From da2e5dfa5142b16733f0289cadf88cf10db6cb5d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 19:49:41 -0600 Subject: [PATCH 001/935] Update build.gradle --- build.gradle | 8 ++++---- build.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index eac4d8633..1143c45ed 100644 --- a/build.gradle +++ b/build.gradle @@ -58,10 +58,10 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - compile "codechicken:CodeChickenLib:1.7.10-1.1.1.109:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.2.9:dev" - compile "codechicken:NotEnoughItems:1.7.10-1.0.2.15:dev" - compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" + 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" //and a bit more for FTP ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") { diff --git a/build.properties b/build.properties index f268287c2..9a9b5d054 100644 --- a/build.properties +++ b/build.properties @@ -2,8 +2,8 @@ #Wed Nov 11 22:20:42 GMT 2015 version=r1.7 dir_output=../Build Output/Botania/ -mc_version=1.7.10 -forge_version=10.13.2.1291 +mc_version=1.8 +forge_version=11.14.3.1468 dir_repo=./ build_number=233 mod_name=Botania From 5a11a58346d39392e87c8a4820ab72989ca942ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 19:50:23 -0600 Subject: [PATCH 002/935] cpw.mods.fml to net.minecraftforge.fml --- .../java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../vazkii/botania/api/boss/IBotaniaBoss.java | 4 +-- .../api/boss/IBotaniaBossWithShader.java | 4 +-- .../api/corporea/CorporeaRequestEvent.java | 4 +-- .../ICorporeaAutoCompleteController.java | 4 +-- .../botania/api/internal/DummyPage.java | 4 +-- .../api/internal/IInternalMethodHandler.java | 4 +-- .../botania/api/item/IBaubleRender.java | 4 +-- .../IWireframeCoordinateListProvider.java | 4 +-- .../api/item/TinyPotatoRenderEvent.java | 6 ++--- .../botania/api/lexicon/LexiconEntry.java | 4 +-- .../botania/api/lexicon/LexiconPage.java | 4 +-- .../component/MultiblockComponent.java | 4 +-- .../java/vazkii/botania/api/mana/ILens.java | 4 +-- .../botania/api/mana/ManaNetworkEvent.java | 2 +- .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/ElvenPortalUpdateEvent.java | 2 +- .../botania/api/subtile/SubTileEntity.java | 4 +-- .../botania/api/wand/ICoordBoundItem.java | 4 +-- .../vazkii/botania/api/wand/ITileBound.java | 4 +-- .../vazkii/botania/api/wiki/WikiHooks.java | 4 +-- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BotaniaPlayerController.java | 4 +-- .../core/handler/BoundTileRenderer.java | 2 +- .../core/handler/ClientTickHandler.java | 8 +++--- .../handler/ContributorFancinessHandler.java | 2 +- .../handler/CorporeaAutoCompleteHandler.java | 8 +++--- .../client/core/handler/DebugHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 6 ++--- .../handler/ItemsRemainingRenderHandler.java | 4 +-- .../client/core/handler/LightningHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 2 +- .../handler/SubTileRadiusRenderHandler.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/core/handler/TooltipHandler.java | 4 +-- .../client/core/helper/ShaderHelper.java | 2 +- .../client/core/proxy/ClientProxy.java | 18 ++++++------- .../botania/client/core/proxy/GuiFactory.java | 2 +- .../java/vazkii/botania/client/fx/FXWisp.java | 2 +- .../client/gui/GuiAchievementsHacky.java | 2 +- .../botania/client/gui/GuiBotaniaConfig.java | 2 +- .../client/render/block/InterpolatedIcon.java | 6 ++--- .../client/render/block/RenderAltar.java | 2 +- .../client/render/block/RenderAvatar.java | 2 +- .../client/render/block/RenderBellows.java | 2 +- .../client/render/block/RenderBrewery.java | 2 +- .../client/render/block/RenderCocoon.java | 2 +- .../block/RenderCorporeaCrystalCube.java | 2 +- .../render/block/RenderCorporeaIndex.java | 2 +- .../render/block/RenderDoubleFlower.java | 2 +- .../render/block/RenderFloatingFlower.java | 2 +- .../client/render/block/RenderHourglass.java | 2 +- .../render/block/RenderIncensePlate.java | 2 +- .../client/render/block/RenderPool.java | 2 +- .../client/render/block/RenderPump.java | 2 +- .../client/render/block/RenderPylon.java | 2 +- .../render/block/RenderSpawnerClaw.java | 2 +- .../render/block/RenderSpecialFlower.java | 2 +- .../client/render/block/RenderSpreader.java | 2 +- .../render/block/RenderTeruTeruBozu.java | 2 +- .../client/render/block/RenderTinyPotato.java | 2 +- .../botania/client/render/item/RenderBow.java | 2 +- .../java/vazkii/botania/common/Botania.java | 26 +++++++++---------- .../achievement/AchievementTriggerer.java | 6 ++--- .../common/achievement/ModAchievements.java | 2 +- .../botania/common/block/BlockAltar.java | 2 +- .../botania/common/block/BlockBifrost.java | 6 ++--- .../botania/common/block/BlockCamo.java | 4 +-- .../botania/common/block/BlockDreamwood.java | 2 +- .../common/block/BlockEnchantedSoil.java | 6 ++--- .../botania/common/block/BlockFelPumpkin.java | 6 ++--- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockGaiaHead.java | 6 ++--- .../botania/common/block/BlockGhostRail.java | 8 +++--- .../botania/common/block/BlockLightRelay.java | 2 +- .../botania/common/block/BlockLivingrock.java | 2 +- .../botania/common/block/BlockLivingwood.java | 2 +- .../vazkii/botania/common/block/BlockMod.java | 6 ++--- .../common/block/BlockModContainer.java | 6 ++--- .../common/block/BlockModDoubleFlower.java | 2 +- .../botania/common/block/BlockModFlower.java | 6 ++--- .../botania/common/block/BlockOpenCrate.java | 2 +- .../common/block/BlockPistonRelay.java | 10 +++---- .../botania/common/block/BlockPlatform.java | 2 +- .../botania/common/block/BlockPylon.java | 4 +-- .../botania/common/block/BlockSolidVines.java | 2 +- .../common/block/BlockSpecialFlower.java | 2 +- .../botania/common/block/BlockStorage.java | 6 ++--- .../botania/common/block/ModBlocks.java | 4 +-- .../common/block/decor/Block18Stone.java | 2 +- .../common/block/decor/BlockBlaze.java | 4 +-- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/decor/BlockCustomBrick.java | 2 +- .../block/decor/BlockEndStoneBrick.java | 2 +- .../block/decor/BlockFloatingFlower.java | 4 +-- .../common/block/decor/BlockManaBeacon.java | 2 +- .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockModMushroom.java | 8 +++--- .../common/block/decor/BlockPavement.java | 6 ++--- .../common/block/decor/BlockPetalBlock.java | 2 +- .../common/block/decor/BlockPrismarine.java | 8 +++--- .../common/block/decor/BlockReeds.java | 6 ++--- .../common/block/decor/BlockSeaLamp.java | 2 +- .../common/block/decor/BlockShimmerrock.java | 6 ++--- .../block/decor/BlockShimmerwoodPlanks.java | 6 ++--- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../common/block/decor/BlockUnstable.java | 2 +- .../decor/biomestone/BlockBiomeStone.java | 2 +- .../block/decor/panes/BlockBifrostPane.java | 6 ++--- .../block/decor/panes/BlockModPane.java | 6 ++--- .../decor/quartz/BlockSpecialQuartz.java | 6 ++--- .../decor/quartz/BlockSpecialQuartzSlab.java | 4 +-- .../block/decor/slabs/BlockLivingSlab.java | 4 +-- .../block/decor/slabs/BlockModSlab.java | 6 ++--- .../block/decor/stairs/BlockModStairs.java | 2 +- .../block/decor/walls/BlockModWall.java | 2 +- .../block/decor/walls/BlockVariantWall.java | 2 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../common/block/string/BlockRedString.java | 4 +-- .../string/BlockRedStringInterceptor.java | 2 +- .../functional/SubTileHeiseiDream.java | 2 +- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 2 +- .../functional/SubTileSpectranthemum.java | 4 +-- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 2 +- .../subtile/generating/SubTileNarslimmus.java | 4 +-- .../botania/common/block/tile/TileCocoon.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 8 +++--- .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 4 +-- .../common/brew/potion/PotionEmptiness.java | 4 +-- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../botania/common/brew/potion/PotionMod.java | 4 +-- .../common/brew/potion/PotionSoulCross.java | 2 +- .../common/core/handler/AliasHandler.java | 6 ++--- .../core/handler/BiomeDecorationHandler.java | 6 ++--- .../core/handler/CommonTickHandler.java | 12 ++++----- .../common/core/handler/ConfigHandler.java | 8 +++--- .../common/core/handler/IMCHandler.java | 2 +- .../core/handler/InternalMethodHandler.java | 2 +- .../core/handler/ManaNetworkHandler.java | 2 +- .../common/core/handler/PixieHandler.java | 2 +- .../common/core/handler/SheddingHandler.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 2 +- .../common/core/helper/ObfuscationHelper.java | 2 +- .../botania/common/core/helper/Vector3.java | 4 +-- .../common/core/proxy/CommonProxy.java | 18 ++++++------- .../common/core/version/VersionChecker.java | 8 +++--- .../common/crafting/ModCraftingRecipes.java | 4 +-- .../common/entity/EntityDoppleganger.java | 6 ++--- .../common/entity/EntityMagicMissile.java | 2 +- .../common/entity/EntityThrowableCopy.java | 4 +-- .../botania/common/entity/ModEntities.java | 2 +- .../botania/common/item/ItemAncientWill.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 6 ++--- .../botania/common/item/ItemCacophonium.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 10 +++---- .../botania/common/item/ItemFlowerBag.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 12 ++++----- .../botania/common/item/ItemKeepIvy.java | 8 +++--- .../botania/common/item/ItemManaCookie.java | 6 ++--- .../botania/common/item/ItemManaGun.java | 6 ++--- .../vazkii/botania/common/item/ItemMod.java | 6 ++--- .../botania/common/item/ItemPhantomInk.java | 2 +- .../botania/common/item/ItemPoolMinecart.java | 2 +- .../botania/common/item/ItemRegenIvy.java | 12 ++++----- .../botania/common/item/ItemSextant.java | 4 +-- .../botania/common/item/ItemSpellCloth.java | 6 ++--- .../common/item/ItemTemperanceStone.java | 4 +-- .../vazkii/botania/common/item/ItemVirus.java | 8 +++--- .../armor/elementium/ItemElementiumArmor.java | 4 +-- .../armor/manasteel/ItemManasteelArmor.java | 8 +++--- .../armor/manaweave/ItemManaweaveArmor.java | 4 +-- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +-- .../armor/terrasteel/ItemTerrasteelHelm.java | 6 ++--- .../item/equipment/bauble/ItemBauble.java | 6 ++--- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 8 +++--- .../equipment/bauble/ItemFlightTiara.java | 10 +++---- .../equipment/bauble/ItemGoldenLaurel.java | 8 +++--- .../item/equipment/bauble/ItemHolyCloak.java | 6 ++--- .../item/equipment/bauble/ItemItemFinder.java | 6 ++--- .../equipment/bauble/ItemKnockbackBelt.java | 4 +-- .../item/equipment/bauble/ItemMagnetRing.java | 6 ++--- .../item/equipment/bauble/ItemMonocle.java | 4 +-- .../bauble/ItemSuperLavaPendant.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 8 +++--- .../item/equipment/tool/ItemGlassPick.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 6 ++--- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 4 +-- .../tool/manasteel/ItemManasteelAxe.java | 6 ++--- .../tool/manasteel/ItemManasteelPick.java | 6 ++--- .../tool/manasteel/ItemManasteelShears.java | 6 ++--- .../tool/manasteel/ItemManasteelShovel.java | 8 +++--- .../tool/manasteel/ItemManasteelSword.java | 6 ++--- .../tool/terrasteel/ItemTerraAxe.java | 12 ++++----- .../tool/terrasteel/ItemTerraPick.java | 6 ++--- .../ItemElementiumHelmRevealing.java | 2 +- .../thaumcraft/ItemManaInkwell.java | 2 +- .../ItemManasteelHelmRevealing.java | 4 +-- .../ItemTerrasteelHelmRevealing.java | 2 +- .../botania/common/item/lens/ItemLens.java | 2 +- .../item/material/ItemManaResource.java | 6 ++--- .../common/item/record/ItemModRecord.java | 6 ++--- .../common/item/relic/ItemAesirRing.java | 4 +-- .../common/item/relic/ItemInfiniteFruit.java | 6 ++--- .../common/item/relic/ItemLokiRing.java | 6 ++--- .../common/item/relic/ItemOdinRing.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 6 ++--- .../botania/common/lexicon/RLexiconEntry.java | 4 +-- .../botania/common/lexicon/page/PageBrew.java | 4 +-- .../lexicon/page/PageCraftingRecipe.java | 6 ++--- .../common/lexicon/page/PageElvenRecipe.java | 4 +-- .../common/lexicon/page/PageEntity.java | 4 +-- .../common/lexicon/page/PageImage.java | 4 +-- .../lexicon/page/PageManaInfusionRecipe.java | 4 +-- .../common/lexicon/page/PageMultiblock.java | 4 +-- .../common/lexicon/page/PagePetalRecipe.java | 4 +-- .../common/lexicon/page/PageRecipe.java | 4 +-- .../common/lexicon/page/PageRuneRecipe.java | 4 +-- .../common/lexicon/page/PageShedding.java | 4 +-- .../common/lexicon/page/PageTerrasteel.java | 4 +-- .../botania/common/lexicon/page/PageText.java | 4 +-- .../common/lexicon/page/PageTutorial.java | 4 +-- .../botania/common/network/GuiHandler.java | 2 +- .../common/world/SkyblockWorldEvents.java | 2 +- 235 files changed, 489 insertions(+), 489 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8c627f937..522308fa6 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -55,7 +55,7 @@ import vazkii.botania.api.wiki.WikiHooks; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import cpw.mods.fml.common.Loader; +import net.minecraftforge.fml.common.Loader; public final class BotaniaAPI { diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index d337e6ae8..ff6dc710d 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -15,8 +15,8 @@ import java.awt.Rectangle; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * An extension of IBossDisplayData. This counts as a botania boss and as a normal diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index 82221d37e..e64dba2cb 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -11,8 +11,8 @@ package vazkii.botania.api.boss; import vazkii.botania.api.internal.ShaderCallback; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A Botania boss whose HP bar makes use of shaders. Shaders diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java index a55ef7b75..ea628ef56 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequestEvent.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.corporea; -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; /** * Fired when a corporea request is initiated. Can be cancelled. diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index fc0a3e9b9..c02047dba 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.corporea; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * An interface for systems which may control if the item auto complete system should be active diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 843198c41..961ea6029 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -11,8 +11,8 @@ package vazkii.botania.api.internal; import vazkii.botania.api.lexicon.LexiconPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A dummy page. It does absolutely nothing and is only diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 9061812e2..54b000f40 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -32,8 +32,8 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any methods that refer to internal methods in Botania are here. diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 7cc492a39..10e01be8e 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -17,8 +17,8 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A Bauble Item that implements this will be have hooks to render something on diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index ae0863ce7..056dec187 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * An item that implements this will allow for various wireframes to be drawn diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 8b51c2634..116671ab6 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -11,9 +11,9 @@ package vazkii.botania.api.item; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index fdbb55ed6..a8a1d10aa 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -17,8 +17,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class LexiconEntry implements Comparable { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 9880b9e9e..7c70491d4 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import vazkii.botania.api.internal.IGuiLexiconEntry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class LexiconPage { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index b1a7d895f..b375e0ccf 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A component of a multiblock, the normal one diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index d125e5729..38ea2fea4 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -11,8 +11,8 @@ package vazkii.botania.api.mana; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Have an Item implement this to be counted as a lens for the mana spreader. diff --git a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java index 9116602c5..747b19379 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaNetworkEvent.java @@ -12,7 +12,7 @@ package vazkii.botania.api.mana; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; public class ManaNetworkEvent extends Event { diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 305ab3b72..027ce0e85 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ @API(owner = "Botania", apiVersion = "67", provides = "BotaniaAPI") package vazkii.botania.api; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index 40d971359..df0235646 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.Event; /** * An event fired when an Elven Portal TE updates. The portal's diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index da1ce2dc8..19aa48f85 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -26,8 +26,8 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index f7c8036d7..eb1d42737 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -2,8 +2,8 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * The item equivalent of ITileBound, renders when the diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 199390b5a..77c1ffcc7 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -11,8 +11,8 @@ package vazkii.botania.api.wand; import net.minecraft.util.ChunkCoordinates; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any TileEntity that implements this is technically bound diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index ae42fd82e..56c4ef22b 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; public class WikiHooks { 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 460e7363c..caf8b3b06 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -36,7 +36,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BaubleRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index a9610ad3a..eb18ab149 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -14,8 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import vazkii.botania.api.item.IExtendedPlayerController; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BotaniaPlayerController extends PlayerControllerMP implements IExtendedPlayerController { diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 968dbfdd6..efec93478 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -32,7 +32,7 @@ import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BoundTileRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 570cec57a..5eb939cf2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -26,10 +26,10 @@ import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.item.ItemTwigWand; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; public class ClientTickHandler { 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 d2d37409b..feb278878 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -35,7 +35,7 @@ import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.material.ItemManaResource; -import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 498f23bd2..72c4b4706 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -30,10 +30,10 @@ import org.lwjgl.input.Keyboard; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class CorporeaAutoCompleteHandler { 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 01fb8924b..36362b371 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -26,7 +26,7 @@ import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class DebugHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 642808d40..c9386910d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -64,9 +64,9 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public final class HUDHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 4e41b8c15..c6a5c40d1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -23,8 +23,8 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public final class ItemsRemainingRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index d66b638a3..3a4c8c574 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.client.core.handler.LightningHandler.LightningBolt.Segment import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class LightningHandler { 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 f60e46c43..37c8a3cb4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -35,7 +35,7 @@ import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class MultiblockRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 68460cabf..e612f8ebf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -30,7 +30,7 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SubTileRadiusRenderHandler { 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 56179cc92..77d759dc8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public final class TooltipAdditionDisplayHandler { 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 6d1ae432e..ede1e06a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -17,8 +17,8 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ItemRegenIvy; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class TooltipHandler { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 1923a011b..a1e20449c 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -26,7 +26,7 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import cpw.mods.fml.common.FMLLog; +import net.minecraftforge.fml.common.FMLLog; public final class ShaderHelper { 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 530a2bd89..0f39d01b9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -171,15 +171,15 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.ItemSextant.MultiblockSextant; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 2a558708d..0794847af 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -15,7 +15,7 @@ import java.util.Set; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import vazkii.botania.client.gui.GuiBotaniaConfig; -import cpw.mods.fml.client.IModGuiFactory; +import net.minecraftforge.fml.client.IModGuiFactory; public class GuiFactory implements IModGuiFactory { diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 05ad91c98..d10323d99 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ObfuscationHelper; -import cpw.mods.fml.client.FMLClientHandler; +import net.minecraftforge.fml.client.FMLClientHandler; public class FXWisp extends EntityFX { diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 9891b66ed..547a7018f 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -15,7 +15,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; import vazkii.botania.common.achievement.ModAchievements; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class GuiAchievementsHacky extends GuiAchievements { diff --git a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java index 4f9d20e1b..77c2fe04c 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.client.config.GuiConfig; +import net.minecraftforge.fml.client.config.GuiConfig; public class GuiBotaniaConfig extends GuiConfig { diff --git a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java index dbe47f01b..e250a1c0e 100644 --- a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java +++ b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java @@ -16,9 +16,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.data.AnimationMetadataSection; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; // This is all vanilla code from 1.8, thanks to ganymedes01 porting it to 1.7 :D @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java index 2d1e6384e..15fbbed8e 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.common.block.tile.TileAltar; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderAltar implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java index f850e1237..4baa2d745 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileAvatar; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderAvatar implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java index a1e287418..e91eabe3e 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TileBellows; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderBellows implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java index aa2eefed3..08cb7f518 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.common.block.tile.TileBrewery; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderBrewery implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java index d74f04d17..9f886b08c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileCocoon; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCocoon implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java index 1225ae73d..53ee16218 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCorporeaCrystalCube implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java index 4eb43de55..e70f1b6f3 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderCorporeaIndex implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java index d9a9ab80b..9a772343d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java @@ -17,7 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import vazkii.botania.client.lib.LibRenderIDs; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java index 4c569ce74..a97379407 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import vazkii.botania.client.lib.LibRenderIDs; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderFloatingFlower implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java index 5bb3d923c..95fbd226d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileHourglass; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderHourglass implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java index d487e4fa2..59b1ce678 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileIncensePlate; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderIncensePlate implements ISimpleBlockRenderingHandler{ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPool.java b/src/main/java/vazkii/botania/client/render/block/RenderPool.java index 29cc7cb51..0160ad9f9 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPool.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPool.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPool implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPump.java b/src/main/java/vazkii/botania/client/render/block/RenderPump.java index cbf99719f..beaadfed3 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPump.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPump.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TilePump; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPump implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java index aad8cfd19..2f4c2c89d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.common.block.tile.TilePylon; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPylon implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java index 6c1e45513..d02d7e6f1 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSpawnerClaw; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index 6de45bc66..a90e9711b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -19,7 +19,7 @@ import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMultiblockRenderHook { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java index 946dfdb6c..bb67f9a6a 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.mana.TileSpreader; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpreader implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java index d12f99eaa..a8925f94d 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderTeruTeruBozu implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java index 2ba503369..bf5a5122b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java @@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTinyPotato; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderTinyPotato implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java index 8b22dc0da..776e843aa 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderBow.java @@ -20,7 +20,7 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class RenderBow implements IItemRenderer { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 180a609f7..151f73802 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -17,19 +17,19 @@ import vazkii.botania.common.integration.coloredlights.ILightHelper; import vazkii.botania.common.integration.coloredlights.LightHelperColored; import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.Mod.Instance; +import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index 0d67196f9..e5c32613e 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -12,9 +12,9 @@ package vazkii.botania.common.achievement; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; public final class AchievementTriggerer { diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 9db5d62dd..5e16c5322 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -21,7 +21,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibAchievementNames; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public final class ModAchievements { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index eb1c4b922..bf29f1ff6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -45,7 +45,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltar extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 8f2736bd7..3aa09c559 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -31,9 +31,9 @@ import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBifrost extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index ba831f15e..9dac8126f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -24,8 +24,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockCamo extends BlockModContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 5ed43a155..8c570787b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -7,7 +7,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockDreamwood extends BlockLivingwood { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 1c66aca3f..71e597b32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -32,9 +32,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index c22cf7d89..f87f8ac90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -29,9 +29,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockFelPumpkin extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c50430429..efca3ee32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -41,7 +41,7 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 7d209302e..2f1e9deec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -20,9 +20,9 @@ import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGaiaHead extends BlockSkull { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 428ec97a5..984f13ebf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -26,10 +26,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 04e0d77c2..2d1748753 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e0b6e8621..017156b2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a9571b675..fbacb7a6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -29,7 +29,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e797d0c8f..4e4553d25 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -18,9 +18,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockMod extends Block { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index d1ff8357e..d19599960 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 9c6988974..529bbf0e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -41,7 +41,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 084e217c7..8ebf8141f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -38,9 +38,9 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b8a1c2d69..1c136f456 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -44,7 +44,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 80dfcdfe4..2e81885c3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -38,11 +38,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 75346747f..5ae575622 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 72ada7d10..f0eb91678 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -31,8 +31,8 @@ import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index f75af748e..1981166d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -26,7 +26,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSolidVines extends BlockVine implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 4819abd34..58640dd02 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -46,7 +46,7 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bf35e1173..e0104455f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -28,9 +28,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 2f4c5c190..e597307be 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -173,8 +173,8 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModBlocks { 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 6614a15d1..d5005f0b4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class Block18Stone extends BlockMod implements ILexiconable { 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 a627d1cde..483e6cb99 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -23,8 +23,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 147a5905d..83d2607d5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockBuriedPetals extends BlockModFlower { 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 063738508..919aa5932 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockCustomBrick extends BlockMod implements ILexiconable { 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 22b476c67..6c2e265c1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { 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 b86f54c7e..2572c1c39 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -43,8 +43,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser { 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 90d3d7a11..d8143da52 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockModContainer implements ILexiconable { 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 0b6a804dd..243bce860 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockManaFlame extends BlockModContainer { 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 a7b4e36f3..46e51d48e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -38,10 +38,10 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { 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 d13de732d..00d8f1f8a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -25,9 +25,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { 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 1ee7e2982..8a6068d4f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPetalBlock extends BlockMod implements ILexiconable { 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 870ac12e3..fa696ebf5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -33,10 +33,10 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { 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 0cfdf2cae..8484f6e32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -25,9 +25,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { 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 381135096..8f868a740 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -21,7 +21,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockSeaLamp extends BlockMod implements ILexiconable { 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 c99f9c53e..724abac77 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -24,9 +24,9 @@ import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockShimmerrock extends BlockMod implements ILexiconable { 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 3a45c951d..d1fdedc25 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -24,9 +24,9 @@ import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 7ea7a8ea1..db5a17ca8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { 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 6c3a99b0f..60843202f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockTinyPotato extends BlockModContainer implements ILexiconable { 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 32bc04b1e..a26bd40f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -31,7 +31,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockUnstable extends BlockMod implements ILexiconable { 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 bec935526..3cb3c3202 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 @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBiomeStone extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 495e39016..b2758f4d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -16,9 +16,9 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.ModBlocks; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBifrostPane extends BlockModPane { 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 3d03e3c79..9b1e53355 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 @@ -21,9 +21,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { 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 7773404ad..31e4dce0e 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 @@ -28,9 +28,9 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { 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 c26bbc8c1..7fd954b0e 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 @@ -26,8 +26,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartzSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 573774843..4a113f588 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -2,8 +2,8 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.Block; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockLivingSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index d6f502f61..948babdb3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -15,9 +15,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 82ad317d5..7394b4b66 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -10,7 +10,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModStairs extends BlockStairs implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index b0a3863b7..3ef9e4c7c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -25,7 +25,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModWall extends BlockWall implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 4c457bb44..76ef02052 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -18,7 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockVariantWall extends BlockModWall { 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 3893d556c..b46e4b2a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -39,7 +39,7 @@ import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { 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 6378abd45..b44106997 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -44,7 +44,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable, IPickupAchievement { 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 79e7e35db..0f401ab9d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -22,7 +22,7 @@ import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class BlockRFGenerator extends BlockModContainer implements ILexiconable { 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 8227d736f..98002e51b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -45,7 +45,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { 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 1ec27f02c..38616bca8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -27,8 +27,8 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockRedString extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 6512281e1..58dbdbae5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -20,7 +20,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BlockRedStringInterceptor extends BlockRedString { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 0c66e7fdc..02bb03c6c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -25,7 +25,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileHeiseiDream extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 95d81b8e9..94563ead9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -21,7 +21,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTilePollidisiac extends SubTileFunctional { 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 d05fefa14..21ad22c75 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 @@ -42,7 +42,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileRannuncarpus extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 733d35b97..19b0762c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -26,8 +26,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class SubTileSpectranthemum extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 07b01ed5f..19748fdef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -27,7 +27,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SubTileTigerseye extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 74110d252..8a8a3f5e4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -24,7 +24,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { 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 875fbb094..c062cebaf 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 @@ -22,8 +22,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileNarslimmus extends SubTileGenerating { 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 1dd09aed9..6f34dafff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,7 +22,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry; public class TileCocoon extends TileMod { 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 81e97bb4e..7623268d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -24,7 +24,7 @@ import net.minecraft.util.WeightedRandom; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class TileSpawnerClaw extends TileMod implements IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index ca55eda1c..bedbbc469 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -39,10 +39,10 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 59e76677f..78e7399e2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { 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 4f856911e..ebd052470 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionAllure extends PotionMod { 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 44eadad2b..f78cdedad 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -20,8 +20,8 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionBloodthirst extends PotionMod { 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 6d2b77ea0..187a15eda 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -19,8 +19,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionEmptiness extends PotionMod { 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 c9e26d3c1..da3fe88e1 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionFeatherfeet extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 1cf8dcfe2..3da24aa70 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -15,8 +15,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PotionMod extends Potion { 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 8498a6800..339b07aa2 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -16,7 +16,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionSoulCross extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index aad356ac8..e1ccd195e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -15,9 +15,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.registry.GameRegistry.Type; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.registry.GameRegistry.Type; public final class AliasHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index b5fa63798..9d5b33f03 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -19,9 +19,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BiomeDecorationHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 5ebadc969..806840428 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -11,12 +11,12 @@ package vazkii.botania.common.core.handler; import vazkii.botania.api.corporea.CorporeaHelper; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public final class CommonTickHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 34577a087..2007ffec4 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -17,10 +17,10 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class ConfigHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index a12ad98f9..5cf46f4b6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -7,7 +7,7 @@ import vazkii.botania.common.lib.LibMisc; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; public final class IMCHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index e181206aa..2ec2fbad4 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -63,7 +63,7 @@ import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; import buildcraft.api.transport.IPipeTile; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; public class InternalMethodHandler extends DummyMethodHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 54608e1c4..611183393 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -24,7 +24,7 @@ import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.common.core.helper.MathHelper; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class ManaNetworkHandler implements IManaNetwork { 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 bccd71985..770ae47d9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -13,7 +13,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PixieHandler { 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 aef3cbdd6..7ae085f17 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -32,7 +32,7 @@ import net.minecraftforge.common.config.Property; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java index 338bcaa74..bcf353fa6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java @@ -17,7 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SpawnerChangingHandler { diff --git a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java b/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java index 8bc4782b0..888c94623 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java @@ -13,7 +13,7 @@ package vazkii.botania.common.core.helper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ObfuscationHelper { diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 02c47ba54..5ae83df22 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -23,8 +23,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class Vector3 { diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 1249071e3..6968bfc07 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -66,15 +66,15 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; import vazkii.botania.common.world.WorldTypeSkyblock; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; public class CommonProxy { diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 9f4f5351b..b79e04e82 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -18,10 +18,10 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraft.util.StatCollector; import vazkii.botania.common.lib.LibMisc; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; public final class VersionChecker { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 056679651..aa22ac4c2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -37,8 +37,8 @@ import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModCraftingRecipes { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index dc82267ec..a570e6411 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -72,9 +72,9 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index e1ba272aa..04ff5862d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -28,7 +28,7 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class EntityMagicMissile extends EntityThrowable { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 38202c607..8f691f1d8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -24,8 +24,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index ad4625bc8..ba4492dd3 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -13,7 +13,7 @@ package vazkii.botania.common.entity; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; -import cpw.mods.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.EntityRegistry; public final class ModEntities { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 5001267df..fa2b52185 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -24,7 +24,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAncientWill extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 98cd2cd1c..677061992 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -39,9 +39,9 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index e5c52b05e..88c213065 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemCacophonium extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index dd13df4db..8b7befbd2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -60,11 +60,11 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index a57e00bfb..630049ea7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -28,7 +28,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemFlowerBag extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 35985a50a..bb55c1545 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -30,12 +30,12 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGrassSeeds extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 663dd323a..e680c1be1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -24,10 +24,10 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemKeepIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 04aa14620..e6d3e8317 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -23,9 +23,9 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 30a8c2ef3..ca7c5c6b9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -42,9 +42,9 @@ import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaGun extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 4e20174df..e8ddc0903 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -16,9 +16,9 @@ import net.minecraft.item.ItemStack; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMod extends Item { diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index c3a90547b..c125c2f0b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -14,7 +14,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemPhantomInk extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 248d72917..07dc38d8c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -25,7 +25,7 @@ import vazkii.botania.common.lib.LibItemNames; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index 20d725430..4db5c55ca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -17,12 +17,12 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.RegenIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemRegenIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index d7b18914d..453fc5ffc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -28,8 +28,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSextant extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index d8782f5d5..af76e2698 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -17,9 +17,9 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSpellCloth extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 371d5a089..1cba481f7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -21,8 +21,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTemperanceStone extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 1ccca7d49..bd36dda17 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -31,10 +31,10 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemVirus extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 1809003cf..f8f4e003b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -3,8 +3,8 @@ package vazkii.botania.common.item.equipment.armor.elementium; import java.util.List; import baubles.common.Config; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 5bda4fc87..f2c542de3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -39,10 +39,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 7e98e576d..d8bf7efe9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -26,8 +26,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 5dc841814..b53472fda 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -22,8 +22,8 @@ import vazkii.botania.client.model.armor.ModelArmorTerrasteel; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelArmor extends ItemManasteelArmor { 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 26e7dc5f0..e1262197a 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 @@ -37,9 +37,9 @@ import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 77bd4604a..060a69b65 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -31,9 +31,9 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { 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 ce41f5347..7434d6693 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 @@ -35,7 +35,7 @@ import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { 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 f0a21d180..7985529b0 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 @@ -37,10 +37,10 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { 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 46a887b48..3bcecf853 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 @@ -60,11 +60,11 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { 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 278d9e285..c95a0ff2d 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 @@ -29,10 +29,10 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 50776abf6..03bf2be4a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -30,9 +30,9 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHolyCloak extends ItemBauble implements IBaubleRender { 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 2acf57719..3f0e579d3 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 @@ -48,9 +48,9 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemItemFinder extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 161bf42f4..b09fbba6c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -27,8 +27,8 @@ import baubles.api.BaubleType; import com.google.common.collect.Multimap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRender { 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 aa392fbca..36a125bd2 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 @@ -35,9 +35,9 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMagnetRing extends ItemBauble { 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 f2af5e85e..e4fa13df1 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 @@ -34,8 +34,8 @@ import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble { 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 dc776b4ca..6a1942402 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 @@ -28,7 +28,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { 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 8eb097cbb..fc623b691 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 @@ -33,10 +33,10 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { 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 f651eb977..c8bcb4f43 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 @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemGlassPick extends ItemManasteelPick { 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 c5ea853b9..656704801 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 @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { 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 0357892a3..4add7dded 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 @@ -20,7 +20,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumAxe extends ItemManasteelAxe { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 4ef76bb2a..b0b967e9c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -13,7 +13,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumPick extends ItemManasteelPick { 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 00d373f29..f9b577319 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 @@ -20,8 +20,8 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemElementiumShears extends ItemManasteelShears { 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 6d673dd6d..460c4b115 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 @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { 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 0682455c1..cd414e6e1 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 @@ -33,9 +33,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { 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 17a2c650e..193127c12 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 @@ -35,9 +35,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { 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 985a84a57..9fc888396 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 @@ -32,10 +32,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index dc7a7d226..da08c003d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -29,9 +29,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { 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 24c275cbc..be741de0d 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 @@ -33,12 +33,12 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { 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 9d3a3e8e7..19be8f014 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 @@ -47,9 +47,9 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 7fdb8e56c..75de52678 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -18,7 +18,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index b7c1cea9f..68180eeb7 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -22,7 +22,7 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index dd9b80dea..adbdbbe4f 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -21,8 +21,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index c266bfad0..618e48c0c 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -18,7 +18,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.Optional; +import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index b43dad328..415a6dbfd 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -37,7 +37,7 @@ import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt { 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 a67ba651f..4e8b88ca5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -39,9 +39,9 @@ import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 793dd4d7e..22fffed31 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -18,9 +18,9 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemModRecord extends ItemRecord { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index c523bb087..819b3293e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -38,8 +38,8 @@ import baubles.api.BaubleType; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 54ca07f67..88d5e515c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -21,9 +21,9 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { 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 5f77e5635..93af5508d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -43,9 +43,9 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 650566022..f80edd9be 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -31,7 +31,7 @@ import baubles.common.lib.PlayerHandler; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { 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 ebd0d40d6..615bb70dd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -41,9 +41,9 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index 1980bbff5..c70aac15f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -15,8 +15,8 @@ import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.stats.Achievement; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class RLexiconEntry extends BLexiconEntry { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index c1e7ed883..ee0b2ab2b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -26,8 +26,8 @@ import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageBrew extends PageRecipe implements ITwoNamedPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 69794f323..765017efe 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -33,9 +33,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageCraftingRecipe extends PageRecipe { 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 5d87a62a0..db1a9e9f7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -22,8 +22,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.BlockAlfPortal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageElvenRecipe extends PageRecipe { 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 89fba690d..97056a150 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -26,8 +26,8 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageEntity extends LexiconPage{ diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index c86a6004a..334392f95 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -19,8 +19,8 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageImage extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b959bb773..8d480c506 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -37,8 +37,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageManaInfusionRecipe extends PageRecipe { 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 e7a7a612d..b1e76c269 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -35,8 +35,8 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageMultiblock extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index f22c9680e..e8d7a1e08 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -31,8 +31,8 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PagePetalRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index b21fdf062..74a01a192 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -32,8 +32,8 @@ import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageRecipe extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 7633ed9f2..8297d96b1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -24,8 +24,8 @@ import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageRuneRecipe extends PagePetalRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 7ba683c6d..2a7c7c4e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -35,8 +35,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.lib.LibResources; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageShedding extends PageEntity { 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 c5c0fc0e1..02be5d57c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -28,8 +28,8 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageTerrasteel extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index a9a221445..4f04dfa31 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -22,8 +22,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import com.google.common.base.Joiner; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageText extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index b1c1b0725..f396350b8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -21,8 +21,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class PageTutorial extends PageText { diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index c33d580f6..25619f4d6 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -18,7 +18,7 @@ import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibGuiIDs; -import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 37a91fcf6..3349bb33c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -31,7 +31,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SkyblockWorldEvents { From f6cfeedd1d9fd3308b3b1afb624b93c14381b6b2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 19:51:23 -0600 Subject: [PATCH 003/935] Vec3 and AABB factory to plain ctor --- .../vazkii/botania/api/corporea/CorporeaHelper.java | 2 +- .../botania/api/mana/spark/ISparkAttachable.java | 2 +- .../vazkii/botania/api/mana/spark/SparkHelper.java | 2 +- .../vazkii/botania/api/subtile/RadiusDescriptor.java | 2 +- .../botania/client/core/handler/LightningHandler.java | 4 ++-- .../botania/common/block/BlockLightLauncher.java | 2 +- .../vazkii/botania/common/block/BlockSolidVines.java | 2 +- .../botania/common/block/decor/BlockDirtPath.java | 2 +- .../botania/common/block/mana/BlockForestDrum.java | 4 ++-- .../botania/common/block/mana/BlockSpreader.java | 2 +- .../block/subtile/functional/SubTileBellethorn.java | 2 +- .../block/subtile/functional/SubTileDaffomill.java | 8 ++++---- .../block/subtile/functional/SubTileFallenKanade.java | 2 +- .../block/subtile/functional/SubTileHeiseiDream.java | 2 +- .../block/subtile/functional/SubTileHopperhock.java | 4 ++-- .../block/subtile/functional/SubTileHyacidus.java | 2 +- .../block/subtile/functional/SubTileMedumone.java | 2 +- .../block/subtile/functional/SubTilePollidisiac.java | 4 ++-- .../block/subtile/functional/SubTileRannuncarpus.java | 2 +- .../subtile/functional/SubTileSpectranthemum.java | 2 +- .../block/subtile/functional/SubTileTangleberrie.java | 2 +- .../block/subtile/functional/SubTileTigerseye.java | 2 +- .../block/subtile/generating/SubTileArcaneRose.java | 2 +- .../block/subtile/generating/SubTileEndoflame.java | 2 +- .../block/subtile/generating/SubTileEntropinnyum.java | 2 +- .../block/subtile/generating/SubTileGourmaryllis.java | 2 +- .../block/subtile/generating/SubTileNarslimmus.java | 2 +- .../block/subtile/generating/SubTileSpectrolus.java | 2 +- .../botania/common/block/tile/TileAlfPortal.java | 4 ++-- .../vazkii/botania/common/block/tile/TileAltar.java | 2 +- .../vazkii/botania/common/block/tile/TileBrewery.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 6 +++--- .../vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- .../botania/common/block/tile/TileForestEye.java | 2 +- .../botania/common/block/tile/TileIncensePlate.java | 2 +- .../botania/common/block/tile/TileLightRelay.java | 2 +- .../botania/common/block/tile/TileRuneAltar.java | 4 ++-- .../botania/common/block/tile/TileSpawnerClaw.java | 2 +- .../botania/common/block/tile/TileTerraPlate.java | 4 ++-- .../common/block/tile/corporea/TileCorporeaFunnel.java | 2 +- .../common/block/tile/corporea/TileCorporeaIndex.java | 2 +- .../block/tile/corporea/TileCorporeaInterceptor.java | 2 +- .../common/block/tile/mana/TileManaDetector.java | 2 +- .../botania/common/block/tile/mana/TilePool.java | 4 ++-- .../botania/common/block/tile/mana/TileSpreader.java | 6 +++--- .../botania/common/brew/potion/PotionBloodthirst.java | 2 +- .../botania/common/brew/potion/PotionEmptiness.java | 2 +- .../common/core/handler/TerrasteelCraftingHandler.java | 4 ++-- .../vazkii/botania/common/core/helper/Vector3.java | 2 +- .../botania/common/entity/EntityBabylonWeapon.java | 2 +- .../botania/common/entity/EntityCorporeaSpark.java | 2 +- .../botania/common/entity/EntityDoppleganger.java | 4 ++-- .../botania/common/entity/EntityFallingStar.java | 2 +- .../vazkii/botania/common/entity/EntityFlameRing.java | 2 +- .../botania/common/entity/EntityMagicLandmine.java | 2 +- .../botania/common/entity/EntityMagicMissile.java | 4 ++-- .../botania/common/entity/EntityThrowableCopy.java | 10 +++++----- .../vazkii/botania/common/entity/EntityThrownItem.java | 4 ++-- .../integration/buildcraft/TriggerManaDetector.java | 2 +- .../botania/common/item/ItemBlackHoleTalisman.java | 2 +- .../vazkii/botania/common/item/ItemBottledMana.java | 2 +- .../java/vazkii/botania/common/item/ItemLexicon.java | 2 +- .../vazkii/botania/common/item/ItemPinkinator.java | 2 +- .../vazkii/botania/common/item/ItemSignalFlare.java | 2 +- .../common/item/equipment/bauble/ItemDivaCharm.java | 2 +- .../common/item/equipment/bauble/ItemItemFinder.java | 2 +- .../common/item/equipment/bauble/ItemMagnetRing.java | 2 +- .../common/item/equipment/bauble/ItemTinyPlanet.java | 2 +- .../common/item/equipment/bauble/ItemUnholyCloak.java | 2 +- .../common/item/equipment/tool/ItemThunderSword.java | 2 +- .../common/item/equipment/tool/ToolCommons.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 2 +- .../item/equipment/tool/terrasteel/ItemTerraSword.java | 2 +- .../vazkii/botania/common/item/lens/LensDamage.java | 2 +- .../vazkii/botania/common/item/lens/LensInfluence.java | 10 +++++----- .../vazkii/botania/common/item/lens/LensPaint.java | 2 +- .../botania/common/item/relic/ItemExcaliber.java | 4 ++-- .../vazkii/botania/common/item/rod/ItemDirtRod.java | 2 +- .../vazkii/botania/common/item/rod/ItemGravityRod.java | 6 +++--- .../vazkii/botania/common/item/rod/ItemRainbowRod.java | 10 +++++----- .../vazkii/botania/common/item/rod/ItemSkyDirtRod.java | 2 +- .../vazkii/botania/common/item/rod/ItemTornadoRod.java | 2 +- 82 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index a1e772649..a2b82f06c 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -245,7 +245,7 @@ public final class CorporeaHelper { * in are for the block that the spark will be on, not the coords of the spark itself. */ public static ICorporeaSpark getSparkForBlock(World world, int x, int y, int z) { - List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, AxisAlignedBB.getBoundingBox(x, y + 1, z, x + 1, y + 2, z + 1)); + List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1)); return sparks.isEmpty() ? null : sparks.get(0); } diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java index 880e169fe..d7708f6f0 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java @@ -40,7 +40,7 @@ public interface ISparkAttachable extends IManaReceiver { * Gets the Spark that is attached to this block. A common implementation is * to check for Spark entities above: * - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 7351036cf..add3c3284 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -25,7 +25,7 @@ public final class SparkHelper { public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; - List entities = world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r)); + List entities = world.getEntitiesWithinAABB(clazz, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r)); return entities; } diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index f57b6fa71..f16eda6b4 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -81,7 +81,7 @@ public class RadiusDescriptor { public static class Square extends Rectangle { public Square(ChunkCoordinates subtileCoords, int expand) { - super(subtileCoords, AxisAlignedBB.getBoundingBox(subtileCoords.posX - expand, subtileCoords.posY, subtileCoords.posZ - expand, subtileCoords.posX + 1 + expand, subtileCoords.posY, subtileCoords.posZ + 1 + expand)); + super(subtileCoords, new AxisAlignedBB(subtileCoords.posX - expand, subtileCoords.posY, subtileCoords.posZ - expand, subtileCoords.posX + 1 + expand, subtileCoords.posY, subtileCoords.posZ + 1 + expand)); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 3a4c8c574..55dc31e33 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -323,8 +323,8 @@ public class LightningHandler { particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; particleAge = -(int) (length * speed); - boundingBox = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); - boundingBox.setBB(AxisAlignedBB.getBoundingBox(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2)); + boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0); + boundingBox.setBB(new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2)); segments.add(new Segment(start, end)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index dc0d407fa..9b23841e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -82,7 +82,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } if(!relays.isEmpty()) { - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 1981166d7..6f452e27a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -41,7 +41,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World w, int x, int y, int z) { setBlockBoundsBasedOnState(w, x, y, z); - return AxisAlignedBB.getBoundingBox(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); + return new AxisAlignedBB(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); } @Override 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 500bd4e47..f15b80c96 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -77,7 +77,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + return new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); } @Override 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 b46e4b2a3..36b394ba1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -117,7 +117,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona ItemGrassHorn.breakGrass(world, null, 1, x, y, z); else if(!world.isRemote) { int range = 10; - List entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); List shearables = new ArrayList(); ItemStack stack = new ItemStack(this, 1, 1); @@ -125,7 +125,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { shearables.add(entity); } else if(entity instanceof EntityCow) { - List items = world.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); + 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) { 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 98002e51b..138ed232e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -247,7 +247,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public AxisAlignedBB getWireframeAABB(World world, int x, int y, int z) { float f = 1F / 16F; - return AxisAlignedBB.getBoundingBox(x + f, y + f, z + f, x + 1 - f, y + 1 - f, z + 1 - f); + return new AxisAlignedBB(x + f, y + f, z + f, x + 1 - f, y + 1 - f, z + 1 - f); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 0ea122295..22e12e409 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -49,7 +49,7 @@ public class SubTileBellethorn extends SubTileFunctional { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + 1, supertile.zCoord + range + 1)); + List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + 1, supertile.zCoord + range + 1)); IEntitySelector selector = getSelector(); for(EntityLivingBase entity : entities) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 564a41bc9..a4f5b4167 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -72,16 +72,16 @@ public class SubTileDaffomill extends SubTileFunctional { AxisAlignedBB axis = null; switch(orientation) { case 0 : - axis = AxisAlignedBB.getBoundingBox(x - w, y - h, z - l, x + w + 1, y + h, z); + axis = new AxisAlignedBB(x - w, y - h, z - l, x + w + 1, y + h, z); break; case 1 : - axis = AxisAlignedBB.getBoundingBox(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); + axis = new AxisAlignedBB(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); break; case 2 : - axis = AxisAlignedBB.getBoundingBox(x - l, y - h, z - w, x, y + h, z + w + 1); + axis = new AxisAlignedBB(x - l, y - h, z - w, x, y + h, z + w + 1); break; case 3 : - axis = AxisAlignedBB.getBoundingBox(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); + axis = new AxisAlignedBB(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); } return axis; } 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 45f94df80..028f16762 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 @@ -32,7 +32,7 @@ public class SubTileFallenKanade extends SubTileFunctional { final int cost = 120; if(!supertile.getWorldObj().isRemote && supertile.getWorldObj().provider.dimensionId != 1) { - List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityPlayer player : players) { if(player.getActivePotionEffect(Potion.regeneration) == null && mana >= cost ) { player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 2)); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 02bb03c6c..e7bd32c67 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -37,7 +37,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; - List mobs = supertile.getWorldObj().getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List mobs = supertile.getWorldObj().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { if(mob instanceof EntityLiving) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 25b325825..132c291d4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -63,7 +63,7 @@ public class SubTileHopperhock extends SubTileFunctional { int y = supertile.yCoord; int z = supertile.zCoord; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); for(EntityItem item : items) { if(item.age < 60 || item.age >= 105 && item.age < 110 || item.isDead) continue; @@ -168,7 +168,7 @@ public class SubTileHopperhock extends SubTileFunctional { }; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1); + AxisAlignedBB aabb = new AxisAlignedBB(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1); List frames = supertile.getWorldObj().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { int orientation = frame.hangingDirection; 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 c658d1d6a..c0a0e900f 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 @@ -36,7 +36,7 @@ public class SubTileHyacidus extends SubTileFunctional { final int cost = 20; - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityLivingBase entity : entities) { if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(Potion.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); 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 ec614af02..0e8709d80 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 @@ -31,7 +31,7 @@ public class SubTileMedumone extends SubTileFunctional { super.onUpdate(); if(mana > 0) { - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 94563ead9..b9f2a3fde 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -34,8 +34,8 @@ public class SubTilePollidisiac extends SubTileFunctional { if(!supertile.getWorldObj().isRemote) { int manaCost = 12; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); - List animals = supertile.getWorldObj().getEntitiesWithinAABB(EntityAnimal.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + List animals = supertile.getWorldObj().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); for(EntityAnimal animal : animals) { if(mana < manaCost) break; 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 21ad22c75..fb71bb954 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 @@ -76,7 +76,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { int y = supertile.yCoord; int z = supertile.zCoord; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); for(EntityItem item : items) { if(item.age < 60 || item.isDead) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 19b0762c7..041862061 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -53,7 +53,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { int z = supertile.zCoord; boolean did = false; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); for(EntityItem item : items) { if(item.age < 60 || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 7959ee403..282244148 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -38,7 +38,7 @@ public class SubTileTangleberrie extends SubTileFunctional { double maxDist = getMaxDistance(); double range = getRange(); - AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(x1 - range, y1 - range, z1 - range, x1 + range + 1, y1 + range + 1, z1 + range + 1); + AxisAlignedBB boundingBox = new AxisAlignedBB(x1 - range, y1 - range, z1 - range, x1 + range + 1, y1 + range + 1, z1 + range + 1); List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); for(EntityLivingBase entity : entities) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 19748fdef..8d33342a3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -41,7 +41,7 @@ public class SubTileTigerseye extends SubTileFunctional { boolean shouldAfffect = mana >= cost; - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + RANGE + 1)); for(EntityLiving entity : entities) { List entries = new ArrayList(entity.tasks.taskEntries); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 6bcb74ef2..c1ec31099 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -31,7 +31,7 @@ public class SubTileArcaneRose extends SubTileGenerating { if(mana >= getMaxMana()) return; - List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); for(EntityPlayer player : players) if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 94095a2a8..00d9be03b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -42,7 +42,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(mana < getMaxMana() && !supertile.getWorldObj().isRemote) { boolean didSomething = false; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { if(item.age >= 59 && !item.isDead) { ItemStack stack = item.getEntityItem(); 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 37e81be64..977d756f2 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 @@ -30,7 +30,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { super.onUpdate(); if(mana == 0) { - List tnts = supertile.getWorldObj().getEntitiesWithinAABB(EntityTNTPrimed.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List tnts = supertile.getWorldObj().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityTNTPrimed tnt : tnts) { if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorldObj().getBlock(MathHelper.floor_double(tnt.posX), MathHelper.floor_double(tnt.posY), MathHelper.floor_double(tnt.posZ)).getMaterial().isLiquid()) { if(!supertile.getWorldObj().isRemote) { 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 4842c85ff..a3b4ad73c 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 @@ -43,7 +43,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { } if(!supertile.getWorldObj().isRemote) { - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { 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 c062cebaf..e55337af6 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 @@ -36,7 +36,7 @@ public class SubTileNarslimmus extends SubTileGenerating { super.onUpdate(); if(ticksExisted % 5 == 0) { - List slimes = supertile.getWorldObj().getEntitiesWithinAABB(EntitySlime.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE, supertile.zCoord + RANGE + 1)); + List slimes = supertile.getWorldObj().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE, supertile.zCoord + RANGE + 1)); for(EntitySlime slime : slimes) { if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && !slime.isDead) { int size = slime.getSlimeSize(); 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 dfc12b5c4..f4720b661 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 @@ -45,7 +45,7 @@ public class SubTileSpectrolus extends SubTileGenerating { if(!supertile.getWorldObj().isRemote) { Item wool = Item.getItemFromBlock(Blocks.wool); - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() == wool) { 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 b6322cb56..faa92405b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -195,9 +195,9 @@ public class TileAlfPortal extends TileMod { } AxisAlignedBB getPortalAABB() { - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord + 1, zCoord, xCoord + 2, yCoord + 4, zCoord + 1); + AxisAlignedBB aabb = new AxisAlignedBB(xCoord - 1, yCoord + 1, zCoord, xCoord + 2, yCoord + 4, zCoord + 1); if(getBlockMetadata() == 2) - aabb = AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord - 1, xCoord + 1, yCoord + 4, zCoord + 2); + aabb = new AxisAlignedBB(xCoord, yCoord + 1, zCoord - 1, xCoord + 1, yCoord + 4, zCoord + 2); return aabb; } 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 a6cd1fd19..935598494 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -210,7 +210,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I @Override public void updateEntity() { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1D / 16D * 20D, zCoord, xCoord + 1, yCoord + 1D / 16D * 21D, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord + 1D / 16D * 20D, zCoord, xCoord + 1, yCoord + 1D / 16D * 21D, zCoord + 1)); boolean didChange = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2a4961a9c..5edf99248 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -94,7 +94,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, recieveMana(0); if(!worldObj.isRemote && recipe == null) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null) { ItemStack stack = item.getEntityItem(); 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 e615e2267..ddc14b7d1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -102,7 +102,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(stage != 0 || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) return; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); int count = items.size(); if(count > 0 && !worldObj.isRemote) { @@ -147,7 +147,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { switch(stage) { case 1 : { // Get books if(stageTicks % 20 == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); int count = items.size(); boolean addedEnch = false; @@ -391,7 +391,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; 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 ac7de35cb..064df7eb1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -29,7 +29,7 @@ public class TileEnderEye extends TileMod { int meta = getBlockMetadata(); int range = 80; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range)); boolean looking = false; for(EntityPlayer player : players) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 9f0e63c8f..184e3a86e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -20,7 +20,7 @@ public class TileForestEye extends TileMod { @Override public void updateEntity() { int range = 6; - int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + range + 1, yCoord + range + 1, zCoord + range + 1)).size(); + int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + range + 1, yCoord + range + 1, zCoord + range + 1)).size(); if(entityCount != entities) { entities = entityCount; worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); 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 133ad72ad..2d334fcbf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -48,7 +48,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven if(timeLeft > 0) { timeLeft--; if(!worldObj.isRemote) { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord + 0.5 - RANGE, yCoord + 0.5 - RANGE, zCoord + 0.5 - RANGE, xCoord + 0.5 + RANGE, yCoord + 0.5 + RANGE, zCoord + 0.5 + RANGE)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(xCoord + 0.5 - RANGE, yCoord + 0.5 - RANGE, zCoord + 0.5 - RANGE, xCoord + 0.5 + RANGE, yCoord + 0.5 + RANGE, zCoord + 0.5 + RANGE)); for(EntityPlayer player : players) { PotionEffect currentEffect = player.getActivePotionEffect(Potion.potionTypes[effect.getPotionID()]); boolean nightVision = effect.getPotionID() == Potion.nightVision.id; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 1c4b2cdf0..f8ebe2eac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -88,7 +88,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { ChunkCoordinates endpoint = getEndpoint(); if(endpoint != null && !worldObj.isRemote) { float range = 0.5F; - List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + 1 + range, yCoord + 1 + range, zCoord + 1 + range)); + List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + 1 + range, yCoord + 1 + range, zCoord + 1 + range)); for(EntityEnderPearl pearl : enderPearls) { pearl.posX = endpoint.posX + pearl.posX - xCoord; pearl.posY = endpoint.posY + pearl.posY - yCoord; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 343a0c2c3..6f84f3438 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -82,7 +82,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor recieveMana(0); if(!worldObj.isRemote && manaToGet == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { ItemStack stack = item.getEntityItem(); @@ -178,7 +178,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(manaToGet > 0 && mana >= manaToGet && !worldObj.isRemote) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); EntityItem livingrock = null; for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() == Item.getItemFromBlock(ModBlocks.livingrock)) { 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 7623268d0..76ec16a4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -72,7 +72,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { if (entity == null) return; - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox(logic.getSpawnerX(), logic.getSpawnerY(), logic.getSpawnerZ(), logic.getSpawnerX() + 1, logic.getSpawnerY() + 1, logic.getSpawnerZ() + 1).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerX(), logic.getSpawnerY(), logic.getSpawnerZ(), logic.getSpawnerX() + 1, logic.getSpawnerY() + 1, logic.getSpawnerZ() + 1).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); if (j >= maxNearbyEntities) { resetTimer(logic); 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 f59d61d6d..21282014b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -133,7 +133,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } List getItems() { - return worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + return worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); } boolean areItemsValid(List items) { @@ -222,7 +222,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index c6554fa21..cc6fd219f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -52,7 +52,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq }; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, AxisAlignedBB.getBoundingBox(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); + List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); for(EntityItemFrame frame : frames) { int orientation = frame.hangingDirection; if(orientationToDir[orientation] == dir.ordinal()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index bedbbc469..8071ec519 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -158,7 +158,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ double y = yCoord + 0.5; double z = zCoord + 0.5; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x - RADIUS, y - RADIUS, z - RADIUS, x + RADIUS, y + RADIUS, z + RADIUS)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(x - RADIUS, y - RADIUS, z - RADIUS, x + RADIUS, y + RADIUS, z + RADIUS)); hasCloseby = false; for(EntityPlayer player : players) if(isInRangeOfIndex(player, this)) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index bfc5734c9..9f213d3f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -94,7 +94,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor }; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, AxisAlignedBB.getBoundingBox(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); + List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); for(EntityItemFrame frame : frames) { int orientation = frame.hangingDirection; if(orientationToDir[orientation] == dir.ordinal()) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 90bd75db1..a5a316420 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -22,7 +22,7 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost { public void updateEntity() { if(!worldObj.isRemote) { int meta = getBlockMetadata(); - int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)).size() != 0 ? 1 : 0; + int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)).size() != 0 ? 1 : 0; if(meta != expectedMeta) worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, expectedMeta, 1 | 2); 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 c6eef89f2..8f81a0796 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 @@ -215,7 +215,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc conjuration = worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.conjurationCatalyst; catalystsRegistered = true; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) { if(item.isDead) continue; @@ -406,7 +406,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; 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 67dd689b4..5275211bd 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 @@ -205,7 +205,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, double x = lastPingbackX; double y = lastPingbackY; double z = lastPingbackZ; - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x, y, z, x, y, z).expand(PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE); + AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x, y, z).expand(PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE); List bursts = worldObj.getEntitiesWithinAABB(IManaBurst.class, aabb); IManaBurst found = null; UUID identity = getIdentifier(); @@ -495,7 +495,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; - Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); + Vec3 vec3 = new Vec3(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); @@ -630,7 +630,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, AxisAlignedBB axis = player.worldObj.getBlock(x, y, z).getCollisionBoundingBoxFromPool(player.worldObj, x, y, z); if(axis == null) - axis = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + axis = new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); if(!blockVec.isInside(axis)) blockVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); 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 f78cdedad..41fde3240 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -35,7 +35,7 @@ public class PotionBloodthirst extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); + List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); for(EntityPlayer player : players) if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { event.setResult(Result.ALLOW); 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 187a15eda..b5d2f0747 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -34,7 +34,7 @@ public class PotionEmptiness extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); + List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); for(EntityPlayer player : players) if(hasEffect(player)) { event.setResult(Result.DENY); diff --git a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java index 59150bbcc..a9a8017be 100644 --- a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java @@ -86,7 +86,7 @@ public final class TerrasteelCraftingHandler { if(beacon.getLevels() <= 0) return -1; - List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)); + List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)); EntityItem diamond = null; EntityItem pearl = null; @@ -178,7 +178,7 @@ public final class TerrasteelCraftingHandler { int y = MathHelper.floor_double(item.posY); int z = MathHelper.floor_double(item.posZ); - List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)); + List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)); for(EntityItem otherItem : items) if(otherItem != item) otherItem.setDead(); diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 5ae83df22..6028af953 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -229,7 +229,7 @@ public class Vector3 } public Vec3 toVec3D() { - return Vec3.createVectorHelper(x, y, z); + return new Vec3(x, y, z); } public double angle(Vector3 vec) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 94e7768cf..331a7d5d8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -121,7 +121,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setLiveTicks(liveTime + 1); if(!worldObj.isRemote) { - AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); + AxisAlignedBB axis = new AxisAlignedBB(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living == thrower) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index c1c277a70..65b6c3e7b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -127,7 +127,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } List getNearbySparks() { - return worldObj.getEntitiesWithinAABB(ICorporeaSpark.class, AxisAlignedBB.getBoundingBox(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE)); + return worldObj.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE)); } void restartNetwork() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index a570e6411..a59a6b53e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -483,7 +483,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public List getPlayersAround() { ChunkCoordinates source = getSource(); float range = 15F; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); return players; } @@ -695,7 +695,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi spawnMissile(); } else { range = 3F; - players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); if(!players.isEmpty()) damageEntity(DamageSource.causePlayerDamage(players.get(0)), 0); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 82d1f4c0b..ecbf9490c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -48,7 +48,7 @@ public class EntityFallingStar extends EntityThrowableCopy { EntityLivingBase thrower = getThrower(); if(!worldObj.isRemote && thrower != null) { - AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); + AxisAlignedBB axis = new AxisAlignedBB(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living == thrower) diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index b77f34f00..66c604564 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -73,7 +73,7 @@ public class EntityFlameRing extends Entity { } if(ticksExisted > 45) { - AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius); + AxisAlignedBB boundingBox = new AxisAlignedBB(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius); List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); if(entities.isEmpty()) diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 8d56c4336..646943a99 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -57,7 +57,7 @@ public class EntityMagicLandmine extends Entity { Botania.proxy.wispFX(worldObj, posX, posY + 1, posZ, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); if(!worldObj.isRemote) { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + 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(Potion.blindness.id, 25, 0)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 04ff5862d..4afd7791e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -123,7 +123,7 @@ public class EntityMagicMissile extends EntityThrowable { motionY = Math.abs(motionY); motionZ = motionVec.z; - List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); + List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); if(targetList.contains(target) && target != null) { EntityLivingBase thrower = getThrower(); EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; @@ -159,7 +159,7 @@ public class EntityMagicMissile extends EntityThrowable { setTarget(null); double range = 12; - List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); while(entities.size() > 0) { Entity e = (Entity) entities.get(worldObj.rand.nextInt(entities.size())); if(!(e instanceof EntityLivingBase) || e.isDead) { // Just in case... diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 8f691f1d8..431e9720c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -187,15 +187,15 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile ++ticksInAir; } - Vec3 vec3 = Vec3.createVectorHelper(posX, posY, posZ); - Vec3 vec31 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); + Vec3 vec3 = new Vec3(posX, posY, posZ); + Vec3 vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3, vec31); - vec3 = Vec3.createVectorHelper(posX, posY, posZ); - vec31 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); + vec3 = new Vec3(posX, posY, posZ); + vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); if (movingobjectposition != null) { - vec31 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + vec31 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } if (!worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index dff1c91c6..42faf7b77 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -47,8 +47,8 @@ public class EntityThrownItem extends EntityItem { @Override public void onUpdate() { super.onUpdate(); - Vec3 vec3 = Vec3.createVectorHelper(posX, posY, posZ); - Vec3 vec31 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); + Vec3 vec3 = new Vec3(posX, posY, posZ); + Vec3 vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3, vec31); diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 4210c9da8..fd84e758a 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -34,7 +34,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern World world = source.getTile().getWorldObj(); int x = source.getTile().xCoord, y = source.getTile().yCoord, z = source.getTile().zCoord; - boolean output = world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)).size() != 0; + boolean output = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size() != 0; if(output) for(int i = 0; i < 4; i++) Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 677061992..9604249ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -110,7 +110,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } else { ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); if(entities == 0) { int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index a2bec1876..2e89850b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -145,7 +145,7 @@ public class ItemBottledMana extends ItemMod { player.worldObj.spawnEntityInWorld(flare); int range = 5; - List entities = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List entities = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityLivingBase entity : entities) if(entity != player && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index d3cc9983a..faaf5dbcd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -72,7 +72,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return true; } } else if(par3World.isRemote) { - MovingObjectPosition pos = new MovingObjectPosition(par4, par5, par6, par7, Vec3.createVectorHelper(par8, par9, par10)); + MovingObjectPosition pos = new MovingObjectPosition(par4, par5, par6, par7, new Vec3(par8, par9, par10)); return Botania.proxy.openWikiPage(par3World, block, pos); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index d684432db..41a11fa10 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -33,7 +33,7 @@ public class ItemPinkinator extends ItemMod { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { int range = 16; - List withers = world.getEntitiesWithinAABB(EntityWither.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) if(!wither.isDead && !(wither instanceof EntityPinkWither)) { if(!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index c7a86d197..b3311f2b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -68,7 +68,7 @@ public class ItemSignalFlare extends ItemMod { int stunned = 0; int range = 5; - List entities = par2World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par3EntityPlayer.posX - range, par3EntityPlayer.posY - range, par3EntityPlayer.posZ - range, par3EntityPlayer.posX + range, par3EntityPlayer.posY + range, par3EntityPlayer.posZ + range)); + 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) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) { entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); 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 7985529b0..2e0ff6eec 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 @@ -59,7 +59,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); + List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); if(mobs.size() > 1) { if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { if(event.entityLiving instanceof EntityCreeper) 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 3f0e579d3..8ab435a9b 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 @@ -118,7 +118,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(pstack != null || player.isSneaking()) { int range = 24; - List entities = player.worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List entities = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(Entity e : entities) { if(e == player) continue; 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 36a125bd2..8c103b498 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 @@ -104,7 +104,7 @@ public class ItemMagnetRing extends ItemBauble { double y = player.posY -(player.worldObj.isRemote ? 1.62 : 0) + 0.75; double z = player.posZ; - List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); + List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); int pulled = 0; for(EntityItem item : items) if(canPullItem(item)) { 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 7b03ea5dc..a0c47c406 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 @@ -61,7 +61,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public static void applyEffect(World world, double x, double y, double z) { int range = 8; - List entities = world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); + List entities = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); for(Entity entity : entities) { IManaBurst burst = (IManaBurst) entity; ItemStack lens = burst.getSourceLens(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 1dbd14b56..69146b74a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -36,7 +36,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.source.isUnblockable()) { int range = 6; - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(IMob mob : mobs) if(mob instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) mob; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 27d6d41f4..0b2e0b136 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -61,7 +61,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; for(int i = 0; i < 4; i++) { - List entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; 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 426138020..a7b833383 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 @@ -139,7 +139,7 @@ public final class ToolCommons { if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; - Vec3 vec3 = Vec3.createVectorHelper(d0, d1, d2); + Vec3 vec3 = new Vec3(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); 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 f9b577319..4d49c95a1 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 @@ -66,7 +66,7 @@ public class ItemElementiumShears extends ItemManasteelShears { if(count != getMaxItemUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = player.worldObj.getEntitiesWithinAABB(IShearable.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List sheep = player.worldObj.getEntitiesWithinAABB(IShearable.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); if(sheep.size() > 0) { for(IShearable target : sheep) { Entity entity = (Entity) target; 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 4865193ec..1258fd90c 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 @@ -103,7 +103,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I @Override public void updateBurst(IManaBurst burst, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; - AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); + AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 68a512b24..162ac9e1c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -24,7 +24,7 @@ public class LensDamage extends Lens { @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { - AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); + AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living instanceof EntityPlayer) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 43c4fa01c..9e3d84bca 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -29,11 +29,11 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); for(Entity movable : movables) { if(movable == burst) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 03afaeb11..c3761dc94 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -34,7 +34,7 @@ public class LensPaint extends Lens { if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { int r = 20; int sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); - List sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, AxisAlignedBB.getBoundingBox(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); + List sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, new AxisAlignedBB(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); for(EntitySheep sheep : sheepList) { if(sheep.getFleeceColor() == sheepColor) sheep.setFleeceColor(storedColor == 16 ? sheep.worldObj.rand.nextInt(16) : storedColor); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 471f677e7..cb944f965 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -156,12 +156,12 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf @Override public void updateBurst(IManaBurst burst, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; - AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); + AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); int homeID = ItemNBTHelper.getInt(stack, TAG_HOME_ID, -1); if(homeID == -1) { - AxisAlignedBB axis1 = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(5, 5, 5); + AxisAlignedBB axis1 = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(5, 5, 5); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis1); for(EntityLivingBase living : entities) { if(living instanceof EntityPlayer || living instanceof IBossDisplayData || !(living instanceof IMob) || living.hurtTime != 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 d09ca7b67..2f2b23fd2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -51,7 +51,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, false)) { ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); 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 34b254266..dba7d061a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -93,7 +93,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { target.add(new Vector3(player.getLookVec()).multiply(distance)); target.y += 0.5; - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) found = true; @@ -111,7 +111,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { target.add(new Vector3(player.getLookVec()).multiply(distance)); target.y += 0.5; - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; } @@ -197,7 +197,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { target.add(new Vector3(player.getLookVec()).multiply(distance)); target.y += 0.5; - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) found = true; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 2c2ae87aa..16357cbe4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -153,16 +153,16 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi AxisAlignedBB axis = null; switch(te.getBlockMetadata() - 2) { case 0 : - axis = AxisAlignedBB.getBoundingBox(x - w, y - h, z - l, x + w + 1, y + h, z); + axis = new AxisAlignedBB(x - w, y - h, z - l, x + w + 1, y + h, z); break; case 1 : - axis = AxisAlignedBB.getBoundingBox(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); + axis = new AxisAlignedBB(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); break; case 2 : - axis = AxisAlignedBB.getBoundingBox(x - l, y - h, z - w, x, y + h, z + w + 1); + axis = new AxisAlignedBB(x - l, y - h, z - w, x, y + h, z + w + 1); break; case 3 : - axis = AxisAlignedBB.getBoundingBox(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); + axis = new AxisAlignedBB(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); } List players = world.getEntitiesWithinAABB(EntityPlayer.class, axis); @@ -178,7 +178,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int ex = px + i - diff; int ez = pz + j - diff; - if(!axis.isVecInside(Vec3.createVectorHelper(ex + 0.5, py + 1, ez + 0.5))) + if(!axis.isVecInside(new Vec3(ex + 0.5, py + 1, ez + 0.5))) continue; Block block = world.getBlock(ex, py, ez); 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 81b390991..d7b4294a9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -39,7 +39,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { int y = MathHelper.floor_double(placeVec.y) + 1; int z = MathHelper.floor_double(placeVec.z); - int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)).size(); + 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); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 509323062..76d54900e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -159,7 +159,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi if(tile.getCurrentMana() >= COST && tile.isEnabled()) { int range = 5; int rangeY = 3; - List players = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(te.xCoord + 0.5 - range, te.yCoord + 0.5 - rangeY, te.zCoord + 0.5 - range, te.xCoord + 0.5 + range, te.yCoord + 0.5 + rangeY, te.zCoord + 0.5 + range)); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(te.xCoord + 0.5 - range, te.yCoord + 0.5 - rangeY, te.zCoord + 0.5 - range, te.xCoord + 0.5 + range, te.yCoord + 0.5 + rangeY, te.zCoord + 0.5 + range)); for(EntityPlayer p : players) { if(p.motionY > 0.3 && p.motionY < 2 && !p.isSneaking()) { p.motionY = 2.8; From 67d5d65902dba34db2928cd3dd308d31ef19c367 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 19:53:37 -0600 Subject: [PATCH 004/935] Shotgun tile.getWorldObj into tile.getWorld. May cause some individual errors but fix later --- .../botania/api/corporea/CorporeaHelper.java | 2 +- .../api/internal/VanillaPacketDispatcher.java | 2 +- .../api/subtile/SubTileFunctional.java | 18 +++++------ .../api/subtile/SubTileGenerating.java | 30 +++++++++---------- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBellows.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 4 +-- .../render/tile/RenderTileEnchanter.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 6 ++-- .../render/tile/RenderTileHourglass.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../client/render/tile/RenderTilePool.java | 10 +++---- .../client/render/tile/RenderTilePump.java | 2 +- .../client/render/tile/RenderTilePylon.java | 4 +-- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSpreader.java | 2 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../render/tile/RenderTileTinyPotato.java | 2 +- .../common/block/subtile/SubTileManastar.java | 4 +-- .../block/subtile/SubTilePureDaisy.java | 10 +++---- .../functional/SubTileAgricarnation.java | 18 +++++------ .../subtile/functional/SubTileBellethorn.java | 2 +- .../subtile/functional/SubTileBubbell.java | 6 ++-- .../subtile/functional/SubTileClayconia.java | 14 ++++----- .../subtile/functional/SubTileDaffomill.java | 6 ++-- .../subtile/functional/SubTileExoflame.java | 6 ++-- .../functional/SubTileFallenKanade.java | 4 +-- .../functional/SubTileHeiseiDream.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 16 +++++----- .../subtile/functional/SubTileHyacidus.java | 2 +- .../functional/SubTileJadedAmaranthus.java | 18 +++++------ .../subtile/functional/SubTileLoonuim.java | 8 ++--- .../functional/SubTileMarimorphosis.java | 16 +++++----- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 16 +++++----- .../functional/SubTileOrechidIgnem.java | 2 +- .../functional/SubTilePollidisiac.java | 8 ++--- .../functional/SubTileRannuncarpus.java | 24 +++++++-------- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../functional/SubTileSpectranthemum.java | 6 ++-- .../functional/SubTileTangleberrie.java | 6 ++-- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 2 +- .../subtile/generating/SubTileArcaneRose.java | 2 +- .../generating/SubTileDandelifeon.java | 8 ++--- .../subtile/generating/SubTileDaybloom.java | 10 +++---- .../subtile/generating/SubTileEndoflame.java | 10 +++---- .../generating/SubTileEntropinnyum.java | 10 +++---- .../generating/SubTileGourmaryllis.java | 8 ++--- .../generating/SubTileHydroangeas.java | 26 ++++++++-------- .../subtile/generating/SubTileKekimurus.java | 14 ++++----- .../subtile/generating/SubTileMunchdew.java | 14 ++++----- .../subtile/generating/SubTileNarslimmus.java | 2 +- .../subtile/generating/SubTileNightshade.java | 2 +- .../subtile/generating/SubTileRafflowsia.java | 12 ++++---- .../subtile/generating/SubTileSpectrolus.java | 4 +-- .../subtile/generating/SubTileThermalily.java | 4 +-- .../common/block/tile/TileAlfPortal.java | 2 +- .../common/block/tile/TileRuneAltar.java | 2 +- .../block/tile/mana/TileManaDetector.java | 2 +- .../common/block/tile/mana/TileManaVoid.java | 2 +- .../core/handler/ManaNetworkHandler.java | 8 ++--- .../common/core/helper/InventoryHelper.java | 2 +- .../common/entity/EntityManaBurst.java | 2 +- .../buildcraft/TriggerManaDetector.java | 2 +- .../botania/common/item/ItemManaMirror.java | 4 +-- .../common/item/rod/ItemDiviningRod.java | 2 +- .../botania/common/item/rod/ItemFireRod.java | 2 +- .../common/item/rod/ItemMissileRod.java | 2 +- .../common/item/rod/ItemRainbowRod.java | 2 +- .../common/item/rod/ItemTornadoRod.java | 2 +- 72 files changed, 231 insertions(+), 231 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index a2b82f06c..4bebf6ebc 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -237,7 +237,7 @@ public final class CorporeaHelper { return null; TileEntity tile = (TileEntity) inv; - return getSparkForBlock(tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord); + return getSparkForBlock(tile.getWorld(), tile.xCoord, tile.yCoord, tile.zCoord); } /** diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index dff8b9636..d62088a53 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -19,7 +19,7 @@ import net.minecraft.world.World; public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { - World world = tile.getWorldObj(); + World world = tile.getWorld(); List players = world.playerEntities; for(Object player : players) if(player instanceof EntityPlayerMP) { diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index d6156eafe..54863c864 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -73,16 +73,16 @@ public class SubTileFunctional extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorldObj().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } - if(supertile.getWorldObj().isRemote) { + if(supertile.getWorld().isRemote) { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorldObj(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } @@ -93,9 +93,9 @@ public class SubTileFunctional extends SubTileEntity { if(cachedPoolCoordinates != null) { needsNew = false; - if(supertile.getWorldObj().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) { + if(supertile.getWorld().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) { needsNew = true; - TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { linkedPool = tileAt; needsNew = false; @@ -104,17 +104,17 @@ public class SubTileFunctional extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); if(tileAt != null && tileAt instanceof IManaPool) linkedPool = tileAt; } if(needsNew && ticksExisted == 1) { // Only for new flowers IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); - int size = network.getAllPoolsInWorld(supertile.getWorldObj()).size(); + int size = network.getAllPoolsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedPool = network.getClosestPool(coords, supertile.getWorldObj(), RANGE); + linkedPool = network.getClosestPool(coords, supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -207,7 +207,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 0dd2f329a..71bac81f2 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -71,7 +71,7 @@ public class SubTileGenerating extends SubTileEntity { if(canGeneratePassively()) { int delay = getDelayBetweenPassiveGeneration(); - if(delay > 0 && ticksExisted % delay == 0 && !supertile.getWorldObj().isRemote) { + if(delay > 0 && ticksExisted % delay == 0 && !supertile.getWorld().isRemote) { if(shouldSyncPassiveGeneration()) sync(); addMana(getValueForPassiveGeneration()); @@ -82,27 +82,27 @@ public class SubTileGenerating extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorldObj().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } - if(supertile.getWorldObj().isRemote) { + if(supertile.getWorld().isRemote) { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorldObj(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } boolean passive = isPassiveFlower(); - if(!supertile.getWorldObj().isRemote) { + if(!supertile.getWorld().isRemote) { int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { - supertile.getWorldObj().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); - if(supertile.getWorldObj().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorldObj(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP)) - supertile.getWorldObj().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush); - else supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + supertile.getWorld().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); + if(supertile.getWorld().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorld(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP)) + supertile.getWorld().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush); + else supertile.getWorld().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); } } @@ -117,9 +117,9 @@ public class SubTileGenerating extends SubTileEntity { if(cachedCollectorCoordinates != null) { needsNew = false; - if(supertile.getWorldObj().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) { + if(supertile.getWorld().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) { needsNew = true; - TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ); if(tileAt != null && tileAt instanceof IManaCollector && !tileAt.isInvalid()) { linkedCollector = tileAt; needsNew = false; @@ -128,17 +128,17 @@ public class SubTileGenerating extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); if(tileAt != null && tileAt instanceof IManaCollector) linkedCollector = tileAt; } if(needsNew && ticksExisted == 1) { // New flowers only IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); - int size = network.getAllCollectorsInWorld(supertile.getWorldObj()).size(); + int size = network.getAllCollectorsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedCollector = network.getClosestCollector(coords, supertile.getWorldObj(), RANGE); + linkedCollector = network.getClosestCollector(coords, supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -298,7 +298,7 @@ public class SubTileGenerating extends SubTileEntity { public boolean isValidBinding() { - return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; + return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; } @Override 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 03dd328c6..37c9d1074 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -51,7 +51,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GL11.glTranslated(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = avatar.getWorldObj() != null ? avatar.getBlockMetadata() : 0; + int meta = avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; GL11.glTranslatef(0.5F, 1.6F, 0.5F); GL11.glScalef(1F, -1F, -1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 77cd86806..a67b02c3e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -41,7 +41,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { GL11.glTranslated(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = bellows.getWorldObj() != null ? bellows.getBlockMetadata() : 0; + int meta = bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; GL11.glTranslatef(0.5F, 1.5F, 0.5F); GL11.glScalef(1F, -1F, -1F); 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 d649d0edc..4cb1e4f9d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -71,7 +71,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float s = 0.25F; GL11.glScalef(s, s, s); GL11.glScalef(2F, 2F, 2F); - if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorldObj(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorldObj().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { + if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { GL11.glScalef(0.5F, 0.5F, 0.5F); if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { GL11.glScalef(0.5F, 0.5F, 0.5F); 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 71f7d6eef..81dcbb099 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -40,14 +40,14 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileentity; if(entity == null) - entity = new EntityItem(cube.getWorldObj(), cube.xCoord, cube.yCoord, cube.zCoord, new ItemStack(Blocks.stone)); + entity = new EntityItem(cube.getWorld(), cube.xCoord, cube.yCoord, cube.zCoord, new ItemStack(Blocks.stone)); entity.age = ClientTickHandler.ticksInGame; ItemStack stack = cube.getRequestTarget(); entity.setEntityItemStack(stack); double time = ClientTickHandler.ticksInGame + f; - double worldTicks = tileentity.getWorldObj() == null ? 0 : time; + double worldTicks = tileentity.getWorld() == null ? 0 : time; Minecraft mc = Minecraft.getMinecraft(); GL11.glPushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 6d9b654fa..2538210de 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -48,7 +48,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { if(enchanter.itemToEnchant != null) { if(item == null) - item = new EntityItem(enchanter.getWorldObj(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); + item = new EntityItem(enchanter.getWorld(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); item.age = ClientTickHandler.ticksInGame; item.setEntityItemStack(enchanter.itemToEnchant); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index bea58c6d8..f0269d566 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -38,15 +38,15 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glTranslated(d0, d1, d2); - double worldTime = tile.getWorldObj() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); - if(tile.getWorldObj() != null) + double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); + if(tile.getWorld() != null) worldTime += new Random(tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(1000); GL11.glTranslatef(0.5F, 0F, 0.5F); GL11.glRotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F); GL11.glTranslatef(-0.5F, 0F, -0.5F); - if(tile.getWorldObj() != null) { + if(tile.getWorld() != null) { GL11.glTranslatef(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); GL11.glRotatef(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index c5bb50574..5d9ffbcd4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -41,7 +41,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { GL11.glTranslated(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int wtime = tileentity.getWorldObj() == null ? 0 : ClientTickHandler.ticksInGame; + int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame; if(wtime != 0) wtime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 3a786db70..36970017f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -42,7 +42,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks) { TileIncensePlate plate = (TileIncensePlate) tileentity; - int meta = plate.getWorldObj() != null ? plate.getBlockMetadata() : 0; + int meta = plate.getWorld() != null ? plate.getBlockMetadata() : 0; GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 5aca76994..b0ad21f9d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -57,8 +57,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GL11.glColor4f(1F, 1F, 1F, a); GL11.glTranslated(d0, d1, d2); - boolean inf = tileentity.getWorldObj() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1; - boolean dil = tileentity.getWorldObj() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2; + boolean inf = tileentity.getWorld() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1; + boolean dil = tileentity.getWorld() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2; Minecraft.getMinecraft().renderEngine.bindTexture(inf ? textureInf : dil ? textureDil : texture); @@ -89,10 +89,10 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float v = 1F / 8F; float w = -v * 3.5F; - if(pool.getWorldObj() != null) { - Block below = pool.getWorldObj().getBlock(pool.xCoord, pool.yCoord - 1, pool.zCoord); + if(pool.getWorld() != null) { + Block below = pool.getWorld().getBlock(pool.xCoord, pool.yCoord - 1, pool.zCoord); if(below instanceof IPoolOverlayProvider) { - IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorldObj(), pool.xCoord, pool.yCoord - 1, pool.zCoord); + IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.xCoord, pool.yCoord - 1, pool.zCoord); if(overlay != null) { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 62e561177..0ab0d3825 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -41,7 +41,7 @@ public class RenderTilePump extends TileEntitySpecialRenderer { GL11.glTranslated(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = pump.getWorldObj() != null ? pump.getBlockMetadata() : 0; + int meta = pump.getWorld() != null ? pump.getBlockMetadata() : 0; GL11.glTranslatef(0.5F, 0.5F, 0.5F); GL11.glScalef(1F, -1F, -1F); 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 209fe9596..650592657 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -56,7 +56,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GL11.glColor4f(1F, 1F, 1F, a); - if(tileentity.getWorldObj() != null) { + if(tileentity.getWorld() != null) { green = tileentity.getBlockMetadata() == 1; pink = tileentity.getBlockMetadata() == 2; } @@ -65,7 +65,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture); - double worldTime = tileentity.getWorldObj() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); + double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); if(tileentity != null) worldTime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360); 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 245c62cd9..691abc521 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -74,7 +74,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); GL11.glScalef(2F, 2F, 2F); - if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorldObj(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorldObj().rand, mc.renderEngine, renderBlocks, 1)) { + if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { GL11.glScalef(0.5F, 0.5F, 0.5F); if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { GL11.glScalef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index e13a116c7..230e5215d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -77,7 +77,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GL11.glColor3f(1F, 1F, 1F); GL11.glPushMatrix(); - double worldTicks = tileentity.getWorldObj() == null ? 0 : time; + double worldTicks = tileentity.getWorld() == null ? 0 : time; GL11.glRotatef((float) worldTicks % 360, 0F, 1F, 0F); GL11.glTranslatef(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); model.renderCube(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index adcb0cbc9..e66f634aa 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -43,7 +43,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); GL11.glRotatef(180F, 1F, 0F, 0F); double time = Botania.proxy.getWorldElapsedTicks() + f; - boolean hasWorld = tileentity.getWorldObj() != null; + boolean hasWorld = tileentity.getWorld() != null; if(hasWorld) time += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(1000); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d8883a54a..f8b8aa176 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -85,7 +85,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glTranslatef(0.5F, 1.5F, 0.5F); GL11.glScalef(1F, -1F, -1F); - int meta = potato.getWorldObj() == null ? 3 : potato.getBlockMetadata(); + int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata(); float rotY = meta * 90F - 180F; GL11.glRotatef(rotY, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 4c5c45c19..821a86c9d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -29,14 +29,14 @@ public class SubTileManastar extends SubTileEntity { int mana = 0; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = supertile.getWorldObj().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); + TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); if(tile instanceof IManaPool) mana += ((IManaPool) tile).getCurrentMana(); } if(manaLastTick != -1 && mana != manaLastTick && Math.random() > 0.6) { boolean more = mana > manaLastTick; - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.75 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.75 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); } if(ticksExisted % 60 == 0) 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 3ff872c9a..a603711f0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -52,7 +52,7 @@ public class SubTilePureDaisy extends SubTileEntity { int[] acoords = POSITIONS[positionAt]; ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord + acoords[0], supertile.yCoord + acoords[1], supertile.zCoord + acoords[2]); - World world = supertile.getWorldObj(); + World world = supertile.getWorld(); if(!world.isAirBlock(coords.posX, coords.posY, coords.posZ)) { Block block = world.getBlock(coords.posX, coords.posY, coords.posZ); int meta = world.getBlockMetadata(coords.posX, coords.posY, coords.posZ); @@ -67,7 +67,7 @@ public class SubTilePureDaisy extends SubTileEntity { if(recipe != null) { ticksRemaining[positionAt] = ticksRemaining[positionAt] - 1; - Botania.proxy.sparkleFX(supertile.getWorldObj(), coords.posX + Math.random(), coords.posY + Math.random(), coords.posZ + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); + Botania.proxy.sparkleFX(supertile.getWorld(), coords.posX + Math.random(), coords.posY + Math.random(), coords.posZ + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); if(ticksRemaining[positionAt] <= 0) { ticksRemaining[positionAt] = 200; @@ -78,10 +78,10 @@ public class SubTilePureDaisy extends SubTileEntity { double y = coords.posY + Math.random() + 0.5; double z = coords.posZ + Math.random(); - Botania.proxy.wispFX(supertile.getWorldObj(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); + Botania.proxy.wispFX(supertile.getWorld(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); } if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(recipe.getOutput()) + (recipe.getOutputMeta() << 12)); + supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(recipe.getOutput()) + (recipe.getOutputMeta() << 12)); } } } else ticksRemaining[positionAt] = 200; @@ -97,7 +97,7 @@ public class SubTilePureDaisy extends SubTileEntity { public void readFromPacketNBT(NBTTagCompound cmp) { positionAt = cmp.getInteger(TAG_POSITION); - if(supertile.getWorldObj() != null && !supertile.getWorldObj().isRemote) + if(supertile.getWorld() != null && !supertile.getWorld().isRemote) for(int i = 0; i < ticksRemaining.length; i++) ticksRemaining[i] = cmp.getInteger(TAG_TICKS_REMAINING + i); } 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 63d466819..5ee99fe17 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 @@ -34,22 +34,22 @@ public class SubTileAgricarnation extends SubTileFunctional { if(ticksExisted % 6 == 0 && redstoneSignal == 0) { int range = getRange(); - int x = supertile.xCoord + supertile.getWorldObj().rand.nextInt(range * 2 + 1) - range; - int z = supertile.zCoord + supertile.getWorldObj().rand.nextInt(range * 2 + 1) - range; + int x = supertile.xCoord + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; + int z = supertile.zCoord + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; for(int i = 4; i > -2; i--) { int y = supertile.yCoord + i; - if(supertile.getWorldObj().isAirBlock(x, y, z)) + if(supertile.getWorld().isAirBlock(x, y, z)) continue; if(isPlant(x, y, z) && mana > 5) { - Block block = supertile.getWorldObj().getBlock(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); mana -= 5; - supertile.getWorldObj().scheduleBlockUpdate(x, y, z, block, 1); + supertile.getWorld().scheduleBlockUpdate(x, y, z, block, 1); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2005, x, y, z, 6 + supertile.getWorldObj().rand.nextInt(4)); - supertile.getWorldObj().playSoundEffect(x, y, z, "botania:agricarnation", 0.1F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playAuxSFX(2005, x, y, z, 6 + supertile.getWorld().rand.nextInt(4)); + supertile.getWorld().playSoundEffect(x, y, z, "botania:agricarnation", 0.1F, 0.5F + (float) Math.random() * 0.5F); break; } @@ -63,12 +63,12 @@ public class SubTileAgricarnation extends SubTileFunctional { } boolean isPlant(int x, int y, int z) { - Block block = supertile.getWorldObj().getBlock(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); if(block == Blocks.grass || block == Blocks.leaves || block == Blocks.leaves2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; Material mat = block.getMaterial(); - return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.gourd) && block instanceof IGrowable && ((IGrowable) block).func_149851_a(supertile.getWorldObj(), x, y, z, supertile.getWorldObj().isRemote); + return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.gourd) && block instanceof IGrowable && ((IGrowable) block).func_149851_a(supertile.getWorld(), x, y, z, supertile.getWorld().isRemote); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 22e12e409..b533a2594 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -49,7 +49,7 @@ public class SubTileBellethorn extends SubTileFunctional { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + 1, supertile.zCoord + range + 1)); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + 1, supertile.zCoord + range + 1)); IEntitySelector selector = getSelector(); for(EntityLivingBase entity : entities) { 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 10c62757c..eeb28f972 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 @@ -47,10 +47,10 @@ public class SubTileBubbell extends SubTileFunctional { for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - Block block = supertile.getWorldObj().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); + Block block = supertile.getWorld().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); if(block.getMaterial() == Material.water) { - supertile.getWorldObj().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, ModBlocks.fakeAir, 0, 2); - TileFakeAir air = (TileFakeAir) supertile.getWorldObj().getTileEntity(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); + supertile.getWorld().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, ModBlocks.fakeAir, 0, 2); + TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); 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 9686fdbf8..fc7d053fc 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 @@ -33,16 +33,16 @@ public class SubTileClayconia extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorldObj().isRemote && ticksExisted % 5 == 0) { + if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) { int manaCost = 80; if(mana >= manaCost) { ChunkCoordinates coords = getCoordsToPut(); if(coords != null) { - supertile.getWorldObj().setBlockToAir(coords.posX, coords.posY, coords.posZ); + supertile.getWorld().setBlockToAir(coords.posX, coords.posY, coords.posZ); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Block.getBlockFromName("sand"))); - EntityItem item = new EntityItem(supertile.getWorldObj(), coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, new ItemStack(Items.clay_ball)); - supertile.getWorldObj().spawnEntityInWorld(item); + supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Block.getBlockFromName("sand"))); + EntityItem item = new EntityItem(supertile.getWorld(), coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, new ItemStack(Items.clay_ball)); + supertile.getWorld().spawnEntityInWorld(item); mana -= manaCost; } } @@ -58,14 +58,14 @@ public class SubTileClayconia extends SubTileFunctional { int x = supertile.xCoord + i; int y = supertile.yCoord + j; int z = supertile.zCoord + k; - Block block = supertile.getWorldObj().getBlock(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); if(block == Block.getBlockFromName("sand")) possibleCoords.add(new ChunkCoordinates(x, y, z)); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorldObj().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index a4f5b4167..0c3ddf91b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -37,8 +37,8 @@ public class SubTileDaffomill extends SubTileFunctional { super.onUpdate(); ForgeDirection dir = ForgeDirection.getOrientation(orientation + 2); - if(supertile.getWorldObj().rand.nextInt(4) == 0) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + Math.random(), supertile.yCoord + Math.random(), supertile.zCoord + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, dir.offsetX * 0.1F, dir.offsetY * 0.1F, dir.offsetZ * 0.1F); + if(supertile.getWorld().rand.nextInt(4) == 0) + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + Math.random(), supertile.yCoord + Math.random(), supertile.zCoord + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, dir.offsetX * 0.1F, dir.offsetY * 0.1F, dir.offsetZ * 0.1F); if(windTicks == 0 && mana > 0) { windTicks = 20; @@ -49,7 +49,7 @@ public class SubTileDaffomill extends SubTileFunctional { AxisAlignedBB axis = aabbForOrientation(); if(axis != null) { - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, axis); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); for(EntityItem item : items) { item.motionX += dir.offsetX * 0.05; item.motionY += dir.offsetY * 0.05; 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 91ca70e39..e959132ba 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 @@ -43,8 +43,8 @@ public class SubTileExoflame extends SubTileFunctional { int y = supertile.yCoord + j; int z = supertile.zCoord + k; - TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); - Block block = supertile.getWorldObj().getBlock(x, y, z); + TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); if(tile != null) { if(tile instanceof TileEntityFurnace && (block == Blocks.furnace || block == Blocks.lit_furnace)) { TileEntityFurnace furnace = (TileEntityFurnace) tile; @@ -52,7 +52,7 @@ public class SubTileExoflame extends SubTileFunctional { if(canSmelt && mana > 2) { if(furnace.furnaceBurnTime < 2) { if(furnace.furnaceBurnTime == 0) - BlockFurnace.updateFurnaceBlockState(true, supertile.getWorldObj(), x, y, z); + BlockFurnace.updateFurnaceBlockState(true, supertile.getWorld(), x, y, z); furnace.furnaceBurnTime = 200; mana = Math.max(0, mana - cost); } 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 028f16762..8ee26f47d 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 @@ -31,8 +31,8 @@ public class SubTileFallenKanade extends SubTileFunctional { final int cost = 120; - if(!supertile.getWorldObj().isRemote && supertile.getWorldObj().provider.dimensionId != 1) { - List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + if(!supertile.getWorld().isRemote && supertile.getWorld().provider.dimensionId != 1) { + List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityPlayer player : players) { if(player.getActivePotionEffect(Potion.regeneration) == null && mana >= cost ) { player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 2)); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index e7bd32c67..cc8abe791 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -37,7 +37,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; - List mobs = supertile.getWorldObj().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List mobs = supertile.getWorld().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { if(mob instanceof EntityLiving) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 132c291d4..13640f273 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -53,7 +53,7 @@ public class SubTileHopperhock extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0 || supertile.getWorldObj().isRemote) + if(redstoneSignal > 0 || supertile.getWorld().isRemote) return; boolean pulledAny = false; @@ -63,7 +63,7 @@ public class SubTileHopperhock extends SubTileFunctional { int y = supertile.yCoord; int z = supertile.zCoord; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); for(EntityItem item : items) { if(item.age < 60 || item.age >= 105 && item.age < 110 || item.isDead) continue; @@ -79,7 +79,7 @@ public class SubTileHopperhock extends SubTileFunctional { int y_ = y + dir.offsetY; int z_ = z + dir.offsetZ; - IInventory inv = InventoryHelper.getInventory(supertile.getWorldObj(), x_, y_, z_); + IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), x_, y_, z_); if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); @@ -152,13 +152,13 @@ public class SubTileHopperhock extends SubTileFunctional { List filter = new ArrayList(); if(recursiveForDoubleChests) { - TileEntity tileEntity = supertile.getWorldObj().getTileEntity(x, y, z); - Block chest = supertile.getWorldObj().getBlock(x, y, z); + TileEntity tileEntity = supertile.getWorld().getTileEntity(x, y, z); + Block chest = supertile.getWorld().getBlock(x, y, z); if(tileEntity instanceof TileEntityChest) for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorldObj().getBlock(x + dir.offsetX, y, z + dir.offsetZ) == chest) { - filter.addAll(getFilterForInventory((IInventory) supertile.getWorldObj().getTileEntity(x + dir.offsetX, y, z + dir.offsetZ), x + dir.offsetX, y, z + dir.offsetZ, false)); + if(supertile.getWorld().getBlock(x + dir.offsetX, y, z + dir.offsetZ) == chest) { + filter.addAll(getFilterForInventory((IInventory) supertile.getWorld().getTileEntity(x + dir.offsetX, y, z + dir.offsetZ), x + dir.offsetX, y, z + dir.offsetZ, false)); break; } } @@ -169,7 +169,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { AxisAlignedBB aabb = new AxisAlignedBB(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1); - List frames = supertile.getWorldObj().getEntitiesWithinAABB(EntityItemFrame.class, aabb); + List frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { int orientation = frame.hangingDirection; if(orientationToDir[orientation] == dir.ordinal()) 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 c0a0e900f..d6488c6e5 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 @@ -36,7 +36,7 @@ public class SubTileHyacidus extends SubTileFunctional { final int cost = 20; - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityLivingBase entity : entities) { if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(Potion.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); 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 8501cd179..315b60e3f 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 @@ -31,19 +31,19 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { if(redstoneSignal > 0) return; - if(mana >= COST && !supertile.getWorldObj().isRemote && ticksExisted % 30 == 0) { - int x = supertile.xCoord - RANGE + supertile.getWorldObj().rand.nextInt(RANGE * 2 + 1); + if(mana >= COST && !supertile.getWorld().isRemote && ticksExisted % 30 == 0) { + int x = supertile.xCoord - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1); int y = supertile.yCoord + RANGE; - int z = supertile.zCoord - RANGE + supertile.getWorldObj().rand.nextInt(RANGE * 2 + 1); + int z = supertile.zCoord - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1); for(int i = 0; i < RANGE * 2; i++) { - Block blockAbove = supertile.getWorldObj().getBlock(x, y + 1, z); - if((supertile.getWorldObj().isAirBlock(x, y + 1, z) || blockAbove.isReplaceable(supertile.getWorldObj(), x, y + 1, z)) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorldObj(), x, y + 1, z)) { - int color = supertile.getWorldObj().rand.nextInt(16); - if(ModBlocks.flower.canBlockStay(supertile.getWorldObj(), x, y + 1, z)) { + Block blockAbove = supertile.getWorld().getBlock(x, y + 1, z); + if((supertile.getWorld().isAirBlock(x, y + 1, z) || blockAbove.isReplaceable(supertile.getWorld(), x, y + 1, z)) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), x, y + 1, z)) { + int color = supertile.getWorld().rand.nextInt(16); + if(ModBlocks.flower.canBlockStay(supertile.getWorld(), x, y + 1, z)) { if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, x, y + 1, z, Block.getIdFromBlock(ModBlocks.flower) + (color << 12)); - supertile.getWorldObj().setBlock(x, y + 1, z, ModBlocks.flower, color, 1 | 2); + supertile.getWorld().playAuxSFX(2001, x, y + 1, z, Block.getIdFromBlock(ModBlocks.flower) + (color << 12)); + supertile.getWorld().setBlock(x, y + 1, z, ModBlocks.flower, color, 1 | 2); } mana -= COST; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index ce14cfaed..f20f1200d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -30,7 +30,7 @@ public class SubTileLoonuim extends SubTileFunctional { public void onUpdate() { super.onUpdate(); if(redstoneSignal == 0 && ticksExisted % 200 == 0 && mana >= COST) { - Random rand = supertile.getWorldObj().rand; + Random rand = supertile.getWorld().rand; ItemStack stack; do { @@ -38,13 +38,13 @@ public class SubTileLoonuim extends SubTileFunctional { } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; - EntityItem entity = new EntityItem(supertile.getWorldObj(), supertile.xCoord - RANGE + rand.nextInt(bound) , supertile.yCoord + 1, supertile.zCoord - RANGE + rand.nextInt(bound), stack); + EntityItem entity = new EntityItem(supertile.getWorld(), supertile.xCoord - RANGE + rand.nextInt(bound) , supertile.yCoord + 1, supertile.zCoord - RANGE + rand.nextInt(bound), stack); entity.motionX = 0; entity.motionY = 0; entity.motionZ = 0; - if(!supertile.getWorldObj().isRemote) - supertile.getWorldObj().spawnEntityInWorld(entity); + if(!supertile.getWorld().isRemote) + supertile.getWorld().spawnEntityInWorld(entity); 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 1df3dc62d..b1886c818 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 @@ -53,16 +53,16 @@ public class SubTileMarimorphosis extends SubTileFunctional { if(redstoneSignal > 0) return; - if(!supertile.getWorldObj().isRemote && mana >= COST && ticksExisted % 2 == 0) { + if(!supertile.getWorld().isRemote && mana >= COST && ticksExisted % 2 == 0) { ChunkCoordinates coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getStoneToPut(coords); if(stack != null) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); - supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); + supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); mana -= COST; sync(); @@ -72,7 +72,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public ItemStack getStoneToPut(ChunkCoordinates coords) { - List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorldObj().getBiomeGenForCoords(coords.posX, coords.posZ))); + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords.posX, coords.posZ))); List values = new ArrayList(); for(int i = 0; i < 8; i++) { @@ -84,7 +84,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { values.add(i); } - return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorldObj().rand.nextInt(values.size()))); + return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorld().rand.nextInt(values.size()))); } public ChunkCoordinates getCoordsToPut() { @@ -99,14 +99,14 @@ public class SubTileMarimorphosis extends SubTileFunctional { int x = supertile.xCoord + i; int y = supertile.yCoord + j; int z = supertile.zCoord + k; - Block block = supertile.getWorldObj().getBlock(x, y, z); - if(block != null && block.isReplaceableOreGen(supertile.getWorldObj(), x, y, z, Blocks.stone)) + Block block = supertile.getWorld().getBlock(x, y, z); + if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, Blocks.stone)) possibleCoords.add(new ChunkCoordinates(x, y, z)); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorldObj().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); } @Override 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 0e8709d80..0a35c5de7 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 @@ -31,7 +31,7 @@ public class SubTileMedumone extends SubTileFunctional { super.onUpdate(); if(mana > 0) { - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { 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 8a027957b..a0054b7ae 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 @@ -47,17 +47,17 @@ public class SubTileOrechid extends SubTileFunctional { return; int cost = getCost(); - if(!supertile.getWorldObj().isRemote && mana >= cost && ticksExisted % getDelay() == 0) { + if(!supertile.getWorld().isRemote && mana >= cost && ticksExisted % getDelay() == 0) { ChunkCoordinates coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getOreToPut(); if(stack != null) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); - supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); + supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:orechid", 2F, 1F); + supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:orechid", 2F, 1F); mana -= cost; sync(); @@ -72,7 +72,7 @@ public class SubTileOrechid extends SubTileFunctional { for(String s : map.keySet()) values.add(new StringRandomItem(map.get(s), s)); - String ore = ((StringRandomItem) WeightedRandom.getRandomItem(supertile.getWorldObj().rand, values)).s; + String ore = ((StringRandomItem) WeightedRandom.getRandomItem(supertile.getWorld().rand, values)).s; List ores = OreDictionary.getOres(ore); @@ -106,14 +106,14 @@ public class SubTileOrechid extends SubTileFunctional { int x = supertile.xCoord + i; int y = supertile.yCoord + j; int z = supertile.zCoord + k; - Block block = supertile.getWorldObj().getBlock(x, y, z); - if(block != null && block.isReplaceableOreGen(supertile.getWorldObj(), x, y, z, source)) + Block block = supertile.getWorld().getBlock(x, y, z); + if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, source)) possibleCoords.add(new ChunkCoordinates(x, y, z)); } if(possibleCoords.isEmpty()) return null; - return possibleCoords.get(supertile.getWorldObj().rand.nextInt(possibleCoords.size())); + return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size())); } public boolean canOperate() { 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 0b6a21f0e..eca3772c3 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 @@ -24,7 +24,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public boolean canOperate() { - return supertile.getWorldObj().provider.isHellWorld; + return supertile.getWorld().provider.isHellWorld; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index b9f2a3fde..5e6438cc4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -31,11 +31,11 @@ public class SubTilePollidisiac extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorldObj().isRemote) { + if(!supertile.getWorld().isRemote) { int manaCost = 12; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); - List animals = supertile.getWorldObj().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + List animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); for(EntityAnimal animal : animals) { if(mana < manaCost) break; @@ -56,7 +56,7 @@ public class SubTilePollidisiac extends SubTileFunctional { ReflectionHelper.setPrivateValue(EntityAnimal.class, animal, 1200, LibObfuscation.IN_LOVE); animal.setTarget(null); - supertile.getWorldObj().setEntityState(animal, (byte)18); + supertile.getWorld().setEntityState(animal, (byte)18); } } } 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 fb71bb954..c891d3472 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 @@ -76,7 +76,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { int y = supertile.yCoord; int z = supertile.zCoord; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); for(EntityItem item : items) { if(item.age < 60 || item.isDead) continue; @@ -91,9 +91,9 @@ public class SubTileRannuncarpus extends SubTileFunctional { int xp = x + i; int yp = y + j; int zp = z + l; - Block blockAbove = supertile.getWorldObj().getBlock(xp, yp + 1, zp); + Block blockAbove = supertile.getWorld().getBlock(xp, yp + 1, zp); - if(filter.equals(supertile.getWorldObj(), xp, yp, zp) && (blockAbove.isAir(supertile.getWorldObj(), xp, yp + 1, zp) || blockAbove.isReplaceable(supertile.getWorldObj(), xp, yp + 1, zp))) + if(filter.equals(supertile.getWorld(), xp, yp, zp) && (blockAbove.isAir(supertile.getWorld(), xp, yp + 1, zp) || blockAbove.isReplaceable(supertile.getWorld(), xp, yp + 1, zp))) validPositions.add(new ChunkCoordinates(xp, yp + 1, zp)); } @@ -101,7 +101,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { } - if(!validPositions.isEmpty() && !supertile.getWorldObj().isRemote) { + if(!validPositions.isEmpty() && !supertile.getWorld().isRemote) { Block blockToPlace = null; if(stackItem instanceof ItemBlock) blockToPlace = ((ItemBlock) stackItem).field_150939_a; @@ -111,23 +111,23 @@ public class SubTileRannuncarpus extends SubTileFunctional { blockToPlace = Blocks.redstone_wire; if(blockToPlace != null) { - ChunkCoordinates coords = validPositions.get(supertile.getWorldObj().rand.nextInt(validPositions.size())); - if(blockToPlace.canPlaceBlockAt(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ)) { - supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); + ChunkCoordinates coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); + if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords.posX, coords.posY, coords.posZ)) { + supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(blockToPlace) + (stack.getItemDamage() << 12)); + supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(blockToPlace) + (stack.getItemDamage() << 12)); validPositions.remove(coords); - TileEntity tile = supertile.getWorldObj().getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = supertile.getWorld().getTileEntity(coords.posX, coords.posY, coords.posZ); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer container = (ISubTileContainer) tile; String subtileName = ItemBlockSpecialFlower.getType(stack); container.setSubTile(subtileName); SubTileEntity subtile = container.getSubTile(); - subtile.onBlockPlacedBy(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ, null, stack); + subtile.onBlockPlacedBy(supertile.getWorld(), coords.posX, coords.posY, coords.posZ, null, stack); } - if(!supertile.getWorldObj().isRemote) { + if(!supertile.getWorld().isRemote) { stack.stackSize--; if(stack.stackSize == 0) item.setDead(); @@ -145,7 +145,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { } public BlockData getUnderlyingBlock() { - return new BlockData(supertile.getWorldObj(), supertile.xCoord, supertile.yCoord - (supertile instanceof IFloatingFlower ? 1 : 2), supertile.zCoord); + return new BlockData(supertile.getWorld(), supertile.xCoord, supertile.yCoord - (supertile instanceof IFloatingFlower ? 1 : 2), supertile.zCoord); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 1840e111b..6a4b0e010 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -50,7 +50,7 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { for(SubTileSolegnolia flower : existingFlowers) { - if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorldObj() != e.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) + if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorld() != e.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) continue; double range = flower.getRange(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 041862061..ffd292e5c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -47,13 +47,13 @@ public class SubTileSpectranthemum extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal == 0 && supertile.getWorldObj().blockExists(bindX, bindY, bindZ)) { + if(redstoneSignal == 0 && supertile.getWorld().blockExists(bindX, bindY, bindZ)) { int x = supertile.xCoord; int y = supertile.yCoord; int z = supertile.zCoord; boolean did = false; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); for(EntityItem item : items) { if(item.age < 60 || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; @@ -71,7 +71,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; spawnExplosionParticles(item); - if(!supertile.getWorldObj().isRemote) { + if(!supertile.getWorld().isRemote) { mana -= cost; did = true; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 282244148..5445929da 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -39,7 +39,7 @@ public class SubTileTangleberrie extends SubTileFunctional { double range = getRange(); AxisAlignedBB boundingBox = new AxisAlignedBB(x1 - range, y1 - range, z1 - range, x1 + range + 1, y1 + range + 1, z1 + range + 1); - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); for(EntityLivingBase entity : entities) { if(entity instanceof EntityPlayer || entity instanceof IBossDisplayData) @@ -53,8 +53,8 @@ public class SubTileTangleberrie extends SubTileFunctional { if(distance > maxDist && distance < range) { MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity()); - if(supertile.getWorldObj().rand.nextInt(3) == 0) - Botania.proxy.sparkleFX(supertile.getWorldObj(), x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3); + if(supertile.getWorld().rand.nextInt(3) == 0) + Botania.proxy.sparkleFX(supertile.getWorld(), x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 8d33342a3..3c5bedfe1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -41,7 +41,7 @@ public class SubTileTigerseye extends SubTileFunctional { boolean shouldAfffect = mana >= cost; - List entities = supertile.getWorldObj().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + RANGE + 1)); for(EntityLiving entity : entities) { List entries = new ArrayList(entity.tasks.taskEntries); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 8a8a3f5e4..e2ad05103 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -82,7 +82,7 @@ public class SubTileVinculotus extends SubTileFunctional { if(event.entity instanceof EntityEnderman) { List possibleFlowers = new ArrayList(); for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorldObj() != event.entity.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) continue; double x = flower.supertile.xCoord + 0.5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index c1ec31099..cddd7d61d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -31,7 +31,7 @@ public class SubTileArcaneRose extends SubTileGenerating { if(mana >= getMaxMana()) return; - List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); for(EntityPlayer player : players) if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 7489df288..987bb38c6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -45,7 +45,7 @@ public class SubTileDandelifeon extends SubTileGenerating { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorldObj().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0) + if(!supertile.getWorld().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0) runSimulation(); } @@ -121,7 +121,7 @@ public class SubTileDandelifeon extends SubTileGenerating { } int getCellGeneration(int x, int y, int z) { - TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); + TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); if(tile instanceof TileCell) return ((TileCell) tile).isSameFlower(supertile) ? ((TileCell) tile).getGeneration() : 0; @@ -163,7 +163,7 @@ public class SubTileDandelifeon extends SubTileGenerating { } void setBlockForGeneration(int x, int y, int z, int gen, int prevGen) { - World world = supertile.getWorldObj(); + World world = supertile.getWorld(); Block blockAt = world.getBlock(x, y, z); TileEntity tile = world.getTileEntity(x, y, z); if(gen == -2) { @@ -174,7 +174,7 @@ public class SubTileDandelifeon extends SubTileGenerating { if(gen < 0 || gen > MAX_GENERATIONS) world.setBlockToAir(x, y, z); else ((TileCell) tile).setGeneration(supertile, gen); - } else if(gen >= 0 && blockAt.isAir(supertile.getWorldObj(), x, y, z)) { + } else if(gen >= 0 && blockAt.isAir(supertile.getWorld(), x, y, z)) { world.setBlock(x, y, z, ModBlocks.cellBlock); tile = world.getTileEntity(x, y, z); ((TileCell) tile).setGeneration(supertile, gen); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index e0437b97a..d53c11a76 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -43,7 +43,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { super.onUpdate(); if(isPrime() && (!savedPosition || primePositionX != supertile.xCoord || primePositionY != supertile.yCoord || primePositionZ != supertile.zCoord)) - supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + supertile.getWorld().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); } public void setPrimusPosition() { @@ -64,8 +64,8 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorldObj().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorldObj().isRaining() || supertile.getWorldObj().isThundering()); - return supertile.getWorldObj().isDaytime() && !rain && supertile.getWorldObj().canBlockSeeTheSky(supertile.xCoord, supertile.yCoord + 1, supertile.zCoord); + boolean rain = supertile.getWorld().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeTheSky(supertile.xCoord, supertile.yCoord + 1, supertile.zCoord); } @Override @@ -76,7 +76,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { public int getSurroundingFlowers() { int flowers = 0; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = supertile.getWorldObj().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); + TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer flower = (ISubTileContainer) tile; if(flower.getSubTile() != null && flower.getSubTile().getClass() == getClass()) { @@ -89,7 +89,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { float m = 0.045F; if(ticksExisted % 10 == 0) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, dir.offsetX * m, dir.offsetY * m, dir.offsetZ * m); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, dir.offsetX * m, dir.offsetY * m, dir.offsetZ * m); } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 00d9be03b..880fdfe82 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -39,10 +39,10 @@ public class SubTileEndoflame extends SubTileGenerating { if(linkedCollector != null) { if(burnTime == 0) { - if(mana < getMaxMana() && !supertile.getWorldObj().isRemote) { + if(mana < getMaxMana() && !supertile.getWorld().isRemote) { boolean didSomething = false; - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { if(item.age >= 59 && !item.isDead) { ItemStack stack = item.getEntityItem(); @@ -54,7 +54,7 @@ public class SubTileEndoflame extends SubTileGenerating { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; stack.stackSize--; - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:endoflame", 0.2F, 1F); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:endoflame", 0.2F, 1F); if(stack.stackSize == 0) item.setDead(); @@ -70,8 +70,8 @@ public class SubTileEndoflame extends SubTileGenerating { sync(); } } else { - if(supertile.getWorldObj().rand.nextInt(8) == 0) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + if(supertile.getWorld().rand.nextInt(8) == 0) + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); burnTime--; } 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 977d756f2..ce0f590c6 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 @@ -30,20 +30,20 @@ public class SubTileEntropinnyum extends SubTileGenerating { super.onUpdate(); if(mana == 0) { - List tnts = supertile.getWorldObj().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityTNTPrimed tnt : tnts) { - if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorldObj().getBlock(MathHelper.floor_double(tnt.posX), MathHelper.floor_double(tnt.posY), MathHelper.floor_double(tnt.posZ)).getMaterial().isLiquid()) { - if(!supertile.getWorldObj().isRemote) { + if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorld().getBlock(MathHelper.floor_double(tnt.posX), MathHelper.floor_double(tnt.posY), MathHelper.floor_double(tnt.posZ)).getMaterial().isLiquid()) { + if(!supertile.getWorld().isRemote) { tnt.setDead(); mana += getMaxMana(); - supertile.getWorldObj().playSoundEffect(tnt.posX, tnt.posY, tnt.posZ, "random.explode", 0.2F, (1F + (supertile.getWorldObj().rand.nextFloat() - supertile.getWorldObj().rand.nextFloat()) * 0.2F) * 0.7F); + supertile.getWorld().playSoundEffect(tnt.posX, tnt.posY, tnt.posZ, "random.explode", 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); sync(); } for(int i = 0; i < 50; i++) Botania.proxy.sparkleFX(tnt.worldObj, tnt.posX + Math.random() * 4 - 2, tnt.posY + Math.random() * 4 - 2, tnt.posZ + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); - supertile.getWorldObj().spawnParticle("hugeexplosion", tnt.posX, tnt.posY, tnt.posZ, 1D, 0D, 0D); + supertile.getWorld().spawnParticle("hugeexplosion", tnt.posX, tnt.posY, tnt.posZ, 1D, 0D, 0D); return; } } 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 a3b4ad73c..66d7525a6 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 @@ -36,14 +36,14 @@ public class SubTileGourmaryllis extends SubTileGenerating { if(cooldown > 0) cooldown--; - if(cooldown == 0 && !supertile.getWorldObj().isRemote) { + if(cooldown == 0 && !supertile.getWorld().isRemote) { mana = Math.min(getMaxMana(), mana + storedMana); storedMana = 0; sync(); } - if(!supertile.getWorldObj().isRemote) { - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + if(!supertile.getWorld().isRemote) { + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { @@ -51,7 +51,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { int val = ((ItemFood) stack.getItem()).func_150905_g(stack); storedMana = val * val * 64; cooldown = val * 10; - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); sync(); } 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 c5a461744..e28053ded 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 @@ -47,12 +47,12 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { if(cooldown > 0) { cooldown--; for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); return; } if(burnTime == 0) { - if(mana < getMaxMana() && !supertile.getWorldObj().isRemote) { + if(mana < getMaxMana() && !supertile.getWorld().isRemote) { List offsets = Arrays.asList(OFFSETS); Collections.shuffle(offsets); @@ -63,17 +63,17 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { }; Material search = getMaterialToSearchFor(); - if(supertile.getWorldObj().getBlock(positions[0], supertile.yCoord, positions[1]).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorldObj().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorldObj().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { + if(supertile.getWorld().getBlock(positions[0], supertile.yCoord, positions[1]).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorld().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { if(search != Material.water) - supertile.getWorldObj().setBlockToAir(positions[0], supertile.yCoord, positions[1]); + supertile.getWorld().setBlockToAir(positions[0], supertile.yCoord, positions[1]); else { int waterAround = 0; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorldObj().getBlock(positions[0] + dir.offsetX, supertile.yCoord, positions[1] + dir.offsetZ).getMaterial() == search) + if(supertile.getWorld().getBlock(positions[0] + dir.offsetX, supertile.yCoord, positions[1] + dir.offsetZ).getMaterial() == search) waterAround++; if(waterAround < 2) - supertile.getWorldObj().setBlockToAir(positions[0], supertile.yCoord, positions[1]); + supertile.getWorld().setBlockToAir(positions[0], supertile.yCoord, positions[1]); } burnTime += getBurnTime(); @@ -84,7 +84,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } } } else { - if(supertile.getWorldObj().rand.nextInt(8) == 0) + if(supertile.getWorld().rand.nextInt(8) == 0) doBurnParticles(); burnTime--; if(burnTime == 0) { @@ -97,7 +97,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { public int getSurroundingFlowers() { int flowers = 0; for(int[] offsetArray : OFFSETS) { - TileEntity tile = supertile.getWorldObj().getTileEntity(supertile.xCoord + offsetArray[0], supertile.yCoord, supertile.zCoord + offsetArray[1]); + TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + offsetArray[0], supertile.yCoord, supertile.zCoord + offsetArray[1]); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer flower = (ISubTileContainer) tile; if(flower.getSubTile() != null && flower.getSubTile().getClass() == getClass()) { @@ -110,7 +110,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { float m = 0.045F; if(ticksExisted % 10 == 0) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, offsetArray[0] * m, 0, offsetArray[1] * m); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, offsetArray[0] * m, 0, offsetArray[1] * m); } } } @@ -119,7 +119,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); } public Material getMaterialToSearchFor() { @@ -131,7 +131,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void playSound() { - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.drink", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.drink", 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { @@ -194,12 +194,12 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { int adj = getSurroundingFlowers(); - return supertile.getWorldObj().rand.nextInt(adj + 1) == 0 && burnTime > 0; + return supertile.getWorld().rand.nextInt(adj + 1) == 0 && burnTime > 0; } @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorldObj().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorldObj().isRaining() || supertile.getWorldObj().isThundering()); + boolean rain = supertile.getWorld().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } 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 cbb2a15e1..fe797faf1 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 @@ -27,22 +27,22 @@ public class SubTileKekimurus extends SubTileGenerating { int mana = 1800; - if(getMaxMana() - this.mana >= mana && !supertile.getWorldObj().isRemote && ticksExisted % 80 == 0) { + if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 80 == 0) { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { int x = supertile.xCoord + i - RANGE; int y = supertile.yCoord + j - RANGE; int z = supertile.zCoord + k - RANGE; - Block block = supertile.getWorldObj().getBlock(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); if(block instanceof BlockCake) { - int meta = supertile.getWorldObj().getBlockMetadata(x, y, z) + 1; + int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; if(meta == 6) - supertile.getWorldObj().setBlockToAir(x, y, z); - else supertile.getWorldObj().setBlockMetadataWithNotify(x, y, z, meta, 1 | 2); + supertile.getWorld().setBlockToAir(x, y, z); + else supertile.getWorld().setBlockMetadataWithNotify(x, y, z, meta, 1 | 2); - supertile.getWorldObj().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 1F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 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 0b7a66f58..9213d3e6b 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 @@ -53,7 +53,7 @@ public class SubTileMunchdew extends SubTileGenerating { int manaPerLeaf = 160; eatLeaves : { - if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorldObj().isRemote && ticksExisted % 4 == 0) { + if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) { List coords = new ArrayList(); int x = supertile.xCoord; int y = supertile.yCoord; @@ -65,11 +65,11 @@ public class SubTileMunchdew extends SubTileGenerating { int xp = x + i; int yp = y + j; int zp = z + k; - Block block = supertile.getWorldObj().getBlock(xp, yp, zp); + Block block = supertile.getWorld().getBlock(xp, yp, zp); if(block.getMaterial() == Material.leaves) { boolean exposed = false; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) - if(supertile.getWorldObj().getBlock(xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ).isAir(supertile.getWorldObj(), xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ)) { + if(supertile.getWorld().getBlock(xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ).isAir(supertile.getWorld(), xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ)) { exposed = true; break; } @@ -84,13 +84,13 @@ public class SubTileMunchdew extends SubTileGenerating { Collections.shuffle(coords); ChunkCoordinates breakCoords = coords.get(0); - Block block = supertile.getWorldObj().getBlock(breakCoords.posX, breakCoords.posY, breakCoords.posZ); - int meta = supertile.getWorldObj().getBlockMetadata(breakCoords.posX, breakCoords.posY, breakCoords.posZ); - supertile.getWorldObj().setBlockToAir(breakCoords.posX, breakCoords.posY, breakCoords.posZ); + Block block = supertile.getWorld().getBlock(breakCoords.posX, breakCoords.posY, breakCoords.posZ); + int meta = supertile.getWorld().getBlockMetadata(breakCoords.posX, breakCoords.posY, breakCoords.posZ); + supertile.getWorld().setBlockToAir(breakCoords.posX, breakCoords.posY, breakCoords.posZ); ticksWithoutEating = 0; ateOnce = true; if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2001, breakCoords.posX, breakCoords.posY, breakCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, breakCoords.posX, breakCoords.posY, breakCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); 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 e55337af6..4c46ce37e 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 @@ -36,7 +36,7 @@ public class SubTileNarslimmus extends SubTileGenerating { super.onUpdate(); if(ticksExisted % 5 == 0) { - List slimes = supertile.getWorldObj().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE, supertile.zCoord + RANGE + 1)); + List slimes = supertile.getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE, supertile.zCoord + RANGE + 1)); for(EntitySlime slime : slimes) { if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && !slime.isDead) { int size = slime.getSlimeSize(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java index 585b982d4..534332263 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java @@ -22,7 +22,7 @@ public class SubTileNightshade extends SubTileDaybloom { @Override public boolean canGeneratePassively() { - return !super.canGeneratePassively() && !supertile.getWorldObj().isDaytime(); + return !super.canGeneratePassively() && !supertile.getWorld().isDaytime(); } @Override 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 07a42d947..f254ee3a5 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 @@ -42,15 +42,15 @@ public class SubTileRafflowsia extends SubTileGenerating { int mana = 2100; - if(getMaxMana() - this.mana >= mana && !supertile.getWorldObj().isRemote && ticksExisted % 40 == 0) { + if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 40 == 0) { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { int x = supertile.xCoord + i - RANGE; int y = supertile.yCoord + j - RANGE; int z = supertile.zCoord + k - RANGE; - Block block = supertile.getWorldObj().getBlock(x, y, z); - TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); + Block block = supertile.getWorld().getBlock(x, y, z); + TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); if(tile instanceof ISubTileContainer) { SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); String name = stile.getUnlocalizedName(); @@ -66,10 +66,10 @@ public class SubTileRafflowsia extends SubTileGenerating { float mod = 1F / lastFlowerTimes; - int meta = supertile.getWorldObj().getBlockMetadata(x, y, z) + 1; - supertile.getWorldObj().setBlockToAir(x, y, z); + int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; + supertile.getWorld().setBlockToAir(x, y, z); - supertile.getWorldObj().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); 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 f4720b661..7e8383f5c 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 @@ -43,9 +43,9 @@ public class SubTileSpectrolus extends SubTileGenerating { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorldObj().isRemote) { + if(!supertile.getWorld().isRemote) { Item wool = Item.getItemFromBlock(Blocks.wool); - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() == wool) { 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 c8eff10fb..f8168ea31 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 @@ -29,7 +29,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.9 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.9 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); } @Override @@ -49,7 +49,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:thermalily", 0.2F, 1F); + supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:thermalily", 0.2F, 1F); } @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 faa92405b..d85f95dea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -178,7 +178,7 @@ public class TileAlfPortal extends TileMod { pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; - Botania.proxy.wispFX(getWorldObj(), xCoord + pos[0], yCoord + pos[1], zCoord + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); + Botania.proxy.wispFX(getWorld(), xCoord + pos[0], yCoord + pos[1], zCoord + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); } public boolean onWanded() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 6f84f3438..192c0a203 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -102,7 +102,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(cooldown > 0) { cooldown--; - Botania.proxy.wispFX(getWorldObj(), xCoord + Math.random(), yCoord + 0.8, zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); + Botania.proxy.wispFX(getWorld(), xCoord + Math.random(), yCoord + 0.8, zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); } int newSignal = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index a5a316420..ac9cd95f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -28,7 +28,7 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost { if(expectedMeta == 1) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(getWorldObj(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(getWorld(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index d4b240ed0..a0574202a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -35,7 +35,7 @@ public class TileManaVoid extends TileMod implements IClientManaHandler { public void recieveMana(int mana) { if(mana > 0) for(int i = 0; i < 10; i++) - Botania.proxy.sparkleFX(getWorldObj(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(getWorld(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 611183393..ff20ca4b8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -70,7 +70,7 @@ public final class ManaNetworkHandler implements IManaNetwork { } private synchronized boolean isIn(TileEntity tile, Map> map) { - List list = map.get(tile.getWorldObj()); + List list = map.get(tile.getWorld()); if(list == null) return false; @@ -106,7 +106,7 @@ public final class ManaNetworkHandler implements IManaNetwork { } private synchronized void remove(Map> map, TileEntity tile) { - World world = tile.getWorldObj(); + World world = tile.getWorld(); if(!map.containsKey(world)) return; @@ -120,7 +120,7 @@ public final class ManaNetworkHandler implements IManaNetwork { } private synchronized void add(Map> map, TileEntity tile) { - World world = tile.getWorldObj(); + World world = tile.getWorld(); List tiles; if(!map.containsKey(world)) @@ -129,7 +129,7 @@ public final class ManaNetworkHandler implements IManaNetwork { tiles = map.get(world); if(!tiles.contains(tile)) - tiles.add(new TileSignature(tile, tile.getWorldObj().isRemote)); + tiles.add(new TileSignature(tile, tile.getWorld().isRemote)); } @Override diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index d553eda94..663f20e5e 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -192,7 +192,7 @@ public class InventoryHelper { public static IInventory getInventory(IInventory inventory) { if(inventory instanceof TileEntityChest) { TileEntity te = (TileEntity)inventory; - return getInventory(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord); + return getInventory(te.getWorld(), te.xCoord, te.yCoord, te.zCoord); } return inventory; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 07a5560fb..728acdcec 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -100,7 +100,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public EntityManaBurst(IManaSpreader spreader, boolean fake) { - this(((TileEntity)spreader).getWorldObj()); + this(((TileEntity)spreader).getWorld()); TileEntity tile = (TileEntity) spreader; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index fd84e758a..1b6dda0bd 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -31,7 +31,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern @Override public boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters) { - World world = source.getTile().getWorldObj(); + World world = source.getTile().getWorld(); int x = source.getTile().xCoord, y = source.getTile().yCoord, z = source.getTile().zCoord; boolean output = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size() != 0; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 27d99c709..2c3fd28e1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -160,7 +160,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte if(pool != null) { pool.recieveMana(mana); TileEntity tile = (TileEntity) pool; - tile.getWorldObj().func_147453_f(tile.xCoord, tile.yCoord, tile.zCoord, tile.getWorldObj().getBlock(tile.xCoord, tile.yCoord, tile.zCoord)); + tile.getWorld().func_147453_f(tile.xCoord, tile.yCoord, tile.zCoord, tile.getWorld().getBlock(tile.xCoord, tile.yCoord, tile.zCoord)); } }*/ @@ -168,7 +168,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte ItemNBTHelper.setInt(stack, TAG_POS_X, pool == null ? 0 : pool.xCoord); ItemNBTHelper.setInt(stack, TAG_POS_Y, pool == null ? -1 : pool.yCoord); ItemNBTHelper.setInt(stack, TAG_POS_Z, pool == null ? 0 : pool.zCoord); - ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorldObj().provider.dimensionId); + ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.dimensionId); } public ChunkCoordinates getPoolCoords(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index c8bfde267..d187da6cf 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -89,7 +89,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW @Override public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; - World world = te.getWorldObj(); + World world = te.getWorld(); if(tile.getCurrentMana() >= COST && tile.getElapsedFunctionalTicks() % 200 == 0 && tile.isEnabled()) { doHighlight(world, te.xCoord, te.yCoord, te.zCoord, 18, te.xCoord ^ te.yCoord ^ te.zCoord); tile.recieveMana(-COST); 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 32f3b0ffd..6f0ebf691 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -73,7 +73,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Override public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; - World world = te.getWorldObj(); + World world = te.getWorld(); if(!world.isRemote && tile.getCurrentMana() >= COST && tile.getElapsedFunctionalTicks() % 300 == 0 && tile.isEnabled()) { EntityFlameRing entity = new EntityFlameRing(world); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index fd694ffda..3943c14be 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -98,7 +98,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; - World world = te.getWorldObj(); + World world = te.getWorld(); if(tile.getCurrentMana() >= COST_AVATAR && tile.getElapsedFunctionalTicks() % 3 == 0 && tile.isEnabled()) if(spawnMissile(world, null, te.xCoord + 0.5 + (Math.random() - 0.5 * 0.1), te.yCoord + 2.5 + (Math.random() - 0.5 * 0.1), te.zCoord + (Math.random() - 0.5 * 0.1))) { if(!world.isRemote) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 16357cbe4..5687d2e2d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -138,7 +138,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; - World world = te.getWorldObj(); + World world = te.getWorld(); if(world.isRemote || tile.getCurrentMana() < MANA_COST_AVATAR * 25 || !tile.isEnabled()) return; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 76d54900e..98b6fc407 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -155,7 +155,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onAvatarUpdate(IAvatarTile tile, ItemStack stack) { TileEntity te = (TileEntity) tile; - World world = te.getWorldObj(); + World world = te.getWorld(); if(tile.getCurrentMana() >= COST && tile.isEnabled()) { int range = 5; int rangeY = 3; From 920324b13599a46726239361d00f199f3b9b0d70 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 20:19:29 -0600 Subject: [PATCH 005/935] Much of the API (blockpos and enumfacing, some low hanging fruit). Not done with it yet though. --- .../java/vazkii/botania/api/BotaniaAPI.java | 8 +-- .../botania/api/corporea/CorporeaHelper.java | 15 +++--- .../api/internal/DummyManaNetwork.java | 6 +-- .../api/internal/DummyMethodHandler.java | 3 +- .../api/internal/IInternalMethodHandler.java | 3 +- .../botania/api/internal/IManaBurst.java | 10 ++-- .../botania/api/internal/IManaNetwork.java | 6 +-- .../api/internal/VanillaPacketDispatcher.java | 7 +-- ...tendedWireframeCoordinateListProvider.java | 4 +- .../IWireframeCoordinateListProvider.java | 6 +-- .../botania/api/lexicon/ILexiconable.java | 3 +- .../api/lexicon/multiblock/Multiblock.java | 6 +-- .../multiblock/component/AnyComponent.java | 4 +- .../component/ColorSwitchingComponent.java | 4 +- .../multiblock/component/FlowerComponent.java | 6 +-- .../component/MultiblockComponent.java | 16 +++--- .../botania/api/mana/ILaputaImmobile.java | 3 +- .../vazkii/botania/api/mana/IManaTrigger.java | 3 +- .../botania/api/recipe/RecipePureDaisy.java | 5 +- .../botania/api/subtile/RadiusDescriptor.java | 16 +++--- .../botania/api/subtile/SubTileEntity.java | 20 ++++---- .../api/subtile/SubTileFunctional.java | 45 ++++++++-------- .../api/subtile/SubTileGenerating.java | 51 +++++++++---------- .../botania/api/wand/ICoordBoundItem.java | 4 +- .../vazkii/botania/api/wand/ITileBound.java | 4 +- .../botania/api/wand/IWandBindable.java | 6 ++- .../vazkii/botania/api/wand/IWandHUD.java | 3 +- .../vazkii/botania/api/wand/IWandable.java | 4 +- .../api/wand/IWireframeAABBProvider.java | 3 +- .../botania/api/wiki/SimpleWikiProvider.java | 11 ++-- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/HUDHandler.java | 4 +- .../botania/common/block/BlockAlfPortal.java | 6 ++- .../botania/common/block/BlockAltar.java | 3 +- .../botania/common/block/BlockAvatar.java | 3 +- .../botania/common/block/BlockBifrost.java | 3 +- .../common/block/BlockBifrostPerm.java | 3 +- .../botania/common/block/BlockCell.java | 3 +- .../botania/common/block/BlockCocoon.java | 3 +- .../botania/common/block/BlockDreamwood.java | 3 +- .../common/block/BlockEnchantedSoil.java | 3 +- .../botania/common/block/BlockEnderEye.java | 3 +- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../block/BlockFloatingSpecialFlower.java | 8 +-- .../botania/common/block/BlockForestEye.java | 3 +- .../botania/common/block/BlockGhostRail.java | 3 +- .../botania/common/block/BlockHourglass.java | 10 ++-- .../common/block/BlockIncensePlate.java | 3 +- .../common/block/BlockLightLauncher.java | 3 +- .../botania/common/block/BlockLightRelay.java | 6 ++- .../botania/common/block/BlockLivingrock.java | 3 +- .../botania/common/block/BlockLivingwood.java | 3 +- .../botania/common/block/BlockManaBomb.java | 5 +- .../common/block/BlockModDoubleFlower.java | 3 +- .../botania/common/block/BlockModFlower.java | 3 +- .../botania/common/block/BlockOpenCrate.java | 8 +-- .../common/block/BlockPistonRelay.java | 6 ++- .../botania/common/block/BlockPlatform.java | 6 ++- .../botania/common/block/BlockPylon.java | 3 +- .../botania/common/block/BlockRoot.java | 3 +- .../botania/common/block/BlockSolidVines.java | 3 +- .../common/block/BlockSparkChanger.java | 3 +- .../common/block/BlockSpecialFlower.java | 8 +-- .../botania/common/block/BlockStorage.java | 3 +- .../common/block/BlockTeruTeruBozu.java | 3 +- .../botania/common/block/BlockTinyPlanet.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 3 +- .../block/corporea/BlockCorporeaFunnel.java | 3 +- .../block/corporea/BlockCorporeaIndex.java | 3 +- .../corporea/BlockCorporeaInterceptor.java | 3 +- .../block/corporea/BlockCorporeaRetainer.java | 3 +- .../common/block/decor/Block18Stone.java | 3 +- .../common/block/decor/BlockBlaze.java | 3 +- .../common/block/decor/BlockCustomBrick.java | 3 +- .../common/block/decor/BlockDirtPath.java | 3 +- .../common/block/decor/BlockElfGlass.java | 3 +- .../block/decor/BlockEndStoneBrick.java | 3 +- .../block/decor/BlockFloatingFlower.java | 5 +- .../common/block/decor/BlockManaBeacon.java | 3 +- .../common/block/decor/BlockManaGlass.java | 3 +- .../common/block/decor/BlockModMushroom.java | 3 +- .../common/block/decor/BlockPetalBlock.java | 3 +- .../common/block/decor/BlockPrismarine.java | 3 +- .../common/block/decor/BlockReeds.java | 3 +- .../common/block/decor/BlockSeaLamp.java | 3 +- .../common/block/decor/BlockShimmerrock.java | 3 +- .../block/decor/BlockShimmerwoodPlanks.java | 3 +- .../common/block/decor/BlockShinyFlower.java | 3 +- .../common/block/decor/BlockStarfield.java | 3 +- .../common/block/decor/BlockThatch.java | 3 +- .../common/block/decor/BlockTinyPotato.java | 3 +- .../common/block/decor/BlockUnstable.java | 3 +- .../decor/biomestone/BlockBiomeStone.java | 3 +- .../decor/quartz/BlockSpecialQuartz.java | 3 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 3 +- .../quartz/BlockSpecialQuartzStairs.java | 5 +- .../block/decor/slabs/Block18StoneSlab.java | 3 +- .../decor/slabs/BlockBiomeStoneSlab.java | 3 +- .../block/decor/slabs/BlockDirtPathSlab.java | 3 +- .../block/decor/slabs/BlockEndStoneSlab.java | 3 +- .../decor/slabs/BlockEnderBrickSlab.java | 3 +- .../block/decor/slabs/BlockModSlab.java | 3 +- .../block/decor/slabs/BlockPavementSlab.java | 3 +- .../block/decor/slabs/BlockReedSlab.java | 3 +- .../block/decor/slabs/BlockThatchSlab.java | 3 +- .../slabs/bricks/BlockCustomBrickSlab.java | 3 +- .../slabs/prismarine/BlockPrismarineSlab.java | 3 +- .../decor/stairs/Block18StoneStairs.java | 3 +- .../decor/stairs/BlockBiomeStoneStairs.java | 3 +- .../decor/stairs/BlockEndStoneStairs.java | 3 +- .../decor/stairs/BlockEnderBrickStairs.java | 3 +- .../block/decor/stairs/BlockModStairs.java | 3 +- .../decor/stairs/BlockPavementStairs.java | 3 +- .../block/decor/stairs/BlockReedStairs.java | 3 +- .../block/decor/stairs/BlockThatchStairs.java | 3 +- .../stairs/bricks/BlockCustomBrickStairs.java | 3 +- .../prismarine/BlockPrismarineStairs.java | 3 +- .../block/decor/walls/Block18StoneWall.java | 3 +- .../decor/walls/BlockBiomeStoneWall.java | 3 +- .../block/decor/walls/BlockModWall.java | 3 +- .../decor/walls/BlockPrismarineWall.java | 3 +- .../common/block/dispenser/BehaviourWand.java | 2 +- .../block/mana/BlockAlchemyCatalyst.java | 3 +- .../common/block/mana/BlockBellows.java | 3 +- .../common/block/mana/BlockBrewery.java | 5 +- .../block/mana/BlockConjurationCatalyst.java | 3 +- .../common/block/mana/BlockDistributor.java | 3 +- .../common/block/mana/BlockEnchanter.java | 8 +-- .../common/block/mana/BlockForestDrum.java | 5 +- .../common/block/mana/BlockManaDetector.java | 3 +- .../common/block/mana/BlockManaVoid.java | 3 +- .../botania/common/block/mana/BlockPool.java | 10 ++-- .../botania/common/block/mana/BlockPrism.java | 5 +- .../botania/common/block/mana/BlockPump.java | 3 +- .../common/block/mana/BlockRFGenerator.java | 3 +- .../common/block/mana/BlockRuneAltar.java | 8 +-- .../common/block/mana/BlockSpawnerClaw.java | 3 +- .../common/block/mana/BlockSpreader.java | 10 ++-- .../common/block/mana/BlockTerraPlate.java | 3 +- .../common/block/mana/BlockTurntable.java | 8 +-- .../common/block/string/BlockRedString.java | 3 +- .../functional/SubTileSpectranthemum.java | 8 +-- .../botania/common/block/tile/TileAltar.java | 10 ++-- .../common/block/tile/TileBrewery.java | 2 +- .../common/block/tile/TileEnchanter.java | 6 +-- .../common/block/tile/TileLightRelay.java | 8 +-- .../common/block/tile/TileRuneAltar.java | 6 +-- .../common/block/tile/TileSpecialFlower.java | 12 +++-- .../common/block/tile/TileTerraPlate.java | 2 +- .../block/tile/corporea/TileCorporeaBase.java | 2 +- .../tile/corporea/TileCorporeaRetainer.java | 2 +- .../common/block/tile/mana/TileBellows.java | 2 +- .../block/tile/mana/TileDistributor.java | 2 +- .../common/block/tile/mana/TilePool.java | 2 +- .../common/block/tile/mana/TilePump.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 18 +++---- .../common/block/tile/mana/TileTurntable.java | 2 +- .../block/tile/string/TileRedString.java | 3 +- .../core/handler/InternalMethodHandler.java | 3 +- .../common/entity/EntityManaBurst.java | 25 ++++----- .../common/entity/EntityPoolMinecart.java | 2 +- .../botania/common/item/ItemBlackLotus.java | 2 +- .../common/item/ItemCorporeaSpark.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 2 +- .../botania/common/item/ItemLexicon.java | 2 +- .../botania/common/item/ItemManaMirror.java | 3 +- .../vazkii/botania/common/item/ItemSpark.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../botania/common/item/ItemTwigWand.java | 11 ++-- .../botania/common/item/lens/LensMine.java | 2 +- .../botania/common/item/lens/LensWarp.java | 2 +- .../botania/common/item/material/ItemDye.java | 2 +- .../common/item/relic/ItemFlugelEye.java | 3 +- 173 files changed, 491 insertions(+), 355 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 522308fa6..d64281c28 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -86,16 +86,16 @@ public final class BotaniaAPI { public static Set looniumBlacklist = new LinkedHashSet(); public static Set paintableBlocks = new LinkedHashSet(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", 18, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); + public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", 5, new int[] { 1, 2, 2, 1 }, 18); + public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18); public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 4bebf6ebc..e60f7f987 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -22,9 +22,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; public final class CorporeaHelper { @@ -237,15 +238,15 @@ public final class CorporeaHelper { return null; TileEntity tile = (TileEntity) inv; - return getSparkForBlock(tile.getWorld(), tile.xCoord, tile.yCoord, tile.zCoord); + return getSparkForBlock(tile.getWorld(), tile.getPos()); } /** * Gets the spark attached to the block in the coords passed in. Note that the coords passed * in are for the block that the spark will be on, not the coords of the spark itself. */ - public static ICorporeaSpark getSparkForBlock(World world, int x, int y, int z) { - List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1)); + public static ICorporeaSpark getSparkForBlock(World world, BlockPos pos) { + List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1))); return sparks.isEmpty() ? null : sparks.get(0); } @@ -253,15 +254,15 @@ public final class CorporeaHelper { * Gets if the block in the coords passed in has a spark attached. Note that the coords passed * in are for the block that the spark will be on, not the coords of the spark itself. */ - public static boolean doesBlockHaveSpark(World world, int x, int y, int z) { - return getSparkForBlock(world, x, y, z) != null; + public static boolean doesBlockHaveSpark(World world, BlockPos pos) { + return getSparkForBlock(world, pos) != null; } /** * Gets if the slot passed in can be extracted from by a spark. */ public static boolean isValidSlot(IInventory inv, int slot) { - return !(inv instanceof ISidedInventory) || arrayHas(((ISidedInventory) inv).getAccessibleSlotsFromSide(ForgeDirection.UP.ordinal()), slot) && ((ISidedInventory) inv).canExtractItem(slot, inv.getStackInSlot(slot), ForgeDirection.UP.ordinal()); + return !(inv instanceof ISidedInventory) || arrayHas(((ISidedInventory) inv).getSlotsForFace(EnumFacing.UP), slot) && ((ISidedInventory) inv).canExtractItem(slot, inv.getStackInSlot(slot), EnumFacing.UP); } /** diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index f74d0cac9..4b8cc5ac2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; @@ -28,12 +28,12 @@ public class DummyManaNetwork implements IManaNetwork { } @Override - public TileEntity getClosestPool(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestPool(BlockPos pos, World world, int limit) { return null; } @Override - public TileEntity getClosestCollector(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestCollector(BlockPos pos, World world, int limit) { return null; } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index d8eb34330..b81b8307f 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -212,7 +213,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public boolean isBotaniaFlower(World world, int x, int y, int z) { + public boolean isBotaniaFlower(World world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 54b000f40..94222cd1a 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -20,6 +20,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -118,7 +119,7 @@ public interface IInternalMethodHandler { public long getWorldElapsedTicks(); - public boolean isBotaniaFlower(World world, int x, int y, int z); + public boolean isBotaniaFlower(World world, BlockPos pos); public void sendBaubleUpdatePacket(EntityPlayer player, int slot); diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 945aa9916..479e0109d 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.UUID; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. @@ -48,17 +48,17 @@ public interface IManaBurst { public void setGravity(float gravity); - public ChunkCoordinates getBurstSourceChunkCoordinates(); + public BlockPos getBurstSourceBlockPos(); - public void setBurstSourceCoords(int x, int y, int z); + public void setBurstSourceCoords(BlockPos pos); public ItemStack getSourceLens(); public void setSourceLens(ItemStack lens); - public boolean hasAlreadyCollidedAt(int x, int y, int z); + public boolean hasAlreadyCollidedAt(BlockPos pos); - public void setCollidedAt(int x, int y, int z); + public void setCollidedAt(BlockPos pos); public int getTicksExisted(); diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index fc4553e46..f2cb29436 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; @@ -38,7 +38,7 @@ public interface IManaNetwork { * @param limit The maximum distance the closest block can be, if the closest block * is farther away than that, null will be returned instead. */ - public TileEntity getClosestCollector(ChunkCoordinates pos, World world, int limit); + public TileEntity getClosestCollector(BlockPos pos, World world, int limit); /** * Gets the closest Mana Pool in the network to the Chunk Coordinates passed in, @@ -49,7 +49,7 @@ public interface IManaNetwork { * @param limit The maximum distance the closest block can be, if the closest block * is farther away than that, null will be returned instead. */ - public TileEntity getClosestPool(ChunkCoordinates pos, World world, int limit); + public TileEntity getClosestPool(BlockPos pos, World world, int limit); /** * Gets the list of all Mana Collectors (eg. Mana Spreader) in the dimension diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index d62088a53..79d251138 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public final class VanillaPacketDispatcher { @@ -24,13 +25,13 @@ public final class VanillaPacketDispatcher { for(Object player : players) if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; - if(pointDistancePlane(mp.posX, mp.posZ, tile.xCoord + 0.5, tile.zCoord + 0.5) < 64) + if(pointDistancePlane(mp.posX, mp.posZ, tile.getPos().getX() + 0.5, tile.getPos().getZ() + 0.5) < 64) ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); } } - public static void dispatchTEToNearbyPlayers(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if(tile != null) dispatchTEToNearbyPlayers(tile); } diff --git a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java index 7713eaa5b..62cafe0d3 100644 --- a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java @@ -12,7 +12,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * An extension of IWireframeCoordinateListProvider that allows for @@ -23,6 +23,6 @@ public interface IExtendedWireframeCoordinateListProvider extends IWireframeCoor /** * Gets the source wireframe to draw, this one will be drawn thicker. */ - public ChunkCoordinates getSourceWireframe(EntityPlayer player, ItemStack stack); + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 056dec187..ae7a1ba13 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,10 +26,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface IWireframeCoordinateListProvider { /** - * Returns a list of ChunkCoordinates for the wireframes to draw. + * Returns a list of BlockPos for the wireframes to draw. * Can be null. */ @SideOnly(Side.CLIENT) - public List getWireframesToDraw(EntityPlayer player, ItemStack stack); + public List getWireframesToDraw(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java index 5baff9f51..008fbb21c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -23,6 +24,6 @@ public interface ILexiconable { /** * Gets the lexicon entry to open at this location. null works too. */ - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon); + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 4cf34b858..2b956a179 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -17,7 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; /** @@ -52,7 +52,7 @@ public class Multiblock { * coords should be pivoted to the center of the structure. */ public void addComponent(int x, int y, int z, Block block, int meta) { - addComponent(new MultiblockComponent(new ChunkCoordinates(x, y, z), block, meta)); + addComponent(new MultiblockComponent(new BlockPos(x, y, z), block, meta)); } private void changeAxisForNewComponent(int x, int y, int z) { @@ -171,7 +171,7 @@ public class Multiblock { * Adds a single component to the location cache */ private void addComponentToLocationCache(MultiblockComponent comp) { - ChunkCoordinates pos = comp.getRelativePosition(); + BlockPos pos = comp.getRelativePosition(); locationCache.put(Arrays.asList( pos.posX, pos.posY, diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 56d640ca1..9fcdde2ab 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -19,7 +19,7 @@ import net.minecraft.world.World; */ public class AnyComponent extends MultiblockComponent { - public AnyComponent(ChunkCoordinates relPos, Block block, int meta) { + public AnyComponent(BlockPos relPos, Block block, int meta) { super(relPos, block, meta); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 27eb32ae2..e79a8789c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -21,7 +21,7 @@ import vazkii.botania.api.BotaniaAPI; */ public class ColorSwitchingComponent extends MultiblockComponent { - public ColorSwitchingComponent(ChunkCoordinates relPos, Block block) { + public ColorSwitchingComponent(BlockPos relPos, Block block) { super(relPos, block, -1); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 8a4f0ad72..d59a92e56 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -20,13 +20,13 @@ import vazkii.botania.api.BotaniaAPI; */ public class FlowerComponent extends ColorSwitchingComponent { - public FlowerComponent(ChunkCoordinates relPos, Block block) { + public FlowerComponent(BlockPos relPos, Block block) { super(relPos, block); } @Override public boolean matches(World world, int x, int y, int z) { - return BotaniaAPI.internalHandler.isBotaniaFlower(world, x, y, z); + return BotaniaAPI.internalHandler.isBotaniaFlower(, world, , x); } @Override diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index b375e0ccf..afa6a8a19 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -13,7 +13,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,25 +24,25 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public class MultiblockComponent { - public ChunkCoordinates relPos; + public BlockPos relPos; public final Block block; public final int meta; public final TileEntity tileEntity; public boolean doFancyRender; - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta) { + public MultiblockComponent(BlockPos relPos, Block block, int meta) { this(relPos, block, meta, null); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender) { this(relPos, block, meta, doFancyRender, null); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, TileEntity tileEntity) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, TileEntity tileEntity) { this(relPos, block, meta, block.hasTileEntity() == (tileEntity != null), tileEntity); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { this.relPos = relPos; this.block = block; this.meta = meta; @@ -50,7 +50,7 @@ public class MultiblockComponent { this.doFancyRender = doFancyRender; } - public ChunkCoordinates getRelativePosition() { + public BlockPos getRelativePosition() { return relPos; } @@ -78,7 +78,7 @@ public class MultiblockComponent { double xn = x * cos - z * sin; double zn = x * sin + z * cos; - relPos = new ChunkCoordinates((int) Math.round(xn), relPos.posY, (int) Math.round(zn)); + relPos = new BlockPos((int) Math.round(xn), relPos.posY, (int) Math.round(zn)); } public MultiblockComponent copy() { diff --git a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java index dfa294513..4658e6a24 100644 --- a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java +++ b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.mana; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -17,6 +18,6 @@ import net.minecraft.world.World; */ public interface ILaputaImmobile { - public boolean canMove(World world, int x, int y, int z); + public boolean canMove(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java index 61aadfcaa..128f6210a 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java +++ b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.mana; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -18,6 +19,6 @@ import vazkii.botania.api.internal.IManaBurst; */ public interface IManaTrigger { - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z); + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 19248e69b..aa9170360 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -16,6 +16,7 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; @@ -78,9 +79,9 @@ public class RecipePureDaisy { * Should only place the block if !world.isRemote, but should return true if it would've placed * it otherwise. You may return false to cancel the normal particles and do your own. */ - public boolean set(World world, int x, int y, int z, SubTileEntity pureDaisy) { + public boolean set(World world, BlockPos pos, SubTileEntity pureDaisy) { if(!world.isRemote) - world.setBlock(x, y, z, output, outputMeta, 1 | 2); + world.setBlockState(pos, output.getStateFromMeta(outputMeta), 1 | 2); // todo 1.8 - should this remain meta? return true; } diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index f16eda6b4..5ff9a45cb 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -11,7 +11,7 @@ package vazkii.botania.api.subtile; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * This object describes the Radius of a SubTileEntity. It can either be @@ -19,13 +19,13 @@ import net.minecraft.util.ChunkCoordinates; */ public class RadiusDescriptor { - final ChunkCoordinates subtileCoords; + final BlockPos subtileCoords; - public RadiusDescriptor(ChunkCoordinates subtileCoords) { + public RadiusDescriptor(BlockPos subtileCoords) { this.subtileCoords = subtileCoords; } - public ChunkCoordinates getSubtileCoords() { + public BlockPos getSubtileCoords() { return subtileCoords; } @@ -45,7 +45,7 @@ public class RadiusDescriptor { final double radius; - public Circle(ChunkCoordinates subtileCoords, double radius) { + public Circle(BlockPos subtileCoords, double radius) { super(subtileCoords); this.radius = radius; } @@ -66,7 +66,7 @@ public class RadiusDescriptor { final AxisAlignedBB aabb; - public Rectangle(ChunkCoordinates subtileCoords, AxisAlignedBB aabb) { + public Rectangle(BlockPos subtileCoords, AxisAlignedBB aabb) { super(subtileCoords); this.aabb = aabb; } @@ -80,8 +80,8 @@ public class RadiusDescriptor { public static class Square extends Rectangle { - public Square(ChunkCoordinates subtileCoords, int expand) { - super(subtileCoords, new AxisAlignedBB(subtileCoords.posX - expand, subtileCoords.posY, subtileCoords.posZ - expand, subtileCoords.posX + 1 + expand, subtileCoords.posY, subtileCoords.posZ + 1 + expand)); + public Square(BlockPos subtileCoords, int expand) { + super(subtileCoords, new AxisAlignedBB(subtileCoords.add(-expand, 0, -expand), subtileCoords.add(expand + 1, 0, expand + 1))); } } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 19aa48f85..014fd0a6b 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -19,8 +19,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -155,7 +155,7 @@ public class SubTileEntity { * when the sub tile is being hovered with a wand of the forest. */ @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return null; } @@ -169,23 +169,23 @@ public class SubTileEntity { } /** - * Gets a ChunkCoordinates instance with the position of this sub tile. + * Gets a BlockPos instance with the position of this sub tile. */ - public ChunkCoordinates toChunkCoordinates() { - return new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); + public BlockPos toBlockPos() { + return supertile.getPos(); } /** - * @see IWandBindable#canSelect(EntityPlayer, ItemStack, int, int, int, int) + * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) */ - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } /** - * @see IWandBindable#bindTo(EntityPlayer, ItemStack, int, int, int, int) + * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) */ - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 54863c864..e9bf6bf0f 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -18,9 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -46,7 +46,7 @@ public class SubTileFunctional extends SubTileEntity { TileEntity linkedPool = null; public int knownMana = -1; - ChunkCoordinates cachedPoolCoordinates = null; + BlockPos cachedPoolCoordinates = null; /** * If set to true, redstoneSignal will be updated every tick. @@ -72,8 +72,8 @@ public class SubTileFunctional extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -93,9 +93,9 @@ public class SubTileFunctional extends SubTileEntity { if(cachedPoolCoordinates != null) { needsNew = false; - if(supertile.getWorld().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) { + if(supertile.getWorld().isBlockLoaded(cachedPoolCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { linkedPool = tileAt; needsNew = false; @@ -104,7 +104,7 @@ public class SubTileFunctional extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.getPos()); if(tileAt != null && tileAt instanceof IManaPool) linkedPool = tileAt; } @@ -113,8 +113,7 @@ public class SubTileFunctional extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllPoolsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedPool = network.getClosestPool(coords, supertile.getWorld(), RANGE); + linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -155,7 +154,7 @@ public class SubTileFunctional extends SubTileEntity { int y = cmp.getInteger(TAG_POOL_Y); int z = cmp.getInteger(TAG_POOL_Z); - cachedPoolCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); + cachedPoolCoordinates = y < 0 ? null : new BlockPos(x, y, z); } @Override @@ -163,13 +162,13 @@ public class SubTileFunctional extends SubTileEntity { cmp.setInteger(TAG_MANA, mana); if(cachedPoolCoordinates != null) { - cmp.setInteger(TAG_POOL_X, cachedPoolCoordinates.posX); - cmp.setInteger(TAG_POOL_Y, cachedPoolCoordinates.posY); - cmp.setInteger(TAG_POOL_Z, cachedPoolCoordinates.posZ); + cmp.setInteger(TAG_POOL_X, cachedPoolCoordinates.getX()); + cmp.setInteger(TAG_POOL_Y, cachedPoolCoordinates.getY()); + cmp.setInteger(TAG_POOL_Z, cachedPoolCoordinates.getZ()); } else { - int x = linkedPool == null ? 0 : linkedPool.xCoord; - int y = linkedPool == null ? -1 : linkedPool.yCoord; - int z = linkedPool == null ? 0 : linkedPool.zCoord; + int x = linkedPool == null ? 0 : linkedPool.getPos().getX(); + int y = linkedPool == null ? -1 : linkedPool.getPos().getY(); + int z = linkedPool == null ? 0 : linkedPool.getPos().getZ(); cmp.setInteger(TAG_POOL_X, x); cmp.setInteger(TAG_POOL_Y, y); @@ -178,25 +177,25 @@ public class SubTileFunctional extends SubTileEntity { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(linkedPool == null) return null; - return new ChunkCoordinates(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + return linkedPool.getPos(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { int range = 10; range *= range; double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(x, y, z); + TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaPool) { linkedPool = tile; return true; @@ -207,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 71bac81f2..50d6692b5 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -23,10 +23,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -54,7 +54,7 @@ public class SubTileGenerating extends SubTileEntity { public int knownMana = -1; public int passiveDecayTicks; - ChunkCoordinates cachedCollectorCoordinates = null; + BlockPos cachedCollectorCoordinates = null; /** * If set to true, redstoneSignal will be updated every tick. @@ -81,8 +81,8 @@ public class SubTileGenerating extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -100,9 +100,9 @@ public class SubTileGenerating extends SubTileEntity { if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { supertile.getWorld().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); - if(supertile.getWorld().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorld(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP)) - supertile.getWorld().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush); - else supertile.getWorld().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.DOWN)) + supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState()); + else supertile.getWorld().setBlockToAir(supertile.getPos()); } } @@ -117,9 +117,9 @@ public class SubTileGenerating extends SubTileEntity { if(cachedCollectorCoordinates != null) { needsNew = false; - if(supertile.getWorld().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) { + if(supertile.getWorld().isBlockLoaded(cachedCollectorCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates); if(tileAt != null && tileAt instanceof IManaCollector && !tileAt.isInvalid()) { linkedCollector = tileAt; needsNew = false; @@ -128,7 +128,7 @@ public class SubTileGenerating extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.getPos()); if(tileAt != null && tileAt instanceof IManaCollector) linkedCollector = tileAt; } @@ -137,8 +137,7 @@ public class SubTileGenerating extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedCollector = network.getClosestCollector(coords, supertile.getWorld(), RANGE); + linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -243,7 +242,7 @@ public class SubTileGenerating extends SubTileEntity { int y = cmp.getInteger(TAG_COLLECTOR_Y); int z = cmp.getInteger(TAG_COLLECTOR_Z); - cachedCollectorCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); + cachedCollectorCoordinates = y < 0 ? null : new BlockPos(x, y, z); } @Override @@ -253,13 +252,13 @@ public class SubTileGenerating extends SubTileEntity { cmp.setInteger(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); if(cachedCollectorCoordinates != null) { - cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.posX); - cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.posY); - cmp.setInteger(TAG_COLLECTOR_Z, cachedCollectorCoordinates.posZ); + cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.getX()); + cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.getY()); + cmp.setInteger(TAG_COLLECTOR_Z, cachedCollectorCoordinates.getZ()); } else { - int x = linkedCollector == null ? 0 : linkedCollector.xCoord; - int y = linkedCollector == null ? -1 : linkedCollector.yCoord; - int z = linkedCollector == null ? 0 : linkedCollector.zCoord; + int x = linkedCollector == null ? 0 : linkedCollector.getPos().getX(); + int y = linkedCollector == null ? -1 : linkedCollector.getPos().getY(); + int z = linkedCollector == null ? 0 : linkedCollector.getPos().getZ(); cmp.setInteger(TAG_COLLECTOR_X, x); cmp.setInteger(TAG_COLLECTOR_Y, y); @@ -268,25 +267,25 @@ public class SubTileGenerating extends SubTileEntity { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(linkedCollector == null) return null; - return new ChunkCoordinates(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + return linkedCollector.getPos(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { int range = 6; range *= range; double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(x, y, z); + TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaCollector) { linkedCollector = tile; return true; @@ -298,7 +297,7 @@ public class SubTileGenerating extends SubTileEntity { public boolean isValidBinding() { - return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; + return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } @Override diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index eb1d42737..4c28dcbf9 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -1,7 +1,7 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -13,6 +13,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface ICoordBoundItem { @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding(ItemStack stack); + public BlockPos getBinding(ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 77c1ffcc7..3b2f42312 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.wand; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,6 +25,6 @@ public interface ITileBound { * Gets where this block is bound to, can return null. */ @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding(); + public BlockPos getBinding(); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index 0c5786c12..ef1e4f7b2 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -12,6 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; /** * A TileEntity that implements this can be bound to another block @@ -23,12 +25,12 @@ public interface IWandBindable extends ITileBound { /** * Return true if the Wand can select this tile. */ - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side); + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side); /** * Call to bind the TileEntity to where the player clicked. Return true to deselect * the TileEntity for another bind or false case the TileEntity should stay selected. */ - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side); + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index a75e44abc..1c054ec0a 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -12,6 +12,7 @@ package vazkii.botania.api.wand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -20,6 +21,6 @@ import net.minecraft.world.World; */ public interface IWandHUD { - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z); + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 52349fa05..2bdef4242 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -12,6 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; /** @@ -23,6 +25,6 @@ public interface IWandable { * Called when the block is used by a wand. Note that the player parameter can be null * if this function is called from a dispenser. */ - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side); + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side); } diff --git a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java index 3b6e807e7..284d9772c 100644 --- a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java +++ b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wand; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -19,6 +20,6 @@ import net.minecraft.world.World; */ public interface IWireframeAABBProvider { - public AxisAlignedBB getWireframeAABB(World world, int x, int y, int z); + public AxisAlignedBB getWireframeAABB(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 9e0fa81ed..63d1d82c0 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -12,6 +12,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -33,18 +34,16 @@ public class SimpleWikiProvider implements IWikiProvider { @Override public String getBlockName(World world, MovingObjectPosition pos) { - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; + BlockPos bPos = pos.getBlockPos(); - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(bPos).getBlock(); if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, x, y, z); + ItemStack stack = block.getPickBlock(pos, world, bPos); if(stack == null || stack.getItem() == null) - stack = new ItemStack(block, 1, world.getBlockMetadata(x, y, z)); + stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos))); if(stack.getItem() == null) return null; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index efec93478..813539a46 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -105,7 +105,7 @@ public final class BoundTileRenderer { AxisAlignedBB axis; if(block instanceof IWireframeAABBProvider) - axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos.posX, pos.posY, pos.posZ); + axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, , pos.posX); else axis = block.getSelectedBoundingBoxFromPool(world, pos.posX, pos.posY, pos.posZ); if(axis == null) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c9386910d..b539a68ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -109,7 +109,7 @@ public final class HUDHandler { if(block instanceof IWandHUD) { profiler.startSection("wandItem"); - ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.blockX, pos.blockY, pos.blockZ); + ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, , pos.blockX); profiler.endSection(); } } @@ -350,7 +350,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.blockX, pos.blockY, pos.blockZ, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, , pos.blockX, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 2e8245885..8c04f72c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -15,6 +15,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -57,12 +59,12 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.alfhomancyIntro; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded(); if(did && player != null) player.addStat(ModAchievements.elfPortalOpen, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index bf29f1ff6..1018cd796 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -269,7 +270,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.apothecary; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index f6eed4756..b1b7a8e58 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -171,7 +172,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.avatar; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 3aa09c559..287aeb9bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -105,7 +106,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 49eb55010..414d40f2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -17,6 +17,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -76,7 +77,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index b538b2372..abd21934c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,7 +43,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dandelifeon; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index bcf82a503..f2ad6fa4f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -19,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -95,7 +96,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.cocoon; } diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 8c570787b..1a7771e49 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockDreamwood; @@ -21,7 +22,7 @@ public class BlockDreamwood extends BlockLivingwood { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 71e597b32..481f150e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -95,7 +96,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.overgrowthSeed; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 5ea86885a..aa31c5b65 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -64,7 +65,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.enderEyeBlock; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index f87f8ac90..a717c5337 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -98,7 +99,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.gardenOfGlass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index efca3ee32..f427fce8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -135,7 +137,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); } @@ -155,7 +157,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @@ -170,7 +172,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index aa03b96cc..74af9aa59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -76,7 +77,7 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.forestEye; } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 984f13ebf..d208c18b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockRailBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -86,7 +87,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.ghostRail; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 99c51a1d5..0524d5ca6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -22,7 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -178,7 +180,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!world.isRemote && !burst.isFake()) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.move = !tile.move; @@ -187,20 +189,20 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.lock = !tile.lock; return false; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.renderHUD(res); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.hourglass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 1a44465f0..b19225371 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -147,7 +148,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.incense; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 9b23841e1..3cf7934f2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -96,7 +97,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.luminizerTransport; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 2d1748753..bd6e87294 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -22,6 +22,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -144,12 +146,12 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return false; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.luminizerTransport; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 017156b2f..25fafd642 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index fbacb7a6d..c19e3db5e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -97,7 +98,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 5154cd727..be0b410b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; @@ -36,7 +37,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake() && !world.isRemote) { world.playAuxSFX(2001, x, y, z, getIdFromBlock(this)); world.setBlockToAir(x, y, z); @@ -47,7 +48,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaBomb; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 529bbf0e6..07f128fa9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -27,6 +27,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -223,7 +224,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 8ebf8141f..ea3424cc3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -24,6 +24,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -124,7 +125,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1c136f456..bc67da973 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -172,18 +174,18 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.openCrate : LexiconData.craftCrate; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(x, y, z); return crate.onWanded(player, stack); } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(x, y, z); if(tile instanceof TileCraftCrate) { TileCraftCrate craft = (TileCraftCrate) tile; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 2e81885c3..643336199 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -28,6 +28,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; @@ -123,7 +125,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { if(player == null) return false; @@ -275,7 +277,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pistonRelay; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 5ae575622..b52b79f4b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -21,6 +21,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -100,13 +102,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.platform : meta == 2 ? null : LexiconData.spectralPlatform; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TilePlatform tile = (TilePlatform) world.getTileEntity(x, y, z); return tile.onWanded(player); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index f0eb91678..814c7390a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -21,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -105,7 +106,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 4a5810bfe..7017bcd59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -49,7 +50,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.gardenOfGlass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 6f452e27a..7c029d75f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -66,7 +67,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.vineBall; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index f8a69fe9f..c62267b3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -173,7 +174,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.sparkChanger; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 58640dd02..98dd5f967 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -29,6 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -230,12 +232,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); } @@ -269,7 +271,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index e0104455f..7bdd62c58 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -87,7 +88,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pool : LexiconData.terrasteel; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index f07afe3df..65126e62e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -19,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -127,7 +128,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.teruTeruBozu; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 6720700cf..a084605b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -49,7 +50,7 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.tinyPlanet; } 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 c41f79dbd..bf03acb59 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -86,7 +87,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaCrystalCube; } 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 0ce2ef19f..eee670582 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -66,7 +67,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaFunnel; } } 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 f2f604cc5..205569783 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -64,7 +65,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaIndex; } 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 b8c18f027..dbe1d24c8 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -75,7 +76,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaInterceptor; } 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 2d804b714..c9452b043 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -70,7 +71,7 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaRetainer; } 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 d5005f0b4..37682ea31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -83,7 +84,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } 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 483e6cb99..be934af38 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -16,6 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,7 +40,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.blazeBlock; } 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 919aa5932..30acb6b76 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -85,7 +86,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta >= 4 ? LexiconData.azulejo : LexiconData.decorativeBlocks; } 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 f15b80c96..2aaae3384 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; @@ -96,7 +97,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dirtPath; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index f4597f2b9..7be671bc8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -54,7 +55,7 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; } 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 6c2e265c1..725bce703 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } 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 2572c1c39..f3ba76fa4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -24,6 +24,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -139,7 +140,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab if(type != null && type != flower.getIslandType()) { if(!world.isRemote) { flower.setIslandType(type); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } if(!player.capabilities.isCreativeMode) @@ -161,7 +162,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; } 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 d8143da52..7d81bdd63 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -105,7 +106,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; } 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 b38cc8e33..154f63572 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -58,7 +59,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pool; } 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 46e51d48e..13f3dff72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -132,7 +133,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.mushrooms; } 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 8a6068d4f..8dcc43686 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -20,6 +20,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -72,7 +73,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } 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 fa696ebf5..48c67f02c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -104,7 +105,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } } \ No newline at end of file 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 8484f6e32..7df9eabcd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -56,7 +57,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } 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 8f868a740..26544a639 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -42,7 +43,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } 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 724abac77..f8eb3f701 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; @@ -56,7 +57,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } 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 d1fdedc25..1a8a91c01 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; @@ -55,7 +56,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index db5a17ca8..74986f074 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -51,7 +52,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; } 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 bbde621f0..39820eae5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -67,7 +68,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.starfield; } 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 2efb25986..16e6815b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -30,7 +31,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } 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 60843202f..9224062a7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -128,7 +129,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.tinyPotato; } } 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 a26bd40f0..637bb355e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -21,6 +21,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -99,7 +100,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; } 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 3cb3c3202..ca1add61b 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 @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -86,7 +87,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } } 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 31e4dce0e..b36c27a8e 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 @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -148,7 +149,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } } 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 7fd954b0e..2456f25fe 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 @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -108,7 +109,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index b2494da45..bd7f49181 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.quartz; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,8 +27,8 @@ public class BlockSpecialQuartzStairs extends BlockModStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return this == ModFluffBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, x, y, z, player, lexicon); + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return this == ModFluffBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, pos, player, lexicon); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java index b5ff215d6..6526bc1a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -40,7 +41,7 @@ public class Block18StoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index aa20c9def..57ec2b292 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -41,7 +42,7 @@ public class BlockBiomeStoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java index a91b5bbab..766b536cc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -37,7 +38,7 @@ public class BlockDirtPathSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dirtPath; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index 4a2a65d9f..8e04c7053 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -39,7 +40,7 @@ public class BlockEndStoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index ce28c608b..0161321fd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -39,7 +40,7 @@ public class BlockEnderBrickSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 948babdb3..10ab14fcc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -73,7 +74,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 9e071232f..e22c09114 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -40,7 +41,7 @@ public class BlockPavementSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pavement; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 23c955d44..bf821d25c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -38,7 +39,7 @@ public class BlockReedSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index 228ec633a..0ff31277e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -38,7 +39,7 @@ public class BlockThatchSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index 7c6cde0e1..ac246e112 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -44,7 +45,7 @@ public class BlockCustomBrickSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index b9e385f03..8e4de8496 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -3,6 +3,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -34,7 +35,7 @@ public class BlockPrismarineSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java index 3873be4c1..77fc40da2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -24,7 +25,7 @@ public class Block18StoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index 20ff8e624..c00be8d6d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; @@ -24,7 +25,7 @@ public class BlockBiomeStoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java index a2da6e37b..9a508aba0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockEndStoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java index fdd23147c..1ed7a72b2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockEnderBrickStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 7394b4b66..191ca88f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -28,7 +29,7 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index fd9624717..d30d1f8d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -24,7 +25,7 @@ public class BlockPavementStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pavement; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java index c2c045307..61832d37e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockReedStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java index d55162c51..3e2dc2c36 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockThatchStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java index e49976d2a..ca8f88916 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.stairs.bricks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -19,7 +20,7 @@ public class BlockCustomBrickStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java index 3a823ffd3..18867cc7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.stairs.prismarine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -19,7 +20,7 @@ public class BlockPrismarineStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 64b30f695..832d3cca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,7 +27,7 @@ public class Block18StoneWall extends BlockVariantWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 3f8a3e037..eea518179 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,7 +27,7 @@ public class BlockBiomeStoneWall extends BlockVariantWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 3ef9e4c7c..7f9a34abc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -65,7 +66,7 @@ public class BlockModWall extends BlockWall implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java index 0c0029950..23e2b0629 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -27,7 +28,7 @@ public class BlockPrismarineWall extends BlockModWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index b50b971f7..0d0e9c0ae 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -30,7 +30,7 @@ public class BehaviourWand extends BehaviorDefaultDispenseItem { World world = par1IBlockSource.getWorld(); Block block = world.getBlock(x, y, z); if(block instanceof IWandable) { - ((IWandable) block).onUsedByWand(null, par2ItemStack, world, x, y, z, facing.getOpposite().ordinal()); + ((IWandable) block).onUsedByWand(null, par2ItemStack, world, , x, , y); return par2ItemStack; } 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 0c60b1635..01485c500 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -54,7 +55,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.alchemy; } 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 341061899..6867b6549 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -16,6 +16,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -87,7 +88,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.bellows; } 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 1c83b153c..d52a52859 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -23,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -156,12 +157,12 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.brewery; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileBrewery) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 818223a53..3c1749dd6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; @@ -24,7 +25,7 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.conjurationCatalyst; } } 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 f5b8aba15..79e7ddc66 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -55,7 +56,7 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.distributor; } 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 2318fc4cb..1325a70ee 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -25,7 +25,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -141,18 +143,18 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileEnchanter) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaEnchanting; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileEnchanter) world.getTileEntity(x, y, z)).renderHUD(mc, res); } 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 36b394ba1..5648a0d10 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -26,6 +26,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -107,7 +108,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; @@ -169,7 +170,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); switch(meta) { 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 2487ce7b4..5dcaea36a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -78,7 +79,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaDetector; } 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 622375863..808b950c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -51,7 +52,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaVoid; } 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 b44106997..fbe604d4f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -27,6 +27,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -116,7 +118,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, if(par5Entity instanceof EntityItem) { TilePool tile = (TilePool) par1World.getTileEntity(par2, par3, par4); if(tile.collideEntityItem((EntityItem) par5Entity)) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, par2, par3, par4); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, , par2); } } @@ -171,18 +173,18 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TilePool) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TilePool) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pool; } 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 0748d9321..195172129 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -177,14 +178,14 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(x, y, z); if(tile != null && tile instanceof TilePrism) ((TilePrism) tile).onBurstCollision(burst); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prism; } 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 aa4a4c6e6..8af11d76e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -103,7 +104,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.poolCart; } 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 0f401ab9d..642dec0a2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -48,7 +49,7 @@ public class BlockRFGenerator extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rfGenerator; } 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 d5133c48e..c0cf6efc1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -153,18 +155,18 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileRuneAltar) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.runicAltar; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileRuneAltar) world.getTileEntity(x, y, z)).renderHUD(mc, res); } 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 c21a20fb5..c1f0b5859 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -20,6 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -73,7 +74,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.spawnerClaw; } 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 138ed232e..311598c29 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -29,6 +29,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -223,7 +225,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileSpreader) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @@ -234,18 +236,18 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpreader) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.spreader : meta == 1 ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override - public AxisAlignedBB getWireframeAABB(World world, int x, int y, int z) { + public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) { float f = 1F / 16F; return new AxisAlignedBB(x + f, y + f, z + f, x + 1 - f, y + 1 - f, z + 1 - f); } 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 6a157af6d..229fab824 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -74,7 +75,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.terrasteel; } 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 ea88ef91c..30d90be03 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -17,6 +17,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -58,18 +60,18 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileTurntable) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileTurntable) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.turntable; } 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 38616bca8..7ae8b230e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -72,7 +73,7 @@ public abstract class BlockRedString extends BlockModContainer im } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index ffd292e5c..dc9f669e3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,7 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -132,8 +134,8 @@ public class SubTileSpectranthemum extends SubTileFunctional { } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { - boolean bound = super.bindTo(player, wand, x, y, z, side); + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { + boolean bound = super.bindTo(player, wand, pos, side); if(!bound && (x != bindX || y != bindY || z != bindZ) && MathHelper.pointDistanceSpace(x, y, z, supertile.xCoord, supertile.yCoord, supertile.zCoord) <= BIND_RANGE && (x != supertile.xCoord || y != supertile.yCoord || z != supertile.zCoord)) { bindX = x; @@ -149,7 +151,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return Minecraft.getMinecraft().thePlayer.isSneaking() && bindY != -1 ? new ChunkCoordinates(bindX, bindY, bindZ) : super.getBinding(); } 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 935598494..e2c2a5961 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -62,7 +62,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I stack.stackSize--; if(stack.stackSize == 0) item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } @@ -150,7 +150,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public void trySetLastRecipe(EntityPlayer player) { tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public static void tryToSetLastRecipe(EntityPlayer player, IInventory inv, List lastRecipe) { @@ -218,7 +218,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I didChange = collideEntityItem(item) || didChange; if(didChange) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stackAt = getStackInSlot(i); @@ -304,12 +304,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I @Override public void setWater(boolean water) { hasWater = water; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public void setLava(boolean lava) { hasLava = lava; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 5edf99248..37e358206 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -64,7 +64,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { this.recipe = recipe; 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 ddc14b7d1..033bd4eea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -295,7 +295,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override @@ -369,11 +369,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return false; for(int[] pylon : PYLON_LOCATIONS[meta]) - if(world.getBlock(pylon[0] + x, pylon[1] + y, pylon[2] + z) != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pylon[0] + x, pylon[1] + y - 1, pylon[2] + z)) + if(world.getBlock(pylon[0] + x, pylon[1] + y, pylon[2] + z) != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(, world, , pylon[0] + x)) return false; for(int[] flower : FLOWER_LOCATIONS) - if(!BotaniaAPI.internalHandler.isBotaniaFlower(world, flower[0] + x, flower[1] + y, flower[2] + z)) + if(!BotaniaAPI.internalHandler.isBotaniaFlower(, world, , flower[0] + x)) return false; return true; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index f8ebe2eac..822a0e57f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -23,8 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; @@ -135,17 +137,17 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return bindY == -1 ? null : new ChunkCoordinates(bindX, bindY, bindZ); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(player.worldObj.getBlock(x, y, z) != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(x, y, z, xCoord, yCoord, zCoord) > MAX_DIST) return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 192c0a203..471a8eea8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -69,7 +69,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(did) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); return true; } @@ -136,7 +136,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(manaToGet != this.manaToGet) { worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:runeAltarStart", 1F, 1F); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } @@ -154,7 +154,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public void trySetLastRecipe(EntityPlayer player) { TileAltar.tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public boolean hasValidRecipe() { 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 3f3fa1b56..5e45ddbe9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -20,7 +20,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -182,24 +184,24 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(subTile == null) return null; return subTile.getBinding(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.canSelect(player, wand, x, y, z, side); + return subTile.canSelect(player, wand, , x, , y); } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.bindTo(player, wand, x, y, z, side); + return subTile.bindTo(player, wand, , x, , y); } public int getLightValue() { 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 21282014b..ca95a1f50 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -91,7 +91,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); mana = 0; worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index d3af0ac8e..3bf5c9af2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -17,7 +17,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class TileCorporeaBase extends TileSimpleInventory { public ICorporeaSpark getSpark() { - return CorporeaHelper.getSparkForBlock(worldObj, xCoord, yCoord, zCoord); + return CorporeaHelper.getSparkForBlock(worldObj, , xCoord); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 841981fad..aca08e46e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -59,7 +59,7 @@ public class TileCorporeaRetainer extends TileMod { if(!hasPendingRequest()) return; - ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestX, requestY, requestZ); + ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, , requestX); if(spark != null) { IInventory inv = spark.getInventory(); if(inv != null && inv instanceof ICorporeaRequestor) { 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 11dfaa35f..12139ab14 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 @@ -131,7 +131,7 @@ public class TileBellows extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index e0aa3d60f..81f726eb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -56,7 +56,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { for(IManaReceiver pool : validPools) { pool.recieveMana(manaForEach); TileEntity tile = (TileEntity) pool; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , tile.xCoord); } } } 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 8f81a0796..7c70f02e1 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 @@ -324,7 +324,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } if(!worldObj.isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 0f15e6304..dd7cec640 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -93,7 +93,7 @@ public class TilePump extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } 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 5275211bd..529254d0a 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 @@ -24,12 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.*; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -233,7 +229,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiverLastTick != receiver && !worldObj.isRemote) { requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } redstoneLastTick = redstone; @@ -382,7 +378,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, checkForReceiver(); requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } } @@ -591,11 +587,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void markDirty() { checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(receiver == null) return null; @@ -619,12 +615,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(x + 0.5, y + 0.5, z + 0.5); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 23a0b1426..dbe3635cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -73,7 +73,7 @@ public class TileTurntable extends TileMod { if(player.isSneaking()) backwards = !backwards; else speed = speed == 6 ? 1 : speed + 1; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public void renderHUD(Minecraft mc, ScaledResolution res) { 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 2d386a6e1..097cd5b3f 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 @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.wand.ITileBound; @@ -69,7 +70,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return binding; } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 2ec2fbad4..3ab5ad07a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -23,6 +23,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -243,7 +244,7 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public boolean isBotaniaFlower(World world, int x, int y, int z) { + public boolean isBotaniaFlower(World world, BlockPos pos) { Block block = world.getBlock(x, y, z); return block == ModBlocks.flower || block == ModBlocks.shinyFlower || block == ModBlocks.specialFlower; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 728acdcec..03a7f9cad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -27,11 +27,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.*; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; @@ -106,7 +103,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { this.fake = fake; - setBurstSourceCoords(tile.xCoord, tile.yCoord, tile.zCoord); + setBurstSourceCoords(tile.xCoord); setLocationAndAngles(tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, 0, 0); rotationYaw = -(spreader.getRotationX() + 90F); rotationPitch = spreader.getRotationY(); @@ -121,7 +118,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public EntityManaBurst(EntityPlayer player) { this(player.worldObj); - setBurstSourceCoords(0, -1, 0); + setBurstSourceCoords(0); setLocationAndAngles(player.posX, player.posY + player.getEyeHeight(), player.posZ, player.rotationYaw + 180, -player.rotationPitch); posX -= MathHelper.cos((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; @@ -470,7 +467,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); int z = par1nbtTagCompound.getInteger(TAG_SPREADER_Z); - setBurstSourceCoords(x, y, z); + setBurstSourceCoords(x); double lastMotionX = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_X); double lastMotionY = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_Y); @@ -590,7 +587,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { onRecieverImpact((IManaReceiver) tile, tile.xCoord, tile.yCoord, tile.zCoord); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + ((IManaTrigger) block).onBurstCollision(this, worldObj, , movingobjectposition.blockX); boolean ghost = tile instanceof IManaCollisionGhost; dead = !ghost; @@ -605,7 +602,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(lens != null) dead = lens.collideBurst(this, movingobjectposition, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); - if(collided && !hasAlreadyCollidedAt(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ)) + if(collided && !hasAlreadyCollidedAt(movingobjectposition.blockX)) alreadyCollidedAt.add(getCollisionLocString(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ)); if(dead && !isDead) { @@ -637,7 +634,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { tile.recieveMana(mana); if(tile instanceof IThrottledPacket) ((IThrottledPacket) tile).markDispatchable(); - else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, x, y, z); + else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , x); } @Override @@ -748,7 +745,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - public void setBurstSourceCoords(int x, int y, int z) { + public void setBurstSourceCoords(BlockPos pos) { dataWatcher.updateObject(coordsStart, x); dataWatcher.updateObject(coordsStart + 1, y); dataWatcher.updateObject(coordsStart + 2, z); @@ -791,13 +788,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - public boolean hasAlreadyCollidedAt(int x, int y, int z) { + public boolean hasAlreadyCollidedAt(BlockPos pos) { return alreadyCollidedAt.contains(getCollisionLocString(x, y, z)); } @Override - public void setCollidedAt(int x, int y, int z) { - if(!hasAlreadyCollidedAt(x, y, z)) + public void setCollidedAt(BlockPos pos) { + if(!hasAlreadyCollidedAt(x)) alreadyCollidedAt.add(getCollisionLocString(x, y, z)); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1c5c260d8..1189ec70b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -119,7 +119,7 @@ public class EntityPoolMinecart extends EntityMinecart { } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xp_, y, zp_); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xp_); pump.hasCart = true; if(!pump.active) pump.setActive(true); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 69002fd3d..132b01575 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -62,7 +62,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { if(!item.worldObj.isRemote) { pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); } for(int i = 0; i < 50; i++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 2efd3a7e7..a83a92818 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -44,7 +44,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, x, y, z)) { + if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, , x)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index fa7504baf..b30562b0c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -119,7 +119,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(inRange(x, y, z, srcx, srcy, srcz, range, heightscale, pointy)) { Block block = world.getBlock(x, y, z); - if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, x, y, z)) && block.getBlockHardness(world, x, y, z) != -1) { + if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, , x)) && block.getBlockHardness(world, x, y, z) != -1) { int id = Block.getIdFromBlock(block); int meta = world.getBlockMetadata(x, y, z); TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index faaf5dbcd..fe214d36b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -63,7 +63,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, par4, par5, par6, par2EntityPlayer, par1ItemStack); + LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, , par4, par2EntityPlayer, par1ItemStack); if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); Botania.proxy.setLexiconStack(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 2c3fd28e1..95af41cee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -263,7 +264,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { IManaPool pool = getManaPool(stack); return pool == null || pool instanceof DummyPool ? null : getPoolCoords(stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index c7db85b29..ae80aa31c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -46,7 +46,7 @@ public class ItemSpark extends ItemMod implements ICraftAchievement { spark.setPosition(x + 0.5, y + 1.5, z + 0.5); world.spawnEntityInWorld(spark); attach.attachSpark(spark); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 981d009a4..484865d50 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -196,7 +196,7 @@ public class ItemSpawnerMover extends ItemMod { tag.setInteger("y", y); tag.setInteger("z", z); te.readFromNBT(tag); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 0b706a86b..60610b6eb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -25,6 +25,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; @@ -71,12 +72,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) { TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { + if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, , par4, , par5)) { Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); doParticleBeam(par3World, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, , boundTile.posX); setBoundTile(par1ItemStack, 0, -1, 0); } @@ -118,7 +119,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { boolean bindable = tile instanceof IWandBindable; boolean wanded = false; - if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { + if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, , par4, , par5)) { if(boundTile.posX == par4 && boundTile.posY == par5 && boundTile.posZ == par6) setBoundTile(par1ItemStack, 0, -1, 0); else setBoundTile(par1ItemStack, par4, par5, par6); @@ -129,7 +130,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par7); + wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, , par4, , par5); if(wanded && par3World.isRemote) par2EntityPlayer.swingItem(); } @@ -294,7 +295,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { ChunkCoordinates bound = getBoundTile(stack); if(bound.posY != -1) return bound; 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 e1e4e5cb1..6316fe45b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -56,7 +56,7 @@ public class LensMine extends Lens { items.addAll(block.getDrops(world, x, y, z, meta, 0)); - if(!burst.hasAlreadyCollidedAt(x, y, z)) { + if(!burst.hasAlreadyCollidedAt(x)) { if(!burst.isFake() && !entity.worldObj.isRemote) { world.setBlockToAir(x, y, z); if(ConfigHandler.blockBreakParticles) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 34f4d0dd8..23787954d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -33,7 +33,7 @@ public class LensWarp extends Lens { int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); if(worldId == entity.worldObj.provider.dimensionId) { entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - burst.setCollidedAt(x, y, z); + burst.setCollidedAt(x); return false; } } 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 49e5fe629..15261d5e0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -53,7 +53,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { if(meta != dyable.getColor()) { dyable.setColor(meta); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); } } } 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 d6f9e20f6..8c40cf10d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -114,7 +115,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); From d293a7dcc7f52ce4ebfa4b6286fa62bc4b7d10ad Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 Nov 2015 20:22:39 -0600 Subject: [PATCH 006/935] update readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 2fb6af838..553040130 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +1.8 PORT README: +This is williewillus' 1.8(.8) port of Botania! +All licensing and distribution rights are exactly as 1.7.10 Botania +Use at your own risk as bugs may pop up unexpectedly. +I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No. + ![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png) Welcome to the Botania repository. From 4d674da1b7a1c1a165e9fda5914b2da503d2a5cb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 00:28:00 -0600 Subject: [PATCH 007/935] Most of what I can do with API done. --- .../api/internal/DummyMethodHandler.java | 5 ++--- .../api/internal/IInternalMethodHandler.java | 5 ++--- .../multiblock/IMultiblockRenderHook.java | 1 - .../api/lexicon/multiblock/Multiblock.java | 21 ++++++++----------- .../api/subtile/SubTileFunctional.java | 6 +++--- .../api/subtile/SubTileGenerating.java | 8 +++---- .../core/handler/MultiblockBlockAccess.java | 2 +- .../common/block/tile/TileAlfPortal.java | 10 ++++----- .../common/block/tile/TileEnchanter.java | 6 +++--- .../common/block/tile/TileTerraPlate.java | 6 +++--- .../core/handler/InternalMethodHandler.java | 3 ++- .../common/entity/EntityDoppleganger.java | 4 ++-- 12 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index b81b8307f..a37a96e99 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -22,7 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; @@ -203,7 +202,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { // NO-OP } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 94222cd1a..2fbd3604f 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -21,7 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; @@ -93,7 +92,7 @@ public interface IInternalMethodHandler { public IInventory getBaublesInventory(EntityPlayer player); - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side); + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side); @SideOnly(Side.CLIENT) public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res); diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 9d05c40d9..591cd252d 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -14,7 +14,6 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 2b956a179..5fb58cc00 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -32,17 +32,17 @@ public class Multiblock { public int minX, minY, minZ, maxX, maxY, maxZ, offX, offY, offZ; - public HashMap, MultiblockComponent> locationCache = new HashMap, MultiblockComponent>(); + public HashMap locationCache = new HashMap(); /** * Adds a multiblock component to this multiblock. The component's x y z * coords should be pivoted to the center of the structure. */ public void addComponent(MultiblockComponent component) { - if(getComponentForLocation(component.relPos.posX, component.relPos.posY, component.relPos.posZ) != null) + if(getComponentForLocation(component.relPos) != null) throw new IllegalArgumentException("Location in multiblock already occupied"); components.add(component); - changeAxisForNewComponent(component.relPos.posX, component.relPos.posY, component.relPos.posZ); + changeAxisForNewComponent(component.relPos.getX(), component.relPos.getY(), component.relPos.getZ()); calculateCostForNewComponent(component); addComponentToLocationCache(component); } @@ -51,8 +51,8 @@ public class Multiblock { * Constructs and adds a multiblock component to this multiblock. The x y z * coords should be pivoted to the center of the structure. */ - public void addComponent(int x, int y, int z, Block block, int meta) { - addComponent(new MultiblockComponent(new BlockPos(x, y, z), block, meta)); + public void addComponent(BlockPos pos, Block block, int meta) { + addComponent(new MultiblockComponent(pos, block, meta)); } private void changeAxisForNewComponent(int x, int y, int z) { @@ -172,17 +172,14 @@ public class Multiblock { */ private void addComponentToLocationCache(MultiblockComponent comp) { BlockPos pos = comp.getRelativePosition(); - locationCache.put(Arrays.asList( - pos.posX, - pos.posY, - pos.posZ - ), comp); + locationCache.put(pos, comp); } /** * Gets the component for a given location + * @param pos */ - public MultiblockComponent getComponentForLocation(int x, int y, int z) { - return locationCache.get(Arrays.asList(x, y, z)); + public MultiblockComponent getComponentForLocation(BlockPos pos) { + return locationCache.get(pos); } } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index e9bf6bf0f..b86afe895 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -73,7 +73,7 @@ public class SubTileFunctional extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); + int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -82,7 +82,7 @@ public class SubTileFunctional extends SubTileEntity { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.getPos().getX() + 0.3 + Math.random() * 0.5, supertile.getPos().getY() + 0.5 + Math.random() * 0.5, supertile.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } @@ -193,7 +193,7 @@ public class SubTileFunctional extends SubTileEntity { int range = 10; range *= range; - double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); + double dist = pos.distanceSq(supertile.getPos()); if(range >= dist) { TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaPool) { diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 50d6692b5..e36ede16c 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -82,7 +82,7 @@ public class SubTileGenerating extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); + int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -91,7 +91,7 @@ public class SubTileGenerating extends SubTileEntity { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); if(Math.random() > particleChance) - BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.getPos().getX() + 0.3 + Math.random() * 0.5, supertile.getPos().getY() + 0.5 + Math.random() * 0.5, supertile.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } boolean passive = isPassiveFlower(); @@ -99,7 +99,7 @@ public class SubTileGenerating extends SubTileEntity { int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { - supertile.getWorld().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); + supertile.getWorld().playAuxSFX(2001, supertile.getPos(), Block.getIdFromBlock(supertile.getBlockType())); if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.DOWN)) supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState()); else supertile.getWorld().setBlockToAir(supertile.getPos()); @@ -283,7 +283,7 @@ public class SubTileGenerating extends SubTileEntity { int range = 6; range *= range; - double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); + double dist = pos.distanceSq(supertile.getPos()); if(range >= dist) { TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaCollector) { 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 c59ac2505..a5499b254 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -126,7 +126,7 @@ public class MultiblockBlockAccess implements IBlockAccess { * Returns the multiblock component for the coordinates, adjusted based on the anchor */ protected MultiblockComponent getComponent(int x, int y, int z) { - MultiblockComponent comp = multiblock.getComponentForLocation(x - anchorX, y - anchorY, z - anchorZ); + MultiblockComponent comp = multiblock.getComponentForLocation(x - anchorX); return comp; } } 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 d85f95dea..78efa497c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -97,15 +97,15 @@ public class TileAlfPortal extends TileMod { Multiblock mb = new Multiblock(); for(int[] l : LIVINGWOOD_POSITIONS) - mb.addComponent(l[0], l[1] + 1, l[2], ModBlocks.livingwood, 0); + mb.addComponent(, l[0], ModBlocks.livingwood, 0); for(int[] g : GLIMMERING_LIVINGWOOD_POSITIONS) - mb.addComponent(g[0], g[1] + 1, g[2], ModBlocks.livingwood, 5); + mb.addComponent(, g[0], ModBlocks.livingwood, 5); for(int[] p : PYLON_POSITIONS) - mb.addComponent(-p[0], p[1] + 1, -p[2], ModBlocks.pylon, 1); + mb.addComponent(, -p[0], ModBlocks.pylon, 1); for(int[] p : POOL_POSITIONS) - mb.addComponent(-p[0], p[1] + 1, -p[2], ModBlocks.pool, 0); + mb.addComponent(, -p[0], ModBlocks.pool, 0); - mb.addComponent(0, 1, 0, ModBlocks.alfPortal, 0); + mb.addComponent(, 0, ModBlocks.alfPortal, 0); mb.setRenderOffset(0, -1, 0); return mb.makeSet(); 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 033bd4eea..469fb4ab5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -85,15 +85,15 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { Multiblock mb = new Multiblock(); for(int[] o : OBSIDIAN_LOCATIONS) - mb.addComponent(o[0], o[1] + 1, o[2], Blocks.obsidian, 0); + mb.addComponent(, o[0], Blocks.obsidian, 0); for(int[] p : PYLON_LOCATIONS[0]) { - mb.addComponent(p[0], p[1] + 1, p[2], ModBlocks.pylon, 0); + mb.addComponent(, p[0], ModBlocks.pylon, 0); mb.addComponent(new FlowerComponent(new ChunkCoordinates(p[0], p[1], p[2]), ModBlocks.flower)); } for(int[] f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(new ChunkCoordinates(f[0], f[1] + 1, f[2]), ModBlocks.flower)); - mb.addComponent(0, 1, 0, Blocks.lapis_block, 0); + mb.addComponent(, 0, Blocks.lapis_block, 0); return mb.makeSet(); } 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 ca95a1f50..d13fa5c49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -50,11 +50,11 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { Multiblock mb = new Multiblock(); for(int[] l : LAPIS_BLOCKS) - mb.addComponent(l[0], 0, l[1], Blocks.lapis_block, 0); + mb.addComponent(, l[0], Blocks.lapis_block, 0); for(int[] l : LIVINGROCK_BLOCKS) - mb.addComponent(l[0], 0, l[1], ModBlocks.livingrock, 0); + mb.addComponent(, l[0], ModBlocks.livingrock, 0); - mb.addComponent(0, 1, 0, ModBlocks.terraPlate, 0); + mb.addComponent(, 0, ModBlocks.terraPlate, 0); mb.setRenderOffset(0, 1, 0); return mb.makeSet(); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 3ab5ad07a..54de30638 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -234,7 +235,7 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { ItemLokiRing.breakOnAllCursors(player, item, stack, x, y, z, side); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index a59a6b53e..5ed1666a7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -127,13 +127,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Multiblock mb = new Multiblock(); for(int[] p : PYLON_LOCATIONS) - mb.addComponent(p[0], p[1] + 1, p[2], ModBlocks.pylon, 2); + mb.addComponent(, p[0], ModBlocks.pylon, 2); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) mb.addComponent(new BeaconComponent(new ChunkCoordinates(i - 1, 0, j - 1))); - mb.addComponent(0, 1, 0, Blocks.beacon, 0); + mb.addComponent(, 0, Blocks.beacon, 0); mb.setRenderOffset(0, -1, 0); return mb.makeSet(); From 8591551a1baeb48abac02baf0543912ac43b5209 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 00:39:42 -0600 Subject: [PATCH 008/935] Lots of tessellator substitutions, full findreplace from CC to BlockPos. Some low hanging fruit in client --- .../core/handler/BaubleRenderHandler.java | 3 +- .../core/handler/BoundTileRenderer.java | 64 +++++++------- .../handler/ContributorFancinessHandler.java | 10 +-- .../client/core/handler/LightningHandler.java | 36 ++++---- .../core/handler/MultiblockRenderHandler.java | 14 +-- .../core/handler/RedStringRenderer.java | 6 +- .../handler/SubTileRadiusRenderHandler.java | 42 ++++----- .../TooltipAdditionDisplayHandler.java | 6 +- .../client/core/helper/RenderHelper.java | 26 +++--- .../client/core/proxy/ClientProxy.java | 88 +++++++++---------- .../vazkii/botania/client/fx/FXSparkle.java | 12 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 12 +-- .../client/fx/ParticleRenderDispatcher.java | 2 +- .../botania/client/gui/bag/GuiFlowerBag.java | 4 +- .../client/gui/bag/InventoryFlowerBag.java | 37 +++++++- .../gui/crafting/ContainerCraftingHalo.java | 3 +- .../nei/RecipeHandlerElvenTrade.java | 2 +- .../nei/RecipeHandlerPetalApothecary.java | 2 +- .../model/armor/ModelArmorElementium.java | 4 +- .../model/armor/ModelArmorManasteel.java | 4 +- .../model/armor/ModelArmorManaweave.java | 4 +- .../model/armor/ModelArmorTerrasteel.java | 4 +- .../render/block/RenderDoubleFlower.java | 2 +- .../render/block/RenderSpecialFlower.java | 38 ++++---- .../render/entity/RenderBabylonWeapon.java | 4 +- .../render/entity/RenderCorporeaSpark.java | 2 +- .../client/render/entity/RenderSparkBase.java | 2 +- .../render/entity/RenderThornChakram.java | 2 +- .../botania/client/render/item/RenderBow.java | 2 +- .../client/render/item/RenderLens.java | 14 +-- .../render/item/RenderTransparentItem.java | 2 +- .../render/tile/RenderTileAlfPortal.java | 12 +-- .../client/render/tile/RenderTileAltar.java | 14 +-- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileEnchanter.java | 12 +-- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 2 +- .../client/render/tile/RenderTilePool.java | 12 +-- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileStarfield.java | 12 +-- .../render/tile/RenderTileTerraPlate.java | 12 +-- .../render/tile/RenderTileTinyPotato.java | 24 ++--- .../block/subtile/SubTilePureDaisy.java | 6 +- .../functional/SubTileAgricarnation.java | 2 +- .../subtile/functional/SubTileBellethorn.java | 2 +- .../subtile/functional/SubTileBubbell.java | 2 +- .../subtile/functional/SubTileClayconia.java | 12 +-- .../subtile/functional/SubTileDaffomill.java | 2 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../functional/SubTileFallenKanade.java | 2 +- .../functional/SubTileHeiseiDream.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 2 +- .../subtile/functional/SubTileHyacidus.java | 2 +- .../functional/SubTileJadedAmaranthus.java | 2 +- .../subtile/functional/SubTileLoonuim.java | 2 +- .../functional/SubTileMarimorphosis.java | 14 +-- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 12 +-- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 10 +-- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../functional/SubTileSpectranthemum.java | 6 +- .../functional/SubTileTangleberrie.java | 2 +- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 2 +- .../subtile/generating/SubTileArcaneRose.java | 2 +- .../generating/SubTileDandelifeon.java | 2 +- .../subtile/generating/SubTileEndoflame.java | 2 +- .../generating/SubTileEntropinnyum.java | 2 +- .../generating/SubTileGourmaryllis.java | 2 +- .../generating/SubTileHydroangeas.java | 2 +- .../subtile/generating/SubTileKekimurus.java | 2 +- .../subtile/generating/SubTileMunchdew.java | 10 +-- .../subtile/generating/SubTileNarslimmus.java | 2 +- .../subtile/generating/SubTileRafflowsia.java | 2 +- .../subtile/generating/SubTileSpectrolus.java | 2 +- .../botania/common/block/tile/TileCell.java | 8 +- .../common/block/tile/TileEnchanter.java | 6 +- .../common/block/tile/TileLightRelay.java | 14 +-- .../common/block/tile/TileSpecialFlower.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../block/tile/string/TileRedString.java | 14 +-- .../tile/string/TileRedStringComparator.java | 4 +- .../tile/string/TileRedStringDispenser.java | 4 +- .../tile/string/TileRedStringFertilizer.java | 8 +- .../tile/string/TileRedStringInterceptor.java | 4 +- .../core/command/CommandSkyblockSpread.java | 4 +- .../core/handler/ManaNetworkHandler.java | 8 +- .../common/entity/EntityDoppleganger.java | 20 ++--- .../common/entity/EntityEnderAirBottle.java | 16 ++-- .../common/entity/EntityManaBurst.java | 18 ++-- .../botania/common/item/ItemCraftingHalo.java | 4 +- .../botania/common/item/ItemFertilizer.java | 8 +- .../botania/common/item/ItemGrassHorn.java | 8 +- .../botania/common/item/ItemGrassSeeds.java | 18 ++-- .../botania/common/item/ItemManaMirror.java | 8 +- .../botania/common/item/ItemTwigWand.java | 14 +-- .../botania/common/item/ItemWorldSeed.java | 4 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 +- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../equipment/bauble/ItemGoldenLaurel.java | 2 +- .../item/equipment/bauble/ItemIcePendant.java | 12 +-- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../equipment/bauble/ItemLavaPendant.java | 2 +- .../item/equipment/bauble/ItemMonocle.java | 2 +- .../bauble/ItemSuperLavaPendant.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 14 +-- .../botania/common/item/lens/LensBounce.java | 4 +- .../common/item/lens/LensExplosive.java | 4 +- .../botania/common/item/lens/LensFire.java | 4 +- .../botania/common/item/lens/LensLight.java | 4 +- .../botania/common/item/lens/LensMagnet.java | 4 +- .../botania/common/item/lens/LensMine.java | 4 +- .../botania/common/item/lens/LensPaint.java | 16 ++-- .../botania/common/item/lens/LensPiston.java | 4 +- .../botania/common/item/lens/LensStorm.java | 4 +- .../common/item/relic/ItemAesirRing.java | 6 +- .../common/item/relic/ItemFlugelEye.java | 8 +- .../common/item/relic/ItemLokiRing.java | 40 ++++----- .../common/item/rod/ItemExchangeRod.java | 20 ++--- .../common/item/rod/ItemTerraformRod.java | 10 +-- .../common/world/SkyblockWorldEvents.java | 6 +- 128 files changed, 553 insertions(+), 524 deletions(-) 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 caf8b3b06..f8561a9a6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -21,7 +21,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -131,7 +130,7 @@ public final class BaubleRenderHandler { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); Color color = new Color(item.getColorFromItemStack(stack, 1)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 813539a46..3a3d26dc1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -49,7 +49,7 @@ public final class BoundTileRenderer { ItemStack stack = player.getCurrentEquippedItem(); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); if(stack != null && stack.getItem() instanceof ICoordBoundItem) { - ChunkCoordinates coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack); + BlockPos coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack); if(coords != null) renderBlockOutlineAt(coords, color); } @@ -69,13 +69,13 @@ public final class BoundTileRenderer { if(stackInSlot != null && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); - List coordsList = provider.getWireframesToDraw(player, stackInSlot); + List coordsList = provider.getWireframesToDraw(player, stackInSlot); if(coordsList != null) - for(ChunkCoordinates coords : coordsList) + for(BlockPos coords : coordsList) renderBlockOutlineAt(coords, color); if(stackInSlot.getItem() instanceof IExtendedWireframeCoordinateListProvider) { - ChunkCoordinates coords = ((IExtendedWireframeCoordinateListProvider) stackInSlot.getItem()).getSourceWireframe(player, stackInSlot); + BlockPos coords = ((IExtendedWireframeCoordinateListProvider) stackInSlot.getItem()).getSourceWireframe(player, stackInSlot); if(coords != null && coords.posY > -1) renderBlockOutlineAt(coords, color, 5F); } @@ -88,11 +88,11 @@ public final class BoundTileRenderer { GL11.glPopMatrix(); } - private void renderBlockOutlineAt(ChunkCoordinates pos, int color) { + private void renderBlockOutlineAt(BlockPos pos, int color) { renderBlockOutlineAt(pos, color, 1F); } - private void renderBlockOutlineAt(ChunkCoordinates pos, int color, float thickness) { + private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { GL11.glPushMatrix(); GL11.glTranslated(pos.posX - RenderManager.renderPosX, pos.posY - RenderManager.renderPosY, pos.posZ - RenderManager.renderPosZ + 1); Color colorRGB = new Color(color); @@ -133,7 +133,7 @@ public final class BoundTileRenderer { } private void renderBlockOutline(AxisAlignedBB aabb) { - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); double ix = aabb.minX; double iy = aabb.minY; @@ -143,41 +143,41 @@ public final class BoundTileRenderer { double az = aabb.maxZ; tessellator.startDrawing(GL11.GL_LINES); - tessellator.addVertex(ix, iy, iz); - tessellator.addVertex(ix, ay, iz); + tessellator.getWorldRenderer().addVertex(ix, iy, iz); + tessellator.getWorldRenderer().addVertex(ix, ay, iz); - tessellator.addVertex(ix, ay, iz); - tessellator.addVertex(ax, ay, iz); + tessellator.getWorldRenderer().addVertex(ix, ay, iz); + tessellator.getWorldRenderer().addVertex(ax, ay, iz); - tessellator.addVertex(ax, ay, iz); - tessellator.addVertex(ax, iy, iz); + tessellator.getWorldRenderer().addVertex(ax, ay, iz); + tessellator.getWorldRenderer().addVertex(ax, iy, iz); - tessellator.addVertex(ax, iy, iz); - tessellator.addVertex(ix, iy, iz); + tessellator.getWorldRenderer().addVertex(ax, iy, iz); + tessellator.getWorldRenderer().addVertex(ix, iy, iz); - tessellator.addVertex(ix, iy, az); - tessellator.addVertex(ix, ay, az); + tessellator.getWorldRenderer().addVertex(ix, iy, az); + tessellator.getWorldRenderer().addVertex(ix, ay, az); - tessellator.addVertex(ix, iy, az); - tessellator.addVertex(ax, iy, az); + tessellator.getWorldRenderer().addVertex(ix, iy, az); + tessellator.getWorldRenderer().addVertex(ax, iy, az); - tessellator.addVertex(ax, iy, az); - tessellator.addVertex(ax, ay, az); + tessellator.getWorldRenderer().addVertex(ax, iy, az); + tessellator.getWorldRenderer().addVertex(ax, ay, az); - tessellator.addVertex(ix, ay, az); - tessellator.addVertex(ax, ay, az); + tessellator.getWorldRenderer().addVertex(ix, ay, az); + tessellator.getWorldRenderer().addVertex(ax, ay, az); - tessellator.addVertex(ix, iy, iz); - tessellator.addVertex(ix, iy, az); + tessellator.getWorldRenderer().addVertex(ix, iy, iz); + tessellator.getWorldRenderer().addVertex(ix, iy, az); - tessellator.addVertex(ix, ay, iz); - tessellator.addVertex(ix, ay, az); + tessellator.getWorldRenderer().addVertex(ix, ay, iz); + tessellator.getWorldRenderer().addVertex(ix, ay, az); - tessellator.addVertex(ax, iy, iz); - tessellator.addVertex(ax, iy, az); + tessellator.getWorldRenderer().addVertex(ax, iy, iz); + tessellator.getWorldRenderer().addVertex(ax, iy, az); - tessellator.addVertex(ax, ay, iz); - tessellator.addVertex(ax, ay, az); + tessellator.getWorldRenderer().addVertex(ax, ay, iz); + tessellator.getWorldRenderer().addVertex(ax, ay, az); tessellator.draw(); } 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 feb278878..a7a83c5ca 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -104,13 +104,13 @@ public final class ContributorFancinessHandler { GL11.glRotatef(r, 0F, 0F, 1F); float s = 0.9F; GL11.glScalef(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glRotatef(-r, 0F, 0F, 1F); GL11.glTranslatef(-t, -0F, 0F); GL11.glScalef(-1F, 1F, 1F); GL11.glTranslatef(t, -0F, 0F); GL11.glRotatef(r, 0F, 0F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); } @@ -130,7 +130,7 @@ public final class ContributorFancinessHandler { GL11.glScalef(0.4F, 0.4F, 0.4F); GL11.glTranslatef(-1.2F, 0.2F, 0.125F); GL11.glRotatef(20F, 1F, 0F, 0F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); } @@ -148,7 +148,7 @@ public final class ContributorFancinessHandler { GL11.glScalef(0.4F, 0.4F, 0.4F); GL11.glTranslatef(1.2F, 0.5F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); } @@ -166,7 +166,7 @@ public final class ContributorFancinessHandler { GL11.glTranslatef(-0.5F, 0.7F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); ShaderHelper.releaseShader(); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 55dc31e33..fa9cba3c4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -28,7 +28,7 @@ import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -77,7 +77,7 @@ public class LightningHandler { GL11.glPushMatrix(); GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); GL11.glDepthMask(false); GL11.glEnable(GL11.GL_BLEND); @@ -86,14 +86,14 @@ public class LightningHandler { ParticleRenderDispatcher.lightningCount = 0; render.bindTexture(outsideResource); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(0xF000F0); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 0, false); tessellator.draw(); render.bindTexture(insideResource); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(0xF000F0); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 1, true); @@ -147,27 +147,27 @@ public class LightningHandler { int color = inner ? bolt.colorInner : bolt.colorOuter; tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); - tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); - tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); + tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); + tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); + tessellator.getWorldRenderer().addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); + tessellator.getWorldRenderer().addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); if(rendersegment.next == null) { Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0); - tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); - tessellator.addVertexWithUV(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z, 0, 1); + tessellator.getWorldRenderer().addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0); + tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); + tessellator.getWorldRenderer().addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); + tessellator.getWorldRenderer().addVertexWithUV(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z, 0, 1); } if(rendersegment.prev == null) { Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0); - tessellator.addVertexWithUV(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z, 0, 1); - tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); + tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); + tessellator.getWorldRenderer().addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0); + tessellator.getWorldRenderer().addVertexWithUV(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z, 0, 1); + tessellator.getWorldRenderer().addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); } } } @@ -177,7 +177,7 @@ public class LightningHandler { public ArrayList segments = new ArrayList(); public Vector3 start; public Vector3 end; - ChunkCoordinates target; + BlockPos target; HashMap splitparents = new HashMap(); public double length; @@ -335,7 +335,7 @@ public class LightningHandler { public LightningBolt(World world, Vector3 sourcevec, TileEntity target, float ticksPerMeter, long seed, int colorOuter, int colorInner) { this(world, sourcevec, getFocalPoint(target), ticksPerMeter, seed, colorOuter, colorInner); - this.target = new ChunkCoordinates(target.xCoord, target.yCoord, target.zCoord); + this.target = new BlockPos(target.xCoord, target.yCoord, target.zCoord); } public void setWrapper(Entity entity) { 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 37c8a3cb4..5cc477999 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -19,7 +19,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -45,7 +45,7 @@ public final class MultiblockRenderHandler { private static RenderBlocks blockRender = RenderBlocks.getInstance(); public static MultiblockSet currentMultiblock; - public static ChunkCoordinates anchor; + public static BlockPos anchor; public static int angle; public static void setMultiblock(MultiblockSet set) { @@ -66,7 +66,7 @@ public final class MultiblockRenderHandler { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { if(currentMultiblock != null && anchor == null && event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer == Minecraft.getMinecraft().thePlayer) { - anchor = new ChunkCoordinates(event.x, event.y, event.z); + anchor = new BlockPos(event.x, event.y, event.z); angle = MathHelper.floor_double(event.entityPlayer.rotationYaw * 4.0 / 360.0 + 0.5) & 3; event.setCanceled(true); } @@ -97,7 +97,7 @@ public final class MultiblockRenderHandler { } private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, int anchorX, int anchorY, int anchorZ) { - ChunkCoordinates pos = comp.getRelativePosition(); + BlockPos pos = comp.getRelativePosition(); int x = pos.posX + anchorX; int y = pos.posY + anchorY; int z = pos.posZ + anchorZ; @@ -116,7 +116,7 @@ public final class MultiblockRenderHandler { GL11.glTranslated(-0.5, -0.5, -0.5); blockAccess.update(null, mb, mb.offX, mb.offY, mb.offZ); for(MultiblockComponent comp : mb.getComponents()) { - ChunkCoordinates pos = comp.getRelativePosition(); + BlockPos pos = comp.getRelativePosition(); doRenderComponent(mb, comp, pos.posX + mb.offX, pos.posY + mb.offY, pos.posZ + mb.offZ, 1); } } @@ -148,9 +148,9 @@ public final class MultiblockRenderHandler { GL11.glColor4f(red, green, blue, alpha); IBlockAccess oldBlockAccess = blockRender.blockAccess; blockRender.blockAccess = blockAccess; - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); blockRender.renderAllFaces = true; - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.disableColor(); try { blockRender.renderBlockByRenderType(block, x, y, z); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 12705600f..9500f78ea 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -68,7 +68,7 @@ public final class RedStringRenderer { private static void renderTile(TileRedString tile) { ForgeDirection dir = ForgeDirection.getOrientation(tile.getBlockMetadata()); - ChunkCoordinates bind = tile.getBinding(); + BlockPos bind = tile.getBinding(); if(bind != null) { GL11.glPushMatrix(); @@ -80,7 +80,7 @@ public final class RedStringRenderer { int stages = (int) (vecOrig.mag() / vecMag.mag()); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); GL11.glLineWidth(1F); tessellator.startDrawing(GL11.GL_LINES); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index e612f8ebf..17ee43b9b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -47,7 +47,7 @@ public final class SubTileRadiusRenderHandler { ItemStack stackHeld = mc.thePlayer.getCurrentEquippedItem(); if(stackHeld != null && stackHeld.getItem() == ModItems.twigWand && ItemTwigWand.getBindMode(stackHeld)) { - ChunkCoordinates coords = ItemTwigWand.getBoundTile(stackHeld); + BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); if(coords.posY != -1) { x = coords.posX; y = coords.posY; @@ -94,29 +94,29 @@ public final class SubTileRadiusRenderHandler { double x = aabb.maxX - aabb.minX - f; double z = aabb.maxZ - aabb.minZ - f; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertex(x, f, f); - tessellator.addVertex(f, f, f); - tessellator.addVertex(f, f, z); - tessellator.addVertex(x, f, z); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().addVertex(x, f, f); + tessellator.getWorldRenderer().addVertex(f, f, f); + tessellator.getWorldRenderer().addVertex(f, f, z); + tessellator.getWorldRenderer().addVertex(x, f, z); tessellator.draw(); x += f; z += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.startDrawingQuads(); - tessellator.addVertex(x, f1, 0); - tessellator.addVertex(0, f1, 0); - tessellator.addVertex(0, f1, z); - tessellator.addVertex(x, f1, z); + tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().addVertex(x, f1, 0); + tessellator.getWorldRenderer().addVertex(0, f1, 0); + tessellator.getWorldRenderer().addVertex(0, f1, z); + tessellator.getWorldRenderer().addVertex(x, f1, z); tessellator.draw(); GL11.glPopMatrix(); } - public void renderCircle(ChunkCoordinates center, double radius) { + public void renderCircle(BlockPos center, double radius) { GL11.glPushMatrix(); double x = center.posX + 0.5; double y = center.posY; @@ -134,30 +134,30 @@ public final class SubTileRadiusRenderHandler { int step = totalAngles / drawAngles; radius -= f; - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); - tessellator.addVertex(0, f, 0); + tessellator.getWorldRenderer().addVertex(0, f, 0); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.addVertex(xp, f, zp); + tessellator.getWorldRenderer().addVertex(xp, f, zp); } - tessellator.addVertex(0, f, 0); + tessellator.getWorldRenderer().addVertex(0, f, 0); tessellator.draw(); radius += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); - tessellator.addVertex(0, f1, 0); + tessellator.getWorldRenderer().addVertex(0, f1, 0); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.addVertex(xp, f1, zp); + tessellator.getWorldRenderer().addVertex(xp, f1, zp); } - tessellator.addVertex(0, f1, 0); + tessellator.getWorldRenderer().addVertex(0, f1, 0); tessellator.draw(); GL11.glPopMatrix(); } 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 77d759dc8..4bb66e47e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -56,7 +56,7 @@ public final class TooltipAdditionDisplayHandler { ItemStack stack = slot.getStack(); if(stack != null) { ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - FontRenderer font = mc.fontRenderer; + FontRenderer font = mc.fontRendererObj; int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth; int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight; @@ -151,13 +151,13 @@ public final class TooltipAdditionDisplayHandler { } } else lexiconLookupTime = 0F; - RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), x, y); + mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, y); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); GL11.glScalef(0.5F, 0.5F, 1F); boolean mac = Minecraft.isRunningOnMac; - mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : (mac ? "Cmd" : "Ctrl")), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); + mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : (mac ? "Cmd" : "Ctrl")), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); GL11.glScalef(2F, 2F, 1F); GL11.glEnable(GL11.GL_DEPTH_TEST); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index ff177cbd1..8c5709642 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -111,7 +111,7 @@ public final class RenderHelper { GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glShadeModel(GL11.GL_SMOOTH); - Tessellator var15 = Tessellator.instance; + Tessellator var15 = Tessellator.getInstance(); var15.startDrawingQuads(); var15.setColorRGBA_F(var8, var9, var10, var7); var15.addVertex(par3, par2, z); @@ -131,17 +131,17 @@ public final class RenderHelper { } public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(par1 + 0, par2 + par6, z, (par3 + 0) * f, (par4 + par6) * f1); - tessellator.addVertexWithUV(par1 + par5, par2 + par6, z, (par3 + par5) * f, (par4 + par6) * f1); - tessellator.addVertexWithUV(par1 + par5, par2 + 0, z, (par3 + par5) * f, (par4 + 0) * f1); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, z, (par3 + 0) * f, (par4 + 0) * f1); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par6, z, (par3 + 0) * f, (par4 + par6) * f1); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par5, par2 + par6, z, (par3 + par5) * f, (par4 + par6) * f1); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par5, par2 + 0, z, (par3 + par5) * f, (par4 + 0) * f1); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, z, (par3 + 0) * f, (par4 + 0) * f1); tessellator.draw(); } public static void renderStar(int color, float xScale, float yScale, float zScale, long seed) { - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); int ticks = ClientTickHandler.ticksInGame % 200; if (ticks >= 100) @@ -174,12 +174,12 @@ public final class RenderHelper { float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; tessellator.setColorRGBA_I(color, (int) (255F * (1F - f2))); - tessellator.addVertex(0, 0, 0); + tessellator.getWorldRenderer().addVertex(0, 0, 0); tessellator.setColorRGBA_F(0F, 0F, 0F, 0); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0, f3, 1F * f4); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.getWorldRenderer().addVertex(0.866D * f4, f3, -0.5F * f4); + tessellator.getWorldRenderer().addVertex(0, f3, 1F * f4); + tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4); tessellator.draw(); } 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 0f39d01b9..479d2444f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -27,7 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; @@ -240,47 +240,47 @@ public class ClientProxy extends CommonProxy { } private void initRenderers() { - LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idSpreader = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idPool = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idBrewery = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idCorporeaIndex = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idPump = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idDoubleFlower = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idCorporeaCrystalCybe = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idTeruTeruBozu = RenderingRegistry.getNextAvailableRenderId(); - LibRenderIDs.idAvatar = RenderingRegistry.getNextAvailableRenderId(); - - RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower); - RenderingRegistry.registerBlockHandler(new RenderAltar()); - RenderingRegistry.registerBlockHandler(specialFlowerRender); - RenderingRegistry.registerBlockHandler(new RenderSpreader()); - RenderingRegistry.registerBlockHandler(new RenderPool()); - RenderingRegistry.registerBlockHandler(new RenderPylon()); - RenderingRegistry.registerBlockHandler(new RenderFloatingFlower()); - RenderingRegistry.registerBlockHandler(new RenderTinyPotato()); - RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw()); - RenderingRegistry.registerBlockHandler(new RenderBrewery()); - RenderingRegistry.registerBlockHandler(new RenderCorporeaIndex()); - RenderingRegistry.registerBlockHandler(new RenderPump()); - RenderingRegistry.registerBlockHandler(new RenderDoubleFlower()); - RenderingRegistry.registerBlockHandler(new RenderCorporeaCrystalCube()); - RenderingRegistry.registerBlockHandler(new RenderIncensePlate()); - RenderingRegistry.registerBlockHandler(new RenderHourglass()); - RenderingRegistry.registerBlockHandler(new RenderCocoon()); - RenderingRegistry.registerBlockHandler(new RenderBellows()); - RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu()); - RenderingRegistry.registerBlockHandler(new RenderAvatar()); +// LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idSpreader = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idPool = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idBrewery = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idCorporeaIndex = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idPump = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idDoubleFlower = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idCorporeaCrystalCybe = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idTeruTeruBozu = RenderingRegistry.getNextAvailableRenderId(); +// LibRenderIDs.idAvatar = RenderingRegistry.getNextAvailableRenderId(); +// +// RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower); +// RenderingRegistry.registerBlockHandler(new RenderAltar()); +// RenderingRegistry.registerBlockHandler(specialFlowerRender); +// RenderingRegistry.registerBlockHandler(new RenderSpreader()); +// RenderingRegistry.registerBlockHandler(new RenderPool()); +// RenderingRegistry.registerBlockHandler(new RenderPylon()); +// RenderingRegistry.registerBlockHandler(new RenderFloatingFlower()); +// RenderingRegistry.registerBlockHandler(new RenderTinyPotato()); +// RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw()); +// RenderingRegistry.registerBlockHandler(new RenderBrewery()); +// RenderingRegistry.registerBlockHandler(new RenderCorporeaIndex()); +// RenderingRegistry.registerBlockHandler(new RenderPump()); +// RenderingRegistry.registerBlockHandler(new RenderDoubleFlower()); +// RenderingRegistry.registerBlockHandler(new RenderCorporeaCrystalCube()); +// RenderingRegistry.registerBlockHandler(new RenderIncensePlate()); +// RenderingRegistry.registerBlockHandler(new RenderHourglass()); +// RenderingRegistry.registerBlockHandler(new RenderCocoon()); +// RenderingRegistry.registerBlockHandler(new RenderBellows()); +// RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu()); +// RenderingRegistry.registerBlockHandler(new RenderAvatar()); IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); @@ -436,11 +436,11 @@ public class ClientProxy extends CommonProxy { int xp = x + i - iradius; int zp = z + j - iradius; if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1)) - mb.addComponent(new AnyComponent(new ChunkCoordinates(xp - x, 1, zp - z), block, 0)); + mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block, 0)); } MultiblockRenderHandler.setMultiblock(mb.makeSet()); - MultiblockRenderHandler.anchor = new ChunkCoordinates(x, y, z); + MultiblockRenderHandler.anchor = new BlockPos(x, y, z); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 61a563631..a57b31711 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -67,13 +67,13 @@ public class FXSparkle extends EntityFX { GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -104,10 +104,10 @@ public class FXSparkle extends EntityFX { tessellator.setBrightness(0x0000f0); tessellator.setColorRGBA_F(particleRed * var16, particleGreen * var16, particleBlue * var16, 1); - tessellator.addVertexWithUV(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12, var9, var11); - tessellator.addVertexWithUV(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12, var9, var10); - tessellator.addVertexWithUV(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12, var8, var10); - tessellator.addVertexWithUV(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12, var8, var11); + tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12, var9, var11); + tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12, var9, var10); + tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12, var8, var10); + tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12, var8, var11); } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index d10323d99..bb54b2682 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -81,7 +81,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -89,7 +89,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GL11.glDisable(GL11.GL_DEPTH_TEST); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); @@ -119,10 +119,10 @@ public class FXWisp extends EntityFX { tessellator.setBrightness(240); tessellator.setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F); - tessellator.addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1); - tessellator.addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1); - tessellator.addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, 1, 0); - tessellator.addVertexWithUV(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10, 0, 0); + tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1); + tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1); + tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, 1, 0); + tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10, 0, 0); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index b711a9dcd..e0cadef6c 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -28,7 +28,7 @@ public final class ParticleRenderDispatcher { // Called from LightningHandler.onRenderWorldLast since that was // already registered. /shrug public static void dispatch() { - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); boolean isLightingEnabled = GL11.glGetBoolean(GL11.GL_LIGHTING); Profiler profiler = Minecraft.getMinecraft().mcProfiler; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index b3cee8997..1bfbdaaa6 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -59,9 +59,9 @@ public class GuiFlowerBag extends GuiContainer { int x = guiLeft + slotf.xDisplayPosition; int y = guiTop + slotf.yDisplayPosition; RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); + mc.getRenderItem().renderItemIntoGUI(stack, x, y); RenderHelper.disableStandardItemLighting(); - mc.fontRenderer.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666); + mc.fontRendererObj.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666); } } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 10fcb06f9..2e0495c7a 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -13,10 +13,14 @@ package vazkii.botania.client.gui.bag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; import vazkii.botania.common.item.ItemFlowerBag; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import java.util.Arrays; + public class InventoryFlowerBag implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; @@ -133,22 +137,47 @@ public class InventoryFlowerBag implements IInventory { } @Override - public boolean hasCustomInventoryName() { + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) {} + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + if (stacks != null) { + Arrays.fill(stacks, null); + } + } + + @Override + public boolean hasCustomName() { return false; } @Override - public void openInventory() { + public IChatComponent getDisplayName() { + return new ChatComponentText(getCommandSenderName()); + } + + @Override + public void openInventory(EntityPlayer player) { // NO-OP } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { // NO-OP } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibItemNames.FLOWER_BAG; } diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index e335f5229..d52ae9a0d 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -15,12 +15,13 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class ContainerCraftingHalo extends ContainerWorkbench { public ContainerCraftingHalo(InventoryPlayer p_i1808_1_, World p_i1808_2_) { - super(p_i1808_1_, p_i1808_2_, 0, 0, 0); + super(p_i1808_1_, p_i1808_2_, BlockPos.ORIGIN); // todo 1.8 verify craftMatrix = new InventoryCraftingHalo(this, 3, 3); diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java index 0e7878cd6..6e8cd6ff8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java @@ -91,7 +91,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80); GL11.glDisable(GL11.GL_BLEND); GuiDraw.changeTexture(TextureMap.locationBlocksTexture); - RenderItem.getInstance().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48); + Minecraft.getMinecraft().getRenderItem().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48); } private static boolean hasElvenKnowledge() { diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java index aa9ee0017..47ac6e62b 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java @@ -121,7 +121,7 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { if(recipe == null) continue; - if(recipe.getOutput().stackTagCompound != null && NEIServerUtils.areStacksSameType(recipe.getOutput(), result) || recipe.getOutput().stackTagCompound == null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result) && recipe.getOutput().getItem() != Items.skull) + if(recipe.getOutput().getTagCompound() != null && NEIServerUtils.areStacksSameType(recipe.getOutput(), result) || recipe.getOutput().getTagCompound() == null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result) && recipe.getOutput().getItem() != Items.skull) arecipes.add(getCachedRecipe(recipe)); } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 5f6e67bfc..3add5ba43 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -249,9 +249,9 @@ public class ModelArmorElementium extends ModelBiped { if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); - if (enumaction == EnumAction.block) + if (enumaction == EnumAction.BLOCK) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if (enumaction == EnumAction.BOW) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index c468620ec..23d57ce0c 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -178,9 +178,9 @@ public class ModelArmorManasteel extends ModelBiped { if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); - if (enumaction == EnumAction.block) + if (enumaction == EnumAction.BLOCK) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if (enumaction == EnumAction.BOW) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 10e143cc5..da3198640 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -179,9 +179,9 @@ public class ModelArmorManaweave extends ModelBiped { if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); - if (enumaction == EnumAction.block) + if (enumaction == EnumAction.BLOCK) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if (enumaction == EnumAction.BOW) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 70d840f3e..b611cfb6c 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -270,9 +270,9 @@ public class ModelArmorTerrasteel extends ModelBiped { if (itemstack != null && player.getItemInUseCount() > 0) { EnumAction enumaction = itemstack.getItemUseAction(); - if (enumaction == EnumAction.block) + if (enumaction == EnumAction.BLOCK) heldItemRight = 3; - else if (enumaction == EnumAction.bow) + else if (enumaction == EnumAction.BOW) aimedBow = true; } } diff --git a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java index 9a772343d..644f63601 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java @@ -29,7 +29,7 @@ public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int p_147774_2_, int p_147774_3_, int p_147774_4_, Block block, int modelId, RenderBlocks renderer) { BlockDoublePlant p_147774_1_ = (BlockDoublePlant) block; - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); tessellator.setBrightness(p_147774_1_.getMixedBrightnessForBlock(world, p_147774_2_, p_147774_3_, p_147774_4_)); tessellator.setColorOpaque_F(1F, 1F, 1F); long j1 = p_147774_2_ * 3129871 ^ p_147774_4_ * 116129781L; diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index a90e9711b..e252d33e9 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -41,7 +41,7 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti // Copied from RenderBlocks public static boolean renderCrossedSquares(IBlockAccess blockAccess, Block par1Block, int par2, int par3, int par4, RenderBlocks render) { - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(blockAccess, par2, par3, par4)); float f = 1.0F; int l = par1Block.colorMultiplier(blockAccess, par2, par3, par4); @@ -80,7 +80,7 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti // Copied from RenderBlocks public static void drawCrossedSquares(IBlockAccess blockAccess, Block par1Block, IIcon icon, int x, int y, int z, double par3, double par5, double par7, float par9, RenderBlocks render) { - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); double d3 = icon.getMinU(); double d4 = icon.getMinV(); @@ -91,22 +91,22 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti double d9 = par3 + 0.5D + d7; double d10 = par7 + 0.5D - d7; double d11 = par7 + 0.5D + d7; - tessellator.addVertexWithUV(d8, par5 + par9, d10, d3, d4); - tessellator.addVertexWithUV(d8, par5 + 0.0D, d10, d3, d6); - tessellator.addVertexWithUV(d9, par5 + 0.0D, d11, d5, d6); - tessellator.addVertexWithUV(d9, par5 + par9, d11, d5, d4); - tessellator.addVertexWithUV(d9, par5 + par9, d11, d3, d4); - tessellator.addVertexWithUV(d9, par5 + 0.0D, d11, d3, d6); - tessellator.addVertexWithUV(d8, par5 + 0.0D, d10, d5, d6); - tessellator.addVertexWithUV(d8, par5 + par9, d10, d5, d4); - tessellator.addVertexWithUV(d8, par5 + par9, d11, d3, d4); - tessellator.addVertexWithUV(d8, par5 + 0.0D, d11, d3, d6); - tessellator.addVertexWithUV(d9, par5 + 0.0D, d10, d5, d6); - tessellator.addVertexWithUV(d9, par5 + par9, d10, d5, d4); - tessellator.addVertexWithUV(d9, par5 + par9, d10, d3, d4); - tessellator.addVertexWithUV(d9, par5 + 0.0D, d10, d3, d6); - tessellator.addVertexWithUV(d8, par5 + 0.0D, d11, d5, d6); - tessellator.addVertexWithUV(d8, par5 + par9, d11, d5, d4); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d10, d3, d4); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d10, d3, d6); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d11, d5, d6); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d11, d5, d4); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d11, d3, d4); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d11, d3, d6); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d10, d5, d6); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d10, d5, d4); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d11, d3, d4); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d11, d3, d6); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d10, d5, d6); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d10, d5, d4); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d10, d3, d4); + tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d10, d3, d6); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d11, d5, d6); + tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d11, d5, d4); } @Override @@ -121,7 +121,7 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti @Override public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, Block block, int meta, RenderBlocks renderBlocks, MultiblockComponent comp, float alpha) { - Tessellator tess = Tessellator.instance; + Tessellator tess = Tessellator.getInstance(); tess.startDrawingQuads(); drawCrossedSquares(world, block, block.getIcon(0, meta), 0, 0, 0, -0.5, -0.5, -0.5, 1F, renderBlocks); tess.draw(); 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 0fc4712ed..79651e84f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -63,7 +63,7 @@ public class RenderBabylonWeapon extends Render { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); GL11.glDisable(GL11.GL_LIGHTING); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); GL11.glDisable(GL11.GL_CULL_FACE); @@ -72,7 +72,7 @@ public class RenderBabylonWeapon extends Render { Minecraft.getMinecraft().renderEngine.bindTexture(babylon); - Tessellator tes = Tessellator.instance; + Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); GL11.glRotatef(-90F, 1F, 0F, 0F); 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 db639df51..4d6f47fee 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -89,7 +89,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GL11.glTranslated(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { GL11.glTranslated(0F, gap * j, 0F); - ItemRenderer.renderItemIn2D(Tessellator.instance, minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); GL11.glTranslated(0F, -gap * j, 0F); } GL11.glTranslated(-gap * i, 0F, 0F); 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 a6fa75208..2f6ac8273 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -46,7 +46,7 @@ public class RenderSparkBase extends RenderEntity { float scale = 0.75F + 0.1F * (float) Math.sin(time / 10); GL11.glScalef(scale, scale, scale); bindEntityTexture(par1Entity); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); GL11.glPushMatrix(); float r = 180.0F - renderManager.playerViewY; 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 e23e8a18a..39f770717 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -38,7 +38,7 @@ public class RenderThornChakram extends Render { GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glScalef(0.5F, 0.5F, 0.5F); bindEntityTexture(p_76986_1_); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); func_77026_a(tessellator, iicon, fire ? 240 : -1); GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java index 776e843aa..d8312b89e 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderBow.java @@ -82,7 +82,7 @@ public class RenderBow implements IItemRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLens.java b/src/main/java/vazkii/botania/client/render/item/RenderLens.java index a3b71c2f4..54375ce09 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLens.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLens.java @@ -79,7 +79,7 @@ public class RenderLens implements IItemRenderer { float scale = 1F / 16F; GL11.glColor4f(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); @@ -109,14 +109,14 @@ public class RenderLens implements IItemRenderer { float par4 = 16; float par5 = 16; float zLevel = 0F; - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); if(shiny) tessellator.setBrightness(240); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, zLevel, icon.getMinU(), icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, zLevel, icon.getMaxU(), icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, zLevel, icon.getMaxU(), icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, zLevel, icon.getMinU(), icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, zLevel, icon.getMinU(), icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, zLevel, icon.getMaxU(), icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, zLevel, icon.getMaxU(), icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, zLevel, icon.getMinU(), icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java index 72b6bc127..a1f02f0d4 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java @@ -67,7 +67,7 @@ public class RenderTransparentItem implements IItemRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); 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 65b77c1e1..81ba71884 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -68,13 +68,13 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(brightness); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 24cca1942..601de93de 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -129,7 +129,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } @@ -168,14 +168,14 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); if(brightness != -1) tessellator.setBrightness(brightness); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } 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 37c9d1074..1ef5abc1b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -79,7 +79,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; 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 4cb1e4f9d..e2812ef9f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -93,7 +93,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 2538210de..2c0f73188 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -108,13 +108,13 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(brightness); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index f0269d566..9809782f8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -68,7 +68,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { float f3 = icon.getMaxV(); GL11.glTranslatef(0.25F, 0.4F, 0.5F); GL11.glScalef(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GL11.glColor3f(1F, 1F, 1F); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 36970017f..4ee7d335a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -76,7 +76,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 0b442f623..28c955325 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -43,7 +43,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float scale = 0.75F; GL11.glScalef(scale, scale, scale); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); GL11.glPushMatrix(); float r = 180.0F - RenderManager.instance.playerViewY; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b0ad21f9d..03f6e8810 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -139,13 +139,13 @@ public class RenderTilePool extends TileEntitySpecialRenderer { } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(brightness); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } 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 691abc521..a496ed1fa 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -93,7 +93,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 97188418e..7986d03a4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -52,7 +52,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index b1991082a..d76b477b0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -96,8 +96,8 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GL11.glTranslatef(-f1, -f3, -f2); f9 = f8 + ActiveRenderInfo.objectY; GL11.glTranslatef(ActiveRenderInfo.objectX * f5 / f9, ActiveRenderInfo.objectZ * f5 / f9, -f2); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); f11 = color.getRed() / 255F; @@ -105,10 +105,10 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { float f13 = color.getBlue() / 255F; tessellator.setColorRGBA_F(f11 * f7, f12 * f7, f13 * f7, 1.0F); - tessellator.addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_); - tessellator.addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_ + 1.0D); - tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_ + 1.0D); - tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_); + tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_); + tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_ + 1.0D); + tessellator.getWorldRenderer().addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_ + 1.0D); + tessellator.getWorldRenderer().addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_); tessellator.draw(); GL11.glPopMatrix(); GL11.glMatrixMode(GL11.GL_MODELVIEW); 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 c87a336df..1d467e9e1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -67,13 +67,13 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); tessellator.setBrightness(brightness); - tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f8b8aa176..f8a1f09c2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -347,15 +347,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glDepthMask(false); GL11.glEnable(GL11.GL_BLEND); OpenGlHelper.glBlendFunc(770, 771, 1, 0); - Tessellator tessellator = Tessellator.instance; + Tessellator tessellator = Tessellator.getInstance(); GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); int i = mc.fontRenderer.getStringWidth(potato.name) / 2; tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.addVertex(-i - 1, -1.0D, 0.0D); - tessellator.addVertex(-i - 1, 8.0D, 0.0D); - tessellator.addVertex(i + 1, 8.0D, 0.0D); - tessellator.addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); @@ -367,13 +367,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glDisable(GL11.GL_TEXTURE_2D); - tessellator.startDrawingQuads(); + tessellator.getWorldRenderer().startDrawingQuads(); i = mc.fontRenderer.getStringWidth(s) / 2; tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.addVertex(-i - 1, -1.0D, 0.0D); - tessellator.addVertex(-i - 1, 8.0D, 0.0D); - tessellator.addVertex(i + 1, 8.0D, 0.0D); - tessellator.addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); + tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); @@ -395,6 +395,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); } } \ No newline at end of file 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 a603711f0..1ffea7187 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -51,7 +51,7 @@ public class SubTilePureDaisy extends SubTileEntity { positionAt = 0; int[] acoords = POSITIONS[positionAt]; - ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord + acoords[0], supertile.yCoord + acoords[1], supertile.zCoord + acoords[2]); + BlockPos coords = new BlockPos(supertile.xCoord + acoords[0], supertile.yCoord + acoords[1], supertile.zCoord + acoords[2]); World world = supertile.getWorld(); if(!world.isAirBlock(coords.posX, coords.posY, coords.posZ)) { Block block = world.getBlock(coords.posX, coords.posY, coords.posZ); @@ -90,7 +90,7 @@ public class SubTilePureDaisy extends SubTileEntity { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), 1); + return new RadiusDescriptor.Square(toBlockPos(), 1); } @Override 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 5ee99fe17..efd540429 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 @@ -87,7 +87,7 @@ public class SubTileAgricarnation extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Square(toBlockPos(), getRange()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index b533a2594..2a199574c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -91,7 +91,7 @@ public class SubTileBellethorn extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Square(toBlockPos(), getRange()); } @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 eeb28f972..1264e1001 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 @@ -98,7 +98,7 @@ public class SubTileBubbell extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), range); + return new RadiusDescriptor.Circle(toBlockPos(), range); } @Override 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 fc7d053fc..62a255d29 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 @@ -17,7 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -36,7 +36,7 @@ public class SubTileClayconia extends SubTileFunctional { if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) { int manaCost = 80; if(mana >= manaCost) { - ChunkCoordinates coords = getCoordsToPut(); + BlockPos coords = getCoordsToPut(); if(coords != null) { supertile.getWorld().setBlockToAir(coords.posX, coords.posY, coords.posZ); if(ConfigHandler.blockBreakParticles) @@ -49,8 +49,8 @@ public class SubTileClayconia extends SubTileFunctional { } } - public ChunkCoordinates getCoordsToPut() { - List possibleCoords = new ArrayList(); + public BlockPos getCoordsToPut() { + List possibleCoords = new ArrayList(); for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) @@ -60,7 +60,7 @@ public class SubTileClayconia extends SubTileFunctional { int z = supertile.zCoord + k; Block block = supertile.getWorld().getBlock(x, y, z); if(block == Block.getBlockFromName("sand")) - possibleCoords.add(new ChunkCoordinates(x, y, z)); + possibleCoords.add(new BlockPos(x, y, z)); } if(possibleCoords.isEmpty()) @@ -70,7 +70,7 @@ public class SubTileClayconia extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 0c3ddf91b..2e8169d0d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -110,7 +110,7 @@ public class SubTileDaffomill extends SubTileFunctional { public RadiusDescriptor getRadius() { AxisAlignedBB aabb = aabbForOrientation(); aabb.minY = supertile.yCoord; - return new RadiusDescriptor.Rectangle(toChunkCoordinates(), aabb); + return new RadiusDescriptor.Rectangle(toBlockPos(), aabb); } @Override 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 e959132ba..e517ef9bd 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 @@ -108,7 +108,7 @@ public class SubTileExoflame extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 8ee26f47d..56383a798 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 @@ -44,7 +44,7 @@ public class SubTileFallenKanade extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index cc8abe791..4a756747c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -92,7 +92,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 13640f273..493bff6ed 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -201,7 +201,7 @@ public class SubTileHopperhock extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Square(toBlockPos(), getRange()); } public int getRange() { 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 d6488c6e5..79c37b2fa 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 @@ -62,7 +62,7 @@ public class SubTileHyacidus extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 315b60e3f..4700f7a8f 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 @@ -69,7 +69,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index f20f1200d..dfae7053b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -73,7 +73,7 @@ public class SubTileLoonuim extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } } 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 b1886c818..918aa955f 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 @@ -17,7 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import vazkii.botania.api.lexicon.LexiconEntry; @@ -54,7 +54,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { return; if(!supertile.getWorld().isRemote && mana >= COST && ticksExisted % 2 == 0) { - ChunkCoordinates coords = getCoordsToPut(); + BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getStoneToPut(coords); if(stack != null) { @@ -71,7 +71,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } } - public ItemStack getStoneToPut(ChunkCoordinates coords) { + public ItemStack getStoneToPut(BlockPos coords) { List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords.posX, coords.posZ))); List values = new ArrayList(); @@ -87,8 +87,8 @@ public class SubTileMarimorphosis extends SubTileFunctional { return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorld().rand.nextInt(values.size()))); } - public ChunkCoordinates getCoordsToPut() { - List possibleCoords = new ArrayList(); + public BlockPos getCoordsToPut() { + List possibleCoords = new ArrayList(); int range = getRange(); int rangeY = getRangeY(); @@ -101,7 +101,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { int z = supertile.zCoord + k; Block block = supertile.getWorld().getBlock(x, y, z); if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, Blocks.stone)) - possibleCoords.add(new ChunkCoordinates(x, y, z)); + possibleCoords.add(new BlockPos(x, y, z)); } if(possibleCoords.isEmpty()) @@ -111,7 +111,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Square(toBlockPos(), getRange()); } public int getRange() { 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 0a35c5de7..4de50fab7 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 @@ -50,7 +50,7 @@ public class SubTileMedumone extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 a0054b7ae..2b070eb90 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 @@ -19,7 +19,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.WeightedRandom; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; @@ -48,7 +48,7 @@ public class SubTileOrechid extends SubTileFunctional { int cost = getCost(); if(!supertile.getWorld().isRemote && mana >= cost && ticksExisted % getDelay() == 0) { - ChunkCoordinates coords = getCoordsToPut(); + BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getOreToPut(); if(stack != null) { @@ -96,8 +96,8 @@ public class SubTileOrechid extends SubTileFunctional { return getOreToPut(); } - public ChunkCoordinates getCoordsToPut() { - List possibleCoords = new ArrayList(); + public BlockPos getCoordsToPut() { + List possibleCoords = new ArrayList(); Block source = getSourceBlock(); for(int i = -RANGE; i < RANGE + 1; i++) @@ -108,7 +108,7 @@ public class SubTileOrechid extends SubTileFunctional { int z = supertile.zCoord + k; Block block = supertile.getWorld().getBlock(x, y, z); if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, source)) - possibleCoords.add(new ChunkCoordinates(x, y, z)); + possibleCoords.add(new BlockPos(x, y, z)); } if(possibleCoords.isEmpty()) @@ -138,7 +138,7 @@ public class SubTileOrechid extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 5e6438cc4..2bfc3b833 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -66,7 +66,7 @@ public class SubTilePollidisiac extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @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 c891d3472..dc803d82b 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 @@ -27,7 +27,7 @@ import net.minecraft.item.ItemReed; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -67,7 +67,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { BlockData filter = getUnderlyingBlock(); boolean scanned = false; - List validPositions = new ArrayList(); + List validPositions = new ArrayList(); int rangePlace = getRange(); int rangePlaceY = getRangeY(); @@ -94,7 +94,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { Block blockAbove = supertile.getWorld().getBlock(xp, yp + 1, zp); if(filter.equals(supertile.getWorld(), xp, yp, zp) && (blockAbove.isAir(supertile.getWorld(), xp, yp + 1, zp) || blockAbove.isReplaceable(supertile.getWorld(), xp, yp + 1, zp))) - validPositions.add(new ChunkCoordinates(xp, yp + 1, zp)); + validPositions.add(new BlockPos(xp, yp + 1, zp)); } scanned = true; @@ -111,7 +111,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { blockToPlace = Blocks.redstone_wire; if(blockToPlace != null) { - ChunkCoordinates coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); + BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords.posX, coords.posY, coords.posZ)) { supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); if(ConfigHandler.blockBreakParticles) @@ -181,7 +181,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Square(toBlockPos(), getRange()); } public int getRange() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 6a4b0e010..5a0976f68 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -77,7 +77,7 @@ public class SubTileSolegnolia extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Circle(toBlockPos(), getRange()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index dc9f669e3..8c02a8420 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; @@ -99,7 +99,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override @@ -152,7 +152,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override @SideOnly(Side.CLIENT) public BlockPos getBinding() { - return Minecraft.getMinecraft().thePlayer.isSneaking() && bindY != -1 ? new ChunkCoordinates(bindX, bindY, bindZ) : super.getBinding(); + return Minecraft.getMinecraft().thePlayer.isSneaking() && bindY != -1 ? new BlockPos(bindX, bindY, bindZ) : super.getBinding(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 5445929da..6570cb256 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -79,7 +79,7 @@ public class SubTileTangleberrie extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), getRange()); + return new RadiusDescriptor.Circle(toBlockPos(), getRange()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 3c5bedfe1..3764229be 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -85,7 +85,7 @@ public class SubTileTigerseye extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index e2ad05103..998866e2a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -47,7 +47,7 @@ public class SubTileVinculotus extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Circle(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index cddd7d61d..351ddb4fc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -42,7 +42,7 @@ public class SubTileArcaneRose extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 987bb38c6..6ab61fc6c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -188,7 +188,7 @@ public class SubTileDandelifeon extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 880fdfe82..4a97648fb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -95,7 +95,7 @@ public class SubTileEndoflame extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 ce0f590c6..3185b9c1b 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 @@ -62,7 +62,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); }; @Override 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 66d7525a6..4ad1ccaa3 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 @@ -76,7 +76,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 e28053ded..b4a482370 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 @@ -140,7 +140,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), 1); + return new RadiusDescriptor.Square(toBlockPos(), 1); } @Override 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 fe797faf1..13fde0474 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 @@ -53,7 +53,7 @@ public class SubTileKekimurus extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 9213d3e6b..d4d84e3e5 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 @@ -19,7 +19,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.LexiconEntry; @@ -54,7 +54,7 @@ public class SubTileMunchdew extends SubTileGenerating { int manaPerLeaf = 160; eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) { - List coords = new ArrayList(); + List coords = new ArrayList(); int x = supertile.xCoord; int y = supertile.yCoord; int z = supertile.zCoord; @@ -75,7 +75,7 @@ public class SubTileMunchdew extends SubTileGenerating { } if(exposed) - coords.add(new ChunkCoordinates(xp, yp, zp)); + coords.add(new BlockPos(xp, yp, zp)); } } @@ -83,7 +83,7 @@ public class SubTileMunchdew extends SubTileGenerating { break eatLeaves; Collections.shuffle(coords); - ChunkCoordinates breakCoords = coords.get(0); + BlockPos breakCoords = coords.get(0); Block block = supertile.getWorld().getBlock(breakCoords.posX, breakCoords.posY, breakCoords.posZ); int meta = supertile.getWorld().getBlockMetadata(breakCoords.posX, breakCoords.posY, breakCoords.posZ); supertile.getWorld().setBlockToAir(breakCoords.posX, breakCoords.posY, breakCoords.posZ); @@ -104,7 +104,7 @@ public class SubTileMunchdew extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 4c46ce37e..b71eb4f29 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 @@ -65,7 +65,7 @@ public class SubTileNarslimmus extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 f254ee3a5..f945df012 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 @@ -114,7 +114,7 @@ public class SubTileRafflowsia extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override 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 7e8383f5c..a008fca01 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 @@ -64,7 +64,7 @@ public class SubTileSpectrolus extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { - return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + return new RadiusDescriptor.Square(toBlockPos(), RANGE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 5e9234dc4..5f5e6d88e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; public class TileCell extends TileMod { @@ -27,8 +27,8 @@ public class TileCell extends TileMod { private int generation; private boolean ticked; - private ChunkCoordinates flowerCoords = new ChunkCoordinates(); - private ChunkCoordinates validCoords = new ChunkCoordinates(); + private BlockPos flowerCoords = new BlockPos(); + private BlockPos validCoords = new BlockPos(); @Override public boolean canUpdate() { @@ -53,7 +53,7 @@ public class TileCell extends TileMod { return matchCoords(validCoords, this) && matchCoords(flowerCoords, flower); } - private boolean matchCoords(ChunkCoordinates coords, TileEntity tile) { + private boolean matchCoords(BlockPos coords, TileEntity tile) { return coords.posX == tile.xCoord && coords.posY == tile.yCoord && coords.posZ == tile.zCoord; } 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 469fb4ab5..882b49a99 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -27,7 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -88,10 +88,10 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { mb.addComponent(, o[0], Blocks.obsidian, 0); for(int[] p : PYLON_LOCATIONS[0]) { mb.addComponent(, p[0], ModBlocks.pylon, 0); - mb.addComponent(new FlowerComponent(new ChunkCoordinates(p[0], p[1], p[2]), ModBlocks.flower)); + mb.addComponent(new FlowerComponent(new BlockPos(p[0], p[1], p[2]), ModBlocks.flower)); } for(int[] f : FLOWER_LOCATIONS) - mb.addComponent(new FlowerComponent(new ChunkCoordinates(f[0], f[1] + 1, f[2]), ModBlocks.flower)); + mb.addComponent(new FlowerComponent(new BlockPos(f[0], f[1] + 1, f[2]), ModBlocks.flower)); mb.addComponent(, 0, Blocks.lapis_block, 0); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 822a0e57f..d6d500749 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -24,7 +24,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -87,7 +87,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { vecTip.add(vecMag); } - ChunkCoordinates endpoint = getEndpoint(); + BlockPos endpoint = getEndpoint(); if(endpoint != null && !worldObj.isRemote) { float range = 0.5F; List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + 1 + range, yCoord + 1 + range, zCoord + 1 + range)); @@ -105,10 +105,10 @@ public class TileLightRelay extends TileMod implements IWandBindable { return block == ModBlocks.lightRelay; } - public ChunkCoordinates getEndpoint() { + public BlockPos getEndpoint() { List pointsPassed = new ArrayList(); TileLightRelay relay = this; - ChunkCoordinates lastCoords = null; + BlockPos lastCoords = null; // Doing while(true) gives an unreachable code error boolean run = true; @@ -117,7 +117,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { return null; // Circular path pointsPassed.add(relay); - ChunkCoordinates coords = relay.getBinding(); + BlockPos coords = relay.getBinding(); if(coords == null) return lastCoords; @@ -138,7 +138,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public BlockPos getBinding() { - return bindY == -1 ? null : new ChunkCoordinates(bindX, bindY, bindZ); + return bindY == -1 ? null : new BlockPos(bindX, bindY, bindZ); } @Override @@ -232,7 +232,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { worldObj.scheduleBlockUpdate(x, y, z, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } - ChunkCoordinates bind = ((TileLightRelay) tile).getBinding(); + BlockPos bind = ((TileLightRelay) tile).getBinding(); if(bind != null) { setExit(bind.posX, bind.posY, bind.posZ); return; 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 5e45ddbe9..1747de090 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -74,7 +74,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil if(subTile != null) { TileEntity tileBelow = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); if(tileBelow instanceof TileRedStringRelay) { - ChunkCoordinates coords = ((TileRedStringRelay) tileBelow).getBinding(); + BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); if(coords != null) { int currX = xCoord; int currY = yCoord; 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 529254d0a..7e8c9c10a 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 @@ -25,7 +25,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -596,7 +596,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return null; TileEntity tile = (TileEntity) receiver; - return new ChunkCoordinates(tile.xCoord, tile.yCoord, tile.zCoord); + return new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord); } @Override 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 097cd5b3f..3ce227292 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 @@ -15,14 +15,14 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; public abstract class TileRedString extends TileMod implements ITileBound { - private ChunkCoordinates binding; + private BlockPos binding; @Override public void updateEntity() { @@ -31,7 +31,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { int y = yCoord; int z = zCoord; int range = getRange(); - ChunkCoordinates currBinding = getBinding(); + BlockPos currBinding = getBinding(); setBinding(null); for(int i = 0; i < range; i++) { @@ -46,7 +46,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { continue; if(acceptBlock(x, y, z)) { - setBinding(new ChunkCoordinates(x, y, z)); + setBinding(new BlockPos(x, y, z)); if(currBinding == null || currBinding.posX != x || currBinding.posY != y || currBinding.posZ != z) onBound(x, y, z); break; @@ -74,7 +74,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { return binding; } - public void setBinding(ChunkCoordinates binding) { + public void setBinding(BlockPos binding) { this.binding = binding; } @@ -83,12 +83,12 @@ public abstract class TileRedString extends TileMod implements ITileBound { } public TileEntity getTileAtBinding() { - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); return binding == null ? null : worldObj.getTileEntity(binding.posX, binding.posY, binding.posZ); } public Block getBlockAtBinding() { - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); return binding == null ? Blocks.air : worldObj.getBlock(binding.posX, binding.posY, binding.posZ); } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index ca519437e..d545a340e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.util.ForgeDirection; public class TileRedStringComparator extends TileRedString { @@ -22,7 +22,7 @@ public class TileRedStringComparator extends TileRedString { public void updateEntity() { super.updateEntity(); - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); ForgeDirection dir = getOrientation(); Block block = getBlockAtBinding(); int origVal = comparatorValue; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 6d1b5875d..acd9219b0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; public class TileRedStringDispenser extends TileRedStringContainer { @@ -23,7 +23,7 @@ public class TileRedStringDispenser extends TileRedStringContainer { } public void tickDispenser() { - ChunkCoordinates bind = getBinding(); + BlockPos bind = getBinding(); if(bind != null) { TileEntity tile = worldObj.getTileEntity(bind.posX, bind.posY, bind.posZ); if(tile instanceof TileEntityDispenser) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 463a37805..36de9c988 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -14,26 +14,26 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class TileRedStringFertilizer extends TileRedString { public boolean func_149851_a(World p_149851_1_, boolean p_149851_5_) { - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); Block block = getBlockAtBinding(); return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(p_149851_1_, binding.posX, binding.posY, binding.posZ, p_149851_5_) : false; } public boolean func_149852_a(World p_149852_1_, Random p_149852_2_) { - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); Block block = getBlockAtBinding(); return block instanceof IGrowable ? ((IGrowable) block).func_149852_a(p_149852_1_, p_149852_2_, binding.posX, binding.posY, binding.posZ) : false; } public void func_149853_b(World p_149853_1_, Random p_149853_2_) { - ChunkCoordinates binding = getBinding(); + BlockPos binding = getBinding(); Block block = getBlockAtBinding(); if(block instanceof IGrowable) ((IGrowable) block).func_149853_b(p_149853_1_, p_149853_2_, binding.posX, binding.posY, binding.posZ); 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 07fb784c6..3c4ea41d0 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 @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class TileRedStringInterceptor extends TileRedString { @@ -50,7 +50,7 @@ public class TileRedStringInterceptor extends TileRedString { } if(inter.worldObj == world) { - ChunkCoordinates coords = inter.getBinding(); + BlockPos coords = inter.getBinding(); if(coords != null && coords.posX == x && coords.posY == y && coords.posZ == z) { if(!world.isRemote) { Block block = inter.getBlockType(); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 3be7ca074..c00cffde2 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -14,7 +14,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; @@ -53,7 +53,7 @@ public class CommandSkyblockSpread extends CommandBase { EntityPlayer player = getPlayer(sender, args[0]); if(player != null) { - ChunkCoordinates spawn = player.worldObj.getSpawnPoint(); + BlockPos spawn = player.worldObj.getSpawnPoint(); int x, z; do { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index ff20ca4b8..b98ab1c62 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.WeakHashMap; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.ManaNetworkEvent; @@ -48,14 +48,14 @@ public final class ManaNetworkHandler implements IManaNetwork { } @Override - public TileEntity getClosestPool(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestPool(BlockPos pos, World world, int limit) { if(manaPools.containsKey(world)) return getClosest(manaPools.get(world), pos, world.isRemote, limit); return null; } @Override - public TileEntity getClosestCollector(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestCollector(BlockPos pos, World world, int limit) { if(manaCollectors.containsKey(world)) return getClosest(manaCollectors.get(world), pos, world.isRemote, limit); return null; @@ -81,7 +81,7 @@ public final class ManaNetworkHandler implements IManaNetwork { return false; } - private synchronized TileEntity getClosest(List tiles, ChunkCoordinates pos, boolean remoteCheck, int limit) { + private synchronized TileEntity getClosest(List tiles, BlockPos pos, boolean remoteCheck, int limit) { float closest = Float.MAX_VALUE; TileEntity closestTile = null; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 5ed1666a7..bb327161b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -44,7 +44,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; @@ -131,7 +131,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) - mb.addComponent(new BeaconComponent(new ChunkCoordinates(i - 1, 0, j - 1))); + mb.addComponent(new BeaconComponent(new BlockPos(i - 1, 0, j - 1))); mb.addComponent(, 0, Blocks.beacon, 0); mb.setRenderOffset(0, -1, 0); @@ -257,11 +257,11 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return dataWatcher.getWatchableObjectInt(22); } - public ChunkCoordinates getSource() { + public BlockPos getSource() { int x = dataWatcher.getWatchableObjectInt(23); int y = dataWatcher.getWatchableObjectInt(24); int z = dataWatcher.getWatchableObjectInt(25); - return new ChunkCoordinates(x, y, z); + return new BlockPos(x, y, z); } public int getMobSpawnTicks() { @@ -313,7 +313,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi par1nbtTagCompound.setBoolean(TAG_AGGRO, isAggored()); par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, getMobSpawnTicks()); - ChunkCoordinates source = getSource(); + BlockPos source = getSource(); par1nbtTagCompound.setInteger(TAG_SOURCE_X, source.posX); par1nbtTagCompound.setInteger(TAG_SOURCE_Y, source.posY); par1nbtTagCompound.setInteger(TAG_SOURCE_Z, source.posZ); @@ -474,14 +474,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void setDead() { - ChunkCoordinates source = getSource(); + BlockPos source = getSource(); Botania.proxy.playRecordClientSided(worldObj, source.posX, source.posY, source.posZ, null); isPlayingMusic = false; super.setDead(); } public List getPlayersAround() { - ChunkCoordinates source = getSource(); + BlockPos source = getSource(); float range = 15F; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); return players; @@ -517,7 +517,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } - ChunkCoordinates source = getSource(); + BlockPos source = getSource(); boolean hard = isHardMode(); float range = RANGE + 3F; List players = getPlayersAround(); @@ -755,7 +755,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi flag = true; // Prevent out of bounds teleporting - ChunkCoordinates source = getSource(); + BlockPos source = getSource(); if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.posX, source.posY, source.posZ) > 12) flag = false; } @@ -867,7 +867,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static class BeaconComponent extends MultiblockComponent { - public BeaconComponent(ChunkCoordinates relPos) { + public BeaconComponent(BlockPos relPos) { super(relPos, Blocks.iron_block, 0); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 0a470bc23..3d04f577f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -17,7 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -34,10 +34,10 @@ public class EntityEnderAirBottle extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition pos) { if(pos.entityHit == null && !worldObj.isRemote) { - List coordsList = getCoordsToPut(pos.blockX, pos.blockY, pos.blockZ); + List coordsList = getCoordsToPut(pos.blockX, pos.blockY, pos.blockZ); worldObj.playAuxSFX(2002, (int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ), 8); - for(ChunkCoordinates coords : coordsList) { + for(BlockPos coords : coordsList) { worldObj.setBlock(coords.posX, coords.posY, coords.posZ, Blocks.end_stone); if(Math.random() < 0.1) worldObj.playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Blocks.end_stone)); @@ -46,9 +46,9 @@ public class EntityEnderAirBottle extends EntityThrowable { } } - public List getCoordsToPut(int xCoord, int yCoord, int zCoord) { - List possibleCoords = new ArrayList(); - List selectedCoords = new ArrayList(); + public List getCoordsToPut(int xCoord, int yCoord, int zCoord) { + List possibleCoords = new ArrayList(); + List selectedCoords = new ArrayList(); int range = 4; int rangeY = 4; @@ -60,12 +60,12 @@ public class EntityEnderAirBottle extends EntityThrowable { int z = zCoord + k; Block block = worldObj.getBlock(x, y, z); if(block != null && block.isReplaceableOreGen(worldObj, x, y, z, Blocks.stone)) - possibleCoords.add(new ChunkCoordinates(x, y, z)); + possibleCoords.add(new BlockPos(x, y, z)); } int count = 64; while(!possibleCoords.isEmpty() && count > 0) { - ChunkCoordinates coords = possibleCoords.get(worldObj.rand.nextInt(possibleCoords.size())); + BlockPos coords = possibleCoords.get(worldObj.rand.nextInt(possibleCoords.size())); possibleCoords.remove(coords); selectedCoords.add(coords); count--; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 03a7f9cad..34fdbe6be 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -28,7 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; @@ -428,7 +428,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { stack.writeToNBT(lensCmp); par1nbtTagCompound.setTag(TAG_LENS_STACK, lensCmp); - ChunkCoordinates coords = getBurstSourceChunkCoordinates(); + BlockPos coords = getBurstSourceBlockPos(); par1nbtTagCompound.setInteger(TAG_SPREADER_X, coords.posX); par1nbtTagCompound.setInteger(TAG_SPREADER_Y, coords.posY); par1nbtTagCompound.setInteger(TAG_SPREADER_Z, coords.posZ); @@ -578,7 +578,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(BotaniaAPI.internalHandler.isBuildcraftPipe(tile)) return; - ChunkCoordinates coords = getBurstSourceChunkCoordinates(); + BlockPos coords = getBurstSourceBlockPos(); if(tile != null && (tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ)) collidedTile = tile; @@ -649,7 +649,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public TileEntity getShooter() { - ChunkCoordinates coords = getBurstSourceChunkCoordinates(); + BlockPos coords = getBurstSourceBlockPos(); TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); return tile; } @@ -736,12 +736,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { final int coordsStart = dataWatcherStart + 6; @Override - public ChunkCoordinates getBurstSourceChunkCoordinates() { + public BlockPos getBurstSourceBlockPos() { int x = dataWatcher.getWatchableObjectInt(coordsStart); int y = dataWatcher.getWatchableObjectInt(coordsStart + 1); int z = dataWatcher.getWatchableObjectInt(coordsStart + 2); - return new ChunkCoordinates(x, y, z); + return new BlockPos(x, y, z); } @Override @@ -840,7 +840,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public void setDeathTicksForFakeParticle() { - ChunkCoordinates coords = getBurstSourceChunkCoordinates(); + BlockPos coords = getBurstSourceBlockPos(); TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); if(tile != null && tile instanceof IManaSpreader) ((IManaSpreader) tile).setLastBurstDeathTick(getTicksExisted()); @@ -848,7 +848,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public static class PositionProperties { - public final ChunkCoordinates coords; + public final BlockPos coords; public final Block block; public final int meta; @@ -858,7 +858,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int x = MathHelper.floor_double(entity.posX); int y = MathHelper.floor_double(entity.posY); int z = MathHelper.floor_double(entity.posZ); - coords = new ChunkCoordinates(x, y, z); + coords = new BlockPos(x, y, z); block = entity.worldObj.getBlock(x, y, z); meta = entity.worldObj.getBlockMetadata(x, y, z); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 8b7befbd2..06939e9cb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -401,7 +401,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); - Tessellator tess = Tessellator.instance; + Tessellator tess = Tessellator.getInstance(); Tessellator.renderingWorldRenderer = false; GL11.glPushMatrix(); @@ -466,7 +466,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); } renderPass++; diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 6940d2d04..44616657d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -32,7 +32,7 @@ public class ItemFertilizer extends ItemMod { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { final int range = 3; if(!par3World.isRemote) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList(); for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { @@ -41,13 +41,13 @@ public class ItemFertilizer extends ItemMod { int y = par5 + k + 1; int z = par6 + j + 1; if(par3World.isAirBlock(x, y, z) && (!par3World.provider.hasNoSky || y < 255) && ModBlocks.flower.canBlockStay(par3World, x, y, z)) - validCoords.add(new ChunkCoordinates(x, y, z)); + validCoords.add(new BlockPos(x, y, z)); } } int flowerCount = Math.min(validCoords.size(), par3World.rand.nextBoolean() ? 3 : 4); for(int i = 0; i < flowerCount; i++) { - ChunkCoordinates coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); + BlockPos coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); validCoords.remove(coords); par3World.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index dec75518f..72a8374be 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -25,7 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.item.IGrassHornExcempt; @@ -117,7 +117,7 @@ public class ItemGrassHorn extends ItemMod { Random rand = new Random(srcx ^ srcy ^ srcz); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; - List coords = new ArrayList(); + List coords = new ArrayList(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) @@ -128,14 +128,14 @@ public class ItemGrassHorn extends ItemMod { Block block = world.getBlock(x, y, z); if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, x, y, z, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block.isLeaves(world, x, y, z) || stackDmg == 2 && block == Blocks.snow_layer) - coords.add(new ChunkCoordinates(x, y, z)); + coords.add(new BlockPos(x, y, z)); } Collections.shuffle(coords, rand); int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { - ChunkCoordinates currCoords = coords.get(i); + BlockPos currCoords = coords.get(i); List items = new ArrayList(); Block block = world.getBlock(currCoords.posX, currCoords.posY, currCoords.posZ); int meta = world.getBlockMetadata(currCoords.posX, currCoords.posY, currCoords.posZ); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index bb55c1545..5e585568d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -146,9 +146,9 @@ public class ItemGrassSeeds extends ItemMod { private static BlockSwapper swapperFromMeta(World world, int x, int y, int z, int meta) { switch(meta) { - case 1 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.dirt, 2); - case 2 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.mycelium, 0); - default : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.grass, 0); + case 1 : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.dirt, 2); + case 2 : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.mycelium, 0); + default : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.grass, 0); } } @@ -159,10 +159,10 @@ public class ItemGrassSeeds extends ItemMod { final Block blockToSet; final int metaToSet; - ChunkCoordinates startCoords; + BlockPos startCoords; int ticksExisted = 0; - BlockSwapper(World world, ChunkCoordinates coords, Block block, int meta) { + BlockSwapper(World world, BlockPos coords, Block block, int meta) { this.world = world; blockToSet = block; metaToSet = meta; @@ -184,7 +184,7 @@ public class ItemGrassSeeds extends ItemMod { if(block == blockToSet && meta == metaToSet) { if(ticksExisted % 20 == 0) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList(); for(int k = -1; k < 2; k++) for(int l = -1; l < 2; l++) { int x1 = x + k; @@ -192,11 +192,11 @@ public class ItemGrassSeeds extends ItemMod { Block block1 = world.getBlock(x1, y, z1); int meta1 = world.getBlockMetadata(x1, y, z1); if(block1 == Blocks.dirt && meta1 == 0) - validCoords.add(new ChunkCoordinates(x1, y, z1)); + validCoords.add(new BlockPos(x1, y, z1)); } if(!validCoords.isEmpty() && !world.isRemote) { - ChunkCoordinates coords = validCoords.get(rand.nextInt(validCoords.size())); + BlockPos coords = validCoords.get(rand.nextInt(validCoords.size())); world.setBlock(coords.posX, coords.posY, coords.posZ, blockToSet, metaToSet, 1 | 2); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 95af41cee..433dec7f5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; @@ -172,11 +172,11 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.dimensionId); } - public ChunkCoordinates getPoolCoords(ItemStack stack) { + public BlockPos getPoolCoords(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_POS_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_POS_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_POS_Z, 0); - return new ChunkCoordinates(x, y, z); + return new BlockPos(x, y, z); } public int getDimension(ItemStack stack) { @@ -188,7 +188,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte if(server == null) return fallbackPool; - ChunkCoordinates coords = getPoolCoords(stack); + BlockPos coords = getPoolCoords(stack); if(coords.posY == -1) return null; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 60610b6eb..6bc133a7e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -26,7 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; @@ -67,7 +67,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { Block block = par3World.getBlock(par4, par5, par6); - ChunkCoordinates boundTile = getBoundTile(par1ItemStack); + BlockPos boundTile = getBoundTile(par1ItemStack); if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) { TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); @@ -177,7 +177,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - ChunkCoordinates coords = getBoundTile(par1ItemStack); + BlockPos coords = getBoundTile(par1ItemStack); TileEntity tile = par2World.getTileEntity(coords.posX, coords.posY, coords.posZ); if(tile == null || !(tile instanceof IWandBindable)) setBoundTile(par1ItemStack, 0, -1, 0); @@ -275,11 +275,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Z, z); } - public static ChunkCoordinates getBoundTile(ItemStack stack) { + public static BlockPos getBoundTile(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_BOUND_TILE_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_BOUND_TILE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_BOUND_TILE_Z, 0); - return new ChunkCoordinates(x, y, z); + return new BlockPos(x, y, z); } public static boolean getBindMode(ItemStack stack) { @@ -296,7 +296,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public BlockPos getBinding(ItemStack stack) { - ChunkCoordinates bound = getBoundTile(stack); + BlockPos bound = getBoundTile(stack); if(bound.posY != -1) return bound; @@ -304,7 +304,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(pos != null) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); if(tile != null && tile instanceof ITileBound) { - ChunkCoordinates coords = ((ITileBound) tile).getBinding(); + BlockPos coords = ((ITileBound) tile).getBinding(); return coords; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 9d1fc7f54..ebf75a8b4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; @@ -26,7 +26,7 @@ public class ItemWorldSeed extends ItemMod { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - ChunkCoordinates coords = world.getSpawnPoint(); + BlockPos coords = world.getSpawnPoint(); if(MathHelper.pointDistanceSpace(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, player.posX, player.posY, player.posZ) > 24) { player.rotationPitch = 0F; 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 e1262197a..e31f10292 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 @@ -122,7 +122,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.26F, 0.15F, -0.39F); GL11.glScalef(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); GL11.glPopMatrix(); } } 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 7434d6693..43bc75496 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 @@ -336,6 +336,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); } } 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 5a7dcd66b..c7792a903 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 @@ -198,7 +198,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); Color color = new Color(getColorFromItemStack(stack, 1)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); 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 2e0ff6eec..c78d2f552 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 @@ -109,7 +109,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.35F : -0.3F); GL11.glScalef(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } 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 3bcecf853..2d76a368e 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 @@ -436,7 +436,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glRotatef(rx, 1F, 0F, 0F); GL11.glRotatef(ry, 0F, 1F, 0F); GL11.glScalef(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GL11.glScalef(sr, sr, sr); GL11.glRotatef(-ry, 0F, 1F, 0F); GL11.glRotatef(-rx, 1F, 0F, 0F); @@ -448,7 +448,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glRotatef(rx, 1F, 0F, 0F); GL11.glRotatef(ry, 0F, 1F, 0F); GL11.glScalef(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GL11.glScalef(sr, sr, sr); GL11.glRotatef(-ry, 1F, 0F, 0F); GL11.glRotatef(-rx, 1F, 0F, 0F); @@ -482,7 +482,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glRotatef(player.ticksExisted + partialTicks, 0, 1, 0); else GL11.glRotatef(Botania.proxy.getWorldElapsedTicks(), 0, 1, 0); - Tessellator tes = Tessellator.instance; + Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); tes.startDrawingQuads(); tes.addVertexWithUV(-0.75, 0, -0.75, 0, 0); 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 c95a0ff2d..6faa9289c 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 @@ -82,7 +82,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { GL11.glScalef(1.1F, 1.1F, 1F); GL11.glTranslatef(-0.05F, -0.1F, 0F); } - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); } } } 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 881113eaf..d5a4f80fa 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 @@ -25,7 +25,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -79,13 +79,13 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { int x1 = x + i; int z1 = z + j; - addIceBlock(player, new ChunkCoordinates(x1, y, z1)); + addIceBlock(player, new BlockPos(x1, y, z1)); } } } } - private void addIceBlock(EntityPlayer player, ChunkCoordinates coords) { + private void addIceBlock(EntityPlayer player, BlockPos coords) { String user = player.getCommandSenderName(); if(!playerIceBlocks.containsKey(user)) playerIceBlocks.put(user, new ArrayList()); @@ -124,16 +124,16 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } } class IceRemover { int time = 30; - final ChunkCoordinates coords; + final BlockPos coords; - public IceRemover(ChunkCoordinates coords) { + public IceRemover(BlockPos coords) { this.coords = coords; } 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 8ab435a9b..0ff876742 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 @@ -229,7 +229,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.3F : -0.25F); GL11.glScalef(0.75F, 0.75F, 0.75F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } } 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 f07540b22..a36c883e3 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 @@ -67,7 +67,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } } 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 e4fa13df1..8eca86f20 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 @@ -62,7 +62,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.35F, -0.1F, armor ? -0.3F : -0.25F); GL11.glScalef(0.35F, 0.35F, 0.35F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } 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 6a1942402..20057dc2c 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 @@ -78,7 +78,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } } } 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 be741de0d..f3b08ead4 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 @@ -21,7 +21,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -92,7 +92,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { if(shouldBreak(player)) { - ChunkCoordinates coords = new ChunkCoordinates(x, y, z); + BlockPos coords = new BlockPos(x, y, z); addBlockSwapper(player.worldObj, player, stack, coords, coords, 32, false, true, new ArrayList()); } } @@ -118,7 +118,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } } - private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, ChunkCoordinates origCoords, ChunkCoordinates coords, int steps, boolean leaves, boolean force, List posChecked) { + private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, BlockPos coords, int steps, boolean leaves, boolean force, List posChecked) { BlockSwapper swapper = new BlockSwapper(world, player, stack, origCoords, coords, steps, leaves, force, posChecked); int dim = world.provider.dimensionId; @@ -134,13 +134,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker final World world; final EntityPlayer player; final ItemStack stack; - final ChunkCoordinates origCoords; + final BlockPos origCoords; final int steps; - final ChunkCoordinates coords; + final BlockPos coords; final boolean leaves; final boolean force; final List posChecked; - BlockSwapper(World world, EntityPlayer player, ItemStack stack, ChunkCoordinates origCoords, ChunkCoordinates coords, int steps, boolean leaves, boolean force, List posChecked) { + BlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, BlockPos coords, int steps, boolean leaves, boolean force, List posChecked) { this.world = world; this.player = player; this.stack = stack; @@ -178,7 +178,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker if(log || leaf) { int steps = this.steps - 1; steps = leaf ? leaves ? steps : 3 : steps; - addBlockSwapper(world, player, stack, origCoords, new ChunkCoordinates(x, y, z), steps, leaf, false, posChecked); + addBlockSwapper(world, player, stack, origCoords, new BlockPos(x, y, z), steps, leaf, false, posChecked); posChecked.add(pstr); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index 28148f736..7bdbd6faa 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; @@ -23,7 +23,7 @@ public class LensBounce extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!isManaBlock && pos.entityHit == null) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if(coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) { Vector3 currentMovementVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index 6d4f8eb10..1fbe72124 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; @@ -22,7 +22,7 @@ public class LensExplosive extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, burst.getMana() / 50F, true); } else dead = false; 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 19ed86c74..812039e78 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; @@ -25,7 +25,7 @@ public class LensFire extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock) { ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); 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 3d1133564..ebb807b30 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -15,7 +15,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; @@ -26,7 +26,7 @@ public class LensLight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock) { ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 983e46cd5..6639fe2ce 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.core.helper.MathHelper; @@ -51,7 +51,7 @@ public class LensMagnet extends Lens { IManaReceiver receiver = (IManaReceiver) tile; - ChunkCoordinates srcCoords = burst.getBurstSourceChunkCoordinates(); + BlockPos srcCoords = burst.getBurstSourceBlockPos(); if(MathHelper.pointDistanceSpace(tile.xCoord, tile.yCoord, tile.zCoord, srcCoords.posX, srcCoords.posY, srcCoords.posZ) > 3 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { Vector3 burstVec = Vector3.fromEntity(entity); 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 6316fe45b..2ae81c0f2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -19,7 +19,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -50,7 +50,7 @@ public class LensMine extends Lens { float hardness = block.getBlockHardness(world, x, y, z); int mana = burst.getMana(); - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if((coords.posX != x || coords.posY != y || coords.posZ != z) && !(tile instanceof IManaBlock) && block != null && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { List items = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index c3761dc94..3ae0ba6be 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -18,7 +18,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; @@ -44,29 +44,29 @@ public class LensPaint extends Lens { Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); if(BotaniaAPI.paintableBlocks.contains(block)) { int meta = entity.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); - List coordsToPaint = new ArrayList(); - List coordsFound = new ArrayList(); + List coordsToPaint = new ArrayList(); + List coordsFound = new ArrayList(); - ChunkCoordinates theseCoords = new ChunkCoordinates(pos.blockX, pos.blockY, pos.blockZ); + BlockPos theseCoords = new BlockPos(pos.blockX, pos.blockY, pos.blockZ); coordsFound.add(theseCoords); do { - List iterCoords = new ArrayList(coordsFound); - for(ChunkCoordinates coords : iterCoords) { + List iterCoords = new ArrayList(coordsFound); + for(BlockPos coords : iterCoords) { coordsFound.remove(coords); coordsToPaint.add(coords); for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Block block_ = entity.worldObj.getBlock(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); int meta_ = entity.worldObj.getBlockMetadata(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); - ChunkCoordinates coords_ = new ChunkCoordinates(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); + BlockPos coords_ = new BlockPos(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); if(block_ == block && meta_ == meta && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_)) coordsFound.add(coords_); } } } while(!coordsFound.isEmpty() && coordsToPaint.size() < 1000); - for(ChunkCoordinates coords : coordsToPaint) { + for(BlockPos coords : coordsToPaint) { int placeColor = storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor; int metaThere = entity.worldObj.getBlockMetadata(coords.posX, coords.posY, coords.posZ); 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 afedaee18..1c0d8444b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -15,7 +15,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; @@ -24,7 +24,7 @@ public class LensPiston extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock && !entity.worldObj.isRemote) { ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit).getOpposite(); int x = pos.blockX + dir.offsetX; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index cfbbe061d..eb9173567 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; @@ -21,7 +21,7 @@ public class LensStorm extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); + BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 5F, true); } else dead = false; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 819b3293e..06faffb37 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -21,7 +21,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.oredict.RecipeSorter; @@ -86,12 +86,12 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe } @Override - public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { + public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { return ((IWireframeCoordinateListProvider) ModItems.lokiRing).getWireframesToDraw(player, stack); } @Override - public ChunkCoordinates getSourceWireframe(EntityPlayer player, ItemStack stack) { + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack) { return ((IExtendedWireframeCoordinateListProvider) ModItems.lokiRing).getSourceWireframe(player, stack); } 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 8c40cf10d..040ff1178 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -16,7 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -119,7 +119,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); - return y == -1 ? null : new ChunkCoordinates(x, y, z); + return y == -1 ? null : new BlockPos(x, y, z); } @Override @@ -301,7 +301,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); - Tessellator tess = Tessellator.instance; + Tessellator tess = Tessellator.getInstance(); Tessellator.renderingWorldRenderer = false; GL11.glPushMatrix(); @@ -350,7 +350,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GL11.glColor3f(1F, 1F, 1F); GL11.glPopMatrix(); 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 93af5508d..bf8a04135 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,7 +24,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -82,9 +82,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } ItemStack heldItemStack = player.getCurrentEquippedItem(); - ChunkCoordinates originCoords = getOriginPos(lokiRing); + BlockPos originCoords = getOriginPos(lokiRing); MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); - List cursors = getCursorList(lokiRing); + List cursors = getCursorList(lokiRing); int cursorCount = cursors.size(); int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); @@ -106,7 +106,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC int relY = lookPos.blockY - originCoords.posY; int relZ = lookPos.blockZ - originCoords.posZ; - for(ChunkCoordinates cursor : cursors) + for(BlockPos cursor : cursors) if(cursor.posX == relX && cursor.posY == relY && cursor.posZ == relZ) { cursors.remove(cursor); setCursorList(lokiRing, cursors); @@ -122,7 +122,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } } else if(heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) { - for(ChunkCoordinates cursor : cursors) { + for(BlockPos cursor : cursors) { int x = lookPos.blockX + cursor.posX; int y = lookPos.blockY + cursor.posY; int z = lookPos.blockZ + cursor.posZ; @@ -143,7 +143,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if(lokiRing == null || player.worldObj.isRemote || !(item instanceof ISequentialBreaker)) return; - List cursors = getCursorList(lokiRing); + List cursors = getCursorList(lokiRing); ISequentialBreaker breaker = (ISequentialBreaker) item; World world = player.worldObj; boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0; @@ -151,7 +151,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC boolean dispose = breaker.disposeOfTrashBlocks(stack); for(int i = 0; i < cursors.size(); i++) { - ChunkCoordinates coords = cursors.get(i); + BlockPos coords = cursors.get(i); int xp = x + coords.posX; int yp = y + coords.posY; int zp = z + coords.posZ; @@ -173,23 +173,23 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @Override @SideOnly(Side.CLIENT) - public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { + public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { if(getLokiRing(player) != stack) return null; MovingObjectPosition lookPos = Minecraft.getMinecraft().objectMouseOver; if(lookPos != null && !player.worldObj.isAirBlock(lookPos.blockX, lookPos.blockY, lookPos.blockZ) && lookPos.entityHit == null) { - List list = getCursorList(stack); - ChunkCoordinates origin = getOriginPos(stack); + List list = getCursorList(stack); + BlockPos origin = getOriginPos(stack); if(origin.posY != -1) { - for(ChunkCoordinates coords : list) { + for(BlockPos coords : list) { coords.posX += origin.posX; coords.posY += origin.posY; coords.posZ += origin.posZ; } - } else for(ChunkCoordinates coords : list) { + } else for(BlockPos coords : list) { coords.posX += lookPos.blockX; coords.posY += lookPos.blockY; coords.posZ += lookPos.blockZ; @@ -202,7 +202,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } @Override - public ChunkCoordinates getSourceWireframe(EntityPlayer player, ItemStack stack) { + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack) { return getLokiRing(player) == stack ? getOriginPos(stack) : null; } @@ -217,11 +217,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC return stack != null && (stack.getItem() == ModItems.lokiRing || stack.getItem() == ModItems.aesirRing); } - private static ChunkCoordinates getOriginPos(ItemStack stack) { + private static BlockPos getOriginPos(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_X_ORIGIN, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y_ORIGIN, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z_ORIGIN, 0); - return new ChunkCoordinates(x, y, z); + return new BlockPos(x, y, z); } private static void setOriginPos(ItemStack stack, int x, int y, int z) { @@ -230,9 +230,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC ItemNBTHelper.setInt(stack, TAG_Z_ORIGIN, z); } - private static List getCursorList(ItemStack stack) { + private static List getCursorList(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); - List cursors = new ArrayList(); + List cursors = new ArrayList(); int count = cmp.getInteger(TAG_CURSOR_COUNT); for(int i = 0; i < count; i++) { @@ -240,17 +240,17 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC int x = cursorCmp.getInteger(TAG_X_OFFSET); int y = cursorCmp.getInteger(TAG_Y_OFFSET); int z = cursorCmp.getInteger(TAG_Z_OFFSET); - cursors.add(new ChunkCoordinates(x, y, z)); + cursors.add(new BlockPos(x, y, z)); } return cursors; } - private static void setCursorList(ItemStack stack, List cursors) { + private static void setCursorList(ItemStack stack, List cursors) { NBTTagCompound cmp = new NBTTagCompound(); if(cursors != null) { int i = 0; - for(ChunkCoordinates cursor : cursors) { + for(BlockPos cursor : cursors) { NBTTagCompound cursorCmp = cursorToCmp(cursor.posX, cursor.posY, cursor.posZ); cmp.setTag(TAG_CURSOR_PREFIX + i, cursorCmp); i++; 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 615bb70dd..db3bb67fb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -23,7 +23,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -89,7 +89,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); - List swap = getBlocksToSwap(par3World, par1ItemStack, block, meta, par4, par5, par6, null, 0); + List swap = getBlocksToSwap(par3World, par1ItemStack, block, meta, par4, par5, par6, null, 0); if(swap.size() > 0) { ItemNBTHelper.setBoolean(par1ItemStack, TAG_SWAPPING, true); ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, par4); @@ -140,13 +140,13 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int z = ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0); Block targetBlock = getTargetBlock(stack); int targetMeta = getTargetBlockMeta(stack); - List swap = getBlocksToSwap(world, stack, block, meta, x, y, z, targetBlock, targetMeta); + List swap = getBlocksToSwap(world, stack, block, meta, x, y, z, targetBlock, targetMeta); if(swap.size() == 0) { ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, false); return; } - ChunkCoordinates coords = swap.get(world.rand.nextInt(swap.size())); + BlockPos coords = swap.get(world.rand.nextInt(swap.size())); boolean exchange = exchange(world, player, coords.posX, coords.posY, coords.posZ, stack, block, meta); if(exchange) ManaItemHandler.requestManaExactForTool(stack, player, COST, true); @@ -182,8 +182,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return matrix; } - public List getBlocksToSwap(World world, ItemStack stack, Block blockToSwap, int metaToSwap, int xc, int yc, int zc, Block targetBlock, int targetMeta) { - List coordsList = new ArrayList(); + public List getBlocksToSwap(World world, ItemStack stack, Block blockToSwap, int metaToSwap, int xc, int yc, int zc, Block targetBlock, int targetMeta) { + List coordsList = new ArrayList(); Boolean[][][] matrix = createMatrix(world, stack, blockToSwap, metaToSwap, xc, yc, zc, targetBlock, targetMeta); int effrange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); @@ -200,7 +200,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Boolean obool = matrix[i + dir.offsetX][j + dir.offsetY][k + dir.offsetZ]; if(obool != null && obool) { - coordsList.add(new ChunkCoordinates(x, y, z)); + coordsList.add(new BlockPos(x, y, z)); break; } } @@ -378,7 +378,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @Override @SideOnly(Side.CLIENT) - public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { + public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { ItemStack holding = player.getCurrentEquippedItem(); if(holding != stack || !canExchange(stack)) return null; @@ -402,8 +402,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } if(!player.worldObj.isAirBlock(x, y, z)) { - List coordsList = getBlocksToSwap(player.worldObj, stack, block, meta, x, y, z, targetBlock, targetMeta); - for(ChunkCoordinates coords : coordsList) + List coordsList = getBlocksToSwap(player.worldObj, stack, block, meta, x, y, z, targetBlock, targetMeta); + for(BlockPos coords : coordsList) if(coords.posX == x && coords.posY == y && coords.posZ == z) { coordsList.remove(coords); break; 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 a097c21b1..224fffb45 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -22,7 +22,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; @@ -115,7 +115,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(int id : ids) if(validBlocks.contains(OreDictionary.getOreName(id))) { boolean hasAir = false; - List airBlocks = new ArrayList(); + List airBlocks = new ArrayList(); for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { int x_ = x + dir.offsetX; @@ -124,7 +124,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP Block block_ = par2World.getBlock(x_, y_, z_); if(block_.isAir(par2World, x_, y_, z_) || block_.isReplaceable(par2World, x_, y_, z_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { - airBlocks.add(new ChunkCoordinates(x_, y_, z_)); + airBlocks.add(new BlockPos(x_, y_, z_)); hasAir = true; } } @@ -132,7 +132,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(hasAir) { if(y > yCenter) blocks.add(new CoordsWithBlock(x, y, z, Blocks.air)); - else for(ChunkCoordinates coords : airBlocks) { + else for(BlockPos coords : airBlocks) { if(par2World.getBlock(coords.posX, coords.posY - 1, coords.posZ) != Blocks.air) blocks.add(new CoordsWithBlock(coords.posX, coords.posY, coords.posZ, Blocks.dirt)); } @@ -164,7 +164,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP return true; } - class CoordsWithBlock extends ChunkCoordinates { + class CoordsWithBlock extends BlockPos { final Block block; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 3349bb33c..517506602 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -20,7 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -53,7 +53,7 @@ public final class SkyblockWorldEvents { if(player.ticksExisted > 3 && !persist.getBoolean(TAG_MADE_ISLAND)) { World world = player.worldObj; if(WorldTypeSkyblock.isWorldSkyblock(world)) { - ChunkCoordinates coords = world.getSpawnPoint(); + BlockPos coords = world.getSpawnPoint(); if(world.getBlock(coords.posX, coords.posY - 4, coords.posZ) != Blocks.bedrock && world.provider.dimensionId == 0) spawnPlayer(player, coords.posX, coords.posY, coords.posZ, false); } @@ -132,7 +132,7 @@ public final class SkyblockWorldEvents { if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; pmp.setPositionAndUpdate(x + 0.5, y + 1.6, z + 0.5); - pmp.setSpawnChunk(new ChunkCoordinates(x, y, z), true); + pmp.setSpawnChunk(new BlockPos(x, y, z), true); player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } From 7ad1820fcb48074e5767b6a1881e827cc724dfda Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 00:59:47 -0600 Subject: [PATCH 009/935] Low hanging fruit: core.world, core.network, core.lib, core.crafting, some miscs --- .../crafting/recipe/AesirRingRecipe.java | 6 +++ .../crafting/recipe/AncientWillRecipe.java | 5 +++ .../BlackHoleTalismanExtractRecipe.java | 5 +++ .../crafting/recipe/CompositeLensRecipe.java | 6 +++ .../crafting/recipe/CosmeticAttachRecipe.java | 6 +++ .../crafting/recipe/CosmeticRemoveRecipe.java | 5 +++ .../crafting/recipe/HelmRevealingRecipe.java | 5 +++ .../common/crafting/recipe/KeepIvyRecipe.java | 5 +++ .../crafting/recipe/LensDyeingRecipe.java | 5 +++ .../crafting/recipe/ManaGunClipRecipe.java | 6 ++- .../crafting/recipe/ManaGunLensRecipe.java | 5 +++ .../recipe/ManaGunRemoveLensRecipe.java | 5 +++ .../crafting/recipe/PhantomInkRecipe.java | 5 +++ .../crafting/recipe/RegenIvyRecipe.java | 5 +++ .../recipe/SpecialFloatingFlowerRecipe.java | 5 +++ .../crafting/recipe/SpellClothRecipe.java | 5 +++ .../recipe/TerraPickTippingRecipe.java | 5 +++ .../vazkii/botania/common/lib/LibMisc.java | 6 +-- .../botania/common/lib/LibObfuscation.java | 36 +++++++++--------- .../common/world/SkyblockWorldEvents.java | 38 +++++++++---------- .../common/world/WorldTypeSkyblock.java | 5 --- 21 files changed, 125 insertions(+), 49 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 5f784a685..1eed8838b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; @@ -73,4 +74,9 @@ public class AesirRingRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index 15a972168..d947402b7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; @@ -73,4 +74,8 @@ public class AncientWillRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 294001eff..9f7b01fc7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; @@ -66,4 +67,8 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } 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 f4cdadcc7..ef0f57425 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; @@ -81,4 +82,9 @@ public class CompositeLensRecipe implements IRecipe { public ItemStack getRecipeOutput() { return null; } + + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 3803e08b1..a388e91ca 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; @@ -72,4 +73,9 @@ public class CosmeticAttachRecipe implements IRecipe { public ItemStack getRecipeOutput() { return null; } + + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index af26d305f..1ac1b641d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; @@ -64,4 +65,8 @@ public class CosmeticRemoveRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } 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 0ac847be8..9553157aa 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; @@ -100,4 +101,8 @@ public class HelmRevealingRecipe implements IRecipe { return helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 5bd1fcfab..5dfe8f63d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; @@ -65,4 +66,8 @@ public class KeepIvyRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 443ff17d4..ba9703da8 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; @@ -96,4 +97,8 @@ public class LensDyeingRecipe implements IRecipe { return -1; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 7403daaf8..0cfc90966 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; @@ -71,5 +72,8 @@ public class ManaGunClipRecipe implements IRecipe { return null; } - + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 8b55e057a..51f056bc1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.ItemManaGun; @@ -75,4 +76,8 @@ public class ManaGunLensRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index b926d525d..6335cc3b2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; public class ManaGunRemoveLensRecipe implements IRecipe { @@ -63,4 +64,8 @@ public class ManaGunRemoveLensRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index fd510dffe..18cfd18dd 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; @@ -66,4 +67,8 @@ public class PhantomInkRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java index 3f763b36f..6330d9795 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemRegenIvy; import vazkii.botania.common.item.ModItems; @@ -82,4 +83,8 @@ public class RegenIvyRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index 2958c526c..17c07a082 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -67,4 +68,8 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index f0aeb8f23..6318e39d3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; public class SpellClothRecipe implements IRecipe { @@ -71,4 +72,8 @@ public class SpellClothRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 733367684..9f37ab337 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; @@ -68,4 +69,8 @@ public class TerraPickTippingRecipe implements IRecipe { return null; } + @Override + public ItemStack[] getRemainingItems(InventoryCrafting inv) { + return ForgeHooks.defaultRecipeGetRemainingItems(inv); + } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index f8a98eaa8..9fc32d47c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.lib; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public final class LibMisc { @@ -32,9 +32,7 @@ public final class LibMisc { // IMC Keys public static final String BLACKLIST_ITEM = "blackListItem"; - public static final ForgeDirection[] CARDINAL_DIRECTIONS = new ForgeDirection[] { - ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST - }; + public static final EnumFacing[] CARDINAL_DIRECTIONS = EnumFacing.HORIZONTALS; public static final int[] CONTROL_CODE_COLORS = new int[] { 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c1c9209fb..e1428c7c7 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -17,44 +17,44 @@ public final class LibObfuscation { // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; - public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "g" }; + public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; // EntityAIAttackOnCollide public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; - // EntityAIAvoidEntity + // EntityAIAvoidEntity // todo 1.8 public static final String[] TARGET_ENTITY_CLASS = new String[] { "targetEntityClass", "field_75381_h", "i" }; // EntityCreeper - public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "bq" }; + public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "c" }; // ThreadDownloadImageData - public static final String[] TEXTURE_UPLOADED = new String[] { "textureUploaded", "field_110559_g", "i" }; - public static final String[] BUFFERED_IMAGE = new String[] { "bufferedImage", "field_110560_d", "g" }; + public static final String[] TEXTURE_UPLOADED = new String[] { "textureUploaded", "field_110559_g", "n" }; + public static final String[] BUFFERED_IMAGE = new String[] { "bufferedImage", "field_110560_d", "l" }; // Entity - public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "ag" }; + public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "ab" }; // ItemReed - public static final String[] REED_ITEM = new String[] { "field_150935_a", "a" }; + public static final String[] REED_ITEM = new String[] { "block", "field_150935_a", "a" }; // EntityAnimal - public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bp" }; + public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bk" }; // EntityPlayer - public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "f" }; - public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "g" }; + public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "g" }; + public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "h" }; // Potion - public static final String[] IS_BAD_EFFECT = new String[] { "isBadEffect", "field_76418_K", "J" }; + public static final String[] IS_BAD_EFFECT = new String[] { "isBadEffect", "field_76418_K", "K" }; // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bv" }; - public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bG" }; + public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "br" }; + public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bC" }; // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; - public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "k" }; + public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "i" }; // MobSpawnerBaseLogic public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "m" }; @@ -62,7 +62,7 @@ public final class LibObfuscation { public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" }; public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" }; public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; + public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" // GuiIngame public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "r" }; @@ -75,11 +75,11 @@ public final class LibObfuscation { // GuiChat public static final String[] INPUT_FIELD = new String[] { "inputField", "field_146415_a", "a" }; - public static final String[] COMPLETE_FLAG = new String[] { "field_146414_r", "r" }; + public static final String[] COMPLETE_FLAG = new String[] { "waitingOnAutocomplete", "field_146414_r", "r" }; // Entityliving - public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "t" }; + public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "z" }; // TextureAtlasSprite - public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "j" }; + public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "k" }; } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 517506602..4a83400e1 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -54,8 +54,8 @@ public final class SkyblockWorldEvents { World world = player.worldObj; if(WorldTypeSkyblock.isWorldSkyblock(world)) { BlockPos coords = world.getSpawnPoint(); - if(world.getBlock(coords.posX, coords.posY - 4, coords.posZ) != Blocks.bedrock && world.provider.dimensionId == 0) - spawnPlayer(player, coords.posX, coords.posY, coords.posZ, false); + if(world.getBlockState(coords.down(4)).getBlock() != Blocks.bedrock && world.provider.getDimensionId() == 0) + spawnPlayer(player, coords, false); } @@ -69,12 +69,12 @@ public final class SkyblockWorldEvents { if(WorldTypeSkyblock.isWorldSkyblock(event.world)) { ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); if(event.action == Action.RIGHT_CLICK_BLOCK && equipped == null && event.entityPlayer.isSneaking()) { - Block block = event.world.getBlock(event.x, event.y, event.z); + Block block = event.world.getBlockState(event.pos).getBlock(); if(block == Blocks.grass || block == Blocks.dirt) { if(event.world.isRemote) event.entityPlayer.swingItem(); else { - event.world.playSoundEffect(event.x + 0.5, event.y + 0.5, event.z + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getPitch() + (float) (Math.random() * 0.2 - 0.1)); + event.world.playSoundEffect(event.pos.getX() + 0.5, event.pos.getY() + 0.5, event.pos.getZ() + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getFrequency() + (float) (Math.random() * 0.2 - 0.1)); if(Math.random() < 0.8) event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } @@ -84,11 +84,7 @@ public final class SkyblockWorldEvents { if(movingobjectposition != null) { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && !event.world.isRemote) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if(event.world.getBlock(i, j, k).getMaterial() == Material.water) { + if(event.world.getBlockState(event.pos).getBlock().getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) @@ -103,7 +99,7 @@ public final class SkyblockWorldEvents { @SubscribeEvent public void onDrops(HarvestDropsEvent event) { - if(WorldTypeSkyblock.isWorldSkyblock(event.world) && event.block == Blocks.tallgrass) { + if(WorldTypeSkyblock.isWorldSkyblock(event.world) && event.state.getBlock() == Blocks.tallgrass) { ItemStack stackToRemove = null; for(ItemStack stack : event.drops) if(stack.getItem() == Items.wheat_seeds && event.world.rand.nextInt(10) == 0) { @@ -118,7 +114,7 @@ public final class SkyblockWorldEvents { } } - public static void spawnPlayer(EntityPlayer player, int x, int y, int z, boolean fabricated) { + public static void spawnPlayer(EntityPlayer player, BlockPos pos, boolean fabricated) { NBTTagCompound data = player.getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); @@ -127,12 +123,12 @@ public final class SkyblockWorldEvents { final boolean test = false; if(test || !persist.getBoolean(TAG_HAS_OWN_ISLAND)) { - createSkyblock(player.worldObj, x, y, z); + createSkyblock(player.worldObj, pos); if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; - pmp.setPositionAndUpdate(x + 0.5, y + 1.6, z + 0.5); - pmp.setSpawnChunk(new BlockPos(x, y, z), true); + pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); + pmp.setSpawnChunk(pos, true, 0); // todo 1.8 verify last parm player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } @@ -154,14 +150,14 @@ public final class SkyblockWorldEvents { } } - public static void createSkyblock(World world, int x, int y, int z) { + public static void createSkyblock(World world, BlockPos pos) { for(int i = 0; i < 3; i++) for(int j = 0; j < 4; j++) for(int k = 0; k < 3; k++) - world.setBlock(x - 1 + i, y - 1 - j, z - 1 + k, j == 0 ? Blocks.grass : Blocks.dirt); - world.setBlock(x - 1, y - 2, z, Blocks.flowing_water); - world.setBlock(x + 1, y + 2, z + 1, ModBlocks.manaFlame); - ((TileManaFlame) world.getTileEntity(x + 1, y + 2, z + 1)).setColor(new Color(70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185), 70 + world.rand.nextInt(185)).getRGB()); + 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()); int[][] rootPositions = new int[][] { { -1, -3, -1 }, @@ -177,9 +173,9 @@ public final class SkyblockWorldEvents { { +0, -6, +3 }, }; for(int[] root : rootPositions) - world.setBlock(x + root[0], y + root[1], z + root[2], ModBlocks.root); + world.setBlockState(pos.add(root[0], root[1], root[2]), ModBlocks.root.getDefaultState()); - world.setBlock(x, y - 4, z, Blocks.bedrock); + world.setBlockState(pos.down(4), Blocks.bedrock.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 138d0602e..f0b4b4bbd 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -32,11 +32,6 @@ public class WorldTypeSkyblock extends WorldType { return true; } - @Override - public boolean hasVoidParticles(boolean flag) { - return false; - } - @Override public int getMinimumSpawnHeight(World world) { return 86; From b22e4852175b7bb679419127c7d2c2d5cbc1e913 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 12:21:30 -0600 Subject: [PATCH 010/935] Some of client.core.handler. Most of this will need to be migrated to layerrenderers --- .../client/core/handler/BossBarHandler.java | 6 +- .../core/handler/BoundTileRenderer.java | 19 ++---- .../handler/ContributorFancinessHandler.java | 5 +- .../client/core/handler/HUDHandler.java | 68 +++++++++---------- .../handler/ItemsRemainingRenderHandler.java | 4 +- .../client/core/handler/LightningHandler.java | 20 +++--- .../handler/PersistentVariableHelper.java | 2 +- .../core/handler/RedStringRenderer.java | 21 +++--- .../handler/SubTileRadiusRenderHandler.java | 22 +++--- .../client/gui/lexicon/GuiLexiconIndex.java | 20 +++--- .../button/GuiButtonChallengeIcon.java | 4 +- .../lexicon/button/GuiButtonInvisible.java | 8 +-- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 6 +- .../render/tile/RenderTileTinyPotato.java | 8 +-- .../subtile/functional/SubTileHopperhock.java | 4 +- .../functional/SubTileRannuncarpus.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 4 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 8 +-- .../common/block/tile/mana/TileTurntable.java | 4 +- .../common/entity/EntityDoppleganger.java | 8 +-- .../botania/common/item/ItemCraftingHalo.java | 8 +-- .../item/equipment/bauble/ItemMonocle.java | 2 +- 24 files changed, 127 insertions(+), 134 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index ec61a9366..c2f4091dd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -47,14 +47,14 @@ public final class BossBarHandler { Minecraft mc = Minecraft.getMinecraft(); Rectangle bgRect = currentBoss.getBossBarTextureRect(); Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); - String name = currentBoss.func_145748_c_().getFormattedText(); + String name = currentBoss.getDisplayName().getFormattedText(); int c = res.getScaledWidth() / 2; int x = c - bgRect.width / 2; int y = 20; int xf = x + (bgRect.width - fgRect.width) / 2; int yf = y + (bgRect.height - fgRect.height) / 2; int fw = (int) ((double) fgRect.width * (currentBoss.getHealth() / currentBoss.getMaxHealth())); - int tx = c - mc.fontRenderer.getStringWidth(name) / 2; + int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; GL11.glColor4f(1F, 1F, 1F, 1F); currentBoss.bossBarRenderCallback(res, x, y); @@ -63,7 +63,7 @@ public final class BossBarHandler { mc.renderEngine.bindTexture(currentBoss.getBossBarTexture()); drawBar(x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true); drawBar(xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false); - mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C); + mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C); GL11.glEnable(GL11.GL_BLEND); Entity e = (Entity) currentBoss; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 3a3d26dc1..b18a3c518 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -76,7 +76,7 @@ public final class BoundTileRenderer { if(stackInSlot.getItem() instanceof IExtendedWireframeCoordinateListProvider) { BlockPos coords = ((IExtendedWireframeCoordinateListProvider) stackInSlot.getItem()).getSourceWireframe(player, stackInSlot); - if(coords != null && coords.posY > -1) + if(coords != null && coords.getY() > -1) renderBlockOutlineAt(coords, color, 5F); } } @@ -94,29 +94,24 @@ public final class BoundTileRenderer { private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { GL11.glPushMatrix(); - GL11.glTranslated(pos.posX - RenderManager.renderPosX, pos.posY - RenderManager.renderPosY, pos.posZ - RenderManager.renderPosZ + 1); + GL11.glTranslated(pos.getX() - RenderManager.renderPosX, pos.getY() - RenderManager.renderPosY, pos.getZ() - RenderManager.renderPosZ + 1); Color colorRGB = new Color(color); GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; - Block block = world.getBlock(pos.posX, pos.posY, pos.posZ); + Block block = world.getBlockState(pos).getBlock(); drawWireframe : { if(block != null) { AxisAlignedBB axis; if(block instanceof IWireframeAABBProvider) - axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, , pos.posX); - else axis = block.getSelectedBoundingBoxFromPool(world, pos.posX, pos.posY, pos.posZ); + axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos); + else axis = block.getSelectedBoundingBox(world, pos); if(axis == null) break drawWireframe; - axis.minX -= pos.posX; - axis.maxX -= pos.posX; - axis.minY -= pos.posY; - axis.maxY -= pos.posY; - axis.minZ -= pos.posZ + 1; - axis.maxZ -= pos.posZ + 1; + axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); GL11.glScalef(1F, 1F, 1F); @@ -142,7 +137,7 @@ public final class BoundTileRenderer { double ay = aabb.maxY; double az = aabb.maxZ; - tessellator.startDrawing(GL11.GL_LINES); + tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES); tessellator.getWorldRenderer().addVertex(ix, iy, iz); tessellator.getWorldRenderer().addVertex(ix, ay, iz); 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 a7a83c5ca..81153953f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; +import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -45,7 +46,7 @@ public final class ContributorFancinessHandler { private static boolean phi = true; public static void render(RenderPlayerEvent.Specials event) { - String name = event.entityPlayer.getDisplayName(); + String name = event.entityPlayer.getDisplayName().getUnformattedText(); if(name.equals("Vazkii") || name.equals("_phi")) { if(phi) @@ -55,7 +56,7 @@ public final class ContributorFancinessHandler { renderGoldfish(event); name = name.toLowerCase(); - if(Minecraft.getMinecraft().gameSettings.getOptionOrdinalValue(Options.SHOW_CAPE) && flowerMap != null && flowerMap.containsKey(name)) + if(event.entityPlayer.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name)) renderFlower(event, flowerMap.get(name)); } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index b539a68ed..0e5f403eb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -100,8 +100,8 @@ public final class HUDHandler { MovingObjectPosition pos = mc.objectMouseOver; if(pos != null) { - Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ); - TileEntity tile = mc.theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + Block block = mc.theWorld.getBlockState(pos.getBlockPos()).getBlock(); + TileEntity tile = mc.theWorld.getTileEntity(pos.getBlockPos()); if(equippedStack != null) { if(pos != null && equippedStack.getItem() == ModItems.twigWand) { @@ -109,7 +109,7 @@ public final class HUDHandler { if(block instanceof IWandHUD) { profiler.startSection("wandItem"); - ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, , pos.blockX); + ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.getBlockPos()); profiler.endSection(); } } @@ -131,7 +131,7 @@ public final class HUDHandler { if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { profiler.startSection("multiblockRightClick"); String s = StatCollector.translateToLocal("botaniamisc.rightClickToAnchor"); - mc.fontRenderer.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); profiler.endSection(); } @@ -222,12 +222,12 @@ public final class HUDHandler { int color = 0x00CC00 + (alpha << 24); String disp = StatCollector.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem())); - int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(disp) / 2; + int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.fontRenderer.drawStringWithShadow(disp, x, y, color); + mc.fontRendererObj.drawStringWithShadow(disp, x, y, color); GL11.glDisable(GL11.GL_BLEND); } profiler.endSection(); @@ -288,14 +288,14 @@ public final class HUDHandler { GL11.glColor4f(1F, 1F, 1F, 1F); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x - 20, y); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y); - RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, mc.renderEngine, recipe.getOutput(), x + 26, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); if(diluted) { String s = StatCollector.translateToLocal("botaniamisc.pay2win"); - mc.fontRenderer.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, y + 20, 0xFF8888); + mc.fontRendererObj.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, y + 20, 0xFF8888); } GL11.glDisable(GL11.GL_LIGHTING); @@ -317,17 +317,17 @@ public final class HUDHandler { if(target != null) { String s1 = target.getDisplayName(); String s2 = tile.getItemCount() + "x"; - int strlen = Math.max(mc.fontRenderer.getStringWidth(s1), mc.fontRenderer.getStringWidth(s2)); + int strlen = Math.max(mc.fontRendererObj.getStringWidth(s1), mc.fontRendererObj.getStringWidth(s2)); int w = res.getScaledWidth(); int h = res.getScaledHeight(); Gui.drawRect(w / 2 + 8, h / 2 - 12, w / 2 + strlen + 32, h / 2 + 10, 0x44000000); Gui.drawRect(w / 2 + 6, h / 2 - 14, w / 2 + strlen + 34, h / 2 + 12, 0x44000000); - mc.fontRenderer.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF); - mc.fontRenderer.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF); + mc.fontRendererObj.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, target, w / 2 + 10, h / 2 - 10); + mc.getRenderItem().renderItemAndEffectIntoGUI(target, w / 2 + 10, h / 2 - 10); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } @@ -339,7 +339,7 @@ public final class HUDHandler { Profiler profiler = mc.mcProfiler; profiler.startSection("lexicon"); - FontRenderer font = mc.fontRenderer; + FontRenderer font = mc.fontRendererObj; boolean draw = false; String drawStr = ""; String secondLine = ""; @@ -350,7 +350,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, , pos.blockX, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; @@ -363,7 +363,7 @@ public final class HUDHandler { if(!draw && pos.entityHit == null) { profiler.startSection("wikiLookup"); - if(!block.isAir(mc.theWorld, pos.blockX, pos.blockY, pos.blockZ) && !(block instanceof BlockLiquid)) { + if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); String url = provider.getWikiURL(mc.theWorld, pos); if(url != null && !url.isEmpty()) { @@ -380,17 +380,17 @@ public final class HUDHandler { if(!mc.thePlayer.isSneaking()) { drawStr = "?"; secondLine = ""; - font = mc.fontRenderer; + font = mc.fontRendererObj; } - RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModItems.lexicon), sx, sy); + mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(drawStr, sx + 10, sy + 8, 0xFFFFFFFF); font.drawStringWithShadow(secondLine, sx + 10, sy + 18, 0xFFAAAAAA); if(!mc.thePlayer.isSneaking()) { GL11.glScalef(0.5F, 0.5F, 1F); - mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); + mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); GL11.glScalef(2F, 2F, 1F); } } @@ -406,7 +406,7 @@ public final class HUDHandler { String txt1 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex1"); String txt2 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex2"); - int l = Math.max(mc.fontRenderer.getStringWidth(txt0), Math.max(mc.fontRenderer.getStringWidth(txt1), mc.fontRenderer.getStringWidth(txt2))) + 20; + int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20; int x = res.getScaledWidth() - l - 20; int y = res.getScaledHeight() - 60; @@ -414,22 +414,22 @@ public final class HUDHandler { Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x44000000); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(ModBlocks.corporeaIndex), x, y + 10); + mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(ModBlocks.corporeaIndex), x, y + 10); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - mc.fontRenderer.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF); - mc.fontRenderer.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF); - mc.fontRenderer.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(txt1, x + 20, y + 14, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(txt2, x + 20, y + 24, 0xFFFFFF); } public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft mc = Minecraft.getMinecraft(); - int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2; + int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(name) / 2; int y = res.getScaledHeight() / 2 + 10; - mc.fontRenderer.drawStringWithShadow(name, x, y, color); + mc.fontRendererObj.drawStringWithShadow(name, x, y, color); x = res.getScaledWidth() / 2 - 51; y += 10; @@ -438,9 +438,9 @@ public final class HUDHandler { if(mana < 0) { String text = StatCollector.translateToLocal("botaniamisc.statusUnknown"); - x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2; + x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2; y -= 1; - mc.fontRenderer.drawString(text, x, y, color); + mc.fontRendererObj.drawString(text, x, y, color); } GL11.glDisable(GL11.GL_BLEND); @@ -456,16 +456,16 @@ public final class HUDHandler { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, bindDisplay, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(bindDisplay, x, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_DEPTH_TEST); if(properlyBound) { - mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); - mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); + mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); + mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); } else { - mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000); - mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D); + mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000); + mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D); } GL11.glEnable(GL11.GL_DEPTH_TEST); } diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index c6a5c40d1..7e9a456a4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -55,7 +55,7 @@ public final class ItemsRemainingRenderHandler { int xp = x + (int) (16F * (1F - alpha)); GL11.glTranslatef(xp, y, 0F); GL11.glScalef(alpha, 1F, 1F); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 0, 0); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 0, 0); GL11.glScalef(1F / alpha,1F, 1F); GL11.glTranslatef(-xp, -y, 0F); RenderHelper.disableStandardItemLighting(); @@ -75,7 +75,7 @@ public final class ItemsRemainingRenderHandler { text = "\u221E"; int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24; - mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 6, color); + mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 6, color); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index fa9cba3c4..ee4faeb75 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -52,7 +52,7 @@ public class LightningHandler { static double interpPosZ; private static Vector3 getRelativeViewVector(Vector3 pos) { - Entity renderEntity = Minecraft.getMinecraft().renderViewEntity; + Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); } @@ -87,16 +87,16 @@ public class LightningHandler { render.bindTexture(outsideResource); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(0xF000F0); + tessellator.getWorldRenderer().setBrightness(0xF000F0); for(LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 0, false); + renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false); tessellator.draw(); render.bindTexture(insideResource); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(0xF000F0); + tessellator.getWorldRenderer().setBrightness(0xF000F0); for(LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 1, true); + renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true); tessellator.draw(); GL11.glDisable(GL11.GL_BLEND); @@ -145,7 +145,7 @@ public class LightningHandler { Vector3 endvec = rendersegment.endpoint.point; int color = inner ? bolt.colorInner : bolt.colorOuter; - tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); + tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); @@ -324,7 +324,7 @@ public class LightningHandler { particleAge = -(int) (length * speed); boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0); - boundingBox.setBB(new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2)); + boundingBox = new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2); segments.add(new Segment(start, end)); } @@ -335,7 +335,7 @@ public class LightningHandler { public LightningBolt(World world, Vector3 sourcevec, TileEntity target, float ticksPerMeter, long seed, int colorOuter, int colorInner) { this(world, sourcevec, getFocalPoint(target), ticksPerMeter, seed, colorOuter, colorInner); - this.target = new BlockPos(target.xCoord, target.yCoord, target.zCoord); + this.target = target.getPos(); } public void setWrapper(Entity entity) { @@ -418,9 +418,9 @@ public class LightningHandler { return prevresistance; if(mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - Block block = world.getBlock(mop.blockX, mop.blockY, mop.blockZ); + Block block = world.getBlockState(mop.getBlockPos()).getBlock(); - if(world.isAirBlock(mop.blockX, mop.blockY, mop.blockZ)) + if(world.isAirBlock(mop.getBlockPos())) return prevresistance; return prevresistance + block.getExplosionResistance(source) + 0.3F; diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index e00303637..9fffdd03f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -98,7 +98,7 @@ public final class PersistentVariableHelper { if(cmp.hasKey(TAG_LEXICON_NOTES)) { NBTTagCompound notesCmp = cmp.getCompoundTag(TAG_LEXICON_NOTES); - Set keys = notesCmp.func_150296_c(); + Set keys = notesCmp.getKeySet(); GuiLexicon.notes.clear(); for(String key : keys) GuiLexicon.notes.put(key, notesCmp.getString(key)); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 9500f78ea..a15e616ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -67,13 +68,13 @@ public final class RedStringRenderer { } private static void renderTile(TileRedString tile) { - ForgeDirection dir = ForgeDirection.getOrientation(tile.getBlockMetadata()); + EnumFacing dir = tile.getOrientation(); BlockPos bind = tile.getBinding(); if(bind != null) { GL11.glPushMatrix(); - GL11.glTranslated(tile.xCoord + 0.5 - RenderManager.renderPosX, tile.yCoord + 0.5 - RenderManager.renderPosY, tile.zCoord + 0.5 - RenderManager.renderPosZ); - Vector3 vecOrig = new Vector3(bind.posX - tile.xCoord, bind.posY - tile.yCoord, bind.posZ - tile.zCoord); + GL11.glTranslated(tile.getPos().getX() + 0.5 - RenderManager.renderPosX, tile.getPos().getY() + 0.5 - RenderManager.renderPosY, tile.getPos().getZ() + 0.5 - RenderManager.renderPosZ); + Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ()); Vector3 vecNorm = vecOrig.copy().normalize(); Vector3 vecMag = vecNorm.copy().multiply(0.025); Vector3 vecApply = vecMag.copy(); @@ -82,9 +83,9 @@ public final class RedStringRenderer { Tessellator tessellator = Tessellator.getInstance(); GL11.glLineWidth(1F); - tessellator.startDrawing(GL11.GL_LINES); + tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES); - double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(10000); + double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().toLong()).nextInt(10000); double add = vecMag.mag(); double rand = Math.random() - 0.5; for(int i = 0; i < stages; i++) { @@ -101,15 +102,15 @@ public final class RedStringRenderer { } } - private static void addVertexAtWithTranslation(Tessellator tess, ForgeDirection dir, double xpos, double ypos, double zpos, double rand, double l) { + private static void addVertexAtWithTranslation(Tessellator tess, EnumFacing dir, double xpos, double ypos, double zpos, double rand, double l) { double freq = 20; double ampl = (0.15 * (Math.sin(l * 2F) * 0.5 + 0.5) + 0.1) * sizeAlpha; double randMul = 0.05; - double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.offsetX) - 1) + rand * randMul; - double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.offsetY) - 1) + rand * randMul; - double z = zpos + (dir.offsetY == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.offsetZ) - 1) + rand * randMul; + double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetX()) - 1) + rand * randMul; + double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul; + double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul; - tess.addVertex(x, y, z); + tess.getWorldRenderer().addVertex(x, y, z); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 17ee43b9b..eaf0e756b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -41,21 +41,17 @@ public final class SubTileRadiusRenderHandler { if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null) return; - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; + BlockPos bPos = pos.getBlockPos(); ItemStack stackHeld = mc.thePlayer.getCurrentEquippedItem(); if(stackHeld != null && stackHeld.getItem() == ModItems.twigWand && ItemTwigWand.getBindMode(stackHeld)) { BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); - if(coords.posY != -1) { - x = coords.posX; - y = coords.posY; - z = coords.posZ; + if(coords.getY() != -1) { + bPos = coords; } } - TileEntity tile = mc.theWorld.getTileEntity(x, y, z); + TileEntity tile = mc.theWorld.getTileEntity(bPos); if(tile == null || !(tile instanceof ISubTileContainer)) return; ISubTileContainer container = (ISubTileContainer) tile; @@ -118,9 +114,9 @@ public final class SubTileRadiusRenderHandler { public void renderCircle(BlockPos center, double radius) { GL11.glPushMatrix(); - double x = center.posX + 0.5; - double y = center.posY; - double z = center.posZ + 0.5; + double x = center.getX() + 0.5; + double y = center.getY(); + double z = center.getZ() + 0.5; GL11.glTranslated(x - RenderManager.renderPosX, y - RenderManager.renderPosY, z - RenderManager.renderPosZ); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); @@ -135,7 +131,7 @@ public final class SubTileRadiusRenderHandler { radius -= f; Tessellator tessellator = Tessellator.getInstance(); - tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); + tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); tessellator.getWorldRenderer().addVertex(0, f, 0); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; @@ -149,7 +145,7 @@ public final class SubTileRadiusRenderHandler { radius += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); + tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); tessellator.getWorldRenderer().addVertex(0, f1, 0); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; 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 3d344ad5a..eb1296bf3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -164,11 +164,11 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GL11.glColor4f(1F, 1F, 1F, 1F); drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12); } else { - boolean unicode = mc.fontRenderer.getUnicodeFlag(); - mc.fontRenderer.setUnicodeFlag(true); + boolean unicode = mc.fontRendererObj.getUnicodeFlag(); + mc.fontRendererObj.setUnicodeFlag(true); String s = StatCollector.translateToLocal("botaniamisc.typeToSearch"); - mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666); - mc.fontRenderer.setUnicodeFlag(unicode); + mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666); + mc.fontRendererObj.setUnicodeFlag(unicode); } float animationTime = 4F; @@ -185,9 +185,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { x = currentButton.xPosition - 20; y = currentButton.yPosition; - mc.fontRenderer.drawStringWithShadow("?", x, y, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF); GL11.glScalef(0.5F, 0.5F, 1F); - mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); GL11.glScalef(2F, 2F, 1F); } } @@ -198,9 +198,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { int x = currentButton.xPosition; int y = currentButton.yPosition; String s = StatCollector.translateToLocal(currentEntry.getTagline()); - boolean unicode = mc.fontRenderer.getUnicodeFlag(); - mc.fontRenderer.setUnicodeFlag(true); - int width = mc.fontRenderer.getStringWidth(s); + boolean unicode = mc.fontRendererObj.getUnicodeFlag(); + mc.fontRendererObj.setUnicodeFlag(true); + int width = mc.fontRendererObj.getStringWidth(s); GL11.glPushMatrix(); GL11.glTranslatef(x, y, 0); @@ -208,7 +208,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { Gui.drawRect(12, -30, width + 20, -2, 0x44000000); Gui.drawRect(10, -32, width + 22, -2, 0x44000000); drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF); - mc.fontRenderer.setUnicodeFlag(unicode); + mc.fontRendererObj.setUnicodeFlag(unicode); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index b75da43aa..e3fe060c9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -46,8 +46,8 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { if(challenge.complete) { GL11.glDisable(GL11.GL_DEPTH_TEST); - par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00); - par1Minecraft.fontRenderer.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D); + par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00); + par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D); GL11.glEnable(GL11.GL_DEPTH_TEST); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 5029bc516..0e2e4191a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -72,10 +72,10 @@ public class GuiButtonInvisible extends GuiButtonLexicon { drawRect(xPosition - 5, yPosition, (int) (xPosition - 5 + timeHover * 24), yPosition + height, alpha << 24 | color); GL11.glEnable(GL11.GL_ALPHA_TEST); - boolean unicode = par1Minecraft.fontRenderer.getUnicodeFlag(); - par1Minecraft.fontRenderer.setUnicodeFlag(true); - par1Minecraft.fontRenderer.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0); - par1Minecraft.fontRenderer.setUnicodeFlag(unicode); + boolean unicode = par1Minecraft.fontRendererObj.getUnicodeFlag(); + par1Minecraft.fontRendererObj.setUnicodeFlag(true); + par1Minecraft.fontRendererObj.drawString(displayString, xPosition + (showStack ? 7 : 0), yPosition + (height - 8) / 2, 0); + par1Minecraft.fontRendererObj.setUnicodeFlag(unicode); if(showStack) { GL11.glScalef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 28729ab7d..26b3d4373 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -46,7 +46,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { else { tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.showNotes")); if(parent.note != null && !parent.note.isEmpty()) - Minecraft.getMinecraft().fontRenderer.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); + Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); } int tooltipY = (tooltip.size() - 1) * 10; 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 81dcbb099..9d22741ea 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -94,16 +94,16 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { float s = 1F / 64F; GL11.glScalef(s, s, s); GL11.glDisable(GL11.GL_LIGHTING); - int l = mc.fontRenderer.getStringWidth(countStr); + int l = mc.fontRendererObj.getStringWidth(countStr); GL11.glTranslatef(0F, 55F, 0F); float tr = -16.5F; for(int i = 0; i < 4; i++) { GL11.glRotatef(90F, 0F, 1F, 0F); GL11.glTranslatef(0F, 0F, tr); - mc.fontRenderer.drawString(countStr, -l / 2, 0, color); + mc.fontRendererObj.drawString(countStr, -l / 2, 0, color); GL11.glTranslatef(0F, 0F, 0.1F); - mc.fontRenderer.drawString(countStr, -l / 2 + 1, 1, colorShade); + mc.fontRendererObj.drawString(countStr, -l / 2 + 1, 1, colorShade); GL11.glTranslatef(0F, 0F, -tr - 0.1F); } GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f8a1f09c2..5f29a8eef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -350,7 +350,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { Tessellator tessellator = Tessellator.getInstance(); GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.getWorldRenderer().startDrawingQuads(); - int i = mc.fontRenderer.getStringWidth(potato.name) / 2; + int i = mc.fontRendererObj.getStringWidth(potato.name) / 2; tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); @@ -359,7 +359,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); - mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF); + mc.fontRendererObj.drawString(potato.name, -mc.fontRendererObj.getStringWidth(potato.name) / 2, 0, 0xFFFFFF); if(name.equals("pahimar") || name.equals("soaryn")) { GL11.glTranslatef(0F, 14F, 0F); String s = name.equals("pahimar") ? "[WIP]" : "(soon)"; @@ -368,7 +368,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.getWorldRenderer().startDrawingQuads(); - i = mc.fontRenderer.getStringWidth(s) / 2; + i = mc.fontRendererObj.getStringWidth(s) / 2; tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); @@ -377,7 +377,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { tessellator.draw(); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); - mc.fontRenderer.drawString(s, -mc.fontRenderer.getStringWidth(s) / 2, 0, 0xFFFFFF); + mc.fontRendererObj.drawString(s, -mc.fontRendererObj.getStringWidth(s) / 2, 0, 0xFFFFFF); } GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 493bff6ed..4706be782 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -230,10 +230,10 @@ public class SubTileHopperhock extends SubTileFunctional { String filter = StatCollector.translateToLocal("botaniamisc.filter" + filterType); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2; + int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2; int y = res.getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(filter, x, y, color); + mc.fontRendererObj.drawStringWithShadow(filter, x, y, color); GL11.glDisable(GL11.GL_BLEND); } 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 dc803d82b..56c79bd7c 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 @@ -165,11 +165,11 @@ public class SubTileRannuncarpus extends SubTileFunctional { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(recieverStack != null && recieverStack.getItem() != null) { String stackName = recieverStack.getDisplayName(); - int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2; + int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; int y = res.getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color); + mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y); RenderHelper.disableStandardItemLighting(); 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 a008fca01..f396658c1 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 @@ -93,11 +93,11 @@ public class SubTileSpectrolus extends SubTileGenerating { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(stack != null && stack.getItem() != null) { String stackName = stack.getDisplayName(); - int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2; + int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; int y = res.getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color); + mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); RenderHelper.disableStandardItemLighting(); 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 f18207621..8a0597505 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -156,7 +156,7 @@ public class TileHourglass extends TileSimpleInventory { int time = getTotalTime(); String timeStr = StringUtils.ticksToElapsedTime(time); - mc.fontRenderer.drawStringWithShadow(timeStr, x + 20, y, getColor()); + mc.fontRendererObj.drawStringWithShadow(timeStr, x + 20, y, getColor()); String status = ""; if(lock) @@ -164,7 +164,7 @@ public class TileHourglass extends TileSimpleInventory { if(!move) status = status.isEmpty() ? "stopped" : "lockedStopped"; if(!status.isEmpty()) - mc.fontRenderer.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); + mc.fontRendererObj.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); } } 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 7e8c9c10a..47bf2c750 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 @@ -515,11 +515,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String lensName = lens.getDisplayName(); - int width = 16 + mc.fontRenderer.getStringWidth(lensName) / 2; + int width = 16 + mc.fontRendererObj.getStringWidth(lensName) / 2; int x = res.getScaledWidth() / 2 - width; int y = res.getScaledHeight() / 2 + 50; - mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color); + mc.fontRendererObj.drawStringWithShadow(lensName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, lens, x, y); RenderHelper.disableStandardItemLighting(); @@ -534,11 +534,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(recieverStack != null && recieverStack.getItem() != null) { String stackName = recieverStack.getDisplayName(); - int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2; + int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; int y = res.getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color); + mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index dbe3635cf..1386c51ad 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -84,11 +84,11 @@ public class TileTurntable extends TileMod { for(int i = 0; i < this.speed; i++) speed = speed + motion; - int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2; + int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(speed) / 2; int y = res.getScaledHeight() / 2 - 15; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.fontRenderer.drawStringWithShadow(speed, x, y, color); + mc.fontRendererObj.drawStringWithShadow(speed, x, y, color); GL11.glDisable(GL11.GL_BLEND); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index bb327161b..c15f10a96 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -826,10 +826,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, px, py); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - boolean unicode = mc.fontRenderer.getUnicodeFlag(); - mc.fontRenderer.setUnicodeFlag(true); - mc.fontRenderer.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF); - mc.fontRenderer.setUnicodeFlag(unicode); + boolean unicode = mc.fontRendererObj.getUnicodeFlag(); + mc.fontRendererObj.setUnicodeFlag(true); + mc.fontRendererObj.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF); + mc.fontRendererObj.setUnicodeFlag(unicode); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 06939e9cb..664dbe44c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -527,7 +527,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(slot == 0) { String name = craftingTable.getDisplayName(); - int l = mc.fontRenderer.getStringWidth(name); + int l = mc.fontRendererObj.getStringWidth(name); int x = resolution.getScaledWidth() / 2 - l / 2; int y = resolution.getScaledHeight() / 2 - 65; @@ -538,7 +538,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - mc.fontRenderer.drawStringWithShadow(name, x, y, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF); } else { ItemStack[] recipe = getCraftingItems(stack, slot); String label = StatCollector.translateToLocal("botaniamisc.unsetRecipe"); @@ -591,11 +591,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { int yoff = 110; if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) { String warning = EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.cantCraft"); - mc.fontRenderer.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); yoff += 12; } - mc.fontRenderer.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(label, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(label) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); } @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 8eca86f20..7e25532fe 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 @@ -100,7 +100,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, dispStack, x, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF); } public static boolean hasMonocle(EntityPlayer player) { From a1c3b00ae05d3d4106501978923c8308acbc1e3a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 12:28:02 -0600 Subject: [PATCH 011/935] client.core.fx --- .../vazkii/botania/client/fx/FXSparkle.java | 26 +++++++++++-------- .../java/vazkii/botania/client/fx/FXWisp.java | 10 ++++--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index a57b31711..62cf9bc68 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -16,6 +16,9 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -101,9 +104,9 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.setBrightness(0x0000f0); + tessellator.getWorldRenderer().setBrightness(0x0000f0); - tessellator.setColorRGBA_F(particleRed * var16, particleGreen * var16, particleBlue * var16, 1); + tessellator.getWorldRenderer().setColorRGBA_F(particleRed * var16, particleGreen * var16, particleBlue * var16, 1); tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12, var9, var11); tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12, var9, var10); tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12, var8, var10); @@ -112,7 +115,7 @@ public class FXSparkle extends EntityFX { } @Override - public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) { + public void renderParticle(WorldRenderer worldRendererIn, Entity p_180434_2_, float f, float f1, float f2, float f3, float f4, float f5) { this.f = f; this.f1 = f1; this.f2 = f2; @@ -137,7 +140,7 @@ public class FXSparkle extends EntityFX { motionY -= 0.04D * particleGravity; if (!noClip && !fake) - pushOutOfBlocks(posX, (boundingBox.minY + boundingBox.maxY) / 2.0D, posZ); + pushOutOfBlocks(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); posX += motionX; posY += motionY; @@ -170,13 +173,14 @@ public class FXSparkle extends EntityFX { double var12 = par3 - var8; double var14 = par5 - var9; - if (!worldObj.isAirBlock(var7, var8, var9)) { - boolean var16 = !worldObj.isBlockNormalCubeDefault(var7 - 1, var8, var9, false); - boolean var17 = !worldObj.isBlockNormalCubeDefault(var7 + 1, var8, var9, false); - boolean var18 = !worldObj.isBlockNormalCubeDefault(var7, var8 - 1, var9, false); - boolean var19 = !worldObj.isBlockNormalCubeDefault(var7, var8 + 1, var9, false); - boolean var20 = !worldObj.isBlockNormalCubeDefault(var7, var8, var9 - 1, false); - boolean var21 = !worldObj.isBlockNormalCubeDefault(var7, var8, var9 + 1, false); + BlockPos bPos = new BlockPos(var7, var8, var9); + if (!worldObj.isAirBlock(bPos)) { + boolean var16 = !worldObj.isBlockNormalCube(bPos.west(), false); + boolean var17 = !worldObj.isBlockNormalCube(bPos.east(), false); + boolean var18 = !worldObj.isBlockNormalCube(bPos.down(), false); + boolean var19 = !worldObj.isBlockNormalCube(bPos.up(), false); + boolean var20 = !worldObj.isBlockNormalCube(bPos.north(), false); + boolean var21 = !worldObj.isBlockNormalCube(bPos.south(), false); byte var22 = -1; double var23 = 9999.0D; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index bb54b2682..1cc2a26b1 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -16,6 +16,8 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -57,7 +59,7 @@ public class FXWisp extends EntityFX { moteHalfLife = particleMaxAge / 2; noClip = true; setSize(0.01F, 0.01F); - EntityLivingBase renderentity = FMLClientHandler.instance().getClient().renderViewEntity; + Entity renderentity = FMLClientHandler.instance().getClient().getRenderViewEntity(); if(distanceLimit) { int visibleDistance = 50; @@ -117,8 +119,8 @@ public class FXWisp extends EntityFX { float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); - tessellator.setBrightness(240); - tessellator.setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F); + tessellator.getWorldRenderer().setBrightness(240); + tessellator.getWorldRenderer().setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F); tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1); tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1); tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, 1, 0); @@ -126,7 +128,7 @@ public class FXWisp extends EntityFX { } @Override - public void renderParticle(Tessellator tessellator, float f, float f1, float f2, float f3, float f4, float f5) { + public void renderParticle(WorldRenderer wr, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { this.f = f; this.f1 = f1; this.f2 = f2; From afb9650b12d0f6f3c9cde36a445daa50827f5b8f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 15:49:58 -0600 Subject: [PATCH 012/935] Update EntityThrowableCopy to 1.8 ver --- .../common/entity/EntityThrowableCopy.java | 298 +++++++++--------- 1 file changed, 147 insertions(+), 151 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 431e9720c..c094097a9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -19,10 +19,7 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -30,11 +27,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable // And we all know how much mods like deflecting EntityThrowables -public abstract class EntityThrowableCopy extends Entity implements IProjectile { - private int field_145788_c = -1; - private int field_145786_d = -1; - private int field_145787_e = -1; - private Block field_145785_f; +public abstract class EntityThrowableCopy extends Entity implements IProjectile +{ + private int xTile = -1; + private int yTile = -1; + private int zTile = -1; + private Block inTile; protected boolean inGround; public int throwableShake; /** The entity that threw this throwable item. */ @@ -42,177 +40,174 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile private String throwerName; private int ticksInGround; private int ticksInAir; - public EntityThrowableCopy(World p_i1776_1_) + private static final String __OBFID = "CL_00001723"; + + public EntityThrowable(World worldIn) { - super(p_i1776_1_); - setSize(0.25F, 0.25F); + super(worldIn); + this.setSize(0.25F, 0.25F); } - @Override protected void entityInit() {} /** * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge * length * 64 * renderDistanceWeight Args: distance */ - @Override @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(double p_70112_1_) + public boolean isInRangeToRenderDist(double distance) { - double d1 = boundingBox.getAverageEdgeLength() * 4.0D; + double d1 = this.getEntityBoundingBox().getAverageEdgeLength() * 4.0D; d1 *= 64.0D; - return p_70112_1_ < d1 * d1; + return distance < d1 * d1; } - public EntityThrowableCopy(World p_i1777_1_, EntityLivingBase p_i1777_2_) + public EntityThrowable(World worldIn, EntityLivingBase throwerIn) { - super(p_i1777_1_); - thrower = p_i1777_2_; - setSize(0.25F, 0.25F); - setLocationAndAngles(p_i1777_2_.posX, p_i1777_2_.posY + p_i1777_2_.getEyeHeight(), p_i1777_2_.posZ, p_i1777_2_.rotationYaw, p_i1777_2_.rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float)Math.PI) * 0.16F; - posY -= 0.10000000149011612D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float)Math.PI) * 0.16F; - setPosition(posX, posY, posZ); - yOffset = 0.0F; + super(worldIn); + this.thrower = throwerIn; + this.setSize(0.25F, 0.25F); + this.setLocationAndAngles(throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight(), throwerIn.posZ, throwerIn.rotationYaw, throwerIn.rotationPitch); + this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.posY -= 0.10000000149011612D; + this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); + this.setPosition(this.posX, this.posY, this.posZ); float f = 0.4F; - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float)Math.PI) * f; - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float)Math.PI) * f; - motionY = -MathHelper.sin((rotationPitch + func_70183_g()) / 180.0F * (float)Math.PI) * f; - setThrowableHeading(motionX, motionY, motionZ, func_70182_d(), 1.0F); + this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * f); + this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * f); + this.motionY = (double)(-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * (float)Math.PI) * f); + this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F); } - public EntityThrowableCopy(World p_i1778_1_, double p_i1778_2_, double p_i1778_4_, double p_i1778_6_) + public EntityThrowable(World worldIn, double x, double y, double p_i1778_6_) { - super(p_i1778_1_); - ticksInGround = 0; - setSize(0.25F, 0.25F); - setPosition(p_i1778_2_, p_i1778_4_, p_i1778_6_); - yOffset = 0.0F; + super(worldIn); + this.ticksInGround = 0; + this.setSize(0.25F, 0.25F); + this.setPosition(x, y, p_i1778_6_); } - protected float func_70182_d() + protected float getVelocity() { return 1.5F; } - protected float func_70183_g() + protected float getInaccuracy() { return 0.0F; } /** * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. + * + * @param inaccuracy Higher means more error. */ - @Override - public void setThrowableHeading(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_) + public void setThrowableHeading(double x, double y, double z, float velocity, float inaccuracy) { - float f2 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_3_ * p_70186_3_ + p_70186_5_ * p_70186_5_); - p_70186_1_ /= f2; - p_70186_3_ /= f2; - p_70186_5_ /= f2; - p_70186_1_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_; - p_70186_3_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_; - p_70186_5_ += rand.nextGaussian() * 0.007499999832361937D * p_70186_8_; - p_70186_1_ *= p_70186_7_; - p_70186_3_ *= p_70186_7_; - p_70186_5_ *= p_70186_7_; - motionX = p_70186_1_; - motionY = p_70186_3_; - motionZ = p_70186_5_; - float f3 = MathHelper.sqrt_double(p_70186_1_ * p_70186_1_ + p_70186_5_ * p_70186_5_); - prevRotationYaw = rotationYaw = (float)(Math.atan2(p_70186_1_, p_70186_5_) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float)(Math.atan2(p_70186_3_, f3) * 180.0D / Math.PI); - ticksInGround = 0; + float f2 = MathHelper.sqrt_double(x * x + y * y + z * z); + x /= (double)f2; + y /= (double)f2; + z /= (double)f2; + x += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + y += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + z += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + x *= (double)velocity; + y *= (double)velocity; + z *= (double)velocity; + this.motionX = x; + this.motionY = y; + this.motionZ = z; + float f3 = MathHelper.sqrt_double(x * x + z * z); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(y, (double)f3) * 180.0D / Math.PI); + this.ticksInGround = 0; } /** * Sets the velocity to the args. Args: x, y, z */ - @Override @SideOnly(Side.CLIENT) - public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) + public void setVelocity(double x, double y, double z) { - motionX = p_70016_1_; - motionY = p_70016_3_; - motionZ = p_70016_5_; + this.motionX = x; + this.motionY = y; + this.motionZ = z; - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_); - prevRotationYaw = rotationYaw = (float)(Math.atan2(p_70016_1_, p_70016_5_) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float)(Math.atan2(p_70016_3_, f) * 180.0D / Math.PI); + float f = MathHelper.sqrt_double(x * x + z * z); + this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(y, (double)f) * 180.0D / Math.PI); } } /** * Called to update the entity's position/logic. */ - @Override public void onUpdate() { - lastTickPosX = posX; - lastTickPosY = posY; - lastTickPosZ = posZ; + this.lastTickPosX = this.posX; + this.lastTickPosY = this.posY; + this.lastTickPosZ = this.posZ; super.onUpdate(); - if (throwableShake > 0) + if (this.throwableShake > 0) { - --throwableShake; + --this.throwableShake; } - if (inGround) + if (this.inGround) { - if (worldObj.getBlock(field_145788_c, field_145786_d, field_145787_e) == field_145785_f) + if (this.worldObj.getBlockState(new BlockPos(this.xTile, this.yTile, this.zTile)).getBlock() == this.inTile) { - ++ticksInGround; + ++this.ticksInGround; - if (ticksInGround == 1200) + if (this.ticksInGround == 1200) { - setDead(); + this.setDead(); } return; } - inGround = false; - motionX *= rand.nextFloat() * 0.2F; - motionY *= rand.nextFloat() * 0.2F; - motionZ *= rand.nextFloat() * 0.2F; - ticksInGround = 0; - ticksInAir = 0; + this.inGround = false; + this.motionX *= (double)(this.rand.nextFloat() * 0.2F); + this.motionY *= (double)(this.rand.nextFloat() * 0.2F); + this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.ticksInGround = 0; + this.ticksInAir = 0; } else { - ++ticksInAir; + ++this.ticksInAir; } - Vec3 vec3 = new Vec3(posX, posY, posZ); - Vec3 vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); - MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3, vec31); - vec3 = new Vec3(posX, posY, posZ); - vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); + Vec3 vec3 = new Vec3(this.posX, this.posY, this.posZ); + Vec3 vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); + vec3 = new Vec3(this.posX, this.posY, this.posZ); + vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { vec31 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); } - if (!worldObj.isRemote) + if (!this.worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; - EntityLivingBase entitylivingbase = getThrower(); + EntityLivingBase entitylivingbase = this.getThrower(); for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity)list.get(j); - if (entity1.canBeCollidedWith() && (entity1 != entitylivingbase || ticksInAir >= 5)) + if (entity1.canBeCollidedWith() && (entity1 != entitylivingbase || this.ticksInAir >= 5)) { float f = 0.3F; - AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f, f, f); + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double)f, (double)f, (double)f); MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); if (movingobjectposition1 != null) @@ -236,63 +231,63 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (movingobjectposition != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ) == Blocks.portal) + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - setInPortal(); + this.setInPortal(); } else { - onImpact(movingobjectposition); + this.onImpact(movingobjectposition); } } - posX += motionX; - posY += motionY; - posZ += motionZ; - float f1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - rotationYaw = (float)(Math.atan2(motionX, motionZ) * 180.0D / Math.PI); + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (rotationPitch = (float)(Math.atan2(motionY, f1) * 180.0D / Math.PI); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } - while (rotationPitch - prevRotationPitch >= 180.0F) + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { - prevRotationPitch += 360.0F; + this.prevRotationPitch += 360.0F; } - while (rotationYaw - prevRotationYaw < -180.0F) + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { - prevRotationYaw -= 360.0F; + this.prevRotationYaw -= 360.0F; } - while (rotationYaw - prevRotationYaw >= 180.0F) + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { - prevRotationYaw += 360.0F; + this.prevRotationYaw += 360.0F; } - rotationPitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F; - rotationYaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F; + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; float f2 = 0.99F; - float f3 = getGravityVelocity(); + float f3 = this.getGravityVelocity(); - if (isInWater()) + if (this.isInWater()) { for (int i = 0; i < 4; ++i) { float f4 = 0.25F; - worldObj.spawnParticle("bubble", posX - motionX * f4, posY - motionY * f4, posZ - motionZ * f4, motionX, motionY, motionZ); + this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f4, this.posY - this.motionY * (double)f4, this.posZ - this.motionZ * (double)f4, this.motionX, this.motionY, this.motionZ, new int[0]); } f2 = 0.8F; } - motionX *= f2; - motionY *= f2; - motionZ *= f2; - motionY -= f3; - setPosition(posX, posY, posZ); + this.motionX *= (double)f2; + this.motionY *= (double)f2; + this.motionZ *= (double)f2; + this.motionY -= (double)f3; + this.setPosition(this.posX, this.posY, this.posZ); } /** @@ -311,58 +306,59 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - @Override - public void writeEntityToNBT(NBTTagCompound p_70014_1_) + public void writeEntityToNBT(NBTTagCompound tagCompound) { - p_70014_1_.setShort("xTile", (short)field_145788_c); - p_70014_1_.setShort("yTile", (short)field_145786_d); - p_70014_1_.setShort("zTile", (short)field_145787_e); - p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(field_145785_f)); - p_70014_1_.setByte("shake", (byte)throwableShake); - p_70014_1_.setByte("inGround", (byte)(inGround ? 1 : 0)); + tagCompound.setShort("xTile", (short)this.xTile); + tagCompound.setShort("yTile", (short)this.yTile); + tagCompound.setShort("zTile", (short)this.zTile); + ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); + tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); + tagCompound.setByte("shake", (byte)this.throwableShake); + tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); - if ((throwerName == null || throwerName.length() == 0) && thrower != null && thrower instanceof EntityPlayer) + if ((this.throwerName == null || this.throwerName.length() == 0) && this.thrower instanceof EntityPlayer) { - throwerName = thrower.getCommandSenderName(); + this.throwerName = this.thrower.getCommandSenderName(); } - p_70014_1_.setString("ownerName", throwerName == null ? "" : throwerName); + tagCompound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - @Override - public void readEntityFromNBT(NBTTagCompound p_70037_1_) + public void readEntityFromNBT(NBTTagCompound tagCompund) { - field_145788_c = p_70037_1_.getShort("xTile"); - field_145786_d = p_70037_1_.getShort("yTile"); - field_145787_e = p_70037_1_.getShort("zTile"); - field_145785_f = Block.getBlockById(p_70037_1_.getByte("inTile") & 255); - throwableShake = p_70037_1_.getByte("shake") & 255; - inGround = p_70037_1_.getByte("inGround") == 1; - throwerName = p_70037_1_.getString("ownerName"); + this.xTile = tagCompund.getShort("xTile"); + this.yTile = tagCompund.getShort("yTile"); + this.zTile = tagCompund.getShort("zTile"); - if (throwerName != null && throwerName.length() == 0) + if (tagCompund.hasKey("inTile", 8)) { - throwerName = null; + this.inTile = Block.getBlockFromName(tagCompund.getString("inTile")); + } + else + { + this.inTile = Block.getBlockById(tagCompund.getByte("inTile") & 255); } - } - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() - { - return 0.0F; + this.throwableShake = tagCompund.getByte("shake") & 255; + this.inGround = tagCompund.getByte("inGround") == 1; + this.throwerName = tagCompund.getString("ownerName"); + + if (this.throwerName != null && this.throwerName.length() == 0) + { + this.throwerName = null; + } } public EntityLivingBase getThrower() { - if (thrower == null && throwerName != null && throwerName.length() > 0) + if (this.thrower == null && this.throwerName != null && this.throwerName.length() > 0) { - thrower = worldObj.getPlayerEntityByName(throwerName); + this.thrower = this.worldObj.getPlayerEntityByName(this.throwerName); } - return thrower; + return this.thrower; } } \ No newline at end of file From b07cac07a06f43f1a422157c15de8076960c4db4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 15:50:23 -0600 Subject: [PATCH 013/935] Fix the ctors oops --- .../vazkii/botania/common/entity/EntityThrowableCopy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index c094097a9..1e1b81e10 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -42,7 +42,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile private int ticksInAir; private static final String __OBFID = "CL_00001723"; - public EntityThrowable(World worldIn) + public EntityThrowableCopy(World worldIn) { super(worldIn); this.setSize(0.25F, 0.25F); @@ -62,7 +62,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile return distance < d1 * d1; } - public EntityThrowable(World worldIn, EntityLivingBase throwerIn) + public EntityThrowableCopy(World worldIn, EntityLivingBase throwerIn) { super(worldIn); this.thrower = throwerIn; @@ -79,7 +79,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F); } - public EntityThrowable(World worldIn, double x, double y, double p_i1778_6_) + public EntityThrowableCopy(World worldIn, double x, double y, double p_i1778_6_) { super(worldIn); this.ticksInGround = 0; From 88ca096ae08217e2cfd2fd54d499e2fdd5a66098 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Nov 2015 19:48:26 -0600 Subject: [PATCH 014/935] client.gui.lexicon --- .../client/gui/lexicon/GuiLexicon.java | 9 +++++---- .../gui/lexicon/GuiLexiconChallenge.java | 8 +++++--- .../gui/lexicon/GuiLexiconChallengesList.java | 5 +++-- .../client/gui/lexicon/GuiLexiconEntry.java | 13 ++++++------ .../client/gui/lexicon/GuiLexiconIndex.java | 20 ++++++++++--------- .../lexicon/button/GuiButtonAchievement.java | 4 ++-- .../gui/lexicon/button/GuiButtonBack.java | 4 ++-- .../gui/lexicon/button/GuiButtonBookmark.java | 4 ++-- .../button/GuiButtonChallengeIcon.java | 6 +++--- .../button/GuiButtonChallengeInfo.java | 4 ++-- .../lexicon/button/GuiButtonChallenges.java | 4 ++-- .../gui/lexicon/button/GuiButtonDoot.java | 10 +++++----- .../gui/lexicon/button/GuiButtonHistory.java | 4 ++-- .../lexicon/button/GuiButtonInvisible.java | 8 ++++---- .../gui/lexicon/button/GuiButtonLexicon.java | 4 ++-- .../gui/lexicon/button/GuiButtonNotes.java | 4 ++-- .../gui/lexicon/button/GuiButtonOptions.java | 4 ++-- .../gui/lexicon/button/GuiButtonPage.java | 4 ++-- .../gui/lexicon/button/GuiButtonShare.java | 4 ++-- .../button/GuiButtonUpdateWarning.java | 4 ++-- .../lexicon/button/GuiButtonViewOnline.java | 4 ++-- 21 files changed, 69 insertions(+), 62 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index e569972b6..4ea0dd2af 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; import java.util.ArrayDeque; import java.util.ArrayList; @@ -294,7 +295,7 @@ public class GuiLexicon extends GuiScreen { public void drawBookmark(int x, int y, String s, boolean drawLeft, int color) { // This function is called from the buttons so I can't use fontRendererObj - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); int l = font.getStringWidth(s); @@ -424,7 +425,7 @@ public class GuiLexicon extends GuiScreen { public int bookmarkWidth(String b) { if(fontRendererObj == null) - fontRendererObj = Minecraft.getMinecraft().fontRenderer; + fontRendererObj = Minecraft.getMinecraft().fontRendererObj; boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); @@ -557,7 +558,7 @@ public class GuiLexicon extends GuiScreen { } @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) throws IOException { handleNoteKey(par1, par2); if(!notesEnabled && closeScreenOnInvKey() && mc.gameSettings.keyBindInventory.getKeyCode() == par2) { @@ -568,7 +569,7 @@ public class GuiLexicon extends GuiScreen { if(par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147673_a(new ResourceLocation("botania:way"))); + mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("botania:way"))); konamiIndex = 0; } } else konamiIndex = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 5f852aedc..879d6e50a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -27,6 +27,8 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.common.lexicon.page.PageText; +import java.io.IOException; + public class GuiLexiconChallenge extends GuiLexicon implements IParented { private static final String TAG_CHALLENGE = "challenge"; @@ -65,7 +67,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(fontRendererObj, mc.renderEngine, challenge.icon, left + 18, top + 15); + mc.getRenderItem().renderItemIntoGUI(challenge.icon, left + 18, top + 15); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); @@ -95,7 +97,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); if(par3 == 1) @@ -124,7 +126,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 66484f628..f8d29c09c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; import java.util.List; import net.minecraft.client.gui.GuiButton; @@ -84,7 +85,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); if(par3 == 1) @@ -108,7 +109,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 80eb85c29..79bdeece0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; import java.util.List; @@ -272,7 +273,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); fx = par1; @@ -290,7 +291,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa } @Override - public void handleMouseInput() { + public void handleMouseInput() throws IOException { super.handleMouseInput(); if(Mouse.getEventButton() == 0) @@ -328,14 +329,14 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } void nextPage() { if(rightButton.enabled) { actionPerformed(rightButton); - rightButton.func_146113_a(mc.getSoundHandler()); + rightButton.playPressSound(mc.getSoundHandler()); updateNote(); } } @@ -343,7 +344,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa void prevPage() { if(leftButton.enabled) { actionPerformed(leftButton); - leftButton.func_146113_a(mc.getSoundHandler()); + leftButton.playPressSound(mc.getSoundHandler()); updateNote(); } } @@ -400,7 +401,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen()); + GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen() {}); // todo 1.8 check anonymous class gui.page = page; gui.setTitle(); return gui; 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 eb1296bf3..e2cafe235 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.lexicon; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -107,7 +108,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { buttonList.add(leftButton = new GuiButtonPage(13, left, top + guiHeight - 10, false)); buttonList.add(rightButton = new GuiButtonPage(14, left + guiWidth - 18, top + guiHeight - 10, true)); - searchField = new GuiTextField(fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10); + // todo 1.8 verify componentID + searchField = new GuiTextField(15, fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10); searchField.setCanLoseFocus(false); searchField.setFocused(true); searchField.setEnableBackgroundDrawing(false); @@ -214,15 +216,15 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GL11.glEnable(GL12.GL_RESCALE_NORMAL); ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); - RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, paper, 14, -28); + mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); // todo 1.8 text List stacks = currentEntry.getDisplayedRecipes(); if(stacks.size() > 0) { int spaceForEach = Math.min(18, (width - 30) / stacks.size()); for(int i = 0; i < stacks.size(); i++) { ItemStack stack = stacks.get(i); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, 38 + spaceForEach * i, -28); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 38 + spaceForEach * i, -28); } } @@ -330,7 +332,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - protected void mouseClicked(int par1, int par2, int par3) { + protected void mouseClicked(int par1, int par2, int par3) throws IOException { super.mouseClicked(par1, par2, par3); searchField.mouseClicked(par1, par2, par3); @@ -349,7 +351,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - public void handleMouseInput() { + public void handleMouseInput() throws IOException { super.handleMouseInput(); if(Mouse.getEventButton() == 0) @@ -394,21 +396,21 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { void back() { if(backButton.enabled) { actionPerformed(backButton); - backButton.func_146113_a(mc.getSoundHandler()); + backButton.playPressSound(mc.getSoundHandler()); } } void nextPage() { if(rightButton.enabled) { actionPerformed(rightButton); - rightButton.func_146113_a(mc.getSoundHandler()); + rightButton.playPressSound(mc.getSoundHandler()); } } void prevPage() { if(leftButton.enabled) { actionPerformed(leftButton); - leftButton.func_146113_a(mc.getSoundHandler()); + leftButton.playPressSound(mc.getSoundHandler()); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 822add343..9284737f5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -30,8 +30,8 @@ public class GuiButtonAchievement extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 465127cad..1c2d07a52 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -29,8 +29,8 @@ public class GuiButtonBack extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 8f972bb1e..ab0c49fcc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -21,8 +21,8 @@ public class GuiButtonBookmark extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); if(displayString.equals("+")) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index e3fe060c9..92c71b23d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -35,12 +35,12 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, challenge.icon, xPosition, yPosition); + par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, xPosition, yPosition); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 0dd4fe65a..2d7d6fffa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -30,8 +30,8 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 826dfa2c5..816ce512a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -30,8 +30,8 @@ public class GuiButtonChallenges extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); 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 1b2646b9e..03404cc16 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,13 +35,13 @@ public class GuiButtonDoot extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); - par1Minecraft.renderEngine.bindTexture(TextureMap.locationItemsTexture); + par1Minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GL11.glColor4f(1F, 1F, 1F, 1F); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, new ItemStack(ModItems.cacophonium), xPosition, yPosition); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), xPosition, yPosition); + par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.fireworks), xPosition + 8, yPosition + 2); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index b5f1fd75e..98c9780cc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -31,8 +31,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { @Override public void drawButton(Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); List tooltip = new ArrayList(); tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 0e2e4191a..6f9d84422 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -37,8 +37,8 @@ public class GuiButtonInvisible extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); boolean showStack = displayStack != null && !displayString.isEmpty(); if(!displayString.isEmpty() && k == 2) { @@ -59,7 +59,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { key = format.charAt(1); for(EnumChatFormatting ecf : EnumChatFormatting.class.getEnumConstants()) - if(ecf.getFormattingCode() == key) { + if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { // todo 1.8 recheck (want last char of code) if(ecf.ordinal() > 15) ecf = EnumChatFormatting.BLACK; color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()]; @@ -81,7 +81,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { GL11.glScalef(0.5F, 0.5F, 0.5F); RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(par1Minecraft.fontRenderer, par1Minecraft.renderEngine, displayStack, xPosition * 2 - 6, yPosition * 2 + 4); + par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, xPosition * 2 - 6, yPosition * 2 + 4); RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index b352679b9..56e717a22 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -22,8 +22,8 @@ public class GuiButtonLexicon extends GuiButton { } @Override - public void func_146113_a(SoundHandler p_146113_1_) { - p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F)); + public void playPressSound(SoundHandler p_146113_1_) { + p_146113_1_.playSound(PositionedSoundRecord.create(new ResourceLocation("botania:lexiconPage"), 1.0F)); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 26b3d4373..25ede9c6e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -33,8 +33,8 @@ public class GuiButtonNotes extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 013f9bceb..476a85275 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -30,8 +30,8 @@ public class GuiButtonOptions extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index fdd0bc7e8..fa2436b5c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -32,8 +32,8 @@ public class GuiButtonPage extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { if(enabled) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 339cc48dd..4ee5896d5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -30,8 +30,8 @@ public class GuiButtonShare extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 7f50bc672..b1262f39c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -35,8 +35,8 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { if(!visible || !enabled) return; - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 3cfb30b45..0c1e39773 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -30,8 +30,8 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { - field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; - int k = getHoverState(field_146123_n); + hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; + int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); GL11.glColor4f(1F, 1F, 1F, 1F); From 29e42d86eae2bbe6c5186f93f3df06bf06a068f5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Nov 2015 13:15:32 -0600 Subject: [PATCH 015/935] Some of client.render.tile --- .../render/tile/RenderTileAlfPortal.java | 5 ++--- .../client/render/tile/RenderTileAltar.java | 8 +++---- .../client/render/tile/RenderTileAvatar.java | 4 ++-- .../client/render/tile/RenderTileBellows.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 4 +--- .../client/render/tile/RenderTileCocoon.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 6 +++--- .../render/tile/RenderTileCorporeaIndex.java | 4 ++-- .../render/tile/RenderTileEnchanter.java | 8 +++---- .../render/tile/RenderTileFloatingFlower.java | 5 ++--- .../render/tile/RenderTileHourglass.java | 4 ++-- .../render/tile/RenderTileIncensePlate.java | 5 ++--- .../render/tile/RenderTileLightRelay.java | 21 ++++++++++--------- .../client/render/tile/RenderTilePool.java | 7 +++---- .../client/render/tile/RenderTilePrism.java | 4 ++-- .../client/render/tile/RenderTilePump.java | 2 +- .../client/render/tile/RenderTilePylon.java | 4 ++-- .../render/tile/RenderTileRedString.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 6 ++---- .../render/tile/RenderTileSkullOverride.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 5 ++--- .../render/tile/RenderTileSpawnerClaw.java | 2 +- .../render/tile/RenderTileSpreader.java | 6 +++--- .../render/tile/RenderTileStarfield.java | 4 ++-- .../render/tile/RenderTileTerraPlate.java | 4 ++-- .../render/tile/RenderTileTeruTeruBozu.java | 4 ++-- .../render/tile/RenderTileTinyPotato.java | 8 +++---- 27 files changed, 63 insertions(+), 75 deletions(-) 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 81ba71884..856828d23 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -26,7 +25,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal; public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileAlfPortal portal = (TileAlfPortal) tileentity; int meta = portal.getBlockMetadata(); if(meta == 0) @@ -70,7 +69,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(brightness); + tessellator.getWorldRenderer().setBrightness(brightness); tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 601de93de..24acecb7d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -22,7 +22,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -50,11 +49,10 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { private static final ResourceLocation textureMossy = new ResourceLocation(LibResources.MODEL_ALTAR_MOSSY); ModelAltar model = new ModelAltar(); - RenderItem renderItem = new RenderItem(); public static int forceMeta = -1; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { TileAltar altar = (TileAltar) tileentity; GL11.glPushMatrix(); @@ -120,7 +118,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GL11.glColor4f(1F, 1F, 1F, 1F); ItemStack stack = altar.getStackInSlot(i); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); IIcon icon = stack.getItem().getIcon(stack, 0); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); @@ -171,7 +169,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); if(brightness != -1) - tessellator.setBrightness(brightness); + tessellator.getWorldRenderer().setBrightness(brightness); tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); 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 1ef5abc1b..9297d0267 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -42,7 +42,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { TileAvatar avatar = (TileAvatar) tileentity; GL11.glPushMatrix(); @@ -61,7 +61,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { ItemStack stack = avatar.getStackInSlot(0); if(stack != null) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; GL11.glScalef(s, s, s); GL11.glRotatef(90F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index a67b02c3e..6c61af209 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -32,7 +32,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileBellows bellows = (TileBellows) tileentity; GL11.glPushMatrix(); 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 e2812ef9f..eee982839 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -15,7 +15,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -23,7 +22,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -43,7 +41,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public static boolean rotate = true; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { brewery = (TileBrewery) tileentity; GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); 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 ff7b4679b..5aeb843d5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -28,7 +28,7 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { ModelCocoon model = new ModelCocoon(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileCocoon cocoon = (TileCocoon) tileentity; float rot = 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 9d22741ea..b40bafa7c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -36,11 +36,11 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { EntityItem entity = null; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileentity; if(entity == null) - entity = new EntityItem(cube.getWorld(), cube.xCoord, cube.yCoord, cube.zCoord, new ItemStack(Blocks.stone)); + entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone)); entity.age = ClientTickHandler.ticksInGame; ItemStack stack = cube.getRequestTarget(); @@ -67,7 +67,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { GL11.glTranslatef(0F, 0.8F, 0F); GL11.glScalef(s, s, s); GL11.glRotatef(180F, 0F, 0F, 1F); - ((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, f); + ((Render) mc.getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, f); GL11.glPopMatrix(); mc.renderEngine.bindTexture(texture); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 3e66131aa..f057b9a3c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -29,7 +29,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { public static boolean move = true; @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks) { + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks, int digProgress) { TileCorporeaIndex index = (TileCorporeaIndex) tile; GL11.glPushMatrix(); @@ -50,7 +50,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { double starX = Math.cos(rads) * starRadius; double starZ = Math.sin(rads) * starRadius; int color = 0xFF00FF; - int seed = index.xCoord ^ index.yCoord ^ index.zCoord; + int seed = index.getPos().getX() ^ index.getPos().getY() ^ index.getPos().getZ(); GL11.glTranslated(starX, 0.3, starZ); RenderHelper.renderStar(color, starScale, starScale, starScale, seed); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 2c0f73188..ccc68157b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -31,11 +30,10 @@ import vazkii.botania.common.block.tile.TileEnchanter; public class RenderTileEnchanter extends TileEntitySpecialRenderer { - RenderItem renderItem = new RenderItem(); EntityItem item; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileEnchanter enchanter = (TileEnchanter) tileentity; float alphaMod = 0F; @@ -48,14 +46,14 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { if(enchanter.itemToEnchant != null) { if(item == null) - item = new EntityItem(enchanter.getWorld(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); + item = new EntityItem(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant); item.age = ClientTickHandler.ticksInGame; item.setEntityItemStack(enchanter.itemToEnchant); GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glTranslatef(0.5F, 1.25F, 0.5F); - ((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f); + ((Render) Minecraft.getMinecraft().getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f); GL11.glTranslatef(-0.5F, -1.25F, -0.5F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 9809782f8..f9b178ea9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -32,7 +31,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { private static final ModelMiniIsland model = new ModelMiniIsland(); @Override - public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t) { + public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { IFloatingFlower flower = (IFloatingFlower) tile; GL11.glPushMatrix(); GL11.glColor4f(1F, 1F, 1F, 1F); @@ -40,7 +39,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) - worldTime += new Random(tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(1000); + worldTime += new Random(tile.getPos().toLong()).nextInt(1000); GL11.glTranslatef(0.5F, 0F, 0.5F); GL11.glRotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 5d9ffbcd4..dee5b1534 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -31,7 +31,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { ModelHourglass model = new ModelHourglass(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileHourglass hourglass = (TileHourglass) tileentity; GL11.glPushMatrix(); @@ -43,7 +43,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame; if(wtime != 0) - wtime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360); + wtime += new Random(tileentity.getPos().toLong()).nextInt(360); float time = wtime == 0 ? 0 : wtime + ticks; float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 4ee7d335a..aa9c0ca08 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -39,7 +38,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { ModelIncensePlate model = new ModelIncensePlate(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileIncensePlate plate = (TileIncensePlate) tileentity; int meta = plate.getWorld() != null ? plate.getBlockMetadata() : 0; @@ -60,7 +59,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { ItemStack stack = plate.getStackInSlot(0); if(stack != null) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; GL11.glTranslatef(0.1F, -1.46F, 0F); GL11.glScalef(s, s, s); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 28c955325..a6994b13a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.BlockLightRelay; public class RenderTileLightRelay extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks) { + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) { Minecraft mc = Minecraft.getMinecraft(); IIcon iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; @@ -46,9 +46,9 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { Tessellator tessellator = Tessellator.getInstance(); GL11.glPushMatrix(); - float r = 180.0F - RenderManager.instance.playerViewY; + float r = 180.0F - mc.getRenderManager().playerViewY; GL11.glRotatef(r, 0F, 1F, 0F); - GL11.glRotatef(-RenderManager.instance.playerViewX, 1F, 0F, 0F); + GL11.glRotatef(-mc.getRenderManager().playerViewX, 1F, 0F, 0F); float off = 0.25F; GL11.glTranslatef(0F, off, 0F); @@ -64,6 +64,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } + // todo 1.8 looks like vanilla copypasta, update it private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) { float f = p_77026_2_.getMinU(); float f1 = p_77026_2_.getMaxU(); @@ -73,13 +74,13 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.startDrawingQuads(); - p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.setBrightness(240); - p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().startDrawingQuads(); + p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().setBrightness(240); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 03f6e8810..491780ddc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -40,14 +40,13 @@ public class RenderTilePool extends TileEntitySpecialRenderer { private static final ResourceLocation textureDil = new ResourceLocation(LibResources.MODEL_DILUTED_POOL); private static final ModelPool model = new ModelPool(); - RenderItem renderItem = new RenderItem(); public static int forceMeta = 0; public static boolean forceMana = false; public static int forceManaNumber = -1; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TilePool pool = (TilePool) tileentity; GL11.glPushMatrix(); @@ -90,7 +89,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float w = -v * 3.5F; if(pool.getWorld() != null) { - Block below = pool.getWorld().getBlock(pool.xCoord, pool.yCoord - 1, pool.zCoord); + Block below = pool.getWorld().getBlockState(pool.getPos().down()).getBlock(); if(below instanceof IPoolOverlayProvider) { IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.xCoord, pool.yCoord - 1, pool.zCoord); if(overlay != null) { @@ -141,7 +140,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(brightness); + tessellator.getWorldRenderer().setBrightness(brightness); tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); 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 e1c95c37c..cbff4f5fa 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -26,7 +26,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism; public class RenderTilePrism extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partTicks) { + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partTicks, int digProgress) { TilePrism prism = (TilePrism) tile; GL11.glPushMatrix(); GL11.glTranslated(x, y, z); @@ -35,7 +35,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { ItemStack stack = prism.getStackInSlot(0); if(stack != null) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(stack.getItem() instanceof ILens) { ILens lens = (ILens) stack.getItem(); GL11.glPushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 0ab0d3825..1efb9fad2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -32,7 +32,7 @@ public class RenderTilePump extends TileEntitySpecialRenderer { private static final ModelPump model = new ModelPump(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TilePump pump = (TilePump) tileentity; GL11.glPushMatrix(); 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 650592657..55de61e63 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -46,7 +46,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { public static boolean pink = false; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); @@ -68,7 +68,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); if(tileentity != null) - worldTime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360); + worldTime += new Random(tileentity.getPos().toLong()).nextInt(360); if(ConfigHandler.oldPylonModel) { GL11.glTranslated(d0 + 0.5, d1 + 2.2, d2 + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 24910351c..3a7195446 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -18,7 +18,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; public class RenderTileRedString extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks) { + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { TileRedString trs = (TileRedString) tileentity; RedStringRenderer.redStringTiles.add(trs); } 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 a496ed1fa..ce803306e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -15,7 +15,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -23,7 +22,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; @@ -39,7 +37,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { RenderBlocks renderBlocks = new RenderBlocks(); @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks) { + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { TileRuneAltar altar = (TileRuneAltar) tileentity; GL11.glPushMatrix(); @@ -116,7 +114,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { float scale = altar.getTargetMana() == 0 ? 0 : (float) altar.getCurrentMana() / (float) altar.getTargetMana() / 75F; if(scale != 0) { - int seed = altar.xCoord ^ altar.yCoord ^ altar.zCoord; + int seed = altar.getPos().getX() ^ altar.getPos().getY() ^ altar.getPos().getZ(); GL11.glTranslatef(0.5F, 0.7F, 0.5F); RenderHelper.renderStar(0x00E4D7, scale, scale, scale, seed); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 5d49f06fe..2072b84af 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -34,7 +34,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { public static final ModelSkullOverride modelSkull = new ModelSkullOverride(); @Override - public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) { + public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, p_147500_1_.getBlockMetadata() & 7, p_147500_1_.func_145906_b() * 360 / 16.0F, p_147500_1_.func_145904_a(), p_147500_1_.func_152108_a()); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 7986d03a4..3dda79f2f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -28,7 +27,7 @@ import vazkii.botania.common.block.tile.TileSparkChanger; public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { GL11.glPushMatrix(); GL11.glTranslated(d0, d1, d2); GL11.glRotated(90F, 1F, 0F, 0F); @@ -37,7 +36,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { ItemStack stack = ((TileSparkChanger) tileentity).getStackInSlot(0); if(stack != null) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.6F; GL11.glScalef(s, s, s); GL11.glRotatef(180F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java index 92628dc63..8f3646d3f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -27,7 +27,7 @@ public class RenderTileSpawnerClaw extends TileEntitySpecialRenderer { private static final ModelSpawnerClaw model = new ModelSpawnerClaw(); @Override - public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8) { + public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glColor4f(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 230e5215d..368b1f886 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -47,7 +47,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ModelSpreader model = new ModelSpreader(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileSpreader spreader = (TileSpreader) tileentity; GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -70,7 +70,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { double time = ClientTickHandler.ticksInGame + ticks; if(spreader.isULTRA_SPREADER()) { - Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.xCoord ^ spreader.yCoord ^ spreader.zCoord).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F); + Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().toLong()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F); GL11.glColor3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); } model.render(); @@ -86,7 +86,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { ItemStack stack = spreader.getStackInSlot(0); if(stack != null) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ILens lens = (ILens) stack.getItem(); GL11.glPushMatrix(); GL11.glTranslatef(-0.4F, -1.4F, -0.4375F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index d76b477b0..817ae41e9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -36,7 +36,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final Random field_147527_e = new Random(31100L); FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16); @Override - public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) { + public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { float f1 = (float)field_147501_a.field_147560_j; float f2 = (float)field_147501_a.field_147561_k; float f3 = (float)field_147501_a.field_147558_l; @@ -104,7 +104,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { float f12 = color.getGreen() / 255F; float f13 = color.getBlue() / 255F; - tessellator.setColorRGBA_F(f11 * f7, f12 * f7, f13 * f7, 1.0F); + tessellator.getWorldRenderer().setColorRGBA_F(f11 * f7, f12 * f7, f13 * f7, 1.0F); tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_); tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_ + 1.0D); tessellator.getWorldRenderer().addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_ + 1.0D); 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 1d467e9e1..8bdbdc5c8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileTerraPlate; public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileTerraPlate plate = (TileTerraPlate) tileentity; float max = TileTerraPlate.MAX_MANA / 10F; @@ -69,7 +69,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(brightness); + tessellator.getWorldRenderer().setBrightness(brightness); tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index e66f634aa..5c71aa1eb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -32,7 +32,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { ModelTeruTeruBozu model = new ModelTeruTeruBozu(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_BLEND); @@ -45,7 +45,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { double time = Botania.proxy.getWorldElapsedTicks() + f; boolean hasWorld = tileentity.getWorld() != null; if(hasWorld) - time += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(1000); + time += new Random(tileentity.getPos().toLong()).nextInt(1000); GL11.glTranslatef(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if(hasWorld) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 5f29a8eef..5c1d0bf17 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -49,7 +49,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ModelTinyPotato model = new ModelTinyPotato(); @Override - public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8) { + public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { TileTinyPotato potato = (TileTinyPotato) var1; GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -127,7 +127,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { if(!name.isEmpty()) { GL11.glPushMatrix(); - mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); ContributorFancinessHandler.firstStart(); @@ -351,7 +351,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.getWorldRenderer().startDrawingQuads(); int i = mc.fontRendererObj.getStringWidth(potato.name) / 2; - tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); + tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); @@ -369,7 +369,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_TEXTURE_2D); tessellator.getWorldRenderer().startDrawingQuads(); i = mc.fontRendererObj.getStringWidth(s) / 2; - tessellator.setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); + tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); From 9da9d6188022dcd4251868ab8a3d1da112820115 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Nov 2015 13:35:58 -0600 Subject: [PATCH 016/935] break from client for now --- .../client/core/helper/RenderHelper.java | 26 ++++++++-------- .../client/core/proxy/ClientProxy.java | 30 ++++--------------- .../common/core/proxy/CommonProxy.java | 3 +- .../common/entity/EntityDoppleganger.java | 4 +-- 4 files changed, 22 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 8c5709642..e06cfd831 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -59,7 +59,7 @@ public final class RenderHelper { int var5 = 0; int var6; int var7; - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj; for (var6 = 0; var6 < tooltipData.size(); ++var6) { var7 = fontRenderer.getStringWidth(tooltipData.get(var6)); if (var7 > var5) @@ -112,13 +112,13 @@ public final class RenderHelper { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glShadeModel(GL11.GL_SMOOTH); Tessellator var15 = Tessellator.getInstance(); - var15.startDrawingQuads(); - var15.setColorRGBA_F(var8, var9, var10, var7); - var15.addVertex(par3, par2, z); - var15.addVertex(par1, par2, z); - var15.setColorRGBA_F(var12, var13, var14, var11); - var15.addVertex(par1, par4, z); - var15.addVertex(par3, par4, z); + var15.getWorldRenderer().startDrawingQuads(); + var15.getWorldRenderer().setColorRGBA_F(var8, var9, var10, var7); + var15.getWorldRenderer().addVertex(par3, par2, z); + var15.getWorldRenderer().addVertex(par1, par2, z); + var15.getWorldRenderer().setColorRGBA_F(var12, var13, var14, var11); + var15.getWorldRenderer().addVertex(par1, par4, z); + var15.getWorldRenderer().addVertex(par3, par4, z); var15.draw(); GL11.glShadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_BLEND); @@ -170,12 +170,12 @@ public final class RenderHelper { GL11.glRotatef(random.nextFloat() * 360F, 1F, 0F, 0F); GL11.glRotatef(random.nextFloat() * 360F, 0F, 1F, 0F); GL11.glRotatef(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); - tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); + tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; - tessellator.setColorRGBA_I(color, (int) (255F * (1F - f2))); + tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (255F * (1F - f2))); tessellator.getWorldRenderer().addVertex(0, 0, 0); - tessellator.setColorRGBA_F(0F, 0F, 0F, 0); + tessellator.getWorldRenderer().setColorRGBA_F(0F, 0F, 0F, 0); tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4); tessellator.getWorldRenderer().addVertex(0.866D * f4, f3, -0.5F * f4); tessellator.getWorldRenderer().addVertex(0, f3, 1F * f4); @@ -195,7 +195,7 @@ public final class RenderHelper { public static void renderProgressPie(int x, int y, float progress, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y); GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); GL11.glEnable(GL11.GL_STENCIL_TEST); @@ -204,7 +204,7 @@ public final class RenderHelper { GL11.glStencilFunc(GL11.GL_NEVER, 1, 0xFF); GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP); GL11.glStencilMask(0xFF); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y); mc.renderEngine.bindTexture(new ResourceLocation(LibResources.GUI_MANA_HUD)); int r = 10; 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 479d2444f..88da34f46 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -61,26 +61,6 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.integration.nei.NEIGuiHooks; -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.block.RenderAltar; -import vazkii.botania.client.render.block.RenderAvatar; -import vazkii.botania.client.render.block.RenderBellows; -import vazkii.botania.client.render.block.RenderBrewery; -import vazkii.botania.client.render.block.RenderCocoon; -import vazkii.botania.client.render.block.RenderCorporeaCrystalCube; -import vazkii.botania.client.render.block.RenderCorporeaIndex; -import vazkii.botania.client.render.block.RenderDoubleFlower; -import vazkii.botania.client.render.block.RenderFloatingFlower; -import vazkii.botania.client.render.block.RenderHourglass; -import vazkii.botania.client.render.block.RenderIncensePlate; -import vazkii.botania.client.render.block.RenderPool; -import vazkii.botania.client.render.block.RenderPump; -import vazkii.botania.client.render.block.RenderPylon; -import vazkii.botania.client.render.block.RenderSpawnerClaw; -import vazkii.botania.client.render.block.RenderSpecialFlower; -import vazkii.botania.client.render.block.RenderSpreader; -import vazkii.botania.client.render.block.RenderTeruTeruBozu; -import vazkii.botania.client.render.block.RenderTinyPotato; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; import vazkii.botania.client.render.entity.RenderDoppleganger; @@ -332,12 +312,12 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(ModItems.vineBall)); + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger()); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram()); RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark()); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(ModItems.manaResource, 15)); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart()); RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither()); RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm()); @@ -411,12 +391,12 @@ public class ClientProxy extends CommonProxy { } @Override - public void playRecordClientSided(World world, int x, int y, int z, ItemRecord record) { + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { Minecraft mc = Minecraft.getMinecraft(); if(record == null) - world.playAuxSFXAtEntity(null, 1005, x, y, z, 0); + world.playAuxSFXAtEntity(null, 1005, pos, 0); else { - world.playAuxSFXAtEntity(null, 1005, x, y, z, Item.getIdFromItem(record)); + world.playAuxSFXAtEntity(null, 1005, pos, Item.getIdFromItem(record)); mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal()); } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 6968bfc07..6fcc566a6 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -210,7 +211,7 @@ public class CommonProxy { return false; } - public void playRecordClientSided(World world, int x, int y, int z, ItemRecord record) { + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c15f10a96..56681cefd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -475,7 +475,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void setDead() { BlockPos source = getSource(); - Botania.proxy.playRecordClientSided(worldObj, source.posX, source.posY, source.posZ, null); + Botania.proxy.playRecordClientSided(worldObj, , source.posX, null); isPlayingMusic = false; super.setDead(); } @@ -524,7 +524,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi int playerCount = getPlayerCount(); if(worldObj.isRemote && !isPlayingMusic && !isDead && !players.isEmpty()) { - Botania.proxy.playRecordClientSided(worldObj, source.posX, source.posY, source.posZ, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1)); + Botania.proxy.playRecordClientSided(worldObj, , source.posX, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1)); isPlayingMusic = true; } From bbbe93a8de10e0af1184e3748247bc16a0a54e5e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Nov 2015 13:40:19 -0600 Subject: [PATCH 017/935] common.lexicon --- .../java/vazkii/botania/common/lexicon/RLexiconEntry.java | 4 ++-- .../java/vazkii/botania/common/lexicon/page/PageBrew.java | 2 +- .../java/vazkii/botania/common/lexicon/page/PageEntity.java | 6 +++--- .../botania/common/lexicon/page/PageManaInfusionRecipe.java | 2 +- .../vazkii/botania/common/lexicon/page/PageMultiblock.java | 4 ++-- .../java/vazkii/botania/common/lexicon/page/PageRecipe.java | 6 +++--- .../vazkii/botania/common/lexicon/page/PageRuneRecipe.java | 2 +- .../vazkii/botania/common/lexicon/page/PageShedding.java | 6 +++--- .../java/vazkii/botania/common/lexicon/page/PageText.java | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index c70aac15f..ec966710f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -11,7 +11,7 @@ package vazkii.botania.common.lexicon; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.stats.Achievement; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; @@ -33,7 +33,7 @@ public class RLexiconEntry extends BLexiconEntry { @Override @SideOnly(Side.CLIENT) public boolean isVisible() { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; return a == null || player.capabilities.isCreativeMode || player.getStatFileWriter().hasAchievementUnlocked(a); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index ee0b2ab2b..d238ce118 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -48,7 +48,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { int y = gui.getTop() + 12; Brew brew = recipe.getBrew(); - FontRenderer renderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj; boolean unicode = renderer.getUnicodeFlag(); renderer.setUnicodeFlag(true); String s = EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName())); 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 97056a150..abd4f80db 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -91,9 +91,9 @@ public class PageEntity extends LexiconPage{ GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GL11.glTranslatef(0.0F, entity.yOffset, 0.0F); - RenderManager.instance.playerViewY = 180.0F; - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + GL11.glTranslatef(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone + Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; + Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); GL11.glPopMatrix(); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 8d480c506..47ae19f45 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -68,7 +68,7 @@ public class PageManaInfusionRecipe extends PageRecipe { public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { RecipeManaInfusion recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; Object input = recipe.getInput(); if(input instanceof String) 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 b1e76c269..8e77d8787 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -85,7 +85,7 @@ public class PageMultiblock extends LexiconPage { GL11.glPopMatrix(); - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); String s = EnumChatFormatting.BOLD + StatCollector.translateToLocal(getUnlocalizedName()); font.setUnicodeFlag(true); @@ -96,7 +96,7 @@ public class PageMultiblock extends LexiconPage { RenderHelper.enableGUIStandardItemLighting(); int x = gui.getLeft() + 15; int y = gui.getTop() + 25; - RenderItem.getInstance().renderItemIntoGUI(font, render, new ItemStack(Blocks.stonebrick), x, y); + Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.stonebrick), x, y); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 74a01a192..46066c55f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -136,7 +136,7 @@ public class PageRecipe extends LexiconPage { @SideOnly(Side.CLIENT) public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) { - RenderItem render = new RenderItem(); + RenderItem render = Minecraft.getMinecraft().getRenderManager(); boolean mouseDown = Mouse.isButtonDown(0); GL11.glPushMatrix(); @@ -147,8 +147,8 @@ public class PageRecipe extends LexiconPage { GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glPushMatrix(); GL11.glTranslated(xPos, yPos, 0); - render.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, 0, 0); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, 0, 0); + render.renderItemAndEffectIntoGUI(stack, 0, 0); + render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0); GL11.glPopMatrix(); RenderHelper.disableStandardItemLighting(); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 8297d96b1..6ab339e0e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -45,7 +45,7 @@ public class PageRuneRecipe extends PagePetalRecipe { @Override @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 2a7c7c4e7..7e85f0630 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -113,7 +113,7 @@ public class PageShedding extends PageEntity { @SideOnly(Side.CLIENT) public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack) { - RenderItem render = new RenderItem(); + RenderItem render = Minecraft.getMinecraft().getRenderItem(); boolean mouseDown = Mouse.isButtonDown(0); GL11.glPushMatrix(); @@ -122,8 +122,8 @@ public class PageShedding extends PageEntity { RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_DEPTH_TEST); - render.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos); + render.renderItemAndEffectIntoGUI(stack, xPos, yPos); + render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos); RenderHelper.disableStandardItemLighting(); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 4f04dfa31..da05a5159 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -51,7 +51,7 @@ public class PageText extends LexiconPage { y += 10; width -= 4; - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); String text = StatCollector.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); From 3b8926c24b37eff1c135e264980d3cd604ed6a34 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Nov 2015 16:37:03 -0600 Subject: [PATCH 018/935] Easy stuff in common.core --- .../subtile/functional/SubTileHopperhock.java | 2 +- .../tile/corporea/TileCorporeaFunnel.java | 4 +- .../common/core/command/CommandShare.java | 2 +- .../core/command/CommandSkyblockSpread.java | 12 +-- .../core/handler/BiomeDecorationHandler.java | 31 ++++--- .../core/handler/InternalMethodHandler.java | 4 +- .../common/core/handler/SheddingHandler.java | 2 +- .../common/core/helper/InventoryHelper.java | 91 ++++++++++++------- .../common/core/helper/MathHelper.java | 5 + .../common/core/proxy/CommonProxy.java | 10 +- .../core/version/ThreadDownloadMod.java | 2 +- .../common/core/version/VersionChecker.java | 2 +- .../common/entity/EntityCorporeaSpark.java | 2 +- 13 files changed, 98 insertions(+), 71 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 4706be782..04db15863 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -79,7 +79,7 @@ public class SubTileHopperhock extends SubTileFunctional { int y_ = y + dir.offsetY; int z_ = z + dir.offsetZ; - IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), x_, y_, z_); + IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), , x_); if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index cc6fd219f..f3ef72231 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -89,9 +89,9 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq if(!(request instanceof ItemStack)) return; - IInventory inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 1, zCoord); + IInventory inv = InventoryHelper.getInventory(worldObj, , xCoord); if(inv == null) - inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 2, zCoord); + inv = InventoryHelper.getInventory(worldObj, , xCoord); List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index f77a03858..399f035c5 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -36,7 +36,7 @@ public class CommandShare extends CommandBase { json = json.replaceAll("%entry%", args[0]); json = json.replaceAll("%entryname%", StatCollector.translateToLocal("botania.entry." + args[0])); - IChatComponent component = IChatComponent.Serializer.func_150699_a(json); + IChatComponent component = IChatComponent.Serializer.jsonToComponent(json); MinecraftServer.getServer().getConfigurationManager().sendChatMsg(component); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index c00cffde2..66b9870d9 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -37,14 +37,14 @@ public class CommandSkyblockSpread extends CommandBase { } @Override - public void processCommand(ICommandSender sender, String[] args) { + public void processCommand(ICommandSender sender, String[] args) throws CommandException { int maxAllowed = 1000000; int minAllowed = 250; int minDist = 100; int maxrange = 200000; if(args.length == 2) - maxrange = parseInt(sender, args[1]); + maxrange = parseInt(sender, args[1]); // <- todo 1.8 wat if(maxrange > maxAllowed) throw new CommandException("botaniamisc.skyblockRangeTooHigh"); @@ -57,11 +57,11 @@ public class CommandSkyblockSpread extends CommandBase { int x, z; do { - x = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.posX; - z = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.posZ; - } while(MathHelper.pointDistancePlane(x, z, spawn.posX, spawn.posZ) < minDist); + x = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.getX(); + z = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.getZ(); + } while(MathHelper.pointDistancePlane(x, z, spawn.getX(), spawn.getZ()) < minDist); - SkyblockWorldEvents.spawnPlayer(player, x, spawn.posY, z, true); + SkyblockWorldEvents.spawnPlayer(player, new BlockPos(x, spawn.getY(), z), true); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 9d5b33f03..ac8529344 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.core.handler; +import net.minecraft.util.BlockPos; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; import vazkii.botania.api.item.IFlowerlessBiome; @@ -31,8 +32,8 @@ public class BiomeDecorationHandler { boolean flowers = true; if(event.world.provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.world.provider).generateFlowers(event.world); - else if(event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.world.getBiomeGenForCoords(event.chunkX, event.chunkZ)).canGenerateFlowers(event.world, event.chunkX, event.chunkZ); + else if(event.world.getBiomeGenForCoords(event.pos) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.world.getBiomeGenForCoords(event.pos)).canGenerateFlowers(event.world, event.pos.getX(), event.pos.getZ()); if(!flowers) return; @@ -40,9 +41,9 @@ public class BiomeDecorationHandler { int dist = Math.min(8, Math.max(1, ConfigHandler.flowerPatchSize)); for(int i = 0; i < ConfigHandler.flowerQuantity; i++) { if(event.rand.nextInt(ConfigHandler.flowerPatchChance) == 0) { - int x = event.chunkX + event.rand.nextInt(16) + 8; - int z = event.chunkZ + event.rand.nextInt(16) + 8; - int y = event.world.getTopSolidOrLiquidBlock(x, z); + int x = event.pos.getX() + event.rand.nextInt(16) + 8; + int z = event.pos.getZ() + event.rand.nextInt(16) + 8; + int y = event.world.getTopSolidOrLiquidBlock(event.pos).getY(); int color = event.rand.nextInt(16); boolean primus = event.rand.nextInt(380) == 0; @@ -51,16 +52,16 @@ public class BiomeDecorationHandler { int x1 = x + event.rand.nextInt(dist * 2) - dist; int y1 = y + event.rand.nextInt(4) - event.rand.nextInt(4); int z1 = z + event.rand.nextInt(dist * 2) - dist; - - if(event.world.isAirBlock(x1, y1, z1) && (!event.world.provider.hasNoSky || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1)) { + BlockPos pos2 = new BlockPos(x1, y1, z1); + if(event.world.isAirBlock(pos2) && (!event.world.provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1)) { if(primus) { - event.world.setBlock(x1, y1, z1, ModBlocks.specialFlower, 0, 2); - TileSpecialFlower flower = (TileSpecialFlower) event.world.getTileEntity(x1, y1, z1); + event.world.setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2); + TileSpecialFlower flower = (TileSpecialFlower) event.world.getTileEntity(pos2); flower.setSubTile(event.rand.nextBoolean() ? LibBlockNames.SUBTILE_NIGHTSHADE_PRIME : LibBlockNames.SUBTILE_DAYBLOOM_PRIME); SubTileDaybloom subtile = (SubTileDaybloom) flower.getSubTile(); subtile.setPrimusPosition(); } else { - event.world.setBlock(x1, y1, z1, ModBlocks.flower, color, 2); + event.world.setBlockState(pos2, ModBlocks.flower, color, 2); if(event.rand.nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).func_149851_a(event.world, x1, y1, z1, false)) BlockModFlower.placeDoubleFlower(event.world, x1, y1, z1, color, 0); } @@ -70,13 +71,13 @@ public class BiomeDecorationHandler { } for(int i = 0; i < ConfigHandler.mushroomQuantity; i++) { - int x = event.chunkX + event.rand.nextInt(16) + 8; - int z = event.chunkZ + event.rand.nextInt(16) + 8; + int x = event.pos.getX() + event.rand.nextInt(16) + 8; + int z = event.pos.getZ() + event.rand.nextInt(16) + 8; int y = event.rand.nextInt(26) + 4; - + BlockPos pos3 = new BlockPos(x, y, z); int color = event.rand.nextInt(16); - if(event.world.isAirBlock(x, y, z) && ModBlocks.mushroom.canBlockStay(event.world, x, y, z)) - event.world.setBlock(x, y, z, ModBlocks.mushroom, color, 2); + if(event.world.isAirBlock(pos3) && ModBlocks.mushroom.canBlockStay(event.world, x, y, z)) + event.world.setBlockState(pos3, ModBlocks.mushroom, color, 2); } } } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 54de30638..d57e8ddc2 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -236,7 +236,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { - ItemLokiRing.breakOnAllCursors(player, item, stack, x, y, z, side); + ItemLokiRing.breakOnAllCursors(player, item, stack, pos, side); } @Override @@ -246,7 +246,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public boolean isBotaniaFlower(World world, BlockPos pos) { - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); return block == ModBlocks.flower || block == ModBlocks.shinyFlower || block == ModBlocks.specialFlower; } 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 7ae085f17..1700e3d56 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -110,7 +110,7 @@ public final class SheddingHandler { int lexiconSize = 40; if(defaultPattern != null) { - itemName = Item.itemRegistry.getNameForObject(defaultPattern.getItemStack().getItem()); + itemName = Item.itemRegistry.getNameForObject(defaultPattern.getItemStack().getItem()).toString(); metadata = defaultPattern.getItemStack().getItemDamage(); rate = defaultPattern.rate; lexiconSize = defaultPattern.lexiconSize; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 663f20e5e..beb00941f 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -26,8 +26,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; +import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; //From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { @@ -62,18 +66,18 @@ public class InventoryHelper { } public static void insertItemIntoInventory(IInventory inventory, ItemStack stack) { - insertItemIntoInventory(inventory, stack, ForgeDirection.UNKNOWN, -1); + insertItemIntoInventory(inventory, stack, null, -1); } - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, ForgeDirection side, int intoSlot) { + public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot) { insertItemIntoInventory(inventory, stack, side, intoSlot, true); } - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, ForgeDirection side, int intoSlot, boolean doMove) { + public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot, boolean doMove) { insertItemIntoInventory(inventory, stack, side, intoSlot, doMove, true); } - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, ForgeDirection side, int intoSlot, boolean doMove, boolean canStack) { + public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot, boolean doMove, boolean canStack) { if(stack == null) return; IInventory targetInventory = inventory; @@ -86,8 +90,8 @@ public class InventoryHelper { int i = 0; int[] attemptSlots; - if(inventory instanceof ISidedInventory && side != ForgeDirection.UNKNOWN) { - attemptSlots = ((ISidedInventory)inventory).getAccessibleSlotsFromSide(side.ordinal()); + if(inventory instanceof ISidedInventory && side != null) { + attemptSlots = ((ISidedInventory)inventory).getSlotsForFace(side); if(attemptSlots == null) attemptSlots = new int[0]; } else { @@ -105,8 +109,8 @@ public class InventoryHelper { else attemptSlots = new int[0]; } while(stack.stackSize > 0 && i < attemptSlots.length) { - if(side != ForgeDirection.UNKNOWN && inventory instanceof ISidedInventory) - if(!((ISidedInventory)inventory).canInsertItem(attemptSlots[i], stack, side.ordinal())) { + if(side != null && inventory instanceof ISidedInventory) + if(!((ISidedInventory)inventory).canInsertItem(attemptSlots[i], stack, side)) { i++; continue; } @@ -116,7 +120,7 @@ public class InventoryHelper { } } - public static int testInventoryInsertion(IInventory inventory, ItemStack item, ForgeDirection side) { + public static int testInventoryInsertion(IInventory inventory, ItemStack item, EnumFacing side) { if(item == null || item.stackSize == 0) return 0; item = item.copy(); @@ -130,7 +134,7 @@ public class InventoryHelper { int[] availableSlots; if(inventory instanceof ISidedInventory) - availableSlots = ((ISidedInventory) inventory).getAccessibleSlotsFromSide(side.ordinal()); + availableSlots = ((ISidedInventory) inventory).getSlotsForFace(side); else { availableSlots = buildSlotsForLinearInventory(inventory); } @@ -142,8 +146,8 @@ public class InventoryHelper { if (!inventory.isItemValidForSlot(i, item)) continue; - if(side != ForgeDirection.UNKNOWN && inventory instanceof ISidedInventory) - if(!((ISidedInventory)inventory).canInsertItem(i, item, side.ordinal())) + if(side != null && inventory instanceof ISidedInventory) + if(!((ISidedInventory)inventory).canInsertItem(i, item, side)) continue; ItemStack inventorySlot = inventory.getStackInSlot(i); @@ -163,36 +167,34 @@ public class InventoryHelper { return 0; } - public static IInventory getInventory(World world, int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + public static IInventory getInventory(World world, BlockPos pos) { + TileEntity tileEntity = world.getTileEntity(pos); if(tileEntity instanceof TileEntityChest) { - Block chestBlock = world.getBlock(x, y, z); - if(world.getBlock(x - 1, y, z) == chestBlock) - return new InventoryLargeChest("Large chest", (IInventory)world.getTileEntity(x - 1, y, z), (IInventory)tileEntity); - if(world.getBlock(x + 1, y, z) == chestBlock) - return new InventoryLargeChest("Large chest", (IInventory)tileEntity, (IInventory)world.getTileEntity(x + 1, y, z)); - if(world.getBlock(x, y, z - 1) == chestBlock) - return new InventoryLargeChest("Large chest", (IInventory)world.getTileEntity(x, y, z - 1), (IInventory)tileEntity); - if(world.getBlock(x, y, z + 1) == chestBlock) - return new InventoryLargeChest("Large chest", (IInventory)tileEntity, (IInventory)world.getTileEntity(x, y, z + 1)); + Block chestBlock = world.getBlockState(pos).getBlock(); + if(world.getBlockState(pos.west()).getBlock() == chestBlock) + return new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) tileEntity); + if(world.getBlockState(pos.east()).getBlock() == chestBlock) + return new InventoryLargeChest("Large chest", (ILockableContainer) tileEntity, (ILockableContainer) world.getTileEntity(pos.east())); + if(world.getBlockState(pos.north()).getBlock() == chestBlock) + return new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) tileEntity); + if(world.getBlockState(pos.south()).getBlock() == chestBlock) + return new InventoryLargeChest("Large chest", (ILockableContainer) tileEntity, (ILockableContainer) world.getTileEntity(pos.south())); } return tileEntity instanceof IInventory ? (IInventory)tileEntity : null; } - public static IInventory getInventory(World world, int x, int y, int z, ForgeDirection direction) { - if(direction != null && direction != ForgeDirection.UNKNOWN) { - x += direction.offsetX; - y += direction.offsetY; - z += direction.offsetZ; + public static IInventory getInventory(World world, BlockPos pos, EnumFacing direction) { + if(direction != null) { + pos = pos.offset(direction); } - return getInventory(world, x, y, z); + return getInventory(world, pos); } public static IInventory getInventory(IInventory inventory) { if(inventory instanceof TileEntityChest) { TileEntity te = (TileEntity)inventory; - return getInventory(te.getWorld(), te.xCoord, te.yCoord, te.zCoord); + return getInventory(te.getWorld(), te.getPos()); } return inventory; } @@ -281,6 +283,20 @@ public class InventoryHelper { return true; } + @Override + public int getField(int id) { return 0; } + + @Override + public void setField(int id, int value) { } + + @Override + public int getFieldCount() { return 0; } + + @Override + public void clear() { + Arrays.fill(inventoryContents, null); + } + @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) { return true; @@ -342,22 +358,27 @@ public class InventoryHelper { } @Override - public String getInventoryName() { + public String getCommandSenderName() { return null; } @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { return false; } + @Override + public IChatComponent getDisplayName() { + return new ChatComponentText(getCommandSenderName()); + } + @Override public void markDirty() { } @Override - public void openInventory() { } + public void openInventory(EntityPlayer player) { } @Override - public void closeInventory() { } + public void closeInventory(EntityPlayer player) { } } } diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index e31af7042..28426316e 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -11,10 +11,15 @@ package vazkii.botania.common.core.helper; import net.minecraft.entity.Entity; +import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { + public static float pointDistanceSpace(BlockPos p1, BlockPos p2) { + return pointDistanceSpace(p1.getX(), p1.getY(), p1.getZ(), p2.getX(), p2.getY(), p2.getZ()); + } + public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2) + Math.pow(z1 - z2, 2)); } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 6fcc566a6..6d9d5fc7f 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -61,8 +61,8 @@ import vazkii.botania.common.crafting.ModPureDaisyRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; -import vazkii.botania.common.integration.etfuturum.ModBanners; +//import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8 +//import vazkii.botania.common.integration.etfuturum.ModBanners; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; @@ -103,7 +103,7 @@ public class CommonProxy { ModMultiblocks.init(); if(Botania.etFuturumLoaded) - ModBanners.init(); + // todo 1.8 ModBanners.init(); ChestGenHandler.init(); @@ -128,8 +128,8 @@ public class CommonProxy { FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - if(Botania.bcTriggersLoaded) - new StatementAPIPlugin(); +// if(Botania.bcTriggersLoaded) todo 1.8 +// new StatementAPIPlugin(); } public void postInit(FMLPostInitializationEvent event) { diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 4bdb6fce7..9387e8142 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -46,7 +46,7 @@ public class ThreadDownloadMod extends Thread { @Override public void run() { try { - IChatComponent component = IChatComponent.Serializer.func_150699_a(String.format(StatCollector.translateToLocal("botania.versioning.startingDownload"), fileName)); + IChatComponent component = IChatComponent.Serializer.jsonToComponent(String.format(StatCollector.translateToLocal("botania.versioning.startingDownload"), fileName)); if(Minecraft.getMinecraft().thePlayer != null) Minecraft.getMinecraft().thePlayer.addChatMessage(component); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index b79e04e82..c337aa373 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -50,7 +50,7 @@ public final class VersionChecker { player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - IChatComponent component = IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + IChatComponent component = IChatComponent.Serializer.jsonToComponent(StatCollector.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); player.addChatComponentMessage(component); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 65b6c3e7b..8877abedf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -181,7 +181,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper.getInventory(worldObj, x, y, z); + return InventoryHelper.getInventory(worldObj, , x); } @Override From 6fb9b0101eb747bccf5497fe9b6edab0af310b9c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Nov 2015 00:30:32 -0600 Subject: [PATCH 019/935] Some entities --- .../botania/api/corporea/CorporeaHelper.java | 2 +- .../botania/api/corporea/ICorporeaSpark.java | 2 +- .../corporea/TileCorporeaInterceptor.java | 2 +- .../tile/corporea/TileCorporeaRetainer.java | 2 +- .../vazkii/botania/common/brew/ModBrews.java | 2 +- .../common/brew/potion/PotionClear.java | 5 ++- .../botania/common/brew/potion/PotionMod.java | 2 +- .../common/entity/EntityBabylonWeapon.java | 2 +- .../common/entity/EntityCorporeaSpark.java | 7 ++-- .../common/entity/EntityDoppleganger.java | 17 +++------ .../common/entity/EntityEnderAirBottle.java | 26 ++++++------- .../common/entity/EntityFallingStar.java | 6 +-- .../common/entity/EntityFlyingCreature.java | 9 +++-- .../common/entity/EntityMagicMissile.java | 2 +- .../common/entity/EntityManaBurst.java | 38 ++++++++----------- .../common/entity/EntityPoolMinecart.java | 36 +++++++++--------- .../common/entity/EntitySignalFlare.java | 10 +++-- .../botania/common/entity/EntitySpark.java | 3 +- .../botania/common/entity/EntityVineBall.java | 23 ++++++----- 19 files changed, 93 insertions(+), 103 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index e60f7f987..daf353b30 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -68,7 +68,7 @@ public final class CorporeaHelper { if(network != null) for(ICorporeaSpark otherSpark : network) if(otherSpark != null) { - IInventory inv = otherSpark.getInventory(); + IInventory inv = otherSpark.getSparkInventory(); if(inv != null) inventories.add(inv); } diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index 943e29e72..71fb33d5e 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -38,7 +38,7 @@ public interface ICorporeaSpark { /** * Gets the inventory this spark is bound to, generally the one right below it. */ - public IInventory getInventory(); + public IInventory getSparkInventory(); /** * Gets the list of sparks this spark is connected to, see registerConnections(). This list diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 9f213d3f5..2ed2a2aa1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -60,7 +60,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); worldObj.scheduleBlockUpdate(xCoord, yCoord, zCoord, getBlockType(), 2); - TileEntity requestor = (TileEntity) source.getInventory(); + TileEntity requestor = (TileEntity) source.getSparkInventory(); for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); if(tile != null && tile instanceof TileCorporeaRetainer) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index aca08e46e..1e4f7b187 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -61,7 +61,7 @@ public class TileCorporeaRetainer extends TileMod { ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, , requestX); if(spark != null) { - IInventory inv = spark.getInventory(); + IInventory inv = spark.getSparkInventory(); if(inv != null && inv instanceof ICorporeaRequestor) { ICorporeaRequestor requestor = (ICorporeaRequestor) inv; requestor.doCorporeaRequest(request, requestCount, spark); diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 505da7c30..9120974a6 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -54,7 +54,7 @@ public class ModBrews { waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(Potion.waterBreathing.id, 9600, 0)); invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(Potion.invisibility.id, 9600, 0)); nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0)); - absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); + absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.absorption.id, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 2400, 2), new PotionEffect(Potion.hunger.id, 200, 2)); soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0)); 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 26e76aa3f..8fcdf9914 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.brew.potion; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -28,8 +29,8 @@ public class PotionClear extends PotionMod { } @Override - public void affectEntity(EntityLivingBase e, EntityLivingBase e1, int t, double d) { - e1.curePotionEffects(new ItemStack(Items.milk_bucket)); + public void affectEntity(Entity e, Entity e1, EntityLivingBase e2, int t, double d) { + e2.curePotionEffects(new ItemStack(Items.milk_bucket)); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 3da24aa70..24d3ac6b6 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -23,7 +23,7 @@ public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); public PotionMod(int id, String name, boolean badEffect, int color, int iconIndex) { - super(id, badEffect, color); + super(id, new ResourceLocation("botania", name), badEffect, color); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 331a7d5d8..5c076fc41 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -108,7 +108,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { MovingObjectPosition lookat = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); if(lookat == null) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); - else playerLook = new Vector3(lookat.blockX + 0.5, lookat.blockY + 0.5, lookat.blockZ + 0.5); + else playerLook = new Vector3(lookat.getBlockPos().getX() + 0.5, lookat.getBlockPos().getY() + 0.5, lookat.getBlockPos().getZ() + 0.5); Vector3 thisVec = Vector3.fromEntityCenter(this); Vector3 motionVec = playerLook.sub(thisVec).normalize().multiply(2); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 8877abedf..d754bd91e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -20,6 +20,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -67,7 +68,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public void onUpdate() { super.onUpdate(); - IInventory inv = getInventory(); + IInventory inv = getSparkInventory(); if(inv == null) { if(!worldObj.isRemote) setDead(); @@ -177,11 +178,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } @Override - public IInventory getInventory() { + public IInventory getSparkInventory() { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper.getInventory(worldObj, , x); + return InventoryHelper.getInventory(worldObj, new BlockPos(x, y, z)); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 56681cefd..81100d644 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -41,14 +41,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.BlockPos; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -142,7 +135,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, int par4, int par5, int par6, boolean hard) { Block block = par3World.getBlock(par4, par5, par6); if(block == Blocks.beacon && isTruePlayer(player) && !par3World.isRemote) { - if(par3World.difficultySetting == EnumDifficulty.PEACEFUL) { + if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; } @@ -405,7 +398,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } worldObj.playSoundAtEntity(this, "random.explode", 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - worldObj.spawnParticle("hugeexplosion", posX, posY, posZ, 1D, 0D, 0D); + worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); } @Override @@ -475,7 +468,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void setDead() { BlockPos source = getSource(); - Botania.proxy.playRecordClientSided(worldObj, , source.posX, null); + Botania.proxy.playRecordClientSided(worldObj, source, null); isPlayingMusic = false; super.setDead(); } @@ -497,7 +490,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi ridingEntity = null; } - boolean peaceful = worldObj.difficultySetting == EnumDifficulty.PEACEFUL; + boolean peaceful = worldObj.getDifficulty() == EnumDifficulty.PEACEFUL; if(!worldObj.isRemote && peaceful) setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 3d04f577f..cf2961060 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; @@ -34,34 +35,29 @@ public class EntityEnderAirBottle extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition pos) { if(pos.entityHit == null && !worldObj.isRemote) { - List coordsList = getCoordsToPut(pos.blockX, pos.blockY, pos.blockZ); - worldObj.playAuxSFX(2002, (int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ), 8); + List coordsList = getCoordsToPut(pos.getBlockPos()); + worldObj.playAuxSFX(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); for(BlockPos coords : coordsList) { - worldObj.setBlock(coords.posX, coords.posY, coords.posZ, Blocks.end_stone); + worldObj.setBlockState(coords, Blocks.end_stone.getDefaultState()); if(Math.random() < 0.1) - worldObj.playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Blocks.end_stone)); + worldObj.playAuxSFX(2001, coords, Block.getIdFromBlock(Blocks.end_stone)); } setDead(); } } - public List getCoordsToPut(int xCoord, int yCoord, int zCoord) { + public List getCoordsToPut(BlockPos pos) { List possibleCoords = new ArrayList(); List selectedCoords = new ArrayList(); int range = 4; int rangeY = 4; - for(int i = -range; i < range + 1; i++) - for(int j = -rangeY; j < rangeY; j++) - for(int k = -range; k < range + 1; k++) { - int x = xCoord + i; - int y = yCoord + j; - int z = zCoord + k; - Block block = worldObj.getBlock(x, y, z); - if(block != null && block.isReplaceableOreGen(worldObj, x, y, z, Blocks.stone)) - possibleCoords.add(new BlockPos(x, y, z)); - } + for (BlockPos bPos : ((Iterable) BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range)))) { + Block block = worldObj.getBlockState(pos).getBlock(); + if(block != null && block.isReplaceableOreGen(worldObj, pos, BlockHelper.forBlock(Blocks.stone))) + possibleCoords.add(pos); + } int count = 64; while(!possibleCoords.isEmpty() && count > 0) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index ecbf9490c..d971de2d6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -74,9 +74,9 @@ public class EntityFallingStar extends EntityThrowableCopy { else pos.entityHit.attackEntityFrom(DamageSource.generic, 10); } - Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.blockX, pos.blockY, pos.blockZ)) - worldObj.playAuxSFX(2001, pos.blockX, pos.blockY, pos.blockZ, Block.getIdFromBlock(block) + (worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) << 12)); + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) + worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); setDead(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index b9c27de8c..8e4440124 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -12,6 +12,7 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityAmbientCreature; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -22,12 +23,12 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - protected void fall(float par1) { + public void fall(float dist, float damageMult) { // NO-OP } @Override - protected void updateFallState(double par1, boolean par3) { + protected void updateFallState(double y, boolean onGround, Block block, BlockPos pos) { // NO-OP } @@ -50,7 +51,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { if (onGround) { f2 = 0.54600006F; - Block block = worldObj.getBlock(MathHelper.floor_double(posX), MathHelper.floor_double(boundingBox.minY) - 1, MathHelper.floor_double(posZ)); + Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } @@ -60,7 +61,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { if (onGround) { f2 = 0.54600006F; - Block block = worldObj.getBlock(MathHelper.floor_double(posX), MathHelper.floor_double(boundingBox.minY) - 1, MathHelper.floor_double(posZ)); + Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 4afd7791e..a8b24d379 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -177,7 +177,7 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition pos) { - Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves) && (pos.entityHit == null || getTargetEntity() == pos.entityHit)) setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 34fdbe6be..1e8083de6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -19,6 +19,7 @@ import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -103,7 +104,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { this.fake = fake; - setBurstSourceCoords(tile.xCoord); + setBurstSourceCoords(tile.getPos()); setLocationAndAngles(tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, 0, 0); rotationYaw = -(spreader.getRotationX() + 90F); rotationPitch = spreader.getRotationY(); @@ -126,7 +127,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { posZ -= MathHelper.sin((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; setPosition(posX, posY, posZ); - yOffset = 0.0F; float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; @@ -166,7 +166,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(entity1.canBeCollidedWith() && (entity1 != entitylivingbase || ticksInAir >= 5)) { float f = 0.3F; - AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f, f, f); + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); if(movingobjectposition1 != null) { @@ -429,9 +429,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { par1nbtTagCompound.setTag(TAG_LENS_STACK, lensCmp); BlockPos coords = getBurstSourceBlockPos(); - par1nbtTagCompound.setInteger(TAG_SPREADER_X, coords.posX); - par1nbtTagCompound.setInteger(TAG_SPREADER_Y, coords.posY); - par1nbtTagCompound.setInteger(TAG_SPREADER_Z, coords.posZ); + par1nbtTagCompound.setInteger(TAG_SPREADER_X, coords.getX()); + par1nbtTagCompound.setInteger(TAG_SPREADER_Y, coords.getY()); + par1nbtTagCompound.setInteger(TAG_SPREADER_Z, coords.getZ()); par1nbtTagCompound.setDouble(TAG_LAST_MOTION_X, motionX); par1nbtTagCompound.setDouble(TAG_LAST_MOTION_Y, motionY); @@ -626,7 +626,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } } - protected void onRecieverImpact(IManaReceiver tile, int x, int y, int z) { + protected void onRecieverImpact(IManaReceiver tile, BlockPos pos) { int mana = getMana(); if(tile instanceof IManaCollector) mana *= ((IManaCollector) tile).getManaYieldMultiplier(this); @@ -634,7 +634,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { tile.recieveMana(mana); if(tile instanceof IThrottledPacket) ((IThrottledPacket) tile).markDispatchable(); - else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , x); + else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } @Override @@ -649,9 +649,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public TileEntity getShooter() { - BlockPos coords = getBurstSourceBlockPos(); - TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); - return tile; + return worldObj.getTileEntity(getBurstSourceBlockPos()); } @Override @@ -794,8 +792,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public void setCollidedAt(BlockPos pos) { - if(!hasAlreadyCollidedAt(x)) - alreadyCollidedAt.add(getCollisionLocString(x, y, z)); + if(!hasAlreadyCollidedAt(pos)) + alreadyCollidedAt.add(getCollisionLocString(pos)); } private String getCollisionLocString(int x, int y, int z) { @@ -841,7 +839,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public void setDeathTicksForFakeParticle() { BlockPos coords = getBurstSourceBlockPos(); - TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = worldObj.getTileEntity(coords); if(tile != null && tile instanceof IManaSpreader) ((IManaSpreader) tile).setLastBurstDeathTick(getTicksExisted()); } @@ -849,8 +847,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public static class PositionProperties { public final BlockPos coords; - public final Block block; - public final int meta; + public final IBlockState state; public boolean invalid = false; @@ -859,8 +856,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int y = MathHelper.floor_double(entity.posY); int z = MathHelper.floor_double(entity.posZ); coords = new BlockPos(x, y, z); - block = entity.worldObj.getBlock(x, y, z); - meta = entity.worldObj.getBlockMetadata(x, y, z); + state = entity.worldObj.getBlockState(coords); } public boolean coordsEqual(PositionProperties props) { @@ -868,14 +864,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public boolean contentsEqual(World world) { - if(!world.blockExists(coords.posX, coords.posY, coords.posZ)) { + if(!world.isBlockLoaded(coords)) { invalid = true; return false; } - Block block = world.getBlock(coords.posX , coords.posY, coords.posZ); - int meta = world.getBlockMetadata(coords.posX, coords.posY, coords.posZ); - return block == this.block && meta == this.meta; + return world.getBlockState(coords) == this.state; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1189ec70b..2368bebc4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -11,12 +11,15 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -47,8 +50,8 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public Block func_145817_o() { - return ModBlocks.pool; + public IBlockState getDisplayTile() { + return ModBlocks.pool.getDefaultState(); } @Override @@ -57,14 +60,14 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public int getMinecartType() { - return 0; + public EnumMinecartType getMinecartType() { + return EnumMinecartType.RIDEABLE; // todo 1.8 } @Override public void killMinecart(DamageSource p_94095_1_) { super.killMinecart(p_94095_1_); - func_145778_a(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F); + dropItemWithOffset(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F); } @Override @@ -73,24 +76,21 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public void moveMinecartOnRail(int x, int y, int z, double par4) { - super.moveMinecartOnRail(x, y, z, par4); + public void moveMinecartOnRail(BlockPos pos) { + super.moveMinecartOnRail(pos); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - int xp = x + dir.offsetX; - int zp = z + dir.offsetZ; - Block block = worldObj.getBlock(xp, y, zp); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + BlockPos posP = pos.offset(dir); + Block block = worldObj.getBlockState(posP).getBlock(); if(block == ModBlocks.pump) { - int xp_ = xp + dir.offsetX; - int zp_ = zp + dir.offsetZ; - int meta = worldObj.getBlockMetadata(xp, y, zp); - TileEntity tile = worldObj.getTileEntity(xp_, y, zp_); - TileEntity tile_ = worldObj.getTileEntity(xp, y, zp); + BlockPos posP_ = posP.offset(dir); + TileEntity tile = worldObj.getTileEntity(posP_); + TileEntity tile_ = worldObj.getTileEntity(posP); TilePump pump = (TilePump) tile_; if(tile != null && tile instanceof IManaPool && !pump.hasRedstone) { IManaPool pool = (IManaPool) tile; - ForgeDirection pumpDir = ForgeDirection.getOrientation(meta); + EnumFacing pumpDir = ForgeDirection.getOrientation(meta); boolean did = false; boolean can = false; @@ -119,7 +119,7 @@ public class EntityPoolMinecart extends EntityMinecart { } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xp_); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, posP_); pump.hasCart = true; if(!pump.active) pump.setActive(true); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index bcecb6ffb..49c2b840d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -12,6 +12,7 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import vazkii.botania.common.Botania; @@ -44,14 +45,17 @@ public class EntitySignalFlare extends Entity { int color = getColor(); if(color < 16 && color >= 0) { - float[] colorArray = EntitySheep.fleeceColorTable[color]; + int hex = EnumDyeColor.byMetadata(color).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); Botania.proxy.setWispFXDistanceLimit(false); for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, colorArray[0], colorArray[1], colorArray[2], (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, r, g, b, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(worldObj, posX + 0.5, 256, posZ + 0.5, colorArray[0], colorArray[1], colorArray[2], (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, posX + 0.5, 256, posZ + 0.5, r, g, b, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index cf5fa51a1..a6efb614a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -26,6 +26,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; @@ -306,7 +307,7 @@ public class EntitySpark extends Entity implements ISparkEntity { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY) - 1; int z = MathHelper.floor_double(posZ); - TileEntity tile = worldObj.getTileEntity(x, y, z); + TileEntity tile = worldObj.getTileEntity(new BlockPos(x, y, z)); if(tile != null && tile instanceof ISparkAttachable) return (ISparkAttachable) tile; diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index cfeadd723..ecd2367ac 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -13,9 +13,10 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.common.block.ModBlocks; public class EntityVineBall extends EntityThrowable { @@ -35,22 +36,20 @@ public class EntityVineBall extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition var1) { if(var1 != null) { - int meta = var1.sideHit; + int meta = var1.sideHit.getIndex(); int[] metaPlace = new int[] { 1, 4, 8, 2 }; if(meta > 1 && meta < 6) { - ForgeDirection dir = ForgeDirection.getOrientation(meta); - int x = var1.blockX + dir.offsetX; - int y = var1.blockY + dir.offsetY; - int z = var1.blockZ + dir.offsetZ; - while(y > 0) { - Block block = worldObj.getBlock(x, y, z); - if(block.isAir(worldObj, x, y, z)) { - worldObj.setBlock(x, y, z, ModBlocks.solidVines, metaPlace[meta - 2], 1 | 2); - worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(ModBlocks.solidVines) + (metaPlace[meta - 2] << 12)); - y--; + EnumFacing dir = EnumFacing.getFront(meta); + BlockPos pos = var1.getBlockPos().offset(dir); + while(pos.getY() > 0) { + Block block = worldObj.getBlockState(pos).getBlock(); + if(block.isAir(worldObj, pos)) { + worldObj.setBlockState(pos, ModBlocks.solidVines, metaPlace[meta - 2], 1 | 2); + worldObj.playAuxSFX(2001, pos, Block.getIdFromBlock(ModBlocks.solidVines) + (metaPlace[meta - 2] << 12)); // todo 1.8 to state id? + pos = pos.down(); } else break; } } From 58dbb0f9cfa26efd416cf9f33af3f5c8fb471dd4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Nov 2015 01:03:09 -0600 Subject: [PATCH 020/935] Lenses, materials, records, relics, equipment --- .../common/block/BlockPistonRelay.java | 4 +-- .../common/entity/EntityDoppleganger.java | 2 +- .../common/item/block/ItemBlockElven.java | 2 +- .../common/item/block/ItemBlockMod.java | 4 +-- .../common/item/block/ItemBlockModSlab.java | 4 +-- .../item/block/ItemBlockSpecialQuartz.java | 2 +- .../block/ItemBlockWithMetadataAndName.java | 12 +++---- .../common/item/brew/ItemBrewBase.java | 15 +++------ .../common/item/brew/ItemIncenseStick.java | 9 +----- .../botania/common/item/brew/ItemVial.java | 2 -- .../botania/common/item/lens/ItemLens.java | 9 ++---- .../botania/common/item/lens/LensBounce.java | 8 ++--- .../common/item/lens/LensExplosive.java | 2 +- .../botania/common/item/lens/LensFire.java | 22 ++++++------- .../botania/common/item/lens/LensLight.java | 21 +++++-------- .../botania/common/item/lens/LensMine.java | 31 +++++++++---------- .../botania/common/item/lens/LensPiston.java | 24 ++++++-------- .../botania/common/item/lens/LensStorm.java | 2 +- .../botania/common/item/lens/LensWarp.java | 9 +++--- .../botania/common/item/lens/LensWeight.java | 12 +++---- .../botania/common/item/material/ItemDye.java | 16 +++++----- .../item/material/ItemManaResource.java | 16 +++++----- .../item/material/ItemPestleAndMortar.java | 5 --- .../common/item/material/ItemPetal.java | 6 ++-- .../common/item/record/ItemModRecord.java | 1 - .../botania/common/item/relic/ItemDice.java | 2 +- .../common/item/relic/ItemFlugelEye.java | 23 +++++++------- .../common/item/relic/ItemInfiniteFruit.java | 2 +- .../common/item/relic/ItemKingKey.java | 2 +- 29 files changed, 114 insertions(+), 155 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 643336199..563787e23 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -81,8 +81,8 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl mapCoords(par1World.provider.dimensionId, par2, par3, par4, 2); } - public static String getCoordsAsString(int world, int x, int y, int z) { - return world + ":" + x + ":" + y + ":" + z; + public static String getCoordsAsString(int world, BlockPos pos) { + return world + ":" + pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); } static void mapCoords(int world, int x, int y, int z, int time) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 81100d644..bf9143e4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -132,7 +132,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return mb.makeSet(); } - public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, int par4, int par5, int par6, boolean hard) { + public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, BlockPos pos, boolean hard) { Block block = par3World.getBlock(par4, par5, par6); if(block == Blocks.beacon && isTruePlayer(player) && !par3World.isRemote) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java index 8fad997dd..f1fd4f4dd 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -22,7 +22,7 @@ public class ItemBlockElven extends ItemBlockMod implements IElvenItem { @Override public boolean isElvenItem(ItemStack stack) { - return ((IElvenItem) field_150939_a).isElvenItem(stack); + return ((IElvenItem) block).isElvenItem(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index a3491afb0..a09cbea2c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -38,12 +38,12 @@ public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraf @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { - return field_150939_a instanceof ICraftAchievement ? ((ICraftAchievement) field_150939_a).getAchievementOnCraft(stack, player, matrix) : null; + return block instanceof ICraftAchievement ? ((ICraftAchievement) block).getAchievementOnCraft(stack, player, matrix) : null; } @Override public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { - return field_150939_a instanceof IPickupAchievement ? ((IPickupAchievement) field_150939_a).getAchievementOnPickup(stack, player, item) : null; + return block instanceof IPickupAchievement ? ((IPickupAchievement) block).getAchievementOnPickup(stack, player, item) : null; } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 0883b4a59..7cbcbaf30 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -18,12 +18,12 @@ import vazkii.botania.common.block.decor.slabs.BlockModSlab; public class ItemBlockModSlab extends ItemSlab { public ItemBlockModSlab(Block par1) { - super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock(), false); + super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock()); } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - return field_150939_a.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); + return block.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index 7f104d0cf..16bb3fb18 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -23,6 +23,6 @@ public class ItemBlockSpecialQuartz extends ItemMultiTexture { @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) field_150939_a).getNames()[par1ItemStack.getItemDamage()]; + return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[par1ItemStack.getItemDamage()]; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index e9bad65fd..4365d5a24 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -14,17 +14,17 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemBlockWithMetadata; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; - -public class ItemBlockWithMetadataAndName extends ItemBlockWithMetadata implements IPickupAchievement, ICraftAchievement { +// todo 1.8 revalidate this (used to extend ItemBlockWithMetadata which got removed) +public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { - super(par2Block, par2Block); + super(par2Block); } @Override @@ -39,12 +39,12 @@ public class ItemBlockWithMetadataAndName extends ItemBlockWithMetadata implemen @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { - return field_150939_a instanceof ICraftAchievement ? ((ICraftAchievement) field_150939_a).getAchievementOnCraft(stack, player, matrix) : null; + return block instanceof ICraftAchievement ? ((ICraftAchievement) block).getAchievementOnCraft(stack, player, matrix) : null; } @Override public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { - return field_150939_a instanceof IPickupAchievement ? ((IPickupAchievement) field_150939_a).getAchievementOnPickup(stack, player, item) : null; + return block instanceof IPickupAchievement ? ((IPickupAchievement) block).getAchievementOnPickup(stack, player, item) : null; } } 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 8c565500e..0fcd4b5f4 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.brew; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +23,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -69,7 +67,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { - return EnumAction.drink; + return EnumAction.DRINK; } @Override @@ -79,13 +77,13 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { - PotionEffect newEffect = new PotionEffect(effect.getPotionID(), effect.getDuration(), effect.getAmplifier(), true); + PotionEffect newEffect = new PotionEffect(effect.getPotionID(), effect.getDuration(), effect.getAmplifier(), true, true); Potion potion = Potion.potionTypes[newEffect.getPotionID()]; if(potion.isInstant()) - potion.affectEntity(player, player, newEffect.getAmplifier(), 1F); + potion.affectEntity(player, player, player, newEffect.getAmplifier(), 1F); else player.addPotionEffect(newEffect); } @@ -127,11 +125,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIcon(ItemStack stack, int pass) { return pass == 0 ? itemIcon : icons[Math.max(0, Math.min(icons.length - 1, swigs - getSwigsLeft(stack)))]; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 42c1eafd3..f80615d92 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.brew; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -62,11 +60,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIcon(ItemStack stack, int pass) { return icons[pass]; @@ -103,7 +96,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false); + PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 81e3aed7a..b2e056824 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -12,11 +12,9 @@ package vazkii.botania.common.item.brew; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.client.core.helper.IconHelper; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 415a6dbfd..6f1b21b8d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -153,11 +154,6 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt { par3List.add(new ItemStack(par1, 1, i)); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIconFromDamageForRenderPass(int par1, int par2) { return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; @@ -249,8 +245,7 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt { if(storedColor == 16) return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 1F, 1F); - float[] color = EntitySheep.fleeceColorTable[storedColor]; - return new Color(color[0], color[1], color[2]).getRGB(); + return EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; } public static int getStoredColor(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index 7bdbd6faa..6706d8b11 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -13,8 +13,8 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.Vector3; @@ -24,10 +24,10 @@ public class LensBounce extends Lens { public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!isManaBlock && pos.entityHit == null) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) { + if(!coords.equals(pos.getBlockPos())) { Vector3 currentMovementVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); - Vector3 normalVector = new Vector3(dir.offsetX, dir.offsetY, dir.offsetZ).normalize(); + EnumFacing dir = pos.sideHit; + Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); burst.setMotion(movementVec.x, movementVec.y, movementVec.z); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index 1fbe72124..e32bb04eb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -23,7 +23,7 @@ public class LensExplosive extends Lens { public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) + if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && !coords.equals(pos.getBlockPos())) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, burst.getMana() / 50F, true); } else dead = false; 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 812039e78..dc2f9291b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -15,8 +15,8 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; @@ -26,23 +26,21 @@ public class LensFire extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock) { - ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); + if(!coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + EnumFacing dir = pos.sideHit; - int x = pos.blockX + dir.offsetX; - int y = pos.blockY + dir.offsetY; - int z = pos.blockZ + dir.offsetZ; + BlockPos pos_ = pos.getBlockPos().offset(dir); - Block blockAt = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - Block blockAt_ = entity.worldObj.getBlock(x, y, z); + Block blockAt = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block blockAt_ = entity.worldObj.getBlockState(pos_).getBlock(); if(blockAt == Blocks.portal) - entity.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Blocks.air); + entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.air.getDefaultState()); else if(blockAt == ModBlocks.incensePlate) { - TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos.getBlockPos()); plate.ignite(); - } else if(blockAt_.isAir(entity.worldObj, x, y, z)) - entity.worldObj.setBlock(x, y, z, Blocks.fire); + } else if(blockAt_.isAir(entity.worldObj, pos_)) + entity.worldObj.setBlockState(pos_, Blocks.fire.getDefaultState()); } return dead; 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 ebb807b30..f07f0a118 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -17,7 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; @@ -27,21 +26,17 @@ public class LensLight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock) { - ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); + if(!coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); - int x = pos.blockX + dir.offsetX; - int y = pos.blockY + dir.offsetY; - int z = pos.blockZ + dir.offsetZ; - - Block blockAt = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - Block blockAt_ = entity.worldObj.getBlock(x, y, z); + Block blockAt = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block blockAt_ = entity.worldObj.getBlockState(pos_).getBlock(); if(blockAt == ModBlocks.manaFlame) - entity.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Blocks.air); - else if(blockAt_.isAir(entity.worldObj, x, y, z) || blockAt_.isReplaceable(entity.worldObj, x, y, z)) { - entity.worldObj.setBlock(x, y, z, ModBlocks.manaFlame); - TileEntity tile = entity.worldObj.getTileEntity(x, y, z); + entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.air.getDefaultState()); + else if(blockAt_.isAir(entity.worldObj, pos_) || blockAt_.isReplaceable(entity.worldObj, pos_)) { + entity.worldObj.setBlockState(pos_, ModBlocks.manaFlame.getDefaultState()); + TileEntity tile = entity.worldObj.getTileEntity(pos_); if(tile instanceof TileManaFlame) ((TileManaFlame) tile).setColor(burst.getColor()); 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 2ae81c0f2..f6816a0fb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; @@ -33,10 +34,8 @@ public class LensMine extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { World world = entity.worldObj; - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; - Block block = world.getBlock(x, y, z); + BlockPos pos_ = pos.getBlockPos(); + Block block = world.getBlockState(pos_).getBlock(); ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP; @@ -44,29 +43,29 @@ public class LensMine extends Lens { if(warp && (block == ModBlocks.pistonRelay || block == Blocks.piston || block == Blocks.piston_extension || block == Blocks.piston_head)) return false; - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos_); - int meta = world.getBlockMetadata(x, y, z); - float hardness = block.getBlockHardness(world, x, y, z); + IBlockState state = world.getBlockState(pos_); + float hardness = block.getBlockHardness(world, pos_); int mana = burst.getMana(); BlockPos coords = burst.getBurstSourceBlockPos(); - if((coords.posX != x || coords.posY != y || coords.posZ != z) && !(tile instanceof IManaBlock) && block != null && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { + if(!coords.equals(pos.getBlockPos()) && !(tile instanceof IManaBlock) && block != null && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { List items = new ArrayList(); - items.addAll(block.getDrops(world, x, y, z, meta, 0)); + items.addAll(block.getDrops(world, pos_, world.getBlockState(pos_), 0)); - if(!burst.hasAlreadyCollidedAt(x)) { + if(!burst.hasAlreadyCollidedAt(pos_)) { if(!burst.isFake() && !entity.worldObj.isRemote) { - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos_); if(ConfigHandler.blockBreakParticles) - entity.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + entity.worldObj.playAuxSFX(2001, pos_, Block.getStateId(state)); - boolean offBounds = coords.posY < 0; + boolean offBounds = coords.getY() < 0; boolean doWarp = warp && !offBounds; - int dropX = doWarp ? coords.posX : x; - int dropY = doWarp ? coords.posY : y; - int dropZ = doWarp ? coords.posZ : z; + int dropX = doWarp ? coords.getX() : pos_.getX(); + int dropY = doWarp ? coords.getY() : pos_.getY(); + int dropZ = doWarp ? coords.getZ() : pos_.getZ(); for(ItemStack stack_ : items) world.spawnEntityInWorld(new EntityItem(world, dropX + 0.5, dropY + 0.5, dropZ + 0.5, stack_)); 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 1c0d8444b..ce6f0e449 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -10,14 +10,13 @@ */ package vazkii.botania.common.item.lens; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; public class LensPiston extends Lens { @@ -25,21 +24,16 @@ public class LensPiston extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if((coords.posX != pos.blockX || coords.posY != pos.blockY || coords.posZ != pos.blockZ) && !burst.isFake() && !isManaBlock && !entity.worldObj.isRemote) { - ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit).getOpposite(); - int x = pos.blockX + dir.offsetX; - int y = pos.blockY + dir.offsetY; - int z = pos.blockZ + dir.offsetZ; + if(!coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock && !entity.worldObj.isRemote) { + BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); - if(entity.worldObj.isAirBlock(x, y, z) || entity.worldObj.getBlock(x, y, z).isReplaceable(entity.worldObj, x, y, z)) { - Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - int meta = entity.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); - TileEntity tile = entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + if(entity.worldObj.isAirBlock(pos_) || entity.worldObj.getBlockState(pos_).getBlock().isReplaceable(entity.worldObj, pos_)) { + IBlockState state = entity.worldObj.getBlockState(pos_); + TileEntity tile = entity.worldObj.getTileEntity(pos_); - if(block.getMobilityFlag() == 0 && block != Blocks.obsidian && block.getBlockHardness(entity.worldObj, pos.blockX, pos.blockY, pos.blockZ) >= 0 && tile == null) { - entity.worldObj.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - entity.worldObj.setBlock(x, y, z, block, meta, 1 | 2); - entity.worldObj.playAuxSFX(2001, pos.blockX, pos.blockY, pos.blockZ, Block.getIdFromBlock(block) + (meta << 12)); + if(state.getBlock().getMobilityFlag() == 0 && state.getBlock() != Blocks.obsidian && state.getBlock().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/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index eb9173567..561a302b2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -22,7 +22,7 @@ public class LensStorm extends Lens { public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) + if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && !coords.equals(pos.getBlockPos())) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 5F, true); } else dead = false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 23787954d..220a590fa 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; @@ -25,15 +26,15 @@ public class LensWarp extends Lens { if(burst.isFake()) return dead; - Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - String key = BlockPistonRelay.mappedPositions.get(BlockPistonRelay.getCoordsAsString(entity.worldObj.provider.dimensionId, pos.blockX, pos.blockY, pos.blockZ)); + String key = BlockPistonRelay.mappedPositions.get(BlockPistonRelay.getCoordsAsString(entity.worldObj.provider.getDimensionId(), pos.getBlockPos())); if(key != null) { String[] tokens = key.split(":"); int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - if(worldId == entity.worldObj.provider.dimensionId) { + if(worldId == entity.worldObj.provider.getDimensionId()) { entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - burst.setCollidedAt(x); + burst.setCollidedAt(pos.getBlockPos()); return false; } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index 7bae10696..275bec6ea 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -22,14 +22,10 @@ public class LensWeight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; - Block block = entity.worldObj.getBlock(x, y, z); - Block blockBelow = entity.worldObj.getBlock(x, y - 1, z); - int meta = entity.worldObj.getBlockMetadata(x, y, z); - if(blockBelow.isAir(entity.worldObj, x, y - 1, z) && block.getBlockHardness(entity.worldObj, x, y, z) != -1 && entity.worldObj.getTileEntity(x, y, z) == null && block.canSilkHarvest(entity.worldObj, null, x, y, z, meta)) { - EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, x + 0.5, y + 0.5, z + 0.5, block, meta); + Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block blockBelow = entity.worldObj.getBlockState(pos.getBlockPos().down()).getBlock(); + if(blockBelow.isAir(entity.worldObj, pos.getBlockPos().down()) && block.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), entity.worldObj.getBlockState(pos.getBlockPos()), null)) { + EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, entity.worldObj.getBlockState(pos.getBlockPos())); if(!entity.worldObj.isRemote) entity.worldObj.spawnEntityInWorld(falling); } 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 15261d5e0..e250e196b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -16,8 +16,11 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IDyablePool; @@ -33,12 +36,9 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int meta = par1ItemStack.getItemDamage(); - if(meta != par3World.getBlockMetadata(par4, par5, par6) && (block == Blocks.wool || block == Blocks.carpet)) { - par3World.setBlockMetadataWithNotify(par4, par5, par6, meta, 1 | 2); - par1ItemStack.stackSize--; + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + if (par3World.getBlockState(pos).getBlock().recolorBlock(par3World, pos, side, EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()))) { + par1ItemStack.stackSize--; // todo 1.8 recheck ^^ return true; } return false; @@ -53,7 +53,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { if(meta != dyable.getColor()) { dyable.setColor(meta); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); } } } @@ -62,7 +62,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_) { if(p_111207_3_ instanceof EntitySheep) { EntitySheep entitysheep = (EntitySheep)p_111207_3_; - int i = p_111207_1_.getItemDamage(); + EnumDyeColor i = EnumDyeColor.byMetadata(p_111207_1_.getItemDamage()); if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { entitysheep.setFleeceColor(i); 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 4e8b88ca5..4aa2d7e00 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -22,7 +21,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -67,7 +67,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; - boolean ender = event.world.provider.dimensionId == 1; + boolean ender = event.world.provider.getDimensionId() == 1; if(rightEvent && correctStack && ender) { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); @@ -91,17 +91,17 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par1ItemStack.getItemDamage() == 14); - else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) { + return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, pos, par1ItemStack.getItemDamage() == 14); + else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, pos, par2EntityPlayer)) { if(!par3World.isRemote) - par3World.playAuxSFX(2005, par4, par5, par6, 0); + par3World.playAuxSFX(2005, pos, 0); return true; } - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, side, par8, par9, par10); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 23e836537..93495033e 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -23,9 +23,4 @@ public class ItemPestleAndMortar extends ItemMod { setUnlocalizedName(LibItemNames.PESTLE_AND_MORTAR); } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 4f11fbec4..51aa99dce 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item.material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.block.ModBlocks; @@ -26,9 +28,9 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, par1ItemStack.getItemDamage()); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { if(!par2EntityPlayer.capabilities.isCreativeMode) diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 22fffed31..2bbe534d5 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.record; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; 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 a0594132b..bb5ca4be1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -94,7 +94,7 @@ public class ItemDice extends ItemRelic { Item item = relicStacks[relic].getItem(); IRelic irelic = (IRelic) item; Achievement achievement = irelic.getBindAchievement(); - return mpPlayer.func_147099_x().hasAchievementUnlocked(achievement); + return mpPlayer.getStatFile().hasAchievementUnlocked(achievement); } } 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 040ff1178..353f02df7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -17,6 +17,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -38,21 +39,21 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs private static final String TAG_DIMENSION = "dim"; @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { if(world.isRemote) { player.swingItem(); for(int i = 0; i < 10; i++) { - float x1 = (float) (x + Math.random()); - float y1 = y + 1; - float z1 = (float) (z + Math.random()); + float x1 = (float) (pos.getX() + Math.random()); + float y1 = pos.getY() + 1; + float z1 = (float) (pos.getZ() + Math.random()); Botania.proxy.wispFX(player.worldObj, x1, y1, z1, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.5F, -0.05F + (float) Math.random() * 0.05F); } } else { - ItemNBTHelper.setInt(stack, TAG_X, x); - ItemNBTHelper.setInt(stack, TAG_Y, y); - ItemNBTHelper.setInt(stack, TAG_Z, z); - ItemNBTHelper.setInt(stack, TAG_DIMENSION, world.provider.dimensionId); + ItemNBTHelper.setInt(stack, TAG_X, pos.getX()); + ItemNBTHelper.setInt(stack, TAG_Y, pos.getY()); + ItemNBTHelper.setInt(stack, TAG_Z, pos.getZ()); + ItemNBTHelper.setInt(stack, TAG_DIMENSION, world.provider.getDimensionId()); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 5F); } } @@ -75,7 +76,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); @@ -83,7 +84,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, player.posX, player.posY, player.posZ) * 10); - if(y > -1 && dim == world.provider.dimensionId && ManaItemHandler.requestManaExact(stack, player, cost, true)) { + if(y > -1 && dim == world.provider.getDimensionId() && 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); @@ -111,7 +112,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.block; + return EnumAction.BLOCK; } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 88d5e515c..f181ec1e7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -40,7 +40,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { - return isBoot(p_77661_1_) ? EnumAction.drink : EnumAction.eat; + return isBoot(p_77661_1_) ? EnumAction.DRINK : EnumAction.EAT; } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 2dc32c505..1c099ef0c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -106,7 +106,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override From 2376287dd76d56c8aabe9712b9056fd0258b024d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Nov 2015 13:09:45 -0600 Subject: [PATCH 021/935] Some items --- .../botania/common/item/Item16Colors.java | 6 +- .../common/item/ItemBlackHoleTalisman.java | 13 +-- .../botania/common/item/ItemBlackLotus.java | 6 +- .../botania/common/item/ItemBottledMana.java | 21 ++--- .../botania/common/item/ItemCacophonium.java | 2 +- .../vazkii/botania/common/item/ItemMod.java | 7 -- .../common/item/ItemOvergrowthSeed.java | 13 +-- .../botania/common/item/ItemPinkinator.java | 3 +- .../botania/common/item/ItemPoolMinecart.java | 14 ++-- .../botania/common/item/ItemSextant.java | 10 +-- .../botania/common/item/ItemSignalFlare.java | 11 +-- .../botania/common/item/ItemSlingshot.java | 4 +- .../vazkii/botania/common/item/ItemSpark.java | 10 ++- .../botania/common/item/ItemSpawnerMover.java | 12 +-- .../botania/common/item/ItemSpellCloth.java | 7 +- .../botania/common/item/ItemTwigWand.java | 84 ++++++++----------- .../botania/common/item/ItemWorldSeed.java | 6 +- 17 files changed, 101 insertions(+), 128 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 5abafdc6c..6ba258099 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -28,11 +29,10 @@ public class Item16Colors extends ItemMod { @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() >= EntitySheep.fleeceColorTable.length) + if(par1ItemStack.getItemDamage() >= EnumDyeColor.values().length) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par1ItemStack.getItemDamage()]; - return new Color(color[0], color[1], color[2]).getRGB(); + return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9604249ff..7dae1cef9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -24,10 +24,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.*; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; @@ -72,7 +70,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlock(par4, par5, par6); int meta = par3World.getBlockMetadata(par4, par5, par6); boolean set = setBlock(par1ItemStack, block, meta); @@ -217,14 +215,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return getContainerItem(stack) != null; } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { - return false; - } - 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)); + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 132b01575..15bde98a7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -42,7 +42,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public boolean hasEffect(ItemStack par1ItemStack, int pass) { + public boolean hasEffect(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() > 0; } @@ -62,7 +62,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { if(!item.worldObj.isRemote) { pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); } for(int i = 0; i < 50; i++) { @@ -76,7 +76,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { float my = (float) Math.random() * m; float mz = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(item.worldObj, item.posX, tile.yCoord + 0.5F, item.posZ, r, g, b, s, mx, my, mz); + Botania.proxy.wispFX(item.worldObj, item.posX, tile.getPos().getY() + 0.5F, item.posZ, r, g, b, s, mx, my, mz); } item.worldObj.playSoundAtEntity(item, "botania:blackLotus", 0.5F, t2 ? 0.1F : 1F); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 2e89850b1..245d23b5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -26,11 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; +import net.minecraft.util.*; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -57,8 +54,8 @@ public class ItemBottledMana extends ItemMod { break; } case 1 : { // Water - if(!player.worldObj.isRemote && !player.worldObj.provider.isHellWorld) - player.worldObj.setBlock(MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), Blocks.flowing_water); + if(!player.worldObj.isRemote && !player.worldObj.provider.doesWaterVaporize()) + player.worldObj.setBlockState(new BlockPos(player), Blocks.flowing_water.getDefaultState()); break; } case 2 : { // Set on Fire @@ -72,7 +69,7 @@ public class ItemBottledMana extends ItemMod { break; } case 4 : { // Mega Jump - if(!player.worldObj.provider.isHellWorld) { + if(!player.worldObj.provider.doesWaterVaporize()) { if(!player.worldObj.isRemote) player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); player.motionY = 6; @@ -87,7 +84,7 @@ public class ItemBottledMana extends ItemMod { } case 6 : { // Lots O' Hearts if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 20 * 60 * 2, 9)); + player.addPotionEffect(new PotionEffect(Potion.absorption.id, 20 * 60 * 2, 9)); break; } case 7 : { // All your inventory is belong to us @@ -113,8 +110,8 @@ public class ItemBottledMana extends ItemMod { MathHelper.floor_double(player.posY); int z = MathHelper.floor_double(player.posZ); for(int i = 256; i > 0; i--) { - Block block = player.worldObj.getBlock(x, i, z); - if(!block.isAir(player.worldObj, x, i, z)) { + Block block = player.worldObj.getBlockState(new BlockPos(x, i, z)).getBlock(); + if(!block.isAir(player.worldObj, new BlockPos(x, i, z))) { if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); @@ -227,7 +224,7 @@ public class ItemBottledMana extends ItemMod { } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { randomEffect(par3EntityPlayer, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); @@ -244,7 +241,7 @@ public class ItemBottledMana extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.drink; + return EnumAction.DRINK; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 88c213065..b552d36b3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -114,7 +114,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.block; + return EnumAction.BLOCK; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index e8ddc0903..ce7b9a5ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.client.core.helper.IconHelper; @@ -37,10 +36,4 @@ public class ItemMod extends Item { public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index fd9c25a08..3632eb8ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -11,8 +11,11 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; @@ -25,15 +28,15 @@ public class ItemOvergrowthSeed extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { - Block block = world.getBlock(x, y, z); - ItemStack blockStack = new ItemStack(block); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + IBlockState state = world.getBlockState(pos); + ItemStack blockStack = new ItemStack(state.getBlock()); int[] ids = OreDictionary.getOreIDs(blockStack); for(int i : ids) { String name = OreDictionary.getOreName(i); if(name.equals("grass")) { - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); - world.setBlock(x, y, z, ModBlocks.enchantedSoil); + world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.setBlockState(pos, ModBlocks.enchantedSoil.getDefaultState()); stack.stackSize--; return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 41a11fa10..51567f8b3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -16,6 +16,7 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.common.achievement.ModAchievements; @@ -45,7 +46,7 @@ public class ItemPinkinator extends ItemMod { } player.addStat(ModAchievements.pinkinator, 1); - world.spawnParticle("hugeexplosion", wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.stackSize--; return stack; } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 07dc38d8c..c4be8eb31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -36,13 +38,13 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(BlockRailBase.func_150051_a(p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_))) { + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { if(!p_77648_3_.isRemote) { - EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, p_77648_4_ + 0.5, p_77648_5_ + 0.5, p_77648_6_ + 0.5); + EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); if(p_77648_1_.hasDisplayName()) - entityminecart.setMinecartName(p_77648_1_.getDisplayName()); + entityminecart.setCustomNameTag(p_77648_1_.getDisplayName()); p_77648_3_.spawnEntityInWorld(entityminecart); } @@ -66,12 +68,12 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin @Override public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k) { - if(BlockRailBase.func_150051_a(world.getBlock(i, j, k))) { + if(BlockRailBase.isRailBlock(world.getBlockState(new BlockPos(i, j, k)))) { if(!world.isRemote) { EntityMinecart entityminecart = new EntityPoolMinecart(world, i + 0.5,j + 0.5, k + 0.5); if(cart.hasDisplayName()) - entityminecart.setMinecartName(cart.getDisplayName()); + entityminecart.setCustomNameTag(cart.getDisplayName()); if(world.spawnEntityInWorld(entityminecart)) return entityminecart; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 453fc5ffc..ef15146a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -44,7 +44,7 @@ public class ItemSextant extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -95,9 +95,9 @@ public class ItemSextant extends ItemMod { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); if(pos != null && pos.entityHit == null) { if(!par2World.isRemote) { - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.blockX); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.blockY); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.blockZ); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.getBlockPos().getX()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.getBlockPos().getY()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.getBlockPos().getZ()); } } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); @@ -134,7 +134,7 @@ public class ItemSextant extends ItemMod { if(onUse == stack && stack.getItem().getMaxItemUseDuration(stack) - time >= 10) { double radius = calculateRadius(stack, player); - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; int x = resolution.getScaledWidth() / 2 + 30; int y = resolution.getScaledHeight() / 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index b3311f2b7..703dd0ff5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -19,6 +19,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -108,11 +109,10 @@ public class ItemSignalFlare extends ItemMod { return 0xFFFFFF; int colorv = getColor(par1ItemStack); - if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0) + if(colorv >= EnumDyeColor.values().length || colorv < 0) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)]; - return new Color(color[0], color[1], color[2]).getRGB(); + return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue; } @Override @@ -121,11 +121,6 @@ public class ItemSignalFlare extends ItemMod { par3List.add(forColor(i)); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index cd52a80f4..9c1fa8f78 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -49,7 +49,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { return par1ItemStack; } @@ -60,7 +60,7 @@ public class ItemSlingshot extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index ae80aa31c..f1cc3b5a1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -16,6 +16,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -35,18 +37,18 @@ public class ItemSpark extends ItemMod implements ICraftAchievement { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { - TileEntity tile = world.getTileEntity(x, y, z); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { + TileEntity tile = world.getTileEntity(pos); if(tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) { stack.stackSize--; if(!world.isRemote) { EntitySpark spark = new EntitySpark(world); - spark.setPosition(x + 0.5, y + 1.5, z + 0.5); + spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.spawnEntityInWorld(spark); attach.attachSpark(spark); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 484865d50..2dd341494 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -20,6 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -104,22 +106,22 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xOffset, float yOffset, float zOffset) { if(getEntityId(itemstack) == null) { - if(world.getBlock(x, y, z).equals(Blocks.mob_spawner)) { - TileEntity te = world.getTileEntity(x, y, z); + if(world.getBlockState(pos).getBlock().equals(Blocks.mob_spawner)) { + TileEntity te = world.getTileEntity(pos); NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TAG_SPAWNER, new NBTTagCompound()); te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER)); tag.setInteger(TAG_PLACE_DELAY, 20); itemstack.setTagCompound(tag); - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); player.renderBrokenItemStack(itemstack); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(world, x + 0.5, y + 0.5, z + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); + Botania.proxy.wispFX(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); } return true; } else return false; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index af76e2698..dc95b05e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -40,7 +40,7 @@ public class ItemSpellCloth extends ItemMod { } @Override - public boolean hasContainerItem() { + public boolean hasContainerItem(ItemStack stack) { return true; } @@ -51,9 +51,4 @@ public class ItemSpellCloth extends ItemMod { return stack; } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 6bc133a7e..b23078907 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -21,15 +21,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.*; import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -58,6 +57,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { private static final String TAG_BOUND_TILE_Y = "boundTileY"; private static final String TAG_BOUND_TILE_Z = "boundTileZ"; private static final String TAG_BIND_MODE = "bindMode"; + private static final BlockPos UNBOUND_POS = new BlockPos(0, -1, 0); public ItemTwigWand() { super(LibItemNames.TWIG_WAND); @@ -65,41 +65,41 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + Block block = par3World.getBlockState(pos).getBlock(); BlockPos boundTile = getBoundTile(par1ItemStack); - if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) { - TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); + if(boundTile.getY() != -1 && par2EntityPlayer.isSneaking() && !pos.equals(boundTile)) { + TileEntity tile = par3World.getTileEntity(boundTile); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, , par4, , par5)) { - Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); - Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); + if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, pos, side)) { + Vector3 orig = new Vector3(boundTile.getX() + 0.5, boundTile.getY() + 0.5, boundTile.getZ() + 0.5); + Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); doParticleBeam(par3World, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, , boundTile.posX); - setBoundTile(par1ItemStack, 0, -1, 0); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile); + setBoundTile(par1ItemStack, UNBOUND_POS); } return true; - } else setBoundTile(par1ItemStack, 0, -1, 0); + } else setBoundTile(par1ItemStack, UNBOUND_POS); } else if(par2EntityPlayer.isSneaking()) { - block.rotateBlock(par3World, par4, par5, par6, ForgeDirection.getOrientation(par7)); + block.rotateBlock(par3World, pos, side); if(par3World.isRemote) par2EntityPlayer.swingItem(); } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { int meta = -1; - if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 0)) + if(TileEnchanter.canEnchanterExist(par3World, pos, 0)) meta = 0; - else if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 1)) + else if(TileEnchanter.canEnchanterExist(par3World, pos, 1)) meta = 1; if(meta != -1 && !par3World.isRemote) { - par3World.setBlock(par4, par5, par6, ModBlocks.enchanter, meta, 1 | 2); + par3World.setBlockState(pos, ModBlocks.enchanter, meta, 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSoundEffect(par4, par5, par6, "botania:enchanterBlock", 0.5F, 0.6F); + par3World.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -111,18 +111,18 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { float velMul = 0.07F; - Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(par3World, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } } } else if(block instanceof IWandable) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = par3World.getTileEntity(pos); boolean bindable = tile instanceof IWandBindable; boolean wanded = false; - if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, , par4, , par5)) { - if(boundTile.posX == par4 && boundTile.posY == par5 && boundTile.posZ == par6) - setBoundTile(par1ItemStack, 0, -1, 0); - else setBoundTile(par1ItemStack, par4, par5, par6); + if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, pos, side)) { + if(boundTile.equals(pos)) + setBoundTile(par1ItemStack, UNBOUND_POS); + else setBoundTile(par1ItemStack, pos); if(par3World.isRemote) par2EntityPlayer.swingItem(); @@ -130,7 +130,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, , par4, , par5); + wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, pos, side); if(wanded && par3World.isRemote) par2EntityPlayer.swingItem(); } @@ -138,7 +138,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return wanded; } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); - String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.dimensionId, par4, par5, par6); + String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.getDimensionId(), pos); BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); @@ -178,9 +178,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { BlockPos coords = getBoundTile(par1ItemStack); - TileEntity tile = par2World.getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = par2World.getTileEntity(coords); if(tile == null || !(tile instanceof IWandBindable)) - setBoundTile(par1ItemStack, 0, -1, 0); + setBoundTile(par1ItemStack, UNBOUND_POS); } @Override @@ -218,18 +218,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(par2 == 0 || par2 == 3) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)]; - return new Color(color[0], color[1], color[2]).getRGB(); - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 4; + EnumDyeColor color = EnumDyeColor.byMetadata(par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)); + return color.getMapColor().colorValue; } @Override @@ -250,7 +240,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public EnumRarity getRarity(ItemStack par1ItemStack) { - return EnumRarity.rare; + return EnumRarity.RARE; } public static ItemStack forColors(int color1, int color2) { @@ -269,10 +259,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return ItemNBTHelper.getInt(stack, TAG_COLOR2, 0); } - public static void setBoundTile(ItemStack stack, int x, int y, int z) { - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_X, x); - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Y, y); - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Z, z); + public static void setBoundTile(ItemStack stack, BlockPos pos) { + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_X, pos.getX()); + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Y, pos.getY()); + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Z, pos.getZ()); } public static BlockPos getBoundTile(ItemStack stack) { @@ -297,12 +287,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public BlockPos getBinding(ItemStack stack) { BlockPos bound = getBoundTile(stack); - if(bound.posY != -1) + if(bound.getY() != -1) return bound; MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null) { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); return coords; diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index ebf75a8b4..9c8ae52b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -28,12 +28,12 @@ public class ItemWorldSeed extends ItemMod { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { BlockPos coords = world.getSpawnPoint(); - if(MathHelper.pointDistanceSpace(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, player.posX, player.posY, player.posZ) > 24) { + if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { player.rotationPitch = 0F; player.rotationYaw = 0F; - player.setPositionAndUpdate(coords.posX + 0.5, coords.posY + 1.6, coords.posZ + 0.5); + player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCollidingBoundingBoxes(player, player.boundingBox).isEmpty()) + while(!world.getCollidingBoundingBoxes(player, player.getBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); From da1dc51202843dac6e29c66f830d953e8c4d5af8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 00:49:52 -0600 Subject: [PATCH 022/935] Update to TC5 API --- .../thaumcraft/api/OreDictionaryEntries.java | 76 ++ .../java/thaumcraft/api/ThaumcraftApi.java | 650 ++++++++++++++++++ .../thaumcraft/api/ThaumcraftApiHelper.java | 329 +++++++++ .../api/ThaumcraftEnchantments.java | 9 + .../thaumcraft/api/ThaumcraftMaterials.java | 52 ++ .../java/thaumcraft/api/aspects/Aspect.java | 206 ++++++ .../thaumcraft/api/aspects/AspectHelper.java | 178 +++++ .../thaumcraft/api/aspects/AspectList.java | 278 ++++++++ .../api/aspects/AspectSourceHelper.java | 58 ++ .../api/aspects/IAspectContainer.java | 80 +++ .../thaumcraft/api/aspects/IAspectSource.java | 16 + .../api/aspects/IEssentiaContainerItem.java | 45 ++ .../api/aspects/IEssentiaTransport.java | 92 +++ .../java/thaumcraft/api/aura/AuraHelper.java | 81 +++ .../java/thaumcraft/api/blocks/BlocksTC.java | 132 ++++ .../thaumcraft/api/blocks/ILabelable.java | 23 + .../thaumcraft/api/blocks/TileThaumcraft.java | 81 +++ .../api/crafting/CrucibleRecipe.java | 90 +++ .../api/crafting/IArcaneRecipe.java | 28 + .../api/crafting/IArcaneWorkbench.java | 11 + .../api/crafting/IInfusionStabiliser.java | 39 +- .../crafting/InfusionEnchantmentRecipe.java | 136 ++++ .../api/crafting/InfusionRecipe.java | 106 +++ .../api/crafting/ShapedArcaneRecipe.java | 284 ++++++++ .../api/crafting/ShapelessArcaneRecipe.java | 182 +++++ .../DamageSourceIndirectThaumcraftEntity.java | 32 + .../damagesource/DamageSourceThaumcraft.java | 47 ++ .../thaumcraft/api/entities/IEldritchMob.java | 5 + .../thaumcraft/api/entities/ITaintedMob.java | 5 + .../thaumcraft/api/golems/ISealDisplayer.java | 11 + .../internal/DummyInternalMethodHandler.java | 93 +++ .../thaumcraft/api/internal/EnumWarpType.java | 5 + .../api/internal/IInternalMethodHandler.java | 30 + .../api/internal/WeightedRandomLoot.java | 24 + .../api/internal/WorldCoordinates.java | 101 +++ .../java/thaumcraft/api/items/IArchitect.java | 30 + .../thaumcraft/api/{ => items}/IGoggles.java | 44 +- .../thaumcraft/api/items/IRechargable.java | 35 + .../thaumcraft/api/items/IRepairable.java | 13 + .../api/items/IRepairableExtended.java | 17 + .../api/{nodes => items}/IRevealer.java | 44 +- .../api/{ => items}/IRunicArmor.java | 44 +- .../api/{ => items}/IScribeTools.java | 28 +- .../api/items/IVisDiscountGear.java | 20 + .../thaumcraft/api/items/IWarpingGear.java | 22 + .../items/ItemGenericEssentiaContainer.java | 88 +++ .../java/thaumcraft/api/items/ItemRunic.java | 21 + .../java/thaumcraft/api/items/ItemsTC.java | 185 +++++ src/api/java/thaumcraft/api/package-info.java | 5 + .../api/potions/PotionFluxTaint.java | 67 ++ .../api/potions/PotionVisExhaust.java | 48 ++ .../thaumcraft/api/research/IScanThing.java | 23 + .../api/research/ResearchCategories.java | 117 ++++ .../api/research/ResearchCategoryList.java | 50 ++ .../api/research/ResearchHelper.java | 42 ++ .../thaumcraft/api/research/ResearchItem.java | 303 ++++++++ .../thaumcraft/api/research/ResearchPage.java | 183 +++++ .../thaumcraft/api/research/ScanAspect.java | 61 ++ .../thaumcraft/api/research/ScanBlock.java | 30 + .../api/research/ScanBlockState.java | 38 + .../thaumcraft/api/research/ScanEntity.java | 57 ++ .../thaumcraft/api/research/ScanItem.java | 37 + .../api/research/ScanningManager.java | 58 ++ .../api/wands/FocusUpgradeType.java | 107 +++ src/api/java/thaumcraft/api/wands/IWand.java | 54 ++ .../api/wands/IWandRodOnUpdate.java | 16 + .../api/wands/IWandTriggerManager.java | 17 + .../java/thaumcraft/api/wands/IWandable.java | 25 + .../thaumcraft/api/wands/ItemFocusBasic.java | 313 +++++++++ .../java/thaumcraft/api/wands/WandCap.java | 142 ++++ .../java/thaumcraft/api/wands/WandHelper.java | 36 + .../java/thaumcraft/api/wands/WandRod.java | 155 +++++ .../api/wands/WandTriggerRegistry.java | 124 ++++ 73 files changed, 6215 insertions(+), 99 deletions(-) create mode 100644 src/api/java/thaumcraft/api/OreDictionaryEntries.java create mode 100644 src/api/java/thaumcraft/api/ThaumcraftApi.java create mode 100644 src/api/java/thaumcraft/api/ThaumcraftApiHelper.java create mode 100644 src/api/java/thaumcraft/api/ThaumcraftEnchantments.java create mode 100644 src/api/java/thaumcraft/api/ThaumcraftMaterials.java create mode 100644 src/api/java/thaumcraft/api/aspects/Aspect.java create mode 100644 src/api/java/thaumcraft/api/aspects/AspectHelper.java create mode 100644 src/api/java/thaumcraft/api/aspects/AspectList.java create mode 100644 src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java create mode 100644 src/api/java/thaumcraft/api/aspects/IAspectContainer.java create mode 100644 src/api/java/thaumcraft/api/aspects/IAspectSource.java create mode 100644 src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java create mode 100644 src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java create mode 100644 src/api/java/thaumcraft/api/aura/AuraHelper.java create mode 100644 src/api/java/thaumcraft/api/blocks/BlocksTC.java create mode 100644 src/api/java/thaumcraft/api/blocks/ILabelable.java create mode 100644 src/api/java/thaumcraft/api/blocks/TileThaumcraft.java create mode 100644 src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java create mode 100644 src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java create mode 100644 src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java create mode 100644 src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java create mode 100644 src/api/java/thaumcraft/api/crafting/InfusionRecipe.java create mode 100644 src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java create mode 100644 src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java create mode 100644 src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java create mode 100644 src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java create mode 100644 src/api/java/thaumcraft/api/entities/IEldritchMob.java create mode 100644 src/api/java/thaumcraft/api/entities/ITaintedMob.java create mode 100644 src/api/java/thaumcraft/api/golems/ISealDisplayer.java create mode 100644 src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java create mode 100644 src/api/java/thaumcraft/api/internal/EnumWarpType.java create mode 100644 src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java create mode 100644 src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java create mode 100644 src/api/java/thaumcraft/api/internal/WorldCoordinates.java create mode 100644 src/api/java/thaumcraft/api/items/IArchitect.java rename src/api/java/thaumcraft/api/{ => items}/IGoggles.java (73%) create mode 100644 src/api/java/thaumcraft/api/items/IRechargable.java create mode 100644 src/api/java/thaumcraft/api/items/IRepairable.java create mode 100644 src/api/java/thaumcraft/api/items/IRepairableExtended.java rename src/api/java/thaumcraft/api/{nodes => items}/IRevealer.java (66%) rename src/api/java/thaumcraft/api/{ => items}/IRunicArmor.java (90%) rename src/api/java/thaumcraft/api/{ => items}/IScribeTools.java (76%) create mode 100644 src/api/java/thaumcraft/api/items/IVisDiscountGear.java create mode 100644 src/api/java/thaumcraft/api/items/IWarpingGear.java create mode 100644 src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java create mode 100644 src/api/java/thaumcraft/api/items/ItemRunic.java create mode 100644 src/api/java/thaumcraft/api/items/ItemsTC.java create mode 100644 src/api/java/thaumcraft/api/package-info.java create mode 100644 src/api/java/thaumcraft/api/potions/PotionFluxTaint.java create mode 100644 src/api/java/thaumcraft/api/potions/PotionVisExhaust.java create mode 100644 src/api/java/thaumcraft/api/research/IScanThing.java create mode 100644 src/api/java/thaumcraft/api/research/ResearchCategories.java create mode 100644 src/api/java/thaumcraft/api/research/ResearchCategoryList.java create mode 100644 src/api/java/thaumcraft/api/research/ResearchHelper.java create mode 100644 src/api/java/thaumcraft/api/research/ResearchItem.java create mode 100644 src/api/java/thaumcraft/api/research/ResearchPage.java create mode 100644 src/api/java/thaumcraft/api/research/ScanAspect.java create mode 100644 src/api/java/thaumcraft/api/research/ScanBlock.java create mode 100644 src/api/java/thaumcraft/api/research/ScanBlockState.java create mode 100644 src/api/java/thaumcraft/api/research/ScanEntity.java create mode 100644 src/api/java/thaumcraft/api/research/ScanItem.java create mode 100644 src/api/java/thaumcraft/api/research/ScanningManager.java create mode 100644 src/api/java/thaumcraft/api/wands/FocusUpgradeType.java create mode 100644 src/api/java/thaumcraft/api/wands/IWand.java create mode 100644 src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java create mode 100644 src/api/java/thaumcraft/api/wands/IWandTriggerManager.java create mode 100644 src/api/java/thaumcraft/api/wands/IWandable.java create mode 100644 src/api/java/thaumcraft/api/wands/ItemFocusBasic.java create mode 100644 src/api/java/thaumcraft/api/wands/WandCap.java create mode 100644 src/api/java/thaumcraft/api/wands/WandHelper.java create mode 100644 src/api/java/thaumcraft/api/wands/WandRod.java create mode 100644 src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java diff --git a/src/api/java/thaumcraft/api/OreDictionaryEntries.java b/src/api/java/thaumcraft/api/OreDictionaryEntries.java new file mode 100644 index 000000000..2467cf1d9 --- /dev/null +++ b/src/api/java/thaumcraft/api/OreDictionaryEntries.java @@ -0,0 +1,76 @@ +package thaumcraft.api; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.blocks.BlocksTC; +import thaumcraft.api.items.ItemsTC; + +public class OreDictionaryEntries { + + /** + * I included this in the API to make it simpler to see what items and blocks are ore dictionaried + */ + public static void initializeOreDictionary() { + OreDictionary.registerOre("oreAmber", new ItemStack(BlocksTC.oreAmber)); + OreDictionary.registerOre("oreCinnabar", new ItemStack(BlocksTC.oreCinnabar)); + + OreDictionary.registerOre("logWood", new ItemStack(BlocksTC.log,1,0)); + OreDictionary.registerOre("logWood", new ItemStack(BlocksTC.log,1,3)); + OreDictionary.registerOre("plankWood", new ItemStack(BlocksTC.plank,1,0)); + OreDictionary.registerOre("plankWood", new ItemStack(BlocksTC.plank,1,1)); + OreDictionary.registerOre("slabWood", new ItemStack(BlocksTC.slabWood,1,0)); + OreDictionary.registerOre("slabWood", new ItemStack(BlocksTC.slabWood,1,1)); + OreDictionary.registerOre("treeSapling", new ItemStack(BlocksTC.sapling,1,0)); + OreDictionary.registerOre("treeSapling", new ItemStack(BlocksTC.sapling,1,1)); + + OreDictionary.registerOre("shardAir", new ItemStack(ItemsTC.shard,1,0)); + OreDictionary.registerOre("shardFire", new ItemStack(ItemsTC.shard,1,1)); + OreDictionary.registerOre("shardWater", new ItemStack(ItemsTC.shard,1,2)); + OreDictionary.registerOre("shardEarth", new ItemStack(ItemsTC.shard,1,3)); + OreDictionary.registerOre("shardOrder", new ItemStack(ItemsTC.shard,1,4)); + OreDictionary.registerOre("shardEntropy", new ItemStack(ItemsTC.shard,1,5)); + OreDictionary.registerOre("shardTainted", new ItemStack(ItemsTC.shard,1,6)); + OreDictionary.registerOre("shardBalanced", new ItemStack(ItemsTC.shard,1,7)); + OreDictionary.registerOre("nitor", new ItemStack(BlocksTC.nitor,1,OreDictionary.WILDCARD_VALUE)); + + OreDictionary.registerOre("gemAmber", new ItemStack(ItemsTC.amber)); + OreDictionary.registerOre("quicksilver", new ItemStack(ItemsTC.quicksilver)); + OreDictionary.registerOre("nuggetGold", new ItemStack(ItemsTC.coin)); + + OreDictionary.registerOre("nuggetIron", new ItemStack(ItemsTC.nuggets,1,0)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(ItemsTC.nuggets,1,1)); + OreDictionary.registerOre("nuggetTin", new ItemStack(ItemsTC.nuggets,1,2)); + OreDictionary.registerOre("nuggetSilver", new ItemStack(ItemsTC.nuggets,1,3)); + OreDictionary.registerOre("nuggetLead", new ItemStack(ItemsTC.nuggets,1,4)); + OreDictionary.registerOre("nuggetQuicksilver", new ItemStack(ItemsTC.nuggets,1,5)); + OreDictionary.registerOre("nuggetThaumium", new ItemStack(ItemsTC.nuggets,1,6)); + OreDictionary.registerOre("nuggetVoid", new ItemStack(ItemsTC.nuggets,1,7)); + OreDictionary.registerOre("nuggetBrass", new ItemStack(ItemsTC.nuggets,1,8)); + + OreDictionary.registerOre("ingotThaumium", new ItemStack(ItemsTC.ingots,1,0)); + OreDictionary.registerOre("ingotVoid", new ItemStack(ItemsTC.ingots,1,1)); + OreDictionary.registerOre("ingotBrass", new ItemStack(ItemsTC.ingots,1,2)); + + OreDictionary.registerOre("blockThaumium", new ItemStack(BlocksTC.metal,1,0)); + OreDictionary.registerOre("blockVoid", new ItemStack(BlocksTC.metal,1,1)); + OreDictionary.registerOre("blockBrass", new ItemStack(BlocksTC.metal,1,4)); + + OreDictionary.registerOre("plateIron", new ItemStack(ItemsTC.plate,1,1)); + OreDictionary.registerOre("gearBrass", new ItemStack(ItemsTC.gear,1,0)); + OreDictionary.registerOre("plateBrass", new ItemStack(ItemsTC.plate,1,0)); + OreDictionary.registerOre("gearThaumium", new ItemStack(ItemsTC.gear,1,1)); + OreDictionary.registerOre("plateThaumium", new ItemStack(ItemsTC.plate,1,2)); + OreDictionary.registerOre("gearVoid", new ItemStack(ItemsTC.gear,1,2)); + OreDictionary.registerOre("plateVoid", new ItemStack(ItemsTC.plate,1,3)); + + OreDictionary.registerOre("clusterIron", new ItemStack(ItemsTC.clusters,1,0)); + OreDictionary.registerOre("clusterGold", new ItemStack(ItemsTC.clusters,1,1)); + OreDictionary.registerOre("clusterCopper", new ItemStack(ItemsTC.clusters,1,2)); + OreDictionary.registerOre("clusterTin", new ItemStack(ItemsTC.clusters,1,3)); + OreDictionary.registerOre("clusterSilver", new ItemStack(ItemsTC.clusters,1,4)); + OreDictionary.registerOre("clusterLead", new ItemStack(ItemsTC.clusters,1,5)); + OreDictionary.registerOre("clusterCinnabar", new ItemStack(ItemsTC.clusters,1,6)); + + } + +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java new file mode 100644 index 000000000..d6e4dc96e --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftApi.java @@ -0,0 +1,650 @@ +package thaumcraft.api; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectHelper; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.api.internal.DummyInternalMethodHandler; +import thaumcraft.api.internal.IInternalMethodHandler; +import thaumcraft.api.internal.WeightedRandomLoot; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchCategoryList; +import thaumcraft.api.research.ResearchHelper; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; + + +/** + * @author Azanor + * + * + * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen. + * + */ +public class ThaumcraftApi { + //Internal (Do not alter this unless you like pretty explosions) + //Calling methods from this will only work properly once Thaumcraft is past the FMLPreInitializationEvent phase. + public static IInternalMethodHandler internalMethods = new DummyInternalMethodHandler(); + + //RESEARCH///////////////////////////////////////// + public static ArrayList scanEntities = new ArrayList(); + public static class EntityTagsNBT { + public EntityTagsNBT(String name, Object value) { + this.name = name; + this.value = value; + } + public String name; + public Object value; + } + public static class EntityTags { + public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) { + this.entityName = entityName; + this.nbts = nbts; + this.aspects = aspects; + } + public String entityName; + public EntityTagsNBT[] nbts; + public AspectList aspects; + } + + + /** + * This is used to add aspects to entities which you can then scan using a thaumometer. + * Also used to calculate vis drops from mobs. + * @param entityName + * @param aspects + * @param nbt you can specify certain nbt keys and their values + * to differentiate between mobs.
For example the normal and wither skeleton: + *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5)); + *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1)); + */ + public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) { + scanEntities.add(new EntityTags(entityName,aspects,nbt)); + } + + //RECIPES///////////////////////////////////////// + private static ArrayList craftingRecipes = new ArrayList(); + private static HashMap smeltingBonus = new HashMap(); + + /** + * This method is used to determine what bonus items are generated when the infernal furnace smelts items + * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold) + * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). + * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. + */ + public static void addSmeltingBonus(ItemStack in, ItemStack out) { + smeltingBonus.put( + Arrays.asList(in.getItem(),in.getItemDamage()), + new ItemStack(out.getItem(),0,out.getItemDamage())); + } + + /** + * This method is used to determine what bonus items are generated when the infernal furnace smelts items + * @param in The ore dictionary input of the smelting operation. e.g. "oreGold" + * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). + * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. + */ + public static void addSmeltingBonus(String in, ItemStack out) { + smeltingBonus.put( in, new ItemStack(out.getItem(),0,out.getItemDamage())); + } + + /** + * Returns the bonus item produced from a smelting operation in the infernal furnace + * @param in The input of the smelting operation. e.g. new ItemStack(oreGold) + * @return the The bonus item that can be produced + */ + public static ItemStack getSmeltingBonus(ItemStack in) { + ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage())); + if (out==null) { + out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE)); + } + if (out==null) { + for (int id:OreDictionary.getOreIDs(in)) { + String od = OreDictionary.getOreName( id); + out = smeltingBonus.get(od); + if (out!=null) break; + } + } + return out; + } + + public static List getCraftingRecipes() { + return craftingRecipes; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect. + * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. + */ + public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + CraftingManager.getInstance().addRecipe(r); + return r; + } + + /** + * @param research the research keys required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect. + * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. + */ + public static ShapedArcaneRecipe addArcaneCraftingRecipe(String[] research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + CraftingManager.getInstance().addRecipe(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect + * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. + */ + public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + CraftingManager.getInstance().addRecipe(r); + return r; + } + + /** + * @param research the research keys required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect + * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. + */ + public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String[] research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + CraftingManager.getInstance().addRecipe(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item + * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an + * instability effect each second while the crafting is in progress + * @param aspects the essentia cost per aspect. + * @param aspects input the central item to be infused. If string is passed it will look up oredictionary entries + * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. + * If string is passed it will look up oredictionary entries. + */ + public static InfusionRecipe addInfusionCraftingRecipe(String research, + Object result, int instability, AspectList aspects, Object input, Object[] recipe) + { + if (!(result instanceof ItemStack || result instanceof Object[])) return null; + InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param research the research keys required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item + * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an + * instability effect each second while the crafting is in progress + * @param aspects the essentia cost per aspect. + * @param aspects input the central item to be infused. If string is passed it will look up oredictionary entries + * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. + * If string is passed it will look up oredictionary entries. + */ + public static InfusionRecipe addInfusionCraftingRecipe(String[] research, + Object result, int instability, AspectList aspects, Object input, Object[] recipe) + { + if (!(result instanceof ItemStack || result instanceof Object[])) return null; + InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param enchantment the enchantment that will be applied to the item + * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an + * instability effect each second while the crafting is in progress + * @param aspects the essentia cost per aspect. + * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. + * If string is passed it will look up oredictionary entries. + */ + @Deprecated + public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, Object[] recipe) + { + InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param stack the recipe result + * @return the recipe + */ + public static InfusionRecipe getInfusionRecipe(ItemStack res) { + for (Object r:getCraftingRecipes()) { + if (r instanceof InfusionRecipe) { + if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) { + if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res)) + return (InfusionRecipe)r; + } + } + } + return null; + } + + /** + * @param key the research key required for this recipe to work. + * @param result the output result + * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item + * @param cost the vis cost + * @param tags the aspects required to craft this + */ + public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) { + CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags); + getCraftingRecipes().add(rc); + return rc; + } + + + + /** + * @param stack the recipe result + * @return the recipe + */ + public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) { + for (Object r:getCraftingRecipes()) { + if (r instanceof CrucibleRecipe) { + if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack)) + return (CrucibleRecipe)r; + } + } + return null; + } + + /** + * @param hash the unique recipe code + * @return the recipe + */ + public static CrucibleRecipe getCrucibleRecipeFromHash(int hash) { + for (Object r:getCraftingRecipes()) { + if (r instanceof CrucibleRecipe) { + if (((CrucibleRecipe)r).hash==hash) + return (CrucibleRecipe)r; + } + } + return null; + } + + /** + * Used by the thaumonomicon drilldown feature. + * @param stack the item + * @return the thaumcraft recipe key that produces that item. + */ + private static HashMap keyCache = new HashMap(); + + public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) { + int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()}; + if (keyCache.containsKey(key)) { + if (keyCache.get(key)==null) return null; + if (ResearchHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0])) + return keyCache.get(key); + else + return null; + } + for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) { + for (ResearchItem ri:rcl.research.values()) { + if (ri.getPages()==null) continue; + for (int a=0;a objectTags = new ConcurrentHashMap(); + public static ConcurrentHashMap groupedObjectTags = new ConcurrentHashMap(); + + /** + * Checks to see if the passed item/block already has aspects associated with it. + * @param id + * @param meta + * @return + */ + public static boolean exists(Item item, int meta) { + AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta)); + if (tmp==null) { + tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE)); + if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) { + int index=0; + do { + tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index)); + index++; + } while (index<16 && tmp==null); + } + if (tmp==null) return false; + } + + return true; + } + + /** + * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

+ * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(ItemStack item, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + try { + objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects); + } catch (Exception e) {} + } + + + /** + * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

+ * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + * @param item + * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations) + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + try { + objectTags.put(Arrays.asList(item.getItem(),meta[0]), aspects); + for (int m:meta) { + groupedObjectTags.put(Arrays.asList(item.getItem(),m), meta); + } + + } catch (Exception e) {} + } + + /** + * Used to assign apsects to the given ore dictionary item. + * @param oreDict the ore dictionary name + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(String oreDict, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + List ores = OreDictionary.getOres(oreDict); + if (ores!=null && ores.size()>0) { + for (ItemStack ore:ores) { + try { + objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects); + } catch (Exception e) {} + } + } + } + + /** + * Used to assign aspects to the given item/block. + * Attempts to automatically generate aspect tags by checking registered recipes. + * Here is an example of the declaration for pistons:

+ * ThaumcraftApi.registerComplexObjectTag(new ItemStack(Blocks.piston), (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.MOTION, 4)); + * IMPORTANT - this should only be used if you are not happy with the default aspects the object would be assigned. + * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) { + if (!exists(item.getItem(),item.getItemDamage())) { + AspectList tmp = AspectHelper.generateTags(item.getItem(), item.getItemDamage()); + if (tmp != null && tmp.size()>0) { + for(Aspect tag:tmp.getAspects()) { + aspects.add(tag, tmp.getAmount(tag)); + } + } + registerObjectTag(item,aspects); + } else { + AspectList tmp = AspectHelper.getObjectAspects(item); + for(Aspect tag:aspects.getAspects()) { + tmp.merge(tag, tmp.getAmount(tag)); + } + registerObjectTag(item,tmp); + } + } + + // WARP + private static HashMap warpMap = new HashMap(); + + /** + * This method is used to determine how much warp is gained if the item is crafted. The warp + * added is "sticky" warp + * @param craftresult The item crafted + * @param amount how much warp is gained + */ + public static void addWarpToItem(ItemStack craftresult, int amount) { + warpMap.put(Arrays.asList(craftresult.getItem(),craftresult.getItemDamage()),amount); + } + + /** + * This method is used to determine how much permanent warp is gained if the research is completed + * @param in The item crafted + * @param amount how much warp is gained + */ + public static void addWarpToResearch(String research, int amount) { + warpMap.put(research, amount); + } + + /** + * Returns how much warp is gained from the item or research passed in + * @param in itemstack or string + * @return how much warp it will give + */ + public static int getWarp(Object in) { + if (in==null) return 0; + if (in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()))) { + return warpMap.get(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage())); + } else + if (in instanceof String && warpMap.containsKey((String)in)) { + return warpMap.get((String)in); + } + return 0; + } + + // LOOT BAGS + + /** + * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 + * and a diamond is 50. + * The weights are the same for all loot bag types - the only difference is how many items the bag + * contains. + * @param item + * @param weight + * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified + * 0 = common, 1 = uncommon, 2 = rare + */ + public static void addLootBagItem(ItemStack item, int weight, int... bagTypes) { + if (bagTypes==null || bagTypes.length==0) + WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); + else { + for (int rarity:bagTypes) { + switch(rarity) { + case 0: WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); break; + case 1: WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(item,weight)); break; + case 2: WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(item,weight)); break; + } + } + } + } + + // PORTABLE HOLE BLACKLIST + /** + * You can blacklist blocks that may not be portable holed through using the "portableHoleBlacklist" + * string message using FMLInterModComms in your @Mod.Init method. + * + * Simply add the mod and block name you don't want the portable hole to go through with a + * 'modid:blockname' designation. For example: "thaumcraft:log" or "minecraft:plank" + * + * You can also specify blockstates by adding ';' delimited 'name=value' pairs. + * For example: "thaumcraft:log;variant=greatwood;variant=silverwood" + * + * You can also give an ore dictionary entry instead: For example: "logWood" + */ + + + + // CROPS + /** + * To define mod crops you need to use FMLInterModComms in your @Mod.Init method. + * There are two 'types' of crops you can add. Standard crops and clickable crops. + * + * Standard crops work like normal vanilla crops - they grow until a certain metadata + * value is reached and you harvest them by destroying the block and collecting the blocks. + * You need to create and ItemStack that tells the golem what block id and metadata represents + * the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get + * checked. + * Example for vanilla wheat: + * FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(Block.crops,1,7)); + * + * Clickable crops are crops that you right click to gather their bounty instead of destroying them. + * As for standard crops, you need to create and ItemStack that tells the golem what block id + * and metadata represents the crop when fully grown. The golem will trigger the blocks onBlockActivated method. + * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. + * Example (this will technically do nothing since clicking wheat does nothing, but you get the idea): + * FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Block.crops,1,7)); + * + * Stacked crops (like reeds) are crops that you wish the bottom block should remain after harvesting. + * As for standard crops, you need to create and ItemStack that tells the golem what block id + * and metadata represents the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the actualy md won't get + * checked. If it has the order upgrade it will only harvest if the crop is more than one block high. + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7)); + */ + + // NATIVE CLUSTERS + /** + * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms + * in your @Mod.Init method using the "nativeCluster" string message. + * The format should be: + * "[ore item/block id],[ore item/block metadata],[cluster item/block id],[cluster item/block metadata],[chance modifier float]" + * + * NOTE: The chance modifier is a multiplier applied to the default chance for that cluster to be produced (default 27.5% for a pickaxe of the core) + * + * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: + * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0"); + */ + + // LAMP OF GROWTH BLACKLIST + /** + * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms + * in your @Mod.Init method using the "lampBlacklist" itemstack message. + * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. + * Example for vanilla wheat: + * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE)); + */ + + // DIMENSION BLACKLIST + /** + * You can blacklist a dimension to not spawn certain thaumcraft features + * in your @Mod.Init method using the "dimensionBlacklist" string message in the format "[dimension]:[level]" + * The level values are as follows: + * [0] stop all tc spawning and generation + * [1] allow ore and node generation (and node special features) + * [2] allow mob spawning + * [3] allow ore and node gen + mob spawning (and node special features) + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1"); + */ + + // BIOME BLACKLIST + /** + * You can blacklist a biome to not spawn certain thaumcraft features + * in your @Mod.Init method using the "biomeBlacklist" string message in the format "[biome id]:[level]" + * The level values are as follows: + * [0] stop all tc spawning and generation + * [1] allow ore and node generation (and node special features) + * [2] allow mob spawning + * [3] allow ore and node gen + mob spawning (and node special features) + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2"); + */ + + // CHAMPION MOB WHITELIST + /** + * You can whitelist an entity class so it can rarely spawn champion versions in your @Mod.Init method using + * the "championWhiteList" string message in the format "[Entity]:[level]" + * The entity must extend EntityMob. + * [Entity] is in a similar format to what is used for mob spawners and such (see EntityList.class for vanilla examples). + * The [level] value indicate how rare the champion version will be - the higher the number the more common. + * The number roughly equals the [n] in 100 chance of a mob being a champion version. + * You can give 0 or negative numbers to allow champions to spawn with a very low chance only in particularly dangerous places. + * However anything less than about -2 will probably result in no spawns at all. + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "championWhiteList", "Thaumcraft.Wisp:1"); + */ + + + +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java new file mode 100644 index 000000000..222fa1ac9 --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java @@ -0,0 +1,329 @@ +package thaumcraft.api; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.aspects.IEssentiaTransport; + +public class ThaumcraftApiHelper { + + public static boolean areItemsEqual(ItemStack s1,ItemStack s2) + { + if (s1.isItemStackDamageable() && s2.isItemStackDamageable()) + { + return s1.getItem() == s2.getItem(); + } else + return s1.getItem() == s2.getItem() && s1.getItemDamage() == s2.getItemDamage(); + } + + /** + * Notifies thaumcraft that something with regards to runic shielding has changed and that it should + * rescan worn items to determine what the max shielding value is. + * It automatically rescans once every 5 seconds, but this makes it happen sooner. + * @param entity + */ + public static void markRunicDirty(Entity entity) { + ThaumcraftApi.internalMethods.markRunicDirty(entity); + } + + public static boolean containsMatch(boolean strict, ItemStack[] inputs, List targets) + { + for (ItemStack input : inputs) + { + for (ItemStack target : targets) + { + if (OreDictionary.itemMatches(target, input, strict)) + { + return true; + } + } + } + return false; + } + + public static boolean areItemStacksEqualForCrafting(ItemStack stack0, Object in) + { + if (stack0==null && in!=null) return false; + if (stack0!=null && in==null) return false; + if (stack0==null && in==null) return true; + + if (in instanceof String) { + List l = OreDictionary.getOres((String) in); + return containsMatch(false, new ItemStack[]{stack0}, l); + } + + if (in instanceof ItemStack) { + //nbt + boolean t1=areItemStackTagsEqualForCrafting(stack0, (ItemStack) in); + if (!t1) return false; + return OreDictionary.itemMatches((ItemStack) in, stack0, false); + } + + return false; + } + + public static boolean areItemStackTagsEqualForCrafting(ItemStack slotItem,ItemStack recipeItem) + { + if (recipeItem == null || slotItem == null) return false; + if (recipeItem.getTagCompound()!=null && slotItem.getTagCompound()==null ) return false; + if (recipeItem.getTagCompound()==null ) return true; + + Iterator iterator = recipeItem.getTagCompound().getKeySet().iterator(); + while (iterator.hasNext()) + { + String s = (String)iterator.next(); + if (slotItem.getTagCompound().hasKey(s)) { + if (!slotItem.getTagCompound().getTag(s).toString().equals( + recipeItem.getTagCompound().getTag(s).toString())) { + return false; + } + } else { + return false; + } + + } + return true; + } + + + public static TileEntity getConnectableTile(World world, BlockPos pos, EnumFacing face) { + TileEntity te = world.getTileEntity(pos.offset(face)); + if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) + return te; + else + return null; + } + + public static TileEntity getConnectableTile(IBlockAccess world, BlockPos pos, EnumFacing face) { + TileEntity te = world.getTileEntity(pos.offset(face)); + if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) + return te; + else + return null; + } + +// private static HashMap allAspects= new HashMap(); +// private static HashMap allCompoundAspects= new HashMap(); +// +// public static AspectList getAllAspects(int amount) { +// if (allAspects.get(amount)==null) { +// AspectList al = new AspectList(); +// for (Aspect aspect:Aspect.aspects.values()) { +// al.add(aspect, amount); +// } +// allAspects.put(amount, al); +// } +// return allAspects.get(amount); +// } +// +// public static AspectList getAllCompoundAspects(int amount) { +// if (allCompoundAspects.get(amount)==null) { +// AspectList al = new AspectList(); +// for (Aspect aspect:Aspect.getCompoundAspects()) { +// al.add(aspect, amount); +// } +// allCompoundAspects.put(amount, al); +// } +// return allCompoundAspects.get(amount); +// } + + + public static MovingObjectPosition rayTraceIgnoringSource(World world, Vec3 v1, Vec3 v2, + boolean bool1, boolean bool2, boolean bool3) + { + if (!Double.isNaN(v1.xCoord) && !Double.isNaN(v1.yCoord) && !Double.isNaN(v1.zCoord)) + { + if (!Double.isNaN(v2.xCoord) && !Double.isNaN(v2.yCoord) && !Double.isNaN(v2.zCoord)) + { + int i = MathHelper.floor_double(v2.xCoord); + int j = MathHelper.floor_double(v2.yCoord); + int k = MathHelper.floor_double(v2.zCoord); + int l = MathHelper.floor_double(v1.xCoord); + int i1 = MathHelper.floor_double(v1.yCoord); + int j1 = MathHelper.floor_double(v1.zCoord); + IBlockState block = world.getBlockState(new BlockPos(l, i1, j1)); + + MovingObjectPosition movingobjectposition2 = null; + int k1 = 200; + + while (k1-- >= 0) + { + if (Double.isNaN(v1.xCoord) || Double.isNaN(v1.yCoord) || Double.isNaN(v1.zCoord)) + { + return null; + } + + if (l == i && i1 == j && j1 == k) + { + continue; + } + + boolean flag6 = true; + boolean flag3 = true; + boolean flag4 = true; + double d0 = 999.0D; + double d1 = 999.0D; + double d2 = 999.0D; + + if (i > l) + { + d0 = (double)l + 1.0D; + } + else if (i < l) + { + d0 = (double)l + 0.0D; + } + else + { + flag6 = false; + } + + if (j > i1) + { + d1 = (double)i1 + 1.0D; + } + else if (j < i1) + { + d1 = (double)i1 + 0.0D; + } + else + { + flag3 = false; + } + + if (k > j1) + { + d2 = (double)j1 + 1.0D; + } + else if (k < j1) + { + d2 = (double)j1 + 0.0D; + } + else + { + flag4 = false; + } + + double d3 = 999.0D; + double d4 = 999.0D; + double d5 = 999.0D; + double d6 = v2.xCoord - v1.xCoord; + double d7 = v2.yCoord - v1.yCoord; + double d8 = v2.zCoord - v1.zCoord; + + if (flag6) + { + d3 = (d0 - v1.xCoord) / d6; + } + + if (flag3) + { + d4 = (d1 - v1.yCoord) / d7; + } + + if (flag4) + { + d5 = (d2 - v1.zCoord) / d8; + } + + if (d3 == -0.0D) + { + d3 = -1.0E-4D; + } + + if (d4 == -0.0D) + { + d4 = -1.0E-4D; + } + + if (d5 == -0.0D) + { + d5 = -1.0E-4D; + } + + EnumFacing enumfacing; + + if (d3 < d4 && d3 < d5) + { + enumfacing = i > l ? EnumFacing.WEST : EnumFacing.EAST; + v1 = new Vec3(d0, v1.yCoord + d7 * d3, v1.zCoord + d8 * d3); + } + else if (d4 < d5) + { + enumfacing = j > i1 ? EnumFacing.DOWN : EnumFacing.UP; + v1 = new Vec3(v1.xCoord + d6 * d4, d1, v1.zCoord + d8 * d4); + } + else + { + enumfacing = k > j1 ? EnumFacing.NORTH : EnumFacing.SOUTH; + v1 = new Vec3(v1.xCoord + d6 * d5, v1.yCoord + d7 * d5, d2); + } + + l = MathHelper.floor_double(v1.xCoord) - (enumfacing == EnumFacing.EAST ? 1 : 0); + i1 = MathHelper.floor_double(v1.yCoord) - (enumfacing == EnumFacing.UP ? 1 : 0); + j1 = MathHelper.floor_double(v1.zCoord) - (enumfacing == EnumFacing.SOUTH ? 1 : 0); + + IBlockState block1 = world.getBlockState(new BlockPos(l, i1, j1)); + + if (!bool2 || block1.getBlock().getCollisionBoundingBox(world, new BlockPos(l, i1, j1), block1) != null) + { + if (block1.getBlock().canCollideCheck(block1, bool1)) + { + MovingObjectPosition movingobjectposition1 = block1.getBlock().collisionRayTrace(world, new BlockPos(l, i1, j1), v1, v2); + + if (movingobjectposition1 != null) + { + return movingobjectposition1; + } + } + else + { + movingobjectposition2 = new MovingObjectPosition(MovingObjectPosition.MovingObjectType.MISS, v1, enumfacing, new BlockPos(l, i1, j1)); + } + } + } + + return bool3 ? movingobjectposition2 : null; + } + else + { + return null; + } + } + else + { + return null; + } + } + + public static Object getNBTDataFromId(NBTTagCompound nbt, byte id, String key) { + switch (id) { + case 1: return nbt.getByte(key); + case 2: return nbt.getShort(key); + case 3: return nbt.getInteger(key); + case 4: return nbt.getLong(key); + case 5: return nbt.getFloat(key); + case 6: return nbt.getDouble(key); + case 7: return nbt.getByteArray(key); + case 8: return nbt.getString(key); + case 9: return nbt.getTagList(key, (byte) 10); + case 10: return nbt.getTag(key); + case 11: return nbt.getIntArray(key); + default: return null; + } + } +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java b/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java new file mode 100644 index 000000000..f0f3dc4a6 --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java @@ -0,0 +1,9 @@ +package thaumcraft.api; + +public class ThaumcraftEnchantments { + + //Enchantment references + public static int HASTE; + public static int REPAIR; + +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftMaterials.java b/src/api/java/thaumcraft/api/ThaumcraftMaterials.java new file mode 100644 index 000000000..bb2d8c667 --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftMaterials.java @@ -0,0 +1,52 @@ +package thaumcraft.api; + +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraftforge.common.util.EnumHelper; + +public class ThaumcraftMaterials { + + public static ToolMaterial TOOLMAT_THAUMIUM = EnumHelper.addToolMaterial("THAUMIUM", 3, 500, 7F, 2.5f, 22); + public static ToolMaterial TOOLMAT_VOID = EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10); + public static ToolMaterial TOOLMAT_ELEMENTAL = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 9F, 3, 18); + public static ArmorMaterial ARMORMAT_THAUMIUM = EnumHelper.addArmorMaterial("THAUMIUM","THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25); + public static ArmorMaterial ARMORMAT_SPECIAL = EnumHelper.addArmorMaterial("SPECIAL","SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25); + public static ArmorMaterial ARMORMAT_VOID = EnumHelper.addArmorMaterial("VOID","VOID", 10, new int[] { 3, 7, 6, 3 }, 10); + + public static final Material MATERIAL_TAINT = new MaterialTaint(); + + public static class MaterialTaint extends Material + { + public MaterialTaint() + { + super(MapColor.purpleColor); + setNoPushMobility(); + } + + @Override + public boolean blocksMovement() + { + return true; + } + + @Override + protected Material setNoPushMobility() + { + this.mobilityFlag = 1; + return this; + } + + private int mobilityFlag; + + @Override + public int getMaterialMobility() + { + return this.mobilityFlag; + } + + } + + +} diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java new file mode 100644 index 000000000..9e24e0caa --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/Aspect.java @@ -0,0 +1,206 @@ +package thaumcraft.api.aspects; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.apache.commons.lang3.text.WordUtils; + +import thaumcraft.api.research.ScanAspect; +import thaumcraft.api.research.ScanningManager; + +public class Aspect { + + String tag; + Aspect[] components; + int color; + private String chatcolor; + ResourceLocation image; + int blend; + + /** + * For easy reference of what compounds are made up of + */ + public static HashMap mixList = new HashMap(); + + /** + * Use this constructor to register your own aspects. + * @param tag the key that will be used to reference this aspect, as well as its latin display name + * @param color color to display the tag in + * @param components the aspects this one is formed from + * @param image ResourceLocation pointing to a 32x32 icon of the aspect + * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1 + */ + public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) { + if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!"); + this.tag = tag; + this.components = components; + this.color = color; + this.image = image; + this.blend = blend; + aspects.put(tag, this); + ScanningManager.addScannableThing(new ScanAspect("!"+tag,this)); + if (components!=null) { + int h = (components[0].getTag()+components[1].getTag()).hashCode(); + mixList.put(h, this); + } + } + + /** + * Shortcut constructor I use for the default aspects - you shouldn't be using this. + */ + public Aspect(String tag, int color, Aspect[] components) { + this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1); + } + + /** + * Shortcut constructor I use for the default aspects - you shouldn't be using this. + */ + public Aspect(String tag, int color, Aspect[] components, int blend) { + this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend); + } + + /** + * Shortcut constructor I use for the primal aspects - + * you shouldn't use this as making your own primal aspects will break all the things. + */ + public Aspect(String tag, int color, String chatcolor, int blend) { + this(tag,color,(Aspect[])null, blend); + this.setChatcolor(chatcolor); + } + + public int getColor() { + return color; + } + + public String getName() { + return WordUtils.capitalizeFully(tag); + } + + public String getLocalizedDescription() { + return StatCollector.translateToLocal("tc.aspect."+tag); + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public Aspect[] getComponents() { + return components; + } + + public void setComponents(Aspect[] components) { + this.components = components; + } + + public ResourceLocation getImage() { + return image; + } + + public static Aspect getAspect(String tag) { + return aspects.get(tag); + } + + public int getBlend() { + return blend; + } + + public void setBlend(int blend) { + this.blend = blend; + } + + public boolean isPrimal() { + return getComponents()==null || getComponents().length!=2; + } + + /////////////////////////////// + public static ArrayList getPrimalAspects() { + ArrayList primals = new ArrayList(); + Collection pa = aspects.values(); + for (Aspect aspect:pa) { + if (aspect.isPrimal()) primals.add(aspect); + } + return primals; + } + + public static ArrayList getCompoundAspects() { + ArrayList compounds = new ArrayList(); + Collection pa = aspects.values(); + for (Aspect aspect:pa) { + if (!aspect.isPrimal()) compounds.add(aspect); + } + return compounds; + } + + public String getChatcolor() { + return chatcolor; + } + + public void setChatcolor(String chatcolor) { + this.chatcolor = chatcolor; + } + + + /////////////////////////////// + public static LinkedHashMap aspects = new LinkedHashMap(); + + //PRIMAL + public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1); + public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1); + public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1); + public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1); + public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1); + public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771); + + //SECONDARY (PRIMAL + PRIMAL) + public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771); + public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE}); + public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER}); + public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY}); + public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, AIR}); + public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, ORDER}); + public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {EARTH, WATER}); + public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {WATER, ENTROPY}); + public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE}); + public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER}); + +// public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY}); + + //TERTIARY + public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {ENERGY, AIR}); + public static final Aspect FLUX = new Aspect("vitium",0x800080, new Aspect[] {ENTROPY, ENERGY}); + public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT}); + public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS}); + public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION}); + public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH}); + + public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {METAL, ENERGY}); + public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {EXCHANGE, TOOL}); + public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL}); + public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY}); + + public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH}); + public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {FIRE, SOUL}); + public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL}); + public static final Aspect AVERSION = new Aspect("aversio",0xc05050, new Aspect[] {SOUL, ENTROPY}); + public static final Aspect PROTECT = new Aspect("praemunio",0x00c0c0, new Aspect[] {SOUL, EARTH}); + public static final Aspect DESIRE = new Aspect("desiderium",0xe6be44, new Aspect[] {SOUL, VOID}); + + public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH}); + public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE}); + public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {SOUL, LIFE}); + + +} diff --git a/src/api/java/thaumcraft/api/aspects/AspectHelper.java b/src/api/java/thaumcraft/api/aspects/AspectHelper.java new file mode 100644 index 000000000..522ae4a16 --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/AspectHelper.java @@ -0,0 +1,178 @@ +package thaumcraft.api.aspects; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Random; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; +import thaumcraft.api.ThaumcraftApiHelper; + +public class AspectHelper { + + public static AspectList cullTags(AspectList temp) { + AspectList temp2 = new AspectList(); + for (Aspect tag:temp.getAspects()) { + if (tag!=null) + temp2.add(tag, temp.getAmount(tag)); + } + while (temp2!=null && temp2.size()>6) { + Aspect lowest = null; + float low = Short.MAX_VALUE; + for (Aspect tag:temp2.getAspects()) { + if (tag==null) continue; + float ta=temp2.getAmount(tag); + if (tag.isPrimal()) { + ta *= .9f; + } else { + if (!tag.getComponents()[0].isPrimal()) { + ta *= 1.1f; + if (!tag.getComponents()[0].getComponents()[0].isPrimal()) { + ta *= 1.05f; + } + if (!tag.getComponents()[0].getComponents()[1].isPrimal()) { + ta *= 1.05f; + } + } + if (!tag.getComponents()[1].isPrimal()) { + ta *= 1.1f; + if (!tag.getComponents()[1].getComponents()[0].isPrimal()) { + ta *= 1.05f; + } + if (!tag.getComponents()[1].getComponents()[1].isPrimal()) { + ta *= 1.05f; + } + } + } + + if (ta aspects = Aspect.aspects.values(); + for (Aspect aspect:aspects) { + if (aspect.getComponents()!=null && ( + (aspect.getComponents()[0]==aspect1 && aspect.getComponents()[1]==aspect2) || + (aspect.getComponents()[0]==aspect2 && aspect.getComponents()[1]==aspect1))) { + + return aspect; + } + } + return null; + } + + public static Aspect getRandomPrimal(Random rand, Aspect aspect) { + ArrayList list = new ArrayList(); + if (aspect!=null) { + AspectList temp = new AspectList(); + temp.add(aspect, 1); + AspectList temp2 = AspectHelper.reduceToPrimals(temp); + for (Aspect a:temp2.getAspects()) { + for (int b=0;b0?list.get(rand.nextInt(list.size())):null; + } + + public static AspectList reduceToPrimals(AspectList in) { + AspectList out = new AspectList(); + for (Aspect aspect:in.getAspects()) { + if (aspect!=null) { + if (aspect.isPrimal()) { + out.add(aspect, in.getAmount(aspect)); + } else { + AspectList temp = new AspectList(); + temp.add(aspect.getComponents()[0],in.getAmount(aspect)); + temp.add(aspect.getComponents()[1],in.getAmount(aspect)); + AspectList temp2 = reduceToPrimals(temp); + + for (Aspect a:temp2.getAspects()) { + out.add(a, temp2.getAmount(a)); + } + } + } + } + return out; + } + + public static AspectList getPrimalAspects(AspectList in) { + AspectList t = new AspectList(); + t.add(Aspect.AIR, in.getAmount(Aspect.AIR)); + t.add(Aspect.FIRE, in.getAmount(Aspect.FIRE)); + t.add(Aspect.WATER, in.getAmount(Aspect.WATER)); + t.add(Aspect.EARTH, in.getAmount(Aspect.EARTH)); + t.add(Aspect.ORDER, in.getAmount(Aspect.ORDER)); + t.add(Aspect.ENTROPY, in.getAmount(Aspect.ENTROPY)); + return t; + } + + public static AspectList getAuraAspects(AspectList in) { + AspectList t = new AspectList(); + t.add(Aspect.AIR, in.getAmount(Aspect.AIR)); + t.add(Aspect.FIRE, in.getAmount(Aspect.FIRE)); + t.add(Aspect.WATER, in.getAmount(Aspect.WATER)); + t.add(Aspect.EARTH, in.getAmount(Aspect.EARTH)); + t.add(Aspect.ORDER, in.getAmount(Aspect.ORDER)); + t.add(Aspect.ENTROPY, in.getAmount(Aspect.ENTROPY)); + t.add(Aspect.FLUX, in.getAmount(Aspect.FLUX)); + return t; + } + +} diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java new file mode 100644 index 000000000..8f9f46ac1 --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/AspectList.java @@ -0,0 +1,278 @@ +package thaumcraft.api.aspects; + +import java.io.Serializable; +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +public class AspectList implements Serializable { + + public LinkedHashMap aspects = new LinkedHashMap();//aspects associated with this object + + + /** + * this creates a new aspect list with preloaded values based off the aspects of the given item. + * @param the itemstack of the given item + */ + public AspectList(ItemStack stack) { + try { + AspectList temp = AspectHelper.getObjectAspects(stack); + if (temp!=null) + for (Aspect tag:temp.getAspects()) { + add(tag,temp.getAmount(tag)); + } + } catch (Exception e) {} + } + + public AspectList() { + } + + public AspectList copy() { + AspectList out = new AspectList(); + for (Aspect a:this.getAspects()) + out.add(a, this.getAmount(a)); + return out; + } + + /** + * @return the amount of different aspects in this collection + */ + public int size() { + return aspects.size(); + } + + /** + * @return the amount of total vis in this collection + */ + public int visSize() { + int q = 0; + + for (Aspect as:aspects.keySet()) { + q+=this.getAmount(as); + } + + return q; + } + + /** + * @return an array of all the aspects in this collection + */ + public Aspect[] getAspects() { + Aspect[] q = new Aspect[1]; + return aspects.keySet().toArray(q); + } + + + /** + * @return an array of all the aspects in this collection sorted by name + */ + public Aspect[] getAspectsSortedByName() { + try { + Aspect[] out = aspects.keySet().toArray(new Aspect[]{}); + boolean change=false; + do { + change=false; + for(int a=0;a0) { + out[a] = e2; + out[a+1] = e1; + change = true; + break; + } + } + } while (change==true); + return out; + } catch (Exception e) { + return this.getAspects(); + } + } + + /** + * @return an array of all the aspects in this collection sorted by amount + */ + public Aspect[] getAspectsSortedByAmount() { + try { + Aspect[] out = aspects.keySet().toArray(new Aspect[1]); + boolean change=false; + do { + change=false; + for(int a=0;a0 && e2>0 && e2>e1) { + Aspect ea = out[a]; + Aspect eb = out[a+1]; + out[a] = eb; + out[a+1] = ea; + change = true; + break; + } + } + } while (change==true); + return out; + } catch (Exception e) { + return this.getAspects(); + } + } + + /** + * @param key + * @return the amount associated with the given aspect in this collection + */ + public int getAmount(Aspect key) { + return aspects.get(key)==null?0:aspects.get(key); + } + + /** + * Reduces the amount of an aspect in this collection by the given amount. + * @param key + * @param amount + * @return + */ + public boolean reduce(Aspect key, int amount) { + if (getAmount(key)>=amount) { + int am = getAmount(key)-amount; + aspects.put(key, am); + return true; + } + return false; + } + + /** + * Reduces the amount of an aspect in this collection by the given amount. + * If reduced to 0 or less the aspect will be removed completely. + * @param key + * @param amount + * @return + */ + public AspectList remove(Aspect key, int amount) { + int am = getAmount(key)-amount; + if (am<=0) aspects.remove(key); else + this.aspects.put(key, am); + return this; + } + + /** + * Simply removes the aspect from the list + * @param key + * @param amount + * @return + */ + public AspectList remove(Aspect key) { + aspects.remove(key); + return this; + } + + /** + * Adds this aspect and amount to the collection. + * If the aspect exists then its value will be increased by the given amount. + * @param aspect + * @param amount + * @return + */ + public AspectList add(Aspect aspect, int amount) { + if (this.aspects.containsKey(aspect)) { + int oldamount = this.aspects.get(aspect); + amount+=oldamount; + } + this.aspects.put( aspect, amount ); + return this; + } + + + /** + * Adds this aspect and amount to the collection. + * If the aspect exists then only the highest of the old or new amount will be used. + * @param aspect + * @param amount + * @return + */ + public AspectList merge(Aspect aspect, int amount) { + if (this.aspects.containsKey(aspect)) { + int oldamount = this.aspects.get(aspect); + if (amount0?aspects:null; + } + return null; + } + + @Override + public void setAspects(ItemStack itemstack, AspectList aspects) { + if (!itemstack.hasTagCompound()) itemstack.setTagCompound(new NBTTagCompound()); + aspects.writeToNBT(itemstack.getTagCompound()); + } + + @Override + public boolean ignoreContainedAspects() {return false;} +*/ \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java new file mode 100644 index 000000000..16bef8f65 --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java @@ -0,0 +1,92 @@ +package thaumcraft.api.aspects; + +import net.minecraft.util.EnumFacing; + + +/** + * @author Azanor + * This interface is used by tiles that use or transport vis. + * Only tiles that implement this interface will be able to connect to vis conduits or other thaumic devices + */ +public interface IEssentiaTransport { + /** + * Is this tile able to connect to other vis users/sources on the specified side? + * @param face + * @return + */ + public boolean isConnectable(EnumFacing face); + + /** + * Is this side used to input essentia? + * @param face + * @return + */ + boolean canInputFrom(EnumFacing face); + + /** + * Is this side used to output essentia? + * @param face + * @return + */ + boolean canOutputTo(EnumFacing face); + + /** + * Sets the amount of suction this block will apply + * @param suction + */ + public void setSuction(Aspect aspect, int amount); + + /** + * Returns the type of suction this block is applying. + * @param loc + * the location from where the suction is being checked + * @return + * a return type of null indicates the suction is untyped and the first thing available will be drawn + */ + public Aspect getSuctionType(EnumFacing face); + + /** + * Returns the strength of suction this block is applying. + * @param loc + * the location from where the suction is being checked + * @return + */ + public int getSuctionAmount(EnumFacing face); + + /** + * remove the specified amount of essentia from this transport tile + * @return how much was actually taken + */ + public int takeEssentia(Aspect aspect, int amount, EnumFacing face); + + /** + * add the specified amount of essentia to this transport tile + * @return how much was actually added + */ + public int addEssentia(Aspect aspect, int amount, EnumFacing face); + + /** + * What type of essentia this contains + * @param face + * @return + */ + public Aspect getEssentiaType(EnumFacing face); + + /** + * How much essentia this block contains + * @param face + * @return + */ + public int getEssentiaAmount(EnumFacing face); + + + /** + * Essentia will not be drawn from this container unless the suction exceeds this amount. + * @return the amount + */ + public int getMinimumSuction(); + + + +} + diff --git a/src/api/java/thaumcraft/api/aura/AuraHelper.java b/src/api/java/thaumcraft/api/aura/AuraHelper.java new file mode 100644 index 000000000..f5e331193 --- /dev/null +++ b/src/api/java/thaumcraft/api/aura/AuraHelper.java @@ -0,0 +1,81 @@ +package thaumcraft.api.aura; + +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; + +public class AuraHelper { + + + /** + * Consume vis from the aura at the given location + * @param world + * @param pos + * @param aspect + * @param amount + * @return has anything been consumed + */ + public static boolean drainAura(World world, BlockPos pos, Aspect aspect, int amount) { + return ThaumcraftApi.internalMethods.drainAura(world,pos, aspect, amount); + } + + /** + * Consume vis from the aura at the given location + * @param world + * @param pos + * @param aspect + * @param amount + * @return how much was actually drained + */ + public static int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, int amount) { + return ThaumcraftApi.internalMethods.drainAuraAvailable(world,pos, aspect, amount); + } + + /** + * Adds vis to the aura at the given location. This does not actually increase the aura instantly - + * it merely adds a recharge ticked to the chunk that will add to the aura there the next time it is processed. + * + * @param world + * @param pos + * @param aspect + * @param amount + */ + public static void addAura(World world, BlockPos pos, Aspect aspect, int amount) { + ThaumcraftApi.internalMethods.addAura(world,pos, aspect, amount); + } + + /** + * Get how much of a given aspect is in the aura at the given location. + * @param world + * @param pos + * @param aspect + * @return + */ + public static int getAura(World world, BlockPos pos, Aspect aspect) { + return ThaumcraftApi.internalMethods.getAura(world,pos, aspect); + } + + /** + * Gets the general aura baseline at the given location + * @param world + * @param pos + * @return + */ + public static int getAuraBase(World world, BlockPos pos) { + return ThaumcraftApi.internalMethods.getAuraBase(world,pos); + } + + /** + * Adds flux to the aura at the specified block position. + * @param world + * @param pos + * @param amount how much flux to add + * @param showEffect if set to true, a flux goo splash effect and sound will also be displayed. Use in moderation. + */ + public static void pollute(World world, BlockPos pos, int amount, boolean showEffect) { + ThaumcraftApi.internalMethods.pollute(world,pos,amount,showEffect); + } + + +} diff --git a/src/api/java/thaumcraft/api/blocks/BlocksTC.java b/src/api/java/thaumcraft/api/blocks/BlocksTC.java new file mode 100644 index 000000000..8a898fa6a --- /dev/null +++ b/src/api/java/thaumcraft/api/blocks/BlocksTC.java @@ -0,0 +1,132 @@ +package thaumcraft.api.blocks; + +import net.minecraft.block.Block; + +public class BlocksTC { + + + // World + public static Block oreAmber; + public static Block oreCinnabar; + public static Block log; + public static Block leaf; + public static Block sapling; + public static Block shimmerleaf; + public static Block cinderpearl; + public static Block vishroom; + public static Block plank; + public static Block stone; + public static Block translucent; + public static Block stairsArcane; + public static Block stairsArcaneBrick; + public static Block stairsAncient; + public static Block stairsSilverwood; + public static Block stairsGreatwood; + public static Block stairsEldritch; + public static Block slabWood; + public static Block slabStone; + public static Block doubleSlabWood; + public static Block doubleSlabStone; + public static Block taintBlock; + public static Block taintFibre; + public static Block taintDust; + public static Block taintLog; + public static Block taintFeature; + public static Block lootCrate; + public static Block lootUrn; + public static Block eldritch; + public static Block crystalAir; + public static Block crystalFire; + public static Block crystalWater; + public static Block crystalEarth; + public static Block crystalOrder; + public static Block crystalEntropy; + public static Block crystalTaint; + + // Doodads + public static Block tableWood; + public static Block tableStone; + /** THAUMIUM, VOID, ALCHEMICAL, ADVANCED_ALCHEMICAL, BRASS */ + public static Block metal; + public static Block candle; + public static Block nitor; + public static Block bloom; + public static Block pedestal; + public static Block itemGrate; + public static Block fleshBlock; + public static Block banner; + public static Block pavingStone; + public static Block pillar; + public static Block redstoneRelay; + + // Machines + public static Block arcaneEar; + public static Block levitator; + public static Block dioptra; + public static Block crucible; + public static Block arcaneWorkbench; + public static Block arcaneWorkbenchCharger; + public static Block wandWorkbench; + public static Block rechargePedestal; + public static Block researchTable; + public static Block tube; + public static Block centrifuge; + public static Block crystallizer; + public static Block hungryChest; + public static Block jar; + public static Block bellows; + public static Block smelterBasic; + public static Block smelterThaumium; + public static Block smelterVoid; + public static Block smelterAux; + public static Block smelterVent; + public static Block alembic; + public static Block infusionMatrix; + public static Block infernalFurnace; + public static Block arcaneBore; + public static Block arcaneBoreBase; + public static Block thaumatorium; + public static Block brainBox; + public static Block mirror; + public static Block mirrorEssentia; + public static Block auraTotem; + public static Block spa; + public static Block waterJug; + public static Block lampArcane; + public static Block lampFertility; + public static Block lampGrowth; + + // Fluids + public static Block fluxGoo; + public static Block purifyingFluid; + public static Block liquidDeath; + + // Misc + public static Block hole; + public static Block vacuum; + public static Block effect; + public static Block barrier; + public static Block placeholder; + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/src/api/java/thaumcraft/api/blocks/ILabelable.java b/src/api/java/thaumcraft/api/blocks/ILabelable.java new file mode 100644 index 000000000..8b8663e39 --- /dev/null +++ b/src/api/java/thaumcraft/api/blocks/ILabelable.java @@ -0,0 +1,23 @@ +package thaumcraft.api.blocks; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; + +/** + * + * @author Azanor + * + * Tile entities or blocks that extend this interface can have jar labels applied to them + * + */ +public interface ILabelable { + + /** + * This method is used by the block or tileentity to do whatever needs doing. + * @return if true then label will be subtracted from player inventory + */ + public boolean applyLabel(EntityPlayer player, BlockPos pos, EnumFacing side, ItemStack labelstack); + +} diff --git a/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java b/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java new file mode 100644 index 000000000..31489d4d2 --- /dev/null +++ b/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java @@ -0,0 +1,81 @@ +package thaumcraft.api.blocks; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +/** + * + * @author azanor + * + * Custom tile entity class I use for most of my tile entities. Setup in such a way that only + * the nbt data within readCustomNBT / writeCustomNBT will be sent to the client when the tile + * updates. Apart from all the normal TE data that gets sent that is. + * + */ +public class TileThaumcraft extends TileEntity { + + //NBT stuff + + @Override + public void readFromNBT(NBTTagCompound nbt) + { + super.readFromNBT(nbt); + readCustomNBT(nbt); + } + + public void readCustomNBT(NBTTagCompound nbt) + { + //TODO + } + + @Override + public void writeToNBT(NBTTagCompound nbt) + { + super.writeToNBT(nbt); + writeCustomNBT(nbt); + } + + public void writeCustomNBT(NBTTagCompound nbt) + { + //TODO + } + + //Client Packet stuff + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); + this.writeCustomNBT(nbt); + return new S35PacketUpdateTileEntity(this.getPos(), -999, nbt); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + this.readCustomNBT(pkt.getNbtCompound()); + } + + + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } + + public EnumFacing getFacing() { + try { + return EnumFacing.getFront(getBlockMetadata() & 7); + } catch (Exception e) { } + return EnumFacing.UP; + } + + public boolean gettingPower() { + return worldObj.isBlockPowered(getPos()); + } + +} diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java new file mode 100644 index 000000000..e2860acad --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java @@ -0,0 +1,90 @@ +package thaumcraft.api.crafting; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class CrucibleRecipe { + + private ItemStack recipeOutput; + + public Object catalyst; + public AspectList aspects; + public String research; + + public int hash; + + public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags) { + recipeOutput = result; + this.aspects = tags; + this.research = researchKey; + this.catalyst = cat; + if (cat instanceof String) { + this.catalyst = OreDictionary.getOres((String) cat); + } + String hc = researchKey; + hc += result.toString(); + for (Aspect tag:tags.getAspects()) { + hc += tag.getTag()+tags.getAmount(tag); + } + if (cat instanceof ItemStack) { + hc += ((ItemStack)cat).toString(); + } else + if (cat instanceof List && ((List)catalyst).size()>0) { + for (ItemStack is :(List)catalyst) { + hc += is.toString(); + } + } + + hash = hc.hashCode(); + } + + + + public boolean matches(AspectList itags, ItemStack cat) { + if (catalyst instanceof ItemStack && !OreDictionary.itemMatches((ItemStack) catalyst,cat,false)) { + return false; + } else + if (catalyst instanceof List && ((List)catalyst).size()>0) { + if (!ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat}, + (List)catalyst)) return false; + } + if (itags==null) return false; + for (Aspect tag:aspects.getAspects()) { + if (itags.getAmount(tag))catalyst).size()>0) { + if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat}, (List)catalyst)) return true; + } + return false; + } + + public AspectList removeMatching(AspectList itags) { + AspectList temptags = new AspectList(); + temptags.aspects.putAll(itags.aspects); + + for (Aspect tag:aspects.getAspects()) { + temptags.remove(tag, aspects.getAmount(tag)); + } + + itags = temptags; + return itags; + } + + public ItemStack getRecipeOutput() { + return recipeOutput; + } + + +} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java new file mode 100644 index 000000000..bba02209a --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java @@ -0,0 +1,28 @@ +package thaumcraft.api.crafting; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; +import thaumcraft.api.aspects.AspectList; + +public interface IArcaneRecipe extends IRecipe +{ + + boolean matches(InventoryCrafting inv, World worldIn); + boolean matches(InventoryCrafting inv, World world, EntityPlayer player); + + ItemStack getCraftingResult(InventoryCrafting inv); + + int getRecipeSize(); + + ItemStack getRecipeOutput(); + + ItemStack[] getRemainingItems(InventoryCrafting inv); + + AspectList getAspects(); + AspectList getAspects(InventoryCrafting inv); + String[] getResearch(); + +} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java b/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java new file mode 100644 index 000000000..9f49eaf8f --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java @@ -0,0 +1,11 @@ +package thaumcraft.api.crafting; + +/** + * + * @author Azanor + * This needs to be implemented by any inventory that wishes to act as an arcane workbench. + * + */ +public interface IArcaneWorkbench { + +} diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java index 768b25ffc..1b62de232 100644 --- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java +++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -1,19 +1,20 @@ -package thaumcraft.api.crafting; - -import net.minecraft.world.World; - -/** - * - * @author Azanor - * - * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls - * - */ -public interface IInfusionStabiliser { - - /** - * returns true if the block can stabilise things - */ - public boolean canStabaliseInfusion(World world, int x, int y, int z); - -} \ No newline at end of file +package thaumcraft.api.crafting; + +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +/** + * + * @author Azanor + * + * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls + * + */ +public interface IInfusionStabiliser { + + /** + * returns true if the block can stabilise things + */ + public boolean canStabaliseInfusion(World world, BlockPos pos); + +} diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java new file mode 100644 index 000000000..2979fdad3 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java @@ -0,0 +1,136 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchHelper; + +@Deprecated +public class InfusionEnchantmentRecipe +{ + + public AspectList aspects; + public String[] research; + public Object[] components; + public Enchantment enchantment; + public int recipeXP; + public int instability; + + public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, AspectList aspects2, Object[] recipe) { + this(new String[]{research},input,inst,aspects2,recipe); + } + + public InfusionEnchantmentRecipe(String[] research, Enchantment input, int inst, AspectList aspects2, Object[] recipe) { + this.research = research; + this.enchantment = input; + this.aspects = aspects2; + this.components = recipe; + this.instability = inst; + this.recipeXP = Math.max(1, input.getMinEnchantability(1)/3); + } + + /** + * Used to check if a recipe matches current crafting inventory + * @param player + */ + public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { + if (research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + + if (!enchantment.canApply(central) || !central.getItem().isItemTool(central)) { + return false; + } + + Map map1 = EnchantmentHelper.getEnchantments(central); + Iterator iterator = map1.keySet().iterator(); + while (iterator.hasNext()) + { + int j1 = ((Integer)iterator.next()).intValue(); + Enchantment ench = Enchantment.enchantmentsBookList[j1]; + if (j1 == enchantment.effectId && + EnchantmentHelper.getEnchantmentLevel(j1, central)>=ench.getMaxLevel()) + return false; + if (enchantment.effectId != ench.effectId && + (!enchantment.canApplyTogether(ench) || + !ench.canApplyTogether(enchantment))) { + return false; + } + } + + ItemStack i2 = null; + + ArrayList ii = new ArrayList(); + for (ItemStack is:input) { + ii.add(is.copy()); + } + + for (Object comp:components) { + boolean b=false; + for (int a=0;a input, ItemStack central, World world, EntityPlayer player) { + if (getRecipeInput()==null) return false; + + if (research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + + ItemStack i2 = central.copy(); + if (getRecipeInput() instanceof ItemStack && + ((ItemStack)getRecipeInput()).getItemDamage()==OreDictionary.WILDCARD_VALUE) { + i2.setItemDamage(OreDictionary.WILDCARD_VALUE); + } + + if (!ThaumcraftApiHelper.areItemStacksEqualForCrafting(i2, getRecipeInput())) return false; + + ArrayList ii = new ArrayList(); + for (ItemStack is:input) { + ii.add(is.copy()); + } + + for (Object comp:getComponents()) { + boolean b=false; + for (int a=0;a comps ) { + return recipeOutput; + } + + public AspectList getAspects(EntityPlayer player, ItemStack input, ArrayList comps) { + return aspects; + } + + public int getInstability(EntityPlayer player, ItemStack input, ArrayList comps) { + return instability; + } +} diff --git a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java new file mode 100644 index 000000000..1a1349646 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java @@ -0,0 +1,284 @@ +package thaumcraft.api.crafting; + +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchHelper; + +public class ShapedArcaneRecipe implements IArcaneRecipe +{ + //Added in for future ease of change, but hard coded for now. + private static final int MAX_CRAFT_GRID_WIDTH = 3; + private static final int MAX_CRAFT_GRID_HEIGHT = 3; + + public ItemStack output = null; + public Object[] input = null; + public AspectList aspects = null; + public String[] research; + public int width = 0; + public int height = 0; + private boolean mirrored = true; + + + public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe){ this(new String[]{research}, result, aspects, recipe); } + + public ShapedArcaneRecipe(String[] research, ItemStack result, AspectList aspects, Object... recipe) + { + output = result.copy(); + this.research = research; + this.aspects = aspects; + String shape = ""; + + int idx = 0; + + if (recipe[idx] instanceof Boolean) + { + mirrored = (Boolean)recipe[idx]; + if (recipe[idx+1] instanceof Object[]) + { + recipe = (Object[])recipe[idx+1]; + } + else + { + idx = 1; + } + } + + if (recipe[idx] instanceof String[]) + { + String[] parts = ((String[])recipe[idx++]); + + for (String s : parts) + { + width = s.length(); + shape += s; + } + + height = parts.length; + } + else + { + while (recipe[idx] instanceof String) + { + String s = (String)recipe[idx++]; + shape += s; + width = s.length(); + height++; + } + } + + if (width * height != shape.length()) + { + String ret = "Invalid shaped ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + + HashMap itemMap = new HashMap(); + + for (; idx < recipe.length; idx += 2) + { + Character chr = (Character)recipe[idx]; + Object in = recipe[idx + 1]; + + if (in instanceof ItemStack) + { + itemMap.put(chr, ((ItemStack)in).copy()); + } + else if (in instanceof Item) + { + itemMap.put(chr, new ItemStack((Item)in)); + } + else if (in instanceof Block) + { + itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE)); + } + else if (in instanceof String) + { + itemMap.put(chr, OreDictionary.getOres((String)in)); + } + else + { + String ret = "Invalid shaped ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + } + + input = new Object[width * height]; + int x = 0; + for (char chr : shape.toCharArray()) + { + input[x++] = itemMap.get(chr); + } + + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } + + @Override + public int getRecipeSize(){ return input.length; } + + @Override + public ItemStack getRecipeOutput(){ return output; } + + @Override + public boolean matches(InventoryCrafting inv, World world) + { + return inv instanceof IArcaneWorkbench && matches(inv,world,null); + } + + @Override + public boolean matches(InventoryCrafting inv, World world, EntityPlayer player) + { + if (player!=null && ( research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research))) { + return false; + } + for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) + { + for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) + { + if (checkMatch(inv, x, y, false)) + { + return true; + } + + if (mirrored && checkMatch(inv, x, y, true)) + { + return true; + } + } + } + + return false; + } + + private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) + { + for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) + { + for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) + { + int subX = x - startX; + int subY = y - startY; + Object target = null; + + if (subX >= 0 && subY >= 0 && subX < width && subY < height) + { + if (mirror) + { + target = input[width - subX - 1 + subY * width]; + } + else + { + target = input[subX + subY * width]; + } + } + + ItemStack slot = inv.getStackInRowAndColumn(x, y); + + if (target instanceof ItemStack) + { + if (!checkItemEquals((ItemStack)target, slot)) + { + return false; + } + } + else if (target instanceof List) + { + boolean matched = false; + + for (ItemStack item : (List)target) + { + matched = matched || checkItemEquals(item, slot); + } + + if (!matched) + { + return false; + } + } + else if (target == null && slot != null) + { + return false; + } + } + } + + return true; + } + + private boolean checkItemEquals(ItemStack target, ItemStack input) + { + if (input == null && target != null || input != null && target == null) + { + return false; + } + return (target.getItem() == input.getItem() && + (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && + (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); + } + + public ShapedArcaneRecipe setMirrored(boolean mirror) + { + mirrored = mirror; + return this; + } + + /** + * Returns the input for this recipe, any mod accessing this value should never + * manipulate the values in this array as it will effect the recipe itself. + * @return The recipes input vales. + */ + public Object[] getInput() + { + return this.input; + } + + @Override + public AspectList getAspects() { + return aspects; + } + + @Override + public AspectList getAspects(InventoryCrafting inv) { + return aspects; + } + + @Override + public String[] getResearch() { + return research; + } + + @Override + public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) + { + ItemStack[] aitemstack = new ItemStack[p_179532_1_.getSizeInventory()]; + + for (int i = 0; i < Math.min(9, aitemstack.length); ++i) + { + ItemStack itemstack = p_179532_1_.getStackInSlot(i); + aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack); + } + + return aitemstack; + } +} diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java new file mode 100644 index 000000000..ba5776a9b --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java @@ -0,0 +1,182 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchHelper; + +public class ShapelessArcaneRecipe implements IArcaneRecipe +{ + private ItemStack output = null; + private ArrayList input = new ArrayList(); + + public AspectList aspects = null; + public String[] research; + + public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe){ this(new String[] {research}, result,aspects, recipe); } + + public ShapelessArcaneRecipe(String[] research, ItemStack result, AspectList aspects, Object... recipe) + { + output = result.copy(); + this.research = research; + this.aspects = aspects; + for (Object in : recipe) + { + if (in instanceof ItemStack) + { + input.add(((ItemStack)in).copy()); + } + else if (in instanceof Item) + { + input.add(new ItemStack((Item)in)); + } + else if (in instanceof Block) + { + input.add(new ItemStack((Block)in)); + } + else if (in instanceof String) + { + input.add(OreDictionary.getOres((String)in)); + } + else + { + String ret = "Invalid shapeless ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + } + } + + @Override + public int getRecipeSize(){ return input.size(); } + + @Override + public ItemStack getRecipeOutput(){ return output; } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } + + @Override + public boolean matches(InventoryCrafting inv, World world) + { + return inv instanceof IArcaneWorkbench && matches(inv,world,null); + } + + @Override + public boolean matches(InventoryCrafting var1, World world, EntityPlayer player) + { + if (player!=null && ( research != null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research))) { + return false; + } + + ArrayList required = new ArrayList(input); + + for (int x = 0; x < 9; x++) + { + ItemStack slot = var1.getStackInSlot(x); + + if (slot != null) + { + boolean inRecipe = false; + Iterator req = required.iterator(); + + while (req.hasNext()) + { + boolean match = false; + + Object next = req.next(); + + if (next instanceof ItemStack) + { + match = checkItemEquals((ItemStack)next, slot); + } + else if (next instanceof List) + { + for (ItemStack item : (List)next) + { + match = match || checkItemEquals(item, slot); + } + } + + if (match) + { + inRecipe = true; + required.remove(next); + break; + } + } + + if (!inRecipe) + { + return false; + } + } + } + + return required.isEmpty(); + } + + private boolean checkItemEquals(ItemStack target, ItemStack input) + { + if (input == null && target != null || input != null && target == null) + { + return false; + } + return (target.getItem() == input.getItem() && + (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && + (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); + } + + /** + * Returns the input for this recipe, any mod accessing this value should never + * manipulate the values in this array as it will effect the recipe itself. + * @return The recipes input vales. + */ + public ArrayList getInput() + { + return this.input; + } + + @Override + public AspectList getAspects() { + return aspects; + } + + @Override + public AspectList getAspects(InventoryCrafting inv) { + return aspects; + } + + @Override + public String[] getResearch() { + return research; + } + + @Override + public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) + { + ItemStack[] aitemstack = new ItemStack[p_179532_1_.getSizeInventory()]; + + for (int i = 0; i < Math.min(9, aitemstack.length); ++i) + { + ItemStack itemstack = p_179532_1_.getStackInSlot(i); + aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack); + } + + return aitemstack; + } +} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java new file mode 100644 index 000000000..6341d8765 --- /dev/null +++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java @@ -0,0 +1,32 @@ +package thaumcraft.api.damagesource; + +import net.minecraft.entity.Entity; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSourceIndirect; + +public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect { + + private boolean fireDamage; + private float hungerDamage; + private boolean isUnblockable; + + + public DamageSourceIndirectThaumcraftEntity(String par1Str, + Entity par2Entity, Entity par3Entity) { + super(par1Str, par2Entity, par3Entity); + } + + + public DamageSource setFireDamage() + { + this.fireDamage = true; + return this; + } + + public DamageSource setDamageBypassesArmor() + { + this.isUnblockable = true; + this.hungerDamage = 0.0F; + return this; + } +} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java new file mode 100644 index 000000000..02530f914 --- /dev/null +++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java @@ -0,0 +1,47 @@ +package thaumcraft.api.damagesource; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; + +public class DamageSourceThaumcraft extends DamageSource +{ + + public static DamageSource taint = new DamageSourceThaumcraft("taint").setDamageBypassesArmor().setMagicDamage(); + public static DamageSource tentacle = new DamageSourceThaumcraft("tentacle"); + public static DamageSource swarm = new DamageSourceThaumcraft("swarm"); + public static DamageSource dissolve = new DamageSourceThaumcraft("dissolve").setDamageBypassesArmor(); + + protected DamageSourceThaumcraft(String par1Str) { + super(par1Str); + } + + /** This kind of damage can be blocked or not. */ + private boolean isUnblockable = false; + private boolean isDamageAllowedInCreativeMode = false; + private float hungerDamage = 0.3F; + + /** This kind of damage is based on fire or not. */ + private boolean fireDamage; + + /** This kind of damage is based on a projectile or not. */ + private boolean projectile; + + /** + * Whether this damage source will have its damage amount scaled based on the current difficulty. + */ + private boolean difficultyScaled; + private boolean magicDamage = false; + private boolean explosion = false; + + public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving) + { + return new EntityDamageSource("swarm", par0EntityLiving); + } + + public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving) + { + return new EntityDamageSource("tentacle", par0EntityLiving); + } + +} diff --git a/src/api/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java new file mode 100644 index 000000000..c0991c5dd --- /dev/null +++ b/src/api/java/thaumcraft/api/entities/IEldritchMob.java @@ -0,0 +1,5 @@ +package thaumcraft.api.entities; + +public interface IEldritchMob { + +} diff --git a/src/api/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java new file mode 100644 index 000000000..0f18471f8 --- /dev/null +++ b/src/api/java/thaumcraft/api/entities/ITaintedMob.java @@ -0,0 +1,5 @@ +package thaumcraft.api.entities; + +public interface ITaintedMob { + +} diff --git a/src/api/java/thaumcraft/api/golems/ISealDisplayer.java b/src/api/java/thaumcraft/api/golems/ISealDisplayer.java new file mode 100644 index 000000000..d90547aa5 --- /dev/null +++ b/src/api/java/thaumcraft/api/golems/ISealDisplayer.java @@ -0,0 +1,11 @@ +package thaumcraft.api.golems; + +/** + * Items using this interface will make golem seals visible in the world while held + * + * @author azanor + * + */ +public interface ISealDisplayer { + +} diff --git a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java new file mode 100644 index 000000000..ef4bdddbc --- /dev/null +++ b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java @@ -0,0 +1,93 @@ +package thaumcraft.api.internal; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class DummyInternalMethodHandler implements IInternalMethodHandler { + + @Override + public boolean isResearchComplete(String username, String researchkey) { + return false; + } + + @Override + public AspectList getObjectAspects(ItemStack is) { + return null; + } + + @Override + public AspectList generateTags(Item item, int meta) { + return null; + } + + @Override + public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, + AspectList cost, boolean doit, boolean crafting) { + return false; + } + + @Override + public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { + return false; + } + + @Override + public void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type) { + } + + @Override + public int getPlayerWarp(EntityPlayer player, EnumWarpType type) { + return 0; + } + + + @Override + public void markRunicDirty(Entity entity) { + } + + @Override + public boolean completeResearch(EntityPlayer player, String researchkey) { + return false; + } + + + + @Override + public boolean drainAura(World world, BlockPos pos, Aspect aspect, int amount) { + return false; + } + + @Override + public void addAura(World world, BlockPos pos, Aspect aspect, int amount) { + + } + + @Override + public void pollute(World world, BlockPos pos, int amount, boolean showEffect) { } + + @Override + public int getAura(World world, BlockPos pos, Aspect aspect) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int getAuraBase(World world, BlockPos pos) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, + int amount) { + // TODO Auto-generated method stub + return 0; + } + +} diff --git a/src/api/java/thaumcraft/api/internal/EnumWarpType.java b/src/api/java/thaumcraft/api/internal/EnumWarpType.java new file mode 100644 index 000000000..c0ed734f7 --- /dev/null +++ b/src/api/java/thaumcraft/api/internal/EnumWarpType.java @@ -0,0 +1,5 @@ +package thaumcraft.api.internal; + +public enum EnumWarpType { + PERMANENT, NORMAL, TEMPORARY; +} diff --git a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java new file mode 100644 index 000000000..0feb03080 --- /dev/null +++ b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java @@ -0,0 +1,30 @@ +package thaumcraft.api.internal; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public interface IInternalMethodHandler { + + public boolean isResearchComplete(String username, String researchkey); + public AspectList getObjectAspects(ItemStack is); + public AspectList generateTags(Item item, int meta); + public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting); + public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost); + public void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type); + public int getPlayerWarp(EntityPlayer player, EnumWarpType type); + public void markRunicDirty(Entity entity); + public boolean completeResearch(EntityPlayer player, String researchkey); + public boolean drainAura(World world, BlockPos pos, Aspect aspect,int amount); + public int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, int amount); + public void addAura(World world, BlockPos pos, Aspect aspect, int amount); + public void pollute(World world, BlockPos pos, int amount, boolean showEffect); + public int getAura(World world, BlockPos pos, Aspect aspect); + public int getAuraBase(World world, BlockPos pos); + +} diff --git a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java new file mode 100644 index 000000000..3aa7664f0 --- /dev/null +++ b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java @@ -0,0 +1,24 @@ +package thaumcraft.api.internal; + +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + + +public class WeightedRandomLoot extends WeightedRandom.Item { + + /** The Item/Block ID to generate in the bag. */ + public ItemStack item; + + public WeightedRandomLoot(ItemStack stack, int weight) + { + super(weight); + this.item = stack; + } + + public static ArrayList lootBagCommon = new ArrayList(); + public static ArrayList lootBagUncommon = new ArrayList(); + public static ArrayList lootBagRare = new ArrayList(); + +} diff --git a/src/api/java/thaumcraft/api/internal/WorldCoordinates.java b/src/api/java/thaumcraft/api/internal/WorldCoordinates.java new file mode 100644 index 000000000..0f0e08880 --- /dev/null +++ b/src/api/java/thaumcraft/api/internal/WorldCoordinates.java @@ -0,0 +1,101 @@ +package thaumcraft.api.internal; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; + +public class WorldCoordinates implements Comparable +{ + public BlockPos pos; + + public int dim; + + public WorldCoordinates() {} + + public WorldCoordinates(BlockPos pos, int d) + { + this.pos = pos; + this.dim = d; + } + + public WorldCoordinates(TileEntity tile) + { + this.pos = tile.getPos(); + this.dim = tile.getWorld().provider.getDimensionId(); + } + + public WorldCoordinates(WorldCoordinates par1ChunkCoordinates) + { + this.pos = par1ChunkCoordinates.pos; + this.dim = par1ChunkCoordinates.dim; + } + + public boolean equals(Object par1Obj) + { + if (!(par1Obj instanceof WorldCoordinates)) + { + return false; + } + else + { + WorldCoordinates coordinates = (WorldCoordinates)par1Obj; + return this.pos.equals(coordinates.pos) && this.dim == coordinates.dim ; + } + } + + public int hashCode() + { + return this.pos.getX() + this.pos.getY() << 8 + this.pos.getZ() << 16 + this.dim << 24; + } + + /** + * Compare the coordinate with another coordinate + */ + public int compareWorldCoordinate(WorldCoordinates par1) + { + return this.dim == par1.dim ? this.pos.compareTo(par1.pos) : -1; + } + + public void set(BlockPos pos, int d) + { + this.pos = pos; + this.dim = d; + } + + /** + * Returns the squared distance between this coordinates and the coordinates given as argument. + */ + public double getDistanceSquared(BlockPos pos) + { + return this.pos.distanceSq(pos); + } + + /** + * Return the squared distance between this coordinates and the ChunkCoordinates given as argument. + */ + public double getDistanceSquaredToWorldCoordinates(WorldCoordinates par1ChunkCoordinates) + { + return this.getDistanceSquared(par1ChunkCoordinates.pos); + } + + public int compareTo(Object par1Obj) + { + return this.compareWorldCoordinate((WorldCoordinates)par1Obj); + } + + public void readNBT(NBTTagCompound nbt) { + int x = nbt.getInteger("w_x"); + int y = nbt.getInteger("w_y"); + int z = nbt.getInteger("w_z"); + this.pos = new BlockPos(x,y,z); + this.dim = nbt.getInteger("w_d"); + } + + public void writeNBT(NBTTagCompound nbt) { + nbt.setInteger("w_x",pos.getX()); + nbt.setInteger("w_y",pos.getY()); + nbt.setInteger("w_z",pos.getZ()); + nbt.setInteger("w_d",dim); + } + +} diff --git a/src/api/java/thaumcraft/api/items/IArchitect.java b/src/api/java/thaumcraft/api/items/IArchitect.java new file mode 100644 index 000000000..5582bb368 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IArchitect.java @@ -0,0 +1,30 @@ +package thaumcraft.api.items; + +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +public interface IArchitect { + + /** + * Returns a list of blocks that should be highlighted in world. + */ + public ArrayList getArchitectBlocks(ItemStack stack, World world, + BlockPos pos, EnumFacing side, EntityPlayer player); + + /** + * which axis should be displayed. + */ + public boolean showAxis(ItemStack stack, World world, EntityPlayer player, EnumFacing side, + EnumAxis axis); + + public enum EnumAxis { + X, // east / west + Y, // up / down + Z; // north / south + } +} diff --git a/src/api/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/items/IGoggles.java similarity index 73% rename from src/api/java/thaumcraft/api/IGoggles.java rename to src/api/java/thaumcraft/api/items/IGoggles.java index 2f53d8163..8dcb4aa63 100644 --- a/src/api/java/thaumcraft/api/IGoggles.java +++ b/src/api/java/thaumcraft/api/items/IGoggles.java @@ -1,22 +1,22 @@ -package thaumcraft.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped head slot items that extend this class will be able to perform most functions that - * goggles of revealing can apart from view nodes which is handled by IRevealer. - * - */ - -public interface IGoggles { - - /* - * If this method returns true things like block essentia contents will be shown. - */ - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player); - -} +package thaumcraft.api.items; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Equipped or held items that extend this class will be able to perform most functions that + * goggles of revealing can apart from view nodes which is handled by IRevealer. + * + */ + +public interface IGoggles { + + /* + * If this method returns true things like block essentia contents will be shown. + */ + public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player); + +} diff --git a/src/api/java/thaumcraft/api/items/IRechargable.java b/src/api/java/thaumcraft/api/items/IRechargable.java new file mode 100644 index 000000000..c3d56e3a1 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IRechargable.java @@ -0,0 +1,35 @@ +package thaumcraft.api.items; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +/** + * + * @author Azanor + * + * Items with this interface can be recharged in wand pedestals and similar devices. + * The recharging needs to occur in handleRecharge and the passed in pos will be the + * player pos or the pos of the device doing the charging. + * The recharge pedestal will simply call handleRecharge and let the item do whatever + * it would normally to recharge. + * HandleRecharge should under normal conditions always be called every 5 ticks. + * + */ +public interface IRechargable { + /** + * @param world + * @param is + * @param pos + * @param player The passed in player can be null + * @param amount how much vis to recharge - modified by things like the node tapper research + * @return the last aspect that was recharged + */ + public Aspect handleRecharge(World world, ItemStack is, BlockPos pos, EntityPlayer player, int amount); + + public AspectList getAspectsInChargable(ItemStack is); + +} diff --git a/src/api/java/thaumcraft/api/items/IRepairable.java b/src/api/java/thaumcraft/api/items/IRepairable.java new file mode 100644 index 000000000..ce5a7e807 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IRepairable.java @@ -0,0 +1,13 @@ +package thaumcraft.api.items; + + + +/** + * @author Azanor + * Items, armor and tools with this interface can receive the Repair enchantment. + * Repairs 1 point of durability every 10 seconds (2 for repair II) + */ +public interface IRepairable { + + +} diff --git a/src/api/java/thaumcraft/api/items/IRepairableExtended.java b/src/api/java/thaumcraft/api/items/IRepairableExtended.java new file mode 100644 index 000000000..ff01cdec1 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IRepairableExtended.java @@ -0,0 +1,17 @@ +package thaumcraft.api.items; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + + + +/** + * @author Azanor + * Items, armor and tools with this interface can receive the Repair enchantment. + * Repairs 1 point of durability every 10 seconds (2 for repair II) + */ +public interface IRepairableExtended extends IRepairable { + + public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantlevel); + +} diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/items/IRevealer.java similarity index 66% rename from src/api/java/thaumcraft/api/nodes/IRevealer.java rename to src/api/java/thaumcraft/api/items/IRevealer.java index 14a19b54d..63916b135 100644 --- a/src/api/java/thaumcraft/api/nodes/IRevealer.java +++ b/src/api/java/thaumcraft/api/items/IRevealer.java @@ -1,22 +1,22 @@ -package thaumcraft.api.nodes; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped head slot items that extend this class will make nodes visible in world. - * - */ - -public interface IRevealer { - - /* - * If this method returns true the nodes will be visible. - */ - public boolean showNodes(ItemStack itemstack, EntityLivingBase player); - - -} +package thaumcraft.api.items; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Equipped or held items that extend this class will make nodes or related objects visible in world. + * + */ + +public interface IRevealer { + + /* + * If this method returns true the nodes will be visible. + */ + public boolean showNodes(ItemStack itemstack, EntityLivingBase player); + + +} diff --git a/src/api/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/items/IRunicArmor.java similarity index 90% rename from src/api/java/thaumcraft/api/IRunicArmor.java rename to src/api/java/thaumcraft/api/items/IRunicArmor.java index 5dd311006..4e4cc6b4e 100644 --- a/src/api/java/thaumcraft/api/IRunicArmor.java +++ b/src/api/java/thaumcraft/api/items/IRunicArmor.java @@ -1,22 +1,22 @@ -package thaumcraft.api; - -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Armor or bauble slot items that implement this interface can provide runic shielding. - * Recharging, hardening, etc. is handled internally by thaumcraft. - * - */ - -public interface IRunicArmor { - - /** - * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. - */ - public int getRunicCharge(ItemStack itemstack); - - -} +package thaumcraft.api.items; + +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Armor or bauble slot items that implement this interface can provide runic shielding. + * Recharging, hardening, etc. is handled internally by thaumcraft. + * + */ + +public interface IRunicArmor { + + /** + * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. + */ + public int getRunicCharge(ItemStack itemstack); + + +} diff --git a/src/api/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/items/IScribeTools.java similarity index 76% rename from src/api/java/thaumcraft/api/IScribeTools.java rename to src/api/java/thaumcraft/api/items/IScribeTools.java index 7a450056e..006c363c3 100644 --- a/src/api/java/thaumcraft/api/IScribeTools.java +++ b/src/api/java/thaumcraft/api/items/IScribeTools.java @@ -1,14 +1,14 @@ -package thaumcraft.api; - - -/** - * - * @author Azanor - * - * Interface used to identify scribing tool items used in research table - * - */ - -public interface IScribeTools { - -} \ No newline at end of file +package thaumcraft.api.items; + + +/** + * + * @author Azanor + * + * Interface used to identify scribing tool items used in research table + * + */ + +public interface IScribeTools { + +} diff --git a/src/api/java/thaumcraft/api/items/IVisDiscountGear.java b/src/api/java/thaumcraft/api/items/IVisDiscountGear.java new file mode 100644 index 000000000..a21b3731c --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IVisDiscountGear.java @@ -0,0 +1,20 @@ +package thaumcraft.api.items; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; + + + + +/** + * @author Azanor + * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands. + * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but + * individual items really shouldn't have a discount more than 5% + */ +public interface IVisDiscountGear { + + int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect); + +} diff --git a/src/api/java/thaumcraft/api/items/IWarpingGear.java b/src/api/java/thaumcraft/api/items/IWarpingGear.java new file mode 100644 index 000000000..56534002c --- /dev/null +++ b/src/api/java/thaumcraft/api/items/IWarpingGear.java @@ -0,0 +1,22 @@ +package thaumcraft.api.items; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Armor, held items or bauble slot items that implement this interface add warp when equipped or held. + * + */ + +public interface IWarpingGear { + + /** + * returns how much warp this item adds while worn or held. + */ + public int getWarp(ItemStack itemstack, EntityPlayer player); + + +} diff --git a/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java b/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java new file mode 100644 index 000000000..4424929f8 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java @@ -0,0 +1,88 @@ +package thaumcraft.api.items; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IEssentiaContainerItem; + +public class ItemGenericEssentiaContainer extends Item implements IEssentiaContainerItem +{ + public ItemGenericEssentiaContainer(int base) + { + super(); + this.base = base; + this.setMaxStackSize(64); + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + int base = 1; + + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs,List par3List) { + for (Aspect tag:Aspect.aspects.values()) { + ItemStack i = new ItemStack(this); + this.setAspects(i, new AspectList().add(tag, base)); + par3List.add(i); + } + } + + @SideOnly(Side.CLIENT) + @Override + public int getColorFromItemStack(ItemStack stack, int par2) + { + if (getAspects(stack)!=null) { + return getAspects(stack).getAspects()[0].getColor(); + } else { + return 16777215; + } + } + + @Override + public AspectList getAspects(ItemStack itemstack) { + if (itemstack.hasTagCompound()) { + AspectList aspects = new AspectList(); + aspects.readFromNBT(itemstack.getTagCompound()); + return aspects.size()>0?aspects:null; + } + return null; + } + + @Override + public void setAspects(ItemStack itemstack, AspectList aspects) { + if (!itemstack.hasTagCompound()) + itemstack.setTagCompound(new NBTTagCompound()); + aspects.writeToNBT(itemstack.getTagCompound()); + } + + @Override + public boolean ignoreContainedAspects() {return false;} + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { + if (!world.isRemote && !stack.hasTagCompound()) { + Aspect[] displayAspects = Aspect.aspects.values().toArray(new Aspect[]{}); + this.setAspects(stack, new AspectList().add(displayAspects[world.rand.nextInt(displayAspects.length)], base)); + } + super.onUpdate(stack, world, entity, par4, par5); + } + + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + if (!world.isRemote && !stack.hasTagCompound()) { + Aspect[] displayAspects = Aspect.aspects.values().toArray(new Aspect[]{}); + this.setAspects(stack, new AspectList().add(displayAspects[world.rand.nextInt(displayAspects.length)], base)); + } + } +} diff --git a/src/api/java/thaumcraft/api/items/ItemRunic.java b/src/api/java/thaumcraft/api/items/ItemRunic.java new file mode 100644 index 000000000..483e93534 --- /dev/null +++ b/src/api/java/thaumcraft/api/items/ItemRunic.java @@ -0,0 +1,21 @@ +package thaumcraft.api.items; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemRunic extends Item implements IRunicArmor { + + int charge; + + public ItemRunic (int charge) + { + super(); + this.charge = charge; + } + + @Override + public int getRunicCharge(ItemStack itemstack) { + return charge; + } + +} diff --git a/src/api/java/thaumcraft/api/items/ItemsTC.java b/src/api/java/thaumcraft/api/items/ItemsTC.java new file mode 100644 index 000000000..fd2f8aeec --- /dev/null +++ b/src/api/java/thaumcraft/api/items/ItemsTC.java @@ -0,0 +1,185 @@ +package thaumcraft.api.items; + +import net.minecraft.item.Item; + +public class ItemsTC { + + //raw materials + public static Item amber; + public static Item quicksilver; + /** air, fire, water, earth, order, entropy, tainted, balanced*/ + public static Item shard; + /** "thaumium","void","brass"*/ + public static Item ingots; + /**"iron","copper","tin","silver","lead","quicksilver","thaumium","void","brass"*/ + public static Item nuggets; + /**"iron","gold","copper","tin","silver","lead","cinnabar"*/ + public static Item clusters; + + //resources + public static Item tallow; + public static Item fabric; + /** "brass","thaumium","void"*/ + public static Item gear; + /** "brass","iron","thaumium","void"*/ + public static Item plate; + public static Item voidSeed; + public static Item salisMundus; + public static Item mirroredGlass; + public static Item primalCharm; + public static Item phial; + public static Item label; + public static Item filter; + /** "clockwork","biothaumic" */ + public static Item mind; + public static Item morphicResonator; + + //consumables + public static Item alumentum; + public static Item brain; + /** "beef","chicken","pork","fish","rabbit","mutton"*/ + public static Item chunks; + public static Item tripleMeatTreat; + public static Item bucketDeath; + public static Item bucketPure; + public static Item bottleTaint; + public static Item bathSalts; + public static Item sanitySoap; + /** "basic","focus","magnet"*/ + public static Item turretPlacer; + + + //armor + public static Item goggles; + + public static Item travellerBoots; + + public static Item thaumiumHelm; + public static Item thaumiumChest; + public static Item thaumiumLegs; + public static Item thaumiumBoots; + + public static Item clothChest; + public static Item clothLegs; + public static Item clothBoots; + + public static Item fortressHelm; + public static Item fortressChest; + public static Item fortressLegs; + + public static Item voidHelm; + public static Item voidChest; + public static Item voidLegs; + public static Item voidBoots; + + public static Item voidRobeHelm; + public static Item voidRobeChest; + public static Item voidRobeLegs; + + public static Item crimsonBoots; + + public static Item crimsonPlateHelm; + public static Item crimsonPlateChest; + public static Item crimsonPlateLegs; + + public static Item crimsonRobeHelm; + public static Item crimsonRobeChest; + public static Item crimsonRobeLegs; + + public static Item crimsonPraetorHelm; + public static Item crimsonPraetorChest; + public static Item crimsonPraetorLegs; + + public static Item thaumostaticHarness; + + //tools + public static Item thaumometer; + public static Item thaumonomicon; + public static Item resonator; + public static Item sinisterStone; + public static Item sanityChecker; + + public static Item thaumiumAxe; + public static Item thaumiumSword; + public static Item thaumiumShovel; + public static Item thaumiumPick; + public static Item thaumiumHoe; + + public static Item elementalAxe; + public static Item elementalSword; + public static Item elementalShovel; + public static Item elementalPick; + public static Item elementalHoe; + + public static Item voidAxe; + public static Item voidSword; + public static Item voidShovel; + public static Item voidPick; + public static Item voidHoe; + + public static Item crimsonBlade; + public static Item primalCrusher; + + public static Item boneBow; + public static Item primalArrows; + + public static Item handMirror; + + //wand + public static Item wand; + /** iron, gold, brass, thaumium_inert, thaumium_charged, void_inert, void_charged*/ + public static Item wandCaps; + /** greatwood, silverwood, obsidian, blaze, ice, quartz, bone, reed, + * greatwood_staff, silverwood_staff, obsidian_staff, blaze_staff, ice_staff, + * quartz_staff, bone_staff, reed_staff, primal_staff */ + public static Item wandRods; + public static Item focusEqualTrade; + public static Item focusFire; + public static Item focusFrost; + public static Item focusPech; + public static Item focusExcavation; + public static Item focusHellbat; + public static Item focusPrimal; + public static Item focusShock; + public static Item focusWarding; + public static Item focusHole; + public static Item focusShard; + + public static Item focusPouch; + + //baubles + /** "amulet_mundane","ring_mundane","girdle_mundane","ring_apprentice"*/ + public static Item baubles; + public static Item amuletRunic; + public static Item ringRunic; + public static Item girdleRunic; + public static Item amuletVis; + public static Item girdleHover; + + //misc + /** "slime","tendril"*/ + public static Item tainted; + public static Item knowledgeFragment; + public static Item coin; + public static Item wispyEssence; + public static Item crystalEssence; + public static Item primordialPearl; + public static Item researchNotes; + public static Item scribingTools; + public static Item lootBag; + public static Item eldritchEye; + public static Item crimsonRites; + public static Item runedTablet; + public static Item creativePlacer; + + //golems + public static Item golemBell; + public static Item golemPlacer; + /** "blank","pickup","fill","fill_advanced","empty","empty_advanced" */ + public static Item seals; + + + + + +} diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java new file mode 100644 index 000000000..eaab3d20d --- /dev/null +++ b/src/api/java/thaumcraft/api/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "Thaumcraft", apiVersion = "5.0.0.4", provides = "Thaumcraft|API") +package thaumcraft.api; + +import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java new file mode 100644 index 000000000..c9efa7e96 --- /dev/null +++ b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java @@ -0,0 +1,67 @@ +package thaumcraft.api.potions; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import thaumcraft.api.damagesource.DamageSourceThaumcraft; +import thaumcraft.api.entities.ITaintedMob; + +public class PotionFluxTaint extends Potion +{ + public static PotionFluxTaint instance = null; // will be instantiated at runtime + private int statusIconIndex = -1; + + public PotionFluxTaint(int par1, boolean par2, int par3) + { + super(par1,new ResourceLocation("flux_taint"),par2,par3); + setIconIndex(0, 0); + } + + public static void init() + { + instance.setPotionName("potion.fluxtaint"); + instance.setIconIndex(3, 1); + instance.setEffectiveness(0.25D); + } + + @Override + public boolean isBadEffect() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() { + Minecraft.getMinecraft().renderEngine.bindTexture(rl); + return super.getStatusIconIndex(); + } + + static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); + + @Override + public void performEffect(EntityLivingBase target, int par2) { + if (target instanceof ITaintedMob) { + target.heal(1); + } else + if (!target.isEntityUndead() && !(target instanceof EntityPlayer)) + { + target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); + } + else + if (!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer))) + { + target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); + } + } + + public boolean isReady(int par1, int par2) + { + int k = 40 >> par2; + return k > 0 ? par1 % k == 0 : true; + } + +} diff --git a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java new file mode 100644 index 000000000..7f9b576e5 --- /dev/null +++ b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java @@ -0,0 +1,48 @@ +package thaumcraft.api.potions; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class PotionVisExhaust extends Potion +{ + public static PotionVisExhaust instance = null; // will be instantiated at runtime + private int statusIconIndex = -1; + + public PotionVisExhaust(int par1, boolean par2, int par3) + { + super(par1,new ResourceLocation("vis_exhaust"),par2,par3); + setIconIndex(0, 0); + } + + public static void init() + { + instance.setPotionName("potion.visexhaust"); + instance.setIconIndex(5, 1); + instance.setEffectiveness(0.25D); + } + + @Override + public boolean isBadEffect() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() { + Minecraft.getMinecraft().renderEngine.bindTexture(rl); + return super.getStatusIconIndex(); + } + + static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); + + @Override + public void performEffect(EntityLivingBase target, int par2) { + + } + + +} diff --git a/src/api/java/thaumcraft/api/research/IScanThing.java b/src/api/java/thaumcraft/api/research/IScanThing.java new file mode 100644 index 000000000..cba286387 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/IScanThing.java @@ -0,0 +1,23 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.player.EntityPlayer; + +public interface IScanThing { + + /** + * The passed in obj can either be an Entity, a BlockPos, an Itemstack, or a null if nothing was actually clicked on. + * You could then probably use the players lookvec to do whatever you want. + * @param player + * @param obj + * @return the research key that will be unlocked if the object is scanned. + * This need not be an actual defined research item - any text string will do. + * You can then use this research key (fake or otherwise) as a parent for research or for whatever. + */ + public boolean checkThing(EntityPlayer player, Object obj); + + /** + * @return the research linked to this 'thing' + */ + public String getResearchKey(); + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java new file mode 100644 index 000000000..6c4c95afb --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchCategories.java @@ -0,0 +1,117 @@ +package thaumcraft.api.research; + +import java.util.Collection; +import java.util.LinkedHashMap; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.FMLLog; + +import org.apache.logging.log4j.Level; + +public class ResearchCategories { + + //Research + public static LinkedHashMap researchCategories = new LinkedHashMap (); + + /** + * @param key + * @return the research item linked to this key + */ + public static ResearchCategoryList getResearchList(String key) { + return researchCategories.get(key); + } + + /** + * @param key + * @return the name of the research category linked to this key. + * Must be stored as localization information in the LanguageRegistry. + */ + public static String getCategoryName(String key) { + return StatCollector.translateToLocal("tc.research_category."+key); + } + + /** + * @param key the research key + * @return the ResearchItem object. + */ + public static ResearchItem getResearch(String key) { + Collection rc = researchCategories.values(); + for (Object cat:rc) { + Collection rl = ((ResearchCategoryList)cat).research.values(); + for (Object ri:rl) { + if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri; + } + } + return null; + } + + /** + * This should only be done at the PostInit stage + * @param key the key used for this category + * @param researchkey the research that the player needs to have completed before this category becomes visible. Set as null to always show. + * @param icon the icon to be used for the research category tab + * @param background the resource location of the background image to use for this category + * @return the name of the research linked to this key + */ + public static void registerCategory(String key, String researchkey, ResourceLocation icon, ResourceLocation background) { + if (getResearchList(key)==null) { + ResearchCategoryList rl = new ResearchCategoryList(researchkey, icon, background); + researchCategories.put(key, rl); + } + } + + /** + * This should only be done at the PostInit stage + * @param key the key used for this category + * @param researchkey the research that the player needs to have completed before this category becomes visible. Set as null to always show. + * @param icon the icon to be used for the research category tab + * @param background the resource location of the background image to use for this category + * @param background2 the resource location of the foreground image that lies between the background and icons + * @return the name of the research linked to this key + */ + public static void registerCategory(String key, String researchkey, ResourceLocation icon, ResourceLocation background, ResourceLocation background2) { + if (getResearchList(key)==null) { + ResearchCategoryList rl = new ResearchCategoryList(researchkey, icon, background, background2); + researchCategories.put(key, rl); + } + } + + public static void addResearch(ResearchItem ri) { + ResearchCategoryList rl = getResearchList(ri.category); + if (rl!=null && !rl.research.containsKey(ri.key)) { + + if (!ri.isVirtual()) { + for (ResearchItem rr:rl.research.values()) { + if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) { + FMLLog.log(Level.FATAL, "[Thaumcraft] Research ["+ri.getName()+"] not added as it overlaps with existing research ["+rr.getName()+"]"); + return; + } + } + } + + + rl.research.put(ri.key, ri); + + if (ri.displayColumn < rl.minDisplayColumn) + { + rl.minDisplayColumn = ri.displayColumn; + } + + if (ri.displayRow < rl.minDisplayRow) + { + rl.minDisplayRow = ri.displayRow; + } + + if (ri.displayColumn > rl.maxDisplayColumn) + { + rl.maxDisplayColumn = ri.displayColumn; + } + + if (ri.displayRow > rl.maxDisplayRow) + { + rl.maxDisplayRow = ri.displayRow; + } + } + } +} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java new file mode 100644 index 000000000..8645ae152 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java @@ -0,0 +1,50 @@ +package thaumcraft.api.research; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.util.ResourceLocation; + +public class ResearchCategoryList { + + /** Is the smallest column used on the GUI. */ + public int minDisplayColumn; + + /** Is the smallest row used on the GUI. */ + public int minDisplayRow; + + /** Is the biggest column used on the GUI. */ + public int maxDisplayColumn; + + /** Is the biggest row used on the GUI. */ + public int maxDisplayRow; + + /** display variables **/ + public ResourceLocation icon; + public ResourceLocation background; + public ResourceLocation background2; + + public String researchKey; + + public ResearchCategoryList(String researchKey, ResourceLocation icon, ResourceLocation background) { + this.researchKey = researchKey; + this.icon = icon; + this.background = background; + this.background2 = null; + } + + public ResearchCategoryList(String researchKey, ResourceLocation icon, ResourceLocation background, ResourceLocation background2) { + this.researchKey = researchKey; + this.icon = icon; + this.background = background; + this.background2 = background2; + } + + //Research + public Map research = new HashMap(); + + + + + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchHelper.java b/src/api/java/thaumcraft/api/research/ResearchHelper.java new file mode 100644 index 000000000..ad5c26e26 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchHelper.java @@ -0,0 +1,42 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.player.EntityPlayer; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.internal.EnumWarpType; + +public class ResearchHelper { + + public static boolean completeResearch(EntityPlayer player, String researchkey) { + return ThaumcraftApi.internalMethods.completeResearch(player, researchkey); + } + + public static boolean isResearchComplete(String username, String[] researchkeys) { + for (String key:researchkeys) if (!ResearchHelper.isResearchComplete(username, key)) return false; + return true; + } + + public static boolean isResearchComplete(String username, String researchkey) { + return ThaumcraftApi.internalMethods.isResearchComplete(username, researchkey); + } + + /** + * This adds warp to a player. It will automatically be synced clientside + * @param player the player using the wand + * @param amount how much warp to add. Negative amounts are only valid for temporary warp + * @param type the type of warp to be added + */ + public static void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type) { + ThaumcraftApi.internalMethods.addWarpToPlayer(player, amount, type); + } + + /** + * This retrieves how much warp the player has + * @param player the player using the wand + * @param type the type of warp to retrieve + * @return how much warp the player has + */ + public static int getPlayerWarp(EntityPlayer player, EnumWarpType type) { + return ThaumcraftApi.internalMethods.getPlayerWarp(player, type); + } + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java new file mode 100644 index 000000000..711add051 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchItem.java @@ -0,0 +1,303 @@ +package thaumcraft.api.research; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class ResearchItem +{ + /** + * A short string used as a key for this research. Must be unique + */ + public final String key; + + /** + * A short string used as a reference to the research category to which this must be added. + */ + public final String category; + + /** + * The aspect tags and their values required to complete this research * + */ + public final AspectList tags; + + /** + * This links to any research that needs to be completed before this research can be discovered or learnt. + */ + public String[] parents = null; + + /** + * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter. + */ + public String[] parentsHidden = null; + + /** + * any research linked to this that will be unlocked automatically when this research is complete + */ + public String[] siblings = null; + + /** + * the horizontal position of the research icon + */ + public final int displayColumn; + + /** + * the vertical position of the research icon + */ + public final int displayRow; + + /** + * the icon to be used for this research + */ + public final ItemStack[] icon_item; + + /** + * the icon to be used for this research + */ + public final ResourceLocation[] icon_resource; + + /** + * How large the research grid is. Valid values are 1 to 3. + */ + private int complexity; + + /** + * Special research has a spiky border. Used for important research milestones. + */ + private boolean isSpecial; + + /** + * Research that can be directly purchased with knowledge fragments + */ + private boolean isSecondary; + + /** + * This indicates if the research should use a circular icon border. Usually used for "passive" research + * that doesn't have recipes and grants passive effects, or that unlock automatically. + */ + private boolean isRound; + + /** + * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system. + */ + private boolean isStub; + + /** + * This indicated that the research is completely hidden and cannot be discovered by any + * player-controlled means. The recipes will never show up in the thaumonomicon. + * Usually used to unlock "hidden" recipes via sibling unlocking, like + * the various cap and rod combos for wands. + */ + private boolean isVirtual; + + /** + * Concealed research does not display in the thaumonomicon until parent researches are discovered. + * Often times some of the parent researches is linked to scanned objects. + */ + private boolean isHidden; + + /** + * These research items will automatically unlock for all players on game start + */ + private boolean isAutoUnlock; + + /** + * Flip the way the connecting lines are drawn in the research browser. + */ + private boolean isFlipped; + + private ResearchPage[] pages = null; + + public ResearchItem(String key, String category) + { + this.key = key; + this.category = category; + this.tags = new AspectList(); + this.icon_resource = null; + this.icon_item = null; + this.displayColumn = 0; + this.displayRow = 0; + this.isVirtual = true; + } + + public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, Object ... icon) + { + this.key = key; + this.category = category; + this.tags = tags; + if (icon[0] instanceof ResourceLocation) { + ResourceLocation[] t = new ResourceLocation[icon.length]; + System.arraycopy(icon, 0, t, 0, icon.length); + this.icon_resource = t; + } else this.icon_resource = null; + if (icon[0] instanceof ItemStack) { + ItemStack[] t = new ItemStack[icon.length]; + System.arraycopy(icon, 0, t, 0, icon.length); + this.icon_item = t; + } else this.icon_item = null; + this.displayColumn = col; + this.displayRow = row; + this.complexity = complex; + if (complexity < 1) this.complexity = 1; + if (complexity > 3) this.complexity = 3; + } + + + public ResearchItem setSpecial() + { + this.isSpecial = true; + return this; + } + + public ResearchItem setStub() + { + this.isStub = true; + return this; + } + + + public ResearchItem setHidden() + { + this.isHidden = true; + return this; + } + + public ResearchItem setParents(String... par) + { + this.parents = par; + return this; + } + + + + public ResearchItem setParentsHidden(String... par) + { + this.parentsHidden = par; + return this; + } + + public ResearchItem setSiblings(String... sib) + { + this.siblings = sib; + return this; + } + + public ResearchItem setPages(ResearchPage... par) + { + this.pages = par; + return this; + } + + public ResearchPage[] getPages() { + return pages; + } + + public ResearchItem registerResearchItem() + { + ResearchCategories.addResearch(this); + return this; + } + + public String getName() + { + return StatCollector.translateToLocal("tc.research_name."+key); + } + + public String getText() + { + return StatCollector.translateToLocal("tc.research_text."+key); + } + + public boolean isSpecial() + { + return this.isSpecial; + } + + public boolean isStub() + { + return this.isStub; + } + + public boolean isHidden() + { + return this.isHidden; + } + + public boolean isVirtual() + { + return this.isVirtual; + } + + public boolean isAutoUnlock() { + return isAutoUnlock; + } + + public ResearchItem setAutoUnlock() + { + this.isAutoUnlock = true; + return this; + } + + public boolean isRound() { + return isRound; + } + + public ResearchItem setRound() { + this.isRound = true; + return this; + } + + public ResearchItem setSecondary() + { + this.isSecondary = true; + return this; + } + + public boolean isSecondary() { + return isSecondary; + } + + public int getComplexity() { + return complexity; + } + + public ResearchItem setFlipped() { + this.isFlipped = true; + return this; + } + + public boolean isFlipped() { + return this.isFlipped; + } + + public ResearchItem setComplexity(int complexity) { + this.complexity = complexity; + return this; + } + + public int getExperience() { + if (this.tags!=null && this.tags.visSize()>0) { + return Math.max(1, (int) Math.sqrt(this.tags.visSize())); + } else + return 0; + } + + /** + * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things + */ + public Aspect getResearchPrimaryTag() { + Aspect aspect=null; + int highest=0; + if (tags!=null) + for (Aspect tag:tags.getAspects()) { + if (tags.getAmount(tag)>highest) { + aspect=tag; + highest=tags.getAmount(tag); + }; + } + return aspect; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java new file mode 100644 index 000000000..3f32c6788 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchPage.java @@ -0,0 +1,183 @@ +package thaumcraft.api.research; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.IArcaneRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; + +public class ResearchPage { + public static enum PageType + { + TEXT, + IMAGE, + CRUCIBLE_CRAFTING, + ARCANE_CRAFTING, + ASPECTS, + NORMAL_CRAFTING, + INFUSION_CRAFTING, + COMPOUND_CRAFTING, + INFUSION_ENCHANTMENT, + SMELTING + } + + public PageType type = PageType.TEXT; + + public String text=null; + public String research=null; + public ResourceLocation image=null; + public AspectList aspects=null; + public Object recipe=null; + public Object recipeOutput=null; + + /** + * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. + */ + public ResearchPage(String text) { + this.type = PageType.TEXT; + this.text = text; + } + + /** + * @param recipe a vanilla crafting recipe. + */ + public ResearchPage(IRecipe recipe) { + this.type = PageType.NORMAL_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe a collection of vanilla crafting recipes. + */ + public ResearchPage(IRecipe[] recipe) { + this.type = PageType.NORMAL_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a collection of arcane crafting recipes. + */ + public ResearchPage(IArcaneRecipe[] recipe) { + this.type = PageType.ARCANE_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a collection of arcane crafting recipes. + */ + public ResearchPage(CrucibleRecipe[] recipe) { + this.type = PageType.CRUCIBLE_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a collection of infusion crafting recipes. + */ + public ResearchPage(InfusionRecipe[] recipe) { + this.type = PageType.INFUSION_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a compound crafting recipe. + */ + public ResearchPage(List recipe) { + this.type = PageType.COMPOUND_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe an arcane worktable crafting recipe. + */ + public ResearchPage(IArcaneRecipe recipe) { + this.type = PageType.ARCANE_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe an alchemy crafting recipe. + */ + public ResearchPage(CrucibleRecipe recipe) { + this.type = PageType.CRUCIBLE_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe a furnace smelting crafting recipe. + */ + public ResearchPage(ItemStack input) { + this.type = PageType.SMELTING; + this.recipe = input; + this.recipeOutput = FurnaceRecipes.instance().getSmeltingResult(input); + } + + /** + * @param recipe an infusion crafting recipe. + */ + public ResearchPage(InfusionRecipe recipe) { + this.type = PageType.INFUSION_CRAFTING; + this.recipe = recipe; + if (recipe.getRecipeOutput() instanceof ItemStack) { + this.recipeOutput = (ItemStack) recipe.getRecipeOutput(); + } else { + this.recipeOutput = recipe.getRecipeInput(); + } + } + + /** + * @param recipe an infusion crafting recipe. + */ + public ResearchPage(InfusionEnchantmentRecipe recipe) { + this.type = PageType.INFUSION_ENCHANTMENT; + this.recipe = recipe; + } + + /** + * @param image + * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text. + */ + public ResearchPage(ResourceLocation image, String caption) { + this.type = PageType.IMAGE; + this.image = image; + this.text = caption; + } + + /** + * This function should really not be called directly - used internally + */ + public ResearchPage(AspectList as) { + this.type = PageType.ASPECTS; + this.aspects = as; + } + + /** + * returns a localized text of the text field (if one exists). Returns the text field itself otherwise. + * @return + */ + public String getTranslatedText() { + String ret=""; + if (text != null) { + ret = StatCollector.translateToLocal(text); + if (ret.isEmpty()) ret = text; + } + return ret; + } + /** + * This page will only be shown if this research is unlocked + */ + public ResearchPage setRequisite(String research) { + this.research = research; + return this; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ScanAspect.java b/src/api/java/thaumcraft/api/research/ScanAspect.java new file mode 100644 index 000000000..ea84ea307 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanAspect.java @@ -0,0 +1,61 @@ +package thaumcraft.api.research; + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectHelper; +import thaumcraft.api.aspects.AspectList; + +public class ScanAspect implements IScanThing { + + String research; + Aspect aspect; + + /** + * NOTE: You should not have to add your own entry for aspects since a trigger research is added automatically for each aspect in the format "![tagname]" + * for example: "!vitium" + */ + + + public ScanAspect(String research, Aspect aspect) { + this.research = research; + this.aspect = aspect; + } + + @Override + public boolean checkThing(EntityPlayer player, Object obj) { + if (obj == null) return false; + + AspectList al = null; + + if (obj instanceof Entity && !(obj instanceof EntityItem)) { + al = AspectHelper.getEntityAspects((Entity) obj); + } else { + ItemStack is = null; + if (obj instanceof ItemStack) + is = (ItemStack) obj; + if (obj instanceof EntityItem && ((EntityItem)obj).getEntityItem()!=null) + is = ((EntityItem)obj).getEntityItem(); + if (obj instanceof BlockPos) { + Block b = player.worldObj.getBlockState((BlockPos) obj).getBlock(); + is = new ItemStack(b,1,b.getMetaFromState(player.worldObj.getBlockState((BlockPos) obj))); + } + + if (is!=null) { + al = AspectHelper.getObjectAspects(is); + } + } + + return al!=null && al.getAmount(aspect)>0; + } + + @Override + public String getResearchKey() { + return research; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ScanBlock.java b/src/api/java/thaumcraft/api/research/ScanBlock.java new file mode 100644 index 000000000..31935d7de --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanBlock.java @@ -0,0 +1,30 @@ +package thaumcraft.api.research; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; + +public class ScanBlock implements IScanThing { + + String research; + Block block; + + public ScanBlock(String research, Block block) { + this.research = research; + this.block = block; + } + + + @Override + public boolean checkThing(EntityPlayer player, Object obj) { + if (obj!=null && obj instanceof BlockPos && player.worldObj.getBlockState((BlockPos) obj).getBlock()==block) { + return true; + } + return false; + } + + @Override + public String getResearchKey() { + return research; + } +} diff --git a/src/api/java/thaumcraft/api/research/ScanBlockState.java b/src/api/java/thaumcraft/api/research/ScanBlockState.java new file mode 100644 index 000000000..47464f24c --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanBlockState.java @@ -0,0 +1,38 @@ +package thaumcraft.api.research; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; + +public class ScanBlockState implements IScanThing { + + String research; + IBlockState blockState; + + public ScanBlockState(String research, IBlockState blockState) { + this.research = research; + this.blockState = blockState; + } + + public ScanBlockState(String research, IBlockState blockState, boolean item) { + this.research = research; + this.blockState = blockState; + if (item) + ScanningManager.addScannableThing(new ScanItem(research, + new ItemStack(blockState.getBlock(),1,blockState.getBlock().getMetaFromState(blockState)))); + } + + @Override + public boolean checkThing(EntityPlayer player, Object obj) { + if (obj!=null && obj instanceof BlockPos && player.worldObj.getBlockState((BlockPos) obj)==blockState) { + return true; + } + return false; + } + + @Override + public String getResearchKey() { + return research; + } +} diff --git a/src/api/java/thaumcraft/api/research/ScanEntity.java b/src/api/java/thaumcraft/api/research/ScanEntity.java new file mode 100644 index 000000000..d732da0b7 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanEntity.java @@ -0,0 +1,57 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; +import thaumcraft.api.ThaumcraftApiHelper; + +public class ScanEntity implements IScanThing { + + String research; + Class entityClass; + EntityTagsNBT[] NBTData; + + /** + * false if the specific entity class should be used, or true if anything the inherits from that class is also allowed. + */ + boolean inheritedClasses=false; + + public ScanEntity(String research, Class entityClass, boolean inheritedClasses) { + this.research = research; + this.entityClass = entityClass; + this.inheritedClasses = inheritedClasses; + } + + public ScanEntity(String research, Class entityClass, boolean inheritedClasses, EntityTagsNBT... nbt) { + this.research = research; + this.entityClass = entityClass; + this.inheritedClasses = inheritedClasses; + this.NBTData = nbt; + } + + @Override + public boolean checkThing(EntityPlayer player, Object obj) { + if (obj!=null && ((!inheritedClasses && entityClass==obj.getClass()) || + (inheritedClasses && entityClass.isInstance(obj)))) { + if (NBTData!=null && NBTData.length>0) { + boolean b = true; + NBTTagCompound tc = new NBTTagCompound(); + ((Entity)obj).writeToNBT(tc); + for (EntityTagsNBT nbt:NBTData) { + if (!tc.hasKey(nbt.name) || !ThaumcraftApiHelper.getNBTDataFromId(tc, tc.getTagId(nbt.name), nbt.name).equals(nbt.value)) { + return false; + } + } + } + return true; + } + return false; + } + + @Override + public String getResearchKey() { + return research; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ScanItem.java b/src/api/java/thaumcraft/api/research/ScanItem.java new file mode 100644 index 000000000..59afe9366 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanItem.java @@ -0,0 +1,37 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.ThaumcraftApiHelper; + +public class ScanItem implements IScanThing { + + String research; + ItemStack stack; + + public ScanItem(String research, ItemStack stack) { + this.research = research; + this.stack = stack; + } + + @Override + public boolean checkThing(EntityPlayer player, Object obj) { + if (obj == null) return false; + + ItemStack is = null; + + if (obj instanceof ItemStack) + is = (ItemStack) obj; + if (obj instanceof EntityItem && ((EntityItem)obj).getEntityItem()!=null) + is = ((EntityItem)obj).getEntityItem(); + + return is!=null && ThaumcraftApiHelper.areItemStacksEqualForCrafting(is, stack); + } + + @Override + public String getResearchKey() { + return research; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ScanningManager.java b/src/api/java/thaumcraft/api/research/ScanningManager.java new file mode 100644 index 000000000..6c5a1f0b3 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanningManager.java @@ -0,0 +1,58 @@ +package thaumcraft.api.research; + +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; + +public class ScanningManager { + + static ArrayList things = new ArrayList(); + + /** + * Add things to scan + * @example + * ScanManager.addScannableThing(new ScanItem("HIPSTER",new ItemStack(Items.apple,1,OreDictionary.WILDCARD_VALUE)));
+ * This will unlock the HIPSTER research if you scan any kind of apple. + */ + public static void addScannableThing(IScanThing obj) { + things.add(obj); + } + + /** + * + * @param player + * @param object this could in theory be anything, but vanilla tc scanning tools only pass in Entity, BlockPos, Itemstack or null + */ + public static void scanTheThing(EntityPlayer player, Object object) { + boolean found = false; + for (IScanThing thing:things) { + if (thing.checkThing(player, object)) { + if (ResearchHelper.completeResearch(player, thing.getResearchKey())) { + found=true; + } + } + } + if (!found) { + player.addChatMessage(new ChatComponentText("\u00a75\u00a7o"+StatCollector.translateToLocal("tc.unknownobject"))); + } + } + + /** + * @param player + * @param object + * @return true if the object can be scanned for research the player has not yet discovered + */ + public static boolean isThingStillScannable(EntityPlayer player, Object object) { + for (IScanThing thing:things) { + if (thing.checkThing(player, object)) { + if (!ResearchHelper.isResearchComplete(player.getCommandSenderName(), thing.getResearchKey())) { + return true; + } + } + } + return false; + } + +} diff --git a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java new file mode 100644 index 000000000..7ba6f1c59 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java @@ -0,0 +1,107 @@ +package thaumcraft.api.wands; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class FocusUpgradeType { + + public static FocusUpgradeType[] types = new FocusUpgradeType[20]; + + public short id; + + public ResourceLocation icon; + + public String name; + + public String text; + + /** + * What aspects are used to calculate the cost of this upgrade. The amounts given is ignored, just the type is used for the calculation. + */ + public AspectList aspects; + + private static int lastID = 0; + + public FocusUpgradeType(ResourceLocation icon, String name, String text, AspectList aspects) { + this.id = (short) lastID; + lastID++; + this.icon = icon; + this.name = name; + this.text = text; + this.aspects = aspects; + + // allocate space + if (id>=types.length) { + FocusUpgradeType[] temp = new FocusUpgradeType[id+1]; + System.arraycopy(types, 0, temp, 0, types.length); + types = temp; + } + + types[id] = this; + } + + public String getLocalizedName() { + return StatCollector.translateToLocal(name); + } + + public String getLocalizedText() { + return StatCollector.translateToLocal(text); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof FocusUpgradeType) { + return this.id == ((FocusUpgradeType)obj).id; + } else return false; + } + + // basic upgrade types + public static FocusUpgradeType potency = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/potency.png"), + "focus.upgrade.potency.name","focus.upgrade.potency.text", + new AspectList().add(Aspect.AVERSION,1)); + + public static FocusUpgradeType frugal = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/frugal.png"), + "focus.upgrade.frugal.name","focus.upgrade.frugal.text", + new AspectList().add(Aspect.DESIRE,1)); + + public static FocusUpgradeType treasure = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/treasure.png"), + "focus.upgrade.treasure.name","focus.upgrade.treasure.text", + new AspectList().add(Aspect.DESIRE,1)); + + public static FocusUpgradeType enlarge = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/enlarge.png"), + "focus.upgrade.enlarge.name","focus.upgrade.enlarge.text", + new AspectList().add(Aspect.MOTION,1)); + + public static FocusUpgradeType alchemistsfire = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/alchemistsfire.png"), + "focus.upgrade.alchemistsfire.name","focus.upgrade.alchemistsfire.text", + new AspectList().add(Aspect.ENERGY,1).add(Aspect.WATER,1)); + + public static FocusUpgradeType alchemistsfrost = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/alchemistsfrost.png"), + "focus.upgrade.alchemistsfrost.name","focus.upgrade.alchemistsfrost.text", + new AspectList().add(Aspect.COLD,1).add(Aspect.TRAP,1)); + + public static FocusUpgradeType architect = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/architect.png"), + "focus.upgrade.architect.name","focus.upgrade.architect.text", + new AspectList().add(Aspect.CRAFT,1)); + + public static FocusUpgradeType extend = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/extend.png"), + "focus.upgrade.extend.name","focus.upgrade.extend.text", + new AspectList().add(Aspect.EXCHANGE,1)); + + public static FocusUpgradeType silktouch = new FocusUpgradeType( + new ResourceLocation("thaumcraft", "textures/foci/silktouch.png"), + "focus.upgrade.silktouch.name","focus.upgrade.silktouch.text", + new AspectList().add(Aspect.DESIRE,1)); + + +} diff --git a/src/api/java/thaumcraft/api/wands/IWand.java b/src/api/java/thaumcraft/api/wands/IWand.java new file mode 100644 index 000000000..123f7e6b4 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWand.java @@ -0,0 +1,54 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public interface IWand { + + public abstract int getMaxVis(ItemStack stack); + + public abstract int getVis(ItemStack is, Aspect aspect); + + public abstract AspectList getAllVis(ItemStack is); + + public abstract AspectList getAspectsWithRoom(ItemStack wandstack); + + public abstract float getConsumptionModifier(ItemStack is, EntityPlayer player, Aspect aspect, boolean crafting); + + public abstract boolean consumeVis(ItemStack is, EntityPlayer player, Aspect aspect, int amount, boolean crafting); + + public abstract boolean consumeAllVis(ItemStack is, EntityPlayer player, AspectList aspects, boolean doit, boolean crafting); + + public abstract int addVis(ItemStack is, Aspect aspect, int amount, boolean doit); + + public abstract ItemFocusBasic getFocus(ItemStack stack); + + public abstract ItemStack getFocusStack(ItemStack stack); + + public abstract void setFocus(ItemStack stack, ItemStack focus); + + public abstract WandRod getRod(ItemStack stack); + + public abstract boolean isStaff(ItemStack stack); + + public abstract boolean isSceptre(ItemStack stack); + + public abstract void setRod(ItemStack stack, WandRod rod); + + public abstract WandCap getCap(ItemStack stack); + + public abstract void setCap(ItemStack stack, WandCap cap); + + public abstract int getFocusPotency(ItemStack itemstack); + + public abstract int getFocusTreasure(ItemStack itemstack); + + public abstract int getFocusFrugal(ItemStack itemstack); + + public abstract int getFocusEnlarge(ItemStack itemstack); + + public abstract int getFocusExtend(ItemStack itemstack); + +} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java new file mode 100644 index 000000000..ca98562ee --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java @@ -0,0 +1,16 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * + * @author azanor + * + * Implemented by a class that you wish to be called whenever a wand with this rod performs its + * update tick. + * + */ +public interface IWandRodOnUpdate { + void onUpdate(ItemStack itemstack, EntityPlayer player); +} diff --git a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java new file mode 100644 index 000000000..685087182 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java @@ -0,0 +1,17 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +public interface IWandTriggerManager { + + /** + * This class will be called by wands with the proper parameters. It is up to you to decide what to do with them. + */ + public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, + BlockPos pos, EnumFacing side, int event); + +} diff --git a/src/api/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java new file mode 100644 index 000000000..17d965970 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandable.java @@ -0,0 +1,25 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +/** + * + * @author azanor + * + * Add this to a tile entity that you wish wands to interact with in some way. + * + */ + +public interface IWandable { + + public boolean onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, BlockPos pos, EnumFacing side); + + public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count); + + public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count); + +} diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java new file mode 100644 index 000000000..b57132014 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java @@ -0,0 +1,313 @@ +package thaumcraft.api.wands; + +import java.text.DecimalFormat; +import java.util.LinkedHashMap; +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class ItemFocusBasic extends Item { + + public ItemFocusBasic (String id, ResourceLocation texture, int renderColor) + { + super(); + maxStackSize = 1; + canRepair=false; + this.setMaxDamage(0); + this.id = id; + this.texture = texture; + foci.put(id, this); + this.focusColor = renderColor; + } + + public ItemFocusBasic (String id, int renderColor) + { + this(id,new ResourceLocation("thaumcraft","items/wand/focus"), renderColor); + } + + public static LinkedHashMap foci = new LinkedHashMap(); + + /** + * Unique identifier used for this focus + */ + private String id; + + public String getFocusId() { + return id; + } + + /** + * Texture used to render the cap on the wand + */ + private ResourceLocation texture; + + public ResourceLocation getFocusTexture() { + return texture; + } + + /** + * What color the focus will be rendered ingame on the wand + */ + private int focusColor=0; + + /** + * What color will the focus orb be rendered on the held wand + */ + public int getFocusColor(ItemStack focusstack) { + return this.focusColor; + } + + @Override + public boolean isDamageable() { + return false; + } + + public boolean canBePlacedInTurret() { + return false; + } + + /** + * This is used to correct for foci that shoot projectiles effected by gravity. + * The number will be modified by range to the target + * @return a number to add to the angle the turrent aims at. + */ + public float getTurretCorrection(ItemStack focusstack) { + return 0; + } + + /** + * @return the possible range of the attack - if the entity is outside this range the turret will not attempt to attack it. Values higher than 32 will have no effect + */ + public float getTurretRange(ItemStack focusstack) { + return 32; + } + + @Override + public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) { + AspectList al = this.getVisCost(stack); + if (al!=null && al.size()>0) { + list.add(StatCollector.translateToLocal(isVisCostPerTick(stack)?"item.Focus.cost2":"item.Focus.cost1")); + for (Aspect aspect:al.getAspectsSortedByName()) { + DecimalFormat myFormatter = new DecimalFormat("#####.##"); + String amount = myFormatter.format(al.getAmount(aspect)); + list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount); + } + } + addFocusInformation(stack,player,list,par4); + } + + public void addFocusInformation(ItemStack focusstack,EntityPlayer player, List list, boolean par4) { + LinkedHashMap map = new LinkedHashMap(); + for (short id:this.getAppliedUpgrades(focusstack)) { + if (id>=0) { + int amt = 1; + if (map.containsKey(id)) { + amt = map.get(id) + 1; + } + map.put(id, amt); + } + } + for (Short id:map.keySet()) { + list.add(EnumChatFormatting.DARK_PURPLE +FocusUpgradeType.types[id].getLocalizedName()+ + (map.get(id)>1?" "+StatCollector.translateToLocal("enchantment.level." + map.get(id)):"")); + } + } + + /** + * Purely for display on the focus tooltip (see addInformation method above) + */ + public boolean isVisCostPerTick(ItemStack focusstack) { + return false; + } + + @Override + public EnumRarity getRarity(ItemStack focusstack) + { + return EnumRarity.RARE; + } + + + + + public enum WandFocusAnimation { + WAVE, CHARGE; + } + + public WandFocusAnimation getAnimation(ItemStack focusstack) { + return WandFocusAnimation.WAVE; + } + + /** + * Just insert two alphanumeric characters before this string in your focus item class + */ + public String getSortingHelper(ItemStack focusstack) { + String out=this.id; + for (short id:this.getAppliedUpgrades(focusstack)) { + out = out + id; + } + return out; + } + + + /** + * How much vis does this focus consume per activation. + */ + public AspectList getVisCost(ItemStack focusstack) { + return null; + } + + /** + * This returns how many milliseconds must pass before the focus can be activated again. + */ + public int getActivationCooldown(ItemStack focusstack) { + return 0; + } + + /** + * Used by foci like equal trade to determine their area in artchitect mode + */ + public int getMaxAreaSize(ItemStack focusstack) { + return 1; + } + + /** + * What upgrades can be applied to this focus for ranks 1 to 5 + */ + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return null; + } + + /** + * What upgrades does the focus currently have + */ + public short[] getAppliedUpgrades(ItemStack focusstack) { + short[] l = new short[] {-1,-1,-1,-1,-1}; + NBTTagList nbttaglist = getFocusUpgradeTagList(focusstack); + if (nbttaglist == null) + { + return l; + } + else + { + for (int j = 0; j < nbttaglist.tagCount(); ++j) + { + if (j>=5) break; + l[j] = nbttaglist.getCompoundTagAt(j).getShort("id"); + } + + return l; + } + } + + public boolean applyUpgrade(ItemStack focusstack, FocusUpgradeType type, int rank) { + short[] upgrades = getAppliedUpgrades(focusstack); + if (upgrades[rank-1]!=-1 || rank<1 || rank>5) { + return false; + } + upgrades[rank-1] = type.id; + setFocusUpgradeTagList(focusstack, upgrades); + return true; + } + + /** + * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" + * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic. + * + */ + public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { + return true; + } + + /** + * Does this focus have the passed upgrade type + */ + public boolean isUpgradedWith(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { + return getUpgradeLevel(focusstack,focusUpgradetype)>0; + } + + /** + * What level is the passed upgrade type on the focus. If it is not present it returns 0 + */ + public int getUpgradeLevel(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { + short[] list = getAppliedUpgrades(focusstack); + int level=0; + for (short id:list) { + if (id == focusUpgradetype.id) + { + level++; + } + } + return level; + } + + /** + * This method will be called whenever you right click, and possibly per wand usage tick depending on isVisCostPerTick + * IMPORTANT: It should be noted that vis consumption is now handled by the wand and not the focus so do not subtract any vis here. + * @param wandstack + * @param world + * @param entity - do not assume it will always be a player since it could be used by other entities as well + * @param movingobjectposition The target + * @param useCount the amount of ticks the item has been used for + * @return did the focus actually activate. Used to determine if vis should be consumed or not. + */ + public boolean onFocusActivation(ItemStack wandstack, World world, EntityLivingBase entity, MovingObjectPosition movingobjectposition, int useCount) { + return true; + } + + +// public ItemStack onFocusRightClick(ItemStack wandstack, World world,EntityPlayer player, MovingObjectPosition movingobjectposition) { +// // TODO Auto-generated method stub +// return null; +// } +// +// public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player,int count) { +// // TODO Auto-generated method stub +// } +// +// public void onPlayerStoppedUsingFocus(ItemStack wandstack, World world, EntityPlayer player, int count) { +// // TODO Auto-generated method stub +// +// } + + public boolean onFocusBlockStartBreak(ItemStack wandstack, BlockPos pos, EntityPlayer player) { + // TODO Auto-generated method stub + return false; + } + + /** + * Internal helper methods + */ + private NBTTagList getFocusUpgradeTagList(ItemStack focusstack) + { + return focusstack.getTagCompound() == null ? null : focusstack.getTagCompound().getTagList("upgrade", 10); + } + + private void setFocusUpgradeTagList(ItemStack focusstack, short[] upgrades) { + if (!focusstack.hasTagCompound()) + focusstack.setTagCompound(new NBTTagCompound()); + NBTTagCompound nbttagcompound = focusstack.getTagCompound(); + NBTTagList tlist = new NBTTagList(); + nbttagcompound.setTag("upgrade", tlist); + for (short id : upgrades) { + NBTTagCompound f = new NBTTagCompound(); + f.setShort("id", id); + tlist.appendTag(f); + } + } + + +} diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java new file mode 100644 index 000000000..3c12b9936 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandCap.java @@ -0,0 +1,142 @@ +package thaumcraft.api.wands; + +import java.util.LinkedHashMap; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.Aspect; + +/** + * This class is used to keep the material information for the various caps. + * It is also used to generate the wand recipes ingame. + * @author Azanor + * + */ +public class WandCap { + + private String tag; + + /** + * Cost to craft this wand. Combined with the rod cost. + */ + private int craftCost; + + /** + * the amount by which all aspect costs are multiplied + */ + float baseCostModifier; + + /** + * how many additional vis is gained per charge 'tick' (one charge tick occurs every 5 game ticks) + * examples: brass caps have a bonus of 1 and void caps have a bonus of 3 + */ + int chargeBonus; + + + /** + * specifies a list of primal aspects that use the special discount figure instead of the normal discount. + */ + List specialCostModifierAspects; + + /** + * the amount by which the specified aspect costs are multiplied + */ + float specialCostModifier; + + /** + * The texture that will be used for the ingame wand cap + */ + ResourceLocation texture; + + /** + * the actual item that makes up this cap and will be used to generate the wand recipes + */ + ItemStack item; + + public static LinkedHashMap caps = new LinkedHashMap(); + + public WandCap (String tag, float discount, int charge, ItemStack item, int craftCost, ResourceLocation texture) { + this.setTag(tag); + this.baseCostModifier = discount; + this.specialCostModifierAspects = null; + this.texture = texture; + this.item=item; + this.chargeBonus = charge; + this.setCraftCost(craftCost); + caps.put(tag, this); + } + + public WandCap (String tag, float discount, int charge, List specialAspects, float discountSpecial, ItemStack item, int craftCost, ResourceLocation texture) { + this.setTag(tag); + this.baseCostModifier = discount; + this.specialCostModifierAspects = specialAspects; + this.specialCostModifier = discountSpecial; + this.texture = texture; + this.item=item; + this.chargeBonus = charge; + this.setCraftCost(craftCost); + caps.put(tag, this); + } + + public float getBaseCostModifier() { + return baseCostModifier; + } + + public List getSpecialCostModifierAspects() { + return specialCostModifierAspects; + } + + public float getSpecialCostModifier() { + return specialCostModifier; + } + + public int getChargeBonus() { + return chargeBonus; + } + + public ResourceLocation getTexture() { + return texture; + } + + public void setTexture(ResourceLocation texture) { + this.texture = texture; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + + public ItemStack getItem() { + return item; + } + + public void setItem(ItemStack item) { + this.item = item; + } + + public int getCraftCost() { + return craftCost; + } + + public void setCraftCost(int craftCost) { + this.craftCost = craftCost; + } + + /** + * The research a player needs to have finished to be able to craft a wand with this cap. + */ + public String getResearch() { + return "CAP_"+getTag(); + } + + // Some examples: + // WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1); + // WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3); + +} diff --git a/src/api/java/thaumcraft/api/wands/WandHelper.java b/src/api/java/thaumcraft/api/wands/WandHelper.java new file mode 100644 index 000000000..53751dad0 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandHelper.java @@ -0,0 +1,36 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.AspectList; + +public class WandHelper { + + /** + * Use to subtract vis from a wand for most operations + * @param wand the wand itemstack + * @param player the player using the wand + * @param cost the cost of the operation. + * @param doit actually subtract the vis from the wand if true - if false just simulate the result + * @param crafting is this a crafting operation or not - if + * false then things like frugal and potency will apply to the costs + * @return was the vis successfully subtracted + */ + public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, + AspectList cost, boolean doit, boolean crafting) { + return ThaumcraftApi.internalMethods.consumeVisFromWand(wand, player, cost, doit, crafting); + } + + /** + * Subtract vis from a wand the player is carrying. The costs are handled like crafting however and things like + * frugal don't effect them + * @param player the player using the wand + * @param cost the cost of the operation. + * @return was the vis successfully subtracted + */ + public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { + return ThaumcraftApi.internalMethods.consumeVisFromInventory(player, cost); + } + +} diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java new file mode 100644 index 000000000..5aeffa235 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandRod.java @@ -0,0 +1,155 @@ +package thaumcraft.api.wands; + +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +/** + * + * @author Azanor + * + * This class is used to keep the material information for the various rods. + * It is also used to generate the wand recipes ingame. + * + */ +public class WandRod { + + + private String tag; + + /** + * Cost to craft this wand. Combined with the rod cost. + */ + private int craftCost; + + /** + * The amount of vis that can be stored + */ + int capacity; + + /** + * The texture that will be used for the ingame wand rod + */ + protected ResourceLocation texture; + + /** + * the actual item that makes up this rod and will be used to generate the wand recipes + */ + ItemStack item; + + /** + * A class that will be called whenever the wand onUpdate tick is run + */ + IWandRodOnUpdate onUpdate; + + /** + * Is this a staff rod? + */ + private boolean isStaff=false; + + /** + * Does this rod give a free level of potency? + */ + private boolean potencyBonus=false; + + public static LinkedHashMap rods = new LinkedHashMap(); + + public static WandRod getRod(String tag) { + return rods.get(tag); + } + + public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) { + this.setTag(tag); + this.capacity = capacity; + this.texture = texture; + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + } + + public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) { + this.setTag(tag); + this.capacity = capacity; + this.texture = texture; + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + this.onUpdate = onUpdate; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public int getCapacity() { + return capacity; + } + + public void setCapacity(int capacity) { + this.capacity = capacity; + } + + public ResourceLocation getTexture() { + return texture; + } + + public void setTexture(ResourceLocation texture) { + this.texture = texture; + } + + public ItemStack getItem() { + return item; + } + + public void setItem(ItemStack item) { + this.item = item; + } + + public int getCraftCost() { + return craftCost; + } + + public void setCraftCost(int craftCost) { + this.craftCost = craftCost; + } + + public IWandRodOnUpdate getOnUpdate() { + return onUpdate; + } + + public void setOnUpdate(IWandRodOnUpdate onUpdate) { + this.onUpdate = onUpdate; + } + + /** + * The research a player needs to have finished to be able to craft a wand with this rod. + */ + public String getResearch() { + return "ROD_"+getTag(); + } + + public boolean isStaff() { + return isStaff; + } + + public void setStaff(boolean isStaff) { + this.isStaff = isStaff; + } + + public boolean hasPotencyBonus() { + return potencyBonus; + } + + public void setPotencyBonus(boolean potencyBonus) { + this.potencyBonus = potencyBonus; + } + + // Some examples: + // WandRod WAND_ROD_WOOD = new WandRod("wood",250,new ItemStack(Item.stick),1,new ResourceLocation("thaumcraft","items/wand/cap_iron_mat")); + // WandRod WAND_ROD_BLAZE = new WandRod("blaze",750,new ItemStack(Item.blazeRod),7,new ResourceLocation("thaumcraft","items/wand/rod_blaze_mat"),new WandRodBlazeOnUpdate()); +} diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java new file mode 100644 index 000000000..6c5410d4e --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java @@ -0,0 +1,124 @@ +package thaumcraft.api.wands; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +/** + * This class serves a similar function to IWandable in that it allows wands to interact + * with object in the world. In this case it is most useful for adding interaction with non-mod + * blocks where you can't control what happens in their code. + * Example where it is used is in crafting the thaumonomicon from a bookshelf and the + * crucible from a cauldron + * + * @author azanor + * + */ +public class WandTriggerRegistry { + + private static HashMap> triggers = new HashMap>(); + private static final String DEFAULT = "default"; + + /** + * Registers an action to perform when a casting wand right clicks on a specific block. + * A manager class needs to be created that implements IWandTriggerManager. + * @param manager + * @param event a logical number that you can use to differentiate different events or actions + * @param blockState + * @param meta send -1 as a wildcard value for all possible meta values + * @param modid a unique identifier. It is best to register your own triggers using your mod id to avoid conflicts with mods that register triggers for the same block + */ + public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, IBlockState state, String modid) { + if (!triggers.containsKey(modid)) { + triggers.put(modid, new HashMap()); + } + HashMap temp = triggers.get(modid); + temp.put(state,Arrays.asList(manager,event)); + triggers.put(modid, temp); + } + + /** + * for legacy support + */ + public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, IBlockState state) { + registerWandBlockTrigger(manager, event, state, DEFAULT); + } + + /** + * Checks all trigger registries if one exists for the given block and meta + * @param blockState + * @param meta + * @return + */ + public static boolean hasTrigger(IBlockState state) { + for (String modid:triggers.keySet()) { + HashMap temp = triggers.get(modid); + if (temp.containsKey(state)) return true; + } + return false; + } + + /** + * modid sensitive version + */ + public static boolean hasTrigger(IBlockState state, String modid) { + if (!triggers.containsKey(modid)) return false; + HashMap temp = triggers.get(modid); + if (temp.containsKey(state)) return true; + return false; + } + + + /** + * This is called by the onItemUseFirst function in wands. + * Parameters and return value functions like you would expect for that function. + * @param world + * @param wand + * @param player + * @param x + * @param y + * @param z + * @param side + * @param blockState + * @param meta + * @return + */ + public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, + BlockPos pos, EnumFacing side, IBlockState state) { + + for (String modid:triggers.keySet()) { + HashMap temp = triggers.get(modid); + List l = temp.get(state); + if (l==null) continue; + + IWandTriggerManager manager = (IWandTriggerManager) l.get(0); + int event = (Integer) l.get(1); + boolean result = manager.performTrigger(world, wand, player, pos, side, event); + if (result) return true; + } + return false; + } + + /** + * modid sensitive version + */ + public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, + BlockPos pos, EnumFacing side, IBlockState state, String modid) { + if (!triggers.containsKey(modid)) return false; + HashMap temp = triggers.get(modid); + List l = temp.get(state); + if (l==null) return false; + + IWandTriggerManager manager = (IWandTriggerManager) l.get(0); + int event = (Integer) l.get(1); + return manager.performTrigger(world, wand, player, pos, side, event); + } + +} From 5c98dc562c2083f32d16b91fd3f7e8c28b6c22dd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 00:54:48 -0600 Subject: [PATCH 023/935] Update RF API to Progressive Automation / FluxDucts' variant --- .../cofh/api/energy/IEnergyConnection.java | 8 +- .../java/cofh/api/energy/IEnergyReceiver.java | 77 ++++++++++--------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java index fd2968537..65c64d31f 100644 --- a/src/api/java/cofh/api/energy/IEnergyConnection.java +++ b/src/api/java/cofh/api/energy/IEnergyConnection.java @@ -1,11 +1,11 @@ package cofh.api.energy; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not * accept it; otherwise just use IEnergyHandler. - * + *

* Note that {@link IEnergyHandler} is an extension of this. * * @author King Lemming @@ -16,6 +16,6 @@ public interface IEnergyConnection { /** * Returns TRUE if the TileEntity can connect on a given side. */ - boolean canConnectEnergy(ForgeDirection from); + boolean canConnectEnergy(EnumFacing facing); -} \ No newline at end of file +} diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java index a048056b8..b1a9e57cd 100644 --- a/src/api/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/api/java/cofh/api/energy/IEnergyReceiver.java @@ -1,38 +1,39 @@ -package cofh.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects. - *

- * A reference implementation is provided {@link TileEnergyHandler}. - * - * @author King Lemming - * - */ -public interface IEnergyReceiver extends IEnergyConnection { - - /** - * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. - * - * @param from - * Orientation the energy is received from. - * @param maxReceive - * Maximum amount of energy to receive. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received. - */ - int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(ForgeDirection from); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(ForgeDirection from); - -} +package cofh.api.energy; + +import net.minecraft.util.EnumFacing; + + +/** + * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects. + *

+ * A reference implementation is provided {@link TileEnergyHandler}. + * + * @author King Lemming + * + */ +public interface IEnergyReceiver extends IEnergyConnection { + + /** + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * + * @param from + * Orientation the energy is received from. + * @param maxReceive + * Maximum amount of energy to receive. + * @param simulate + * If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received. + */ + int receiveEnergy(EnumFacing facing, int maxReceive, boolean simulate); + + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(EnumFacing facing); + + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(EnumFacing facing); + +} From ed75f4a4b77648b36ae5dc3e4139135fe8151ffa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 01:01:46 -0600 Subject: [PATCH 024/935] Delete parts of TC5 api that actually weren't needed. Oops. --- .../thaumcraft/api/OreDictionaryEntries.java | 76 -- .../java/thaumcraft/api/ThaumcraftApi.java | 650 ------------------ .../thaumcraft/api/ThaumcraftApiHelper.java | 329 --------- .../api/ThaumcraftEnchantments.java | 9 - .../thaumcraft/api/ThaumcraftMaterials.java | 52 -- .../java/thaumcraft/api/aspects/Aspect.java | 206 ------ .../thaumcraft/api/aspects/AspectHelper.java | 178 ----- .../thaumcraft/api/aspects/AspectList.java | 278 -------- .../api/aspects/AspectSourceHelper.java | 58 -- .../api/aspects/IAspectContainer.java | 80 --- .../thaumcraft/api/aspects/IAspectSource.java | 16 - .../api/aspects/IEssentiaContainerItem.java | 45 -- .../api/aspects/IEssentiaTransport.java | 92 --- .../java/thaumcraft/api/aura/AuraHelper.java | 81 --- .../java/thaumcraft/api/blocks/BlocksTC.java | 132 ---- .../thaumcraft/api/blocks/ILabelable.java | 23 - .../thaumcraft/api/blocks/TileThaumcraft.java | 81 --- .../api/crafting/CrucibleRecipe.java | 90 --- .../api/crafting/IArcaneRecipe.java | 28 - .../api/crafting/IArcaneWorkbench.java | 11 - .../crafting/InfusionEnchantmentRecipe.java | 136 ---- .../api/crafting/InfusionRecipe.java | 106 --- .../api/crafting/ShapedArcaneRecipe.java | 284 -------- .../api/crafting/ShapelessArcaneRecipe.java | 182 ----- .../DamageSourceIndirectThaumcraftEntity.java | 32 - .../damagesource/DamageSourceThaumcraft.java | 47 -- .../thaumcraft/api/entities/IEldritchMob.java | 5 - .../thaumcraft/api/entities/ITaintedMob.java | 5 - .../thaumcraft/api/golems/ISealDisplayer.java | 11 - .../internal/DummyInternalMethodHandler.java | 93 --- .../thaumcraft/api/internal/EnumWarpType.java | 5 - .../api/internal/IInternalMethodHandler.java | 30 - .../api/internal/WeightedRandomLoot.java | 24 - .../api/internal/WorldCoordinates.java | 101 --- .../java/thaumcraft/api/items/IArchitect.java | 30 - .../thaumcraft/api/items/IRechargable.java | 35 - .../thaumcraft/api/items/IRepairable.java | 13 - .../api/items/IRepairableExtended.java | 17 - .../api/items/IVisDiscountGear.java | 20 - .../thaumcraft/api/items/IWarpingGear.java | 22 - .../items/ItemGenericEssentiaContainer.java | 88 --- .../java/thaumcraft/api/items/ItemRunic.java | 21 - .../java/thaumcraft/api/items/ItemsTC.java | 185 ----- src/api/java/thaumcraft/api/package-info.java | 5 - .../api/potions/PotionFluxTaint.java | 67 -- .../api/potions/PotionVisExhaust.java | 48 -- .../thaumcraft/api/research/IScanThing.java | 23 - .../api/research/ResearchCategories.java | 117 ---- .../api/research/ResearchCategoryList.java | 50 -- .../api/research/ResearchHelper.java | 42 -- .../thaumcraft/api/research/ResearchItem.java | 303 -------- .../thaumcraft/api/research/ResearchPage.java | 183 ----- .../thaumcraft/api/research/ScanAspect.java | 61 -- .../thaumcraft/api/research/ScanBlock.java | 30 - .../api/research/ScanBlockState.java | 38 - .../thaumcraft/api/research/ScanEntity.java | 57 -- .../thaumcraft/api/research/ScanItem.java | 37 - .../api/research/ScanningManager.java | 58 -- .../api/wands/FocusUpgradeType.java | 107 --- src/api/java/thaumcraft/api/wands/IWand.java | 54 -- .../api/wands/IWandRodOnUpdate.java | 16 - .../api/wands/IWandTriggerManager.java | 17 - .../java/thaumcraft/api/wands/IWandable.java | 25 - .../thaumcraft/api/wands/ItemFocusBasic.java | 313 --------- .../java/thaumcraft/api/wands/WandCap.java | 142 ---- .../java/thaumcraft/api/wands/WandHelper.java | 36 - .../java/thaumcraft/api/wands/WandRod.java | 155 ----- .../api/wands/WandTriggerRegistry.java | 124 ---- 68 files changed, 6115 deletions(-) delete mode 100644 src/api/java/thaumcraft/api/OreDictionaryEntries.java delete mode 100644 src/api/java/thaumcraft/api/ThaumcraftApi.java delete mode 100644 src/api/java/thaumcraft/api/ThaumcraftApiHelper.java delete mode 100644 src/api/java/thaumcraft/api/ThaumcraftEnchantments.java delete mode 100644 src/api/java/thaumcraft/api/ThaumcraftMaterials.java delete mode 100644 src/api/java/thaumcraft/api/aspects/Aspect.java delete mode 100644 src/api/java/thaumcraft/api/aspects/AspectHelper.java delete mode 100644 src/api/java/thaumcraft/api/aspects/AspectList.java delete mode 100644 src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java delete mode 100644 src/api/java/thaumcraft/api/aspects/IAspectContainer.java delete mode 100644 src/api/java/thaumcraft/api/aspects/IAspectSource.java delete mode 100644 src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java delete mode 100644 src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java delete mode 100644 src/api/java/thaumcraft/api/aura/AuraHelper.java delete mode 100644 src/api/java/thaumcraft/api/blocks/BlocksTC.java delete mode 100644 src/api/java/thaumcraft/api/blocks/ILabelable.java delete mode 100644 src/api/java/thaumcraft/api/blocks/TileThaumcraft.java delete mode 100644 src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java delete mode 100644 src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java delete mode 100644 src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java delete mode 100644 src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java delete mode 100644 src/api/java/thaumcraft/api/crafting/InfusionRecipe.java delete mode 100644 src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java delete mode 100644 src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java delete mode 100644 src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java delete mode 100644 src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java delete mode 100644 src/api/java/thaumcraft/api/entities/IEldritchMob.java delete mode 100644 src/api/java/thaumcraft/api/entities/ITaintedMob.java delete mode 100644 src/api/java/thaumcraft/api/golems/ISealDisplayer.java delete mode 100644 src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java delete mode 100644 src/api/java/thaumcraft/api/internal/EnumWarpType.java delete mode 100644 src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java delete mode 100644 src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java delete mode 100644 src/api/java/thaumcraft/api/internal/WorldCoordinates.java delete mode 100644 src/api/java/thaumcraft/api/items/IArchitect.java delete mode 100644 src/api/java/thaumcraft/api/items/IRechargable.java delete mode 100644 src/api/java/thaumcraft/api/items/IRepairable.java delete mode 100644 src/api/java/thaumcraft/api/items/IRepairableExtended.java delete mode 100644 src/api/java/thaumcraft/api/items/IVisDiscountGear.java delete mode 100644 src/api/java/thaumcraft/api/items/IWarpingGear.java delete mode 100644 src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java delete mode 100644 src/api/java/thaumcraft/api/items/ItemRunic.java delete mode 100644 src/api/java/thaumcraft/api/items/ItemsTC.java delete mode 100644 src/api/java/thaumcraft/api/package-info.java delete mode 100644 src/api/java/thaumcraft/api/potions/PotionFluxTaint.java delete mode 100644 src/api/java/thaumcraft/api/potions/PotionVisExhaust.java delete mode 100644 src/api/java/thaumcraft/api/research/IScanThing.java delete mode 100644 src/api/java/thaumcraft/api/research/ResearchCategories.java delete mode 100644 src/api/java/thaumcraft/api/research/ResearchCategoryList.java delete mode 100644 src/api/java/thaumcraft/api/research/ResearchHelper.java delete mode 100644 src/api/java/thaumcraft/api/research/ResearchItem.java delete mode 100644 src/api/java/thaumcraft/api/research/ResearchPage.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanAspect.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanBlock.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanBlockState.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanEntity.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanItem.java delete mode 100644 src/api/java/thaumcraft/api/research/ScanningManager.java delete mode 100644 src/api/java/thaumcraft/api/wands/FocusUpgradeType.java delete mode 100644 src/api/java/thaumcraft/api/wands/IWand.java delete mode 100644 src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java delete mode 100644 src/api/java/thaumcraft/api/wands/IWandTriggerManager.java delete mode 100644 src/api/java/thaumcraft/api/wands/IWandable.java delete mode 100644 src/api/java/thaumcraft/api/wands/ItemFocusBasic.java delete mode 100644 src/api/java/thaumcraft/api/wands/WandCap.java delete mode 100644 src/api/java/thaumcraft/api/wands/WandHelper.java delete mode 100644 src/api/java/thaumcraft/api/wands/WandRod.java delete mode 100644 src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java diff --git a/src/api/java/thaumcraft/api/OreDictionaryEntries.java b/src/api/java/thaumcraft/api/OreDictionaryEntries.java deleted file mode 100644 index 2467cf1d9..000000000 --- a/src/api/java/thaumcraft/api/OreDictionaryEntries.java +++ /dev/null @@ -1,76 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.blocks.BlocksTC; -import thaumcraft.api.items.ItemsTC; - -public class OreDictionaryEntries { - - /** - * I included this in the API to make it simpler to see what items and blocks are ore dictionaried - */ - public static void initializeOreDictionary() { - OreDictionary.registerOre("oreAmber", new ItemStack(BlocksTC.oreAmber)); - OreDictionary.registerOre("oreCinnabar", new ItemStack(BlocksTC.oreCinnabar)); - - OreDictionary.registerOre("logWood", new ItemStack(BlocksTC.log,1,0)); - OreDictionary.registerOre("logWood", new ItemStack(BlocksTC.log,1,3)); - OreDictionary.registerOre("plankWood", new ItemStack(BlocksTC.plank,1,0)); - OreDictionary.registerOre("plankWood", new ItemStack(BlocksTC.plank,1,1)); - OreDictionary.registerOre("slabWood", new ItemStack(BlocksTC.slabWood,1,0)); - OreDictionary.registerOre("slabWood", new ItemStack(BlocksTC.slabWood,1,1)); - OreDictionary.registerOre("treeSapling", new ItemStack(BlocksTC.sapling,1,0)); - OreDictionary.registerOre("treeSapling", new ItemStack(BlocksTC.sapling,1,1)); - - OreDictionary.registerOre("shardAir", new ItemStack(ItemsTC.shard,1,0)); - OreDictionary.registerOre("shardFire", new ItemStack(ItemsTC.shard,1,1)); - OreDictionary.registerOre("shardWater", new ItemStack(ItemsTC.shard,1,2)); - OreDictionary.registerOre("shardEarth", new ItemStack(ItemsTC.shard,1,3)); - OreDictionary.registerOre("shardOrder", new ItemStack(ItemsTC.shard,1,4)); - OreDictionary.registerOre("shardEntropy", new ItemStack(ItemsTC.shard,1,5)); - OreDictionary.registerOre("shardTainted", new ItemStack(ItemsTC.shard,1,6)); - OreDictionary.registerOre("shardBalanced", new ItemStack(ItemsTC.shard,1,7)); - OreDictionary.registerOre("nitor", new ItemStack(BlocksTC.nitor,1,OreDictionary.WILDCARD_VALUE)); - - OreDictionary.registerOre("gemAmber", new ItemStack(ItemsTC.amber)); - OreDictionary.registerOre("quicksilver", new ItemStack(ItemsTC.quicksilver)); - OreDictionary.registerOre("nuggetGold", new ItemStack(ItemsTC.coin)); - - OreDictionary.registerOre("nuggetIron", new ItemStack(ItemsTC.nuggets,1,0)); - OreDictionary.registerOre("nuggetCopper", new ItemStack(ItemsTC.nuggets,1,1)); - OreDictionary.registerOre("nuggetTin", new ItemStack(ItemsTC.nuggets,1,2)); - OreDictionary.registerOre("nuggetSilver", new ItemStack(ItemsTC.nuggets,1,3)); - OreDictionary.registerOre("nuggetLead", new ItemStack(ItemsTC.nuggets,1,4)); - OreDictionary.registerOre("nuggetQuicksilver", new ItemStack(ItemsTC.nuggets,1,5)); - OreDictionary.registerOre("nuggetThaumium", new ItemStack(ItemsTC.nuggets,1,6)); - OreDictionary.registerOre("nuggetVoid", new ItemStack(ItemsTC.nuggets,1,7)); - OreDictionary.registerOre("nuggetBrass", new ItemStack(ItemsTC.nuggets,1,8)); - - OreDictionary.registerOre("ingotThaumium", new ItemStack(ItemsTC.ingots,1,0)); - OreDictionary.registerOre("ingotVoid", new ItemStack(ItemsTC.ingots,1,1)); - OreDictionary.registerOre("ingotBrass", new ItemStack(ItemsTC.ingots,1,2)); - - OreDictionary.registerOre("blockThaumium", new ItemStack(BlocksTC.metal,1,0)); - OreDictionary.registerOre("blockVoid", new ItemStack(BlocksTC.metal,1,1)); - OreDictionary.registerOre("blockBrass", new ItemStack(BlocksTC.metal,1,4)); - - OreDictionary.registerOre("plateIron", new ItemStack(ItemsTC.plate,1,1)); - OreDictionary.registerOre("gearBrass", new ItemStack(ItemsTC.gear,1,0)); - OreDictionary.registerOre("plateBrass", new ItemStack(ItemsTC.plate,1,0)); - OreDictionary.registerOre("gearThaumium", new ItemStack(ItemsTC.gear,1,1)); - OreDictionary.registerOre("plateThaumium", new ItemStack(ItemsTC.plate,1,2)); - OreDictionary.registerOre("gearVoid", new ItemStack(ItemsTC.gear,1,2)); - OreDictionary.registerOre("plateVoid", new ItemStack(ItemsTC.plate,1,3)); - - OreDictionary.registerOre("clusterIron", new ItemStack(ItemsTC.clusters,1,0)); - OreDictionary.registerOre("clusterGold", new ItemStack(ItemsTC.clusters,1,1)); - OreDictionary.registerOre("clusterCopper", new ItemStack(ItemsTC.clusters,1,2)); - OreDictionary.registerOre("clusterTin", new ItemStack(ItemsTC.clusters,1,3)); - OreDictionary.registerOre("clusterSilver", new ItemStack(ItemsTC.clusters,1,4)); - OreDictionary.registerOre("clusterLead", new ItemStack(ItemsTC.clusters,1,5)); - OreDictionary.registerOre("clusterCinnabar", new ItemStack(ItemsTC.clusters,1,6)); - - } - -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java deleted file mode 100644 index d6e4dc96e..000000000 --- a/src/api/java/thaumcraft/api/ThaumcraftApi.java +++ /dev/null @@ -1,650 +0,0 @@ -package thaumcraft.api; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectHelper; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.InfusionEnchantmentRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.crafting.ShapedArcaneRecipe; -import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.api.internal.DummyInternalMethodHandler; -import thaumcraft.api.internal.IInternalMethodHandler; -import thaumcraft.api.internal.WeightedRandomLoot; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchCategoryList; -import thaumcraft.api.research.ResearchHelper; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; - - -/** - * @author Azanor - * - * - * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen. - * - */ -public class ThaumcraftApi { - //Internal (Do not alter this unless you like pretty explosions) - //Calling methods from this will only work properly once Thaumcraft is past the FMLPreInitializationEvent phase. - public static IInternalMethodHandler internalMethods = new DummyInternalMethodHandler(); - - //RESEARCH///////////////////////////////////////// - public static ArrayList scanEntities = new ArrayList(); - public static class EntityTagsNBT { - public EntityTagsNBT(String name, Object value) { - this.name = name; - this.value = value; - } - public String name; - public Object value; - } - public static class EntityTags { - public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) { - this.entityName = entityName; - this.nbts = nbts; - this.aspects = aspects; - } - public String entityName; - public EntityTagsNBT[] nbts; - public AspectList aspects; - } - - - /** - * This is used to add aspects to entities which you can then scan using a thaumometer. - * Also used to calculate vis drops from mobs. - * @param entityName - * @param aspects - * @param nbt you can specify certain nbt keys and their values - * to differentiate between mobs.
For example the normal and wither skeleton: - *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5)); - *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1)); - */ - public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) { - scanEntities.add(new EntityTags(entityName,aspects,nbt)); - } - - //RECIPES///////////////////////////////////////// - private static ArrayList craftingRecipes = new ArrayList(); - private static HashMap smeltingBonus = new HashMap(); - - /** - * This method is used to determine what bonus items are generated when the infernal furnace smelts items - * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold) - * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). - * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. - */ - public static void addSmeltingBonus(ItemStack in, ItemStack out) { - smeltingBonus.put( - Arrays.asList(in.getItem(),in.getItemDamage()), - new ItemStack(out.getItem(),0,out.getItemDamage())); - } - - /** - * This method is used to determine what bonus items are generated when the infernal furnace smelts items - * @param in The ore dictionary input of the smelting operation. e.g. "oreGold" - * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). - * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. - */ - public static void addSmeltingBonus(String in, ItemStack out) { - smeltingBonus.put( in, new ItemStack(out.getItem(),0,out.getItemDamage())); - } - - /** - * Returns the bonus item produced from a smelting operation in the infernal furnace - * @param in The input of the smelting operation. e.g. new ItemStack(oreGold) - * @return the The bonus item that can be produced - */ - public static ItemStack getSmeltingBonus(ItemStack in) { - ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage())); - if (out==null) { - out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE)); - } - if (out==null) { - for (int id:OreDictionary.getOreIDs(in)) { - String od = OreDictionary.getOreName( id); - out = smeltingBonus.get(od); - if (out!=null) break; - } - } - return out; - } - - public static List getCraftingRecipes() { - return craftingRecipes; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect. - * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. - */ - public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - CraftingManager.getInstance().addRecipe(r); - return r; - } - - /** - * @param research the research keys required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect. - * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. - */ - public static ShapedArcaneRecipe addArcaneCraftingRecipe(String[] research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - CraftingManager.getInstance().addRecipe(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect - * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. - */ - public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - CraftingManager.getInstance().addRecipe(r); - return r; - } - - /** - * @param research the research keys required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect - * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. - */ - public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String[] research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - CraftingManager.getInstance().addRecipe(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item - * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an - * instability effect each second while the crafting is in progress - * @param aspects the essentia cost per aspect. - * @param aspects input the central item to be infused. If string is passed it will look up oredictionary entries - * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. - * If string is passed it will look up oredictionary entries. - */ - public static InfusionRecipe addInfusionCraftingRecipe(String research, - Object result, int instability, AspectList aspects, Object input, Object[] recipe) - { - if (!(result instanceof ItemStack || result instanceof Object[])) return null; - InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param research the research keys required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item - * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an - * instability effect each second while the crafting is in progress - * @param aspects the essentia cost per aspect. - * @param aspects input the central item to be infused. If string is passed it will look up oredictionary entries - * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. - * If string is passed it will look up oredictionary entries. - */ - public static InfusionRecipe addInfusionCraftingRecipe(String[] research, - Object result, int instability, AspectList aspects, Object input, Object[] recipe) - { - if (!(result instanceof ItemStack || result instanceof Object[])) return null; - InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param enchantment the enchantment that will be applied to the item - * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an - * instability effect each second while the crafting is in progress - * @param aspects the essentia cost per aspect. - * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. - * If string is passed it will look up oredictionary entries. - */ - @Deprecated - public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, Object[] recipe) - { - InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param stack the recipe result - * @return the recipe - */ - public static InfusionRecipe getInfusionRecipe(ItemStack res) { - for (Object r:getCraftingRecipes()) { - if (r instanceof InfusionRecipe) { - if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) { - if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res)) - return (InfusionRecipe)r; - } - } - } - return null; - } - - /** - * @param key the research key required for this recipe to work. - * @param result the output result - * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item - * @param cost the vis cost - * @param tags the aspects required to craft this - */ - public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) { - CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags); - getCraftingRecipes().add(rc); - return rc; - } - - - - /** - * @param stack the recipe result - * @return the recipe - */ - public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) { - for (Object r:getCraftingRecipes()) { - if (r instanceof CrucibleRecipe) { - if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack)) - return (CrucibleRecipe)r; - } - } - return null; - } - - /** - * @param hash the unique recipe code - * @return the recipe - */ - public static CrucibleRecipe getCrucibleRecipeFromHash(int hash) { - for (Object r:getCraftingRecipes()) { - if (r instanceof CrucibleRecipe) { - if (((CrucibleRecipe)r).hash==hash) - return (CrucibleRecipe)r; - } - } - return null; - } - - /** - * Used by the thaumonomicon drilldown feature. - * @param stack the item - * @return the thaumcraft recipe key that produces that item. - */ - private static HashMap keyCache = new HashMap(); - - public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) { - int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()}; - if (keyCache.containsKey(key)) { - if (keyCache.get(key)==null) return null; - if (ResearchHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0])) - return keyCache.get(key); - else - return null; - } - for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) { - for (ResearchItem ri:rcl.research.values()) { - if (ri.getPages()==null) continue; - for (int a=0;a objectTags = new ConcurrentHashMap(); - public static ConcurrentHashMap groupedObjectTags = new ConcurrentHashMap(); - - /** - * Checks to see if the passed item/block already has aspects associated with it. - * @param id - * @param meta - * @return - */ - public static boolean exists(Item item, int meta) { - AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta)); - if (tmp==null) { - tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE)); - if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) { - int index=0; - do { - tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index)); - index++; - } while (index<16 && tmp==null); - } - if (tmp==null) return false; - } - - return true; - } - - /** - * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

- * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); - * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(ItemStack item, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - try { - objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects); - } catch (Exception e) {} - } - - - /** - * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

- * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); - * @param item - * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations) - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - try { - objectTags.put(Arrays.asList(item.getItem(),meta[0]), aspects); - for (int m:meta) { - groupedObjectTags.put(Arrays.asList(item.getItem(),m), meta); - } - - } catch (Exception e) {} - } - - /** - * Used to assign apsects to the given ore dictionary item. - * @param oreDict the ore dictionary name - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(String oreDict, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - List ores = OreDictionary.getOres(oreDict); - if (ores!=null && ores.size()>0) { - for (ItemStack ore:ores) { - try { - objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects); - } catch (Exception e) {} - } - } - } - - /** - * Used to assign aspects to the given item/block. - * Attempts to automatically generate aspect tags by checking registered recipes. - * Here is an example of the declaration for pistons:

- * ThaumcraftApi.registerComplexObjectTag(new ItemStack(Blocks.piston), (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.MOTION, 4)); - * IMPORTANT - this should only be used if you are not happy with the default aspects the object would be assigned. - * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) { - if (!exists(item.getItem(),item.getItemDamage())) { - AspectList tmp = AspectHelper.generateTags(item.getItem(), item.getItemDamage()); - if (tmp != null && tmp.size()>0) { - for(Aspect tag:tmp.getAspects()) { - aspects.add(tag, tmp.getAmount(tag)); - } - } - registerObjectTag(item,aspects); - } else { - AspectList tmp = AspectHelper.getObjectAspects(item); - for(Aspect tag:aspects.getAspects()) { - tmp.merge(tag, tmp.getAmount(tag)); - } - registerObjectTag(item,tmp); - } - } - - // WARP - private static HashMap warpMap = new HashMap(); - - /** - * This method is used to determine how much warp is gained if the item is crafted. The warp - * added is "sticky" warp - * @param craftresult The item crafted - * @param amount how much warp is gained - */ - public static void addWarpToItem(ItemStack craftresult, int amount) { - warpMap.put(Arrays.asList(craftresult.getItem(),craftresult.getItemDamage()),amount); - } - - /** - * This method is used to determine how much permanent warp is gained if the research is completed - * @param in The item crafted - * @param amount how much warp is gained - */ - public static void addWarpToResearch(String research, int amount) { - warpMap.put(research, amount); - } - - /** - * Returns how much warp is gained from the item or research passed in - * @param in itemstack or string - * @return how much warp it will give - */ - public static int getWarp(Object in) { - if (in==null) return 0; - if (in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()))) { - return warpMap.get(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage())); - } else - if (in instanceof String && warpMap.containsKey((String)in)) { - return warpMap.get((String)in); - } - return 0; - } - - // LOOT BAGS - - /** - * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 - * and a diamond is 50. - * The weights are the same for all loot bag types - the only difference is how many items the bag - * contains. - * @param item - * @param weight - * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified - * 0 = common, 1 = uncommon, 2 = rare - */ - public static void addLootBagItem(ItemStack item, int weight, int... bagTypes) { - if (bagTypes==null || bagTypes.length==0) - WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); - else { - for (int rarity:bagTypes) { - switch(rarity) { - case 0: WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); break; - case 1: WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(item,weight)); break; - case 2: WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(item,weight)); break; - } - } - } - } - - // PORTABLE HOLE BLACKLIST - /** - * You can blacklist blocks that may not be portable holed through using the "portableHoleBlacklist" - * string message using FMLInterModComms in your @Mod.Init method. - * - * Simply add the mod and block name you don't want the portable hole to go through with a - * 'modid:blockname' designation. For example: "thaumcraft:log" or "minecraft:plank" - * - * You can also specify blockstates by adding ';' delimited 'name=value' pairs. - * For example: "thaumcraft:log;variant=greatwood;variant=silverwood" - * - * You can also give an ore dictionary entry instead: For example: "logWood" - */ - - - - // CROPS - /** - * To define mod crops you need to use FMLInterModComms in your @Mod.Init method. - * There are two 'types' of crops you can add. Standard crops and clickable crops. - * - * Standard crops work like normal vanilla crops - they grow until a certain metadata - * value is reached and you harvest them by destroying the block and collecting the blocks. - * You need to create and ItemStack that tells the golem what block id and metadata represents - * the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get - * checked. - * Example for vanilla wheat: - * FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(Block.crops,1,7)); - * - * Clickable crops are crops that you right click to gather their bounty instead of destroying them. - * As for standard crops, you need to create and ItemStack that tells the golem what block id - * and metadata represents the crop when fully grown. The golem will trigger the blocks onBlockActivated method. - * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. - * Example (this will technically do nothing since clicking wheat does nothing, but you get the idea): - * FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Block.crops,1,7)); - * - * Stacked crops (like reeds) are crops that you wish the bottom block should remain after harvesting. - * As for standard crops, you need to create and ItemStack that tells the golem what block id - * and metadata represents the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the actualy md won't get - * checked. If it has the order upgrade it will only harvest if the crop is more than one block high. - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7)); - */ - - // NATIVE CLUSTERS - /** - * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms - * in your @Mod.Init method using the "nativeCluster" string message. - * The format should be: - * "[ore item/block id],[ore item/block metadata],[cluster item/block id],[cluster item/block metadata],[chance modifier float]" - * - * NOTE: The chance modifier is a multiplier applied to the default chance for that cluster to be produced (default 27.5% for a pickaxe of the core) - * - * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: - * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0"); - */ - - // LAMP OF GROWTH BLACKLIST - /** - * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms - * in your @Mod.Init method using the "lampBlacklist" itemstack message. - * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. - * Example for vanilla wheat: - * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE)); - */ - - // DIMENSION BLACKLIST - /** - * You can blacklist a dimension to not spawn certain thaumcraft features - * in your @Mod.Init method using the "dimensionBlacklist" string message in the format "[dimension]:[level]" - * The level values are as follows: - * [0] stop all tc spawning and generation - * [1] allow ore and node generation (and node special features) - * [2] allow mob spawning - * [3] allow ore and node gen + mob spawning (and node special features) - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1"); - */ - - // BIOME BLACKLIST - /** - * You can blacklist a biome to not spawn certain thaumcraft features - * in your @Mod.Init method using the "biomeBlacklist" string message in the format "[biome id]:[level]" - * The level values are as follows: - * [0] stop all tc spawning and generation - * [1] allow ore and node generation (and node special features) - * [2] allow mob spawning - * [3] allow ore and node gen + mob spawning (and node special features) - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2"); - */ - - // CHAMPION MOB WHITELIST - /** - * You can whitelist an entity class so it can rarely spawn champion versions in your @Mod.Init method using - * the "championWhiteList" string message in the format "[Entity]:[level]" - * The entity must extend EntityMob. - * [Entity] is in a similar format to what is used for mob spawners and such (see EntityList.class for vanilla examples). - * The [level] value indicate how rare the champion version will be - the higher the number the more common. - * The number roughly equals the [n] in 100 chance of a mob being a champion version. - * You can give 0 or negative numbers to allow champions to spawn with a very low chance only in particularly dangerous places. - * However anything less than about -2 will probably result in no spawns at all. - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "championWhiteList", "Thaumcraft.Wisp:1"); - */ - - - -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java deleted file mode 100644 index 222fa1ac9..000000000 --- a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java +++ /dev/null @@ -1,329 +0,0 @@ -package thaumcraft.api; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.aspects.IEssentiaTransport; - -public class ThaumcraftApiHelper { - - public static boolean areItemsEqual(ItemStack s1,ItemStack s2) - { - if (s1.isItemStackDamageable() && s2.isItemStackDamageable()) - { - return s1.getItem() == s2.getItem(); - } else - return s1.getItem() == s2.getItem() && s1.getItemDamage() == s2.getItemDamage(); - } - - /** - * Notifies thaumcraft that something with regards to runic shielding has changed and that it should - * rescan worn items to determine what the max shielding value is. - * It automatically rescans once every 5 seconds, but this makes it happen sooner. - * @param entity - */ - public static void markRunicDirty(Entity entity) { - ThaumcraftApi.internalMethods.markRunicDirty(entity); - } - - public static boolean containsMatch(boolean strict, ItemStack[] inputs, List targets) - { - for (ItemStack input : inputs) - { - for (ItemStack target : targets) - { - if (OreDictionary.itemMatches(target, input, strict)) - { - return true; - } - } - } - return false; - } - - public static boolean areItemStacksEqualForCrafting(ItemStack stack0, Object in) - { - if (stack0==null && in!=null) return false; - if (stack0!=null && in==null) return false; - if (stack0==null && in==null) return true; - - if (in instanceof String) { - List l = OreDictionary.getOres((String) in); - return containsMatch(false, new ItemStack[]{stack0}, l); - } - - if (in instanceof ItemStack) { - //nbt - boolean t1=areItemStackTagsEqualForCrafting(stack0, (ItemStack) in); - if (!t1) return false; - return OreDictionary.itemMatches((ItemStack) in, stack0, false); - } - - return false; - } - - public static boolean areItemStackTagsEqualForCrafting(ItemStack slotItem,ItemStack recipeItem) - { - if (recipeItem == null || slotItem == null) return false; - if (recipeItem.getTagCompound()!=null && slotItem.getTagCompound()==null ) return false; - if (recipeItem.getTagCompound()==null ) return true; - - Iterator iterator = recipeItem.getTagCompound().getKeySet().iterator(); - while (iterator.hasNext()) - { - String s = (String)iterator.next(); - if (slotItem.getTagCompound().hasKey(s)) { - if (!slotItem.getTagCompound().getTag(s).toString().equals( - recipeItem.getTagCompound().getTag(s).toString())) { - return false; - } - } else { - return false; - } - - } - return true; - } - - - public static TileEntity getConnectableTile(World world, BlockPos pos, EnumFacing face) { - TileEntity te = world.getTileEntity(pos.offset(face)); - if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) - return te; - else - return null; - } - - public static TileEntity getConnectableTile(IBlockAccess world, BlockPos pos, EnumFacing face) { - TileEntity te = world.getTileEntity(pos.offset(face)); - if (te instanceof IEssentiaTransport && ((IEssentiaTransport)te).isConnectable(face.getOpposite())) - return te; - else - return null; - } - -// private static HashMap allAspects= new HashMap(); -// private static HashMap allCompoundAspects= new HashMap(); -// -// public static AspectList getAllAspects(int amount) { -// if (allAspects.get(amount)==null) { -// AspectList al = new AspectList(); -// for (Aspect aspect:Aspect.aspects.values()) { -// al.add(aspect, amount); -// } -// allAspects.put(amount, al); -// } -// return allAspects.get(amount); -// } -// -// public static AspectList getAllCompoundAspects(int amount) { -// if (allCompoundAspects.get(amount)==null) { -// AspectList al = new AspectList(); -// for (Aspect aspect:Aspect.getCompoundAspects()) { -// al.add(aspect, amount); -// } -// allCompoundAspects.put(amount, al); -// } -// return allCompoundAspects.get(amount); -// } - - - public static MovingObjectPosition rayTraceIgnoringSource(World world, Vec3 v1, Vec3 v2, - boolean bool1, boolean bool2, boolean bool3) - { - if (!Double.isNaN(v1.xCoord) && !Double.isNaN(v1.yCoord) && !Double.isNaN(v1.zCoord)) - { - if (!Double.isNaN(v2.xCoord) && !Double.isNaN(v2.yCoord) && !Double.isNaN(v2.zCoord)) - { - int i = MathHelper.floor_double(v2.xCoord); - int j = MathHelper.floor_double(v2.yCoord); - int k = MathHelper.floor_double(v2.zCoord); - int l = MathHelper.floor_double(v1.xCoord); - int i1 = MathHelper.floor_double(v1.yCoord); - int j1 = MathHelper.floor_double(v1.zCoord); - IBlockState block = world.getBlockState(new BlockPos(l, i1, j1)); - - MovingObjectPosition movingobjectposition2 = null; - int k1 = 200; - - while (k1-- >= 0) - { - if (Double.isNaN(v1.xCoord) || Double.isNaN(v1.yCoord) || Double.isNaN(v1.zCoord)) - { - return null; - } - - if (l == i && i1 == j && j1 == k) - { - continue; - } - - boolean flag6 = true; - boolean flag3 = true; - boolean flag4 = true; - double d0 = 999.0D; - double d1 = 999.0D; - double d2 = 999.0D; - - if (i > l) - { - d0 = (double)l + 1.0D; - } - else if (i < l) - { - d0 = (double)l + 0.0D; - } - else - { - flag6 = false; - } - - if (j > i1) - { - d1 = (double)i1 + 1.0D; - } - else if (j < i1) - { - d1 = (double)i1 + 0.0D; - } - else - { - flag3 = false; - } - - if (k > j1) - { - d2 = (double)j1 + 1.0D; - } - else if (k < j1) - { - d2 = (double)j1 + 0.0D; - } - else - { - flag4 = false; - } - - double d3 = 999.0D; - double d4 = 999.0D; - double d5 = 999.0D; - double d6 = v2.xCoord - v1.xCoord; - double d7 = v2.yCoord - v1.yCoord; - double d8 = v2.zCoord - v1.zCoord; - - if (flag6) - { - d3 = (d0 - v1.xCoord) / d6; - } - - if (flag3) - { - d4 = (d1 - v1.yCoord) / d7; - } - - if (flag4) - { - d5 = (d2 - v1.zCoord) / d8; - } - - if (d3 == -0.0D) - { - d3 = -1.0E-4D; - } - - if (d4 == -0.0D) - { - d4 = -1.0E-4D; - } - - if (d5 == -0.0D) - { - d5 = -1.0E-4D; - } - - EnumFacing enumfacing; - - if (d3 < d4 && d3 < d5) - { - enumfacing = i > l ? EnumFacing.WEST : EnumFacing.EAST; - v1 = new Vec3(d0, v1.yCoord + d7 * d3, v1.zCoord + d8 * d3); - } - else if (d4 < d5) - { - enumfacing = j > i1 ? EnumFacing.DOWN : EnumFacing.UP; - v1 = new Vec3(v1.xCoord + d6 * d4, d1, v1.zCoord + d8 * d4); - } - else - { - enumfacing = k > j1 ? EnumFacing.NORTH : EnumFacing.SOUTH; - v1 = new Vec3(v1.xCoord + d6 * d5, v1.yCoord + d7 * d5, d2); - } - - l = MathHelper.floor_double(v1.xCoord) - (enumfacing == EnumFacing.EAST ? 1 : 0); - i1 = MathHelper.floor_double(v1.yCoord) - (enumfacing == EnumFacing.UP ? 1 : 0); - j1 = MathHelper.floor_double(v1.zCoord) - (enumfacing == EnumFacing.SOUTH ? 1 : 0); - - IBlockState block1 = world.getBlockState(new BlockPos(l, i1, j1)); - - if (!bool2 || block1.getBlock().getCollisionBoundingBox(world, new BlockPos(l, i1, j1), block1) != null) - { - if (block1.getBlock().canCollideCheck(block1, bool1)) - { - MovingObjectPosition movingobjectposition1 = block1.getBlock().collisionRayTrace(world, new BlockPos(l, i1, j1), v1, v2); - - if (movingobjectposition1 != null) - { - return movingobjectposition1; - } - } - else - { - movingobjectposition2 = new MovingObjectPosition(MovingObjectPosition.MovingObjectType.MISS, v1, enumfacing, new BlockPos(l, i1, j1)); - } - } - } - - return bool3 ? movingobjectposition2 : null; - } - else - { - return null; - } - } - else - { - return null; - } - } - - public static Object getNBTDataFromId(NBTTagCompound nbt, byte id, String key) { - switch (id) { - case 1: return nbt.getByte(key); - case 2: return nbt.getShort(key); - case 3: return nbt.getInteger(key); - case 4: return nbt.getLong(key); - case 5: return nbt.getFloat(key); - case 6: return nbt.getDouble(key); - case 7: return nbt.getByteArray(key); - case 8: return nbt.getString(key); - case 9: return nbt.getTagList(key, (byte) 10); - case 10: return nbt.getTag(key); - case 11: return nbt.getIntArray(key); - default: return null; - } - } -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java b/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java deleted file mode 100644 index f0f3dc4a6..000000000 --- a/src/api/java/thaumcraft/api/ThaumcraftEnchantments.java +++ /dev/null @@ -1,9 +0,0 @@ -package thaumcraft.api; - -public class ThaumcraftEnchantments { - - //Enchantment references - public static int HASTE; - public static int REPAIR; - -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftMaterials.java b/src/api/java/thaumcraft/api/ThaumcraftMaterials.java deleted file mode 100644 index bb2d8c667..000000000 --- a/src/api/java/thaumcraft/api/ThaumcraftMaterials.java +++ /dev/null @@ -1,52 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraftforge.common.util.EnumHelper; - -public class ThaumcraftMaterials { - - public static ToolMaterial TOOLMAT_THAUMIUM = EnumHelper.addToolMaterial("THAUMIUM", 3, 500, 7F, 2.5f, 22); - public static ToolMaterial TOOLMAT_VOID = EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10); - public static ToolMaterial TOOLMAT_ELEMENTAL = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 9F, 3, 18); - public static ArmorMaterial ARMORMAT_THAUMIUM = EnumHelper.addArmorMaterial("THAUMIUM","THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25); - public static ArmorMaterial ARMORMAT_SPECIAL = EnumHelper.addArmorMaterial("SPECIAL","SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25); - public static ArmorMaterial ARMORMAT_VOID = EnumHelper.addArmorMaterial("VOID","VOID", 10, new int[] { 3, 7, 6, 3 }, 10); - - public static final Material MATERIAL_TAINT = new MaterialTaint(); - - public static class MaterialTaint extends Material - { - public MaterialTaint() - { - super(MapColor.purpleColor); - setNoPushMobility(); - } - - @Override - public boolean blocksMovement() - { - return true; - } - - @Override - protected Material setNoPushMobility() - { - this.mobilityFlag = 1; - return this; - } - - private int mobilityFlag; - - @Override - public int getMaterialMobility() - { - return this.mobilityFlag; - } - - } - - -} diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java deleted file mode 100644 index 9e24e0caa..000000000 --- a/src/api/java/thaumcraft/api/aspects/Aspect.java +++ /dev/null @@ -1,206 +0,0 @@ -package thaumcraft.api.aspects; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.apache.commons.lang3.text.WordUtils; - -import thaumcraft.api.research.ScanAspect; -import thaumcraft.api.research.ScanningManager; - -public class Aspect { - - String tag; - Aspect[] components; - int color; - private String chatcolor; - ResourceLocation image; - int blend; - - /** - * For easy reference of what compounds are made up of - */ - public static HashMap mixList = new HashMap(); - - /** - * Use this constructor to register your own aspects. - * @param tag the key that will be used to reference this aspect, as well as its latin display name - * @param color color to display the tag in - * @param components the aspects this one is formed from - * @param image ResourceLocation pointing to a 32x32 icon of the aspect - * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1 - */ - public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) { - if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!"); - this.tag = tag; - this.components = components; - this.color = color; - this.image = image; - this.blend = blend; - aspects.put(tag, this); - ScanningManager.addScannableThing(new ScanAspect("!"+tag,this)); - if (components!=null) { - int h = (components[0].getTag()+components[1].getTag()).hashCode(); - mixList.put(h, this); - } - } - - /** - * Shortcut constructor I use for the default aspects - you shouldn't be using this. - */ - public Aspect(String tag, int color, Aspect[] components) { - this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1); - } - - /** - * Shortcut constructor I use for the default aspects - you shouldn't be using this. - */ - public Aspect(String tag, int color, Aspect[] components, int blend) { - this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend); - } - - /** - * Shortcut constructor I use for the primal aspects - - * you shouldn't use this as making your own primal aspects will break all the things. - */ - public Aspect(String tag, int color, String chatcolor, int blend) { - this(tag,color,(Aspect[])null, blend); - this.setChatcolor(chatcolor); - } - - public int getColor() { - return color; - } - - public String getName() { - return WordUtils.capitalizeFully(tag); - } - - public String getLocalizedDescription() { - return StatCollector.translateToLocal("tc.aspect."+tag); - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public Aspect[] getComponents() { - return components; - } - - public void setComponents(Aspect[] components) { - this.components = components; - } - - public ResourceLocation getImage() { - return image; - } - - public static Aspect getAspect(String tag) { - return aspects.get(tag); - } - - public int getBlend() { - return blend; - } - - public void setBlend(int blend) { - this.blend = blend; - } - - public boolean isPrimal() { - return getComponents()==null || getComponents().length!=2; - } - - /////////////////////////////// - public static ArrayList getPrimalAspects() { - ArrayList primals = new ArrayList(); - Collection pa = aspects.values(); - for (Aspect aspect:pa) { - if (aspect.isPrimal()) primals.add(aspect); - } - return primals; - } - - public static ArrayList getCompoundAspects() { - ArrayList compounds = new ArrayList(); - Collection pa = aspects.values(); - for (Aspect aspect:pa) { - if (!aspect.isPrimal()) compounds.add(aspect); - } - return compounds; - } - - public String getChatcolor() { - return chatcolor; - } - - public void setChatcolor(String chatcolor) { - this.chatcolor = chatcolor; - } - - - /////////////////////////////// - public static LinkedHashMap aspects = new LinkedHashMap(); - - //PRIMAL - public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1); - public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1); - public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1); - public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1); - public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1); - public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771); - - //SECONDARY (PRIMAL + PRIMAL) - public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771); - public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE}); - public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER}); - public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY}); - public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, AIR}); - public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, ORDER}); - public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {EARTH, WATER}); - public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {WATER, ENTROPY}); - public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE}); - public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER}); - -// public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY}); - - //TERTIARY - public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {ENERGY, AIR}); - public static final Aspect FLUX = new Aspect("vitium",0x800080, new Aspect[] {ENTROPY, ENERGY}); - public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT}); - public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS}); - public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION}); - public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH}); - - public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {METAL, ENERGY}); - public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {EXCHANGE, TOOL}); - public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL}); - public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY}); - - public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH}); - public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {FIRE, SOUL}); - public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL}); - public static final Aspect AVERSION = new Aspect("aversio",0xc05050, new Aspect[] {SOUL, ENTROPY}); - public static final Aspect PROTECT = new Aspect("praemunio",0x00c0c0, new Aspect[] {SOUL, EARTH}); - public static final Aspect DESIRE = new Aspect("desiderium",0xe6be44, new Aspect[] {SOUL, VOID}); - - public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH}); - public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE}); - public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {SOUL, LIFE}); - - -} diff --git a/src/api/java/thaumcraft/api/aspects/AspectHelper.java b/src/api/java/thaumcraft/api/aspects/AspectHelper.java deleted file mode 100644 index 522ae4a16..000000000 --- a/src/api/java/thaumcraft/api/aspects/AspectHelper.java +++ /dev/null @@ -1,178 +0,0 @@ -package thaumcraft.api.aspects; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Random; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; -import thaumcraft.api.ThaumcraftApiHelper; - -public class AspectHelper { - - public static AspectList cullTags(AspectList temp) { - AspectList temp2 = new AspectList(); - for (Aspect tag:temp.getAspects()) { - if (tag!=null) - temp2.add(tag, temp.getAmount(tag)); - } - while (temp2!=null && temp2.size()>6) { - Aspect lowest = null; - float low = Short.MAX_VALUE; - for (Aspect tag:temp2.getAspects()) { - if (tag==null) continue; - float ta=temp2.getAmount(tag); - if (tag.isPrimal()) { - ta *= .9f; - } else { - if (!tag.getComponents()[0].isPrimal()) { - ta *= 1.1f; - if (!tag.getComponents()[0].getComponents()[0].isPrimal()) { - ta *= 1.05f; - } - if (!tag.getComponents()[0].getComponents()[1].isPrimal()) { - ta *= 1.05f; - } - } - if (!tag.getComponents()[1].isPrimal()) { - ta *= 1.1f; - if (!tag.getComponents()[1].getComponents()[0].isPrimal()) { - ta *= 1.05f; - } - if (!tag.getComponents()[1].getComponents()[1].isPrimal()) { - ta *= 1.05f; - } - } - } - - if (ta aspects = Aspect.aspects.values(); - for (Aspect aspect:aspects) { - if (aspect.getComponents()!=null && ( - (aspect.getComponents()[0]==aspect1 && aspect.getComponents()[1]==aspect2) || - (aspect.getComponents()[0]==aspect2 && aspect.getComponents()[1]==aspect1))) { - - return aspect; - } - } - return null; - } - - public static Aspect getRandomPrimal(Random rand, Aspect aspect) { - ArrayList list = new ArrayList(); - if (aspect!=null) { - AspectList temp = new AspectList(); - temp.add(aspect, 1); - AspectList temp2 = AspectHelper.reduceToPrimals(temp); - for (Aspect a:temp2.getAspects()) { - for (int b=0;b0?list.get(rand.nextInt(list.size())):null; - } - - public static AspectList reduceToPrimals(AspectList in) { - AspectList out = new AspectList(); - for (Aspect aspect:in.getAspects()) { - if (aspect!=null) { - if (aspect.isPrimal()) { - out.add(aspect, in.getAmount(aspect)); - } else { - AspectList temp = new AspectList(); - temp.add(aspect.getComponents()[0],in.getAmount(aspect)); - temp.add(aspect.getComponents()[1],in.getAmount(aspect)); - AspectList temp2 = reduceToPrimals(temp); - - for (Aspect a:temp2.getAspects()) { - out.add(a, temp2.getAmount(a)); - } - } - } - } - return out; - } - - public static AspectList getPrimalAspects(AspectList in) { - AspectList t = new AspectList(); - t.add(Aspect.AIR, in.getAmount(Aspect.AIR)); - t.add(Aspect.FIRE, in.getAmount(Aspect.FIRE)); - t.add(Aspect.WATER, in.getAmount(Aspect.WATER)); - t.add(Aspect.EARTH, in.getAmount(Aspect.EARTH)); - t.add(Aspect.ORDER, in.getAmount(Aspect.ORDER)); - t.add(Aspect.ENTROPY, in.getAmount(Aspect.ENTROPY)); - return t; - } - - public static AspectList getAuraAspects(AspectList in) { - AspectList t = new AspectList(); - t.add(Aspect.AIR, in.getAmount(Aspect.AIR)); - t.add(Aspect.FIRE, in.getAmount(Aspect.FIRE)); - t.add(Aspect.WATER, in.getAmount(Aspect.WATER)); - t.add(Aspect.EARTH, in.getAmount(Aspect.EARTH)); - t.add(Aspect.ORDER, in.getAmount(Aspect.ORDER)); - t.add(Aspect.ENTROPY, in.getAmount(Aspect.ENTROPY)); - t.add(Aspect.FLUX, in.getAmount(Aspect.FLUX)); - return t; - } - -} diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java deleted file mode 100644 index 8f9f46ac1..000000000 --- a/src/api/java/thaumcraft/api/aspects/AspectList.java +++ /dev/null @@ -1,278 +0,0 @@ -package thaumcraft.api.aspects; - -import java.io.Serializable; -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -public class AspectList implements Serializable { - - public LinkedHashMap aspects = new LinkedHashMap();//aspects associated with this object - - - /** - * this creates a new aspect list with preloaded values based off the aspects of the given item. - * @param the itemstack of the given item - */ - public AspectList(ItemStack stack) { - try { - AspectList temp = AspectHelper.getObjectAspects(stack); - if (temp!=null) - for (Aspect tag:temp.getAspects()) { - add(tag,temp.getAmount(tag)); - } - } catch (Exception e) {} - } - - public AspectList() { - } - - public AspectList copy() { - AspectList out = new AspectList(); - for (Aspect a:this.getAspects()) - out.add(a, this.getAmount(a)); - return out; - } - - /** - * @return the amount of different aspects in this collection - */ - public int size() { - return aspects.size(); - } - - /** - * @return the amount of total vis in this collection - */ - public int visSize() { - int q = 0; - - for (Aspect as:aspects.keySet()) { - q+=this.getAmount(as); - } - - return q; - } - - /** - * @return an array of all the aspects in this collection - */ - public Aspect[] getAspects() { - Aspect[] q = new Aspect[1]; - return aspects.keySet().toArray(q); - } - - - /** - * @return an array of all the aspects in this collection sorted by name - */ - public Aspect[] getAspectsSortedByName() { - try { - Aspect[] out = aspects.keySet().toArray(new Aspect[]{}); - boolean change=false; - do { - change=false; - for(int a=0;a0) { - out[a] = e2; - out[a+1] = e1; - change = true; - break; - } - } - } while (change==true); - return out; - } catch (Exception e) { - return this.getAspects(); - } - } - - /** - * @return an array of all the aspects in this collection sorted by amount - */ - public Aspect[] getAspectsSortedByAmount() { - try { - Aspect[] out = aspects.keySet().toArray(new Aspect[1]); - boolean change=false; - do { - change=false; - for(int a=0;a0 && e2>0 && e2>e1) { - Aspect ea = out[a]; - Aspect eb = out[a+1]; - out[a] = eb; - out[a+1] = ea; - change = true; - break; - } - } - } while (change==true); - return out; - } catch (Exception e) { - return this.getAspects(); - } - } - - /** - * @param key - * @return the amount associated with the given aspect in this collection - */ - public int getAmount(Aspect key) { - return aspects.get(key)==null?0:aspects.get(key); - } - - /** - * Reduces the amount of an aspect in this collection by the given amount. - * @param key - * @param amount - * @return - */ - public boolean reduce(Aspect key, int amount) { - if (getAmount(key)>=amount) { - int am = getAmount(key)-amount; - aspects.put(key, am); - return true; - } - return false; - } - - /** - * Reduces the amount of an aspect in this collection by the given amount. - * If reduced to 0 or less the aspect will be removed completely. - * @param key - * @param amount - * @return - */ - public AspectList remove(Aspect key, int amount) { - int am = getAmount(key)-amount; - if (am<=0) aspects.remove(key); else - this.aspects.put(key, am); - return this; - } - - /** - * Simply removes the aspect from the list - * @param key - * @param amount - * @return - */ - public AspectList remove(Aspect key) { - aspects.remove(key); - return this; - } - - /** - * Adds this aspect and amount to the collection. - * If the aspect exists then its value will be increased by the given amount. - * @param aspect - * @param amount - * @return - */ - public AspectList add(Aspect aspect, int amount) { - if (this.aspects.containsKey(aspect)) { - int oldamount = this.aspects.get(aspect); - amount+=oldamount; - } - this.aspects.put( aspect, amount ); - return this; - } - - - /** - * Adds this aspect and amount to the collection. - * If the aspect exists then only the highest of the old or new amount will be used. - * @param aspect - * @param amount - * @return - */ - public AspectList merge(Aspect aspect, int amount) { - if (this.aspects.containsKey(aspect)) { - int oldamount = this.aspects.get(aspect); - if (amount0?aspects:null; - } - return null; - } - - @Override - public void setAspects(ItemStack itemstack, AspectList aspects) { - if (!itemstack.hasTagCompound()) itemstack.setTagCompound(new NBTTagCompound()); - aspects.writeToNBT(itemstack.getTagCompound()); - } - - @Override - public boolean ignoreContainedAspects() {return false;} -*/ \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java deleted file mode 100644 index 16bef8f65..000000000 --- a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java +++ /dev/null @@ -1,92 +0,0 @@ -package thaumcraft.api.aspects; - -import net.minecraft.util.EnumFacing; - - -/** - * @author Azanor - * This interface is used by tiles that use or transport vis. - * Only tiles that implement this interface will be able to connect to vis conduits or other thaumic devices - */ -public interface IEssentiaTransport { - /** - * Is this tile able to connect to other vis users/sources on the specified side? - * @param face - * @return - */ - public boolean isConnectable(EnumFacing face); - - /** - * Is this side used to input essentia? - * @param face - * @return - */ - boolean canInputFrom(EnumFacing face); - - /** - * Is this side used to output essentia? - * @param face - * @return - */ - boolean canOutputTo(EnumFacing face); - - /** - * Sets the amount of suction this block will apply - * @param suction - */ - public void setSuction(Aspect aspect, int amount); - - /** - * Returns the type of suction this block is applying. - * @param loc - * the location from where the suction is being checked - * @return - * a return type of null indicates the suction is untyped and the first thing available will be drawn - */ - public Aspect getSuctionType(EnumFacing face); - - /** - * Returns the strength of suction this block is applying. - * @param loc - * the location from where the suction is being checked - * @return - */ - public int getSuctionAmount(EnumFacing face); - - /** - * remove the specified amount of essentia from this transport tile - * @return how much was actually taken - */ - public int takeEssentia(Aspect aspect, int amount, EnumFacing face); - - /** - * add the specified amount of essentia to this transport tile - * @return how much was actually added - */ - public int addEssentia(Aspect aspect, int amount, EnumFacing face); - - /** - * What type of essentia this contains - * @param face - * @return - */ - public Aspect getEssentiaType(EnumFacing face); - - /** - * How much essentia this block contains - * @param face - * @return - */ - public int getEssentiaAmount(EnumFacing face); - - - /** - * Essentia will not be drawn from this container unless the suction exceeds this amount. - * @return the amount - */ - public int getMinimumSuction(); - - - -} - diff --git a/src/api/java/thaumcraft/api/aura/AuraHelper.java b/src/api/java/thaumcraft/api/aura/AuraHelper.java deleted file mode 100644 index f5e331193..000000000 --- a/src/api/java/thaumcraft/api/aura/AuraHelper.java +++ /dev/null @@ -1,81 +0,0 @@ -package thaumcraft.api.aura; - -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; - -public class AuraHelper { - - - /** - * Consume vis from the aura at the given location - * @param world - * @param pos - * @param aspect - * @param amount - * @return has anything been consumed - */ - public static boolean drainAura(World world, BlockPos pos, Aspect aspect, int amount) { - return ThaumcraftApi.internalMethods.drainAura(world,pos, aspect, amount); - } - - /** - * Consume vis from the aura at the given location - * @param world - * @param pos - * @param aspect - * @param amount - * @return how much was actually drained - */ - public static int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, int amount) { - return ThaumcraftApi.internalMethods.drainAuraAvailable(world,pos, aspect, amount); - } - - /** - * Adds vis to the aura at the given location. This does not actually increase the aura instantly - - * it merely adds a recharge ticked to the chunk that will add to the aura there the next time it is processed. - * - * @param world - * @param pos - * @param aspect - * @param amount - */ - public static void addAura(World world, BlockPos pos, Aspect aspect, int amount) { - ThaumcraftApi.internalMethods.addAura(world,pos, aspect, amount); - } - - /** - * Get how much of a given aspect is in the aura at the given location. - * @param world - * @param pos - * @param aspect - * @return - */ - public static int getAura(World world, BlockPos pos, Aspect aspect) { - return ThaumcraftApi.internalMethods.getAura(world,pos, aspect); - } - - /** - * Gets the general aura baseline at the given location - * @param world - * @param pos - * @return - */ - public static int getAuraBase(World world, BlockPos pos) { - return ThaumcraftApi.internalMethods.getAuraBase(world,pos); - } - - /** - * Adds flux to the aura at the specified block position. - * @param world - * @param pos - * @param amount how much flux to add - * @param showEffect if set to true, a flux goo splash effect and sound will also be displayed. Use in moderation. - */ - public static void pollute(World world, BlockPos pos, int amount, boolean showEffect) { - ThaumcraftApi.internalMethods.pollute(world,pos,amount,showEffect); - } - - -} diff --git a/src/api/java/thaumcraft/api/blocks/BlocksTC.java b/src/api/java/thaumcraft/api/blocks/BlocksTC.java deleted file mode 100644 index 8a898fa6a..000000000 --- a/src/api/java/thaumcraft/api/blocks/BlocksTC.java +++ /dev/null @@ -1,132 +0,0 @@ -package thaumcraft.api.blocks; - -import net.minecraft.block.Block; - -public class BlocksTC { - - - // World - public static Block oreAmber; - public static Block oreCinnabar; - public static Block log; - public static Block leaf; - public static Block sapling; - public static Block shimmerleaf; - public static Block cinderpearl; - public static Block vishroom; - public static Block plank; - public static Block stone; - public static Block translucent; - public static Block stairsArcane; - public static Block stairsArcaneBrick; - public static Block stairsAncient; - public static Block stairsSilverwood; - public static Block stairsGreatwood; - public static Block stairsEldritch; - public static Block slabWood; - public static Block slabStone; - public static Block doubleSlabWood; - public static Block doubleSlabStone; - public static Block taintBlock; - public static Block taintFibre; - public static Block taintDust; - public static Block taintLog; - public static Block taintFeature; - public static Block lootCrate; - public static Block lootUrn; - public static Block eldritch; - public static Block crystalAir; - public static Block crystalFire; - public static Block crystalWater; - public static Block crystalEarth; - public static Block crystalOrder; - public static Block crystalEntropy; - public static Block crystalTaint; - - // Doodads - public static Block tableWood; - public static Block tableStone; - /** THAUMIUM, VOID, ALCHEMICAL, ADVANCED_ALCHEMICAL, BRASS */ - public static Block metal; - public static Block candle; - public static Block nitor; - public static Block bloom; - public static Block pedestal; - public static Block itemGrate; - public static Block fleshBlock; - public static Block banner; - public static Block pavingStone; - public static Block pillar; - public static Block redstoneRelay; - - // Machines - public static Block arcaneEar; - public static Block levitator; - public static Block dioptra; - public static Block crucible; - public static Block arcaneWorkbench; - public static Block arcaneWorkbenchCharger; - public static Block wandWorkbench; - public static Block rechargePedestal; - public static Block researchTable; - public static Block tube; - public static Block centrifuge; - public static Block crystallizer; - public static Block hungryChest; - public static Block jar; - public static Block bellows; - public static Block smelterBasic; - public static Block smelterThaumium; - public static Block smelterVoid; - public static Block smelterAux; - public static Block smelterVent; - public static Block alembic; - public static Block infusionMatrix; - public static Block infernalFurnace; - public static Block arcaneBore; - public static Block arcaneBoreBase; - public static Block thaumatorium; - public static Block brainBox; - public static Block mirror; - public static Block mirrorEssentia; - public static Block auraTotem; - public static Block spa; - public static Block waterJug; - public static Block lampArcane; - public static Block lampFertility; - public static Block lampGrowth; - - // Fluids - public static Block fluxGoo; - public static Block purifyingFluid; - public static Block liquidDeath; - - // Misc - public static Block hole; - public static Block vacuum; - public static Block effect; - public static Block barrier; - public static Block placeholder; - - - - - - - - - - - - - - - - - - - - - - -} diff --git a/src/api/java/thaumcraft/api/blocks/ILabelable.java b/src/api/java/thaumcraft/api/blocks/ILabelable.java deleted file mode 100644 index 8b8663e39..000000000 --- a/src/api/java/thaumcraft/api/blocks/ILabelable.java +++ /dev/null @@ -1,23 +0,0 @@ -package thaumcraft.api.blocks; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; - -/** - * - * @author Azanor - * - * Tile entities or blocks that extend this interface can have jar labels applied to them - * - */ -public interface ILabelable { - - /** - * This method is used by the block or tileentity to do whatever needs doing. - * @return if true then label will be subtracted from player inventory - */ - public boolean applyLabel(EntityPlayer player, BlockPos pos, EnumFacing side, ItemStack labelstack); - -} diff --git a/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java b/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java deleted file mode 100644 index 31489d4d2..000000000 --- a/src/api/java/thaumcraft/api/blocks/TileThaumcraft.java +++ /dev/null @@ -1,81 +0,0 @@ -package thaumcraft.api.blocks; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -/** - * - * @author azanor - * - * Custom tile entity class I use for most of my tile entities. Setup in such a way that only - * the nbt data within readCustomNBT / writeCustomNBT will be sent to the client when the tile - * updates. Apart from all the normal TE data that gets sent that is. - * - */ -public class TileThaumcraft extends TileEntity { - - //NBT stuff - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - readCustomNBT(nbt); - } - - public void readCustomNBT(NBTTagCompound nbt) - { - //TODO - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - writeCustomNBT(nbt); - } - - public void writeCustomNBT(NBTTagCompound nbt) - { - //TODO - } - - //Client Packet stuff - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbt = new NBTTagCompound(); - this.writeCustomNBT(nbt); - return new S35PacketUpdateTileEntity(this.getPos(), -999, nbt); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - this.readCustomNBT(pkt.getNbtCompound()); - } - - - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } - - public EnumFacing getFacing() { - try { - return EnumFacing.getFront(getBlockMetadata() & 7); - } catch (Exception e) { } - return EnumFacing.UP; - } - - public boolean gettingPower() { - return worldObj.isBlockPowered(getPos()); - } - -} diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java deleted file mode 100644 index e2860acad..000000000 --- a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java +++ /dev/null @@ -1,90 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class CrucibleRecipe { - - private ItemStack recipeOutput; - - public Object catalyst; - public AspectList aspects; - public String research; - - public int hash; - - public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags) { - recipeOutput = result; - this.aspects = tags; - this.research = researchKey; - this.catalyst = cat; - if (cat instanceof String) { - this.catalyst = OreDictionary.getOres((String) cat); - } - String hc = researchKey; - hc += result.toString(); - for (Aspect tag:tags.getAspects()) { - hc += tag.getTag()+tags.getAmount(tag); - } - if (cat instanceof ItemStack) { - hc += ((ItemStack)cat).toString(); - } else - if (cat instanceof List && ((List)catalyst).size()>0) { - for (ItemStack is :(List)catalyst) { - hc += is.toString(); - } - } - - hash = hc.hashCode(); - } - - - - public boolean matches(AspectList itags, ItemStack cat) { - if (catalyst instanceof ItemStack && !OreDictionary.itemMatches((ItemStack) catalyst,cat,false)) { - return false; - } else - if (catalyst instanceof List && ((List)catalyst).size()>0) { - if (!ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat}, - (List)catalyst)) return false; - } - if (itags==null) return false; - for (Aspect tag:aspects.getAspects()) { - if (itags.getAmount(tag))catalyst).size()>0) { - if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat}, (List)catalyst)) return true; - } - return false; - } - - public AspectList removeMatching(AspectList itags) { - AspectList temptags = new AspectList(); - temptags.aspects.putAll(itags.aspects); - - for (Aspect tag:aspects.getAspects()) { - temptags.remove(tag, aspects.getAmount(tag)); - } - - itags = temptags; - return itags; - } - - public ItemStack getRecipeOutput() { - return recipeOutput; - } - - -} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java deleted file mode 100644 index bba02209a..000000000 --- a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java +++ /dev/null @@ -1,28 +0,0 @@ -package thaumcraft.api.crafting; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; -import thaumcraft.api.aspects.AspectList; - -public interface IArcaneRecipe extends IRecipe -{ - - boolean matches(InventoryCrafting inv, World worldIn); - boolean matches(InventoryCrafting inv, World world, EntityPlayer player); - - ItemStack getCraftingResult(InventoryCrafting inv); - - int getRecipeSize(); - - ItemStack getRecipeOutput(); - - ItemStack[] getRemainingItems(InventoryCrafting inv); - - AspectList getAspects(); - AspectList getAspects(InventoryCrafting inv); - String[] getResearch(); - -} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java b/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java deleted file mode 100644 index 9f49eaf8f..000000000 --- a/src/api/java/thaumcraft/api/crafting/IArcaneWorkbench.java +++ /dev/null @@ -1,11 +0,0 @@ -package thaumcraft.api.crafting; - -/** - * - * @author Azanor - * This needs to be implemented by any inventory that wishes to act as an arcane workbench. - * - */ -public interface IArcaneWorkbench { - -} diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java deleted file mode 100644 index 2979fdad3..000000000 --- a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java +++ /dev/null @@ -1,136 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchHelper; - -@Deprecated -public class InfusionEnchantmentRecipe -{ - - public AspectList aspects; - public String[] research; - public Object[] components; - public Enchantment enchantment; - public int recipeXP; - public int instability; - - public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, AspectList aspects2, Object[] recipe) { - this(new String[]{research},input,inst,aspects2,recipe); - } - - public InfusionEnchantmentRecipe(String[] research, Enchantment input, int inst, AspectList aspects2, Object[] recipe) { - this.research = research; - this.enchantment = input; - this.aspects = aspects2; - this.components = recipe; - this.instability = inst; - this.recipeXP = Math.max(1, input.getMinEnchantability(1)/3); - } - - /** - * Used to check if a recipe matches current crafting inventory - * @param player - */ - public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { - if (research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - - if (!enchantment.canApply(central) || !central.getItem().isItemTool(central)) { - return false; - } - - Map map1 = EnchantmentHelper.getEnchantments(central); - Iterator iterator = map1.keySet().iterator(); - while (iterator.hasNext()) - { - int j1 = ((Integer)iterator.next()).intValue(); - Enchantment ench = Enchantment.enchantmentsBookList[j1]; - if (j1 == enchantment.effectId && - EnchantmentHelper.getEnchantmentLevel(j1, central)>=ench.getMaxLevel()) - return false; - if (enchantment.effectId != ench.effectId && - (!enchantment.canApplyTogether(ench) || - !ench.canApplyTogether(enchantment))) { - return false; - } - } - - ItemStack i2 = null; - - ArrayList ii = new ArrayList(); - for (ItemStack is:input) { - ii.add(is.copy()); - } - - for (Object comp:components) { - boolean b=false; - for (int a=0;a input, ItemStack central, World world, EntityPlayer player) { - if (getRecipeInput()==null) return false; - - if (research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - - ItemStack i2 = central.copy(); - if (getRecipeInput() instanceof ItemStack && - ((ItemStack)getRecipeInput()).getItemDamage()==OreDictionary.WILDCARD_VALUE) { - i2.setItemDamage(OreDictionary.WILDCARD_VALUE); - } - - if (!ThaumcraftApiHelper.areItemStacksEqualForCrafting(i2, getRecipeInput())) return false; - - ArrayList ii = new ArrayList(); - for (ItemStack is:input) { - ii.add(is.copy()); - } - - for (Object comp:getComponents()) { - boolean b=false; - for (int a=0;a comps ) { - return recipeOutput; - } - - public AspectList getAspects(EntityPlayer player, ItemStack input, ArrayList comps) { - return aspects; - } - - public int getInstability(EntityPlayer player, ItemStack input, ArrayList comps) { - return instability; - } -} diff --git a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java deleted file mode 100644 index 1a1349646..000000000 --- a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java +++ /dev/null @@ -1,284 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.HashMap; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchHelper; - -public class ShapedArcaneRecipe implements IArcaneRecipe -{ - //Added in for future ease of change, but hard coded for now. - private static final int MAX_CRAFT_GRID_WIDTH = 3; - private static final int MAX_CRAFT_GRID_HEIGHT = 3; - - public ItemStack output = null; - public Object[] input = null; - public AspectList aspects = null; - public String[] research; - public int width = 0; - public int height = 0; - private boolean mirrored = true; - - - public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe){ this(new String[]{research}, result, aspects, recipe); } - - public ShapedArcaneRecipe(String[] research, ItemStack result, AspectList aspects, Object... recipe) - { - output = result.copy(); - this.research = research; - this.aspects = aspects; - String shape = ""; - - int idx = 0; - - if (recipe[idx] instanceof Boolean) - { - mirrored = (Boolean)recipe[idx]; - if (recipe[idx+1] instanceof Object[]) - { - recipe = (Object[])recipe[idx+1]; - } - else - { - idx = 1; - } - } - - if (recipe[idx] instanceof String[]) - { - String[] parts = ((String[])recipe[idx++]); - - for (String s : parts) - { - width = s.length(); - shape += s; - } - - height = parts.length; - } - else - { - while (recipe[idx] instanceof String) - { - String s = (String)recipe[idx++]; - shape += s; - width = s.length(); - height++; - } - } - - if (width * height != shape.length()) - { - String ret = "Invalid shaped ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - - HashMap itemMap = new HashMap(); - - for (; idx < recipe.length; idx += 2) - { - Character chr = (Character)recipe[idx]; - Object in = recipe[idx + 1]; - - if (in instanceof ItemStack) - { - itemMap.put(chr, ((ItemStack)in).copy()); - } - else if (in instanceof Item) - { - itemMap.put(chr, new ItemStack((Item)in)); - } - else if (in instanceof Block) - { - itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE)); - } - else if (in instanceof String) - { - itemMap.put(chr, OreDictionary.getOres((String)in)); - } - else - { - String ret = "Invalid shaped ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - - input = new Object[width * height]; - int x = 0; - for (char chr : shape.toCharArray()) - { - input[x++] = itemMap.get(chr); - } - - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } - - @Override - public int getRecipeSize(){ return input.length; } - - @Override - public ItemStack getRecipeOutput(){ return output; } - - @Override - public boolean matches(InventoryCrafting inv, World world) - { - return inv instanceof IArcaneWorkbench && matches(inv,world,null); - } - - @Override - public boolean matches(InventoryCrafting inv, World world, EntityPlayer player) - { - if (player!=null && ( research!=null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research))) { - return false; - } - for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) - { - for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) - { - if (checkMatch(inv, x, y, false)) - { - return true; - } - - if (mirrored && checkMatch(inv, x, y, true)) - { - return true; - } - } - } - - return false; - } - - private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) - { - for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) - { - for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) - { - int subX = x - startX; - int subY = y - startY; - Object target = null; - - if (subX >= 0 && subY >= 0 && subX < width && subY < height) - { - if (mirror) - { - target = input[width - subX - 1 + subY * width]; - } - else - { - target = input[subX + subY * width]; - } - } - - ItemStack slot = inv.getStackInRowAndColumn(x, y); - - if (target instanceof ItemStack) - { - if (!checkItemEquals((ItemStack)target, slot)) - { - return false; - } - } - else if (target instanceof List) - { - boolean matched = false; - - for (ItemStack item : (List)target) - { - matched = matched || checkItemEquals(item, slot); - } - - if (!matched) - { - return false; - } - } - else if (target == null && slot != null) - { - return false; - } - } - } - - return true; - } - - private boolean checkItemEquals(ItemStack target, ItemStack input) - { - if (input == null && target != null || input != null && target == null) - { - return false; - } - return (target.getItem() == input.getItem() && - (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && - (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); - } - - public ShapedArcaneRecipe setMirrored(boolean mirror) - { - mirrored = mirror; - return this; - } - - /** - * Returns the input for this recipe, any mod accessing this value should never - * manipulate the values in this array as it will effect the recipe itself. - * @return The recipes input vales. - */ - public Object[] getInput() - { - return this.input; - } - - @Override - public AspectList getAspects() { - return aspects; - } - - @Override - public AspectList getAspects(InventoryCrafting inv) { - return aspects; - } - - @Override - public String[] getResearch() { - return research; - } - - @Override - public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) - { - ItemStack[] aitemstack = new ItemStack[p_179532_1_.getSizeInventory()]; - - for (int i = 0; i < Math.min(9, aitemstack.length); ++i) - { - ItemStack itemstack = p_179532_1_.getStackInSlot(i); - aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack); - } - - return aitemstack; - } -} diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java deleted file mode 100644 index ba5776a9b..000000000 --- a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java +++ /dev/null @@ -1,182 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchHelper; - -public class ShapelessArcaneRecipe implements IArcaneRecipe -{ - private ItemStack output = null; - private ArrayList input = new ArrayList(); - - public AspectList aspects = null; - public String[] research; - - public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe){ this(new String[] {research}, result,aspects, recipe); } - - public ShapelessArcaneRecipe(String[] research, ItemStack result, AspectList aspects, Object... recipe) - { - output = result.copy(); - this.research = research; - this.aspects = aspects; - for (Object in : recipe) - { - if (in instanceof ItemStack) - { - input.add(((ItemStack)in).copy()); - } - else if (in instanceof Item) - { - input.add(new ItemStack((Item)in)); - } - else if (in instanceof Block) - { - input.add(new ItemStack((Block)in)); - } - else if (in instanceof String) - { - input.add(OreDictionary.getOres((String)in)); - } - else - { - String ret = "Invalid shapeless ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - } - - @Override - public int getRecipeSize(){ return input.size(); } - - @Override - public ItemStack getRecipeOutput(){ return output; } - - @Override - public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } - - @Override - public boolean matches(InventoryCrafting inv, World world) - { - return inv instanceof IArcaneWorkbench && matches(inv,world,null); - } - - @Override - public boolean matches(InventoryCrafting var1, World world, EntityPlayer player) - { - if (player!=null && ( research != null && research[0].length()>0 && !ResearchHelper.isResearchComplete(player.getCommandSenderName(), research))) { - return false; - } - - ArrayList required = new ArrayList(input); - - for (int x = 0; x < 9; x++) - { - ItemStack slot = var1.getStackInSlot(x); - - if (slot != null) - { - boolean inRecipe = false; - Iterator req = required.iterator(); - - while (req.hasNext()) - { - boolean match = false; - - Object next = req.next(); - - if (next instanceof ItemStack) - { - match = checkItemEquals((ItemStack)next, slot); - } - else if (next instanceof List) - { - for (ItemStack item : (List)next) - { - match = match || checkItemEquals(item, slot); - } - } - - if (match) - { - inRecipe = true; - required.remove(next); - break; - } - } - - if (!inRecipe) - { - return false; - } - } - } - - return required.isEmpty(); - } - - private boolean checkItemEquals(ItemStack target, ItemStack input) - { - if (input == null && target != null || input != null && target == null) - { - return false; - } - return (target.getItem() == input.getItem() && - (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && - (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); - } - - /** - * Returns the input for this recipe, any mod accessing this value should never - * manipulate the values in this array as it will effect the recipe itself. - * @return The recipes input vales. - */ - public ArrayList getInput() - { - return this.input; - } - - @Override - public AspectList getAspects() { - return aspects; - } - - @Override - public AspectList getAspects(InventoryCrafting inv) { - return aspects; - } - - @Override - public String[] getResearch() { - return research; - } - - @Override - public ItemStack[] getRemainingItems(InventoryCrafting p_179532_1_) - { - ItemStack[] aitemstack = new ItemStack[p_179532_1_.getSizeInventory()]; - - for (int i = 0; i < Math.min(9, aitemstack.length); ++i) - { - ItemStack itemstack = p_179532_1_.getStackInSlot(i); - aitemstack[i] = net.minecraftforge.common.ForgeHooks.getContainerItem(itemstack); - } - - return aitemstack; - } -} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java deleted file mode 100644 index 6341d8765..000000000 --- a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -package thaumcraft.api.damagesource; - -import net.minecraft.entity.Entity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; - -public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect { - - private boolean fireDamage; - private float hungerDamage; - private boolean isUnblockable; - - - public DamageSourceIndirectThaumcraftEntity(String par1Str, - Entity par2Entity, Entity par3Entity) { - super(par1Str, par2Entity, par3Entity); - } - - - public DamageSource setFireDamage() - { - this.fireDamage = true; - return this; - } - - public DamageSource setDamageBypassesArmor() - { - this.isUnblockable = true; - this.hungerDamage = 0.0F; - return this; - } -} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java deleted file mode 100644 index 02530f914..000000000 --- a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java +++ /dev/null @@ -1,47 +0,0 @@ -package thaumcraft.api.damagesource; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; - -public class DamageSourceThaumcraft extends DamageSource -{ - - public static DamageSource taint = new DamageSourceThaumcraft("taint").setDamageBypassesArmor().setMagicDamage(); - public static DamageSource tentacle = new DamageSourceThaumcraft("tentacle"); - public static DamageSource swarm = new DamageSourceThaumcraft("swarm"); - public static DamageSource dissolve = new DamageSourceThaumcraft("dissolve").setDamageBypassesArmor(); - - protected DamageSourceThaumcraft(String par1Str) { - super(par1Str); - } - - /** This kind of damage can be blocked or not. */ - private boolean isUnblockable = false; - private boolean isDamageAllowedInCreativeMode = false; - private float hungerDamage = 0.3F; - - /** This kind of damage is based on fire or not. */ - private boolean fireDamage; - - /** This kind of damage is based on a projectile or not. */ - private boolean projectile; - - /** - * Whether this damage source will have its damage amount scaled based on the current difficulty. - */ - private boolean difficultyScaled; - private boolean magicDamage = false; - private boolean explosion = false; - - public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving) - { - return new EntityDamageSource("swarm", par0EntityLiving); - } - - public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving) - { - return new EntityDamageSource("tentacle", par0EntityLiving); - } - -} diff --git a/src/api/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java deleted file mode 100644 index c0991c5dd..000000000 --- a/src/api/java/thaumcraft/api/entities/IEldritchMob.java +++ /dev/null @@ -1,5 +0,0 @@ -package thaumcraft.api.entities; - -public interface IEldritchMob { - -} diff --git a/src/api/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java deleted file mode 100644 index 0f18471f8..000000000 --- a/src/api/java/thaumcraft/api/entities/ITaintedMob.java +++ /dev/null @@ -1,5 +0,0 @@ -package thaumcraft.api.entities; - -public interface ITaintedMob { - -} diff --git a/src/api/java/thaumcraft/api/golems/ISealDisplayer.java b/src/api/java/thaumcraft/api/golems/ISealDisplayer.java deleted file mode 100644 index d90547aa5..000000000 --- a/src/api/java/thaumcraft/api/golems/ISealDisplayer.java +++ /dev/null @@ -1,11 +0,0 @@ -package thaumcraft.api.golems; - -/** - * Items using this interface will make golem seals visible in the world while held - * - * @author azanor - * - */ -public interface ISealDisplayer { - -} diff --git a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java deleted file mode 100644 index ef4bdddbc..000000000 --- a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java +++ /dev/null @@ -1,93 +0,0 @@ -package thaumcraft.api.internal; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class DummyInternalMethodHandler implements IInternalMethodHandler { - - @Override - public boolean isResearchComplete(String username, String researchkey) { - return false; - } - - @Override - public AspectList getObjectAspects(ItemStack is) { - return null; - } - - @Override - public AspectList generateTags(Item item, int meta) { - return null; - } - - @Override - public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, - AspectList cost, boolean doit, boolean crafting) { - return false; - } - - @Override - public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { - return false; - } - - @Override - public void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type) { - } - - @Override - public int getPlayerWarp(EntityPlayer player, EnumWarpType type) { - return 0; - } - - - @Override - public void markRunicDirty(Entity entity) { - } - - @Override - public boolean completeResearch(EntityPlayer player, String researchkey) { - return false; - } - - - - @Override - public boolean drainAura(World world, BlockPos pos, Aspect aspect, int amount) { - return false; - } - - @Override - public void addAura(World world, BlockPos pos, Aspect aspect, int amount) { - - } - - @Override - public void pollute(World world, BlockPos pos, int amount, boolean showEffect) { } - - @Override - public int getAura(World world, BlockPos pos, Aspect aspect) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getAuraBase(World world, BlockPos pos) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, - int amount) { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/src/api/java/thaumcraft/api/internal/EnumWarpType.java b/src/api/java/thaumcraft/api/internal/EnumWarpType.java deleted file mode 100644 index c0ed734f7..000000000 --- a/src/api/java/thaumcraft/api/internal/EnumWarpType.java +++ /dev/null @@ -1,5 +0,0 @@ -package thaumcraft.api.internal; - -public enum EnumWarpType { - PERMANENT, NORMAL, TEMPORARY; -} diff --git a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java deleted file mode 100644 index 0feb03080..000000000 --- a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package thaumcraft.api.internal; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public interface IInternalMethodHandler { - - public boolean isResearchComplete(String username, String researchkey); - public AspectList getObjectAspects(ItemStack is); - public AspectList generateTags(Item item, int meta); - public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting); - public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost); - public void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type); - public int getPlayerWarp(EntityPlayer player, EnumWarpType type); - public void markRunicDirty(Entity entity); - public boolean completeResearch(EntityPlayer player, String researchkey); - public boolean drainAura(World world, BlockPos pos, Aspect aspect,int amount); - public int drainAuraAvailable(World world, BlockPos pos, Aspect aspect, int amount); - public void addAura(World world, BlockPos pos, Aspect aspect, int amount); - public void pollute(World world, BlockPos pos, int amount, boolean showEffect); - public int getAura(World world, BlockPos pos, Aspect aspect); - public int getAuraBase(World world, BlockPos pos); - -} diff --git a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java deleted file mode 100644 index 3aa7664f0..000000000 --- a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java +++ /dev/null @@ -1,24 +0,0 @@ -package thaumcraft.api.internal; - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - - -public class WeightedRandomLoot extends WeightedRandom.Item { - - /** The Item/Block ID to generate in the bag. */ - public ItemStack item; - - public WeightedRandomLoot(ItemStack stack, int weight) - { - super(weight); - this.item = stack; - } - - public static ArrayList lootBagCommon = new ArrayList(); - public static ArrayList lootBagUncommon = new ArrayList(); - public static ArrayList lootBagRare = new ArrayList(); - -} diff --git a/src/api/java/thaumcraft/api/internal/WorldCoordinates.java b/src/api/java/thaumcraft/api/internal/WorldCoordinates.java deleted file mode 100644 index 0f0e08880..000000000 --- a/src/api/java/thaumcraft/api/internal/WorldCoordinates.java +++ /dev/null @@ -1,101 +0,0 @@ -package thaumcraft.api.internal; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; - -public class WorldCoordinates implements Comparable -{ - public BlockPos pos; - - public int dim; - - public WorldCoordinates() {} - - public WorldCoordinates(BlockPos pos, int d) - { - this.pos = pos; - this.dim = d; - } - - public WorldCoordinates(TileEntity tile) - { - this.pos = tile.getPos(); - this.dim = tile.getWorld().provider.getDimensionId(); - } - - public WorldCoordinates(WorldCoordinates par1ChunkCoordinates) - { - this.pos = par1ChunkCoordinates.pos; - this.dim = par1ChunkCoordinates.dim; - } - - public boolean equals(Object par1Obj) - { - if (!(par1Obj instanceof WorldCoordinates)) - { - return false; - } - else - { - WorldCoordinates coordinates = (WorldCoordinates)par1Obj; - return this.pos.equals(coordinates.pos) && this.dim == coordinates.dim ; - } - } - - public int hashCode() - { - return this.pos.getX() + this.pos.getY() << 8 + this.pos.getZ() << 16 + this.dim << 24; - } - - /** - * Compare the coordinate with another coordinate - */ - public int compareWorldCoordinate(WorldCoordinates par1) - { - return this.dim == par1.dim ? this.pos.compareTo(par1.pos) : -1; - } - - public void set(BlockPos pos, int d) - { - this.pos = pos; - this.dim = d; - } - - /** - * Returns the squared distance between this coordinates and the coordinates given as argument. - */ - public double getDistanceSquared(BlockPos pos) - { - return this.pos.distanceSq(pos); - } - - /** - * Return the squared distance between this coordinates and the ChunkCoordinates given as argument. - */ - public double getDistanceSquaredToWorldCoordinates(WorldCoordinates par1ChunkCoordinates) - { - return this.getDistanceSquared(par1ChunkCoordinates.pos); - } - - public int compareTo(Object par1Obj) - { - return this.compareWorldCoordinate((WorldCoordinates)par1Obj); - } - - public void readNBT(NBTTagCompound nbt) { - int x = nbt.getInteger("w_x"); - int y = nbt.getInteger("w_y"); - int z = nbt.getInteger("w_z"); - this.pos = new BlockPos(x,y,z); - this.dim = nbt.getInteger("w_d"); - } - - public void writeNBT(NBTTagCompound nbt) { - nbt.setInteger("w_x",pos.getX()); - nbt.setInteger("w_y",pos.getY()); - nbt.setInteger("w_z",pos.getZ()); - nbt.setInteger("w_d",dim); - } - -} diff --git a/src/api/java/thaumcraft/api/items/IArchitect.java b/src/api/java/thaumcraft/api/items/IArchitect.java deleted file mode 100644 index 5582bb368..000000000 --- a/src/api/java/thaumcraft/api/items/IArchitect.java +++ /dev/null @@ -1,30 +0,0 @@ -package thaumcraft.api.items; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -public interface IArchitect { - - /** - * Returns a list of blocks that should be highlighted in world. - */ - public ArrayList getArchitectBlocks(ItemStack stack, World world, - BlockPos pos, EnumFacing side, EntityPlayer player); - - /** - * which axis should be displayed. - */ - public boolean showAxis(ItemStack stack, World world, EntityPlayer player, EnumFacing side, - EnumAxis axis); - - public enum EnumAxis { - X, // east / west - Y, // up / down - Z; // north / south - } -} diff --git a/src/api/java/thaumcraft/api/items/IRechargable.java b/src/api/java/thaumcraft/api/items/IRechargable.java deleted file mode 100644 index c3d56e3a1..000000000 --- a/src/api/java/thaumcraft/api/items/IRechargable.java +++ /dev/null @@ -1,35 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -/** - * - * @author Azanor - * - * Items with this interface can be recharged in wand pedestals and similar devices. - * The recharging needs to occur in handleRecharge and the passed in pos will be the - * player pos or the pos of the device doing the charging. - * The recharge pedestal will simply call handleRecharge and let the item do whatever - * it would normally to recharge. - * HandleRecharge should under normal conditions always be called every 5 ticks. - * - */ -public interface IRechargable { - /** - * @param world - * @param is - * @param pos - * @param player The passed in player can be null - * @param amount how much vis to recharge - modified by things like the node tapper research - * @return the last aspect that was recharged - */ - public Aspect handleRecharge(World world, ItemStack is, BlockPos pos, EntityPlayer player, int amount); - - public AspectList getAspectsInChargable(ItemStack is); - -} diff --git a/src/api/java/thaumcraft/api/items/IRepairable.java b/src/api/java/thaumcraft/api/items/IRepairable.java deleted file mode 100644 index ce5a7e807..000000000 --- a/src/api/java/thaumcraft/api/items/IRepairable.java +++ /dev/null @@ -1,13 +0,0 @@ -package thaumcraft.api.items; - - - -/** - * @author Azanor - * Items, armor and tools with this interface can receive the Repair enchantment. - * Repairs 1 point of durability every 10 seconds (2 for repair II) - */ -public interface IRepairable { - - -} diff --git a/src/api/java/thaumcraft/api/items/IRepairableExtended.java b/src/api/java/thaumcraft/api/items/IRepairableExtended.java deleted file mode 100644 index ff01cdec1..000000000 --- a/src/api/java/thaumcraft/api/items/IRepairableExtended.java +++ /dev/null @@ -1,17 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - - - -/** - * @author Azanor - * Items, armor and tools with this interface can receive the Repair enchantment. - * Repairs 1 point of durability every 10 seconds (2 for repair II) - */ -public interface IRepairableExtended extends IRepairable { - - public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantlevel); - -} diff --git a/src/api/java/thaumcraft/api/items/IVisDiscountGear.java b/src/api/java/thaumcraft/api/items/IVisDiscountGear.java deleted file mode 100644 index a21b3731c..000000000 --- a/src/api/java/thaumcraft/api/items/IVisDiscountGear.java +++ /dev/null @@ -1,20 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; - - - - -/** - * @author Azanor - * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands. - * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but - * individual items really shouldn't have a discount more than 5% - */ -public interface IVisDiscountGear { - - int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect); - -} diff --git a/src/api/java/thaumcraft/api/items/IWarpingGear.java b/src/api/java/thaumcraft/api/items/IWarpingGear.java deleted file mode 100644 index 56534002c..000000000 --- a/src/api/java/thaumcraft/api/items/IWarpingGear.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Armor, held items or bauble slot items that implement this interface add warp when equipped or held. - * - */ - -public interface IWarpingGear { - - /** - * returns how much warp this item adds while worn or held. - */ - public int getWarp(ItemStack itemstack, EntityPlayer player); - - -} diff --git a/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java b/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java deleted file mode 100644 index 4424929f8..000000000 --- a/src/api/java/thaumcraft/api/items/ItemGenericEssentiaContainer.java +++ /dev/null @@ -1,88 +0,0 @@ -package thaumcraft.api.items; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IEssentiaContainerItem; - -public class ItemGenericEssentiaContainer extends Item implements IEssentiaContainerItem -{ - public ItemGenericEssentiaContainer(int base) - { - super(); - this.base = base; - this.setMaxStackSize(64); - this.setHasSubtypes(true); - this.setMaxDamage(0); - } - - int base = 1; - - @SideOnly(Side.CLIENT) - @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs,List par3List) { - for (Aspect tag:Aspect.aspects.values()) { - ItemStack i = new ItemStack(this); - this.setAspects(i, new AspectList().add(tag, base)); - par3List.add(i); - } - } - - @SideOnly(Side.CLIENT) - @Override - public int getColorFromItemStack(ItemStack stack, int par2) - { - if (getAspects(stack)!=null) { - return getAspects(stack).getAspects()[0].getColor(); - } else { - return 16777215; - } - } - - @Override - public AspectList getAspects(ItemStack itemstack) { - if (itemstack.hasTagCompound()) { - AspectList aspects = new AspectList(); - aspects.readFromNBT(itemstack.getTagCompound()); - return aspects.size()>0?aspects:null; - } - return null; - } - - @Override - public void setAspects(ItemStack itemstack, AspectList aspects) { - if (!itemstack.hasTagCompound()) - itemstack.setTagCompound(new NBTTagCompound()); - aspects.writeToNBT(itemstack.getTagCompound()); - } - - @Override - public boolean ignoreContainedAspects() {return false;} - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { - if (!world.isRemote && !stack.hasTagCompound()) { - Aspect[] displayAspects = Aspect.aspects.values().toArray(new Aspect[]{}); - this.setAspects(stack, new AspectList().add(displayAspects[world.rand.nextInt(displayAspects.length)], base)); - } - super.onUpdate(stack, world, entity, par4, par5); - } - - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) { - if (!world.isRemote && !stack.hasTagCompound()) { - Aspect[] displayAspects = Aspect.aspects.values().toArray(new Aspect[]{}); - this.setAspects(stack, new AspectList().add(displayAspects[world.rand.nextInt(displayAspects.length)], base)); - } - } -} diff --git a/src/api/java/thaumcraft/api/items/ItemRunic.java b/src/api/java/thaumcraft/api/items/ItemRunic.java deleted file mode 100644 index 483e93534..000000000 --- a/src/api/java/thaumcraft/api/items/ItemRunic.java +++ /dev/null @@ -1,21 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemRunic extends Item implements IRunicArmor { - - int charge; - - public ItemRunic (int charge) - { - super(); - this.charge = charge; - } - - @Override - public int getRunicCharge(ItemStack itemstack) { - return charge; - } - -} diff --git a/src/api/java/thaumcraft/api/items/ItemsTC.java b/src/api/java/thaumcraft/api/items/ItemsTC.java deleted file mode 100644 index fd2f8aeec..000000000 --- a/src/api/java/thaumcraft/api/items/ItemsTC.java +++ /dev/null @@ -1,185 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.item.Item; - -public class ItemsTC { - - //raw materials - public static Item amber; - public static Item quicksilver; - /** air, fire, water, earth, order, entropy, tainted, balanced*/ - public static Item shard; - /** "thaumium","void","brass"*/ - public static Item ingots; - /**"iron","copper","tin","silver","lead","quicksilver","thaumium","void","brass"*/ - public static Item nuggets; - /**"iron","gold","copper","tin","silver","lead","cinnabar"*/ - public static Item clusters; - - //resources - public static Item tallow; - public static Item fabric; - /** "brass","thaumium","void"*/ - public static Item gear; - /** "brass","iron","thaumium","void"*/ - public static Item plate; - public static Item voidSeed; - public static Item salisMundus; - public static Item mirroredGlass; - public static Item primalCharm; - public static Item phial; - public static Item label; - public static Item filter; - /** "clockwork","biothaumic" */ - public static Item mind; - public static Item morphicResonator; - - //consumables - public static Item alumentum; - public static Item brain; - /** "beef","chicken","pork","fish","rabbit","mutton"*/ - public static Item chunks; - public static Item tripleMeatTreat; - public static Item bucketDeath; - public static Item bucketPure; - public static Item bottleTaint; - public static Item bathSalts; - public static Item sanitySoap; - /** "basic","focus","magnet"*/ - public static Item turretPlacer; - - - //armor - public static Item goggles; - - public static Item travellerBoots; - - public static Item thaumiumHelm; - public static Item thaumiumChest; - public static Item thaumiumLegs; - public static Item thaumiumBoots; - - public static Item clothChest; - public static Item clothLegs; - public static Item clothBoots; - - public static Item fortressHelm; - public static Item fortressChest; - public static Item fortressLegs; - - public static Item voidHelm; - public static Item voidChest; - public static Item voidLegs; - public static Item voidBoots; - - public static Item voidRobeHelm; - public static Item voidRobeChest; - public static Item voidRobeLegs; - - public static Item crimsonBoots; - - public static Item crimsonPlateHelm; - public static Item crimsonPlateChest; - public static Item crimsonPlateLegs; - - public static Item crimsonRobeHelm; - public static Item crimsonRobeChest; - public static Item crimsonRobeLegs; - - public static Item crimsonPraetorHelm; - public static Item crimsonPraetorChest; - public static Item crimsonPraetorLegs; - - public static Item thaumostaticHarness; - - //tools - public static Item thaumometer; - public static Item thaumonomicon; - public static Item resonator; - public static Item sinisterStone; - public static Item sanityChecker; - - public static Item thaumiumAxe; - public static Item thaumiumSword; - public static Item thaumiumShovel; - public static Item thaumiumPick; - public static Item thaumiumHoe; - - public static Item elementalAxe; - public static Item elementalSword; - public static Item elementalShovel; - public static Item elementalPick; - public static Item elementalHoe; - - public static Item voidAxe; - public static Item voidSword; - public static Item voidShovel; - public static Item voidPick; - public static Item voidHoe; - - public static Item crimsonBlade; - public static Item primalCrusher; - - public static Item boneBow; - public static Item primalArrows; - - public static Item handMirror; - - //wand - public static Item wand; - /** iron, gold, brass, thaumium_inert, thaumium_charged, void_inert, void_charged*/ - public static Item wandCaps; - /** greatwood, silverwood, obsidian, blaze, ice, quartz, bone, reed, - * greatwood_staff, silverwood_staff, obsidian_staff, blaze_staff, ice_staff, - * quartz_staff, bone_staff, reed_staff, primal_staff */ - public static Item wandRods; - public static Item focusEqualTrade; - public static Item focusFire; - public static Item focusFrost; - public static Item focusPech; - public static Item focusExcavation; - public static Item focusHellbat; - public static Item focusPrimal; - public static Item focusShock; - public static Item focusWarding; - public static Item focusHole; - public static Item focusShard; - - public static Item focusPouch; - - //baubles - /** "amulet_mundane","ring_mundane","girdle_mundane","ring_apprentice"*/ - public static Item baubles; - public static Item amuletRunic; - public static Item ringRunic; - public static Item girdleRunic; - public static Item amuletVis; - public static Item girdleHover; - - //misc - /** "slime","tendril"*/ - public static Item tainted; - public static Item knowledgeFragment; - public static Item coin; - public static Item wispyEssence; - public static Item crystalEssence; - public static Item primordialPearl; - public static Item researchNotes; - public static Item scribingTools; - public static Item lootBag; - public static Item eldritchEye; - public static Item crimsonRites; - public static Item runedTablet; - public static Item creativePlacer; - - //golems - public static Item golemBell; - public static Item golemPlacer; - /** "blank","pickup","fill","fill_advanced","empty","empty_advanced" */ - public static Item seals; - - - - - -} diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java deleted file mode 100644 index eaab3d20d..000000000 --- a/src/api/java/thaumcraft/api/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "Thaumcraft", apiVersion = "5.0.0.4", provides = "Thaumcraft|API") -package thaumcraft.api; - -import net.minecraftforge.fml.common.API; - diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java deleted file mode 100644 index c9efa7e96..000000000 --- a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java +++ /dev/null @@ -1,67 +0,0 @@ -package thaumcraft.api.potions; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import thaumcraft.api.damagesource.DamageSourceThaumcraft; -import thaumcraft.api.entities.ITaintedMob; - -public class PotionFluxTaint extends Potion -{ - public static PotionFluxTaint instance = null; // will be instantiated at runtime - private int statusIconIndex = -1; - - public PotionFluxTaint(int par1, boolean par2, int par3) - { - super(par1,new ResourceLocation("flux_taint"),par2,par3); - setIconIndex(0, 0); - } - - public static void init() - { - instance.setPotionName("potion.fluxtaint"); - instance.setIconIndex(3, 1); - instance.setEffectiveness(0.25D); - } - - @Override - public boolean isBadEffect() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(rl); - return super.getStatusIconIndex(); - } - - static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); - - @Override - public void performEffect(EntityLivingBase target, int par2) { - if (target instanceof ITaintedMob) { - target.heal(1); - } else - if (!target.isEntityUndead() && !(target instanceof EntityPlayer)) - { - target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); - } - else - if (!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer))) - { - target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); - } - } - - public boolean isReady(int par1, int par2) - { - int k = 40 >> par2; - return k > 0 ? par1 % k == 0 : true; - } - -} diff --git a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java deleted file mode 100644 index 7f9b576e5..000000000 --- a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java +++ /dev/null @@ -1,48 +0,0 @@ -package thaumcraft.api.potions; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class PotionVisExhaust extends Potion -{ - public static PotionVisExhaust instance = null; // will be instantiated at runtime - private int statusIconIndex = -1; - - public PotionVisExhaust(int par1, boolean par2, int par3) - { - super(par1,new ResourceLocation("vis_exhaust"),par2,par3); - setIconIndex(0, 0); - } - - public static void init() - { - instance.setPotionName("potion.visexhaust"); - instance.setIconIndex(5, 1); - instance.setEffectiveness(0.25D); - } - - @Override - public boolean isBadEffect() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(rl); - return super.getStatusIconIndex(); - } - - static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); - - @Override - public void performEffect(EntityLivingBase target, int par2) { - - } - - -} diff --git a/src/api/java/thaumcraft/api/research/IScanThing.java b/src/api/java/thaumcraft/api/research/IScanThing.java deleted file mode 100644 index cba286387..000000000 --- a/src/api/java/thaumcraft/api/research/IScanThing.java +++ /dev/null @@ -1,23 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.player.EntityPlayer; - -public interface IScanThing { - - /** - * The passed in obj can either be an Entity, a BlockPos, an Itemstack, or a null if nothing was actually clicked on. - * You could then probably use the players lookvec to do whatever you want. - * @param player - * @param obj - * @return the research key that will be unlocked if the object is scanned. - * This need not be an actual defined research item - any text string will do. - * You can then use this research key (fake or otherwise) as a parent for research or for whatever. - */ - public boolean checkThing(EntityPlayer player, Object obj); - - /** - * @return the research linked to this 'thing' - */ - public String getResearchKey(); - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java deleted file mode 100644 index 6c4c95afb..000000000 --- a/src/api/java/thaumcraft/api/research/ResearchCategories.java +++ /dev/null @@ -1,117 +0,0 @@ -package thaumcraft.api.research; - -import java.util.Collection; -import java.util.LinkedHashMap; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.common.FMLLog; - -import org.apache.logging.log4j.Level; - -public class ResearchCategories { - - //Research - public static LinkedHashMap researchCategories = new LinkedHashMap (); - - /** - * @param key - * @return the research item linked to this key - */ - public static ResearchCategoryList getResearchList(String key) { - return researchCategories.get(key); - } - - /** - * @param key - * @return the name of the research category linked to this key. - * Must be stored as localization information in the LanguageRegistry. - */ - public static String getCategoryName(String key) { - return StatCollector.translateToLocal("tc.research_category."+key); - } - - /** - * @param key the research key - * @return the ResearchItem object. - */ - public static ResearchItem getResearch(String key) { - Collection rc = researchCategories.values(); - for (Object cat:rc) { - Collection rl = ((ResearchCategoryList)cat).research.values(); - for (Object ri:rl) { - if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri; - } - } - return null; - } - - /** - * This should only be done at the PostInit stage - * @param key the key used for this category - * @param researchkey the research that the player needs to have completed before this category becomes visible. Set as null to always show. - * @param icon the icon to be used for the research category tab - * @param background the resource location of the background image to use for this category - * @return the name of the research linked to this key - */ - public static void registerCategory(String key, String researchkey, ResourceLocation icon, ResourceLocation background) { - if (getResearchList(key)==null) { - ResearchCategoryList rl = new ResearchCategoryList(researchkey, icon, background); - researchCategories.put(key, rl); - } - } - - /** - * This should only be done at the PostInit stage - * @param key the key used for this category - * @param researchkey the research that the player needs to have completed before this category becomes visible. Set as null to always show. - * @param icon the icon to be used for the research category tab - * @param background the resource location of the background image to use for this category - * @param background2 the resource location of the foreground image that lies between the background and icons - * @return the name of the research linked to this key - */ - public static void registerCategory(String key, String researchkey, ResourceLocation icon, ResourceLocation background, ResourceLocation background2) { - if (getResearchList(key)==null) { - ResearchCategoryList rl = new ResearchCategoryList(researchkey, icon, background, background2); - researchCategories.put(key, rl); - } - } - - public static void addResearch(ResearchItem ri) { - ResearchCategoryList rl = getResearchList(ri.category); - if (rl!=null && !rl.research.containsKey(ri.key)) { - - if (!ri.isVirtual()) { - for (ResearchItem rr:rl.research.values()) { - if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) { - FMLLog.log(Level.FATAL, "[Thaumcraft] Research ["+ri.getName()+"] not added as it overlaps with existing research ["+rr.getName()+"]"); - return; - } - } - } - - - rl.research.put(ri.key, ri); - - if (ri.displayColumn < rl.minDisplayColumn) - { - rl.minDisplayColumn = ri.displayColumn; - } - - if (ri.displayRow < rl.minDisplayRow) - { - rl.minDisplayRow = ri.displayRow; - } - - if (ri.displayColumn > rl.maxDisplayColumn) - { - rl.maxDisplayColumn = ri.displayColumn; - } - - if (ri.displayRow > rl.maxDisplayRow) - { - rl.maxDisplayRow = ri.displayRow; - } - } - } -} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java deleted file mode 100644 index 8645ae152..000000000 --- a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java +++ /dev/null @@ -1,50 +0,0 @@ -package thaumcraft.api.research; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.util.ResourceLocation; - -public class ResearchCategoryList { - - /** Is the smallest column used on the GUI. */ - public int minDisplayColumn; - - /** Is the smallest row used on the GUI. */ - public int minDisplayRow; - - /** Is the biggest column used on the GUI. */ - public int maxDisplayColumn; - - /** Is the biggest row used on the GUI. */ - public int maxDisplayRow; - - /** display variables **/ - public ResourceLocation icon; - public ResourceLocation background; - public ResourceLocation background2; - - public String researchKey; - - public ResearchCategoryList(String researchKey, ResourceLocation icon, ResourceLocation background) { - this.researchKey = researchKey; - this.icon = icon; - this.background = background; - this.background2 = null; - } - - public ResearchCategoryList(String researchKey, ResourceLocation icon, ResourceLocation background, ResourceLocation background2) { - this.researchKey = researchKey; - this.icon = icon; - this.background = background; - this.background2 = background2; - } - - //Research - public Map research = new HashMap(); - - - - - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchHelper.java b/src/api/java/thaumcraft/api/research/ResearchHelper.java deleted file mode 100644 index ad5c26e26..000000000 --- a/src/api/java/thaumcraft/api/research/ResearchHelper.java +++ /dev/null @@ -1,42 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.player.EntityPlayer; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.internal.EnumWarpType; - -public class ResearchHelper { - - public static boolean completeResearch(EntityPlayer player, String researchkey) { - return ThaumcraftApi.internalMethods.completeResearch(player, researchkey); - } - - public static boolean isResearchComplete(String username, String[] researchkeys) { - for (String key:researchkeys) if (!ResearchHelper.isResearchComplete(username, key)) return false; - return true; - } - - public static boolean isResearchComplete(String username, String researchkey) { - return ThaumcraftApi.internalMethods.isResearchComplete(username, researchkey); - } - - /** - * This adds warp to a player. It will automatically be synced clientside - * @param player the player using the wand - * @param amount how much warp to add. Negative amounts are only valid for temporary warp - * @param type the type of warp to be added - */ - public static void addWarpToPlayer(EntityPlayer player, int amount, EnumWarpType type) { - ThaumcraftApi.internalMethods.addWarpToPlayer(player, amount, type); - } - - /** - * This retrieves how much warp the player has - * @param player the player using the wand - * @param type the type of warp to retrieve - * @return how much warp the player has - */ - public static int getPlayerWarp(EntityPlayer player, EnumWarpType type) { - return ThaumcraftApi.internalMethods.getPlayerWarp(player, type); - } - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java deleted file mode 100644 index 711add051..000000000 --- a/src/api/java/thaumcraft/api/research/ResearchItem.java +++ /dev/null @@ -1,303 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class ResearchItem -{ - /** - * A short string used as a key for this research. Must be unique - */ - public final String key; - - /** - * A short string used as a reference to the research category to which this must be added. - */ - public final String category; - - /** - * The aspect tags and their values required to complete this research * - */ - public final AspectList tags; - - /** - * This links to any research that needs to be completed before this research can be discovered or learnt. - */ - public String[] parents = null; - - /** - * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter. - */ - public String[] parentsHidden = null; - - /** - * any research linked to this that will be unlocked automatically when this research is complete - */ - public String[] siblings = null; - - /** - * the horizontal position of the research icon - */ - public final int displayColumn; - - /** - * the vertical position of the research icon - */ - public final int displayRow; - - /** - * the icon to be used for this research - */ - public final ItemStack[] icon_item; - - /** - * the icon to be used for this research - */ - public final ResourceLocation[] icon_resource; - - /** - * How large the research grid is. Valid values are 1 to 3. - */ - private int complexity; - - /** - * Special research has a spiky border. Used for important research milestones. - */ - private boolean isSpecial; - - /** - * Research that can be directly purchased with knowledge fragments - */ - private boolean isSecondary; - - /** - * This indicates if the research should use a circular icon border. Usually used for "passive" research - * that doesn't have recipes and grants passive effects, or that unlock automatically. - */ - private boolean isRound; - - /** - * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system. - */ - private boolean isStub; - - /** - * This indicated that the research is completely hidden and cannot be discovered by any - * player-controlled means. The recipes will never show up in the thaumonomicon. - * Usually used to unlock "hidden" recipes via sibling unlocking, like - * the various cap and rod combos for wands. - */ - private boolean isVirtual; - - /** - * Concealed research does not display in the thaumonomicon until parent researches are discovered. - * Often times some of the parent researches is linked to scanned objects. - */ - private boolean isHidden; - - /** - * These research items will automatically unlock for all players on game start - */ - private boolean isAutoUnlock; - - /** - * Flip the way the connecting lines are drawn in the research browser. - */ - private boolean isFlipped; - - private ResearchPage[] pages = null; - - public ResearchItem(String key, String category) - { - this.key = key; - this.category = category; - this.tags = new AspectList(); - this.icon_resource = null; - this.icon_item = null; - this.displayColumn = 0; - this.displayRow = 0; - this.isVirtual = true; - } - - public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, Object ... icon) - { - this.key = key; - this.category = category; - this.tags = tags; - if (icon[0] instanceof ResourceLocation) { - ResourceLocation[] t = new ResourceLocation[icon.length]; - System.arraycopy(icon, 0, t, 0, icon.length); - this.icon_resource = t; - } else this.icon_resource = null; - if (icon[0] instanceof ItemStack) { - ItemStack[] t = new ItemStack[icon.length]; - System.arraycopy(icon, 0, t, 0, icon.length); - this.icon_item = t; - } else this.icon_item = null; - this.displayColumn = col; - this.displayRow = row; - this.complexity = complex; - if (complexity < 1) this.complexity = 1; - if (complexity > 3) this.complexity = 3; - } - - - public ResearchItem setSpecial() - { - this.isSpecial = true; - return this; - } - - public ResearchItem setStub() - { - this.isStub = true; - return this; - } - - - public ResearchItem setHidden() - { - this.isHidden = true; - return this; - } - - public ResearchItem setParents(String... par) - { - this.parents = par; - return this; - } - - - - public ResearchItem setParentsHidden(String... par) - { - this.parentsHidden = par; - return this; - } - - public ResearchItem setSiblings(String... sib) - { - this.siblings = sib; - return this; - } - - public ResearchItem setPages(ResearchPage... par) - { - this.pages = par; - return this; - } - - public ResearchPage[] getPages() { - return pages; - } - - public ResearchItem registerResearchItem() - { - ResearchCategories.addResearch(this); - return this; - } - - public String getName() - { - return StatCollector.translateToLocal("tc.research_name."+key); - } - - public String getText() - { - return StatCollector.translateToLocal("tc.research_text."+key); - } - - public boolean isSpecial() - { - return this.isSpecial; - } - - public boolean isStub() - { - return this.isStub; - } - - public boolean isHidden() - { - return this.isHidden; - } - - public boolean isVirtual() - { - return this.isVirtual; - } - - public boolean isAutoUnlock() { - return isAutoUnlock; - } - - public ResearchItem setAutoUnlock() - { - this.isAutoUnlock = true; - return this; - } - - public boolean isRound() { - return isRound; - } - - public ResearchItem setRound() { - this.isRound = true; - return this; - } - - public ResearchItem setSecondary() - { - this.isSecondary = true; - return this; - } - - public boolean isSecondary() { - return isSecondary; - } - - public int getComplexity() { - return complexity; - } - - public ResearchItem setFlipped() { - this.isFlipped = true; - return this; - } - - public boolean isFlipped() { - return this.isFlipped; - } - - public ResearchItem setComplexity(int complexity) { - this.complexity = complexity; - return this; - } - - public int getExperience() { - if (this.tags!=null && this.tags.visSize()>0) { - return Math.max(1, (int) Math.sqrt(this.tags.visSize())); - } else - return 0; - } - - /** - * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things - */ - public Aspect getResearchPrimaryTag() { - Aspect aspect=null; - int highest=0; - if (tags!=null) - for (Aspect tag:tags.getAspects()) { - if (tags.getAmount(tag)>highest) { - aspect=tag; - highest=tags.getAmount(tag); - }; - } - return aspect; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java deleted file mode 100644 index 3f32c6788..000000000 --- a/src/api/java/thaumcraft/api/research/ResearchPage.java +++ /dev/null @@ -1,183 +0,0 @@ -package thaumcraft.api.research; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionEnchantmentRecipe; -import thaumcraft.api.crafting.InfusionRecipe; - -public class ResearchPage { - public static enum PageType - { - TEXT, - IMAGE, - CRUCIBLE_CRAFTING, - ARCANE_CRAFTING, - ASPECTS, - NORMAL_CRAFTING, - INFUSION_CRAFTING, - COMPOUND_CRAFTING, - INFUSION_ENCHANTMENT, - SMELTING - } - - public PageType type = PageType.TEXT; - - public String text=null; - public String research=null; - public ResourceLocation image=null; - public AspectList aspects=null; - public Object recipe=null; - public Object recipeOutput=null; - - /** - * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. - */ - public ResearchPage(String text) { - this.type = PageType.TEXT; - this.text = text; - } - - /** - * @param recipe a vanilla crafting recipe. - */ - public ResearchPage(IRecipe recipe) { - this.type = PageType.NORMAL_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe a collection of vanilla crafting recipes. - */ - public ResearchPage(IRecipe[] recipe) { - this.type = PageType.NORMAL_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of arcane crafting recipes. - */ - public ResearchPage(IArcaneRecipe[] recipe) { - this.type = PageType.ARCANE_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of arcane crafting recipes. - */ - public ResearchPage(CrucibleRecipe[] recipe) { - this.type = PageType.CRUCIBLE_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of infusion crafting recipes. - */ - public ResearchPage(InfusionRecipe[] recipe) { - this.type = PageType.INFUSION_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a compound crafting recipe. - */ - public ResearchPage(List recipe) { - this.type = PageType.COMPOUND_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe an arcane worktable crafting recipe. - */ - public ResearchPage(IArcaneRecipe recipe) { - this.type = PageType.ARCANE_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe an alchemy crafting recipe. - */ - public ResearchPage(CrucibleRecipe recipe) { - this.type = PageType.CRUCIBLE_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe a furnace smelting crafting recipe. - */ - public ResearchPage(ItemStack input) { - this.type = PageType.SMELTING; - this.recipe = input; - this.recipeOutput = FurnaceRecipes.instance().getSmeltingResult(input); - } - - /** - * @param recipe an infusion crafting recipe. - */ - public ResearchPage(InfusionRecipe recipe) { - this.type = PageType.INFUSION_CRAFTING; - this.recipe = recipe; - if (recipe.getRecipeOutput() instanceof ItemStack) { - this.recipeOutput = (ItemStack) recipe.getRecipeOutput(); - } else { - this.recipeOutput = recipe.getRecipeInput(); - } - } - - /** - * @param recipe an infusion crafting recipe. - */ - public ResearchPage(InfusionEnchantmentRecipe recipe) { - this.type = PageType.INFUSION_ENCHANTMENT; - this.recipe = recipe; - } - - /** - * @param image - * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text. - */ - public ResearchPage(ResourceLocation image, String caption) { - this.type = PageType.IMAGE; - this.image = image; - this.text = caption; - } - - /** - * This function should really not be called directly - used internally - */ - public ResearchPage(AspectList as) { - this.type = PageType.ASPECTS; - this.aspects = as; - } - - /** - * returns a localized text of the text field (if one exists). Returns the text field itself otherwise. - * @return - */ - public String getTranslatedText() { - String ret=""; - if (text != null) { - ret = StatCollector.translateToLocal(text); - if (ret.isEmpty()) ret = text; - } - return ret; - } - /** - * This page will only be shown if this research is unlocked - */ - public ResearchPage setRequisite(String research) { - this.research = research; - return this; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ScanAspect.java b/src/api/java/thaumcraft/api/research/ScanAspect.java deleted file mode 100644 index ea84ea307..000000000 --- a/src/api/java/thaumcraft/api/research/ScanAspect.java +++ /dev/null @@ -1,61 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectHelper; -import thaumcraft.api.aspects.AspectList; - -public class ScanAspect implements IScanThing { - - String research; - Aspect aspect; - - /** - * NOTE: You should not have to add your own entry for aspects since a trigger research is added automatically for each aspect in the format "![tagname]" - * for example: "!vitium" - */ - - - public ScanAspect(String research, Aspect aspect) { - this.research = research; - this.aspect = aspect; - } - - @Override - public boolean checkThing(EntityPlayer player, Object obj) { - if (obj == null) return false; - - AspectList al = null; - - if (obj instanceof Entity && !(obj instanceof EntityItem)) { - al = AspectHelper.getEntityAspects((Entity) obj); - } else { - ItemStack is = null; - if (obj instanceof ItemStack) - is = (ItemStack) obj; - if (obj instanceof EntityItem && ((EntityItem)obj).getEntityItem()!=null) - is = ((EntityItem)obj).getEntityItem(); - if (obj instanceof BlockPos) { - Block b = player.worldObj.getBlockState((BlockPos) obj).getBlock(); - is = new ItemStack(b,1,b.getMetaFromState(player.worldObj.getBlockState((BlockPos) obj))); - } - - if (is!=null) { - al = AspectHelper.getObjectAspects(is); - } - } - - return al!=null && al.getAmount(aspect)>0; - } - - @Override - public String getResearchKey() { - return research; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ScanBlock.java b/src/api/java/thaumcraft/api/research/ScanBlock.java deleted file mode 100644 index 31935d7de..000000000 --- a/src/api/java/thaumcraft/api/research/ScanBlock.java +++ /dev/null @@ -1,30 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; - -public class ScanBlock implements IScanThing { - - String research; - Block block; - - public ScanBlock(String research, Block block) { - this.research = research; - this.block = block; - } - - - @Override - public boolean checkThing(EntityPlayer player, Object obj) { - if (obj!=null && obj instanceof BlockPos && player.worldObj.getBlockState((BlockPos) obj).getBlock()==block) { - return true; - } - return false; - } - - @Override - public String getResearchKey() { - return research; - } -} diff --git a/src/api/java/thaumcraft/api/research/ScanBlockState.java b/src/api/java/thaumcraft/api/research/ScanBlockState.java deleted file mode 100644 index 47464f24c..000000000 --- a/src/api/java/thaumcraft/api/research/ScanBlockState.java +++ /dev/null @@ -1,38 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; - -public class ScanBlockState implements IScanThing { - - String research; - IBlockState blockState; - - public ScanBlockState(String research, IBlockState blockState) { - this.research = research; - this.blockState = blockState; - } - - public ScanBlockState(String research, IBlockState blockState, boolean item) { - this.research = research; - this.blockState = blockState; - if (item) - ScanningManager.addScannableThing(new ScanItem(research, - new ItemStack(blockState.getBlock(),1,blockState.getBlock().getMetaFromState(blockState)))); - } - - @Override - public boolean checkThing(EntityPlayer player, Object obj) { - if (obj!=null && obj instanceof BlockPos && player.worldObj.getBlockState((BlockPos) obj)==blockState) { - return true; - } - return false; - } - - @Override - public String getResearchKey() { - return research; - } -} diff --git a/src/api/java/thaumcraft/api/research/ScanEntity.java b/src/api/java/thaumcraft/api/research/ScanEntity.java deleted file mode 100644 index d732da0b7..000000000 --- a/src/api/java/thaumcraft/api/research/ScanEntity.java +++ /dev/null @@ -1,57 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; -import thaumcraft.api.ThaumcraftApiHelper; - -public class ScanEntity implements IScanThing { - - String research; - Class entityClass; - EntityTagsNBT[] NBTData; - - /** - * false if the specific entity class should be used, or true if anything the inherits from that class is also allowed. - */ - boolean inheritedClasses=false; - - public ScanEntity(String research, Class entityClass, boolean inheritedClasses) { - this.research = research; - this.entityClass = entityClass; - this.inheritedClasses = inheritedClasses; - } - - public ScanEntity(String research, Class entityClass, boolean inheritedClasses, EntityTagsNBT... nbt) { - this.research = research; - this.entityClass = entityClass; - this.inheritedClasses = inheritedClasses; - this.NBTData = nbt; - } - - @Override - public boolean checkThing(EntityPlayer player, Object obj) { - if (obj!=null && ((!inheritedClasses && entityClass==obj.getClass()) || - (inheritedClasses && entityClass.isInstance(obj)))) { - if (NBTData!=null && NBTData.length>0) { - boolean b = true; - NBTTagCompound tc = new NBTTagCompound(); - ((Entity)obj).writeToNBT(tc); - for (EntityTagsNBT nbt:NBTData) { - if (!tc.hasKey(nbt.name) || !ThaumcraftApiHelper.getNBTDataFromId(tc, tc.getTagId(nbt.name), nbt.name).equals(nbt.value)) { - return false; - } - } - } - return true; - } - return false; - } - - @Override - public String getResearchKey() { - return research; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ScanItem.java b/src/api/java/thaumcraft/api/research/ScanItem.java deleted file mode 100644 index 59afe9366..000000000 --- a/src/api/java/thaumcraft/api/research/ScanItem.java +++ /dev/null @@ -1,37 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import thaumcraft.api.ThaumcraftApiHelper; - -public class ScanItem implements IScanThing { - - String research; - ItemStack stack; - - public ScanItem(String research, ItemStack stack) { - this.research = research; - this.stack = stack; - } - - @Override - public boolean checkThing(EntityPlayer player, Object obj) { - if (obj == null) return false; - - ItemStack is = null; - - if (obj instanceof ItemStack) - is = (ItemStack) obj; - if (obj instanceof EntityItem && ((EntityItem)obj).getEntityItem()!=null) - is = ((EntityItem)obj).getEntityItem(); - - return is!=null && ThaumcraftApiHelper.areItemStacksEqualForCrafting(is, stack); - } - - @Override - public String getResearchKey() { - return research; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ScanningManager.java b/src/api/java/thaumcraft/api/research/ScanningManager.java deleted file mode 100644 index 6c5a1f0b3..000000000 --- a/src/api/java/thaumcraft/api/research/ScanningManager.java +++ /dev/null @@ -1,58 +0,0 @@ -package thaumcraft.api.research; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; - -public class ScanningManager { - - static ArrayList things = new ArrayList(); - - /** - * Add things to scan - * @example - * ScanManager.addScannableThing(new ScanItem("HIPSTER",new ItemStack(Items.apple,1,OreDictionary.WILDCARD_VALUE)));
- * This will unlock the HIPSTER research if you scan any kind of apple. - */ - public static void addScannableThing(IScanThing obj) { - things.add(obj); - } - - /** - * - * @param player - * @param object this could in theory be anything, but vanilla tc scanning tools only pass in Entity, BlockPos, Itemstack or null - */ - public static void scanTheThing(EntityPlayer player, Object object) { - boolean found = false; - for (IScanThing thing:things) { - if (thing.checkThing(player, object)) { - if (ResearchHelper.completeResearch(player, thing.getResearchKey())) { - found=true; - } - } - } - if (!found) { - player.addChatMessage(new ChatComponentText("\u00a75\u00a7o"+StatCollector.translateToLocal("tc.unknownobject"))); - } - } - - /** - * @param player - * @param object - * @return true if the object can be scanned for research the player has not yet discovered - */ - public static boolean isThingStillScannable(EntityPlayer player, Object object) { - for (IScanThing thing:things) { - if (thing.checkThing(player, object)) { - if (!ResearchHelper.isResearchComplete(player.getCommandSenderName(), thing.getResearchKey())) { - return true; - } - } - } - return false; - } - -} diff --git a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java deleted file mode 100644 index 7ba6f1c59..000000000 --- a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java +++ /dev/null @@ -1,107 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class FocusUpgradeType { - - public static FocusUpgradeType[] types = new FocusUpgradeType[20]; - - public short id; - - public ResourceLocation icon; - - public String name; - - public String text; - - /** - * What aspects are used to calculate the cost of this upgrade. The amounts given is ignored, just the type is used for the calculation. - */ - public AspectList aspects; - - private static int lastID = 0; - - public FocusUpgradeType(ResourceLocation icon, String name, String text, AspectList aspects) { - this.id = (short) lastID; - lastID++; - this.icon = icon; - this.name = name; - this.text = text; - this.aspects = aspects; - - // allocate space - if (id>=types.length) { - FocusUpgradeType[] temp = new FocusUpgradeType[id+1]; - System.arraycopy(types, 0, temp, 0, types.length); - types = temp; - } - - types[id] = this; - } - - public String getLocalizedName() { - return StatCollector.translateToLocal(name); - } - - public String getLocalizedText() { - return StatCollector.translateToLocal(text); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof FocusUpgradeType) { - return this.id == ((FocusUpgradeType)obj).id; - } else return false; - } - - // basic upgrade types - public static FocusUpgradeType potency = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/potency.png"), - "focus.upgrade.potency.name","focus.upgrade.potency.text", - new AspectList().add(Aspect.AVERSION,1)); - - public static FocusUpgradeType frugal = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/frugal.png"), - "focus.upgrade.frugal.name","focus.upgrade.frugal.text", - new AspectList().add(Aspect.DESIRE,1)); - - public static FocusUpgradeType treasure = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/treasure.png"), - "focus.upgrade.treasure.name","focus.upgrade.treasure.text", - new AspectList().add(Aspect.DESIRE,1)); - - public static FocusUpgradeType enlarge = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/enlarge.png"), - "focus.upgrade.enlarge.name","focus.upgrade.enlarge.text", - new AspectList().add(Aspect.MOTION,1)); - - public static FocusUpgradeType alchemistsfire = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/alchemistsfire.png"), - "focus.upgrade.alchemistsfire.name","focus.upgrade.alchemistsfire.text", - new AspectList().add(Aspect.ENERGY,1).add(Aspect.WATER,1)); - - public static FocusUpgradeType alchemistsfrost = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/alchemistsfrost.png"), - "focus.upgrade.alchemistsfrost.name","focus.upgrade.alchemistsfrost.text", - new AspectList().add(Aspect.COLD,1).add(Aspect.TRAP,1)); - - public static FocusUpgradeType architect = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/architect.png"), - "focus.upgrade.architect.name","focus.upgrade.architect.text", - new AspectList().add(Aspect.CRAFT,1)); - - public static FocusUpgradeType extend = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/extend.png"), - "focus.upgrade.extend.name","focus.upgrade.extend.text", - new AspectList().add(Aspect.EXCHANGE,1)); - - public static FocusUpgradeType silktouch = new FocusUpgradeType( - new ResourceLocation("thaumcraft", "textures/foci/silktouch.png"), - "focus.upgrade.silktouch.name","focus.upgrade.silktouch.text", - new AspectList().add(Aspect.DESIRE,1)); - - -} diff --git a/src/api/java/thaumcraft/api/wands/IWand.java b/src/api/java/thaumcraft/api/wands/IWand.java deleted file mode 100644 index 123f7e6b4..000000000 --- a/src/api/java/thaumcraft/api/wands/IWand.java +++ /dev/null @@ -1,54 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public interface IWand { - - public abstract int getMaxVis(ItemStack stack); - - public abstract int getVis(ItemStack is, Aspect aspect); - - public abstract AspectList getAllVis(ItemStack is); - - public abstract AspectList getAspectsWithRoom(ItemStack wandstack); - - public abstract float getConsumptionModifier(ItemStack is, EntityPlayer player, Aspect aspect, boolean crafting); - - public abstract boolean consumeVis(ItemStack is, EntityPlayer player, Aspect aspect, int amount, boolean crafting); - - public abstract boolean consumeAllVis(ItemStack is, EntityPlayer player, AspectList aspects, boolean doit, boolean crafting); - - public abstract int addVis(ItemStack is, Aspect aspect, int amount, boolean doit); - - public abstract ItemFocusBasic getFocus(ItemStack stack); - - public abstract ItemStack getFocusStack(ItemStack stack); - - public abstract void setFocus(ItemStack stack, ItemStack focus); - - public abstract WandRod getRod(ItemStack stack); - - public abstract boolean isStaff(ItemStack stack); - - public abstract boolean isSceptre(ItemStack stack); - - public abstract void setRod(ItemStack stack, WandRod rod); - - public abstract WandCap getCap(ItemStack stack); - - public abstract void setCap(ItemStack stack, WandCap cap); - - public abstract int getFocusPotency(ItemStack itemstack); - - public abstract int getFocusTreasure(ItemStack itemstack); - - public abstract int getFocusFrugal(ItemStack itemstack); - - public abstract int getFocusEnlarge(ItemStack itemstack); - - public abstract int getFocusExtend(ItemStack itemstack); - -} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java deleted file mode 100644 index ca98562ee..000000000 --- a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java +++ /dev/null @@ -1,16 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * - * @author azanor - * - * Implemented by a class that you wish to be called whenever a wand with this rod performs its - * update tick. - * - */ -public interface IWandRodOnUpdate { - void onUpdate(ItemStack itemstack, EntityPlayer player); -} diff --git a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java deleted file mode 100644 index 685087182..000000000 --- a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java +++ /dev/null @@ -1,17 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -public interface IWandTriggerManager { - - /** - * This class will be called by wands with the proper parameters. It is up to you to decide what to do with them. - */ - public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - BlockPos pos, EnumFacing side, int event); - -} diff --git a/src/api/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java deleted file mode 100644 index 17d965970..000000000 --- a/src/api/java/thaumcraft/api/wands/IWandable.java +++ /dev/null @@ -1,25 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -/** - * - * @author azanor - * - * Add this to a tile entity that you wish wands to interact with in some way. - * - */ - -public interface IWandable { - - public boolean onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, BlockPos pos, EnumFacing side); - - public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count); - - public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count); - -} diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java deleted file mode 100644 index b57132014..000000000 --- a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java +++ /dev/null @@ -1,313 +0,0 @@ -package thaumcraft.api.wands; - -import java.text.DecimalFormat; -import java.util.LinkedHashMap; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class ItemFocusBasic extends Item { - - public ItemFocusBasic (String id, ResourceLocation texture, int renderColor) - { - super(); - maxStackSize = 1; - canRepair=false; - this.setMaxDamage(0); - this.id = id; - this.texture = texture; - foci.put(id, this); - this.focusColor = renderColor; - } - - public ItemFocusBasic (String id, int renderColor) - { - this(id,new ResourceLocation("thaumcraft","items/wand/focus"), renderColor); - } - - public static LinkedHashMap foci = new LinkedHashMap(); - - /** - * Unique identifier used for this focus - */ - private String id; - - public String getFocusId() { - return id; - } - - /** - * Texture used to render the cap on the wand - */ - private ResourceLocation texture; - - public ResourceLocation getFocusTexture() { - return texture; - } - - /** - * What color the focus will be rendered ingame on the wand - */ - private int focusColor=0; - - /** - * What color will the focus orb be rendered on the held wand - */ - public int getFocusColor(ItemStack focusstack) { - return this.focusColor; - } - - @Override - public boolean isDamageable() { - return false; - } - - public boolean canBePlacedInTurret() { - return false; - } - - /** - * This is used to correct for foci that shoot projectiles effected by gravity. - * The number will be modified by range to the target - * @return a number to add to the angle the turrent aims at. - */ - public float getTurretCorrection(ItemStack focusstack) { - return 0; - } - - /** - * @return the possible range of the attack - if the entity is outside this range the turret will not attempt to attack it. Values higher than 32 will have no effect - */ - public float getTurretRange(ItemStack focusstack) { - return 32; - } - - @Override - public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) { - AspectList al = this.getVisCost(stack); - if (al!=null && al.size()>0) { - list.add(StatCollector.translateToLocal(isVisCostPerTick(stack)?"item.Focus.cost2":"item.Focus.cost1")); - for (Aspect aspect:al.getAspectsSortedByName()) { - DecimalFormat myFormatter = new DecimalFormat("#####.##"); - String amount = myFormatter.format(al.getAmount(aspect)); - list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount); - } - } - addFocusInformation(stack,player,list,par4); - } - - public void addFocusInformation(ItemStack focusstack,EntityPlayer player, List list, boolean par4) { - LinkedHashMap map = new LinkedHashMap(); - for (short id:this.getAppliedUpgrades(focusstack)) { - if (id>=0) { - int amt = 1; - if (map.containsKey(id)) { - amt = map.get(id) + 1; - } - map.put(id, amt); - } - } - for (Short id:map.keySet()) { - list.add(EnumChatFormatting.DARK_PURPLE +FocusUpgradeType.types[id].getLocalizedName()+ - (map.get(id)>1?" "+StatCollector.translateToLocal("enchantment.level." + map.get(id)):"")); - } - } - - /** - * Purely for display on the focus tooltip (see addInformation method above) - */ - public boolean isVisCostPerTick(ItemStack focusstack) { - return false; - } - - @Override - public EnumRarity getRarity(ItemStack focusstack) - { - return EnumRarity.RARE; - } - - - - - public enum WandFocusAnimation { - WAVE, CHARGE; - } - - public WandFocusAnimation getAnimation(ItemStack focusstack) { - return WandFocusAnimation.WAVE; - } - - /** - * Just insert two alphanumeric characters before this string in your focus item class - */ - public String getSortingHelper(ItemStack focusstack) { - String out=this.id; - for (short id:this.getAppliedUpgrades(focusstack)) { - out = out + id; - } - return out; - } - - - /** - * How much vis does this focus consume per activation. - */ - public AspectList getVisCost(ItemStack focusstack) { - return null; - } - - /** - * This returns how many milliseconds must pass before the focus can be activated again. - */ - public int getActivationCooldown(ItemStack focusstack) { - return 0; - } - - /** - * Used by foci like equal trade to determine their area in artchitect mode - */ - public int getMaxAreaSize(ItemStack focusstack) { - return 1; - } - - /** - * What upgrades can be applied to this focus for ranks 1 to 5 - */ - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { - return null; - } - - /** - * What upgrades does the focus currently have - */ - public short[] getAppliedUpgrades(ItemStack focusstack) { - short[] l = new short[] {-1,-1,-1,-1,-1}; - NBTTagList nbttaglist = getFocusUpgradeTagList(focusstack); - if (nbttaglist == null) - { - return l; - } - else - { - for (int j = 0; j < nbttaglist.tagCount(); ++j) - { - if (j>=5) break; - l[j] = nbttaglist.getCompoundTagAt(j).getShort("id"); - } - - return l; - } - } - - public boolean applyUpgrade(ItemStack focusstack, FocusUpgradeType type, int rank) { - short[] upgrades = getAppliedUpgrades(focusstack); - if (upgrades[rank-1]!=-1 || rank<1 || rank>5) { - return false; - } - upgrades[rank-1] = type.id; - setFocusUpgradeTagList(focusstack, upgrades); - return true; - } - - /** - * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" - * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic. - * - */ - public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { - return true; - } - - /** - * Does this focus have the passed upgrade type - */ - public boolean isUpgradedWith(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { - return getUpgradeLevel(focusstack,focusUpgradetype)>0; - } - - /** - * What level is the passed upgrade type on the focus. If it is not present it returns 0 - */ - public int getUpgradeLevel(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { - short[] list = getAppliedUpgrades(focusstack); - int level=0; - for (short id:list) { - if (id == focusUpgradetype.id) - { - level++; - } - } - return level; - } - - /** - * This method will be called whenever you right click, and possibly per wand usage tick depending on isVisCostPerTick - * IMPORTANT: It should be noted that vis consumption is now handled by the wand and not the focus so do not subtract any vis here. - * @param wandstack - * @param world - * @param entity - do not assume it will always be a player since it could be used by other entities as well - * @param movingobjectposition The target - * @param useCount the amount of ticks the item has been used for - * @return did the focus actually activate. Used to determine if vis should be consumed or not. - */ - public boolean onFocusActivation(ItemStack wandstack, World world, EntityLivingBase entity, MovingObjectPosition movingobjectposition, int useCount) { - return true; - } - - -// public ItemStack onFocusRightClick(ItemStack wandstack, World world,EntityPlayer player, MovingObjectPosition movingobjectposition) { -// // TODO Auto-generated method stub -// return null; -// } -// -// public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player,int count) { -// // TODO Auto-generated method stub -// } -// -// public void onPlayerStoppedUsingFocus(ItemStack wandstack, World world, EntityPlayer player, int count) { -// // TODO Auto-generated method stub -// -// } - - public boolean onFocusBlockStartBreak(ItemStack wandstack, BlockPos pos, EntityPlayer player) { - // TODO Auto-generated method stub - return false; - } - - /** - * Internal helper methods - */ - private NBTTagList getFocusUpgradeTagList(ItemStack focusstack) - { - return focusstack.getTagCompound() == null ? null : focusstack.getTagCompound().getTagList("upgrade", 10); - } - - private void setFocusUpgradeTagList(ItemStack focusstack, short[] upgrades) { - if (!focusstack.hasTagCompound()) - focusstack.setTagCompound(new NBTTagCompound()); - NBTTagCompound nbttagcompound = focusstack.getTagCompound(); - NBTTagList tlist = new NBTTagList(); - nbttagcompound.setTag("upgrade", tlist); - for (short id : upgrades) { - NBTTagCompound f = new NBTTagCompound(); - f.setShort("id", id); - tlist.appendTag(f); - } - } - - -} diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java deleted file mode 100644 index 3c12b9936..000000000 --- a/src/api/java/thaumcraft/api/wands/WandCap.java +++ /dev/null @@ -1,142 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.LinkedHashMap; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.Aspect; - -/** - * This class is used to keep the material information for the various caps. - * It is also used to generate the wand recipes ingame. - * @author Azanor - * - */ -public class WandCap { - - private String tag; - - /** - * Cost to craft this wand. Combined with the rod cost. - */ - private int craftCost; - - /** - * the amount by which all aspect costs are multiplied - */ - float baseCostModifier; - - /** - * how many additional vis is gained per charge 'tick' (one charge tick occurs every 5 game ticks) - * examples: brass caps have a bonus of 1 and void caps have a bonus of 3 - */ - int chargeBonus; - - - /** - * specifies a list of primal aspects that use the special discount figure instead of the normal discount. - */ - List specialCostModifierAspects; - - /** - * the amount by which the specified aspect costs are multiplied - */ - float specialCostModifier; - - /** - * The texture that will be used for the ingame wand cap - */ - ResourceLocation texture; - - /** - * the actual item that makes up this cap and will be used to generate the wand recipes - */ - ItemStack item; - - public static LinkedHashMap caps = new LinkedHashMap(); - - public WandCap (String tag, float discount, int charge, ItemStack item, int craftCost, ResourceLocation texture) { - this.setTag(tag); - this.baseCostModifier = discount; - this.specialCostModifierAspects = null; - this.texture = texture; - this.item=item; - this.chargeBonus = charge; - this.setCraftCost(craftCost); - caps.put(tag, this); - } - - public WandCap (String tag, float discount, int charge, List specialAspects, float discountSpecial, ItemStack item, int craftCost, ResourceLocation texture) { - this.setTag(tag); - this.baseCostModifier = discount; - this.specialCostModifierAspects = specialAspects; - this.specialCostModifier = discountSpecial; - this.texture = texture; - this.item=item; - this.chargeBonus = charge; - this.setCraftCost(craftCost); - caps.put(tag, this); - } - - public float getBaseCostModifier() { - return baseCostModifier; - } - - public List getSpecialCostModifierAspects() { - return specialCostModifierAspects; - } - - public float getSpecialCostModifier() { - return specialCostModifier; - } - - public int getChargeBonus() { - return chargeBonus; - } - - public ResourceLocation getTexture() { - return texture; - } - - public void setTexture(ResourceLocation texture) { - this.texture = texture; - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - - public ItemStack getItem() { - return item; - } - - public void setItem(ItemStack item) { - this.item = item; - } - - public int getCraftCost() { - return craftCost; - } - - public void setCraftCost(int craftCost) { - this.craftCost = craftCost; - } - - /** - * The research a player needs to have finished to be able to craft a wand with this cap. - */ - public String getResearch() { - return "CAP_"+getTag(); - } - - // Some examples: - // WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1); - // WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3); - -} diff --git a/src/api/java/thaumcraft/api/wands/WandHelper.java b/src/api/java/thaumcraft/api/wands/WandHelper.java deleted file mode 100644 index 53751dad0..000000000 --- a/src/api/java/thaumcraft/api/wands/WandHelper.java +++ /dev/null @@ -1,36 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.AspectList; - -public class WandHelper { - - /** - * Use to subtract vis from a wand for most operations - * @param wand the wand itemstack - * @param player the player using the wand - * @param cost the cost of the operation. - * @param doit actually subtract the vis from the wand if true - if false just simulate the result - * @param crafting is this a crafting operation or not - if - * false then things like frugal and potency will apply to the costs - * @return was the vis successfully subtracted - */ - public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, - AspectList cost, boolean doit, boolean crafting) { - return ThaumcraftApi.internalMethods.consumeVisFromWand(wand, player, cost, doit, crafting); - } - - /** - * Subtract vis from a wand the player is carrying. The costs are handled like crafting however and things like - * frugal don't effect them - * @param player the player using the wand - * @param cost the cost of the operation. - * @return was the vis successfully subtracted - */ - public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { - return ThaumcraftApi.internalMethods.consumeVisFromInventory(player, cost); - } - -} diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java deleted file mode 100644 index 5aeffa235..000000000 --- a/src/api/java/thaumcraft/api/wands/WandRod.java +++ /dev/null @@ -1,155 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -/** - * - * @author Azanor - * - * This class is used to keep the material information for the various rods. - * It is also used to generate the wand recipes ingame. - * - */ -public class WandRod { - - - private String tag; - - /** - * Cost to craft this wand. Combined with the rod cost. - */ - private int craftCost; - - /** - * The amount of vis that can be stored - */ - int capacity; - - /** - * The texture that will be used for the ingame wand rod - */ - protected ResourceLocation texture; - - /** - * the actual item that makes up this rod and will be used to generate the wand recipes - */ - ItemStack item; - - /** - * A class that will be called whenever the wand onUpdate tick is run - */ - IWandRodOnUpdate onUpdate; - - /** - * Is this a staff rod? - */ - private boolean isStaff=false; - - /** - * Does this rod give a free level of potency? - */ - private boolean potencyBonus=false; - - public static LinkedHashMap rods = new LinkedHashMap(); - - public static WandRod getRod(String tag) { - return rods.get(tag); - } - - public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) { - this.setTag(tag); - this.capacity = capacity; - this.texture = texture; - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - } - - public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) { - this.setTag(tag); - this.capacity = capacity; - this.texture = texture; - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - this.onUpdate = onUpdate; - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public int getCapacity() { - return capacity; - } - - public void setCapacity(int capacity) { - this.capacity = capacity; - } - - public ResourceLocation getTexture() { - return texture; - } - - public void setTexture(ResourceLocation texture) { - this.texture = texture; - } - - public ItemStack getItem() { - return item; - } - - public void setItem(ItemStack item) { - this.item = item; - } - - public int getCraftCost() { - return craftCost; - } - - public void setCraftCost(int craftCost) { - this.craftCost = craftCost; - } - - public IWandRodOnUpdate getOnUpdate() { - return onUpdate; - } - - public void setOnUpdate(IWandRodOnUpdate onUpdate) { - this.onUpdate = onUpdate; - } - - /** - * The research a player needs to have finished to be able to craft a wand with this rod. - */ - public String getResearch() { - return "ROD_"+getTag(); - } - - public boolean isStaff() { - return isStaff; - } - - public void setStaff(boolean isStaff) { - this.isStaff = isStaff; - } - - public boolean hasPotencyBonus() { - return potencyBonus; - } - - public void setPotencyBonus(boolean potencyBonus) { - this.potencyBonus = potencyBonus; - } - - // Some examples: - // WandRod WAND_ROD_WOOD = new WandRod("wood",250,new ItemStack(Item.stick),1,new ResourceLocation("thaumcraft","items/wand/cap_iron_mat")); - // WandRod WAND_ROD_BLAZE = new WandRod("blaze",750,new ItemStack(Item.blazeRod),7,new ResourceLocation("thaumcraft","items/wand/rod_blaze_mat"),new WandRodBlazeOnUpdate()); -} diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java deleted file mode 100644 index 6c5410d4e..000000000 --- a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java +++ /dev/null @@ -1,124 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -/** - * This class serves a similar function to IWandable in that it allows wands to interact - * with object in the world. In this case it is most useful for adding interaction with non-mod - * blocks where you can't control what happens in their code. - * Example where it is used is in crafting the thaumonomicon from a bookshelf and the - * crucible from a cauldron - * - * @author azanor - * - */ -public class WandTriggerRegistry { - - private static HashMap> triggers = new HashMap>(); - private static final String DEFAULT = "default"; - - /** - * Registers an action to perform when a casting wand right clicks on a specific block. - * A manager class needs to be created that implements IWandTriggerManager. - * @param manager - * @param event a logical number that you can use to differentiate different events or actions - * @param blockState - * @param meta send -1 as a wildcard value for all possible meta values - * @param modid a unique identifier. It is best to register your own triggers using your mod id to avoid conflicts with mods that register triggers for the same block - */ - public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, IBlockState state, String modid) { - if (!triggers.containsKey(modid)) { - triggers.put(modid, new HashMap()); - } - HashMap temp = triggers.get(modid); - temp.put(state,Arrays.asList(manager,event)); - triggers.put(modid, temp); - } - - /** - * for legacy support - */ - public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, IBlockState state) { - registerWandBlockTrigger(manager, event, state, DEFAULT); - } - - /** - * Checks all trigger registries if one exists for the given block and meta - * @param blockState - * @param meta - * @return - */ - public static boolean hasTrigger(IBlockState state) { - for (String modid:triggers.keySet()) { - HashMap temp = triggers.get(modid); - if (temp.containsKey(state)) return true; - } - return false; - } - - /** - * modid sensitive version - */ - public static boolean hasTrigger(IBlockState state, String modid) { - if (!triggers.containsKey(modid)) return false; - HashMap temp = triggers.get(modid); - if (temp.containsKey(state)) return true; - return false; - } - - - /** - * This is called by the onItemUseFirst function in wands. - * Parameters and return value functions like you would expect for that function. - * @param world - * @param wand - * @param player - * @param x - * @param y - * @param z - * @param side - * @param blockState - * @param meta - * @return - */ - public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - BlockPos pos, EnumFacing side, IBlockState state) { - - for (String modid:triggers.keySet()) { - HashMap temp = triggers.get(modid); - List l = temp.get(state); - if (l==null) continue; - - IWandTriggerManager manager = (IWandTriggerManager) l.get(0); - int event = (Integer) l.get(1); - boolean result = manager.performTrigger(world, wand, player, pos, side, event); - if (result) return true; - } - return false; - } - - /** - * modid sensitive version - */ - public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - BlockPos pos, EnumFacing side, IBlockState state, String modid) { - if (!triggers.containsKey(modid)) return false; - HashMap temp = triggers.get(modid); - List l = temp.get(state); - if (l==null) return false; - - IWandTriggerManager manager = (IWandTriggerManager) l.get(0); - int event = (Integer) l.get(1); - return manager.performTrigger(world, wand, player, pos, side, event); - } - -} From 4c0922f0b470fc3b21ab2212f9628a81a7682397 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 01:04:51 -0600 Subject: [PATCH 025/935] Update Botania refs to TC api --- .../equipment/armor/manasteel/ItemManasteelArmor.java | 4 ++-- .../botania/common/item/equipment/bauble/ItemBauble.java | 4 ++-- .../thaumcraft/ItemElementiumHelmRevealing.java | 8 ++++---- .../item/interaction/thaumcraft/ItemManaInkwell.java | 4 ++-- .../thaumcraft/ItemManasteelHelmRevealing.java | 8 ++++---- .../thaumcraft/ItemTerrasteelHelmRevealing.java | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index f2c542de3..250bd1a12 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -26,7 +26,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import thaumcraft.api.IRunicArmor; +import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; @@ -44,7 +44,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") +@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { private static final int MANA_PER_DAMAGE = 70; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 060a69b65..7272cbd78 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.api.IRunicArmor; +import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.achievement.ModAchievements; @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor") +@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { private static final String TAG_HASHCODE = "playerHashcode"; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 75de52678..43d0e47a7 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -12,8 +12,8 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; +import thaumcraft.api.items.IGoggles; +import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; @@ -21,8 +21,8 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true)}) + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRevealer", striprefs = true)}) public class ItemElementiumHelmRevealing extends ItemElementiumHelm implements IGoggles, IRevealer { public ItemElementiumHelmRevealing() { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 68180eeb7..fe3494559 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -17,14 +17,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import thaumcraft.api.IScribeTools; +import thaumcraft.api.items.IScribeTools; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.Optional; -@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IScribeTools") +@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { private static final int COST_PER_USE = 50; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index adbdbbe4f..45af183af 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -14,8 +14,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; +import thaumcraft.api.items.IGoggles; +import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; @@ -25,8 +25,8 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.InterfaceList({ - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true)}) + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRevealer", striprefs = true)}) public class ItemManasteelHelmRevealing extends ItemManasteelHelm implements IGoggles, IRevealer { public ItemManasteelHelmRevealing() { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index 618e48c0c..82c70a5fa 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -12,8 +12,8 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; +import thaumcraft.api.items.IGoggles; +import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; @@ -21,8 +21,8 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), - @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true)}) + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRevealer", striprefs = true)}) public class ItemTerrasteelHelmRevealing extends ItemTerrasteelHelm implements IGoggles, IRevealer { public ItemTerrasteelHelmRevealing() { From 9cbd2708dbff477701df85827058922703a39f53 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 08:33:32 -0600 Subject: [PATCH 026/935] Base item package, tc interaction items --- .../botania/api/item/IHornHarvestable.java | 7 +- .../common/block/decor/BlockModMushroom.java | 6 +- .../common/block/decor/BlockShinyFlower.java | 6 +- .../common/item/ItemBlackHoleTalisman.java | 19 ++- .../botania/common/item/ItemCacophonium.java | 10 +- .../common/item/ItemCorporeaSpark.java | 12 +- .../botania/common/item/ItemCraftPattern.java | 8 +- .../botania/common/item/ItemCraftingHalo.java | 18 +-- .../botania/common/item/ItemFertilizer.java | 19 ++- .../botania/common/item/ItemFlowerBag.java | 7 +- .../botania/common/item/ItemGaiaHead.java | 139 +++++++++--------- .../botania/common/item/ItemGrassHorn.java | 34 ++--- .../botania/common/item/ItemGrassSeeds.java | 66 ++++----- .../botania/common/item/ItemLaputaShard.java | 83 +++++------ .../botania/common/item/ItemLexicon.java | 19 +-- .../botania/common/item/ItemManaCookie.java | 2 +- .../botania/common/item/ItemManaGun.java | 5 - .../botania/common/item/ItemManaMirror.java | 29 ++-- .../botania/common/item/ItemManaTablet.java | 10 -- .../common/item/ItemObedienceStick.java | 18 +-- .../botania/common/item/ItemOpenBucket.java | 18 +-- .../thaumcraft/ItemManaInkwell.java | 5 - 22 files changed, 254 insertions(+), 286 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java index a74af38dc..654d289c5 100644 --- a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java +++ b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -22,20 +23,20 @@ public interface IHornHarvestable { * Returns true if this block can be uprooted. * Note that the stack param can be null if it's a drum breaking it. */ - public boolean canHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType); + public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); /** * Returns true if harvestByHorn() should be called. If false it just uses the normal * block breaking method. * Note that the stack param can be null if it's a drum breaking it. */ - public boolean hasSpecialHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType); + public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); /** * Called to harvest by a horn. * Note that the stack param can be null if it's a drum breaking it. */ - public void harvestByHorn(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType); + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType); public static enum EnumHornType { 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 13f3dff72..f9fc03820 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -138,17 +138,17 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public boolean canHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { return false; } @Override - public boolean hasSpecialHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { return false; } @Override - public void harvestByHorn(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 74986f074..c1bb54f97 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -67,17 +67,17 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean canHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { return false; } @Override - public boolean hasSpecialHornHarvest(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { return false; } @Override - public void harvestByHorn(World world, int x, int y, int z, ItemStack stack, EnumHornType hornType) { + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 7dae1cef9..f36a37702 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -71,18 +72,17 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int meta = par3World.getBlockMetadata(par4, par5, par6); - boolean set = setBlock(par1ItemStack, block, meta); + IBlockState state = par3World.getBlockState(pos); + boolean set = setBlock(par1ItemStack, state.getBlock(), state.getBlock().getMetaFromState(state)); if(!set) { Block bBlock = getBlock(par1ItemStack); int bmeta = getBlockMeta(par1ItemStack); - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = par3World.getTileEntity(pos); if(tile != null && tile instanceof IInventory) { IInventory inv = (IInventory) tile; - int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(par7) : InventoryHelper.buildSlotsForLinearInventory(inv); + int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : InventoryHelper.buildSlotsForLinearInventory(inv); for(int slot : slots) { ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == null) { @@ -90,7 +90,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { int maxSize = stack.getMaxStackSize(); stack.stackSize = remove(par1ItemStack, maxSize); if(stack.stackSize != 0) { - if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, par7))) { + if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, side))) { inv.setInventorySlotContents(slot, stack); inv.markDirty(); set = true; @@ -99,7 +99,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) { int maxSize = stackInSlot.getMaxStackSize(); int missing = maxSize - stackInSlot.stackSize; - if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, par7))) { + if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, side))) { stackInSlot.stackSize += remove(par1ItemStack, missing); inv.markDirty(); set = true; @@ -107,8 +107,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } } else { - ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); @@ -116,7 +115,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { ItemStack stack = new ItemStack(bBlock, 1, bmeta); ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack)); - Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, pos, side, par8, par9, par10); set = true; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index b552d36b3..a6b1e36b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -24,6 +24,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; @@ -82,7 +84,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { boolean can = isDOIT(stack); if(!can) { String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); @@ -92,10 +94,10 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } if(can) { - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); if(block == Blocks.noteblock) { - world.setBlock(x, y, z, ModBlocks.cacophonium); - ((TileCacophonium) world.getTileEntity(x, y, z)).stack = stack.copy(); + world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); + ((TileCacophonium) world.getTileEntity(pos)).stack = stack.copy(); stack.stackSize--; return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index a83a92818..6675da929 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -19,6 +19,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.corporea.CorporeaHelper; @@ -42,17 +44,17 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { - TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, , x)) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); if(stack.getItemDamage() == 1) spark.setMaster(true); - spark.setPosition(x + 0.5, y + 1.5, z + 0.5); + spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.spawnEntityInWorld(spark); - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); } return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index d799748f6..fb1bb876f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -35,12 +37,12 @@ public class ItemCraftPattern extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer p, World world, int x, int y, int z, int s, float xs, float ys, float zs) { - TileEntity tile = world.getTileEntity(x, y, z); + public boolean onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCraftCrate && !world.isRemote) { TileCraftCrate crate = (TileCraftCrate) tile; crate.pattern = stack.getItemDamage(); - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); } return false; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 664dbe44c..e65c7ecab 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -490,20 +490,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GL11.glDisable(GL11.GL_CULL_FACE); ItemCraftingHalo item = (ItemCraftingHalo) stack.getItem(); mc.renderEngine.bindTexture(item.getGlowResource()); - tess.startDrawingQuads(); + tess.getWorldRenderer().startDrawingQuads(); for(int i = 0; i < segAngles; i++) { float ang = i + seg * segAngles + shift; double xp = Math.cos(ang * Math.PI / 180F) * s; double zp = Math.sin(ang * Math.PI / 180F) * s; - tess.addVertexWithUV(xp * m, y, zp * m, u, v); - tess.addVertexWithUV(xp, y0, zp, u, 0); + tess.getWorldRenderer().addVertexWithUV(xp * m, y, zp * m, u, v); + tess.getWorldRenderer().addVertexWithUV(xp, y0, zp, u, 0); xp = Math.cos((ang + 1) * Math.PI / 180F) * s; zp = Math.sin((ang + 1) * Math.PI / 180F) * s; - tess.addVertexWithUV(xp, y0, zp, 0, 0); - tess.addVertexWithUV(xp * m, y, zp * m, 0, v); + tess.getWorldRenderer().addVertexWithUV(xp, y0, zp, 0, 0); + tess.getWorldRenderer().addVertexWithUV(xp * m, y, zp * m, 0, v); } y0 = 0; tess.draw(); @@ -535,7 +535,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x22000000); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52); + mc.getRenderItem().renderItemAndEffectIntoGUI(craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF); @@ -578,12 +578,12 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { int ypos = y + i / 3 * 18; Gui.drawRect(xpos, ypos, xpos + 16, ypos + 16, 0x22000000); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, xpos, ypos); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, xpos, ypos); } } - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recipe[9], x + 72, y + 18); - RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, recipe[9], x + 72, y + 18); + mc.getRenderItem().renderItemAndEffectIntoGUI(recipe[9], x + 72, y + 18); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe[9], x + 72, y + 18); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 44616657d..1c0a97589 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -29,7 +30,7 @@ public class ItemFertilizer extends ItemMod { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { final int range = 3; if(!par3World.isRemote) { List validCoords = new ArrayList(); @@ -37,11 +38,9 @@ public class ItemFertilizer extends ItemMod { for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { for(int k = 2; k >= -2; k--) { - int x = par4 + i + 1; - int y = par5 + k + 1; - int z = par6 + j + 1; - if(par3World.isAirBlock(x, y, z) && (!par3World.provider.hasNoSky || y < 255) && ModBlocks.flower.canBlockStay(par3World, x, y, z)) - validCoords.add(new BlockPos(x, y, z)); + BlockPos pos_ = pos.add(i + 1, k + 1, j + 1); + if(par3World.isAirBlock(pos_) && (!par3World.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canBlockStay(par3World, pos_)) + validCoords.add(pos_); } } @@ -49,14 +48,14 @@ public class ItemFertilizer extends ItemMod { for(int i = 0; i < flowerCount; i++) { BlockPos coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); validCoords.remove(coords); - par3World.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); + par3World.setBlockState(coords, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); } par1ItemStack.stackSize--; } else { for(int i = 0; i < 15; i++) { - double x = par4 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); - double y = par5 + 1; - double z = par6 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double x = pos.getX() - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double y = pos.getY() + 1; + double z = pos.getZ() - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 630049ea7..7bf226595 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; @@ -91,11 +93,10 @@ public class ItemFlowerBag extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { - TileEntity tile = world.getTileEntity(x, y, z); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof IInventory) { if(!world.isRemote) { - ForgeDirection side = ForgeDirection.getOrientation(s); IInventory inv = (IInventory) tile; ItemStack[] stacks = loadStacks(stack); ItemStack[] newStacks = new ItemStack[stacks.length]; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 42363e19a..8530130c7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,17 +10,26 @@ */ package vazkii.botania.common.item; +import com.mojang.authlib.GameProfile; +import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import java.util.UUID; + public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { @@ -31,98 +40,94 @@ public class ItemGaiaHead extends ItemMod { // // Deal with it. @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) + public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { - if(p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_).isReplaceable(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_) && p_77648_7_ != 0) + if (worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos) && side != EnumFacing.DOWN) { - p_77648_7_ = 1; - p_77648_5_--; + side = EnumFacing.UP; + pos = pos.down(); } - if (p_77648_7_ == 0) - { - return false; - } - else if (!p_77648_3_.isSideSolid(p_77648_4_, p_77648_5_, p_77648_6_, net.minecraftforge.common.util.ForgeDirection.getOrientation(p_77648_7_))) + if (side == EnumFacing.DOWN) { return false; } else { - if (p_77648_7_ == 1) - { - ++p_77648_5_; - } + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + boolean flag = block.isReplaceable(worldIn, pos); - if (p_77648_7_ == 2) + if (!flag) { - --p_77648_6_; - } - - if (p_77648_7_ == 3) - { - ++p_77648_6_; - } - - if (p_77648_7_ == 4) - { - --p_77648_4_; - } - - if (p_77648_7_ == 5) - { - ++p_77648_4_; - } - - } - { - if (!p_77648_3_.isRemote) - { - if (!Blocks.skull.canPlaceBlockOnSide(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_)) return false; - p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, ModBlocks.gaiaHead, p_77648_7_, 2); // Gaia head instead of skull - int i1 = 0; - - if (p_77648_7_ == 1) + if (!worldIn.isSideSolid(pos, side, true)) { - i1 = MathHelper.floor_double(p_77648_2_.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; + return false; } - TileEntity tileentity = p_77648_3_.getTileEntity(p_77648_4_, p_77648_5_, p_77648_6_); + pos = pos.offset(side); + } - if (tileentity != null && tileentity instanceof TileEntitySkull) + if (!playerIn.canPlayerEdit(pos, side, stack)) + { + return false; + } + else if (!Blocks.skull.canPlaceBlockAt(worldIn, pos)) + { + return false; + } + else + { + if (!worldIn.isRemote) { - /*if (p_77648_1_.getItemDamage() == 3) + if (!Blocks.skull.canPlaceBlockOnSide(worldIn, pos, side)) return false; + worldIn.setBlockState(pos, Blocks.skull.getDefaultState().withProperty(BlockSkull.FACING, side), 3); + int i = 0; + + if (side == EnumFacing.UP) { - GameProfile gameprofile = null; + i = MathHelper.floor_double((double)(playerIn.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15; + } - if (p_77648_1_.hasTagCompound()) + TileEntity tileentity = worldIn.getTileEntity(pos); + + if (tileentity instanceof TileEntitySkull) + { + TileEntitySkull tileentityskull = (TileEntitySkull)tileentity; + + if (stack.getMetadata() == 3) { - NBTTagCompound nbttagcompound = p_77648_1_.getTagCompound(); - - if (nbttagcompound.hasKey("SkullOwner", 10)) - { - gameprofile = NBTUtil.func_152459_a(nbttagcompound.getCompoundTag("SkullOwner")); - } - else if (nbttagcompound.hasKey("SkullOwner", 8) && nbttagcompound.getString("SkullOwner").length() > 0) - { - gameprofile = new GameProfile((UUID)null, nbttagcompound.getString("SkullOwner")); - } +// GameProfile gameprofile = null; +// +// if (stack.hasTagCompound()) +// { +// NBTTagCompound nbttagcompound = stack.getTagCompound(); +// +// if (nbttagcompound.hasKey("SkullOwner", 10)) +// { +// gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); +// } +// else if (nbttagcompound.hasKey("SkullOwner", 8) && nbttagcompound.getString("SkullOwner").length() > 0) +// { +// gameprofile = new GameProfile((UUID)null, nbttagcompound.getString("SkullOwner")); +// } +// } +// +// tileentityskull.setPlayerProfile(gameprofile); + } + else + { + tileentityskull.setType(stack.getMetadata()); } - ((TileEntitySkull)tileentity).func_152106_a(gameprofile); + tileentityskull.setSkullRotation(i); + Blocks.skull.checkWitherSpawn(worldIn, pos, tileentityskull); } - else - { - ((TileEntitySkull)tileentity).func_152107_a(p_77648_1_.getItemDamage()); - }*/ - ((TileEntitySkull)tileentity).func_145903_a(i1); - ((BlockSkull)Blocks.skull).func_149965_a(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_, (TileEntitySkull)tileentity); + --stack.stackSize; } - --p_77648_1_.stackSize; + return true; } - - return true; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 72a8374be..dce215c9b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -89,7 +90,7 @@ public class ItemGrassHorn extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -112,9 +113,9 @@ public class ItemGrassHorn extends ItemMod { player.worldObj.playSoundAtEntity(player, "note.bassattack", 1F, 0.001F); } - public static void breakGrass(World world, ItemStack stack, int stackDmg, int srcx, int srcy, int srcz) { + public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { EnumHornType type = EnumHornType.getTypeForMeta(stackDmg); - Random rand = new Random(srcx ^ srcy ^ srcz); + Random rand = new Random(srcPos.toLong()); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; List coords = new ArrayList(); @@ -122,13 +123,10 @@ public class ItemGrassHorn extends ItemMod { for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = -rangeY; k < rangeY + 1; k++) { - int x = srcx + i; - int y = srcy + k; - int z = srcz + j; - - Block block = world.getBlock(x, y, z); - if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, x, y, z, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block.isLeaves(world, x, y, z) || stackDmg == 2 && block == Blocks.snow_layer) - coords.add(new BlockPos(x, y, z)); + 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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block.isLeaves(world, pos) || stackDmg == 2 && block == Blocks.snow_layer) + coords.add(pos); } Collections.shuffle(coords, rand); @@ -137,19 +135,19 @@ public class ItemGrassHorn extends ItemMod { for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); List items = new ArrayList(); - Block block = world.getBlock(currCoords.posX, currCoords.posY, currCoords.posZ); - int meta = world.getBlockMetadata(currCoords.posX, currCoords.posY, currCoords.posZ); - items.addAll(block.getDrops(world, currCoords.posX, currCoords.posY, currCoords.posZ, meta, 0)); + IBlockState state = world.getBlockState(currCoords); + Block block = state.getBlock(); + items.addAll(block.getDrops(world, currCoords, state, 0)); - if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords.posX, currCoords.posY, currCoords.posZ, stack, type)) - ((IHornHarvestable) block).harvestByHorn(world, currCoords.posX, currCoords.posY, currCoords.posZ, stack, type); + if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) + ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); else if(!world.isRemote) { - world.setBlockToAir(currCoords.posX, currCoords.posY, currCoords.posZ); + world.setBlockToAir(currCoords); if(ConfigHandler.blockBreakParticles) - world.playAuxSFX(2001, currCoords.posX, currCoords.posY, currCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + world.playAuxSFX(2001, currCoords, Block.getStateId(state)); for(ItemStack stack_ : items) - world.spawnEntityInWorld(new EntityItem(world, currCoords.posX + 0.5, currCoords.posY + 0.5, currCoords.posZ + 0.5, stack_)); + 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 5e585568d..6343d0cd5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -17,6 +17,8 @@ import java.util.Map; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +26,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -81,15 +84,14 @@ public class ItemGrassSeeds extends ItemMod { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int bmeta = par3World.getBlockMetadata(par4, par5, par6); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + IBlockState state = par3World.getBlockState(pos); - if(block == Blocks.dirt && bmeta == 0) { + if(state == Blocks.dirt.getDefaultState()) { int meta = par1ItemStack.getItemDamage(); - BlockSwapper swapper = addBlockSwapper(par3World, par4, par5, par6, meta); - par3World.setBlock(par4, par5, par6, swapper.blockToSet, swapper.metaToSet, 1 | 2); + BlockSwapper swapper = addBlockSwapper(par3World, pos, meta); + par3World.setBlockState(pos, swapper.stateToSet, 1 | 2); for(int i = 0; i < 50; i++) { double x = (Math.random() - 0.5) * 3; double y = Math.random() - 0.5 + 1; @@ -110,7 +112,7 @@ public class ItemGrassSeeds extends ItemMod { float velMul = 0.025F; - Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(par3World, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } par1ItemStack.stackSize--; @@ -122,7 +124,7 @@ public class ItemGrassSeeds extends ItemMod { @SubscribeEvent public void onTickEnd(TickEvent.WorldTickEvent event) { if(event.phase == Phase.END) { - int dim = event.world.provider.dimensionId; + int dim = event.world.provider.getDimensionId(); if(blockSwappers.containsKey(dim)) { List swappers = blockSwappers.get(dim); List swappersSafe = new ArrayList(swappers); @@ -133,10 +135,10 @@ public class ItemGrassSeeds extends ItemMod { } } - private static BlockSwapper addBlockSwapper(World world, int x, int y, int z, int meta) { - BlockSwapper swapper = swapperFromMeta(world, x, y, z, meta); + private static BlockSwapper addBlockSwapper(World world, BlockPos pos, int meta) { + BlockSwapper swapper = swapperFromMeta(world, pos, meta); - int dim = world.provider.dimensionId; + int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) blockSwappers.put(dim, new ArrayList()); blockSwappers.get(dim).add(swapper); @@ -144,11 +146,11 @@ public class ItemGrassSeeds extends ItemMod { return swapper; } - private static BlockSwapper swapperFromMeta(World world, int x, int y, int z, int meta) { + private static BlockSwapper swapperFromMeta(World world, BlockPos pos, int meta) { switch(meta) { - case 1 : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.dirt, 2); - case 2 : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.mycelium, 0); - default : return new BlockSwapper(world, new BlockPos(x, y, z), Blocks.grass, 0); + 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()); + default : return new BlockSwapper(world, pos, Blocks.grass.getDefaultState()); } } @@ -156,17 +158,14 @@ public class ItemGrassSeeds extends ItemMod { final World world; final Random rand; - final Block blockToSet; - final int metaToSet; - + final IBlockState stateToSet; BlockPos startCoords; int ticksExisted = 0; - BlockSwapper(World world, BlockPos coords, Block block, int meta) { + BlockSwapper(World world, BlockPos coords, IBlockState state) { this.world = world; - blockToSet = block; - metaToSet = meta; - rand = new Random(coords.posX ^ coords.posY ^ coords.posZ); + stateToSet = state; + rand = new Random(coords.toLong()); startCoords = coords; } @@ -176,28 +175,25 @@ public class ItemGrassSeeds extends ItemMod { int range = 3; for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) { - int x = startCoords.posX + i; - int y = startCoords.posY; - int z = startCoords.posZ + j; - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); + BlockPos pos = startCoords.add(i, 0, j); + IBlockState state = world.getBlockState(pos); + Block block = state.getBlock(); - if(block == blockToSet && meta == metaToSet) { + if(state == stateToSet) { if(ticksExisted % 20 == 0) { List validCoords = new ArrayList(); for(int k = -1; k < 2; k++) for(int l = -1; l < 2; l++) { - int x1 = x + k; - int z1 = z + l; - Block block1 = world.getBlock(x1, y, z1); - int meta1 = world.getBlockMetadata(x1, y, z1); - if(block1 == Blocks.dirt && meta1 == 0) - validCoords.add(new BlockPos(x1, y, z1)); + BlockPos pos1 = pos.add(k, 0, l); + IBlockState state1 = world.getBlockState(pos1); + if(state1.getBlock() == Blocks.dirt + && state1.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) + validCoords.add(pos1); } if(!validCoords.isEmpty() && !world.isRemote) { BlockPos coords = validCoords.get(rand.nextInt(validCoords.size())); - world.setBlock(coords.posX, coords.posY, coords.posZ, blockToSet, metaToSet, 1 | 2); + world.setBlockState(coords, stateToSet, 1 | 2); } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index b30562b0c..dfd02176d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -21,8 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; @@ -71,10 +71,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(par5 < 160 && !par3World.provider.isHellWorld) { - par3World.playSound(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false); - spawnBurstFirst(par3World, par4, par5, par6, par1ItemStack); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + if(pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { + par3World.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false); + spawnBurstFirst(par3World, pos, par1ItemStack); par1ItemStack.stackSize--; if(par1ItemStack.getItemDamage() == 19) par2EntityPlayer.addStat(ModAchievements.l20ShardUse, 1); @@ -83,21 +83,21 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet return true; } - public void spawnBurstFirst(World world, int srcx, int srcy, int srcz, ItemStack lens) { + public void spawnBurstFirst(World world, BlockPos pos, ItemStack lens) { int range = BASE_RANGE + lens.getItemDamage(); boolean pointy = world.rand.nextDouble() < 0.25; double heightscale = (world.rand.nextDouble() + 0.5) * ((double)BASE_RANGE / (double)range); - spawnBurst(world, srcx, srcy, srcz, lens, pointy, heightscale); + spawnBurst(world, pos, lens, pointy, heightscale); } - public void spawnBurst(World world, int srcx, int srcy, int srcz, ItemStack lens) { + public void spawnBurst(World world, BlockPos pos, ItemStack lens) { boolean pointy = ItemNBTHelper.getBoolean(lens, TAG_POINTY, false); double heightscale = ItemNBTHelper.getDouble(lens, TAG_HEIGHTSCALE, 1); - spawnBurst(world, srcx, srcy, srcz, lens, pointy, heightscale); + spawnBurst(world, pos, lens, pointy, heightscale); } - public void spawnBurst(World world, int srcx, int srcy, int srcz, ItemStack lens, boolean pointy, double heightscale) { + public void spawnBurst(World world, BlockPos pos, ItemStack lens, boolean pointy, double heightscale) { int range = BASE_RANGE + lens.getItemDamage(); int i = ItemNBTHelper.getInt(lens, TAG_ITERATION_I, 0); @@ -113,42 +113,40 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet for(; i < range * 2 + 1; i++) { for(; j > -BASE_RANGE * 2; j--) { for(; k < range * 2 + 1; k++) { - int x = srcx - range + i; - int y = srcy - BASE_RANGE + j; - int z = srcz - range + k; + BlockPos pos_ = pos.add(-range + i, -BASE_RANGE + j, -range + k); - if(inRange(x, y, z, srcx, srcy, srcz, range, heightscale, pointy)) { - Block block = world.getBlock(x, y, z); - if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, , x)) && block.getBlockHardness(world, x, y, z) != -1) { + if(inRange(pos_, pos, range, heightscale, pointy)) { + Block block = world.getBlockState(pos_).getBlock(); + if(!block.isAir(world, pos_) && !block.isReplaceable(world, pos_) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, pos_)) && block.getBlockHardness(world, pos_) != -1) { int id = Block.getIdFromBlock(block); - int meta = world.getBlockMetadata(x, y, z); - TileEntity tile = world.getTileEntity(x, y, z); + IBlockState state = world.getBlockState(pos_); + TileEntity tile = world.getTileEntity(pos_); if(tile != null) { - TileEntity newTile = block.createTileEntity(world, meta); - world.setTileEntity(x, y, z, newTile); + TileEntity newTile = block.createTileEntity(world, state); + world.setTileEntity(pos_, newTile); } - world.setBlockToAir(x, y, z); - world.playAuxSFX(2001, x, y, z, id + (meta << 12)); + world.setBlockToAir(pos_); + world.playAuxSFX(2001, pos_, Block.getStateId(state)); ItemStack copyLens = new ItemStack(this, 1, lens.getItemDamage()); ItemNBTHelper.setInt(copyLens, TAG_BLOCK, id); - ItemNBTHelper.setInt(copyLens, TAG_META, meta); + ItemNBTHelper.setInt(copyLens, TAG_META, block.getMetaFromState(state)); NBTTagCompound cmp = new NBTTagCompound(); if(tile != null) tile.writeToNBT(cmp); ItemNBTHelper.setCompound(copyLens, TAG_TILE, cmp); - ItemNBTHelper.setInt(copyLens, TAG_X, srcx); - ItemNBTHelper.setInt(copyLens, TAG_Y, srcy); - ItemNBTHelper.setInt(copyLens, TAG_Y_START, y); - ItemNBTHelper.setInt(copyLens, TAG_Z, srcz); + ItemNBTHelper.setInt(copyLens, TAG_X, pos.getX()); + ItemNBTHelper.setInt(copyLens, TAG_Y, pos.getY()); + ItemNBTHelper.setInt(copyLens, TAG_Y_START, pos_.getY()); + ItemNBTHelper.setInt(copyLens, TAG_Z, pos.getZ()); ItemNBTHelper.setBoolean(copyLens, TAG_POINTY, pointy); ItemNBTHelper.setDouble(copyLens, TAG_HEIGHTSCALE, heightscale); ItemNBTHelper.setInt(copyLens, TAG_ITERATION_I, i); ItemNBTHelper.setInt(copyLens, TAG_ITERATION_J, j); ItemNBTHelper.setInt(copyLens, TAG_ITERATION_K, k); - EntityManaBurst burst = getBurst(world, x, y, z, copyLens); + EntityManaBurst burst = getBurst(world, pos_, copyLens); world.spawnEntityInWorld(burst); return; } @@ -169,11 +167,11 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet else return MathHelper.pointDistanceSpace(x, 0, z, srcx, 0, srcz) < range - (srcy - y) / heightscale; } - public EntityManaBurst getBurst(World world, int x, int y, int z, ItemStack stack) { + public EntityManaBurst getBurst(World world, BlockPos pos, ItemStack stack) { EntityManaBurst burst = new EntityManaBurst(world); - burst.posX = x + 0.5; - burst.posY = y + 0.5; - burst.posZ = z + 0.5; + burst.posX = pos.getX() + 0.5; + burst.posY = pos.getY() + 0.5; + burst.posZ = pos.getZ() + 0.5; burst.setColor(0x00EAFF); burst.setMana(1); @@ -218,13 +216,14 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet int z = ItemNBTHelper.getInt(lens, TAG_Z, 0); if(y != -1) - spawnBurst(entity.worldObj, x, y, z, lens); + spawnBurst(entity.worldObj, new BlockPos(x, y, z), lens); } else if(burst.getTicksExisted() == placeTicks) { int x = net.minecraft.util.MathHelper.floor_double(entity.posX); int y = ItemNBTHelper.getInt(lens, TAG_Y_START, -1) + targetDistance; int z = net.minecraft.util.MathHelper.floor_double(entity.posZ); + BlockPos pos = new BlockPos(x, y, z); - if(entity.worldObj.isAirBlock(x, y, z)) { + if(entity.worldObj.isAirBlock(pos)) { int id = ItemNBTHelper.getInt(lens, TAG_BLOCK, 0); Block block = Block.getBlockById(id); int meta = ItemNBTHelper.getInt(lens, TAG_META, 0); @@ -234,13 +233,11 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(tilecmp.hasKey("id")) tile = TileEntity.createAndLoadEntity(tilecmp); - entity.worldObj.setBlock(x, y, z, block, meta, 1 | 2); - entity.worldObj.playAuxSFX(2001, x, y, z, id + (meta << 12)); + entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); + entity.worldObj.playAuxSFX(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); if(tile != null) { - tile.xCoord = x; - tile.yCoord = y; - tile.zCoord = z; - entity.worldObj.setTileEntity(x, y, z, tile); + tile.setPos(pos); + entity.worldObj.setTileEntity(pos, tile); } } @@ -254,9 +251,9 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet EntityThrowable entity = (EntityThrowable) burst; ItemStack lens = burst.getSourceLens(); int id = ItemNBTHelper.getInt(lens, TAG_BLOCK, 0); - Block.getBlockById(id); + Block b = Block.getBlockById(id); int meta = ItemNBTHelper.getInt(lens, TAG_META, 0); - entity.worldObj.spawnParticle("blockcrack_" + id + "_" + meta, entity.posX, entity.posY, entity.posZ, entity.motionX, entity.motionY, entity.motionZ); + entity.worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, entity.posX, entity.posY, entity.posZ, entity.motionX, entity.motionY, entity.motionZ, Block.getStateId(b.getStateFromMeta(meta))); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index fe214d36b..8c42e0d2e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -21,12 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -57,13 +52,13 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking()) { - Block block = par3World.getBlock(par4, par5, par6); + Block block = par3World.getBlockState(pos).getBlock(); if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, , par4, par2EntityPlayer, par1ItemStack); + LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, pos, par2EntityPlayer, par1ItemStack); if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); Botania.proxy.setLexiconStack(par1ItemStack); @@ -72,8 +67,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return true; } } else if(par3World.isRemote) { - MovingObjectPosition pos = new MovingObjectPosition(par4, par5, par6, par7, new Vec3(par8, par9, par10)); - return Botania.proxy.openWikiPage(par3World, block, pos); + MovingObjectPosition mop = new MovingObjectPosition(new Vec3(par8, par9, par10), side, pos); + return Botania.proxy.openWikiPage(par3World, block, mop); } } } @@ -175,7 +170,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Override public EnumRarity getRarity(ItemStack par1ItemStack) { - return EnumRarity.uncommon; + return EnumRarity.UNCOMMON; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index e6d3e8317..eff217680 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -33,7 +33,7 @@ public class ItemManaCookie extends ItemFood { public ItemManaCookie() { super(0, 0.1F, false); - setPotionEffect(Potion.field_76443_y.id, 1, 0, 1F); + setPotionEffect(Potion.saturation.id, 1, 0, 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); 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 ca7c5c6b9..c802d64cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -179,11 +179,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { return getLens(itemStack); } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { - return false; - } - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { EntityManaBurst burst = new EntityManaBurst(player); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 433dec7f5..a304139b6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -20,6 +20,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; @@ -65,11 +66,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return 1000 - (int) (mana / TilePool.MAX_MANA * 1000); } - @Override - public int getDisplayDamage(ItemStack stack) { - return getDamage(stack); - } - @Override public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[2]; @@ -105,9 +101,9 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = par3World.getTileEntity(pos); if(tile != null && tile instanceof IManaPool) { bindPool(par1ItemStack, tile); par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); @@ -118,11 +114,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return false; } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - /*public int getMana(ItemStack stack) { IManaPool pool = getManaPool(stack); return pool == null ? 0 : pool.getCurrentMana(); @@ -166,10 +157,10 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte }*/ public void bindPool(ItemStack stack, TileEntity pool) { - ItemNBTHelper.setInt(stack, TAG_POS_X, pool == null ? 0 : pool.xCoord); - ItemNBTHelper.setInt(stack, TAG_POS_Y, pool == null ? -1 : pool.yCoord); - ItemNBTHelper.setInt(stack, TAG_POS_Z, pool == null ? 0 : pool.zCoord); - ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.dimensionId); + ItemNBTHelper.setInt(stack, TAG_POS_X, pool == null ? 0 : pool.getPos().getX()); + ItemNBTHelper.setInt(stack, TAG_POS_Y, pool == null ? -1 : pool.getPos().getY()); + ItemNBTHelper.setInt(stack, TAG_POS_Z, pool == null ? 0 : pool.getPos().getZ()); + ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.getDimensionId()); } public BlockPos getPoolCoords(ItemStack stack) { @@ -189,19 +180,19 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return fallbackPool; BlockPos coords = getPoolCoords(stack); - if(coords.posY == -1) + if(coords.getY() == -1) return null; int dim = getDimension(stack); World world = null; for(World w : server.worldServers) - if(w.provider.dimensionId == dim) { + if(w.provider.getDimensionId() == dim) { world = w; break; } if(world != null) { - TileEntity tile = world.getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = world.getTileEntity(coords); if(tile != null && tile instanceof IManaPool) return (IManaPool) tile; } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 167ca07ad..55153b35f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -73,11 +73,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP return 1000 - (int) (mana / MAX_MANA * 1000); } - @Override - public int getDisplayDamage(ItemStack stack) { - return getDamage(stack); - } - @Override public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[2]; @@ -96,11 +91,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP par3List.add(StatCollector.translateToLocal("botaniamisc.creative")); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index acce895e6..e56fb06ee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaPool; @@ -32,8 +34,8 @@ public class ItemObedienceStick extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { - TileEntity tileAt = world.getTileEntity(x, y, z); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + TileEntity tileAt = world.getTileEntity(pos); if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { boolean pool = tileAt instanceof IManaPool; Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; @@ -42,18 +44,16 @@ public class ItemObedienceStick extends ItemMod { for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) { - int xp = x + i; - int yp = y + j; - int zp = z + k; - if(MathHelper.pointDistanceSpace(xp, yp, zp, x, y, z) > range) + BlockPos pos_ = pos.add(i, j, k); + if(MathHelper.pointDistanceSpace(pos_, pos) > range) continue; - TileEntity tile = world.getTileEntity(xp, yp, zp); + TileEntity tile = world.getTileEntity(pos_); if(tile instanceof ISubTileContainer) { SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); if(act.actuate(subtile, tileAt)) { - Vector3 orig = new Vector3(xp + 0.5, yp + 0.5, zp + 0.5); - Vector3 end = new Vector3(x + 0.5, y + 0.5, z + 0.5); + Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); + Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); ItemTwigWand.doParticleBeam(world, orig, end); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index fecf05c4d..e1da38641 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -10,9 +10,11 @@ */ package vazkii.botania.common.item; +import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; @@ -32,26 +34,24 @@ public class ItemOpenBucket extends ItemMod { return par1ItemStack; else { if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; + BlockPos pos = movingobjectposition.getBlockPos(); - if(!par2World.canMineBlock(par3EntityPlayer, i, j, k)) + if(!par2World.isBlockModifiable(par3EntityPlayer, pos)) return par1ItemStack; - if(!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) + if(!par3EntityPlayer.canPlayerEdit(pos, movingobjectposition.sideHit, par1ItemStack)) return par1ItemStack; - Material material = par2World.getBlock(i, j, k).getMaterial(); - int l = par2World.getBlockMetadata(i, j, k); + Material material = par2World.getBlockState(pos).getBlock().getMaterial(); + int l = ((Integer) par2World.getBlockState(pos).getValue(BlockLiquid.LEVEL)); if(material == Material.water && l == 0) { - par2World.setBlockToAir(i, j, k); + par2World.setBlockToAir(pos); return par1ItemStack; } if(material == Material.lava && l == 0) { - par2World.setBlockToAir(i, j, k); + par2World.setBlockToAir(pos); return par1ItemStack; } } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index fe3494559..89fc14312 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -66,11 +66,6 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools super.setDamage(stack, damage); } - @Override - public int getDisplayDamage(ItemStack stack) { - return getDamage(stack); - } - @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; From 8cc23c7fb3bd16bc5d2c6a8c4103ce9b806415b7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 08:38:20 -0600 Subject: [PATCH 027/935] Update readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 553040130..8b695d602 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,15 @@ 1.8 PORT README: + This is williewillus' 1.8(.8) port of Botania! + All licensing and distribution rights are exactly as 1.7.10 Botania + Use at your own risk as bugs may pop up unexpectedly. + I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No. +Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S. + ![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png) Welcome to the Botania repository. From 27126c074d3a4b0a85d4efebf3fef2838724de97 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 18:39:52 -0600 Subject: [PATCH 028/935] Some of tool package --- .../item/equipment/bauble/ItemBauble.java | 5 -- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 9 +--- .../equipment/bauble/ItemFlightTiara.java | 10 ++-- .../item/equipment/bauble/ItemIcePendant.java | 9 ++-- .../item/equipment/bauble/ItemItemFinder.java | 13 ++--- .../item/equipment/bauble/ItemMagnetRing.java | 6 +-- .../item/equipment/bauble/ItemManaRing.java | 5 -- .../item/equipment/bauble/ItemMiningRing.java | 2 +- .../item/equipment/bauble/ItemMonocle.java | 8 +-- .../item/equipment/bauble/ItemSwapRing.java | 2 +- .../item/equipment/bauble/ItemWaterRing.java | 2 +- .../item/equipment/tool/ItemEnderDagger.java | 7 +-- .../item/equipment/tool/ItemGlassPick.java | 4 +- .../item/equipment/tool/ItemStarSword.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 7 +-- .../item/equipment/tool/ToolCommons.java | 49 +++++++++---------- .../tool/elementium/ItemElementiumShears.java | 7 +-- .../tool/elementium/ItemElementiumShovel.java | 8 +-- .../tool/manasteel/ItemManasteelAxe.java | 10 ++-- 20 files changed, 73 insertions(+), 94 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 7272cbd78..61adda4bb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -174,11 +174,6 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt return getCosmeticItem(itemStack); } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { - return false; - } - public static UUID getBaubleUUID(ItemStack stack) { long most = ItemNBTHelper.getLong(stack, TAG_BAUBLE_UUID_MOST, 0); if(most == 0) { 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 43bc75496..37b16288d 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 @@ -88,7 +88,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(type == RenderType.HEAD) { Helper.translateToHeadLevel(event.entityPlayer); switch(stack.getItemDamage()) { 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 c7792a903..b7a423287 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 @@ -74,11 +74,6 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIcon(ItemStack stack, int pass) { return icons[pass]; @@ -138,7 +133,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre PotionEffect currentEffect = player.getActivePotionEffect(Potion.potionTypes[effect.getPotionID()]); boolean nightVision = effect.getPotionID() == Potion.nightVision.id; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { - PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true); + PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); } @@ -185,7 +180,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; GL11.glRotatef(180F, 1F, 0F, 0F); 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 2d76a368e..820149bed 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 @@ -484,11 +484,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); - tes.startDrawingQuads(); - tes.addVertexWithUV(-0.75, 0, -0.75, 0, 0); - tes.addVertexWithUV(-0.75, 0, 0.75, 0, 1); - tes.addVertexWithUV(0.75, 0, 0.75, 1, 1); - tes.addVertexWithUV(0.75, 0, -0.75, 1, 0); + tes.getWorldRenderer().startDrawingQuads(); + tes.getWorldRenderer().addVertexWithUV(-0.75, 0, -0.75, 0, 0); + tes.getWorldRenderer().addVertexWithUV(-0.75, 0, 0.75, 0, 1); + tes.getWorldRenderer().addVertexWithUV(0.75, 0, 0.75, 1, 1); + tes.getWorldRenderer().addVertexWithUV(0.75, 0, -0.75, 1, 0); tes.draw(); ShaderHelper.releaseShader(); 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 d5a4f80fa..cc56f2147 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 @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; @@ -91,8 +92,8 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { playerIceBlocks.put(user, new ArrayList()); List ice = playerIceBlocks.get(user); - if(player.worldObj.getBlock(coords.posX, coords.posY, coords.posZ) == Blocks.water && player.worldObj.getBlockMetadata(coords.posX, coords.posY, coords.posZ) == 0) { - player.worldObj.setBlock(coords.posX, coords.posY, coords.posZ, Blocks.ice); + if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && ((Integer) player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL)) == 0) { + player.worldObj.setBlockState(coords, Blocks.ice.getDefaultState()); if(!player.worldObj.isRemote) ice.add(new IceRemover(coords)); @@ -138,9 +139,9 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } public void tick(World world, List list) { - if(world.getBlock(coords.posX, coords.posY, coords.posZ) == Blocks.ice) { + if(world.getBlockState(coords).getBlock() == Blocks.ice) { if(time-- == 0) - world.setBlock(coords.posX, coords.posY, coords.posZ, Blocks.water, 0, 1 | 2); + world.setBlockState(coords, Blocks.water.getDefaultState(), 1 | 2); else return; list.remove(this); } 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 0ff876742..cf15a1b00 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 @@ -30,6 +30,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; @@ -165,20 +166,16 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(pstack != null) { range = 12; - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); + BlockPos pos = new BlockPos(player); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) { - int xp = x + i; - int yp = y + j; - int zp = z + k; - TileEntity tile = player.worldObj.getTileEntity(xp, yp, zp); + BlockPos pos_ = pos.add(i, j, k); + TileEntity tile = player.worldObj.getTileEntity(pos_); if(tile != null && tile instanceof IInventory) { IInventory inv = (IInventory) tile; if(scanInventory(inv, pstack)) - positionsBuilder.append(xp).append(",").append(yp).append(",").append(zp).append(";"); + positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); } } } 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 8c103b498..4fd642f97 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 @@ -18,6 +18,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; @@ -130,10 +131,7 @@ public class ItemMagnetRing extends ItemBauble { if(stack == null || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || BLACKLIST.contains(itemRegistry.getNameForObject(stack.getItem()))) return false; - int x = net.minecraft.util.MathHelper.floor_double(item.posX); - int y = net.minecraft.util.MathHelper.floor_double(item.posY); - int z = net.minecraft.util.MathHelper.floor_double(item.posZ); - if(item.worldObj.getBlock(x, y, z) == ModBlocks.terraPlate) + if(item.worldObj.getBlockState(new BlockPos(item)).getBlock() == ModBlocks.terraPlate) return false; return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index b5f3665e8..adea2709d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -56,11 +56,6 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD return 1000 - (int) (mana / getMaxMana(stack) * 1000); } - @Override - public int getDisplayDamage(ItemStack stack) { - return getDamage(stack); - } - @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; 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 0a6f6f8c4..458c93f6a 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 @@ -39,7 +39,7 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { if(player.getActivePotionEffect(Potion.digSpeed) != null) player.removePotionEffect(Potion.digSpeed.id); - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, Integer.MAX_VALUE, 1, true)); + player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, Integer.MAX_VALUE, 1, true, true)); } if(player.swingProgress == 0.25F) 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 7e25532fe..c6c6102cb 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 @@ -72,9 +72,9 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm MovingObjectPosition pos = mc.objectMouseOver; if(pos == null) return; - Block block = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - int meta = player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); - player.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + Block block = player.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + int meta = block.getMetaFromState(player.worldObj.getBlockState(pos.getBlockPos())); // todo 1.8 use states + player.worldObj.getTileEntity(pos.getBlockPos()); ItemStack dispStack = null; String text = ""; @@ -97,7 +97,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm int y = resolution.getScaledHeight() / 2 - 8; net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, dispStack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(dispStack, x, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 423b2feeb..51420e579 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -44,7 +44,7 @@ public class ItemSwapRing extends ItemBauble { ToolType typeToFind = null; if(player.isSwingInProgress && pos != null) { - Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block != null) { Material mat = block.getMaterial(); 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 6ccc36259..6dfea4410 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 @@ -52,7 +52,7 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { PotionEffect effect = player.getActivePotionEffect(Potion.nightVision); if(effect == null) { - PotionEffect neweffect = new PotionEffect(Potion.nightVision.id, Integer.MAX_VALUE, -42, true); + PotionEffect neweffect = new PotionEffect(Potion.nightVision.id, Integer.MAX_VALUE, -42, true, true); player.addPotionEffect(neweffect); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index e7102c7f0..6936b08b1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -43,11 +43,6 @@ public class ItemEnderDagger extends ItemManasteelSword { iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIcon(ItemStack stack, int pass) { return pass == 0 ? iconFront : iconOverlay; @@ -63,7 +58,7 @@ public class ItemEnderDagger extends ItemManasteelSword { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.none; + return EnumAction.NONE; } @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 c8bcb4f43..6b25744d4 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 @@ -33,8 +33,8 @@ public class ItemGlassPick extends ItemManasteelPick { @SubscribeEvent public void onBlockDrops(HarvestDropsEvent event) { - if(event.harvester != null && event.block != null && event.drops.isEmpty() && event.harvester.getCurrentEquippedItem() != null && event.harvester.getCurrentEquippedItem().getItem() == this && event.block.getMaterial() == Material.glass && event.block.canSilkHarvest(event.world, event.harvester, event.x, event.y, event.z, event.blockMetadata)) - event.drops.add(new ItemStack(event.block, 1, event.blockMetadata)); + if(event.harvester != null && event.state != null && event.drops.isEmpty() && event.harvester.getCurrentEquippedItem() != null && event.harvester.getCurrentEquippedItem().getItem() == this && event.state.getBlock().getMaterial() == Material.glass && event.state.getBlock().canSilkHarvest(event.world, event.pos, event.state, event.harvester)) + event.drops.add(new ItemStack(event.state.getBlock(), 1, event.state.getBlock().getMetaFromState(event.state))); } @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 fa1e78b21..d621371d3 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 @@ -47,7 +47,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); if(pos != null) { - Vector3 posVec = new Vector3(pos.blockX, pos.blockY, pos.blockZ); + Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); posVec.add(motVec); motVec.normalize().negate().multiply(1.5); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 0b2e0b136..0b6a3c929 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.google.common.base.Predicate; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -49,10 +50,10 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); - IEntitySelector selector = new IEntitySelector() { + Predicate selector = new Predicate() { @Override - public boolean isEntityApplicable(Entity e) { + public boolean apply(Entity e) { return e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); } @@ -61,7 +62,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; for(int i = 0; i < 4; i++) { - List entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; 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 a7b833383..f3d5d4ba5 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.tool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -21,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -46,13 +48,12 @@ public final class ToolCommons { stack.damageItem(dmg, entity); } - public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int xs, int ys, int zs, int xe, int ye, int ze, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { - float blockHardness = block == null ? 1F : block.getBlockHardness(world, x, y, z); + public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { + float blockHardness = block == null ? 1F : block.getBlockHardness(world, pos); - for(int x1 = xs; x1 < xe; x1++) - for(int y1 = ys; y1 < ye; y1++) - for(int z1 = zs; z1 < ze; z1++) - removeBlockWithDrops(player, stack, world, x1 + x, y1 + y, z1 + z, x, y, z, block, materialsListing, silk, fortune, blockHardness, dispose); + for (BlockPos iterPos : ((Iterable) BlockPos.getAllInBox(posStart, posEnd))) { + removeBlockWithDrops(player, stack, world, iterPos, pos, block, materialsListing, silk, fortune, blockHardness, dispose); + } } public static boolean isRightMaterial(Material material, Material[] materialsListing) { @@ -63,41 +64,41 @@ public final class ToolCommons { return false; } - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int bx, int by, int bz, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose) { - removeBlockWithDrops(player, stack, world, x, y, z, bx, by, bz, block, materialsListing, silk, fortune, blockHardness, dispose, true); + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose) { + removeBlockWithDrops(player, stack, world, pos, bPos, block, materialsListing, silk, fortune, blockHardness, dispose, true); } - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int bx, int by, int bz, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose, boolean particles) { - if(!world.blockExists(x, y, z)) + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose, boolean particles) { + if(!world.isBlockLoaded(pos)) return; - Block blk = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); + IBlockState state = world.getBlockState(pos); + Block blk = state.getBlock(); if(block != null && blk != block) return; - Material mat = world.getBlock(x, y, z).getMaterial(); - if(!world.isRemote && blk != null && !blk.isAir(world, x, y, z) && blk.getPlayerRelativeBlockHardness(player, world, x, y, z) > 0) { - if(!blk.canHarvestBlock(player, meta) || !isRightMaterial(mat, materialsListing)) + Material mat = world.getBlockState(pos).getBlock().getMaterial(); + if(!world.isRemote && blk != null && !blk.isAir(world, pos) && blk.getPlayerRelativeBlockHardness(player, world, pos) > 0) { + if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) return; if(!player.capabilities.isCreativeMode) { - int localMeta = world.getBlockMetadata(x, y, z); - blk.onBlockHarvested(world, x, y, z, localMeta, player); + IBlockState localState = world.getBlockState(pos); + blk.onBlockHarvested(world, pos, localState, player); - if(blk.removedByPlayer(world, player, x, y, z, true)) { - blk.onBlockDestroyedByPlayer(world, x, y, z, localMeta); + if(blk.removedByPlayer(world, pos, player, true)) { + blk.onBlockDestroyedByPlayer(world, pos, state); if(!dispose || !ItemElementiumPick.isDisposable(blk)) - blk.harvestBlock(world, player, x, y, z, localMeta); + blk.harvestBlock(world, player, pos, state, world.getTileEntity(pos)); } damageItem(stack, 1, player, 80); - } else world.setBlockToAir(x, y, z); + } else world.setBlockToAir(pos); if(particles && !world.isRemote && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blk) + (meta << 12)); + world.playAuxSFX(2001, pos, Block.getStateId(state)); } } @@ -110,7 +111,7 @@ public final class ToolCommons { return 0; ItemTool tool = (ItemTool) item; - ToolMaterial material = tool.func_150913_i(); + ToolMaterial material = tool.getToolMaterial(); int materialLevel = 0; if(material == BotaniaAPI.manasteelToolMaterial) materialLevel = 10; @@ -136,8 +137,6 @@ public final class ToolCommons { float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; double d0 = player.prevPosX + (player.posX - player.prevPosX) * f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * f; - if (!world.isRemote && player instanceof EntityPlayer) - d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; Vec3 vec3 = new Vec3(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); 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 4d49c95a1..f51fe595a 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 @@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -33,7 +34,7 @@ public class ItemElementiumShears extends ItemManasteelShears { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -70,8 +71,8 @@ public class ItemElementiumShears extends ItemManasteelShears { if(sheep.size() > 0) { for(IShearable target : sheep) { Entity entity = (Entity) target; - if(target.isShearable(stack, entity.worldObj, (int)entity.posX, (int)entity.posY, (int)entity.posZ)) { - ArrayList drops = target.onSheared(stack, entity.worldObj, (int)entity.posX, (int)entity.posY, (int)entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + if(target.isShearable(stack, entity.worldObj, new BlockPos(entity))) { + List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, 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 1c2ca7df0..6677e2248 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 @@ -6,6 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -23,9 +24,9 @@ public class ItemElementiumShovel extends ItemManasteelShovel { } @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { World world = player.worldObj; - Material mat = world.getBlock(x, y, z).getMaterial(); + Material mat = world.getBlockState(pos).getBlock().getMaterial(); if (!ToolCommons.isRightMaterial(mat, materialsShovel)) return false; @@ -33,11 +34,10 @@ public class ItemElementiumShovel extends ItemManasteelShovel { if (block == null) return false; - ForgeDirection.getOrientation(block.sideHit); int fortune = EnchantmentHelper.getFortuneModifier(player); boolean silk = EnchantmentHelper.getSilkTouchModifier(player); - Block blk = world.getBlock(x, y, z); + Block blk = world.getBlockState(pos).getBlock(); if(blk instanceof BlockFalling) ToolCommons.removeBlocksInIteration(player, stack, world, x, y, z, 0, -12, 0, 1, 12, 1, blk, materialsShovel, silk, fortune, false); 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 460c4b115..3e43b4f0d 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 @@ -21,6 +21,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; @@ -77,8 +79,8 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { - if (block.getBlockHardness(world, x, y, z) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { + if (block.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; @@ -89,11 +91,11 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz); + boolean did = stackAt.getItem().onItemUse(stackAt, player, world, pos, side, sx, sy, sz); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); From 02ed9f1c84702fa7cc3378e30583205043c26380 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 Nov 2015 19:07:37 -0600 Subject: [PATCH 029/935] Finish tools and relics except some of Loki --- .../botania/api/item/ISequentialBreaker.java | 4 +- .../tool/manasteel/ItemManasteelPick.java | 10 +++-- .../tool/manasteel/ItemManasteelShears.java | 16 ++++---- .../tool/manasteel/ItemManasteelShovel.java | 20 +++++----- .../tool/manasteel/ItemManasteelSword.java | 5 ++- .../tool/terrasteel/ItemTerraAxe.java | 39 +++++++++--------- .../tool/terrasteel/ItemTerraPick.java | 34 ++++++---------- .../common/item/relic/ItemExcaliber.java | 9 +++-- .../common/item/relic/ItemLokiRing.java | 40 +++++++++---------- 9 files changed, 88 insertions(+), 89 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index 87af2d04d..ff09042de 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -12,6 +12,8 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; /** * An item that implements this can break multiple blocks at once @@ -20,7 +22,7 @@ import net.minecraft.item.ItemStack; */ public interface ISequentialBreaker { - public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side); + public void breakOtherBlock(EntityPlayer player, ItemStack stack, BlockPos pos, BlockPos originPos, EnumFacing side); public boolean disposeOfTrashBlocks(ItemStack stack); 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 cd414e6e1..5fbbcb363 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 @@ -21,6 +21,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; @@ -77,19 +79,19 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { - if(block.getBlockHardness(world, x, y, z) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { + if(block.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDmg()); return true; } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz); + boolean did = stackAt.getItem().onItemUse(stackAt, player, world, pos, side, sx, sy, sz); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); 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 193127c12..1850a3da5 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import java.util.ArrayList; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; @@ -25,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.mana.IManaUsingItem; @@ -76,8 +78,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { if(entity instanceof IShearable) { IShearable target = (IShearable)entity; - if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { - ArrayList drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); + if(target.isShearable(itemstack, entity.worldObj, new BlockPos(entity))) { + List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -97,15 +99,15 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) { if (player.worldObj.isRemote) return false; - Block block = player.worldObj.getBlock(x, y, z); + Block block = player.worldObj.getBlockState(pos).getBlock(); if(block instanceof IShearable) { IShearable target = (IShearable)block; - if(target.isShearable(itemstack, player.worldObj, x, y, z)) { - ArrayList drops = target.onSheared(itemstack, player.worldObj, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); + if(target.isShearable(itemstack, player.worldObj, pos)) { + List drops = target.onSheared(itemstack, player.worldObj, pos, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -114,7 +116,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { double d1 = rand.nextFloat() * f + (1D - f) * 0.5; double d2 = rand.nextFloat() * f + (1D - f) * 0.5; - EntityItem entityitem = new EntityItem(player.worldObj, x + d, y + d1, z + d2, stack); + EntityItem entityitem = new EntityItem(player.worldObj, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); entityitem.delayBeforeCanPickup = 10; player.worldObj.spawnEntityInWorld(entityitem); } 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 9fc888396..de6a16bc0 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 @@ -19,6 +19,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; @@ -75,19 +77,19 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { - if (block.getBlockHardness(world, x, y, z) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { + if (block.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); return true; } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(!p_77648_2_.canPlayerEdit(p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_1_)) + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) return false; else { - UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_); + UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, pos); if(MinecraftForge.EVENT_BUS.post(event)) return false; @@ -96,16 +98,16 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS return true; } - Block block = p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_); + Block block = p_77648_3_.getBlockState(pos).getBlock(); - if(p_77648_7_ != 0 && p_77648_3_.getBlock(p_77648_4_, p_77648_5_ + 1, p_77648_6_).isAir(p_77648_3_, p_77648_4_, p_77648_5_ + 1, p_77648_6_) && (block == Blocks.grass || block == Blocks.dirt)) { + if(side != EnumFacing.DOWN && p_77648_3_.getBlockState(pos.up()).getBlock().isAir(p_77648_3_, pos.up()) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; - p_77648_3_.playSoundEffect(p_77648_4_ + 0.5F, p_77648_5_ + 0.5F, p_77648_6_ + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); + p_77648_3_.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block1.stepSound.getStepSound(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getFrequency() * 0.8F); if (p_77648_3_.isRemote) return true; else { - p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, block1); + p_77648_3_.setBlockState(pos, block1.getDefaultState()); ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); return true; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index da08c003d..ab6262000 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -86,8 +87,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { - if(usesMana(stack) && block.getBlockHardness(world, x, y, z) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { + if(usesMana(stack) && block.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; 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 f3b08ead4..ee21c493d 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 @@ -22,6 +22,7 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -74,11 +75,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); if(raycast != null) { - breakOtherBlock(player, stack, x, y, z, x, y, z, raycast.sideHit); - ItemLokiRing.breakOnAllCursors(player, this, stack, x, y, z, raycast.sideHit); + breakOtherBlock(player, stack, pos, pos, raycast.sideHit); + ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); } return false; @@ -90,9 +91,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } @Override - public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { + public void breakOtherBlock(EntityPlayer player, ItemStack stack, BlockPos pos, BlockPos originPos, EnumFacing side) { if(shouldBreak(player)) { - BlockPos coords = new BlockPos(x, y, z); + BlockPos coords = new BlockPos(pos); addBlockSwapper(player.worldObj, player, stack, coords, coords, 32, false, true, new ArrayList()); } } @@ -105,7 +106,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @SubscribeEvent public void onTickEnd(TickEvent.WorldTickEvent event) { if(event.phase == Phase.END) { - int dim = event.world.provider.dimensionId; + int dim = event.world.provider.getDimensionId(); if(blockSwappers.containsKey(dim)) { List swappers = blockSwappers.get(dim); List swappersSafe = new ArrayList(swappers); @@ -121,7 +122,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, BlockPos coords, int steps, boolean leaves, boolean force, List posChecked) { BlockSwapper swapper = new BlockSwapper(world, player, stack, origCoords, coords, steps, leaves, force, posChecked); - int dim = world.provider.dimensionId; + int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) blockSwappers.put(dim, new ArrayList()); blockSwappers.get(dim).add(swapper); @@ -153,11 +154,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } void tick() { - Block blockat = world.getBlock(coords.posX, coords.posY, coords.posZ); - if(!force && blockat.isAir(world, coords.posX, coords.posY, coords.posZ)) + Block blockat = world.getBlockState(coords).getBlock(); + if(!force && blockat.isAir(world, coords)) return; - ToolCommons.removeBlockWithDrops(player, stack, world, coords.posX, coords.posY, coords.posZ, origCoords.posX, origCoords.posY, origCoords.posZ, null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack), 0F, false, !leaves); + ToolCommons.removeBlockWithDrops(player, stack, world, coords, origCoords, null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack), 0F, false, !leaves); if(steps == 0) return; @@ -165,27 +166,25 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) for(int k = 0; k < 3; k++) { - int x = coords.posX + i - 1; - int y = coords.posY + j - 1; - int z = coords.posZ + k - 1; - String pstr = posStr(x, y, z); + BlockPos pos = coords.add(i - 1, j - 1, k - 1); + String pstr = posStr(pos); if(posChecked.contains(pstr)) continue; - Block block = world.getBlock(x, y, z); - boolean log = block.isWood(world, x, y, z); - boolean leaf = block.isLeaves(world, x, y, z); + Block block = world.getBlockState(pos).getBlock(); + boolean log = block.isWood(world, pos); + boolean leaf = block.isLeaves(world, pos); if(log || leaf) { int steps = this.steps - 1; steps = leaf ? leaves ? steps : 3 : steps; - addBlockSwapper(world, player, stack, origCoords, new BlockPos(x, y, z), steps, leaf, false, posChecked); + addBlockSwapper(world, player, stack, origCoords, pos, steps, leaf, false, posChecked); posChecked.add(pstr); } } } - String posStr(int x, int y, int z) { - return x + ":" + y + ":" + z; + String posStr(BlockPos pos) { + return pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); } } 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 19be8f014..b67ef1810 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 @@ -22,10 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.*; import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; @@ -111,8 +109,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { - return player.isSneaking() && super.onItemUse(stack, player, world, x, y, z, s, sx, sy, sz); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { + return player.isSneaking() && super.onItemUse(stack, player, world, pos, side, sx, sy, sz); } @Override @@ -129,11 +127,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); if(raycast != null) { - breakOtherBlock(player, stack, x, y, z, x, y, z, raycast.sideHit); - ItemLokiRing.breakOnAllCursors(player, this, stack, x, y, z, raycast.sideHit); + breakOtherBlock(player, stack, pos, pos, raycast.sideHit); + ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); // ^ Doable with API access through the IInternalMethodHandler. } @@ -146,25 +144,24 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { + public void breakOtherBlock(EntityPlayer player, ItemStack stack, BlockPos pos, BlockPos originPos, EnumFacing side) { if(!isEnabled(stack)) return; World world = player.worldObj; - Material mat = world.getBlock(x, y, z).getMaterial(); + Material mat = world.getBlockState(pos).getBlock().getMaterial(); if(!ToolCommons.isRightMaterial(mat, MATERIALS)) return; - if(world.isAirBlock(x, y, z)) + if(world.isAirBlock(pos)) return; - ForgeDirection direction = ForgeDirection.getOrientation(side); int fortune = EnchantmentHelper.getFortuneModifier(player); boolean silk = EnchantmentHelper.getSilkTouchModifier(player); boolean thor = ItemThorRing.getThorRing(player) != null; - boolean doX = thor || direction.offsetX == 0; - boolean doY = thor || direction.offsetY == 0; - boolean doZ = thor || direction.offsetZ == 0; + boolean doX = thor || side.getFrontOffsetX() == 0; + boolean doY = thor || side.getFrontOffsetY() == 0; + boolean doZ = thor || side.getFrontOffsetZ() == 0; int origLevel = getLevel(stack); int level = origLevel + (thor ? 1 : 0); @@ -177,7 +174,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(range == 0 && level != 1) return; - ToolCommons.removeBlocksInIteration(player, stack, world, x, y, z, doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0, doX ? range + 1 : 1, doY ? rangeY * 2 : 1, doZ ? range + 1 : 1, null, MATERIALS, silk, fortune, isTipped(stack)); + ToolCommons.removeBlocksInIteration(player, stack, world, pos, new BlockPos(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0), new BlockPos(doX ? range + 1 : 1, doY ? rangeY * 2 : 1, doZ ? range + 1 : 1), null, MATERIALS, silk, fortune, isTipped(stack)); if(origLevel == 5) player.addStat(ModAchievements.rankSSPick, 1); } @@ -194,11 +191,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ iconTipped = IconHelper.forItem(par1IconRegister, this, 2); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public IIcon getIcon(ItemStack stack, int pass) { return pass == 1 && isEnabled(stack) ? iconOverlay : isTipped(stack) ? iconTipped : iconTool; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index cb944f965..09de0621e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -8,7 +8,7 @@ * * File Created @ [Mar 29, 2015, 10:12:50 PM (GMT)] */ -/*package vazkii.botania.common.item.relic; +package vazkii.botania.common.item.relic; import java.util.List; @@ -45,6 +45,7 @@ import vazkii.botania.common.lib.LibItemNames; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +/* public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; @@ -119,8 +120,8 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf @Override public Multimap getItemAttributeModifiers() { Multimap multimap = HashMultimap.create(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 10, 0)); - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 0.3, 1)); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 10, 0)); + multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 0.3, 1)); return multimap; } @@ -220,4 +221,4 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf } } - */ \ No newline at end of file +*/ 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 bf8a04135..590e23289 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -25,6 +25,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -90,7 +91,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { - if(originCoords.posY == -1 && lookPos != null) { + if(originCoords.getY() == -1 && lookPos != null) { setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); setCursorList(lokiRing, null); if(player instanceof EntityPlayerMP) @@ -138,7 +139,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } - public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { + public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote || !(item instanceof ISequentialBreaker)) return; @@ -152,12 +153,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC for(int i = 0; i < cursors.size(); i++) { BlockPos coords = cursors.get(i); - int xp = x + coords.posX; - int yp = y + coords.posY; - int zp = z + coords.posZ; - Block block = world.getBlock(xp, yp, zp); - breaker.breakOtherBlock(player, stack, xp, yp, zp, x, y, z, side); - ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, xp, yp, zp, x, y, z, block, new Material[] { block.getMaterial() }, silk, fortune, block.getBlockHardness(world, xp, yp, zp), dispose); + Block block = world.getBlockState(coords).getBlock(); + breaker.breakOtherBlock(player, stack, coords, coords, side); + ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, block, new Material[] { block.getMaterial() }, silk, fortune, block.getBlockHardness(world, coords), dispose); } } @@ -179,11 +177,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC MovingObjectPosition lookPos = Minecraft.getMinecraft().objectMouseOver; - if(lookPos != null && !player.worldObj.isAirBlock(lookPos.blockX, lookPos.blockY, lookPos.blockZ) && lookPos.entityHit == null) { + if(lookPos != null && !player.worldObj.isAirBlock(lookPos.getBlockPos()) && lookPos.entityHit == null) { List list = getCursorList(stack); BlockPos origin = getOriginPos(stack); - if(origin.posY != -1) { + if(origin.getY() != -1) { for(BlockPos coords : list) { coords.posX += origin.posX; coords.posY += origin.posY; @@ -224,10 +222,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC return new BlockPos(x, y, z); } - private static void setOriginPos(ItemStack stack, int x, int y, int z) { - ItemNBTHelper.setInt(stack, TAG_X_ORIGIN, x); - ItemNBTHelper.setInt(stack, TAG_Y_ORIGIN, y); - ItemNBTHelper.setInt(stack, TAG_Z_ORIGIN, z); + private static void setOriginPos(ItemStack stack, BlockPos pos) { + ItemNBTHelper.setInt(stack, TAG_X_ORIGIN, pos.getX()); + ItemNBTHelper.setInt(stack, TAG_Y_ORIGIN, pos.getY()); + ItemNBTHelper.setInt(stack, TAG_Z_ORIGIN, pos.getZ()); } private static List getCursorList(ItemStack stack) { @@ -251,7 +249,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if(cursors != null) { int i = 0; for(BlockPos cursor : cursors) { - NBTTagCompound cursorCmp = cursorToCmp(cursor.posX, cursor.posY, cursor.posZ); + NBTTagCompound cursorCmp = cursorToCmp(cursor); cmp.setTag(TAG_CURSOR_PREFIX + i, cursorCmp); i++; } @@ -261,18 +259,18 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC ItemNBTHelper.setCompound(stack, TAG_CURSOR_LIST, cmp); } - private static NBTTagCompound cursorToCmp(int x, int y, int z) { + private static NBTTagCompound cursorToCmp(BlockPos pos) { NBTTagCompound cmp = new NBTTagCompound(); - cmp.setInteger(TAG_X_OFFSET, x); - cmp.setInteger(TAG_Y_OFFSET, y); - cmp.setInteger(TAG_Z_OFFSET, z); + cmp.setInteger(TAG_X_OFFSET, pos.getX()); + cmp.setInteger(TAG_Y_OFFSET, pos.getY()); + cmp.setInteger(TAG_Z_OFFSET, pos.getZ()); return cmp; } - private static void addCursor(ItemStack stack, int x, int y, int z) { + private static void addCursor(ItemStack stack, BlockPos pos) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); int count = cmp.getInteger(TAG_CURSOR_COUNT); - cmp.setTag(TAG_CURSOR_PREFIX + count, cursorToCmp(x, y, z)); + cmp.setTag(TAG_CURSOR_PREFIX + count, cursorToCmp(pos)); cmp.setInteger(TAG_CURSOR_COUNT, count + 1); ItemNBTHelper.setCompound(stack, TAG_CURSOR_LIST, cmp); } From 3ebcd10233fd4ee5dbe90ffe7052a0ba59378e57 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 20 Nov 2015 00:53:35 -0600 Subject: [PATCH 030/935] Finish ring of Loki --- .../common/item/relic/ItemLokiRing.java | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) 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 590e23289..22a6fa96c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -92,23 +92,21 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { if(originCoords.getY() == -1 && lookPos != null) { - setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); + setOriginPos(lokiRing, lookPos.getBlockPos()); setCursorList(lokiRing, null); if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } else if(lookPos != null) { - if(originCoords.posX == lookPos.blockX && originCoords.posY == lookPos.blockY && originCoords.posZ == lookPos.blockZ) { - setOriginPos(lokiRing, 0, -1, 0); + if(originCoords.equals(lookPos.getBlockPos())) { + setOriginPos(lokiRing, new BlockPos(0, -1, 0)); if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } else { addCursor : { - int relX = lookPos.blockX - originCoords.posX; - int relY = lookPos.blockY - originCoords.posY; - int relZ = lookPos.blockZ - originCoords.posZ; + BlockPos relPos = lookPos.getBlockPos().add(originCoords.multiply(-1)); for(BlockPos cursor : cursors) - if(cursor.posX == relX && cursor.posY == relY && cursor.posZ == relZ) { + if(cursor.equals(relPos)) { cursors.remove(cursor); setCursorList(lokiRing, cursors); if(player instanceof EntityPlayerMP) @@ -116,7 +114,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC break addCursor; } - addCursor(lokiRing, relX, relY, relZ); + addCursor(lokiRing, relPos); if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } @@ -124,12 +122,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } else if(heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) { for(BlockPos cursor : cursors) { - int x = lookPos.blockX + cursor.posX; - int y = lookPos.blockY + cursor.posY; - int z = lookPos.blockZ + cursor.posZ; + BlockPos pos = lookPos.getBlockPos().add(cursor); Item item = heldItemStack.getItem(); - if(!player.worldObj.isAirBlock(x, y, z) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, x, y, z, lookPos.sideHit, (float) lookPos.hitVec.xCoord - x, (float) lookPos.hitVec.yCoord - y, (float) lookPos.hitVec.zCoord - z); + if(!player.worldObj.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { + item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); if(heldItemStack.stackSize == 0) { event.setCanceled(true); return; @@ -181,16 +177,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC List list = getCursorList(stack); BlockPos origin = getOriginPos(stack); - if(origin.getY() != -1) { - for(BlockPos coords : list) { - coords.posX += origin.posX; - coords.posY += origin.posY; - coords.posZ += origin.posZ; + for (int i = 0; i < list.size(); i++) { + if (origin.getY() != -1) { + list.set(i, list.get(i).add(origin)); + } else { + list.set(i, list.get(i).add(lookPos.getBlockPos())); } - } else for(BlockPos coords : list) { - coords.posX += lookPos.blockX; - coords.posY += lookPos.blockY; - coords.posZ += lookPos.blockZ; } return list; From 55bf02798d1879ded4e515b97570ecb3a5dccde0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 20 Nov 2015 13:45:35 -0600 Subject: [PATCH 031/935] Most of rod package --- .../core/handler/RedStringRenderer.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileHourglass.java | 2 +- .../client/render/tile/RenderTilePylon.java | 2 +- .../render/tile/RenderTileSpreader.java | 2 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 2 +- .../common/item/lens/LensFirework.java | 6 +- .../botania/common/item/lens/LensFlare.java | 13 +- .../botania/common/item/lens/LensMagnet.java | 70 ++++++----- .../botania/common/item/lens/LensPaint.java | 38 +++--- .../common/item/lens/LensRedirect.java | 14 +-- .../common/item/rod/ItemCobbleRod.java | 4 +- .../botania/common/item/rod/ItemDirtRod.java | 16 +-- .../common/item/rod/ItemDiviningRod.java | 22 ++-- .../common/item/rod/ItemExchangeRod.java | 113 ++++++++---------- .../botania/common/item/rod/ItemFireRod.java | 8 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemMissileRod.java | 6 +- .../common/item/rod/ItemSkyDirtRod.java | 4 +- .../botania/common/item/rod/ItemSmeltRod.java | 6 +- .../botania/common/item/rod/ItemWaterRod.java | 12 +- 23 files changed, 172 insertions(+), 178 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index a15e616ed..42a04a7f7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -85,7 +85,7 @@ public final class RedStringRenderer { GL11.glLineWidth(1F); tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES); - double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().toLong()).nextInt(10000); + double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().hashCode()).nextInt(10000); double add = vecMag.mag(); double rand = Math.random() - 0.5; for(int i = 0; i < stages; i++) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index f9b178ea9..859dd1a3f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -39,7 +39,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) - worldTime += new Random(tile.getPos().toLong()).nextInt(1000); + worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); GL11.glTranslatef(0.5F, 0F, 0.5F); GL11.glRotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index dee5b1534..6d45fdb82 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -43,7 +43,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame; if(wtime != 0) - wtime += new Random(tileentity.getPos().toLong()).nextInt(360); + wtime += new Random(tileentity.getPos().hashCode()).nextInt(360); float time = wtime == 0 ? 0 : wtime + ticks; float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F; 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 55de61e63..b7fcc6eea 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -68,7 +68,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); if(tileentity != null) - worldTime += new Random(tileentity.getPos().toLong()).nextInt(360); + worldTime += new Random(tileentity.getPos().hashCode()).nextInt(360); if(ConfigHandler.oldPylonModel) { GL11.glTranslated(d0 + 0.5, d1 + 2.2, d2 + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 368b1f886..9b0054df8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -70,7 +70,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { double time = ClientTickHandler.ticksInGame + ticks; if(spreader.isULTRA_SPREADER()) { - Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().toLong()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F); + Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().hashCode()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F); GL11.glColor3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); } model.render(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 5c71aa1eb..21c284c4f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -45,7 +45,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { double time = Botania.proxy.getWorldElapsedTicks() + f; boolean hasWorld = tileentity.getWorld() != null; if(hasWorld) - time += new Random(tileentity.getPos().toLong()).nextInt(1000); + time += new Random(tileentity.getPos().hashCode()).nextInt(1000); GL11.glTranslatef(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if(hasWorld) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index dce215c9b..73d7d4205 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -115,7 +115,7 @@ public class ItemGrassHorn extends ItemMod { public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { EnumHornType type = EnumHornType.getTypeForMeta(stackDmg); - Random rand = new Random(srcPos.toLong()); + Random rand = new Random(srcPos.hashCode()); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; List coords = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 43025d414..f86cbff39 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -214,7 +214,7 @@ public class ItemGrassSeeds extends ItemMod { BlockSwapper(World world, BlockPos coords, IBlockState state) { this.world = world; stateToSet = state; - rand = new Random(coords.toLong()); + rand = new Random(coords.hashCode()); startCoords = coords; } 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 8f2841611..d452faaf2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -27,8 +27,8 @@ public class LensFirework extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!burst.isFake()) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) { + BlockPos coords = burst.getBurstSourceBlockPos(); + if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && !pos.getBlockPos().equals(coords)) { ItemStack fireworkStack = generateFirework(burst.getColor()); EntityFireworkRocket rocket = new EntityFireworkRocket(entity.worldObj, entity.posX, entity.posY, entity.posZ, fireworkStack); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 4040ab0e0..f98db62bf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.lens; import java.awt.Color; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -52,18 +53,18 @@ public class LensFlare extends Lens { TileEntity tile = (TileEntity) spreader; if(storedColor == 16) { - Color c = Color.getHSBColor(tile.getWorldObj().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); + Color c = Color.getHSBColor(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); r = (float) c.getRed() / 255F; g = (float) c.getGreen() / 255F; b = (float) c.getBlue() / 255F; } else if(storedColor >= 0) { - float[] colortable = EntitySheep.fleeceColorTable[storedColor]; - r = colortable[0]; - g = colortable[1]; - b = colortable[2]; + int hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; + r = (hex & 0xFF0000) >> 16; + g = (hex & 0xFF00) >> 8; + b = (hex & 0xFF); } - Botania.proxy.wispFX(tile.getWorldObj(), tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, r, g, b, 0.4F, mx, my, mz); + Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 6639fe2ce..6b048556c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -28,53 +28,51 @@ public class LensMagnet extends Lens { @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { - int x = (int) entity.posX; - int y = (int) entity.posY; - int z = (int) entity.posZ; + BlockPos basePos = new BlockPos(entity); boolean magnetized = entity.getEntityData().hasKey(TAG_MAGNETIZED); int range = 3; magnetize : { - for(int i = -range; i < range; i++) - for(int j = -range; j < range; j++) - for(int k = -range; k < range; k++) - if(entity.worldObj.getTileEntity(i + x, j + y, k + z) instanceof IManaReceiver) { - TileEntity tile = entity.worldObj.getTileEntity(i + x, j + y, k + z); + for (BlockPos pos : ((Iterable) BlockPos.getAllInBox(basePos.add(-range, -range, -range), basePos.add(range, range, range)))) { + if(entity.worldObj.getTileEntity(pos) instanceof IManaReceiver) { + TileEntity tile = entity.worldObj.getTileEntity(pos); - if(magnetized) { - int magX = entity.getEntityData().getInteger(TAG_MAGNETIZED_X); - int magY = entity.getEntityData().getInteger(TAG_MAGNETIZED_Y); - int magZ = entity.getEntityData().getInteger(TAG_MAGNETIZED_Z); - if(tile.xCoord != magX || tile.yCoord != magY || tile.zCoord != magZ) - continue; - } + if(magnetized) { + int magX = entity.getEntityData().getInteger(TAG_MAGNETIZED_X); + int magY = entity.getEntityData().getInteger(TAG_MAGNETIZED_Y); + int magZ = entity.getEntityData().getInteger(TAG_MAGNETIZED_Z); + if(tile.getPos().getX() != magX || tile.getPos().getY() != magY || tile.getPos().getZ() != magZ) + continue; + } - IManaReceiver receiver = (IManaReceiver) tile; + IManaReceiver receiver = (IManaReceiver) tile; - BlockPos srcCoords = burst.getBurstSourceBlockPos(); + BlockPos srcCoords = burst.getBurstSourceBlockPos(); - if(MathHelper.pointDistanceSpace(tile.xCoord, tile.yCoord, tile.zCoord, srcCoords.posX, srcCoords.posY, srcCoords.posZ) > 3 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { - Vector3 burstVec = Vector3.fromEntity(entity); - Vector3 tileVec = Vector3.fromTileEntityCenter(tile).add(0, -0.1, 0); - Vector3 motionVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); + if(MathHelper.pointDistanceSpace(tile.getPos(), srcCoords) > 3 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { + Vector3 burstVec = Vector3.fromEntity(entity); + Vector3 tileVec = Vector3.fromTileEntityCenter(tile).add(0, -0.1, 0); + Vector3 motionVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - Vector3 normalMotionVec = motionVec.copy().normalize(); - Vector3 magnetVec = tileVec.sub(burstVec).normalize(); - Vector3 differenceVec = normalMotionVec.sub(magnetVec).multiply(motionVec.mag() * 0.1); + Vector3 normalMotionVec = motionVec.copy().normalize(); + Vector3 magnetVec = tileVec.sub(burstVec).normalize(); + Vector3 differenceVec = normalMotionVec.sub(magnetVec).multiply(motionVec.mag() * 0.1); - Vector3 finalMotionVec = motionVec.sub(differenceVec); - if(!magnetized) { - finalMotionVec.multiply(0.75); - entity.getEntityData().setBoolean(TAG_MAGNETIZED, true); - entity.getEntityData().setInteger(TAG_MAGNETIZED_X, tile.xCoord); - entity.getEntityData().setInteger(TAG_MAGNETIZED_Y, tile.yCoord); - entity.getEntityData().setInteger(TAG_MAGNETIZED_Z, tile.zCoord); - } - - burst.setMotion(finalMotionVec.x, finalMotionVec.y, finalMotionVec.z); - break magnetize; - } + Vector3 finalMotionVec = motionVec.sub(differenceVec); + if(!magnetized) { + finalMotionVec.multiply(0.75); + entity.getEntityData().setBoolean(TAG_MAGNETIZED, true); + entity.getEntityData().setInteger(TAG_MAGNETIZED_X, tile.getPos().getX()); + entity.getEntityData().setInteger(TAG_MAGNETIZED_Y, tile.getPos().getY()); + entity.getEntityData().setInteger(TAG_MAGNETIZED_Z, tile.getPos().getZ()); } + + burst.setMotion(finalMotionVec.x, finalMotionVec.y, finalMotionVec.z); + break magnetize; + } + } + + } } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 3ae0ba6be..ea40b1e37 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -14,11 +14,14 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; @@ -33,21 +36,21 @@ public class LensPaint extends Lens { if(!burst.isFake() && storedColor > -1 && storedColor < 17) { if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { int r = 20; - int sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); + EnumDyeColor sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); List sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, new AxisAlignedBB(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); for(EntitySheep sheep : sheepList) { if(sheep.getFleeceColor() == sheepColor) - sheep.setFleeceColor(storedColor == 16 ? sheep.worldObj.rand.nextInt(16) : storedColor); + sheep.setFleeceColor(EnumDyeColor.byMetadata(storedColor == 16 ? sheep.worldObj.rand.nextInt(16) : storedColor)); } dead = true; } else { - Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(BotaniaAPI.paintableBlocks.contains(block)) { - int meta = entity.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); + IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); List coordsToPaint = new ArrayList(); List coordsFound = new ArrayList(); - BlockPos theseCoords = new BlockPos(pos.blockX, pos.blockY, pos.blockZ); + BlockPos theseCoords = pos.getBlockPos(); coordsFound.add(theseCoords); do { @@ -56,29 +59,28 @@ public class LensPaint extends Lens { coordsFound.remove(coords); coordsToPaint.add(coords); - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Block block_ = entity.worldObj.getBlock(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); - int meta_ = entity.worldObj.getBlockMetadata(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); - BlockPos coords_ = new BlockPos(coords.posX + dir.offsetX, coords.posY + dir.offsetY, coords.posZ + dir.offsetZ); - if(block_ == block && meta_ == meta && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_)) + for(EnumFacing dir : EnumFacing.VALUES) { + IBlockState state_ = entity.worldObj.getBlockState(coords.offset(dir)); + BlockPos coords_ = new BlockPos(coords.offset(dir)); + if(state_ == state && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_)) coordsFound.add(coords_); } } } while(!coordsFound.isEmpty() && coordsToPaint.size() < 1000); for(BlockPos coords : coordsToPaint) { - int placeColor = storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor; - int metaThere = entity.worldObj.getBlockMetadata(coords.posX, coords.posY, coords.posZ); + EnumDyeColor placeColor = EnumDyeColor.byMetadata(storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor); + IBlockState stateThere = entity.worldObj.getBlockState(coords); if(metaThere != placeColor) { if(!entity.worldObj.isRemote) - entity.worldObj.setBlockMetadataWithNotify(coords.posX, coords.posY, coords.posZ, placeColor, 2); - float[] color = EntitySheep.fleeceColorTable[placeColor]; - float r = color[0]; - float g = color[1]; - float b = color[2]; + entity.worldObj.setBlockState(coords, placeColor, 2); + int hex = placeColor.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(entity.worldObj, coords.posX + (float) Math.random(), coords.posY + (float) Math.random(), coords.posZ + (float) Math.random(), r, g, b, 0.6F + (float) Math.random() * 0.3F, 5); + Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r, g, b, 0.6F + (float) Math.random() * 0.3F, 5); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 812b5e2d3..181fbeba7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -14,7 +14,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IDirectioned; @@ -28,18 +28,18 @@ public class LensRedirect extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); - if(!entity.worldObj.isRemote && pos.entityHit == null && coords.posY != -1 && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) { - TileEntity tile = entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + BlockPos coords = burst.getBurstSourceBlockPos(); + if(!entity.worldObj.isRemote && pos.entityHit == null && coords.getY() != -1 && !pos.getBlockPos().equals(coords)) { + TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof IRedirectable) { if(!burst.isFake()) { IRedirectable redir = (IRedirectable) tile; Vector3 tileVec = Vector3.fromTileEntityCenter(tile); - Vector3 sourceVec = new Vector3(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5); + Vector3 sourceVec = new Vector3(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - AxisAlignedBB axis = entity.worldObj.getBlock(coords.posX, coords.posY, coords.posZ).getCollisionBoundingBoxFromPool(entity.worldObj, coords.posX, coords.posY, coords.posZ); + AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getBlock().getCollisionBoundingBox(entity.worldObj, coords, entity.worldObj.getBlockState(coords)); if(axis == null) - axis = AxisAlignedBB.getBoundingBox(coords.posX, coords.posY, coords.posZ, coords.posX + 1, coords.posY + 1, coords.posZ + 1); + axis = new AxisAlignedBB(coords, coords.add(1, 1, 1)); if(!sourceVec.isInside(axis)) sourceVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); 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 0a5df3c44..65d26f37f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -14,6 +14,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; @@ -31,7 +33,7 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); } 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 2f2b23fd2..8be2a01ce 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -18,8 +18,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -44,23 +45,22 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - return place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + return place(par1ItemStack, par2EntityPlayer, par3World, pos, side, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); } - public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { + public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, false)) { - ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), r, g, b, 1F, 5); + Botania.proxy.sparkleFX(par3World, pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index d187da6cf..170961de8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -13,9 +13,11 @@ package vazkii.botania.common.item.rod; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -45,12 +47,9 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer p) { if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { - int x = MathHelper.floor_double(p.posX); - int y = MathHelper.floor_double(p.posY); - int z = MathHelper.floor_double(p.posZ); int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; long seedxor = world.rand.nextLong(); - doHighlight(world, x, y, z, range, seedxor); + doHighlight(world, new BlockPos(p), range, seedxor); p.swingItem(); } else world.playSoundAtEntity(p, "botania:divinationRod", 1F, 1F); } @@ -58,22 +57,19 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW return stack; } - public void doHighlight(World world, int x, int y, int z, int range, long seedxor) { + public void doHighlight(World world, BlockPos pos, int range, long seedxor) { Botania.proxy.setWispFXDepthTest(false); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) { - int xp = x + i; - int yp = y + j; - int zp = z + k; - Block block = world.getBlock(xp, yp, zp); - int meta = world.getBlockMetadata(xp, yp, zp); - ItemStack orestack = new ItemStack(block, 1, meta); + BlockPos pos_ = pos.add(i, j, k); + IBlockState state = world.getBlockState(pos_); + ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); for(int id : OreDictionary.getOreIDs(orestack)) { String s = OreDictionary.getOreName(id); if(s.matches("^ore[A-Z].+")) { Random rand = new Random(s.hashCode() ^ seedxor); - Botania.proxy.wispFX(world, xp + world.rand.nextFloat(), yp + world.rand.nextFloat(), zp + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); + Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); break; } } @@ -91,7 +87,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW TileEntity te = (TileEntity) tile; World world = te.getWorld(); if(tile.getCurrentMana() >= COST && tile.getElapsedFunctionalTicks() % 200 == 0 && tile.isEnabled()) { - doHighlight(world, te.xCoord, te.yCoord, te.zCoord, 18, te.xCoord ^ te.yCoord ^ te.zCoord); + doHighlight(world, te.getPos(), 18, te.getPos().hashCode()); tile.recieveMana(-COST); } } 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 db3bb67fb..30268d5e1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -25,10 +26,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IBlockProvider; @@ -67,19 +68,16 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block wblock = par3World.getBlock(par4, par5, par6); - int wmeta = par3World.getBlockMetadata(par4, par5, par6); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + IBlockState wstate = par3World.getBlockState(pos); if(par2EntityPlayer.isSneaking()) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = par3World.getTileEntity(pos); if(tile == null) { - if(BlockCamo.isValidBlock(wblock)) { - Item item = Item.getItemFromBlock(wblock); - if(!item.getHasSubtypes()) - wmeta = 0; + if(BlockCamo.isValidBlock(wstate.getBlock())) { + Item item = Item.getItemFromBlock(wstate.getBlock()); - boolean set = setBlock(par1ItemStack, wblock, wmeta); + boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); displayRemainderCounter(par2EntityPlayer, par1ItemStack); @@ -89,13 +87,13 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); - List swap = getBlocksToSwap(par3World, par1ItemStack, block, meta, par4, par5, par6, null, 0); + List swap = getBlocksToSwap(par3World, par1ItemStack, block.getStateFromMeta(meta), pos, null); if(swap.size() > 0) { ItemNBTHelper.setBoolean(par1ItemStack, TAG_SWAPPING, true); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, par4); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Y, par5); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, par6); - setTargetBlock(par1ItemStack, wblock, wmeta); + ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, pos.getX()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Y, pos.getY()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, pos.getZ()); + setTargetBlock(par1ItemStack, wstate.getBlock(), wstate.getBlock().getMetaFromState(wstate)); if(par3World.isRemote) par2EntityPlayer.swingItem(); } @@ -109,7 +107,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(event.action == Action.LEFT_CLICK_BLOCK) { ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, false)) { - if(exchange(event.world, event.entityPlayer, event.x, event.y, event.z, stack, getBlock(stack), getBlockMeta(stack))) + if(exchange(event.world, event.entityPlayer, event.pos, stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, true); } } @@ -140,24 +138,23 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int z = ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0); Block targetBlock = getTargetBlock(stack); int targetMeta = getTargetBlockMeta(stack); - List swap = getBlocksToSwap(world, stack, block, meta, x, y, z, targetBlock, targetMeta); + List swap = getBlocksToSwap(world, stack, block.getStateFromMeta(meta), new BlockPos(x, y, z), targetBlock.getStateFromMeta(targetMeta)); if(swap.size() == 0) { ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, false); return; } BlockPos coords = swap.get(world.rand.nextInt(swap.size())); - boolean exchange = exchange(world, player, coords.posX, coords.posY, coords.posZ, stack, block, meta); + boolean exchange = exchange(world, player, coords, stack, block.getStateFromMeta(meta)); if(exchange) ManaItemHandler.requestManaExactForTool(stack, player, COST, true); else ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, false); } } - public Boolean[][][] createMatrix(World world, ItemStack stack, Block blockToSwap, int metaToSwap, int xc, int yc, int zc, Block targetBlock, int targetMeta) { - if(targetBlock == null) { - targetBlock = world.getBlock(xc, yc, zc); - targetMeta = world.getBlockMetadata(xc, yc, zc); + public Boolean[][][] createMatrix(World world, ItemStack stack, IBlockState swapState, BlockPos pos, IBlockState targetState) { + if(targetState == null) { + targetState = world.getBlockState(pos); } int effrange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); @@ -166,15 +163,12 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra for(int i = 0; i < diameter; i++) for(int j = 0; j < diameter; j++) for(int k = 0; k < diameter; k++) { - int x = xc + i - effrange; - int y = yc + j - effrange; - int z = zc + k - effrange; - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - boolean invalid = !BlockCamo.isValidBlock(block); + BlockPos pos_ = pos.add(i - effrange, j - effrange, k - effrange); + IBlockState state = world.getBlockState(pos_); + boolean invalid = !BlockCamo.isValidBlock(state.getBlock()); if(invalid) matrix[i][j][k] = true; - else if(block == blockToSwap && meta == metaToSwap || block != targetBlock || meta != targetMeta) + else if(state == swapState || state != targetState) matrix[i][j][k] = null; else matrix[i][j][k] = false; } @@ -182,25 +176,22 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return matrix; } - public List getBlocksToSwap(World world, ItemStack stack, Block blockToSwap, int metaToSwap, int xc, int yc, int zc, Block targetBlock, int targetMeta) { + public List getBlocksToSwap(World world, ItemStack stack, IBlockState swapState, BlockPos pos, IBlockState targetState) { List coordsList = new ArrayList(); - Boolean[][][] matrix = createMatrix(world, stack, blockToSwap, metaToSwap, xc, yc, zc, targetBlock, targetMeta); + Boolean[][][] matrix = createMatrix(world, stack, swapState, pos, targetState); int effrange = RANGE + ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); int diameter = effrange * 2; for(int i = 1; i < diameter; i++) for(int j = 1; j < diameter; j++) for(int k = 1; k < diameter; k++) { - int x = xc + i - effrange; - int y = yc + j - effrange; - int z = zc + k - effrange; - + BlockPos pos_ = pos.add(i - effrange, j - effrange, k - effrange); Boolean bool = matrix[i][j][k]; if(bool != null && !bool) - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Boolean obool = matrix[i + dir.offsetX][j + dir.offsetY][k + dir.offsetZ]; + for(EnumFacing dir : EnumFacing.VALUES) { + Boolean obool = matrix[i + dir.getFrontOffsetX()][j + dir.getFrontOffsetY()][k + dir.getFrontOffsetZ()]; if(obool != null && obool) { - coordsList.add(new BlockPos(x, y, z)); + coordsList.add(pos_); break; } } @@ -209,26 +200,26 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return coordsList; } - public boolean exchange(World world, EntityPlayer player, int x, int y, int z, ItemStack stack, Block blockToSet, int metaToSet) { - TileEntity tile = world.getTileEntity(x, y, z); + public boolean exchange(World world, EntityPlayer player, BlockPos pos, ItemStack stack, IBlockState state) { + TileEntity tile = world.getTileEntity(pos); if(tile != null) return false; - ItemStack placeStack = removeFromInventory(player, stack, blockToSet, metaToSet, false); + ItemStack placeStack = removeFromInventory(player, stack, state.getBlock(), state.getBlock().getMetaFromState(state), false); if(placeStack != null) { - Block blockAt = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - if(!blockAt.isAir(world, x, y, z) && blockAt.getPlayerRelativeBlockHardness(player, world, x, y, z) > 0 && (blockAt != blockToSet || meta != metaToSet)) { + IBlockState stateAt = world.getBlockState(pos); + Block blockAt = stateAt.getBlock(); + if(!blockAt.isAir(world, pos) && blockAt.getPlayerRelativeBlockHardness(player, world, pos) > 0 && stateAt != state) { if(!world.isRemote) { if(!player.capabilities.isCreativeMode) { - List drops = blockAt.getDrops(world, x, y, z, meta, 0); + List drops = blockAt.getDrops(world, pos, stateAt, 0); for(ItemStack drop : drops) - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, drop)); - removeFromInventory(player, stack, blockToSet, metaToSet, true); + 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, x, y, z, Block.getIdFromBlock(blockAt) + (meta << 12)); - world.setBlock(x, y, z, blockToSet, metaToSet, 1 | 2); - blockToSet.onBlockPlacedBy(world, x, y, z, player, placeStack); + world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.setBlockState(pos, state, 1 | 2); + state.getBlock().onBlockPlacedBy(world, pos, state, player, placeStack); } displayRemainderCounter(player, stack); return true; @@ -332,7 +323,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)); + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } @@ -358,7 +349,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)); + ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_TARGET_BLOCK_META, meta); return true; } @@ -388,23 +379,23 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null) { - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; + BlockPos bPos = pos.getBlockPos(); Block targetBlock = null; int targetMeta = 0; if(ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { - x = ItemNBTHelper.getInt(stack, TAG_SELECT_X, 0); - y = ItemNBTHelper.getInt(stack, TAG_SELECT_Y, 0); - z = ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0); + bPos = new BlockPos( + ItemNBTHelper.getInt(stack, TAG_SELECT_X, 0), + ItemNBTHelper.getInt(stack, TAG_SELECT_Y, 0), + ItemNBTHelper.getInt(stack, TAG_SELECT_Z, 0) + ); targetBlock = getTargetBlock(stack); targetMeta = getTargetBlockMeta(stack); } - if(!player.worldObj.isAirBlock(x, y, z)) { - List coordsList = getBlocksToSwap(player.worldObj, stack, block, meta, x, y, z, targetBlock, targetMeta); + if(!player.worldObj.isAirBlock(bPos)) { + List coordsList = getBlocksToSwap(player.worldObj, stack, block.getStateFromMeta(meta), bPos, targetBlock == null ? null : targetBlock.getStateFromMeta(targetMeta)); for(BlockPos coords : coordsList) - if(coords.posX == x && coords.posY == y && coords.posZ == z) { + if(coords.equals(bPos)) { coordsList.remove(coords); break; } 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 6f0ebf691..887cfc926 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -14,6 +14,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; @@ -40,10 +42,10 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, int x, int y, int z, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); - entity.setPosition(x + 0.5, y + 1, z + 0.5); + entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); par1ItemStack.setItemDamage(COOLDOWN); @@ -77,7 +79,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield if(!world.isRemote && tile.getCurrentMana() >= COST && tile.getElapsedFunctionalTicks() % 300 == 0 && tile.isEnabled()) { EntityFlameRing entity = new EntityFlameRing(world); - entity.setPosition(te.xCoord + 0.5, te.yCoord, te.zCoord + 0.5); + entity.setPosition(te.getPos().getX() + 0.5, te.getPos().getY(), te.getPos().getZ() + 0.5); world.spawnEntityInWorld(entity); tile.recieveMana(-COST); } 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 dba7d061a..04aca1a5e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -131,7 +131,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { EntityLivingBase targetEntity = (EntityLivingBase)item; targetEntity.fallDistance = 0.0F; if(targetEntity.getActivePotionEffect(Potion.moveSlowdown) == null) - targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true)); + targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true, true)); } Vector3 target3 = Vector3.fromEntityCenter(player); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 3943c14be..b388fcd17 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -43,7 +43,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -100,10 +100,10 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi TileEntity te = (TileEntity) tile; World world = te.getWorld(); if(tile.getCurrentMana() >= COST_AVATAR && tile.getElapsedFunctionalTicks() % 3 == 0 && tile.isEnabled()) - if(spawnMissile(world, null, te.xCoord + 0.5 + (Math.random() - 0.5 * 0.1), te.yCoord + 2.5 + (Math.random() - 0.5 * 0.1), te.zCoord + (Math.random() - 0.5 * 0.1))) { + if(spawnMissile(world, null, te.getPos().getX() + 0.5 + (Math.random() - 0.5 * 0.1), te.getPos().getY() + 2.5 + (Math.random() - 0.5 * 0.1), te.getPos().getZ() + (Math.random() - 0.5 * 0.1))) { if(!world.isRemote) tile.recieveMana(-COST_AVATAR); - Botania.proxy.sparkleFX(world, te.xCoord + 0.5, te.yCoord + 2.5, te.zCoord + 0.5, 1F, 0.4F, 1F, 6F, 6); + Botania.proxy.sparkleFX(world, te.getPos().getX() + 0.5, te.getPos().getY() + 2.5, te.getPos().getZ() + 0.5, 1F, 0.4F, 1F, 6F, 6); } } 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 d7b4294a9..bd08bb9d5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -15,6 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.ManaItemHandler; @@ -43,7 +45,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { if(entities == 0) { ItemStack stackToPlace = new ItemStack(Blocks.dirt); - stackToPlace.tryPlaceItemIntoWorld(player, world, x, y, z, 0, 0F, 0F, 0F); + stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), EnumFacing.DOWN, 0F, 0F, 0F); if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true); 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 6a72d4671..b550f9c5e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -44,7 +44,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -70,7 +70,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { int meta = p.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); ItemStack blockStack = new ItemStack(block, 1, meta); - ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(blockStack); + ItemStack result = FurnaceRecipes.instance().getSmeltingResult(blockStack); if(result != null && result.getItem() instanceof ItemBlock) { boolean decremented = false; @@ -139,7 +139,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } public boolean equalPos(MovingObjectPosition pos) { - return pos.blockX == this.pos.blockX && pos.blockY == this.pos.blockY && pos.blockZ == this.pos.blockZ; + return pos.getBlockPos().equals(this.pos.getBlockPos()); } } } 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 3d8cf2183..9db28ad64 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -3,8 +3,9 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -22,17 +23,16 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.isHellWorld) { - ForgeDirection dir = ForgeDirection.getOrientation(par7); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.doesWaterVaporize()) { ItemStack stackToPlace = new ItemStack(Blocks.flowing_water); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); + 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 true; From 3f9d5c888f45762c8a9106e9065d4b6fc5451ad4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 20 Nov 2015 18:36:01 -0600 Subject: [PATCH 032/935] Finish rods (a bit of block leaked in, oops) --- MC18_notes.txt | 20 +++++++++ .../block/corporea/BlockCorporeaBase.java | 12 ++--- .../corporea/BlockCorporeaCrystalCube.java | 4 +- .../common/item/rod/ItemCobbleRod.java | 2 +- .../common/item/rod/ItemRainbowRod.java | 45 ++++++++----------- .../botania/common/item/rod/ItemSmeltRod.java | 20 ++++----- .../common/item/rod/ItemTerraformRod.java | 44 ++++++++---------- 7 files changed, 77 insertions(+), 70 deletions(-) create mode 100644 MC18_notes.txt diff --git a/MC18_notes.txt b/MC18_notes.txt new file mode 100644 index 000000000..1d8d42194 --- /dev/null +++ b/MC18_notes.txt @@ -0,0 +1,20 @@ +-- API -- +* Updated to BlockPos and EnumFacing everywhere where it made sense +* Registering repainting blocks will need to also receive a PropertyEnum with EnumDyeColor as the component type +so Botania knows what property to set the color on (todo actually do this) +* ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively) +This can be changed to match vanilla signature, but either would break backward compat. + +-- Other -- +* Most things left untouched to make patches from upstream easier +* Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances +since BlockPos'es are immutable and thus can be reused everywhere. +* Some really needed fields in EntityItem are private now. Reflection time :( + + +-- Todo -- +* Fix all the block signatures (easy) +* Fix all other low hanging errors (easy-med) +* Find all the block metadatas and give them all meaningful block states and properties (tedious/med-hard) +* JSON models for everything (tedious/med-hard) +* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med) \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 4be814d28..a24b1af8a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -14,12 +14,14 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -39,8 +41,8 @@ public abstract class BlockCorporeaBase extends BlockModContainer= 256 || y <= 0) break; for(int i = -2; i < 1; i++) for(int j = -2; j < 1; j++) - if(par2World.getBlock((int) x + i, (int) y, (int) z + j).isAir(par2World, (int) x + i, (int) y, (int) z + j) || par2World.getBlock((int) x + i, (int) y, (int) z + j) == place) { - par2World.setBlock((int) x + i, (int) y, (int) z + j, place); - TileBifrost tile = (TileBifrost) par2World.getTileEntity((int) x + i, (int) y, (int) z + j); + if(par2World.getBlockState(playerPos.add(i, 0, j)).getBlock().isAir(par2World, playerPos.add(i, 0, j)) || par2World.getBlockState(playerPos.add(i, 0, j)).getBlock() == place) { + par2World.setBlockState(playerPos.add(i, 0, j), place.getDefaultState()); + TileBifrost tile = (TileBifrost) par2World.getTileEntity(playerPos.add(i, 0, j)); if(tile != null) { for(int k = 0; k < 4; k++) - Botania.proxy.sparkleFX(par2World, tile.xCoord + Math.random(), tile.yCoord + Math.random(), tile.zCoord + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(par2World, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); tile.ticks = time; } } @@ -114,11 +112,6 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi return getContainerItem(stack) != null; } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { - return false; - } - @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par1ItemStack.isItemDamaged()) @@ -143,9 +136,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if(world.isRemote || tile.getCurrentMana() < MANA_COST_AVATAR * 25 || !tile.isEnabled()) return; - int x = te.xCoord; - int y = te.yCoord; - int z = te.zCoord; + BlockPos tePos = te.getPos(); int w = 1; int h = 1; int l = 20; @@ -153,16 +144,16 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi AxisAlignedBB axis = null; switch(te.getBlockMetadata() - 2) { case 0 : - axis = new AxisAlignedBB(x - w, y - h, z - l, x + w + 1, y + h, z); + axis = new AxisAlignedBB(tePos.add(-w, -h, -l), tePos.add(w + 1, h, 0)); break; case 1 : - axis = new AxisAlignedBB(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); + axis = new AxisAlignedBB(tePos.add(-w, -h, 1), tePos.add(w + 1, h, l + 1)); break; case 2 : - axis = new AxisAlignedBB(x - l, y - h, z - w, x, y + h, z + w + 1); + axis = new AxisAlignedBB(tePos.add(-l, -h, -w), tePos.add(0, h, w + 1)); break; case 3 : - axis = new AxisAlignedBB(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); + axis = new AxisAlignedBB(tePos.add(1, -h, -w), tePos.add(l + 1, h, w + 1)); } List players = world.getEntitiesWithinAABB(EntityPlayer.class, axis); @@ -180,15 +171,15 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if(!axis.isVecInside(new Vec3(ex + 0.5, py + 1, ez + 0.5))) continue; - - Block block = world.getBlock(ex, py, ez); - if(block.isAir(world, ex, py, ez)) { - world.setBlock(ex, py, ez, ModBlocks.bifrost); - TileBifrost tileBifrost = (TileBifrost) world.getTileEntity(ex, py, ez); + BlockPos pos = new BlockPos(ex, py, ez); + Block block = world.getBlockState(pos).getBlock(); + if(block.isAir(world, pos)) { + world.setBlockState(pos, ModBlocks.bifrost.getDefaultState()); + TileBifrost tileBifrost = (TileBifrost) world.getTileEntity(pos); tileBifrost.ticks = 10; tile.recieveMana(-MANA_COST_AVATAR); } else if(block == ModBlocks.bifrost) { - TileBifrost tileBifrost = (TileBifrost) world.getTileEntity(ex, py, ez); + TileBifrost tileBifrost = (TileBifrost) world.getTileEntity(pos); if(tileBifrost.ticks < 2) { tileBifrost.ticks = 10; tile.recieveMana(-MANA_COST_AVATAR); 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 b550f9c5e..1fe5bba52 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.WeakHashMap; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemBlock; @@ -66,10 +67,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); if(pos != null) { - Block block = p.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - int meta = p.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); + IBlockState state = p.worldObj.getBlockState(pos.getBlockPos()); - ItemStack blockStack = new ItemStack(block, 1, meta); + ItemStack blockStack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); ItemStack result = FurnaceRecipes.instance().getSmeltingResult(blockStack); if(result != null && result.getItem() instanceof ItemBlock) { @@ -83,7 +83,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { decremented = true; if(data.progress <= 0) { if(!p.worldObj.isRemote) { - p.worldObj.setBlock(pos.blockX, pos.blockY, pos.blockZ, Block.getBlockFromItem(result.getItem()), result.getItemDamage(), 1 | 2); + p.worldObj.setBlockState(pos.getBlockPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 1 | 2); p.worldObj.playSoundAtEntity(p, "fire.ignite", 0.6F, 1F); p.worldObj.playSoundAtEntity(p, "fire.fire", 1F, 1F); @@ -93,9 +93,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } for(int i = 0; i < 25; i++) { - double x = pos.blockX + Math.random(); - double y = pos.blockY + Math.random(); - double z = pos.blockZ + Math.random(); + double x = pos.getBlockPos().getX() + Math.random(); + double y = pos.getBlockPos().getY() + Math.random(); + double z = pos.getBlockPos().getZ() + Math.random(); Botania.proxy.wispFX(p.worldObj, x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); } @@ -107,9 +107,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { playerData.put(p, new SmeltData(pos, IManaProficiencyArmor.Helper.hasProficiency(p) ? (int) (TIME * 0.6) : TIME)); else { for(int i = 0; i < 2; i++) { - double x = pos.blockX + Math.random(); - double y = pos.blockY + Math.random(); - double z = pos.blockZ + Math.random(); + double x = pos.getBlockPos().getX() + Math.random(); + double y = pos.getBlockPos().getY() + Math.random(); + double z = pos.getBlockPos().getZ() + Math.random(); Botania.proxy.wispFX(p.worldObj, x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); } if(time % 10 == 0) 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 224fffb45..6e6bf7860 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -23,8 +24,8 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -63,7 +64,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -87,7 +88,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; int xCenter = (int) par3EntityPlayer.posX; - int yCenter = (int) par3EntityPlayer.posY - (par2World.isRemote ? 2 : 1); + int yCenter = (int) par3EntityPlayer.posY; int zCenter = (int) par3EntityPlayer.posZ; if(yCenter < 62) // Not below sea level @@ -104,37 +105,30 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(yStart + k < 0) break; - int x = xCenter + i; - int y = yStart + k; - int z = zCenter + j; + BlockPos pos = new BlockPos(xCenter + i, yStart + k, zCenter + j); + IBlockState state = par2World.getBlockState(pos); - Block block = par2World.getBlock(x, y, z); - int meta = par2World.getBlockMetadata(x, y, z); - - int[] ids = OreDictionary.getOreIDs(new ItemStack(block, 1, meta)); + int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); for(int id : ids) if(validBlocks.contains(OreDictionary.getOreName(id))) { boolean hasAir = false; List airBlocks = new ArrayList(); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - int x_ = x + dir.offsetX; - int y_ = y + dir.offsetY; - int z_ = z + dir.offsetZ; - - Block block_ = par2World.getBlock(x_, y_, z_); - if(block_.isAir(par2World, x_, y_, z_) || block_.isReplaceable(par2World, x_, y_, z_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { - airBlocks.add(new BlockPos(x_, y_, z_)); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + BlockPos pos_ = pos.offset(dir); + Block block_ = par2World.getBlockState(pos_).getBlock(); + if(block_.isAir(par2World, pos_) || block_.isReplaceable(par2World, pos_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { + airBlocks.add(pos_); hasAir = true; } } if(hasAir) { - if(y > yCenter) - blocks.add(new CoordsWithBlock(x, y, z, Blocks.air)); + if(pos.getY() > yCenter) + blocks.add(new CoordsWithBlock(pos, Blocks.air)); else for(BlockPos coords : airBlocks) { - if(par2World.getBlock(coords.posX, coords.posY - 1, coords.posZ) != Blocks.air) - blocks.add(new CoordsWithBlock(coords.posX, coords.posY, coords.posZ, Blocks.dirt)); + if(par2World.getBlockState(coords.down()).getBlock() != Blocks.air) + blocks.add(new CoordsWithBlock(coords, Blocks.dirt)); } } break; @@ -148,7 +142,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(par2World.isRemote || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, cost, true)) { if(!par2World.isRemote) for(CoordsWithBlock block : blocks) - par2World.setBlock(block.posX, block.posY, block.posZ, block.block); + par2World.setBlockState(block, block.block.getDefaultState()); if(!blocks.isEmpty()) { for(int i = 0; i < 10; i++) @@ -168,8 +162,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP final Block block; - public CoordsWithBlock(int x, int y, int z, Block block) { - super(x, y, z); + public CoordsWithBlock(BlockPos pos, Block block) { + super(pos.getX(), pos.getY(), pos.getZ()); this.block = block; } From 921370b546d3808e914ff952a353a4411b2ca5e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 Nov 2015 22:53:58 -0600 Subject: [PATCH 033/935] block. corporea, dispenser, mana, string. some of the base pkg too --- .../botania/common/block/BlockAlfPortal.java | 4 +- .../botania/common/block/BlockAltGrass.java | 111 ++++++++++-------- .../botania/common/block/BlockAltar.java | 48 ++++---- .../botania/common/block/BlockAvatar.java | 2 +- .../botania/common/block/BlockBifrost.java | 2 +- .../common/block/BlockCacophonium.java | 2 +- .../botania/common/block/BlockCell.java | 2 +- .../botania/common/block/BlockCocoon.java | 2 +- .../botania/common/block/BlockEnderEye.java | 2 +- .../botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/BlockForestEye.java | 2 +- .../botania/common/block/BlockHourglass.java | 2 +- .../common/block/BlockIncensePlate.java | 2 +- .../botania/common/block/BlockLightRelay.java | 6 +- .../common/block/BlockModContainer.java | 4 +- .../botania/common/block/BlockOpenCrate.java | 6 +- .../botania/common/block/BlockPlatform.java | 13 +- .../botania/common/block/BlockPylon.java | 17 +-- .../botania/common/block/BlockRoot.java | 5 +- .../botania/common/block/BlockSolidVines.java | 20 ++-- .../common/block/BlockSparkChanger.java | 30 ++--- .../common/block/BlockSpecialFlower.java | 96 ++++++++------- .../botania/common/block/BlockStorage.java | 9 +- .../common/block/BlockTeruTeruBozu.java | 24 ++-- .../botania/common/block/BlockTinyPlanet.java | 4 +- .../common/block/BotaniaStateProps.java | 33 ++++++ .../block/corporea/BlockCorporeaBase.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 14 +-- .../block/corporea/BlockCorporeaFunnel.java | 5 +- .../block/corporea/BlockCorporeaIndex.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 6 +- .../block/corporea/BlockCorporeaRetainer.java | 9 +- .../block/decor/BlockFloatingFlower.java | 6 +- .../common/block/decor/BlockManaBeacon.java | 6 +- .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockStarfield.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 6 +- .../dispenser/BehaviourPoolMinecart.java | 18 +-- .../block/dispenser/BehaviourSeeds.java | 11 +- .../common/block/dispenser/BehaviourWand.java | 13 +- .../common/block/mana/BlockBellows.java | 10 +- .../common/block/mana/BlockBrewery.java | 27 +++-- .../common/block/mana/BlockDistributor.java | 2 +- .../common/block/mana/BlockEnchanter.java | 22 ++-- .../common/block/mana/BlockForestDrum.java | 10 +- .../common/block/mana/BlockManaDetector.java | 10 +- .../common/block/mana/BlockManaVoid.java | 2 +- .../botania/common/block/mana/BlockPool.java | 53 +++++---- .../botania/common/block/mana/BlockPrism.java | 22 ++-- .../botania/common/block/mana/BlockPump.java | 39 +++--- .../common/block/mana/BlockRFGenerator.java | 8 +- .../common/block/mana/BlockRuneAltar.java | 30 ++--- .../common/block/mana/BlockSpawnerClaw.java | 4 +- .../common/block/mana/BlockSpreader.java | 57 +++++---- .../common/block/mana/BlockTerraPlate.java | 10 +- .../common/block/mana/BlockTurntable.java | 6 +- .../common/block/string/BlockRedString.java | 20 ++-- .../string/BlockRedStringComparator.java | 5 +- .../string/BlockRedStringFertilizer.java | 15 +-- .../string/BlockRedStringInterceptor.java | 10 +- .../tile/string/TileRedStringFertilizer.java | 12 +- 61 files changed, 501 insertions(+), 426 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BotaniaStateProps.java diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8c04f72c1..8a16618b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -38,7 +38,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.ALF_PORTAL); + setUnlocalizedName(LibBlockNames.ALF_PORTAL); } @Override @@ -65,7 +65,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded(); + boolean did = ((TileAlfPortal) world.getTileEntity(pos)).onWanded(); if(did && player != null) player.addStat(ModAchievements.elfPortalOpen, 1); return did; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 0bb2f00a9..4a4d18328 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -11,39 +11,54 @@ package vazkii.botania.common.block; import java.util.List; +import java.util.Locale; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockDirt; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; -import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltGrass extends BlockMod { - private static final int SUBTYPES = 6; - IIcon[] icons; - public BlockAltGrass() { super(Material.grass); setHardness(0.6F); setStepSound(soundTypeGrass); setBlockName(LibBlockNames.ALT_GRASS); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.DRY)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ALTGRASS_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.values()[meta]); } @Override @@ -64,75 +79,75 @@ public class BlockAltGrass extends BlockMod { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES * 2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int side, int meta) { - return side == 0 || meta >= SUBTYPES ? Blocks.dirt.getIcon(side, meta) : side == 1 ? icons[meta * 2] : icons[meta * 2 + 1]; - } - - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - if(!world.isRemote && world.getBlockLightValue(x, y + 1, z) >= 9) { - int meta = world.getBlockMetadata(x, y, z); + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + if(!world.isRemote && world.getLight(pos.up()) >= 9) { + AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); for(int l = 0; l < 4; ++l) { - int i1 = x + rand.nextInt(3) - 1; - int j1 = y + rand.nextInt(5) - 3; - int k1 = z + rand.nextInt(3) - 1; + BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); - Block block = world.getBlock(i1, j1 + 1, k1); + Block block = world.getBlockState(pos1.up()).getBlock(); - if(world.getBlock(i1, j1, k1) == Blocks.dirt && world.getBlockMetadata(i1, j1, k1) == 0 && world.getBlockLightValue(i1, j1 + 1, k1) >= 4 && world.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) - world.setBlock(i1, j1, k1, this, meta, 1 | 2); + if(world.getBlockState(pos1).getBlock() == Blocks.dirt && world.getBlockState(pos).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos.up()) <= 2) + world.setBlockState(pos, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); } } } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(this, 1, world.getBlockMetadata(x, y, z)); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override - public void randomDisplayTick(World world, int x, int y, int z, Random r) { - int meta = world.getBlockMetadata(x, y, z); - switch(meta) { - case 0: // Dry + public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { + AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + switch(variant) { + case DRY: // Dry break; - case 1: // Golden + case GOLDEN: // Golden break; - case 2: // Vivid + case VIVID: // Vivid break; - case 3: // Scorched + case SCORCHED: // Scorched if(r.nextInt(80) == 0) - world.spawnParticle("flame", x + r.nextFloat(), y + 1.1, z + r.nextFloat(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); break; - case 4: // Infused + case INFUSED: // Infused if(r.nextInt(100) == 0) - Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); + Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); break; - case 5: // Mutated + case MUTATED: // Mutated if(r.nextInt(100) == 0) { if(r.nextInt(100) > 25) - Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); - else Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5); + Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); + else Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5); } break; } } + public enum AltGrassType implements IStringSerializable { + DRY, + GOLDEN, + VIVID, + SCORCHED, + INFUSED, + MUTATED; + + @Override + public String getName() { + return this.name().toLowerCase(Locale.ROOT); + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 1018cd796..ef1c94e9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -27,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -56,7 +58,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { super(Material.rock); setHardness(3.5F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.ALTAR); + setUnlocalizedName(LibBlockNames.ALTAR); float f = 1F / 16F * 2F; setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); @@ -75,9 +77,9 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -87,23 +89,23 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { + public void onEntityCollidedWithBlock(World par1World, BlockPos pos, Entity par5Entity) { if(par5Entity instanceof EntityItem) { - TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4); + TileAltar tile = (TileAltar) par1World.getTileEntity(pos); tile.collideEntityItem((EntityItem) par5Entity); } } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - TileAltar tile = (TileAltar) world.getTileEntity(x, y, z); + public int getLightValue(IBlockAccess world, BlockPos pos) { + TileAltar tile = (TileAltar) world.getTileEntity(pos); return tile.hasLava ? 15 : 0; } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); - TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4); + TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { @@ -113,7 +115,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); tile.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + par1World.updateComparatorOutputLevel(pos, this); break; } } @@ -128,7 +130,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); tile.setWater(true); - par1World.func_147453_f(par2, par3, par4, this); + par1World.updateComparatorOutputLevel(pos, this); } return true; @@ -138,7 +140,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(true); tile.setWater(false); - par1World.func_147453_f(par2, par3, par4, this); + par1World.updateComparatorOutputLevel(pos, this); return true; } else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { @@ -154,7 +156,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if(tile.hasLava) tile.setLava(false); else tile.setWater(false); - par1World.func_147453_f(par2, par3, par4, this); + par1World.updateComparatorOutputLevel(pos, this); return true; } @@ -164,8 +166,8 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } private boolean isValidWaterContainer(ItemStack stack) { @@ -206,7 +208,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -221,8 +223,8 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -240,7 +242,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -252,10 +254,10 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -264,8 +266,8 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileAltar altar = (TileAltar) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileAltar altar = (TileAltar) par1World.getTileEntity(pos); return altar.hasWater ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index b1b7a8e58..43593a9c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -48,7 +48,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.AVATAR); + setUnlocalizedName(LibBlockNames.AVATAR); setBlockBounds(true); random = new Random(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 287aeb9bd..0aa359027 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -40,7 +40,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { public BlockBifrost() { super(Material.glass); - setBlockName(LibBlockNames.BIFROST); + setUnlocalizedName(LibBlockNames.BIFROST); setLightOpacity(0); setLightLevel(1F); setBlockUnbreakable(); diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d0129c4fa..cce64a02c 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 @@ public class BlockCacophonium extends BlockModContainer { protected BlockCacophonium() { super(Material.wood); - setBlockName(LibBlockNames.CACOPHONIUM); + setUnlocalizedName(LibBlockNames.CACOPHONIUM); setHardness(0.8F); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index abd21934c..2a02e7053 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -28,7 +28,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { public BlockCell() { super(Material.gourd); - setBlockName(LibBlockNames.CELL_BLOCK); + setUnlocalizedName(LibBlockNames.CELL_BLOCK); setStepSound(soundTypeCloth); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index f2ad6fa4f..69b4d1993 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -36,7 +36,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { setHardness(3.0F); setResistance(50.0F); setStepSound(soundTypeCloth); - setBlockName(LibBlockNames.COCOON); + setUnlocalizedName(LibBlockNames.COCOON); float f = 3F / 16F; float f1 = 14F / 16F; setBlockBounds(f, 0F, f, 1F - f, f1, 1F - f); diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index aa31c5b65..bd235a521 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -35,7 +35,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.ENDER_EYE_BLOCK); + setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index e55e11295..87b1c4d3c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -30,7 +30,7 @@ public class BlockFakeAir extends BlockModContainer { public BlockFakeAir() { super(Material.air); - setBlockName(LibBlockNames.FAKE_AIR); + setUnlocalizedName(LibBlockNames.FAKE_AIR); setBlockBounds(0, 0, 0, 0, 0, 0); setTickRandomly(true); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 74af9aa59..1a7f70ce1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -35,7 +35,7 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeMetal); setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); - setBlockName(LibBlockNames.FOREST_EYE); + setUnlocalizedName(LibBlockNames.FOREST_EYE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 0524d5ca6..cf0f4b133 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -48,7 +48,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I protected BlockHourglass() { super(Material.iron); - setBlockName(LibBlockNames.HOURGLASS); + setUnlocalizedName(LibBlockNames.HOURGLASS); setHardness(2.0F); setStepSound(soundTypeMetal); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index b19225371..128d77486 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 BlockModContainer implements ILexiconable protected BlockIncensePlate() { super(Material.wood); - setBlockName(LibBlockNames.INCENSE_PLATE); + setUnlocalizedName(LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setStepSound(soundTypeWood); setBlockBounds(true); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index bd6e87294..a11e6ca99 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -46,13 +46,13 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe super(Material.glass); float f = 5F / 16F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); - setBlockName(LibBlockNames.LIGHT_RELAY); + setUnlocalizedName(LibBlockNames.LIGHT_RELAY); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { register(par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } void register(String name) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index d19599960..12611f266 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -34,10 +34,10 @@ public abstract class BlockModContainer extends BlockConta } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { if(shouldRegisterInNameSet()) GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } protected boolean shouldRegisterInNameSet() { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index bc67da973..d1864aef2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -65,7 +65,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.OPEN_CRATE); + setUnlocalizedName(LibBlockNames.OPEN_CRATE); random = new Random(); } @@ -76,9 +76,9 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index b52b79f4b..db10a4724 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -46,7 +47,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable setHardness(2.0F); setResistance(5.0F); setStepSound(Block.soundTypeWood); - setBlockName(LibBlockNames.PLATFORM); + setUnlocalizedName(LibBlockNames.PLATFORM); } @Override @@ -55,14 +56,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -109,7 +110,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - TilePlatform tile = (TilePlatform) world.getTileEntity(x, y, z); + TilePlatform tile = (TilePlatform) world.getTileEntity(pos); return tile.onWanded(player); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 814c7390a..01e1cb2ad 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +43,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu super(Material.iron); setHardness(5.5F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.PYLON); + setUnlocalizedName(LibBlockNames.PYLON); setLightLevel(0.5F); float f = 1F / 16F * 2F; @@ -54,9 +55,9 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -65,8 +66,8 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override @@ -86,7 +87,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -96,7 +97,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public float getEnchantPowerBonus(World world, int x, int y, int z) { + public float getEnchantPowerBonus(World world, BlockPos pos) { return world.getBlockMetadata(x, y, z) == 0 ? 8 : 15; } @@ -111,7 +112,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 7017bcd59..8598e8c6b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -35,12 +36,12 @@ public class BlockRoot extends BlockMod implements ILexiconable { @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { return ModItems.manaResource; } @Override - public int damageDropped(int p_149692_1_) { + public int damageDropped(IBlockState p_149692_1_) { return 20; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 7c029d75f..d908495df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -32,37 +33,36 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { - setBlockName(LibBlockNames.SOLID_VINE); + setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setStepSound(soundTypeGrass); - setBlockTextureName("vine"); setCreativeTab(null); } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World w, int x, int y, int z) { - setBlockBoundsBasedOnState(w, x, y, z); - return new AxisAlignedBB(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); + public AxisAlignedBB getCollisionBoundingBox(World w, BlockPos pos, IBlockState state) { + setBlockBoundsBasedOnState(w, pos); + return new AxisAlignedBB(pos.add(minX, minY, minZ), pos.add(maxX, maxY, maxZ)); } @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { + public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return false; } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.vine); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index c62267b3b..e8733e07b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -44,13 +46,13 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.SPARK_CHANGER); + setUnlocalizedName(LibBlockNames.SPARK_CHANGER); random = new Random(); } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -60,7 +62,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return false; } @@ -90,20 +92,20 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { - TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(x, y, z); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack cstack = changer.getStackInSlot(0); ItemStack pstack = player.getCurrentEquippedItem(); if(cstack != null) { changer.setInventorySlotContents(0, null); - world.func_147453_f(x, y, z, this); + world.updateComparatorOutputLevel(pos, this); changer.markDirty(); if(!player.inventory.addItemStackToInventory(cstack)) player.dropPlayerItemWithRandomChoice(cstack, false); return true; } else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) { changer.setInventorySlotContents(0, pstack.copy().splitStack(1)); - world.func_147453_f(x, y, z, this); + world.updateComparatorOutputLevel(pos, this); changer.markDirty(); pstack.stackSize--; @@ -117,8 +119,8 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -136,7 +138,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -148,10 +150,10 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -160,8 +162,8 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int s) { - TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(x, y, z); + public int getComparatorInputOverride(World world, BlockPos pos) { + TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack stack = changer.getStackInSlot(0); if(stack == null) return 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 98dd5f967..4cab29a8c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -19,6 +19,8 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +28,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -107,41 +110,47 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } protected BlockSpecialFlower() { - super(0); - setBlockName(LibBlockNames.SPECIAL_FLOWER); + super(); + setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); - if(currentLight == -1) - currentLight = 0; - return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); } +// @Override todo 1.8 coloredlightscore dep +// public int getLightValue(IBlockAccess world, BlockPos pos) { +// int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); +// if(currentLight == -1) +// currentLight = 0; +// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); +// } + @Override public boolean hasComparatorInputOverride() { return true; } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getComparatorInputOverride(side); + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getPowerLevel(side); + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) { - return isProvidingWeakPower(world, x, y, z, side); + public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return isProvidingWeakPower(world, pos, state, side); } @Override @@ -155,9 +164,9 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -169,6 +178,11 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } } + @Override + public EnumFlowerColor getBlockType() { + return EnumFlowerColor.RED; + } + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { for(String s : BotaniaAPI.getAllSubTiles()) @@ -187,8 +201,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - String name = ((TileSpecialFlower) world.getTileEntity(x, y, z)).subTileName; + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } @@ -198,17 +212,17 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); - ((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); + dropBlockAsItem(par1World, pos, state, 0); + ((TileSpecialFlower) par1World.getTileEntity(pos)).onBlockHarvested(par1World, pos, state, par6EntityPlayer); } } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null) { String name = ((TileSpecialFlower) tile).subTileName; @@ -220,9 +234,9 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int par5, int par6) { + super.onBlockEventReceived(par1World, pos, state, par5, par6); + TileEntity tileentity = par1World.getTileEntity(pos); return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; } @@ -233,46 +247,46 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); + return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry(); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); + return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player); } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, x, y, z, entity, stack); } @Override - public void onBlockAdded(World world, int x, int y, int z) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockAdded(world, x, y, z); + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, x, y, z); } @Override - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - float[] rgb = EntitySheep.fleeceColorTable[world.getBlockMetadata(x, y, z)]; - return ((int) (rgb[0] * 255) << 16) + ((int) (rgb[1] * 255) << 8) + (int) (rgb[2] * 255); + public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { + return ((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)) + .getMapColor().colorValue; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.dye) { - int newMeta = stack.getItemDamage(); - int oldMeta = world.getBlockMetadata(x, y, z); - if(newMeta != oldMeta) - world.setBlockMetadataWithNotify(x, y, z, newMeta, 1 | 2); + EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); + EnumDyeColor oldColor = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)); + if(newColor != oldColor) + world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); } - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); } @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 7bdd62c58..dfd79f834 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -60,8 +61,8 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override @@ -83,13 +84,13 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beaconPos) { return true; } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); + int meta = world.getBlockMetadata(pos); return meta == 0 ? LexiconData.pool : LexiconData.terrasteel; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 65126e62e..fa2f81abf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +20,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -33,13 +33,13 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable public BlockTeruTeruBozu() { super(Material.cloth); - setBlockName(LibBlockNames.TERU_TERU_BOZU); + setUnlocalizedName(LibBlockNames.TERU_TERU_BOZU); float f = 0.25F; setBlockBounds(f, 0.01F, f, 1F - f, 0.99F, 1F - f); } @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getEntityItem(); @@ -52,7 +52,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && ((isSunflower(stack) && removeRain(world)) || (isBlueOrchid(stack) && startRain(world)))) { if(!player.capabilities.isCreativeMode) @@ -93,27 +93,17 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int s) { + public int getComparatorInputOverride(World world, BlockPos pos) { return world.isRaining() ? 15 : 0; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return Blocks.wool.getIcon(0, 0); - } - @Override public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index a084605b4..5c49a0663 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -31,11 +31,11 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { setStepSound(soundTypeStone); float size = 3F / 16F; setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); - setBlockName(LibBlockNames.TINY_PLANET); + setUnlocalizedName(LibBlockNames.TINY_PLANET); } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java b/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java new file mode 100644 index 000000000..c5346ef12 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java @@ -0,0 +1,33 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; + +/** + * Holds all Botania block state properties + */ +public class BotaniaStateProps { + + /** Common properties to all blocks **/ + + // The 16 Minecraft colors + public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); + + // Only the four cardinal directions + public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); + + // All 6 directions + public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); + + // Redstone power + public static final PropertyBool POWERED = PropertyBool.create("powered"); + + /** Properties for individual blocks **/ + + // BlockAltGrass + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", BlockAltGrass.AltGrassType.class); + + private BotaniaStateProps() {} +} diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index a24b1af8a..2b6c7504a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.corporea; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -35,7 +34,7 @@ public abstract class BlockCorporeaBase extends BlockModContainer 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; int meta = world.getBlockMetadata(x, y, z); boolean powered = (meta & 8) != 0; 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 205569783..91dfa501e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -40,7 +40,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } 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 dbe1d24c8..168d35660 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -13,10 +13,12 @@ package vazkii.botania.common.block.corporea; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -51,7 +53,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public void updateTick(World world, int x, int y, int z, Random rand) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { world.setBlockMetadataWithNotify(x, y, z, 0, 1 | 2); } @@ -61,7 +63,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return world.getBlockMetadata(x, y, z) != 0 ? 15 : 0; } 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 c9452b043..ef4fd5f10 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -34,11 +35,11 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon super(Material.iron); setHardness(5.5F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.CORPOREA_RETAINER); + setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); int meta = world.getBlockMetadata(x, y, z); boolean powered = (meta & 8) != 0; @@ -56,8 +57,8 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int s) { - return ((TileCorporeaRetainer) world.getTileEntity(x, y, z)).hasPendingRequest() ? 15 : 0; + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TileCorporeaRetainer) world.getTileEntity(pos)).hasPendingRequest() ? 15 : 0; } @Override 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 b27acb5e0..74dcd1d87 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -56,7 +56,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab public BlockFloatingFlower(String name) { super(Material.ground); - setBlockName(name); + setUnlocalizedName(name); setHardness(0.5F); setStepSound(soundTypeGravel); setLightLevel(1F); @@ -77,9 +77,9 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { register(par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } protected void register(String name) { 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 7d81bdd63..14ad125fc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -47,7 +47,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setStepSound(soundTypeMetal); float size = 3F / 16F; setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); - setBlockName(LibBlockNames.MANA_BEACON); + setUnlocalizedName(LibBlockNames.MANA_BEACON); } @Override @@ -69,9 +69,9 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override 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 243bce860..16ca21b07 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -34,7 +34,7 @@ public class BlockManaFlame extends BlockModContainer { public BlockManaFlame() { super(Material.cloth); - setBlockName(LibBlockNames.MANA_FLAME); + setUnlocalizedName(LibBlockNames.MANA_FLAME); float f = 0.25F; setStepSound(soundTypeCloth); setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); 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 39820eae5..704176854 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 BlockModContainer implements ILexiconable { setHardness(5F); setResistance(2000F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.STARFIELD); + setUnlocalizedName(LibBlockNames.STARFIELD); setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } 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 9224062a7..2591a06b0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -40,15 +40,15 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { public BlockTinyPotato() { super(Material.cloth); setHardness(0.25F); - setBlockName(LibBlockNames.TINY_POTATO); + setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; setBlockBounds(f, 0, f, 1F - f, f, 1F - f); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override 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 5639c9386..4fff32f19 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -14,10 +14,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; @@ -26,21 +28,19 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Override public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { - EnumFacing enumfacing = BlockDispenser.func_149937_b(p_82487_1_.getBlockMetadata()); + EnumFacing enumfacing = BlockDispenser.getFacing(p_82487_1_.getBlockMetadata()); World world = p_82487_1_.getWorld(); double d0 = p_82487_1_.getX() + enumfacing.getFrontOffsetX() * 1.125F; double d1 = p_82487_1_.getY() + enumfacing.getFrontOffsetY() * 1.125F; double d2 = p_82487_1_.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; - int i = p_82487_1_.getXInt() + enumfacing.getFrontOffsetX(); - int j = p_82487_1_.getYInt() + enumfacing.getFrontOffsetY(); - int k = p_82487_1_.getZInt() + enumfacing.getFrontOffsetZ(); - Block block = world.getBlock(i, j, k); + BlockPos pos = p_82487_1_.getBlockPos().offset(enumfacing); + IBlockState state = world.getBlockState(pos); double d3; - if(BlockRailBase.func_150051_a(block)) + if(BlockRailBase.isRailBlock(state)) d3 = 0.0D; else { - if(block.getMaterial() != Material.air || !BlockRailBase.func_150051_a(world.getBlock(i, j - 1, k))) + if(state.getBlock().getMaterial() != Material.air || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) return super.dispenseStack(p_82487_1_, p_82487_2_); d3 = -1.0D; @@ -49,7 +49,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { EntityMinecart entityminecart = new EntityPoolMinecart(world, d0, d1 + d3, d2); if(p_82487_2_.hasDisplayName()) - entityminecart.setMinecartName(p_82487_2_.getDisplayName()); + entityminecart.setCustomNameTag(p_82487_2_.getDisplayName()); world.spawnEntityInWorld(entityminecart); p_82487_2_.splitStack(1); @@ -58,7 +58,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Override protected void playDispenseSound(IBlockSource p_82485_1_) { - p_82485_1_.getWorld().playAuxSFX(1000, p_82485_1_.getXInt(), p_82485_1_.getYInt(), p_82485_1_.getZInt(), 0); + p_82485_1_.getWorld().playAuxSFX(1000, p_82485_1_.getBlockPos(), 0); } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index bd679c72b..06b5abee8 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -28,14 +29,12 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); - int x = par1IBlockSource.getXInt() + facing.getFrontOffsetX(); - int y = par1IBlockSource.getYInt() + facing.getFrontOffsetY(); - int z = par1IBlockSource.getZInt() + facing.getFrontOffsetZ(); + EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); + BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); - if(world.getBlock(x, y, z).isAir(world, x, y, z) && block.canBlockStay(world, x, y, z)) { - world.setBlock(x, y, z, block); + if(world.getBlockState(pos).getBlock().isAir(world, pos) && block.canPlaceBlockAt(world, pos)) { + world.setBlockState(pos, block.getDefaultState()); par2ItemStack.stackSize--; return par2ItemStack; } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 0d0e9c0ae..102543050 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -15,22 +15,21 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.wand.IWandable; public class BehaviourWand extends BehaviorDefaultDispenseItem { @Override protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - ForgeDirection facing = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()).ordinal()); - int x = par1IBlockSource.getXInt() + facing.offsetX; - int y = par1IBlockSource.getYInt() + facing.offsetY; - int z = par1IBlockSource.getZInt() + facing.offsetZ; + EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); + BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); if(block instanceof IWandable) { - ((IWandable) block).onUsedByWand(null, par2ItemStack, world, , x, , y); + ((IWandable) block).onUsedByWand(null, par2ItemStack, world, pos, facing.getOpposite()); return par2ItemStack; } 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 6867b6549..82672bdf3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -11,12 +11,14 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -38,7 +40,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.BELLOWS); + setUnlocalizedName(LibBlockNames.BELLOWS); float f = (1F - 10 / 16F) / 2F; setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); @@ -56,9 +58,9 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { if(EntityDoppleganger.isTruePlayer(player)) - ((TileBellows) world.getTileEntity(x, y, z)).interact(); + ((TileBellows) world.getTileEntity(pos)).interact(); return true; } @@ -68,7 +70,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } 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 d52a52859..2e9260cb7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -12,8 +12,8 @@ package vazkii.botania.common.block.mana; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -44,7 +45,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa super(Material.rock); float f = 6F / 16F; setBlockBounds(f, 0.05F, f, 1F - f, 0.95F, 1F - f); - setBlockName(LibBlockNames.BREWERY); + setUnlocalizedName(LibBlockNames.BREWERY); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); @@ -58,8 +59,8 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { if(brew.recipe == null && par1World.getBlockMetadata(par2, par3, par4) == 0) @@ -70,7 +71,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); brew.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + par1World.func_147453_f(pos, this); break; } } @@ -83,8 +84,8 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -102,7 +103,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -117,7 +118,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa par1World.func_147453_f(par2, par3, par4, par5); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -126,8 +127,8 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); return brew.signal; } @@ -147,7 +148,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -163,7 +164,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileBrewery) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); } } 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 79e7ddc66..b4fbf357a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -36,7 +36,7 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.DISTRIBUTOR); + setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } @Override 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 1325a70ee..4f88d073b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -12,8 +12,8 @@ package vazkii.botania.common.block.mana; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -52,7 +52,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex setResistance(5.0F); setLightLevel(1.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.ENCHANTER); + setUnlocalizedName(LibBlockNames.ENCHANTER); random = new Random(); } @@ -74,7 +74,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { return Item.getItemFromBlock(Blocks.lapis_block); } @@ -84,8 +84,8 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -109,8 +109,8 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); ItemStack itemstack = enchanter.itemToEnchant; @@ -126,7 +126,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3 * 0.5; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -139,12 +139,12 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex par1World.func_147453_f(par2, par3, par4, par5); - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - ((TileEnchanter) world.getTileEntity(x, y, z)).onWanded(player, stack); + ((TileEnchanter) world.getTileEntity(pos)).onWanded(player, stack); return true; } @@ -155,7 +155,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileEnchanter) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileEnchanter) world.getTileEntity(pos)).renderHUD(mc, res); } } 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 5648a0d10..dc6712c96 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; @@ -27,6 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -70,7 +72,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -80,8 +82,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return state.getBlock().getMetaFromState(state); } @Override @@ -165,7 +167,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(!world.isRemote) for(int i = 0; i < 10; i++) world.playSoundEffect(x, y, z, "note.bd", 1F, 1F); - else world.spawnParticle("note", x + 0.5, y + 1.2, z + 0.5D, 1.0 / 24.0, 0, 0); + else world.spawnParticle(EnumParticleTypes.NOTE, x + 0.5, y + 1.2, z + 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 5dcaea36a..4f5b0b505 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -42,7 +44,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable setHardness(2.0F); setResistance(10.0F); setStepSound(Block.soundTypeStone); - setBlockName(LibBlockNames.MANA_DETECTOR); + setUnlocalizedName(LibBlockNames.MANA_DETECTOR); } @Override @@ -63,14 +65,14 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { + public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; } @Override - public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) - super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } @Override 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 808b950c1..02f25276b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -37,7 +37,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP setHardness(2.0F); setResistance(2000F); setStepSound(Block.soundTypeStone); - setBlockName(LibBlockNames.MANA_VOID); + setUnlocalizedName(LibBlockNames.MANA_VOID); } @Override 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 679c7e341..7fa2c23e1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -61,7 +62,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.POOL); + setUnlocalizedName(LibBlockNames.POOL); setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); } @@ -71,9 +72,9 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockPool.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -82,23 +83,23 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return state.getBlock().getMetaFromState(state); } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TilePool pool = (TilePool) par1World.getTileEntity(pos); lastFragile = pool.fragile; - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList drops = new ArrayList(); if(!lastFragile) - drops.add(new ItemStack(this, 1, metadata)); + drops.add(new ItemStack(this, 1, state.getBlock().getMetaFromState(state))); return drops; } @@ -116,33 +117,33 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { + public void onEntityCollidedWithBlock(World par1World, BlockPos pos, Entity par5Entity) { if(par5Entity instanceof EntityItem) { - TilePool tile = (TilePool) par1World.getTileEntity(par2, par3, par4); + TilePool tile = (TilePool) par1World.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, , par2); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, pos); } } @Override - public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { + public void addCollisionBoxesToList(World p_149743_1_, BlockPos pos, IBlockState state, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { float f = 1F / 16F; setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); setBlockBounds(0.0F, 0.0F, 0.0F, f, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, f); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return side == ForgeDirection.DOWN; + public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN; } @Override @@ -151,7 +152,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -171,8 +172,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TilePool pool = (TilePool) par1World.getTileEntity(pos); int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); if(pool.getCurrentMana() > 0) val = Math.max(val, 1); @@ -182,12 +183,12 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TilePool) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TilePool) world.getTileEntity(pos)).renderHUD(mc, res); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - ((TilePool) world.getTileEntity(x, y, z)).onWanded(player, stack); + ((TilePool) world.getTileEntity(pos)).onWanded(player, stack); return true; } 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 195172129..b980fece5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -46,7 +48,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi setHardness(0.3F); setStepSound(soundTypeGlass); setLightLevel(1.0F); - setBlockName(LibBlockNames.PRISM); + setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); @@ -71,7 +73,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { return null; } @@ -81,13 +83,13 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TilePrism)) return false; @@ -131,8 +133,8 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSimpleInventory)) return; @@ -154,7 +156,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -169,7 +171,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi par1World.func_147453_f(par2, par3, par4, par5); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -179,7 +181,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TilePrism) ((TilePrism) tile).onBurstCollision(burst); } 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 8af11d76e..4368abf90 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -11,15 +11,15 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; @@ -35,37 +36,33 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPump extends BlockModContainer implements ILexiconable { - private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; - public BlockPump() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.PUMP); + setUnlocalizedName(LibBlockNames.PUMP); setBlockBounds(true); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(p_149689_5_.getHorizontalFacing().getOpposite()), 2); } @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, int x, int y, int z) { - setBlockBounds(w.getBlockMetadata(x, y, z) < 4); + public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { + EnumFacing facing = ((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)); + setBlockBounds(facing.getAxis()); } - public void setBlockBounds(boolean horiz) { - if(horiz) + public void setBlockBounds(EnumFacing.Axis axis) { + if (axis == EnumFacing.Axis.X) { + setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F) + } else if (axis == EnumFacing.Axis.Z) { setBlockBounds(0.25F, 0F, 0F, 0.75F, 0.5F, 1F); - else setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F); - } - - @Override - public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { - return RotationHelper.rotateVanillaBlock(Blocks.furnace, worldObj, x, y, z, axis); + } } @Override @@ -89,7 +86,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -99,8 +96,8 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return ((TilePump) world.getTileEntity(x, y, z)).comparator; + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TilePump) world.getTileEntity(pos)).comparator; } @Override 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 642dec0a2..cf14d2006 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -32,15 +32,15 @@ public class BlockRFGenerator extends BlockModContainer implements ILexiconable setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.RF_GENERATOR); + setUnlocalizedName(LibBlockNames.RF_GENERATOR); } @Override @Optional.Method(modid = "CoFHAPI|energy") - public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - TileEntity tile = world.getTileEntity(x, y, z); + public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos tilePos) { + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileRFGenerator) - ((TileRFGenerator) tile).onNeighborTileChange(tileX, tileY, tileZ); + ((TileRFGenerator) tile).onNeighborTileChange(tilePos); } @Override 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 c0cf6efc1..92754b0a8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -12,8 +12,8 @@ package vazkii.botania.common.block.mana; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -48,7 +48,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.RUNE_ALTAR); + setUnlocalizedName(LibBlockNames.RUNE_ALTAR); random = new Random(); } @@ -59,7 +59,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -71,8 +71,8 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(par5EntityPlayer.isSneaking()) { @@ -84,7 +84,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); altar.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + par1World.updateComparatorOutputLevel(pos, this); break; } } @@ -96,8 +96,8 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -115,7 +115,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -127,10 +127,10 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -149,14 +149,14 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); return altar.signal; } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - ((TileRuneAltar) world.getTileEntity(x, y, z)).onWanded(player, stack); + ((TileRuneAltar) world.getTileEntity(pos)).onWanded(player, stack); return true; } @@ -167,7 +167,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileRuneAltar) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileRuneAltar) world.getTileEntity(pos)).renderHUD(mc, res); } 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 c1f0b5859..5847c955f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -35,7 +35,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable public BlockSpawnerClaw() { super(Material.iron); setHardness(3.0F); - setBlockName(LibBlockNames.SPAWNER_CLAW); + setUnlocalizedName(LibBlockNames.SPAWNER_CLAW); float f = 1F / 8F; float f1 = 1F / 16F; @@ -59,7 +59,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } 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 311598c29..5ce794f20 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; @@ -57,7 +58,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.SPREADER); + setUnlocalizedName(LibBlockNames.SPREADER); random = new Random(); } @@ -68,14 +69,9 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + return super.setUnlocalizedName(par1Str); } @Override @@ -85,25 +81,25 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); - TileSpreader spreader = (TileSpreader) par1World.getTileEntity(par2, par3, par4); + public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 1 | 2); switch(orientation) { - case 0: + case DOWN: spreader.rotationY = -90F; break; - case 1: + case UP: spreader.rotationY = 90F; break; - case 2: + case NORTH: spreader.rotationX = 270F; break; - case 3: + case SOUTH: spreader.rotationX = 90F; break; - case 4: + case WEST: break; default: spreader.rotationX = 180F; @@ -112,8 +108,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState par1) { + return getMetaFromState(par1); } @Override @@ -122,7 +118,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -137,8 +133,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return false; @@ -183,8 +179,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return; @@ -206,7 +202,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -218,15 +214,15 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - ((TileSpreader) world.getTileEntity(x, y, z)).onWanded(player, stack); + ((TileSpreader) world.getTileEntity(pos)).onWanded(player, stack); return true; } @@ -237,19 +233,20 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileSpreader) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileSpreader) world.getTileEntity(pos)).renderHUD(mc, res); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); + int meta = world.getBlockMetadata(pos); return meta == 0 ? LexiconData.spreader : meta == 1 ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) { float f = 1F / 16F; - return new AxisAlignedBB(x + f, y + f, z + f, x + 1 - f, y + 1 - f, z + 1 - f); + return new AxisAlignedBB(pos.getX() + f, pos.getY() + f, pos.getZ() + f, + pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f); } } 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 229fab824..2e37b5e11 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -38,11 +38,11 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.TERRA_PLATE); + setUnlocalizedName(LibBlockNames.TERRA_PLATE); } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -52,7 +52,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return false; } @@ -85,8 +85,8 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(pos); int val = (int) ((double) plate.getCurrentMana() / (double) TileTerraPlate.MAX_MANA * 15.0); if(plate.getCurrentMana() > 0) val = Math.max(val, 1); 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 30d90be03..312858917 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -39,7 +39,7 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.TURNTABLE); + setUnlocalizedName(LibBlockNames.TURNTABLE); } @Override @@ -61,12 +61,12 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileTurntable) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileTurntable) world.getTileEntity(pos)).renderHUD(mc, res); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - ((TileTurntable) world.getTileEntity(x, y, z)).onWanded(player, stack); + ((TileTurntable) world.getTileEntity(pos)).onWanded(player, stack); return true; } 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 7ae8b230e..946d032a7 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -12,12 +12,14 @@ package vazkii.botania.common.block.string; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -26,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.relauncher.Side; @@ -41,18 +44,19 @@ public abstract class BlockRedString extends BlockModContainer im setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(name); + setUnlocalizedName(name); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.SOUTH)); } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); - par1World.setBlockMetadataWithNotify(par2, par3, par4, orientation, 1 | 2); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FACING); } - + @Override - public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { - return RotationHelper.rotateVanillaBlock(Blocks.piston, worldObj, x, y, z, axis); + public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 02db2de05..80b03a401 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; @@ -27,8 +28,8 @@ public class BlockRedStringComparator extends BlockRedString { } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return ((TileRedStringComparator) world.getTileEntity(x, y, z)).getComparatorValue(); + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TileRedStringComparator) world.getTileEntity(pos)).getComparatorValue(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 2483d69e0..f57b49cec 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.string; import java.util.Random; import net.minecraft.block.IGrowable; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; @@ -25,23 +27,22 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean something) { - return ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149851_a(world, something); + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + return ((TileRedStringFertilizer) world.getTileEntity(pos)).canGrow(world, isClient); } @Override - public boolean func_149852_a(World world, Random rand, int x, int y, int z) { - return ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149852_a(world, rand); + public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + return ((TileRedStringFertilizer) world.getTileEntity(pos)).canUseBonemeal(world, rand); } @Override - public void func_149853_b(World world, Random rand, int x, int y, int z) { - ((TileRedStringFertilizer) world.getTileEntity(x, y, z)).func_149853_b(world, rand); + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + ((TileRedStringFertilizer) world.getTileEntity(pos)).grow(world, rand); } @Override public TileRedString createNewTileEntity(World world, int meta) { return new TileRedStringFertilizer(); } - } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 58dbdbae5..7367522d7 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -12,6 +12,9 @@ package vazkii.botania.common.block.string; import java.util.Random; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -27,12 +30,13 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); MinecraftForge.EVENT_BUS.register(this); + // todo 1.8 completely override states from super } @SubscribeEvent public void onInteract(PlayerInteractEvent event) { if(event.action == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.entityPlayer, event.world, event.x, event.y, event.z); + TileRedStringInterceptor.onInteract(event.entityPlayer, event.world, event.pos); } @Override @@ -41,12 +45,12 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return (world.getBlockMetadata(x, y, z) & 8) == 0 ? 0 : 15; } @Override - public void updateTick(World world, int x, int y, int z, Random update) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random update) { world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 36de9c988..88d7b2760 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -19,24 +19,24 @@ import net.minecraft.world.World; public class TileRedStringFertilizer extends TileRedString { - public boolean func_149851_a(World p_149851_1_, boolean p_149851_5_) { + public boolean canGrow(World p_149851_1_, boolean p_149851_5_) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(p_149851_1_, binding.posX, binding.posY, binding.posZ, p_149851_5_) : false; + return block instanceof IGrowable ? ((IGrowable) block).canGrow(p_149851_1_, binding, p_149851_1_.getBlockState(binding), p_149851_5_) : false; } - public boolean func_149852_a(World p_149852_1_, Random p_149852_2_) { + public boolean canUseBonemeal(World p_149852_1_, Random p_149852_2_) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).func_149852_a(p_149852_1_, p_149852_2_, binding.posX, binding.posY, binding.posZ) : false; + return block instanceof IGrowable ? ((IGrowable) block).canUseBonemeal(p_149852_1_, p_149852_2_, binding, p_149852_1_.getBlockState(binding)) : false; } - public void func_149853_b(World p_149853_1_, Random p_149853_2_) { + public void grow(World p_149853_1_, Random p_149853_2_) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); if(block instanceof IGrowable) - ((IGrowable) block).func_149853_b(p_149853_1_, p_149853_2_, binding.posX, binding.posY, binding.posZ); + ((IGrowable) block).grow(p_149853_1_, p_149853_2_, binding, p_149853_1_.getBlockState(binding)); } @Override From 3fe15e6b7dec6b194f9a8a9e38b7472976d85673 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 Nov 2015 23:12:46 -0600 Subject: [PATCH 034/935] Remove trivial IIcon refs in Item to get a better sense of my progress there --- .../botania/common/item/ItemAncientWill.java | 16 ---------- .../common/item/ItemBlackHoleTalisman.java | 18 ----------- .../botania/common/item/ItemBottledMana.java | 15 ---------- .../common/item/ItemCorporeaSpark.java | 2 -- .../botania/common/item/ItemCraftPattern.java | 16 ---------- .../botania/common/item/ItemFlowerBag.java | 1 - .../botania/common/item/ItemGrassHorn.java | 22 -------------- .../botania/common/item/ItemGrassSeeds.java | 15 ---------- .../botania/common/item/ItemManaCookie.java | 16 ---------- .../botania/common/item/ItemManaGun.java | 30 ------------------- .../botania/common/item/ItemManaMirror.java | 16 ---------- .../botania/common/item/ItemManaTablet.java | 16 ---------- .../botania/common/item/ItemSignalFlare.java | 16 ---------- .../vazkii/botania/common/item/ItemSpark.java | 15 ---------- .../botania/common/item/ItemSparkUpgrade.java | 20 ------------- .../botania/common/item/ItemSpawnerMover.java | 18 ----------- .../common/item/ItemTemperanceStone.java | 17 ----------- .../botania/common/item/ItemThornChakram.java | 15 ---------- .../botania/common/item/ItemTwigWand.java | 17 ----------- .../vazkii/botania/common/item/ItemVirus.java | 18 ----------- .../common/item/brew/ItemBrewBase.java | 16 ---------- .../common/item/brew/ItemIncenseStick.java | 14 --------- .../botania/common/item/brew/ItemVial.java | 13 -------- .../armor/manasteel/ItemManasteelArmor.java | 7 ----- .../armor/terrasteel/ItemTerrasteelHelm.java | 1 - .../botania/common/item/lens/ItemLens.java | 9 ------ .../item/material/ItemManaResource.java | 7 ----- .../common/item/material/ItemQuartz.java | 15 ---------- .../common/item/material/ItemRune.java | 16 ---------- .../common/item/relic/ItemInfiniteFruit.java | 12 -------- .../common/item/rod/ItemTornadoRod.java | 11 +------ 31 files changed, 1 insertion(+), 439 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index fa2b52185..89c7cc624 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -12,12 +12,10 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -30,8 +28,6 @@ public class ItemAncientWill extends ItemMod { private static final int SUBTYPES = 6; - IIcon[] icons; - public ItemAncientWill() { setUnlocalizedName(LibItemNames.ANCIENT_WILL); setHasSubtypes(true); @@ -47,18 +43,6 @@ public class ItemAncientWill extends ItemMod { list.add(new ItemStack(item, 1, i)); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(icons.length - 1, dmg)]; - } - @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index f36a37702..48369d8e7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,9 +25,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; @@ -48,8 +45,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { private static final String TAG_BLOCK_META = "blockMeta"; private static final String TAG_BLOCK_COUNT = "blockCount"; - IIcon enabledIcon; - public ItemBlackHoleTalisman() { setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN); setMaxStackSize(1); @@ -228,19 +223,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { setCount(stack, current + count); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return par1 == 1 ? enabledIcon : itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 245d23b5b..386267e83 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +26,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.*; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -37,7 +35,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemBottledMana extends ItemMod { - IIcon[] icons; private static final String TAG_SEED = "randomSeed"; public ItemBottledMana() { @@ -205,18 +202,6 @@ public class ItemBottledMana extends ItemMod { par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[6]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 6675da929..c67d7bd5e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -30,8 +30,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { - public static IIcon invIcon, worldIcon, invIconMaster, worldIconMaster, iconColorStar; - public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index fb1bb876f..b1803fcdb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; @@ -28,8 +26,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCraftPattern extends ItemMod { - IIcon[] icons; - public ItemCraftPattern() { setHasSubtypes(true); setUnlocalizedName(LibItemNames.CRAFT_PATTERN); @@ -53,18 +49,6 @@ public class ItemCraftPattern extends ItemMod { list.add(new ItemStack(item, 1, i)); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TileCraftCrate.PATTERNS.length]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(icons.length - 1, dmg)]; - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 7bf226595..00486feba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -22,7 +22,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 73d7d4205..29360c420 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -18,7 +18,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +26,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; @@ -40,8 +38,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; - IIcon[] icons; - IIcon vuvuzelaIcon; public ItemGrassHorn() { super(); @@ -56,29 +52,11 @@ public class ItemGrassHorn extends ItemMod { list.add(new ItemStack(item, 1, i)); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - vuvuzelaIcon = IconHelper.forName(par1IconRegister, "vuvuzela"); - } - @Override public IIcon getIconIndex(ItemStack par1ItemStack) { return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack); } - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - - @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index f86cbff39..62e11bacb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -51,7 +51,6 @@ public class ItemGrassSeeds extends ItemMod { }; private static final int SUBTYPES = 9; - IIcon[] icons; public ItemGrassSeeds() { super(); @@ -66,20 +65,6 @@ public class ItemGrassSeeds extends ItemMod { par3.add(new ItemStack(par1, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index eff217680..7c6f7a9b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,13 +10,11 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; @@ -29,8 +27,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { - private IIcon totalBiscuitIcon; - public ItemManaCookie() { super(0, 0.1F, false); setPotionEffect(Potion.saturation.id, 1, 0, 1F); @@ -55,21 +51,9 @@ public class ItemManaCookie extends ItemFood { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - @Override public IIcon getIconIndex(ItemStack stack) { return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit"); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index c802d64cf..87a9dff12 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; @@ -55,8 +53,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { private static final int CLIP_SLOTS = 6; private static final int COOLDOWN = 30; - IIcon[] icons; - public ItemManaGun() { super(); setMaxDamage(COOLDOWN); @@ -110,32 +106,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { return par1ItemStack; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - int states = 3; - icons = new IIcon[states * 2]; - - for(int i = 0; i < states; i++) { - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - icons[states + i] = IconHelper.forName(par1IconRegister, "desuGun" + i); - } - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - boolean desu = isSugoiKawaiiDesuNe(stack); - int index = pass; - if(index == 0 && hasClip(stack)) - index = 2; - - return icons[Math.min(2, index) + (desu ? 3 : 0)]; - } - // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index a304139b6..9ba61cb97 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.awt.Color; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; @@ -34,8 +32,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { - IIcon[] icons; - private static final String TAG_MANA = "mana"; private static final String TAG_MANA_BACKLOG = "manaBacklog"; @@ -66,18 +62,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return 1000 - (int) (mana / TilePool.MAX_MANA * 1000); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return icons[Math.min(1, pass)]; - } - @Override public boolean isFull3D() { return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 55153b35f..908560de0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -13,13 +13,11 @@ package vazkii.botania.common.item; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.mana.ICreativeManaProvider; @@ -31,8 +29,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { - IIcon[] icons; - private static final int MAX_MANA = 500000; private static final String TAG_MANA = "mana"; @@ -73,18 +69,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP return 1000 - (int) (mana / MAX_MANA * 1000); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return icons[Math.min(1, pass)]; - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 703dd0ff5..cda0156a9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -26,7 +25,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -37,8 +35,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSignalFlare extends ItemMod { - IIcon[] icons; - private static final String TAG_COLOR = "color"; public ItemSignalFlare() { @@ -91,18 +87,6 @@ public class ItemSignalFlare extends ItemMod { par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return icons[Math.min(1, pass)]; - } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index f1cc3b5a1..69ac4673f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -18,7 +17,6 @@ import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -30,8 +28,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement { - public static IIcon invIcon, worldIcon; - public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); } @@ -56,17 +52,6 @@ public class ItemSpark extends ItemMod implements ICraftAchievement { return false; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forItem(par1IconRegister, this, 0); - worldIcon = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIconFromDamage(int p_77617_1_) { - return invIcon; - } - @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { return ModAchievements.sparkCraft; diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 20b3f1e81..d9f776643 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -12,11 +12,9 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; @@ -24,29 +22,11 @@ public class ItemSparkUpgrade extends ItemMod { private static final int VARIANTS = 4; - public static IIcon[] worldIcons; - IIcon[] invIcons; - public ItemSparkUpgrade() { setUnlocalizedName(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - worldIcons = new IIcon[VARIANTS]; - invIcons = new IIcon[VARIANTS]; - for(int i = 0; i < VARIANTS; i++) { - worldIcons[i] = IconHelper.forItem(par1IconRegister, this, "L" + i); - invIcons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - } - - @Override - public IIcon getIconFromDamage(int meta) { - return invIcons[Math.min(invIcons.length - 1, meta)]; - } - @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 2dd341494..258a44270 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -36,29 +36,11 @@ public class ItemSpawnerMover extends ItemMod { public static final String TAG_SPAWNER = "spawner"; private static final String TAG_PLACE_DELAY = "placeDelay"; - IIcon iconNormal, iconSpawner; - public ItemSpawnerMover() { setUnlocalizedName(LibItemNames.SPAWNER_MOVER); setMaxStackSize(1); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconNormal = IconHelper.forItem(par1IconRegister, this, 0); - iconSpawner = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return hasData(par1ItemStack) ? iconSpawner : iconNormal; - } - public static NBTTagCompound getSpawnerTag(ItemStack stack) { NBTTagCompound tag = stack.getTagCompound(); if(tag != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 1cba481f7..3b5b7d3c8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -12,11 +12,9 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -26,8 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTemperanceStone extends ItemMod { - IIcon enabledIcon; - public ItemTemperanceStone() { setUnlocalizedName(LibItemNames.TEMPERANCE_STONE); setMaxStackSize(1); @@ -43,19 +39,6 @@ public class ItemTemperanceStone extends ItemMod { return par1ItemStack; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return par1 == 1 ? enabledIcon : itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 1d790d9ae..af05f309a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -11,14 +11,12 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ICraftAchievement; @@ -28,8 +26,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemThornChakram extends ItemMod implements ICraftAchievement { - IIcon iconFire; - public ItemThornChakram() { setUnlocalizedName(LibItemNames.THORN_CHAKRAM); setMaxStackSize(6); @@ -42,17 +38,6 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { list.add(new ItemStack(item, 1, i)); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - iconFire = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIconFromDamage(int dmg) { - return dmg == 0 ? itemIcon : iconFire; - } - @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index b23078907..7546f5cf1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -49,8 +49,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { - IIcon[] icons; - private static final String TAG_COLOR1 = "color1"; private static final String TAG_COLOR2 = "color2"; private static final String TAG_BOUND_TILE_X = "boundTileX"; @@ -198,21 +196,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return true; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[4]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - if(pass == 3 && !getBindMode(stack)) - pass = 0; - - return icons[Math.min(icons.length - 1, pass)]; - } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0 || par2 == 3) diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index bd36dda17..5fec84388 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -25,7 +24,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.client.core.helper.IconHelper; @@ -38,8 +36,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemVirus extends ItemMod { - IIcon[] icons; - private static final int SUBTYPES = 2; public ItemVirus() { @@ -90,12 +86,6 @@ public class ItemVirus extends ItemMod { list.add(new ItemStack(item, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); @@ -105,12 +95,4 @@ public class ItemVirus extends ItemMod { return super.getUnlocalizedName(par1ItemStack); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - } 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 0fcd4b5f4..1e4d4e6b6 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -46,8 +46,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup int drinkSpeed; ItemStack baseItem; - IIcon[] icons; - public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { this.name = name; this.texName = texName; @@ -116,20 +114,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forName(par1IconRegister, texName + "0"); - - icons = new IIcon[swigs]; - for(int i = 0; i < swigs; i++) - icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return pass == 0 ? itemIcon : icons[Math.max(0, Math.min(icons.length - 1, swigs - getSwigsLeft(stack)))]; - } - @Override public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index f80615d92..f52d70459 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -36,8 +36,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain private static final String TAG_BREW_KEY = "brewKey"; public static final int TIME_MULTIPLIER = 60; - IIcon[] icons; - public ItemIncenseStick() { setUnlocalizedName(LibItemNames.INCENSE_STICK); setMaxStackSize(1); @@ -53,18 +51,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return icons[pass]; - } - @Override public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index b2e056824..65296ca4d 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -24,8 +24,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemVial extends ItemMod implements IBrewContainer { - public static IIcon flaskIcon, vialIcon; - public ItemVial() { this(LibItemNames.VIAL); } @@ -35,17 +33,6 @@ public class ItemVial extends ItemMod implements IBrewContainer { setUnlocalizedName(name); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0"); - flaskIcon = IconHelper.forName(par1IconRegister, LibItemNames.FLASK + "0"); - } - - @Override - public IIcon getIconFromDamage(int i) { - return i == 0 ? vialIcon : flaskIcon; - } - @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 250bd1a12..ad0bf085f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -14,7 +14,6 @@ import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -74,12 +73,6 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { if(source.isUnblockable()) 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 e31f10292..741ec2d02 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 @@ -44,7 +44,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer { private static final String TAG_ANCIENT_WILL = "AncientWill"; - static IIcon willIcon; public ItemTerrasteelHelm() { this(LibItemNames.TERRASTEEL_HELM); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index d7af18e0e..922390a28 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -135,10 +135,6 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp private static final String TAG_COLOR = "color"; private static final String TAG_COMPOSITE_LENS = "compositeLens"; - public static IIcon iconGlass; - - IIcon[] ringIcons; - public ItemLens() { super(); setUnlocalizedName(LibItemNames.LENS); @@ -171,11 +167,6 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; } - @Override - public IIcon getIconFromDamage(int par1) { - return getIconFromDamageForRenderPass(par1, 0); - } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; 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 4aa2d7e00..846a03305 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -46,7 +46,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { final int types = 23; - IIcon[] icons; // begin dank_memes public IIcon tailIcon = null; @@ -155,12 +154,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public boolean canFit(ItemStack stack, IInventory apothecary) { int meta = stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 0ab289299..460a07374 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -12,11 +12,9 @@ package vazkii.botania.common.item.material; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; @@ -26,7 +24,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; - IIcon[] icons; public ItemQuartz() { setUnlocalizedName(LibItemNames.QUARTZ); @@ -39,18 +36,6 @@ public class ItemQuartz extends ItemMod implements IElvenItem { list.add(new ItemStack(item, 1, i)); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index e678f3676..fa1711559 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.material; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +19,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.IPickupAchievement; @@ -30,26 +28,12 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { - IIcon[] icons; - public ItemRune() { super(); setHasSubtypes(true); setUnlocalizedName(LibItemNames.RUNE); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[16]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; - } - @Override public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index f181ec1e7..45cd3ce0c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.item.relic; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -27,8 +25,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { - public static IIcon dasBootIcon; - public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); } @@ -64,14 +60,6 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - dasBootIcon = IconHelper.forName(par1IconRegister, "dasBoot"); - } - @Override public IIcon getIconIndex(ItemStack par1ItemStack) { return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 98b6fc407..96da44966 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.rod; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; @@ -47,8 +45,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final String TAG_FLYING = "flying"; - IIcon iconIdle, iconFlying; - public ItemTornadoRod() { setMaxDamage(MAX_DAMAGE); setUnlocalizedName(LibItemNames.TORNADO_ROD); @@ -113,14 +109,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi return isFlying(par1ItemStack) ? iconFlying : iconIdle; } - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override From 999705294d96277e97149ddea8f9509a4bd4bb34 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Nov 2015 15:28:50 -0600 Subject: [PATCH 035/935] root package of block, first pass done --- MC18_notes.txt | 3 + .../botania/api/subtile/SubTileEntity.java | 16 ++-- .../botania/common/block/BlockAltar.java | 7 -- .../botania/common/block/BlockAvatar.java | 57 ++++++-------- .../botania/common/block/BlockBifrost.java | 23 +++--- .../common/block/BlockBifrostPerm.java | 26 +++---- .../common/block/BlockCacophonium.java | 31 +++----- .../botania/common/block/BlockCamo.java | 13 ++-- .../botania/common/block/BlockCell.java | 5 +- .../botania/common/block/BlockCocoon.java | 28 +++---- .../botania/common/block/BlockEnderEye.java | 26 ++++--- .../botania/common/block/BlockFakeAir.java | 31 ++++---- .../botania/common/block/BlockFelPumpkin.java | 56 ++++++------- .../block/BlockFloatingSpecialFlower.java | 44 ++++++----- .../botania/common/block/BlockForestEye.java | 22 +----- .../botania/common/block/BlockGaiaHead.java | 20 ++--- .../botania/common/block/BlockGhostRail.java | 31 ++++---- .../botania/common/block/BlockHourglass.java | 39 ++++------ .../common/block/BlockIncensePlate.java | 65 ++++++++-------- .../common/block/BlockLightLauncher.java | 19 ++--- .../botania/common/block/BlockLightRelay.java | 32 +++----- .../botania/common/block/BlockLivingrock.java | 17 +--- .../botania/common/block/BlockLivingwood.java | 26 ++----- .../botania/common/block/BlockManaBomb.java | 7 +- .../vazkii/botania/common/block/BlockMod.java | 11 +-- .../common/block/BlockModContainer.java | 7 -- .../common/block/BlockModDoubleFlower.java | 9 ++- .../botania/common/block/BlockModFlower.java | 78 ++++++++++--------- .../botania/common/block/BlockOpenCrate.java | 46 ++++------- .../common/block/BlockPistonRelay.java | 77 +++++++++--------- .../botania/common/block/BlockPlatform.java | 19 +---- .../botania/common/block/BlockPylon.java | 12 --- .../botania/common/block/BlockRoot.java | 2 +- .../common/block/BlockSparkChanger.java | 21 +---- .../common/block/BlockSpecialFlower.java | 25 +----- .../botania/common/block/BlockStorage.java | 23 +----- .../common/block/BotaniaStateProps.java | 6 +- .../block/decor/BlockFloatingFlower.java | 38 ++++----- .../common/block/tile/TileCacophonium.java | 2 +- .../common/block/tile/TileSpecialFlower.java | 28 +++---- 40 files changed, 416 insertions(+), 632 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 1d8d42194..2a3fb351a 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -4,6 +4,9 @@ so Botania knows what property to set the color on (todo actually do this) * ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively) This can be changed to match vanilla signature, but either would break backward compat. +* SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block). +Anyways, vanilla removed it from their method so we follow suit. +* SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts -- Other -- * Most things left untouched to make patches from upstream easier diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 014fd0a6b..ce1f32dfc 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -11,7 +11,9 @@ package vazkii.botania.api.subtile; import java.util.ArrayList; +import java.util.List; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -113,33 +115,33 @@ public class SubTileEntity { /** * Called when this sub tile is placed in the world (by an entity). */ - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { // NO-OP } /** * Called when a player right clicks this sub tile. */ - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { return false; } + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } /** * Called when this sub tile is added to the world. */ - public void onBlockAdded(World world, int x, int y, int z) { + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { //NO-OP } /** * Called when this sub tile is harvested */ - public void onBlockHarvested(World world, int x, int y, int z, int side, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { //NO-OP } /** * Allows additional processing of sub tile drops */ - public ArrayList getDrops(ArrayList list) { + public List getDrops(List list) { return list; } @@ -208,14 +210,14 @@ public class SubTileEntity { /** * Gets the comparator input value for this SubTileEntity */ - public int getComparatorInputOverride(int side) { + public int getComparatorInputOverride() { return 0; } /** * Gets the redstone power level for this SubTileEntity */ - public int getPowerLevel(int side) { + public int getPowerLevel(EnumFacing side) { return 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index ef1c94e9c..c20daabb0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -16,7 +16,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -29,7 +28,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -66,11 +64,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { random = new Random(); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override protected boolean shouldRegisterInNameSet() { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 43593a9c6..cb0cf1acd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -14,7 +14,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -23,12 +24,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,8 +39,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAvatar extends BlockModContainer implements ILexiconable { - private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; - Random random; protected BlockAvatar() { @@ -49,14 +46,19 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.AVATAR); - setBlockBounds(true); - + setBlockBounds(EnumFacing.Axis.Z); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); random = new Random(); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { - TileAvatar avatar = (TileAvatar) world.getTileEntity(x, y, z); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getStackInSlot(0); ItemStack stackOnPlayer = player.getCurrentEquippedItem(); if(stackOnAvatar != null) { @@ -76,25 +78,25 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, int x, int y, int z) { - setBlockBounds(w.getBlockMetadata(x, y, z) < 4); + public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { + setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis()); } - public void setBlockBounds(boolean horiz) { + public void setBlockBounds(EnumFacing.Axis horiz) { float f = 1F / 16F; float w = f * 9; float l = f * 6; float ws = (1F - w) / 2; float ls = (1F - l) / 2; - if(horiz) + if(horiz == EnumFacing.Axis.Z) setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -112,7 +114,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -124,26 +126,15 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); - } - - @Override - public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { - return RotationHelper.rotateVanillaBlock(Blocks.furnace, worldObj, x, y, z, axis); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); } @Override @@ -157,7 +148,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 0aa359027..0b41a9881 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -14,12 +14,13 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -59,19 +60,19 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.rainbowRod); } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + Block block = p_149646_1_.getBlockState(pos).getBlock(); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + return shouldSideBeRendered1(p_149646_1_, pos, 1 - p_149646_5_); //todo 1.8 wtf } @Override @@ -80,7 +81,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public int quantityDropped(int meta, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, Random random) { return 0; } @@ -94,12 +95,6 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileBifrost(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 414d40f2f..c95b5bff2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -14,10 +14,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -39,36 +41,26 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { setTickRandomly(true); } - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.bifrost.getIcon(side, meta); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public boolean isOpaqueCube() { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + Block block = p_149646_1_.getBlockState(pos).getBlock(); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + return shouldSideBeRendered1(p_149646_1_, pos, 1 - p_149646_5_); //todo 1.8 wtf } @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { if(rand.nextBoolean()) - Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index cce64a02c..74c6547fd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -11,15 +11,17 @@ package vazkii.botania.common.block; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; @@ -27,8 +29,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCacophonium extends BlockModContainer { - IIcon top; - protected BlockCacophonium() { super(Material.wood); setUnlocalizedName(LibBlockNames.CACOPHONIUM); @@ -36,18 +36,7 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public void registerBlockIcons(IIconRegister reg) { - blockIcon = IconHelper.forBlock(reg, this, 0); - top = IconHelper.forBlock(reg, this, 1); - } - - @Override - public IIcon getIcon(int side, int meta) { - return side == 1 ? blockIcon : top; - } - - @Override - protected boolean canSilkHarvest() { + public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { return false; } @@ -57,7 +46,7 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); int meta = world.getBlockMetadata(x, y, z); boolean powered = (meta & 8) != 0; @@ -72,16 +61,16 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + dropBlockAsItem(par1World, pos, state, 0); } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList stacks = new ArrayList(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) { stacks.add(new ItemStack(Blocks.noteblock)); ItemStack thingy = ((TileCacophonium) tile).stack; diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 9dac8126f..81669fd16 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -122,26 +123,22 @@ public abstract class BlockCamo extends BlockModContainer { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess par1World, int par2, int par3, int par4) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public int colorMultiplier(IBlockAccess par1World, BlockPos pos, int pass) { + TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; Block block = camo.camo; if(block != null) - return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, par2, par3, par4); + return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, pos, pass); } return 0xFFFFFF; } - public IIcon getIconFromSideAfterCheck(TileEntity tile, int meta, int side) { - return getIcon(side, meta); - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 2a02e7053..953418ec6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -11,12 +11,15 @@ package vazkii.botania.common.block; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -33,7 +36,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 69b4d1993..062691f8d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -11,16 +11,18 @@ package vazkii.botania.common.block; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -43,17 +45,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return Blocks.web.getBlockTextureFromSide(0); - } - - @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -68,25 +60,25 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { - TileCocoon cocoon = (TileCocoon) world.getTileEntity(x, y, z); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + TileCocoon cocoon = (TileCocoon) world.getTileEntity(pos); ItemStack item = player.getCurrentEquippedItem(); if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.emerald) { if(!player.capabilities.isCreativeMode) item.stackSize--; cocoon.emeraldsGiven++; - world.playAuxSFX(2005, x, y, z, 6 + world.rand.nextInt(4)); + world.playAuxSFX(2005, pos, 6 + world.rand.nextInt(4)); } return false; } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } @Override - protected boolean canSilkHarvest() { + public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index bd235a521..a6ea1e901 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -11,12 +11,13 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -28,25 +29,28 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnderEye extends BlockModContainer implements ILexiconable { - IIcon iconOff, iconOn; - protected BlockEnderEye() { super(Material.iron); setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWER, 0)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconOff = IconHelper.forBlock(par1IconRegister, this, 0); - iconOn = IconHelper.forBlock(par1IconRegister, this, 1); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWER); } @Override - public IIcon getIcon(int side, int meta) { - return meta == 0 ? iconOff : iconOn; + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWER, meta); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Integer) state.getValue(BotaniaStateProps.POWER)); } @Override @@ -55,8 +59,8 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { - return world.getBlockMetadata(x, y, z); + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return ((Integer) state.getValue(BotaniaStateProps.POWER)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 87b1c4d3c..6e8856513 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -11,15 +11,18 @@ package vazkii.botania.common.block; import java.util.ArrayList; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,19 +39,19 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - if(shouldRemove(world, x, y, z)) - world.scheduleBlockUpdate(x, y, z, this, tickRate(world)); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + if(shouldRemove(world, pos)) + world.scheduleUpdate(pos, this, tickRate(world)); } - private boolean shouldRemove(World world, int x, int y, int z) { - return !world.isRemote && world.getTileEntity(x, y, z) == null || !(world.getTileEntity(x, y, z) instanceof TileFakeAir) || !((TileFakeAir) world.getTileEntity(x, y, z)).canStay(); + private boolean shouldRemove(World world, BlockPos pos) { + return !world.isRemote && world.getTileEntity(pos) == null || !(world.getTileEntity(pos) instanceof TileFakeAir) || !((TileFakeAir) world.getTileEntity(pos)).canStay(); } @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - if(shouldRemove(world, x, y, z)) - world.setBlock(x, y, z, Blocks.water); + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + if(shouldRemove(world, pos)) + world.setBlockState(pos, Blocks.water.getDefaultState()); } @Override @@ -72,17 +75,17 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity e) { + public boolean canEntityDestroy(IBlockAccess world, BlockPos pos, Entity e) { return false; } @Override - public boolean canCollideCheck(int par1, boolean par2) { + public boolean canCollideCheck(IBlockState state, boolean hitIfLiquid) { return false; } @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { + public boolean canBeReplacedByLeaves(IBlockAccess world, BlockPos pos) { return true; } @@ -92,17 +95,17 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); // Empty List } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { + public AxisAlignedBB getCollisionBoundingBox(World par1World, BlockPos pos, IBlockState state) { return null; } @Override - public boolean isAir(IBlockAccess world, int x, int y, int z) { + public boolean isAir(IBlockAccess world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index a717c5337..125127baa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -11,7 +11,8 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityBlaze; @@ -20,7 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -38,52 +39,51 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; - IIcon top, face; - public BlockFelPumpkin() { super(Material.gourd); setBlockName(LibBlockNames.FEL_PUMPKIN); setHardness(1F); setStepSound(soundTypeWood); MinecraftForge.EVENT_BUS.register(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return p_149691_1_ == 1 ? top : p_149691_1_ == 0 ? top : p_149691_2_ == 2 && p_149691_1_ == 2 ? face : p_149691_2_ == 3 && p_149691_1_ == 5 ? face : p_149691_2_ == 0 && p_149691_1_ == 3 ? face : p_149691_2_ == 1 && p_149691_1_ == 4 ? face : blockIcon; + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); } @Override - public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) { - super.onBlockAdded(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_); + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + } - if(!p_149726_1_.isRemote && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_) == Blocks.iron_bars && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_) == Blocks.iron_bars) { - p_149726_1_.setBlock(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0), 0, 2); - p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0), 0, 2); - p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0), 0, 2); + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + } + + @Override + 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); EntityBlaze blaze = new EntityBlaze(p_149726_1_); - blaze.setLocationAndAngles(p_149726_2_ + 0.5D, p_149726_3_ - 1.95D, p_149726_4_ + 0.5D, 0.0F, 0.0F); + 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_.notifyBlockChange(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0)); - p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0)); - p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0)); + p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.air); + p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.air); + p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.air); } } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 2.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, l, 2); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) { - face = IconHelper.forBlock(p_149651_1_, this); - top = Blocks.pumpkin.getIcon(0, 0); - blockIcon = Blocks.pumpkin.getIcon(2, 0); + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index f427fce8b..5cf18e4f5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; @@ -54,13 +55,13 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); - if(currentLight == -1) - currentLight = originalLight; - return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); - } +// @Override todo 1.8 coloredlights dep +// public int getLightValue(IBlockAccess world, int x, int y, int z) { +// int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); +// if(currentLight == -1) +// currentLight = originalLight; +// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); +// } @Override public boolean hasComparatorInputOverride() { @@ -68,18 +69,18 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getComparatorInputOverride(side); + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getPowerLevel(side); + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) { - return isProvidingWeakPower(world, x, y, z, side); + public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return isProvidingWeakPower(world, pos, state, side); } @Override @@ -88,7 +89,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { // NO-OP } @@ -102,9 +103,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - String name = ((TileSpecialFlower) world.getTileEntity(x, y, z)).subTileName; - return ItemBlockSpecialFlower.ofType(new ItemStack(world.getBlock(x, y, z)), name); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; + IBlockState state = world.getBlockState(pos); + return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock(), state.getBlock().getMetaFromState(state), name); } @Override @@ -152,13 +154,13 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockAdded(World world, int x, int y, int z) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockAdded(world, x, y, z); + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos); } @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); + ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } @Override @@ -173,6 +175,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); + return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 1a7f70ce1..690b6efe7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -11,12 +11,10 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -27,8 +25,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockForestEye extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockForestEye() { super(Material.iron); setHardness(5.0F); @@ -39,19 +35,7 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[6]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par1)]; - } - - @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -66,8 +50,8 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileForestEye eye = (TileForestEye) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileForestEye eye = (TileForestEye) par1World.getTileEntity(pos); return Math.min(15, Math.max(0, eye.entities - 1)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 2f1e9deec..f5ccf78a7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -12,9 +12,10 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; @@ -27,33 +28,28 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGaiaHead extends BlockSkull { public BlockGaiaHead() { - setBlockName(LibBlockNames.GAIA_HEAD); + setUnlocalizedName(LibBlockNames.GAIA_HEAD); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { + public Item getItem(World p_149694_1_, BlockPos pos) { return ModItems.gaiaHead; } @Override - public void registerBlockIcons(IIconRegister p_149651_1_) { - // NO-OP - } - - @Override - public int getDamageValue(World p_149643_1_, int p_149643_2_, int p_149643_3_, int p_149643_4_) { + public int getDamageValue(World p_149643_1_, BlockPos pos) { return 0; } @Override - public int damageDropped(int p_149692_1_) { + public int damageDropped(IBlockState state) { return 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index d208c18b1..a2f0449a9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -40,19 +40,13 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { super(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); MinecraftForge.EVENT_BUS.register(this); - setBlockName(LibBlockNames.GHOST_RAIL); + setUnlocalizedName(LibBlockNames.GHOST_RAIL); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); + return super.setUnlocalizedName(par1Str); } @SubscribeEvent @@ -60,8 +54,9 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { int x = MathHelper.floor_double(event.entity.posX); int y = MathHelper.floor_double(event.entity.posY); int z = MathHelper.floor_double(event.entity.posZ); - Block block = event.entity.worldObj.getBlock(x, y, z); - boolean air = block.isAir(event.entity.worldObj, x, y, z); + BlockPos entPos = new BlockPos(event.entity); + Block block = event.entity.worldObj.getBlockState(entPos).getBlock(); + boolean air = block.isAir(event.entity.worldObj, entPos); int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(block == this) @@ -69,20 +64,20 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 0); if(floatTicks > 0) - event.entity.worldObj.playAuxSFX(2003, x, y, z, 0); + event.entity.worldObj.playAuxSFX(2003, entPos, 0); } floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(floatTicks > 0) { - Block blockBelow = event.entity.worldObj.getBlock(x, y - 1, z); - boolean airBelow = blockBelow.isAir(event.entity.worldObj, x, y - 1, z); + Block blockBelow = event.entity.worldObj.getBlockState(entPos.down()).getBlock(); + boolean airBelow = blockBelow.isAir(event.entity.worldObj, entPos.down()); if(air && airBelow || !air && !airBelow) event.entity.noClip = true; event.entity.motionY = 0.2; event.entity.motionX *= 1.4; event.entity.motionZ *= 1.4; event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); - event.entity.worldObj.playAuxSFX(2000, x, y, z, 0); + event.entity.worldObj.playAuxSFX(2000, entPos, 0); } else event.entity.noClip = false; } @@ -91,4 +86,8 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return LexiconData.ghostRail; } + @Override + public IProperty getShapeProperty() { + return null; // todo 1.8 ?? + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index cf0f4b133..e4200c2cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -14,9 +14,9 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,7 +25,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -61,8 +60,8 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xs, float ys, float zs) { - TileHourglass hourglass = (TileHourglass) world.getTileEntity(x, y, z); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float xs, float ys, float zs) { + TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); ItemStack hgStack = hourglass.getStackInSlot(0); ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) @@ -97,7 +96,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return world.getBlockMetadata(x, y, z) == 0 ? 0 : 15; } @@ -107,13 +106,13 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public void updateTick(World world, int x, int y, int z, Random rand) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { world.setBlockMetadataWithNotify(x, y, z, 0, 1 | 2); } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -131,7 +130,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -143,20 +142,10 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return ModBlocks.manaGlass.getIcon(0, 0); + super.breakBlock(par1World, pos, state); } @Override @@ -165,7 +154,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -182,7 +171,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!world.isRemote && !burst.isFake()) { - TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); + TileHourglass tile = (TileHourglass) world.getTileEntity(pos); tile.move = !tile.move; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } @@ -190,14 +179,14 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); + TileHourglass tile = (TileHourglass) world.getTileEntity(pos); tile.lock = !tile.lock; return false; } @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); + TileHourglass tile = (TileHourglass) world.getTileEntity(pos); tile.renderHUD(res); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 128d77486..cd2cbbe18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -11,7 +11,8 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -19,12 +20,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -35,19 +34,33 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockIncensePlate extends BlockModContainer implements ILexiconable { - private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; - protected BlockIncensePlate() { super(Material.wood); setUnlocalizedName(LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockBounds(true); + setBlockBounds(EnumFacing.Axis.Z); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { - TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(x, y, z); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); ItemStack stack = player.getCurrentEquippedItem(); ItemStack plateStack = plate.getStackInSlot(0); boolean did = false; @@ -81,9 +94,8 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); } @Override @@ -92,48 +104,33 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return ((TileIncensePlate) world.getTileEntity(x, y, z)).comparatorOutput; + public int getComparatorInputOverride(World world, BlockPos pos) { + return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, int x, int y, int z) { - setBlockBounds(w.getBlockMetadata(x, y, z) < 4); + public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { + setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis()); } - public void setBlockBounds(boolean horiz) { + public void setBlockBounds(EnumFacing.Axis axis) { float f = 1F / 16F; float w = 12 * f; float l = 4 * f; float xs = (1F - w) / 2; float zs = (1F - l) / 2; - if(horiz) + if(axis == EnumFacing.Axis.Z) setBlockBounds(xs, 0F, zs, 1F - xs, f, 1f - zs); else setBlockBounds(zs, 0F, xs, 1F - zs, f, 1f - xs); } - @Override - public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { - return RotationHelper.rotateVanillaBlock(Blocks.furnace, worldObj, x, y, z, axis); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return ModBlocks.livingwood.getIcon(0, 0); - } - @Override public boolean isOpaqueCube() { return false; } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 3cf7934f2..c6ccb1ca7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -23,9 +24,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileLightRelay; @@ -49,18 +50,18 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return false; } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0; int meta = world.getBlockMetadata(x, y, z); boolean powered = (meta & 8) != 0; @@ -71,10 +72,10 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); } - public void pickUpEntities(World world, int x, int y, int z) { + public void pickUpEntities(World world, BlockPos pos) { List relays = new ArrayList(); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = world.getTileEntity(x + dir.offsetX, y, z + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile instanceof TileLightRelay) { TileLightRelay relay = (TileLightRelay) tile; if(relay.getBinding() != null) @@ -83,7 +84,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } if(!relays.isEmpty()) { - AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); + AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1)); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index a11e6ca99..5be284fab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -15,7 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -24,7 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -66,7 +65,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public int damageDropped(int meta) { + public int damageDropped(IBlockState state) { return meta == 0 ? 0 : 1; } @@ -76,18 +75,18 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return false; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { - ((TileLightRelay) world.getTileEntity(x, y, z)).mountEntity(player); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + ((TileLightRelay) world.getTileEntity(pos)).mountEntity(player); return true; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { return null; } @@ -97,7 +96,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public void updateTick(World world, int x, int y, int z, Random rand) { + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); } @@ -107,26 +106,13 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int s) { + public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { int meta = world.getBlockMetadata(x, y, z); return (meta & 8) != 0 ? 15 : 0; } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forBlock(par1IconRegister, this, 0); - worldIcon = IconHelper.forBlock(par1IconRegister, this, 1); - invIconRed = IconHelper.forBlock(par1IconRegister, this, 2); - worldIconRed = IconHelper.forBlock(par1IconRegister, this, 3); - } - - @Override - public IIcon getIcon(int side, int meta) { - return meta > 0 ? invIconRed : invIcon; - } - - @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 25fafd642..77f28fce3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -14,13 +14,11 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,7 +32,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { private static final int TYPES = 5; - IIcon[] icons; public BlockLivingrock() { super(Material.rock); @@ -67,19 +64,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { int meta = world.getBlockMetadata(x, y, z); return new ItemStack(this, 1, meta); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index c19e3db5e..c12006eab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -14,13 +14,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,7 +34,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { private static final int TYPES = 6; - IIcon[] icons; public BlockLivingwood() { this(LibBlockNames.LIVING_WOOD); @@ -54,8 +52,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override @@ -75,25 +73,13 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { int meta = world.getBlockMetadata(x, y, z); return new ItemStack(this, 1, meta); } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, BlockPos pos) { return world.getBlockMetadata(x, y, z) == 5 ? 12 : 0; } @@ -104,7 +90,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) { + public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { return world.getBlockMetadata(x, y, z) == 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index be0b410b4..4310b77fc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -39,10 +40,10 @@ 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, x, y, z, getIdFromBlock(this)); - world.setBlockToAir(x, y, z); + world.playAuxSFX(2001, pos, Block.getStateId(this.getDefaultState())); + world.setBlockToAir(pos); EntityManaStorm storm = new EntityManaStorm(world); - storm.setPosition(x + 0.5, y + 0.5, z + 0.5); + storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); world.spawnEntityInWorld(storm); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 4e4553d25..791ed8850 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -33,10 +32,10 @@ public class BlockMod extends Block { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { if(shouldRegisterInNameSet()) GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } protected boolean shouldRegisterInNameSet() { @@ -49,12 +48,6 @@ public class BlockMod extends Block { return super.setLightLevel(p_149715_1_); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - boolean registerInCreative() { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index 12611f266..328f69219 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -50,12 +49,6 @@ public abstract class BlockModContainer extends BlockConta return super.setLightLevel(p_149715_1_); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - public boolean registerInCreative() { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 07f128fa9..dbf76bfbf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; @@ -63,19 +64,19 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { if(!par1Str.equals("doublePlant")) GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { return null; } @Override - public int damageDropped(int p_149692_1_) { + public int damageDropped(IBlockState p_149692_1_) { return p_149692_1_ & 7; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index ea3424cc3..345df6529 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -16,16 +16,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -45,9 +46,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { - public static IIcon[] icons; - public static IIcon[] iconsAlt; - public int originalLight; public static final String ALT_DIR = "alt"; @@ -57,13 +55,34 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } protected BlockModFlower(String name) { - super(0); - setBlockName(name); + super(); + setUnlocalizedName(name); setHardness(0F); setStepSound(soundTypeGrass); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.RED)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + + @Override + public EnumFlowerColor getBlockType() { + return EnumFlowerColor.RED; } public boolean registerInCreative() { @@ -77,21 +96,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[17]; - iconsAlt = new IIcon[17]; - - for(int i = 0; i < icons.length; i++) { - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - iconsAlt[i] = IconHelper.forBlock(par1IconRegister, this, i, ALT_DIR); - } + return super.setUnlocalizedName(par1Str); } @Override @@ -100,28 +107,25 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return super.setLightLevel(p_149715_1_); } - @Override - public IIcon getIcon(int par1, int par2) { - return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; - } - @Override public int getRenderType() { return LibRenderIDs.idSpecialFlower; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); } @Override @@ -135,17 +139,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { - return world.isAirBlock(x, y + 1, z); + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + return world.isAirBlock(pos.up()); } @Override - public boolean func_149852_a(World world, Random rand, int x, int y, int z) { - return func_149851_a(world, x, y, z, false); + public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + return canGrow(world, pos, state, false); } @Override - public void func_149853_b(World world, Random rand, int x, int y, int z) { + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { int meta = world.getBlockMetadata(x, y, z); placeDoubleFlower(world, x, y, z, meta, 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index d1864aef2..bf154730c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -24,7 +25,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +32,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -50,13 +49,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { - IIcon iconSide; - IIcon iconBottom; - IIcon iconSideCraft; - IIcon iconBottomCraft; - - IIcon[] sidePatternIcons; - Random random; private static final int SUBTYPES = 2; @@ -88,8 +80,8 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @@ -99,14 +91,14 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World par1World, BlockPos pos) { + TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(pos); return crate.getSignal(); } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -124,7 +116,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -136,10 +128,10 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, pos, state); } @Override @@ -154,19 +146,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I sidePatternIcons[i] = IconHelper.forName(par1IconRegister, "ocPattern" + i); } - @Override - public IIcon getIcon(int side, int meta) { - return meta == 0 ? side == 0 ? iconBottom : iconSide : side == 0 ? iconBottomCraft : iconSideCraft; - } - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - if(tile != null && tile instanceof TileCraftCrate && ((TileCraftCrate) tile).pattern != -1 && side != 0) - return sidePatternIcons[((TileCraftCrate) tile).pattern]; - - return super.getIcon(world, x, y, z, side); - } @Override public TileEntity createNewTileEntity(World world, int meta) { @@ -180,13 +160,13 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(x, y, z); + TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(pos); return crate.onWanded(player, stack); } @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileCraftCrate) { TileCraftCrate craft = (TileCraftCrate) tile; @@ -213,7 +193,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I ItemStack item = craft.getStackInSlot(index); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, item, xp, yp); + mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 563787e23..30e5a57e0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -18,7 +18,10 @@ import java.util.Map; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockPistonExtension; +import net.minecraft.block.BlockPistonMoving; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -33,7 +36,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.WorldEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -57,7 +59,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public BlockPistonRelay() { super(Material.gourd); - setBlockName(LibBlockNames.PISTON_RELAY); + setUnlocalizedName(LibBlockNames.PISTON_RELAY); setHardness(2F); setResistance(10F); setStepSound(soundTypeMetal); @@ -67,7 +69,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public int quantityDropped(int meta, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, Random random) { return 0; } @@ -77,16 +79,16 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - mapCoords(par1World.provider.dimensionId, par2, par3, par4, 2); + public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + mapCoords(par1World.provider.getDimensionId(), pos, 2); } public static String getCoordsAsString(int world, BlockPos pos) { return world + ":" + pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); } - static void mapCoords(int world, int x, int y, int z, int time) { - String coords = getCoordsAsString(world, x, y, z); + static void mapCoords(int world, BlockPos pos, int time) { + String coords = getCoordsAsString(world, pos); coordsToCheck.put(coords, time); } @@ -110,18 +112,18 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl String[] tokens = key.split(":"); int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); World world = server.worldServerForDimension(worldId); - return world.getBlock(x, y, z); + return world.getBlockState(new BlockPos(x, y, z)).getBlock(); } - static int getBlockMetaAt(String key) { + static IBlockState getStateAt(String key) { MinecraftServer server = MinecraftServer.getServer(); if(server == null) - return 0; + return null; String[] tokens = key.split(":"); int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); World world = server.worldServerForDimension(worldId); - return world.getBlockMetadata(x, y, z); + return world.getBlockState(new BlockPos(x, y, z)); } @Override @@ -130,13 +132,13 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl return false; if(!player.isSneaking()) { - playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.dimensionId, x, y, z)); - world.playSoundEffect(x, y, z, "botania:ding", 0.5F, 1F); + playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.getDimensionId(), pos)); + world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { dropBlockAsItem(world, x, y, z, new ItemStack(this)); - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); if(!world.isRemote) - world.playAuxSFX(2001, x, y , z, Block.getIdFromBlock(this)); + world.playAuxSFX(2001, pos, Block.getIdFromBlock(this)); } return true; @@ -164,11 +166,11 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public void readFromNBT(NBTTagCompound nbttagcompound) { mappedPositions.clear(); - Collection tags = nbttagcompound.func_150296_c(); + Collection tags = nbttagcompound.getKeySet(); for(String key : tags) { NBTBase tag = nbttagcompound.getTag(key); if(tag instanceof NBTTagString) { - String value = ((NBTTagString) tag).func_150285_a_(); + String value = ((NBTTagString) tag).getString(); mappedPositions.put(key, value); } @@ -182,15 +184,15 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } public static WorldData get(World world) { - if(world.mapStorage == null) + if(world.getMapStorage() == null) return null; - WorldData data = (WorldData) world.mapStorage.loadData(WorldData.class, ID); + WorldData data = (WorldData) world.getMapStorage().loadData(WorldData.class, ID); if (data == null) { data = new WorldData(ID); data.markDirty(); - world.mapStorage.setData(ID, data); + world.getMapStorage().setData(ID, data); } return data; } @@ -207,9 +209,9 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl Block block = getBlockAt(s); if(block == Blocks.piston_extension) { - int meta = getBlockMetaAt(s); - boolean sticky = (meta & 8) == 8; - ForgeDirection dir = ForgeDirection.getOrientation(meta & ~8); + IBlockState state = getStateAt(s); + boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); + EnumFacing dir = ((EnumFacing) state.getValue(BlockPistonMoving.FACING)).getOpposite(); MinecraftServer server = MinecraftServer.getServer(); @@ -219,34 +221,35 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl { String[] tokens = s.split(":"); int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); + BlockPos pos = new BlockPos(x, y, z); World world = server.worldServerForDimension(worldId); - if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) - world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, ModBlocks.pistonRelay); + if(world.isAirBlock(pos.offset(dir))) + world.setBlockState(pos.offset(dir), ModBlocks.pistonRelay.getDefaultState()); else if(!world.isRemote) { ItemStack stack = new ItemStack(ModBlocks.pistonRelay); - world.spawnEntityInWorld(new EntityItem(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, stack)); + world.spawnEntityInWorld(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); } checkedCoords.add(s); - newPos = getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ); + newPos = getCoordsAsString(world.provider.getDimensionId(), pos.offset(dir)); } if(mappedPositions.containsKey(s)) { String pos = mappedPositions.get(s); String[] tokens = pos.split(":"); int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); + BlockPos pos2 = new BlockPos(x, y, z); World world = server.worldServerForDimension(worldId); - Block srcBlock = world.getBlock(x, y, z); - int srcMeta = world.getBlockMetadata(x, y, z); - TileEntity tile = world.getTileEntity(x, y, z); - Material mat = srcBlock.getMaterial(); + IBlockState srcState = world.getBlockState(pos2); + TileEntity tile = world.getTileEntity(pos2); + Material mat = srcState.getBlock().getMaterial(); - if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcBlock.getBlockHardness(world, x, y, z) != -1 && !srcBlock.isAir(world, x, y, z)) { - Material destMat = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial(); - if(world.isAirBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ) || destMat.isReplaceable()) { - world.setBlock(x, y, z, Blocks.air); - world.setBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, srcBlock, srcMeta, 1 | 2); - mappedPositions.put(s, getCoordsAsString(world.provider.dimensionId, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)); + if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcState.getBlock().getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(world, pos2)) { + Material destMat = world.getBlockState(pos2.offset(dir)).getBlock().getMaterial(); + if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { + world.setBlockState(pos2, Blocks.air.getDefaultState()); + world.setBlockState(pos2.offset(dir), srcState, 1 | 2); + mappedPositions.put(s, getCoordsAsString(world.provider.getDimensionId(), 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 db10a4724..97212e0b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,7 +37,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { - IIcon[] icons; private static final int SUBTYPES = 3; public BlockPlatform() { @@ -73,26 +70,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(SUBTYPES - 1, par2)]; - } - - @Override - public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { int meta = par1World.getBlockMetadata(par2, par3, par4); if(meta == 2 || meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } @Override - public float getBlockHardness(World par1World, int par2, int par3, int par4) { + public float getBlockHardness(World par1World, BlockPos pos) { int meta = par1World.getBlockMetadata(par2, par3, par4); return meta == 2 ? -1F : super.getBlockHardness(par1World, par2, par3, par4); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 01e1cb2ad..125abd7c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -23,7 +22,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; @@ -60,11 +58,6 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu return super.setUnlocalizedName(par1Str); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); @@ -76,11 +69,6 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu par3.add(new ItemStack(par1, 1, i)); } - @Override - public IIcon getIcon(int par1, int par2) { - return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, par2); - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 8598e8c6b..1cae52eab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -31,7 +31,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { super(Material.plants); setHardness(1.2F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.ROOT); + setUnlocalizedName(LibBlockNames.ROOT); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e8733e07b..b269dc79c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -37,7 +35,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockSparkChanger extends BlockModContainer implements ILexiconable { - IIcon[] icons; Random random; public BlockSparkChanger() { @@ -67,25 +64,13 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; int meta = world.getBlockMetadata(x, y, z); boolean powered = (meta & 8) != 0; if(power && !powered) { - ((TileSparkChanger) world.getTileEntity(x, y, z)).doSwap(); + ((TileSparkChanger) world.getTileEntity(pos)).doSwap(); world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); } else if(!power && powered) world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 4cab29a8c..7309d194e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -23,7 +23,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; @@ -34,7 +33,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -183,23 +181,6 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return EnumFlowerColor.RED; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - for(String s : BotaniaAPI.getAllSubTiles()) - if(!s.isEmpty()) - BotaniaAPI.getSignatureForName(s).registerIcons(par1IconRegister); - } - - @Override - public IIcon getIcon(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { - return ((TileSpecialFlower) par1iBlockAccess.getTileEntity(par2, par3, par4)).getIcon(); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return BlockModFlower.icons[16]; - } - @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; @@ -257,12 +238,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, x, y, z, entity, stack); + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } @Override public void onBlockAdded(World world, BlockPos pos, IBlockState state) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, x, y, z); + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } @Override @@ -281,7 +262,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); } - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index dfd79f834..6c1ce0a13 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -15,13 +15,11 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -38,14 +36,12 @@ public class BlockStorage extends BlockMod implements ILexiconable { private static final int SUBTYPES = 5; - IIcon[] icons; - public BlockStorage() { super(Material.iron); setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); - setBlockName(LibBlockNames.STORAGE); + setUnlocalizedName(LibBlockNames.STORAGE); } @Override @@ -55,9 +51,9 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockStorage.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -70,19 +66,6 @@ public class BlockStorage extends BlockMod implements ILexiconable { return false; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par2)]; - } - @Override public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beaconPos) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java b/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java index c5346ef12..61467c7d1 100644 --- a/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; @@ -21,9 +22,12 @@ public class BotaniaStateProps { // All 6 directions public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); - // Redstone power + // Redstone power - boolean public static final PropertyBool POWERED = PropertyBool.create("powered"); + // Redstone power - int + public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); + /** Properties for individual blocks **/ // BlockAltGrass 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 74dcd1d87..3f3151e18 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; @@ -25,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -65,11 +67,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); } - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } +// @Override todo 1.8 coloredlights dep +// @Optional.Method(modid = "easycoloredlights") +// public int getLightValue(IBlockAccess world, int x, int y, int z) { +// return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); +// } @Override protected boolean shouldRegisterInNameSet() { @@ -87,7 +89,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { int meta = par1World.getBlockMetadata(par2, par3, par4); float[] color = EntitySheep.fleeceColorTable[meta]; @@ -95,11 +97,6 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) @@ -107,8 +104,8 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override @@ -117,20 +114,15 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public IIcon getIcon(int par1, int par2) { - return Blocks.dirt.getIcon(par1, par2); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null) { - IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(x, y, z); + IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(pos); IslandType type = null; if(stack.getItem() == Items.snowball) type = IslandType.SNOW; @@ -143,7 +135,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab if(type != null && type != flower.getIslandType()) { if(!world.isRemote) { flower.setIslandType(type); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } if(!player.capabilities.isCreativeMode) @@ -170,7 +162,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index a1dc474eb..7c47564c9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -21,7 +21,7 @@ public class TileCacophonium extends TileMod { public ItemStack stack; public void annoyDirewolf() { - ItemCacophonium.playSound(worldObj, stack, xCoord, yCoord, zCoord, 1F); + ItemCacophonium.playSound(worldObj, stack, pos.getX(), pos.getY(), pos.getZ(), 1F); } @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 1747de090..53c65e0d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block.tile; import java.util.ArrayList; +import java.util.List; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -152,26 +154,26 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return subTile == null ? false : subTile.onWanded(player, wand); } - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { if (subTile != null) - subTile.onBlockPlacedBy(world, x, y, z, entity, stack); + subTile.onBlockPlacedBy(world, pos, state, entity, stack); } - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return subTile == null ? false : subTile.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { + return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); } - public void onBlockAdded(World world, int x, int y, int z) { + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { if (subTile != null) - subTile.onBlockAdded(world, x, y, z); + subTile.onBlockAdded(world, pos, state); } - public void onBlockHarvested(World world, int x, int y, int z, int side, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { if (subTile != null) - subTile.onBlockHarvested(world, x, y, z, side, player); + subTile.onBlockHarvested(world, pos, state, player); } - public ArrayList getDrops(ArrayList list) { + public List getDrops(List list) { if (subTile != null) subTile.getDrops(list); @@ -194,14 +196,14 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.canSelect(player, wand, , x, , y); + return subTile.canSelect(player, wand, pos, side); } @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.bindTo(player, wand, , x, , y); + return subTile.bindTo(player, wand, pos, side); } public int getLightValue() { @@ -210,10 +212,10 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return subTile.getLightValue(); } - public int getComparatorInputOverride(int side) { + public int getComparatorInputOverride() { if(subTile == null) return 0; - return subTile.getComparatorInputOverride(side); + return subTile.getComparatorInputOverride(); } public int getPowerLevel(int side) { From c2f1a9ab17adc7ce47e92b34d49277ed8a826b06 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Nov 2015 16:19:02 -0600 Subject: [PATCH 036/935] corporea, mana, and string tile entities --- .../block/tile/TileSimpleInventory.java | 33 +++++++-- .../block/tile/corporea/TileCorporeaBase.java | 2 +- .../corporea/TileCorporeaCrystalCube.java | 11 +-- .../tile/corporea/TileCorporeaFunnel.java | 20 +++--- .../tile/corporea/TileCorporeaIndex.java | 19 +++--- .../corporea/TileCorporeaInterceptor.java | 20 +++--- .../tile/corporea/TileCorporeaRetainer.java | 28 ++++---- .../common/block/tile/mana/TileBellows.java | 66 +++++++++--------- .../block/tile/mana/TileDistributor.java | 13 ++-- .../block/tile/mana/TileManaDetector.java | 9 +-- .../common/block/tile/mana/TileManaVoid.java | 7 +- .../common/block/tile/mana/TilePool.java | 41 +++++------ .../common/block/tile/mana/TilePrism.java | 9 +-- .../common/block/tile/mana/TilePump.java | 17 +++-- .../block/tile/mana/TileRFGenerator.java | 68 ++++++++++--------- .../common/block/tile/mana/TileSpreader.java | 56 +++++++-------- .../common/block/tile/mana/TileTurntable.java | 15 ++-- .../block/tile/string/TileRedString.java | 42 ++++++------ .../tile/string/TileRedStringComparator.java | 16 ++--- .../tile/string/TileRedStringContainer.java | 60 ++++++++++++---- .../tile/string/TileRedStringDispenser.java | 8 +-- .../tile/string/TileRedStringFertilizer.java | 4 +- .../tile/string/TileRedStringInterceptor.java | 21 +++--- .../block/tile/string/TileRedStringRelay.java | 9 +-- 24 files changed, 325 insertions(+), 269 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 15a9f4144..bcaa103da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -15,6 +15,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; public abstract class TileSimpleInventory extends TileMod implements IInventory { @@ -90,7 +92,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory @Override public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return worldObj.getTileEntity(xCoord, yCoord, zCoord) != this ? false : entityplayer.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64; + return worldObj.getTileEntity(getPos()) != this ? false : entityplayer.getDistanceSq(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D) <= 64; } @Override @@ -99,17 +101,40 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory } @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { return false; } @Override - public void openInventory() { + public void openInventory(EntityPlayer player) { // NO-OP } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { // NO-OP } + + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) {} + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + // todo 1.8 + } + + @Override + public IChatComponent getDisplayName() { + return new ChatComponentText(getCommandSenderName()); // todo 1.8 + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index 3bf5c9af2..3a3d175ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -17,7 +17,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class TileCorporeaBase extends TileSimpleInventory { public ICorporeaSpark getSpark() { - return CorporeaHelper.getSparkForBlock(worldObj, , xCoord); + return CorporeaHelper.getSparkForBlock(worldObj, getPos()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 0c8b71c2e..c16e4b511 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -15,13 +15,14 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -34,7 +35,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public int compValue = 0; @Override - public void updateEntity() { + public void update() { ++ticks; if(ticks % 20 == 0) updateCount(); @@ -92,7 +93,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor private void onUpdateCount() { compValue = getComparatorValue(); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } @Override @@ -130,7 +131,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.CORPOREA_CRYSTAL_CUBE; } @@ -144,7 +145,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor boolean did = false; for(ItemStack reqStack : stacks) if(requestTarget != null) { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, reqStack); + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); worldObj.spawnEntityInWorld(item); itemCount -= reqStack.stackSize; did = true; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index f3ef72231..ce3690f3b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -18,7 +18,7 @@ import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -51,11 +51,11 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq 1, 16, 32, 64 }; - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { - int orientation = frame.hangingDirection; - if(orientationToDir[orientation] == dir.ordinal()) { + EnumFacing orientation = frame.facingDirection; + if(orientation == dir) { ItemStack stack = frame.getDisplayedItem(); if(stack != null) { ItemStack copy = stack.copy(); @@ -80,7 +80,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.CORPOREA_FUNNEL; } @@ -89,18 +89,18 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq if(!(request instanceof ItemStack)) return; - IInventory inv = InventoryHelper.getInventory(worldObj, , xCoord); + IInventory inv = InventoryHelper.getInventory(worldObj, getPos()); if(inv == null) - inv = InventoryHelper.getInventory(worldObj, , xCoord); + inv = InventoryHelper.getInventory(worldObj, getPos()); List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); for(ItemStack reqStack : stacks) if(request != null) { - if(inv != null && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, ForgeDirection.UP)) + if(inv != null && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, EnumFacing.UP)) InventoryHelper.insertItemIntoInventory(inv, reqStack); else { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, reqStack); + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); worldObj.spawnEntityInWorld(item); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 8071ec519..366c42040 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -24,6 +24,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -44,7 +45,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { public static final double RADIUS = 2.5; @@ -151,12 +152,10 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; @Override - public void updateEntity() { - super.updateEntity(); - - double x = xCoord + 0.5; - double y = yCoord + 0.5; - double z = zCoord + 0.5; + public void update() { + double x = pos.getX() + 0.5; + double y = pos.getY() + 0.5; + double z = pos.getZ() + 0.5; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(x - RADIUS, y - RADIUS, z - RADIUS, x + RADIUS, y + RADIUS, z + RADIUS)); hasCloseby = false; @@ -197,7 +196,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.CORPOREA_INDEX; } @@ -210,13 +209,13 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ spark.onItemsRequested(stacks); for(ItemStack stack : stacks) if(stack != null) { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, stack); + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); worldObj.spawnEntityInWorld(item); } } public static boolean isInRangeOfIndex(EntityPlayer player, TileCorporeaIndex index) { - return player.worldObj.provider.dimensionId == index.worldObj.provider.dimensionId && MathHelper.pointDistancePlane(index.xCoord + 0.5, index.zCoord + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.yCoord + 0.5 - player.posY + (player.worldObj.isRemote ? 0 : 1.6)) < 5; + return player.worldObj.provider.getDimensionId() == index.worldObj.provider.getDimensionId() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.posY + (player.worldObj.isRemote ? 0 : 1.6)) < 5; } public static void addPattern(String pattern, IRegexStacker stacker) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 2ed2a2aa1..0b6b1b711 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -38,7 +38,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.CORPOREA_INTERCEPTOR; } @@ -58,13 +58,13 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor if(missing > 0 && getBlockMetadata() == 0) { worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); - worldObj.scheduleBlockUpdate(xCoord, yCoord, zCoord, getBlockType(), 2); + worldObj.scheduleUpdate(getPos(), getBlockType(), 2); TileEntity requestor = (TileEntity) source.getSparkInventory(); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileCorporeaRetainer) - ((TileCorporeaRetainer) tile).setPendingRequest(requestor.xCoord, requestor.yCoord, requestor.zCoord, request, count); + ((TileCorporeaRetainer) tile).setPendingRequest(requestor.getPos(), request, count); } return; @@ -93,11 +93,11 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor 3, 4, 2, 5 }; - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, xCoord + dir.offsetX + 1, yCoord + dir.offsetY + 1, zCoord + dir.offsetZ + 1)); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { - int orientation = frame.hangingDirection; - if(orientationToDir[orientation] == dir.ordinal()) + EnumFacing orientation = frame.facingDirection; + if(orientation == dir) filter.add(frame.getDisplayedItem()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 1e4f7b187..d10cbe68c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.corporea; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -34,21 +35,19 @@ public class TileCorporeaRetainer extends TileMod { private static final int REQUEST_STRING = 2; boolean pendingRequest = false; - int requestX, requestY, requestZ; + BlockPos requestPos; Object request; int requestCount; - public void setPendingRequest(int x, int y, int z, Object request, int requestCount) { + public void setPendingRequest(BlockPos pos, Object request, int requestCount) { if(pendingRequest) return; - requestX = x; - requestY = y; - requestZ = z; + requestPos = pos; this.request = request; this.requestCount = requestCount; pendingRequest = true; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } public boolean hasPendingRequest() { @@ -59,14 +58,14 @@ public class TileCorporeaRetainer extends TileMod { if(!hasPendingRequest()) return; - ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, , requestX); + ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestPos); if(spark != null) { IInventory inv = spark.getSparkInventory(); if(inv != null && inv instanceof ICorporeaRequestor) { ICorporeaRequestor requestor = (ICorporeaRequestor) inv; requestor.doCorporeaRequest(request, requestCount, spark); pendingRequest = false; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } } } @@ -76,9 +75,9 @@ public class TileCorporeaRetainer extends TileMod { super.writeCustomNBT(cmp); cmp.setBoolean(TAG_PENDING_REQUEST, pendingRequest); - cmp.setInteger(TAG_REQUEST_X, requestX); - cmp.setInteger(TAG_REQUEST_Y, requestY); - cmp.setInteger(TAG_REQUEST_Z, requestZ); + cmp.setInteger(TAG_REQUEST_X, requestPos.getX()); + cmp.setInteger(TAG_REQUEST_Y, requestPos.getY()); + cmp.setInteger(TAG_REQUEST_Z, requestPos.getZ()); int reqType = REQUEST_NULL; if(request != null) @@ -104,9 +103,10 @@ public class TileCorporeaRetainer extends TileMod { super.readCustomNBT(cmp); pendingRequest = cmp.getBoolean(TAG_PENDING_REQUEST); - requestX = cmp.getInteger(TAG_REQUEST_X); - requestY = cmp.getInteger(TAG_REQUEST_Y); - requestZ = cmp.getInteger(TAG_REQUEST_Z); + int x = cmp.getInteger(TAG_REQUEST_X); + int y = cmp.getInteger(TAG_REQUEST_Y); + int z = cmp.getInteger(TAG_REQUEST_Z); + requestPos = new BlockPos(x, y, z); int reqType = cmp.getInteger(TAG_REQUEST_TYPE); switch (reqType) { 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 12139ab14..f2ef30355 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 @@ -10,16 +10,19 @@ */ package vazkii.botania.common.block.tile.mana; +import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; -public class TileBellows extends TileMod { +public class TileBellows extends TileMod implements IUpdatePlayerListBox { private static final String TAG_ACTIVE = "active"; @@ -33,7 +36,7 @@ public class TileBellows extends TileMod { } @Override - public void updateEntity() { + public void update() { boolean disable = true; TileEntity tile = getLinkedTile(); if(!active && tile instanceof TilePool) { @@ -53,39 +56,41 @@ public class TileBellows extends TileMod { if(movePos < max && active && moving >= 0F) { if(moving == 0F) - worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "botania:bellows", 0.1F, 3F); + worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "botania:bellows", 0.1F, 3F); if(tile instanceof TileEntityFurnace) { TileEntityFurnace furnace = (TileEntityFurnace) tile; if(SubTileExoflame.canFurnaceSmelt(furnace)) { - furnace.furnaceCookTime = Math.min(199, furnace.furnaceCookTime + 20); - furnace.furnaceBurnTime = Math.max(0, furnace.furnaceBurnTime - 10); + furnace.setField(2, Math.min(199, furnace.getField(2) + 20)); // cookTime + furnace.setField(0, Math.max(0, furnace.getField(0) - 10)); // burnTime } if(furnace.getBlockType() == Blocks.lit_furnace) { // Copypasta from BlockFurnace - int x = furnace.xCoord; - int y = furnace.yCoord; - int z = furnace.zCoord; - int l = worldObj.getBlockMetadata(x, y, z); - float f = x + 0.5F; - float f1 = y + 0.0F + worldObj.rand.nextFloat() * 6.0F / 16.0F; - float f2 = z + 0.5F; - float f3 = 0.52F; - float f4 = worldObj.rand.nextFloat() * 0.6F - 0.3F; + EnumFacing enumfacing = (EnumFacing)worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); + double d0 = (double)pos.getX() + 0.5D; + double d1 = (double)pos.getY() + worldObj.rand.nextDouble() * 6.0D / 16.0D; + double d2 = (double)pos.getZ() + 0.5D; + double d3 = 0.52D; + double d4 = worldObj.rand.nextDouble() * 0.6D - 0.3D; - if(l == 4) { - worldObj.spawnParticle("smoke", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle("flame", f - f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - } else if(l == 5) { - worldObj.spawnParticle("smoke", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle("flame", f + f3, f1, f2 + f4, 0.0D, 0.0D, 0.0D); - } else if(l == 2) { - worldObj.spawnParticle("smoke", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle("flame", f + f4, f1, f2 - f3, 0.0D, 0.0D, 0.0D); - } else if(l == 3) { - worldObj.spawnParticle("smoke", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle("flame", f + f4, f1, f2 + f3, 0.0D, 0.0D, 0.0D); + switch (enumfacing) + { + case WEST: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + break; + case EAST: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + break; + case NORTH: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); + break; + case SOUTH: + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); } } } @@ -107,13 +112,12 @@ public class TileBellows extends TileMod { } } - super.updateEntity(); } public TileEntity getLinkedTile() { int meta = getBlockMetadata(); - ForgeDirection dir = ForgeDirection.getOrientation(meta); - return worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + EnumFacing dir = EnumFacing.getFront(meta); // todo 1.8 states + return worldObj.getTileEntity(getPos().offset(dir)); } @Override @@ -131,7 +135,7 @@ public class TileBellows extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 81f726eb3..fab39e870 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -13,23 +13,24 @@ package vazkii.botania.common.block.tile.mana; import java.util.ArrayList; import java.util.List; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibMisc; -public class TileDistributor extends TileMod implements IManaReceiver { +public class TileDistributor extends TileMod implements IManaReceiver, IUpdatePlayerListBox { List validPools = new ArrayList(); @Override - public void updateEntity() { + public void update() { validPools.clear(); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tileAt = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); if(tileAt != null && tileAt instanceof IManaPool) { IManaReceiver receiver = (IManaReceiver) tileAt; if(!receiver.isFull()) @@ -56,7 +57,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { for(IManaReceiver pool : validPools) { pool.recieveMana(manaForEach); TileEntity tile = (TileEntity) pool; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , tile.xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.getPos()); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index ac9cd95f9..c8e3163c9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -10,25 +10,26 @@ */ package vazkii.botania.common.block.tile.mana; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod implements IManaCollisionGhost { +public class TileManaDetector extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote) { int meta = getBlockMetadata(); - int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)).size() != 0 ? 1 : 0; + int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))).size() != 0 ? 1 : 0; if(meta != expectedMeta) worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, expectedMeta, 1 | 2); if(expectedMeta == 1) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(getWorld(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index a0574202a..55921d510 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -16,11 +16,6 @@ import vazkii.botania.common.block.tile.TileMod; public class TileManaVoid extends TileMod implements IClientManaHandler { - @Override - public boolean canUpdate() { - return false; - } - @Override public int getCurrentMana() { return 0; @@ -35,7 +30,7 @@ public class TileManaVoid extends TileMod implements IClientManaHandler { public void recieveMana(int mana) { if(mana > 0) for(int i = 0; i < 10; i++) - Botania.proxy.sparkleFX(getWorld(), xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } @Override 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 7c70f02e1..6ce9eeeb1 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 @@ -25,10 +25,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -58,7 +59,7 @@ import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { +public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, IUpdatePlayerListBox { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; @@ -99,7 +100,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public boolean isFull() { - Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); + Block blockBelow = worldObj.getBlockState(pos.down()).getBlock(); return blockBelow != ModBlocks.manaVoid && getCurrentMana() >= manaCap; } @@ -109,7 +110,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc this.mana = Math.max(0, Math.min(getCurrentMana() + mana, manaCap)); if(full == mana < 0) { - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDispatchable(); } } @@ -141,7 +142,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - if(item.age > 100 && item.age < 130 || !catalystsRegistered) + if(item.getAge() > 100 && item.getAge() < 130 || !catalystsRegistered) return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { @@ -156,7 +157,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); outputItem.age = 105; worldObj.spawnEntityInWorld(outputItem); } @@ -174,7 +175,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void craftingFanciness() { if(soundTicks == 0) { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:manaPoolCraft", 0.4F, 4F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:manaPoolCraft", 0.4F, 4F); soundTicks = 6; } @@ -182,12 +183,12 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + 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); } } @Override - public void updateEntity() { + public void update() { boolean wasDoingTransfer = isDoingTransfer; isDoingTransfer = false; if(manaCap == -1) @@ -203,7 +204,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; Color color = new Color(0x00C6FF); if(Math.random() > particleChance) - Botania.proxy.wispFX(worldObj, xCoord + 0.3 + Math.random() * 0.5, yCoord + 0.6 + Math.random() * 0.25, zCoord + Math.random(), color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); } if(sendPacket && ticks % 10 == 0) { @@ -211,11 +212,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc sendPacket = false; } - alchemy = worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.alchemyCatalyst; - conjuration = worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.conjurationCatalyst; + alchemy = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.alchemyCatalyst; + conjuration = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.conjurationCatalyst; catalystsRegistered = true; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); for(EntityItem item : items) { if(item.isDead) continue; @@ -228,8 +229,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int bellowCount = 0; if(outputting) - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileBellows && ((TileBellows) tile).getLinkedTile() == this) bellowCount++; } @@ -324,7 +325,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } if(!worldObj.isRemote) { @@ -332,7 +333,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, nbttagcompound)); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSoundAtEntity(player, "botania:ding", 0.11F, 1F); @@ -361,8 +362,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ItemManaTablet.setStackCreative(tablet); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, tablet, x - 20, y); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, pool, x + 26, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(tablet, x - 20, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(pool, x + 26, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_LIGHTING); @@ -406,7 +407,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1))); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 974315976..c95ac821a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.entity.Entity; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; @@ -60,22 +61,22 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.PRISM; } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + public int[] getSlotsForFace(EnumFacing p_94128_1_) { return new int[] { 0 }; } @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { return p_102007_2_.getItem() instanceof ILens; } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index dd7cec640..f1714046a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -11,11 +11,12 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod { +public class TilePump extends TileMod implements IUpdatePlayerListBox { private static final String TAG_ACTIVE = "active"; @@ -30,10 +31,10 @@ public class TilePump extends TileMod { int lastComparator = 0; @Override - public void updateEntity() { + public void update() { hasRedstone = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { hasRedstone = true; break; @@ -72,10 +73,8 @@ public class TilePump extends TileMod { hasCartOnTop = false; if(comparator != lastComparator) - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); lastComparator = comparator; - - super.updateEntity(); } @Override @@ -93,7 +92,7 @@ public class TilePump extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 78e7399e2..a6eb3e27b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -11,16 +11,21 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; import net.minecraftforge.fml.common.Optional; +import java.util.EnumMap; +import java.util.Map; + @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { +public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, IUpdatePlayerListBox { private static final int CONVERSION_RATE = 10; private static final int MAX_MANA = 1280 * CONVERSION_RATE; @@ -30,7 +35,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo int mana = 0; // Thanks to skyboy for help with this cuz I'm a noob with RF - private IEnergyReceiver[] receiverCache; + private EnumMap receiverCache; private boolean deadCache; @Override @@ -43,8 +48,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo @Override @Optional.Method(modid = "CoFHAPI|energy") - public void updateEntity() { - super.updateEntity(); + public void update() { if(!worldObj.isRemote) { if(deadCache) reCache(); @@ -58,14 +62,14 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo @Optional.Method(modid = "CoFHAPI|energy") protected final int transmitEnergy(int energy) { if(receiverCache != null) - for(int i = receiverCache.length; i-- > 0;) { - IEnergyReceiver tile = receiverCache[i]; + for(Map.Entry e : receiverCache.entrySet()) { + // todo 1.8 this iteration was in explicit reverse order. was there a reason? + IEnergyReceiver tile = e.getValue(); if(tile == null) continue; - ForgeDirection from = ForgeDirection.VALID_DIRECTIONS[i]; - if(tile.receiveEnergy(from, energy, true) > 0) - energy -= tile.receiveEnergy(from, energy, false); + if(tile.receiveEnergy(e.getKey(), energy, true) > 0) + energy -= tile.receiveEnergy(e.getKey(), energy, false); if(energy <= 0) return 0; @@ -77,39 +81,39 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo @Optional.Method(modid = "CoFHAPI|energy") private void reCache() { if(deadCache) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) - onNeighborTileChange(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); + for(EnumFacing dir : EnumFacing.VALUES) + onNeighborTileChange(pos.offset(dir)); deadCache = false; } } @Optional.Method(modid = "CoFHAPI|energy") - public void onNeighborTileChange(int x, int y, int z) { - TileEntity tile = worldObj.getTileEntity(x, y, z); + public void onNeighborTileChange(BlockPos pos) { + TileEntity tile = worldObj.getTileEntity(pos); - if(x < xCoord) - addCache(tile, 5); - else if(x > xCoord) - addCache(tile, 4); - else if(z < zCoord) - addCache(tile, 3); - else if(z > zCoord) - addCache(tile, 2); - else if(y < yCoord) - addCache(tile, 1); - else if(y > yCoord) - addCache(tile, 0); + if(pos.getX() < getPos().getX()) + addCache(tile, EnumFacing.EAST); + else if(pos.getX() > getPos().getX()) + addCache(tile, EnumFacing.WEST); + else if(pos.getZ() < getPos().getZ()) + addCache(tile, EnumFacing.SOUTH); + else if(pos.getZ() > getPos().getZ()) + addCache(tile, EnumFacing.NORTH); + else if(pos.getY() < getPos().getY()) + addCache(tile, EnumFacing.UP); + else if(pos.getY() > getPos().getY()) + addCache(tile, EnumFacing.DOWN); } @Optional.Method(modid = "CoFHAPI|energy") - private void addCache(TileEntity tile, int side) { + private void addCache(TileEntity tile, EnumFacing side) { if(receiverCache != null) - receiverCache[side] = null; + receiverCache.remove(side); - if(tile instanceof IEnergyReceiver && ((IEnergyReceiver)tile).canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[side])) { + if(tile instanceof IEnergyReceiver && ((IEnergyReceiver)tile).canConnectEnergy(side)) { if(receiverCache == null) - receiverCache = new IEnergyReceiver[6]; - receiverCache[side] = (IEnergyReceiver)tile; + receiverCache = new EnumMap(EnumFacing.class); + receiverCache.put(side, (IEnergyReceiver)tile); } } @@ -144,7 +148,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public boolean canConnectEnergy(ForgeDirection from) { + public boolean canConnectEnergy(EnumFacing from) { return true; } 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 3bacff3c8..c3d46d4d3 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 @@ -23,11 +23,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -57,7 +57,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; import vazkii.botania.common.lib.LibBlockNames; -public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable { +public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, IUpdatePlayerListBox { private static final int MAX_MANA = 1000; private static final int ULTRA_MAX_MANA = 6400; @@ -162,7 +162,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void updateEntity() { + public void update() { boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(this); boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { @@ -172,8 +172,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean redstone = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tileAt = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); + for(EnumFacing dir : EnumFacing.VALUES) { + TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); if(tileAt instanceof IManaPool) { IManaPool pool = (IManaPool) tileAt; if(wasInNetwork && (pool != receiver || isRedstone())) { @@ -190,7 +190,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } } - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) redstone = true; } @@ -243,7 +243,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiverLastTick != receiver && !worldObj.isRemote) { requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } redstoneLastTick = redstone; @@ -274,9 +274,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, cmp.setString(TAG_INPUT_KEY, inputKey); cmp.setString(TAG_OUTPUT_KEY, outputKey); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_X, receiver == null ? 0 : ((TileEntity) receiver).xCoord); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Y, receiver == null ? -1 : ((TileEntity) receiver).yCoord); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Z, receiver == null ? 0 : ((TileEntity) receiver).zCoord); + cmp.setInteger(TAG_FORCE_CLIENT_BINDING_X, receiver == null ? 0 : ((TileEntity) receiver).getPos().getX()); + cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Y, receiver == null ? -1 : ((TileEntity) receiver).getPos().getY()); + cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Z, receiver == null ? 0 : ((TileEntity) receiver).getPos().getZ()); cmp.setBoolean(TAG_MAPMAKER_OVERRIDE, mapmakerOverride); cmp.setInteger(TAG_FORCED_COLOR, mmForcedColor); @@ -336,7 +336,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int y = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Y); int z = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Z); if(y != -1) { - TileEntity tile = worldObj.getTileEntity(x, y, z); + TileEntity tile = worldObj.getTileEntity(new BlockPos(x, y, z)); if(tile instanceof IManaReceiver) receiver = (IManaReceiver) tile; else receiver = null; @@ -367,17 +367,17 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, nbttagcompound)); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); } else { MovingObjectPosition pos = raytraceFromEntity(worldObj, player, true, 5); if(pos != null && pos.hitVec != null && !worldObj.isRemote) { - double x = pos.hitVec.xCoord - xCoord - 0.5; - double y = pos.hitVec.yCoord - yCoord - 0.5; - double z = pos.hitVec.zCoord - zCoord - 0.5; + double x = pos.hitVec.xCoord - getPos().getX() - 0.5; + double y = pos.hitVec.yCoord - getPos().getY() - 0.5; + double z = pos.hitVec.zCoord - getPos().getZ() - 0.5; - if(pos.sideHit != 0 && pos.sideHit != 1) { + if(pos.sideHit != EnumFacing.DOWN && pos.sideHit != EnumFacing.UP) { Vector3 clickVector = new Vector3(x, 0, z); Vector3 relative = new Vector3(-0.5, 0, 0); double angle = Math.acos(clickVector.dotProduct(relative) / (relative.mag() * clickVector.mag())) * 180D / Math.PI; @@ -392,7 +392,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, checkForReceiver(); requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, getPos()); } } } @@ -424,7 +424,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, worldObj.spawnEntityInWorld(burst); burst.ping(); if(!ConfigHandler.silentSpreaders) - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:spreaderFire", 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:spreaderFire", 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); } } } @@ -531,7 +531,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (player instanceof EntityPlayerMP) d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); Vec3 vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); - return world.func_147447_a(vec3, vec31, par3, !par3, par3); + return world.rayTraceBlocks(vec3, vec31, par3, !par3, par3); } public void renderHUD(Minecraft mc, ScaledResolution res) { @@ -550,7 +550,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, mc.fontRendererObj.drawStringWithShadow(lensName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, lens, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(lens, x, y); RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_BLEND); @@ -558,7 +558,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiver != null) { TileEntity receiverTile = (TileEntity) receiver; - ItemStack recieverStack = new ItemStack(worldObj.getBlock(receiverTile.xCoord, receiverTile.yCoord, receiverTile.zCoord), 1, receiverTile.getBlockMetadata()); + ItemStack recieverStack = new ItemStack(worldObj.getBlockState(receiverTile.getPos()).getBlock(), 1, receiverTile.getBlockMetadata()); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(recieverStack != null && recieverStack.getItem() != null) { @@ -569,7 +569,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(recieverStack, x, y); RenderHelper.disableStandardItemLighting(); } @@ -599,7 +599,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.SPREADER; } @@ -616,7 +616,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void markDirty() { checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } @Override @@ -625,7 +625,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return null; TileEntity tile = (TileEntity) receiver; - return new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord); + return tile.getPos(); } @Override @@ -651,11 +651,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { Vector3 thisVec = Vector3.fromTileEntityCenter(this); - Vector3 blockVec = new Vector3(x + 0.5, y + 0.5, z + 0.5); + Vector3 blockVec = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - AxisAlignedBB axis = player.worldObj.getBlock(x, y, z).getCollisionBoundingBoxFromPool(player.worldObj, x, y, z); + AxisAlignedBB axis = player.worldObj.getBlockState(pos).getBlock().getCollisionBoundingBox(player.worldObj, pos, player.worldObj.getBlockState(pos)); if(axis == null) - axis = new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); + axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); if(!blockVec.isInside(axis)) blockVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 1386c51ad..d086a2b77 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -15,16 +15,17 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod { +public class TileTurntable extends TileMod implements IUpdatePlayerListBox { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; @@ -33,17 +34,17 @@ public class TileTurntable extends TileMod { boolean backwards = false; @Override - public void updateEntity() { + public void update() { boolean redstone = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) redstone = true; } if(!redstone) { - TileEntity tile = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); + TileEntity tile = worldObj.getTileEntity(pos.up()); if(tile instanceof TileSpreader) { TileSpreader spreader = (TileSpreader) tile; spreader.rotationX += speed * (backwards ? -1 : 1); @@ -73,7 +74,7 @@ public class TileTurntable extends TileMod { if(player.isSneaking()) backwards = !backwards; else speed = speed == 6 ? 1 : speed + 1; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public void renderHUD(Minecraft mc, ScaledResolution res) { 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 3ce227292..4da1bf098 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 @@ -12,43 +12,39 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; -public abstract class TileRedString extends TileMod implements ITileBound { +public abstract class TileRedString extends TileMod implements ITileBound, IUpdatePlayerListBox { private BlockPos binding; @Override - public void updateEntity() { - ForgeDirection dir = getOrientation(); - int x = xCoord; - int y = yCoord; - int z = zCoord; + public void update() { + EnumFacing dir = getOrientation(); + BlockPos pos_ = getPos(); int range = getRange(); BlockPos currBinding = getBinding(); setBinding(null); for(int i = 0; i < range; i++) { - x += dir.offsetX; - y += dir.offsetY; - z += dir.offsetZ; - if(worldObj.isAirBlock(x, y, z)) + pos_ = pos_.offset(dir); + if(worldObj.isAirBlock(pos_)) continue; - TileEntity tile = worldObj.getTileEntity(x, y, z); + TileEntity tile = worldObj.getTileEntity(pos_); if(tile instanceof TileRedString) continue; - if(acceptBlock(x, y, z)) { - setBinding(new BlockPos(x, y, z)); - if(currBinding == null || currBinding.posX != x || currBinding.posY != y || currBinding.posZ != z) - onBound(x, y, z); + if(acceptBlock(pos_)) { + setBinding(new BlockPos(pos_)); + if(currBinding == null || !currBinding.equals(pos_)) + onBound(pos_); break; } } @@ -58,9 +54,9 @@ public abstract class TileRedString extends TileMod implements ITileBound { return 8; } - public abstract boolean acceptBlock(int x, int y, int z); + public abstract boolean acceptBlock(BlockPos pos); - public void onBound(int x, int y, int z) { + public void onBound(BlockPos pos) { // NO-OP } @@ -78,18 +74,18 @@ public abstract class TileRedString extends TileMod implements ITileBound { this.binding = binding; } - public ForgeDirection getOrientation() { - return ForgeDirection.getOrientation(getBlockMetadata()); + public EnumFacing getOrientation() { + return EnumFacing.getFront(getBlockMetadata()); // todo 1.8 states? } public TileEntity getTileAtBinding() { BlockPos binding = getBinding(); - return binding == null ? null : worldObj.getTileEntity(binding.posX, binding.posY, binding.posZ); + return binding == null ? null : worldObj.getTileEntity(binding); } public Block getBlockAtBinding() { BlockPos binding = getBinding(); - return binding == null ? Blocks.air : worldObj.getBlock(binding.posX, binding.posY, binding.posZ); + return binding == null ? Blocks.air : worldObj.getBlockState(binding).getBlock(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index d545a340e..e3b787ddd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -12,28 +12,26 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.util.BlockPos; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; @Override - public void updateEntity() { - super.updateEntity(); - + public void update() { BlockPos binding = getBinding(); - ForgeDirection dir = getOrientation(); + EnumFacing dir = getOrientation(); Block block = getBlockAtBinding(); int origVal = comparatorValue; if(block.hasComparatorInputOverride()) { - int val = block.getComparatorInputOverride(worldObj, binding.posX, binding.posY, binding.posZ, dir.getOpposite().ordinal()); + int val = block.getComparatorInputOverride(worldObj, binding); comparatorValue = val; } else comparatorValue = 0; if(origVal != comparatorValue) - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } public int getComparatorValue() { @@ -41,8 +39,8 @@ public class TileRedStringComparator extends TileRedString { } @Override - public boolean acceptBlock(int x, int y, int z) { - Block block = worldObj.getBlock(x, y, z); + public boolean acceptBlock(BlockPos pos) { + Block block = worldObj.getBlockState(pos).getBlock(); return block.hasComparatorInputOverride(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index d05269770..3e3a5434e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -15,14 +15,18 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IChatComponent; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lib.LibBlockNames; public class TileRedStringContainer extends TileRedString implements ISidedInventory { @Override - public boolean acceptBlock(int x, int y, int z) { - TileEntity inv = worldObj.getTileEntity(x, y, z); + public boolean acceptBlock(BlockPos pos) { + TileEntity inv = worldObj.getTileEntity(pos); return inv != null && inv instanceof IInventory; } @@ -58,15 +62,21 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven } @Override - public String getInventoryName() { + public String getCommandSenderName() { IInventory inv = getInventory(); - return inv != null ? inv.getInventoryName() : LibBlockNames.RED_STRING_CONTAINER; + return inv != null ? inv.getCommandSenderName() : LibBlockNames.RED_STRING_CONTAINER; } @Override - public boolean hasCustomInventoryName() { + public boolean hasCustomName() { IInventory inv = getInventory(); - return inv != null ? inv.hasCustomInventoryName() : false; + return inv != null ? inv.hasCustomName() : false; + } + + @Override + public IChatComponent getDisplayName() { + IInventory inv = getInventory(); + return inv != null ? inv.getDisplayName() : new ChatComponentText(getCommandSenderName()); } @Override @@ -82,17 +92,17 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven } @Override - public void openInventory() { + public void openInventory(EntityPlayer player) { IInventory inv = getInventory(); if(inv != null) - inv.openInventory(); + inv.openInventory(player); } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { IInventory inv = getInventory(); if(inv != null) - inv.closeInventory(); + inv.closeInventory(player); } @Override @@ -102,19 +112,39 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven } @Override - public int[] getAccessibleSlotsFromSide(int side) { - IInventory inv = getInventory(); - return inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(side) : inv instanceof IInventory ? InventoryHelper.buildSlotsForLinearInventory(inv) : new int[0]; + public int getField(int id) { + return 0; } @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { + public void setField(int id, int value) { + + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + + } + + @Override + public int[] getSlotsForFace(EnumFacing side) { + IInventory inv = getInventory(); + return inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : inv instanceof IInventory ? InventoryHelper.buildSlotsForLinearInventory(inv) : new int[0]; + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { IInventory inv = getInventory(); return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canInsertItem(slot, stack, side) : true; } @Override - public boolean canExtractItem(int slot, ItemStack stack, int side) { + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { IInventory inv = getInventory(); return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canExtractItem(slot, stack, side) : true; } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index acd9219b0..a1adc3249 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -17,17 +17,17 @@ import net.minecraft.util.BlockPos; public class TileRedStringDispenser extends TileRedStringContainer { @Override - public boolean acceptBlock(int x, int y, int z) { - TileEntity tile = worldObj.getTileEntity(x, y, z); + public boolean acceptBlock(BlockPos pos) { + TileEntity tile = worldObj.getTileEntity(pos); return tile != null && tile instanceof TileEntityDispenser; } public void tickDispenser() { BlockPos bind = getBinding(); if(bind != null) { - TileEntity tile = worldObj.getTileEntity(bind.posX, bind.posY, bind.posZ); + TileEntity tile = worldObj.getTileEntity(bind); if(tile instanceof TileEntityDispenser) - worldObj.scheduleBlockUpdate(bind.posX, bind.posY, bind.posZ, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); + worldObj.scheduleUpdate(bind, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 88d7b2760..a18c5712b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -40,8 +40,8 @@ public class TileRedStringFertilizer extends TileRedString { } @Override - public boolean acceptBlock(int x, int y, int z) { - return worldObj.getBlock(x, y, z) instanceof IGrowable; + public boolean acceptBlock(BlockPos pos) { + return worldObj.getBlockState(pos).getBlock() instanceof IGrowable; } } 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 3c4ea41d0..509367d0f 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 @@ -15,31 +15,30 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -public class TileRedStringInterceptor extends TileRedString { +public class TileRedStringInterceptor extends TileRedString implements IUpdatePlayerListBox { public static List interceptors = new ArrayList(); @Override - public void updateEntity() { - super.updateEntity(); - + public void update() { if(!interceptors.contains(this)) interceptors.add(this); } @Override - public boolean acceptBlock(int x, int y, int z) { - return worldObj.getTileEntity(x, y, z) != null; + public boolean acceptBlock(BlockPos pos) { + return worldObj.getTileEntity(pos) != null; } public boolean removeFromList() { - return !tileEntityInvalid && worldObj.getTileEntity(xCoord, yCoord, zCoord) == this; + return !tileEntityInvalid && worldObj.getTileEntity(pos) == this; } - public static void onInteract(EntityPlayer player, World world, int x, int y, int z) { + public static void onInteract(EntityPlayer player, World world, BlockPos pos) { List remove = new ArrayList(); boolean did = false; @@ -51,12 +50,12 @@ public class TileRedStringInterceptor extends TileRedString { if(inter.worldObj == world) { BlockPos coords = inter.getBinding(); - if(coords != null && coords.posX == x && coords.posY == y && coords.posZ == z) { + if(coords != null && coords.equals(pos)) { if(!world.isRemote) { Block block = inter.getBlockType(); int meta = inter.getBlockMetadata(); world.setBlockMetadataWithNotify(inter.xCoord, inter.yCoord, inter.zCoord, meta | 8, 1 | 2); - world.scheduleBlockUpdate(inter.xCoord, inter.yCoord, inter.zCoord, block, block.tickRate(world)); + world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); } did = true; @@ -68,7 +67,7 @@ public class TileRedStringInterceptor extends TileRedString { if(did) { if(world.isRemote) player.swingItem(); - else world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.click", 0.3F, 0.6F); + else world.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "random.click", 0.3F, 0.6F); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index 825deabf7..cd1889174 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -15,17 +15,18 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockMushroom; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import vazkii.botania.api.subtile.ISubTileContainer; public class TileRedStringRelay extends TileRedString { @Override - public boolean acceptBlock(int x, int y, int z) { - if(x == xCoord && y == yCoord + 1 && z == zCoord) + public boolean acceptBlock(BlockPos pos) { + if(pos.equals(getPos().up())) return false; - Block block = worldObj.getBlock(x, y, z); - TileEntity tile = worldObj.getTileEntity(x, y, z); + Block block = worldObj.getBlockState(pos).getBlock(); + TileEntity tile = worldObj.getTileEntity(pos); return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof ISubTileContainer)); } From b72be67dd7074cffe1b55f4ef60d895f6fcfc3fd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Nov 2015 23:56:18 -0600 Subject: [PATCH 037/935] Smaller TE's in the root package. several of the bigger ones left --- .../botania/common/block/BlockEnderEye.java | 2 +- .../common/block/tile/TileBifrost.java | 9 +-- .../botania/common/block/tile/TileCamo.java | 9 +-- .../botania/common/block/tile/TileCell.java | 49 +++++++--------- .../botania/common/block/tile/TileCocoon.java | 13 +++-- .../common/block/tile/TileCraftCrate.java | 6 +- .../common/block/tile/TileEnderEye.java | 9 +-- .../common/block/tile/TileFakeAir.java | 5 -- .../common/block/tile/TileFloatingFlower.java | 5 -- .../common/block/tile/TileForestEye.java | 9 +-- .../common/block/tile/TileManaBeacon.java | 10 ++-- .../common/block/tile/TileManaFlame.java | 11 ++-- .../botania/common/block/tile/TileMod.java | 4 +- .../common/block/tile/TileOpenCrate.java | 19 ++++--- .../common/block/tile/TilePlatform.java | 13 ++--- .../botania/common/block/tile/TilePylon.java | 34 +++++------ .../common/block/tile/TileRuneAltar.java | 37 ++++++------ .../common/block/tile/TileSparkChanger.java | 10 ++-- .../common/block/tile/TileSpawnerClaw.java | 9 +-- .../common/block/tile/TileSpecialFlower.java | 33 +++-------- .../common/block/tile/TileSpiritShrine.java | 11 ++-- .../common/block/tile/TileStarfield.java | 11 ++-- .../common/block/tile/TileTerraPlate.java | 57 ++++++++++--------- .../common/block/tile/TileTeruTeruBozu.java | 8 ++- .../common/block/tile/TileTinyPlanet.java | 7 ++- .../common/block/tile/TileTinyPotato.java | 7 ++- 26 files changed, 192 insertions(+), 205 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index a6ea1e901..fa2e53bcf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -35,7 +35,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWER, 0)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWER, 0)); // todo 1.8 this is probably powered (bool). see the TE } @Override 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 acefc2ffd..f3bdbb9a2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,22 +11,23 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.common.Botania; -public class TileBifrost extends TileMod { +public class TileBifrost extends TileMod implements IUpdatePlayerListBox { private static final String TAG_TICKS = "ticks"; public int ticks = 0; @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote) { if(ticks <= 0) { - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.setBlockToAir(pos); } else ticks--; } else if(Math.random() < 0.1) - Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } @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 e96e0e375..50826c644 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -24,15 +24,10 @@ public class TileCamo extends TileMod { public Block camo; public int camoMeta; - @Override - public boolean canUpdate() { - return false; - } - @Override public void writeCustomNBT(NBTTagCompound cmp) { if(camo != null) { - cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camo)); + cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camo).toString()); cmp.setInteger(TAG_CAMO_META, camoMeta); } } @@ -46,6 +41,6 @@ public class TileCamo extends TileMod { @Override public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) { super.onDataPacket(manager, packet); - worldObj.markBlockRangeForRenderUpdate(xCoord,yCoord,zCoord,xCoord,yCoord,zCoord); + worldObj.markBlockRangeForRenderUpdate(pos, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 5f5e6d88e..955cc0958 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -27,26 +27,17 @@ public class TileCell extends TileMod { private int generation; private boolean ticked; - private BlockPos flowerCoords = new BlockPos(); - private BlockPos validCoords = new BlockPos(); - - @Override - public boolean canUpdate() { - return false; - } + private BlockPos flowerCoords = new BlockPos(0, -1, 0); + private BlockPos validCoords = new BlockPos(0, -1, 0); public void setGeneration(TileEntity flower, int gen) { generation = gen; if(!ticked) { - flowerCoords.posX = flower.xCoord; - flowerCoords.posY = flower.yCoord; - flowerCoords.posZ = flower.zCoord; - validCoords.posX = xCoord; - validCoords.posY = yCoord; - validCoords.posZ = zCoord; + flowerCoords = flower.getPos(); + validCoords = this.getPos(); ticked = true; } else if(!matchCoords(validCoords, this) || !matchCoords(flowerCoords, flower)) - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.setBlockToAir(pos); } public boolean isSameFlower(TileEntity flower) { @@ -54,7 +45,7 @@ public class TileCell extends TileMod { } private boolean matchCoords(BlockPos coords, TileEntity tile) { - return coords.posX == tile.xCoord && coords.posY == tile.yCoord && coords.posZ == tile.zCoord; + return coords.equals(tile.getPos()); } public int getGeneration() { @@ -66,12 +57,12 @@ public class TileCell extends TileMod { cmp.setInteger(TAG_GENERATION, generation); cmp.setBoolean(TAG_TICKED, ticked); if(ticked) { - cmp.setInteger(TAG_FLOWER_X, flowerCoords.posX); - cmp.setInteger(TAG_FLOWER_Y, flowerCoords.posY); - cmp.setInteger(TAG_FLOWER_Z, flowerCoords.posZ); - cmp.setInteger(TAG_VALID_X, validCoords.posX); - cmp.setInteger(TAG_VALID_Y, validCoords.posY); - cmp.setInteger(TAG_VALID_Z, validCoords.posZ); + cmp.setInteger(TAG_FLOWER_X, flowerCoords.getX()); + cmp.setInteger(TAG_FLOWER_Y, flowerCoords.getY()); + cmp.setInteger(TAG_FLOWER_Z, flowerCoords.getZ()); + cmp.setInteger(TAG_VALID_X, validCoords.getX()); + cmp.setInteger(TAG_VALID_Y, validCoords.getY()); + cmp.setInteger(TAG_VALID_Z, validCoords.getZ()); } } @@ -80,12 +71,16 @@ public class TileCell extends TileMod { generation = cmp.getInteger(TAG_GENERATION); ticked = cmp.getBoolean(TAG_TICKED); if(ticked) { - flowerCoords.posX = cmp.getInteger(TAG_FLOWER_X); - flowerCoords.posY = cmp.getInteger(TAG_FLOWER_Y); - flowerCoords.posZ = cmp.getInteger(TAG_FLOWER_Z); - validCoords.posX = cmp.getInteger(TAG_VALID_X); - validCoords.posY = cmp.getInteger(TAG_VALID_Y); - validCoords.posZ = cmp.getInteger(TAG_VALID_Z); + flowerCoords = new BlockPos( + cmp.getInteger(TAG_FLOWER_X), + cmp.getInteger(TAG_FLOWER_Y), + cmp.getInteger(TAG_FLOWER_Z) + ); + validCoords = new BlockPos( + cmp.getInteger(TAG_VALID_X), + cmp.getInteger(TAG_VALID_Y), + cmp.getInteger(TAG_VALID_Z) + ); } } 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 6f34dafff..e7c4907fe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,9 +22,10 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraftforge.fml.common.registry.VillagerRegistry; -public class TileCocoon extends TileMod { +public class TileCocoon extends TileMod implements IUpdatePlayerListBox { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; @@ -36,7 +37,7 @@ public class TileCocoon extends TileMod { public int emeraldsGiven; @Override - public void updateEntity() { + public void update() { timePassed++; if(timePassed >= TOTAL_TIME) hatch(); @@ -44,8 +45,8 @@ public class TileCocoon extends TileMod { public void hatch() { if(!worldObj.isRemote) { - worldObj.playAuxSFX(2001, xCoord, yCoord, zCoord, Block.getIdFromBlock(getBlockType())); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.playAuxSFX(2001, pos, Block.getIdFromBlock(getBlockType())); + worldObj.setBlockToAir(pos); EntityAgeable entity = null; @@ -53,7 +54,7 @@ public class TileCocoon extends TileMod { if(Math.random() < villagerChance) { EntityVillager villager = new EntityVillager(worldObj); - VillagerRegistry.applyRandomTrade(villager, worldObj.rand); + // todo 1.8 village registry incomplete. VillagerRegistry.applyRandomTrade(villager, worldObj.rand); entity = villager; } else { float specialChance = 0.05F; @@ -92,7 +93,7 @@ public class TileCocoon extends TileMod { } if(entity != null) { - entity.setPosition(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + entity.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); entity.setGrowingAge(-24000); worldObj.spawnEntityInWorld(entity); entity.spawnExplosionParticle(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 225ec081a..b5e9a7e1f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -91,7 +91,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote && (craft(true) && canEject() || isFull())) ejectAll(); @@ -102,7 +102,7 @@ public class TileCraftCrate extends TileOpenCrate { if(newSignal != signal) { signal = newSignal; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } } @@ -197,7 +197,7 @@ public class TileCraftCrate extends TileOpenCrate { int lastPattern = pattern; super.onDataPacket(manager, packet); if(pattern != lastPattern) - worldObj.markBlockRangeForRenderUpdate(xCoord,yCoord,zCoord,xCoord,yCoord,zCoord); + worldObj.markBlockRangeForRenderUpdate(pos, pos); } } 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 064df7eb1..89997321e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -16,20 +16,21 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.common.item.equipment.tool.ToolCommons; -public class TileEnderEye extends TileMod { +public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { @Override - public void updateEntity() { + public void update() { if(worldObj.isRemote) return; int meta = getBlockMetadata(); int range = 80; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); boolean looking = false; for(EntityPlayer player : players) { @@ -38,7 +39,7 @@ public class TileEnderEye extends TileMod { continue; MovingObjectPosition pos = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); - if(pos != null && pos.blockX == xCoord && pos.blockY == yCoord && pos.blockZ == zCoord) { + if(pos != null && pos.getBlockPos().equals(getPos())) { looking = true; break; } 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 cc82c9619..0e1441cd6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -22,11 +22,6 @@ public class TileFakeAir extends TileMod { int flowerX, flowerY, flowerZ; - @Override - public boolean canUpdate() { - return false; - } - public void setFlower(TileEntity tile) { flowerX = tile.xCoord; flowerY = tile.yCoord; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 8811ba542..45e95e508 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -32,11 +32,6 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { return new ItemStack(ModBlocks.flower, 1, getBlockMetadata()); } - @Override - public boolean canUpdate() { - return false; - } - @Override public IslandType getIslandType() { return type; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 184e3a86e..b5346daf0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,19 +11,20 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; -public class TileForestEye extends TileMod { +public class TileForestEye extends TileMod implements IUpdatePlayerListBox { public int entities = 0; @Override - public void updateEntity() { + public void update() { int range = 6; - int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + range + 1, yCoord + range + 1, zCoord + range + 1)).size(); + int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { entities = entityCount; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index d4d0936d8..087a5dd22 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -11,16 +11,18 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.common.Botania; -public class TileManaBeacon extends TileMod { +public class TileManaBeacon extends TileMod implements IUpdatePlayerListBox { @Override - public void updateEntity() { + public void update() { boolean redstone = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) redstone = true; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index a1815d3ba..68a571370 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,10 +11,11 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -public class TileManaFlame extends TileMod { +public class TileManaFlame extends TileMod implements IUpdatePlayerListBox { private static final String TAG_COLOR = "color"; @@ -31,7 +32,7 @@ public class TileManaFlame extends TileMod { } @Override - public void updateEntity() { + public void update() { float c = 0.3F; if(Math.random() < c) { @@ -43,9 +44,9 @@ public class TileManaFlame extends TileMod { float w = 0.15F; float h = 0.05F; - double x = xCoord + 0.5 + (Math.random() - 0.5) * w; - double y = yCoord + 0.25 + (Math.random() - 0.5) * h; - double z = zCoord + 0.5 + (Math.random() - 0.5) * w; + double x = pos.getX() + 0.5 + (Math.random() - 0.5) * w; + double y = pos.getY() + 0.25 + (Math.random() - 0.5) * h; + double z = pos.getZ() + 0.5 + (Math.random() - 0.5) * w; float s = 0.2F + (float) Math.random() * 0.1F; float m = 0.03F + (float) Math.random() * 0.015F; 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 b1deaf483..752394c91 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -44,13 +44,13 @@ public class TileMod extends TileEntity { public Packet getDescriptionPacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeCustomNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, nbttagcompound); + return new S35PacketUpdateTileEntity(pos, -999, nbttagcompound); } @Override public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { super.onDataPacket(net, packet); - readCustomNBT(packet.func_148857_g()); + readCustomNBT(packet.getNbtCompound()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 33f12dc65..b863555cb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -14,10 +14,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.EnumFacing; import vazkii.botania.common.lib.LibBlockNames; -public class TileOpenCrate extends TileSimpleInventory { +public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerListBox { @Override public int getSizeInventory() { @@ -25,15 +26,15 @@ public class TileOpenCrate extends TileSimpleInventory { } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.OPEN_CRATE; } @Override - public void updateEntity() { + public void update() { boolean redstone = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { redstone = true; break; @@ -48,12 +49,12 @@ public class TileOpenCrate extends TileSimpleInventory { } public boolean canEject() { - Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); - return blockBelow.isAir(worldObj, xCoord, yCoord - 1, zCoord) || blockBelow.getCollisionBoundingBoxFromPool(worldObj, xCoord, yCoord - 1, zCoord) == null; + Block blockBelow = worldObj.getBlockState(pos.down()).getBlock(); + return blockBelow.isAir(worldObj, pos.down()) || blockBelow.getCollisionBoundingBox(worldObj, pos.down(), worldObj.getBlockState(pos.down())) == null; } public void eject(ItemStack stack, boolean redstone) { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord - 0.5, zCoord + 0.5, stack); + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() - 0.5, pos.getZ() + 0.5, stack); item.motionX = 0; item.motionY = 0; item.motionZ = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index 416ca3eb2..b3a9059dc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -12,7 +12,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.mana.IManaCollisionGhost; public class TilePlatform extends TileCamo implements IManaCollisionGhost { @@ -39,11 +40,9 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost { } void swapSurroudings(TilePlatform tile, boolean empty) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int x = tile.xCoord + dir.offsetX; - int y = tile.yCoord + dir.offsetY; - int z = tile.zCoord + dir.offsetZ; - TileEntity tileAt = worldObj.getTileEntity(x, y, z); + for(EnumFacing dir : EnumFacing.VALUES) { + BlockPos pos = tile.getPos().offset(dir); + TileEntity tileAt = worldObj.getTileEntity(pos); if(tileAt != null && tileAt instanceof TilePlatform) { TilePlatform platform = (TilePlatform) tileAt; if(empty ? platform.camo != null : platform.camo == null) @@ -55,7 +54,7 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost { void swap(TilePlatform tile, boolean empty) { tile.camo = empty ? null : camo; tile.camoMeta = empty ? 0 : camoMeta; - worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); + worldObj.markBlockForUpdate(tile.getPos()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index a3b89b029..54626d2b6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -14,56 +14,58 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -public class TilePylon extends TileEntity { +public class TilePylon extends TileEntity implements IUpdatePlayerListBox { boolean activated = false; - int centerX, centerY, centerZ; + BlockPos centerPos; int ticks = 0; @Override - public void updateEntity() { + public void update() { ++ticks; int meta = getBlockMetadata(); if(activated && worldObj.isRemote) { - if(worldObj.getBlock(centerX, centerY, centerZ) != getBlockForMeta() || meta != 0 && worldObj.getBlockMetadata(centerX, centerY, centerZ) == 0) { + if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || meta != 0 && worldObj.getBlockMetadata(centerX, centerY, centerZ) == 0) { activated = false; return; } - Vector3 centerBlock = new Vector3(centerX + 0.5, centerY + 0.75 + (Math.random() - 0.5 * 0.25), centerZ + 0.5); + Vector3 centerBlock = new Vector3(centerPos.getX() + 0.5, centerPos.getY() + 0.75 + (Math.random() - 0.5 * 0.25), centerPos.getZ() + 0.5); if(meta == 1) { if(ConfigHandler.elfPortalParticlesEnabled) { double worldTime = ticks; - worldTime += new Random(xCoord ^ yCoord ^ zCoord).nextInt(1000); + worldTime += new Random(pos.hashCode()).nextInt(1000); worldTime /= 5; float r = 0.75F + (float) Math.random() * 0.05F; - double x = xCoord + 0.5 + Math.cos(worldTime) * r; - double z = zCoord + 0.5 + Math.sin(worldTime) * r; + double x = pos.getX() + 0.5 + Math.cos(worldTime) * r; + double z = pos.getZ() + 0.5 + Math.sin(worldTime) * r; - Vector3 ourCoords = new Vector3(x, yCoord + 0.25, z); + Vector3 ourCoords = new Vector3(x, pos.getY() + 0.25, z); centerBlock.sub(new Vector3(0, 0.5, 0)); Vector3 movementVector = centerBlock.sub(ourCoords).normalize().multiply(0.2); - Botania.proxy.wispFX(worldObj, x, yCoord + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); + Botania.proxy.wispFX(worldObj, x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); if(worldObj.rand.nextInt(3) == 0) - Botania.proxy.wispFX(worldObj, x, yCoord + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(worldObj, x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } else { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); Vector3 movementVector = centerBlock.sub(ourCoords).normalize().multiply(0.2); - Block block = worldObj.getBlock(xCoord, yCoord - 1, zCoord); + Block block = worldObj.getBlockState(pos.down()); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { int fmeta = worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord); float[] color = EntitySheep.fleeceColorTable[fmeta]; @@ -71,15 +73,15 @@ public class TilePylon extends TileEntity { if(worldObj.rand.nextInt(4) == 0) Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, color[0], color[1], color[2], (float) Math.random(), 8); - Botania.proxy.wispFX(worldObj, xCoord + 0.5 + (Math.random() - 0.5) * 0.25, yCoord - 0.5, zCoord + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 3F, -0.04F); - Botania.proxy.wispFX(worldObj, xCoord + 0.5 + (Math.random() - 0.5) * 0.125, yCoord + 1.5, zCoord + 0.5 + (Math.random() - 0.5) * 0.125, color[0], color[1], color[2], (float) Math.random() / 5F, -0.001F); - Botania.proxy.wispFX(worldObj, xCoord + 0.5 + (Math.random() - 0.5) * 0.25, yCoord + 1.5, zCoord + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 3F, -0.04F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, color[0], color[1], color[2], (float) Math.random() / 5F, -0.001F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } } if(worldObj.rand.nextBoolean() && worldObj.isRemote) - Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random() * 1.5, zCoord + Math.random(), meta == 2 ? 1F : 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2); + Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), meta == 2 ? 1F : 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 471a8eea8..17f9eddc5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -21,7 +21,9 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; @@ -33,7 +35,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -69,20 +71,19 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(did) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); return true; } @Override - public void updateEntity() { - super.updateEntity(); + public void update() { // Update every tick. recieveMana(0); if(!worldObj.isRemote && manaToGet == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { ItemStack stack = item.getEntityItem(); @@ -102,7 +103,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(cooldown > 0) { cooldown--; - Botania.proxy.wispFX(getWorld(), xCoord + Math.random(), yCoord + 0.8, zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); + Botania.proxy.wispFX(getWorld(), pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); } int newSignal = 0; @@ -114,7 +115,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(newSignal != signal) { signal = newSignal; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } if(recipeKeepTicks > 0) @@ -135,8 +136,8 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(manaToGet != this.manaToGet) { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:runeAltarStart", 1F, 1F); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:runeAltarStart", 1F, 1F); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } @@ -154,7 +155,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public void trySetLastRecipe(EntityPlayer player) { TileAltar.tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public boolean hasValidRecipe() { @@ -178,7 +179,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(manaToGet > 0 && mana >= manaToGet && !worldObj.isRemote) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); EntityItem livingrock = null; for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() == Item.getItemFromBlock(ModBlocks.livingrock)) { @@ -191,7 +192,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor recieveMana(-mana); if(!worldObj.isRemote) { ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); worldObj.spawnEntityInWorld(outputItem); cooldown = 60; } @@ -215,12 +216,12 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void craftingFanciness() { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:runeAltarCraft", 1F, 1F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:runeAltarCraft", 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + 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); } } @@ -259,7 +260,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.RUNE_ALTAR; } @@ -269,7 +270,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public int[] getAccessibleSlotsFromSide(int var1) { + public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) if(getStackInSlot(i) != null) @@ -279,12 +280,12 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { + public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { return true; } @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { + public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { return mana == 0; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 8b37e9c67..bc162d464 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -32,8 +32,8 @@ public class TileSparkChanger extends TileSimpleInventory { ItemStack changeStack = getStackInSlot(0); List attachables = new ArrayList(); - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; ISparkEntity spark = attach.getAttachedSpark(); @@ -57,7 +57,7 @@ public class TileSparkChanger extends TileSimpleInventory { if(transfers != null) transfers.clear(); setInventorySlotContents(0, sparkStack); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDirty(); } } @@ -84,7 +84,7 @@ public class TileSparkChanger extends TileSimpleInventory { } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.SPARK_CHANGER; } 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 76ec16a4f..887896a4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; @@ -26,18 +27,18 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -public class TileSpawnerClaw extends TileMod implements IManaReceiver { +public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePlayerListBox { private static final String TAG_MANA = "mana"; int mana = 0; @Override - public void updateEntity() { - TileEntity tileBelow = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + public void update() { + TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; - MobSpawnerBaseLogic logic = spawner.func_145881_a(); + MobSpawnerBaseLogic logic = spawner.getSpawnerBaseLogic(); if(!logic.isActivated()) { if(!worldObj.isRemote) 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 53c65e0d0..c272cff6d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -21,11 +21,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -35,7 +35,7 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer, IUpdatePlayerListBox { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; @@ -72,22 +72,16 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void updateEntity() { + public void update() { if(subTile != null) { - TileEntity tileBelow = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); if(coords != null) { - int currX = xCoord; - int currY = yCoord; - int currZ = zCoord; - xCoord = coords.posX; - yCoord = coords.posY; - zCoord = coords.posZ; + BlockPos currPos = pos; + setPos(coords); subTile.onUpdate(); - xCoord = currX; - yCoord = currY; - zCoord = currZ; + setPos(currPos); return; } @@ -108,12 +102,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } public boolean isOnSpecialSoil() { - return worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.enchantedSoil; - } - - @Override - public boolean canUpdate() { - return subTile == null || subTile.canUpdate(); + return worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil; } @Override @@ -142,10 +131,6 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil subTile.readFromPacketNBTInternal(subCmp); } - public IIcon getIcon() { - return subTile == null ? Blocks.red_flower.getIcon(0, 0) : subTile.getIcon(); - } - public LexiconEntry getEntry() { return subTile == null ? null : subTile.getEntry(); } @@ -218,7 +203,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return subTile.getComparatorInputOverride(); } - public int getPowerLevel(int side) { + public int getPowerLevel(EnumFacing side) { if(subTile == null) return 0; return subTile.getPowerLevel(side); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 1925fad26..e401e7454 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,14 +10,15 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod { +public class TileSpiritShrine extends TileMod implements IUpdatePlayerListBox { int ticks; @Override - public void updateEntity() { + public void update() { if(worldObj.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { @@ -43,9 +44,9 @@ public class TileSpiritShrine extends TileMod { double g = Math.sin(wticks * Math.PI / 180 * 0.55); for(int i = 0; i < totalSpiritCount; i++) { - double x = xCoord + Math.sin(wticks * Math.PI / 180) * r + 0.5; - double y = yCoord + (ticks > existTicks ? 40 - (double) (ticks - existTicks) : Math.min(80 + 40 * i, ticks) - 40 * (i + 1)) * 0.1; - double z = zCoord + Math.cos(wticks * Math.PI / 180) * r + 0.5; + double x = pos.getX() + Math.sin(wticks * Math.PI / 180) * r + 0.5; + double y = pos.getY() + (ticks > existTicks ? 40 - (double) (ticks - existTicks) : Math.min(80 + 40 * i, ticks) - 40 * (i + 1)) * 0.1; + double z = pos.getZ() + Math.cos(wticks * Math.PI / 180) * r + 0.5; wticks += tickIncrement; float[] colorsfx = colors[i >= colors.length ? 0 : i]; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 06eeaa350..ba2ba1ae3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.common.Botania; -public class TileStarfield extends TileMod { +public class TileStarfield extends TileMod implements IUpdatePlayerListBox { @Override - public void updateEntity() { + public void update() { int meta = getBlockMetadata(); if(!worldObj.isRemote) { int newMeta = worldObj.isDaytime() ? 0 : 1; @@ -29,9 +30,9 @@ public class TileStarfield extends TileMod { double radius = 512; int iter = 2; for(int i = 0; i < iter; i++) { - double x = xCoord + 0.5 + (Math.random() - 0.5) * radius; - double y = yCoord + 256; - double z = zCoord + 0.5 + (Math.random() - 0.5) * radius; + double x = pos.getX() + 0.5 + (Math.random() - 0.5) * radius; + double y = pos.getY() + 256; + double z = pos.getZ() + 0.5 + (Math.random() - 0.5) * radius; float w = 0.6F; float c = 1F - w; 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 d13fa5c49..98c3ec3b3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -18,7 +18,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -31,15 +33,19 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -public class TileTerraPlate extends TileMod implements ISparkAttachable { +public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { public static final int MAX_MANA = TilePool.MAX_MANA / 2; - private static final int[][] LAPIS_BLOCKS = { - { 1, 0, }, { -1, 0 }, { 0, 1 }, { 0, -1 } + + private static final BlockPos[] LAPIS_BLOCKS = { + new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), + new BlockPos(0, 0, 1), new BlockPos(0, 0, -1) }; - private static final int[][] LIVINGROCK_BLOCKS = { - { 0, 0 }, { 1, 1 }, { 1, -1 }, { -1, 1 }, { -1, -1 } + private static final BlockPos[] LIVINGROCK_BLOCKS = { + new BlockPos(0, 0, 0), new BlockPos(1, 0, 1), + new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), + new BlockPos(-1, 0, -1) }; private static final String TAG_MANA = "mana"; @@ -49,19 +55,19 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); - for(int[] l : LAPIS_BLOCKS) - mb.addComponent(, l[0], Blocks.lapis_block, 0); - for(int[] l : LIVINGROCK_BLOCKS) - mb.addComponent(, l[0], ModBlocks.livingrock, 0); + for(BlockPos relativePos : LAPIS_BLOCKS) + mb.addComponent(relativePos, Blocks.lapis_block, 0); + for(BlockPos relativePos : LIVINGROCK_BLOCKS) + mb.addComponent(relativePos, ModBlocks.livingrock, 0); - mb.addComponent(, 0, ModBlocks.terraPlate, 0); + mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.terraPlate, 0); mb.setRenderOffset(0, 1, 0); return mb.makeSet(); } @Override - public void updateEntity() { + public void update() { boolean removeMana = true; if(hasValidPlatform()) { @@ -70,7 +76,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { removeMana = false; ISparkEntity spark = getAttachedSpark(); if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); for(ISparkEntity otherSpark : sparkEntities) { if(spark == otherSpark) continue; @@ -90,8 +96,8 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4)); item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); mana = 0; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } } @@ -114,9 +120,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { double g = Math.sin(wticks * Math.PI / 180 * 0.55); for(int i = 0; i < totalSpiritCount; i++) { - double x = xCoord + Math.sin(wticks * Math.PI / 180) * r + 0.5; - double y = yCoord + 0.25 + Math.abs(r) * 0.7; - double z = zCoord + Math.cos(wticks * Math.PI / 180) * r + 0.5; + double x = pos.getX() + Math.sin(wticks * Math.PI / 180) * r + 0.5; + double y = pos.getY() + 0.25 + Math.abs(r) * 0.7; + double z = pos.getZ() + Math.cos(wticks * Math.PI / 180) * r + 0.5; wticks += tickIncrement; float[] colorsfx = new float[] { @@ -127,13 +133,13 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { if(ticks == 100) for(int j = 0; j < 15; j++) - Botania.proxy.wispFX(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); } } } List getItems() { - return worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + return worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); } boolean areItemsValid(List items) { @@ -165,10 +171,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { return checkAll(LAPIS_BLOCKS, Blocks.lapis_block) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); } - boolean checkAll(int[][] positions, Block block) { - for (int[] position : positions) { - int[] positions_ = position; - if(!checkPlatform(positions_[0], positions_[1], block)) + boolean checkAll(BlockPos[] relPositions, Block block) { + for (BlockPos position : relPositions) { + if(!checkPlatform(position.getX(), position.getZ(), block)) return false; } @@ -176,7 +181,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } boolean checkPlatform(int xOff, int zOff, Block block) { - return worldObj.getBlock(xCoord + xOff, yCoord - 1, zOff + zCoord) == block; + return worldObj.getBlockState(pos.add(xOff, -1, zOff)).getBlock() == block; } @Override @@ -202,7 +207,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public void recieveMana(int mana) { this.mana = Math.max(0, Math.min(MAX_MANA, this.mana + mana)); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } @Override @@ -222,7 +227,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1))); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 21e8fd2d0..95b41c283 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,18 +10,20 @@ */ package vazkii.botania.common.block.tile; -public class TileTeruTeruBozu extends TileMod { +import net.minecraft.server.gui.IUpdatePlayerListBox; + +public class TileTeruTeruBozu extends TileMod implements IUpdatePlayerListBox { public boolean wasRaining = false; @Override - public void updateEntity() { + public void update() { boolean isRaining = worldObj.isRaining(); if(isRaining && worldObj.rand.nextInt(9600) == 0) worldObj.getWorldInfo().setRaining(false); if(wasRaining != isRaining) - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); wasRaining = isRaining; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index c7c14bc8b..3c5f1c78c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,14 +10,15 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.server.gui.IUpdatePlayerListBox; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { @Override - public void updateEntity() { - ItemTinyPlanet.applyEffect(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + public void update() { + ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index bc3f60e32..bf398f2a6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,9 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; -public class TileTinyPotato extends TileMod { +public class TileTinyPotato extends TileMod implements IUpdatePlayerListBox { private static final String TAG_NAME = "name"; @@ -25,7 +26,7 @@ public class TileTinyPotato extends TileMod { jump(); if(name.equalsIgnoreCase("shia labeouf") && !worldObj.isRemote && nextDoIt == 0) { nextDoIt = 40; - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:doit", 1F, 1F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:doit", 1F, 1F); } } @@ -35,7 +36,7 @@ public class TileTinyPotato extends TileMod { } @Override - public void updateEntity() { + public void update() { if(worldObj.rand.nextInt(100) == 0) jump(); From 605e38337a0944760af7e226faf6834f0eb9cc61 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 Nov 2015 00:49:57 -0600 Subject: [PATCH 038/935] Rest of root package TE --- .../common/block/tile/TileAlfPortal.java | 17 ++- .../botania/common/block/tile/TileAltar.java | 53 +++++---- .../botania/common/block/tile/TileAvatar.java | 20 ++-- .../common/block/tile/TileBrewery.java | 39 +++--- .../common/block/tile/TileEnchanter.java | 111 +++++++++--------- .../common/block/tile/TileFakeAir.java | 23 ++-- .../common/block/tile/TileHourglass.java | 14 +-- .../common/block/tile/TileIncensePlate.java | 28 +++-- .../common/block/tile/TileLightRelay.java | 109 ++++++++--------- .../botania/common/block/tile/TilePylon.java | 2 +- 10 files changed, 207 insertions(+), 209 deletions(-) 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 78efa497c..28453ebb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -18,6 +18,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; @@ -37,7 +38,7 @@ import vazkii.botania.common.lexicon.LexiconData; import com.google.common.base.Function; -public class TileAlfPortal extends TileMod { +public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { private static final int[][] LIVINGWOOD_POSITIONS = { { -1, 0, 0}, { 1, 0, 0}, { -2, 1, 0}, { 2, 1, 0}, { -2, 3, 0}, { 2, 3, 0}, { -1, 4, 0}, { 1, 4, 0} @@ -112,7 +113,7 @@ public class TileAlfPortal extends TileMod { } @Override - public void updateEntity() { + public void update() { int meta = getBlockMetadata(); if(meta == 0) { ticksOpen = 0; @@ -178,7 +179,7 @@ public class TileAlfPortal extends TileMod { pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; - Botania.proxy.wispFX(getWorld(), xCoord + pos[0], yCoord + pos[1], zCoord + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); + Botania.proxy.wispFX(getWorld(), getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); } public boolean onWanded() { @@ -195,9 +196,9 @@ public class TileAlfPortal extends TileMod { } AxisAlignedBB getPortalAABB() { - AxisAlignedBB aabb = new AxisAlignedBB(xCoord - 1, yCoord + 1, zCoord, xCoord + 2, yCoord + 4, zCoord + 1); + AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); if(getBlockMetadata() == 2) - aabb = new AxisAlignedBB(xCoord, yCoord + 1, zCoord - 1, xCoord + 1, yCoord + 4, zCoord + 2); + aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); return aabb; } @@ -232,7 +233,7 @@ public class TileAlfPortal extends TileMod { } void spawnItem(ItemStack stack) { - EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, stack); + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); item.getEntityData().setBoolean(TAG_PORTAL_FLAG, true); worldObj.spawnEntityInWorld(item); ticksSinceLastItem = 0; @@ -322,9 +323,7 @@ public class TileAlfPortal extends TileMod { if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; - pylon.centerX = xCoord; - pylon.centerY = yCoord; - pylon.centerZ = zCoord; + pylon.centerPos = getPos(); } tile = worldObj.getTileEntity(xCoord + pos[0], yCoord + pos[1] - 1, zCoord + pos[2]); 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 e2c2a5961..37bb3328a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -25,7 +25,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; @@ -34,7 +37,7 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary { +public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary, IUpdatePlayerListBox { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); @@ -58,23 +61,23 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I if(!isMossy && getBlockMetadata() == 0) { if(stack.getItem() == Item.getItemFromBlock(Blocks.vine) && !worldObj.isRemote) { isMossy = true; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); stack.stackSize--; if(stack.stackSize == 0) item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } if(!hasWater() && !hasLava()) { if(stack.getItem() == Items.water_bucket && !worldObj.isRemote) { setWater(true); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - stack.func_150996_a(Items.bucket); // Set item + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + stack.setItem(Items.bucket); } else if(stack.getItem() == Items.lava_bucket && !worldObj.isRemote) { setLava(true); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - stack.func_150996_a(Items.bucket); // Set item + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + stack.setItem(Items.bucket); } else return false; } @@ -118,11 +121,11 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I item.setDead(); ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); worldObj.spawnEntityInWorld(outputItem); setWater(false); - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } craftingFanciness(); @@ -150,7 +153,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public void trySetLastRecipe(EntityPlayer player) { tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public static void tryToSetLastRecipe(EntityPlayer player, IInventory inv, List lastRecipe) { @@ -191,12 +194,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } public void craftingFanciness() { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:altarCraft", 1F, 1F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:altarCraft", 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + 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); } } @@ -209,8 +212,8 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } @Override - public void updateEntity() { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord + 1D / 16D * 20D, zCoord, xCoord + 1, yCoord + 1D / 16D * 21D, zCoord + 1)); + public void update() { + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 21D,1))); boolean didChange = false; @@ -218,7 +221,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I didChange = collideEntityItem(item) || didChange; if(didChange) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stackAt = getStackInSlot(i); @@ -231,16 +234,16 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I float green = color.getGreen() / 255F; float blue = color.getBlue() / 255F; if(Math.random() >= 0.75F) - worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "game.neutral.swim.splash", 0.1F, 10F); - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "game.neutral.swim.splash", 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); } } if(hasLava()) { isMossy = false; - worldObj.spawnParticle("smoke", xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); if(Math.random() > 0.9) - worldObj.spawnParticle("lava", xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); + worldObj.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); } if(recipeKeepTicks > 0) @@ -267,7 +270,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.ALTAR; } @@ -287,29 +290,29 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } @Override - public int[] getAccessibleSlotsFromSide(int var1) { + public int[] getSlotsForFace(EnumFacing var1) { return new int[0]; } @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { + public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { return false; } @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { + public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { return false; } @Override public void setWater(boolean water) { hasWater = water; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public void setLava(boolean lava) { hasLava = lava; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 1e0e62b28..5f0241589 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,12 +13,13 @@ package vazkii.botania.common.block.tile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, IUpdatePlayerListBox { private static final int MAX_MANA = 6400; @@ -31,12 +32,11 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid int mana; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { enabled = true; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = worldObj.getIndirectPowerLevelTo(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { enabled = false; break; @@ -85,22 +85,22 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + public int[] getSlotsForFace(EnumFacing p_94128_1_) { return new int[0]; } @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { return false; } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { return false; } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.AVATAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 37e358206..99cbfcc33 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -20,7 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; @@ -32,7 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { private static final String TAG_MANA = "mana"; @@ -64,11 +66,11 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { this.recipe = recipe; - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); + worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 1, 1 | 2); } } @@ -76,14 +78,13 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public void updateEntity() { - super.updateEntity(); + public void update() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this)) { this.recipe = recipe; - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); + worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 1, 1 | 2); } if(recipe == null) @@ -94,7 +95,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, recieveMana(0); if(!worldObj.isRemote && recipe == null) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1)); for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null) { ItemStack stack = item.getEntityItem(); @@ -106,7 +107,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe != null) { if(!recipe.matches(this)) { recipe = null; - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2); + worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 0, 1 | 2); } if(recipe != null) { @@ -116,9 +117,9 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; for(int i = 0; i < 5; i++) { - Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); } } @@ -127,7 +128,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, recieveMana(-mana); if(!worldObj.isRemote) { ItemStack output = recipe.getOutput(getStackInSlot(0)); - EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); worldObj.spawnEntityInWorld(outputItem); } @@ -145,7 +146,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(newSignal != signal) { signal = newSignal; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } manaLastTick = mana; @@ -160,15 +161,15 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } public void craftingFanciness() { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); for(int i = 0; i < 25; i++) { Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); + 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, r, g, b, (float) Math.random() * 2F + 0.5F, 10); for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); } } @@ -197,7 +198,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.RUNE_ALTAR; } @@ -207,7 +208,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public int[] getAccessibleSlotsFromSide(int var1) { + public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) if(getStackInSlot(i) != null) @@ -217,12 +218,12 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { + public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { return true; } @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { + public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { return mana == 0; } 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 882b49a99..3dae572ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -25,6 +25,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -42,7 +43,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileEnchanter extends TileMod implements ISparkAttachable { +public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; @@ -63,37 +64,37 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { public ItemStack itemToEnchant = null; List enchants = new ArrayList(); - private static final int[][] OBSIDIAN_LOCATIONS = new int[][] { - { 0, -1, 0 }, - { 0, -1, 1 }, { 0, -1, -1 }, { 1, -1, 0 }, { -1, -1, 0 }, - { 0, -1, 2 }, { -1, -1, 2 }, { 1, -1, 2 }, - { 0, -1, -2 }, { -1, -1, -2 }, { 1, -1, -2 }, - { 2, -1, 0 }, { 2, -1, 1 }, { 2, -1, -1 }, - { -2, -1, 0 }, { -2, -1, 1 }, { -2, -1, -1 } + private static final BlockPos[] OBSIDIAN_LOCATIONS = { + new BlockPos(0, -1, 0), + new BlockPos(0, -1, 1), new BlockPos(0, -1, -1), new BlockPos(1, -1, 0), new BlockPos(-1, -1, 0), + new BlockPos(0, -1, 2), new BlockPos(-1, -1, 2), new BlockPos(1, -1, 2), + new BlockPos(0, -1, -2), new BlockPos(-1, -1, -2), new BlockPos(1, -1, -2), + new BlockPos(2, -1, 0), new BlockPos(2, -1, 1), new BlockPos(2, -1, -1 ), + new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) }; - private static final int[][][] PYLON_LOCATIONS = new int[][][] { - { { -5, 1, 0 }, { 5, 1, 0 }, { -4, 1, 3 }, { 4, 1, 3 }, { -4, 1, -3 }, { 4, 1, -3 } }, - { { 0, 1, -5 }, { 0, 1, 5 }, { 3, 1, -4 }, { 3, 1, 4 }, { -3, 1, -4 }, { -3, 1, 4 } } + private static final BlockPos[][] PYLON_LOCATIONS = { + { new BlockPos(-5, 1, 0), new BlockPos(5, 1, 0), new BlockPos(-4, 1, 3), new BlockPos(4, 1, 3), new BlockPos(-4, 1, -3 ), new BlockPos(4, 1, -3) }, + { new BlockPos(0, 1, -5), new BlockPos(0, 1, 5), new BlockPos(3, 1, -4), new BlockPos(3, 1, 4), new BlockPos(-3, 1, -4 ), new BlockPos(-3, 1, 4) } }; - private static final int[][] FLOWER_LOCATIONS = new int[][] { - { -1, 0, -1 }, { 1, 0, -1 }, { -1, 0, 1 }, { 1, 0, 1 } + private static final BlockPos[] FLOWER_LOCATIONS = { + new BlockPos(-1, 0, -1), new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), new BlockPos(1, 0, 1) }; public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); - for(int[] o : OBSIDIAN_LOCATIONS) - mb.addComponent(, o[0], Blocks.obsidian, 0); - for(int[] p : PYLON_LOCATIONS[0]) { - mb.addComponent(, p[0], ModBlocks.pylon, 0); - mb.addComponent(new FlowerComponent(new BlockPos(p[0], p[1], p[2]), ModBlocks.flower)); + for(BlockPos o : OBSIDIAN_LOCATIONS) + mb.addComponent(o, Blocks.obsidian, 0); + for(BlockPos p : PYLON_LOCATIONS[0]) { + mb.addComponent(p, ModBlocks.pylon, 0); + mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); } - for(int[] f : FLOWER_LOCATIONS) - mb.addComponent(new FlowerComponent(new BlockPos(f[0], f[1] + 1, f[2]), ModBlocks.flower)); + for(BlockPos f : FLOWER_LOCATIONS) + mb.addComponent(new FlowerComponent(f, ModBlocks.flower)); - mb.addComponent(, 0, Blocks.lapis_block, 0); + mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block, 0); // todo 1.8 recheck return mb.makeSet(); } @@ -102,14 +103,14 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(stage != 0 || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) return; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); int count = items.size(); if(count > 0 && !worldObj.isRemote) { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); if(item.getItem() == Items.enchanted_book) { - NBTTagList enchants = Items.enchanted_book.func_92110_g(item); + NBTTagList enchants = Items.enchanted_book.getEnchantments(item); if(enchants != null && enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short id = enchant.getShort("id"); @@ -124,30 +125,30 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void updateEntity() { + public void update() { if(getBlockMetadata() < PYLON_LOCATIONS.length) - for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) { - TileEntity tile = worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2]); + for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) { + TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); if(tile != null && tile instanceof TilePylon) ((TilePylon) tile).activated = false; } - if(!canEnchanterExist(worldObj, xCoord, yCoord, zCoord, getBlockMetadata())) { + if(!canEnchanterExist(worldObj, pos, getBlockMetadata())) { - worldObj.setBlock(xCoord, yCoord, zCoord, Blocks.lapis_block, 0, 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(); float blue = (float) Math.random(); - Botania.proxy.wispFX(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:enchanterBlock", 0.5F, 10F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 10F); } switch(stage) { case 1 : { // Get books if(stageTicks % 20 == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(xCoord - 2, yCoord, zCoord - 2, xCoord + 3, yCoord + 1, zCoord + 3)); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); int count = items.size(); boolean addedEnch = false; @@ -155,14 +156,14 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); if(item.getItem() == Items.enchanted_book) { - NBTTagList enchants = Items.enchanted_book.func_92110_g(item); + NBTTagList enchants = Items.enchanted_book.getEnchantments(item); if(enchants != null && enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short enchantId = enchant.getShort("id"); short enchantLvl = enchant.getShort("lvl"); if(!hasEnchantAlready(enchantId) && isEnchantmentValid(enchantId)) { this.enchants.add(new EnchantmentData(enchantId, enchantLvl)); - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:ding", 1F, 1F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 1F, 1F); addedEnch = true; break; } @@ -180,32 +181,30 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { break; } case 2 : { // Get Mana - for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) { - TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2]); + for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) { + TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(pos.add(pylon)); if(pylonTile != null) { pylonTile.activated = true; - pylonTile.centerX = xCoord; - pylonTile.centerY = yCoord; - pylonTile.centerZ = zCoord; + pylonTile .centerPos = pos; } } if(manaRequired == -1) { manaRequired = 0; for(EnchantmentData data : enchants) { - Enchantment ench = Enchantment.enchantmentsList[data.enchant]; + Enchantment ench = Enchantment.getEnchantmentById(data.enchant); manaRequired += (int) (5000F * ((15 - Math.min(15, ench.getWeight())) * 1.05F) * ((3F + data.level * data.level) * 0.25F) * (0.9F + enchants.size() * 0.05F)); } } else if(mana >= manaRequired) { manaRequired = 0; - for(int[] pylon : PYLON_LOCATIONS[getBlockMetadata()]) - ((TilePylon) worldObj.getTileEntity(xCoord + pylon[0], yCoord + pylon[1], zCoord + pylon[2])).activated = false; + for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) + ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; advanceStage(); } else { ISparkEntity spark = getAttachedSpark(); if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); for(ISparkEntity otherSpark : sparkEntities) { if(spark == otherSpark) continue; @@ -222,7 +221,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(stageTicks >= 100) { for(EnchantmentData data : enchants) if(EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0) - itemToEnchant.addEnchantment(Enchantment.enchantmentsList[data.enchant], data.level); + itemToEnchant.addEnchantment(Enchantment.getEnchantmentById(data.enchant), data.level); enchants.clear(); manaRequired = -1; @@ -260,12 +259,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void craftingFanciness() { - worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:enchanterEnchant", 1F, 1F); + worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterEnchant", 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + 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); } } @@ -295,7 +294,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } @Override @@ -350,12 +349,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public boolean isEnchantmentValid(short id) { - Enchantment ench = Enchantment.enchantmentsList[id]; + Enchantment ench = Enchantment.getEnchantmentById(id); if(!ench.canApply(itemToEnchant) || !ench.type.canEnchantItem(itemToEnchant.getItem())) return false; for(EnchantmentData data : enchants) { - Enchantment otherEnch = Enchantment.enchantmentsList[data.enchant]; + Enchantment otherEnch = Enchantment.getEnchantmentById(data.enchant); if(!otherEnch.canApplyTogether(ench) || !ench.canApplyTogether(otherEnch)) return false; } @@ -363,17 +362,17 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return true; } - public static boolean canEnchanterExist(World world, int x, int y, int z, int meta) { - for(int[] obsidian : OBSIDIAN_LOCATIONS) - if(world.getBlock(obsidian[0] + x, obsidian[1] + y, obsidian[2] + z) != Blocks.obsidian) + public static boolean canEnchanterExist(World world, BlockPos pos, int meta) { + for(BlockPos obsidian : OBSIDIAN_LOCATIONS) + if(world.getBlockState(pos.add(obsidian)).getBlock() != Blocks.obsidian) return false; - for(int[] pylon : PYLON_LOCATIONS[meta]) - if(world.getBlock(pylon[0] + x, pylon[1] + y, pylon[2] + z) != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(, world, , pylon[0] + x)) + for(BlockPos pylon : PYLON_LOCATIONS[meta]) + if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon))) return false; - for(int[] flower : FLOWER_LOCATIONS) - if(!BotaniaAPI.internalHandler.isBotaniaFlower(, world, , flower[0] + x)) + for(BlockPos flower : FLOWER_LOCATIONS) + if(!BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(flower))) return false; return true; @@ -391,7 +390,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, pos.getY() + 2, pos.getZ() + 1)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; 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 0e1441cd6..c9dedbd36 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; public class TileFakeAir extends TileMod { @@ -20,32 +21,32 @@ public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_Y = "flowerY"; private static final String TAG_FLOWER_Z = "flowerZ"; - int flowerX, flowerY, flowerZ; + BlockPos flowerPos; public void setFlower(TileEntity tile) { - flowerX = tile.xCoord; - flowerY = tile.yCoord; - flowerZ = tile.zCoord; + flowerPos = tile.getPos(); } public boolean canStay() { - return SubTileBubbell.isValidBubbell(worldObj, flowerX, flowerY, flowerZ); + return SubTileBubbell.isValidBubbell(worldObj, flowerPos); } @Override public void writeToNBT(NBTTagCompound par1nbtTagCompound) { super.writeToNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_FLOWER_X, flowerX); - par1nbtTagCompound.setInteger(TAG_FLOWER_Y, flowerY); - par1nbtTagCompound.setInteger(TAG_FLOWER_Z, flowerZ); + par1nbtTagCompound.setInteger(TAG_FLOWER_X, flowerPos.getX()); + par1nbtTagCompound.setInteger(TAG_FLOWER_Y, flowerPos.getY()); + par1nbtTagCompound.setInteger(TAG_FLOWER_Z, flowerPos.getZ()); } @Override public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); - flowerX = par1nbtTagCompound.getInteger(TAG_FLOWER_X); - flowerY = par1nbtTagCompound.getInteger(TAG_FLOWER_Y); - flowerZ = par1nbtTagCompound.getInteger(TAG_FLOWER_Z); + flowerPos = new BlockPos( + par1nbtTagCompound.getInteger(TAG_FLOWER_X), + par1nbtTagCompound.getInteger(TAG_FLOWER_Y), + par1nbtTagCompound.getInteger(TAG_FLOWER_Z) + ); } } 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 8a0597505..72141ab66 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; @@ -27,7 +28,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileHourglass extends TileSimpleInventory { +public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerListBox { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; @@ -44,8 +45,7 @@ public class TileHourglass extends TileSimpleInventory { public boolean move = true; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { int totalTime = getTotalTime(); if(totalTime > 0) { @@ -56,7 +56,7 @@ public class TileHourglass extends TileSimpleInventory { flip = !flip; flipTicks = 4; worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); - worldObj.scheduleBlockUpdate(xCoord, yCoord, zCoord, getBlockType(), getBlockType().tickRate(worldObj)); + worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); } timeFraction = (float) time / (float) totalTime; } else { @@ -149,8 +149,8 @@ public class TileHourglass extends TileSimpleInventory { if(stack != null) { RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); - RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); + mc.getRenderItem().renderItemIntoGUI(stack, x, y); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, stack, x, y, ""); GL11.glDisable(GL12.GL_RESCALE_NORMAL); RenderHelper.disableStandardItemLighting(); @@ -170,7 +170,7 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.HOURGLASS; } 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 2d334fcbf..1205c4f59 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -19,7 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -28,7 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory { +public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, IUpdatePlayerListBox { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -40,7 +42,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven public int comparatorOutput = 0; @Override - public void updateEntity() { + public void update() { ItemStack stack = getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); @@ -48,22 +50,22 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven if(timeLeft > 0) { timeLeft--; if(!worldObj.isRemote) { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(xCoord + 0.5 - RANGE, yCoord + 0.5 - RANGE, zCoord + 0.5 - RANGE, xCoord + 0.5 + RANGE, yCoord + 0.5 + RANGE, zCoord + 0.5 + RANGE)); + 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(Potion.potionTypes[effect.getPotionID()]); boolean nightVision = effect.getPotionID() == Potion.nightVision.id; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { - PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true); + PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); } } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.1, zCoord + 0.5, "fire.fire", 0.1F, 1F); + worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.1, pos.getZ() + 0.5, "fire.fire", 0.1F, 1F); } else { - double x = xCoord + 0.5; - double y = yCoord + 0.5; - double z = zCoord + 0.5; + double x = pos.getX() + 0.5; + double y = pos.getY() + 0.5; + double z = pos.getZ() + 0.5; Color color = new Color(brew.getColor(stack)); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; @@ -85,7 +87,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven newComparator = 2; if(comparatorOutput != newComparator) { comparatorOutput = newComparator; - worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } } @@ -105,7 +107,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibBlockNames.INCENSE_PLATE; } @@ -129,17 +131,17 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } @Override - public int[] getAccessibleSlotsFromSide(int side) { + public int[] getSlotsForFace(EnumFacing side) { return new int[] { 0 }; } @Override - public boolean canInsertItem(int slot, ItemStack stack, int side) { + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { return isItemValidForSlot(slot, stack); } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 161a3b17b..68817738f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,10 +21,10 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -35,7 +35,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -public class TileLightRelay extends TileMod implements IWandBindable { +public class TileLightRelay extends TileMod implements IWandBindable, IUpdatePlayerListBox { private static final int MAX_DIST = 20; @@ -43,14 +43,14 @@ public class TileLightRelay extends TileMod implements IWandBindable { private static final String TAG_BIND_Y = "bindY"; private static final String TAG_BIND_Z = "bindZ"; - int bindX, bindY = -1, bindZ; + BlockPos bindPos = new BlockPos(0, -1, 0); int ticksElapsed = 0; public void mountEntity(Entity e) { - if(e.ridingEntity != null || worldObj.isRemote || bindY == -1 || !isValidBinding()) + if(e.ridingEntity != null || worldObj.isRemote || bindPos.getY() == -1 || !isValidBinding()) return; - EntityPlayerMover mover = new EntityPlayerMover(worldObj, xCoord, yCoord, zCoord, bindX, bindY, bindZ); + EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, bindPos); worldObj.spawnEntityInWorld(mover); e.mountEntity(mover); if(!(e instanceof EntityItem)) { @@ -61,10 +61,10 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void updateEntity() { + public void update() { ticksElapsed++; - if(bindY > -1 && isValidBinding()) { + if(bindPos.getY() > -1 && isValidBinding()) { Vector3 vec = getMovementVector(); double dist = 0.1; @@ -73,7 +73,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { int start = ticksElapsed % size; Vector3 vecMag = vec.copy().normalize().multiply(dist); - Vector3 vecTip = vecMag.copy().multiply(start).add(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + Vector3 vecTip = vecMag.copy().multiply(start).add(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); double radPer = Math.PI / 16.0; float mul = 0.5F; @@ -90,18 +90,18 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos endpoint = getEndpoint(); if(endpoint != null && !worldObj.isRemote) { float range = 0.5F; - List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, new AxisAlignedBB(xCoord - range, yCoord - range, zCoord - range, xCoord + 1 + range, yCoord + 1 + range, zCoord + 1 + range)); + List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(1 + range, 1 + range, 1 + range))); for(EntityEnderPearl pearl : enderPearls) { - pearl.posX = endpoint.posX + pearl.posX - xCoord; - pearl.posY = endpoint.posY + pearl.posY - yCoord; - pearl.posZ = endpoint.posZ + pearl.posZ - zCoord; + pearl.posX = endpoint.getX() + pearl.posX - pos.getX(); + pearl.posY = endpoint.getY() + pearl.posY - pos.getY(); + pearl.posZ = endpoint.getZ() + pearl.posZ - pos.getZ(); } } } } public boolean isValidBinding() { - Block block = worldObj.getBlock(bindX, bindY, bindZ); + Block block = worldObj.getBlockState(bindPos).getBlock(); return block == ModBlocks.lightRelay; } @@ -121,7 +121,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(coords == null) return lastCoords; - TileEntity tile = worldObj.getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = worldObj.getTileEntity(coords); if(tile != null && tile instanceof TileLightRelay) relay = (TileLightRelay) tile; else return lastCoords; @@ -133,12 +133,12 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public Vector3 getMovementVector() { - return new Vector3(bindX - xCoord, bindY - yCoord, bindZ - zCoord); + return new Vector3(bindPos.getX() - pos.getX(), bindPos.getY() - pos.getY(), bindPos.getZ() - pos.getZ()); } @Override public BlockPos getBinding() { - return bindY == -1 ? null : new BlockPos(bindX, bindY, bindZ); + return bindPos.getY() == -1 ? null : bindPos; } @Override @@ -148,27 +148,27 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(player.worldObj.getBlock(x, y, z) != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(x, y, z, xCoord, yCoord, zCoord) > MAX_DIST) + if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(pos, getPos()) > MAX_DIST) return false; - bindX = x; - bindY = y; - bindZ = z; + bindPos = pos; return true; } @Override public void readCustomNBT(NBTTagCompound cmp) { - bindX = cmp.getInteger(TAG_BIND_X); - bindY = cmp.getInteger(TAG_BIND_Y); - bindZ = cmp.getInteger(TAG_BIND_Z); + bindPos = new BlockPos( + cmp.getInteger(TAG_BIND_X), + cmp.getInteger(TAG_BIND_Y), + cmp.getInteger(TAG_BIND_Z) + ); } @Override public void writeCustomNBT(NBTTagCompound cmp) { - cmp.setInteger(TAG_BIND_X, bindX); - cmp.setInteger(TAG_BIND_Y, bindY); - cmp.setInteger(TAG_BIND_Z, bindZ); + cmp.setInteger(TAG_BIND_X, bindPos.getX()); + cmp.setInteger(TAG_BIND_Y, bindPos.getY()); + cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); } public static class EntityPlayerMover extends Entity { @@ -181,10 +181,10 @@ public class TileLightRelay extends TileMod implements IWandBindable { super(world); } - public EntityPlayerMover(World world, int x, int y, int z, int exitX, int exitY, int exitZ) { + public EntityPlayerMover(World world, BlockPos pos, BlockPos exitPos) { this(world); - setPosition(x + 0.5, y + 0.5, z + 0.5); - setExit(exitX, exitY, exitZ); + setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + setExit(exitPos); } @Override @@ -213,25 +213,21 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(!isItem && ticksExisted % 30 == 0) worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.05F, (float) Math.random() * 0.3F + 0.7F); - int exitX = getExitX(); - int exitY = getExitY(); - int exitZ = getExitZ(); + BlockPos pos = new BlockPos(this); + BlockPos exitPos = getExitPos(); - int x = net.minecraft.util.MathHelper.floor_double(posX); - int y = net.minecraft.util.MathHelper.floor_double(posY); - int z = net.minecraft.util.MathHelper.floor_double(posZ); - if(x == exitX && y == exitY && z == exitZ) { - TileEntity tile = worldObj.getTileEntity(x, y, z); + if(pos.equals(exitPos)) { + TileEntity tile = worldObj.getTileEntity(pos); if(tile != null && tile instanceof TileLightRelay) { int meta = worldObj.getBlockMetadata(x, y, z); if(meta > 0) { worldObj.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2); - worldObj.scheduleBlockUpdate(x, y, z, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); + worldObj.scheduleUpdate(pos, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } BlockPos bind = ((TileLightRelay) tile).getBinding(); if(bind != null) { - setExit(bind.posX, bind.posY, bind.posZ); + setExit(bind); return; } } @@ -240,7 +236,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { setDead(); } else { Vector3 thisVec = Vector3.fromEntity(this); - Vector3 motVec = thisVec.negate().add(exitX + 0.5, exitY + 0.5, exitZ + 0.5).normalize().multiply(0.5); + Vector3 motVec = thisVec.negate().add(exitPos.getX() + 0.5, exitPos.getY() + 0.5, exitPos.getZ() + 0.5).normalize().multiply(0.5); Color color; @@ -273,32 +269,29 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { - setExit(cmp.getInteger(TAG_EXIT_X), cmp.getInteger(TAG_EXIT_Y), cmp.getInteger(TAG_EXIT_Z)); + setExit(new BlockPos(cmp.getInteger(TAG_EXIT_X), cmp.getInteger(TAG_EXIT_Y), cmp.getInteger(TAG_EXIT_Z))); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { - cmp.setInteger(TAG_EXIT_X, getExitX()); - cmp.setInteger(TAG_EXIT_Y, getExitY()); - cmp.setInteger(TAG_EXIT_Z, getExitZ()); + BlockPos exit = getExitPos(); + cmp.setInteger(TAG_EXIT_X, exit.getX()); + cmp.setInteger(TAG_EXIT_Y, exit.getY()); + cmp.setInteger(TAG_EXIT_Z, exit.getZ()); } - public int getExitX() { - return dataWatcher.getWatchableObjectInt(20); + public BlockPos getExitPos() { + return new BlockPos( + dataWatcher.getWatchableObjectInt(20), + dataWatcher.getWatchableObjectInt(21), + dataWatcher.getWatchableObjectInt(22) + ); } - public int getExitY() { - return dataWatcher.getWatchableObjectInt(21); - } - - public int getExitZ() { - return dataWatcher.getWatchableObjectInt(22); - } - - public void setExit(int x, int y, int z) { - dataWatcher.updateObject(20, x); - dataWatcher.updateObject(21, y); - dataWatcher.updateObject(22, z); + public void setExit(BlockPos pos) { + dataWatcher.updateObject(20, pos.getX()); + dataWatcher.updateObject(21, pos.getY()); + dataWatcher.updateObject(22, pos.getZ()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 54626d2b6..d962521b4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -65,7 +65,7 @@ public class TilePylon extends TileEntity implements IUpdatePlayerListBox { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); Vector3 movementVector = centerBlock.sub(ourCoords).normalize().multiply(0.2); - Block block = worldObj.getBlockState(pos.down()); + Block block = worldObj.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { int fmeta = worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord); float[] color = EntitySheep.fleeceColorTable[fmeta]; From b4d9c3ded8a5240ad605c4455f79770de1765524 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 Nov 2015 01:10:03 -0600 Subject: [PATCH 039/935] Some of genereating flora --- .../botania/api/subtile/SubTileEntity.java | 4 --- .../common/block/subtile/SubTileDecor.java | 5 ---- .../common/block/subtile/SubTileManastar.java | 8 +++--- .../block/subtile/SubTilePureDaisy.java | 27 ++++++++++--------- .../subtile/generating/SubTileArcaneRose.java | 2 +- .../subtile/generating/SubTileDaybloom.java | 2 ++ .../subtile/generating/SubTileEndoflame.java | 6 ++--- .../generating/SubTileEntropinnyum.java | 8 +++--- .../generating/SubTileGourmaryllis.java | 6 ++--- .../generating/SubTileHydroangeas.java | 2 +- .../subtile/generating/SubTileKekimurus.java | 21 ++++++++------- .../subtile/generating/SubTileMunchdew.java | 26 ++++++++---------- .../subtile/generating/SubTileNarslimmus.java | 8 +++--- .../subtile/generating/SubTileRafflowsia.java | 13 +++++---- .../subtile/generating/SubTileSpectrolus.java | 4 +-- .../subtile/generating/SubTileThermalily.java | 4 +-- 16 files changed, 70 insertions(+), 76 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index ce1f32dfc..2c61452ba 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -55,10 +55,6 @@ public class SubTileEntity { supertile = tile; } - public boolean canUpdate() { - return true; - } - public void onUpdate() { ticksExisted++; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java index 4eb580e27..f71a6bb8e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java @@ -14,11 +14,6 @@ import vazkii.botania.api.subtile.SubTileEntity; public class SubTileDecor extends SubTileEntity { - @Override - public boolean canUpdate() { - return false; - } - public static class Daybloom extends SubTileDecor { } public static class Nightshade extends SubTileDecor { } public static class Hydroangeas extends SubTileDecor { } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 821a86c9d..d7e3597aa 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.SubTileEntity; @@ -28,15 +28,15 @@ public class SubTileManastar extends SubTileEntity { super.onUpdate(); int mana = 0; - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = supertile.getWorld().getTileEntity(supertile.getPos().offset(dir)); if(tile instanceof IManaPool) mana += ((IManaPool) tile).getCurrentMana(); } if(manaLastTick != -1 && mana != manaLastTick && Math.random() > 0.6) { boolean more = mana > manaLastTick; - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.75 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); } if(ticksExisted % 60 == 0) 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 1ffea7187..b542b71f5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -28,15 +29,15 @@ public class SubTilePureDaisy extends SubTileEntity { private static final String TAG_POSITION = "position"; private static final String TAG_TICKS_REMAINING = "ticksRemaining"; - private static final int[][] POSITIONS = new int[][] { - { -1, 0, -1 }, - { -1, 0, 0 }, - { -1, 0, 1 }, - { 0, 0, 1 }, - { 1, 0, 1 }, - { 1, 0, 0 }, - { 1, 0, -1 }, - { 0, 0, -1 }, + private static final BlockPos[] POSITIONS = { + new BlockPos(-1, 0, -1 ), + new BlockPos(-1, 0, 0 ), + new BlockPos(-1, 0, 1 ), + new BlockPos(0, 0, 1 ), + new BlockPos(1, 0, 1 ), + new BlockPos(1, 0, 0 ), + new BlockPos(1, 0, -1 ), + new BlockPos(0, 0, -1 ), }; int positionAt = 0; @@ -50,11 +51,11 @@ public class SubTilePureDaisy extends SubTileEntity { if(positionAt == POSITIONS.length) positionAt = 0; - int[] acoords = POSITIONS[positionAt]; - BlockPos coords = new BlockPos(supertile.xCoord + acoords[0], supertile.yCoord + acoords[1], supertile.zCoord + acoords[2]); + BlockPos acoords = POSITIONS[positionAt]; + BlockPos coords = supertile.getPos().add(acoords); World world = supertile.getWorld(); - if(!world.isAirBlock(coords.posX, coords.posY, coords.posZ)) { - Block block = world.getBlock(coords.posX, coords.posY, coords.posZ); + if(!world.isAirBlock(coords)) { + Block block = world.getBlockState(coords).getBlock(); int meta = world.getBlockMetadata(coords.posX, coords.posY, coords.posZ); RecipePureDaisy recipe = null; for(RecipePureDaisy recipe_ : BotaniaAPI.pureDaisyRecipes) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 351ddb4fc..c53a81af2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -31,7 +31,7 @@ public class SubTileArcaneRose extends SubTileGenerating { if(mana >= getMaxMana()) return; - List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + 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(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { ExperienceHelper.drainPlayerXP(player, 1); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index d53c11a76..b119d0463 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; @@ -31,6 +32,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { private static final String TAG_SAVED_POSITION = "savedPosition"; int primePositionX, primePositionY, primePositionZ; + BlockPos primePosition; boolean savedPosition; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 4a97648fb..f80e702d7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -42,7 +42,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(mana < getMaxMana() && !supertile.getWorld().isRemote) { boolean didSomething = false; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { if(item.age >= 59 && !item.isDead) { ItemStack stack = item.getEntityItem(); @@ -54,7 +54,7 @@ public class SubTileEndoflame extends SubTileGenerating { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; stack.stackSize--; - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:endoflame", 0.2F, 1F); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:endoflame", 0.2F, 1F); if(stack.stackSize == 0) item.setDead(); @@ -71,7 +71,7 @@ public class SubTileEndoflame extends SubTileGenerating { } } else { if(supertile.getWorld().rand.nextInt(8) == 0) - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); burnTime--; } 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 3185b9c1b..11895e3a9 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 @@ -14,6 +14,8 @@ import java.util.List; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -30,9 +32,9 @@ public class SubTileEntropinnyum extends SubTileGenerating { super.onUpdate(); if(mana == 0) { - List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityTNTPrimed tnt : tnts) { - if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorld().getBlock(MathHelper.floor_double(tnt.posX), MathHelper.floor_double(tnt.posY), MathHelper.floor_double(tnt.posZ)).getMaterial().isLiquid()) { + if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getBlock().getMaterial().isLiquid()) { if(!supertile.getWorld().isRemote) { tnt.setDead(); mana += getMaxMana(); @@ -43,7 +45,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { for(int i = 0; i < 50; i++) Botania.proxy.sparkleFX(tnt.worldObj, tnt.posX + Math.random() * 4 - 2, tnt.posY + Math.random() * 4 - 2, tnt.posZ + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); - supertile.getWorld().spawnParticle("hugeexplosion", tnt.posX, tnt.posY, tnt.posZ, 1D, 0D, 0D); + supertile.getWorld().spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, tnt.posX, tnt.posY, tnt.posZ, 1D, 0D, 0D); return; } } 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 4ad1ccaa3..dfae13460 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 @@ -43,15 +43,15 @@ public class SubTileGourmaryllis extends SubTileGenerating { } if(!supertile.getWorld().isRemote) { - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { if(cooldown == 0) { - int val = ((ItemFood) stack.getItem()).func_150905_g(stack); + int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; cooldown = val * 10; - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); sync(); } 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 b4a482370..a2c76125c 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 @@ -199,7 +199,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } 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 13fde0474..777bb8ced 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 @@ -12,6 +12,8 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockCake; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; @@ -31,18 +33,17 @@ public class SubTileKekimurus extends SubTileGenerating { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - int x = supertile.xCoord + i - RANGE; - int y = supertile.yCoord + j - RANGE; - int z = supertile.zCoord + k - RANGE; - Block block = supertile.getWorld().getBlock(x, y, z); + BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE); + IBlockState state = supertile.getWorld().getBlockState(pos); + Block block = state.getBlock(); if(block instanceof BlockCake) { - int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; - if(meta == 6) - supertile.getWorld().setBlockToAir(x, y, z); - else supertile.getWorld().setBlockMetadataWithNotify(x, y, z, meta, 1 | 2); + int nextSlicesEaten = ((Integer) state.getValue(BlockCake.BITES)) + 1; + if(nextSlicesEaten == 6) + supertile.getWorld().setBlockToAir(pos); + else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); - supertile.getWorld().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 1F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state.withProperty(BlockCake.BITES, nextSlicesEaten))); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 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 d4d84e3e5..eaa97791a 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 @@ -16,12 +16,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; @@ -55,27 +56,23 @@ public class SubTileMunchdew extends SubTileGenerating { eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) { List coords = new ArrayList(); - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + BlockPos pos = supertile.getPos(); for(int i = -RANGE; i < RANGE + 1; i++) for(int j = 0; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { - int xp = x + i; - int yp = y + j; - int zp = z + k; - Block block = supertile.getWorld().getBlock(xp, yp, zp); + BlockPos pos_ = pos.add(i, j, k); + Block block = supertile.getWorld().getBlockState(pos_).getBlock(); if(block.getMaterial() == Material.leaves) { boolean exposed = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) - if(supertile.getWorld().getBlock(xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ).isAir(supertile.getWorld(), xp + dir.offsetX, yp + dir.offsetY, zp + dir.offsetZ)) { + for(EnumFacing dir : EnumFacing.VALUES) + if(supertile.getWorld().getBlockState(pos_.offset(dir)).getBlock().isAir(supertile.getWorld(), pos_.offset(dir))) { exposed = true; break; } if(exposed) - coords.add(new BlockPos(xp, yp, zp)); + coords.add(pos_); } } @@ -84,13 +81,12 @@ public class SubTileMunchdew extends SubTileGenerating { Collections.shuffle(coords); BlockPos breakCoords = coords.get(0); - Block block = supertile.getWorld().getBlock(breakCoords.posX, breakCoords.posY, breakCoords.posZ); - int meta = supertile.getWorld().getBlockMetadata(breakCoords.posX, breakCoords.posY, breakCoords.posZ); - supertile.getWorld().setBlockToAir(breakCoords.posX, breakCoords.posY, breakCoords.posZ); + IBlockState state = supertile.getWorld().getBlockState(breakCoords); + supertile.getWorld().setBlockToAir(breakCoords); ticksWithoutEating = 0; ateOnce = true; if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, breakCoords.posX, breakCoords.posY, breakCoords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(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 b71eb4f29..bc6202ebf 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 @@ -14,6 +14,8 @@ import java.util.List; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -36,7 +38,7 @@ public class SubTileNarslimmus extends SubTileGenerating { super.onUpdate(); if(ticksExisted % 5 == 0) { - List slimes = supertile.getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE, supertile.zCoord + RANGE + 1)); + List slimes = supertile.getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntitySlime slime : slimes) { if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && !slime.isDead) { int size = slime.getSlimeSize(); @@ -55,7 +57,7 @@ public class SubTileNarslimmus extends SubTileGenerating { float f2 = MathHelper.sin(f) * size * 0.5F * f1; float f3 = MathHelper.cos(f) * size * 0.5F * f1; float f4 = slime.worldObj.rand.nextFloat() * size * 0.5F * f1; - slime.worldObj.spawnParticle("slime", slime.posX + f2, slime.boundingBox.minY + f4, slime.posZ + f3, 0.0D, 0.0D, 0.0D); + slime.worldObj.spawnParticle(EnumParticleTypes.SLIME, slime.posX + f2, slime.getEntityBoundingBox().minY + f4, slime.posZ + f3, 0.0D, 0.0D, 0.0D); } break; } @@ -92,7 +94,7 @@ public class SubTileNarslimmus extends SubTileGenerating { } public static boolean isSlimeChunk(World world, int x, int z) { - Chunk chunk = world.getChunkFromBlockCoords(x, z); + Chunk chunk = world.getChunkFromBlockCoords(new BlockPos(x, 0, z)); return chunk.getRandomWithSeed(987234911L).nextInt(10) == 0; } 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 f945df012..92e327d3a 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 @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; @@ -46,11 +47,9 @@ public class SubTileRafflowsia extends SubTileGenerating { for(int i = 0; i < RANGE * 2 + 1; i++) for(int j = 0; j < RANGE * 2 + 1; j++) for(int k = 0; k < RANGE * 2 + 1; k++) { - int x = supertile.xCoord + i - RANGE; - int y = supertile.yCoord + j - RANGE; - int z = supertile.zCoord + k - RANGE; - Block block = supertile.getWorld().getBlock(x, y, z); - TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); + BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE); + Block block = supertile.getWorld().getBlockState(pos).getBlock(); + TileEntity tile = supertile.getWorld().getTileEntity(pos); if(tile instanceof ISubTileContainer) { SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); String name = stile.getUnlocalizedName(); @@ -67,9 +66,9 @@ public class SubTileRafflowsia extends SubTileGenerating { float mod = 1F / lastFlowerTimes; int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; - supertile.getWorld().setBlockToAir(x, y, z); + supertile.getWorld().setBlockToAir(pos); - supertile.getWorld().playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, pos, Block.getIdFromBlock(block) + (meta << 12)); 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 f396658c1..c95e52c09 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 @@ -45,7 +45,7 @@ public class SubTileSpectrolus extends SubTileGenerating { if(!supertile.getWorld().isRemote) { Item wool = Item.getItemFromBlock(Blocks.wool); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() == wool) { @@ -99,7 +99,7 @@ public class SubTileSpectrolus extends SubTileGenerating { mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y); RenderHelper.disableStandardItemLighting(); } 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 f8168ea31..ef65c691d 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 @@ -29,7 +29,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.9 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); } @Override @@ -49,7 +49,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:thermalily", 0.2F, 1F); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:thermalily", 0.2F, 1F); } @Override From c0bcfb6448e3c7fd26d11c3e434430971766ca64 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 Nov 2015 17:31:19 -0600 Subject: [PATCH 040/935] Most functional flora --- .../botania/api/item/IFlowerPlaceable.java | 5 +- .../functional/SubTileAgricarnation.java | 27 ++++---- .../subtile/functional/SubTileBellethorn.java | 13 ++-- .../subtile/functional/SubTileBubbell.java | 11 ++-- .../subtile/functional/SubTileClayconia.java | 15 ++--- .../subtile/functional/SubTileDaffomill.java | 35 +++++----- .../subtile/functional/SubTileDreadthorn.java | 7 +- .../subtile/functional/SubTileExoflame.java | 21 +++--- .../functional/SubTileFallenKanade.java | 4 +- .../functional/SubTileHeiseiDream.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 46 ++++++------- .../subtile/functional/SubTileHyacidus.java | 2 +- .../functional/SubTileJadedAmaranthus.java | 21 +++--- .../subtile/functional/SubTileLoonuim.java | 2 +- .../functional/SubTileMarimorphosis.java | 17 +++-- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 17 +++-- .../functional/SubTileOrechidIgnem.java | 2 +- .../functional/SubTilePollidisiac.java | 6 +- .../functional/SubTileRannuncarpus.java | 66 ++++++++----------- .../subtile/functional/SubTileSolegnolia.java | 4 +- .../functional/SubTileSpectranthemum.java | 42 ++++++------ .../functional/SubTileTangleberrie.java | 6 +- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 14 ++-- 25 files changed, 184 insertions(+), 205 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index 05f1f1f40..a4ef8facf 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import vazkii.botania.api.subtile.SubTileEntity; /** @@ -21,7 +22,7 @@ public interface IFlowerPlaceable { /** * Gets the block to be placed, return null to not place anything. */ - public Block getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z); + public Block getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); - public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z); + public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); } 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 fc81afa91..a154da514 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 @@ -17,6 +17,7 @@ import net.minecraft.block.BlockSapling; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -34,22 +35,22 @@ public class SubTileAgricarnation extends SubTileFunctional { if(ticksExisted % 6 == 0 && redstoneSignal == 0) { int range = getRange(); - int x = supertile.xCoord + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; - int z = supertile.zCoord + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; + int x = supertile.getPos().getX() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; + int z = supertile.getPos().getZ() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; for(int i = 4; i > -2; i--) { - int y = supertile.yCoord + i; - - if(supertile.getWorld().isAirBlock(x, y, z)) + int y = supertile.getPos().getY() + i; + BlockPos pos = new BlockPos(x, y, z); + if(supertile.getWorld().isAirBlock(pos)) continue; - if(isPlant(x, y, z) && mana > 5) { - Block block = supertile.getWorld().getBlock(x, y, z); + if(isPlant(pos) && mana > 5) { + Block block = supertile.getWorld().getBlockState(pos).getBlock(); mana -= 5; - supertile.getWorld().scheduleBlockUpdate(x, y, z, block, 1); + supertile.getWorld().scheduleUpdate(pos, block, 1); if(ConfigHandler.blockBreakParticles) - supertile.getWorldObj().playAuxSFX(2005, x, y, z, 6 + supertile.getWorldObj().rand.nextInt(4)); - supertile.getWorldObj().playSoundEffect(x, y, z, "botania:agricarnation", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playAuxSFX(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); + supertile.getWorld().playSoundEffect(x, y, z, "botania:agricarnation", 0.01F, 0.5F + (float) Math.random() * 0.5F); break; } @@ -62,13 +63,13 @@ public class SubTileAgricarnation extends SubTileFunctional { return true; } - boolean isPlant(int x, int y, int z) { - Block block = supertile.getWorld().getBlock(x, y, z); + boolean isPlant(BlockPos pos) { + Block block = supertile.getWorld().getBlockState(pos).getBlock(); if(block == Blocks.grass || block == Blocks.leaves || block == Blocks.leaves2 || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling)) return false; Material mat = block.getMaterial(); - return mat != null && (mat == Material.plants || mat == Material.cactus || mat == Material.grass || mat == Material.leaves || mat == Material.gourd) && block instanceof IGrowable && ((IGrowable) block).func_149851_a(supertile.getWorld(), x, y, z, 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/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 05126a8e2..ac701e2ce 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; +import com.google.common.base.Predicate; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -50,11 +51,11 @@ public class SubTileBellethorn extends SubTileFunctional { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - range, supertile.yCoord, supertile.zCoord - range, supertile.xCoord + range + 1, supertile.yCoord + 1, supertile.zCoord + range + 1)); - IEntitySelector selector = getSelector(); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-range, -range, -range), supertile.getPos().add(range + 1, range + 1, range + 1))); + Predicate selector = getSelector(); for(EntityLivingBase entity : entities) { - if(!selector.isEntityApplicable(entity)) + if(!selector.apply(entity)) continue; if(entity.hurtTime == 0 && mana >= manaToUse) { @@ -83,11 +84,11 @@ public class SubTileBellethorn extends SubTileFunctional { return RANGE; } - public IEntitySelector getSelector() { - return new IEntitySelector() { + public Predicate getSelector() { + return new Predicate() { @Override - public boolean isEntityApplicable(Entity entity) { + public boolean apply(Entity entity) { return !(entity instanceof EntityPlayer); } 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 1264e1001..4e8a74071 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 @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; @@ -47,18 +48,18 @@ public class SubTileBubbell extends SubTileFunctional { for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - Block block = supertile.getWorld().getBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); + Block block = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)).getBlock(); if(block.getMaterial() == Material.water) { - supertile.getWorld().setBlock(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k, ModBlocks.fakeAir, 0, 2); - TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.xCoord + i, supertile.yCoord + j, supertile.zCoord + k); + supertile.getWorld().setBlockState(supertile.getPos().add(i, j, k), ModBlocks.fakeAir.getDefaultState(), 2); + TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.getPos().add(i, j, k)); air.setFlower(supertile); } } } } - public static boolean isValidBubbell(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static boolean isValidBubbell(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer container = (ISubTileContainer) tile; if(container.getSubTile() != null && container.getSubTile() instanceof SubTileBubbell) { 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 62a255d29..5a3a94b1e 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 @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -38,10 +39,10 @@ public class SubTileClayconia extends SubTileFunctional { if(mana >= manaCost) { BlockPos coords = getCoordsToPut(); if(coords != null) { - supertile.getWorld().setBlockToAir(coords.posX, coords.posY, coords.posZ); + supertile.getWorld().setBlockToAir(coords); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(Block.getBlockFromName("sand"))); - EntityItem item = new EntityItem(supertile.getWorld(), coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, new ItemStack(Items.clay_ball)); + 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().spawnEntityInWorld(item); mana -= manaCost; } @@ -55,12 +56,10 @@ public class SubTileClayconia extends SubTileFunctional { for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) for(int k = -RANGE; k < RANGE + 1; k++) { - int x = supertile.xCoord + i; - int y = supertile.yCoord + j; - int z = supertile.zCoord + k; - Block block = supertile.getWorld().getBlock(x, y, z); + BlockPos pos = supertile.getPos().add(i, j, k); + Block block = supertile.getWorld().getBlockState(pos).getBlock(); if(block == Block.getBlockFromName("sand")) - possibleCoords.add(new BlockPos(x, y, z)); + possibleCoords.add(pos); } if(possibleCoords.isEmpty()) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 2e8169d0d..c3921fca3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -30,15 +30,14 @@ public class SubTileDaffomill extends SubTileFunctional { private static final String TAG_WIND_TICKS = "windTicks"; int windTicks = 0; - int orientation = 0; + EnumFacing orientation = EnumFacing.NORTH; @Override public void onUpdate() { super.onUpdate(); - ForgeDirection dir = ForgeDirection.getOrientation(orientation + 2); if(supertile.getWorld().rand.nextInt(4) == 0) - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + Math.random(), supertile.yCoord + Math.random(), supertile.zCoord + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, dir.offsetX * 0.1F, dir.offsetY * 0.1F, dir.offsetZ * 0.1F); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getFrontOffsetX() * 0.1F, orientation.getFrontOffsetY() * 0.1F, orientation.getFrontOffsetZ() * 0.1F); if(windTicks == 0 && mana > 0) { windTicks = 20; @@ -51,9 +50,9 @@ public class SubTileDaffomill extends SubTileFunctional { if(axis != null) { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); for(EntityItem item : items) { - item.motionX += dir.offsetX * 0.05; - item.motionY += dir.offsetY * 0.05; - item.motionZ += dir.offsetZ * 0.05; + item.motionX += orientation.getFrontOffsetX() * 0.05; + item.motionY += orientation.getFrontOffsetY() * 0.05; + item.motionZ += orientation.getFrontOffsetZ() * 0.05; } } @@ -62,25 +61,25 @@ public class SubTileDaffomill extends SubTileFunctional { } AxisAlignedBB aabbForOrientation() { - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + int x = supertile.getPos().getX(); + int y = supertile.getPos().getY(); + int z = supertile.getPos().getZ(); int w = 2; int h = 3; int l = 16; AxisAlignedBB axis = null; switch(orientation) { - case 0 : + case NORTH : axis = new AxisAlignedBB(x - w, y - h, z - l, x + w + 1, y + h, z); break; - case 1 : + case SOUTH : axis = new AxisAlignedBB(x - w, y - h, z + 1, x + w + 1, y + h, z + l + 1); break; - case 2 : + case WEST : axis = new AxisAlignedBB(x - l, y - h, z - w, x, y + h, z + w + 1); break; - case 3 : + case EAST : axis = new AxisAlignedBB(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); } return axis; @@ -98,7 +97,7 @@ public class SubTileDaffomill extends SubTileFunctional { if(player.isSneaking()) { if(!player.worldObj.isRemote) { - orientation = orientation == 3 ? 0 : orientation + 1; + orientation = orientation.rotateY(); sync(); } @@ -109,7 +108,7 @@ public class SubTileDaffomill extends SubTileFunctional { @Override public RadiusDescriptor getRadius() { AxisAlignedBB aabb = aabbForOrientation(); - aabb.minY = supertile.yCoord; + aabb = new AxisAlignedBB(aabb.minX, supertile.getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ); return new RadiusDescriptor.Rectangle(toBlockPos(), aabb); } @@ -132,7 +131,7 @@ public class SubTileDaffomill extends SubTileFunctional { public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_ORIENTATION, orientation); + cmp.setInteger(TAG_ORIENTATION, orientation.getIndex() - 2); // retain compat with 1.7 saves cmp.setInteger(TAG_WIND_TICKS, windTicks); } @@ -140,7 +139,7 @@ public class SubTileDaffomill extends SubTileFunctional { public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - orientation = cmp.getInteger(TAG_ORIENTATION); + orientation = EnumFacing.getFront(cmp.getInteger(TAG_ORIENTATION) + 2); // retain compat with 1.7 saves windTicks = cmp.getInteger(TAG_WIND_TICKS); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 332389f7b..1c7490228 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import com.google.common.base.Predicate; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; @@ -24,11 +25,11 @@ public class SubTileDreadthorn extends SubTileBellethorn { } @Override - public IEntitySelector getSelector() { - return new IEntitySelector() { + public Predicate getSelector() { + return new Predicate() { @Override - public boolean isEntityApplicable(Entity var1) { + public boolean apply(Entity var1) { return var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; } 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 de3315735..97c3cba2a 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 @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.BlockPos; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -39,25 +40,23 @@ public class SubTileExoflame extends SubTileFunctional { for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) for(int k = -RANGE; k < RANGE + 1; k++) { - int x = supertile.xCoord + i; - int y = supertile.yCoord + j; - int z = supertile.zCoord + k; + BlockPos pos = supertile.getPos().add(i, j, k); - TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); - Block block = supertile.getWorld().getBlock(x, y, z); + 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)) { TileEntityFurnace furnace = (TileEntityFurnace) tile; boolean canSmelt = canFurnaceSmelt(furnace); if(canSmelt && mana > 2) { - if(furnace.furnaceBurnTime < 2) { - if(furnace.furnaceBurnTime == 0) - BlockFurnace.updateFurnaceBlockState(true, supertile.getWorld(), x, y, z); - furnace.furnaceBurnTime = 200; + if(furnace.getField(0) < 2) { // Field 0 -> Burn time + if(furnace.getField(0) == 0) + BlockFurnace.setState(true, supertile.getWorld(), pos); + furnace.setField(0, 200); mana = Math.max(0, mana - cost); } if(ticksExisted % 2 == 0) - furnace.furnaceCookTime = Math.min(199, furnace.furnaceCookTime + 1); + furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time did = true; @@ -92,7 +91,7 @@ public class SubTileExoflame extends SubTileFunctional { if(furnace.getStackInSlot(0) == null) return false; else { - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(furnace.getStackInSlot(0)); + ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(furnace.getStackInSlot(0)); if(itemstack == null) return false; 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 56383a798..d0f281e9c 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 @@ -31,8 +31,8 @@ public class SubTileFallenKanade extends SubTileFunctional { final int cost = 120; - if(!supertile.getWorld().isRemote && supertile.getWorld().provider.dimensionId != 1) { - List players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimensionId() != 1) { + 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(Potion.regeneration) == null && mana >= cost ) { player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 2)); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 4a756747c..6cc44c4e4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -37,7 +37,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; - List mobs = supertile.getWorld().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + List mobs = supertile.getWorld().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { if(mob instanceof EntityLiving) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 66909a182..bcae999ec 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -25,8 +25,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -59,29 +60,25 @@ public class SubTileHopperhock extends SubTileFunctional { boolean pulledAny = false; int range = getRange(); - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + BlockPos pos = supertile.getPos(); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); for(EntityItem item : items) { - if(item.age < 60 || item.age >= 105 && item.age < 110 || item.isDead) + if(item.getAge() < 60 || item.getAge() >= 105 && item.getAge() < 110 || item.isDead) continue; ItemStack stack = item.getEntityItem(); IInventory invToPutItemIn = null; - ForgeDirection sideToPutItemIn = ForgeDirection.UNKNOWN; + EnumFacing sideToPutItemIn = null; boolean priorityInv = false; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int x_ = x + dir.offsetX; - int y_ = y + dir.offsetY; - int z_ = z + dir.offsetZ; + for(EnumFacing dir : EnumFacing.VALUES) { + BlockPos pos_ = pos.offset(dir); - IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), , x_); + IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), pos_, dir); if(inv != null) { - List filter = getFilterForInventory(inv, x_, y_, z_, true); + List filter = getFilterForInventory(inv, pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); int stackSize = InventoryHelper.testInventoryInsertion(inv, stack, dir); canAccept &= stackSize == stack.stackSize; @@ -149,31 +146,26 @@ public class SubTileHopperhock extends SubTileFunctional { } } - public List getFilterForInventory(IInventory inv, int x, int y, int z, boolean recursiveForDoubleChests) { + public List getFilterForInventory(IInventory inv, BlockPos pos, boolean recursiveForDoubleChests) { List filter = new ArrayList(); if(recursiveForDoubleChests) { - TileEntity tileEntity = supertile.getWorld().getTileEntity(x, y, z); - Block chest = supertile.getWorld().getBlock(x, y, z); + TileEntity tileEntity = supertile.getWorld().getTileEntity(pos); + Block chest = supertile.getWorld().getBlockState(pos).getBlock(); if(tileEntity instanceof TileEntityChest) - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorld().getBlock(x + dir.offsetX, y, z + dir.offsetZ) == chest) { - filter.addAll(getFilterForInventory((IInventory) supertile.getWorld().getTileEntity(x + dir.offsetX, y, z + dir.offsetZ), x + dir.offsetX, y, z + dir.offsetZ, false)); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) + if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { + filter.addAll(getFilterForInventory((IInventory) supertile.getWorld().getTileEntity(pos.offset(dir)), pos.offset(dir), false)); break; } } - final int[] orientationToDir = new int[] { - 3, 4, 2, 5 - }; - - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - AxisAlignedBB aabb = new AxisAlignedBB(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1)); List frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { - int orientation = frame.hangingDirection; - if(orientationToDir[orientation] == dir.ordinal()) + if(frame.facingDirection == dir) filter.add(frame.getDisplayedItem()); } } 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 79c37b2fa..45de5761f 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 @@ -36,7 +36,7 @@ public class SubTileHyacidus extends SubTileFunctional { final int cost = 20; - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + 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(Potion.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); 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 4700f7a8f..acd500a6a 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -32,18 +33,20 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { return; if(mana >= COST && !supertile.getWorld().isRemote && ticksExisted % 30 == 0) { - int x = supertile.xCoord - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1); - int y = supertile.yCoord + RANGE; - int z = supertile.zCoord - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1); + BlockPos pos = new BlockPos( + supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), + supertile.getPos().getY() + RANGE, + supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1) + ); for(int i = 0; i < RANGE * 2; i++) { - Block blockAbove = supertile.getWorld().getBlock(x, y + 1, z); - if((supertile.getWorld().isAirBlock(x, y + 1, z) || blockAbove.isReplaceable(supertile.getWorld(), x, y + 1, z)) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), x, y + 1, z)) { + Block blockAbove = supertile.getWorld().getBlockState(pos.up()).getBlock(); + if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { int color = supertile.getWorld().rand.nextInt(16); - if(ModBlocks.flower.canBlockStay(supertile.getWorld(), x, y + 1, z)) { + if(ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, x, y + 1, z, Block.getIdFromBlock(ModBlocks.flower) + (color << 12)); - supertile.getWorld().setBlock(x, y + 1, z, ModBlocks.flower, color, 1 | 2); + supertile.getWorld().playAuxSFX(2001, pos.up(), Block.getIdFromBlock(ModBlocks.flower) + (color << 12)); + supertile.getWorld().setBlockState(pos.up(), ModBlocks.flower, color, 1 | 2); } mana -= COST; @@ -52,7 +55,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { break; } - y--; + pos = pos.down(); } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index dfae7053b..589873b60 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -38,7 +38,7 @@ public class SubTileLoonuim extends SubTileFunctional { } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; - EntityItem entity = new EntityItem(supertile.getWorld(), supertile.xCoord - RANGE + rand.nextInt(bound) , supertile.yCoord + 1, supertile.zCoord - RANGE + rand.nextInt(bound), stack); + EntityItem entity = new EntityItem(supertile.getWorld(), supertile.getPos().getX() - RANGE + rand.nextInt(bound) , supertile.getPos().getY() + 1, supertile.getPos().getZ() - RANGE + rand.nextInt(bound), stack); entity.motionX = 0; entity.motionY = 0; entity.motionZ = 0; 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 918aa955f..3e012e90c 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 @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -60,9 +61,9 @@ public class SubTileMarimorphosis extends SubTileFunctional { if(stack != null) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); - supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); + supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); mana -= COST; sync(); @@ -72,7 +73,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public ItemStack getStoneToPut(BlockPos coords) { - List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords.posX, coords.posZ))); + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); List values = new ArrayList(); for(int i = 0; i < 8; i++) { @@ -96,12 +97,10 @@ public class SubTileMarimorphosis extends SubTileFunctional { for(int i = -range; i < range + 1; i++) for(int j = -range; j < rangeY; j++) for(int k = -range; k < range + 1; k++) { - int x = supertile.xCoord + i; - int y = supertile.yCoord + j; - int z = supertile.zCoord + k; - Block block = supertile.getWorld().getBlock(x, y, z); - if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, Blocks.stone)) - possibleCoords.add(new BlockPos(x, y, z)); + BlockPos pos = supertile.getPos().add(i, j, k); + Block block = supertile.getWorld().getBlockState(pos).getBlock(); + if(block != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockHelper.forBlock(Blocks.stone))) + possibleCoords.add(pos); } if(possibleCoords.isEmpty()) 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 4de50fab7..5395533d4 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 @@ -31,7 +31,7 @@ public class SubTileMedumone extends SubTileFunctional { super.onUpdate(); if(mana > 0) { - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); + 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)) { 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 2b070eb90..5e8feb37b 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 @@ -16,6 +16,7 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -54,10 +55,10 @@ public class SubTileOrechid extends SubTileFunctional { if(stack != null) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); - supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); + supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:orechid", 2F, 1F); + supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:orechid", 2F, 1F); mana -= cost; sync(); @@ -103,12 +104,10 @@ public class SubTileOrechid extends SubTileFunctional { for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y; j++) for(int k = -RANGE; k < RANGE + 1; k++) { - int x = supertile.xCoord + i; - int y = supertile.yCoord + j; - int z = supertile.zCoord + k; - Block block = supertile.getWorld().getBlock(x, y, z); - if(block != null && block.isReplaceableOreGen(supertile.getWorld(), x, y, z, source)) - possibleCoords.add(new BlockPos(x, y, z)); + BlockPos pos = supertile.getPos().add(i, j, k); + Block block = supertile.getWorld().getBlockState(pos).getBlock(); + if(block != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockHelper.forBlock(source))) + possibleCoords.add(pos); } if(possibleCoords.isEmpty()) 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 eca3772c3..104b060d3 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 @@ -24,7 +24,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public boolean canOperate() { - return supertile.getWorld().provider.isHellWorld; + return supertile.getWorld().provider.doesWaterVaporize(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 2bfc3b833..27206d95d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -34,8 +34,8 @@ public class SubTilePollidisiac extends SubTileFunctional { if(!supertile.getWorld().isRemote) { int manaCost = 12; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 + RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); - List animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + 1 +RANGE, supertile.yCoord + 1, supertile.zCoord + 1 +RANGE)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityAnimal animal : animals) { if(mana < manaCost) break; @@ -43,7 +43,7 @@ public class SubTilePollidisiac extends SubTileFunctional { int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); if(animal.getGrowingAge() == 0 && love <= 0) { for(EntityItem item : items) { - if(item.age < 60 || item.isDead) + if(item.getAge() < 60 || item.isDead) continue; ItemStack stack = item.getEntityItem(); 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 c9bea80cf..e2512bf8d 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 @@ -14,10 +14,10 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -73,13 +73,11 @@ public class SubTileRannuncarpus extends SubTileFunctional { int rangePlace = getRange(); int rangePlaceY = getRangeY(); - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + BlockPos pos = supertile.getPos(); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(EntityItem item : items) { - if(item.age < 60 || item.isDead) + if(item.getAge() < 60 || item.isDead) continue; ItemStack stack = item.getEntityItem(); @@ -89,56 +87,48 @@ public class SubTileRannuncarpus extends SubTileFunctional { for(int i = -rangePlace; i < rangePlace + 1; i++) for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) for(int l = -rangePlace; l < rangePlace + 1; l++) { - int xp = x + i; - int yp = y + j; - int zp = z + l; - Block blockAbove = supertile.getWorld().getBlock(xp, yp + 1, zp); + BlockPos pos_ = pos.add(i, j, l); + Block blockAbove = supertile.getWorld().getBlockState(pos_.up()).getBlock(); - if(filter.equals(supertile.getWorld(), xp, yp, zp) && (blockAbove.isAir(supertile.getWorld(), xp, yp + 1, zp) || blockAbove.isReplaceable(supertile.getWorld(), xp, yp + 1, zp))) - validPositions.add(new BlockPos(xp, yp + 1, zp)); + if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) + validPositions.add(pos_.up()); } scanned = true; } - if(!validPositions.isEmpty() && !supertile.getWorldObj().isRemote) { - ChunkCoordinates coords = validPositions.get(supertile.getWorldObj().rand.nextInt(validPositions.size())); + if(!validPositions.isEmpty() && !supertile.getWorld().isRemote) { + BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); Block blockToPlace = null; if(stackItem instanceof IFlowerPlaceable) - blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords.posX, coords.posY, coords.posZ); + blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords); if(stackItem instanceof ItemBlock) - blockToPlace = ((ItemBlock) stackItem).field_150939_a; + blockToPlace = ((ItemBlock) stackItem).block; else if(stackItem instanceof ItemReed) blockToPlace = ReflectionHelper.getPrivateValue(ItemReed.class, (ItemReed) stackItem, LibObfuscation.REED_ITEM); else if(stackItem instanceof ItemRedstone) blockToPlace = Blocks.redstone_wire; if(blockToPlace != null) { -<<<<<<< HEAD - BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); - if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords.posX, coords.posY, coords.posZ)) { - supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); -======= - if(blockToPlace.canPlaceBlockAt(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ)) { - supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2); ->>>>>>> 82051d95d9817a177f0ec62817f4f2430358b46e + if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords)) { + supertile.getWorld().setBlockState(coords, blockToPlace.getStateFromMeta(stack.getItemDamage()), 1 | 2); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(blockToPlace) + (stack.getItemDamage() << 12)); + supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(blockToPlace.getStateFromMeta(stack.getItemDamage()))); validPositions.remove(coords); - TileEntity tile = supertile.getWorld().getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = supertile.getWorld().getTileEntity(coords); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer container = (ISubTileContainer) tile; String subtileName = ItemBlockSpecialFlower.getType(stack); container.setSubTile(subtileName); SubTileEntity subtile = container.getSubTile(); - subtile.onBlockPlacedBy(supertile.getWorld(), coords.posX, coords.posY, coords.posZ, null, stack); + subtile.onBlockPlacedBy(supertile.getWorld(), coords, supertile.getWorld().getBlockState(coords), null, stack); } if(stackItem instanceof IFlowerPlaceable) - ((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords.posX, coords.posY, coords.posZ); + ((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords); if(!supertile.getWorld().isRemote) { stack.stackSize--; @@ -158,7 +148,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { } public BlockData getUnderlyingBlock() { - return new BlockData(supertile.getWorld(), supertile.xCoord, supertile.yCoord - (supertile instanceof IFloatingFlower ? 1 : 2), supertile.zCoord); + return new BlockData(supertile.getWorld(), supertile.getPos().down(supertile instanceof IFloatingFlower ? 1 : 2)); } @Override @@ -171,7 +161,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { super.renderHUD(mc, res); BlockData filter = getUnderlyingBlock(); - ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.block), 1, filter.meta); + ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.state.getBlock()), 1, filter.state.getBlock().getMetaFromState(filter.state)); int color = getColor(); GL11.glEnable(GL11.GL_BLEND); @@ -184,7 +174,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { mc.fontRendererObj.drawStringWithShadow(stackName, x + 20, y + 5, color); RenderHelper.enableGUIStandardItemLighting(); - RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(recieverStack, x, y); RenderHelper.disableStandardItemLighting(); } @@ -227,20 +217,18 @@ public class SubTileRannuncarpus extends SubTileFunctional { static class BlockData { - Block block; - int meta; + final IBlockState state; - public BlockData(World world, int x, int y, int z) { - block = world.getBlock(x, y, z); - meta = world.getBlockMetadata(x, y, z); + public BlockData(World world, BlockPos pos) { + state = world.getBlockState(pos); } public boolean equals(BlockData data) { - return block == data.block && meta == data.meta; + return this.state == data.state; } - public boolean equals(World world, int x, int y, int z) { - return equals(new BlockData(world, x, y, z)); + public boolean equals(World world, BlockPos pos) { + return equals(new BlockData(world, pos)); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 5a0976f68..bdf80a014 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -50,11 +50,11 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { for(SubTileSolegnolia flower : existingFlowers) { - if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorld() != e.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) + if(flower.mana == 0 || flower.redstoneSignal > 0 || flower.supertile.getWorld() != e.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; double range = flower.getRange(); - if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.xCoord + 0.5, flower.supertile.yCoord + 0.5, flower.supertile.zCoord + 0.5) <= range) + if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.getPos().getX() + 0.5, flower.supertile.getPos().getY() + 0.5, flower.supertile.getPos().getZ() + 0.5) <= range) return true; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 8c02a8420..f64333e4b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -18,10 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.*; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -43,21 +41,19 @@ public class SubTileSpectranthemum extends SubTileFunctional { private static final String TAG_TELEPORTED = "Botania_TPd"; - int bindX, bindY = -1, bindZ; + BlockPos bindPos = new BlockPos(0, -1, 0); @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal == 0 && supertile.getWorld().blockExists(bindX, bindY, bindZ)) { - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + if(redstoneSignal == 0 && supertile.getWorld().isBlockLoaded(bindPos)) { + BlockPos pos = supertile.getPos(); boolean did = false; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - RANGE, y - RANGE, z - RANGE, x + RANGE + 1, y + RANGE, z + RANGE + 1)); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { - if(item.age < 60 || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(item.getAge() < 60 || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); @@ -69,7 +65,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { int cost = stack.stackSize * COST; if(mana >= cost) { spawnExplosionParticles(item); - item.setPosition(bindX + 0.5, bindY + 1.5, bindZ + 0.5); + item.setPosition(bindPos.getX() + 0.5, bindPos.getY() + 1.5, bindPos.getZ() + 0.5); item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; spawnExplosionParticles(item); @@ -93,7 +89,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { double d1 = item.worldObj.rand.nextGaussian() * m; double d2 = item.worldObj.rand.nextGaussian() * m; double d3 = 10.0D; - item.worldObj.spawnParticle("explode", item.posX + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, item.posY + item.worldObj.rand.nextFloat() * item.height - d1 * d3, item.posZ + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); + item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, item.posX + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, item.posY + item.worldObj.rand.nextFloat() * item.height - d1 * d3, item.posZ + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); } } @@ -105,17 +101,19 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); - cmp.setInteger(TAG_BIND_X, bindX); - cmp.setInteger(TAG_BIND_Y, bindY); - cmp.setInteger(TAG_BIND_Z, bindZ); + cmp.setInteger(TAG_BIND_X, bindPos.getX()); + cmp.setInteger(TAG_BIND_Y, bindPos.getY()); + cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); } @Override public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - bindX = cmp.getInteger(TAG_BIND_X); - bindY = cmp.getInteger(TAG_BIND_Y); - bindZ = cmp.getInteger(TAG_BIND_Z); + bindPos = new BlockPos( + cmp.getInteger(TAG_BIND_X), + cmp.getInteger(TAG_BIND_Y), + cmp.getInteger(TAG_BIND_Z) + ); } @Override @@ -137,10 +135,8 @@ public class SubTileSpectranthemum extends SubTileFunctional { public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && (x != bindX || y != bindY || z != bindZ) && MathHelper.pointDistanceSpace(x, y, z, supertile.xCoord, supertile.yCoord, supertile.zCoord) <= BIND_RANGE && (x != supertile.xCoord || y != supertile.yCoord || z != supertile.zCoord)) { - bindX = x; - bindY = y; - bindZ = z; + if(!bound && !pos.equals(bindPos) && MathHelper.pointDistanceSpace(pos, supertile.getPos()) <= BIND_RANGE && !(pos.equals(supertile.getPos()))) { + bindPos = pos; sync(); return true; @@ -152,7 +148,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override @SideOnly(Side.CLIENT) public BlockPos getBinding() { - return Minecraft.getMinecraft().thePlayer.isSneaking() && bindY != -1 ? new BlockPos(bindX, bindY, bindZ) : super.getBinding(); + return Minecraft.getMinecraft().thePlayer.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 6570cb256..e7b936806 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -31,9 +31,9 @@ public class SubTileTangleberrie extends SubTileFunctional { super.onUpdate(); if(mana > 0) { - double x1 = supertile.xCoord + 0.5; - double y1 = supertile.yCoord + 0.5; - double z1 = supertile.zCoord + 0.5; + double x1 = supertile.getPos().getX() + 0.5; + double y1 = supertile.getPos().getY() + 0.5; + double z1 = supertile.getPos().getZ() + 0.5; double maxDist = getMaxDistance(); double range = getRange(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 3764229be..62d3c1111 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -41,7 +41,7 @@ public class SubTileTigerseye extends SubTileFunctional { boolean shouldAfffect = mana >= cost; - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + RANGE + 1)); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(EntityLiving entity : entities) { List entries = new ArrayList(entity.tasks.taskEntries); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 998866e2a..5d42b0904 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -82,12 +82,12 @@ public class SubTileVinculotus extends SubTileFunctional { if(event.entity instanceof EntityEnderman) { List possibleFlowers = new ArrayList(); for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != flower.supertile) + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; - double x = flower.supertile.xCoord + 0.5; - double y = flower.supertile.yCoord + 1.5; - double z = flower.supertile.zCoord + 0.5; + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; if(MathHelper.pointDistanceSpace(x, y, z, event.targetX, event.targetY, event.targetZ) < RANGE) possibleFlowers.add(flower); @@ -96,9 +96,9 @@ public class SubTileVinculotus extends SubTileFunctional { if(!possibleFlowers.isEmpty()) { SubTileVinculotus flower = possibleFlowers.get(event.entity.worldObj.rand.nextInt(possibleFlowers.size())); - double x = flower.supertile.xCoord + 0.5; - double y = flower.supertile.yCoord + 1.5; - double z = flower.supertile.zCoord + 0.5; + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; event.targetX = x + Math.random() * 3 - 1; event.targetY = y; From 4426f8904f060a500fd35e55961baabcea933f80 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 25 Nov 2015 01:36:21 -0600 Subject: [PATCH 041/935] Some touchups on entities --- .../component/ColorSwitchingComponent.java | 4 +- .../component/MultiblockComponent.java | 12 +- .../botania/common/block/mana/BlockPump.java | 2 +- .../common/entity/EntityDoppleganger.java | 120 ++++++++---------- .../common/entity/EntityManaBurst.java | 85 ++++++------- .../common/entity/EntityPinkWither.java | 3 +- .../common/entity/EntityPoolMinecart.java | 4 +- .../common/entity/EntityThornChakram.java | 13 +- .../common/entity/EntityThrownItem.java | 8 +- 9 files changed, 122 insertions(+), 129 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index e79a8789c..4af31394e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -31,8 +31,8 @@ public class ColorSwitchingComponent extends MultiblockComponent { } @Override - public boolean matches(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == getBlock(); + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock() == getBlock(); } @Override diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index afa6a8a19..a44a7652d 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -39,7 +39,7 @@ public class MultiblockComponent { } public MultiblockComponent(BlockPos relPos, Block block, int meta, TileEntity tileEntity) { - this(relPos, block, meta, block.hasTileEntity() == (tileEntity != null), tileEntity); + this(relPos, block, meta, block.hasTileEntity(block.getStateFromMeta(meta)) == (tileEntity != null), tileEntity); } public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { @@ -62,8 +62,8 @@ public class MultiblockComponent { return meta; } - public boolean matches(World world, int x, int y, int z) { - return world.getBlock(x, y, z) == getBlock() && (meta == -1 || world.getBlockMetadata(x, y, z) == meta); + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock() == getBlock() && (meta == -1 || world.getBlockState(pos).getBlock().getMetaFromState(world.getBlockState(pos)) == meta); } public ItemStack[] getMaterials() { @@ -71,14 +71,14 @@ public class MultiblockComponent { } public void rotate(double angle) { - double x = relPos.posX; - double z = relPos.posZ; + double x = relPos.getX(); + double z = relPos.getZ(); double sin = Math.sin(angle); double cos = Math.cos(angle); double xn = x * cos - z * sin; double zn = x * sin + z * cos; - relPos = new BlockPos((int) Math.round(xn), relPos.posY, (int) Math.round(zn)); + relPos = new BlockPos((int) Math.round(xn), relPos.getY(), (int) Math.round(zn)); } public MultiblockComponent copy() { 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 4368abf90..3adb4d98c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -48,7 +48,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { @Override public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(p_149689_5_.getHorizontalFacing().getOpposite()), 2); + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 768e95b80..ad53d9201 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -91,11 +91,11 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static final String TAG_HARD_MODE = "hardMode"; private static final String TAG_PLAYER_COUNT = "playerCount"; - private static final int[][] PYLON_LOCATIONS = new int[][] { - { 4, 1, 4 }, - { 4, 1, -4 }, - { -4, 1, 4 }, - { -4, 1, -4 } + private static final BlockPos[] PYLON_LOCATIONS = { + new BlockPos(4, 1, 4), + new BlockPos(4, 1, -4), + new BlockPos(-4, 1, 4), + new BlockPos(-4, 1, -4) }; boolean spawnLandmines = false; @@ -133,7 +133,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, BlockPos pos, boolean hard) { - Block block = par3World.getBlock(par4, par5, par6); + Block block = par3World.getBlockState(pos).getBlock(); if(block == Blocks.beacon && isTruePlayer(player)) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!par3World.isRemote) @@ -141,10 +141,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return false; } - for(int[] coords : PYLON_LOCATIONS) { - int x = par4 + coords[0]; - int y = par5 + coords[1]; - int z = par6 + coords[2]; + for(BlockPos coords : PYLON_LOCATIONS) { + BlockPos pos_ = pos.add(coords); Block blockat = par3World.getBlock(x, y, z); int meta = par3World.getBlockMetadata(x, y, z); @@ -155,7 +153,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } - if(!hasProperArena(par3World, par4, par5, par6)) { + if(!hasProperArena(par3World, pos)) { for(int i = 0; i < 360; i += 8) { float r = 1F; float g = 0F; @@ -164,9 +162,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi float mv = 0.35F; float rad = i * (float) Math.PI / 180F; - double x = par4 + 0.5 - Math.cos(rad) * RANGE; - double y = par5 + 0.5; - double z = par6 + 0.5 - Math.sin(rad) * RANGE; + double x = pos.getX() + 0.5 - Math.cos(rad) * RANGE; + double y = pos.getY() + 0.5; + double z = pos.getZ() + 0.5 - Math.sin(rad) * RANGE; Botania.proxy.sparkleFX(par3World, x, y, z, r, g, b, 5F, 120); } @@ -178,10 +176,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi par1ItemStack.stackSize--; EntityDoppleganger e = new EntityDoppleganger(par3World); - e.setPosition(par4 + 0.5, par5 + 3, par6 + 0.5); + e.setPosition(pos.getX() + 0.5, pos.getY() + 3, pos.getZ() + 0.5); e.setInvulTime(SPAWN_TICKS); e.setHealth(1F); - e.setSource(par4, par5, par6); + e.setSource(pos); e.setMobSpawnTicks(MOB_SPAWN_TICKS); e.setHardMode(hard); @@ -202,7 +200,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return false; } - private static boolean hasProperArena(World world, int sx, int sy, int sz) { + private static boolean hasProperArena(World world, BlockPos startPos) { int heightCheck = 3; int heightMin = 2; int range = (int) Math.ceil(RANGE); @@ -210,15 +208,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi for(int j = -range; j < range + 1; j++) { if((Math.abs(i) == 4 && Math.abs(j) == 4) || vazkii.botania.common.core.helper.MathHelper.pointDistancePlane(i, j, 0, 0) > RANGE) continue; // Ignore pylons and out of circle - - int x = sx + i; - int z = sz + j; + int air = 0; yCheck: { for(int k = heightCheck + heightMin + 1; k >= -heightCheck; k--) { - int y = sy + k; - boolean isAir = world.getBlock(x, y, z).getCollisionBoundingBoxFromPool(world, x, y, z) == null; + BlockPos pos = startPos.add(i, k, j); + boolean isAir = world.getBlockState(pos).getBlock().getCollisionBoundingBox(world, pos, world.getBlockState(pos)) == null; if(isAir) air++; else { @@ -299,10 +295,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi dataWatcher.updateObject(22, delay); } - public void setSource(int x, int y, int z) { - dataWatcher.updateObject(23, x); - dataWatcher.updateObject(24, y); - dataWatcher.updateObject(25, z); + public void setSource(BlockPos pos) { + dataWatcher.updateObject(23, pos.getX()); + dataWatcher.updateObject(24, pos.getY()); + dataWatcher.updateObject(25, pos.getZ()); } public void setMobSpawnTicks(int ticks) { @@ -325,9 +321,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, getMobSpawnTicks()); BlockPos source = getSource(); - par1nbtTagCompound.setInteger(TAG_SOURCE_X, source.posX); - par1nbtTagCompound.setInteger(TAG_SOURCE_Y, source.posY); - par1nbtTagCompound.setInteger(TAG_SOURCE_Z, source.posZ); + par1nbtTagCompound.setInteger(TAG_SOURCE_X, source.getX()); + par1nbtTagCompound.setInteger(TAG_SOURCE_Y, source.getY()); + par1nbtTagCompound.setInteger(TAG_SOURCE_Z, source.getZ()); par1nbtTagCompound.setBoolean(TAG_HARD_MODE, isHardMode()); par1nbtTagCompound.setInteger(TAG_PLAYER_COUNT, getPlayerCount()); @@ -343,7 +339,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi int x = par1nbtTagCompound.getInteger(TAG_SOURCE_X); int y = par1nbtTagCompound.getInteger(TAG_SOURCE_Y); int z = par1nbtTagCompound.getInteger(TAG_SOURCE_Z); - setSource(x, y, z); + setSource(new BlockPos(x, y, z)); setHardMode(par1nbtTagCompound.getBoolean(TAG_HARD_MODE)); if(par1nbtTagCompound.hasKey(TAG_PLAYER_COUNT)) @@ -494,7 +490,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public List getPlayersAround() { BlockPos source = getSource(); float range = 15F; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); + List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); return players; } @@ -513,18 +509,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi setDead(); if(!worldObj.isRemote) { - int posXInt = MathHelper.floor_double(posX); - int posYInt = MathHelper.floor_double(posY); - int posZInt = MathHelper.floor_double(posZ); - Block block = worldObj.getBlock(posXInt, posYInt, posZInt); - if(block.getBlockHardness(worldObj, posXInt, posYInt, posZInt) >= 0) { - List items = block.getDrops(worldObj, posXInt, posYInt, posZInt, 0, 0); + BlockPos pos = new BlockPos(this); + Block block = worldObj.getBlockState(pos).getBlock(); + if(block.getBlockHardness(worldObj, pos) >= 0) { + List items = block.getDrops(worldObj, pos, worldObj.getBlockState(pos), 0); for(ItemStack stack : items) { if(ConfigHandler.blockBreakParticles) - worldObj.playAuxSFX(2001, posXInt, posYInt, posZInt, Block.getIdFromBlock(block) + (worldObj.getBlockMetadata(posXInt, posYInt, posZInt) << 12)); - worldObj.spawnEntityInWorld(new EntityItem(worldObj, posXInt + 0.5, posYInt + 0.5, posZInt + 0.5, stack)); + worldObj.playAuxSFX(2001, pos, Block.getStateId(worldObj.getBlockState(pos))); + worldObj.spawnEntityInWorld(new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, stack)); } - worldObj.setBlockToAir(posXInt, posYInt, posZInt); + worldObj.setBlockToAir(pos); } } @@ -535,7 +529,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi int playerCount = getPlayerCount(); if(worldObj.isRemote && !isPlayingMusic && !isDead && !players.isEmpty()) { - Botania.proxy.playRecordClientSided(worldObj, , source.posX, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1)); + Botania.proxy.playRecordClientSided(worldObj, source, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1)); isPlayingMusic = true; } @@ -548,9 +542,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi float mv = 0.35F; float rad = i * (float) Math.PI / 180F; - double x = source.posX + 0.5 - Math.cos(rad) * range; - double y = source.posY + 0.5; - double z = source.posZ + 0.5 - Math.sin(rad) * range; + double x = source.getX() + 0.5 - Math.cos(rad) * range; + double y = source.getY() + 0.5; + double z = source.getZ() + 0.5 - Math.sin(rad) * range; Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); } @@ -572,8 +566,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; - if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.posX + 0.5, source.posY + 0.5, source.posZ + 0.5) >= range) { - Vector3 sourceVector = new Vector3(source.posX + 0.5, source.posY + 0.5, source.posZ + 0.5); + if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { + Vector3 sourceVector = new Vector3(source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5); Vector3 playerVector = Vector3.fromEntityCenter(player); Vector3 motion = sourceVector.copy().sub(playerVector).copy().normalize(); @@ -673,13 +667,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi while(!teleportRandomly() && tries < 50) tries++; if(tries >= 50) - teleportTo(source.posX + 0.5, source.posY + 1.6, source.posZ + 0.5); + teleportTo(source.getX() + 0.5, source.getY() + 1.6, source.getZ() + 0.5); if(spawnLandmines) for(int i = 0; i < 6; i++) { - int x = source.posX - 10 + rand.nextInt(20); - int z = source.posZ - 10 + rand.nextInt(20); - int y = worldObj.getTopSolidOrLiquidBlock(x, z); + int x = source.getX() - 10 + rand.nextInt(20); + int z = source.getZ() - 10 + rand.nextInt(20); + int y = worldObj.getTopSolidOrLiquidBlock(new BlockPos(x, -1, z)).getY(); EntityMagicLandmine landmine = new EntityMagicLandmine(worldObj); landmine.setPosition(x + 0.5, y, z + 0.5); @@ -741,33 +735,31 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi posY = par3; posZ = par5; boolean flag = false; - int i = MathHelper.floor_double(posX); - int j = MathHelper.floor_double(posY); - int k = MathHelper.floor_double(posZ); + BlockPos pos = new BlockPos(this); - if(worldObj.blockExists(i, j, k)) { + if(worldObj.isBlockLoaded(pos)) { boolean flag1 = false; - while(!flag1 && j > 0) { - Block block = worldObj.getBlock(i, j - 1, k); + while(!flag1 && pos.getY() > 0) { + Block block = worldObj.getBlockState(pos.down()).getBlock(); if(block.getMaterial().blocksMovement()) flag1 = true; else { --posY; - --j; + pos = pos.down(); } } if(flag1) { setPosition(posX, posY, posZ); - if(worldObj.getCollidingBoundingBoxes(this, boundingBox).isEmpty() && !worldObj.isAnyLiquid(boundingBox)) + if(worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) flag = true; // Prevent out of bounds teleporting BlockPos source = getSource(); - if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.posX, source.posY, source.posZ) > 12) + if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.getX(), source.getY(), source.getZ()) > 12) flag = false; } } @@ -786,7 +778,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi double d7 = d3 + (posX - d3) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D; double d8 = d4 + (posY - d4) * d6 + rand.nextDouble() * height; double d9 = d5 + (posZ - d5) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D; - worldObj.spawnParticle("portal", d7, d8, d9, f, f1, f2); + worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, f, f1, f2); } worldObj.playSoundEffect(d3, d4, d5, "mob.endermen.portal", 1.0F, 1.0F); @@ -831,10 +823,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Minecraft mc = Minecraft.getMinecraft(); ItemStack stack = new ItemStack(Items.skull, 1, 3); - mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, px, py); + mc.getRenderItem().renderItemIntoGUI(stack, px, py); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); boolean unicode = mc.fontRendererObj.getUnicodeFlag(); @@ -883,8 +875,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } @Override - public boolean matches(World world, int x, int y, int z) { - return world.getBlock(x, y, z).isBeaconBase(world, x, y, z, x - relPos.posX, y - relPos.posY, z - relPos.posZ); + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock().isBeaconBase(world, pos, pos.add(relPos.multiply(-1))); }; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 1e8083de6..045907b4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -105,21 +105,21 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { this.fake = fake; setBurstSourceCoords(tile.getPos()); - setLocationAndAngles(tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, 0, 0); + setLocationAndAngles(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, 0, 0); rotationYaw = -(spreader.getRotationX() + 90F); rotationPitch = spreader.getRotationY(); float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch + func_70183_g()) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin((rotationPitch + getInaccuracy()) / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } public EntityManaBurst(EntityPlayer player) { this(player.worldObj); - setBurstSourceCoords(0); + setBurstSourceCoords(new BlockPos(0, -1, 0)); setLocationAndAngles(player.posX, player.posY + player.getEyeHeight(), player.posZ, player.rotationYaw + 180, -player.rotationPitch); posX -= MathHelper.cos((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; @@ -130,7 +130,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch + func_70183_g()) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin((rotationPitch + getInaccuracy()) / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } @@ -157,7 +157,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; EntityLivingBase entitylivingbase = getThrower(); @@ -223,11 +223,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int l = MathHelper.floor_double(par1Vec3.xCoord); int i1 = MathHelper.floor_double(par1Vec3.yCoord); int j1 = MathHelper.floor_double(par1Vec3.zCoord); - Block block = worldObj.getBlock(l, i1, j1); - int l1 = worldObj.getBlockMetadata(l, i1, j1); + BlockPos pos = new BlockPos(l, i1, j1); + IBlockState state = worldObj.getBlockState(pos); + Block block = state.getBlock(); - if (block != null && (!par4 || block == null || block.getCollisionBoundingBoxFromPool(worldObj, l, i1, j1) != null) && block != Blocks.air && block.canCollideCheck(l1, par3)) { - MovingObjectPosition movingobjectposition = block.collisionRayTrace(worldObj, l, i1, j1, par1Vec3, par2Vec3); + if (block != null && (!par4 || block == null || block.getCollisionBoundingBox(worldObj, pos, state) != null) && block != Blocks.air && block.canCollideCheck(state, par3)) { + MovingObjectPosition movingobjectposition = block.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); if (movingobjectposition != null) return movingobjectposition; @@ -290,54 +291,52 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { b0 = 4; else b0 = 5; - par1Vec3.xCoord = d0; - par1Vec3.yCoord += d7 * d3; - par1Vec3.zCoord += d8 * d3; + par1Vec3 = new Vec3(d0, par1Vec3.yCoord + (d7 * d3), par1Vec3.zCoord + (d8 * d3)); } else if (d4 < d5) { if (j > i1) b0 = 0; else b0 = 1; - par1Vec3.xCoord += d6 * d4; - par1Vec3.yCoord = d1; - par1Vec3.zCoord += d8 * d4; + par1Vec3 = new Vec3(par1Vec3.xCoord + (d6 * d4), d1, par1Vec3.zCoord + (d8 * d4)); } else { if (k > j1) b0 = 2; else b0 = 3; - par1Vec3.xCoord += d6 * d5; - par1Vec3.yCoord += d7 * d5; - par1Vec3.zCoord = d2; + par1Vec3 = new Vec3(par1Vec3.xCoord + (d6 * d5), par1Vec3.yCoord + (d7 * d5), d2); } Vec3 vec32 = new Vector3(par1Vec3.xCoord, par1Vec3.yCoord, par1Vec3.zCoord).toVec3D(); - l = (int)(vec32.xCoord = MathHelper.floor_double(par1Vec3.xCoord)); + vec32 = new Vec3(MathHelper.floor_double(par1Vec3.xCoord), vec32.yCoord, vec32.zCoord); + l = ((int) vec32.xCoord); if (b0 == 5) { --l; - ++vec32.xCoord; + vec32 = vec32.addVector(1, 0, 0); } - i1 = (int)(vec32.yCoord = MathHelper.floor_double(par1Vec3.yCoord)); + vec32 = new Vec3(vec32.xCoord, MathHelper.floor_double(par1Vec3.yCoord), vec32.zCoord); + i1 = ((int) vec32.yCoord); if (b0 == 1) { --i1; - ++vec32.yCoord; + vec32 = vec32.addVector(0, 1, 0); } - j1 = (int)(vec32.zCoord = MathHelper.floor_double(par1Vec3.zCoord)); + vec32 = new Vec3(par1Vec3.xCoord, vec32.yCoord, MathHelper.floor_double(vec32.zCoord)); + j1 = ((int) vec32.zCoord); if (b0 == 3) { --j1; - ++vec32.zCoord; + vec32 = vec32.addVector(0, 0, 1); } - Block block1 = worldObj.getBlock(l, i1, j1); - int j2 = worldObj.getBlockMetadata(l, i1, j1); + BlockPos pos1 = new BlockPos(l, i1, j1); + IBlockState state1 = worldObj.getBlockState(pos1); + Block block1 = state1.getBlock(); - if ((!par4 || block1 == null || block1.getCollisionBoundingBoxFromPool(worldObj, l, i1, j1) != null) && block1 != Blocks.air && block1.canCollideCheck(j2, par3)) { - MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(worldObj, l, i1, j1, par1Vec3, par2Vec3); + if ((!par4 || block1 == null || block1.getCollisionBoundingBox(worldObj, pos1, state) != null) && block1 != Blocks.air && block1.canCollideCheck(state, par3)) { + MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(worldObj, pos1, par1Vec3, par2Vec3); if (movingobjectposition1 != null) return movingobjectposition1; @@ -467,7 +466,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); int z = par1nbtTagCompound.getInteger(TAG_SPREADER_Z); - setBurstSourceCoords(x); + setBurstSourceCoords(new BlockPos(x, y, z)); double lastMotionX = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_X); double lastMotionY = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_Y); @@ -569,8 +568,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { boolean dead = false; if(movingobjectposition.entityHit == null) { - TileEntity tile = worldObj.getTileEntity(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); - Block block = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + TileEntity tile = worldObj.getTileEntity(movingobjectposition.getBlockPos()); + Block block = worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock(); if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) return; @@ -579,15 +578,15 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return; BlockPos coords = getBurstSourceBlockPos(); - if(tile != null && (tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ)) + if(tile != null && !tile.getPos().equals(coords)) collidedTile = tile; - if(tile == null || tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ) { + if(tile == null || !tile.getPos().equals(coords)) { if(!fake && !noParticles && (!worldObj.isRemote || tile instanceof IClientManaHandler) && tile != null && tile instanceof IManaReceiver && ((IManaReceiver) tile).canRecieveManaFromBursts()) - onRecieverImpact((IManaReceiver) tile, tile.xCoord, tile.yCoord, tile.zCoord); + onRecieverImpact((IManaReceiver) tile, tile.getPos()); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, , movingobjectposition.blockX); + ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.getBlockPos()); boolean ghost = tile instanceof IManaCollisionGhost; dead = !ghost; @@ -602,8 +601,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(lens != null) dead = lens.collideBurst(this, movingobjectposition, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); - if(collided && !hasAlreadyCollidedAt(movingobjectposition.blockX)) - alreadyCollidedAt.add(getCollisionLocString(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ)); + if(collided && !hasAlreadyCollidedAt(movingobjectposition.getBlockPos())) + alreadyCollidedAt.add(getCollisionLocString(movingobjectposition.getBlockPos())); if(dead && !isDead) { if(!fake) { @@ -744,9 +743,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public void setBurstSourceCoords(BlockPos pos) { - dataWatcher.updateObject(coordsStart, x); - dataWatcher.updateObject(coordsStart + 1, y); - dataWatcher.updateObject(coordsStart + 2, z); + dataWatcher.updateObject(coordsStart, pos.getX()); + dataWatcher.updateObject(coordsStart + 1, pos.getY()); + dataWatcher.updateObject(coordsStart + 2, pos.getZ()); } @Override @@ -787,7 +786,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public boolean hasAlreadyCollidedAt(BlockPos pos) { - return alreadyCollidedAt.contains(getCollisionLocString(x, y, z)); + return alreadyCollidedAt.contains(getCollisionLocString(pos)); } @Override @@ -796,8 +795,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { alreadyCollidedAt.add(getCollisionLocString(pos)); } - private String getCollisionLocString(int x, int y, int z) { - return x + ":" + y + ":" + z; + private String getCollisionLocString(BlockPos pos) { + return pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 8d050076e..843ff697a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -32,7 +33,7 @@ public class EntityPinkWither extends EntityWither { double d10 = func_82214_u(j); double d2 = func_82208_v(j); double d4 = func_82213_w(j); - worldObj.spawnParticle("heart", d10 + rand.nextGaussian() * 0.30000001192092896D, d2 + rand.nextGaussian() * 0.30000001192092896D, d4 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.HEART, d10 + rand.nextGaussian() * 0.30000001192092896D, d2 + rand.nextGaussian() * 0.30000001192092896D, d4 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 2368bebc4..1fcbf63cf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -21,9 +21,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.common.block.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; @@ -90,7 +90,7 @@ public class EntityPoolMinecart extends EntityMinecart { if(tile != null && tile instanceof IManaPool && !pump.hasRedstone) { IManaPool pool = (IManaPool) tile; - EnumFacing pumpDir = ForgeDirection.getOrientation(meta); + EnumFacing pumpDir = ((EnumFacing) worldObj.getBlockState(posP).getValue(BotaniaStateProps.CARDINALS)); boolean did = false; boolean can = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 5fea97229..48d496cde 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -21,9 +21,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -62,7 +63,7 @@ public class EntityThornChakram extends EntityThrowable { double r = 0.1; double m = 0.1; for(int i = 0; i < 3; i++) - worldObj.spawnParticle("flame", posX + r * (Math.random() - 0.5), posY + r * (Math.random() - 0.5), posZ + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); + worldObj.spawnParticle(EnumParticleTypes.FLAME, posX + r * (Math.random() - 0.5), posY + r * (Math.random() - 0.5), posZ + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); } int bounces = getTimesBounced(); @@ -110,8 +111,8 @@ public class EntityThornChakram extends EntityThrowable { if(noClip) return; - Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + worldObj.getTileEntity(pos.getBlockPos()); if(block instanceof BlockBush || block instanceof BlockLeaves) return; @@ -127,8 +128,8 @@ public class EntityThornChakram extends EntityThrowable { int bounces = getTimesBounced(); if(bounces < MAX_BOUNCES) { Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); - ForgeDirection dir = ForgeDirection.getOrientation(pos.sideHit); - Vector3 normalVector = new Vector3(dir.offsetX, dir.offsetY, dir.offsetZ).normalize(); + EnumFacing dir = pos.sideHit; + Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); motionX = movementVec.x; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 42faf7b77..cfe0e0dfe 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -40,7 +40,7 @@ public class EntityThrownItem extends EntityItem { } @Override - public boolean isEntityInvulnerable() { + public boolean isEntityInvulnerable(DamageSource source) { return true; } @@ -56,7 +56,7 @@ public class EntityThrownItem extends EntityItem { if (!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; for (int j = 0; j < list.size(); ++j) @@ -66,7 +66,7 @@ public class EntityThrownItem extends EntityItem { if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || delayBeforeCanPickup == 0)) { float f = 1.0F; - AxisAlignedBB axisalignedbb = entity1.boundingBox.expand(f, f, f); + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); if (movingobjectposition1 != null) @@ -90,7 +90,7 @@ public class EntityThrownItem extends EntityItem { if (movingobjectposition != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ) == Blocks.portal) + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { setInPortal(); } From 0a7268fc9819ab1f58425dde152505b834839d34 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 00:09:29 -0600 Subject: [PATCH 042/935] Move botaniaStateProps and all state enums into the api so others can use them to set our blockstates --- .../state}/BotaniaStateProps.java | 11 ++++++----- .../botania/api/state/enums/AltGrassType.java | 19 +++++++++++++++++++ .../botania/common/block/BlockAltGrass.java | 19 ++----------------- .../botania/common/block/BlockAvatar.java | 4 +--- .../botania/common/block/BlockEnderEye.java | 2 +- .../botania/common/block/BlockFelPumpkin.java | 5 +---- .../common/block/BlockIncensePlate.java | 3 +-- .../botania/common/block/BlockModFlower.java | 5 +---- .../common/block/BlockSpecialFlower.java | 2 +- .../botania/common/block/mana/BlockPump.java | 2 +- .../common/block/string/BlockRedString.java | 2 +- .../common/entity/EntityPoolMinecart.java | 2 +- 12 files changed, 36 insertions(+), 40 deletions(-) rename src/main/java/vazkii/botania/{common/block => api/state}/BotaniaStateProps.java (77%) create mode 100644 src/main/java/vazkii/botania/api/state/enums/AltGrassType.java diff --git a/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java similarity index 77% rename from src/main/java/vazkii/botania/common/block/BotaniaStateProps.java rename to src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 61467c7d1..40517afd5 100644 --- a/src/main/java/vazkii/botania/common/block/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -1,22 +1,23 @@ -package vazkii.botania.common.block; +package vazkii.botania.api.state; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import vazkii.botania.api.state.enums.AltGrassType; /** - * Holds all Botania block state properties + * Holds all Botania block state properties. Use these to set botania blockstates */ public class BotaniaStateProps { - /** Common properties to all blocks **/ + /** Common properties to all blocks to use **/ // The 16 Minecraft colors public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); - // Only the four cardinal directions + // The four cardinal directions public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); // All 6 directions @@ -31,7 +32,7 @@ public class BotaniaStateProps { /** Properties for individual blocks **/ // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", BlockAltGrass.AltGrassType.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassType.class); private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java new file mode 100644 index 000000000..5bbd19241 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java @@ -0,0 +1,19 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AltGrassType implements IStringSerializable { + DRY, + GOLDEN, + VIVID, + SCORCHED, + INFUSED, + MUTATED; + + @Override + public String getName() { + return this.name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 4a4d18328..7ca8db558 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block; import java.util.List; -import java.util.Locale; import java.util.Random; import net.minecraft.block.Block; @@ -19,7 +18,6 @@ import net.minecraft.block.BlockDirt; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -30,7 +28,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltGrassType; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -136,18 +135,4 @@ public class BlockAltGrass extends BlockMod { } } - public enum AltGrassType implements IStringSerializable { - DRY, - GOLDEN, - VIVID, - SCORCHED, - INFUSED, - MUTATED; - - @Override - public String getName() { - return this.name().toLowerCase(Locale.ROOT); - } - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index cb0cf1acd..8de0c3efc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -12,22 +12,20 @@ package vazkii.botania.common.block; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index fa2e53bcf..654b087eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -20,9 +20,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 125127baa..21ecc766a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -22,18 +22,15 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockFelPumpkin extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index cd2cbbe18..d7514e3ab 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -15,15 +15,14 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 345df6529..e11d5597b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -20,7 +20,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -28,9 +27,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; @@ -41,8 +40,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7309d194e..3058e0e5d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -25,7 +25,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -37,6 +36,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISpecialFlower; 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 3adb4d98c..da677ff72 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -28,7 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.BotaniaStateProps; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; 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 946d032a7..8b8daaa58 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -28,7 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.BotaniaStateProps; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1fcbf63cf..e41f83e92 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -23,7 +23,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.common.block.BotaniaStateProps; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; From 9cd7a4a0d53ece6d90e9ca71e7e5f742cf12ac54 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 00:20:11 -0600 Subject: [PATCH 043/935] Tweak multiblocks a bit --- .../api/lexicon/multiblock/Multiblock.java | 30 ++++++++++--------- .../api/lexicon/multiblock/MultiblockSet.java | 23 ++++++-------- .../multiblock/component/FlowerComponent.java | 4 +-- .../core/handler/MultiblockRenderHandler.java | 9 ++---- .../client/core/proxy/ClientProxy.java | 3 +- .../common/lexicon/page/PageMultiblock.java | 4 +-- 6 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 5fb58cc00..fc317116f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -10,14 +10,12 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import java.util.*; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; /** @@ -125,17 +123,21 @@ public class Multiblock { * to render this multiblock in the world relevant to the 4 cardinal * orientations. */ - public Multiblock[] createRotations() { - Multiblock[] blocks = new Multiblock[4]; - blocks[0] = this; - blocks[1] = blocks[0].copy(); - blocks[1].rotate(Math.PI / 2); - blocks[2] = blocks[1].copy(); - blocks[2].rotate(Math.PI / 2); - blocks[3] = blocks[2].copy(); - blocks[3].rotate(Math.PI / 2); + public Map createRotations() { + Map ret = new EnumMap(EnumFacing.class); - return blocks; + ret.put(EnumFacing.SOUTH, this); + + ret.put(EnumFacing.WEST, ret.get(EnumFacing.SOUTH).copy()); + ret.get(EnumFacing.WEST).rotate(Math.PI / 2); + + ret.put(EnumFacing.NORTH, ret.get(EnumFacing.WEST).copy()); + ret.get(EnumFacing.NORTH).rotate(Math.PI / 2); + + ret.put(EnumFacing.EAST, ret.get(EnumFacing.NORTH).copy()); + ret.get(EnumFacing.EAST).rotate(Math.PI / 2); + + return ret; } /** diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index c0435f81e..b5f967681 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -11,33 +11,28 @@ package vazkii.botania.api.lexicon.multiblock; import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; +import java.util.Collections; +import java.util.Map; + /** * A set of Multiblock objects for various rotations. */ public class MultiblockSet { - private final Multiblock[] mbs; - - public MultiblockSet(Multiblock[] mbs) { - this.mbs = mbs; - } + private final Map mbs; public MultiblockSet(Multiblock mb) { - this(mb.createRotations()); + mbs = Collections.unmodifiableMap(mb.createRotations()); } public Multiblock getForEntity(Entity e) { - return getForRotation(e.rotationYaw); + return getForFacing(e.getHorizontalFacing()); } - public Multiblock getForRotation(double rotation) { - int facing = MathHelper.floor_double(rotation * 4.0 / 360.0 + 0.5) & 3; - return getForIndex(facing); - } - - public Multiblock getForIndex(int index) { - return mbs[Math.min(mbs.length - 1, index)]; + public Multiblock getForFacing(EnumFacing facing) { + return mbs.get(facing); } } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index d59a92e56..61b043ec9 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -25,8 +25,8 @@ public class FlowerComponent extends ColorSwitchingComponent { } @Override - public boolean matches(World world, int x, int y, int z) { - return BotaniaAPI.internalHandler.isBotaniaFlower(, world, , x); + public boolean matches(World world, BlockPos pos) { + return BotaniaAPI.internalHandler.isBotaniaFlower(world, pos); } @Override 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 5cc477999..93d306431 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -17,12 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.ChatStyle; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -79,7 +74,7 @@ public final class MultiblockRenderHandler { int anchorZ = anchor != null ? anchor.posZ : src.blockZ; rendering = true; - Multiblock mb = anchor != null ? currentMultiblock.getForIndex(angle) : currentMultiblock.getForEntity(player); + Multiblock mb = anchor != null ? currentMultiblock.getForFacing(EnumFacing.getHorizontal(angle)) : currentMultiblock.getForEntity(player); boolean didAny = false; blockAccess.update(player.worldObj, mb, anchorX, anchorY, anchorZ); 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 88da34f46..da93655bf 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; @@ -427,7 +428,7 @@ public class ClientProxy extends CommonProxy { public void removeSextantMultiblock() { MultiblockSet set = MultiblockRenderHandler.currentMultiblock; if(set != null) { - Multiblock mb = set.getForIndex(0); + Multiblock mb = set.getForFacing(EnumFacing.SOUTH); if(mb instanceof MultiblockSextant) MultiblockRenderHandler.setMultiblock(null); } 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 8e77d8787..c9a17ab4f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -18,11 +18,11 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -49,7 +49,7 @@ public class PageMultiblock extends LexiconPage { public PageMultiblock(String unlocalizedName, MultiblockSet set) { super(unlocalizedName); - mb = set.getForIndex(0); + mb = set.getForFacing(EnumFacing.SOUTH); this.set = set; } From 2dae52a9ff488f8a8a2f2df39da83f2c35515e30 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 00:50:46 -0600 Subject: [PATCH 044/935] Full GLStatemanager substitution --- .../botania/api/item/IBaubleRender.java | 5 +- .../core/handler/BaubleRenderHandler.java | 39 +-- .../client/core/handler/BossBarHandler.java | 9 +- .../core/handler/BoundTileRenderer.java | 29 +- .../handler/ContributorFancinessHandler.java | 70 ++-- .../client/core/handler/HUDHandler.java | 61 ++-- .../handler/ItemsRemainingRenderHandler.java | 27 +- .../client/core/handler/LightningHandler.java | 19 +- .../core/handler/MultiblockRenderHandler.java | 32 +- .../core/handler/RedStringRenderer.java | 27 +- .../handler/SubTileRadiusRenderHandler.java | 34 +- .../TooltipAdditionDisplayHandler.java | 41 +-- .../client/core/helper/RenderHelper.java | 101 +++--- .../vazkii/botania/client/fx/FXSparkle.java | 2 +- .../java/vazkii/botania/client/fx/FXWisp.java | 6 +- .../client/fx/ParticleRenderDispatcher.java | 19 +- .../botania/client/gui/bag/GuiFlowerBag.java | 2 +- .../client/gui/crafting/GuiCraftingHalo.java | 2 +- .../client/gui/lexicon/GuiLexicon.java | 40 +-- .../gui/lexicon/GuiLexiconChallenge.java | 4 +- .../client/gui/lexicon/GuiLexiconIndex.java | 16 +- .../lexicon/button/GuiButtonAchievement.java | 2 +- .../gui/lexicon/button/GuiButtonBack.java | 2 +- .../gui/lexicon/button/GuiButtonCategory.java | 14 +- .../button/GuiButtonChallengeIcon.java | 8 +- .../lexicon/button/GuiButtonChallenges.java | 2 +- .../gui/lexicon/button/GuiButtonDoot.java | 6 +- .../lexicon/button/GuiButtonInvisible.java | 18 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonOptions.java | 2 +- .../gui/lexicon/button/GuiButtonPage.java | 2 +- .../gui/lexicon/button/GuiButtonShare.java | 2 +- .../button/GuiButtonUpdateWarning.java | 2 +- .../lexicon/button/GuiButtonViewOnline.java | 2 +- .../integration/nei/RecipeHandlerBrewery.java | 2 +- .../nei/RecipeHandlerElvenTrade.java | 6 +- .../nei/RecipeHandlerManaPool.java | 4 +- .../nei/RecipeHandlerPetalApothecary.java | 4 +- .../nei/RecipeHandlerPureDaisy.java | 4 +- .../botania/client/model/ModelBellows.java | 12 +- .../botania/client/model/ModelBrewery.java | 32 +- .../botania/client/model/ModelHourglass.java | 33 +- .../client/model/ModelSpinningCubes.java | 32 +- .../client/render/block/RenderAltar.java | 8 +- .../client/render/block/RenderAvatar.java | 6 +- .../client/render/block/RenderBellows.java | 8 +- .../client/render/block/RenderBrewery.java | 8 +- .../client/render/block/RenderCocoon.java | 6 +- .../block/RenderCorporeaCrystalCube.java | 10 +- .../render/block/RenderCorporeaIndex.java | 8 +- .../client/render/block/RenderHourglass.java | 10 +- .../render/block/RenderIncensePlate.java | 8 +- .../client/render/block/RenderPool.java | 6 +- .../client/render/block/RenderPump.java | 6 +- .../client/render/block/RenderPylon.java | 6 +- .../render/block/RenderSpawnerClaw.java | 6 +- .../client/render/block/RenderSpreader.java | 6 +- .../render/block/RenderTeruTeruBozu.java | 6 +- .../client/render/block/RenderTinyPotato.java | 6 +- .../render/entity/RenderBabylonWeapon.java | 46 +-- .../render/entity/RenderCorporeaSpark.java | 31 +- .../client/render/entity/RenderManaStorm.java | 11 +- .../client/render/entity/RenderPixie.java | 14 +- .../client/render/entity/RenderSparkBase.java | 36 +- .../render/entity/RenderThornChakram.java | 16 +- .../botania/client/render/item/RenderBow.java | 28 +- .../render/item/RenderFloatingFlowerItem.java | 16 +- .../client/render/item/RenderLens.java | 36 +- .../client/render/item/RenderLexicon.java | 32 +- .../render/item/RenderTransparentItem.java | 22 +- .../render/tile/RenderTileAlfPortal.java | 42 +-- .../client/render/tile/RenderTileAltar.java | 68 ++-- .../client/render/tile/RenderTileAvatar.java | 54 +-- .../client/render/tile/RenderTileBellows.java | 22 +- .../client/render/tile/RenderTileBrewery.java | 40 +-- .../client/render/tile/RenderTileCocoon.java | 24 +- .../tile/RenderTileCorporeaCrystalCube.java | 54 +-- .../render/tile/RenderTileCorporeaIndex.java | 22 +- .../render/tile/RenderTileEnchanter.java | 42 +-- .../render/tile/RenderTileFloatingFlower.java | 32 +- .../render/tile/RenderTileHourglass.java | 20 +- .../render/tile/RenderTileIncensePlate.java | 40 +-- .../render/tile/RenderTileLightRelay.java | 39 +-- .../client/render/tile/RenderTilePool.java | 70 ++-- .../client/render/tile/RenderTilePrism.java | 14 +- .../client/render/tile/RenderTilePump.java | 22 +- .../client/render/tile/RenderTilePylon.java | 66 ++-- .../render/tile/RenderTileRuneAltar.java | 56 ++-- .../render/tile/RenderTileSkullOverride.java | 22 +- .../render/tile/RenderTileSparkChanger.java | 26 +- .../render/tile/RenderTileSpawnerClaw.java | 18 +- .../render/tile/RenderTileSpreader.java | 68 ++-- .../render/tile/RenderTileStarfield.java | 151 +++++---- .../render/tile/RenderTileTerraPlate.java | 28 +- .../render/tile/RenderTileTeruTeruBozu.java | 32 +- .../render/tile/RenderTileTinyPotato.java | 310 +++++++++--------- .../botania/common/block/BlockOpenCrate.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 6 +- .../functional/SubTileRannuncarpus.java | 8 +- .../subtile/generating/SubTileSpectrolus.java | 8 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/mana/TilePool.java | 10 +- .../common/block/tile/mana/TileSpreader.java | 18 +- .../common/block/tile/mana/TileTurntable.java | 6 +- .../common/entity/EntityDoppleganger.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 56 ++-- .../botania/common/item/ItemSextant.java | 6 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 12 +- .../equipment/bauble/ItemBaubleCosmetic.java | 117 +++---- .../equipment/bauble/ItemBloodPendant.java | 8 +- .../item/equipment/bauble/ItemDivaCharm.java | 8 +- .../equipment/bauble/ItemFlightTiara.java | 93 +++--- .../equipment/bauble/ItemGoldenLaurel.java | 12 +- .../item/equipment/bauble/ItemHolyCloak.java | 4 +- .../item/equipment/bauble/ItemIcePendant.java | 8 +- .../item/equipment/bauble/ItemItemFinder.java | 8 +- .../equipment/bauble/ItemKnockbackBelt.java | 4 +- .../equipment/bauble/ItemLavaPendant.java | 8 +- .../item/equipment/bauble/ItemMonocle.java | 8 +- .../bauble/ItemSuperLavaPendant.java | 8 +- .../item/equipment/bauble/ItemTinyPlanet.java | 4 +- .../item/equipment/bauble/ItemTravelBelt.java | 4 +- .../common/item/relic/ItemFlugelEye.java | 38 +-- .../lexicon/page/PageCraftingRecipe.java | 14 +- .../common/lexicon/page/PageElvenRecipe.java | 8 +- .../common/lexicon/page/PageEntity.java | 21 +- .../common/lexicon/page/PageImage.java | 8 +- .../common/lexicon/page/PageLoreText.java | 8 +- .../lexicon/page/PageManaInfusionRecipe.java | 14 +- .../common/lexicon/page/PageMultiblock.java | 34 +- .../common/lexicon/page/PagePetalRecipe.java | 8 +- .../common/lexicon/page/PageRecipe.java | 23 +- .../common/lexicon/page/PageRuneRecipe.java | 6 +- .../common/lexicon/page/PageShedding.java | 23 +- .../common/lexicon/page/PageTerrasteel.java | 22 +- 135 files changed, 1629 insertions(+), 1596 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 10e01be8e..b28fb1cfe 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -49,11 +50,11 @@ public interface IBaubleRender { } public static void applySneakingRotation() { - GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(28.64789F, 1.0F, 0.0F, 0.0F); } public static void translateToHeadLevel(EntityPlayer player) { - GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); + GlStateManager.translate(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); } } 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 f8561a9a6..dce1b15fd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -55,10 +56,10 @@ public final class BaubleRenderHandler { float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; - GL11.glPushMatrix(); - GL11.glRotatef(yawOffset, 0, -1, 0); - GL11.glRotatef(yaw - 270, 0, 1, 0); - GL11.glRotatef(pitch, 0, 0, 1); + GlStateManager.pushMatrix(); + GlStateManager.rotate(yawOffset, 0, -1, 0); + GlStateManager.rotate(yaw - 270, 0, 1, 0); + GlStateManager.rotate(pitch, 0, 0, 1); dispatchRenders(inv, event, RenderType.HEAD); ItemStack helm = player.inventory.armorItemInSlot(3); @@ -66,7 +67,7 @@ public final class BaubleRenderHandler { ItemTerrasteelHelm.renderOnPlayer(helm, event); ContributorFancinessHandler.render(event); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void dispatchRenders(InventoryBaubles inv, RenderPlayerEvent event, RenderType type) { @@ -85,19 +86,19 @@ public final class BaubleRenderHandler { ICosmeticAttachable attachable = (ICosmeticAttachable) item; ItemStack cosmetic = attachable.getCosmeticItem(stack); if(cosmetic != null) { - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, event, type); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); continue; } } if(item instanceof IBaubleRender) { - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, event, type); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } @@ -110,16 +111,16 @@ public final class BaubleRenderHandler { ItemStack stack = player.inventory.getStackInSlot(i); if(stack != null && stack.getItem() == ModItems.manaTablet) { Item item = stack.getItem(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.25F, -0.85F, renderedOne ? armor ? 0.2F : 0.28F : armor ? -0.3F : -0.25F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.25F, -0.85F, renderedOne ? armor ? 0.2F : 0.28F : armor ? -0.3F : -0.25F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; @@ -133,9 +134,9 @@ public final class BaubleRenderHandler { ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); Color color = new Color(item.getColorFromItemStack(stack, 1)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(renderedOne) return; diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index c2f4091dd..214d05554 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -14,6 +14,7 @@ import java.awt.Rectangle; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; @@ -56,15 +57,15 @@ public final class BossBarHandler { int fw = (int) ((double) fgRect.width * (currentBoss.getHealth() / currentBoss.getMaxHealth())); int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); currentBoss.bossBarRenderCallback(res, x, y); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.renderEngine.bindTexture(currentBoss.getBossBarTexture()); drawBar(x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true); drawBar(xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false); mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.enableBlend(); Entity e = (Entity) currentBoss; EntityPlayer p = mc.thePlayer; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index b18a3c518..cfea527f1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; @@ -38,10 +39,10 @@ public final class BoundTileRenderer { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.pushMatrix(); + GlStateManager.disableDepth(); + GlStateManager.disableTexture2D(); + GlStateManager.enableBlend(); Tessellator.renderingWorldRenderer = false; @@ -82,10 +83,10 @@ public final class BoundTileRenderer { } } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableDepth(); + GlStateManager.enableTexture2D(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } private void renderBlockOutlineAt(BlockPos pos, int color) { @@ -93,10 +94,10 @@ public final class BoundTileRenderer { } private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { - GL11.glPushMatrix(); - GL11.glTranslated(pos.getX() - RenderManager.renderPosX, pos.getY() - RenderManager.renderPosY, pos.getZ() - RenderManager.renderPosZ + 1); + GlStateManager.pushMatrix(); + GlStateManager.translate(pos.getX() - RenderManager.renderPosX, pos.getY() - RenderManager.renderPosY, pos.getZ() - RenderManager.renderPosZ + 1); Color colorRGB = new Color(color); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; Block block = world.getBlockState(pos).getBlock(); @@ -113,18 +114,18 @@ public final class BoundTileRenderer { axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); - GL11.glScalef(1F, 1F, 1F); + GlStateManager.scale(1F, 1F, 1F); GL11.glLineWidth(thickness); renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); renderBlockOutline(axis); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void renderBlockOutline(AxisAlignedBB aabb) { 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 81153953f..cdd13ed2d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -86,7 +86,7 @@ public final class ContributorFancinessHandler { } private static void renderTwintails(RenderPlayerEvent event) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); IIcon icon = ((ItemManaResource) ModItems.manaResource).tailIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); @@ -94,82 +94,82 @@ public final class ContributorFancinessHandler { float f3 = icon.getMaxV(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); float t = 0.13F; - GL11.glTranslatef(t, -0.5F, -0.1F); + GlStateManager.translate(t, -0.5F, -0.1F); if(event.entityPlayer.motionY < 0) - GL11.glRotatef((float) event.entityPlayer.motionY * 20F, 1F, 0F, 0F); + GlStateManager.rotate((float) event.entityPlayer.motionY * 20F, 1F, 0F, 0F); float r = -18F + (float) Math.sin((ClientTickHandler.ticksInGame + event.partialRenderTick) * 0.05F) * 2F; - GL11.glRotatef(r, 0F, 0F, 1F); + GlStateManager.rotate(r, 0F, 0F, 1F); float s = 0.9F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glRotatef(-r, 0F, 0F, 1F); - GL11.glTranslatef(-t, -0F, 0F); - GL11.glScalef(-1F, 1F, 1F); - GL11.glTranslatef(t, -0F, 0F); - GL11.glRotatef(r, 0F, 0F, 1F); + GlStateManager.rotate(-r, 0F, 0F, 1F); + GlStateManager.translate(-t, -0F, 0F); + GlStateManager.scale(-1F, 1F, 1F); + GlStateManager.translate(t, -0F, 0F); + GlStateManager.rotate(r, 0F, 0F, 1F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private static void renderPhiFlower(RenderPlayerEvent event) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); IIcon icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); Helper.translateToHeadLevel(event.entityPlayer); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.4F, 0.1F, -0.25F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.4F, 0.1F, -0.25F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glScalef(0.4F, 0.4F, 0.4F); - GL11.glTranslatef(-1.2F, 0.2F, 0.125F); - GL11.glRotatef(20F, 1F, 0F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.scale(0.4F, 0.4F, 0.4F); + GlStateManager.translate(-1.2F, 0.2F, 0.125F); + GlStateManager.rotate(20F, 1F, 0F, 0F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private static void renderGoldfish(RenderPlayerEvent event) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); IIcon icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); Helper.rotateIfSneaking(event.entityPlayer); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.75F, 0.5F, 0F); - GL11.glScalef(0.4F, 0.4F, 0.4F); - GL11.glTranslatef(1.2F, 0.5F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.75F, 0.5F, 0F); + GlStateManager.scale(0.4F, 0.4F, 0.4F); + GlStateManager.translate(1.2F, 0.5F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private static void renderFlower(RenderPlayerEvent event, IIcon icon) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(-0.5F, 0.7F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(-0.5F, 0.7F, 0F); ShaderHelper.useShader(ShaderHelper.gold); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); ShaderHelper.releaseShader(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public static class ThreadContributorListLoader extends Thread { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 0e5f403eb..1d58de36f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -20,6 +20,7 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -206,7 +207,7 @@ public final class HUDHandler { profiler.endSection(); profiler.endSection(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } } @@ -225,10 +226,10 @@ public final class HUDHandler { int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.fontRendererObj.drawStringWithShadow(disp, x, y, color); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } profiler.endSection(); } @@ -252,13 +253,13 @@ public final class HUDHandler { } Color color = new Color(Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F)); - GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); mc.renderEngine.bindTexture(manaBar); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { @@ -280,12 +281,12 @@ public final class HUDHandler { } int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.renderEngine.bindTexture(manaBar); RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); @@ -298,8 +299,8 @@ public final class HUDHandler { mc.fontRendererObj.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, y + 20, 0xFF8888); } - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); break; } @@ -326,7 +327,7 @@ public final class HUDHandler { mc.fontRendererObj.drawStringWithShadow(target.getDisplayName(), w / 2 + 30, h / 2 - 10, 0x6666FF); mc.fontRendererObj.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(target, w / 2 + 10, h / 2 - 10); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } @@ -344,8 +345,8 @@ public final class HUDHandler { String drawStr = ""; String secondLine = ""; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int sx = res.getScaledWidth() / 2 - 17; int sy = res.getScaledHeight() / 2 + 2; @@ -384,19 +385,19 @@ public final class HUDHandler { } mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); font.drawStringWithShadow(drawStr, sx + 10, sy + 8, 0xFFFFFFFF); font.drawStringWithShadow(secondLine, sx + 10, sy + 18, 0xFFAAAAAA); if(!mc.thePlayer.isSneaking()) { - GL11.glScalef(0.5F, 0.5F, 1F); + GlStateManager.scale(0.5F, 0.5F, 1F); mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); - GL11.glScalef(2F, 2F, 1F); + GlStateManager.scale(2F, 2F, 1F); } } - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.disableBlend(); + GlStateManager.color(1F, 1F, 1F, 1F); profiler.endSection(); } @@ -413,7 +414,7 @@ public final class HUDHandler { Gui.drawRect(x - 6, y - 6, x + l + 6, y + 37, 0x44000000); Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x44000000); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(ModBlocks.corporeaIndex), x, y + 10); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); @@ -423,8 +424,8 @@ public final class HUDHandler { } public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft mc = Minecraft.getMinecraft(); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(name) / 2; int y = res.getScaledHeight() / 2 + 10; @@ -443,7 +444,7 @@ public final class HUDHandler { mc.fontRendererObj.drawString(text, x, y, color); } - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } public static void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { @@ -455,11 +456,11 @@ public final class HUDHandler { int y = res.getScaledHeight() / 2 + 12; net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(bindDisplay, x, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); if(properlyBound) { mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00); mc.fontRendererObj.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D); @@ -467,13 +468,13 @@ public final class HUDHandler { mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000); mc.fontRendererObj.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D); } - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableDepth(); } public static void renderManaBar(int x, int y, int color, float alpha, int mana, int maxMana) { Minecraft mc = Minecraft.getMinecraft(); - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); mc.renderEngine.bindTexture(manaBar); RenderHelper.drawTexturedModalRect(x, y, 0, 0, 0, 102, 5); @@ -485,7 +486,7 @@ public final class HUDHandler { RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3); Color color_ = new Color(color); - GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); + GlStateManager.color((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 7e9a456a4..55c951968 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -14,6 +14,7 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; @@ -45,22 +46,22 @@ public final class ItemsRemainingRenderHandler { int start = maxTicks - leaveTicks; float alpha = ticks + partTicks > start ? 1F : (ticks + partTicks) / start; - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.enableBlend(); + GlStateManager.enableRescaleNormal(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); RenderHelper.enableGUIStandardItemLighting(); int xp = x + (int) (16F * (1F - alpha)); - GL11.glTranslatef(xp, y, 0F); - GL11.glScalef(alpha, 1F, 1F); + GlStateManager.translate(xp, y, 0F); + GlStateManager.scale(alpha, 1F, 1F); mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 0, 0); - GL11.glScalef(1F / alpha,1F, 1F); - GL11.glTranslatef(-xp, -y, 0F); + GlStateManager.scale(1F / alpha,1F, 1F); + GlStateManager.translate(-xp, -y, 0F); RenderHelper.disableStandardItemLighting(); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); String text = EnumChatFormatting.GREEN + stack.getDisplayName(); if(count >= 0) { @@ -77,8 +78,8 @@ public final class ItemsRemainingRenderHandler { int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24; mc.fontRendererObj.drawStringWithShadow(text, x + 20, y + 6, color); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.disableBlend(); + GlStateManager.enableAlpha(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index ee4faeb75..a67c672d1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; @@ -74,14 +75,14 @@ public class LightningHandler { interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame; interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame; - GL11.glPushMatrix(); - GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ); + GlStateManager.pushMatrix(); + GlStateManager.translate(-interpPosX, -interpPosY, -interpPosZ); Tessellator tessellator = Tessellator.getInstance(); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); ParticleRenderDispatcher.lightningCount = 0; @@ -99,11 +100,11 @@ public class LightningHandler { renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true); tessellator.draw(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); + GlStateManager.disableBlend(); + GlStateManager.depthMask(true); - GL11.glTranslated(interpPosX, interpPosY, interpPosZ); - GL11.glPopMatrix(); + GlStateManager.translate(interpPosX, interpPosY, interpPosZ); + GlStateManager.popMatrix(); profiler.endSection(); profiler.endSection(); 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 93d306431..7d5c0d922 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -99,16 +99,16 @@ public final class MultiblockRenderHandler { if(anchor != null && comp.matches(world, x, y, z)) return false; - GL11.glPushMatrix(); - GL11.glTranslated(-RenderManager.renderPosX, -RenderManager.renderPosY, -RenderManager.renderPosZ); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.pushMatrix(); + GlStateManager.translate(-RenderManager.renderPosX, -RenderManager.renderPosY, -RenderManager.renderPosZ); + GlStateManager.disableDepth(); doRenderComponent(mb, comp, x, y, z, 0.4F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); return true; } public static void renderMultiblockOnPage(Multiblock mb) { - GL11.glTranslated(-0.5, -0.5, -0.5); + GlStateManager.translate(-0.5, -0.5, -0.5); blockAccess.update(null, mb, mb.offX, mb.offY, mb.offZ); for(MultiblockComponent comp : mb.getComponents()) { BlockPos pos = comp.getRelativePosition(); @@ -117,9 +117,9 @@ public final class MultiblockRenderHandler { } private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, int x, int y, int z, float alpha) { - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Block block = comp.getBlock(); int meta = comp.getMeta(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); @@ -127,10 +127,10 @@ public final class MultiblockRenderHandler { if(block == null) return; if(IMultiblockRenderHook.renderHooks.containsKey(block)) { - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(block); if(renderHook.needsTranslate(block)) { - GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); } renderHook.renderBlockForMultiblock(blockAccess, mb, block, comp.getMeta(), blockRender, comp, alpha); } @@ -140,7 +140,7 @@ public final class MultiblockRenderHandler { float red = (color >> 16 & 255) / 255.0F; float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - GL11.glColor4f(red, green, blue, alpha); + GlStateManager.color(red, green, blue, alpha); IBlockAccess oldBlockAccess = blockRender.blockAccess; blockRender.blockAccess = blockAccess; Tessellator tessellator = Tessellator.getInstance(); @@ -162,13 +162,13 @@ public final class MultiblockRenderHandler { float red = (color >> 16 & 255) / 255.0F; float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - GL11.glColor4f(red, green, blue, alpha); - GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + GlStateManager.color(red, green, blue, alpha); + GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); blockRender.renderBlockAsItem(block, meta, 1F); } } - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.enableDepth(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 42a04a7f7..49987cc82 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -15,6 +15,7 @@ import java.util.Queue; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; @@ -35,14 +36,14 @@ public final class RedStringRenderer { public static void renderAll() { if(!redStringTiles.isEmpty()) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); boolean lighting = GL11.glGetBoolean(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.disableTexture2D(); + GlStateManager.enableBlend(); if(lighting) - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 0F, 0F, sizeAlpha); + GlStateManager.disableLighting(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 0F, 0F, sizeAlpha); Tessellator.renderingWorldRenderer = false; TileRedString tile; @@ -50,10 +51,10 @@ public final class RedStringRenderer { renderTile(tile); if(lighting) - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableLighting(); + GlStateManager.enableTexture2D(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } } @@ -72,8 +73,8 @@ public final class RedStringRenderer { BlockPos bind = tile.getBinding(); if(bind != null) { - GL11.glPushMatrix(); - GL11.glTranslated(tile.getPos().getX() + 0.5 - RenderManager.renderPosX, tile.getPos().getY() + 0.5 - RenderManager.renderPosY, tile.getPos().getZ() + 0.5 - RenderManager.renderPosZ); + GlStateManager.pushMatrix(); + GlStateManager.translate(tile.getPos().getX() + 0.5 - RenderManager.renderPosX, tile.getPos().getY() + 0.5 - RenderManager.renderPosY, tile.getPos().getZ() + 0.5 - RenderManager.renderPosZ); Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ()); Vector3 vecNorm = vecOrig.copy().normalize(); Vector3 vecMag = vecNorm.copy().multiply(0.025); @@ -98,7 +99,7 @@ public final class RedStringRenderer { tessellator.draw(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index eaf0e756b..74829d143 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -62,10 +62,10 @@ public final class SubTileRadiusRenderHandler { if(descriptor == null) return; - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.disableTexture2D(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Tessellator.renderingWorldRenderer = false; @@ -73,18 +73,18 @@ public final class SubTileRadiusRenderHandler { renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); else renderRectangle(descriptor.getAABB()); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableTexture2D(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } public void renderRectangle(AxisAlignedBB aabb) { - GL11.glPushMatrix(); - GL11.glTranslated(aabb.minX - RenderManager.renderPosX, aabb.minY - RenderManager.renderPosY, aabb.minZ - RenderManager.renderPosZ); + GlStateManager.pushMatrix(); + GlStateManager.translate(aabb.minX - RenderManager.renderPosX, aabb.minY - RenderManager.renderPosY, aabb.minZ - RenderManager.renderPosZ); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; double x = aabb.maxX - aabb.minX - f; @@ -101,7 +101,7 @@ public final class SubTileRadiusRenderHandler { x += f; z += f; double f1 = f + f / 4F; - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().startDrawingQuads(); tessellator.getWorldRenderer().addVertex(x, f1, 0); tessellator.getWorldRenderer().addVertex(0, f1, 0); @@ -109,19 +109,19 @@ public final class SubTileRadiusRenderHandler { tessellator.getWorldRenderer().addVertex(x, f1, z); tessellator.draw(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderCircle(BlockPos center, double radius) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); double x = center.getX() + 0.5; double y = center.getY(); double z = center.getZ() + 0.5; - GL11.glTranslated(x - RenderManager.renderPosX, y - RenderManager.renderPosY, z - RenderManager.renderPosZ); + GlStateManager.translate(x - RenderManager.renderPosX, y - RenderManager.renderPosY, z - RenderManager.renderPosZ); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; @@ -144,7 +144,7 @@ public final class SubTileRadiusRenderHandler { radius += f; double f1 = f + f / 4F; - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); tessellator.getWorldRenderer().addVertex(0, f1, 0); for(int i = 0; i < totalAngles + 1; i += step) { @@ -155,7 +155,7 @@ public final class SubTileRadiusRenderHandler { } tessellator.getWorldRenderer().addVertex(0, f1, 0); tessellator.draw(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } 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 4bb66e47e..196e344f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -20,6 +20,7 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; @@ -105,7 +106,7 @@ public final class TooltipAdditionDisplayHandler { if(lexSlot > -1) { int x = mouseX + offx - 34; int y = mouseY - offy; - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); Gui.drawRect(x - 4, y - 4, x + 20, y + 26, 0x44000000); Gui.drawRect(x - 6, y - 6, x + 22, y + 28, 0x44000000); @@ -119,17 +120,17 @@ public final class TooltipAdditionDisplayHandler { float time = 20F; float angles = lexiconLookupTime / time * 360F; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableLighting(); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glBegin(GL11.GL_TRIANGLE_FAN); float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - GL11.glColor4f(0F, 0.5F, 0F, a); + GlStateManager.color(0F, 0.5F, 0F, a); GL11.glVertex2i(cx, cy); - GL11.glColor4f(0F, 1F, 0F, 1F); + GlStateManager.color(0F, 1F, 0F, 1F); for(float i = angles; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; @@ -138,9 +139,9 @@ public final class TooltipAdditionDisplayHandler { GL11.glVertex2i(cx, cy); GL11.glEnd(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + GlStateManager.shadeModel(GL11.GL_FLAT); if(lexiconLookupTime >= time) { mc.thePlayer.inventory.currentItem = lexSlot; @@ -152,15 +153,15 @@ public final class TooltipAdditionDisplayHandler { } else lexiconLookupTime = 0F; mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, y); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); - GL11.glScalef(0.5F, 0.5F, 1F); + GlStateManager.scale(0.5F, 0.5F, 1F); boolean mac = Minecraft.isRunningOnMac; mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : (mac ? "Cmd" : "Ctrl")), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); - GL11.glScalef(2F, 2F, 1F); + GlStateManager.scale(2F, 2F, 1F); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableDepth(); } else lexiconLookupTime = 0F; } else lexiconLookupTime = 0F; } else lexiconLookupTime = 0F; @@ -178,7 +179,7 @@ public final class TooltipAdditionDisplayHandler { float huePer = width == 0 ? 0F : 1F / width; float hueOff = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.01F; - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); for(int i = 0; i < rainbowWidth; i++) Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); @@ -186,22 +187,22 @@ public final class TooltipAdditionDisplayHandler { String rank = StatCollector.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); boolean light = GL11.glGetBoolean(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { rank = StatCollector.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } if(light) - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); } private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int offx, int offy, int width, int height) { float fraction = display.getManaFractionForDisplay(stack); int manaBarWidth = (int) Math.ceil(width * fraction); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); Gui.drawRect(mouseX + offx, mouseY - offy - height, mouseX + offx + manaBarWidth, mouseY - offy, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); Gui.drawRect(mouseX + offx + manaBarWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index e06cfd831..56b99f143 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.settings.KeyBinding; @@ -82,7 +83,7 @@ public final class RenderHelper { drawGradientRect(var6 - 3, var7 - 3, z, var6 + var5 + 3, var7 - 3 + 1, color, color); drawGradientRect(var6 - 3, var7 + var9 + 2, z, var6 + var5 + 3, var7 + var9 + 3, var12, var12); - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); for (int var13 = 0; var13 < tooltipData.size(); ++var13) { String var14 = tooltipData.get(var13); fontRenderer.drawStringWithShadow(var14, var6, var7, -1); @@ -90,11 +91,11 @@ public final class RenderHelper { var7 += 2; var7 += 10; } - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableDepth(); } if(!lighting) net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } public static void drawGradientRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { @@ -106,11 +107,11 @@ public final class RenderHelper { float var12 = (par6 >> 16 & 255) / 255F; float var13 = (par6 >> 8 & 255) / 255F; float var14 = (par6 & 255) / 255F; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glShadeModel(GL11.GL_SMOOTH); + GlStateManager.disableTexture2D(); + GlStateManager.enableBlend(); + GlStateManager.disableAlpha(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.shadeModel(GL11.GL_SMOOTH); Tessellator var15 = Tessellator.getInstance(); var15.getWorldRenderer().startDrawingQuads(); var15.getWorldRenderer().setColorRGBA_F(var8, var9, var10, var7); @@ -120,10 +121,10 @@ public final class RenderHelper { var15.getWorldRenderer().addVertex(par1, par4, z); var15.getWorldRenderer().addVertex(par3, par4, z); var15.draw(); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); + GlStateManager.shadeModel(GL11.GL_FLAT); + GlStateManager.disableBlend(); + GlStateManager.enableAlpha(); + GlStateManager.enableTexture2D(); } public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { @@ -153,23 +154,23 @@ public final class RenderHelper { f2 = (f1 - 0.7F) / 0.2F; Random random = new Random(seed); - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(770, 1); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - GL11.glScalef(xScale, yScale, zScale); + GlStateManager.pushMatrix(); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 1); + GlStateManager.disableAlpha(); + GlStateManager.enableCull(); + GlStateManager.depthMask(false); + GlStateManager.scale(xScale, yScale, zScale); for (int i = 0; i < (f1 + f1 * f1) / 2F * 90F + 30F; i++) { - GL11.glRotatef(random.nextFloat() * 360F, 1F, 0F, 0F); - GL11.glRotatef(random.nextFloat() * 360F, 0F, 1F, 0F); - GL11.glRotatef(random.nextFloat() * 360F, 0F, 0F, 1F); - GL11.glRotatef(random.nextFloat() * 360F, 1F, 0F, 0F); - GL11.glRotatef(random.nextFloat() * 360F, 0F, 1F, 0F); - GL11.glRotatef(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); + GlStateManager.rotate(random.nextFloat() * 360F, 1F, 0F, 0F); + GlStateManager.rotate(random.nextFloat() * 360F, 0F, 1F, 0F); + GlStateManager.rotate(random.nextFloat() * 360F, 0F, 0F, 1F); + GlStateManager.rotate(random.nextFloat() * 360F, 1F, 0F, 0F); + GlStateManager.rotate(random.nextFloat() * 360F, 0F, 1F, 0F); + GlStateManager.rotate(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; @@ -183,24 +184,24 @@ public final class RenderHelper { tessellator.draw(); } - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glPopMatrix(); + GlStateManager.depthMask(true); + GlStateManager.disableCull(); + GlStateManager.disableBlend(); + GlStateManager.shadeModel(GL11.GL_FLAT); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.enableTexture2D(); + GlStateManager.enableAlpha(); + GlStateManager.popMatrix(); } public static void renderProgressPie(int x, int y, float progress, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); + GlStateManager.clear(GL11.GL_DEPTH_BUFFER_BIT); GL11.glEnable(GL11.GL_STENCIL_TEST); - GL11.glColorMask(false, false, false, false); - GL11.glDepthMask(false); + GlStateManager.colorMask(false, false, false, false); + GlStateManager.depthMask(false); GL11.glStencilFunc(GL11.GL_NEVER, 1, 0xFF); GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP); GL11.glStencilMask(0xFF); @@ -213,28 +214,28 @@ public final class RenderHelper { int degs = (int) (360 * progress); float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColorMask(true, true, true, true); - GL11.glDepthMask(true); + GlStateManager.disableLighting(); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.depthMask(true); GL11.glStencilMask(0x00); GL11.glStencilFunc(GL11.GL_EQUAL, 1, 0xFF); GL11.glBegin(GL11.GL_TRIANGLE_FAN); - GL11.glColor4f(0F, 0.5F, 0.5F, a); + GlStateManager.color(0F, 0.5F, 0.5F, a); GL11.glVertex2i(centerX, centerY); - GL11.glColor4f(0F, 1F, 0.5F, a); + GlStateManager.color(0F, 1F, 0.5F, a); for(int i = degs; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; GL11.glVertex2d(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r); } GL11.glVertex2i(centerX, centerY); GL11.glEnd(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_FLAT); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + GlStateManager.shadeModel(GL11.GL_FLAT); GL11.glDisable(GL11.GL_STENCIL_TEST); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 62cf9bc68..45c6d56e4 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -67,7 +67,7 @@ public class FXSparkle extends EntityFX { ParticleRenderDispatcher.sparkleFxCount = 0; ParticleRenderDispatcher.fakeSparkleFxCount = 0; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); tessellator.getWorldRenderer().startDrawingQuads(); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 1cc2a26b1..7b7ec9700 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -79,7 +79,7 @@ public class FXWisp extends EntityFX { ParticleRenderDispatcher.wispFxCount = 0; ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { @@ -90,12 +90,12 @@ public class FXWisp extends EntityFX { } if(!queuedDepthIgnoringRenders.isEmpty()) { - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); tessellator.getWorldRenderer().startDrawingQuads(); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableDepth(); } queuedRenders.clear(); diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index e0cadef6c..60b90e49b 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -12,6 +12,7 @@ package vazkii.botania.client.fx; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; @@ -33,12 +34,12 @@ public final class ParticleRenderDispatcher { boolean isLightingEnabled = GL11.glGetBoolean(GL11.GL_LIGHTING); Profiler profiler = Minecraft.getMinecraft().mcProfiler; - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); if(isLightingEnabled) - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); profiler.startSection("sparkle"); FXSparkle.dispatchQueuedRenders(tessellator); @@ -47,10 +48,10 @@ public final class ParticleRenderDispatcher { profiler.endSection(); if(isLightingEnabled) - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); + GlStateManager.enableLighting(); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); + GlStateManager.disableBlend(); + GlStateManager.depthMask(true); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 1bfbdaaa6..44b9eb0e2 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -44,7 +44,7 @@ public class GuiFlowerBag extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(texture); int k = (width - xSize) / 2; int l = (height - ySize) / 2; diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index fbc503ff6..7c88f4a74 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -35,7 +35,7 @@ public class GuiCraftingHalo extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(craftingTableGuiTextures); int k = (width - xSize) / 2; int l = (height - ySize) / 2; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 4ea0dd2af..67b8b51c1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -197,11 +197,11 @@ public class GuiLexicon extends GuiScreen { lastTime = time; partialTicks = par3; - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawNotes(par3); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); @@ -211,9 +211,9 @@ public class GuiLexicon extends GuiScreen { drawBookmark(left + guiWidth / 2, top - getTitleHeight(), getTitle(), true); String subtitle = getSubtitle(); if(subtitle != null) { - GL11.glScalef(0.5F, 0.5F, 1F); + GlStateManager.scale(0.5F, 0.5F, 1F); drawCenteredString(fontRendererObj, subtitle, left * 2 + guiWidth, (top - getTitleHeight() + 11) * 2, 0x00FF00); - GL11.glScalef(2F, 2F, 1F); + GlStateManager.scale(2F, 2F, 1F); } if(isMainPage()) @@ -225,16 +225,16 @@ public class GuiLexicon extends GuiScreen { } if(mc.thePlayer.getCommandSenderName().equals("haighyorkie")) { - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26); if(par1 >= left - 19 && par1 < left && par2 >= top + 62 && par2 < top + 88) { mc.renderEngine.bindTexture(textureToff); - GL11.glPushMatrix(); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glTranslatef(0F, 0F, 2F); + GlStateManager.pushMatrix(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.translate(0F, 0F, 2F); int w = 256; int h = 152; @@ -242,8 +242,8 @@ public class GuiLexicon extends GuiScreen { int y = (int) (top + guiHeight / 2 - h / 4 + Math.sin((ClientTickHandler.ticksInGame + par3) / 6.0) * 40); drawTexturedModalRect(x * 2, y * 2, 0, 0, w, h); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); RenderHelper.renderTooltip(par1, par2, Arrays.asList(EnumChatFormatting.GOLD + "#goldfishchris", EnumChatFormatting.AQUA + "IT SAYS MANUAL")); } @@ -253,11 +253,11 @@ public class GuiLexicon extends GuiScreen { if(hasTutorialArrow) { mc.renderEngine.bindTexture(texture); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + par3) * 0.3F) + 1) * 0.15F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + par3) * 0.3F) + 1) * 0.15F); drawTexturedModalRect(tutorialArrowX, tutorialArrowY, 20, 200, TUTORIAL_ARROW_WIDTH, TUTORIAL_ARROW_HEIGHT); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } } @@ -308,7 +308,7 @@ public class GuiLexicon extends GuiScreen { Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(x + l / 2 + 3, y - 1, 54, 180, 6, 11); if(drawLeft) drawTexturedModalRect(x - l / 2 - 9, y - 1, 61, 180, 6, 11); @@ -320,8 +320,8 @@ public class GuiLexicon extends GuiScreen { } void drawHeader() { - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); Minecraft.getMinecraft().renderEngine.bindTexture(texture); drawTexturedModalRect(left - 8, top + 9, 0, 224, 140, 31); @@ -335,7 +335,7 @@ public class GuiLexicon extends GuiScreen { fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0); fontRendererObj.setUnicodeFlag(unicode); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); categoryHighlight = ""; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 879d6e50a..e6aa2fe14 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -66,10 +66,10 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { super.drawScreen(par1, par2, par3); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(challenge.icon, left + 18, top + 15); RenderHelper.disableStandardItemLighting(); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.enableBlend(); boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); 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 e2cafe235..1d650026b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -163,7 +163,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(!searchField.getText().isEmpty()) { drawBookmark(left + 138, top + guiHeight - 24, " " + searchField.getText(), false); mc.renderEngine.bindTexture(texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12); } else { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); @@ -188,9 +188,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { y = currentButton.yPosition; mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF); - GL11.glScalef(0.5F, 0.5F, 1F); + GlStateManager.scale(0.5F, 0.5F, 1F); mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); - GL11.glScalef(2F, 2F, 1F); + GlStateManager.scale(2F, 2F, 1F); } } @@ -204,16 +204,16 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { mc.fontRendererObj.setUnicodeFlag(true); int width = mc.fontRendererObj.getStringWidth(s); - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, 0); - GL11.glScalef(fract, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, 0); + GlStateManager.scale(fract, 1F, 1F); Gui.drawRect(12, -30, width + 20, -2, 0x44000000); Gui.drawRect(10, -32, width + 22, -2, 0x44000000); drawBookmark(width / 2 + 16, -8, s, true, 0xFFFFFF); mc.fontRendererObj.setUnicodeFlag(unicode); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); @@ -230,7 +230,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } setHoveredButton(null); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 9284737f5..0af00e8ea 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -34,7 +34,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); List tooltip = new ArrayList(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 1c2d07a52..9e5fbc49f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -33,7 +33,7 @@ public class GuiButtonBack extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, 36, k == 2 ? 180 : 189, 18, 9); List tooltip = getTooltip(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index af814ebe4..93219fb18 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -48,7 +48,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { ARBShaderObjects.glUniform1iARB(imageUniform, 0); OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit); - GL11.glEnable(GL11.GL_TEXTURE_2D); + GlStateManager.enableTexture2D(); int texture = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId()); ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit); @@ -88,11 +88,11 @@ public class GuiButtonCategory extends GuiButtonLexicon { float s = 1F / 32F; float defAlpha = 0F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.color(1F, 1F, 1F, 1F); if(!boundStencil) { // Allow for the texture manager to take care of the ResourceLocation before we use it directly with gl mc.renderEngine.bindTexture(stencilResource); @@ -118,7 +118,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(inside) gui.categoryHighlight = StatCollector.translateToLocal(getTooltipText()); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 92c71b23d..b216b4283 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -39,16 +39,16 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { int k = getHoverState(hovered); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, xPosition, yPosition); RenderHelper.disableStandardItemLighting(); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.enableBlend(); if(challenge.complete) { - GL11.glDisable(GL11.GL_DEPTH_TEST); + GlStateManager.disableDepth(); par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 9, 0x004C00); par1Minecraft.fontRendererObj.drawStringWithShadow("\u2714", xPosition + 10, yPosition + 8, 0x0BD20D); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableDepth(); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 816ce512a..f29623ccf 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -34,7 +34,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); List tooltip = new ArrayList(); 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 03404cc16..b36718b88 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 @@ -39,11 +39,11 @@ public class GuiButtonDoot extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glColor4f(1F, 1F, 1F, 1F); + 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); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); List tooltip = new ArrayList(); @@ -52,7 +52,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { if(k == 2) RenderHelper.renderTooltip(xPosition - 100, yPosition + 36, tooltip); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.enableAlpha(); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 6f9d84422..6e762822b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -46,11 +46,11 @@ public class GuiButtonInvisible extends GuiButtonLexicon { gui.setHoveredButton(this); } else timeHover = Math.max(0, timeHover - gui.timeDelta); - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.disableAlpha(); int color = 0; String format = FontHelper.getFormatFromString(displayString); if(format.length() > 1) { @@ -70,7 +70,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { int maxalpha = 0x22; int alpha = Math.min(maxalpha, (int) (timeHover / 4 * maxalpha)); drawRect(xPosition - 5, yPosition, (int) (xPosition - 5 + timeHover * 24), yPosition + height, alpha << 24 | color); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.enableAlpha(); boolean unicode = par1Minecraft.fontRendererObj.getUnicodeFlag(); par1Minecraft.fontRendererObj.setUnicodeFlag(true); @@ -78,14 +78,14 @@ public class GuiButtonInvisible extends GuiButtonLexicon { par1Minecraft.fontRendererObj.setUnicodeFlag(unicode); if(showStack) { - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, xPosition * 2 - 6, yPosition * 2 + 4); RenderHelper.disableStandardItemLighting(); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.enableBlend(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 25ede9c6e..c10fe923e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -37,7 +37,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 130 : 120, 191, 10, 11); List tooltip = new ArrayList(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 476a85275..74db7f4d0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -34,7 +34,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 180, 11, 11); List tooltip = new ArrayList(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index fa2436b5c..ab79de13b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -36,7 +36,7 @@ public class GuiButtonPage extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 4ee5896d5..4ee51e054 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -34,7 +34,7 @@ public class GuiButtonShare extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 10 : 0 , 200, 10, 12); List tooltip = getTooltip(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index b1262f39c..a896afdb6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -41,7 +41,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5; par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, red ? 153 : 142, 180, 11, 11); List tooltip = new ArrayList(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 0c1e39773..c9447d900 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -34,7 +34,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { int k = getHoverState(hovered); par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); List tooltip = Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java index 19b69a195..830a7b8cf 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java @@ -91,7 +91,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GuiDraw.changeTexture(getGuiTexture()); GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java index 6e8cd6ff8..870dd6c7c 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java @@ -85,11 +85,11 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { super.drawBackground(recipe); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.7F); + GlStateManager.enableBlend(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.7F); GuiDraw.changeTexture(LibResources.GUI_ELVEN_TRADE_OVERLAY); GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); GuiDraw.changeTexture(TextureMap.locationBlocksTexture); Minecraft.getMinecraft().getRenderItem().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48); } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java index 5a5d5b976..7a8c35c85 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java @@ -110,8 +110,8 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { super.drawBackground(recipe); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + GlStateManager.enableBlend(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY); GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50); HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, ((CachedManaPoolRecipe) arecipes.get(recipe)).mana, TilePool.MAX_MANA / 10); diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java index 47ac6e62b..0f174053e 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java @@ -92,8 +92,8 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { super.drawBackground(recipe); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + GlStateManager.enableBlend(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); GuiDraw.changeTexture(LibResources.GUI_PETAL_OVERLAY); GuiDraw.drawTexturedModalRect(45, 10, 38, 7, 92, 92); } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java index f0afaf5aa..d1d89d75b 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java @@ -93,8 +93,8 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { @Override public void drawBackground(int recipe) { super.drawBackground(recipe); - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + GlStateManager.enableBlend(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); GuiDraw.changeTexture(LibResources.GUI_PURE_DAISY_OVERLAY); GuiDraw.drawTexturedModalRect(45, 10, 0, 0, 65, 44); } diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index f086f946e..b9c929d25 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -74,18 +74,18 @@ public class ModelBellows extends ModelBase { //float fract = Math.max(0.1F, (float) (Math.sin(((double) ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.5F); float mov = (1F - fract) * 0.5F; - GL11.glTranslatef(0F, mov, 0F); + GlStateManager.translate(0F, mov, 0F); Top.render(f5); Handle1.render(f5); Handle2.render(f5); Handle3.render(f5); - GL11.glTranslatef(0F, -mov, 0F); + GlStateManager.translate(0F, -mov, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.19F, -1.375F, -0.19F); - GL11.glScalef(1F, fract, 1F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.19F, -1.375F, -0.19F); + GlStateManager.scale(1F, fract, 1F); Funnel.render(f5); - GL11.glScalef(1F, 1F / fract, 1F); + GlStateManager.scale(1F, 1F / fract, 1F); } diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index aa24757c4..8c0598a79 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -54,20 +54,20 @@ public class ModelBrewery extends ModelBase { float deg = (float) time / 16F; float polerot = -deg * 25F; - GL11.glTranslatef(0F, offset, 0F); - GL11.glRotatef(polerot, 0F, 1F, 0F); + GlStateManager.translate(0F, offset, 0F); + GlStateManager.rotate(polerot, 0F, 1F, 0F); if(render.brewery.getStackInSlot(0) != null) { - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-1F / 8F, -0.5F, 1F / 128F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); render.renderItemStack(render.brewery.getStackInSlot(0)); - GL11.glTranslatef(1F / 8F, 0.5F, -1F / 128F); - GL11.glRotatef(-180F, 1F, 0F, 0F); + GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); + GlStateManager.rotate(-180F, 1F, 0F, 0F); } Pole.render(f); Top.render(f); Bottom.render(f); - GL11.glRotatef(-polerot, 0F, 1F, 0F); + GlStateManager.rotate(-polerot, 0F, 1F, 0F); float degper = (float) (2F * Math.PI) / plates; for(int i = 0; i < plates; i++) { @@ -76,27 +76,27 @@ public class ModelBrewery extends ModelBase { if(time == -1) offset1 = 0F; - GL11.glTranslatef(0F, offset1, 0F); + GlStateManager.translate(0F, offset1, 0F); if(render.brewery.getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; float transZ = 0.1245F; - GL11.glRotatef(rot, 0F, 1F, 0F); - GL11.glTranslatef(transX, transY, transZ); - GL11.glRotatef(-90F, 1F, 0F, 0F); + GlStateManager.rotate(rot, 0F, 1F, 0F); + GlStateManager.translate(transX, transY, transZ); + GlStateManager.rotate(-90F, 1F, 0F, 0F); render.renderItemStack(render.brewery.getStackInSlot(i + 1)); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glTranslatef(-transX, -transY, -transZ); - GL11.glRotatef(-rot, 0F, 1F, 0F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(-transX, -transY, -transZ); + GlStateManager.rotate(-rot, 0F, 1F, 0F); } Plate.render(f); - GL11.glTranslatef(0F, -offset1, 0F); + GlStateManager.translate(0F, -offset1, 0F); deg += degper; } - GL11.glTranslatef(0F, -offset, 0F); + GlStateManager.translate(0F, -offset, 0F); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index d32af9c75..582d7a41a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -15,6 +15,7 @@ import java.awt.Color; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; public class ModelHourglass extends ModelBase { @@ -65,41 +66,41 @@ public class ModelHourglass extends ModelBase { base1.render(f); base2.render(f); Color c = new Color(color); - GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); + GlStateManager.color((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); boolean normalize = GL11.glGetBoolean(GL11.GL_NORMALIZE); - GL11.glEnable(GL11.GL_NORMALIZE); + GlStateManager.enableNormalize(); if(fract1 > 0) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(flip) - GL11.glTranslatef(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); else { - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); } - GL11.glScalef(1F, fract1, 1F); + GlStateManager.scale(1F, fract1, 1F); sand1.render(f); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(fract2 > 0) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(flip) - GL11.glTranslatef(-2.5F * f, -6.0F * f, -2.5F * f); + GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f); else { - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-2.5F * f, 1.0F * f, -2.5F * f); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f); } - GL11.glScalef(1F, fract2, 1F); + GlStateManager.scale(1F, fract2, 1F); sand2.render(f); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(!normalize) - GL11.glDisable(GL11.GL_NORMALIZE); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.disableNormalize(); + GlStateManager.color(1F, 1F, 1F); glass1.render(f); glass2.render(f); } diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 6a56e7c6c..b1dc6d519 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -29,7 +29,7 @@ public class ModelSpinningCubes extends ModelBase { } public void renderSpinningCubes(int cubes, int repeat, int origRepeat) { - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); final float modifier = 6F; final float rotationModifier = 0.2F; @@ -39,8 +39,8 @@ public class ModelSpinningCubes extends ModelBase { double ticks = Minecraft.getMinecraft().thePlayer.ticksExisted - 1.3 * (origRepeat - repeat); float offsetPerCube = 360 / cubes; - GL11.glPushMatrix(); - GL11.glTranslatef(-0.025F, 0.85F, -0.025F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.025F, 0.85F, -0.025F); for(int i = 0; i < cubes; i++) { float offset = offsetPerCube * i; float deg = (int) (ticks / rotationModifier % 360F + offset); @@ -51,19 +51,19 @@ public class ModelSpinningCubes extends ModelBase { float z = (float) (radiusZ * Math.sin(rad)); float y = (float) Math.cos((ticks + 50 * i) / 5F) / 10F; - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, z); float xRotate = (float) Math.sin(ticks * rotationModifier) / 2F; float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F); float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F; - GL11.glRotatef(deg, xRotate, yRotate, zRotate); + GlStateManager.rotate(deg, xRotate, yRotate, zRotate); if(repeat < origRepeat) { - GL11.glColor4f(1F, 1F, 1F, (float) repeat / (float) origRepeat * 0.4F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - } else GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, (float) repeat / (float) origRepeat * 0.4F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + } else GlStateManager.color(1F, 1F, 1F, 1F); int light = 15728880; int lightmapX = light % 65536; @@ -73,14 +73,14 @@ public class ModelSpinningCubes extends ModelBase { spinningCube.render(1F / 16F); if(repeat < origRepeat) { - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.disableBlend(); + GlStateManager.enableAlpha(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + GlStateManager.popMatrix(); + GlStateManager.enableTexture2D(); if(repeat != 0) renderSpinningCubes(cubes, repeat - 1, origRepeat); diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java index 15fbbed8e..d48a3d53b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java @@ -26,12 +26,12 @@ public class RenderAltar implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.6F, -0.5F); - GL11.glScalef(0.9F, 0.9F, 0.9F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.6F, -0.5F); + GlStateManager.scale(0.9F, 0.9F, 0.9F); RenderTileAltar.forceMeta = metadata; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileAltar(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java index 4baa2d745..8731d5090 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java @@ -25,10 +25,10 @@ public class RenderAvatar implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.6F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.6F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileAvatar(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java index e91eabe3e..39356db69 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java @@ -25,11 +25,11 @@ public class RenderBellows implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.3F, -0.5F); - GL11.glScalef(1.2F, 1.2F, 1.2F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.3F, -0.5F); + GlStateManager.scale(1.2F, 1.2F, 1.2F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileBellows(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java index 08cb7f518..800232855 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java @@ -26,13 +26,13 @@ public class RenderBrewery implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glScalef(1.2F, 1.2F, 1.2F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.scale(1.2F, 1.2F, 1.2F); RenderTileBrewery.rotate = false; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileBrewery(), 0.0D, 0.0D, 0.0D, 0.0F); RenderTileBrewery.rotate = true; - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java index 9f886b08c..2299230d8 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java @@ -25,10 +25,10 @@ public class RenderCocoon implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCocoon(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java index 53ee16218..b2d0728c4 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java @@ -25,12 +25,12 @@ public class RenderCorporeaCrystalCube implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.disableAlpha(); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCorporeaCrystalCube(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java index e70f1b6f3..917e08835 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java @@ -26,13 +26,13 @@ public class RenderCorporeaIndex implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.3F, -0.5F); - GL11.glScalef(1.4F, 1.4F, 1.4F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.3F, -0.5F); + GlStateManager.scale(1.4F, 1.4F, 1.4F); RenderTileCorporeaIndex.move = false; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCorporeaIndex(), 0.0D, 0.0D, 0.0D, 0.0F); RenderTileCorporeaIndex.move = true; - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java index 95fbd226d..bab1510da 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java @@ -25,12 +25,12 @@ public class RenderHourglass implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.disableAlpha(); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileHourglass(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java index 59b1ce678..ab57d1d3b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java @@ -25,11 +25,11 @@ public class RenderIncensePlate implements ISimpleBlockRenderingHandler{ @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.1F, -0.5F); - GL11.glScalef(1.4F, 1.4F, 1.4F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.1F, -0.5F); + GlStateManager.scale(1.4F, 1.4F, 1.4F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileIncensePlate(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPool.java b/src/main/java/vazkii/botania/client/render/block/RenderPool.java index 0160ad9f9..51b268da6 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPool.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPool.java @@ -26,12 +26,12 @@ public class RenderPool implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); RenderTilePool.forceMeta = metadata; RenderTilePool.forceMana = RenderTilePool.forceMana | metadata == 1; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePool(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPump.java b/src/main/java/vazkii/botania/client/render/block/RenderPump.java index beaadfed3..81f4708d5 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPump.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPump.java @@ -25,10 +25,10 @@ public class RenderPump implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.25F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.25F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePump(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java index 2f4c2c89d..4c602fc5f 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java @@ -26,12 +26,12 @@ public class RenderPylon implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.7F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.7F, -0.5F); RenderTilePylon.green = metadata == 1; RenderTilePylon.pink = metadata == 2; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePylon(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java index d02d7e6f1..936820083 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java @@ -25,10 +25,10 @@ public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, 0F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileSpawnerClaw(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java index bb67f9a6a..495f26fdc 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java @@ -25,8 +25,8 @@ public class RenderSpreader implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); TileSpreader.staticRedstone = metadata == 1; TileSpreader.staticDreamwood = metadata == 2 || metadata == 3; TileSpreader.staticUltra = metadata == 3; @@ -34,7 +34,7 @@ public class RenderSpreader implements ISimpleBlockRenderingHandler { TileSpreader spreader = new TileSpreader(); spreader.rotationX = -180F; TileEntityRendererDispatcher.instance.renderTileEntityAt(spreader, 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java index a8925f94d..c49531073 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java @@ -25,10 +25,10 @@ public class RenderTeruTeruBozu implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.3F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.3F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileTeruTeruBozu(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java index bf5a5122b..70cd0b889 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java @@ -25,10 +25,10 @@ public class RenderTinyPotato implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, -0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, 0F, -0.5F); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileTinyPotato(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override 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 79651e84f..1f324d441 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -36,55 +36,55 @@ public class RenderBabylonWeapon extends Render { @Override public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { EntityBabylonWeapon weapon = (EntityBabylonWeapon) par1Entity; - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glRotatef(weapon.getRotation(), 0F, 1F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)par2, (float)par4, (float)par6); + GlStateManager.rotate(weapon.getRotation(), 0F, 1F, 0F); int live = weapon.getLiveTicks(); int delay = weapon.getDelay(); float charge = Math.min(10F, Math.max(live, weapon.getChargeTicks()) + par9); float chargeMul = charge / 10F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float s = 1.5F; - GL11.glScalef(s, s, s); - GL11.glRotatef(-90F, 0F, 1F, 0F); - GL11.glRotatef(45F, 0F, 0F, 1F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.rotate(45F, 0F, 0F, 1F); IIcon icon = ItemKingKey.weaponIcons[weapon.getVariety()]; - GL11.glColor4f(1F, 1F, 1F, chargeMul); + GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glColor4f(1F, 1F, 1F, chargeMul); + GlStateManager.disableCull(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.color(1F, 1F, 1F, chargeMul); Minecraft.getMinecraft().renderEngine.bindTexture(babylon); Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); - GL11.glRotatef(-90F, 1F, 0F, 0F); - GL11.glTranslatef(0F, -0.3F + rand.nextFloat() * 0.1F, 1F); + GlStateManager.rotate(-90F, 1F, 0F, 0F); + GlStateManager.translate(0F, -0.3F + rand.nextFloat() * 0.1F, 1F); s = chargeMul; if(live > delay) s -= Math.min(1F, (live - delay + par9) * 0.2F); s *= 2F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); - GL11.glRotatef(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); + GlStateManager.rotate(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); tes.startDrawingQuads(); tes.addVertexWithUV(-1, 0, -1, 0, 0); @@ -95,10 +95,10 @@ public class RenderBabylonWeapon extends Render { ShaderHelper.releaseShader(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix(); + GlStateManager.enableLighting(); + GlStateManager.shadeModel(GL11.GL_FLAT); + GlStateManager.enableCull(); + GlStateManager.popMatrix(); } @Override 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 4d6f47fee..c67c095d1 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -37,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void colorSpinningIcon(EntityCorporeaSpark entity) { int network = Math.min(15, entity.getNetwork()); - GL11.glColor3f(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2]); + GlStateManager.color(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2]); } @Override @@ -53,14 +54,14 @@ public class RenderCorporeaSpark extends RenderSparkBase { float absTime = Math.abs(time) - pticks; - GL11.glPushMatrix(); - GL11.glRotated(90F, 1F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(90F, 1F, 0F, 0F); float scalef = 1F / 6F; - GL11.glScalef(scalef, scalef, scalef); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, absTime / 10); - GL11.glTranslatef(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); + GlStateManager.scale(scalef, scalef, scalef); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, absTime / 10); + GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); ItemStack stack = entity.getDisplayedItem(); if(stack == null) @@ -84,20 +85,20 @@ public class RenderCorporeaSpark extends RenderSparkBase { int shift = pieces / 2; float scale = 1F / pieces * 3F; - GL11.glScalef(scale, scale, 1F); + GlStateManager.scale(scale, scale, 1F); for(int i = -shift; i < shift; i++) { - GL11.glTranslated(gap * i, 0F, 0F); + GlStateManager.translate(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { - GL11.glTranslated(0F, gap * j, 0F); + GlStateManager.translate(0F, gap * j, 0F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); - GL11.glTranslated(0F, -gap * j, 0F); + GlStateManager.translate(0F, -gap * j, 0F); } - GL11.glTranslated(-gap * i, 0F, 0F); + GlStateManager.translate(-gap * i, 0F, 0F); } } - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index f0f568af4..cb45e786e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -24,15 +25,15 @@ public class RenderManaStorm extends Render { @Override public void doRender(Entity e, double x, double y, double z, float something, float pticks) { - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, z); EntityManaStorm storm = (EntityManaStorm) e; float maxScale = 1.95F; float scale = 0.05F + ((float) storm.burstsFired / EntityManaStorm.TOTAL_BURSTS - (storm.deathTime == 0 ? 0 : storm.deathTime + pticks) / EntityManaStorm.DEATH_TIME) * maxScale; RenderHelper.renderStar(0x00FF00, scale, scale, scale, e.getUniqueID().getMostSignificantBits()); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.disableRescaleNormal(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 4ef275754..721d0813f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -69,21 +69,21 @@ public class RenderPixie extends RenderLiving { else { bindTexture(getEntityTexture(par1EntityPixie)); float f1 = 1.0F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + GlStateManager.enableBlend(); + GlStateManager.disableAlpha(); + GlStateManager.blendFunc(GL11.GL_ONE, GL11.GL_ONE); if (par1EntityPixie.isInvisible()) - GL11.glDepthMask(false); + GlStateManager.depthMask(false); else - GL11.glDepthMask(true); + GlStateManager.depthMask(true); char c0 = 61680; int j = c0 % 65536; int k = c0 / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, f1); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, f1); return 1; } } 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 2f6ac8273..1802cb8c1 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -32,42 +32,42 @@ public class RenderSparkBase extends RenderEntity { T tEntity = (T) par1Entity; IIcon iicon = getBaseIcon(tEntity); - GL11.glPushMatrix(); - GL11.glTranslatef((float)par2, (float)par4, (float)par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.05F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)par2, (float)par4, (float)par6); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.05F); double time = ClientTickHandler.ticksInGame + par9; time += new Random(par1Entity.getEntityId()).nextInt(); - GL11.glColor4f(1F, 1F, 1F, 0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2); + GlStateManager.color(1F, 1F, 1F, 0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2); float scale = 0.75F + 0.1F * (float) Math.sin(time / 10); - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); bindEntityTexture(par1Entity); Tessellator tessellator = Tessellator.getInstance(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float r = 180.0F - renderManager.playerViewY; - GL11.glRotatef(r, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-renderManager.playerViewX, 1F, 0F, 0F); + GlStateManager.rotate(r, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-renderManager.playerViewX, 1F, 0F, 0F); func_77026_a(tessellator, iicon); IIcon spinningIcon = getSpinningIcon(tEntity); if(spinningIcon != null) { - GL11.glTranslatef(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); - GL11.glScalef(0.2F, 0.2F, 0.2F); + GlStateManager.translate(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); + GlStateManager.scale(0.2F, 0.2F, 0.2F); colorSpinningIcon(tEntity); func_77026_a(tessellator, spinningIcon); } - GL11.glPopMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); renderCallback(tEntity, par9); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.disableRescaleNormal(); + GlStateManager.popMatrix(); } public IIcon getBaseIcon(T entity) { 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 39f770717..568c37f46 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -33,16 +33,16 @@ public class RenderThornChakram extends Render { IIcon iicon = ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); if(iicon != null) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GlStateManager.enableRescaleNormal(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); bindEntityTexture(p_76986_1_); Tessellator tessellator = Tessellator.getInstance(); func_77026_a(tessellator, iicon, fire ? 240 : -1); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.disableRescaleNormal(); + GlStateManager.popMatrix(); } } @@ -59,8 +59,8 @@ public class RenderThornChakram extends Render { float f4 = 1.0F; float f5 = 0.5F; float f6 = 0.25F; - GL11.glRotatef(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); if(light != -1) diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java index d8312b89e..64e225aff 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderBow.java @@ -38,12 +38,12 @@ public class RenderBow implements IItemRenderer { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { switch(type) { case ENTITY : { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, 0F, 0F); if(item.isOnItemFrame()) - GL11.glTranslatef(0F, -0.3F, 0.01F); + GlStateManager.translate(0F, -0.3F, 0.01F); render(item, null, false); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); break; } case EQUIPPED : { @@ -66,9 +66,9 @@ public class RenderBow implements IItemRenderer { int time = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, LibObfuscation.ITEM_IN_USE_COUNT); icon = item.getItem().getIcon(item, 0, player, using, time); if(transform) { - GL11.glTranslatef(0.2F, -0.3F, 0.1F); - //GL11.glRotatef(20.0F, 0.0F, 1.0F, 0.0F); - //GL11.glRotatef(-100.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.translate(0.2F, -0.3F, 0.1F); + //GlStateManager.rotate(20.0F, 0.0F, 1.0F, 0.0F); + //GlStateManager.rotate(-100.0F, 1.0F, 0.0F, 0.0F); } } @@ -78,16 +78,16 @@ public class RenderBow implements IItemRenderer { float f3 = icon.getMaxV(); float scale = 1F / 16F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } diff --git a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java b/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java index 3f66ca3cb..b962535c7 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java @@ -36,19 +36,19 @@ public class RenderFloatingFlowerItem implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack stack, Object... data) { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float s = 1.4F; - GL11.glScalef(s, s, s); - GL11.glRotatef(-5F, 1F, 0F, 0F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(-5F, 1F, 0F, 0F); Item item = stack.getItem(); TileFloatingFlower.forcedStack = item instanceof ItemBlockFloatingSpecialFlower ? ItemBlockSpecialFlower.ofType(ItemBlockSpecialFlower.getType(stack)) : new ItemStack(ModBlocks.flower, 1, stack.getItemDamage()); TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileFloatingFlower(), 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLens.java b/src/main/java/vazkii/botania/client/render/item/RenderLens.java index 54375ce09..c25e8f8aa 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLens.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLens.java @@ -44,12 +44,12 @@ public class RenderLens implements IItemRenderer { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { switch(type) { case ENTITY : { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, 0F, 0F); if(item.isOnItemFrame()) - GL11.glTranslatef(0F, -0.3F, 0.01F); + GlStateManager.translate(0F, -0.3F, 0.01F); render(item); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); break; } case EQUIPPED : { @@ -78,29 +78,29 @@ public class RenderLens implements IItemRenderer { float f3 = icon.getMaxV(); float scale = 1F / 16F; - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.enableCull(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Color color = new Color(color_); - GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); boolean shiny = ItemLens.getStoredColor(item) != -1; icon = ItemLens.iconGlass; - GL11.glScalef(scale, scale, scale); - GL11.glTranslatef(0F, 0F, -0.5F); + GlStateManager.scale(scale, scale, scale); + GlStateManager.translate(0F, 0F, -0.5F); renderShinyLensIcon(icon, shiny); - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(-16F, 0F, 0F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(-16F, 0F, 0F); renderShinyLensIcon(icon, shiny); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableCull(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } public static void renderShinyLensIcon(IIcon icon, boolean shiny) { diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java index 19b314357..a816e8bf8 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -44,7 +44,7 @@ public class RenderLexicon implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Minecraft mc = Minecraft.getMinecraft(); mc.renderEngine.bindTexture(texture); float opening = 0F; @@ -57,10 +57,10 @@ public class RenderLexicon implements IItemRenderer { else ticks -= ClientTickHandler.partialTicks; } - GL11.glTranslatef(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); - GL11.glRotatef(87.5F + ticks * 5, 0F, 1F, 0F); - GL11.glRotatef(ticks * 2.5F, 0F, 0F, 1F); - GL11.glScalef(0.9F, 0.9F, 0.9F); + GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); + GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F); + GlStateManager.rotate(ticks * 2.5F, 0F, 0F, 1F); + GlStateManager.scale(0.9F, 0.9F, 0.9F); opening = ticks / 12F; float pageFlipTicks = ClientTickHandler.pageFlipTicks; @@ -72,9 +72,9 @@ public class RenderLexicon implements IItemRenderer { model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); if(ticks < 3) { FontRenderer font = Minecraft.getMinecraft().fontRenderer; - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.3F, -0.21F, -0.07F); - GL11.glScalef(0.0035F, 0.0035F, -0.0035F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.3F, -0.21F, -0.07F); + GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); boolean bevo = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("BevoLJ"); boolean saice = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("saice"); @@ -89,27 +89,27 @@ public class RenderLexicon implements IItemRenderer { title = StatCollector.translateToLocal("item.botania:lexicon.saice"); font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); - GL11.glTranslatef(0F, 10F, 0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0F, 10F, 0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); - GL11.glTranslatef(0F, 15F, 0F); + GlStateManager.translate(0F, 15F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); - GL11.glTranslatef(0F, 10F, 0F); + GlStateManager.translate(0F, 10F, 0F); font.drawString(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); - GL11.glTranslatef(0F, 50F, 0F); + GlStateManager.translate(0F, 50F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); - GL11.glTranslatef(0F, 10F, 0F); + GlStateManager.translate(0F, 10F, 0F); font.drawString(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); if(bevo || saice) { - GL11.glTranslatef(0F, 10F, 0F); + GlStateManager.translate(0F, 10F, 0F); font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java index a1f02f0d4..540fe7339 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java @@ -34,12 +34,12 @@ public class RenderTransparentItem implements IItemRenderer { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { switch(type) { case ENTITY : { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.5F, 0F, 0F); if(item.isOnItemFrame()) - GL11.glTranslatef(0F, -0.3F, 0.01F); + GlStateManager.translate(0F, -0.3F, 0.01F); render(item); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); break; } case EQUIPPED : { @@ -63,16 +63,16 @@ public class RenderTransparentItem implements IItemRenderer { float f3 = icon.getMaxV(); float scale = 1F / 16F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } 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 856828d23..6cb6d32a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -31,39 +31,39 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { if(meta == 0) return; - GL11.glPushMatrix(); - GL11.glTranslated(d0, d1, d2); - GL11.glTranslatef(-1F, 1F, 0.25F); + GlStateManager.pushMatrix(); + GlStateManager.translate(d0, d1, d2); + GlStateManager.translate(-1F, 1F, 0.25F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableAlpha(); + GlStateManager.enableCull(); float alpha = (float) Math.min(1F, (Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 7D + 0.6D) * (Math.min(60, portal.ticksOpen) / 60F) * 0.5F; - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(meta == 2) { - GL11.glTranslatef(1.25F, 0F, 1.75F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.translate(1.25F, 0F, 1.75F); + GlStateManager.rotate(90F, 0F, 1F, 0F); } - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableCull(); + GlStateManager.disableLighting(); renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glTranslated(0F, 0F, 0.5F); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.translate(0F, 0F, 0.5F); renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.enableCull(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.enableLighting(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 24acecb7d..1197e6933 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -55,21 +55,21 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { TileAltar altar = (TileAltar) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); - GL11.glTranslated(d0 + 0.5, d1 + 1.5, d2 + 0.5); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); + GlStateManager.scale(1F, -1F, -1F); model.render(); - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); boolean water = altar.hasWater(); boolean lava = altar.hasLava(); if(water || lava) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float s = 1F / 256F * 10F; float v = 1F / 8F; float w = -v * 2.5F; @@ -90,9 +90,9 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { double ticks = (ClientTickHandler.ticksInGame + pticks) * 0.5; float offsetPerPetal = 360 / petals; - GL11.glPushMatrix(); - GL11.glTranslatef(-0.05F, -0.5F, 0F); - GL11.glScalef(v, v, v); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.05F, -0.5F, 0F); + GlStateManager.scale(v, v, v); for(int i = 0; i < petals; i++) { float offset = offsetPerPetal * i; float deg = (int) (ticks / rotationModifier % 360F + offset); @@ -103,38 +103,38 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { float z = (float) (radiusZ * Math.sin(rad)); float y = (float) Math.cos((ticks + 50 * i) / 5F) / 10F; - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, z); float xRotate = (float) Math.sin(ticks * rotationModifier) / 2F; float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F); float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F; v /= 2F; - GL11.glTranslatef(v, v, v); - GL11.glRotatef(deg, xRotate, yRotate, zRotate); - GL11.glTranslatef(-v, -v, -v); + GlStateManager.translate(v, v, v); + GlStateManager.rotate(deg, xRotate, yRotate, zRotate); + GlStateManager.translate(-v, -v, -v); v *= 2F; - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); IIcon icon = stack.getItem().getIcon(stack, 0); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } @@ -143,24 +143,24 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { int brightness = lava ? 240 : -1; float alpha = lava ? 1F : 0.7F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); if(lava) - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glColor4f(1F, 1F, 1F, alpha); - GL11.glTranslatef(w, -0.3F, w); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glScalef(s, s, s); + GlStateManager.disableLighting(); + GlStateManager.color(1F, 1F, 1F, alpha); + GlStateManager.translate(w, -0.3F, w); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.scale(s, s, s); renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness); if(lava) - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableLighting(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); forceMeta = -1; } 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 9297d0267..f81017062 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -45,69 +45,69 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { TileAvatar avatar = (TileAvatar) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); int meta = avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; - GL11.glTranslatef(0.5F, 1.6F, 0.5F); - GL11.glScalef(1F, -1F, -1F); - GL11.glRotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.translate(0.5F, 1.6F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); model.render(); ItemStack stack = avatar.getStackInSlot(0); if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; - GL11.glScalef(s, s, s); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslated(-1.2F, -3.5F, -0.65F); - GL11.glRotatef(20F, 0F, 0F, 1F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-1.2F, -3.5F, -0.65F); + GlStateManager.rotate(20F, 0F, 0F, 1F); int renderPass = 0; do { IIcon icon = stack.getItem().getIcon(stack, renderPass); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); Minecraft.getMinecraft().renderEngine.bindTexture(wieldable.getOverlayResource(avatar, stack)); s = 1.01F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glScalef(s, s, s); - GL11.glTranslatef(0F, -0.01F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.scale(s, s, s); + GlStateManager.translate(0F, -0.01F, 0F); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F; - GL11.glColor4f(1F, 1F, 1F, alpha + 0.183F); + GlStateManager.color(1F, 1F, 1F, alpha + 0.183F); model.render(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glColor3f(1F, 1F, 1F); - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 6c61af209..2a8074268 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -35,22 +35,22 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileBellows bellows = (TileBellows) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); int meta = bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); - GL11.glRotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); model.render(Math.max(0.1F, 1F - (bellows.movePos + bellows.moving * f + 0.1F))); - GL11.glColor3f(1F, 1F, 1F); - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } 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 eee982839..fe44d5f93 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -43,22 +43,22 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { brewery = (TileBrewery) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glScalef(1F, -1F, -1F); - GL11.glTranslatef(0.5F, -1.5F, -0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.translate(0.5F, -1.5F, -0.5F); double time = ClientTickHandler.ticksInGame + f; if(!rotate) time = -1; model.render(this, time); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } public void renderItemStack(ItemStack stack) { @@ -67,38 +67,38 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); float s = 0.25F; - GL11.glScalef(s, s, s); - GL11.glScalef(2F, 2F, 2F); + GlStateManager.scale(s, s, s); + GlStateManager.scale(2F, 2F, 2F); if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(1F, 1.1F, 0F); - GL11.glPushMatrix(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(1F, 1.1F, 0F); + GlStateManager.pushMatrix(); RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); - GL11.glPopMatrix(); - GL11.glTranslatef(-1F, -1.1F, 0F); - GL11.glScalef(2F, 2F, 2F); + GlStateManager.popMatrix(); + GlStateManager.translate(-1F, -1.1F, 0F); + GlStateManager.scale(2F, 2F, 2F); } else { int renderPass = 0; do { IIcon icon = stack.getItem().getIcon(stack, renderPass); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); } } - GL11.glScalef(1F / s, 1F / s, 1F / s); + GlStateManager.scale(1F / s, 1F / s, 1F / s); Minecraft.getMinecraft().renderEngine.bindTexture(texture); } 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 5aeb843d5..40d0e3177 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -39,19 +39,19 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { rot = (float) Math.sin(v) * (float) Math.log(cocoon.timePassed + f); } - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glTranslatef(0.5F, -0.5F - 3F / 16F, -0.5F + 1F / 16F); - GL11.glRotatef(rot, 0F, 1F, 0F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(0.5F, -0.5F - 3F / 16F, -0.5F + 1F / 16F); + GlStateManager.rotate(rot, 0F, 1F, 0F); model.render(); - GL11.glColor3f(1F, 1F, 1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } 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 b40bafa7c..d3db12167 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -50,31 +50,31 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { double worldTicks = tileentity.getWorld() == null ? 0 : time; Minecraft mc = Minecraft.getMinecraft(); - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); mc.renderEngine.bindTexture(texture); - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); model.renderBase(); - GL11.glTranslatef(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); + GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float s = stack.getItem() instanceof ItemBlock ? 0.7F : 0.5F; - GL11.glTranslatef(0F, 0.8F, 0F); - GL11.glScalef(s, s, s); - GL11.glRotatef(180F, 0F, 0F, 1F); + GlStateManager.translate(0F, 0.8F, 0F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(180F, 0F, 0F, 1F); ((Render) mc.getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, f); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); mc.renderEngine.bindTexture(texture); } - GL11.glColor4f(1F, 1F, 1F, 0.4F); + GlStateManager.color(1F, 1F, 1F, 0.4F); model.renderCube(); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); if(stack != null) { int count = cube.getItemCount(); @@ -92,26 +92,26 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { int colorShade = (color & 16579836) >> 2 | color & -16777216; float s = 1F / 64F; - GL11.glScalef(s, s, s); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.scale(s, s, s); + GlStateManager.disableLighting(); int l = mc.fontRendererObj.getStringWidth(countStr); - GL11.glTranslatef(0F, 55F, 0F); + GlStateManager.translate(0F, 55F, 0F); float tr = -16.5F; for(int i = 0; i < 4; i++) { - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(0F, 0F, tr); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0F, tr); mc.fontRendererObj.drawString(countStr, -l / 2, 0, color); - GL11.glTranslatef(0F, 0F, 0.1F); + GlStateManager.translate(0F, 0F, 0.1F); mc.fontRendererObj.drawString(countStr, -l / 2 + 1, 1, colorShade); - GL11.glTranslatef(0F, 0F, -tr - 0.1F); + GlStateManager.translate(0F, 0F, -tr - 0.1F); } - GL11.glEnable(GL11.GL_LIGHTING); + GlStateManager.enableLighting(); } - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index f057b9a3c..7f69b7184 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -32,16 +32,16 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks, int digProgress) { TileCorporeaIndex index = (TileCorporeaIndex) tile; - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y, z + 0.5); + GlStateManager.pushMatrix(); + GlStateManager.translate(x + 0.5, y, z + 0.5); Minecraft.getMinecraft().renderEngine.bindTexture(texture); float translation = move ? (float) ((Math.cos((index.ticksWithCloseby + (index.hasCloseby ? partticks : 0)) / 10F) * 0.5 + 0.5) * 0.25) : 0F; float rotation = move ? index.ticks * 2 + partticks : 0F; float scale = 0.6F; - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F); - GL11.glScalef(1F / scale, 1F / scale, 1F / scale); + GlStateManager.scale(1F / scale, 1F / scale, 1F / scale); if(index.closeby > 0F) { float starScale = 0.02F; @@ -52,22 +52,22 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { int color = 0xFF00FF; int seed = index.getPos().getX() ^ index.getPos().getY() ^ index.getPos().getZ(); - GL11.glTranslated(starX, 0.3, starZ); + GlStateManager.translate(starX, 0.3, starZ); RenderHelper.renderStar(color, starScale, starScale, starScale, seed); - GL11.glTranslated(-starX * 2, 0, -starZ * 2); + GlStateManager.translate(-starX * 2, 0, -starZ * 2); RenderHelper.renderStar(color, starScale, starScale, starScale, seed); - GL11.glTranslated(starX, 0, starZ); + GlStateManager.translate(starX, 0, starZ); rads = -rads; starX = Math.cos(rads) * starRadius; starZ = Math.sin(rads) * starRadius; - GL11.glTranslated(starX, 0, starZ); + GlStateManager.translate(starX, 0, starZ); RenderHelper.renderStar(color, starScale, starScale, starScale, seed); - GL11.glTranslated(-starX * 2, 0, -starZ * 2); + GlStateManager.translate(-starX * 2, 0, -starZ * 2); RenderHelper.renderStar(color, starScale, starScale, starScale, seed); - GL11.glTranslated(starX, 0, starZ); + GlStateManager.translate(starX, 0, starZ); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index ccc68157b..f1119962b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -51,33 +51,33 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { item.age = ClientTickHandler.ticksInGame; item.setEntityItemStack(enchanter.itemToEnchant); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslatef(0.5F, 1.25F, 0.5F); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(0.5F, 1.25F, 0.5F); ((Render) Minecraft.getMinecraft().getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f); - GL11.glTranslatef(-0.5F, -1.25F, -0.5F); + GlStateManager.translate(-0.5F, -1.25F, -0.5F); } - GL11.glPushMatrix(); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.translate(d0, d1, d2); - GL11.glRotated(90F, 1F, 0F, 0F); - GL11.glTranslatef(-2F, -2F, -0.001F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(-2F, -2F, -0.001F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableAlpha(); float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.4D) * alphaMod; if(alpha > 0) { if(ShaderHelper.useShaders()) - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); else { int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - GL11.glColor4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha); + GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha); } Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); @@ -88,10 +88,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { float yTranslation = Math.min(20, ticks) / 20F * 1.15F; float scale = ticks < 10 ? 1F : 1F - Math.min(20, ticks - 10) / 20F * 0.75F; - GL11.glTranslatef(2.5F, 2.5F, -yTranslation); - GL11.glScalef(scale, scale, 1F); - GL11.glRotatef(angle, 0F, 0F, 1F); - GL11.glTranslatef(-2.5F, -2.5F, 0F); + GlStateManager.translate(2.5F, 2.5F, -yTranslation); + GlStateManager.scale(scale, scale, 1F); + GlStateManager.rotate(angle, 0F, 0F, 1F); + GlStateManager.translate(-2.5F, -2.5F, 0F); } ShaderHelper.useShader(ShaderHelper.enchanterRune); @@ -99,10 +99,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { ShaderHelper.releaseShader(); } - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 859dd1a3f..d419204bb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -33,29 +33,29 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { IFloatingFlower flower = (IFloatingFlower) tile; - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); - GL11.glTranslatef(0.5F, 0F, 0.5F); - GL11.glRotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, 0F, -0.5F); + GlStateManager.translate(0.5F, 0F, 0.5F); + GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); + GlStateManager.translate(-0.5F, 0F, -0.5F); if(tile.getWorld() != null) { - GL11.glTranslatef(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); - GL11.glRotatef(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); + GlStateManager.translate(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); + GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); } Minecraft.getMinecraft().renderEngine.bindTexture(flower.getIslandType().getResource()); - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 1.4F, 0.5F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 1.4F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); model.render(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); IIcon icon = stack.getIconIndex(); @@ -65,11 +65,11 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - GL11.glTranslatef(0.25F, 0.4F, 0.5F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0.25F, 0.4F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - GL11.glColor3f(1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 6d45fdb82..34df5f9ef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -34,11 +34,11 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileHourglass hourglass = (TileHourglass) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame; @@ -53,17 +53,17 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { float fract1 = stack == null ? 0 : hourglass.timeFraction; float fract2 = stack == null ? 0 : 1F - hourglass.timeFraction; - GL11.glTranslatef(x, y, z); + GlStateManager.translate(x, y, z); float rot = hourglass.flip ? 180F : 1F; if(hourglass.flipTicks > 0) rot += (hourglass.flipTicks - ticks) * (180F / 4F); - GL11.glRotatef(rot, 0F, 0F, 1F); + GlStateManager.rotate(rot, 0F, 0F, 1F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.scale(1F, -1F, -1F); model.render(fract1, fract2, hourglass.flip, hourglass.getColor()); - GL11.glScalef(1F, -1F, -1F); - GL11.glPopMatrix(); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index aa9c0ca08..4f3907a4b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -43,48 +43,48 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { int meta = plate.getWorld() != null ? plate.getBlockMetadata() : 0; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); - GL11.glRotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); model.render(); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.scale(1F, -1F, -1F); ItemStack stack = plate.getStackInSlot(0); if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; - GL11.glTranslatef(0.1F, -1.46F, 0F); - GL11.glScalef(s, s, s); - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.translate(0.1F, -1.46F, 0F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; do { IIcon icon = stack.getItem().getIcon(stack, renderPass); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glColor3f(1F, 1F, 1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index a6994b13a..8fdc84de1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -31,37 +32,37 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { Minecraft mc = Minecraft.getMinecraft(); IIcon iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y + 0.3, z + 0.5); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.05F); + GlStateManager.pushMatrix(); + GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.05F); double time = ClientTickHandler.ticksInGame + pticks; - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); float scale = 0.75F; - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); Tessellator tessellator = Tessellator.getInstance(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float r = 180.0F - mc.getRenderManager().playerViewY; - GL11.glRotatef(r, 0F, 1F, 0F); - GL11.glRotatef(-mc.getRenderManager().playerViewX, 1F, 0F, 0F); + GlStateManager.rotate(r, 0F, 1F, 0F); + GlStateManager.rotate(-mc.getRenderManager().playerViewX, 1F, 0F, 0F); float off = 0.25F; - GL11.glTranslatef(0F, off, 0F); - GL11.glRotated(time, 0F, 0F, 1F); - GL11.glTranslatef(0F, -off, 0F); + GlStateManager.translate(0F, off, 0F); + GlStateManager.rotate(time, 0F, 0F, 1F); + GlStateManager.translate(0F, -off, 0F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); func_77026_a(tessellator, iicon); - GL11.glPopMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableBlend(); + GlStateManager.disableRescaleNormal(); + GlStateManager.popMatrix(); } // todo 1.8 looks like vanilla copypasta, update it diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 491780ddc..ca09fa7c9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -49,27 +49,27 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TilePool pool = (TilePool) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableRescaleNormal(); float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; - GL11.glColor4f(1F, 1F, 1F, a); - GL11.glTranslated(d0, d1, d2); + GlStateManager.color(1F, 1F, 1F, a); + GlStateManager.translate(d0, d1, d2); boolean inf = tileentity.getWorld() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1; boolean dil = tileentity.getWorld() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2; Minecraft.getMinecraft().renderEngine.bindTexture(inf ? textureInf : dil ? textureDil : texture); - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); int color = pool.color; float[] acolor = EntitySheep.fleeceColorTable[color]; - GL11.glColor4f(acolor[0], acolor[1], acolor[2], a); + GlStateManager.color(acolor[0], acolor[1], acolor[2], a); model.render(); - GL11.glColor4f(1F, 1F, 1F, a); - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.color(1F, 1F, 1F, a); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); @@ -93,44 +93,44 @@ public class RenderTilePool extends TileEntitySpecialRenderer { if(below instanceof IPoolOverlayProvider) { IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.xCoord, pool.yCoord - 1, pool.zCoord); if(overlay != null) { - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1F, 1F, 1F, a * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2)); - GL11.glTranslatef(-0.5F, -1F - 0.43F, -0.5F); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glScalef(s, s, s); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.color(1F, 1F, 1F, a * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2)); + GlStateManager.translate(-0.5F, -1F - 0.43F, -0.5F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.scale(s, s, s); renderIcon(0, 0, overlay, 16, 16, 240); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } } } if(waterLevel > 0) { s = 1F / 256F * 14F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1F, 1F, 1F, a); - GL11.glTranslatef(w, -1F - (0.43F - waterLevel), w); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glScalef(s, s, s); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.color(1F, 1F, 1F, a); + GlStateManager.translate(w, -1F - (0.43F - waterLevel), w); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.scale(s, s, s); ShaderHelper.useShader(ShaderHelper.manaPool); renderIcon(0, 0, BlockPool.manaIcon, 16, 16, 240); ShaderHelper.releaseShader(); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); forceMeta = 0; forceMana = false; 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 cbff4f5fa..a162fe38f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -28,8 +28,8 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partTicks, int digProgress) { TilePrism prism = (TilePrism) tile; - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; ItemStack stack = prism.getStackInSlot(0); @@ -38,14 +38,14 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(stack.getItem() instanceof ILens) { ILens lens = (ILens) stack.getItem(); - GL11.glPushMatrix(); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glTranslatef(0F, 0F, pos); + GlStateManager.pushMatrix(); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(0F, 0F, pos); RenderLens.render(stack, lens.getLensColor(stack)); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 1efb9fad2..4cdd00579 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -35,22 +35,22 @@ public class RenderTilePump extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TilePump pump = (TilePump) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); int meta = pump.getWorld() != null ? pump.getBlockMetadata() : 0; - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); - GL11.glRotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.translate(0.5F, 0.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f))); - GL11.glColor3f(1F, 1F, 1F); - GL11.glScalef(1F, -1F, -1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } 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 b7fcc6eea..f6936aa1c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -50,12 +50,12 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; - GL11.glColor4f(1F, 1F, 1F, a); + GlStateManager.color(1F, 1F, 1F, a); if(tileentity.getWorld() != null) { green = tileentity.getBlockMetadata() == 1; pink = tileentity.getBlockMetadata() == 2; @@ -71,69 +71,69 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { worldTime += new Random(tileentity.getPos().hashCode()).nextInt(360); if(ConfigHandler.oldPylonModel) { - GL11.glTranslated(d0 + 0.5, d1 + 2.2, d2 + 0.5); - GL11.glScalef(1F, -1.5F, -1F); + GlStateManager.translate(d0 + 0.5, d1 + 2.2, d2 + 0.5); + GlStateManager.scale(1F, -1.5F, -1F); } else { - GL11.glTranslated(d0 + 0.2 + (green ? -0.1 : 0), d1 + 0.05, d2 + 0.8 + (green ? 0.1 : 0)); + GlStateManager.translate(d0 + 0.2 + (green ? -0.1 : 0), d1 + 0.05, d2 + 0.8 + (green ? 0.1 : 0)); float scale = green ? 0.8F : 0.6F; - GL11.glScalef(scale, 0.6F, scale); + GlStateManager.scale(scale, 0.6F, scale); } if(!green) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(!ConfigHandler.oldPylonModel) - GL11.glTranslatef(0.5F, 0F, -0.5F); - GL11.glRotatef((float) worldTime * 1.5F, 0F, 1F, 0F); + GlStateManager.translate(0.5F, 0F, -0.5F); + GlStateManager.rotate((float) worldTime * 1.5F, 0F, 1F, 0F); if(!ConfigHandler.oldPylonModel) - GL11.glTranslatef(-0.5F, 0F, 0.5F); + GlStateManager.translate(-0.5F, 0F, 0.5F); model.renderRing(); - GL11.glTranslated(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); + GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); model.renderGems(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glPushMatrix(); - GL11.glTranslated(0D, Math.sin(worldTime / 20D) / 17.5, 0D); + GlStateManager.pushMatrix(); + GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 17.5, 0D); if(!ConfigHandler.oldPylonModel) - GL11.glTranslatef(0.5F, 0F, -0.5F); + GlStateManager.translate(0.5F, 0F, -0.5F); - GL11.glRotatef((float) -worldTime, 0F, 1F, 0F); + GlStateManager.rotate((float) -worldTime, 0F, 1F, 0F); if(!ConfigHandler.oldPylonModel) - GL11.glTranslatef(-0.5F, 0F, 0.5F); + GlStateManager.translate(-0.5F, 0F, 0.5F); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.disableCull(); model.renderCrystal(); - GL11.glColor4f(1F, 1F, 1F, a); + GlStateManager.color(1F, 1F, 1F, a); if(!ShaderHelper.useShaders()) { int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); float alpha = (float) ((Math.sin(worldTime / 20D) / 2D + 0.5) / (ConfigHandler.oldPylonModel ? 1D : 2D)); - GL11.glColor4f(1F, 1F, 1F, a * (alpha + 0.183F)); + GlStateManager.color(1F, 1F, 1F, a * (alpha + 0.183F)); } - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glScalef(1.1F, 1.1F, 1.1F); + GlStateManager.disableAlpha(); + GlStateManager.scale(1.1F, 1.1F, 1.1F); if(!ConfigHandler.oldPylonModel) - GL11.glTranslatef(-0.05F, -0.1F, 0.05F); - else GL11.glTranslatef(0F, -0.09F, 0F); + GlStateManager.translate(-0.05F, -0.1F, 0.05F); + else GlStateManager.translate(0F, -0.09F, 0F); ShaderHelper.useShader(ShaderHelper.pylonGlow); model.renderCrystal(); ShaderHelper.releaseShader(); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.enableCull(); + GlStateManager.popMatrix(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.disableBlend(); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } 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 ce803306e..450f0bf90 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -40,9 +40,9 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { TileRuneAltar altar = (TileRuneAltar) tileentity; - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(x, y, z); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(x, y, z); int items = 0; for(int i = 0; i < altar.getSizeInventory(); i++) @@ -59,67 +59,67 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { double time = ClientTickHandler.ticksInGame + partticks; for(int i = 0; i < altar.getSizeInventory(); i++) { - GL11.glPushMatrix(); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(1F, 2.5F, 1F); - GL11.glRotatef(angles[i] + (float) time, 0F, 1F, 0F); - GL11.glTranslatef(2.25F, 0F, 0.5F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslated(0D, 0.15 * Math.sin((time + i * 10) / 5D), 0F); + GlStateManager.pushMatrix(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(1F, 2.5F, 1F); + GlStateManager.rotate(angles[i] + (float) time, 0F, 1F, 0F); + GlStateManager.translate(2.25F, 0F, 0.5F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(0D, 0.15 * Math.sin((time + i * 10) / 5D), 0F); ItemStack stack = altar.getStackInSlot(i); Minecraft mc = Minecraft.getMinecraft(); if(stack != null) { mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); - GL11.glScalef(2F, 2F, 2F); + GlStateManager.scale(2F, 2F, 2F); if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(1F, 1.1F, 0F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(1F, 1.1F, 0F); renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); - GL11.glTranslatef(-1F, -1.1F, 0F); - GL11.glScalef(2F, 2F, 2F); + GlStateManager.translate(-1F, -1.1F, 0F); + GlStateManager.scale(2F, 2F, 2F); } else { int renderPass = 0; do { IIcon icon = stack.getItem().getIcon(stack, renderPass); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); } } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 1.8F, 0.5F); - GL11.glRotatef(180F, 1F, 0F, 1F); + GlStateManager.disableAlpha(); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 1.8F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 1F); int repeat = 15; cubes.renderSpinningCubes(2, repeat, repeat); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glTranslatef(0F, 0.2F, 0F); + GlStateManager.translate(0F, 0.2F, 0F); float scale = altar.getTargetMana() == 0 ? 0 : (float) altar.getCurrentMana() / (float) altar.getTargetMana() / 75F; if(scale != 0) { int seed = altar.getPos().getX() ^ altar.getPos().getY() ^ altar.getPos().getZ(); - GL11.glTranslatef(0.5F, 0.7F, 0.5F); + GlStateManager.translate(0.5F, 0.7F, 0.5F); RenderHelper.renderStar(0x00E4D7, scale, scale, scale, seed); } - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.enableAlpha(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 2072b84af..7851eca67 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -53,31 +53,31 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { } } bindTexture(resourcelocation); - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.pushMatrix(); + GlStateManager.disableCull(); if (par4 != 1) { switch (par4) { case 2: - GL11.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); + GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); break; case 3: - GL11.glTranslatef(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); + GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); par5 = 180.0F; break; case 4: - GL11.glTranslatef(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); + GlStateManager.translate(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); par5 = 270.0F; break; case 5: default: - GL11.glTranslatef(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); + GlStateManager.translate(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); par5 = 90.0F; } - } else GL11.glTranslatef(par1 + 0.5F, par2, par3 + 0.5F); + } else GlStateManager.translate(par1 + 0.5F, par2, par3 + 0.5F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(-1.0F, -1.0F, 1.0F); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.enableRescaleNormal(); + GlStateManager.scale(-1.0F, -1.0F, 1.0F); + GlStateManager.enableAlpha(); if(gaia) ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); @@ -85,7 +85,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { if(gaia) ShaderHelper.releaseShader(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else super.func_152674_a(par1, par2, par3, par4, par5, par6, gameProfile); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 3dda79f2f..e24e4e8c1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -28,38 +28,38 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { - GL11.glPushMatrix(); - GL11.glTranslated(d0, d1, d2); - GL11.glRotated(90F, 1F, 0F, 0F); - GL11.glTranslatef(0.8F, 0.2F, -0.22F); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.translate(d0, d1, d2); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(0.8F, 0.2F, -0.22F); + GlStateManager.color(1F, 1F, 1F, 1F); ItemStack stack = ((TileSparkChanger) tileentity).getStackInSlot(0); if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.6F; - GL11.glScalef(s, s, s); - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.scale(s, s, s); + GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; do { IIcon icon = stack.getItem().getIcon(stack, renderPass); if(icon != null) { Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java index 8f3646d3f..f9eb400d3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -28,20 +28,20 @@ public class RenderTileSpawnerClaw extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); model.render(); - GL11.glColor3f(1F, 1F, 1F); - GL11.glScalef(1F, -1F, -1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 9b0054df8..338cffee4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -49,50 +49,50 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileSpreader spreader = (TileSpreader) tileentity; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glRotatef(spreader.rotationX + 90F, 0F, 1F, 0F); - GL11.glTranslatef(0F, -1F, 0F); - GL11.glRotatef(spreader.rotationY, 1F, 0F, 0F); - GL11.glTranslatef(0F, 1F, 0F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.rotate(spreader.rotationX + 90F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.rotate(spreader.rotationY, 1F, 0F, 0F); + GlStateManager.translate(0F, 1F, 0F); ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : texture; if(ClientProxy.dootDoot) r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : textureHalloween; Minecraft.getMinecraft().renderEngine.bindTexture(r); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.scale(1F, -1F, -1F); double time = ClientTickHandler.ticksInGame + ticks; if(spreader.isULTRA_SPREADER()) { Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().hashCode()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F); - GL11.glColor3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); + GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); } model.render(); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); double worldTicks = tileentity.getWorld() == null ? 0 : time; - GL11.glRotatef((float) worldTicks % 360, 0F, 1F, 0F); - GL11.glTranslatef(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); + GlStateManager.rotate((float) worldTicks % 360, 0F, 1F, 0F); + GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); model.renderCube(); - GL11.glPopMatrix(); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.popMatrix(); + GlStateManager.scale(1F, -1F, -1F); ItemStack stack = spreader.getStackInSlot(0); if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ILens lens = (ILens) stack.getItem(); - GL11.glPushMatrix(); - GL11.glTranslatef(-0.4F, -1.4F, -0.4375F); - GL11.glScalef(0.8F, 0.8F, 0.8F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.4F, -1.4F, -0.4375F); + GlStateManager.scale(0.8F, 0.8F, 0.8F); RenderLens.render(stack, lens.getLensColor(stack)); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(spreader.paddingColor != -1) { @@ -102,28 +102,28 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { int color = spreader.paddingColor; RenderBlocks render = RenderBlocks.getInstance(); float f = 1F / 16F; - GL11.glTranslatef(0F, -f, 0F); + GlStateManager.translate(0F, -f, 0F); render.renderBlockAsItem(block, color, 1F); - GL11.glTranslatef(0F, -f * 15, 0F); + GlStateManager.translate(0F, -f * 15, 0F); render.renderBlockAsItem(block, color, 1F); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); - GL11.glPushMatrix(); - GL11.glScalef(f * 14F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.scale(f * 14F, 1F, 1F); render.renderBlockAsItem(block, color, 1F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glRotatef(90F, 1F, 0F, 0F); - GL11.glTranslatef(0F, 0F, -f / 2); - GL11.glScalef(f * 14F, 1F, f * 15F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(0F, 0F, -f / 2); + GlStateManager.scale(f * 14F, 1F, f * 15F); render.renderBlockAsItem(block, color, 1F); - GL11.glTranslatef(0F, f * 15F, 0F); + GlStateManager.translate(0F, f * 15F, 0F); render.renderBlockAsItem(block, color, 1F); } - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 817ae41e9..0614b7cd1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -15,11 +15,10 @@ import java.nio.FloatBuffer; import java.util.Random; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -35,91 +34,105 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation field_147526_d = new ResourceLocation("textures/entity/end_portal.png"); private static final Random field_147527_e = new Random(31100L); FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16); - @Override - public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { - float f1 = (float)field_147501_a.field_147560_j; - float f2 = (float)field_147501_a.field_147561_k; - float f3 = (float)field_147501_a.field_147558_l; - GL11.glDisable(GL11.GL_LIGHTING); - field_147527_e.setSeed(31100L); - float f4 = 0.24F; - for(int i = 0; i < 16; ++i) { - GL11.glPushMatrix(); - float f5 = 16 - i; + @Override + public void renderTileEntityAt(TileEntity p_180544_1_, double p_180544_2_, double p_180544_4_, double p_180544_6_, float p_180544_8_, int p_180544_9_) { + float f1 = (float)this.rendererDispatcher.entityX; + float f2 = (float)this.rendererDispatcher.entityY; + float f3 = (float)this.rendererDispatcher.entityZ; + GlStateManager.disableLighting(); + field_147527_e.setSeed(31100L); + float f4 = 0.75F; + + for (int j = 0; j < 16; ++j) + { + GlStateManager.pushMatrix(); + float f5 = (float)(16 - j); float f6 = 0.0625F; float f7 = 1.0F / (f5 + 1.0F); - if(i == 0) { - bindTexture(field_147529_c); + if (j == 0) + { + this.bindTexture(field_147529_c); f7 = 0.1F; f5 = 65.0F; f6 = 0.125F; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); } - if(i == 1) { - bindTexture(field_147526_d); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + if (j >= 1) + { + this.bindTexture(field_147526_d); + } + + if (j == 1) + { + GlStateManager.enableBlend(); + GlStateManager.blendFunc(1, 1); f6 = 0.5F; } - float f8 = (float)-(p_147500_4_ + f4); - float f9 = f8 + ActiveRenderInfo.objectY; - float f10 = f8 + f5 + ActiveRenderInfo.objectY; + float f8 = (float)(-(p_180544_4_ + (double)f4)); + float f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; + float f10 = f8 + f5 + (float)ActiveRenderInfo.getPosition().yCoord; float f11 = f9 / f10; - f11 += (float)(p_147500_4_ + f4); - GL11.glTranslatef(f1, f11, f3); - GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_R, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR); - GL11.glTexGeni(GL11.GL_Q, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_EYE_LINEAR); - GL11.glTexGen(GL11.GL_S, GL11.GL_OBJECT_PLANE, func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); - GL11.glTexGen(GL11.GL_T, GL11.GL_OBJECT_PLANE, func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); - GL11.glTexGen(GL11.GL_R, GL11.GL_OBJECT_PLANE, func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); - GL11.glTexGen(GL11.GL_Q, GL11.GL_EYE_PLANE, func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); - GL11.glEnable(GL11.GL_TEXTURE_GEN_S); - GL11.glEnable(GL11.GL_TEXTURE_GEN_T); - GL11.glEnable(GL11.GL_TEXTURE_GEN_R); - GL11.glEnable(GL11.GL_TEXTURE_GEN_Q); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, Minecraft.getSystemTime() % 20000L / 20000.0F, 0.0F); - GL11.glScalef(f6, f6, f6); - GL11.glTranslatef(0.5F, 0.5F, 0.0F); - GL11.glRotatef((i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, -0.5F, 0.0F); - GL11.glTranslatef(-f1, -f3, -f2); - f9 = f8 + ActiveRenderInfo.objectY; - GL11.glTranslatef(ActiveRenderInfo.objectX * f5 / f9, ActiveRenderInfo.objectZ * f5 / f9, -f2); + f11 += (float)(p_180544_4_ + (double)f4); + GlStateManager.translate(f1, f11, f3); + GlStateManager.texGen(GlStateManager.TexGen.S, 9217); + GlStateManager.texGen(GlStateManager.TexGen.T, 9217); + GlStateManager.texGen(GlStateManager.TexGen.R, 9217); + GlStateManager.texGen(GlStateManager.TexGen.Q, 9216); + GlStateManager.func_179105_a(GlStateManager.TexGen.S, 9473, this.func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); + GlStateManager.func_179105_a(GlStateManager.TexGen.T, 9473, this.func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); + GlStateManager.func_179105_a(GlStateManager.TexGen.R, 9473, this.func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); + GlStateManager.func_179105_a(GlStateManager.TexGen.Q, 9474, this.func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); + GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S); + GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T); + GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R); + GlStateManager.enableTexGenCoord(GlStateManager.TexGen.Q); + GlStateManager.popMatrix(); + GlStateManager.matrixMode(5890); + GlStateManager.pushMatrix(); + GlStateManager.loadIdentity(); + GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); + GlStateManager.scale(f6, f6, f6); + GlStateManager.translate(0.5F, 0.5F, 0.0F); + GlStateManager.rotate((float)(j * j * 4321 + j * 9) * 2.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(-0.5F, -0.5F, 0.0F); + GlStateManager.translate(-f1, -f3, -f2); + f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; + GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f5 / f9, (float)ActiveRenderInfo.getPosition().zCoord * f5 / f9, -f2); Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.startDrawingQuads(); + float f12 = field_147527_e.nextFloat() * 0.5F + 0.1F; + float f13 = field_147527_e.nextFloat() * 0.5F + 0.4F; + float f14 = field_147527_e.nextFloat() * 0.5F + 0.5F; - Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); - f11 = color.getRed() / 255F; - float f12 = color.getGreen() / 255F; - float f13 = color.getBlue() / 255F; + if (j == 0) + { + f14 = 1.0F; + f13 = 1.0F; + f12 = 1.0F; + } - tessellator.getWorldRenderer().setColorRGBA_F(f11 * f7, f12 * f7, f13 * f7, 1.0F); - tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_); - tessellator.getWorldRenderer().addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_ + 1.0D); - tessellator.getWorldRenderer().addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_ + 1.0D); - tessellator.getWorldRenderer().addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_); + worldrenderer.setColorRGBA_F(f12 * f7, f13 * f7, f14 * f7, 1.0F); + worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_); + worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); + worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); + worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_); tessellator.draw(); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); + GlStateManager.popMatrix(); + GlStateManager.matrixMode(5888); } - GL11.glDisable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_TEXTURE_GEN_S); - GL11.glDisable(GL11.GL_TEXTURE_GEN_T); - GL11.glDisable(GL11.GL_TEXTURE_GEN_R); - GL11.glDisable(GL11.GL_TEXTURE_GEN_Q); - GL11.glEnable(GL11.GL_LIGHTING); + GlStateManager.disableBlend(); + GlStateManager.disableTexGenCoord(GlStateManager.TexGen.S); + GlStateManager.disableTexGenCoord(GlStateManager.TexGen.T); + GlStateManager.disableTexGenCoord(GlStateManager.TexGen.R); + GlStateManager.disableTexGenCoord(GlStateManager.TexGen.Q); + GlStateManager.enableLighting(); } private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) { 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 8bdbdc5c8..a87678184 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -33,25 +33,25 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { float max = TileTerraPlate.MAX_MANA / 10F; float alphaMod = Math.min(max, plate.getCurrentMana()) / max; - GL11.glPushMatrix(); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.translate(d0, d1, d2); - GL11.glRotated(90F, 1F, 0F, 0F); - GL11.glTranslatef(0F, 0F, -3F / 16F - 0.001F); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.translate(0F, 0F, -3F / 16F - 0.001F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableAlpha(); float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.6D) * alphaMod; if(ShaderHelper.useShaders()) - GL11.glColor4f(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, alpha); else { int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - GL11.glColor4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha); + GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha); } Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); @@ -60,10 +60,10 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { renderIcon(0, 0, BlockTerraPlate.overlay, 1, 1, 240); ShaderHelper.releaseShader(); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); } public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 21c284c4f..b9ea15d09 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -33,33 +33,33 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableBlend(); + GlStateManager.disableCull(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); double time = Botania.proxy.getWorldElapsedTicks() + f; boolean hasWorld = tileentity.getWorld() != null; if(hasWorld) time += new Random(tileentity.getPos().hashCode()).nextInt(1000); - GL11.glTranslatef(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); + GlStateManager.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if(hasWorld) { - GL11.glRotated(time * 0.3, 0F, 1F, 0F); - GL11.glRotatef(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F); + GlStateManager.rotate(time * 0.3, 0F, 1F, 0F); + GlStateManager.rotate(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F); float s = 0.75F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); } model.render(); - GL11.glColor3f(1F, 1F, 1F); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableCull(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 5c1d0bf17..d398f58a9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -51,10 +51,10 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { TileTinyPotato potato = (TileTinyPotato) var1; - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glTranslated(d0, d1, d2); + GlStateManager.pushMatrix(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.translate(d0, d1, d2); Minecraft mc = Minecraft.getMinecraft(); mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); @@ -83,11 +83,11 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { usedShader = true; } - GL11.glTranslatef(0.5F, 1.5F, 0.5F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata(); float rotY = meta * 90F - 180F; - GL11.glRotatef(rotY, 0F, 1F, 0F); + GlStateManager.rotate(rotY, 0F, 1F, 0F); float jump = potato.jumpTicks; if(jump > 0) @@ -96,259 +96,259 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2; - GL11.glTranslatef(0F, up, 0F); - GL11.glRotatef(rotZ, 0F, 0F, 1F); + GlStateManager.translate(0F, up, 0F); + GlStateManager.rotate(rotZ, 0F, 0F, 1F); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(name.equals("pahimar")) { - GL11.glScalef(1F, 0.3F, 1F); - GL11.glTranslatef(0F, 3.5F, 0F); + GlStateManager.scale(1F, 0.3F, 1F); + GlStateManager.translate(0F, 3.5F, 0F); } else if(name.equals("kyle hyde")) mc.renderEngine.bindTexture(textureGrayscale); else if(name.equals("dinnerbone") || name.equals("grumm")) { - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(0F, -2.625F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(0F, -2.625F, 0F); } else if(name.equals("aureylian")) - GL11.glColor3f(1F, 0.5F, 1F); + GlStateManager.color(1F, 0.5F, 1F); boolean render = !(name.equals("mami") || name.equals("soaryn") || name.equals("eloraam") && jump != 0); if(render) model.render(); if(name.equals("kingdaddydmac")) { - GL11.glTranslated(0.5F, 0F, 0F); + GlStateManager.translate(0.5F, 0F, 0F); model.render(); } if(usedShader) ShaderHelper.releaseShader(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(!name.isEmpty()) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); ContributorFancinessHandler.firstStart(); float scale = 1F / 4F; - GL11.glTranslatef(0F, 1F, 0F); - GL11.glScalef(scale, scale, scale); + GlStateManager.translate(0F, 1F, 0F); + GlStateManager.scale(scale, scale, scale); if(name.equals("phi") || name.equals("vazkii")) { - GL11.glTranslatef(0.45F, 0F, 0.4F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(20F, 1F, 0F, 1F); + GlStateManager.translate(0.45F, 0F, 0.4F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(20F, 1F, 0F, 1F); renderIcon(((ItemManaResource) ModItems.manaResource).phiFlowerIcon); if(name.equals("vazkii")) { - GL11.glRotatef(-20F, 1F, 0F, 1F); - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-1.5F, -1.3F, -0.75F); + GlStateManager.rotate(-20F, 1F, 0F, 1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-1.5F, -1.3F, -0.75F); renderIcon(((ItemManaResource) ModItems.manaResource).nerfBatIcon); } } else if(name.equals("skull kid")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(23)); } else if(name.equals("kamina")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.1F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.1F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(26)); } else if(name.equals("haighyorkie")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(((ItemManaResource) ModItems.manaResource).goldfishIcon); } else if(name.equals("chitoge")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -0.7F, 0.1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -0.7F, 0.1F); renderIcon(ModItems.cosmetic.getIconFromDamage(7)); } else if(name.equals("direwolf20")) { - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -2.2F, -0.5F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -2.2F, -0.5F); renderIcon(ModItems.cosmetic.getIconFromDamage(0)); } else if(name.equals("doctor")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.15F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.15F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(25)); } else if(name.equals("snoo")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -0.7F, 0.1F); - GL11.glRotatef(20F, 0F, 0F, 1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -0.7F, 0.1F); + GlStateManager.rotate(20F, 0F, 0F, 1F); renderIcon(ModItems.cosmetic.getIconFromDamage(24)); } else if(name.equals("charlotte")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(12)); } else if(name.equals("greg") || name.equals("gregorioust")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.5F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.5F, -0.4F); renderIcon(Items.book.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glTranslatef(0.5F, 0.5F, 0F); - GL11.glScalef(0.3F, 0.3F, 0.3F); + GlStateManager.translate(0.5F, 0.5F, 0F); + GlStateManager.scale(0.3F, 0.3F, 0.3F); RenderBlocks.getInstance().renderBlockAsItem(Blocks.iron_ore, 0, 1F); } else if(name.equals("profmobius")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(Items.bread.getIconFromDamage(0)); } else if(name.equals("martysgames") || name.equals("marty")) { - GL11.glScalef(0.7F, 0.7F, 0.7F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.75F, -2.4F, -0.7F); - GL11.glRotatef(10F, 0F, 0F, 1F); + GlStateManager.scale(0.7F, 0.7F, 0.7F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.75F, -2.4F, -0.7F); + GlStateManager.rotate(10F, 0F, 0F, 1F); renderIcon(ItemInfiniteFruit.dasBootIcon); } else if(name.equals("tromped")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(ModItems.cacophonium.getIconFromDamage(0)); } else if(name.equals("kain vinosec")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.3F, -1.5F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.3F, -1.5F, -0.4F); renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); - GL11.glTranslatef(0F, 0F, 0.85F); + GlStateManager.translate(0F, 0F, 0.85F); renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); } else if(name.equals("mankrik")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -0.2F, -0.1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -0.2F, -0.1F); renderIcon(ModItems.cosmetic.getIconFromDamage(31)); } else if(name.equals("kurumi")) { - GL11.glScalef(0.4F, 0.4F, 0.4F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.9F, -2.5F, -1.3F); + GlStateManager.scale(0.4F, 0.4F, 0.4F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.9F, -2.5F, -1.3F); renderIcon(ModItems.cosmetic.getIconFromDamage(17)); } else if(name.equals("ichun")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(15)); } else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.1F, -0.325F); + GlStateManager.scale(1.5F, 1.5F, 1.5F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.1F, -0.325F); renderIcon(Items.painting.getIconFromDamage(0)); } else if(name.equals("jibril")) { - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(0F, 0.7F, 0F); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.scale(1.5F, 1.5F, 1.5F); + GlStateManager.translate(0F, 0.7F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); ItemFlightTiara.renderHalo(null, var8); } else if(name.equals("nebris")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); RenderBlocks.getInstance().renderBlockAsItem(Blocks.glowstone, 0, 1F); } else if(name.equals("ible")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glScalef(1.2F, 1.2F, 1.2F); - GL11.glTranslatef(0F, 0.7F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.scale(1.2F, 1.2F, 1.2F); + GlStateManager.translate(0F, 0.7F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderBlocks.getInstance().renderBlockAsItem(Blocks.portal, 0, 1F); } else if(name.equals("razz") || name.equals("razzleberryfox")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1F, 0.45F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1F, 0.45F); renderIcon(ModItems.cosmetic.getIconFromDamage(8)); } else if(name.equals("etho") || name.equals("ethoslab")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.5F, -1.2F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(Items.cookie.getIconFromDamage(0)); } else if(name.equals("sethbling")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glScalef(1.2F, 1.2F, 1.2F); - GL11.glTranslatef(0F, 0.9F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.scale(1.2F, 1.2F, 1.2F); + GlStateManager.translate(0F, 0.9F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); RenderBlocks.getInstance().renderBlockAsItem(Blocks.command_block, 0, 1F); } else if(name.equals("bdoubleo100") || name.equals("bdoubleo")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-1F, -1.1F, -0.1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-1F, -1.1F, -0.1F); renderIcon(Items.stick.getIconFromDamage(0)); } else if(name.equals("kingdaddydmac")) { - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.3F, -2.5F, 1.075F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.3F, -2.5F, 1.075F); renderIcon(ModItems.manaRing.getIconFromDamage(0)); - GL11.glTranslatef(0F, 0F, -4F); + GlStateManager.translate(0F, 0F, -4F); renderIcon(ModItems.manaRing.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(1.5F, -0.5F, 0.7F); + GlStateManager.scale(1.5F, 1.5F, 1.5F); + GlStateManager.translate(1.5F, -0.5F, 0.7F); RenderBlocks.getInstance().renderBlockAsItem(Blocks.cake, 0, 1F); } else if(name.equals("sjin")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -1.27F, -0.4F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -1.27F, -0.4F); renderIcon(ModItems.cosmetic.getIconFromDamage(27)); } else if(name.equals("martyn") || name.equals("inthelittlewood")) { - GL11.glScalef(1.25F, 1.25F, 1.25F); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glTranslatef(-0.5F, -0.45F, -0.1F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.5F, -0.45F, -0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); renderIcon(Blocks.sapling.getIcon(0, 0)); }else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { IIcon icon = ContributorFancinessHandler.flowerMap.get(name); if(icon != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.5F, -0.5F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.5F, -0.5F, 0F); ShaderHelper.useShader(ShaderHelper.gold); renderIcon(icon); ShaderHelper.releaseShader(); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, d0, d1, d2, var8)); - GL11.glRotatef(-rotZ, 0F, 0F, 1F); - GL11.glRotatef(-rotY, 0F, 1F, 0F); - GL11.glColor3f(1F, 1F, 1F); - GL11.glScalef(1F, -1F, -1F); + GlStateManager.rotate(-rotZ, 0F, 0F, 1F); + GlStateManager.rotate(-rotY, 0F, 1F, 0F); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); MovingObjectPosition pos = mc.objectMouseOver; if(!name.isEmpty() && pos != null && pos.blockX == potato.xCoord && pos.blockY == potato.yCoord && pos.blockZ == potato.zCoord) { - GL11.glPushMatrix(); - GL11.glTranslatef(0F, -0.6F, 0F); - GL11.glRotatef(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0F, -0.6F, 0F); + GlStateManager.rotate(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; float f1 = 0.016666668F * f; - GL11.glScalef(-f1, -f1, f1); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glTranslatef(0.0F, 0F / f1, 0.0F); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.scale(-f1, -f1, f1); + GlStateManager.disableLighting(); + GlStateManager.translate(0.0F, 0F / f1, 0.0F); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); Tessellator tessellator = Tessellator.getInstance(); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); tessellator.getWorldRenderer().startDrawingQuads(); int i = mc.fontRendererObj.getStringWidth(potato.name) / 2; tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); @@ -357,16 +357,16 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); + GlStateManager.enableTexture2D(); + GlStateManager.depthMask(true); mc.fontRendererObj.drawString(potato.name, -mc.fontRendererObj.getStringWidth(potato.name) / 2, 0, 0xFFFFFF); if(name.equals("pahimar") || name.equals("soaryn")) { - GL11.glTranslatef(0F, 14F, 0F); + GlStateManager.translate(0F, 14F, 0F); String s = name.equals("pahimar") ? "[WIP]" : "(soon)"; - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); tessellator.getWorldRenderer().startDrawingQuads(); i = mc.fontRendererObj.getStringWidth(s) / 2; tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); @@ -375,19 +375,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); + GlStateManager.enableTexture2D(); + GlStateManager.depthMask(true); mc.fontRendererObj.drawString(s, -mc.fontRendererObj.getStringWidth(s) / 2, 0, 0xFFFFFF); } - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glScalef(1F / -f1, 1F / -f1, 1F / f1); - GL11.glPopMatrix(); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.scale(1F / -f1, 1F / -f1, 1F / f1); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderIcon(IIcon icon) { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index bf154730c..aab1160df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -192,7 +192,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I ItemStack item = craft.getStackInSlot(index); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index bcae999ec..065399904 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -221,13 +221,13 @@ public class SubTileHopperhock extends SubTileFunctional { int color = getColor(); String filter = StatCollector.translateToLocal("botaniamisc.filter" + filterType); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2; int y = res.getScaledHeight() / 2 + 30; mc.fontRendererObj.drawStringWithShadow(filter, x, y, color); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } @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 e2512bf8d..2f6184ac8 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 @@ -164,8 +164,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.state.getBlock()), 1, filter.state.getBlock().getMetaFromState(filter.state)); int color = getColor(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(recieverStack != null && recieverStack.getItem() != null) { String stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; @@ -178,8 +178,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { RenderHelper.disableStandardItemLighting(); } - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } @Override 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 c95e52c09..a2e34b0b3 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 @@ -89,8 +89,8 @@ public class SubTileSpectrolus extends SubTileGenerating { ItemStack stack = new ItemStack(Blocks.wool, 1, nextColor); int color = getColor(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(stack != null && stack.getItem() != null) { String stackName = stack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; @@ -103,8 +103,8 @@ public class SubTileSpectrolus extends SubTileGenerating { RenderHelper.disableStandardItemLighting(); } - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } @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 72141ab66..6b1eb4cd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -148,10 +148,10 @@ public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerL ItemStack stack = getStackInSlot(0); if(stack != null) { RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(stack, x, y); mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, stack, x, y, ""); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GlStateManager.disableRescaleNormal(); RenderHelper.disableStandardItemLighting(); int time = getTotalTime(); 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 6ce9eeeb1..e2f717bee 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 @@ -351,12 +351,12 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int u = outputting ? 22 : 0; int v = 38; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.renderEngine.bindTexture(HUDHandler.manaBar); RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); ItemStack tablet = new ItemStack(ModItems.manaTablet); ItemManaTablet.setStackCreative(tablet); @@ -366,8 +366,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc mc.getRenderItem().renderItemAndEffectIntoGUI(pool, x + 26, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } @Override 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 c3d46d4d3..2c5b5b04e 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 @@ -541,8 +541,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, ItemStack lens = getStackInSlot(0); if(lens != null) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String lensName = lens.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(lensName) / 2; int x = res.getScaledWidth() / 2 - width; @@ -552,15 +552,15 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemAndEffectIntoGUI(lens, x, y); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } if(receiver != null) { TileEntity receiverTile = (TileEntity) receiver; ItemStack recieverStack = new ItemStack(worldObj.getBlockState(receiverTile.getPos()).getBlock(), 1, receiverTile.getBlockMetadata()); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(recieverStack != null && recieverStack.getItem() != null) { String stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; @@ -573,11 +573,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, RenderHelper.disableStandardItemLighting(); } - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index d086a2b77..f016aae56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -87,10 +87,10 @@ public class TileTurntable extends TileMod implements IUpdatePlayerListBox { int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(speed) / 2; int y = res.getScaledHeight() / 2 - 15; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.fontRendererObj.drawStringWithShadow(speed, x, y, color); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index ad53d9201..baf5632fa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -817,7 +817,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override @SideOnly(Side.CLIENT) public void bossBarRenderCallback(ScaledResolution res, int x, int y) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); int px = x + 160; int py = y + 12; @@ -825,7 +825,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi ItemStack stack = new ItemStack(Items.skull, 1, 3); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(stack, px, py); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); @@ -833,7 +833,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi mc.fontRendererObj.setUnicodeFlag(true); mc.fontRendererObj.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF); mc.fontRendererObj.setUnicodeFlag(unicode); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index e65c7ecab..1ce2e2cc0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -404,16 +404,16 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Tessellator tess = Tessellator.getInstance(); Tessellator.renderingWorldRenderer = false; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float alpha = ((float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.2F) * 0.5F + 0.5F) * 0.4F + 0.3F; double posX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks; double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks; double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks; - GL11.glTranslated(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); + GlStateManager.translate(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); float base = getRotationBase(stack); @@ -434,9 +434,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { for(int seg = 0; seg < SEGMENTS; seg++) { boolean inside = false; float rotationAngle = (seg + 0.5F) * segAngles + shift; - GL11.glPushMatrix(); - GL11.glRotatef(rotationAngle, 0F, 1F, 0F); - GL11.glTranslatef(s * m, -0.75F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(rotationAngle, 0F, 1F, 0F); + GlStateManager.translate(s * m, -0.75F, 0F); if(segmentLookedAt == seg) inside = true; @@ -447,36 +447,36 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(slotStack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(slotStack.getItem()).getRenderType())) { float scale = seg == 0 ? 0.75F : 0.6F; - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); + GlStateManager.scale(scale, scale, scale); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(slotStack.getItem()), slotStack.getItemDamage(), 1F); } else { - GL11.glScalef(0.75F, 0.75F, 0.75F); - GL11.glTranslatef(0F, 0F, 0.5F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); + GlStateManager.translate(0F, 0F, 0.5F); int renderPass = 0; do { IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass); if(icon != null) { - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F); } renderPass++; } while(renderPass < slotStack.getItem().getRenderPasses(slotStack.getItemDamage())); } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180F, 1F, 0F, 0F); float a = alpha; if(inside) { a += 0.3F; @@ -484,10 +484,10 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } if(seg % 2 == 0) - GL11.glColor4f(0.6F, 0.6F, 0.6F, a); - else GL11.glColor4f(1F, 1F, 1F, a); + GlStateManager.color(0.6F, 0.6F, 0.6F, a); + else GlStateManager.color(1F, 1F, 1F, a); - GL11.glDisable(GL11.GL_CULL_FACE); + GlStateManager.disableCull(); ItemCraftingHalo item = (ItemCraftingHalo) stack.getItem(); mc.renderEngine.bindTexture(item.getGlowResource()); tess.getWorldRenderer().startDrawingQuads(); @@ -507,10 +507,10 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } y0 = 0; tess.draw(); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix(); + GlStateManager.enableCull(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @SideOnly(Side.CLIENT) @@ -522,8 +522,8 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); int slot = getSegmentLookedAt(stack, player); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(slot == 0) { String name = craftingTable.getDisplayName(); @@ -534,7 +534,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Gui.drawRect(x - 6, y - 6, x + l + 6, y + 37, 0x22000000); Gui.drawRect(x - 4, y - 4, x + l + 4, y + 35, 0x22000000); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(craftingTable, resolution.getScaledWidth() / 2 - 8, resolution.getScaledHeight() / 2 - 52); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); @@ -570,7 +570,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Gui.drawRect(x - 2, y - 2, x + 56, y + 56, 0x22000000); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); for(int i = 0; i < 9; i++) { ItemStack stack = recipe[i]; if(stack != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index ef15146a2..c9f45b2b2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -143,10 +143,10 @@ public class ItemSextant extends ItemMod { if(radius > 0) { radius += 4; - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); GL11.glLineWidth(3F); GL11.glBegin(GL11.GL_LINE_STRIP); - GL11.glColor4f(0F, 1F, 1F, 1F); + GlStateManager.color(0F, 1F, 1F, 1F); for(int i = 0; i < 361; i++) { float radian = (float) ((double) i * Math.PI / 180); double xp = x + Math.cos(radian) * radius; @@ -154,7 +154,7 @@ public class ItemSextant extends ItemMod { GL11.glVertex2d(xp, yp); } GL11.glEnd(); - GL11.glEnable(GL11.GL_TEXTURE_2D); + GlStateManager.enableTexture2D(); } } } 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 741ec2d02..4ae049316 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 @@ -110,19 +110,19 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @SideOnly(Side.CLIENT) public static void renderOnPlayer(ItemStack stack, RenderPlayerEvent event) { if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); float f = willIcon.getMinU(); float f1 = willIcon.getMaxU(); float f2 = willIcon.getMinV(); float f3 = willIcon.getMaxV(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.26F, 0.15F, -0.39F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.26F, 0.15F, -0.39F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } 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 37b16288d..3c9eca6fc 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; @@ -95,155 +96,155 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case 2: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.5F, 0F); + GlStateManager.translate(0.04F, -0.5F, 0F); renderIcon(2); break; case 4: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.5F, 0F); + GlStateManager.translate(0.04F, -0.5F, 0F); renderIcon(4); break; case 5: faceTranslate(); scale(0.35F); - GL11.glTranslatef(0.3F, -0.5F, 0F); + GlStateManager.translate(0.3F, -0.5F, 0F); renderIcon(5); break; case 6: faceTranslate(); scale(0.35F); - GL11.glTranslatef(0.9F, -0.5F, 0F); + GlStateManager.translate(0.9F, -0.5F, 0F); renderIcon(6); break; case 7: faceTranslate(); scale(0.6F); - GL11.glTranslatef(0.2F, 0.3F, 0.6F); + GlStateManager.translate(0.2F, 0.3F, 0.6F); renderIcon(7); break; case 8: faceTranslate(); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); scale(0.6F); - GL11.glTranslatef(-0.9F, 0F, 0.2F); + GlStateManager.translate(-0.9F, 0F, 0.2F); renderIcon(8); break; case 9: faceTranslate(); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); scale(0.6F); - GL11.glTranslatef(-0.9F, -0.2F, 0.2F); + GlStateManager.translate(-0.9F, -0.2F, 0.2F); renderIcon(9); - GL11.glTranslatef(0F, 0F, 1F); + GlStateManager.translate(0F, 0F, 1F); renderIcon(9); break; case 10: faceTranslate(); - GL11.glRotatef(90F, 0F, 1F, 0F); + GlStateManager.rotate(90F, 0F, 1F, 0F); scale(0.4F); - GL11.glTranslatef(-0.5F, -0.1F, 0.3F); - GL11.glRotatef(120F, 0F, 1F, 0F); + GlStateManager.translate(-0.5F, -0.1F, 0.3F); + GlStateManager.rotate(120F, 0F, 1F, 0F); renderIcon(10); - GL11.glRotatef(-100F, 0F, 1F, 0F); + GlStateManager.rotate(-100F, 0F, 1F, 0F); renderIcon(10); break; case 11: faceTranslate(); scale(0.6F); - GL11.glTranslatef(0.2F, -0.1F, 0.6F); + GlStateManager.translate(0.2F, -0.1F, 0.6F); renderIcon(11); break; case 15: faceTranslate(); - GL11.glTranslatef(-0.1F, -0.55F, 0F); + GlStateManager.translate(-0.1F, -0.55F, 0F); renderIcon(15); break; case 17: faceTranslate(); scale(0.35F); - GL11.glTranslatef(0.3F, -0.6F, 0F); + GlStateManager.translate(0.3F, -0.6F, 0F); renderIcon(17); break; case 18: faceTranslate(); scale(0.75F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(-0.3F, 0.1F, 0.55F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(-0.3F, 0.1F, 0.55F); renderIcon(18); break; case 19: faceTranslate(); scale(0.6F); - GL11.glTranslatef(0.2F, -0.2F, 0.1F); + GlStateManager.translate(0.2F, -0.2F, 0.1F); renderIcon(19); break; case 20: faceTranslate(); scale(0.25F); - GL11.glTranslatef(0.4F, 0.5F, -0.1F); + GlStateManager.translate(0.4F, 0.5F, -0.1F); renderIcon(20); - GL11.glTranslatef(1.4F, 0F, 0F); + GlStateManager.translate(1.4F, 0F, 0F); renderIcon(20); break; case 22: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.4F, 0F); + GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(22); break; case 23: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.4F, 0F); + GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(23); break; case 24: faceTranslate(); scale(0.6F); - GL11.glTranslatef(0.5F, 0F, 0.1F); - GL11.glRotatef(60F, 0F, 0F, 1F); + GlStateManager.translate(0.5F, 0F, 0.1F); + GlStateManager.rotate(60F, 0F, 0F, 1F); renderIcon(24); break; case 25: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.5F, 0F); + GlStateManager.translate(0.04F, -0.5F, 0F); renderIcon(25); break; case 26: faceTranslate(); - GL11.glTranslatef(-0.1F, -0.5F, 0F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 0.7F); + GlStateManager.translate(-0.1F, -0.5F, 0F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 0.7F); renderIcon(26); break; case 27: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.5F, 0F); + GlStateManager.translate(0.04F, -0.5F, 0F); renderIcon(27); break; case 28: faceTranslate(); scale(0.25F); - GL11.glTranslatef(1.55F, -0.2F, -0.1F); + GlStateManager.translate(1.55F, -0.2F, -0.1F); renderIcon(28); - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(-0.1F, 0F, 0.1F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(-0.1F, 0F, 0.1F); renderIcon(28); break; case 30: faceTranslate(); scale(0.75F); - GL11.glTranslatef(0.04F, -0.4F, 0F); + GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(30); break; case 31: faceTranslate(); scale(0.5F); - GL11.glTranslatef(0.3F, 0.7F, 0.5F); + GlStateManager.translate(0.3F, 0.7F, 0.5F); renderIcon(31); break; } @@ -253,62 +254,62 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case 0: chestTranslate(); scale(0.5F); - GL11.glTranslatef(0.5F, 0.7F, 0F); + GlStateManager.translate(0.5F, 0.7F, 0F); renderIcon(0); break; case 1: chestTranslate(); scale(0.75F); - GL11.glTranslatef(0.15F, -0.1F, 0F); + GlStateManager.translate(0.15F, -0.1F, 0F); renderIcon(1); break; case 3: chestTranslate(); scale(0.6F); - GL11.glTranslatef(0.35F, 0.3F, 0F); + GlStateManager.translate(0.35F, 0.3F, 0F); renderIcon(3); break; case 12: chestTranslate(); scale(0.225F); - GL11.glTranslatef(1.2F, 1.9F, 0F); + GlStateManager.translate(1.2F, 1.9F, 0F); renderIcon(12); break; case 13: chestTranslate(); - GL11.glRotatef(-90F, 0F, 1F, 0F); + GlStateManager.rotate(-90F, 0F, 1F, 0F); scale(0.5F); - GL11.glTranslatef(-1.3F, -0.4F, -1F); + GlStateManager.translate(-1.3F, -0.4F, -1F); renderIcon(13); break; case 14: chestTranslate(); scale(0.5F); - GL11.glTranslatef(2.3F, 1F, -0.05F); - GL11.glRotatef(180F, 0F, 1F, 0F); + GlStateManager.translate(2.3F, 1F, -0.05F); + GlStateManager.rotate(180F, 0F, 1F, 0F); renderIcon(14); - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glColor4f(0F, 0F, 0.3F, 1F); - GL11.glTranslatef(-2.6F, 0F, 0.05F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.color(0F, 0F, 0.3F, 1F); + GlStateManager.translate(-2.6F, 0F, 0.05F); renderIcon(14); break; case 16: chestTranslate(); scale(0.225F); - GL11.glTranslatef(2.3F, 1.9F, 0F); + GlStateManager.translate(2.3F, 1.9F, 0F); renderIcon(16); break; case 21: chestTranslate(); scale(0.3F); - GL11.glTranslatef(1.2F, 0.5F, 0F); + GlStateManager.translate(1.2F, 0.5F, 0F); renderIcon(21); break; case 29: chestTranslate(); scale(0.8F); - GL11.glTranslatef(0.2F, -0.2F, -0.35F); - GL11.glRotatef(10F, 0F, 0F, 1F); + GlStateManager.translate(0.2F, -0.2F, -0.35F); + GlStateManager.rotate(10F, 0F, 0F, 1F); renderIcon(29); break; } @@ -316,18 +317,18 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void faceTranslate() { - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.4F, 0.1F, -0.25F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.4F, 0.1F, -0.25F); } public void chestTranslate() { - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.5F, -0.7F, 0.15F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.5F, -0.7F, 0.15F); } public void scale(float f) { - GL11.glScalef(f, f, f); + GlStateManager.scale(f, f, f); } public void renderIcon(int i) { 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 b7a423287..5ecfeb27d 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 @@ -183,9 +183,9 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.26F, -0.4F, armor ? 0.2F : 0.15F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); for(int i = 2; i < 4; i++) { IIcon icon = icons[i]; @@ -196,7 +196,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); Color color = new Color(getColorFromItemStack(stack, 1)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; 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 c78d2f552..8d5da67d2 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 @@ -105,10 +105,10 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.35F : -0.3F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } 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 820149bed..89c41c507 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 @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -356,10 +357,10 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub float i = 0.15F; float s = 1F; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); int light = 15728880; int lightmapX = light % 65536; @@ -405,7 +406,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rz = 0F; ry = -rx; rx = 0F; - GL11.glColor4f(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F); + GlStateManager.color(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F); break; } case 8 : { // Mega Ultra Chicken @@ -418,7 +419,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rx = 0F; s = 1.5F; h = 1.2F; - GL11.glColor4f(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F + 0.25F : 0F)); + GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F + 0.25F : 0F)); } } @@ -430,33 +431,33 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub Helper.rotateIfSneaking(event.entityPlayer); - GL11.glTranslatef(0F, h, i); + GlStateManager.translate(0F, h, i); - GL11.glRotatef(rz, 0F, 0F, 1F); - GL11.glRotatef(rx, 1F, 0F, 0F); - GL11.glRotatef(ry, 0F, 1F, 0F); - GL11.glScalef(s, s, s); + GlStateManager.rotate(rz, 0F, 0F, 1F); + GlStateManager.rotate(rx, 1F, 0F, 0F); + GlStateManager.rotate(ry, 0F, 1F, 0F); + GlStateManager.scale(s, s, s); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - GL11.glScalef(sr, sr, sr); - GL11.glRotatef(-ry, 0F, 1F, 0F); - GL11.glRotatef(-rx, 1F, 0F, 0F); - GL11.glRotatef(-rz, 0F, 0F, 1F); + GlStateManager.scale(sr, sr, sr); + GlStateManager.rotate(-ry, 0F, 1F, 0F); + GlStateManager.rotate(-rx, 1F, 0F, 0F); + GlStateManager.rotate(-rz, 0F, 0F, 1F); if(meta != 2) { // Sephiroth - GL11.glScalef(-1F, 1F, 1F); - GL11.glRotatef(rz, 0F, 0F, 1F); - GL11.glRotatef(rx, 1F, 0F, 0F); - GL11.glRotatef(ry, 0F, 1F, 0F); - GL11.glScalef(s, s, s); + GlStateManager.scale(-1F, 1F, 1F); + GlStateManager.rotate(rz, 0F, 0F, 1F); + GlStateManager.rotate(rx, 1F, 0F, 0F); + GlStateManager.rotate(ry, 0F, 1F, 0F); + GlStateManager.scale(s, s, s); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - GL11.glScalef(sr, sr, sr); - GL11.glRotatef(-ry, 1F, 0F, 0F); - GL11.glRotatef(-rx, 1F, 0F, 0F); - GL11.glRotatef(-rz, 0F, 0F, 1F); + GlStateManager.scale(sr, sr, sr); + GlStateManager.rotate(-ry, 1F, 0F, 0F); + GlStateManager.rotate(-rx, 1F, 0F, 0F); + GlStateManager.rotate(-rz, 0F, 0F, 1F); } - GL11.glColor3f(1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.popMatrix(); } } else if(meta == 1) // Jibril's Halo renderHalo(event.entityPlayer, event.partialRenderTick); @@ -464,23 +465,23 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @SideOnly(Side.CLIENT) public static void renderHalo(EntityPlayer player, float partialTicks) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glShadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.shadeModel(GL11.GL_SMOOTH); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.disableLighting(); + GlStateManager.disableCull(); + GlStateManager.color(1F, 1F, 1F, 1F); Minecraft.getMinecraft().renderEngine.bindTexture(textureHalo); if(player != null) Helper.translateToHeadLevel(player); - GL11.glRotated(30, 1, 0, -1); - GL11.glTranslatef(-0.1F, -0.5F, -0.1F); + GlStateManager.rotate(30, 1, 0, -1); + GlStateManager.translate(-0.1F, -0.5F, -0.1F); if(player != null) - GL11.glRotatef(player.ticksExisted + partialTicks, 0, 1, 0); - else GL11.glRotatef(Botania.proxy.getWorldElapsedTicks(), 0, 1, 0); + GlStateManager.rotate(player.ticksExisted + partialTicks, 0, 1, 0); + else GlStateManager.rotate(Botania.proxy.getWorldElapsedTicks(), 0, 1, 0); Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); @@ -492,9 +493,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub tes.draw(); ShaderHelper.releaseShader(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_CULL_FACE); + GlStateManager.enableLighting(); + GlStateManager.shadeModel(GL11.GL_FLAT); + GlStateManager.enableCull(); } @SideOnly(Side.CLIENT) @@ -520,26 +521,26 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub float trans = 1F; if(i == segs - 1) { trans = (float) last / (float) segTime; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); } - GL11.glColor4f(1F, 1F, 1F, trans); + GlStateManager.color(1F, 1F, 1F, trans); RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 9, 9); x += 8; } if(player.capabilities.isFlying) { int width = ItemNBTHelper.getInt(stack, TAG_DASH_COOLDOWN, 0); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); if(width > 0) Gui.drawRect(xo, y - 2, xo + 80, y - 1, 0x88000000); Gui.drawRect(xo, y - 2, xo + width, y - 1, 0xFFFFFFFF); } - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableAlpha(); + GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(Gui.icons); } 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 6faa9289c..a7ccbd1a5 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 @@ -74,13 +74,13 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(180F, 0F, 0F, 1F); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(-100F, 1F, 0F, 0F); - GL11.glTranslatef(-0.5F, -0.55F, 0.3F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(-100F, 1F, 0F, 0F); + GlStateManager.translate(-0.5F, -0.55F, 0.3F); if(armor) { - GL11.glScalef(1.1F, 1.1F, 1F); - GL11.glTranslatef(-0.05F, -0.1F, 0F); + GlStateManager.scale(1.1F, 1.1F, 1F); + GlStateManager.translate(-0.05F, -0.1F, 0F); } ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 03bf2be4a..b0797ca33 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -132,10 +132,10 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; - GL11.glTranslatef(0F, armor ? -0.07F : -0.01F, 0F); + GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); float s = 0.1F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); if(model == null) model = new ModelBiped(); 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 cc56f2147..03f6ce547 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 @@ -116,10 +116,10 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.36F, -0.3F, armor ? 0.2F : 0.15F); - GL11.glRotatef(-45F, 0F, 0F, 1F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); + GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); 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 cf15a1b00..fa44d39e3 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 @@ -222,10 +222,10 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.3F : -0.25F); - GL11.glScalef(0.75F, 0.75F, 0.75F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.4F, 0.1F, armor ? -0.3F : -0.25F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index b09fbba6c..e7de40e88 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -56,10 +56,10 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend Minecraft.getMinecraft().renderEngine.bindTexture(texture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; - GL11.glTranslatef(0F, 0.2F, 0F); + GlStateManager.translate(0F, 0.2F, 0F); float s = 1.05F / 16F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); if(model == null) model = new ModelBiped(); 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 a36c883e3..bd7ac4f42 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 @@ -58,10 +58,10 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GL11.glRotatef(-45F, 0F, 0F, 1F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); + GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); 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 c6c6102cb..cb9e7a9db 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 @@ -58,10 +58,10 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.35F, -0.1F, armor ? -0.3F : -0.25F); - GL11.glScalef(0.35F, 0.35F, 0.35F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.35F, -0.1F, armor ? -0.3F : -0.25F); + GlStateManager.scale(0.35F, 0.35F, 0.35F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } 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 20057dc2c..4787c2470 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 @@ -69,10 +69,10 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glTranslatef(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GL11.glRotatef(-45F, 0F, 0F, 1F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); + GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); 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 a0c47c406..5bcfc272e 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 @@ -106,8 +106,8 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GL11.glTranslatef(0.25F, -0.5F, 0F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0.25F, -0.5F, 0F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); RenderBlocks.getInstance().renderBlockAsItem(ModBlocks.tinyPlanet, 0, 1F); } } 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 fc623b691..c98531c82 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 @@ -140,10 +140,10 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; - GL11.glTranslatef(0F, 0.2F, 0F); + GlStateManager.translate(0F, 0.2F, 0F); float s = 1.05F / 16F; - GL11.glScalef(s, s, s); + GlStateManager.scale(s, s, s); if(model == null) model = new ModelBiped(); 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 353f02df7..3590a6e1c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -305,16 +305,16 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs Tessellator tess = Tessellator.getInstance(); Tessellator.renderingWorldRenderer = false; - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float alpha = ((float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.2F) * 0.5F + 0.5F) * 0.4F + 0.3F; double posX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks; double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks; double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks; - GL11.glTranslated(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); + GlStateManager.translate(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); float base = getRotationBase(stack); int angles = 360; @@ -337,27 +337,27 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs if(segmentLookedAt == seg) inside = true; - GL11.glPushMatrix(); - GL11.glRotatef(rotationAngle, 0F, 1F, 0F); - GL11.glTranslatef(s * m, -0.75F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(rotationAngle, 0F, 1F, 0F); + GlStateManager.translate(s * m, -0.75F, 0F); mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); - GL11.glScalef(0.75F, 0.75F, 0.75F); - GL11.glTranslatef(0F, 0F, 0.5F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); + GlStateManager.translate(0F, 0F, 0.5F); IIcon icon = signs[seg]; - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glColor4f(1F, 1F, 1F, getWarpPoint(stack, seg).isValid() ? 1F : 0.2F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.color(1F, 1F, 1F, getWarpPoint(stack, seg).isValid() ? 1F : 0.2F); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GL11.glColor3f(1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(180F, 1F, 0F, 0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180F, 1F, 0F, 0F); float a = alpha; if(inside) { a += 0.3F; @@ -365,8 +365,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } if(seg % 2 == 0) - GL11.glColor4f(0.6F, 0.6F, 0.6F, a); - else GL11.glColor4f(1F, 1F, 1F, a); + GlStateManager.color(0.6F, 0.6F, 0.6F, a); + else GlStateManager.color(1F, 1F, 1F, a); mc.renderEngine.bindTexture(glowTexture); tess.startDrawingQuads(); @@ -387,9 +387,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs y0 = 0; tess.draw(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index f4e00c8ed..94fd9e4fb 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -73,16 +73,16 @@ public class PageCraftingRecipe extends PageRecipe { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(craftingOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); int iconX = gui.getLeft() + 115; int iconY = gui.getTop() + 12; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); if(shapelessRecipe) { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); @@ -94,7 +94,7 @@ public class PageCraftingRecipe extends PageRecipe { } render.bindTexture(craftingOverlay); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.enableBlend(); if(oreDictRecipe) { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); @@ -102,7 +102,7 @@ public class PageCraftingRecipe extends PageRecipe { if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.oredict"))); } - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } @Override 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 e7392755c..86b98340b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -54,11 +54,11 @@ public class PageElvenRecipe extends PageRecipe { RecipeElvenTrade recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(elvenTradeOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); 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 abd4f80db..afbbfcc53 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -13,6 +13,7 @@ package vazkii.botania.common.lexicon.page; import java.lang.reflect.Constructor; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; @@ -84,21 +85,21 @@ public class PageEntity extends LexiconPage{ public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { dummyEntity.worldObj = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().theWorld : null; - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, 50.0F); - GL11.glScalef(-scale, scale, scale); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); + GlStateManager.enableColorMaterial(); + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, 50.0F); + GlStateManager.scale(-scale, scale, scale); + GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GL11.glTranslatef(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone + GlStateManager.translate(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GlStateManager.disableRescaleNormal(); OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 334392f95..1a5f3346d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -37,11 +37,11 @@ public class PageImage extends LexiconPage { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(resource); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); int width = gui.getWidth() - 30; int height = gui.getHeight(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index 01b9e2788..15ac859ad 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -31,11 +31,11 @@ public class PageLoreText extends PageText { public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { Minecraft.getMinecraft().renderEngine.bindTexture(paperOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); super.renderScreen(gui, mx, my); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index bd8515daa..52572d9aa 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -86,8 +86,8 @@ public class PageManaInfusionRecipe extends PageRecipe { else if(recipe.isConjuration()) renderItemAtGridPos(gui, 1, 2, new ItemStack(ModBlocks.conjurationCatalyst), false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); @@ -118,15 +118,15 @@ public class PageManaInfusionRecipe extends PageRecipe { font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x99000000); font.setUnicodeFlag(unicode); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); render.bindTexture(manaInfusionOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); if(hoveringOverDrop) { String key = RenderHelper.getKeyDisplayString("key.drop"); 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 c9a17ab4f..ee4c088bf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -59,31 +59,31 @@ public class PageMultiblock extends LexiconPage { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(multiblockOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); + GlStateManager.disableBlend(); + GlStateManager.enableAlpha(); final float maxX = 90, maxY = 60; - GL11.glPushMatrix(); - GL11.glTranslatef(gui.getLeft() + gui.getWidth() / 2, gui.getTop() + 90, gui.getZLevel() + 100F); + GlStateManager.pushMatrix(); + GlStateManager.translate(gui.getLeft() + gui.getWidth() / 2, gui.getTop() + 90, gui.getZLevel() + 100F); float diag = (float) Math.sqrt(mb.getXSize() * mb.getXSize() + mb.getZSize() * mb.getZSize()); float height = mb.getYSize(); float scaleX = maxX / diag; float scaleY = maxY / height; float scale = -Math.min(scaleY, scaleX); - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); - GL11.glRotatef(-20F, 1, 0, 0); - GL11.glRotatef(gui.getElapsedTicks(), 0, 1, 0); + GlStateManager.rotate(-20F, 1, 0, 0); + GlStateManager.rotate(gui.getElapsedTicks(), 0, 1, 0); MultiblockRenderHandler.renderMultiblockOnPage(mb); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); @@ -92,16 +92,16 @@ public class PageMultiblock extends LexiconPage { font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000); font.setUnicodeFlag(unicode); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GlStateManager.enableRescaleNormal(); RenderHelper.enableGUIStandardItemLighting(); int x = gui.getLeft() + 15; int y = gui.getTop() + 25; Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(new ItemStack(Blocks.stonebrick), x, y); RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GlStateManager.disableRescaleNormal(); - GL11.glPushMatrix(); - GL11.glTranslatef(0F, 0F, 200F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { List mats = new ArrayList(); mats.add(StatCollector.translateToLocal("botaniamisc.materialsRequired")); @@ -114,7 +114,7 @@ public class PageMultiblock extends LexiconPage { vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, mats); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 6f6af23f0..0e84136bb 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -84,11 +84,11 @@ public class PagePetalRecipe extends PageRecipe { render.bindTexture(petalOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } ItemStack getMiddleStack() { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 46066c55f..52e7b45e0 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; @@ -89,7 +90,7 @@ public class PageRecipe extends LexiconPage { tooltipStack = tooltipContainerStack = null; tooltipEntry = false; - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); mouseDownLastTick = Mouse.isButtonDown(0); } @@ -139,19 +140,19 @@ public class PageRecipe extends LexiconPage { RenderItem render = Minecraft.getMinecraft().getRenderManager(); boolean mouseDown = Mouse.isButtonDown(0); - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPushMatrix(); - GL11.glTranslated(xPos, yPos, 0); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableDepth(); + GlStateManager.pushMatrix(); + GlStateManager.translate(xPos, yPos, 0); render.renderItemAndEffectIntoGUI(stack, 0, 0); render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); int xpi = (int) xPos; int ypi = (int) yPos; @@ -178,7 +179,7 @@ public class PageRecipe extends LexiconPage { } } - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 6ab339e0e..b5d56d923 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -46,8 +46,8 @@ public class PageRuneRecipe extends PagePetalRecipe { @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 115, 0x66000000); @@ -65,7 +65,7 @@ public class PageRuneRecipe extends PagePetalRecipe { boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); font.drawString(ratioString, x + 100 - font.getStringWidth(ratioString), y + 5, 0x99000000); - font.setUnicodeFlag(unicode); GL11.glDisable(GL11.GL_BLEND); + font.setUnicodeFlag(unicode); GlStateManager.disableBlend(); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 7e85f0630..c8d01da93 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; @@ -72,9 +73,9 @@ public class PageShedding extends PageEntity { TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(sheddingOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); if(tooltipStack != null) { @@ -107,7 +108,7 @@ public class PageShedding extends PageEntity { tooltipStack = null; tooltipEntry = tooltipEntity = false; - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); mouseDownLastTick = Mouse.isButtonDown(0); } @@ -116,16 +117,16 @@ public class PageShedding extends PageEntity { RenderItem render = Minecraft.getMinecraft().getRenderItem(); boolean mouseDown = Mouse.isButtonDown(0); - GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_DEPTH_TEST); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableDepth(); render.renderItemAndEffectIntoGUI(stack, xPos, yPos); render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos); RenderHelper.disableStandardItemLighting(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(relativeMouseX >= xPos && relativeMouseY >= yPos && relativeMouseX <= xPos + 16 && relativeMouseY <= yPos + 16) { tooltipStack = stack; @@ -142,7 +143,7 @@ public class PageShedding extends PageEntity { } } - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); } @Override 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 02be5d57c..a89bf0157 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -46,28 +46,28 @@ public class PageTerrasteel extends PageRecipe { Block block2 = Blocks.lapis_block; Block block3 = ModBlocks.terraPlate; - GL11.glTranslatef(0F, 0F, -10F); + GlStateManager.translate(0F, 0F, -10F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 103, new ItemStack(block1), false); - GL11.glTranslatef(0F, 0F, 5F); + GlStateManager.translate(0F, 0F, 5F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 106, new ItemStack(block2), false); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 106, new ItemStack(block2), false); - GL11.glTranslatef(0F, 0F, 5F); + GlStateManager.translate(0F, 0F, 5F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 110, new ItemStack(block1), false); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 14, gui.getTop() + 110, new ItemStack(block1), false); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 13, gui.getTop() + 110, new ItemStack(block1), false); - GL11.glTranslatef(0F, 0F, 5F); + GlStateManager.translate(0F, 0F, 5F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 114, new ItemStack(block2), false); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 114, new ItemStack(block2), false); - GL11.glTranslatef(0F, 0F, 5F); + GlStateManager.translate(0F, 0F, 5F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 1, gui.getTop() + 117, new ItemStack(block1), false); - GL11.glTranslatef(0F, 0F, 5F); + GlStateManager.translate(0F, 0F, 5F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false); - GL11.glTranslatef(0F, 0F, -10F); + GlStateManager.translate(0F, 0F, -10F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 4), false); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 0), false); @@ -76,11 +76,11 @@ public class PageTerrasteel extends PageRecipe { Minecraft.getMinecraft().renderEngine.bindTexture(terrasteelOverlay); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } @Override From ddf2a94aa1e3cfc0bdb27dbaadcbba4bec32a46d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 02:18:20 -0600 Subject: [PATCH 045/935] Some states in the root package. here we go! --- .../botania/api/state/BotaniaStateProps.java | 20 ++++++++- ...AltGrassType.java => AltGrassVariant.java} | 2 +- .../botania/api/state/enums/CrateVariant.java | 15 +++++++ .../api/state/enums/LivingRockVariant.java | 18 ++++++++ .../api/state/enums/LivingWoodVariant.java | 19 ++++++++ .../api/state/enums/PlatformVariant.java | 16 +++++++ .../botania/api/state/enums/PylonVariant.java | 16 +++++++ .../botania/common/block/BlockAlfPortal.java | 28 ++++++------ .../botania/common/block/BlockAltGrass.java | 18 ++++---- .../common/block/BlockBifrostPerm.java | 2 +- .../common/block/BlockCacophonium.java | 29 +++++++++--- .../botania/common/block/BlockCamo.java | 20 +++++---- .../common/block/BlockEnchantedSoil.java | 25 ++++------- .../botania/common/block/BlockEnderEye.java | 8 ++-- .../botania/common/block/BlockFelPumpkin.java | 2 +- .../botania/common/block/BlockHourglass.java | 22 ++++++++- .../common/block/BlockLightLauncher.java | 2 +- .../botania/common/block/BlockLivingrock.java | 45 +++++++++++++------ .../botania/common/block/BlockLivingwood.java | 44 ++++++++++++------ .../botania/common/block/BlockOpenCrate.java | 44 ++++++++++-------- .../botania/common/block/BlockPlatform.java | 41 ++++++++++++----- .../botania/common/block/BlockPylon.java | 32 +++++++++++-- .../common/block/tile/TileEnderEye.java | 8 ++-- 23 files changed, 347 insertions(+), 129 deletions(-) rename src/main/java/vazkii/botania/api/state/enums/{AltGrassType.java => AltGrassVariant.java} (82%) create mode 100644 src/main/java/vazkii/botania/api/state/enums/CrateVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PylonVariant.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 40517afd5..3cf783c26 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -5,7 +5,7 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; -import vazkii.botania.api.state.enums.AltGrassType; +import vazkii.botania.api.state.enums.*; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -24,6 +24,7 @@ public class BotaniaStateProps { public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); // Redstone power - boolean + // Also for any other simple boolean "on/off" state public static final PropertyBool POWERED = PropertyBool.create("powered"); // Redstone power - int @@ -32,7 +33,22 @@ public class BotaniaStateProps { /** Properties for individual blocks **/ // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassType.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + + // BlockDreamWood, BlockLivingWood + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + + // BlockLivingRock + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + + // BlockOpenCrate + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + + // BlockPlatform + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + + // BlockPylon + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java similarity index 82% rename from src/main/java/vazkii/botania/api/state/enums/AltGrassType.java rename to src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index 5bbd19241..f6c547005 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassType.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -4,7 +4,7 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; -public enum AltGrassType implements IStringSerializable { +public enum AltGrassVariant implements IStringSerializable { DRY, GOLDEN, VIVID, diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java new file mode 100644 index 000000000..b8e3c1717 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -0,0 +1,15 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum CrateVariant implements IStringSerializable { + OPEN, + CRAFTY; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java new file mode 100644 index 000000000..47be762c4 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum LivingRockVariant implements IStringSerializable { + DEFAULT, + BRICK, + MOSSY_BRICK, + CRACKED_BRICK, + CHISELED_BRICK; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java new file mode 100644 index 000000000..561017457 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -0,0 +1,19 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum LivingWoodVariant implements IStringSerializable { + DEFAULT, + PLANKS, + MOSSY_PLANKS, + FRAMED, + PATTERN_FRAMED, + GLIMMERING; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java new file mode 100644 index 000000000..67d7b213b --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PlatformVariant implements IStringSerializable { + ABSTRUSE, + SPECTRAL, + INFRANGIBLE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java new file mode 100644 index 000000000..ce316c222 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PylonVariant implements IStringSerializable { + MANA, + NATURA, + GAIA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8a16618b1..49b3858cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -11,17 +11,18 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; @@ -31,26 +32,27 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { - IIcon iconOff, iconOn; - public static IIcon portalTex; - public BlockAlfPortal() { super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconOff = IconHelper.forBlock(par1IconRegister, this, 0); - iconOn = IconHelper.forBlock(par1IconRegister, this, 1); - portalTex = IconHelper.forBlock(par1IconRegister, this, "Inside"); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); } @Override - public IIcon getIcon(int side, int meta) { - return meta == 0 ? iconOff : iconOn; + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; } @Override @@ -72,8 +74,8 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z) == 0 ? 0 : 15; + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ((Boolean) world.getBlockState(pos).getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7ca8db558..9449dbfc9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -29,7 +29,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassType; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -41,8 +41,8 @@ public class BlockAltGrass extends BlockMod { super(Material.grass); setHardness(0.6F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.ALT_GRASS); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.DRY)); + setUnlocalizedName(LibBlockNames.ALT_GRASS); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); } @Override @@ -52,18 +52,18 @@ public class BlockAltGrass extends BlockMod { @Override public int getMetaFromState(IBlockState state) { - return ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); + return ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassType.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -80,7 +80,7 @@ public class BlockAltGrass extends BlockMod { @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { if(!world.isRemote && world.getLight(pos.up()) >= 9) { - AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); @@ -109,7 +109,7 @@ public class BlockAltGrass extends BlockMod { @Override public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { - AltGrassType variant = ((AltGrassType) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); switch(variant) { case DRY: // Dry break; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index c95b5bff2..6d2062afc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -33,7 +33,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { super(Material.glass); - setBlockName(LibBlockNames.BIFROST_PERM); + setUnlocalizedName(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 74c6547fd..9023358e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -23,6 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; @@ -33,6 +35,22 @@ public class BlockCacophonium extends BlockModContainer { super(Material.wood); setUnlocalizedName(LibBlockNames.CACOPHONIUM); setHardness(0.8F); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override @@ -47,17 +65,16 @@ public class BlockCacophonium extends BlockModContainer { @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) ((TileCacophonium) tile).annoyDirewolf(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 81669fd16..46eb57e12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -16,11 +16,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -60,8 +62,8 @@ public abstract class BlockCamo extends BlockModContainer { } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; @@ -89,26 +91,26 @@ public abstract class BlockCamo extends BlockModContainer { int metadata = currentStack.getItemDamage(); if(block instanceof BlockDirectional) { switch (par6) { - case 0: - case 1: + case DOWN: + case UP: break; - case 2: + case NORTH: metadata = metadata & 12 | 2; break; - case 3: + case SOUTH: metadata = metadata & 12; break; - case 4: + case WEST: metadata = metadata & 12 | 1; break; - case 5: + case EAST: metadata = metadata & 12 | 3; break; } } camo.camo = Block.getBlockFromItem(currentStack.getItem()); camo.camoMeta = metadata; - par1World.markBlockForUpdate(par2,par3,par4); + par1World.markBlockForUpdate(pos); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 481f150e6..b74754aaa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -13,21 +13,20 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.block.InterpolatedIcon; @@ -39,13 +38,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { - IIcon iconSide; - public BlockEnchantedSoil() { super(Material.grass); setHardness(0.6F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.ENCHANTED_SOIL); + setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); MinecraftForge.EVENT_BUS.register(this); } @@ -75,23 +72,17 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side == 0 ? Blocks.dirt.getIcon(0, 0) : side == 1 ? blockIcon : iconSide; + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + return Blocks.dirt.getItemDropped(state, p_149650_2_, p_149650_3_); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; - } - - @Override - protected boolean canSilkHarvest() { + public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 654b087eb..0d2513684 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -35,22 +35,22 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWER, 0)); // todo 1.8 this is probably powered (bool). see the TE + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWER); + return new BlockState(this, BotaniaStateProps.POWERED); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.POWER, meta); + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 15); } @Override public int getMetaFromState(IBlockState state) { - return ((Integer) state.getValue(BotaniaStateProps.POWER)); + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 21ecc766a..286560f24 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 { public BlockFelPumpkin() { super(Material.gourd); - setBlockName(LibBlockNames.FEL_PUMPKIN); + setUnlocalizedName(LibBlockNames.FEL_PUMPKIN); setHardness(1F); setStepSound(soundTypeWood); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index e4200c2cc..9549af714 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -32,6 +33,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.lib.LibRenderIDs; @@ -57,6 +59,22 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I setBlockBounds(d, 0F, d, 1F - d, 1.15F, 1F - d); random = new Random(); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override @@ -97,7 +115,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return world.getBlockMetadata(x, y, z) == 0 ? 0 : 15; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } @Override @@ -107,7 +125,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - world.setBlockMetadataWithNotify(x, y, z, 0, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index c6ccb1ca7..ccb02bc33 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -40,7 +40,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.LIGHT_LAUNCHER); + setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 77f28fce3..1a79596f5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -14,6 +14,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,7 +25,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -31,14 +34,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { - private static final int TYPES = 5; - public BlockLivingrock() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.LIVING_ROCK); + setUnlocalizedName(LibBlockNames.LIVING_ROCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.LIVINGROCK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((LivingRockVariant) state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= LivingRockVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.values()[meta]); } @Override @@ -47,32 +67,31 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; + boolean isDefaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGROCK_VARIANT) == LivingRockVariant.DEFAULT; + return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index c12006eab..a7399e0a6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -25,7 +26,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -33,8 +35,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { - private static final int TYPES = 6; - public BlockLivingwood() { this(LibBlockNames.LIVING_WOOD); } @@ -43,7 +43,26 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(name); + setUnlocalizedName(name); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.LIVINGWOOD_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((LivingWoodVariant) state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= LivingWoodVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.values()[meta]); } @Override @@ -57,9 +76,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { register(par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } void register(String name) { @@ -68,30 +87,29 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 5 ? 12 : 0; + return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; + boolean defaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; + return defaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } @Override public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 0; + return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index aab1160df..caeb11b8a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,7 +13,9 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -36,6 +38,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; @@ -51,17 +55,33 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I Random random; - private static final int SUBTYPES = 2; - public BlockOpenCrate() { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.OPEN_CRATE); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CRATE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((CrateVariant) state.getValue(BotaniaStateProps.CRATE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > CrateVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -75,7 +95,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -134,20 +154,6 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I super.breakBlock(par1World, pos, state); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconSide = IconHelper.forBlock(par1IconRegister, this, 0); - iconBottom = IconHelper.forBlock(par1IconRegister, this, 1); - iconSideCraft = IconHelper.forBlock(par1IconRegister, this, 2); - iconBottomCraft = IconHelper.forBlock(par1IconRegister, this, 3); - - sidePatternIcons = new IIcon[TileCraftCrate.PATTERNS.length]; - for(int i = 0; i < sidePatternIcons.length; i++) - sidePatternIcons[i] = IconHelper.forName(par1IconRegister, "ocPattern" + i); - } - - - @Override public TileEntity createNewTileEntity(World world, int meta) { return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); @@ -155,7 +161,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.openCrate : LexiconData.craftCrate; + return world.getBlockState(pos).getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? LexiconData.openCrate : LexiconData.craftCrate; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 97212e0b8..0cdfa59b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -26,6 +27,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CrateVariant; +import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCamo; @@ -37,14 +41,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { - private static final int SUBTYPES = 3; - public BlockPlatform() { super(Material.wood); setHardness(2.0F); setResistance(5.0F); setStepSound(Block.soundTypeWood); setUnlocalizedName(LibBlockNames.PLATFORM); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PLATFORM_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > PlatformVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); } @Override @@ -65,21 +86,21 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - if(meta == 2 || meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + PlatformVariant variant = ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)); + if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } @Override public float getBlockHardness(World par1World, BlockPos pos) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - return meta == 2 ? -1F : super.getBlockHardness(par1World, par2, par3, par4); + PlatformVariant variant = ((PlatformVariant) par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(par1World, pos); } @Override @@ -89,8 +110,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.platform : meta == 2 ? null : LexiconData.spectralPlatform; + PlatformVariant variant = ((PlatformVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + return variant == PlatformVariant.ABSTRUSE ? LexiconData.platform : variant == PlatformVariant.INFRANGIBLE ? null : LexiconData.spectralPlatform; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 125abd7c8..65fe7c48d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +27,9 @@ import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PlatformVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -46,7 +50,27 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu float f = 1F / 16F * 2F; setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PYLON_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PylonVariant) state.getValue(BotaniaStateProps.PYLON_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > PylonVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -65,7 +89,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < 3; i++) + for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -86,7 +110,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public float getEnchantPowerBonus(World world, BlockPos pos) { - return world.getBlockMetadata(x, y, z) == 0 ? 8 : 15; + return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? 8 : 15; } @Override @@ -96,8 +120,8 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; + PylonVariant variant = ((PylonVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT)); + return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } @Override public boolean canStabaliseInfusion(World world, BlockPos pos) { 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 89997321e..0c4da460f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { @@ -28,7 +29,7 @@ public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { if(worldObj.isRemote) return; - int meta = getBlockMetadata(); + boolean wasLooking = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); @@ -45,9 +46,8 @@ public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { } } - int newMeta = looking ? 15 : 0; - if(newMeta != meta) - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + if(looking != wasLooking) + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, looking), 1 | 2); } } From bf81e002e808c2261c81e25fc4d7f09d334a7b56 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 12:03:33 -0600 Subject: [PATCH 046/935] More blockstates --- .../botania/api/state/BotaniaStateProps.java | 12 +++ .../botania/api/state/enums/DrumVariant.java | 16 ++++ .../api/state/enums/SpreaderVariant.java | 17 ++++ .../api/state/enums/StorageVariant.java | 18 +++++ .../botania/common/block/BlockManaBomb.java | 2 +- .../common/block/BlockModDoubleFlower.java | 46 ++--------- .../common/block/BlockPistonRelay.java | 2 +- .../common/block/BlockSparkChanger.java | 26 ++++-- .../common/block/BlockSpecialFlower.java | 16 +++- .../botania/common/block/BlockStorage.java | 11 +-- .../corporea/BlockCorporeaCrystalCube.java | 10 --- .../block/corporea/BlockCorporeaIndex.java | 12 --- .../block/mana/BlockAlchemyCatalyst.java | 16 +--- .../common/block/mana/BlockBellows.java | 31 +++---- .../common/block/mana/BlockBrewery.java | 32 +++++--- .../common/block/mana/BlockDistributor.java | 15 ---- .../common/block/mana/BlockEnchanter.java | 11 +-- .../common/block/mana/BlockForestDrum.java | 80 +++++++++---------- .../common/block/mana/BlockManaDetector.java | 24 +++--- .../common/block/mana/BlockManaVoid.java | 8 -- .../botania/common/block/mana/BlockPool.java | 15 ---- .../botania/common/block/mana/BlockPrism.java | 44 +++++----- .../botania/common/block/mana/BlockPump.java | 18 +---- .../common/block/mana/BlockRuneAltar.java | 10 --- .../common/block/mana/BlockSpawnerClaw.java | 6 -- .../common/block/mana/BlockSpreader.java | 36 ++++++--- .../common/block/mana/BlockTerraPlate.java | 18 ----- .../common/block/mana/BlockTurntable.java | 16 ---- 28 files changed, 256 insertions(+), 312 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/DrumVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/StorageVariant.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 3cf783c26..42074c307 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -38,6 +38,9 @@ public class BotaniaStateProps { // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + // BlockForestDrum + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); @@ -47,8 +50,17 @@ public class BotaniaStateProps { // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + // BlockPrism + public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); + // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + // BlockSpreader + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + + // BlockStorage + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java new file mode 100644 index 000000000..abf23d24e --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum DrumVariant implements IStringSerializable { + WILD, + GATHERING, + CANOPY; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java new file mode 100644 index 000000000..333c62ae2 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -0,0 +1,17 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum SpreaderVariant implements IStringSerializable { + MANA, + REDSTONE, + ELVEN, + GAIA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java new file mode 100644 index 000000000..e1376be3a --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum StorageVariant implements IStringSerializable { + MANASTEEL, + TERRASTEEL, + ELEMENTIUM, + MANA_DIAMOND, + DRAGONSTONE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 4310b77fc..7ef470d00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -34,7 +34,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl super(Material.wood); setHardness(12.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.MANA_BOMB); + setUnlocalizedName(LibBlockNames.MANA_BOMB); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index dbf76bfbf..761affae7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -49,14 +49,11 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab private static final int COUNT = 8; - IIcon[] doublePlantTopIcons, doublePlantBottomIcons; - IIcon[] doublePlantTopIconsAlt, doublePlantBottomIconsAlt; - final int offset; public BlockModDoubleFlower(boolean second) { offset = second ? 8 : 0; - setBlockName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); + setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); setHardness(0F); setStepSound(soundTypeGrass); setTickRandomly(false); @@ -152,55 +149,24 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { + public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return true; } @Override - public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { + public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 7)); return ret; } @Override - public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - boolean top = func_149887_c(p_149691_2_); - return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[p_149691_2_ & 7]; - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - int meta = world.getBlockMetadata(x, y, z); - boolean top = func_149887_c(meta); - if(top) - meta = world.getBlockMetadata(x, y - 1, z); - - return (ConfigHandler.altFlowerTextures ? top ? doublePlantBottomIconsAlt : doublePlantTopIconsAlt : top ? doublePlantBottomIcons : doublePlantTopIcons)[meta & 7]; - } - - @Override - public void registerBlockIcons(IIconRegister register) { - doublePlantTopIcons = new IIcon[COUNT]; - doublePlantBottomIcons = new IIcon[COUNT]; - doublePlantTopIconsAlt = new IIcon[COUNT]; - doublePlantBottomIconsAlt = new IIcon[COUNT]; - for(int i = 0; i < COUNT; i++) { - int off = offset(i); - doublePlantTopIcons[i] = IconHelper.forName(register, "flower" + off + "Tall0"); - doublePlantBottomIcons[i] = IconHelper.forName(register, "flower" + off + "Tall1"); - doublePlantTopIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall0", BlockModFlower.ALT_DIR); - doublePlantBottomIconsAlt[i] = IconHelper.forName(register, "flower" + off + "Tall1", BlockModFlower.ALT_DIR); - } - } - - @Override - public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { + public int colorMultiplier(IBlockAccess blockAccess, BlockPos pos, int pass) { return 16777215; } @@ -216,7 +182,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { int meta = par1World.getBlockMetadata(par2, par3, par4); float[] color = EntitySheep.fleeceColorTable[offset(meta & 7)]; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 30e5a57e0..8a0f6c0af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -135,7 +135,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.getDimensionId(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { - dropBlockAsItem(world, x, y, z, new ItemStack(this)); + spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); if(!world.isRemote) world.playAuxSFX(2001, pos, Block.getIdFromBlock(this)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index b269dc79c..059aa7c66 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +27,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; @@ -44,10 +46,25 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.SPARK_CHANGER); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); + } + @Override public boolean isFullCube() { return false; @@ -66,14 +83,13 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { ((TileSparkChanger) world.getTileEntity(pos)).doSwap(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3058e0e5d..dd99b5f25 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -53,9 +53,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { - public static Map icons = new HashMap(); - public static Map iconsAlt = new HashMap(); - static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { // Misc @@ -123,6 +120,19 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return new BlockState(this, BotaniaStateProps.COLOR); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > 15) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + // @Override todo 1.8 coloredlightscore dep // public int getLightValue(IBlockAccess world, BlockPos pos) { // int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 6c1ce0a13..bc7858a70 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -24,6 +24,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; @@ -34,19 +36,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { - private static final int SUBTYPES = 5; - public BlockStorage() { super(Material.iron); setHardness(3F); setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.STORAGE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < SUBTYPES; i++) + for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -73,8 +74,8 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(pos); - return meta == 0 ? LexiconData.pool : LexiconData.terrasteel; + StorageVariant variant = ((StorageVariant) world.getBlockState(pos).getValue(BotaniaStateProps.STORAGE_VARIANT)); + return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } } 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 d224c1597..6b5964580 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -71,16 +71,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return LibRenderIDs.idCorporeaCrystalCybe; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.storage.getIcon(0, 2); - } - @Override public TileCorporeaBase createNewTileEntity(World world, int meta) { return new TileCorporeaCrystalCube(); 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 91dfa501e..6161a812e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -11,11 +11,9 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -44,16 +42,6 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.storage.getIcon(0, 2); - } - @Override public int getRenderType() { return LibRenderIDs.idCorporeaIndex; 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 01485c500..c0d809590 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -28,8 +28,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { - IIcon[] icons; - public BlockAlchemyCatalyst() { this(LibBlockNames.ALCHEMY_CATALYST); } @@ -39,19 +37,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo setHardness(2.0F); setResistance(10.0F); setStepSound(Block.soundTypeStone); - setBlockName(name); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[4]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + setUnlocalizedName(name); } @Override 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 82672bdf3..d87acfc5b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -11,19 +11,19 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.ModBlocks; @@ -34,8 +34,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBellows extends BlockModContainer implements ILexiconable { - private static final int[] META_ROTATIONS = new int[] { 3, 4, 2, 5 }; - public BlockBellows() { super(Material.wood); setHardness(2.0F); @@ -44,17 +42,27 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { float f = (1F - 10 / 16F) / 2F; setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + } + + @Override + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing()), 2); } @Override @@ -74,11 +82,6 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingwood.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idBellows; 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 2e9260cb7..5dc2c8114 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -13,10 +13,10 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -25,10 +25,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; @@ -37,6 +37,8 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.swing.text.html.ObjectView; + public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { Random random; @@ -51,11 +53,22 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa setStepSound(soundTypeStone); random = new Random(); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public IIcon getIcon(int side, int meta) { - return Blocks.cobblestone.getIcon(side, meta); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override @@ -63,7 +76,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { - if(brew.recipe == null && par1World.getBlockMetadata(par2, par3, par4) == 0) + if(brew.recipe == null && !((Boolean) state.getValue(BotaniaStateProps.POWERED))) for(int i = brew.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = brew.getStackInSlot(i); if(stackAt != null) { @@ -71,7 +84,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); brew.setInventorySlotContents(i, null); - par1World.func_147453_f(pos, this); + par1World.updateComparatorOutputLevel(pos, this); break; } } @@ -115,7 +128,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } super.breakBlock(par1World, pos, state); @@ -132,11 +145,6 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa return brew.signal; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public int getRenderType() { return LibRenderIDs.idBrewery; 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 b4fbf357a..7b8a74365 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -11,12 +11,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,8 +27,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockDistributor extends BlockModContainer implements ILexiconable { - IIcon iconSide, iconTop; - public BlockDistributor() { super(Material.rock); setHardness(2.0F); @@ -39,17 +35,6 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconTop = IconHelper.forBlock(par1IconRegister, this, 0); - iconSide = IconHelper.forBlock(par1IconRegister, this, 1); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 0 ? ModBlocks.livingrock.getIcon(0, 0) : par1 == 1 ? iconTop : iconSide; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileDistributor(); 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 4f88d073b..1580b855a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -16,7 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -28,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -44,7 +42,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; - public static IIcon overlay; public BlockEnchanter() { super(Material.rock); @@ -62,12 +59,6 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - super.registerBlockIcons(par1IconRegister); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileEnchanter(); @@ -137,7 +128,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); super.breakBlock(par1World, pos, state); } 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 dc6712c96..3185feca8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -16,8 +16,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -29,13 +29,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; @@ -46,10 +47,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { - IIcon iconBases, iconFaces; - IIcon iconBasesA, iconFacesA; - IIcon iconBasesB, iconFacesB; - public BlockForestDrum() { super(Material.wood); float f = 1F / 16F; @@ -57,7 +54,26 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.FOREST_DRUM); + setUnlocalizedName(LibBlockNames.FOREST_DRUM); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.DRUM_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((DrumVariant) state.getValue(BotaniaStateProps.DRUM_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > DrumVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.values()[meta]); } @Override @@ -66,9 +82,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -86,46 +102,29 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getBlock().getMetaFromState(state); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconBases = IconHelper.forBlock(par1IconRegister, this, 0); - iconFaces = IconHelper.forBlock(par1IconRegister, this, 1); - iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2); - iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3); - iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4); - iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5); - } - @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - boolean animal = meta == 1; - boolean tree = meta == 2; - return side < 2 ? animal ? iconBasesA : tree ? iconBasesB : iconBases : animal ? iconFacesA : tree ? iconFacesB : iconFaces; - } - @Override public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; - - if(world.getBlockMetadata(x, y, z) == 0) - ItemGrassHorn.breakGrass(world, null, 0, x, y, z); - else if(world.getBlockMetadata(x, y, z) == 2) - ItemGrassHorn.breakGrass(world, null, 1, x, y, z); + DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); + if(variant == DrumVariant.WILD) + ItemGrassHorn.breakGrass(world, null, 0, pos); + else if(variant == DrumVariant.CANOPY) + ItemGrassHorn.breakGrass(world, null, 1, pos); else if(!world.isRemote) { int range = 10; - List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); + List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); List shearables = new ArrayList(); ItemStack stack = new ItemStack(this, 1, 1); for(EntityLiving entity : entities) { - if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { + if(entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, new BlockPos(entity))) { shearables.add(entity); } else if(entity instanceof EntityCow) { 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)); @@ -152,7 +151,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(sheared > 4) break; - List stacks = ((IShearable) entity).onSheared(stack, world, (int) entity.posX, (int) entity.posY, (int) entity.posZ, 0); + List stacks = ((IShearable) entity).onSheared(stack, world, new BlockPos(entity), 0); if(stacks != null) for(ItemStack wool : stacks) { EntityItem ent = entity.entityDropItem(wool, 1.0F); @@ -166,20 +165,21 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(!world.isRemote) for(int i = 0; i < 10; i++) - world.playSoundEffect(x, y, z, "note.bd", 1F, 1F); - else world.spawnParticle(EnumParticleTypes.NOTE, x + 0.5, y + 1.2, z + 0.5D, 1.0 / 24.0, 0, 0); + world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "note.bd", 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); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); + DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); - switch(meta) { - case 1: + switch(variant) { + case GATHERING: return LexiconData.gatherDrum; - case 2: + case CANOPY: return LexiconData.canopyDrum; + case WILD: default: return LexiconData.forestDrum; } 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 4f5b0b505..715e98217 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -14,8 +14,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,12 +23,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaDetector; @@ -37,26 +37,28 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaDetector extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockManaDetector() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(Block.soundTypeStone); setUnlocalizedName(LibBlockNames.MANA_DETECTOR); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par2)]; + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override @@ -66,7 +68,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable @Override public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { - return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override 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 02f25276b..9b9c7584f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -12,12 +12,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,12 +38,6 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP setUnlocalizedName(LibBlockNames.MANA_VOID); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - overlay = IconHelper.forBlock(par1IconRegister, this, 1); - } - @Override public TileEntity createNewTileEntity(World world, int id) { return new TileManaVoid(); 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 7fa2c23e1..b81684d6b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -18,7 +18,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -30,10 +29,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -55,8 +52,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; - public static IIcon manaIcon; - public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -77,11 +72,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return super.setUnlocalizedName(par1Str); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - manaIcon = IconHelper.forName(par1IconRegister, "manaWater"); - } - @Override public int damageDropped(IBlockState state) { return state.getBlock().getMetaFromState(state); @@ -156,11 +146,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingrock.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idPool; 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 b980fece5..f976c3497 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; @@ -31,6 +32,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaTrigger; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -41,7 +43,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable { Random random; - IIcon[] icons; public BlockPrism() { super(Material.glass); @@ -51,20 +52,28 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); - + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.POWERED, false) + .withProperty(BotaniaStateProps.HAS_LENS, false) + ); random = new Random(); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); } @Override - public IIcon getIcon(int side, int meta) { - return side > 1 ? icons[1] : icons[0]; + public int getMetaFromState(IBlockState state) { + return (((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0) + + (((Boolean) state.getValue(BotaniaStateProps.HAS_LENS)) ? 1 : 0); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, (meta & 8) > 0) + .withProperty(BotaniaStateProps.HAS_LENS, (meta & 1) > 0); } @Override @@ -97,7 +106,6 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi ItemStack lens = prism.getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; - int meta = par1World.getBlockMetadata(par2, par3, par4); if(lens == null && isHeldItemLens) { if(!par5EntityPlayer.capabilities.isCreativeMode) @@ -105,30 +113,30 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi prism.setInventorySlotContents(0, heldItem.copy()); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2); + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); prism.setInventorySlotContents(0, null); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); +// par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); } return true; } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(!world.isRemote) { if(power && !powered) - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 1 | 2); else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } } @@ -168,7 +176,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } } - par1World.func_147453_f(par2, par3, par4, par5); + par1World.updateComparatorOutputLevel(pos, state.getBlock()); } super.breakBlock(par1World, pos, state); 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 da677ff72..9c2667139 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -12,18 +12,14 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; @@ -42,7 +38,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.PUMP); - setBlockBounds(true); + setBlockBounds(EnumFacing.Axis.X); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -59,22 +55,12 @@ public class BlockPump extends BlockModContainer implements ILexiconable { public void setBlockBounds(EnumFacing.Axis axis) { if (axis == EnumFacing.Axis.X) { - setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F) + setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F); } else if (axis == EnumFacing.Axis.Z) { setBlockBounds(0.25F, 0F, 0F, 0.75F, 0.5F, 1F); } } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingrock.getIcon(0, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idPump; 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 92754b0a8..3cdd85795 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -16,7 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +23,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,7 +38,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRuneAltar extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { Random random; - IIcon[] icons; public BlockRuneAltar() { super(Material.rock); @@ -63,13 +60,6 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - @Override public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); 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 5847c955f..d399104c4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana; import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -48,11 +47,6 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable list.add(new ItemStack(Blocks.mob_spawner)); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - //NO-OP - } - @Override public boolean isOpaqueCube() { return false; 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 5ce794f20..2d6b29c3f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -16,10 +16,10 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -32,11 +32,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; @@ -59,10 +60,28 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.SPREADER); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.SPREADER_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((SpreaderVariant) state.getValue(BotaniaStateProps.SPREADER_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > SpreaderVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]); + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -84,7 +103,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); - par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 1 | 2); + par1World.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); switch(orientation) { case DOWN: @@ -122,11 +141,6 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand return false; } - @Override - public IIcon getIcon(int par1, int par2) { - return par2 >= 2 ? ModBlocks.dreamwood.getIcon(par1, 0) : ModBlocks.livingwood.getIcon(par1, 0); - } - @Override public int getRenderType() { return LibRenderIDs.idSpreader; @@ -238,8 +252,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(pos); - return meta == 0 ? LexiconData.spreader : meta == 1 ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; + SpreaderVariant variant = ((SpreaderVariant) world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT)); + return variant == SpreaderVariant.MANA ? LexiconData.spreader : variant == SpreaderVariant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override 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 2e37b5e11..befe73652 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -11,12 +11,10 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -29,9 +27,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { - public static IIcon overlay; - IIcon[] icons; - public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -56,19 +51,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { return false; } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileTerraPlate(); 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 312858917..cd6eb5501 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -13,13 +13,11 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -33,8 +31,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { - IIcon[] icons; - public BlockTurntable() { super(Material.wood); setHardness(2.0F); @@ -42,18 +38,6 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan setUnlocalizedName(LibBlockNames.TURNTABLE); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 1 ? icons[0] : icons[1]; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileTurntable(); From e679a2062dc47c9b3d35dc834c29c6d144f410db Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 17:33:31 -0600 Subject: [PATCH 047/935] Misc touchups everywhere. Move ModBanners in block pkg --- .../java/vazkii/botania/api/BotaniaAPI.java | 28 ++++++---- .../botania/common/block/BlockModFlower.java | 2 +- .../botania/common/block/ModBanners.java | 48 +++++++++++++++++ .../core/command/CommandSkyblockSpread.java | 2 +- .../core/handler/BiomeDecorationHandler.java | 18 ++++--- .../core/handler/ManaNetworkHandler.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 6 +-- .../handler/TerrasteelCraftingHandler.java | 37 +++++++------- .../common/core/proxy/CommonProxy.java | 7 ++- .../common/entity/EntityDoppleganger.java | 16 +++--- .../common/entity/EntityManaBurst.java | 6 +-- .../common/entity/EntityThrownItem.java | 11 +++- .../integration/etfuturum/ModBanners.java | 51 ------------------- .../botania/common/item/ItemSpawnerMover.java | 43 +++++----------- .../item/block/ItemBlockSpecialFlower.java | 26 ++++------ .../armor/terrasteel/ItemTerrasteelHelm.java | 1 + .../equipment/bauble/ItemBaubleCosmetic.java | 5 -- .../botania/common/item/lens/LensPaint.java | 7 ++- .../common/item/record/ItemModRecord.java | 6 --- .../common/item/relic/ItemAesirRing.java | 16 +++++- .../lexicon/page/PageCraftingRecipe.java | 1 + .../common/lexicon/page/PageElvenRecipe.java | 4 +- .../common/lexicon/page/PageImage.java | 1 + .../common/lexicon/page/PageLoreText.java | 1 + .../lexicon/page/PageManaInfusionRecipe.java | 1 + .../common/lexicon/page/PageMultiblock.java | 1 + .../common/lexicon/page/PagePetalRecipe.java | 1 + .../common/lexicon/page/PageRecipe.java | 4 +- .../common/lexicon/page/PageRuneRecipe.java | 1 + .../common/lexicon/page/PageShedding.java | 2 +- .../common/lexicon/page/PageTerrasteel.java | 1 + .../botania/common/lib/LibObfuscation.java | 4 ++ 32 files changed, 182 insertions(+), 178 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/ModBanners.java delete mode 100644 src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 4fa139c99..e84661f1c 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -18,9 +18,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.minecraft.block.Block; +import net.minecraft.block.*; +import net.minecraft.block.properties.PropertyEnum; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -84,7 +86,7 @@ public final class BotaniaAPI { public static Map oreWeightsNether = new HashMap(); public static Map seeds = new HashMap(); public static Set looniumBlacklist = new LinkedHashSet(); - public static Set paintableBlocks = new LinkedHashSet(); + public static Map paintableBlocks = new LinkedHashMap(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); @@ -230,11 +232,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); - registerPaintableBlock(Blocks.stained_glass_pane); - registerPaintableBlock(Blocks.stained_hardened_clay); - registerPaintableBlock(Blocks.wool); - registerPaintableBlock(Blocks.carpet); + 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); } /** @@ -276,10 +278,18 @@ public final class BotaniaAPI { /** * Registers a paintableBlock and returns it. + * You must also provide the PropertyEnum that this block uses to express its color + * The component type of the property must be EnumDyeColor */ - public static Block registerPaintableBlock(Block paintable){ - paintableBlocks.add(paintable); + public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ + if (colorProp.getValueClass() != EnumDyeColor.class) { + throw new IllegalArgumentException("Must be EnumDyeColor"); + } + + paintableBlocks.put(paintable, colorProp); return paintable; + + //todo 1.8 improve this } /** diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index e11d5597b..3a2f8fb4d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -151,7 +151,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup placeDoubleFlower(world, x, y, z, meta, 1 | 2); } - public static void placeDoubleFlower(World world, int x, int y, int z, int meta, int flags) { + public static void placeDoubleFlower(World world, BlockPos pos, EnumDyeColor color, int flags) { Block flower = meta >= 8 ? ModBlocks.doubleFlower2 : ModBlocks.doubleFlower1; int placeMeta = meta & 7; world.setBlock(x, y, z, flower, placeMeta, flags); diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java new file mode 100644 index 000000000..228845af9 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -0,0 +1,48 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 25, 2015, 7:11:35 PM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityBanner; +import net.minecraftforge.common.util.EnumHelper; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; + +public final class ModBanners { + + public static void init() { + Class> clazz = TileEntityBanner.EnumBannerPattern.class; + addPattern(clazz, "flower", "flr", new ItemStack(ModItems.manaResource, 1, 3)); + addPattern(clazz, "lexicon", "lex", new ItemStack(ModItems.lexicon)); + addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.manaResource, 1, 4)); + addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.manaResource, 1, 13)); + addPattern(clazz, "tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato)); + + addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgrade, 1, 0)); + addPattern(clazz, "spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgrade, 1, 1)); + 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)); + } + + public static void addPattern(Class> clazz, String name, String id, ItemStack craftingItem) { + name = "botania_" + name; + id = "bt_" + id; + EnumHelper.addEnum(clazz, name.toUpperCase(), new Class[] { String.class, String.class, ItemStack.class }, new Object[] { name, id, craftingItem }); + } +} diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 66b9870d9..6a0208e95 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -44,7 +44,7 @@ public class CommandSkyblockSpread extends CommandBase { int maxrange = 200000; if(args.length == 2) - maxrange = parseInt(sender, args[1]); // <- todo 1.8 wat + maxrange = parseInt(args[1]); if(maxrange > maxAllowed) throw new CommandException("botaniamisc.skyblockRangeTooHigh"); diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index ac8529344..7a6768bea 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -10,11 +10,13 @@ */ package vazkii.botania.common.core.handler; +import net.minecraft.item.EnumDyeColor; import net.minecraft.util.BlockPos; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; import vazkii.botania.api.item.IFlowerlessBiome; import vazkii.botania.api.item.IFlowerlessWorld; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; @@ -45,7 +47,7 @@ public class BiomeDecorationHandler { int z = event.pos.getZ() + event.rand.nextInt(16) + 8; int y = event.world.getTopSolidOrLiquidBlock(event.pos).getY(); - int color = event.rand.nextInt(16); + EnumDyeColor color = EnumDyeColor.byMetadata(event.rand.nextInt(16)); boolean primus = event.rand.nextInt(380) == 0; for(int j = 0; j < ConfigHandler.flowerDensity * ConfigHandler.flowerPatchChance; j++) { @@ -53,7 +55,7 @@ public class BiomeDecorationHandler { int y1 = y + event.rand.nextInt(4) - event.rand.nextInt(4); int z1 = z + event.rand.nextInt(dist * 2) - dist; BlockPos pos2 = new BlockPos(x1, y1, z1); - if(event.world.isAirBlock(pos2) && (!event.world.provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1)) { + if(event.world.isAirBlock(pos2) && (!event.world.provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.world, pos2)) { if(primus) { event.world.setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2); TileSpecialFlower flower = (TileSpecialFlower) event.world.getTileEntity(pos2); @@ -61,9 +63,9 @@ public class BiomeDecorationHandler { SubTileDaybloom subtile = (SubTileDaybloom) flower.getSubTile(); subtile.setPrimusPosition(); } else { - event.world.setBlockState(pos2, ModBlocks.flower, color, 2); - if(event.rand.nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).func_149851_a(event.world, x1, y1, z1, false)) - BlockModFlower.placeDoubleFlower(event.world, x1, y1, z1, color, 0); + event.world.setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); + if(event.rand.nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.world, pos2, event.world.getBlockState(pos2), false)) + BlockModFlower.placeDoubleFlower(event.world, pos2, color, 0); } } } @@ -75,9 +77,9 @@ public class BiomeDecorationHandler { int z = event.pos.getZ() + event.rand.nextInt(16) + 8; int y = event.rand.nextInt(26) + 4; BlockPos pos3 = new BlockPos(x, y, z); - int color = event.rand.nextInt(16); - if(event.world.isAirBlock(pos3) && ModBlocks.mushroom.canBlockStay(event.world, x, y, z)) - event.world.setBlockState(pos3, ModBlocks.mushroom, color, 2); + EnumDyeColor color = EnumDyeColor.byMetadata(event.rand.nextInt(16)); + if(event.world.isAirBlock(pos3) && ModBlocks.mushroom.canPlaceBlockAt(event.world, pos3)) + event.world.setBlockState(pos3, ModBlocks.mushroom.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); } } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index b98ab1c62..564344fe7 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -92,7 +92,7 @@ public final class ManaNetworkHandler implements IManaNetwork { TileEntity tile = sig.tile; if(tile.isInvalid()) continue; - float distance = MathHelper.pointDistanceSpace(tile.xCoord, tile.yCoord, tile.zCoord, pos.posX, pos.posY, pos.posZ); + float distance = MathHelper.pointDistanceSpace(tile.getPos(), pos); if(distance > limit) continue; diff --git a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java index bcf353fa6..e032a903c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java @@ -29,11 +29,11 @@ public final class SpawnerChangingHandler { if(event.entityPlayer.capabilities.isCreativeMode && !event.world.isRemote && event.action == Action.RIGHT_CLICK_BLOCK && !event.entityPlayer.isSneaking()) { ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Items.spawn_egg) { - TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); + TileEntity tile = event.world.getTileEntity(event.pos); if(tile instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; - spawner.func_145881_a().setEntityName(EntityList.getStringFromID(stack.getItemDamage())); - event.world.markBlockForUpdate(event.x, event.y, event.z); + spawner.getSpawnerBaseLogic().setEntityName(EntityList.getStringFromID(stack.getItemDamage())); + event.world.markBlockForUpdate(event.pos); event.setCanceled(true); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java index a9a8017be..8f6fe40c8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java @@ -18,12 +18,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibObfuscation; // This is legacy code and is no longer used. Check out TileTerraPlate instead. public final class TerrasteelCraftingHandler { @@ -43,23 +46,21 @@ public final class TerrasteelCraftingHandler { item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); getManaFromPools : { - int x = MathHelper.floor_double(item.posX); - int y = MathHelper.floor_double(item.posY); - int z = MathHelper.floor_double(item.posZ); - + BlockPos pos = new BlockPos(item); int range = 12; for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) for(int k = - range; k < range + 1; k++) { - TileEntity tile = item.worldObj.getTileEntity(x + i, y + j, z + k); + BlockPos pos_ = pos.add(i, j, k); + TileEntity tile = item.worldObj.getTileEntity(pos_); if(tile instanceof IManaPool) { IManaPool pool = (IManaPool) tile; if(!item.worldObj.isRemote && pool.getCurrentMana() >= MANA_PER_TICK) { pool.recieveMana(-MANA_PER_TICK); - item.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); + item.worldObj.markBlockForUpdate(tile.getPos()); incrementCraftingTime(item, time); break getManaFromPools; } @@ -75,18 +76,16 @@ public final class TerrasteelCraftingHandler { if(estack.stackSize != 1) return -1; - int x = MathHelper.floor_double(item.posX); - int y = MathHelper.floor_double(item.posY); - int z = MathHelper.floor_double(item.posZ); + BlockPos pos = new BlockPos(item); - if(item.worldObj.getBlock(x, y - 1, z) != Blocks.beacon) + if(item.worldObj.getBlockState(pos.down()).getBlock() != Blocks.beacon) return -1; - TileEntityBeacon beacon = (TileEntityBeacon) item.worldObj.getTileEntity(x, y - 1, z); - if(beacon.getLevels() <= 0) + TileEntityBeacon beacon = (TileEntityBeacon) item.worldObj.getTileEntity(pos.down()); + if(beacon.getField(0) <= 0) // Field 0 -> levels return -1; - List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)); + List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); EntityItem diamond = null; EntityItem pearl = null; @@ -115,12 +114,12 @@ public final class TerrasteelCraftingHandler { if(diamond != null && pearl != null) { int time = getTimeInCrafting(item); if(time > 0) { - diamond.delayBeforeCanPickup = 1; - diamond.age = 0; - pearl.delayBeforeCanPickup = 1; - pearl.age = 0; - item.delayBeforeCanPickup = 1; - item.age = 0; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, diamond, 1, LibObfuscation.PICKUP_DELAY); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, diamond, 0, LibObfuscation.AGE); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, pearl, 1, LibObfuscation.PICKUP_DELAY); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, pearl, 0, LibObfuscation.AGE); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, 1, LibObfuscation.PICKUP_DELAY); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, 0, LibObfuscation.AGE); } return time; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 6d9d5fc7f..0c36807e3 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModMultiblocks; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; @@ -62,7 +63,7 @@ import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.ModEntities; //import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8 -//import vazkii.botania.common.integration.etfuturum.ModBanners; +//import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; @@ -101,9 +102,7 @@ public class CommonProxy { ModBrewRecipes.init(); ModAchievements.init(); ModMultiblocks.init(); - - if(Botania.etFuturumLoaded) - // todo 1.8 ModBanners.init(); + ModBanners.init(); ChestGenHandler.init(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index baf5632fa..38027b588 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -17,8 +17,10 @@ import java.util.List; import java.util.regex.Pattern; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -55,6 +57,8 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; @@ -119,14 +123,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); - for(int[] p : PYLON_LOCATIONS) - mb.addComponent(, p[0], ModBlocks.pylon, 2); + for(BlockPos p : PYLON_LOCATIONS) + mb.addComponent(p, ModBlocks.pylon, 2); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) mb.addComponent(new BeaconComponent(new BlockPos(i - 1, 0, j - 1))); - mb.addComponent(, 0, Blocks.beacon, 0); + mb.addComponent(new BlockPos(0, 1, 0), Blocks.beacon, 0); mb.setRenderOffset(0, -1, 0); return mb.makeSet(); @@ -144,9 +148,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi for(BlockPos coords : PYLON_LOCATIONS) { BlockPos pos_ = pos.add(coords); - Block blockat = par3World.getBlock(x, y, z); - int meta = par3World.getBlockMetadata(x, y, z); - if(blockat != ModBlocks.pylon || meta != 2) { + IBlockState state = par3World.getBlockState(pos_); + Block blockat = state.getBlock(); + if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!par3World.isRemote) player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index a703a2bc8..27e1974c3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -47,8 +47,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class EntityManaBurst extends EntityThrowable implements IManaBurst { @@ -394,7 +394,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_) { + 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_) { setPosition(p_70056_1_, p_70056_3_, p_70056_5_); setRotation(p_70056_7_, p_70056_8_); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index cfe0e0dfe..77b14f93d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -21,7 +21,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibObfuscation; public class EntityThrownItem extends EntityItem { @@ -33,7 +35,12 @@ public class EntityThrownItem extends EntityItem { double p_i1710_4_, double p_i1710_6_, EntityItem item) { super(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, item.getEntityItem()); - delayBeforeCanPickup = item.delayBeforeCanPickup; + ObfuscationReflectionHelper.setPrivateValue( + EntityItem.class, + this, + ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.PICKUP_DELAY), + LibObfuscation.PICKUP_DELAY + ); motionX = item.motionX; motionY = item.motionY; motionZ = item.motionZ; @@ -63,7 +70,7 @@ public class EntityThrownItem extends EntityItem { { Entity entity1 = (Entity)list.get(j); - if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || delayBeforeCanPickup == 0)) + if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, this, LibObfuscation.PICKUP_DELAY)) == 0)) { float f = 1.0F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); diff --git a/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java b/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java deleted file mode 100644 index 8b140b780..000000000 --- a/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 25, 2015, 7:11:35 PM (GMT)] - */ -package vazkii.botania.common.integration.etfuturum; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.EnumHelper; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ModItems; - -public final class ModBanners { - - public static void init() { - try { - Class> clazz = (Class>) Class.forName("ganymedes01.etfuturum.tileentities.TileEntityBanner$EnumBannerPattern"); - addPattern(clazz, "flower", "flr", new ItemStack(ModItems.manaResource, 1, 3)); - addPattern(clazz, "lexicon", "lex", new ItemStack(ModItems.lexicon)); - addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.manaResource, 1, 4)); - addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.manaResource, 1, 13)); - addPattern(clazz, "tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato)); - - addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgrade, 1, 0)); - addPattern(clazz, "spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgrade, 1, 1)); - 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)); - } catch (ClassNotFoundException e) { - // Looks like we don't have EtFuturum around, let's not do any of this nonsense then - } - } - - public static void addPattern(Class> clazz, String name, String id, ItemStack craftingItem) { - name = "botania_" + name; - id = "bt_" + id; - EnumHelper.addEnum(clazz, name.toUpperCase(), new Class[] { String.class, String.class, ItemStack.class }, new Object[] { name, id, craftingItem }); - } -} diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 258a44270..8004551c0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -114,49 +114,30 @@ public class ItemSpawnerMover extends ItemMod { } } - private boolean placeBlock(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - Block block = world.getBlock(x, y, z); + private boolean placeBlock(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xOffset, float yOffset, float zOffset) { + Block block = world.getBlockState(pos).getBlock(); if(block == Blocks.snow_layer) - side = 1; - else if(block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { - switch (side) { - case 0: - --y; - break; - case 1: - ++y; - break; - case 2: - --z; - break; - case 3: - ++z; - break; - case 4: - --x; - break; - case 5: - ++x; - break; - } + side = EnumFacing.UP; + else if(block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, pos)) { + pos = pos.offset(side); } if(itemstack.stackSize == 0) return false; - else if(!player.canPlayerEdit(x, y, z, side, itemstack)) + else if(!player.canPlayerEdit(pos, side, itemstack)) return false; - else if(y == 255 && block.getMaterial().isSolid()) + else if(pos.getY() == 255 && block.getMaterial().isSolid()) return false; - else if(world.canPlaceEntityOnSide(Blocks.mob_spawner, x, y, z, false, side, player, itemstack)) { - int meta = block.onBlockPlaced(world, x, y, z, side, xOffset, yOffset, zOffset, 0); + else if(world.canBlockBePlaced(Blocks.mob_spawner, pos, false, side, player, itemstack)) { + int meta = block.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, 0); - if(placeBlockAt(itemstack, player, world, x, y, z, side, xOffset, yOffset, zOffset, meta)) { - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.stepSound.func_150496_b(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + if(placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, meta)) { + world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getFrequency() * 0.8F); player.renderBrokenItemStack(itemstack); player.addStat(ModAchievements.spawnerMoverUse, 1); for(int i = 0; i < 100; i++) - Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); --itemstack.stackSize; } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 8311cae46..a3fb57f3d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -13,13 +13,15 @@ package vazkii.botania.common.item.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -41,28 +43,18 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public IIcon getIconIndex(ItemStack stack) { - return BotaniaAPI.getSignatureForName(getType(stack)).getIconForStack(stack); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } - - @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - boolean placed = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); if(placed) { String type = getType(stack); - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(pos); if(te instanceof TileSpecialFlower) { TileSpecialFlower tile = (TileSpecialFlower) te; tile.setSubTile(type); - tile.onBlockAdded(world, x, y, z); - tile.onBlockPlacedBy(world, x, y, z, player, stack); + tile.onBlockAdded(world, pos, newState); + tile.onBlockPlacedBy(world, pos, newState, player, stack); if(!world.isRemote) - world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(pos); } } 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 4ae049316..efd845a6b 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; 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 3c9eca6fc..46ec0676c 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 @@ -66,11 +66,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(SUBTYPES - 1, dmg)]; - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index ea40b1e37..752630157 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -23,7 +23,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; @@ -45,7 +44,7 @@ public class LensPaint extends Lens { dead = true; } else { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(BotaniaAPI.paintableBlocks.contains(block)) { + if(BotaniaAPI.paintableBlocks.containsKey(block)) { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); List coordsToPaint = new ArrayList(); List coordsFound = new ArrayList(); @@ -72,9 +71,9 @@ public class LensPaint extends Lens { EnumDyeColor placeColor = EnumDyeColor.byMetadata(storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor); IBlockState stateThere = entity.worldObj.getBlockState(coords); - if(metaThere != placeColor) { + if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor) { if(!entity.worldObj.isRemote) - entity.worldObj.setBlockState(coords, placeColor, 2); + entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); int hex = placeColor.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 2bbe534d5..abe4b4b81 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -43,12 +43,6 @@ public class ItemModRecord extends ItemRecord { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public ResourceLocation getRecordResource(String name) { return new ResourceLocation(file); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 06faffb37..9c91f84f7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -24,6 +24,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; @@ -40,6 +41,7 @@ import com.google.common.collect.Multimap; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibObfuscation; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { @@ -67,8 +69,18 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; entity.motionZ = event.entityItem.motionZ; - entity.age = event.entityItem.age; - entity.delayBeforeCanPickup = event.entityItem.delayBeforeCanPickup; + ObfuscationReflectionHelper.setPrivateValue( + EntityItem.class, + entity, + ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, event.entityItem, LibObfuscation.AGE), + LibObfuscation.AGE + ); + ObfuscationReflectionHelper.setPrivateValue( + EntityItem.class, + entity, + ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, event.entityItem, LibObfuscation.PICKUP_DELAY), + LibObfuscation.PICKUP_DELAY + ); entity.worldObj.spawnEntityInWorld(entity); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 94fd9e4fb..bb628fdee 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; 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 86b98340b..2b82f507c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -6,11 +6,11 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; @@ -75,7 +75,7 @@ public class PageElvenRecipe extends PageRecipe { IIcon portalIcon = BlockAlfPortal.portalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - RenderItem.getInstance().renderIcon(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); + Minecraft.getMinecraft().getRenderItem().renderIcon(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 1a5f3346d..8f51fa9de 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index 15ac859ad..37c9f0dc7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 52572d9aa..b6fecc955 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; 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 ee4c088bf..ceb53842c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.init.Blocks; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 0e84136bb..dda54e9bf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 52e7b45e0..e553d5000 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -137,7 +137,7 @@ public class PageRecipe extends LexiconPage { @SideOnly(Side.CLIENT) public void renderItem(IGuiLexiconEntry gui, double xPos, double yPos, ItemStack stack, boolean accountForContainer) { - RenderItem render = Minecraft.getMinecraft().getRenderManager(); + RenderItem render = Minecraft.getMinecraft().getRenderItem(); boolean mouseDown = Mouse.isButtonDown(0); GlStateManager.pushMatrix(); @@ -149,7 +149,7 @@ public class PageRecipe extends LexiconPage { GlStateManager.pushMatrix(); GlStateManager.translate(xPos, yPos, 0); render.renderItemAndEffectIntoGUI(stack, 0, 0); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0); + render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0, ""); GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index b5d56d923..707f5a3a5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index c8d01da93..dca49b71c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -124,7 +124,7 @@ public class PageShedding extends PageEntity { GlStateManager.enableRescaleNormal(); GlStateManager.enableDepth(); render.renderItemAndEffectIntoGUI(stack, xPos, yPos); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos); + render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos, ""); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); 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 a89bf0157..b3f752313 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index e1428c7c7..c94760551 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -12,6 +12,10 @@ package vazkii.botania.common.lib; public final class LibObfuscation { + // EntityItem + public static final String[] AGE = { "age", "field_70292_b", "c" }; + public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "d" }; + // EffectRenderer public static final String[] PARTICLE_TEXTURES = new String[] { "particleTextures", "field_110737_b", "b" }; From 6c637d27b292ae2244af32ea0af7bee41f42b860 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 Nov 2015 22:14:46 -0600 Subject: [PATCH 048/935] Lots of rendering work. Multiblock structures migrated from to states --- .../multiblock/IMultiblockRenderHook.java | 5 +- .../api/lexicon/multiblock/Multiblock.java | 44 +++--- .../multiblock/component/AnyComponent.java | 11 +- .../component/ColorSwitchingComponent.java | 21 ++- .../multiblock/component/FlowerComponent.java | 2 +- .../component/MultiblockComponent.java | 41 +++--- .../botania/api/state/BotaniaStateProps.java | 7 + .../core/handler/BaubleRenderHandler.java | 3 +- .../core/handler/BoundTileRenderer.java | 18 ++- .../handler/ContributorFancinessHandler.java | 20 +-- .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 69 ++++----- .../core/handler/MultiblockRenderHandler.java | 131 ++++++++++-------- .../core/handler/RedStringRenderer.java | 19 ++- .../handler/SubTileRadiusRenderHandler.java | 21 ++- .../java/vazkii/botania/client/fx/FXWisp.java | 1 + .../render/block/RenderSpecialFlower.java | 3 +- .../render/entity/RenderBabylonWeapon.java | 19 ++- .../render/entity/RenderDoppleganger.java | 5 +- .../client/render/entity/RenderManaStorm.java | 5 + .../render/entity/RenderPinkWither.java | 10 +- .../client/render/entity/RenderPixie.java | 1 + .../render/entity/RenderPoolMinecart.java | 10 +- .../client/render/entity/RenderSparkBase.java | 25 ++-- .../render/entity/RenderThornChakram.java | 25 ++-- .../render/tile/RenderTileAlfPortal.java | 4 +- .../client/render/tile/RenderTileAltar.java | 4 +- .../render/tile/RenderTileTinyPotato.java | 1 + .../botania/common/block/BlockBifrost.java | 2 +- .../common/block/mana/BlockEnchanter.java | 24 +++- .../common/block/tile/TileEnchanter.java | 37 +++-- .../common/entity/EntityDoppleganger.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 25 ++-- .../item/material/ItemManaResource.java | 9 +- .../botania/common/lib/LibObfuscation.java | 5 + 35 files changed, 386 insertions(+), 245 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 591cd252d..a4efe59d3 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; @@ -24,8 +25,8 @@ public interface IMultiblockRenderHook { public static Map renderHooks = new HashMap(); - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, Block block, int meta, RenderBlocks renderBlocks, MultiblockComponent comp, float alpha); + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha); - public boolean needsTranslate(Block block); + public boolean needsTranslate(IBlockState state); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index fc317116f..9cab8f69f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -28,7 +28,9 @@ public class Multiblock { public List components = new ArrayList(); public List materials = new ArrayList(); - public int minX, minY, minZ, maxX, maxY, maxZ, offX, offY, offZ; + public BlockPos minPos; + public BlockPos maxPos; + public BlockPos offPos; public HashMap locationCache = new HashMap(); @@ -40,7 +42,7 @@ public class Multiblock { if(getComponentForLocation(component.relPos) != null) throw new IllegalArgumentException("Location in multiblock already occupied"); components.add(component); - changeAxisForNewComponent(component.relPos.getX(), component.relPos.getY(), component.relPos.getZ()); + changeAxisForNewComponent(component.relPos); calculateCostForNewComponent(component); addComponentToLocationCache(component); } @@ -53,21 +55,21 @@ public class Multiblock { addComponent(new MultiblockComponent(pos, block, meta)); } - private void changeAxisForNewComponent(int x, int y, int z) { - if(x < minX) - minX = x; - else if(x > maxX) - maxX = x; + private void changeAxisForNewComponent(BlockPos pos) { + if(pos.getX() < minPos.getX()) + minPos = new BlockPos(pos.getX(), minPos.getY(), minPos.getZ()); + else if(pos.getX() > maxPos.getX()) + maxPos = new BlockPos(pos.getX(), maxPos.getY(), maxPos.getZ()); - if(y < minY) - minY = y; - else if(y > maxY) - maxY = y; + if(pos.getY() < minPos.getY()) + minPos = new BlockPos(minPos.getX(), pos.getY(), minPos.getZ()); + else if(pos.getY() > maxPos.getY()) + maxPos = new BlockPos(maxPos.getX(), pos.getY(), maxPos.getZ()); - if(z < minZ) - minZ = z; - else if(z > maxZ) - maxZ = z; + if(pos.getZ() < minPos.getZ()) + minPos = new BlockPos(minPos.getX(), minPos.getY(), pos.getZ()); + else if(pos.getZ() > maxPos.getZ()) + maxPos = new BlockPos(maxPos.getX(), maxPos.getY(), pos.getZ()); } private void calculateCostForNewComponent(MultiblockComponent comp) { @@ -90,10 +92,8 @@ public class Multiblock { materials.add(stack); } - public void setRenderOffset(int x, int y, int z) { - offX = x; - offY = y; - offZ = z; + public void setRenderOffset(BlockPos pos) { + offPos = pos; } public List getComponents() { @@ -149,15 +149,15 @@ public class Multiblock { } public int getXSize() { - return Math.abs(minX) + Math.abs(maxX) + 1; + return Math.abs(minPos.getX()) + Math.abs(maxPos.getX()) + 1; } public int getYSize() { - return Math.abs(minY) + Math.abs(maxY) + 1; + return Math.abs(minPos.getY()) + Math.abs(maxPos.getY()) + 1; } public int getZSize() { - return Math.abs(minZ) + Math.abs(maxZ) + 1; + return Math.abs(minPos.getZ()) + Math.abs(maxPos.getZ()) + 1; } /** diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 9fcdde2ab..5a86a6c54 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -11,6 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -19,14 +20,14 @@ import net.minecraft.world.World; */ public class AnyComponent extends MultiblockComponent { - public AnyComponent(BlockPos relPos, Block block, int meta) { - super(relPos, block, meta); + public AnyComponent(BlockPos relPos, IBlockState state) { + super(relPos, state); } @Override - public boolean matches(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - return !block.isAir(world, x, y, z) && block.getCollisionBoundingBoxFromPool(world, x, y, z) != null; + public boolean matches(World world, BlockPos pos) { + Block block = world.getBlockState(pos).getBlock(); + return !block.isAir(world, pos) && block.getCollisionBoundingBox(world, pos, world.getBlockState(pos)) != null; } } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 4af31394e..52239a29e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -11,6 +11,9 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -21,23 +24,29 @@ import vazkii.botania.api.BotaniaAPI; */ public class ColorSwitchingComponent extends MultiblockComponent { - public ColorSwitchingComponent(BlockPos relPos, Block block) { - super(relPos, block, -1); + private final PropertyEnum colorProp; + + public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) { + super(relPos, block.getDefaultState()); + if (colorProp.getValueClass() != EnumDyeColor.class) { + throw new IllegalArgumentException("Must be EnumDyeColor"); + } + this.colorProp = colorProp; } @Override - public int getMeta() { - return (int) (BotaniaAPI.internalHandler.getWorldElapsedTicks() / 20) % 16; + public IBlockState getBlockState() { + return state.withProperty(colorProp, EnumDyeColor.byMetadata((int) (BotaniaAPI.internalHandler.getWorldElapsedTicks() / 20) % 16)); } @Override public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == getBlock(); + return world.getBlockState(pos).getBlock() == getBlockState().getBlock(); } @Override public MultiblockComponent copy() { - return new ColorSwitchingComponent(relPos, block); + return new ColorSwitchingComponent(getRelativePosition(), getBlockState().getBlock(), colorProp); } } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 61b043ec9..1682ee5f4 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -31,7 +31,7 @@ public class FlowerComponent extends ColorSwitchingComponent { @Override public MultiblockComponent copy() { - return new FlowerComponent(relPos, block); + return new FlowerComponent(relPos, state.getBlock()); } } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index a44a7652d..1c2f3e082 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -11,6 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -24,28 +25,26 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public class MultiblockComponent { - public BlockPos relPos; - public final Block block; - public final int meta; - public final TileEntity tileEntity; - public boolean doFancyRender; + protected BlockPos relPos; + protected final IBlockState state; + protected final TileEntity tileEntity; + private boolean doFancyRender; - public MultiblockComponent(BlockPos relPos, Block block, int meta) { - this(relPos, block, meta, null); + public MultiblockComponent(BlockPos relPos, IBlockState state) { + this(relPos, state, null); } - public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender) { - this(relPos, block, meta, doFancyRender, null); + public MultiblockComponent(BlockPos relPos, IBlockState state, boolean doFancyRender) { + this(relPos, state, doFancyRender, null); } - public MultiblockComponent(BlockPos relPos, Block block, int meta, TileEntity tileEntity) { - this(relPos, block, meta, block.hasTileEntity(block.getStateFromMeta(meta)) == (tileEntity != null), tileEntity); + public MultiblockComponent(BlockPos relPos, IBlockState state, TileEntity tileEntity) { + this(relPos, state, state.getBlock().hasTileEntity(state) == (tileEntity != null), tileEntity); } - public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { + public MultiblockComponent(BlockPos relPos, IBlockState state, boolean doFancyRender, TileEntity tileEntity) { this.relPos = relPos; - this.block = block; - this.meta = meta; + this.state = state; this.tileEntity = tileEntity; this.doFancyRender = doFancyRender; } @@ -54,20 +53,16 @@ public class MultiblockComponent { return relPos; } - public Block getBlock() { - return block; - } - - public int getMeta() { - return meta; + public IBlockState getBlockState() { + return state; } public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == getBlock() && (meta == -1 || world.getBlockState(pos).getBlock().getMetaFromState(world.getBlockState(pos)) == meta); + return world.getBlockState(pos) == state; // todo 1.8? } public ItemStack[] getMaterials() { - return new ItemStack[] { new ItemStack(block, 1, meta) }; + return new ItemStack[] { new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)) }; } public void rotate(double angle) { @@ -82,7 +77,7 @@ public class MultiblockComponent { } public MultiblockComponent copy() { - return new MultiblockComponent(relPos, block, meta, tileEntity); + return new MultiblockComponent(relPos, state, tileEntity); } public TileEntity getTileEntity() { diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 42074c307..bfb03d140 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -1,5 +1,7 @@ package vazkii.botania.api.state; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -7,6 +9,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; +import javax.annotation.Nullable; + /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -38,6 +42,9 @@ public class BotaniaStateProps { // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + // BlockEnchanter + public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); 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 dce1b15fd..ad0a974ef 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -112,7 +113,7 @@ public final class BaubleRenderHandler { if(stack != null && stack.getItem() == ModItems.manaTablet) { Item item = stack.getItem(); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(1) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index cfea527f1..f7d237647 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -26,6 +26,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -34,6 +35,7 @@ import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibObfuscation; public final class BoundTileRenderer { @@ -44,7 +46,7 @@ public final class BoundTileRenderer { GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingWorldRenderer = false; EntityPlayer player = Minecraft.getMinecraft().thePlayer; ItemStack stack = player.getCurrentEquippedItem(); @@ -93,9 +95,21 @@ public final class BoundTileRenderer { renderBlockOutlineAt(pos, color, 1F); } + private double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { GlStateManager.pushMatrix(); - GlStateManager.translate(pos.getX() - RenderManager.renderPosX, pos.getY() - RenderManager.renderPosY, pos.getZ() - RenderManager.renderPosZ + 1); + GlStateManager.translate(pos.getX() - getRenderPosX(), pos.getY() - getRenderPosY(), pos.getZ() - getRenderPosZ() + 1); Color colorRGB = new Color(color); GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); 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 cdd13ed2d..49b2b4346 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -17,8 +17,10 @@ import java.util.Map; import java.util.Properties; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EnumPlayerModelParts; @@ -40,7 +42,7 @@ import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler { - public volatile static Map flowerMap = null; + public volatile static Map flowerMap = null; private volatile static boolean startedLoading = false; private static boolean phi = true; @@ -76,7 +78,7 @@ public final class ContributorFancinessHandler { int i = Integer.parseInt(value); if(i < 0 || i >= 16) throw new NumberFormatException(); - flowerMap.put(key, ModBlocks.flower.func_149735_b(0, i)); + flowerMap.put(key, ModBlocks.flower.(0, i)); } catch(NumberFormatException e) { SubTileSignature sig = BotaniaAPI.getSignatureForName(value); if(sig != null) @@ -87,13 +89,13 @@ public final class ContributorFancinessHandler { private static void renderTwintails(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - IIcon icon = ((ItemManaResource) ModItems.manaResource).tailIcon; + TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).tailIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); float t = 0.13F; @@ -117,7 +119,7 @@ public final class ContributorFancinessHandler { private static void renderPhiFlower(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - IIcon icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; + TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -126,7 +128,7 @@ public final class ContributorFancinessHandler { GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, -0.25F); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(-1.2F, 0.2F, 0.125F); @@ -137,7 +139,7 @@ public final class ContributorFancinessHandler { private static void renderGoldfish(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - IIcon icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; + TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -148,12 +150,12 @@ public final class ContributorFancinessHandler { GlStateManager.translate(-0.75F, 0.5F, 0F); GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(1.2F, 0.5F, 0F); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } - private static void renderFlower(RenderPlayerEvent event, IIcon icon) { + private static void renderFlower(RenderPlayerEvent event, TextureAtlasSprite icon) { GlStateManager.pushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 1d58de36f..11d753467 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -291,7 +291,7 @@ public final class HUDHandler { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, mc.renderEngine, recipe.getOutput(), x + 26, y); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, ""); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); if(diluted) { 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 a5499b254..e80872cc2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -11,11 +11,14 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; @@ -28,74 +31,62 @@ public class MultiblockBlockAccess implements IBlockAccess { protected IBlockAccess originalBlockAccess; protected boolean hasBlockAccess = false; protected Multiblock multiblock; - protected int anchorX, anchorY, anchorZ; + protected BlockPos anchorPos; @Override - public Block getBlock(int x, int y, int z) { - MultiblockComponent comp=getComponent(x, y, z); + public IBlockState getBlockState(BlockPos pos) { + MultiblockComponent comp=getComponent(pos); if(comp != null) - return comp.getBlock(); + return comp.getBlock().getStateFromMeta(comp.getMeta()); if(hasBlockAccess) - return originalBlockAccess.getBlock(x, y, z); - return Blocks.air; + return originalBlockAccess.getBlockState(pos); + return Blocks.air.getDefaultState(); } @Override - public TileEntity getTileEntity(int x, int y, int z) { - MultiblockComponent comp=getComponent(x, y, z); + public TileEntity getTileEntity(BlockPos pos) { + MultiblockComponent comp=getComponent(pos); if(comp != null) return comp.getTileEntity(); if(hasBlockAccess) - return originalBlockAccess.getTileEntity(x, y, z); + return originalBlockAccess.getTileEntity(pos); return null; } @Override - public int getLightBrightnessForSkyBlocks(int x, int y, int z, int p_72802_4_) { + public int getCombinedLight(BlockPos pos, int p_72802_4_) { if(hasBlockAccess) - return originalBlockAccess.getLightBrightnessForSkyBlocks(x,y,z,p_72802_4_); + return originalBlockAccess.getCombinedLight(pos, p_72802_4_); return 15728640; } @Override - public int getBlockMetadata(int x, int y, int z) { - MultiblockComponent comp=getComponent(x, y, z); - if(comp != null) - return comp.getMeta(); - if(hasBlockAccess) - return originalBlockAccess.getBlockMetadata(x, y, z); + public int getStrongPower(BlockPos pos, EnumFacing direction) { return 0; } @Override - public int isBlockProvidingPowerTo(int x, int y, int z, int direction) { - return 0; + public WorldType getWorldType() { + return null; // todo 1.8 } @Override - public boolean isAirBlock(int x, int y, int z) { - MultiblockComponent comp=getComponent(x, y, z); + public boolean isAirBlock(BlockPos pos) { + MultiblockComponent comp=getComponent(pos); if(comp != null) return false; if(hasBlockAccess) - return originalBlockAccess.isAirBlock(x, y, z); + return originalBlockAccess.isAirBlock(pos); return true; } @Override - public BiomeGenBase getBiomeGenForCoords(int x, int z) { + public BiomeGenBase getBiomeGenForCoords(BlockPos pos) { if(hasBlockAccess) - return originalBlockAccess.getBiomeGenForCoords(x, z); + return originalBlockAccess.getBiomeGenForCoords(pos); return null; } - @Override - public int getHeight() { - if(hasBlockAccess) - return originalBlockAccess.getHeight(); - return 256; - } - @Override public boolean extendedLevelsInChunkCache() { if(hasBlockAccess) @@ -104,29 +95,27 @@ public class MultiblockBlockAccess implements IBlockAccess { } @Override - public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { + public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) { if(hasBlockAccess) - return originalBlockAccess.isSideSolid(x, y, z, side, _default); + return originalBlockAccess.isSideSolid(pos, side, _default); return _default; } /** * Updates the block access to the new parameters */ - public void update(IBlockAccess access, Multiblock mb, int anchorX, int anchorY, int anchorZ) { + public void update(IBlockAccess access, Multiblock mb, BlockPos anchorPos) { originalBlockAccess = access; multiblock = mb; - this.anchorX = anchorX; - this.anchorY = anchorY; - this.anchorZ = anchorZ; + this.anchorPos = anchorPos; hasBlockAccess = access != null; } /** * Returns the multiblock component for the coordinates, adjusted based on the anchor */ - protected MultiblockComponent getComponent(int x, int y, int z) { - MultiblockComponent comp = multiblock.getComponentForLocation(x - anchorX); + protected MultiblockComponent getComponent(BlockPos pos) { + MultiblockComponent comp = multiblock.getComponentForLocation(pos.add(anchorPos.multiply(-1))); return comp; } } 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 208c8f965..ee499c196 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -11,8 +11,10 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -24,6 +26,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; @@ -31,6 +34,7 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibObfuscation; public final class MultiblockRenderHandler { @@ -38,7 +42,6 @@ public final class MultiblockRenderHandler { private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); - private static RenderBlocks blockRender = RenderBlocks.getInstance(); public static MultiblockSet currentMultiblock; public static BlockPos anchor; public static int angle; @@ -51,7 +54,7 @@ public final class MultiblockRenderHandler { Minecraft mc = Minecraft.getMinecraft(); if(mc.theWorld != null) - dimension = mc.theWorld.provider.dimensionId; + dimension = mc.theWorld.provider.getDimensionId(); } @SubscribeEvent @@ -66,26 +69,24 @@ public final class MultiblockRenderHandler { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { if(currentMultiblock != null && anchor == null && event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer == Minecraft.getMinecraft().thePlayer) { - anchor = new BlockPos(event.x, event.y, event.z); + anchor = event.pos; angle = MathHelper.floor_double(event.entityPlayer.rotationYaw * 4.0 / 360.0 + 0.5) & 3; event.setCanceled(true); } } private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) { - if(currentMultiblock != null && dimension == player.worldObj.provider.dimensionId) { - int anchorX = anchor != null ? anchor.posX : src.blockX; - int anchorY = anchor != null ? anchor.posY : src.blockY; - int anchorZ = anchor != null ? anchor.posZ : src.blockZ; + if(currentMultiblock != null && dimension == player.worldObj.provider.getDimensionId()) { + BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); rendering = true; Multiblock mb = anchor != null ? currentMultiblock.getForFacing(EnumFacing.getHorizontal(angle)) : currentMultiblock.getForEntity(player); boolean didAny = false; - blockAccess.update(player.worldObj, mb, anchorX, anchorY, anchorZ); + blockAccess.update(player.worldObj, mb, anchorPos); for(MultiblockComponent comp : mb.getComponents()) - if(renderComponentInWorld(player.worldObj, mb, comp, anchorX, anchorY, anchorZ)) + if(renderComponentInWorld(player.worldObj, mb, comp, anchorPos)) didAny = true; rendering = false; @@ -96,81 +97,91 @@ public final class MultiblockRenderHandler { } } - private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, int anchorX, int anchorY, int anchorZ) { + private double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + + private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { BlockPos pos = comp.getRelativePosition(); - int x = pos.posX + anchorX; - int y = pos.posY + anchorY; - int z = pos.posZ + anchorZ; - if(anchor != null && comp.matches(world, x, y, z)) + BlockPos pos_ = pos.add(anchorPos); + if(anchor != null && comp.matches(world, pos_)) return false; GlStateManager.pushMatrix(); - GlStateManager.translate(-RenderManager.renderPosX, -RenderManager.renderPosY, -RenderManager.renderPosZ); + GlStateManager.translate(-getRenderPosX(), -getRenderPosY(), -getRenderPosZ()); GlStateManager.disableDepth(); - doRenderComponent(mb, comp, x, y, z, 0.4F); + doRenderComponent(mb, comp, pos_, 0.4F); GlStateManager.popMatrix(); return true; } public static void renderMultiblockOnPage(Multiblock mb) { GlStateManager.translate(-0.5, -0.5, -0.5); - blockAccess.update(null, mb, mb.offX, mb.offY, mb.offZ); + blockAccess.update(null, mb, mb.offPos); for(MultiblockComponent comp : mb.getComponents()) { BlockPos pos = comp.getRelativePosition(); - doRenderComponent(mb, comp, pos.posX + mb.offX, pos.posY + mb.offY, pos.posZ + mb.offZ, 1); + doRenderComponent(mb, comp, pos.add(mb.offPos), 1); } } - private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, int x, int y, int z, float alpha) { + private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos, float alpha) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Block block = comp.getBlock(); - int meta = comp.getMeta(); + IBlockState state = comp.getBlockState(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - blockRender.useInventoryTint = false; - if(block == null) + if(state == null) return; - if(IMultiblockRenderHook.renderHooks.containsKey(block)) { + if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) { GlStateManager.color(1F, 1F, 1F, alpha); - IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(block); - if(renderHook.needsTranslate(block)) { - GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); + IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(state.getBlock()); + if(renderHook.needsTranslate(state)) { + GlStateManager.translate(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } - renderHook.renderBlockForMultiblock(blockAccess, mb, block, comp.getMeta(), blockRender, comp, alpha); + renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp, alpha); } else { - if(comp.shouldDoFancyRender()) { - int color = block.colorMultiplier(blockAccess, x, y, z); - float red = (color >> 16 & 255) / 255.0F; - float green = (color >> 8 & 255) / 255.0F; - float blue = (color & 255) / 255.0F; - GlStateManager.color(red, green, blue, alpha); - IBlockAccess oldBlockAccess = blockRender.blockAccess; - blockRender.blockAccess = blockAccess; - Tessellator tessellator = Tessellator.getInstance(); - blockRender.renderAllFaces = true; - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.disableColor(); - try { - blockRender.renderBlockByRenderType(block, x, y, z); - } - catch(Exception e) { - comp.doFancyRender = false; - } - tessellator.draw(); - blockRender.renderAllFaces = false; - blockRender.blockAccess = oldBlockAccess; - } - else { - int color = block.getRenderColor(meta); - float red = (color >> 16 & 255) / 255.0F; - float green = (color >> 8 & 255) / 255.0F; - float blue = (color & 255) / 255.0F; - GlStateManager.color(red, green, blue, alpha); - GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); - blockRender.renderBlockAsItem(block, meta, 1F); - } + BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); + brd.renderBlockBrightness(state, 1.0F); // todo 1.8 check brightness +// if(comp.shouldDoFancyRender()) { +// int color = block.colorMultiplier(blockAccess, x, y, z); +// float red = (color >> 16 & 255) / 255.0F; +// float green = (color >> 8 & 255) / 255.0F; +// float blue = (color & 255) / 255.0F; +// GlStateManager.color(red, green, blue, alpha); +// IBlockAccess oldBlockAccess = blockRender.blockAccess; +// blockRender.blockAccess = blockAccess; +// Tessellator tessellator = Tessellator.getInstance(); +// blockRender.renderAllFaces = true; +// tessellator.getWorldRenderer().startDrawingQuads(); +// tessellator.disableColor(); +// try { +// blockRender.renderBlockByRenderType(block, x, y, z); +// } +// catch(Exception e) { +// comp.doFancyRender = false; +// } +// tessellator.draw(); +// blockRender.renderAllFaces = false; +// blockRender.blockAccess = oldBlockAccess; +// } +// else { +// int color = block.getRenderColor(meta); +// float red = (color >> 16 & 255) / 255.0F; +// float green = (color >> 8 & 255) / 255.0F; +// float blue = (color & 255) / 255.0F; +// GlStateManager.color(red, green, blue, alpha); +// GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); +// blockRender.renderBlockAsItem(block, meta, 1F); +// } } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 49987cc82..467e74d96 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -21,13 +21,14 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibObfuscation; public final class RedStringRenderer { @@ -45,7 +46,7 @@ public final class RedStringRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 0F, 0F, sizeAlpha); - Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingWorldRenderer = false; TileRedString tile; while((tile = redStringTiles.poll()) != null) renderTile(tile); @@ -68,13 +69,25 @@ public final class RedStringRenderer { sizeAlpha += 0.1F; } + private static double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private static double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private static double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + private static void renderTile(TileRedString tile) { EnumFacing dir = tile.getOrientation(); BlockPos bind = tile.getBinding(); if(bind != null) { GlStateManager.pushMatrix(); - GlStateManager.translate(tile.getPos().getX() + 0.5 - RenderManager.renderPosX, tile.getPos().getY() + 0.5 - RenderManager.renderPosY, tile.getPos().getZ() + 0.5 - RenderManager.renderPosZ); + GlStateManager.translate(tile.getPos().getX() + 0.5 - getRenderPosX(), tile.getPos().getY() + 0.5 - getRenderPosY(), tile.getPos().getZ() + 0.5 - getRenderPosZ()); Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ()); Vector3 vecNorm = vecOrig.copy().normalize(); Vector3 vecMag = vecNorm.copy().multiply(0.025); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 74829d143..df0315a9c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.item.ItemStack; @@ -22,6 +23,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; @@ -31,6 +33,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibObfuscation; public final class SubTileRadiusRenderHandler { @@ -67,7 +70,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingWorldRenderer = false; if(descriptor.isCircle()) renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); @@ -78,9 +81,21 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } + private double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + public void renderRectangle(AxisAlignedBB aabb) { GlStateManager.pushMatrix(); - GlStateManager.translate(aabb.minX - RenderManager.renderPosX, aabb.minY - RenderManager.renderPosY, aabb.minZ - RenderManager.renderPosZ); + GlStateManager.translate(aabb.minX - getRenderPosX(), aabb.minY - getRenderPosY(), aabb.minZ - getRenderPosZ()); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); @@ -117,7 +132,7 @@ public final class SubTileRadiusRenderHandler { double x = center.getX() + 0.5; double y = center.getY(); double z = center.getZ() + 0.5; - GlStateManager.translate(x - RenderManager.renderPosX, y - RenderManager.renderPosY, z - RenderManager.renderPosZ); + GlStateManager.translate(x - getRenderPosX(), y - getRenderPosY(), z - getRenderPosZ()); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 7b7ec9700..6de0de3bc 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -15,6 +15,7 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index e252d33e9..f0cccbc07 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.block; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -128,7 +129,7 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti } @Override - public boolean needsTranslate(Block block) { + public boolean needsTranslate(IBlockState state) { return true; } 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 1f324d441..f692152a0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -13,13 +13,14 @@ package vazkii.botania.client.render.entity; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -33,6 +34,10 @@ public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); + public RenderBabylonWeapon(RenderManager renderManager) { + super(renderManager); + } + @Override public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { EntityBabylonWeapon weapon = (EntityBabylonWeapon) par1Entity; @@ -48,7 +53,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.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.pushMatrix(); float s = 1.5F; GlStateManager.scale(s, s, s); @@ -86,11 +91,11 @@ public class RenderBabylonWeapon extends Render { GlStateManager.rotate(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); - tes.startDrawingQuads(); - tes.addVertexWithUV(-1, 0, -1, 0, 0); - tes.addVertexWithUV(-1, 0, 1, 0, 1); - tes.addVertexWithUV(1, 0, 1, 1, 1); - tes.addVertexWithUV(1, 0, -1, 1, 0); + tes.getWorldRenderer().startDrawingQuads(); + tes.getWorldRenderer().addVertexWithUV(-1, 0, -1, 0, 0); + tes.getWorldRenderer().addVertexWithUV(-1, 0, 1, 0, 1); + tes.getWorldRenderer().addVertexWithUV(1, 0, 1, 1, 1); + tes.getWorldRenderer().addVertexWithUV(1, 0, -1, 1, 0); tes.draw(); ShaderHelper.releaseShader(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 3b8c124ba..ab2fe9088 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderBiped; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -59,8 +60,8 @@ public class RenderDoppleganger extends RenderBiped { } }; - public RenderDoppleganger() { - super(new ModelBiped(0.5F), 0F); + public RenderDoppleganger(RenderManager renderManager) { + super(renderManager, new ModelBiped(0.5F), 0F); } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index cb45e786e..d7aaaf7c6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -23,6 +24,10 @@ import vazkii.botania.common.entity.EntityManaStorm; public class RenderManaStorm extends Render { + public RenderManaStorm(RenderManager renderManager) { + super(renderManager); + } + @Override public void doRender(Entity e, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index a6806ca39..8a7f21246 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -10,7 +10,9 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; +import net.minecraft.entity.Entity; import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; @@ -22,10 +24,14 @@ public class RenderPinkWither extends RenderWither { int idk = -1; + public RenderPinkWither(RenderManager p_i46130_1_) { + super(p_i46130_1_); + } + @Override - public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - if(BossStatus.bossName.equals(p_76986_1_.func_145748_c_().getFormattedText())) { + if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { BossStatus.statusBarTime = -1; BossStatus.hasColorModifier = false; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 721d0813f..211634c9e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; 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 b9a043881..ec9720f05 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -11,6 +11,8 @@ package vazkii.botania.client.render.entity; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; import net.minecraft.entity.item.EntityMinecart; import vazkii.botania.client.render.tile.RenderTilePool; @@ -18,11 +20,15 @@ import vazkii.botania.common.entity.EntityPoolMinecart; public class RenderPoolMinecart extends RenderMinecart { + public RenderPoolMinecart(RenderManager p_i46155_1_) { + super(p_i46155_1_); + } + @Override - protected void func_147910_a(EntityMinecart p_147910_1_, float p_147910_2_, Block p_147910_3_, int p_147910_4_) { + protected void func_180560_a(EntityMinecart p_147910_1_, float p_147910_2_, IBlockState state) { EntityPoolMinecart poolCart = (EntityPoolMinecart) p_147910_1_; RenderTilePool.forceManaNumber = poolCart.getMana(); - super.func_147910_a(p_147910_1_, p_147910_2_, p_147910_3_, p_147910_4_); + super.func_180560_a(p_147910_1_, p_147910_2_, state); } 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 1802cb8c1..fdd966868 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -12,8 +12,11 @@ package vazkii.botania.client.render.entity; import java.util.Random; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderEntity; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; @@ -27,6 +30,10 @@ import vazkii.botania.common.item.ItemSpark; public class RenderSparkBase extends RenderEntity { + public RenderSparkBase(RenderManager p_i46185_1_) { + super(p_i46185_1_); + } + @Override public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { T tEntity = (T) par1Entity; @@ -88,10 +95,10 @@ public class RenderSparkBase extends RenderEntity { @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return TextureMap.locationItemsTexture; + return TextureMap.locationBlocksTexture; } - private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) { + private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) { float f = p_77026_2_.getMinU(); float f1 = p_77026_2_.getMaxU(); float f2 = p_77026_2_.getMinV(); @@ -100,13 +107,13 @@ public class RenderSparkBase extends RenderEntity { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.startDrawingQuads(); - p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.setBrightness(240); - p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().startDrawingQuads(); + p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().setBrightness(240); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } 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 568c37f46..447d1ff4b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -10,8 +10,11 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; @@ -26,6 +29,10 @@ import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { + protected RenderThornChakram(RenderManager renderManager) { + super(renderManager); + } + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { EntityThornChakram c = (EntityThornChakram) p_76986_1_; @@ -48,10 +55,10 @@ public class RenderThornChakram extends Render { @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return TextureMap.locationItemsTexture; + return TextureMap.locationBlocksTexture; } - private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_, int light) { + private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_, int light) { float f = p_77026_2_.getMinU(); float f1 = p_77026_2_.getMaxU(); float f2 = p_77026_2_.getMinV(); @@ -61,14 +68,14 @@ public class RenderThornChakram extends Render { float f6 = 0.25F; GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - p_77026_1_.startDrawingQuads(); - p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().startDrawingQuads(); + p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); if(light != -1) - p_77026_1_.setBrightness(light); - p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().setBrightness(light); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } 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 6cb6d32a7..7ecdec696 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -11,7 +11,9 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -66,7 +68,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); tessellator.getWorldRenderer().setBrightness(brightness); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 1197e6933..ccb515290 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -14,9 +14,11 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -165,7 +167,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { forceMeta = -1; } - public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); if(brightness != -1) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d398f58a9..7904206d7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 0b41a9881..0d88405af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -89,7 +89,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrost"); + TextureAtlasSprite icon = new TextureAtlasSprite("botania:bifrost"); if(event.map.setTextureEntry("botania:bifrost", icon)) blockIcon = icon; } 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 1580b855a..1792d0d98 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -30,6 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; @@ -50,10 +53,29 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex setLightLevel(1.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.ENCHANTER); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ENCHANTER_DIRECTION); + } + + @Override + public int getMetaFromState(IBlockState state) { + switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION))) { + case Z: return 1; + case X: + default: return 0; + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, meta == 1 ? EnumFacing.Axis.Z : EnumFacing.Axis.X); + } + @Override public boolean registerInCreative() { return false; 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 3dae572ff..9c502602e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -11,8 +11,12 @@ package vazkii.botania.common.block.tile; import java.util.ArrayList; +import java.util.EnumMap; import java.util.List; +import java.util.Map; +import com.google.common.collect.Maps; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.enchantment.Enchantment; @@ -29,6 +33,7 @@ import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -39,6 +44,7 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -73,10 +79,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) }; - private static final BlockPos[][] PYLON_LOCATIONS = { - { new BlockPos(-5, 1, 0), new BlockPos(5, 1, 0), new BlockPos(-4, 1, 3), new BlockPos(4, 1, 3), new BlockPos(-4, 1, -3 ), new BlockPos(4, 1, -3) }, - { new BlockPos(0, 1, -5), new BlockPos(0, 1, 5), new BlockPos(3, 1, -4), new BlockPos(3, 1, 4), new BlockPos(-3, 1, -4 ), new BlockPos(-3, 1, 4) } - }; + private static final Map PYLON_LOCATIONS = new EnumMap(EnumFacing.Axis.class); + + static { + PYLON_LOCATIONS.put(EnumFacing.Axis.X, new BlockPos[] { new BlockPos(-5, 1, 0), new BlockPos(5, 1, 0), new BlockPos(-4, 1, 3), new BlockPos(4, 1, 3), new BlockPos(-4, 1, -3 ), new BlockPos(4, 1, -3) }); + PYLON_LOCATIONS.put(EnumFacing.Axis.Z, new BlockPos[] { new BlockPos(0, 1, -5), new BlockPos(0, 1, 5), new BlockPos(3, 1, -4), new BlockPos(3, 1, 4), new BlockPos(-3, 1, -4 ), new BlockPos(-3, 1, 4) }); + } private static final BlockPos[] FLOWER_LOCATIONS = { new BlockPos(-1, 0, -1), new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), new BlockPos(1, 0, 1) @@ -87,14 +95,14 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP for(BlockPos o : OBSIDIAN_LOCATIONS) mb.addComponent(o, Blocks.obsidian, 0); - for(BlockPos p : PYLON_LOCATIONS[0]) { + for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) { mb.addComponent(p, ModBlocks.pylon, 0); mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); } for(BlockPos f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(f, ModBlocks.flower)); - mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block, 0); // todo 1.8 recheck + mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block, 0); return mb.makeSet(); } @@ -126,14 +134,17 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP @Override public void update() { - if(getBlockMetadata() < PYLON_LOCATIONS.length) - for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) { + IBlockState state = worldObj.getBlockState(getPos()); + EnumFacing.Axis axis = ((EnumFacing.Axis) state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)); + + if(getBlockMetadata() < PYLON_LOCATIONS.size()) + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); if(tile != null && tile instanceof TilePylon) ((TilePylon) tile).activated = false; } - if(!canEnchanterExist(worldObj, pos, getBlockMetadata())) { + if(!canEnchanterExist(worldObj, pos, axis)) { worldObj.setBlockState(pos, Blocks.lapis_block.getDefaultState(), 1 | 2); for(int i = 0; i < 50; i++) { @@ -181,7 +192,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP break; } case 2 : { // Get Mana - for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) { + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(pos.add(pylon)); if(pylonTile != null) { pylonTile.activated = true; @@ -197,7 +208,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP } } else if(mana >= manaRequired) { manaRequired = 0; - for(BlockPos pylon : PYLON_LOCATIONS[getBlockMetadata()]) + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; advanceStage(); @@ -362,12 +373,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP return true; } - public static boolean canEnchanterExist(World world, BlockPos pos, int meta) { + 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) return false; - for(BlockPos pylon : PYLON_LOCATIONS[meta]) + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon))) return false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 38027b588..1a56f3445 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -875,7 +875,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static class BeaconComponent extends MultiblockComponent { public BeaconComponent(BlockPos relPos) { - super(relPos, Blocks.iron_block, 0); + super(relPos, Blocks.iron_block.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 8004551c0..206230dc7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -22,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -108,7 +107,7 @@ public class ItemSpawnerMover extends ItemMod { return true; } else return false; } else { - if(getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, x, y, z, side, xOffset, yOffset, zOffset)) + if(getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, pos, side, xOffset, yOffset, zOffset)) return true; return false; } @@ -130,9 +129,9 @@ public class ItemSpawnerMover extends ItemMod { else if(pos.getY() == 255 && block.getMaterial().isSolid()) return false; else if(world.canBlockBePlaced(Blocks.mob_spawner, pos, false, side, player, itemstack)) { - int meta = block.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, 0); + IBlockState state = block.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, 0, player); - if(placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, meta)) { + if(placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, state)) { world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getFrequency() * 0.8F); player.renderBrokenItemStack(itemstack); player.addStat(ModAchievements.spawnerMoverUse, 1); @@ -147,21 +146,21 @@ public class ItemSpawnerMover extends ItemMod { else return false; } - private boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, Blocks.mob_spawner, metadata, 3)) + private boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) { + if (!world.setBlockState(pos, state, 3)) return false; - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); if(block.equals(Blocks.mob_spawner)) { - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(pos); NBTTagCompound tag = stack.getTagCompound(); if (tag.hasKey(TAG_SPAWNER)) tag = tag.getCompoundTag(TAG_SPAWNER); - tag.setInteger("x", x); - tag.setInteger("y", y); - tag.setInteger("z", z); + tag.setInteger("x", pos.getX()); + tag.setInteger("y", pos.getY()); + tag.setInteger("z", pos.getZ()); te.readFromNBT(tag); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } return true; 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 846a03305..b2e5e90bf 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -48,10 +49,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 23; // begin dank_memes - public IIcon tailIcon = null; - public IIcon phiFlowerIcon = null; - public IIcon goldfishIcon = null; - public IIcon nerfBatIcon = null; + public TextureAtlasSprite tailIcon = null; + public TextureAtlasSprite phiFlowerIcon = null; + public TextureAtlasSprite goldfishIcon = null; + public TextureAtlasSprite nerfBatIcon = null; // end dank_memes public ItemManaResource() { diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c94760551..e38b0a676 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -12,6 +12,11 @@ package vazkii.botania.common.lib; public final class LibObfuscation { + // RenderManager + public static final String[] RENDERPOSX = { "renderPosX", "field_78725_b", "o" }; + public static final String[] RENDERPOSY = { "renderPosY", "field_78726_c", "p" }; + public static final String[] RENDERPOSZ = { "renderPosZ", "field_78723_d", "q" }; + // EntityItem public static final String[] AGE = { "age", "field_70292_b", "c" }; public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "d" }; From 1817e75b5db7cbb8d2499994533dda49c2b497be Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Nov 2015 13:04:23 -0600 Subject: [PATCH 049/935] More decor states --- MC18_notes.txt | 4 +- .../botania/api/state/BotaniaStateProps.java | 37 ++++++ .../api/state/enums/CustomBrickVariant.java | 29 +++++ .../api/state/enums/EndBrickVariant.java | 17 +++ .../api/state/enums/FutureStoneVariant.java | 29 +++++ .../api/state/enums/PrismarineVariant.java | 16 +++ .../api/state/enums/QuartzVariant.java | 18 +++ .../render/tile/RenderTileStarfield.java | 1 + .../botania/common/block/BlockModFlower.java | 2 +- .../common/block/decor/Block18Stone.java | 47 ++++---- .../common/block/decor/BlockBlaze.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 35 +++--- .../common/block/decor/BlockCustomBrick.java | 61 +++++----- .../common/block/decor/BlockDirtPath.java | 33 +++--- .../common/block/decor/BlockElfGlass.java | 23 +--- .../block/decor/BlockEndStoneBrick.java | 48 ++++---- .../block/decor/BlockFloatingFlower.java | 32 ++++- .../common/block/decor/BlockManaBeacon.java | 42 ++++--- .../common/block/decor/BlockManaFlame.java | 30 ++--- .../common/block/decor/BlockManaGlass.java | 7 +- .../common/block/decor/BlockModMushroom.java | 79 +++++++------ .../common/block/decor/BlockPavement.java | 75 ++++++++---- .../common/block/decor/BlockPetalBlock.java | 41 +++++-- .../common/block/decor/BlockPrismarine.java | 55 +++++---- .../common/block/decor/BlockReeds.java | 62 +++++----- .../common/block/decor/BlockSeaLamp.java | 4 +- .../common/block/decor/BlockShimmerrock.java | 8 +- .../block/decor/BlockShimmerwoodPlanks.java | 8 +- .../common/block/decor/BlockShinyFlower.java | 49 ++++---- .../common/block/decor/BlockStarfield.java | 16 +-- .../common/block/decor/BlockThatch.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 75 ++++++++---- .../common/block/decor/BlockUnstable.java | 50 +++++--- .../block/decor/panes/BlockBifrostPane.java | 6 - .../block/decor/panes/BlockModPane.java | 40 ++----- .../decor/quartz/BlockSpecialQuartz.java | 110 ++++++++---------- .../block/decor/slabs/BlockModSlab.java | 34 +++--- .../block/decor/walls/BlockVariantWall.java | 1 - .../coloredlights/ColoredLightHelper.java | 20 ++-- .../coloredlights/ILightHelper.java | 4 +- .../coloredlights/LightHelperColored.java | 6 +- .../coloredlights/LightHelperVanilla.java | 4 +- 42 files changed, 753 insertions(+), 509 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java diff --git a/MC18_notes.txt b/MC18_notes.txt index 2a3fb351a..15af37855 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -7,13 +7,15 @@ This can be changed to match vanilla signature, but either would break backward * SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block). Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts +* Multiblock system reworked to use states -- Other -- * Most things left untouched to make patches from upstream easier * Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances since BlockPos'es are immutable and thus can be reused everywhere. * Some really needed fields in EntityItem are private now. Reflection time :( - +* Alfglass just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. +Unless someone figures out a way to use the old one -- Todo -- * Fix all the block signatures (easy) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index bfb03d140..628e80965 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,6 +2,7 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -18,6 +19,12 @@ public class BotaniaStateProps { /** Common properties to all blocks to use **/ + // Cardinal connection booleans (think fence or wall) + public static final PropertyBool CONNECT_NORTH = PropertyBool.create("north"); + public static final PropertyBool CONNECT_SOUTH = PropertyBool.create("south"); + public static final PropertyBool CONNECT_WEST = PropertyBool.create("west"); + public static final PropertyBool CONNECT_EAST = PropertyBool.create("east"); + // The 16 Minecraft colors public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); @@ -34,17 +41,34 @@ public class BotaniaStateProps { // Redstone power - int public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); + /** Properties for certain kinds of blocks **/ + + // The axis directions (think quartz pillars and wood logs) + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + + // Extra Quartz Blocks + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + /** Properties for individual blocks **/ + // Block18Stone + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + // BlockCustomBrick + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); // BlockEnchanter public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + // BlockEndStoneBrick + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); @@ -54,12 +78,25 @@ public class BotaniaStateProps { // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + // BlockPavement + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor color) { + return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN; + } + }); + // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); + // BlockPrismarine + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java new file mode 100644 index 000000000..f1aeb6476 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum CustomBrickVariant implements IStringSerializable { + HELLISH_BRICK, + SOUL_BRICK, + FROSTY_BRICK, + ROOF_TILE, + AZULEJO_1, // todo 1.8 must rename these + AZULEJO_2, + AZULEJO_3, + AZULEJO_4, + AZULEJO_5, + AZULEJO_6, + AZULEJO_7, + AZULEJO_8, + AZULEJO_9, + AZULEJO_10, + AZULEJO_11, + AZULEJO_12; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java new file mode 100644 index 000000000..a19544117 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java @@ -0,0 +1,17 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum EndBrickVariant implements IStringSerializable { + END_STONE_BRICKS, + CHISELED_END_STONE_BRICKS, + ENDER_BRICKS, + PILLAR_ENDER_BRICKS; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java new file mode 100644 index 000000000..bf667f908 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum FutureStoneVariant implements IStringSerializable { + ANDESITE, + BASALT, + DIORITE, + GRANITE, + POLISHED_ANDESITE, + POLISHED_BASALT, + POLISHED_DIORITE, + POLISHED_GRANITE, + ANDESITE_BRICK, + BASALT_BRICK, + DIORITE_BRICK, + GRANITE_BRICK, + CHISELED_ANDESITE, + CHISELED_BASALT, + CHISELED_DIORITE, + CHISELED_GRANITE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java new file mode 100644 index 000000000..fa72d6b0c --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PrismarineVariant implements IStringSerializable { + PRISMARINE, + PRISMARINE_BRICKS, + DARK_PRIMSARINE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java new file mode 100644 index 000000000..0f5d0a0a8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum QuartzVariant implements IStringSerializable { + NORMAL, + CHISELED, + PILLAR_Y, + PILLAR_X, + PILLAR_Z; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 0614b7cd1..a1bfe2528 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -28,6 +28,7 @@ import org.lwjgl.opengl.GL11; // I HAVE NO IDEA WHAT I'M DOING // SO MUCH STUFF I DON'T UNDERSTAND D: // HELP +// todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation field_147529_c = new ResourceLocation("textures/environment/end_sky.png"); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3a2f8fb4d..c081077a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -59,7 +59,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.RED)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override 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 37682ea31..78ec915ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,20 +36,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class Block18Stone extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[16]; - public Block18Stone() { super(Material.rock); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.STONE); + setUnlocalizedName(LibBlockNames.STONE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } @Override - public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < 16; i++) - icons[i] = IconHelper.forBlock(register, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FUTURESTONE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((FutureStoneVariant) state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= FutureStoneVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.values()[meta]); } @Override @@ -56,31 +69,25 @@ public class Block18Stone extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - return icons[meta]; - } - @Override protected boolean shouldRegisterInNameSet() { return false; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override 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 be934af38..a7e4c39a2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -35,7 +35,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { setResistance(10F); setStepSound(soundTypeMetal); setLightLevel(1F); - setBlockName(LibBlockNames.BLAZE_BLOCK); + setUnlocalizedName(LibBlockNames.BLAZE_BLOCK); GameRegistry.registerFuelHandler(this); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 83d2607d5..8b98081c4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -12,12 +12,15 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; @@ -36,17 +39,21 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + EnumDyeColor color = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)); + int hex = color.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.1 + par5Random.nextFloat() * 0.1, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.1 + par5Random.nextFloat() * 0.1, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.setSparkleFXNoClip(false); } @@ -56,17 +63,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return blockIcon; - } - - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { return ModItems.petal; } 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 30acb6b76..259518421 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,15 +36,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockCustomBrick extends BlockMod implements ILexiconable { - private static final int TYPES = 16; - IIcon[] icons; - public BlockCustomBrick() { super(Material.rock); setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.CUSTOM_BRICK); + setUnlocalizedName(LibBlockNames.CUSTOM_BRICK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((CustomBrickVariant) state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= CustomBrickVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]); } @Override @@ -51,44 +69,31 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta >= 4 ? LexiconData.azulejo : LexiconData.decorativeBlocks; + CustomBrickVariant variant = ((CustomBrickVariant) world.getBlockState(pos).getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)); + return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; } } 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 2aaae3384..fab48555e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -12,16 +12,17 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -36,17 +37,17 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { setLightOpacity(255); setHardness(0.6F); setStepSound(soundTypeGravel); - setBlockName(LibBlockNames.DIRT_PATH); + setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; } @Override - public boolean isToolEffective(String type, int metadata) { + public boolean isToolEffective(String type, IBlockState state) { return type.equals("shovel"); } @Override - public void onEntityWalking(World world, int x, int y, int z, Entity entity) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { float speed = 2F; float max = 0.4F; @@ -59,26 +60,26 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { - Block blockAbove = world.getBlock(x, y + 1, z); - if(!blockAbove.isAir(world, x, y + 1, z)) + public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos) { + Block blockAbove = world.getBlockState(pos.up()).getBlock(); + if(!blockAbove.isAir(world, pos.up())) setBlockBounds(0F, 0F, 0F, 1F, 1, 1F); else setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return side == ForgeDirection.DOWN; + public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN; } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - setBlockBoundsBasedOnState(world, x, y, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + setBlockBoundsBasedOnState(world, pos); } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + return new AxisAlignedBB(pos, pos.add(1, 1, 1)); } @Override @@ -87,13 +88,13 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 7be671bc8..5f07c73af 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -12,11 +12,9 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -28,26 +26,15 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexiconable { - private static final int ICON_COUNT = 4; - IIcon[] icons; - public BlockElfGlass() { super(LibBlockNames.ELF_GLASS); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[ICON_COUNT]; - for(int i = 0; i < ICON_COUNT; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { - int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); - return icons[v]; - } +// @Override +// public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { +// int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); +// return icons[v]; +// } // todo 1.8 use randomized states for this @Override public boolean isElvenItem(ItemStack stack) { 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 725bce703..93fd8c6f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,54 +36,58 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[5]; - public BlockEndStoneBrick() { super(Material.rock); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.END_STONE_BRICK); + setUnlocalizedName(LibBlockNames.END_STONE_BRICK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } @Override - public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < icons.length; i++) { - icons[i] = IconHelper.forBlock(register, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ENDBRICK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EndBrickVariant) state.getValue(BotaniaStateProps.ENDBRICK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EndBrickVariant.values().length) { + meta = 0; } + return getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.values()[meta]); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 4; i++) + for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - return meta == 3 ? icons[side == 0 || side == 1 ? 4 : 3] : icons[Math.min(icons.length - 1, meta)]; - } - @Override protected boolean shouldRegisterInNameSet() { return false; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override 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 3f3151e18..a353e33f1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -15,25 +15,26 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; @@ -65,6 +66,25 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab float f = 0.1F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } // @Override todo 1.8 coloredlights dep @@ -90,11 +110,13 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); } @Override 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 14ad125fc..571b2390d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -15,19 +15,21 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; @@ -38,8 +40,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockManaBeacon() { super(Material.iron); setHardness(5.0F); @@ -48,18 +48,25 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { float size = 3F / 16F; setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.MANA_BEACON); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < 2; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 == 1 ? 1 : 0]; + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -80,7 +87,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -90,19 +97,18 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; - return new Color(color[0], color[1], color[2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { + return getRenderColor(par1iBlockAccess.getBlockState(pos)); } @Override 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 16ca21b07..d71d23cc0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -11,16 +11,18 @@ package vazkii.botania.common.block.decor; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.BlockModContainer; @@ -48,13 +50,8 @@ public class BlockManaFlame extends BlockModContainer { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ((TileManaFlame) world.getTileEntity(x, y, z)).getLightColor(); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } @Override @@ -68,22 +65,22 @@ public class BlockManaFlame extends BlockModContainer { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return true; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { return null; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { @@ -99,12 +96,7 @@ public class BlockManaFlame extends BlockModContainer { } @Override - public IIcon getIcon(int side, int meta) { - return Blocks.fire.getIcon(side, meta); - } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } 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 154f63572..66d7d3b6b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,7 +35,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { setHardness(0.3F); setStepSound(soundTypeGlass); setLightLevel(1.0F); - setBlockName(name); + setUnlocalizedName(name); } @Override @@ -49,8 +50,8 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); // todo 1.8 wtf } @Override 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 f9fc03820..37d04c2af 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -14,23 +14,26 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -47,29 +50,47 @@ import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { - public static IIcon[] icons; public int originalLight; public BlockModMushroom() { - setBlockName(LibBlockNames.MUSHROOM); + setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); setStepSound(soundTypeGrass); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + + @Override + public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading } @Override - public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) { - if(p_149718_3_ >= 0 && p_149718_3_ < 256) { - Block block = p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_); - return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockMetadata(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this); + public boolean canPlaceBlockAt(World p_149718_1_, BlockPos pos) { + if(pos.getY() >= 0 && pos.getY() < 256) { + Block block = p_149718_1_.getBlockState(pos.down()).getBlock(); + return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockState(pos.down()).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(p_149718_1_, pos.down(), EnumFacing.UP, this); } return false; @@ -82,18 +103,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[16]; - - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + return super.setUnlocalizedName(par1Str); } @Override @@ -104,31 +116,28 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par2]; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } 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 00d8f1f8a..8645a56ce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -14,13 +14,17 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -32,14 +36,51 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { public static final int TYPES = 6; - IIcon[] icons; public BlockPavement() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.PAVEMENT); + setUnlocalizedName(LibBlockNames.PAVEMENT); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PAVEMENT_COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + switch ((EnumDyeColor) state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) { + case GREEN: return 5; + case YELLOW: return 4; + case RED: return 3; + case BLUE: return 2; + case BLACK: return 1; + case WHITE: + default: return 0; + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= TYPES) { + meta = 0; + } + + EnumDyeColor color; + switch (meta) { + case 5: color = EnumDyeColor.GREEN; break; + case 4: color = EnumDyeColor.YELLOW; break; + case 3: color = EnumDyeColor.RED; break; + case 2: color = EnumDyeColor.BLUE; break; + case 1: color = EnumDyeColor.BLACK; break; + case 0: + default: color = EnumDyeColor.WHITE; break; + } + return getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color); } @Override @@ -48,14 +89,14 @@ public class BlockPavement extends BlockMod { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -65,22 +106,8 @@ public class BlockPavement extends BlockMod { } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } } 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 8dcc43686..9b7d398c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -15,9 +15,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -25,6 +28,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -37,7 +41,26 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { super(Material.plants); setHardness(0.4F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.PETAL_BLOCK); + setUnlocalizedName(LibBlockNames.PETAL_BLOCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -52,24 +75,24 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public int getRenderColor(int meta) { - return new Color(EntitySheep.fleeceColorTable[meta][0], EntitySheep.fleeceColorTable[meta][1], EntitySheep.fleeceColorTable[meta][2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - return getRenderColor(world.getBlockMetadata(x, y, z)); + public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { + return getRenderColor(world.getBlockState(pos)); } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override 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 48c67f02c..0528e8024 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -14,20 +14,23 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; @@ -42,15 +45,33 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { private static final int TYPES = 3; - IIcon[] icons; public BlockPrismarine() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.PRISMARINE); + setUnlocalizedName(LibBlockNames.PRISMARINE); MinecraftForge.EVENT_BUS.register(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PRISMARINE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PrismarineVariant) state.getValue(BotaniaStateProps.PRISMARINE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= PrismarineVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); } @Override @@ -59,14 +80,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -75,14 +96,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { par3List.add(new ItemStack(par1, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 1; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - @SubscribeEvent @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { @@ -94,14 +107,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override 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 7df9eabcd..c965be68e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -13,62 +13,68 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { - IIcon topIcon; - public BlockReeds() { super(Material.wood); setHardness(1.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.REED_BLOCK); + setUnlocalizedName(LibBlockNames.REED_BLOCK); setCreativeTab(BotaniaCreativeTab.INSTANCE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.AXIS_FACING); + } @Override - public Block setBlockName(String par1Str) { + public int getMetaFromState(IBlockState state) { + switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.AXIS_FACING))) { + case Z: return 8; + case X: return 4; + case Y: + default: return 0; + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing.Axis axis = null; + switch (meta) { + case 8: axis = EnumFacing.Axis.Z; break; + case 4: axis = EnumFacing.Axis.X; break; + case 0: + default: axis = EnumFacing.Axis.Y; break; + } + return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); + } + + @Override + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - topIcon = IconHelper.forBlock(par1IconRegister, this, 1); + return super.setUnlocalizedName(par1Str); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } - - @Override - protected IIcon getSideIcon(int p_150163_1_) { - return blockIcon; - } - - @Override - protected IIcon getTopIcon(int p_150161_1_) { - return topIcon; - } - } 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 26544a639..8cfeb886a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -31,14 +31,14 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { setHardness(0.3F); setStepSound(soundTypeGlass); setLightLevel(1.0F); - setBlockName(LibBlockNames.SEA_LAMP); + setUnlocalizedName(LibBlockNames.SEA_LAMP); } int coloredLight = -1; @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, BlockPos pos) { return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } 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 f8eb3f701..29021dcab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -36,7 +36,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.SHIMMERROCK); + setUnlocalizedName(LibBlockNames.SHIMMERROCK); MinecraftForge.EVENT_BUS.register(this); } @@ -50,12 +50,6 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; 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 1a8a91c01..65b1d81a6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -35,7 +35,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.SHIMMERWOOD_PLANKS); + setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); MinecraftForge.EVENT_BUS.register(this); } @@ -49,12 +49,6 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 77bd6a379..0607a547f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -10,16 +10,19 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; @@ -38,27 +41,31 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } - - @Override - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[16]; - iconsAlt = new IIcon[16]; - for(int i = 0; i < 16; i++) { - icons[i] = IconHelper.forName(register, "flowerGlimmering" + i); - iconsAlt[i] = IconHelper.forName(register, "flowerGlimmering" + i, BlockModFlower.ALT_DIR); - } - } - - @Override - public IIcon getIcon(int par1, int par2) { - return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override @@ -67,12 +74,12 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { return false; } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } 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 704176854..cea1c87c3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -28,8 +28,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockStarfield extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockStarfield() { super(Material.iron); setHardness(5F); @@ -41,19 +39,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - - @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } 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 16e6815b3..5e00e9611 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -27,7 +27,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { super(Material.grass); setHardness(1.0F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.THATCH); + setUnlocalizedName(LibBlockNames.THATCH); } @Override 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 2591a06b0..3f7f9ee5e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -11,21 +11,26 @@ package vazkii.botania.common.block.decor; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -43,6 +48,38 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; setBlockBounds(f, 0, f, 1F - f, f, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public int getMetaFromState(IBlockState state) { + switch (((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS))) { + case NORTH: return 0; + case WEST: return 3; + case EAST: return 1; + case SOUTH: + default: + return 2; // wai vazkii senpai + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing side = null; + switch (meta) { + case 3: side = EnumFacing.WEST; break; + case 0: side = EnumFacing.NORTH; break; + case 1: side = EnumFacing.EAST; break; + case 2: + default: + side = EnumFacing.SOUTH; break; + } + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } @Override @@ -57,45 +94,33 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return Blocks.hardened_clay.getIcon(0, 0); - } - - @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + minX + Math.random() * (maxX - minX), pos.getY() + maxY, pos.getZ() + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); } return true; } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { - int l1 = MathHelper.floor_double(par5EntityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - par1World.setBlockMetadataWithNotify(par2, par3, par4, l1, 2); + public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, par5EntityLiving.getHorizontalFacing().getOpposite())); if (par6ItemStack.hasDisplayName()) - ((TileTinyPotato) par1World.getTileEntity(par2, par3, par4)).name = par6ItemStack.getDisplayName(); + ((TileTinyPotato) par1World.getTileEntity(pos)).name = par6ItemStack.getDisplayName(); } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + dropBlockAsItem(par1World, pos, state, 0); } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null) { ItemStack stack = new ItemStack(this); @@ -114,7 +139,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } 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 637bb355e..a37883145 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -16,9 +16,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -26,6 +29,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; @@ -42,7 +46,26 @@ public class BlockUnstable extends BlockMod implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeMetal); setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); - setBlockName(LibBlockNames.UNSTABLE_BLOCK); + setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -52,9 +75,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -63,7 +86,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -73,30 +96,29 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int color = getRenderColor(par1World.getBlockMetadata(par2, par3, par4)); + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + int color = getRenderColor(state); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); - Vector3 origVector = new Vector3(par2 + 0.5, par3 + 0.5, par4 + 0.5); + Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1); Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright); } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; - return new Color(color[0], color[1], color[2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { + return getRenderColor(par1iBlockAccess.getBlockState(pos)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index b2758f4d2..e916e1416 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -37,10 +37,4 @@ public class BlockBifrostPane extends BlockModPane { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister reg) { - // NO-OP - } - } 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 493a94238..d9103f076 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 @@ -13,10 +13,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -28,12 +27,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { Block source; - public IIcon iconTop; public BlockModPane(Block source) { - super("", "", Material.glass, false); + super(Material.glass, false); this.source = source; - setBlockName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); + setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setStepSound(soundTypeGlass); @@ -41,19 +39,13 @@ public class BlockModPane extends BlockPane { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister reg) { - iconTop = IconHelper.forBlock(reg, this); - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) { + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; } @@ -68,21 +60,9 @@ public class BlockModPane extends BlockPane { } @Override - @SideOnly(Side.CLIENT) - public IIcon func_150097_e() { - return source.getIcon(0, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side >= 2 ? iconTop : source.getIcon(side, meta); - } - - @Override - public boolean canPaneConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir) { - Block block = world.getBlock(x, y, z); - return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, x, y, z, dir); + public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { + Block block = world.getBlockState(pos).getBlock(); + return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } } 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 b36c27a8e..d95a8013e 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 @@ -14,16 +14,20 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; @@ -35,26 +39,39 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { - private final String[] iconNames; public final String type; - private IIcon[] specialQuartzIcons; - private IIcon chiseledSpecialQuartzIcon; - private IIcon pillarSpecialQuartzIcon; - private IIcon specialQuartzTopIcon; public BlockSpecialQuartz(String type) { super(Material.rock); this.type = type; - iconNames = new String[]{ "block" + type + "Quartz0", "chiseled" + type + "Quartz0", "pillar" + type + "Quartz0", null, null }; setHardness(0.8F); setResistance(10F); - setBlockName("quartzType" + type); + setUnlocalizedName("quartzType" + type); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } @Override - public Block setBlockName(String par1Str) { + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.QUARTZ_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= QuartzVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.values()[meta]); + } + + @Override + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -71,52 +88,33 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - if (par2 != 2 && par2 != 3 && par2 != 4) { - if (par1 != 1 && (par1 != 0 || par2 != 1)) { - if (par1 == 0) - return specialQuartzTopIcon; - else { - if (par2 < 0 || par2 >= specialQuartzIcons.length) - par2 = 0; - - return specialQuartzIcons[par2]; - } - } else return par2 == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon; - } else - return par2 == 2 && (par1 == 1 || par1 == 0) ? pillarSpecialQuartzIcon : par2 == 3 && (par1 == 5 || par1 == 4) ? pillarSpecialQuartzIcon : par2 == 4 && (par1 == 2 || par1 == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[par2]; - } - - @Override - public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { - if (par9 == 2) { - switch (par5) { - case 0: - case 1: - par9 = 2; - break; - case 2: - case 3: - par9 = 4; - break; - case 4: - case 5: - par9 = 3; + public IBlockState onBlockPlaced(World par1World, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { + if (meta == 2) { // Pillar quartz variant + switch (side.getAxis()) { + case Y: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y); + case Z: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Z); + case X: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_X); } } - return par9; + return getStateFromMeta(meta); } @Override - public int damageDropped(int par1) { - return par1 != 3 && par1 != 4 ? par1 : 2; + public int damageDropped(IBlockState state) { + QuartzVariant variant = ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)); + if (variant == QuartzVariant.PILLAR_X || variant == QuartzVariant.PILLAR_Z) { + state = state.withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y); + } + return getMetaFromState(state); } @Override - public ItemStack createStackedBlock(int par1) { - return par1 != 3 && par1 != 4 ? super.createStackedBlock(par1) : new ItemStack(this, 1, 2); + public ItemStack createStackedBlock(IBlockState state) { + return new ItemStack(this, 1, damageDropped(state)); } @Override @@ -132,22 +130,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { par3List.add(new ItemStack(this, 1, 2)); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - specialQuartzIcons = new IIcon[iconNames.length]; - - for (int i = 0; i < specialQuartzIcons.length; ++i) { - if (iconNames[i] == null) - specialQuartzIcons[i] = specialQuartzIcons[i - 1]; - else specialQuartzIcons[i] = IconHelper.forName(par1IconRegister, iconNames[i]); - } - - specialQuartzTopIcon = IconHelper.forName(par1IconRegister, "block" + type + "Quartz1"); - chiseledSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "chiseled" + type + "Quartz1"); - pillarSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "pillar" + type + "Quartz1"); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 10ab14fcc..709067452 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -4,7 +4,8 @@ import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,9 +26,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; public BlockModSlab(boolean full, Material mat, String name) { - super(full, mat); + super(mat); this.name = name; - setBlockName(name); + setUnlocalizedName(name); if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; @@ -39,40 +40,43 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { return Item.getItemFromBlock(getSingleBlock()); } @Override - public int quantityDropped(int meta, int fortune, Random random) { - return super.quantityDropped(meta, fortune, random); + public int quantityDropped(IBlockState state, int fortune, Random random) { + return super.quantityDropped(state, fortune, random); } @Override - public ItemStack createStackedBlock(int par1) { + public ItemStack createStackedBlock(IBlockState par1) { return new ItemStack(getSingleBlock()); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - public void register() { GameRegistry.registerBlock(this, ItemBlockModSlab.class, name); } @Override - public String func_150002_b(int i) { + public String getUnlocalizedName(int i) { return name; } + @Override + public abstract boolean isDouble(); + + @Override + public abstract IProperty getVariantProperty(); + + @Override + public abstract Object getVariant(ItemStack stack); + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 76ef02052..47467abab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -16,7 +16,6 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 46786e369..43b13df5d 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -11,6 +11,11 @@ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + +import java.util.EnumMap; +import java.util.Map; + /* * This class is presentto help with the Colored Lights mod without needing to package * the API or hold a dependency, please understand. @@ -48,21 +53,22 @@ public class ColoredLightHelper { } // End API Copypasta + private static Map packedColors = null; - private static int packedColors[][] = null; - - public static int getPackedColor(int meta, int light) { + public static int getPackedColor(EnumDyeColor color, int light) { if(packedColors == null) initPackedColors(); - return packedColors[meta][light]; + return packedColors.get(color)[light]; } private static void initPackedColors() { - packedColors = new int[16][16]; - for(int i = 0; i < 16; i++) + packedColors = new EnumMap(EnumDyeColor.class); + for(EnumDyeColor color : EnumDyeColor.values()) { + packedColors.put(color, new int[16]); for(int j = 0; j < 16; j++) - packedColors[i][j] = makeRGBLightValue(r[15 - i], g[15 - i], b[15 - i], j / 16F); + packedColors.get(color)[j] = makeRGBLightValue(r[15 - color.getMetadata()], g[15 - color.getMetadata()], b[15 - color.getMetadata()], j / 16F); + } } } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java index e813b5132..3ad64401a 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This interface is use for wrappers for compatibility with the colored lights mod. * It has one version for colored lights, and one version which leaves the light values unmodified for vanilla @@ -17,5 +19,5 @@ package vazkii.botania.common.integration.coloredlights; public interface ILightHelper { public int makeRGBLightValue(float r, float g, float b, int currentLightValue); - public int getPackedColor(int meta, int light); + public int getPackedColor(EnumDyeColor meta, int light); } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java index 9b9f4580c..51315523a 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This is an implementation of ILightHelper for when the colored lights mod is installed */ @@ -21,8 +23,8 @@ public class LightHelperColored implements ILightHelper { } @Override - public int getPackedColor(int meta, int light) { - return ColoredLightHelper.getPackedColor(meta, light); + public int getPackedColor(EnumDyeColor color, int light) { + return ColoredLightHelper.getPackedColor(color, light); } } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java index 441d0dd57..bb793708f 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This is an implementation of ILightHelper for when the colored lights mod isn't installed */ @@ -21,7 +23,7 @@ public class LightHelperVanilla implements ILightHelper { } @Override - public int getPackedColor(int meta, int light) { + public int getPackedColor(EnumDyeColor meta, int light) { return light; } From 4a4763b075a0f94f31639a50a3d264911eb3df52 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Nov 2015 22:58:18 -0600 Subject: [PATCH 050/935] Light work on decor --- .../botania/api/state/BotaniaStateProps.java | 17 +++++- .../api/state/enums/BiomeBrickVariant.java | 29 ++++++++++ .../api/state/enums/BiomeStoneVariant.java | 29 ++++++++++ .../decor/biomestone/BlockBiomeStone.java | 37 ++++--------- .../decor/biomestone/BlockBiomeStoneA.java | 33 ++++++++++-- .../decor/biomestone/BlockBiomeStoneB.java | 25 ++++++++- .../decor/quartz/BlockSpecialQuartzSlab.java | 31 ++++++----- .../block/decor/walls/Block18StoneWall.java | 36 ++++++++++++- .../decor/walls/BlockBiomeStoneWall.java | 32 ++++++++++- .../block/decor/walls/BlockModWall.java | 40 +++++++------- .../block/decor/walls/BlockVariantWall.java | 54 ------------------- 11 files changed, 240 insertions(+), 123 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 628e80965..b204fd119 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -51,12 +51,27 @@ public class BotaniaStateProps { /** Properties for individual blocks **/ - // Block18Stone + // Block18Stone, public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + // Block18StoneWall + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + @Override + public boolean apply(FutureStoneVariant variant) { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; + } + }); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + // BlockBiomeStoneA + public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); + + // BlockBiomeStoneB + public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java new file mode 100644 index 000000000..7962ab47c --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum BiomeBrickVariant implements IStringSerializable { + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + CHISELED_FOREST, + CHISELED_PLAINS, + CHISELED_MOUNTAIN, + CHISELED_FUNGAL, + CHISELED_SWAMP, + CHISELED_DESERT, + CHISELED_TAIGA, + CHISELED_MESA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java new file mode 100644 index 000000000..844667aa8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum BiomeStoneVariant implements IStringSerializable { + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + FOREST_COBBLE, + PLAINS_COBBLE, + MOUNTAIN_COBBLE, + FUNGAL_COBBLE, + SWAMP_COBBLE, + DESERT_COBBLE, + TAIGA_COBBLE, + MESA_COBBLE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} 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 ca1add61b..1bda5d990 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 @@ -14,13 +14,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -33,24 +32,12 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBiomeStone extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[32]; - int iconOffset; - - public BlockBiomeStone(int iconOffset, String name) { + public BlockBiomeStone(String name) { super(Material.rock); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); - setBlockName(name); - this.iconOffset = iconOffset; - } - - @Override - public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < 16; i++) { - int index = i + iconOffset; - icons[index] = IconHelper.forName(register, "biomeStone" + index); - } + setUnlocalizedName(name); } @Override @@ -59,31 +46,25 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - return icons[meta + iconOffset]; - } - @Override protected boolean shouldRegisterInNameSet() { return false; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 2a9928204..c8d653c31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -10,17 +10,44 @@ */ package vazkii.botania.common.block.decor.biomestone; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { - super(0, LibBlockNames.BIOME_STONE_A); + super(LibBlockNames.BIOME_STONE_A); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); } @Override - public int damageDropped(int par1) { - return par1 % 8 + 8; + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.BIOMESTONE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= BiomeStoneVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]); + } + + @Override + public int damageDropped(IBlockState state) { + int meta = getMetaFromState(state); + if (meta < 8) { + meta += 8; // Drop cobblestone variant + } + return meta; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 405432fc5..a0638efe9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -10,12 +10,35 @@ */ package vazkii.botania.common.block.decor.biomestone; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { - super(16, LibBlockNames.BIOME_STONE_B); + super(LibBlockNames.BIOME_STONE_B); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.BIOMEBRICK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= BiomeBrickVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.values()[meta]); + } } 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 2456f25fe..f5c839e15 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 @@ -15,12 +15,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; @@ -82,30 +82,33 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - return source.getBlockTextureFromSide(par1); - } - - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { return Item.getItemFromBlock(getSingleBlock()); } @Override - public ItemStack createStackedBlock(int par1) { + public ItemStack createStackedBlock(IBlockState par1) { return new ItemStack(getSingleBlock()); } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public boolean isDouble() { + return getFullBlock() == this; + } + + @Override + public IProperty getVariantProperty() { + return null; + } + + @Override + public Object getVariant(ItemStack stack) { + return null; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 832d3cca4..d81cd3f3e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -10,15 +10,24 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.state.BlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -public class Block18StoneWall extends BlockVariantWall { +import java.util.List; + +public class Block18StoneWall extends BlockModWall { public Block18StoneWall() { super(ModFluffBlocks.stone, 4); @@ -26,6 +35,31 @@ public class Block18StoneWall extends BlockVariantWall { setResistance(10F); } + @Override + public BlockState createBlockState() { + return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); + } + + @Override + protected void specifyDefaultState() { + setDefaultState(blockState.getBaseState() + .withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false) + .withProperty(WEST, false).withProperty(EAST, false) + .withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE) + ); + } + + @Override + public void register(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + for(int i = 0; i < 4; i++) + list.add(new ItemStack(item, 1, i)); + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index eea518179..9f0b22008 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -10,22 +10,50 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.state.BlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -public class BlockBiomeStoneWall extends BlockVariantWall { +import java.util.List; + +public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall() { - super(ModFluffBlocks.biomeStoneA, 8, 8); + super(ModFluffBlocks.biomeStoneA, 8); setHardness(1.5F); setResistance(10F); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.BIOME); + } + + @Override + protected void specifyDefaultState() { + + } + + @Override + public void register(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + for(int i = 0; i < 8; i++) + list.add(new ItemStack(item, 1, i)); + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 7f9a34abc..c169206e9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -14,13 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -28,27 +29,38 @@ import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockModWall extends BlockWall implements ILexiconable { +public abstract class BlockModWall extends BlockWall implements ILexiconable { Block block; - int meta; public BlockModWall(Block block, int meta) { super(block); this.block = block; - this.meta = meta; - setBlockName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); + setUnlocalizedName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); + specifyDefaultState(); } @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + public BlockState createBlockState() { + return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST); + } + + protected void specifyDefaultState() { + setDefaultState(blockState.getBaseState() + .withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false) + .withProperty(WEST, false).withProperty(EAST, false) + ); + } + + @Override + public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) { return true; } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { register(par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } public void register(String name) { @@ -60,19 +72,9 @@ public class BlockModWall extends BlockWall implements ILexiconable { list.add(new ItemStack(item)); } - @Override - public IIcon getIcon(int side, int meta) { - return block.getIcon(side, this.meta); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } - @Override - public void registerBlockIcons(IIconRegister p_149651_1_) { - // NO-OP - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java deleted file mode 100644 index 47467abab..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:42:16 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public class BlockVariantWall extends BlockModWall { - - int metaStates; - int metaShift; - - public BlockVariantWall(Block block, int metaStates, int metaShift) { - super(block, 0); - this.metaStates = metaStates; - this.metaShift = metaShift; - } - - public BlockVariantWall(Block block, int metaStates) { - this(block, metaStates, 0); - } - - @Override - public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { - for(int i = 0; i < metaStates; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public IIcon getIcon(int side, int meta) { - return block.getIcon(side, meta + metaShift); - } - - -} From a9baf71924b0087bc469f74308df92b6fc389408 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 Nov 2015 19:55:12 -0600 Subject: [PATCH 051/935] TESRs and fixed quite a few todos --- .../vazkii/botania/api/item/IDyablePool.java | 6 +- .../api/mana/IPoolOverlayProvider.java | 5 +- .../handler/ContributorFancinessHandler.java | 7 +- .../client/core/helper/IconHelper.java | 29 ++++---- .../gui/crafting/ContainerCraftingHalo.java | 2 +- .../client/gui/lexicon/GuiLexiconEntry.java | 2 +- .../client/gui/lexicon/GuiLexiconIndex.java | 5 +- .../client/render/tile/RenderTileAltar.java | 66 ++++++++++--------- .../client/render/tile/RenderTileAvatar.java | 33 +++++----- .../client/render/tile/RenderTileBellows.java | 1 + .../client/render/tile/RenderTileBrewery.java | 62 ++++++++--------- .../client/render/tile/RenderTileCocoon.java | 1 + .../tile/RenderTileCorporeaCrystalCube.java | 5 +- .../render/tile/RenderTileCorporeaIndex.java | 1 + .../render/tile/RenderTileEnchanter.java | 10 ++- .../render/tile/RenderTileFloatingFlower.java | 22 ++++--- .../render/tile/RenderTileHourglass.java | 1 + .../render/tile/RenderTileIncensePlate.java | 39 ++++++----- .../render/tile/RenderTileLightRelay.java | 9 ++- .../client/render/tile/RenderTilePool.java | 18 ++--- .../client/render/tile/RenderTilePrism.java | 1 + .../client/render/tile/RenderTilePump.java | 1 + .../client/render/tile/RenderTilePylon.java | 1 + .../render/tile/RenderTileRuneAltar.java | 57 ++++++++-------- .../render/tile/RenderTileSkullOverride.java | 31 +++++---- .../render/tile/RenderTileSpawnerClaw.java | 1 + .../render/tile/RenderTileSpreader.java | 1 + .../render/tile/RenderTileTerraPlate.java | 5 +- .../render/tile/RenderTileTeruTeruBozu.java | 3 +- .../render/tile/RenderTileTinyPotato.java | 3 +- .../botania/common/block/BlockAlfPortal.java | 12 ++++ .../block/BlockFloatingSpecialFlower.java | 16 +++-- .../botania/common/block/BlockGaiaHead.java | 2 +- .../common/block/BlockIncensePlate.java | 4 +- .../botania/common/block/BlockLightRelay.java | 16 ++++- .../common/block/BlockSpecialFlower.java | 14 ++-- .../block/decor/BlockFloatingFlower.java | 10 +-- .../block/mana/BlockAlchemyCatalyst.java | 4 +- .../common/block/mana/BlockEnchanter.java | 14 ++++ .../common/block/mana/BlockManaVoid.java | 17 ++++- .../botania/common/block/mana/BlockPool.java | 15 +++++ .../common/block/mana/BlockTerraPlate.java | 15 +++++ .../block/tile/TileSimpleInventory.java | 6 +- .../common/block/tile/mana/TileBellows.java | 6 +- .../common/block/tile/mana/TilePool.java | 16 +++-- .../coloredlights/LightHelper.java | 3 +- .../item/equipment/bauble/ItemMonocle.java | 1 + .../botania/common/item/material/ItemDye.java | 8 +-- .../common/lexicon/page/PageEntity.java | 2 +- .../common/world/SkyblockWorldEvents.java | 2 +- 50 files changed, 373 insertions(+), 238 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IDyablePool.java b/src/main/java/vazkii/botania/api/item/IDyablePool.java index 8bb8e94eb..c5137266d 100644 --- a/src/main/java/vazkii/botania/api/item/IDyablePool.java +++ b/src/main/java/vazkii/botania/api/item/IDyablePool.java @@ -11,14 +11,16 @@ package vazkii.botania.api.item; +import net.minecraft.item.EnumDyeColor; + /** * Used to define a Mana Pool that can be dyed through floral powder. */ public interface IDyablePool { - public int getColor(); + public EnumDyeColor getColor(); - public void setColor(int color); + public void setColor(EnumDyeColor color); } diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index e443e2c1b..19da6afee 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -10,7 +10,8 @@ */ package vazkii.botania.api.mana; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -20,6 +21,6 @@ import net.minecraft.world.World; */ public interface IPoolOverlayProvider { - public IIcon getIcon(World world, int x, int y, int z); + public TextureAtlasSprite getIcon(World world, BlockPos pos); } 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 49b2b4346..049c24e43 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -24,6 +24,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EnumPlayerModelParts; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -42,7 +43,7 @@ import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler { - public volatile static Map flowerMap = null; + public volatile static Map flowerMap = null; private volatile static boolean startedLoading = false; private static boolean phi = true; @@ -82,7 +83,7 @@ public final class ContributorFancinessHandler { } catch(NumberFormatException e) { SubTileSignature sig = BotaniaAPI.getSignatureForName(value); if(sig != null) - flowerMap.put(key, ItemBlockSpecialFlower.ofType(value).getIconIndex()); + flowerMap.put(key, ItemBlockSpecialFlower.ofType(value)); } } } @@ -155,7 +156,7 @@ public final class ContributorFancinessHandler { GlStateManager.popMatrix(); } - private static void renderFlower(RenderPlayerEvent event, TextureAtlasSprite icon) { + private static void renderFlower(RenderPlayerEvent event, ItemStack flower) { GlStateManager.pushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index bf3c2304b..5481dfb43 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -11,50 +11,51 @@ package vazkii.botania.client.core.helper; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; -import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; public final class IconHelper { - public static IIcon forName(IIconRegister ir, String name) { - return ir.registerIcon(LibResources.PREFIX_MOD + name); + public static TextureAtlasSprite forName(TextureMap ir, String name) { + return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, name)); } - public static IIcon forName(IIconRegister ir, String name, String dir) { - return ir.registerIcon(LibResources.PREFIX_MOD + dir + "/" + name); + public static TextureAtlasSprite forName(TextureMap ir, String name, String dir) { + return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, dir + "/" + name)); } - public static IIcon forBlock(IIconRegister ir, Block block) { + public static TextureAtlasSprite forBlock(TextureMap ir, Block block) { return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "")); } - public static IIcon forBlock(IIconRegister ir, Block block, int i) { + public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i) { return forBlock(ir, block, Integer.toString(i)); } - public static IIcon forBlock(IIconRegister ir, Block block, int i, String dir) { + public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i, String dir) { return forBlock(ir, block, Integer.toString(i), dir); } - public static IIcon forBlock(IIconRegister ir, Block block, String s) { + public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s) { return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s); } - public static IIcon forBlock(IIconRegister ir, Block block, String s, String dir) { + public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s, String dir) { return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s, dir); } - public static IIcon forItem(IIconRegister ir, Item item) { + public static TextureAtlasSprite forItem(TextureMap ir, Item item) { return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "")); } - public static IIcon forItem(IIconRegister ir, Item item, int i) { + public static TextureAtlasSprite forItem(TextureMap ir, Item item, int i) { return forItem(ir, item, Integer.toString(i)); } - public static IIcon forItem(IIconRegister ir, Item item, String s) { + public static TextureAtlasSprite forItem(TextureMap ir, Item item, String s) { return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s); } diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index d52ae9a0d..852cfe84c 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; public class ContainerCraftingHalo extends ContainerWorkbench { public ContainerCraftingHalo(InventoryPlayer p_i1808_1_, World p_i1808_2_) { - super(p_i1808_1_, p_i1808_2_, BlockPos.ORIGIN); // todo 1.8 verify + super(p_i1808_1_, p_i1808_2_, BlockPos.ORIGIN); craftMatrix = new InventoryCraftingHalo(this, 3, 3); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 79bdeece0..949200c09 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -401,7 +401,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, new GuiScreen() {}); // todo 1.8 check anonymous class + GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); // todo 1.8 recheck last param (was new GuiScreen()) gui.page = page; gui.setTitle(); return gui; 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 1d650026b..b6db58d69 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -18,6 +18,7 @@ import java.util.List; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -217,7 +218,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { ItemStack paper = new ItemStack(Items.paper, currentEntry.pages.size()); mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); // todo 1.8 text + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); List stacks = currentEntry.getDisplayedRecipes(); if(stacks.size() > 0) { @@ -370,7 +371,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) throws IOException { if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up prevPage(); else if(par2 == 205 || par2 == 208 || par2 == 209) // Right, Down Page Down diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index ccb515290..19e17fecf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -121,17 +121,18 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - IIcon icon = stack.getItem().getIcon(stack, 0); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// IIcon icon = stack.getItem().getIcon(stack, 0); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } GlStateManager.popMatrix(); } @@ -140,27 +141,28 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { } } - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Block block = lava ? Blocks.lava : Blocks.water; - int brightness = lava ? 240 : -1; - float alpha = lava ? 1F : 0.7F; - - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.disableAlpha(); - if(lava) - GlStateManager.disableLighting(); - GlStateManager.color(1F, 1F, 1F, alpha); - GlStateManager.translate(w, -0.3F, w); - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.scale(s, s, s); - - renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness); - if(lava) - GlStateManager.enableLighting(); - GlStateManager.enableAlpha(); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); + // todo 1.8 this theoretically would be completely done in models and getActualState +// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); +// Block block = lava ? Blocks.lava : Blocks.water; +// int brightness = lava ? 240 : -1; +// float alpha = lava ? 1F : 0.7F; +// +// GlStateManager.enableBlend(); +// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); +// GlStateManager.disableAlpha(); +// if(lava) +// GlStateManager.disableLighting(); +// GlStateManager.color(1F, 1F, 1F, alpha); +// GlStateManager.translate(w, -0.3F, w); +// GlStateManager.rotate(90F, 1F, 0F, 0F); +// GlStateManager.scale(s, s, s); +// +// renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness); +// if(lava) +// GlStateManager.enableLighting(); +// GlStateManager.enableAlpha(); +// GlStateManager.disableBlend(); +// GlStateManager.popMatrix(); } GlStateManager.popMatrix(); 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 f81017062..0245fbc55 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -20,7 +21,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -69,21 +69,22 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GlStateManager.translate(-1.2F, -3.5F, -0.65F); GlStateManager.rotate(20F, 0F, 0F, 1F); - int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// int renderPass = 0; +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 2a8074268..c031ad1d7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; 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 fe44d5f93..7016e9bc2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -14,6 +14,7 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -64,40 +65,41 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public void renderItemStack(ItemStack stack) { if(stack != null) { Minecraft mc = Minecraft.getMinecraft(); - mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.25F; GlStateManager.scale(s, s, s); GlStateManager.scale(2F, 2F, 2F); - if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { - GlStateManager.scale(0.5F, 0.5F, 0.5F); - if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(1F, 1.1F, 0F); - GlStateManager.pushMatrix(); - RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); - GlStateManager.popMatrix(); - GlStateManager.translate(-1F, -1.1F, 0F); - GlStateManager.scale(2F, 2F, 2F); - } else { - int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); - } - } + mc.getRenderItem().renderItemModel(stack); // todo 1.8 +// if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// GlStateManager.translate(1F, 1.1F, 0F); +// GlStateManager.pushMatrix(); +// RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); +// GlStateManager.popMatrix(); +// GlStateManager.translate(-1F, -1.1F, 0F); +// GlStateManager.scale(2F, 2F, 2F); +// } else { +// int renderPass = 0; +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); +// } +// } GlStateManager.scale(1F / s, 1F / s, 1F / s); Minecraft.getMinecraft().renderEngine.bindTexture(texture); 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 40d0e3177..1c20841f1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; 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 d3db12167..1e9841765 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -28,6 +30,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; +import vazkii.botania.common.lib.LibObfuscation; public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { @@ -42,7 +45,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { if(entity == null) entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone)); - entity.age = ClientTickHandler.ticksInGame; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE); ItemStack stack = cube.getRequestTarget(); entity.setEntityItemStack(stack); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 7f69b7184..3cd31253f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelEnderCrystal; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index f1119962b..1ebe0d32d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -11,22 +11,26 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockEnchanter; import vazkii.botania.common.block.tile.TileEnchanter; +import vazkii.botania.common.lib.LibObfuscation; public class RenderTileEnchanter extends TileEntitySpecialRenderer { @@ -48,7 +52,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { if(item == null) item = new EntityItem(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant); - item.age = ClientTickHandler.ticksInGame; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, ClientTickHandler.ticksInGame, LibObfuscation.AGE); item.setEntityItemStack(enchanter.itemToEnchant); GlStateManager.color(1F, 1F, 1F, 1F); @@ -105,10 +109,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.setBrightness(brightness); + tessellator.getWorldRenderer().setBrightness(brightness); tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index d419204bb..2718419f9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -58,16 +59,17 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); - IIcon icon = stack.getIconIndex(); - - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - GlStateManager.translate(0.25F, 0.4F, 0.5F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// IIcon icon = stack.getIconIndex(); +// +// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// GlStateManager.translate(0.25F, 0.4F, 0.5F); +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 34df5f9ef..0fae3b81a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 4f3907a4b..32df4e8d8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -13,17 +13,20 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelIncensePlate; import vazkii.botania.common.block.tile.TileIncensePlate; @@ -41,7 +44,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileIncensePlate plate = (TileIncensePlate) tileentity; - int meta = plate.getWorld() != null ? plate.getBlockMetadata() : 0; + EnumFacing facing = plate.getWorld() != null ? ((EnumFacing) plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS)) : EnumFacing.SOUTH; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); @@ -52,7 +55,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(texture); GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, facing.getIndex() - 2), 0)], 0F, 1F, 0F); model.render(); GlStateManager.scale(1F, -1F, -1F); @@ -64,22 +67,22 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.translate(0.1F, -1.46F, 0F); GlStateManager.scale(s, s, s); GlStateManager.rotate(180F, 0F, 1F, 0F); - - int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// int renderPass = 0; +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 8fdc84de1..4ada1c7fe 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -14,10 +14,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -30,7 +30,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) { Minecraft mc = Minecraft.getMinecraft(); - IIcon iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; + TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); @@ -53,7 +53,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float off = 0.25F; GlStateManager.translate(0F, off, 0F); - GlStateManager.rotate(time, 0F, 0F, 1F); + GlStateManager.rotate(((float) time), 0F, 0F, 1F); GlStateManager.translate(0F, -off, 0F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); @@ -65,8 +65,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - // todo 1.8 looks like vanilla copypasta, update it - private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) { + private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) { float f = p_77026_2_.getMinU(); float f1 = p_77026_2_.getMaxU(); float f2 = p_77026_2_.getMinV(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index ca09fa7c9..4cc67bf2a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -12,17 +12,15 @@ package vazkii.botania.client.render.tile; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -63,9 +61,11 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - int color = pool.color; - float[] acolor = EntitySheep.fleeceColorTable[color]; - GlStateManager.color(acolor[0], acolor[1], acolor[2], a); + int hex = pool.color.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); + GlStateManager.color(r, g, b, a); model.render(); GlStateManager.color(1F, 1F, 1F, a); GlStateManager.scale(1F, -1F, -1F); @@ -91,7 +91,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { if(pool.getWorld() != null) { Block below = pool.getWorld().getBlockState(pool.getPos().down()).getBlock(); if(below instanceof IPoolOverlayProvider) { - IIcon overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.xCoord, pool.yCoord - 1, pool.zCoord); + TextureAtlasSprite overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.getPos()); if(overlay != null) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); @@ -137,7 +137,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { forceManaNumber = -1; } - public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); tessellator.getWorldRenderer().setBrightness(brightness); 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 a162fe38f..4e0551539 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 4cdd00579..890176f08 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; 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 f6936aa1c..adc174e65 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; 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 450f0bf90..1b24e6560 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -14,6 +14,7 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -34,7 +35,6 @@ import vazkii.botania.common.block.tile.TileRuneAltar; public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ModelSpinningCubes cubes = new ModelSpinningCubes(); - RenderBlocks renderBlocks = new RenderBlocks(); @Override public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { @@ -69,35 +69,36 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft mc = Minecraft.getMinecraft(); if(stack != null) { - mc.renderEngine.bindTexture(stack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(2F, 2F, 2F); - if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { - GlStateManager.scale(0.5F, 0.5F, 0.5F); - if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(1F, 1.1F, 0F); - renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); - GlStateManager.translate(-1F, -1.1F, 0F); - GlStateManager.scale(2F, 2F, 2F); - } else { - int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); - } - } + mc.getRenderItem().renderItemModel(stack); +// if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// GlStateManager.translate(1F, 1.1F, 0F); +// renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); +// GlStateManager.translate(-1F, -1.1F, 0F); +// GlStateManager.scale(2F, 2F, 2F); +// } else { +// int renderPass = 0; +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); +// } +// } } GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 7851eca67..fbb94cc6b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -14,8 +14,12 @@ import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; +import net.minecraft.client.resources.DefaultPlayerSkin; +import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -34,41 +38,44 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { public static final ModelSkullOverride modelSkull = new ModelSkullOverride(); @Override - public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { - render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, p_147500_1_.getBlockMetadata() & 7, p_147500_1_.func_145906_b() * 360 / 16.0F, p_147500_1_.func_145904_a(), p_147500_1_.func_152108_a()); + public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { + if (p_147500_1_ instanceof TileEntitySkull) { + TileEntitySkull skull = ((TileEntitySkull) p_147500_1_); + render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress); + } } - public void render(TileEntitySkull skull, float par1, float par2, float par3, int par4, float par5, int par6, GameProfile gameProfile) { + public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { boolean gaia = skull instanceof TileGaiaHead; if(par6 == 3 || gaia) { - ResourceLocation resourcelocation = AbstractClientPlayer.locationStevePng; + ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy(); Minecraft minecraft = Minecraft.getMinecraft(); if(gaia) resourcelocation = minecraft.thePlayer.getLocationSkin(); else if(gameProfile != null) { - Map map = minecraft.func_152342_ad().func_152788_a(gameProfile); + Map map = minecraft.getSkinManager().loadSkinFromCache(gameProfile); if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) { - resourcelocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); + resourcelocation = minecraft.getSkinManager().loadSkin((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); } } bindTexture(resourcelocation); GlStateManager.pushMatrix(); GlStateManager.disableCull(); - if (par4 != 1) { + if (par4 != EnumFacing.UP) { switch (par4) { - case 2: + case NORTH: GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); break; - case 3: + case SOUTH: GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); par5 = 180.0F; break; - case 4: + case WEST: GlStateManager.translate(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); par5 = 270.0F; break; - case 5: + case EAST: default: GlStateManager.translate(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); par5 = 90.0F; @@ -86,6 +93,6 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { if(gaia) ShaderHelper.releaseShader(); GlStateManager.popMatrix(); - } else super.func_152674_a(par1, par2, par3, par4, par5, par6, gameProfile); + } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java index f9eb400d3..32032b735 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 338cffee4..36ad8a280 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; 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 a87678184..3efdb4d30 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -11,12 +11,13 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -66,7 +67,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().startDrawingQuads(); tessellator.getWorldRenderer().setBrightness(brightness); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index b9ea15d09..52e6f234e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.util.Random; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -49,7 +50,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if(hasWorld) { - GlStateManager.rotate(time * 0.3, 0F, 1F, 0F); + GlStateManager.rotate(((float) (time * 0.3)), 0F, 1F, 0F); GlStateManager.rotate(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F); float s = 0.75F; GlStateManager.scale(s, s, s); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 7904206d7..0422c7ba5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -391,7 +392,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } - public void renderIcon(IIcon icon) { + public void renderIcon(TextureAtlasSprite icon) { float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 49b3858cf..64e08d79e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -20,6 +21,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,12 +36,20 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { + public static TextureAtlasSprite portalTex; + public BlockAlfPortal() { super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Pre evt) { + portalTex = IconHelper.forBlock(evt.map, this, "Inside"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 5cf18e4f5..c3a048b3e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -20,6 +20,7 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -33,6 +34,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; @@ -55,13 +57,13 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); } -// @Override todo 1.8 coloredlights dep -// public int getLightValue(IBlockAccess world, int x, int y, int z) { -// int currentLight = ((TileSpecialFlower) world.getTileEntity(x, y, z)).getLightValue(); -// if(currentLight == -1) -// currentLight = originalLight; -// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); -// } + @Override + public int getLightValue(IBlockAccess world, BlockPos pos) { + int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); + if(currentLight == -1) + currentLight = originalLight; + return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight); + } @Override public boolean hasComparatorInputOverride() { diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 9c57bdf28..3abd78078 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -59,7 +59,7 @@ public class BlockGaiaHead extends BlockSkull { public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList(); - if((p_149749_6_ & 8) == 0) { // todo 1.8 p_<>_6 is meta + if(!((Boolean) state.getValue(NODROP))) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index d7514e3ab..db6e8e111 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -49,12 +49,12 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 5be284fab..3c44f82df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,6 +27,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; @@ -39,13 +45,21 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { - public static IIcon invIcon, worldIcon, invIconRed, worldIconRed; + public static TextureAtlasSprite worldIcon, worldIconRed; protected BlockLightRelay() { super(Material.glass); float f = 5F / 16F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcon = IconHelper.forBlock(evt.map, this, 1); + worldIconRed = IconHelper.forBlock(evt.map, this, 3); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index dd99b5f25..7847e1c57 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -133,13 +133,13 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } -// @Override todo 1.8 coloredlightscore dep -// public int getLightValue(IBlockAccess world, BlockPos pos) { -// int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); -// if(currentLight == -1) -// currentLight = 0; -// return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight); -// } + @Override + public int getLightValue(IBlockAccess world, BlockPos pos) { + int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); + if(currentLight == -1) + currentLight = 0; + return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight); + } @Override public boolean hasComparatorInputOverride() { 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 a353e33f1..fe9471395 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -87,11 +87,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } -// @Override todo 1.8 coloredlights dep -// @Optional.Method(modid = "easycoloredlights") -// public int getLightValue(IBlockAccess world, int x, int y, int z) { -// return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); -// } + @Override + @Optional.Method(modid = "easycoloredlights") + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); + } @Override protected boolean shouldRegisterInNameSet() { 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 c0d809590..e5edb7562 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -21,7 +22,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -46,7 +46,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override - public IIcon getIcon(World world, int x, int y, int z) { + public TextureAtlasSprite getIcon(World world, BlockPos pos) { return icons[3]; } 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 1792d0d98..c913900e6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -18,6 +18,7 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -30,6 +31,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -45,6 +51,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; + public static TextureAtlasSprite overlay; public BlockEnchanter() { super(Material.rock); @@ -55,6 +62,13 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + overlay = IconHelper.forBlock(evt.map, this, "Overlay"); } @Override 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 9b9c7584f..cf0985358 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -12,11 +12,17 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -28,7 +34,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider { - IIcon overlay; + TextureAtlasSprite overlay; public BlockManaVoid() { super(Material.rock); @@ -36,6 +42,13 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP setResistance(2000F); setStepSound(Block.soundTypeStone); setUnlocalizedName(LibBlockNames.MANA_VOID); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + overlay = IconHelper.forBlock(evt.map, this, 1); } @Override @@ -49,7 +62,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override - public IIcon getIcon(World world, int x, int y, int z) { + public TextureAtlasSprite getIcon(World world, BlockPos pos) { return overlay; } 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 b81684d6b..12f007761 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -18,6 +18,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -31,6 +32,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -52,6 +58,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; + public static TextureAtlasSprite manaIcon; + public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -59,6 +67,13 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.POOL); setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + manaIcon = IconHelper.forName(evt.map, "manaWater"); } @Override 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 befe73652..3116614ea 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -11,12 +11,18 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; @@ -27,6 +33,8 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { + public static TextureAtlasSprite overlay; + public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -34,6 +42,13 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { setResistance(10F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.TERRA_PLATE); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + overlay = IconHelper.forBlock(evt.map, this, "Overlay"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index bcaa103da..e8ba54d1a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -18,6 +18,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; +import java.util.Arrays; + public abstract class TileSimpleInventory extends TileMod implements IInventory { ItemStack[] inventorySlots = new ItemStack[getSizeInventory()]; @@ -130,11 +132,11 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory @Override public void clear() { - // todo 1.8 + Arrays.fill(inventorySlots, null); } @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); // todo 1.8 + return new ChatComponentText(getCommandSenderName()); } } 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 f2ef30355..c85db3c6a 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 @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; @@ -115,9 +116,8 @@ public class TileBellows extends TileMod implements IUpdatePlayerListBox { } public TileEntity getLinkedTile() { - int meta = getBlockMetadata(); - EnumFacing dir = EnumFacing.getFront(meta); // todo 1.8 states - return worldObj.getTileEntity(getPos().offset(dir)); + EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS)); + return worldObj.getTileEntity(getPos().offset(side)); } @Override 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 e2f717bee..ee1418a3d 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 @@ -16,11 +16,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,6 +33,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -58,6 +61,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.LibObfuscation; public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, IUpdatePlayerListBox { @@ -80,7 +84,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public boolean conjuration = false; boolean catalystsRegistered = false; - public int color = 0; + public EnumDyeColor color = EnumDyeColor.WHITE; int mana; int knownMana = -1; @@ -158,7 +162,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ItemStack output = recipe.getOutput().copy(); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - outputItem.age = 105; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, outputItem, 105, LibObfuscation.AGE); worldObj.spawnEntityInWorld(outputItem); } @@ -285,7 +289,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void writeCustomNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setBoolean(TAG_OUTPUTTING, outputting); - cmp.setInteger(TAG_COLOR, color); + cmp.setInteger(TAG_COLOR, color.getMetadata()); cmp.setInteger(TAG_MANA_CAP, manaCap); cmp.setBoolean(TAG_CAN_ACCEPT, canAccept); @@ -300,7 +304,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void readCustomNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); outputting = cmp.getBoolean(TAG_OUTPUTTING); - color = cmp.getInteger(TAG_COLOR); + color = EnumDyeColor.byMetadata(cmp.getInteger(TAG_COLOR)); if(cmp.hasKey(TAG_MANA_CAP)) manaCap = cmp.getInteger(TAG_MANA_CAP); @@ -427,12 +431,12 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } @Override - public int getColor() { + public EnumDyeColor getColor() { return color; } @Override - public void setColor(int color) { + public void setColor(EnumDyeColor color) { this.color = color; } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java index a2788419e..9721b5da2 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; import vazkii.botania.common.Botania; /* @@ -21,7 +22,7 @@ public class LightHelper { return Botania.lightHelper.makeRGBLightValue(r, g, b, (int) currentLightValue); } - public static int getPackedColor(int meta, int light) { + public static int getPackedColor(EnumDyeColor meta, int light) { return Botania.lightHelper.getPackedColor(meta, light); } } 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 cb9e7a9db..cdd730aa5 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; 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 e250e196b..2f79bdbe1 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -38,7 +38,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if (par3World.getBlockState(pos).getBlock().recolorBlock(par3World, pos, side, EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()))) { - par1ItemStack.stackSize--; // todo 1.8 recheck ^^ + par1ItemStack.stackSize--; return true; } return false; @@ -49,9 +49,9 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { if(!item.worldObj.isRemote && pool instanceof IDyablePool) { IDyablePool dyable = (IDyablePool) pool; TileEntity tile = (TileEntity) pool; - int meta = stack.getItemDamage(); - if(meta != dyable.getColor()) { - dyable.setColor(meta); + EnumDyeColor color = EnumDyeColor.byMetadata(stack.getItemDamage()); + if(color != dyable.getColor()) { + dyable.setColor(color); stack.stackSize--; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); } 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 afbbfcc53..5e58bbbe6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -92,7 +92,7 @@ public class PageEntity extends LexiconPage{ GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - GlStateManager.translate(0.0F, 0.0F, 0.0F); // todo 1.8 yOffset gone + // todo 1.8 yOffset gone GlStateManager.translate(0.0F, 0.0F, 0.0F); Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 4a83400e1..89bad781c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -128,7 +128,7 @@ public final class SkyblockWorldEvents { if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); - pmp.setSpawnChunk(pos, true, 0); // todo 1.8 verify last parm + pmp.setSpawnChunk(pos, true, player.worldObj.provider.getDimensionId()); player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } From e4b58e0c2d25b481099dbeac57c29e4ebc898052 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 Nov 2015 19:57:33 -0600 Subject: [PATCH 052/935] Remove InterpolatedIcon. Now present natively in 1.8 --- .../client/render/block/InterpolatedIcon.java | 79 ------------------- .../botania/common/block/BlockBifrost.java | 1 - .../common/block/BlockEnchantedSoil.java | 28 ------- .../common/block/decor/BlockPrismarine.java | 20 ----- .../common/block/decor/BlockShimmerrock.java | 18 ----- .../block/decor/BlockShimmerwoodPlanks.java | 18 ----- .../block/decor/panes/BlockBifrostPane.java | 19 ----- 7 files changed, 183 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java diff --git a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java b/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java deleted file mode 100644 index e250a1c0e..000000000 --- a/src/main/java/vazkii/botania/client/render/block/InterpolatedIcon.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 15, 2015, 5:11:16 PM (GMT)] - */ -package vazkii.botania.client.render.block; - -import java.lang.reflect.Field; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.data.AnimationMetadataSection; -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -// This is all vanilla code from 1.8, thanks to ganymedes01 porting it to 1.7 :D -@SideOnly(Side.CLIENT) -public class InterpolatedIcon extends TextureAtlasSprite { - - protected int[][] interpolatedFrameData; - private Field fanimationMetadata; - - public InterpolatedIcon(String name) { - super(name); - fanimationMetadata = ReflectionHelper.findField(TextureAtlasSprite.class, LibObfuscation.ANIMATION_METADATA); - fanimationMetadata.setAccessible(true); - } - - @Override - public void updateAnimation() { - super.updateAnimation(); - try { - updateAnimationInterpolated(); - } catch(Exception e) { - // NO-OP - } - } - - private void updateAnimationInterpolated() throws IllegalArgumentException, IllegalAccessException { - AnimationMetadataSection animationMetadata = (AnimationMetadataSection) fanimationMetadata.get(this); - - double d0 = 1.0D - tickCounter / (double) animationMetadata.getFrameTimeSingle(frameCounter); - int i = animationMetadata.getFrameIndex(frameCounter); - int j = animationMetadata.getFrameCount() == 0 ? framesTextureData.size() : animationMetadata.getFrameCount(); - int k = animationMetadata.getFrameIndex((frameCounter + 1) % j); - - if(i != k && k >= 0 && k < framesTextureData.size()) { - int[][] aint = (int[][]) framesTextureData.get(i); - int[][] aint1 = (int[][]) framesTextureData.get(k); - - if(interpolatedFrameData == null || interpolatedFrameData.length != aint.length) - interpolatedFrameData = new int[aint.length][]; - - for(int l = 0; l < aint.length; l++) { - if (interpolatedFrameData[l] == null) - interpolatedFrameData[l] = new int[aint[l].length]; - - if(l < aint1.length && aint1[l].length == aint[l].length) - for (int i1 = 0; i1 < aint[l].length; ++i1) { - int j1 = aint[l][i1]; - int k1 = aint1[l][i1]; - int l1 = (int) (((j1 & 16711680) >> 16) * d0 + ((k1 & 16711680) >> 16) * (1.0D - d0)); - int i2 = (int) (((j1 & 65280) >> 8) * d0 + ((k1 & 65280) >> 8) * (1.0D - d0)); - int j2 = (int) ((j1 & 255) * d0 + (k1 & 255) * (1.0D - d0)); - interpolatedFrameData[l][i1] = j1 & -16777216 | l1 << 16 | i2 << 8 | j2; - } - } - - TextureUtil.uploadTextureMipmap(interpolatedFrameData, width, height, originX, originY, false, false); - } - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 0d88405af..f5ab174ef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -28,7 +28,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index b74754aaa..ab8739f30 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -14,7 +14,6 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -23,18 +22,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @@ -43,7 +36,6 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { setHardness(0.6F); setStepSound(soundTypeGrass); setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); - MinecraftForge.EVENT_BUS.register(this); } @Override @@ -51,26 +43,6 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { return false; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:enchantedSoil0"); - if(event.map.setTextureEntry("botania:enchantedSoil0", icon)) - blockIcon = icon; - - icon = new InterpolatedIcon("botania:enchantedSoil1"); - if(event.map.setTextureEntry("botania:enchantedSoil1", icon)) - iconSide = icon; - } - } - @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_); 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 0528e8024..3d33913b1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -16,31 +16,22 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { @@ -52,7 +43,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.PRISMARINE); - MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } @@ -96,16 +86,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { par3List.add(new ItemStack(par1, 1, i)); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:prismarine0"); - if(event.map.setTextureEntry("botania:prismarine0", icon)) - icons[0] = icon; - } - } - @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); 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 29021dcab..fe5f87d2a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -12,22 +12,15 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockShimmerrock extends BlockMod implements ILexiconable { @@ -37,17 +30,6 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.SHIMMERROCK); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerrock"); - if(event.map.setTextureEntry("botania:shimmerrock", icon)) - blockIcon = icon; - } } @Override 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 65b1d81a6..eb469f29c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -12,22 +12,15 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { @@ -36,17 +29,6 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:shimmerwoodPlanks"); - if(event.map.setTextureEntry("botania:shimmerwoodPlanks", icon)) - blockIcon = icon; - } } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index e916e1416..536421cb7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -10,31 +10,12 @@ */ package vazkii.botania.common.block.decor.panes; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.ModBlocks; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBifrostPane extends BlockModPane { public BlockBifrostPane() { super(ModBlocks.bifrostPerm); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new InterpolatedIcon("botania:bifrostPermPane"); - if(event.map.setTextureEntry("botania:bifrostPermPane", icon)) - iconTop = icon; - } } } From 9ea899bad5274c7aa3765fa91b5f2232a77e263a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 Nov 2015 20:54:09 -0600 Subject: [PATCH 053/935] Fix alf portal states, made the api compile now! --- .../api/internal/DummyMethodHandler.java | 8 +- .../api/internal/IInternalMethodHandler.java | 7 +- .../api/lexicon/multiblock/Multiblock.java | 9 +- .../multiblock/component/FlowerComponent.java | 3 +- .../botania/api/state/BotaniaStateProps.java | 3 + .../api/state/enums/AlfPortalState.java | 16 ++ .../botania/api/subtile/SubTileEntity.java | 5 +- .../api/subtile/SubTileGenerating.java | 9 +- .../api/subtile/signature/BasicSignature.java | 8 +- .../subtile/signature/SubTileSignature.java | 10 +- .../botania/api/wiki/SimpleWikiProvider.java | 2 +- .../core/handler/BaubleRenderHandler.java | 23 +-- .../handler/ContributorFancinessHandler.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 1 + .../botania/common/block/BlockAlfPortal.java | 14 +- .../subtile/generating/SubTileDaybloom.java | 3 +- .../subtile/generating/SubTileMunchdew.java | 4 +- .../common/block/tile/TileAlfPortal.java | 156 +++++++++--------- .../common/block/tile/TileEnchanter.java | 6 +- .../common/block/tile/TileTerraPlate.java | 2 +- .../core/handler/InternalMethodHandler.java | 6 +- .../common/entity/EntityDoppleganger.java | 4 +- 23 files changed, 173 insertions(+), 130 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index a37a96e99..759a053a1 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,6 +13,8 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -131,12 +133,12 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public IIcon getSubTileIconForName(String name) { - return Blocks.red_flower.getIcon(0, 0); + public TextureAtlasSprite getSubTileIconForName(String name) { + return null; //todo 1.8 return Blocks.red_flower.getIcon(0, 0); } @Override - public void registerBasicSignatureIcons(String name, IIconRegister register) { + public void registerBasicSignatureIcons(String name, TextureMap map) { // NO-OP } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 2fbd3604f..0c30bc3e4 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,6 +13,8 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -82,9 +84,10 @@ public interface IInternalMethodHandler { public String getStackSubTileKey(ItemStack stack); - public IIcon getSubTileIconForName(String name); + // todo 1.8 evaluate need for these two + public TextureAtlasSprite getSubTileIconForName(String name); - public void registerBasicSignatureIcons(String name, IIconRegister register); + public void registerBasicSignatureIcons(String name, TextureMap map); public boolean shouldForceCheck(); diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 9cab8f69f..0f7669474 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -13,6 +13,7 @@ package vazkii.botania.api.lexicon.multiblock; import java.util.*; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -39,10 +40,10 @@ public class Multiblock { * coords should be pivoted to the center of the structure. */ public void addComponent(MultiblockComponent component) { - if(getComponentForLocation(component.relPos) != null) + if(getComponentForLocation(component.getRelativePosition()) != null) throw new IllegalArgumentException("Location in multiblock already occupied"); components.add(component); - changeAxisForNewComponent(component.relPos); + changeAxisForNewComponent(component.getRelativePosition()); calculateCostForNewComponent(component); addComponentToLocationCache(component); } @@ -51,8 +52,8 @@ public class Multiblock { * Constructs and adds a multiblock component to this multiblock. The x y z * coords should be pivoted to the center of the structure. */ - public void addComponent(BlockPos pos, Block block, int meta) { - addComponent(new MultiblockComponent(pos, block, meta)); + public void addComponent(BlockPos pos, IBlockState state) { + addComponent(new MultiblockComponent(pos, state)); } private void changeAxisForNewComponent(BlockPos pos) { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 1682ee5f4..02a7e1e28 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.state.BotaniaStateProps; /** * A multiblock component that matches any botania flower. @@ -21,7 +22,7 @@ import vazkii.botania.api.BotaniaAPI; public class FlowerComponent extends ColorSwitchingComponent { public FlowerComponent(BlockPos relPos, Block block) { - super(relPos, block); + super(relPos, block, BotaniaStateProps.COLOR); } @Override diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index b204fd119..f367c2824 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -63,6 +63,9 @@ public class BotaniaStateProps { } }); + // BlockAlfPortal + public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java new file mode 100644 index 000000000..8851a319b --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AlfPortalState implements IStringSerializable { + OFF, + ON_Z, + ON_X; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 2c61452ba..9f9c0c2f0 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -95,8 +96,8 @@ public class SubTileEntity { /** * Gets the icon for this SubTileEntity, this is a block icon. */ - @SideOnly(Side.CLIENT) - public IIcon getIcon() { + @SideOnly(Side.CLIENT) // todo 1.8 reevaluate need + public TextureAtlasSprite getIcon() { return BotaniaAPI.internalHandler.getSubTileIconForName(getUnlocalizedName()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index e36ede16c..1cdf53fe2 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -183,8 +184,8 @@ public class SubTileGenerating extends SubTileEntity { } @Override - public ArrayList getDrops(ArrayList list) { - ArrayList drops = super.getDrops(list); + public List getDrops(List list) { + List drops = super.getDrops(list); if(isPassiveFlower()) populateDropStackNBTs(drops); return drops; @@ -203,8 +204,8 @@ public class SubTileGenerating extends SubTileEntity { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, entity, stack); if(isPassiveFlower()) { NBTTagCompound cmp = stack.getTagCompound(); passiveDecayTicks = cmp.getInteger(TAG_PASSIVE_DECAY_TICKS); diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index a17938739..ea885bc65 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -10,9 +10,9 @@ */ package vazkii.botania.api.subtile.signature; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.api.BotaniaAPI; /** @@ -27,12 +27,12 @@ public class BasicSignature extends SubTileSignature { } @Override - public void registerIcons(IIconRegister register) { + public void registerIcons(TextureMap register) { BotaniaAPI.internalHandler.registerBasicSignatureIcons(name, register); } @Override - public IIcon getIconForStack(ItemStack stack) { + public TextureAtlasSprite getIconForStack(ItemStack stack) { return BotaniaAPI.internalHandler.getSubTileIconForName(name); } diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 65fac2265..1128b0602 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -12,10 +12,10 @@ package vazkii.botania.api.subtile.signature; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; /** * A singleton instance for a SubTileEntity, this is called for a few methods. @@ -27,12 +27,12 @@ public abstract class SubTileSignature { /** * Equivalent to Block.registerBlockIcons. */ - public abstract void registerIcons(IIconRegister register); - + public abstract void registerIcons(TextureMap map); + // todo 1.8 evaluate need for these two /** * Gets the icon to display for the flower item. */ - public abstract IIcon getIconForStack(ItemStack stack); + public abstract TextureAtlasSprite getIconForStack(ItemStack stack); /** * Gets the display name for the flower item. diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index a4b7c7879..d01519249 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -53,7 +53,7 @@ public class SimpleWikiProvider implements IWikiProvider { if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, bPos); + ItemStack stack = block.getPickBlock(pos, world, bPos, null); if(stack == null || stack.getItem() == null) stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos))); 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 ad0a974ef..e707f8455 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -126,17 +126,18 @@ public final class BaubleRenderHandler { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - for(int j = 0; j < 2; j++) { - IIcon icon = item.getIcon(stack, j); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - - Color color = new Color(item.getColorFromItemStack(stack, 1)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - } + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// for(int j = 0; j < 2; j++) { +// IIcon icon = item.getIcon(stack, j); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// +// Color color = new Color(item.getColorFromItemStack(stack, 1)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// } GlStateManager.popMatrix(); if(renderedOne) 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 049c24e43..ef9d02f7f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -79,7 +79,7 @@ public final class ContributorFancinessHandler { int i = Integer.parseInt(value); if(i < 0 || i >= 16) throw new NumberFormatException(); - flowerMap.put(key, ModBlocks.flower.(0, i)); + flowerMap.put(key, new ItemStack(ModBlocks.flower, 1, i)); } catch(NumberFormatException e) { SubTileSignature sig = BotaniaAPI.getSignatureForName(value); if(sig != null) 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 e80872cc2..e9567bab6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -37,7 +37,7 @@ public class MultiblockBlockAccess implements IBlockAccess { public IBlockState getBlockState(BlockPos pos) { MultiblockComponent comp=getComponent(pos); if(comp != null) - return comp.getBlock().getStateFromMeta(comp.getMeta()); + return comp.getBlockState(); if(hasBlockAccess) return originalBlockAccess.getBlockState(pos); return Blocks.air.getDefaultState(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 6e762822b..21bedd7fc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 64e08d79e..c4f566246 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; @@ -43,7 +44,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); MinecraftForge.EVENT_BUS.register(this); } @@ -54,17 +55,20 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + return new BlockState(this, BotaniaStateProps.ALFPORTAL_STATE); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); + if (meta > AlfPortalState.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.values()[meta]); } @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return ((AlfPortalState) state.getValue(BotaniaStateProps.ALFPORTAL_STATE)).ordinal(); } @Override @@ -87,7 +91,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - return ((Boolean) world.getBlockState(pos).getValue(BotaniaStateProps.POWERED)) ? 0 : 15; + return ((AlfPortalState) world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE)) == AlfPortalState.OFF ? 0 : 15; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index b119d0463..b488566d0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.generating; import java.awt.Color; import java.util.ArrayList; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -57,7 +58,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { } @Override - public ArrayList getDrops(ArrayList list) { + public List getDrops(List list) { if(isPrime()) list.clear(); 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 eaa97791a..ba6c14022 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 @@ -120,8 +120,8 @@ public class SubTileMunchdew extends SubTileGenerating { } @Override - public ArrayList getDrops(ArrayList list) { - ArrayList drops = super.getDrops(list); + public List getDrops(List list) { + List drops = super.getDrops(list); if(cooldown > 0) ItemNBTHelper.setInt(drops.get(0), TAG_COOLDOWN, cooldown); return drops; 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 28453ebb3..68c29a7bd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -21,6 +22,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -29,6 +31,10 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; +import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; @@ -40,24 +46,28 @@ import com.google.common.base.Function; public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { - private static final int[][] LIVINGWOOD_POSITIONS = { - { -1, 0, 0}, { 1, 0, 0}, { -2, 1, 0}, { 2, 1, 0}, { -2, 3, 0}, { 2, 3, 0}, { -1, 4, 0}, { 1, 4, 0} + private static final BlockPos[] LIVINGWOOD_POSITIONS = { + new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(-2, 1, 0), + new BlockPos(2, 1, 0), new BlockPos(-2, 3, 0), new BlockPos(2, 3, 0), + new BlockPos(-1, 4, 0), new BlockPos(1, 4, 0) }; - private static final int[][] GLIMMERING_LIVINGWOOD_POSITIONS = { - { -2, 2, 0 }, { 2, 2, 0 }, { 0, 4, 0 } + private static final BlockPos[] GLIMMERING_LIVINGWOOD_POSITIONS = { + new BlockPos(-2, 2, 0), new BlockPos(2, 2, 0), new BlockPos(0, 4, 0) }; - private static final int[][] PYLON_POSITIONS = { - { -3, 1, 3 }, { 3, 1, 3 } + private static final BlockPos[] PYLON_POSITIONS = { + new BlockPos(-3, 1, 3), new BlockPos(3, 1, 3) }; - private static final int[][] POOL_POSITIONS = { - { -3, 0, 3 }, { 3, 0, 3 } + private static final BlockPos[] POOL_POSITIONS = { + new BlockPos(-3, 0, 3), new BlockPos(3, 0, 3) }; - private static final int[][] AIR_POSITIONS = { - { -1, 1, 0 }, { 0, 1, 0 }, { 1, 1, 0 }, { -1, 2, 0 }, { 0, 2, 0 }, { 1, 2, 0 }, { -1, 3, 0 }, { 0, 3, 0 }, { 1, 3, 0 } + private static final BlockPos[] AIR_POSITIONS = { + new BlockPos(-1, 1, 0), new BlockPos(0, 1, 0), new BlockPos(1, 1, 0), + new BlockPos(-1, 2, 0), new BlockPos(0, 2, 0), new BlockPos(1, 2, 0), + new BlockPos(-1, 3, 0), new BlockPos(0, 3, 0), new BlockPos(1, 3, 0) }; private static final String TAG_TICKS_OPEN = "ticksOpen"; @@ -73,10 +83,10 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { private boolean closeNow = false; private boolean hasUnloadedParts = false; - private static final Function CONVERTER_X_Z = new Function() { + private static final Function CONVERTER_X_Z = new Function() { @Override - public int[] apply(int[] input) { - return new int[] { input[2], input[1], input[0] }; + public BlockPos apply(BlockPos input) { + return new BlockPos(input.getZ(), input.getY(), input.getX()); } }; @@ -87,39 +97,39 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { } }; - private static final Function CONVERTER_Z_SWAP = new Function() { + private static final Function CONVERTER_Z_SWAP = new Function() { @Override - public int[] apply(int[] input) { - return new int[] { input[0], input[1], -input[2] }; + public BlockPos apply(BlockPos input) { + return new BlockPos(input.getX(), input.getY(), -input.getZ()); } }; public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); - for(int[] l : LIVINGWOOD_POSITIONS) - mb.addComponent(, l[0], ModBlocks.livingwood, 0); - for(int[] g : GLIMMERING_LIVINGWOOD_POSITIONS) - mb.addComponent(, g[0], ModBlocks.livingwood, 5); - for(int[] p : PYLON_POSITIONS) - mb.addComponent(, -p[0], ModBlocks.pylon, 1); - for(int[] p : POOL_POSITIONS) - mb.addComponent(, -p[0], ModBlocks.pool, 0); + for(BlockPos l : LIVINGWOOD_POSITIONS) + mb.addComponent(l.up(), ModBlocks.livingwood, 0); + for(BlockPos g : GLIMMERING_LIVINGWOOD_POSITIONS) + mb.addComponent(g.up(), ModBlocks.livingwood, 5); + for(BlockPos p : PYLON_POSITIONS) + mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon, 1); + for(BlockPos p : POOL_POSITIONS) + mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool, 0); - mb.addComponent(, 0, ModBlocks.alfPortal, 0); - mb.setRenderOffset(0, -1, 0); + mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal, 0); + mb.setRenderOffset(new BlockPos(0, -1, 0)); return mb.makeSet(); } @Override public void update() { - int meta = getBlockMetadata(); - if(meta == 0) { + AlfPortalState state = ((AlfPortalState) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE)); + if(state == AlfPortalState.OFF) { ticksOpen = 0; return; } - int newMeta = getValidMetadata(); + AlfPortalState newState = getValidState(); if(!hasUnloadedParts) { ticksOpen++; @@ -132,7 +142,7 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { if(ticksOpen > 60) { ticksSinceLastItem++; if(ConfigHandler.elfPortalParticlesEnabled) - blockParticle(meta); + blockParticle(state); List items = worldObj.getEntitiesWithinAABB(EntityItem.class, aabb); if(!worldObj.isRemote) @@ -156,26 +166,26 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { } else closeNow = false; if(closeNow) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2); + worldObj.setBlockState(getPos(), ModBlocks.alfPortal.getDefaultState(), 1 | 2); for(int i = 0; i < 36; i++) - blockParticle(meta); + blockParticle(state); closeNow = false; - } else if(newMeta != meta) { - if(newMeta == 0) + } else if(newState != state) { + if(newState == AlfPortalState.OFF) for(int i = 0; i < 36; i++) - blockParticle(meta); - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + blockParticle(state); + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); } hasUnloadedParts = false; } - private void blockParticle(int meta) { + private void blockParticle(AlfPortalState state) { int i = worldObj.rand.nextInt(AIR_POSITIONS.length); double[] pos = new double[] { - AIR_POSITIONS[i][0] + 0.5F, AIR_POSITIONS[i][1] + 0.5F, AIR_POSITIONS[i][2] + 0.5F + AIR_POSITIONS[i].getX() + 0.5F, AIR_POSITIONS[i].getY() + 0.5F, AIR_POSITIONS[i].getZ() + 0.5F }; - if(meta == 2) + if(state == AlfPortalState.ON_X) pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; @@ -183,11 +193,11 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { } public boolean onWanded() { - int meta = getBlockMetadata(); - if(meta == 0) { - int newMeta = getValidMetadata(); - if(newMeta != 0) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + AlfPortalState state = ((AlfPortalState) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE)); + if(state == AlfPortalState.OFF) { + AlfPortalState newState = getValidState(); + if(newState != AlfPortalState.OFF) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); return true; } } @@ -278,55 +288,55 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { ticksSinceLastItem = cmp.getInteger(TAG_TICKS_SINCE_LAST_ITEM); } - private int getValidMetadata() { + private AlfPortalState getValidState() { if(checkConverter(null)) - return 1; + return AlfPortalState.ON_Z; if(checkConverter(CONVERTER_X_Z)) - return 2; + return AlfPortalState.ON_X; - return 0; + return AlfPortalState.OFF; } - private boolean checkConverter(Function baseConverter) { + private boolean checkConverter(Function baseConverter) { return checkMultipleConverters(baseConverter) || checkMultipleConverters(CONVERTER_Z_SWAP, baseConverter); } - private boolean checkMultipleConverters(Function... converters) { - if(!check2DArray(AIR_POSITIONS, Blocks.air, -1, converters)) + private boolean checkMultipleConverters(Function... converters) { + if(!check2DArray(AIR_POSITIONS, Blocks.air.getDefaultState(), true, converters)) return false; - if(!check2DArray(LIVINGWOOD_POSITIONS, ModBlocks.livingwood, 0, converters)) + if(!check2DArray(LIVINGWOOD_POSITIONS, ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT), false, converters)) return false; - if(!check2DArray(GLIMMERING_LIVINGWOOD_POSITIONS, ModBlocks.livingwood, 5, converters)) + if(!check2DArray(GLIMMERING_LIVINGWOOD_POSITIONS, ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.GLIMMERING), false, converters)) return false; - if(!check2DArray(PYLON_POSITIONS, ModBlocks.pylon, 1, converters)) + if(!check2DArray(PYLON_POSITIONS, ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA), false, converters)) return false; - if(!check2DArray(POOL_POSITIONS, ModBlocks.pool, -1, converters)) + if(!check2DArray(POOL_POSITIONS, ModBlocks.pool.getDefaultState(), true, converters)) return false; lightPylons(converters); return true; } - private void lightPylons(Function... converters) { + private void lightPylons(Function... converters) { if(ticksOpen < 50) return; int cost = ticksOpen == 50 ? 75000 : 2; - for(int[] pos : PYLON_POSITIONS) { - for(Function f : converters) + for(BlockPos pos : PYLON_POSITIONS) { + for(Function f : converters) if(f != null) pos = f.apply(pos); - TileEntity tile = worldObj.getTileEntity(xCoord + pos[0], yCoord + pos[1], zCoord + pos[2]); + TileEntity tile = worldObj.getTileEntity(getPos().add(pos)); if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; pylon.centerPos = getPos(); } - tile = worldObj.getTileEntity(xCoord + pos[0], yCoord + pos[1] - 1, zCoord + pos[2]); + tile = worldObj.getTileEntity(getPos().add(pos).down()); if(tile instanceof TilePool) { TilePool pool = (TilePool) tile; if(pool.getCurrentMana() < cost) @@ -337,35 +347,31 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { } } - private boolean check2DArray(int[][] positions, Block block, int meta, Function... converters) { - for(int[] pos : positions) { - for(Function f : converters) + private boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function... converters) { + for(BlockPos pos : positions) { + for(Function f : converters) if(f != null) pos = f.apply(pos); - if(!checkPosition(pos, block, meta)) + if(!checkPosition(pos, state, onlyCheckBlock)) return false; } return true; } - private boolean checkPosition(int[] pos, Block block, int meta) { - int x = xCoord + pos[0]; - int y = yCoord + pos[1]; - int z = zCoord + pos[2]; - if(!worldObj.blockExists(x, y, z)) { + private boolean checkPosition(BlockPos pos, IBlockState state, boolean onlyCheckBlock) { + BlockPos pos_ = getPos().add(pos); + if(!worldObj.isBlockLoaded(pos_)) { hasUnloadedParts = true; return true; // Don't fuck everything up if there's a chunk unload } - Block blockat = worldObj.getBlock(x, y, z); - if(block == Blocks.air ? blockat.isAir(worldObj, x, y, z) : blockat == block) { - if(meta == -1) - return true; + IBlockState stateat = worldObj.getBlockState(pos_); + Block blockat = stateat.getBlock(); - int metaat = worldObj.getBlockMetadata(x, y, z); - return meta == metaat; + if(state.getBlock() == Blocks.air ? blockat.isAir(worldObj, pos_) : blockat == state.getBlock()) { + return onlyCheckBlock || stateat == state; } return false; 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 9c502602e..21451e8be 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -94,13 +94,13 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP Multiblock mb = new Multiblock(); for(BlockPos o : OBSIDIAN_LOCATIONS) - mb.addComponent(o, Blocks.obsidian, 0); + mb.addComponent(o.up(), Blocks.obsidian, 0); for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) { - mb.addComponent(p, ModBlocks.pylon, 0); + mb.addComponent(p.up(), ModBlocks.pylon, 0); mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); } for(BlockPos f : FLOWER_LOCATIONS) - mb.addComponent(new FlowerComponent(f, ModBlocks.flower)); + mb.addComponent(new FlowerComponent(f.up(), ModBlocks.flower)); mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block, 0); 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 98c3ec3b3..ec9cb1167 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -61,7 +61,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdate mb.addComponent(relativePos, ModBlocks.livingrock, 0); mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.terraPlate, 0); - mb.setRenderOffset(0, 1, 0); + mb.setRenderOffset(new BlockPos(0, 1, 0)); return mb.makeSet(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index d57e8ddc2..affef4d54 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -15,6 +15,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -95,13 +97,13 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public IIcon getSubTileIconForName(String name) { + public TextureAtlasSprite getSubTileIconForName(String name) { IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; } @Override - public void registerBasicSignatureIcons(String name, IIconRegister register) { + public void registerBasicSignatureIcons(String name, TextureMap map) { IIcon normal = IconHelper.forName(register, name); IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); BlockSpecialFlower.icons.put(name, normal); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 1a56f3445..f4d9d7b74 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -124,14 +124,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Multiblock mb = new Multiblock(); for(BlockPos p : PYLON_LOCATIONS) - mb.addComponent(p, ModBlocks.pylon, 2); + mb.addComponent(p.up(), ModBlocks.pylon, 2); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) mb.addComponent(new BeaconComponent(new BlockPos(i - 1, 0, j - 1))); mb.addComponent(new BlockPos(0, 1, 0), Blocks.beacon, 0); - mb.setRenderOffset(0, -1, 0); + mb.setRenderOffset(new BlockPos(0, -1, 0)); return mb.makeSet(); } From f58440b79a83c55cdd44c2703966f542134040e6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 12:59:22 -0600 Subject: [PATCH 054/935] Misc cleanups and fixes. All magic flowers compile now! --- .../botania/api/recipe/RecipePureDaisy.java | 25 +++++------ .../botania/common/block/BlockAltGrass.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/ModBlocks.java | 5 ++- .../block/decor/panes/BlockModPane.java | 5 --- .../block/decor/slabs/BlockLivingSlab.java | 7 ---- .../block/mana/BlockAlchemyCatalyst.java | 16 +++++-- .../botania/common/block/mana/BlockPrism.java | 10 +++-- .../common/block/mana/BlockRuneAltar.java | 5 --- .../block/subtile/SubTilePureDaisy.java | 18 ++++---- .../subtile/functional/SubTileHopperhock.java | 1 + .../functional/SubTileJadedAmaranthus.java | 10 +++-- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 1 + .../generating/SubTileDandelifeon.java | 37 +++++++--------- .../subtile/generating/SubTileDaybloom.java | 35 ++++++++-------- .../subtile/generating/SubTileEndoflame.java | 2 +- .../generating/SubTileHydroangeas.java | 42 +++++++++---------- .../subtile/generating/SubTileMunchdew.java | 4 +- .../subtile/generating/SubTileRafflowsia.java | 10 +++-- .../subtile/generating/SubTileSpectrolus.java | 1 + 21 files changed, 117 insertions(+), 123 deletions(-) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index aa9170360..568296e76 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -26,13 +27,11 @@ public class RecipePureDaisy { private static final Map> oreMap = new HashMap(); Object input; - Block output; - int outputMeta; + IBlockState outputState; - public RecipePureDaisy(Object input, Block output, int outputMeta) { + public RecipePureDaisy(Object input, IBlockState state) { this.input = input; - this.output = output; - this.outputMeta = outputMeta; + this.outputState = state; if(input != null && !(input instanceof String || input instanceof Block)) throw new IllegalArgumentException("input must be an oredict String or a Block."); @@ -41,11 +40,11 @@ public class RecipePureDaisy { /** * This gets called every tick, please be careful with your checks. */ - public boolean matches(World world, int x, int y, int z, SubTileEntity pureDaisy, Block block, int meta) { + public boolean matches(World world, BlockPos pos, SubTileEntity pureDaisy, IBlockState state) { if(input instanceof Block) - return block == input; + return state.getBlock() == input; - ItemStack stack = new ItemStack(block, 1, meta); + ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); String oredict = (String) input; return isOreDict(stack, oredict); } @@ -81,7 +80,7 @@ public class RecipePureDaisy { */ public boolean set(World world, BlockPos pos, SubTileEntity pureDaisy) { if(!world.isRemote) - world.setBlockState(pos, output.getStateFromMeta(outputMeta), 1 | 2); // todo 1.8 - should this remain meta? + world.setBlockState(pos, outputState, 1 | 2); return true; } @@ -89,12 +88,8 @@ public class RecipePureDaisy { return input; } - public Block getOutput() { - return output; - } - - public int getOutputMeta() { - return outputMeta; + public IBlockState getOutputState() { + return outputState; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 92e957001..c5534f566 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -43,7 +43,7 @@ public class BlockAltGrass extends BlockMod { setStepSound(soundTypeGrass); setUnlocalizedName(LibBlockNames.ALT_GRASS); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); - setTickRandomly(true) + setTickRandomly(true); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c3a048b3e..48d64d2b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -108,7 +108,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; IBlockState state = world.getBlockState(pos); - return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock(), state.getBlock().getMetaFromState(state), name); + return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ebe241ca7..780e94a3a 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; @@ -398,8 +399,8 @@ public final class ModBlocks { OreDictionary.registerOre("chestWood", Blocks.chest); OreDictionary.registerOre("craftingTableWood", Blocks.crafting_table); - BotaniaAPI.registerPaintableBlock(unstableBlock); - BotaniaAPI.registerPaintableBlock(manaBeacon); + BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); + BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); initTileEntities(); } 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 d9103f076..5e3c78f87 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 @@ -54,11 +54,6 @@ public class BlockModPane extends BlockPane { return 18; } - @Override - public int getRenderBlockPass() { - return 1; - } - @Override public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { Block block = world.getBlockState(pos).getBlock(); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 4a113f588..47c5e51e3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -1,7 +1,6 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.Block; -import net.minecraft.util.IIcon; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,10 +16,4 @@ public abstract class BlockLivingSlab extends BlockModSlab { this.meta = meta; } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - return source.getIcon(par1, meta); - } - } 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 e5edb7562..f4cfb899b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -12,22 +12,26 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { + TextureAtlasSprite overlay; + public BlockAlchemyCatalyst() { this(LibBlockNames.ALCHEMY_CATALYST); } @@ -38,6 +42,12 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo setResistance(10.0F); setStepSound(Block.soundTypeStone); setUnlocalizedName(name); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Pre evt) { + overlay = IconHelper.forBlock(evt.map, this, 3); } @Override @@ -47,7 +57,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo @Override public TextureAtlasSprite getIcon(World world, BlockPos pos) { - return icons[3]; + return overlay; } } 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 f976c3497..43605b8ac 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -16,7 +16,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,8 +24,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -77,8 +78,9 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public int getRenderBlockPass() { - return 1; + @SideOnly(Side.CLIENT) + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 } @Override 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 3cdd85795..9353e8449 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -123,11 +123,6 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan super.breakBlock(par1World, pos, state); } - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileRuneAltar(); 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 b542b71f5..76b4ea7a4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -55,11 +56,10 @@ public class SubTilePureDaisy extends SubTileEntity { BlockPos coords = supertile.getPos().add(acoords); World world = supertile.getWorld(); if(!world.isAirBlock(coords)) { - Block block = world.getBlockState(coords).getBlock(); - int meta = world.getBlockMetadata(coords.posX, coords.posY, coords.posZ); + IBlockState state = world.getBlockState(coords); RecipePureDaisy recipe = null; for(RecipePureDaisy recipe_ : BotaniaAPI.pureDaisyRecipes) - if(recipe_.matches(world, coords.posX, coords.posY, coords.posZ, this, block, meta)) { + if(recipe_.matches(world, coords, this, state)) { recipe = recipe_; break; } @@ -68,21 +68,21 @@ public class SubTilePureDaisy extends SubTileEntity { if(recipe != null) { ticksRemaining[positionAt] = ticksRemaining[positionAt] - 1; - Botania.proxy.sparkleFX(supertile.getWorld(), coords.posX + Math.random(), coords.posY + Math.random(), coords.posZ + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); + Botania.proxy.sparkleFX(supertile.getWorld(), coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); if(ticksRemaining[positionAt] <= 0) { ticksRemaining[positionAt] = 200; - if(recipe.set(world,coords.posX, coords.posY, coords.posZ, this)) { + if(recipe.set(world,coords, this)) { for(int i = 0; i < 25; i++) { - double x = coords.posX + Math.random(); - double y = coords.posY + Math.random() + 0.5; - double z = coords.posZ + Math.random(); + double x = coords.getX() + Math.random(); + double y = coords.getY() + Math.random() + 0.5; + double z = coords.getZ() + Math.random(); Botania.proxy.wispFX(supertile.getWorld(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); } if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(recipe.getOutput()) + (recipe.getOutputMeta() << 12)); + supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(recipe.getOutputState())); } } } else ticksRemaining[positionAt] = 200; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 065399904..236a407cf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; 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 acd500a6a..0914372e0 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 @@ -12,8 +12,11 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; @@ -42,11 +45,12 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { for(int i = 0; i < RANGE * 2; i++) { Block blockAbove = supertile.getWorld().getBlockState(pos.up()).getBlock(); if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { - int color = supertile.getWorld().rand.nextInt(16); + EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); if(ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { + IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, pos.up(), Block.getIdFromBlock(ModBlocks.flower) + (color << 12)); - supertile.getWorld().setBlockState(pos.up(), ModBlocks.flower, color, 1 | 2); + supertile.getWorld().playAuxSFX(2001, pos.up(), Block.getStateId(state)); + supertile.getWorld().setBlockState(pos.up(), state, 1 | 2); } mana -= COST; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 27206d95d..9c7ef285b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -55,7 +55,7 @@ public class SubTilePollidisiac extends SubTileFunctional { mana -= manaCost; ReflectionHelper.setPrivateValue(EntityAnimal.class, animal, 1200, LibObfuscation.IN_LOVE); - animal.setTarget(null); + // todo 1.8 new AI animal.setTarget(null); supertile.getWorld().setEntityState(animal, (byte)18); } } 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 2f6184ac8..ec3ecf1c5 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 @@ -17,6 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 6ab61fc6c..032c41316 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -85,20 +86,17 @@ public class SubTileDandelifeon extends SubTileGenerating { } } - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + BlockPos pos = supertile.getPos(); for(int[] change : changes) { - int px = x - RANGE + change[0]; - int pz = z - RANGE + change[1]; + BlockPos pos_ = pos.add(-RANGE + change[0], 0, -RANGE + change[1]); int val = change[2]; if(val != -2 && wipe) val = -1; int old = change[3]; - setBlockForGeneration(px, y, pz, val, old); + setBlockForGeneration(pos_, val, old); } } @@ -106,22 +104,19 @@ public class SubTileDandelifeon extends SubTileGenerating { int diam = RANGE * 2 + 1; int[][] table = new int[diam][diam]; - int x = supertile.xCoord; - int y = supertile.yCoord; - int z = supertile.zCoord; + BlockPos pos = supertile.getPos(); for(int i = 0; i < diam; i++) for(int j = 0; j < diam; j++) { - int px = x - RANGE + i; - int pz = z - RANGE + j; - table[i][j] = getCellGeneration(px, y, pz); + BlockPos pos_ = pos.add(-RANGE + i, 0, -RANGE + j); + table[i][j] = getCellGeneration(pos_); } return table; } - int getCellGeneration(int x, int y, int z) { - TileEntity tile = supertile.getWorld().getTileEntity(x, y, z); + int getCellGeneration(BlockPos pos) { + TileEntity tile = supertile.getWorld().getTileEntity(pos); if(tile instanceof TileCell) return ((TileCell) tile).isSameFlower(supertile) ? ((TileCell) tile).getGeneration() : 0; @@ -162,21 +157,21 @@ public class SubTileDandelifeon extends SubTileGenerating { return x < 0 || z < 0 || x >= table.length || z >= table[0].length; } - void setBlockForGeneration(int x, int y, int z, int gen, int prevGen) { + void setBlockForGeneration(BlockPos pos, int gen, int prevGen) { World world = supertile.getWorld(); - Block blockAt = world.getBlock(x, y, z); - TileEntity tile = world.getTileEntity(x, y, z); + Block blockAt = world.getBlockState(pos).getBlock(); + TileEntity tile = world.getTileEntity(pos); if(gen == -2) { int val = prevGen * MANA_PER_GEN; mana = Math.min(getMaxMana(), mana + val); //world.setBlockToAir(x, y, z); } else if(blockAt == ModBlocks.cellBlock) { if(gen < 0 || gen > MAX_GENERATIONS) - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); else ((TileCell) tile).setGeneration(supertile, gen); - } else if(gen >= 0 && blockAt.isAir(supertile.getWorld(), x, y, z)) { - world.setBlock(x, y, z, ModBlocks.cellBlock); - tile = world.getTileEntity(x, y, z); + } else if(gen >= 0 && blockAt.isAir(supertile.getWorld(), pos)) { + world.setBlockState(pos, ModBlocks.cellBlock.getDefaultState()); + tile = world.getTileEntity(pos); ((TileCell) tile).setGeneration(supertile, gen); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index b488566d0..3c0efbd82 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.common.Botania; @@ -32,7 +32,6 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { private static final String TAG_PRIME_POSITION_Z = "primePositionZ"; private static final String TAG_SAVED_POSITION = "savedPosition"; - int primePositionX, primePositionY, primePositionZ; BlockPos primePosition; boolean savedPosition; @@ -45,14 +44,12 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { public void onUpdate() { super.onUpdate(); - if(isPrime() && (!savedPosition || primePositionX != supertile.xCoord || primePositionY != supertile.yCoord || primePositionZ != supertile.zCoord)) - supertile.getWorld().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + if(isPrime() && (!savedPosition || !supertile.getPos().equals(primePosition))) + supertile.getWorld().setBlockToAir(supertile.getPos()); } public void setPrimusPosition() { - primePositionX = supertile.xCoord; - primePositionY = supertile.yCoord; - primePositionZ = supertile.zCoord; + primePosition = supertile.getPos(); savedPosition = true; } @@ -67,8 +64,8 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getWorldChunkManager().getBiomeGenAt(supertile.xCoord, supertile.zCoord).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); - return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeTheSky(supertile.xCoord, supertile.yCoord + 1, supertile.zCoord); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } @Override @@ -78,8 +75,8 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { public int getSurroundingFlowers() { int flowers = 0; - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { - TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = supertile.getWorld().getTileEntity(supertile.getPos().offset(dir)); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer flower = (ISubTileContainer) tile; if(flower.getSubTile() != null && flower.getSubTile().getClass() == getClass()) { @@ -92,7 +89,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { float m = 0.045F; if(ticksExisted % 10 == 0) - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, dir.offsetX * m, dir.offsetY * m, dir.offsetZ * m); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.5, supertile.getPos().getY() + 0.05, supertile.getPos().getZ() + 0.5, r, g, b, 0.1F, dir.getFrontOffsetX() * m, dir.getFrontOffsetY() * m, dir.getFrontOffsetZ() * m); } } } @@ -105,9 +102,9 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { super.writeToPacketNBT(cmp); if(isPrime()) { - cmp.setInteger(TAG_PRIME_POSITION_X, primePositionX); - cmp.setInteger(TAG_PRIME_POSITION_Y, primePositionY); - cmp.setInteger(TAG_PRIME_POSITION_Z, primePositionZ); + cmp.setInteger(TAG_PRIME_POSITION_X, primePosition.getX()); + cmp.setInteger(TAG_PRIME_POSITION_Y, primePosition.getY()); + cmp.setInteger(TAG_PRIME_POSITION_Z, primePosition.getZ()); cmp.setBoolean(TAG_SAVED_POSITION, savedPosition); } } @@ -117,9 +114,11 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { super.readFromPacketNBT(cmp); if(isPrime()) { - primePositionX = cmp.getInteger(TAG_PRIME_POSITION_X); - primePositionY = cmp.getInteger(TAG_PRIME_POSITION_Y); - primePositionZ = cmp.getInteger(TAG_PRIME_POSITION_Z); + primePosition = new BlockPos( + cmp.getInteger(TAG_PRIME_POSITION_X), + cmp.getInteger(TAG_PRIME_POSITION_Y), + cmp.getInteger(TAG_PRIME_POSITION_Z) + ); savedPosition = cmp.getBoolean(TAG_SAVED_POSITION); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index f80e702d7..300743a91 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -44,7 +44,7 @@ public class SubTileEndoflame extends SubTileGenerating { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { - if(item.age >= 59 && !item.isDead) { + if(item.getAge() >= 59 && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; 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 a2c76125c..fe487d7eb 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 @@ -16,13 +16,16 @@ import java.util.Collections; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -36,7 +39,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { private static final String TAG_BURN_TIME = "burnTime"; private static final String TAG_COOLDOWN = "cooldown"; - private static final int[][] OFFSETS = { { 0, 1 }, { 0, -1 }, { 1, 0 }, { -1, 0 }, { -1, 1 }, { -1, -1 }, { 1, 1 }, { 1, -1 } }; + private static final BlockPos[] OFFSETS = { new BlockPos(0, 0, 1), new BlockPos(0, 0, -1), new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), new BlockPos(-1, 0, 1), new BlockPos(-1, 0, -1), new BlockPos(1, 0, 1), new BlockPos(1, 0, -1) }; int burnTime, cooldown; @@ -47,33 +50,30 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { if(cooldown > 0) { cooldown--; for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.5 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); return; } if(burnTime == 0) { if(mana < getMaxMana() && !supertile.getWorld().isRemote) { - List offsets = Arrays.asList(OFFSETS); + List offsets = Arrays.asList(OFFSETS); Collections.shuffle(offsets); - for(int[] offsetArray : offsets) { - int[] positions = { - supertile.xCoord + offsetArray[0], - supertile.zCoord + offsetArray[1] - }; + for(BlockPos offset : offsets) { + BlockPos pos = supertile.getPos().add(offset); Material search = getMaterialToSearchFor(); - if(supertile.getWorld().getBlock(positions[0], supertile.yCoord, positions[1]).getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlock(positions[0], supertile.yCoord - 1, positions[1]) == getBlockToSearchBelow()) && supertile.getWorld().getBlockMetadata(positions[0], supertile.yCoord, positions[1]) == 0) { + if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && ((Integer) supertile.getWorld().getBlockState(pos).getValue(BlockLiquid.LEVEL))/* todo 1.8 may crash */ == 0) { if(search != Material.water) - supertile.getWorld().setBlockToAir(positions[0], supertile.yCoord, positions[1]); + supertile.getWorld().setBlockToAir(pos); else { int waterAround = 0; - for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorld().getBlock(positions[0] + dir.offsetX, supertile.yCoord, positions[1] + dir.offsetZ).getMaterial() == search) + for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) + if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock().getMaterial() == search) waterAround++; if(waterAround < 2) - supertile.getWorld().setBlockToAir(positions[0], supertile.yCoord, positions[1]); + supertile.getWorld().setBlockToAir(pos); } burnTime += getBurnTime(); @@ -96,8 +96,8 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { public int getSurroundingFlowers() { int flowers = 0; - for(int[] offsetArray : OFFSETS) { - TileEntity tile = supertile.getWorld().getTileEntity(supertile.xCoord + offsetArray[0], supertile.yCoord, supertile.zCoord + offsetArray[1]); + for(BlockPos offset : OFFSETS) { + TileEntity tile = supertile.getWorld().getTileEntity(supertile.getPos().add(offset)); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer flower = (ISubTileContainer) tile; if(flower.getSubTile() != null && flower.getSubTile().getClass() == getClass()) { @@ -110,7 +110,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { float m = 0.045F; if(ticksExisted % 10 == 0) - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.5, supertile.yCoord + 0.05, supertile.zCoord + 0.5, r, g, b, 0.1F, offsetArray[0] * m, 0, offsetArray[1] * m); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.5, supertile.getPos().getY() + 0.05, supertile.getPos().getZ() + 0.5, r, g, b, 0.1F, offset.getX() * m, 0, offset.getZ() * m); } } } @@ -119,7 +119,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorld(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); } public Material getMaterialToSearchFor() { @@ -131,7 +131,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void playSound() { - supertile.getWorld().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.drink", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.drink", 0.01F, 0.5F + (float) Math.random() * 0.5F); } public int getBurnTime() { @@ -186,8 +186,8 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, entity, stack); cooldown = ItemNBTHelper.getInt(stack, TAG_COOLDOWN, 0); } 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 ba6c14022..f4c15b83d 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 @@ -128,8 +128,8 @@ public class SubTileMunchdew extends SubTileGenerating { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, entity, stack); cooldown = ItemNBTHelper.getInt(stack, TAG_COOLDOWN, 0); } 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 92e327d3a..1c571f910 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -65,10 +66,11 @@ public class SubTileRafflowsia extends SubTileGenerating { float mod = 1F / lastFlowerTimes; - int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; + // todo 1.8 why is meta +1 'ed ?? int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; + IBlockState state = supertile.getWorld().getBlockState(pos); supertile.getWorld().setBlockToAir(pos); - supertile.getWorld().playAuxSFX(2001, pos, Block.getIdFromBlock(block) + (meta << 12)); + supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state)); this.mana += mana * mod; sync(); return; @@ -104,8 +106,8 @@ public class SubTileRafflowsia extends SubTileGenerating { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, entity, stack); lastFlower = ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, ""); lastFlowerTimes = ItemNBTHelper.getInt(stack, TAG_LAST_FLOWER_TIMES, 0); 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 a2e34b0b3..b3dcc7e2c 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 @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; From d0a14a451b3164827f1cca4347886a2221c45f84 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 15:06:03 -0600 Subject: [PATCH 055/935] More IIcon exorcisms, various compilation fixes now that we know states --- .../botania/api/item/IGrassHornExcempt.java | 3 +- .../botania/api/state/BotaniaStateProps.java | 3 + .../botania/api/state/enums/PoolVariant.java | 16 +++++ .../client/core/proxy/ClientProxy.java | 18 ++--- .../botania/client/gui/bag/GuiFlowerBag.java | 1 + .../botania/client/gui/box/GuiBaubleBox.java | 5 +- .../client/gui/box/InventoryBaubleBox.java | 36 ++++++++-- .../client/gui/crafting/GuiCraftingHalo.java | 1 + .../client/gui/lexicon/GuiLexicon.java | 1 + .../gui/lexicon/GuiLexiconChallenge.java | 3 +- .../lexicon/button/GuiButtonAchievement.java | 1 + .../gui/lexicon/button/GuiButtonBack.java | 1 + .../gui/lexicon/button/GuiButtonCategory.java | 1 + .../button/GuiButtonChallengeIcon.java | 1 + .../lexicon/button/GuiButtonChallenges.java | 1 + .../gui/lexicon/button/GuiButtonDoot.java | 1 + .../gui/lexicon/button/GuiButtonNotes.java | 1 + .../gui/lexicon/button/GuiButtonOptions.java | 1 + .../gui/lexicon/button/GuiButtonPage.java | 1 + .../gui/lexicon/button/GuiButtonShare.java | 1 + .../button/GuiButtonUpdateWarning.java | 1 + .../lexicon/button/GuiButtonViewOnline.java | 1 + .../botania/client/model/ModelBellows.java | 1 + .../botania/client/model/ModelBrewery.java | 1 + .../client/model/ModelSpinningCubes.java | 1 + .../render/entity/RenderThornChakram.java | 2 +- .../render/tile/RenderTileSpreader.java | 2 - .../render/tile/RenderTileTinyPotato.java | 2 - .../botania/common/block/BlockAltar.java | 5 -- .../botania/common/block/BlockAvatar.java | 5 -- .../botania/common/block/BlockBifrost.java | 17 ++--- .../common/block/BlockBifrostPerm.java | 9 ++- .../block/BlockFloatingSpecialFlower.java | 32 ++++----- .../common/block/BlockModDoubleFlower.java | 71 +++++++++++-------- .../botania/common/block/BlockModFlower.java | 10 +-- .../common/block/decor/BlockStarfield.java | 22 +++++- .../botania/common/block/mana/BlockPool.java | 22 ++++++ .../common/block/tile/TileAlfPortal.java | 10 +-- .../common/block/tile/TileBrewery.java | 8 ++- .../common/block/tile/TileEnchanter.java | 6 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/TileOpenCrate.java | 4 +- .../botania/common/block/tile/TilePylon.java | 27 ++++--- .../common/block/tile/TileStarfield.java | 13 ++-- .../common/block/tile/TileTerraPlate.java | 6 +- .../common/entity/EntityDoppleganger.java | 14 ++-- .../common/entity/EntityPinkWither.java | 16 ++--- .../botania/common/entity/EntityPixie.java | 66 ++++++++--------- .../botania/common/entity/EntityVineBall.java | 12 ++-- .../botania/common/item/ItemBaubleBox.java | 3 +- .../common/item/ItemCorporeaSpark.java | 23 +++--- .../botania/common/item/ItemCraftingHalo.java | 13 +--- .../botania/common/item/ItemFertilizer.java | 6 +- .../botania/common/item/ItemGrassHorn.java | 9 +-- .../botania/common/item/ItemGrassSeeds.java | 18 ++--- .../botania/common/item/ItemLaputaShard.java | 10 +-- .../botania/common/item/ItemManaCookie.java | 5 +- .../botania/common/item/ItemSextant.java | 14 +++- .../botania/common/item/ItemSlimeBottle.java | 15 +--- .../botania/common/item/ItemTwigWand.java | 18 +++-- .../armor/terrasteel/ItemTerrasteelHelm.java | 12 ++-- .../equipment/bauble/ItemBaubleCosmetic.java | 8 --- .../equipment/bauble/ItemBloodPendant.java | 17 +---- .../item/equipment/bauble/ItemDivaCharm.java | 3 +- .../equipment/bauble/ItemFlightTiara.java | 11 --- .../item/equipment/tool/ItemEnderDagger.java | 15 ---- .../equipment/tool/bow/ItemLivingwoodBow.java | 43 +++++------ .../tool/elementium/ItemElementiumAxe.java | 4 +- .../tool/elementium/ItemElementiumShears.java | 19 ++--- .../tool/elementium/ItemElementiumShovel.java | 3 +- .../tool/manasteel/ItemManasteelAxe.java | 7 -- .../tool/manasteel/ItemManasteelPick.java | 7 -- .../tool/manasteel/ItemManasteelShears.java | 12 ++-- .../tool/manasteel/ItemManasteelShovel.java | 7 -- .../tool/manasteel/ItemManasteelSword.java | 26 ++----- .../tool/terrasteel/ItemTerraAxe.java | 21 ------ .../tool/terrasteel/ItemTerraPick.java | 17 ----- .../botania/common/item/lens/ItemLens.java | 26 ++++--- .../common/item/relic/ItemInfiniteFruit.java | 8 +-- .../common/item/relic/ItemKingKey.java | 20 +++--- .../common/item/rod/ItemGravityRod.java | 6 +- .../common/lexicon/page/PageElvenRecipe.java | 3 +- 82 files changed, 426 insertions(+), 490 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/PoolVariant.java diff --git a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java index 601ad9113..8a6bbb438 100644 --- a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java +++ b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.item; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -20,6 +21,6 @@ import net.minecraft.world.World; @Deprecated public interface IGrassHornExcempt { - public boolean canUproot(World world, int x, int y, int z); + public boolean canUproot(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f367c2824..8bab6ce6d 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -109,6 +109,9 @@ public class BotaniaStateProps { // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + // BlockPool + public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); + // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java new file mode 100644 index 000000000..852cc2ba4 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PoolVariant implements IStringSerializable { + DEFAULT, + CREATIVE, + DILUTED; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} 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 da93655bf..a2e0ed39c 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -263,8 +263,8 @@ public class ClientProxy extends CommonProxy { // RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu()); // RenderingRegistry.registerBlockHandler(new RenderAvatar()); - IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); - IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); +// IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); +// IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); @@ -314,15 +314,15 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger()); + RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram()); + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark()); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart()); - RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither()); - RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm()); - RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon()); + RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager())); ShaderHelper.initShaders(); } @@ -417,7 +417,7 @@ public class ClientProxy extends CommonProxy { int xp = x + i - iradius; int zp = z + j - iradius; if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1)) - mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block, 0)); + mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); } MultiblockRenderHandler.setMultiblock(mb.makeSet()); diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 44b9eb0e2..b6efd239b 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -13,6 +13,7 @@ package vazkii.botania.client.gui.bag; import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 250c1086c..9c250e708 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.box; import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; @@ -35,7 +36,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer { @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(texture); int k = (width - xSize) / 2; int l = (height - ySize) / 2; @@ -47,7 +48,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer { drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); } - GuiInventory.func_147046_a(this.guiLeft + 43, this.guiTop + 61, 20, (float)(this.guiLeft + 43 - p_146976_2_), (float)(this.guiTop + 45 - 30 - p_146976_3_), this.mc.thePlayer); + GuiInventory.drawEntityOnScreen(this.guiLeft + 43, this.guiTop + 61, 20, (float)(this.guiLeft + 43 - p_146976_2_), (float)(this.guiTop + 45 - 30 - p_146976_3_), this.mc.thePlayer); } } diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 415eee637..b878c81c9 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -13,10 +13,14 @@ package vazkii.botania.client.gui.box; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; import vazkii.botania.common.item.ItemBaubleBox; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import java.util.Arrays; + public class InventoryBaubleBox implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; @@ -133,22 +137,46 @@ public class InventoryBaubleBox implements IInventory { } @Override - public boolean hasCustomInventoryName() { + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) {} + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + if (stacks != null) + Arrays.fill(stacks, null); + } + + @Override + public boolean hasCustomName() { return false; } @Override - public void openInventory() { + public IChatComponent getDisplayName() { + return new ChatComponentText(getCommandSenderName()); + } + + @Override + public void openInventory(EntityPlayer player) { // NO-OP } @Override - public void closeInventory() { + public void closeInventory(EntityPlayer player) { // NO-OP } @Override - public String getInventoryName() { + public String getCommandSenderName() { return LibItemNames.BAUBLE_BOX; } diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index 7c88f4a74..87f867476 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.crafting; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index f0e1232f0..02490ecc4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -27,6 +27,7 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index e6aa2fe14..6adb773c2 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.nbt.NBTTagCompound; @@ -85,7 +86,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) throws IOException { if(par2 == 14 && !notesEnabled) // Backspace back(); else if(par2 == 199) { // Home diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 0af00e8ea..d08029cfa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 9e5fbc49f..03d24adaa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 93219fb18..46ce7153c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index b216b4283..4031f8f03 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index f29623ccf..fa7797212 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; 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 b36718b88..786d27b60 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 @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index c10fe923e..bb3e50bbf 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 74db7f4d0..d6141d21a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index ab79de13b..74f725f0c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -13,6 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 4ee51e054..3fba77c56 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index a896afdb6..3c3881484 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index c9447d900..2fc32fcdf 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -14,6 +14,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index b9c929d25..764b8b28b 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -13,6 +13,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; public class ModelBellows extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 8c0598a79..f410799ad 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -13,6 +13,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; import vazkii.botania.client.render.tile.RenderTileBrewery; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index b1dc6d519..2e4c337d3 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -13,6 +13,7 @@ package vazkii.botania.client.model; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import org.lwjgl.opengl.GL11; 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 447d1ff4b..40a9fba51 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -29,7 +29,7 @@ import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { - protected RenderThornChakram(RenderManager renderManager) { + public RenderThornChakram(RenderManager renderManager) { super(renderManager); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 36ad8a280..42d984661 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -16,7 +16,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -32,7 +31,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpreader; -import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TileSpreader; public class RenderTileSpreader extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 0422c7ba5..436d76f04 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -14,7 +14,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -23,7 +22,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index c20daabb0..aabed6245 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -190,11 +190,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { return FluidContainerRegistry.drainFluidContainer(stack); } - @Override - public IIcon getIcon(int par1, int par2) { - return par2 == 0 ? Blocks.cobblestone.getIcon(par1, par2) : ModFluffBlocks.biomeStoneA.getIcon(par1, par2 + 7); - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 8de0c3efc..256df27fc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -135,11 +135,6 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); } - @Override - public IIcon getIcon(int side, int meta) { - return ModBlocks.livingwood.getIcon(0, 0); - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index f5ab174ef..ec0ed2519 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -71,12 +72,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, 1 - p_149646_5_); //todo 1.8 wtf + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify } @Override - public int getRenderBlockPass() { - return 1; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 } @Override @@ -84,16 +85,6 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { return 0; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void loadTextures(TextureStitchEvent.Pre event) { - if(event.map.getTextureType() == 0) { - TextureAtlasSprite icon = new TextureAtlasSprite("botania:bifrost"); - if(event.map.setTextureEntry("botania:bifrost", icon)) - blockIcon = icon; - } - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileBifrost(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 6d2062afc..f8d92c744 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -15,12 +15,11 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -54,7 +53,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, 1 - p_149646_5_); //todo 1.8 wtf + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify } @Override @@ -64,8 +63,8 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public int getRenderBlockPass() { - return 1; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 verify } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 48d64d2b7..a43404df8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -112,21 +112,21 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); - ((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); + dropBlockAsItem(par1World, pos, state, 0); + ((TileSpecialFlower) par1World.getTileEntity(pos)).onBlockHarvested(par1World, pos, state, par6EntityPlayer); } } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null) { String name = ((TileSpecialFlower) tile).subTileName; - list.add(ItemBlockSpecialFlower.ofType(new ItemStack(world.getBlock(x, y, z)), name)); + list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name)); ((TileSpecialFlower) tile).getDrops(list); } @@ -134,30 +134,30 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + public boolean onBlockEventReceived(World par1World, BlockPos pos, IBlockState state, int eventID, int value) { + super.onBlockEventReceived(par1World, pos, state, eventID, value); + TileEntity tileentity = par1World.getTileEntity(pos); + return tileentity != null ? tileentity.receiveClientEvent(eventID, value) : false; } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); + return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player); } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockPlacedBy(world, x, y, z, entity, stack); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); } @Override public void onBlockAdded(World world, BlockPos pos, IBlockState state) { - ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos); + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 761affae7..6f7443905 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -17,7 +17,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; @@ -25,16 +24,18 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; @@ -84,48 +85,55 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, p_149689_6_.getItemDamage() | 8, 2); + public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlockState(pos.up(), this, p_149689_6_.getItemDamage() | 8, 2); } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { return false; } @Override - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) { + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(p_149636_6_)) - harvestBlockCopy(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_); + harvestBlockCopy(p_149636_1_, p_149636_2_, pos, state); } // This is how I get around encapsulation - public void harvestBlockCopy(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) { - p_149636_2_.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1); - p_149636_2_.addExhaustion(0.025F); + public void harvestBlockCopy(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state) { + player.triggerAchievement(StatList.mineBlockStatArray[getIdFromBlock(this)]); + player.addExhaustion(0.025F); - if(this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) { - ArrayList items = new ArrayList(); - ItemStack itemstack = createStackedBlock(p_149636_6_); + if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player)) + { + java.util.ArrayList items = new java.util.ArrayList(); + ItemStack itemstack = this.createStackedBlock(state); - if(itemstack != null) + if (itemstack != null) + { items.add(itemstack); + } - ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_); - for(ItemStack is : items) - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is); - } else { - harvesters.set(p_149636_2_); - int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_); - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1); + net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, worldIn, pos, worldIn.getBlockState(pos), 0, 1.0f, true, player); + for (ItemStack stack : items) + { + spawnAsEntity(worldIn, pos, stack); + } + } + else + { + harvesters.set(player); + int i = EnchantmentHelper.getFortuneModifier(player); + this.dropBlockAsItem(worldIn, pos, state, i); harvesters.set(null); } } @Override - public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) { + public void onBlockHarvested(World p_149681_1_, BlockPos pos, IBlockState state, EntityPlayer p_149681_6_) { if(func_149887_c(p_149681_5_)) { - if(p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) { + if(p_149681_1_.getBlockState(pos.down()).getBlock() == this) { if(!p_149681_6_.capabilities.isCreativeMode) { int i1 = p_149681_1_.getBlockMetadata(p_149681_2_, p_149681_3_ - 1, p_149681_4_); int j1 = func_149890_d(i1); @@ -138,12 +146,12 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab this.func_149886_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, i1, p_149681_6_); }*/ - p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); + p_149681_1_.setBlockToAir(pos.down()); } - } else p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); + } else p_149681_1_.setBlockToAir(pos.down()); } - } else if(p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_) == this) - p_149681_1_.setBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_, Blocks.air, 0, 2); + } else if(p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlockState(pos.up()).getBlock() == this) + p_149681_1_.setBlockState(pos.up(), Blocks.air.getDefaultState(), 2); //super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_); } @@ -183,11 +191,14 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[offset(meta & 7)]; + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index c081077a4..961841d69 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; import net.minecraft.block.state.BlockState; @@ -147,15 +148,14 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - int meta = world.getBlockMetadata(x, y, z); - placeDoubleFlower(world, x, y, z, meta, 1 | 2); + placeDoubleFlower(world, pos, ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)), 1 | 2); } public static void placeDoubleFlower(World world, BlockPos pos, EnumDyeColor color, int flags) { - Block flower = meta >= 8 ? ModBlocks.doubleFlower2 : ModBlocks.doubleFlower1; + Block flower = color.getMetadata() >= 8 ? ModBlocks.doubleFlower2 : ModBlocks.doubleFlower1; int placeMeta = meta & 7; - world.setBlock(x, y, z, flower, placeMeta, flags); - world.setBlock(x, y + 1, z, flower, placeMeta | 8, flags); + world.setBlockState(pos, flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.LOWER), flags); + world.setBlockState(pos.up(), flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } } 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 cea1c87c3..07a50e1f1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -11,15 +11,16 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileStarfield; @@ -34,10 +35,25 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setResistance(2000F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.STARFIELD); - + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); + } + @Override public boolean isFullCube() { return false; 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 12f007761..7089f1a22 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -40,6 +41,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; @@ -68,6 +71,25 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, setUnlocalizedName(LibBlockNames.POOL); setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); MinecraftForge.EVENT_BUS.register(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POOL_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PoolVariant) state.getValue(BotaniaStateProps.POOL_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta > PoolVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } @SubscribeEvent 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 68c29a7bd..b6c0806cd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -108,15 +108,15 @@ public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { Multiblock mb = new Multiblock(); for(BlockPos l : LIVINGWOOD_POSITIONS) - mb.addComponent(l.up(), ModBlocks.livingwood, 0); + mb.addComponent(l.up(), ModBlocks.livingwood.getDefaultState()); for(BlockPos g : GLIMMERING_LIVINGWOOD_POSITIONS) - mb.addComponent(g.up(), ModBlocks.livingwood, 5); + mb.addComponent(g.up(), ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.GLIMMERING)); for(BlockPos p : PYLON_POSITIONS) - mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon, 1); + mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA)); for(BlockPos p : POOL_POSITIONS) - mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool, 0); + mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool.getDefaultState()); - mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal, 0); + mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal.getDefaultState()); mb.setRenderOffset(new BlockPos(0, -1, 0)); return mb.makeSet(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 99cbfcc33..545ca0e44 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -29,8 +29,10 @@ import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar @@ -70,7 +72,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { this.recipe = recipe; - worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 1, 1 | 2); + worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } } @@ -84,7 +86,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this)) { this.recipe = recipe; - worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 1, 1 | 2); + worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } if(recipe == null) @@ -107,7 +109,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe != null) { if(!recipe.matches(this)) { recipe = null; - worldObj.setBlockMetadataWithNotify(pos.getX(), pos.getY(), pos.getZ(), 0, 1 | 2); + worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState(), 1 | 2); } if(recipe != 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 21451e8be..e7b3dd264 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -94,15 +94,15 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdateP Multiblock mb = new Multiblock(); for(BlockPos o : OBSIDIAN_LOCATIONS) - mb.addComponent(o.up(), Blocks.obsidian, 0); + mb.addComponent(o.up(), Blocks.obsidian.getDefaultState()); for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) { - mb.addComponent(p.up(), ModBlocks.pylon, 0); + mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState()); mb.addComponent(new FlowerComponent(p, ModBlocks.flower)); } for(BlockPos f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(f.up(), ModBlocks.flower)); - mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block, 0); + mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block.getDefaultState()); return mb.makeSet(); } 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 6b1eb4cd9..aeed83d55 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Blocks; @@ -26,6 +27,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerListBox { @@ -55,7 +57,7 @@ public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerL time = 0; flip = !flip; flipTicks = 4; - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); } timeFraction = (float) time / (float) totalTime; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index b863555cb..cae077b5a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -16,7 +16,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibObfuscation; public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerListBox { @@ -60,7 +62,7 @@ public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerL item.motionZ = 0; if(redstone) - item.age = -200; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, -200, LibObfuscation.AGE); setInventorySlotContents(0, null); if(!worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index d962521b4..f669a3f9c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -14,9 +14,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; @@ -33,17 +36,17 @@ public class TilePylon extends TileEntity implements IUpdatePlayerListBox { @Override public void update() { ++ticks; - int meta = getBlockMetadata(); + PylonVariant variant = ((PylonVariant) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT)); if(activated && worldObj.isRemote) { - if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || meta != 0 && worldObj.getBlockMetadata(centerX, centerY, centerZ) == 0) { + if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && worldObj.getBlockState(centerPos).getBlock().getMetaFromState(worldObj.getBlockState(centerPos)) == 0) { // todo 1.8 clarify activated = false; return; } Vector3 centerBlock = new Vector3(centerPos.getX() + 0.5, centerPos.getY() + 0.75 + (Math.random() - 0.5 * 0.25), centerPos.getZ() + 0.5); - if(meta == 1) { + if(variant == PylonVariant.NATURA) { if(ConfigHandler.elfPortalParticlesEnabled) { double worldTime = ticks; worldTime += new Random(pos.hashCode()).nextInt(1000); @@ -67,25 +70,27 @@ public class TilePylon extends TileEntity implements IUpdatePlayerListBox { Block block = worldObj.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int fmeta = worldObj.getBlockMetadata(xCoord, yCoord - 1, zCoord); - float[] color = EntitySheep.fleeceColorTable[fmeta]; + int hex = ((EnumDyeColor) worldObj.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(worldObj.rand.nextInt(4) == 0) - Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, color[0], color[1], color[2], (float) Math.random(), 8); + Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r, g, b, (float) Math.random(), 8); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 3F, -0.04F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, color[0], color[1], color[2], (float) Math.random() / 5F, -0.001F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, color[0], color[1], color[2], (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r, g, b, (float) Math.random() / 3F, -0.04F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r, g, b, (float) Math.random() / 5F, -0.001F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r, g, b, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } } if(worldObj.rand.nextBoolean() && worldObj.isRemote) - Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), meta == 2 ? 1F : 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2); + Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { - return getBlockMetadata() == 0 ? ModBlocks.enchanter : ModBlocks.alfPortal; + return worldObj.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index ba2ba1ae3..13de5ce71 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -11,22 +11,23 @@ package vazkii.botania.common.block.tile; import net.minecraft.server.gui.IUpdatePlayerListBox; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; public class TileStarfield extends TileMod implements IUpdatePlayerListBox { @Override public void update() { - int meta = getBlockMetadata(); + boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); if(!worldObj.isRemote) { - int newMeta = worldObj.isDaytime() ? 0 : 1; - if(newMeta != meta) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); - meta = newMeta; + boolean newState = !worldObj.isDaytime(); + if(newState != state) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, newState), 1 | 2); + state = newState; } } - if(meta == 1) { + if(state) { double radius = 512; int iter = 2; for(int i = 0; i < iter; i++) { 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 ec9cb1167..9a4ec8407 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -56,11 +56,11 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdate Multiblock mb = new Multiblock(); for(BlockPos relativePos : LAPIS_BLOCKS) - mb.addComponent(relativePos, Blocks.lapis_block, 0); + mb.addComponent(relativePos, Blocks.lapis_block.getDefaultState()); for(BlockPos relativePos : LIVINGROCK_BLOCKS) - mb.addComponent(relativePos, ModBlocks.livingrock, 0); + mb.addComponent(relativePos, ModBlocks.livingrock.getDefaultState()); - mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.terraPlate, 0); + mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.terraPlate.getDefaultState()); mb.setRenderOffset(new BlockPos(0, 1, 0)); return mb.makeSet(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index f4d9d7b74..40719fc71 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -113,7 +113,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public EntityDoppleganger(World par1World) { super(par1World); setSize(0.6F, 1.8F); - getNavigator().setCanSwim(true); + //todo 1.8 new AI getNavigator().setCanSwim(true); tasks.addTask(0, new EntityAISwimming(this)); tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, Float.MAX_VALUE)); isImmuneToFire = true; @@ -124,13 +124,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Multiblock mb = new Multiblock(); for(BlockPos p : PYLON_LOCATIONS) - mb.addComponent(p.up(), ModBlocks.pylon, 2); + mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.GAIA)); for(int i = 0; i < 3; i++) for(int j = 0; j < 3; j++) mb.addComponent(new BeaconComponent(new BlockPos(i - 1, 0, j - 1))); - mb.addComponent(new BlockPos(0, 1, 0), Blocks.beacon, 0); + mb.addComponent(new BlockPos(0, 1, 0), Blocks.beacon.getDefaultState()); mb.setRenderOffset(new BlockPos(0, -1, 0)); return mb.makeSet(); @@ -237,10 +237,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return true; } - @Override - protected boolean isAIEnabled() { - return true; - } +// @Override todo 1.8 new AI +// protected boolean isAIEnabled() { +// return true; +// } @Override protected void entityInit() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 843ff697a..b2712e05d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -42,10 +42,10 @@ public class EntityPinkWither extends EntityWither { // NO-OP } - @Override - protected void attackEntity(Entity p_70785_1_, float p_70785_2_) { - // NO-OP - } +// @Override todo 1.8 mtd no longer exists? +// protected void attackEntity(Entity p_70785_1_, float p_70785_2_) { +// // NO-OP +// } @Override public boolean attackEntityAsMob(Entity p_70652_1_) { @@ -61,10 +61,10 @@ public class EntityPinkWither extends EntityWither { return false; } - @Override - protected boolean isAIEnabled() { - return false; - } +// @Override todo 1.8 new AI +// protected boolean isAIEnabled() { +// return false; +// } @Override protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 870a13f72..d60ac38f9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -60,39 +60,39 @@ public class EntityPixie extends EntityFlyingCreature { this.effect = effect; } - @Override - protected void updateEntityActionState() { - EntityLivingBase target = getAttackTarget(); - if(target != null) { - double d0 = target.posX + target.width / 2 - posX; - double d1 = target.posY + target.height / 2 - posY; - double d2 = target.posZ + target.width / 2 - posZ; - double d3 = d0 * d0 + d1 * d1 + d2 * d2; - - float mod = 0.45F; - if(getType() == 1) - mod = 0.1F; - - motionX += d0 / d3 * mod; - motionY += d1 / d3 * mod; - motionZ += d2 / d3 * mod; - - if(Math.sqrt(d3) < 1F) { - if(summoner != null) { - if(summoner instanceof EntityPlayer) - target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage); - else { - target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); - } - } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); - if(effect != null && !(target instanceof EntityPlayer)) - target.addPotionEffect(effect); - die(); - } - } - - renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI; - } +// @Override todo 1.8 uh oh ... we can't override this anymore +// protected void updateEntityActionState() { +// EntityLivingBase target = getAttackTarget(); +// if(target != null) { +// double d0 = target.posX + target.width / 2 - posX; +// double d1 = target.posY + target.height / 2 - posY; +// double d2 = target.posZ + target.width / 2 - posZ; +// double d3 = d0 * d0 + d1 * d1 + d2 * d2; +// +// float mod = 0.45F; +// if(getType() == 1) +// mod = 0.1F; +// +// motionX += d0 / d3 * mod; +// motionY += d1 / d3 * mod; +// motionZ += d2 / d3 * mod; +// +// if(Math.sqrt(d3) < 1F) { +// if(summoner != null) { +// if(summoner instanceof EntityPlayer) +// target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage); +// else { +// target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); +// } +// } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); +// if(effect != null && !(target instanceof EntityPlayer)) +// target.addPotionEffect(effect); +// die(); +// } +// } +// +// renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI; +// } @Override public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index ecd2367ac..ba7808459 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -11,6 +11,8 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; +import net.minecraft.block.BlockVine; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.BlockPos; @@ -36,19 +38,19 @@ public class EntityVineBall extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition var1) { if(var1 != null) { - int meta = var1.sideHit.getIndex(); + EnumFacing dir = var1.sideHit; int[] metaPlace = new int[] { 1, 4, 8, 2 }; - if(meta > 1 && meta < 6) { - EnumFacing dir = EnumFacing.getFront(meta); + if(dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { Block block = worldObj.getBlockState(pos).getBlock(); if(block.isAir(worldObj, pos)) { - worldObj.setBlockState(pos, ModBlocks.solidVines, metaPlace[meta - 2], 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getIdFromBlock(ModBlocks.solidVines) + (metaPlace[meta - 2] << 12)); // todo 1.8 to state id? + IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(BlockVine.ALL_FACES[dir.getIndex() + 1], true); + worldObj.setBlockState(pos, state, 1 | 2); + worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); // todo 1.8 verify pos = pos.down(); } else break; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index e702b3f60..3264ffc4f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -20,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -28,7 +27,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemBaubleBox extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index c67d7bd5e..4fb732bc5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.client.core.helper.IconHelper; @@ -59,23 +57,18 @@ public class ItemCorporeaSpark extends ItemMod { return false; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forItem(par1IconRegister, this, 0); - worldIcon = IconHelper.forItem(par1IconRegister, this, 1); - invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); - worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); - iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); - } +// @Override todo 1.8 +// public void registerIcons(IIconRegister par1IconRegister) { +// invIcon = IconHelper.forItem(par1IconRegister, this, 0); +// worldIcon = IconHelper.forItem(par1IconRegister, this, 1); +// invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); +// worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); +// iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); +// } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } - @Override - public IIcon getIconFromDamage(int meta) { - return meta == 0 ? invIcon : invIconMaster; - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 332c9fb7f..5eb2ce5de 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -18,7 +18,6 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -35,16 +34,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -141,7 +134,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } private static ItemStack[] validateRecipe(EntityPlayer player, ItemStack stack, ItemStack[] recipe, int slot) { - InventoryCrafting fakeInv = new InventoryCrafting(new ContainerWorkbench(player.inventory, player.worldObj, 0, 0, 0), 3, 3); + InventoryCrafting fakeInv = new InventoryCrafting(new ContainerWorkbench(player.inventory, player.worldObj, BlockPos.ORIGIN), 3, 3); for(int i = 0; i < 9; i++) fakeInv.setInventorySlotContents(i, recipe[i]); @@ -163,7 +156,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(recipe == null) return false; - if(recipe[9].stackSize != InventoryHelper.testInventoryInsertion(inv, recipe[9], ForgeDirection.UNKNOWN)) + if(recipe[9].stackSize != InventoryHelper.testInventoryInsertion(inv, recipe[9], null)) return false; return consumeRecipeIngredients(recipe, inv, null); diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 1c0a97589..d5a8db219 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -14,10 +14,12 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -39,7 +41,7 @@ public class ItemFertilizer extends ItemMod { for(int j = -range - 1; j < range; j++) { for(int k = 2; k >= -2; k--) { BlockPos pos_ = pos.add(i + 1, k + 1, j + 1); - if(par3World.isAirBlock(pos_) && (!par3World.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canBlockStay(par3World, pos_)) + if(par3World.isAirBlock(pos_) && (!par3World.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canPlaceBlockAt(par3World, pos_)) validCoords.add(pos_); } } @@ -48,7 +50,7 @@ public class ItemFertilizer extends ItemMod { for(int i = 0; i < flowerCount; i++) { BlockPos coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); validCoords.remove(coords); - par3World.setBlockState(coords, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); + par3World.setBlockState(coords, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(par3World.rand.nextInt(16))), 1 | 2); } par1ItemStack.stackSize--; } else { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 29360c420..e502855ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -52,10 +52,7 @@ public class ItemGrassHorn extends ItemMod { list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack); - } + // todo 1.8 return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack); @Override public String getUnlocalizedName(ItemStack par1ItemStack) { @@ -85,7 +82,7 @@ public class ItemGrassHorn extends ItemMod { @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int time) { if(time != getMaxItemUseDuration(stack) && time % 5 == 0) - breakGrass(player.worldObj, stack, stack.getItemDamage(), (int) player.posX, (int) player.posY, (int) player.posZ); + breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); if(!player.worldObj.isRemote) player.worldObj.playSoundAtEntity(player, "note.bassattack", 1F, 0.001F); @@ -103,7 +100,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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block.isLeaves(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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, pos)) || stackDmg == 1 && block.isLeaves(world, pos) || stackDmg == 2 && block == Blocks.snow_layer) coords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 452ffdeb7..e39b3f133 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -19,7 +19,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,8 +26,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -75,7 +75,7 @@ public class ItemGrassSeeds extends ItemMod { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { IBlockState state = par3World.getBlockState(pos); - if((state.getBlock() == Blocks.dirt || (state.getBlock() == Blocks.grass && par1ItemStack.getItemDamage() != 0)) && bmeta == 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); @@ -179,12 +179,12 @@ public class ItemGrassSeeds extends ItemMod { 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 3 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 0); - case 4 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 1); - case 5 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 2); - case 6 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 3); - case 7 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 4); - case 8 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 5); + 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()); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index dfd02176d..e12cbd007 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -159,12 +159,12 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } } - private boolean inRange(int x, int y, int z, int srcx, int srcy, int srcz, int range, double heightscale, boolean pointy) { - if(y >= srcy) - return MathHelper.pointDistanceSpace(x, 0, z, srcx, 0, srcz) < range; + private boolean inRange(BlockPos pos, BlockPos srcPos, int range, double heightscale, boolean pointy) { + if(pos.getY() >= srcPos.getY()) + return MathHelper.pointDistanceSpace(pos.getX(), 0, pos.getZ(), srcPos.getX(), 0, srcPos.getZ()) < range; else if(!pointy) - return MathHelper.pointDistanceSpace(x, y / heightscale, z, srcx, srcy / heightscale, srcz) < range; - else return MathHelper.pointDistanceSpace(x, 0, z, srcx, 0, srcz) < range - (srcy - y) / heightscale; + return MathHelper.pointDistanceSpace(pos.getX(), pos.getY() / heightscale, pos.getZ(), srcPos.getX(), srcPos.getY() / heightscale, srcPos.getZ()) < range; + else return MathHelper.pointDistanceSpace(pos.getX(), 0, pos.getZ(), srcPos.getX(), 0, srcPos.getZ()) < range - (srcPos.getY() - pos.getY()) / heightscale; } public EntityManaBurst getBurst(World world, BlockPos pos, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 7c6f7a9b1..60b40037d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -51,9 +51,6 @@ public class ItemManaCookie extends ItemFood { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - public IIcon getIconIndex(ItemStack stack) { - return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); - } + // todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index c9f45b2b2..b31a7f915 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; @@ -31,6 +33,9 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.EnumMap; +import java.util.Map; + public class ItemSextant extends ItemMod { private static final String TAG_SOURCE_X = "sourceX"; @@ -162,8 +167,13 @@ public class ItemSextant extends ItemMod { public static class MultiblockSextant extends Multiblock { @Override - public Multiblock[] createRotations() { - return new Multiblock[] { this }; + public Map createRotations() { + Map ret = new EnumMap(EnumFacing.class); + for (EnumFacing e : EnumFacing.HORIZONTALS) { + ret.put(e, this); + } + return ret; + // return new Multiblock[] { this }; todo 1.8 verify, this was only the first direction } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 3a9b37420..2d102ff58 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -10,10 +10,8 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; @@ -22,7 +20,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSlimeBottle extends ItemMod { - IIcon activeIcon; + // todo 1.8 smart model? public ItemSlimeBottle() { setUnlocalizedName(LibItemNames.SLIME_BOTTLE); @@ -30,17 +28,6 @@ public class ItemSlimeBottle extends ItemMod { setHasSubtypes(true); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - activeIcon = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIconFromDamage(int dmg) { - return dmg == 0 ? itemIcon : activeIcon; - } - @Override public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { if(!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 7546f5cf1..5a9ad926d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntitySheep; @@ -28,10 +27,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.api.wand.IWandBindable; @@ -88,14 +86,14 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { - int meta = -1; - if(TileEnchanter.canEnchanterExist(par3World, pos, 0)) - meta = 0; - else if(TileEnchanter.canEnchanterExist(par3World, pos, 1)) - meta = 1; + EnumFacing.Axis axis = null; + if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.X)) + axis = EnumFacing.Axis.X; + else if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.Z)) + axis = EnumFacing.Axis.Z; - if(meta != -1 && !par3World.isRemote) { - par3World.setBlockState(pos, ModBlocks.enchanter, meta, 1 | 2); + if(axis != null && !par3World.isRemote) { + par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); par3World.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 0.6F); for(int i = 0; i < 50; i++) { 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 efd845a6b..4f4d62bb0 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 @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +28,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -45,6 +47,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer { private static final String TAG_ANCIENT_WILL = "AncientWill"; + static TextureAtlasSprite willIcon; public ItemTerrasteelHelm() { this(LibItemNames.TERRASTEEL_HELM); @@ -55,11 +58,10 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc super(0, name); } - @Override + @SubscribeEvent @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - willIcon = IconHelper.forName(par1IconRegister, "willFlame"); + public void onTextureStitch(TextureStitchEvent evt) { + willIcon = IconHelper.forName(evt.map, "willFlame"); } @Override @@ -117,7 +119,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc float f2 = willIcon.getMinV(); float f3 = willIcon.getMaxV(); Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, 0.15F, -0.39F); 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 46ec0676c..e378d5378 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 @@ -41,7 +41,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { private static final int SUBTYPES = 32; - IIcon[] icons; public ItemBaubleCosmetic() { super(LibItemNames.COSMETIC); @@ -53,13 +52,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { RecipeSorter.register("botania:cosmeticRemove", CosmeticRemoveRecipe.class, Category.SHAPELESS, ""); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[SUBTYPES]; - for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) 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 5ecfeb27d..191fe3515 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 @@ -14,10 +14,10 @@ import java.awt.Color; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -27,7 +27,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -50,8 +49,6 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre private static final String TAG_BREW_KEY = "brewKey"; - IIcon[] icons; - public ItemBloodPendant() { super(LibItemNames.BLOOD_PENDANT); setMaxStackSize(1); @@ -67,18 +64,6 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[4]; - for(int i = 0; i < 4; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return icons[pass]; - } - @Override public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) 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 8d5da67d2..fa4b304b3 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -104,7 +105,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble float f3 = itemIcon.getMaxV(); boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); 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 89c41c507..f858c8e58 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 @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -35,7 +34,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -99,15 +97,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub return BaubleType.AMULET; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - wingIcons = new IIcon[WING_TYPES]; - for(int i = 0; i < WING_TYPES; i++) - wingIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1); - } - @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 6936b08b1..02ee3db55 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.equipment.tool; import java.awt.Color; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityEnderman; @@ -20,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; @@ -29,25 +27,12 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemEnderDagger extends ItemManasteelSword { - IIcon iconFront, iconOverlay; - public ItemEnderDagger() { super(BotaniaAPI.manasteelToolMaterial, LibItemNames.ENDER_DAGGER); setMaxDamage(69); // What you looking at? setNoRepair(); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconFront = IconHelper.forItem(par1IconRegister, this, 0); - iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return pass == 0 ? iconFront : iconOverlay; - } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) 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 656704801..b5b3a73a1 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 @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -20,7 +19,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -40,7 +38,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 40; - IIcon[] pullIcons = new IIcon[3]; public ItemLivingwoodBow() { this(LibItemNames.LIVINGWOOD_BOW); @@ -151,14 +148,6 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { else p_77615_3_.inventory.consumeInventoryItem(Items.arrow); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - for(int i = 0; i < 3; i++) - pullIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1); - } - @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) @@ -175,21 +164,21 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if(stack != usingItem) - return itemIcon; - - int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); - - if(j >= 18) - return pullIcons[2]; - if(j > 13) - return pullIcons[1]; - if(j > 0) - return pullIcons[0]; - - return itemIcon; - } +// @Override todo 1.8 +// public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { +// if(stack != usingItem) +// return itemIcon; +// +// int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); +// +// if(j >= 18) +// return pullIcons[2]; +// if(j > 13) +// return pullIcons[1]; +// if(j > 0) +// return pullIcons[0]; +// +// return itemIcon; +// } } 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 4add7dded..13adbbec1 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 @@ -14,6 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; @@ -21,6 +22,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibObfuscation; public class ItemElementiumAxe extends ItemManasteelAxe { @@ -58,7 +60,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { private void addDrop(LivingDropsEvent event, ItemStack drop) { EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop); - entityitem.delayBeforeCanPickup = 10; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entityitem, 10, LibObfuscation.PICKUP_DELAY); event.drops.add(entityitem); } 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 f51fe595a..dc4e68ead 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 @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -14,7 +13,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.client.core.helper.IconHelper; @@ -26,8 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemElementiumShears extends ItemManasteelShears { - IIcon dammitReddit; - public ItemElementiumShears() { super(LibItemNames.ELEMENTIUM_SHEARS); } @@ -48,17 +44,10 @@ public class ItemElementiumShears extends ItemManasteelShears { return par1ItemStack; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - dammitReddit = IconHelper.forName(par1IconRegister, "dammitReddit"); - } - - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack); - } +// @Override todo 1.8 +// public IIcon getIconIndex(ItemStack par1ItemStack) { +// return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack); +// } @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { 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 6677e2248..796f89fe9 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 @@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; @@ -39,7 +38,7 @@ public class ItemElementiumShovel extends ItemManasteelShovel { Block blk = world.getBlockState(pos).getBlock(); if(blk instanceof BlockFalling) - ToolCommons.removeBlocksInIteration(player, stack, world, x, y, z, 0, -12, 0, 1, 12, 1, blk, materialsShovel, silk, fortune, false); + ToolCommons.removeBlocksInIteration(player, stack, world, pos, new BlockPos(0, -12, 0), new BlockPos(1, 12, 1), blk, materialsShovel, silk, fortune, false); return false; } 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 3e43b4f0d..39264e3aa 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import java.util.regex.Pattern; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -66,12 +65,6 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); 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 5fbbcb363..0d1dec470 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import java.util.regex.Pattern; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -66,12 +65,6 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDmg()); 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 1850a3da5..fceac2ca5 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 @@ -15,7 +15,6 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -29,17 +28,20 @@ import net.minecraft.stats.StatList; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.helper.ObfuscationHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibObfuscation; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { @@ -65,12 +67,6 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) { if(entity.worldObj.isRemote) @@ -117,7 +113,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { double d2 = rand.nextFloat() * f + (1D - f) * 0.5; EntityItem entityitem = new EntityItem(player.worldObj, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); - entityitem.delayBeforeCanPickup = 10; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entityitem, 10, LibObfuscation.PICKUP_DELAY); player.worldObj.spawnEntityInWorld(entityitem); } 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 de6a16bc0..bdd70d63a 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 @@ -11,7 +11,6 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -64,12 +63,6 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } - @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index ab6262000..a683a0939 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -11,7 +11,6 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; @@ -38,8 +36,6 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 60; - public static IIcon elucidatorIcon; - public ItemManasteelSword() { this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_SWORD); } @@ -61,13 +57,6 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - elucidatorIcon = IconHelper.forName(par1IconRegister, "elucidator"); - } - @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { if(usesMana(par1ItemStack)) @@ -75,16 +64,11 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { return true; } - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - String name = par1ItemStack.getDisplayName().toLowerCase().trim(); - return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return getIconIndex(stack); - } +// @Override todo 1.8 +// public IIcon getIconIndex(ItemStack par1ItemStack) { +// String name = par1ItemStack.getDisplayName().toLowerCase().trim(); +// return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack); +// } @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { 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 ee21c493d..7ed09a054 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 @@ -16,14 +16,12 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -46,30 +44,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker private static final int MANA_PER_DAMAGE = 100; private static Map> blockSwappers = new HashMap(); - IIcon iconOn, iconOff; - public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); FMLCommonHandler.instance().bus().register(this); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - iconOn = IconHelper.forItem(par1IconRegister, this, 0); - iconOff = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - public IIcon getIconFromDamage(int p_77617_1_) { - return iconOn; - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - return shouldBreak(player) ? iconOn : iconOff; - } - public boolean shouldBreak(EntityPlayer player) { return !player.isSneaking() && !ItemTemperanceStone.hasTemperanceActive(player); } 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 b67ef1810..134afa6f2 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 @@ -14,7 +14,6 @@ import java.awt.Color; import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -23,9 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -68,8 +65,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ 10000 - 1, 1000000 - 1, 10000000 - 1, 100000000 - 1, 1000000000 - 1, MAX_MANA - 1 }; - IIcon iconTool, iconOverlay, iconTipped; - public ItemTerraPick() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); GameRegistry.addRecipe(new TerraPickTippingRecipe()); @@ -184,18 +179,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return Integer.MAX_VALUE; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconTool = IconHelper.forItem(par1IconRegister, this, 0); - iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); - iconTipped = IconHelper.forItem(par1IconRegister, this, 2); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass) { - return pass == 1 && isEnabled(stack) ? iconOverlay : isTipped(stack) ? iconTipped : iconTool; - } - public static boolean isTipped(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, TAG_TIPPED, false); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 4cb71cb77..6fee98a2f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.lens; import java.awt.Color; import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; @@ -22,7 +21,6 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.RecipeSorter; @@ -148,14 +146,14 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, Category.SHAPELESS, ""); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconGlass = IconHelper.forName(par1IconRegister, "lensInside"); - - ringIcons = new IIcon[SUBTYPES]; - for(int i = 0; i < ringIcons.length; i++) - ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); - } +// @Override todo 1.8 +// public void registerIcons(IIconRegister par1IconRegister) { +// iconGlass = IconHelper.forName(par1IconRegister, "lensInside"); +// +// ringIcons = new IIcon[SUBTYPES]; +// for(int i = 0; i < ringIcons.length; i++) +// ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); +// } @Override public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { @@ -163,10 +161,10 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens par3List.add(new ItemStack(par1, 1, i)); } - @Override - public IIcon getIconFromDamageForRenderPass(int par1, int par2) { - return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; - } +// @Override todo 1.8 +// public IIcon getIconFromDamageForRenderPass(int par1, int par2) { +// return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; +// } @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 45cd3ce0c..a91ba1370 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -60,10 +60,10 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } } - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); - } +// @Override todo 1.8 +// public IIcon getIconIndex(ItemStack par1ItemStack) { +// return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); +// } private boolean isBoot(ItemStack par1ItemStack) { String name = par1ItemStack.getDisplayName().toLowerCase().trim(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 1c099ef0c..d51ab85b5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -12,11 +12,9 @@ package vazkii.botania.common.item.relic; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -33,20 +31,20 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_CHARGING = "charging"; private static final int WEAPON_TYPES = 12; - public static IIcon[] weaponIcons; + // public static IIcon[] weaponIcons; public ItemKingKey() { super(LibItemNames.KING_KEY); } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - - weaponIcons = new IIcon[WEAPON_TYPES]; - for(int i = 0; i < WEAPON_TYPES; i++) - weaponIcons[i] = IconHelper.forName(par1IconRegister, "gateWeapon" + i); - } +// @Override +// public void registerIcons(IIconRegister par1IconRegister) { +// super.registerIcons(par1IconRegister); +// +// weaponIcons = new IIcon[WEAPON_TYPES]; +// for(int i = 0; i < WEAPON_TYPES; i++) +// weaponIcons[i] = IconHelper.forName(par1IconRegister, "gateWeapon" + i); +// } todo 1.8 @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { 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 04aca1a5e..cf9a4fc08 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -22,6 +22,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -32,6 +33,7 @@ import vazkii.botania.common.entity.EntityThrownItem; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibObfuscation; public class ItemGravityRod extends ItemMod implements IManaUsingItem { @@ -125,7 +127,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true) && item != null) { if(item instanceof EntityItem) - ((EntityItem)item).delayBeforeCanPickup = 5; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, ((EntityItem) item), 5, LibObfuscation.PICKUP_DELAY); if(item instanceof EntityLivingBase) { EntityLivingBase targetEntity = (EntityLivingBase)item; @@ -209,7 +211,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setDouble(stack, TAG_DIST, -1); Vector3 moveVector = new Vector3(player.getLookVec().normalize()); if(item instanceof EntityItem) { - ((EntityItem)item).delayBeforeCanPickup = 20; + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, ((EntityItem) item), 20, LibObfuscation.PICKUP_DELAY); float mot = IManaProficiencyArmor.Helper.hasProficiency(player) ? 2.25F : 1.5F; item.motionX = moveVector.x * mot; item.motionY = moveVector.y; 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 2b82f507c..a754b5281 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -8,6 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; @@ -73,7 +74,7 @@ public class PageElvenRecipe extends PageRecipe { i++; } - IIcon portalIcon = BlockAlfPortal.portalTex; + TextureAtlasSprite portalIcon = BlockAlfPortal.portalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Minecraft.getMinecraft().getRenderItem().renderIcon(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } From e4864d2e7b5605fa21701355626f5c19da740fa7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 15:26:59 -0600 Subject: [PATCH 056/935] Red string blocks and tiles --- .../java/vazkii/botania/api/BotaniaAPI.java | 8 ++-- .../common/block/string/BlockRedString.java | 35 +++++----------- .../string/BlockRedStringComparator.java | 3 ++ .../block/string/BlockRedStringContainer.java | 3 ++ .../block/string/BlockRedStringDispenser.java | 41 ++++++++++++++++--- .../string/BlockRedStringFertilizer.java | 3 ++ .../string/BlockRedStringInterceptor.java | 32 +++++++++++++-- .../block/string/BlockRedStringRelay.java | 3 ++ .../block/tile/string/TileRedString.java | 3 +- .../tile/string/TileRedStringInterceptor.java | 4 +- 10 files changed, 94 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index e84661f1c..3bbd42dc8 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -20,6 +20,7 @@ import java.util.Set; import net.minecraft.block.*; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; @@ -308,12 +309,11 @@ public final class BotaniaAPI { /** * Registers a Pure Daisy Recipe. * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. - * @param output The block to be placed upon recipe completion. - * @param outputMeta The metadata to be placed upon recipe completion. + * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ - public static RecipePureDaisy registerPureDaisyRecipe(Object input, Block output, int outputMeta) { - RecipePureDaisy recipe = new RecipePureDaisy(input, output, outputMeta); + public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { + RecipePureDaisy recipe = new RecipePureDaisy(input, outputState); pureDaisyRecipes.add(recipe); return recipe; } 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 8b8daaa58..fae7d3c6f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -14,16 +14,12 @@ import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.util.RotationHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; @@ -36,16 +32,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockRedString extends BlockModContainer implements ILexiconable { - IIcon senderIcon; - IIcon sideIcon; - public BlockRedString(String name) { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); setUnlocalizedName(name); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.SOUTH)); } @Override @@ -53,29 +45,22 @@ public abstract class BlockRedString extends BlockModContainer im return new BlockState(this, BotaniaStateProps.FACING); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); + } + @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - senderIcon = IconHelper.forName(par1IconRegister, "redStringSender"); - sideIcon = registerSideIcon(par1IconRegister); - } - - @SideOnly(Side.CLIENT) - public IIcon registerSideIcon(IIconRegister register) { - return IconHelper.forBlock(register, this); - } - - @Override - public IIcon getIcon(int side, int meta) { - return side == meta ? senderIcon : sideIcon; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 80b03a401..52454f072 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block.string; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; @@ -20,6 +22,7 @@ public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { super(LibBlockNames.RED_STRING_COMPARATOR); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 3fc3f6cd0..c4c1e5672 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; @@ -19,6 +21,7 @@ public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { super(LibBlockNames.RED_STRING_CONTAINER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override 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 9ef22db23..6ad032eee 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -11,7 +11,12 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; @@ -20,19 +25,43 @@ public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { super(LibBlockNames.RED_STRING_DISPENSER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + meta |= 8; + } else { + meta &= -9; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; + meta &= -9; + EnumFacing facing = EnumFacing.getFront(meta); + return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); + } + + @Override + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileRedStringDispenser) world.getTileEntity(x, y, z)).tickDispenser(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileRedStringDispenser) world.getTileEntity(pos)).tickDispenser(); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index f57b49cec..d5987da7a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -15,7 +15,9 @@ import java.util.Random; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; @@ -24,6 +26,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl public BlockRedStringFertilizer() { super(LibBlockNames.RED_STRING_FERTILIZER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 7367522d7..d281d6d1e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.string; import java.util.Random; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -20,6 +21,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; @@ -30,7 +32,31 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); MinecraftForge.EVENT_BUS.register(this); - // todo 1.8 completely override states from super + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + meta |= 8; + } else { + meta &= -9; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + boolean powered = (meta & 8) != 0; + meta &= -9; + EnumFacing facing = EnumFacing.getFront(meta); + return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); } @SubscribeEvent @@ -46,12 +72,12 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return (world.getBlockMetadata(x, y, z) & 8) == 0 ? 0 : 15; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random update) { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 0a291ff0e..5a284f116 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; @@ -19,6 +21,7 @@ public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { super(LibBlockNames.RED_STRING_RELAY); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } @Override 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 4da1bf098..61e54503c 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 @@ -17,6 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; @@ -75,7 +76,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, IUpda } public EnumFacing getOrientation() { - return EnumFacing.getFront(getBlockMetadata()); // todo 1.8 states? + return ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.FACING)); } public TileEntity getTileAtBinding() { 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 509367d0f..60a005e85 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 @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString implements IUpdatePlayerListBox { @@ -53,8 +54,7 @@ public class TileRedStringInterceptor extends TileRedString implements IUpdatePl if(coords != null && coords.equals(pos)) { if(!world.isRemote) { Block block = inter.getBlockType(); - int meta = inter.getBlockMetadata(); - world.setBlockMetadataWithNotify(inter.xCoord, inter.yCoord, inter.zCoord, meta | 8, 1 | 2); + world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); } From 4736be9d6160e853c5c8a1cf1c973d9b5a697dee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 15:59:17 -0600 Subject: [PATCH 057/935] Corporea done --- .../block/corporea/BlockCorporeaFunnel.java | 37 ++++++++++--------- .../corporea/BlockCorporeaInterceptor.java | 26 +++++++------ .../block/corporea/BlockCorporeaRetainer.java | 29 ++++++++++++--- .../corporea/TileCorporeaInterceptor.java | 5 ++- 4 files changed, 59 insertions(+), 38 deletions(-) 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 c0ba7d3c3..93b10c703 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -12,15 +12,15 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; @@ -29,37 +29,38 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { - IIcon[] icons; - public BlockCorporeaFunnel() { super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); setStepSound(soundTypeMetal); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileCorporeaFunnel) world.getTileEntity(x, y, z)).doRequest(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileCorporeaFunnel) world.getTileEntity(pos)).doRequest(); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 > 1 ? 1 : 0]; + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override 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 168d35660..b4c5aa6d0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -13,17 +13,17 @@ package vazkii.botania.common.block.corporea; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; @@ -32,29 +32,31 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { - IIcon[] icons; - public BlockCorporeaInterceptor() { super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); setStepSound(soundTypeMetal); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 > 1 ? 1 : 0]; + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - world.setBlockMetadataWithNotify(x, y, z, 0, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override @@ -64,7 +66,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return world.getBlockMetadata(x, y, z) != 0 ? 15 : 0; + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override 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 ef4fd5f10..324cae185 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,6 +23,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -36,19 +38,34 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon setHardness(5.5F); setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { - boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z); - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); if(power && !powered) { - ((TileCorporeaRetainer) world.getTileEntity(x, y, z)).fulfilRequest(); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + ((TileCorporeaRetainer) world.getTileEntity(pos)).fulfilRequest(); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 0b6b1b711..f873137d4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -22,6 +22,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -56,8 +57,8 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor for(ItemStack stack_ : stacks) missing -= stack_.stackSize; - if(missing > 0 && getBlockMetadata() == 0) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1, 1 | 2); + if(missing > 0 && !((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED))) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(getPos(), getBlockType(), 2); TileEntity requestor = (TileEntity) source.getSparkInventory(); From 6cc88f1c5a2aeefaaf8293d5bb2661182cd794dc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Nov 2015 16:45:36 -0600 Subject: [PATCH 058/935] Almost done with TEs --- .../botania/api/state/BotaniaStateProps.java | 3 ++ .../api/state/enums/LuminizerVariant.java | 15 ++++++++ .../botania/common/block/BlockLightRelay.java | 35 ++++++++++++++++--- .../common/block/tile/TileLightRelay.java | 7 ++-- .../common/block/tile/TileManaBeacon.java | 12 ++++--- .../common/block/tile/TileSpawnerClaw.java | 21 ++++++----- .../block/tile/mana/TileManaDetector.java | 11 +++--- .../common/block/tile/mana/TileSpreader.java | 1 + .../common/block/tile/mana/TileTurntable.java | 1 + .../botania/common/lib/LibObfuscation.java | 1 + 10 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 8bab6ce6d..f977617b7 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -90,6 +90,9 @@ public class BotaniaStateProps { // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockLightRelay + public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); + // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java new file mode 100644 index 000000000..3b2db192c --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -0,0 +1,15 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum LuminizerVariant implements IStringSerializable { + DEFAULT, + DETECTOR; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 3c44f82df..df896c2aa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; @@ -34,6 +35,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; @@ -53,6 +56,30 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); MinecraftForge.EVENT_BUS.register(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR ? 1 : 0; + if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + meta |= 8; + } else { + meta &= -9; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + boolean powered = (meta & 8) != 0; + meta &= -9; + return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, meta == 1 ? LuminizerVariant.DETECTOR : LuminizerVariant.DEFAULT); } @SubscribeEvent @@ -80,7 +107,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int damageDropped(IBlockState state) { - return meta == 0 ? 0 : 1; + return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT ? 0 : 1; } @Override @@ -111,7 +138,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override @@ -121,8 +148,8 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { - int meta = world.getBlockMetadata(x, y, z); - return (meta & 8) != 0 ? 15 : 0; + return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT + && ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 68817738f..7326d5296 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -28,6 +28,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -219,9 +221,8 @@ public class TileLightRelay extends TileMod implements IWandBindable, IUpdatePla if(pos.equals(exitPos)) { TileEntity tile = worldObj.getTileEntity(pos); if(tile != null && tile instanceof TileLightRelay) { - int meta = worldObj.getBlockMetadata(x, y, z); - if(meta > 0) { - worldObj.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2); + if(worldObj.getBlockState(pos).getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR) { + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(pos, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 087a5dd22..76d854dad 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -11,9 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; public class TileManaBeacon extends TileMod implements IUpdatePlayerListBox { @@ -28,13 +29,16 @@ public class TileManaBeacon extends TileMod implements IUpdatePlayerListBox { } if(!redstone) { - float[] color = EntitySheep.fleeceColorTable[worldObj.getBlockMetadata(xCoord, yCoord, zCoord)]; + int hex = ((EnumDyeColor) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); Botania.proxy.setWispFXDistanceLimit(false); - Botania.proxy.wispFX(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, color[0], color[1], color[2], (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - yCoord)), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r, g, b, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); for(int i = 0; i < 2; i++) - Botania.proxy.wispFX(worldObj, xCoord + 0.5, 256, zCoord + 0.5, color[0], color[1], color[2], (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, 256, pos.getZ() + 0.5, r, g, b, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 887896a4f..f63a795a6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.tile; +import java.lang.reflect.Method; import java.util.List; import net.minecraft.entity.Entity; @@ -33,6 +34,8 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePl int mana = 0; + private static final Method isActivated = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); + @Override public void update() { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); @@ -40,7 +43,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePl TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; MobSpawnerBaseLogic logic = spawner.getSpawnerBaseLogic(); - if(!logic.isActivated()) { + if(!((Boolean) isActivated.invoke(logic))) { if(!worldObj.isRemote) mana -= 6; @@ -49,10 +52,10 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePl --logic.spawnDelay; if(Math.random() > 0.5) - Botania.proxy.wispFX(worldObj, xCoord + 0.3 + Math.random() * 0.5, yCoord - 0.3 + Math.random() * 0.25, zCoord + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); - logic.field_98284_d = logic.field_98287_c; - logic.field_98287_c = (logic.field_98287_c + 1000.0F / (logic.spawnDelay + 200.0F)) % 360.0D; + logic.prevMobRotation = logic.getMobRotation(); + logic.mobRotation = (logic.getMobRotation() + 1000.0F / (logic.spawnDelay + 200.0F)) % 360.0D; } else if(logic.spawnDelay == -1) resetTimer(logic); @@ -73,23 +76,23 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePl if (entity == null) return; - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerX(), logic.getSpawnerY(), logic.getSpawnerZ(), logic.getSpawnerX() + 1, logic.getSpawnerY() + 1, logic.getSpawnerZ() + 1).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.func_177221_b(), logic.func_177221_b().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); if (j >= maxNearbyEntities) { resetTimer(logic); return; } - double d2 = logic.getSpawnerX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - double d3 = logic.getSpawnerY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; - double d4 = logic.getSpawnerZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d2 = logic.func_177221_b().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d3 = logic.func_177221_b().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; + double d4 = logic.func_177221_b().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); if(entityliving == null || entityliving.getCanSpawnHere()) { if(!worldObj.isRemote) logic.func_98265_a(entity); - logic.getSpawnerWorld().playAuxSFX(2004, logic.getSpawnerX(), logic.getSpawnerY(), logic.getSpawnerZ(), 0); + logic.getSpawnerWorld().playAuxSFX(2004, logic.func_177221_b(), 0); if (entityliving != null) entityliving.spawnExplosionParticle(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index c8e3163c9..b3d738994 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -14,6 +14,7 @@ import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; @@ -22,12 +23,12 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost, IU @Override public void update() { if(!worldObj.isRemote) { - int meta = getBlockMetadata(); - int expectedMeta = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))).size() != 0 ? 1 : 0; - if(meta != expectedMeta) - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, expectedMeta, 1 | 2); + boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); + boolean expectedState = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))).size() != 0; + if(state != expectedState) + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); - if(expectedMeta == 1) + if(expectedState) for(int i = 0; i < 4; i++) Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } 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 2c5b5b04e..f056756cd 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 @@ -15,6 +15,7 @@ import java.util.UUID; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index f016aae56..99591955d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index e38b0a676..e448d97ea 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -66,6 +66,7 @@ public final class LibObfuscation { public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "i" }; // MobSpawnerBaseLogic + public static final String[] IS_ACTIVATED = new String[] { "isActivated" ,"func_98279_f", "g" }; public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "m" }; public static final String[] SPAWN_COUNT = new String[] { "spawnCount", "field_98294_i", "i" }; public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" }; From 8361d1743d1a6813f0605ee0805c978b292430c7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 Nov 2015 12:53:36 -0600 Subject: [PATCH 059/935] Some rendering experiements, update notes --- MC18_notes.txt | 17 +-- .../client/core/helper/IconHelper.java | 105 ++++++++++++++++++ .../common/block/tile/TileSpawnerClaw.java | 97 ++++++++-------- .../botania/common/core/helper/Vector3.java | 11 +- .../common/crafting/ModPureDaisyRecipes.java | 14 +-- .../armor/terrasteel/ItemTerrasteelHelm.java | 4 +- .../item/equipment/bauble/ItemHolyCloak.java | 1 + .../item/equipment/bauble/ItemIcePendant.java | 3 +- .../item/equipment/bauble/ItemItemFinder.java | 3 +- .../bauble/ItemSuperLavaPendant.java | 1 + .../item/equipment/bauble/ItemTinyPlanet.java | 5 +- .../item/equipment/bauble/ItemTravelBelt.java | 1 + .../item/material/ItemManaResource.java | 23 ++-- .../common/item/rod/ItemTornadoRod.java | 16 +-- 14 files changed, 207 insertions(+), 94 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 15af37855..100a19167 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -1,25 +1,26 @@ -- API -- * Updated to BlockPos and EnumFacing everywhere where it made sense * Registering repainting blocks will need to also receive a PropertyEnum with EnumDyeColor as the component type -so Botania knows what property to set the color on (todo actually do this) +so Botania knows what property to set the color on * ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively) This can be changed to match vanilla signature, but either would break backward compat. * SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block). Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts -* Multiblock system reworked to use states +* Multiblock system reworked to use states and blockposes -- Other -- * Most things left untouched to make patches from upstream easier * Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances since BlockPos'es are immutable and thus can be reused everywhere. -* Some really needed fields in EntityItem are private now. Reflection time :( -* Alfglass just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. +* Some really needed fields in EntityItem are private now. Reflection time :(. If this is a +* Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. Unless someone figures out a way to use the old one -- Todo -- -* Fix all the block signatures (easy) -* Fix all other low hanging errors (easy-med) -* Find all the block metadatas and give them all meaningful block states and properties (tedious/med-hard) * JSON models for everything (tedious/med-hard) -* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med) \ No newline at end of file +* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med) +* For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.) + - Sub to texture stitch and bake our own model there to use? + - This remains the largest portion of what is left + - Where is the method to render an arbitrary baked model? \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 5481dfb43..88cb4e9ae 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -11,10 +11,13 @@ package vazkii.botania.client.core.helper; import net.minecraft.block.Block; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IFlexibleBakedModel; import vazkii.botania.client.lib.LibResources; public final class IconHelper { @@ -59,4 +62,106 @@ public final class IconHelper { return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s); } + private static String json + + /** + * Takes an icon, generates a "flat 3D" model in the style of held items. + * Used for rendering icons in 3D that have no item form + * @param sprite The texture to bake + * @return A baked model representing the flat 3D form of the given texture + */ + public IFlexibleBakedModel bakeModelFromIcon(TextureAtlasSprite sprite) { + + } + + /** + * From 1.7, takes a sprite and renders it in the "flat 3D" style of held items + * Use this ONLY for sprites that don't have a corresponding item! + * For items, use built in methods that use the bakedmodel since those are much more efficient + * Args: tess, maxu, minv, minu, maxv, width, height, thickness(?) + * todo 1.8 find a replacement for this method, possibly the above bakeModelFromIcon + */ + public static void renderItemIn2D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float p_78439_7_) + { + WorldRenderer wr = tess.getWorldRenderer(); + wr.startDrawingQuads(); + wr.setNormal(0.0F, 0.0F, 1.0F); + wr.addVertexWithUV(0.0D, 0.0D, 0.0D, (double)p_78439_1_, (double)p_78439_4_); + wr.addVertexWithUV(1.0D, 0.0D, 0.0D, (double)p_78439_3_, (double)p_78439_4_); + wr.addVertexWithUV(1.0D, 1.0D, 0.0D, (double)p_78439_3_, (double)p_78439_2_); + wr.addVertexWithUV(0.0D, 1.0D, 0.0D, (double)p_78439_1_, (double)p_78439_2_); + tess.draw(); + wr.startDrawingQuads(); + wr.setNormal(0.0F, 0.0F, -1.0F); + wr.addVertexWithUV(0.0D, 1.0D, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)p_78439_2_); + wr.addVertexWithUV(1.0D, 1.0D, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)p_78439_2_); + wr.addVertexWithUV(1.0D, 0.0D, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)p_78439_4_); + wr.addVertexWithUV(0.0D, 0.0D, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)p_78439_4_); + tess.draw(); + float f5 = 0.5F * (p_78439_1_ - p_78439_3_) / (float)width; + float f6 = 0.5F * (p_78439_4_ - p_78439_2_) / (float)height; + wr.startDrawingQuads(); + wr.setNormal(-1.0F, 0.0F, 0.0F); + int k; + float f7; + float f8; + + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + wr.addVertexWithUV((double)f7, 0.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_4_); + wr.addVertexWithUV((double)f7, 0.0D, 0.0D, (double)f8, (double)p_78439_4_); + wr.addVertexWithUV((double)f7, 1.0D, 0.0D, (double)f8, (double)p_78439_2_); + wr.addVertexWithUV((double)f7, 1.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_2_); + } + + tess.draw(); + wr.startDrawingQuads(); + wr.setNormal(1.0F, 0.0F, 0.0F); + float f9; + + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + f9 = f7 + 1.0F / (float)width; + wr.addVertexWithUV((double)f9, 1.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_2_); + wr.addVertexWithUV((double)f9, 1.0D, 0.0D, (double)f8, (double)p_78439_2_); + wr.addVertexWithUV((double)f9, 0.0D, 0.0D, (double)f8, (double)p_78439_4_); + wr.addVertexWithUV((double)f9, 0.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_4_); + } + + tess.draw(); + wr.startDrawingQuads(); + wr.setNormal(0.0F, 1.0F, 0.0F); + + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + f9 = f7 + 1.0F / (float)height; + wr.addVertexWithUV(0.0D, (double)f9, 0.0D, (double)p_78439_1_, (double)f8); + wr.addVertexWithUV(1.0D, (double)f9, 0.0D, (double)p_78439_3_, (double)f8); + wr.addVertexWithUV(1.0D, (double)f9, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)f8); + wr.addVertexWithUV(0.0D, (double)f9, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)f8); + } + + tess.draw(); + wr.startDrawingQuads(); + wr.setNormal(0.0F, -1.0F, 0.0F); + + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + wr.addVertexWithUV(1.0D, (double)f7, 0.0D, (double)p_78439_3_, (double)f8); + wr.addVertexWithUV(0.0D, (double)f7, 0.0D, (double)p_78439_1_, (double)f8); + wr.addVertexWithUV(0.0D, (double)f7, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)f8); + wr.addVertexWithUV(1.0D, (double)f7, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)f8); + } + + tess.draw(); + } + } \ No newline at end of file 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 f63a795a6..f20023109 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.tile; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; @@ -43,66 +44,72 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePl TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; MobSpawnerBaseLogic logic = spawner.getSpawnerBaseLogic(); - if(!((Boolean) isActivated.invoke(logic))) { - if(!worldObj.isRemote) - mana -= 6; + try { + if(!((Boolean) isActivated.invoke(logic))) { + if(!worldObj.isRemote) + mana -= 6; - if(logic.getSpawnerWorld().isRemote) { - if(logic.spawnDelay > 0) - --logic.spawnDelay; + if(logic.getSpawnerWorld().isRemote) { + if(logic.spawnDelay > 0) + --logic.spawnDelay; - if(Math.random() > 0.5) - Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + if(Math.random() > 0.5) + Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); - logic.prevMobRotation = logic.getMobRotation(); - logic.mobRotation = (logic.getMobRotation() + 1000.0F / (logic.spawnDelay + 200.0F)) % 360.0D; - } else if(logic.spawnDelay == -1) - resetTimer(logic); + logic.prevMobRotation = logic.getMobRotation(); + logic.mobRotation = (logic.getMobRotation() + 1000.0F / (logic.spawnDelay + 200.0F)) % 360.0D; + } else if(logic.spawnDelay == -1) + resetTimer(logic); - if(logic.spawnDelay > 0) { - --logic.spawnDelay; - return; - } + if(logic.spawnDelay > 0) { + --logic.spawnDelay; + return; + } - boolean flag = false; + boolean flag = false; - int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); - int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); - int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); + int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); + int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); + int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); - for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(logic.getEntityNameToSpawn(), logic.getSpawnerWorld()); + for(int i = 0; i < spawnCount; ++i) { + Entity entity = EntityList.createEntityByName(logic.getEntityNameToSpawn(), logic.getSpawnerWorld()); - if (entity == null) - return; + if (entity == null) + return; - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.func_177221_b(), logic.func_177221_b().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.func_177221_b(), logic.func_177221_b().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); - if (j >= maxNearbyEntities) { - resetTimer(logic); - return; - } + if (j >= maxNearbyEntities) { + resetTimer(logic); + return; + } - double d2 = logic.func_177221_b().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - double d3 = logic.func_177221_b().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; - double d4 = logic.func_177221_b().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; - entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); + double d2 = logic.func_177221_b().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d3 = logic.func_177221_b().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; + double d4 = logic.func_177221_b().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; + entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); - if(entityliving == null || entityliving.getCanSpawnHere()) { - if(!worldObj.isRemote) - logic.func_98265_a(entity); - logic.getSpawnerWorld().playAuxSFX(2004, logic.func_177221_b(), 0); + if(entityliving == null || entityliving.getCanSpawnHere()) { + if(!worldObj.isRemote) + logic.func_98265_a(entity); + logic.getSpawnerWorld().playAuxSFX(2004, logic.func_177221_b(), 0); - if (entityliving != null) - entityliving.spawnExplosionParticle(); + if (entityliving != null) + entityliving.spawnExplosionParticle(); - flag = true; - } - } + flag = true; + } + } - if (flag) - resetTimer(logic); + if (flag) + resetTimer(logic); + } + } catch (IllegalAccessException e) { + Botania.instance.handleIMC(); + } catch (InvocationTargetException e) { + e.printStackTrace(); } } } diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 6028af953..56c9f1bc3 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -17,6 +17,7 @@ import java.math.RoundingMode; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; @@ -61,20 +62,24 @@ public class Vector3 return new Vector3(this); } + public static Vector3 fromBlockPos(BlockPos pos) { + return new Vector3(pos.getX(), pos.getY(), pos.getZ()); + } + public static Vector3 fromEntity(Entity e) { return new Vector3(e.posX, e.posY, e.posZ); } public static Vector3 fromEntityCenter(Entity e) { - return new Vector3(e.posX, e.posY - e.yOffset + e.height / 2, e.posZ); + return new Vector3(e.posX, e.posY - /*e.yOffset todo 1.8 */ 0 + e.height / 2, e.posZ); } public static Vector3 fromTileEntity(TileEntity e) { - return new Vector3(e.xCoord, e.yCoord, e.zCoord); + return fromBlockPos(e.getPos()); } public static Vector3 fromTileEntityCenter(TileEntity e) { - return new Vector3(e.xCoord + 0.5, e.yCoord + 0.5, e.zCoord + 0.5); + return fromTileEntity(e).add(0.5); } public Vector3 set(double d, double d1, double d2) { diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java index eb846ed31..bcf6a78c5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java @@ -18,14 +18,14 @@ import vazkii.botania.common.lib.LibOreDict; public final class ModPureDaisyRecipes { public static void init() { - BotaniaAPI.registerPureDaisyRecipe("stone", ModBlocks.livingrock, 0); - BotaniaAPI.registerPureDaisyRecipe("logWood", ModBlocks.livingwood, 0); + BotaniaAPI.registerPureDaisyRecipe("stone", ModBlocks.livingrock.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe("logWood", ModBlocks.livingwood.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.cobblestone, 0); - BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.sand, 0); - BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.packed_ice, 0); - BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.obsidian, 0); - BotaniaAPI.registerPureDaisyRecipe(Blocks.water, Blocks.snow, 0); + 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/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 4f4d62bb0..e8eecdbb4 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 @@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -24,7 +23,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -124,7 +122,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, 0.15F, -0.39F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); + IconHelper.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index b0797ca33..b88b0a717 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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 03f6ce547..43915808e 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 @@ -18,6 +18,7 @@ import java.util.Map; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; @@ -113,7 +114,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != 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 fa44d39e3..5ded3be7f 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 @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; @@ -221,7 +222,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, armor ? -0.3F : -0.25F); 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 4787c2470..4e1171c70 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; 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 5bcfc272e..e58917198 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 @@ -13,7 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -108,7 +108,8 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.25F, -0.5F, 0F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - RenderBlocks.getInstance().renderBlockAsItem(ModBlocks.tinyPlanet, 0, 1F); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F); +// RenderBlocks.getInstance().renderBlockAsItem(ModBlocks.tinyPlanet, 0, 1F); todo 1.8 } } 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 441150355..6ee95b1bc 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 @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; 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 b2e5e90bf..f23181ff7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -26,6 +26,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; @@ -62,6 +63,15 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve MinecraftForge.EVENT_BUS.register(this); } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + tailIcon = IconHelper.forName(evt.map, "tail"); + phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower"); + goldfishIcon = IconHelper.forName(evt.map, "goldfish"); + nerfBatIcon = IconHelper.forName(evt.map, "nerfBat"); + } + @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; @@ -128,19 +138,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve par3List.add(new ItemStack(par1, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[types]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forName(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]); - - tailIcon = IconHelper.forName(par1IconRegister, "tail"); - phiFlowerIcon = IconHelper.forName(par1IconRegister, "phiFlower"); - goldfishIcon = IconHelper.forName(par1IconRegister, "goldfish"); - nerfBatIcon = IconHelper.forName(par1IconRegister, "nerfBat"); - } - @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 96da44966..878840508 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -104,10 +104,10 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } - @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return isFlying(par1ItemStack) ? iconFlying : iconIdle; - } +// @Override todo 1.8 +// public IIcon getIconIndex(ItemStack par1ItemStack) { +// return isFlying(par1ItemStack) ? iconFlying : iconIdle; +// } @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { @@ -119,12 +119,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi return 720000; } - @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconIdle = IconHelper.forItem(par1IconRegister, this, 0); - iconFlying = IconHelper.forItem(par1IconRegister, this, 1); - } - public boolean isFlying(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, TAG_FLYING, false); } @@ -150,7 +144,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi if(tile.getCurrentMana() >= COST && tile.isEnabled()) { int range = 5; int rangeY = 3; - List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(te.xCoord + 0.5 - range, te.yCoord + 0.5 - rangeY, te.zCoord + 0.5 - range, te.xCoord + 0.5 + range, te.yCoord + 0.5 + rangeY, te.zCoord + 0.5 + range)); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(te.getPos().add(-0.5 + range, -0.5 + rangeY, -0.5 + range), te.getPos().add(0.5 + range, 0.5 + rangeY, 0.5 + range))); for(EntityPlayer p : players) { if(p.motionY > 0.3 && p.motionY < 2 && !p.isSneaking()) { p.motionY = 2.8; From 6b03424e2c8826ed5e6fd0d9f2a84280c480c235 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 14 Dec 2015 12:46:31 -0600 Subject: [PATCH 060/935] Commit before merging upstream --- .../handler/ContributorFancinessHandler.java | 35 +++++++++------- .../client/core/helper/IconHelper.java | 42 +++++++++++++++---- .../client/core/proxy/ClientProxy.java | 31 ++++++-------- .../vazkii/botania/client/fx/FXSparkle.java | 1 + .../integration/nei/RecipeHandlerBrewery.java | 1 + .../nei/RecipeHandlerElvenTrade.java | 16 ++++++- .../nei/RecipeHandlerManaPool.java | 1 + .../nei/RecipeHandlerPetalApothecary.java | 1 + .../nei/RecipeHandlerPureDaisy.java | 5 ++- .../botania/client/lib/LibResources.java | 2 +- .../botania/client/model/ModelPylon.java | 16 ++++--- .../client/render/entity/RenderPixie.java | 3 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 30 ++++++------- .../render/tile/RenderTileSpreader.java | 14 +++---- .../render/tile/RenderTileTinyPotato.java | 16 +++---- .../core/handler/InternalMethodHandler.java | 16 +++---- .../item/material/ItemManaResource.java | 17 +++++++- .../models/item/dank_memes/goldfish.json | 6 +++ .../models/item/dank_memes/nerfBat.json | 6 +++ .../models/item/dank_memes/phiFlower.json | 6 +++ .../botania/models/item/dank_memes/tail.json | 6 +++ 22 files changed, 179 insertions(+), 94 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/dank_memes/goldfish.json create mode 100644 src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json create mode 100644 src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json create mode 100644 src/main/resources/assets/botania/models/item/dank_memes/tail.json 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 ef9d02f7f..5edf034a2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -20,12 +20,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -108,13 +108,13 @@ public final class ContributorFancinessHandler { GlStateManager.rotate(r, 0F, 0F, 1F); float s = 0.9F; GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.rotate(-r, 0F, 0F, 1F); GlStateManager.translate(-t, -0F, 0F); GlStateManager.scale(-1F, 1F, 1F); GlStateManager.translate(t, -0F, 0F); GlStateManager.rotate(r, 0F, 0F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -134,7 +134,7 @@ public final class ContributorFancinessHandler { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(-1.2F, 0.2F, 0.125F); GlStateManager.rotate(20F, 1F, 0F, 0F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -152,7 +152,7 @@ public final class ContributorFancinessHandler { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(1.2F, 0.5F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -160,19 +160,24 @@ public final class ContributorFancinessHandler { GlStateManager.pushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(-0.5F, 0.7F, 0F); - ShaderHelper.useShader(ShaderHelper.gold); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, event.entityPlayer, ItemCameraTransforms.TransformType.THIRD_PERSON); ShaderHelper.releaseShader(); GlStateManager.popMatrix(); + +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// GlStateManager.rotate(180F, 0F, 0F, 1F); +// GlStateManager.rotate(90F, 0F, 1F, 0F); +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// GlStateManager.translate(-0.5F, 0.7F, 0F); +// +// ShaderHelper.useShader(ShaderHelper.gold); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// ShaderHelper.releaseShader(); +// GlStateManager.popMatrix(); } public static class ThreadContributorListLoader extends Thread { diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 88cb4e9ae..a77ea5552 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,15 +10,34 @@ */ package vazkii.botania.client.core.helper; +import com.google.common.base.Function; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ITransformation; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Locale; public final class IconHelper { @@ -62,15 +81,22 @@ public final class IconHelper { return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s); } - private static String json - /** - * Takes an icon, generates a "flat 3D" model in the style of held items. - * Used for rendering icons in 3D that have no item form - * @param sprite The texture to bake - * @return A baked model representing the flat 3D form of the given texture - */ - public IFlexibleBakedModel bakeModelFromIcon(TextureAtlasSprite sprite) { + * Load and bake an arbitrary model + */ + public static IFlexibleBakedModel loadAndBakeArbitraryModel(ResourceLocation location) { + + try { + IModel unbaked = ModelLoaderRegistry.getModel(location); + return unbaked.bake(unbaked.getDefaultState(), DefaultVertexFormats.ITEM, new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }); + } catch (IOException ex) { + return null; + } } 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 a2e0ed39c..a24393a08 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -71,11 +71,6 @@ import vazkii.botania.client.render.entity.RenderPixie; import vazkii.botania.client.render.entity.RenderPoolMinecart; import vazkii.botania.client.render.entity.RenderSpark; import vazkii.botania.client.render.entity.RenderThornChakram; -import vazkii.botania.client.render.item.RenderBow; -import vazkii.botania.client.render.item.RenderFloatingFlowerItem; -import vazkii.botania.client.render.item.RenderLens; -import vazkii.botania.client.render.item.RenderLexicon; -import vazkii.botania.client.render.item.RenderTransparentItem; import vazkii.botania.client.render.tile.RenderTileAlfPortal; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.client.render.tile.RenderTileAvatar; @@ -266,19 +261,19 @@ public class ClientProxy extends CommonProxy { // IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); // IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); - RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); - RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); - RenderBow renderBow = new RenderBow(); - - MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); - if(ConfigHandler.lexicon3dModel) - MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); - MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); - MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); - MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); - MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); +// RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); +// RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); +// RenderBow renderBow = new RenderBow(); +// +// MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); +// if(ConfigHandler.lexicon3dModel) +// MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); +// MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); +// MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); +// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); +// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); +// MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); +// MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 45c6d56e4..af2a3251a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -15,6 +15,7 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java index 830a7b8cf..0bf9034b8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java @@ -4,6 +4,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java index 870dd6c7c..675933e27 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java @@ -5,7 +5,10 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -91,7 +94,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80); GlStateManager.disableBlend(); GuiDraw.changeTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48); + renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48, 240); // todo 1.8 } private static boolean hasElvenKnowledge() { @@ -150,4 +153,15 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.draw(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java index 7a8c35c85..4fe4ecfd6 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java index 0f174053e..75c5e2315 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java @@ -4,6 +4,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java index d1d89d75b..0f97d663c 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; @@ -39,7 +40,7 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 23)); else inputs.add(new PositionedStack(new ItemStack((Block) recipe.getInput()), 42, 23)); - output = new PositionedStack(new ItemStack(recipe.getOutput()), 101, 23); + output = new PositionedStack(new ItemStack(recipe.getOutputState().getBlock()), 101, 23); // todo 1.8 getOutput -> getOutputState } @Override @@ -117,7 +118,7 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { if(recipe == null) continue; - if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(recipe.getOutput()), result)) + if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(recipe.getOutputState().getBlock()), result)) // todo 1.8 getOutput -> getOutputState arecipes.add(new CachedPureDaisyRecipe(recipe)); } } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b6237a71c..49a7d1b80 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -12,7 +12,7 @@ package vazkii.botania.client.lib; public final class LibResources { - public static final String PREFIX_MOD = "botania:"; + public static final String PREFIX_MOD = "botania:"; // todo 1.8 take out the colon? public static final String PREFIX_LANG = "/assets/botania/lang/"; public static final String PREFIX_SHADER = "/assets/botania/shader/"; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 3b90bf371..ff5a29736 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -11,31 +11,29 @@ package vazkii.botania.client.model; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; import vazkii.botania.client.lib.LibResources; public class ModelPylon implements IPylonModel { - private IModelCustom model; - + //private IModelCustom model; + // todo 1.8 restore public ModelPylon() { - model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); + //model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); } @Override public void renderCrystal() { - model.renderPart("Crystal"); + //model.renderPart("Crystal"); } @Override public void renderRing() { - model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + //model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); } @Override public void renderGems() { - for(int i = 1; i < 5; i++) - model.renderPart("Ring_Gem0" + i); + //for(int i = 1; i < 5; i++) + //model.renderPart("Ring_Gem0" + i); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 211634c9e..8f19ec82b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; @@ -43,7 +44,7 @@ public class RenderPixie extends RenderLiving { }; public RenderPixie() { - super(new ModelPixie(), 0.25F); + super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } 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 4e0551539..3d8c13c94 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -42,7 +42,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0F, 0F, pos); - RenderLens.render(stack, lens.getLensColor(stack)); + // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index e24e4e8c1..f787800d1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -42,20 +43,21 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 42d984661..6eba216f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -90,7 +90,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(-0.4F, -1.4F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - RenderLens.render(stack, lens.getLensColor(stack)); + // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); GlStateManager.popMatrix(); } @@ -99,26 +99,26 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { Block block = Blocks.carpet; int color = spreader.paddingColor; - RenderBlocks render = RenderBlocks.getInstance(); + //RenderBlocks render = RenderBlocks.getInstance(); float f = 1F / 16F; GlStateManager.translate(0F, -f, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.translate(0F, -f * 15, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.pushMatrix(); GlStateManager.scale(f * 14F, 1F, 1F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.popMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0F, 0F, -f / 2); GlStateManager.scale(f * 14F, 1F, f * 15F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.translate(0F, f * 15F, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); todo 1.8 } GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 436d76f04..31e9bc314 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -199,7 +199,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, 0.5F, 0F); GlStateManager.scale(0.3F, 0.3F, 0.3F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.iron_ore, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.iron_ore.getDefaultState(), 1F); } else if(name.equals("profmobius")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -255,7 +255,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { } else if(name.equals("nebris")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 1F, 0F, 0F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.glowstone, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.glowstone.getDefaultState(), 1F); } else if(name.equals("ible")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); @@ -263,7 +263,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.portal, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.portal.getDefaultState(), 1F); } else if(name.equals("razz") || name.equals("razzleberryfox")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -281,7 +281,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.2F, 1.2F, 1.2F); GlStateManager.translate(0F, 0.9F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.command_block, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.command_block.getDefaultState(), 1F); } else if(name.equals("bdoubleo100") || name.equals("bdoubleo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -299,7 +299,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(1.5F, -0.5F, 0.7F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.cake, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState()); } else if(name.equals("sjin")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -334,11 +334,11 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1F, -1F, -1F); MovingObjectPosition pos = mc.objectMouseOver; - if(!name.isEmpty() && pos != null && pos.blockX == potato.xCoord && pos.blockY == potato.yCoord && pos.blockZ == potato.zCoord) { + if(!name.isEmpty() && pos != null && pos.getBlockPos().equals(potato.getPos())) { GlStateManager.pushMatrix(); GlStateManager.translate(0F, -0.6F, 0F); - GlStateManager.rotate(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; float f1 = 0.016666668F * f; GlStateManager.scale(-f1, -f1, f1); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index affef4d54..c6faaf319 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,8 +13,8 @@ package vazkii.botania.common.core.handler; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +27,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; @@ -98,16 +97,17 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public TextureAtlasSprite getSubTileIconForName(String name) { - IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); - return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; +// IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); +// return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; todo 1.8 + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:red_flower"); } @Override public void registerBasicSignatureIcons(String name, TextureMap map) { - IIcon normal = IconHelper.forName(register, name); - IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); - BlockSpecialFlower.icons.put(name, normal); - BlockSpecialFlower.iconsAlt.put(name, alt == null ? normal : alt); +// IIcon normal = IconHelper.forName(register, name); todo 1.8 +// IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); +// BlockSpecialFlower.icons.put(name, normal); +// BlockSpecialFlower.iconsAlt.put(name, alt == null ? normal : alt); } @Override 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 f23181ff7..cb75ee1d7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -12,8 +12,10 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; +import java.util.Locale; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +27,11 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; @@ -44,12 +49,13 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibMisc; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { final int types = 23; - // begin dank_memes + // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed public TextureAtlasSprite tailIcon = null; public TextureAtlasSprite phiFlowerIcon = null; public TextureAtlasSprite goldfishIcon = null; @@ -72,6 +78,15 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve nerfBatIcon = IconHelper.forName(evt.map, "nerfBat"); } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/phiFlower", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/phiFlower"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/goldfish", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/goldfish"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat"))); + } + @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; diff --git a/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json b/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json new file mode 100644 index 000000000..d837ff588 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/goldfish" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json b/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json new file mode 100644 index 000000000..4d029c6cf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/nerfBat" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json b/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json new file mode 100644 index 000000000..569ced203 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/phiFlower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/tail.json b/src/main/resources/assets/botania/models/item/dank_memes/tail.json new file mode 100644 index 000000000..2e50e9e57 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/tail.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/tail" + } +} \ No newline at end of file From b8a1a9cd5deb6c47b197dd831509c177c345fa94 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 12:24:28 -0600 Subject: [PATCH 061/935] Some 1.8.8 fixes before merging upstream --- ForgeGradle-2.1-20151213.034144-13.jar.1 | Bin 0 -> 1037758 bytes build.gradle | 34 ++++++++++-------- build.properties | 4 +-- .../botania/api/corporea/CorporeaHelper.java | 6 ++-- .../client/core/handler/HUDHandler.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/gui/bag/InventoryFlowerBag.java | 6 ++-- .../client/gui/box/InventoryBaubleBox.java | 6 ++-- .../client/gui/lexicon/GuiLexicon.java | 2 +- .../client/render/item/RenderLexicon.java | 5 +-- .../botania/common/block/BlockEnderEye.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 6 ++-- .../botania/common/block/BlockHourglass.java | 2 +- .../common/block/BlockLightLauncher.java | 4 +-- .../botania/common/block/BlockLightRelay.java | 2 +- .../common/block/BlockPistonRelay.java | 2 +- .../common/block/BlockSpecialFlower.java | 4 +-- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../common/block/decor/BlockShimmerrock.java | 1 - .../decor/walls/BlockBiomeStoneWall.java | 1 + .../common/block/mana/BlockManaDetector.java | 2 +- .../string/BlockRedStringInterceptor.java | 2 +- .../subtile/functional/SubTileBellethorn.java | 1 - .../subtile/functional/SubTileDreadthorn.java | 1 - .../common/block/tile/TileAlfPortal.java | 4 +-- .../botania/common/block/tile/TileAltar.java | 6 ++-- .../botania/common/block/tile/TileAvatar.java | 6 ++-- .../common/block/tile/TileBifrost.java | 4 +-- .../common/block/tile/TileBrewery.java | 6 ++-- .../botania/common/block/tile/TileCocoon.java | 4 +-- .../common/block/tile/TileEnchanter.java | 4 +-- .../common/block/tile/TileEnderEye.java | 4 +-- .../common/block/tile/TileForestEye.java | 4 +-- .../common/block/tile/TileHourglass.java | 6 ++-- .../common/block/tile/TileIncensePlate.java | 6 ++-- .../common/block/tile/TileLightRelay.java | 4 +-- .../common/block/tile/TileManaBeacon.java | 4 +-- .../common/block/tile/TileManaFlame.java | 4 +-- .../common/block/tile/TileOpenCrate.java | 6 ++-- .../botania/common/block/tile/TilePylon.java | 4 +-- .../common/block/tile/TileRuneAltar.java | 6 ++-- .../block/tile/TileSimpleInventory.java | 4 +-- .../common/block/tile/TileSparkChanger.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 4 +-- .../common/block/tile/TileSpecialFlower.java | 4 +-- .../common/block/tile/TileSpiritShrine.java | 4 +-- .../common/block/tile/TileStarfield.java | 4 +-- .../common/block/tile/TileTerraPlate.java | 9 ++--- .../common/block/tile/TileTeruTeruBozu.java | 4 +-- .../common/block/tile/TileTinyPlanet.java | 4 +-- .../common/block/tile/TileTinyPotato.java | 4 +-- .../corporea/TileCorporeaCrystalCube.java | 6 ++-- .../tile/corporea/TileCorporeaFunnel.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 6 ++-- .../corporea/TileCorporeaInterceptor.java | 2 +- .../common/block/tile/mana/TileBellows.java | 4 +-- .../block/tile/mana/TileDistributor.java | 4 +-- .../block/tile/mana/TileManaDetector.java | 8 +++-- .../common/block/tile/mana/TilePool.java | 4 +-- .../common/block/tile/mana/TilePrism.java | 2 +- .../common/block/tile/mana/TilePump.java | 4 +-- .../block/tile/mana/TileRFGenerator.java | 4 +-- .../common/block/tile/mana/TileSpreader.java | 6 ++-- .../common/block/tile/mana/TileTurntable.java | 4 +-- .../block/tile/string/TileRedString.java | 4 +-- .../tile/string/TileRedStringContainer.java | 10 +++--- .../tile/string/TileRedStringInterceptor.java | 4 +-- .../common/core/command/CommandShare.java | 2 +- .../common/core/handler/AliasHandler.java | 5 +-- .../common/core/helper/InventoryHelper.java | 6 ++-- .../common/core/version/AdaptorNotifier.java | 4 +-- .../common/crafting/ModCraftingRecipes.java | 3 +- .../crafting/ModManaInfusionRecipes.java | 3 +- .../common/entity/EntityDoppleganger.java | 6 ++-- .../common/entity/EntityThrowableCopy.java | 2 +- .../botania/common/item/ItemBottledMana.java | 2 +- .../botania/common/item/ItemTwigWand.java | 6 ++-- .../botania/common/item/ItemWorldSeed.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 3 +- .../item/equipment/bauble/ItemIcePendant.java | 4 +-- .../item/equipment/bauble/ItemMagnetRing.java | 17 --------- .../item/equipment/tool/ItemThunderSword.java | 5 ++- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/terrasteel/ItemTerraSword.java | 4 +-- .../common/item/lens/LensInfluence.java | 7 ++-- .../common/item/relic/ItemExcaliber.java | 4 +-- .../botania/common/item/relic/ItemRelic.java | 4 +-- 87 files changed, 193 insertions(+), 196 deletions(-) create mode 100644 ForgeGradle-2.1-20151213.034144-13.jar.1 diff --git a/ForgeGradle-2.1-20151213.034144-13.jar.1 b/ForgeGradle-2.1-20151213.034144-13.jar.1 new file mode 100644 index 0000000000000000000000000000000000000000..68587665d454c1a56a819acb5a4790d2b6f4966d GIT binary patch literal 1037758 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�@_H=Dl+`Tb&1XWGi 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 z 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%0A=1oZVR?@`F!rM+bsnF%f9v8|pn9evIaJ- zXO`Q|+I@onD08HNrfI5oGI5OL2CPgQ_P)@IqoBjpL(knyUdJ81+M_aJfaKtcdJUhw zjwYDqOlK&Xg*)n*5CWV{*9ofELQz1JhmNb>pNfk1`X`_6!yfNyGO7hMuSKZ?N8RnL z7z=H5;#;^MGU78(yA~U9cEC%5U;t<(4+?o?jyb4yUqcFbWTs42Y6oUj>n_$ZCCP=R zkYg$FN?WDv8NcluZ_`kaj(5E4;V&t+v#f;hLYyL>pE?xIOA72MJy2MdSX&n8$vf&l z@8AH}mO!3rOaV%Pqn zezA;OTMJjIFR~z`D7npv%A+v-9wy!`KBQ5BsNjFxZ9u#e#}+M*y5IH5@2n|k&(pJDQlP= z>>lJ6gJWygi#zZf$_f~8PBcKr(-1%bj^X3M&!dejnS#QyLq!jGwgo07{wgWPXU z8h=cWKw{rQkuW7)hDugyW;NJqOUoDlee6Rco%v!CGMh85Q)JR>-sp&bfP7lsR|M%0 z+OdqJVc7b9Ly_`+a?66mt)Tg<*eA72)^v~lH4MC2maz*jKdbS zTAzOJ=Wpk*y<+sK$B1|ti=vE1lK`F3TkR;C*5VrD-bscXdFqkA$O?0076y+WI^Y81 zDo0p*&6W%?YWtsOY2|01rwjW-0}%fD#r$uv0srx=5;3y=2e0Jtk0({5Dx|C8vfYmc+#M$6hJ0)r~s8ywO3ZEP*3s^H42LAf( zAVF_dypEtuY+wSE3qXN+ZsjuPmlowwX`sxgN92*m5xr$GTvrYpyXik#F>iD2KtDAb z(8--DX;fJeFK&Mw7p2%nvKHU82hL#*%{p6=csefV0%HscQg0{*Q~DrAUn*IciA`cg z)Ka>}VMKdQnD<9oc)H}m(LGMtnbr#OOrmI663LvZ8Ld`Z{-QKrtyJdTxtu#b-hKx)!WZJS|Ku)Ju77)-LK~`iVWj%uQr&O8C8%D5*vq;bq=3z0i^Y`0z`5h$fo&h!$sX6HqU~-= z{Q_#9y{RnYOG;1o89mDmIpVksMh$-XTpM|M zQ&z+-O^a~i&2f!AwLSgIa;+#2QoK`S*NN?Fmvebj)%qJK5-kC`)t}E4H#2NCb%J6aKX67__FOt}shm2jb3zxyf2>kPgsosa@hg2K_79u;aqNK^xTK3d-t z28;f-7zHvOk?Jz7osJsU7=n_M0qyBPrnNQ+L1KtUr|gqg$Xy`Hn{5}mI7Ir%d)T+S9<1cg&qI3rmV2KpA242LyXvqSWUq}(Q= z6A7%^bc0FI5f#J~Vc71TWC{xIgLH@5rwq3uF9sk63J7QZi5QzLIgL?HOOsU({%#DH&Lm?zrMCYlhij^B;^UY zV`)(th%19Q*+%#-4KUbes8N`YfwP&7eV#eMj;y;*zM%OADCL3zF9*XeUWzUfUG9UY zxq;@!xuo4uJ5{5<&r2)wIXNluZdX1Z<2`mO+|lZ}SP3`m zSEXr#bHT{d7^b-j{uqV`?z9oJ^<@r>vb z#;Z-GCI{AHgHVsB#OjQk*r;2~)1+5W zT!7x+T_NeO5D)&M>`Z+&ajf+5^`k_7;}z%JX4rw(m4q?7S5CmZ1EIgiUzvDrk#!)H zXGrdL4jZK05sPId4B~Rzfe;=2n)E+Sn40NBll^|-* z%<64OD<}!rWDmShZZcPP1RQ?RE&6+oNlfMXAXZ5$qm6I~q(PV1Ac1Zi4bGyhX|#YT zZx*)1y6d$p*OBYfbGN~(rbNt|UA|<(%!o}{sY-4(7NsZ??S2l8NR_&SBp|k+kw>Fs zq5Bs=w5CDRiQYE>^08cE3AKXr^-Y%fFc$51H5rl=N^>;K(+S0z^okl)kcVo=`spJ$ z_pdXOL5>0ic>LZ}z1pdekTS+0UF&lXMxZ@jh8iq^^-Ndc;nA!mnLql)>8^ z5E>Y{0MUKPOfmWz@Fcgl2c{w*OO8y4c?3%2#v1e%qB6Na0h<2&w6#wRP*VsziE$;+NZLUb_?XEEG{zotu`FT>P?*L`c&z9jDuAna{6+t zhJtbXyKyAJ>`KYxG`S(&wXMTN}A-z)Cjd-1kd-z+CphY&Hc2I*T7}pQv)cq;al;2n0lsx_ z0=dF8YrR7ScB{NFcZ{mAOv)W$<%;EDn}+=jzxO2fwrbP*QdxMiegYY${)?h!R%r72 zE$|p;?Okb#KK9Q01H(Jhd>LUHcAq800b9)G%5I7*u3pv-m;#DZZ-=q>1AQqvSnh%6 z7uyRqzSN~xS?ds5?j=De9Yt}3hxS$`r z0a!UfZ!&xsP;d>gen*6RVI`aYYh~^&BAyFA!rMb?IS!{pD)a2HJE;t8T`mZBRK+?_+iW5BK0=HX($}?NSC&*0H9i3t}o$$2kts7GIV1piR9= zj0mcC@Duora}i`pHo2}h1kS$M-qYL4{p|s$tFsOK5%%G;nB0U)e@jFv2)A@k^^P^5 z3xE+T&GJJr!zAE>n%-`VQ$@oAB%wGB}jMKAR=R z(9v%)Ra_;_p3O>Ohsh*7ORmUPH?^jS(YajX4QGsM;fM{&ePdHg?+8^jNl${{c?I?p zrrfkkCXS$*`OB*@CyR(B@kl)z@89$I-c{XyHwzSnT^*0jDyW66qqlT?Za)uotA!sz zzJEUn@w0(M#LsKBZ0%Ley;P&-gx?C#xCfrcY=+eQ>GRaoRd-9;y;4~5J+49Y3F>t9 z)w>r8YDz{g=axWy<+OSOzTFR}2h@pkd#R)BQ85JXA|JnDG83`pWbT;$|rrjq!v_-LEpgZ#Urz_&Q_3ML>K&IWYT_(yt*jfZ0 z`$JQFFL;AqfeIJ$ma?vxPUS;GNWIkb;R4blYKQvdmL93#YkKnziBI?;{fqk- z$Eq?j5+S!Va-VvVZPiIQ=VNb4SD(Ex#$gSO5HVuF8f621)OO~B-n$r`x7L_$Td5I$ zgR|uBN!Ik8kML?BqaBRc!lG!NdR`m;;)CbAm!D_!OA(!QUu|i?d1OS>Fk9Y z0maT)*bcMubsf~*?pAL+jkBJ$Rlr8xcqh4L|Ep{;qK9Vf^@snV{NM6F|EZKpR9OEB zD~IDsXB9I*5lx@t&xJG1iE3pPyjdtifWY;YBo$W*9geJb+GulbTm^bl!R3o}{XcQ# zE48v>;eyx~t*%q44E5*#;D7wIgaMi*k>nU^!`6udUBp!>a;Ib${B>1r=o>af&5vnA z3W^7^w!#x>{^*2ylV%d+cKRw#Jq=iwyXv^R`_H8FA)QbKJuh9@y68j%B8H8)Y(0I& znqAPNUAEAmQ@0Clq5pX*ScC73p@+1-2(?uy!40i1h=uwO{)arQz&u!=H6g)`zP|5G z0fX+jHr0_mpYruCWi8e(MsLX zbh6%1BY>g(R@CiBHx8x#sd14H#HZm7?>4{}!Xgj5=MC<{cBPk@AHWtxPZNZRm+#O{@m@i3XAP6aK$jlX6uex3egHf9j7A^i)gCeV0TCdo{O$|%KT|-4ahPg%KjU=wlX}noZ&5)1sVNe2 zbu_YeFtf2H{LkjGOnHs}=%V^6df-n+R>|1`Ms76Kh?FS11@@yuMx1aLqxH(R4!(>t z8k&#>|A0gA2_g;)h5h>FlW;p>EtT^$$bB)vww-a!k<8WY{rv)-6KRZ0v|%qhWCdET z>M+u&(7Oq7MVBy%D}9a$B?Cwn;e#dtZ{B6|lo%C&W40v|@Ex0Oi`($c-R%+;8Dmy) zKz!S*kDhK7v^m81yBC0G&%4j)p!@t!$c!a(JJev*8D!8nKxpS5?5BXQ9uIIlNM8uI zxkL7*FEGkA6tte5D{(SMl3g=$FgIo)p+}Mh#a-9_qqkz_F`-jLkm}h99fQN}Fho8Y z37_2XfHQ3@G3%f-2rXFr%7s}m>^U(-@tY-~T&q1+5AzZMJ+GiO*T85iPG}R6paQt@ zlSo>?#p;|Z{XfrIinQl>VW89)C9SIbkzZGg@w%!Rva|y4--9L5qAAJvyCiwr$ZPu5 z3gOi=8^ngWbPE{q%?4QsQ)0T2Ppy*aQ=HRJ(o0ZYN~{g=4u)JJcmhZ2u-(3m*j^&L zkgdQij!9%-tb;`C$>9046Z;S`YLKdg5v%A?18a^NLzd?hE9l1D(PUm@2^*ZmDtFp& zK5hfgA|LYSP=j`Nr)>6Sio);|Y70u5<5%Y`vAN|f;L()pMr0JIKL4UlTUaeYT>jBA zC&2#?iRu5Iq<_$fmC9BMh$=|l%-}$AOaWl<7L_!O2!04c8s$04ycEp%2*877oB!1i z6}GhYJoVu5EyS~eUTTne`k-O*me0=hd_`;-2Q837-@ld2b<8%+b-Y3HKHcr}0j`V0 z<7DtF{KJkWp!1~z^7(ZSz=!jq4;7Def)g#9>Q)Ue!l=Zvwa=uS&(u>6iXRpa zgdjv7%*z!i0G&UhdYn%c0hcdp$;nvST)cH+4580rg0eiwyVCLmLH`ulNJ`8sOj~qw zq^c%^NfN0Xu@s1af`|zwM-kg*>seVwXYyoBTSr*2&x#m zK88F+T-$)Gu%O5|0e@TuUC7-gxEvjk*F~7>But4eH6VEX8B6ATLLAvFjUkc9A{0w) zvA#gH)yTNW_|k64nAO=gn_fe%@#B)7;oefpuYnW~zp1EvxDdLLQ_kd21}audcWwl6 zIE!&GqZFxrqNC7|Y3N@60Le<5PN~b88E~miJd~%?D=j%&Rq{BMIE~B5c+mlj5GDA? zP0iApx~)@5V_EySrL24jI4s+gKt{bV=gfdp(nM^6D8q7HtMBS}eNlQ_F%8|pB2W9c z_RwdjvBngIe)9r)YF(ZAs`FHzbO5k7Bo`Xf07KOB!4Mj7_W83X?pR zZ!S6tY|C12W!YSnAGGh>NgffP<@7-eYN`x=sEuWKAZo-Fw8#srYkZ8SpE1=!mN$RP ztIINqCsv>gb6&W&cJ~Y(>;xc+a4S&_M|AB0Ng9CWz90&W^kd%~66rru32z?Sde5%u zFqeU#=iQ#?CGpgxHa*%u!xfgtp^F=vdA@nq_YU|HDwtE_VwaxU#!LhX=D;ALH9$ zkPZdqJ{22S7ByUmA1Psh*CB{yIJmci#P^4ZRbai;rD9jTJ-D%WiLdPevAdgped!PU zL!zjgkrfPAWGOf?hxgG;SGV=crP( zr%ICiN*>g!mJPEU;24;vG5?0p166w3UBSG#V=>q+cISax0kxu0>8uVLxI>TL%YS98 zT4bM~+4_?M7TZ0G*D1+-o92AUC*4X#m|&OG0; z#C$H1^Z+S(lDV3X)j4Qk@g%7Z_(w3K1v>TqRs&>@|X-L&(O zwS$$j)qd)@Yo>ntH@7)tQ%d~Duv(j~(_$KU_U0Dl$XYX*Td-1nJIguFTyY?#0+8kQ&kdb?z{f!u9blO{WUr z{iu&Wu;bx>4?F%-&HR7E4khKBK}d4**(MBB%za280|;Wm@HE{Ux3)h`{^L-on+UG> zx2R@$DK9&)HzMfM+LHed)ZwrEgF0$uhqNFiRGUURReC=muxS(aeIqc+p{BWr^q*zP zcQLzgt}PJ3SZF(NAf7{pzj)D}wVZ7-2l$2L%bE77C5ZN+gD#HpvI- zLT1X6QwWS-BwXfcl%p2Mp=X^`ej;ytR}b>jM)~4T24B=dC&h+^MsC{!7Czsfr!2rc z3)y)b=f@nVb$*)7oV6p75)AlKUvNshg0nrCbP z!1UH0FX^Y}E!hi|`HgB&0*b$dgvW#Y`SW%xBC3Ukxlm8_|0C_4qBIMDEZwTKZQC|0 z@uzLuwppn^ZQHhO+qP|2W@S#z?S7b^+jp%yYu?WLIqO91*b(0@>W`KLIG3@H){fFi z>Mr%M*t(>GnH)W_s=jtdy1SZSD2VHrzbo{ygg^#o_s2O;0-H2tb;pI zGZuyovt97m6}`%CNzIdQ0Rd_YrquNRug>F&o^;{=$`b$2aLWH8iJ&YksTH7*%8VHh z6nC{$g@ICeO)4-ILx&^lJT+VF8#W~Wy(C&^Z9M!BNfhv3Eb&)b4+Wvbd>i0=*}B=8 zOETMzW06VTa6Y$;3stv5q!3*<;s6++y!&tY_Ud>%+!RHAD+zkKE%0^b^X?`-4T=$i z=4t2UJKhqXNyCpN4oBv7n3>*AspV`d!5 z37e_vx^|&|mUzoz;y+8gm#_3tLTIY)sA(qYDJn*#jXU!zsOqIa0h)ECsC60MH94&@J7V4Fw#HLH-*GPs#Zl1FL*84EDesvW9%O45)YluL1o{e zscy;XN015Ntw#e~R>(+Y!Ju@iqa{h+R*}C5UxK5Z2?@$4uHyaf6PgPuUuXTk5exyg~`M?LGiSwY8i8Sy;o;?9bdGk@+oQiA$QB7n!k7W|7D3I z{I8aH_J3O9nE$IK{)O#8jcKwkrq&#hncf|;sp$squ0YCY+m-}9YX4vLP^viGlq2Mi zALReK*#G~QxUA{F^9?ae8`J-^#FN!6y>XY({YJG$QYd4PTOt7i31I3ik|NOX<@mxO zHg)~si(}EmHu%z{o<^1<*wHAE9dqComYP~;2`>7J*+7(0pz!(5LQ0MPN4-G7>>`Kn ztOcDl`8i~^_ig*Xgu9&M9A2-#y^P&3dt#sbfrfa|20z~s;PQ!vP>jSSFg6`!#Ka{O z!!~0QqDDiqEJhQeC`mn_5Zw>DJ@hGeVi8>qkbM-!LREaY0`+`E#tMZABKI79nm`E$ zQIUP{a*^ICO%JJw<;Cydeo-GOH+)o4`OD4ubfD(;o14CH6PK!FVa%NJ-h=xn4yUU4 zXbP=0DaqB8<#}I}`RT-_>aY^#vP9mL1;!+$H@dVQVZpSl+TPOFK6WHW%Fp7nFWj8{ zA~+XNY0zmjz~hKK(bX3j%u`8Y&BD%}0}sqzc?@+OO=_Nn>v*Ja-R3gIw(II6wG^N2&^%yS`AvUe z=e6T-zzWv7yEl^I94~A-3|@~NsrT>LwYb>6fGi$^nWl|YjWMaXq0K^ObfAnC zUPdgZo>ppYb-EZ%(n;TTO`f49#812WY)9-^DF9cgCP#0rmeH$J#Yc5`)uT{jntL$& zrLvNjL*v#*+|jp_b49}!g*VynN$W_5(zfD#d@RL#SNPpNPIjGGe4HJI zBQs*eJt4JsIjvO(tVW!jaAtUCQwDfzE)pF8)YVB+|N>s!9D`xWlDzGVYf@4cg|JyRnDEZ#_W=IU@e*{=E-%sPLi<9r1R zRK7(5dk^ek?B4uu8vM*gOdO7ZZdYanQmE5b_DjlvwrnQ3!G>NtPfRo&LZG=jy@*%t@zl zpN-eB#kH<>sk`?~^-CB#eYY5`;Hd0~Z)*)uYPkOHKAIgjUZzvdM@6U<6KePq=8?e?lMF{|8>Q!@ zv9?TlP+%wZ5o_iL zYf8V=9$TJ>s6%XZQhCdZCfdWEr)KmX1OO(X#8nqw9?#-b$u=Y_-Yenf85W{-sxzY= znBqh*M=Y$efcCX4oL8CBca&mwm2VkOY{BWd%FUUaT(LgUbkKWlEArzpy0@6Fr|BYGxm1mwY}ER{dl=n0<= zRZqGivj9g=M0bQDszoYOpSYam9w?j+2Ve81=^ODe$SB+Ui)}K$I_Qn{An%QzqZUwF51X_< ztqZ1C$K55KF(Azuf@$;fR&l_)3cM={akdSrOTpPgo-HKR7KU*NWM?t>RR-3Bn{cPg zedLqyzZUVI&%!&yF#lp3vHnkr_`f-nlcBMToT>YN?zO2yd#Eg>9Kf16C*K^ zL`Yb&Br-uoQ1@%3l+BZA1Q{f$>6_^dB#vh~ozv{>nCiP*xbQ4FCq zyIMB4Z1}F)x$U}Br+l4ur;bmVC`k4C?fSg#xZk#$zt1|&@_pQj6M)xAltb^E*r?Xi zgAul<8DiTd?vt|kumx{AiicJ5n!csMxvL)9ZJ`cyzqR@JkpzRUF%0_BxRtdD1ebdd z1@rJ}M9Uv2FTb(5P1H#b1Dy6*mp!mLRgZ+ZP)LQ_#JOUCcTgk3Z*(scJB2J)$)J8S zL&hw841=dCKEHzB*J!$O;+7Lx_=*oK<6lFNNZtw}%tZ>#Reh*~Lki@;X3O84pdybC zjC@4x1ZodLtbEY*6ZbEjKDe3x;L`MzA87w8xxx9`Fc%$+3ykxHnwv5rozqdB&24o?srl|b|u%-Fo8gH&T3-tXK)u^w+!zhD?VQ9 z^^>~#m8mpPXybNMa@%c=L^ZK~#qIGY1sAI7QB*M%`E*6?S(_=5&MFl(7oL*O`-`N1 zKhq*8ipGC&C8FLmG+Zx4ui3n%8PEVOI#&9{8wG{=r7pDqe^VAYuo9Qdl=)120;UCP z7b|*@1ZMtvHTlekYui89@D$S;OSaf2JAUkjg3J;D#XU6@V**CLDs?PF34xjEs__MiSRH!Cw$;C6Y>q z9xaTSQsgqE)q6uuG^PuHNS1LM9<#RB$G|S@fzkVOu-v#o^|}ct8q|glIH5L<+ImRy z=yc8WIo5PJMzW;Gvagh)wzIUrP3Xd#-%OPmQhT(6KnrmEAxT0O`bi0QO-Ex?$1A0|6&EO`By%l(lQmR1{_1kJ z?@UBioloqV@^xap(n)D0J?&-C|OnFZx;RRcXkKrd*{y_c)02F>WiW z{|JG^X(DcIaWce9wAm*Ak^)hfri+CrAb11SC{Uq|`DPGMB4fZP!O0IJ)*G4F*;Bog zhhNdBvYQ0PMVuB7?@8?7WfNh`mqc?d+e@mQE(Y5yn}>NB1`DETl%mXMo=O@#m6Fqm zEU8j;taUjmyS4N=XUqz&pd#-N<7l zvPSU%B#vKL60p)S8Yo>aIq2F33=tiS^pG5mW&6Yun7JAFbRqyArbOrk2e1-hQ(HrhXpQ1}{Cb6bC5YqxE5pnmS zlv1??)J_|cSC+hq?4(P9W21uzf-U~;t2?@bNhkq>?k%867M17> z&!bVrVNe#%P^z}Tk%P2;82ElUR(CLwOsHjnc(xh9U;&RrEIhkAruD+qK&5zvk_qu~ zuIKrNU@?re4h}3d9^XGxVBr>dZo`w)n*Ygf?19{uRol`KK9pf{>L8WTTS5FnA?D>t z!hAoF?1>GlJT%IF#J}@Dv0p6HF!6`EnUx_R0T95~pZ?s0)oZw7hET4g%X*)=s@Aaj@ zB6<&-G10&UrDcvblB%k3{+3Fb&YUHd&}gp3WT*jHSXf}xRqAd8#TK{!*-=?}MVp_o z09|d?xo3Zope@9od?0`bULCp==h-Z+V@UbIXZaP?KJ37avS`IR*cy2w5s`rIGeMPN zHWbcBAGaq(Ijk#lFmB)BPT_0wjtZVFdz$L#yMAI|x`4wL+91~?Z-w?5B?Eb$KtDArh+#x@XQm&Slev z6CDxc0nAI!v4&Ruh5lgAq-iZ|YYDx~5$7-|710+|IA}J2-YPRH4?NaXH4dG67-ls9g90e)0uj<%nLZ-t{Dusua=d3c61mGb>7%yglCdUb8;?S^+L**GoCuP zZ=n z4G*JwGiHRDuB4k%LNEScD69w*5rL0jJ-yZO7XYpe&eenRx&vhNP)aSOQiHXo#CMfx ztHxBLd$#@q?7|host#M*gEva8E4yDcAiWBJl6H{$eB=sq%0n^0JElx6C^*A#N(VI+ z{H;2r;s_pOC6Iw__%T-(OGgnn0e&h~vpbyTy6pv{ilhclhb8^#?Wp7r&VP1`E1HSO z`$$fEhP17qP=do}A1!{NDmQ-M4;Fh5XaaO?oT&EM8EV75%`@zEBgb#^L~u$HYh8dM z`9XRaE0YIcBzgbg3K?hU|u(+RC2nE-MeYRb8s| zKxEzwJ>>gcbA0Z7PRw~o_9wWM;*Yq_UkWMDG49Unc^`2hIm>s6l{>%FV}-kb)c`&P zf(LIs%!f-o)Q7(BAMd`w){w+Kxp4w_{-K|L8sZ=kK;GqqdoEpxzKK9rjXH)>amk#@1F9)dss8@o2s<#yJ{bQu1QC}1=!}#9 zJA#N%o9twGg_6oo;kN&WAcAXtX>(jvINcGL8v-VJpzu5uD;&l7zY#=U33ugwy4<$` zY1DMM+AfW-U-7owsTW-C`uYKou~-#mRFu=~z-K||!`LE}{FBfVruq0g(rL*0yV0#+ zK>pwE^B&C7c$L{Q4`~|97HkgfkVR-$b?yoXI(`mTqD(4=~@Cw z{ign=RgU>@3XE1=Pf9o@S{*!p-6s9+Ghg$e`>SVRQqU5?x<-L;-Iay%2&h!<%3k4h;_2l@6@!? z<;Ips2nJH#RWiw#xk+TJ>sfy&;<%9Z|d*bs}eo2HFRd|5aPf@<`Jf{o|FbMgI7~{(rJC z@*fbI|CCnzkRB?kE2k-(x27zTW5FB-*bzy=WFRX)q$EJV5|L1e(9kK{FdCnpd{?mpE~gTB+veqJ@t1FJYqC|RDY|KoAQx8t>x|C`<{Epm2*%U&-|p% z?!6AidpyPu>Xl~yw!C|7c>nkW4f>AEA;kG4&GwfO%{}{67Jf)a1>Vgx`M&4(1m+*jgT94l_2Iv8 z`Q5QV?x?ZIvrr77ETN(WL;FY1gxv>JY#8CZzM{gBBvQs$f?2gqU@?!66b_g~Y8W1} zm?A3>^G;`hW22=GxCOs+K&g?F43335u&#n3n1_%6@cYCLX~e)qXHLMC+$=xbubr1^JoA8&JI16%aG5|y@Z7s2O0RZ_|&M?i;P zFHoFf<$7TyG*_f^7(g!w$LfvC6V)`T*ASjFOj^1;Z~)-#2jdPYc?l$-KrX+SMw-nV zLG?0#05!zQw6YyKHRL4ckZ8}^7xorik(~xG=8GaZf=(|Nk+A;p$hYV=ykms*I^LB~(|GovQk2T^+NCW84Q| z55NFf60?bLjx7B0%tPfJT+>LUy!-6`w)V|&4(I?`wqee2jtmS)jyc3LoI~KjaOxt> z#0(3=!*XwNCbuYF2O|Dd48=z*03Eqm_#~Sm5rsfyhY*GumjTWL8i0;$RXb3xhJDBt z*p}0WOZ7irBrd!oY5*s$Q6hs~zGlZVH1Citux%U39m%7V_=aU@8`w6A^onEDNZf*T z@C&eI9~Mm9f^+Z_;DU1?1h8Qp0s!9&~%MWDyXxLBk)wdV}d?BXLhpi5#ll}gC#+bpaX_rMg;RS>D3Z9}r0 zBhjp1czOwZgXFJY#(nY$N3nS>A>Lsb+5~!pVm;I_d|8IQX4&xED~G)zqu5D-krOIB zFiQO@0?YI_35$ilhhF}hlrT&6o|V8z_1;R{vox$Ow=x#LB6i?Lm4|lH*_?$)B z#W~tlb;f1si?y@VA)2CgqV&gNxiHbivZ-D8mx~^bR?Y!0R;se3jfHYf6G6A zl=3O0AhQj}DZ_KaQ_2$@B|%P}%V{#0n@qxJrqfp*$w--Uhwe6QA+>3TSu?&I6a;+4|Ji*@JqOB#w*#naKa zfVcQE0QoWUw-7x|tSCHbY;o5ioTpCyX{ee$6$9@bp%oh{qfn=gXBQ;fF*i-H%E>&s96pT7Y&u$D}WLFHJmp@7C z>WL0&uvdW)3OXMV$A|$tgvC_?G1&hm1UJ-n4~sPx5hl<_R7-({u;kjr4q5Q%Gfh0@ zxGJLMlMmiw5w}wf`@875a3~n%V8P*CuKNQw4gd*VWn)A5GJYR zQIqh(0v=e(H1^Wm8oH8E8$5=oJ#L@?&(W;?XCtWikqMX9yg3-8=Z;U+{I$ll%(AM9 z1qo&dw8D-I@0FNd5kge=a^-ykr7zJA?7C*up zAz}tMYYDdsTE@~xVouyD@r@?JkrS1|9>V;Wzjgz7LRtqfVTi3b^DADPtDf>rTC^UC zNbnttdd))YlWWJ?=W=X~~M zcr2}=$&<}Z1veaXD+9@#F{=CXGF~vM7;#dc& z$%xY-JwvLI7Z>$vC`c)hBy83UamNi6Xj{~W6?G4+)D$^7&@3BB9Md`?zB^1s-%}yr zJ4))a@!*K}7L5)l5JiPlW&A`WiNl3&df%W`n&>nsbzT&tr*k72;qxat(#E~3yn6X9 zkVvEaZp2>7jvYOZ0Wr*r`J=Ig{ngEw-CT1hZlsM7=XSFuJ&YzvSb3S=ggYQbp^hKO z2M;lD|79VSRYB7z3lMLEO&Jk%K@TrtJwtr6N$Mm5Ekp4QbBze;7fTI7Yptq!Zl(nl zp9yHwIL$SJ3)&Bxxs<>zsf`YmWO zFrX~KPn$(?&64hK{XRy?h-7p{@-VE<%Dsh1{@Oc^iro*Ax{!IhN)>!tjd1^q2P@S% z49#Se1UwPUFtzH35FQ0L1xC_Bqkf6CCWxBl__GPDiUL8?e-1KF0kI6A|D;EJ85t2M zrA`D?g4MQ^t>eCktP!1n$mkGMEgz}zy@y%{-L7b_48u&5Pw2GxkxlRrq>P`ZFGfC% z-yf&HtgzJtwpFWPb4dj}Q5OIBg}M#|na7bx_e^EKtj{or0%NQOogfa%x!Kgv;^qt) zK;txb&bW-Ty|ihPp}P3hE3hXn8L{qQ+>~sU?~YX4no7D*Th(Q2n1ErUauQeSw)%Kf zr{h>457N3%Q4I#jhAbTXj$^~7^H~+!HS{%0m^2jZZ z-)!8WNyjHFruKhTycgdTZl8-+0&d5C7B zj7AbWNleF+?LymHkxC6>g@w!3Jj`zt>~9Zs^-cK9E;&I*mk_2QoR_O7=}0@(baekp z9peu2@OYagCdG^U^NuQ(Uukfs5&pDn%YiYIpU&$uTTcl)PI#4;wV7Hl2{RtCEMI}> zrn`ZEri(UTSv-9{YbLYC8feX~;hOiuUlF>Phn)pT4rw~`H>01dH@n~|1*)*Y$xbDP z+_JXp%In(hBP+tt@h1o1K6#OpN3vL)w-b{uiM zBLyjhh$>lBtM5lsM`UaG)7nD-)v_F!fEH|1XVA@cKHB@3NQjsVC^6O0o;LOS-Ode6((Le!BbQDcFbDO5Q8UqQh&?(3i?kF*x?U#ebDG*m84GY0xUTG zVrz?^k=|_Rp^n4Oj25_}AEP%`rl_fLRxwWZ#RaBRq^;?9)U+6#2UY+_F4|o$JCiX= zQx76W5WdI=-NygrH^Yt8WHR@5lq_74i)g!{|1xp4+`#%Y%N#B9QszfpU)q(lzKFkJx%?Tjz z6C+evI*yM*-zQ}g&zKkrdJ@H3KzlYZya)R%k>@7Kw;#E^qlq>Tsb`g^ou?&;pC$Om z`w#zkcDI3HS*u)?tUDm`AD;hTy>WVYlolmrYkKqO%^|7#a2w1>yN-~3eSGiXT~*b@Rs>Q;L=$CFu64)o-rxhy zUbj)_IIezdZLva`a&?+en`l--L}nb@oEvOvSKo0Y5LTxsg}>=0*gaL;G6+|95g^G650(T_}Tpl?}r;r{#5zC~56Cpsp4CV3PDpLsHr% zS-MBoZRb85!g(n8 z#qiUUf%BJS)AMB6@KT9_z1TF}b$-yRMagdI5$J{0ZuSFWp`SElvVxi9*%^lp`FFv{ zqWi{L#FOKI`g7DNU?8!+Hk(iJEEF@_GjA_}aK7yqMbgJpW)nuEKq7Chg0^`0g!8z( zB>3}S=8YFw{Und4DA@gnEb4dqXO_@lO|$$v@tF<%^T$EYR63{UUvR^jW)I!X1-WtOJ!l)*cDBe#1wTy1SrwL(VAh~5PK%Lm-l&)Cme zhVRpa-HBVQsI~Lz`+tR zED=(w__E>>=QMeBNrhNBv3=OGeYpPk?5b8psn*m|E;S`OYFX!~{o3ccNTGshWGDf! z*q$h<&>3Rv-XNrfY^fiKtVKq;(a?(egd8G;;*d_VL|`|3KIi19)XbO4@f)K`Vd)5U z&7a=DD~NefbWuelcDqz=<*It(@1N-T9U@gO*Xip8n5F;*+c=-GVt9(5IKo{wr3sa? zyvvze_9!y)isk6GRMRsIoaCp1j|z)lh+7ZxzK+MnR)aQ#&VH%R!+r?=s1|Z=_B(Ez zBvlv;wp^0Wb|M1?v?kB)#f9I(Mw^V}WDLbPC!3`ihkqi6i?107`%cJ3hu_@N$fqC% zN`Q+mb1!VO+*QUh=$SHW$p9IML+|{NUyM|0JGI!1-Sh&K<`<6w6XMpdqQ15zu_d0! ztsH@1+b#E25|TWTZu@IVD{m4aMNE0$8%k0iHN__d4bi=f}~}s*e?y zG?f@~xiPHWa@~xo*q6Fm`D(%GYSm&{Fcn8~|Dwm$sW609T#p|sFjdx@rM&-*#m{i6 z2AEg|Z4LIaes$LyrY!r+5MpZVMX0Bxu1sgEGka4DFA0h1*^2TX|K0Z{M_Vl8qMp5q z_N(qW`Oe3s-1ZvKyNdq`;8%Pyzy2oUmf)vmP}1iLMURH9;;#B69aM{YMbBCY+dxxgZsvq{bD(I{0X*cJ5`hBta zmk{=Ntis}3xOvwXN?u_sPF0KB7WniP%PvrKHu)YYGuZ00_`FY?lq3%3nUq>A=OAV? zWXu40(VLeGeu}$;L@)Yb4Oo0Ar$Q2ezd|QWS4GB9S4<5%A+3)Dg}gvAG8eG-F36uJf31Zt~ie<%;W(L&d5n z@Tz2|aI%_qCj-~r?bIO*wiJrFo34@wji%k+u~;h}wquKxWrY>;`fB_KjhIn6Iy^H^ z&CE+ZLQAf8IvaEw>4bt@iXw|AHblBBG0h@D*DeAJ89#J0uNNwsxf!mJsv*=bpMVt+ z?aj|*b7jTdyr}jpTFw)=DGQTNJKKMjoWe?8-c()GEAywOmM@h3OqVlK*q$K2ZfF($ zYG$dWn)w9FT(|s6a4&W9T9_YPrcQOU(8ndUl&SBa4zCqTw^iV^eCaOVaIw2$^N{HE zUG`2&`-N}Dh$h+8oYqkrZ?nTEb)wuLIIM%c+O|M-L7#Ee9?8_q;cdBq(eZYV_3IJ! zU!;8`Rfe9-XpOR4L%D%fR1|u0m(XBd3E!c{^5zP1q<7|`oUXVBXtn7Mncr>4)StyJ zW8-)ZkWsHyZCnxQra>&3%vQcV+0Mih+i;iQPdyh^=x!bs{C)aZh%ReVe7z3EefSFH zYbq(9PlHr9E@Df2sJ!Gz@Gdl>iWZluO`Ia*ZDhUNT)D6yW_vzije?W+%66m4uAQc9 z{vsYLBPDwYHr-dMXmP1(8}xt$s3y`Q#*UVyV*K)abPEcS6b4}!bbXnUD%I1;@ob_? z65Q->CBF#eX|8VC?tW9N;7Z?puK99_r#}PbFQg9m#UC}6d;sOuf_GQ?y@eFZ>W;3F zV*1sN&NG2cA@n1q5eH+l{_o>N>Tne{{6cHpJP`>I%oo#4NvzOg?~5P7cQl z2U?*Esg)r6DEhpT_Rwx6lh)-H#9~iN%78rng9WwtmW+aGH%n`_t1F8nLtFf3k0{`P z6JoFWYK*JpsO4xU8~HM&(z>J-^*qHPpOhShq<|=|>Z+WxWvR6}Q{2hTRC-3N0Xo6i zxNd4=+4DM^J$QA1gOeuttLO}|%jtr~Y+-$l{2aImUFfS%uHd$eLTAaDMr`vfN?Q|b z_)=t9Vm1sy3w-H=Rzlrn(`CG| z$-p@OYBO$_H0Q;JEW@>#ZK8B%$lXqbE-;yH^4L`2=vh3DPYW@CyqW?&xU++-o!y|c;t%`K~+t<%4@B|X46yEyG*ZR6}7Lq1oV zYuiqr*puJKwmCA=Ex>n?gYs~N$}4r-{-gjm#j`l3KZm!yIjmo-*Zw_!=E94d$u-_5 zSGT>_&aY5xbrte8Do)7yk0_6;6o+Z)D{{5Ak@Cpxg1RL`R92$;zfT^Av&UckN{REt zp46zcn%Gidb@cp#&9kHA z>3aLnc9da^26WN~pZFsY7F3**7Ux{h5_?Jc65NH63#k?^&1?;Am1B3~M9{Wjvmu8; z%q@H0&P4+Z&W`-*f;YJ&>capq^6b{SxUb$iW$`Q3+hlde&?zsBxYD!G&^iYd}FOeZb_tV`B?^cCT6X4dhWdvVG-M8zC5X9BTngMN>VA zCS{&OR}1LrB*{JTTKz1lPIIasqb&n`AIJj@ubdq5wlkew zzn5_|C5l@^0aXJXDqTNB%a`^~W4Q9!+`{No30;M~Q-f-A-&DGkNV#IQC!mC+Wnze1 zdD}*@b_n!I#<&Ek5}v`^nJC>*{B<18Rrrk4TUhGAT2&tOzB->253vP&;kF7+p~F(u zOO3%T!;Qn(j7r1}*gUpzz6lmsIpF6?a;bEQ+Bluu>#uKCyJ{*|H7)68V1$#0qZ8-v8Nn%`Bx6*DcP}{IP_;+NJsu%wnHpbD$_Cy&#yL_L-A)gypHGNrL-Gi z3#X|r%A|#JQg^+|)>%$34o>bBu+3ERlh2>R30b^KW{>Bf9el+`AhP{$4;2ZmX$~HBlH#0=nQl@90eUJj)*i zWm(f3MX{69Oe;zEAjLyk!uVf;=)e?f#otDfx)q;juxf4tO#2UQrYsV?nIxeb9(HVD zLV=7Xv`0eJgbqS~)MF9I#GiFH1yDEaUpmkvT{>#7k{V9^{G+Dw1%!9Mrq48euQpoe zS;}s{l3tH4uSsb5Eu4C2O?_i^#)bK>!9@nSD$%4kXysK9tLo?AbCwnKG?km19Q8a0 zyNcmeqn%GVRaDp)cCm=R$y3Y#^O?~3?u#W?uX0%#Yyv?g`uK5EHr@AQ?cPSaAha(lJ)u}74KNe12mDgdWC5%`ZxGgEJH5E-Pb4Yb| z`ia%mcg@-~zd}}d^p(;UNfM8^<7u!mXwpJq*t@6erV6Iq5H`RN3ayp53OO#1MIu2$ zJ%-eRL0M0%&1~VPu|ef4cFEjr)oHU!mVfR}L=EKNY%plX!Y7_)P$5f+$wE3x;570K z9M7+qATkt7Ou-ju$fGA>S<0t8Ow|g!p7nGGn9*Dh#elRY1GG>Fi@zzDtCKFV2M%cux)fzjYCyMv|yXbt&-IZX!oOj{gx6 z<1L8RkGmLd#u6BI#&17~xK`v z8m@!~n8&qx7D3@PD{evH^J`As?LPLUc{}3<7FPu+k{xszcT)Y{e3(UR&JllcsRZTH zf?pf{^S)G}AIOxS4H;wf0zcCV>E z1}<6h2tdvyFww3@WVEy?6{Y+8k?<0f=Oez-C_Kh9@K+3CDg`L+LhzldCSscEjSw%B zXvu;rZyW2HOQmPp$zFtrRdB2rH`%V*@@!5wC^gD;G`Ydcc$bGiglPQ>i*+cbM(Wtv zTII+U5HqsrnSKeW2XW;!RKIYC&hv7o@GdRrDda|rqHjf(&zC>)(k&@ks0Kv|eNXio z%f{awB@B>gkrXNNkTZICb%->;vW-qjIC^SkB)TwiT(4+OC^`I zuAHzD^;1%K;d5Z5NnpUh&Q@$%;a_3M2P{|w)wmmy8v^M1CC-hit_MV%&@Xt`_n}BSlFhIVy z!%sNLzBzG23ElcnR1XYjSaT2{JB5KqVs_-V`+yzXluRq{&rZzFSBbuy5IcK{3uKIo zcxbHT6#k7Vxjwx&UI_nD6vp6#VWT`39Js)sK3GW7Ni*W5AF6Xu%}j_VgCG__3Jp-$ zeLM{?Ov6Zc2P_@f&_Q|!uq{yW0kyk+QVnZfusv)I2u4BLPy7_xFANgI$~}=^S+@{) zmtb!XD~Gd&oVMuOzGD8jpr2Q6drxtq&(YccNVOJTuZobNn?wMkw>{6tVP` zRnA7Z)8c*`1xul+M9l5LWQ5I;fy;_n5Q1N8lcCn>$4m5miDnqpef%B~{nzs~w8EKN zOZ}8l{Rah?t7Db}oDqTJ^Zmq?%Qcvh&Ihgzm7tHDy7ZKm)ADJU0b3&ju&5?)lG;AbHxg0^^)c;$Qj1fvto z3*YyL)(G1x0Hb4YVHE18TI9@4&KPW(O_rc(M@e2eI$4v)~2#+GRo?*M4y2!iU1HNwlS*50Kly z=!{etf@(wIt}C?#hV0XjYc?n+C|(~$gQ4OfzO?k$XQ^mD8gcAFl2Prd6QF%5i)jvi2^Dm0l0 zf+=DV5~xOkrlf!?YzQtI(IG9}N$&-ja7HgAMi}CZO8-0Uf>EphQ@xrO=^y7|8P!Hn zpS6Fa+bxj(LY%ZoPH2>_->5!1mk9Mz5-PhYPdQ?{ zlwz;x04-+`c@`Vop=7|h1V!pqv*KnQET^!~nSa4%{}*CrR;(-o)o)nUL|920*lo;m zFHBUAa1h343+Of*R-GMaT!|1{y5F=aL9`Nb^s*8vy5U&0R#K+(d7UQNi~N@fDka1BnYrdFi2V0PuM=lhH?(O!`dU!jHqaH`vt)$@jAAx=zZ5#XsxN|1l@DK;vhFNeYynru5;T-js37SV-;19%m1iG6Kc=Fldlnt3q%v*{udC-ISk!yW9q4c;k+YfIQ4wA@w_X!GJ9=w zvD@6R{q545`ui1mBCSQ|6_U-i{iNyGOh&tg-M0OFF@?7;p1OvctVT0B(j~UhF@Aqs z&4nVFhZiG-#0Qk-Ia8s0H%iJEmF8Ld-&2ItUk;VC*23amP}RTNWfQle$=%otzv&&o zw?gS}Mz_FR3Lx*e_`hehiPJ_XEr(<>{~pw>Ty;K1lko z;IuwJNc14?Vn%OnqP+R}_#@dwtxX{AK^8b_lgXW!`oQ3{vWk-CPLu`&tv))x34I#O zz0Y@r$e$h?5J3{`vDVpQ#C&Mz1$fHgoxA9bSH=aJYyQd|HxH2Zf&V^ftY;IS`AzG= zF5GTGce*yB)QReALfMgkh}Q9~`h$?B|2r2VZvtC~M#>fiSRAQWRvOp>)YJv?FbCzUa^ zVi)YN`q|~HHj`hO_6&4WlHDf<)_NDNKYC6|^|n)_jeF1y_WPDD^FTP(KtkJ4G1!`Z zd(t_iC5Kl7QCrvS2xQ6DZV0AT1i)<&O=N#=qN*zVeB_{53!`YdvoTp1z^qdQw_&@F zjHXaSuj@v!f%}su3(bL1?eY`16e(8SAwMvZ4`KR6HvT@8bOTyeLn~__*sSGuG7`o1 zkjN)(Gt;?c+7kiuwQe5;jST8I9Bl?g{=A4x;<;-s*d`{t_0LUt!}Z(;1c^FOelc|$ z(_mXE7+ftW(N(ghXc*icIdU7e{6#t&O^lW*f;w{D=)vSl!-n>>s7AKv#$#u)OL&E6 zm(9e!2p&~78E=CXxsiaf%t~hdAKPavSb+?$P)iGi) zy7an)X(0QVaPH7aUvb%VtpU3OWhU(AT7KC+?jHIIRBnUk9eU<0m-ZM$-EdVH{s_hX z|KRK$V`Ph?yxs28wr$(CZQHhO+qP}nwr%sYPaC)A&b+yI=F{Z;RH>?DCzbrOYOl3_ z>vk8joz5nT+3N=c%_1DSXqO3#nl+=)x&?p zwm8fVZu6JX++DJ;drxZjhr>EctdCnX>Dls#^Mak3HP`XaK+l`k3D9sLwxGG z68a_P4CR!2I(W$ow)4l59!14qR}MHx`rKm$_GO)#A%UJt~CNA-8w~+6@AjVEv@f35z!Zexmk<(}BW_wT99igcZQ@C8gXA zAuKMGensI8q!q&AL8LtpAxsKlfzw0Uqjw3V&Stsn7CQCK0$rMA#Bv+>Bh1q)?@W2j zEAMO&M0;%mjMfVx_XkC`HU>ehJCjr|F}(M8J5DNL8jJ=P0#}LGOG5i#YmT{RBQ_J)Lxo!iE~L!PhJ-l zCnE~hygvA99QK_Rm=(}44vrR>l{n|SIyWgoa7;wloQAzp<58@+7?qr3R`o1xSY(Px z$u+3{o$8dBVN&rdsb66HzhAv_f@Ao!gTM*AfIxqt{W# z*wk4=6_ssJQNx2l5} zwEbQuI;Y8M&Y+2j(O)*J`VXo^Ss71E?iWNGW6W%Ab25cy>|`;>k#<7#tayH4>K(hUB(h zf1Icc2-oak7RT;M85@CmBxN_UOln?KkOhL!a zh-2uGBH{vq(vDtB5PZ)Mk(;@WMC$Chl-4Z!f(bnl+r2~emPnhKU_uk zjzW7O(vY`Y?<5H{_lF91BTR}ni{j%l@d>$v#J!Z{&)VYS7eUEMj!%f#kta=ZeYSpb zS0c_(wt?MiQ)gH<0gSHStwpVZ)Ez*v#;yXKp_ihK9(%?u=(9!|dxS1HTC=;4Y5!DX9iBcygSlo3cXR@BZp@Wz6hUy*uB0tmuo3swvR}@ z>E2VhCcD?FYrapPXT5Kd54@jPA1ctM+hN;lFNTOOd{|SyDADIC^+8`G-&Ub!2Y4(F zBsM2n+~Z95+^a(s+i*9J)Yo9H6Z~8nG5fUbw6h7zTspWD+m3X!aa3M;+%d3;tXF*x zGCV@OqoHFeZ#L*7w=}$ao?|s{Ihri5mI&`)SA4vRm4}{Y67T5N$hZ~SlaS4?Zs8BA zJuR;kx#iu{q~^IdV;iu&F^2HlEA$ySd+h!x>=o}wBZj<7@P{CrE02yNW!@nNraF7; zlayF9kCY=D-lcnxy43)@LNAXP-h{QwCHEZOthp5|kDi;euuGh70lu`kwYoEz_rKl+ z-|%|HKOuChKeK7)w|7HNb*~4YcSO)|oayIxj9}14dz!FztX^x5?l8}EQwKAKcv`S^ zNw>CZN1ZxxUDux6bG2f*WhdxJ&4G2oW9|L(9^q{TM&8BW_;5u{)cZ_6b|-{Vs<-Z% z9pji?V-0~~ueRroeFy2a*(N&7lYhH$bc}_#fA=vJz)dDB?-An)qpp+d!YOfu$g$qO zz~hXx&>Y|8cL${K#~c8>^6Cz&2-X^Mbw<|iTH?!qutwufuk-;zZ>(M!z)z^eyzt_= z?Atdc7j)|$jZ(U7-Z#fg+PC@wqG>2vA*KeE6S67|)_Hp*J#_-%_lIj$G_7EqWc4yq-;9uQg|Y z`I`iajf{w|>uFAFj3cCID-kqw24tIfg|XAD3hriM;LwvAKZ}z>6${a z)z1I##ndIfTy0M+uF2BW10%A9CWd#oZ|+}6Sb47Bs^%VES&UuK7Y}6iSF7p^uB)7y zPv~E1(buS8M%{BPQ?lLd3hMw;pBFR`wX}yN7x0+AVs*G&*#_ni!H=HNU3+dIiBHVn zX)C3pfdb~zluD?GTkcp%_Eul!yml~SvlZv=BU48cL6f!rn1v()=X5IW9b$3uc_<^B z>%MG#84u91(Nb(1_r_QGPqfAlMzx$z5;E`BL@trYH}}wS2sH4SDZV|~e#W0?!@!=u8lo%#OcE5KD)pU)vvUrtF0ZcMy9L2Mu_L;%f8CXGcV>zzZq&@pQTv( zg!ed@>pzBXSdl6fND9U2k$c5J3Lrfx`gU3KToBK-WP35<-xm{dlr1mf6$Td{l>G1g zuo*uldAa%8>H##W@Ag2|gX}|=(i}TSm2ula75hiPAH)N^B=3)ZhYHzP2ec?kN-bRq z-RhhJv_iO@s5^XtBwUkT<+HS==T8Th6Tiok@_uu+@$!&-c9#`rmR)D3y`HM)JI{z- zLy=>Qj?Kzp$u^sfFr?BsUf85Z8)y?ozTSCOxIkAK9BL%D{wVb$q+g^-WW-HJ7aO_T zjBBNNxU`HeRZnh)*u~~^5*A0ORy-d`2;F33r)y~wM;1?o%B>zuBpa_PRrglJLLR4< zz4R;JL~^>Dr8S2Fu{<}(iDcBoWaaBzKtS2Xr`FTs5=IuXm{K(FvSO_i$JbPh?RsSE zY!$t`tuTtFF+atY);Cq4A9SE3*M2$ITCq`E%I?=(lOMU!Z*YT-FV)?(U(YH=PMR_=Kpx&a&_`ni*Uo>U&&Y;&Kb6_j^8lgVH0B5Af{xxm>{0umX;0FI zRC^I}57hdjJ}F;A^@h+#`(%BIrq0+JCcKfXj@ueoK4E{8&BJAPAL}KbzOF!fldblS z60HqrZ$#HR-)7M%cxTak15mF?-q?PTaz|SpKtE7+Cw?R7=NP`2eyMund1q;NXm6Kf1XSzVWHIxChVgD)00k(miN@4@uk&p@4xH^tFkB{n{S5stqRbqwg^HkT_Ivp z;Rc&UhV9SI>pEUK?k#R3;D3o2BtMj+7kUwnuwfZ?8TgSoLn8>s%oVQ55lLb>85SCp zrCpmNeQ?U6zHri_fNA*(t8b9UNCh4wX?V z`d~}Y<*~^i2L}bL%V!x^Wr^> zw76EdlWV;5q~?m1IATb%NS(yRPtA?_?mPgYSD8<&jc$2p3NYG%#EwsAfu*H;#ER*Y z_W=}PxB22vGZTab)reeVhxl+)i$b4Eqnmr6(9u6M`xO4t+Rr{k$uGJA4M061y_SGW@XEqfc!gr-m9pJWz4q?!!@NVgZ2TGW z=}FgjgC#JloqehFLX$;l*0Gt$(SZ*F9d{ zja^{>BZ}SubQ&mVrKP|1%-PF-#B%XP>YuZJgw1vdH38`3Zd=VvIdX3gPZhejrZaFGD<%p{U|Gcf5fZfFuKQ{Nc=XI4+zC<^e* z6lh_*-?`>=Mb8^o*wCkH%liq^rl!X$`${3)cZb^d!YR&DO-$YCSP zvLc*D1IF61nRY{Ldo*bwDrY>)7KS_GKD>WfpeXiHDxGB9Q%K+v){g<2w}GVW9a4(Z zZHp~V+7d?#u`Y$F$nxWO$6NgM+|8YE3R*2U-KtYHrzOrRKXMcAa6~-KOzy14KawAT zarw?akRg)mxL+X80{V(Ivv^y8L>3VF#ors%#;fudM*T4DP=2oc@w}7}O^Bw~{E5b% zJOJ8aeSvCcaYiQxpAaPba)-CSIZ29RdK@+OGO6c@IyCoZo{T(^@G?a%$^Ax;ka@lM zuIa&dwNIZ+J|iC!1~`cVsIQPb{Zk6=^RvPeMjQ9UPArm^i zwRsy7@Q=&%2*I5^g-QvfzpzO@VL4*l@8);A=5F8anj`5;N=MkAkEKjld#1`djg(a0!D*5s0G z;AgMNj8MYU5^S9hir2?51(ZAqfDZA8trB7q4PaiVx5p|&Fi)wM57f;KCI(HY7sT>> zh@I~-0x>q56d9<)2)$?xeaS;_M;(RAy zYIVz4a^{?Gz;u*HE? zF6|O}m{gVkqIKgm29IQapj?BW%qeB>WG`hdOSAu#8KgsVuj^OaCihD4N`o(0b{jWB_|HB&jUvw=IcOw}) zV+&IY6GtcFUz4PXqk*%DjDfw7wSkk9fU$wSvx(z>?ugf@SlMBTAoC#ct-7|#*yGkX zkT)Y=wmYDbgFKkyLs%G&7sUt(Zr!2Rjm@?`S8w2up#(~z+!4Kwvh@ZEBLO4w`R@h8 zyN%i!Kg7dV*5vdsIlXLq&GB%3obB~}0q(8g?vKvx zwmRrRPE21J(*E=K{_P71)t=E`*h{BDUU~<}+gxvGkV0^=>VaPS5UMXuw|CaHUE!qR zBuRN^Y!gY)i{>r~41KoMm3uqgQmKLvKAF0)z`KXx~5PAcTQTPL61Ya;g> z3@V}ygwd_d>hGPp%HqCz>TW_;;nE$qw^a~FuqRPfwLT}0O?jllTD&>69b+Fg~OxfRt9ui85D9GsdHD613oxWGL*My(4l)m z92J{&!lFp|mino>ADNY_Iy_GC7i;an z+Sq<-lq0*1A=m&b?T%5%aI*%>1~EToOTCRD^iRd5xq}l;oi0LvD8iXTY_mNKalub81+~@2J5Y|sd({3T11j-g@E#RCOco6NJx*1$`z%t^ z!QoycYAxciKwHgj4SIE%dFC8;`ym!z<%K$mh8-nl`vrjj2@>6E~J?e+1*RCV|lMJ(_L2gD9d4s?XXap z-%7)7;-po$ZHesX?d$;wX9n2C^i4sOGx!&g!Xi2#kqeKUQL3rbae>dZcP36gncqJM zLcXjsQFCsoU4MRTm8Zf`G;`MN=P?j%=5o>N;L+w~uJSm81w8a|v|RkmxmaYz1!-y| zKK^TR_ncmGm|_B$SH+J8p*ukBQ7Yid8nuZ_hE)_vLc?lo4F#i^L=+}fTr~=V(!F|D z&TGUOq-L_Q#d{z1y&}3i93~1J{QIR_@m&sn${(o0k8_zV=I8~Ld@DS&-*)MHxafNr z4xJ!QJQQHol4xg*;d$YQ$djxl`XAMz)=oe27iX(I+MGgb=b-~30{Dehc{xQ_^9PCP z9SZ6_i|qlzo3GSvTtkeV{HR-Kg3F|L)&pLcQF}tzw)hY@(`t&W7P0P?JrP_-f_n~n zghDgKdoUc*D$9_s^EutLrn}SZpi5M)@09bYO=9f#@X|n_Nq6`%-+zZuc%XInTR{N; zXkz?t?Ir(Fij-Uo?f+ATEM#D9{h!q)=RYL2D+u3aO&eVsJs$9X5P@M393X~8fQNzO zEMz zEbrZi#m|E!i44?xJUKHMiaayrlal7tMY*vV772A0%!Uy&Qy4V53yj@GYV+o6?oxNf zuP9N~WOz{43g7E<>(vch2BKv&BSBJ8om7$4*Ud6S30FB6Ock!R2wH0ilS5AJNZhxQ zfI833_&S+}x}2NzwoukaPKZC+RG45cxTNb?jO$sZ2n{dk+ErA?( zvKOn*<84DfTAp%yr)kL||6)^Wc;i!e3vzUs#NM?ry{L2{LhM+_SzR;_+i5m9IoVL; z-ZGpbUP6L)QSU5Q7f%@N3J6J8PsU(Q+-cr0^<~@04oAMsN5BU_e_tK;2?)ynNs7%B zl_b2GdJ{5_uJ|g4Dm$=; z{F!4AvM@kf;z#~Urp6Lh{m>9S<$lryDD$ebx9}mF1)?dkMIDqmvX9D~L4uGoY84Tv<<0S#970)SZx-_B(kX+@<@}{~Q<VS} zr_?E^OB>pMC}{>MCI5z}VVV=Jwn0L!&BdCf1?e?Qz-<(N)elw6L`$<} zF_ixl@vxel3?(a<<+PMHCAXA20k|G}-CW(0-S_ef!Op7C3;$AjI`A4y{5a{uo2K^j zhw+x19IDeAe*8@Z87>1;Z0qL9D<0|Fcz0|{ga~kKx_z_YY5(<0G<8hnHW3oRIs0#8&;*s zJ&0$M$%TtO!+vWn*+|QiOtMqG@A0ICd-HY)a$p-*&6Y}TU);T+R7{<$Kbg{D?tRDf zxb3z$V%&iR)*~`Sw*ALCglV~^sJUFf{)SOdJMr9;d9+vuSC&|68oLgbA}3YyGz?I% zabli+9u`zkZK>*uvS!eif(>qqe!$_V3x{*{Ogt4BIM- z@##UqLdae-kGM{wcE7W`@c1rUJL3x16&bVw{!NSQsH-yL!m<=NOon>T%+UaTQ_ra8 z(7v-1-{6F*pLh*{wyghkCbZ_TkTQVYOxia5hUjxsAH~BxtNhpRNTozLp)Ngp$bnQg z>>=*YKsNZ$q^IKlZzM*5hZ7M6skEbnVXR;Q#KQ@cqo0bN_*G**N6mVRcxk=A(;K?A z*u}}mQN7KoiZ*FgXI)D2@&FjEVuCJlO?d{&8Nz+!DAUQ2zCUJ9=x;?dc;urge(<)A zqYtA!g{=#Zi>rkN&vsfQRw~KC%lM#^P_$nJ2SVctSYa%4iA1+l8l!1x@d8Ofij5`V=|EJ`YXb zZyithkGNn3vchplJ zJ8pULoT^MLkz>eZ8X4%KZ{BxqGcjQ=j!wk=YbX>3>TJO9N5kzfWIRcLBK5O6aR3@b z&1y^e`0Sl{X&ahj?h9$}iRaLnCi<4O;RLqigq{;fz8~{~KY?3E+SRXma_kD;5&=J? zzM&hy$|yQ5JtWkg)(af9oD#O#_#zJ*T*Au274|^o6-?bz4W}L-lxxR{N-xL97ST@< zr=BJpAD9#*!4@@{31K-eX+HtCY-5WtyhK>G z;S08CSrT(ttX7yt7x^NXzD8Zp(8#_%Xfeg48F-p`y^#y@?_vRPgq1F9wH#2ldeb7istic-j z%=*Zjmd=ql+pSm?8v|;#13TMuk6iP03J_DIDmV>CU4Y#`MWZ^AJ;x28s>$4GoJFH~ zi+F5^D>62W1T;sifi=p7HLuOEN5*)7t#4vycmMJk$Q4m4H6wk*h6=L*(W)LY$NVT+ zcSvI;fU3idYV`n|?0RY4-wa{EX+8MN;}b;o!|1#S;N60>RUU~pAErJ0-GKqd5KSir zuoH@NXK1b-E#U#4_Fg*RA|t3dXN0XVa?QG*_B{J`MLkqtm^~|Q-#F`Rs3-e&kjjk9 z)d(Ea?5##yzN;b3=5`Dx+z1_4*Mb$1`?4sws6^Yczamc86H=m!IZgqbLVJ*jbsyuI zD~7T48A5%$zPE>ZYj`hP=3~7yo8)6XF*{aDAode{N@w(;>c9_U1#;IJTIwf?5+rSj z>RiD-B#>=uyGd{G>8Sk=FNocN0*D%AyX1hD2RwF9iF;NLTyWLBYpJ)ij?o%3-z-kK z`VGHGiZwyn{3tac?slFSL>^CP9RNn}%TZQ|Q_eSG>C>mMnBONt=$!epJ8RRJV?;#){=stMybXvWAkih7-~5 zt%a3?b43sb)MNYt<)eSmxopVh%8!^T+re2jF>U)iv7q?%WC)k;}%|h@lA&N4*)>k??mDM zQb71$RKlG9W3)WAlt#k*)2uC}WWOCH6zpzM5u8X!5E6x~9PGZyt~EB&Qq_Xg(kCC` z2N=DDa$KJ|Km;@8UQGZY zMAV)bkTHNM)H>JmfDqRS4K)L_dzL!pGiE8W_%DYh)Op!u$T8)>VhJt5<@|jx)the< zu9%2g>>-wny0WcHQ1dp_^@SbL_Z+mha?jO=ZPVb@cv_HtadGQ8puVVPN=Ee=J@H>Y z5&DBnq2CghHPl;f8&3f(%KG-!(W1%+x^$%!gTH{^$%o)74{m5+ycyGzdhG%W(%6av z;F0YGHRrAoIeLo0GE8+^Eg8Av7ap^2yj4f+Tv2YZs9IJmbl~>{eaQ_7!NAs$Fqd*s zOJHtu$R<-VDc8308}V$d9TJelv!?J)e$qf^ER6N#yn{+uC>7_aK>~TvCugO)VgMN@ zYJ+ePeUvct2nCx#`4=C?P$5xa=-q3?d9&wVxPVV=Tn8;??Fo5?Qs{AJ6p5BZ2Ms?K zX^%rZGaZIemOR#Acm7*Su{k;ga&iX1#$sv$r>7Yrxkpv}x&UAvA;>H%GyT(148+rS zkkj4@P38unVEZL8!t`93>576>5`QA|?%QPQ~mZ_ng^w3WZptpBgG{4Wtqi^eZQe$9o~to4Q2lNy&;9~hi~ z9#IorH2`GXpIE=1xSlxP1S>1y2_C2j!{amtnl#Jk8XkL$boS6aLaPiy0xfJ^6n{y6 zOh#wSWs}-wskx%d?jqGT;);{>r{i|U+?09n?M{ui{g(DW;D;PP8aH>FTy(mmg)E=V zd9aImZx?kJc9P;neJQ86pHDAOaEl*eG2aqpcyAYZ7kZNCdKY`eFSm^kMtqq+cT3do zaxvdhWk0DmKj%+K89x=WcBzX$i&~7Yd>S5Fp?p*&Zs(E|NKMSNF+0AR)rL#@Wxin2{De^F2&bdTEj5$*#+-heYgATo; z0y$LptaS1Bf)=O{W0HJyr<6Hq=h}bIO1h;puSAkh7MI19sAeE@uAFPvIs~3sFS`}b z;%BQqyEE5bJ!pQB96fi|iylGVY=Ru#L9;XP>1-F>8*mA&=G%XM)1*M_K8gHmB>m#)sh?<_s7I?%UF>ql6X78HNweSw#?~ zi9`tv;$a-7qv?Ne7{Nyf?+@hTQldx0*cd>%mK>-!4R7K~3xOD%w77HY300X9z~Vx1 zB986N*)cF8GYZDdnTidUC@o166%g!OWpY~!8|1~9Nrp*y77pBpCCLPKH0rxMh-@_r63n-;rA1*i!tgUP z5NwzYVQ^WK3UtHUmZD#Z!9;Cpic=#{SzE&Eg-**c@EDJRE}u-4*5wvrt{0i2(@jsV z&!eLa9mxGk!K18_JQgb@LG{|JYI>^DEJUfQ4Mh%Dzs0FxP~KR@jufgwCUm+C`KWg@ z(HTW#v)58^G3b+e5Y&~SlhC7wpT!atFu0O%uk4ZAEIUaN2vYjK*7G?k{R5^ys7N!x|AvoBU$2NV5Fp(`vtv z6lqi(fBNhg%+H=T5C;A3zLXFQ)5dVI+!$&qZo>%I+5{B>TKC$nM^9Clx)B=K$cY&V zrB}`LwWCkK0g=|w`@2I2&_V|TCeO|%Dbsqzlq-mXq53=V6D73n7t8zKT_-RVxL&l4 z5oEv;nk|OaW>WDK4hA#n7{)C}vf{rm7)o01Kme6~ zEGq&OA^h#i@`8zv%(-^!64RYq=f<%Gvc>=L92m_~7A zqB&x|CCJLJbf=s)uQEv*^-8ZStIrSwD?ChajDr-F#GSxCH>*koQtK;M64Ty_E;lRn zfZo8zjTq3oHcrm)-&!}3GA&$tuB=GHn8c89B4#i(HOT|9c{xepZ(@?noOWqa3=#G) zpFmjID}p517-P1x6j!I{g2pWBV%fF2o7uLRSBS(&&QBlZ0eyMk4Z0!3Zn)7DjP>VB zMGqf#rId_$!P*{cGvBtmtMSenXnO<EWh4u@h5(Oq7~XRVQCV=w*7QE`cs8Fao|df(8#p=5*S`S zgzs=pg~jnSU7!vDydAW&EDeFr7$=r?s;^9S*KWS)2?d}|-WM2@fc4e3VJ*seBEN2F z3KZ|?2y@Tq4#F4jRpcnB;R!w#$U{a*B?dI~6Yx8K0PoNX=DR-qjn_g}(uwa&UNBFP zLeWc7SeFqoVibi@tu*;od1W6faU-76rJs{NWi)^4NlU&B z36yUn�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

taYYmyLQ@4J1aZ(%0 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 WA#s+L@jAV_FJb*cBhzQ({0fXBc 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⪼4MV4`!SKRS7wDrbLSBTQC z=3pYxJRX@nZ@$I6?_FT_c~M#KCitrO?SN(Vk3v;r&Z{vhO8xa*d}}y^&^4SZmt|tRas| z=@!D|(_-ma87gxBo$Mbqgfby3o(O*T!4nmbj|3ZbG;!cBtx>AFx^#B(r!HG&if1yJ zq9aZ{Vm(N(U)B?sQ>4p(NN4nq-y*9iPD-ZFykY*=vB1{^{r`?|ec^=vClRjy40!$b zAXkwG$PVMnv3(5#1}63YFMu)Q zEHMrXlmxL|Iq*89f^yx^VOW=vN3e@W6Z zu)as8*1N{G6fy)Z9kpj4#y=v)5f(D;H!@aIy=o@PPM;_ApUf-ir%#blUR4m7h*@G|*r!;9+Zh*0-q1NCa0;g8eue07V7UmG zku4vtu+wOi>+4;D*1evwt3C=F4MgrI&jfX$oq~#1^Mn;Squ8I^*B~D^5e=C{=t@naMq;;3yY_!g$vJgNH7EvwfLP<9#c~I0^FUJ$%5;J|FY+ z;CuL2W`!Bl#n2+-`Q6@Ag*~T%S(pE&Z8_J}C4PaNf0%-tABgET#)7R7+fPub?6!8+ zJ81f{If(fZZ?H8^d`{2ZR_ni77*=!3W+j{c@?&Q?T7;^H8g++?qle=T!rO@RrKb^V zX>+{UwDvmht@O6Iz9}*BuaQ}2*KujV^(B|ZP9qMpRnxZ#>{576i})XU-*v53m3^C4 zGPIZ4Im(Z}JcccdPVjVRntW`>-=ouEyut;zq|nemeT;=vPi1Wx^(ro?kOj zi`?XD_NE>SG{T{m4dFD+dXlznP(THQG6}Xd3IUA^Q;7NQVbQZJbIoAO%iid5dcxUR zjqLf+%U6RrqM1f6C`;P=!9gSa9HzvJl3igVXF0!06SjV~ac=3@boh_jl;Udpv(I(= zp3b8F2EfhoG-gp%Srdp#cKExBv7&cH2P-?Gzy!mEHtVUry9YzmkDcOSO7M{g)K$+;}UKWm3ifbdh2V>1JDy0iHI*J}ZVCz;}u8UIJd3 zovuf|Xjy392(Wi^3jsNZdbkwvdrZ7x;?U301S*E}X)O2(tkxS3c z^I=8nIil2~m_`h*_OlFJmf$k$SGgp~WEIinD|6iST65m!Po=lV5IE|GkV zIIqKyRfy6h!N`Ok;)u6AS5lxi0>}M>(#vOHmgxmEQvfE!fU+`V&*#6bM-M|!+`nJkLe{BewhBKt@&S2%g$1NuN6$gf=Gk^D!_IxMmZLk0dNq%|m)j1DRA zOGjf19ay&LaP7g8RVe&zZHJ-ldDCO&BgbK;?K$(|*ph+oh0&L6zY}?RZ~15Yt)2Bh zGLb1tr4ESJsP_%wm+$;zi}-9WYMzoq1O%I7kvWKYKXMGt8#XVGf_&h96JGyb_ED?L zDG?Z1aH(je2*hsX@P*hUJUs5k*^CkHzk+6P=TN)R1D

35TC$xsIqT0KM7@*Iys!s$=P3yP$ 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 z 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 R7WUpu*1yoKaoT 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

bmF%e4fr;3%v&T(tJUY|loE=}-eWZQiu# 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%0AI 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%0DOWoJ% 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

MC2@_p01gB@Rx%TQ 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 literal 0 HcmV?d00001 diff --git a/build.gradle b/build.gradle index 38d6b7270..1a561c020 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,8 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } @@ -22,8 +23,8 @@ repositories { } } -apply plugin: 'forge' -apply plugin: 'curseforge' +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'com.matthewprenger.cursegradle' ext.configFile = file('build.properties') @@ -36,8 +37,9 @@ archivesBaseName = config.mod_name minecraft { version = "${config.mc_version}-${config.forge_version}" - assetDir = "eclipse/assets" + runDir = "eclipse/assets" + mappings = "snapshot_20151128" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -60,9 +62,9 @@ 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: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" //and a bit more for SCP @@ -207,14 +209,18 @@ jar { archiveName = "${baseName} ${version}.${extension}" } -curse { +curseforge { apiKey = priv.cfkey - projectId = "225643" - changelog = """ - See http://botaniamod.net/changelog.php#${version} - """ - releaseType = "release" - relatedProject 'baubles': 'requiredLibrary' + project { + id = "225643" + changelog = """ + See http://botaniamod.net/changelog.php#${version} + """ + releaseType = "release" + relations { + requiredLibrary 'baubles' + } + } } defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' diff --git a/build.properties b/build.properties index 07e4fe7ab..94e996974 100644 --- a/build.properties +++ b/build.properties @@ -2,8 +2,8 @@ #Sun Dec 13 01:59:42 GMT 2015 version=r1.8 dir_output=../Build Output/Botania/ -mc_version=1.8 -forge_version=11.14.3.1468 +mc_version=1.8.8 +forge_version=11.15.0.1635-1.8.8 dir_repo=./ build_number=244 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index daf353b30..b3601d37f 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -17,6 +17,8 @@ import java.util.Map; import java.util.WeakHashMap; import java.util.regex.Pattern; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -246,8 +248,8 @@ public final class CorporeaHelper { * in are for the block that the spark will be on, not the coords of the spark itself. */ public static ICorporeaSpark getSparkForBlock(World world, BlockPos pos) { - List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1))); - return sparks.isEmpty() ? null : sparks.get(0); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1)), Predicates.instanceOf(ICorporeaSpark.class)); + return sparks.isEmpty() ? null : ((ICorporeaSpark) sparks.get(0)); } /** diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index cd76a22b4..c9172dd6a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -280,7 +280,7 @@ public final class HUDHandler { int y = res.getScaledHeight() / 2 + 10; int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; - int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; + int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); 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 89203afe8..b7871192a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -56,7 +56,7 @@ public final class TooltipAdditionDisplayHandler { if(slot != null && slot.getHasStack()) { ItemStack stack = slot.getStack(); if(stack != null) { - ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + ScaledResolution res = new ScaledResolution(mc); FontRenderer font = mc.fontRendererObj; int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth; int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight; diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 2e0495c7a..94cd95403 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -111,7 +111,7 @@ public class InventoryFlowerBag implements IInventory { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -163,7 +163,7 @@ public class InventoryFlowerBag implements IInventory { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override @@ -177,7 +177,7 @@ public class InventoryFlowerBag implements IInventory { } @Override - public String getCommandSenderName() { + public String getName() { return LibItemNames.FLOWER_BAG; } diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index b878c81c9..5d59fe39e 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -111,7 +111,7 @@ public class InventoryBaubleBox implements IInventory { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -162,7 +162,7 @@ public class InventoryBaubleBox implements IInventory { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override @@ -176,7 +176,7 @@ public class InventoryBaubleBox implements IInventory { } @Override - public String getCommandSenderName() { + public String getName() { return LibItemNames.BAUBLE_BOX; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 095fcba2d..c917be4c6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -225,7 +225,7 @@ public class GuiLexicon extends GuiScreen { bookmarksNeedPopulation = false; } - if(mc.thePlayer.getCommandSenderName().equals("haighyorkie")) { + if(mc.thePlayer.getName().equals("haighyorkie")) { GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java index a816e8bf8..0c98afcce 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.model.ModelBook; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; @@ -75,8 +76,8 @@ public class RenderLexicon implements IItemRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.3F, -0.21F, -0.07F); GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("BevoLJ"); - boolean saice = Minecraft.getMinecraft().thePlayer.getCommandSenderName().equalsIgnoreCase("saice"); + boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); + boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 0d2513684..6bd133987 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -59,7 +59,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Integer) state.getValue(BotaniaStateProps.POWER)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index a43404df8..2a3c39a03 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -76,13 +76,13 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return isProvidingWeakPower(world, pos, state, side); + public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + return getWeakPower(world, pos, state, side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9549af714..bff3801cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -114,7 +114,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 0 : 15; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index ccb02bc33..31539d5c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -85,11 +85,11 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { if(!relays.isEmpty()) { AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1)); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); if(!entities.isEmpty()) { - for(Entity entity : entities) { + for(Entity entity : ((List) entities)) { TileLightRelay relay = relays.get(world.rand.nextInt(relays.size())); relay.mountEntity(entity); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index df896c2aa..d8bd6c4b0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -147,7 +147,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT && ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 8a0f6c0af..e12ccf6d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -132,7 +132,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl return false; if(!player.isSneaking()) { - playerPositions.put(player.getCommandSenderName(), getCoordsAsString(world.provider.getDimensionId(), pos)); + playerPositions.put(player.getName(), getCoordsAsString(world.provider.getDimensionId(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7847e1c57..96c5e7538 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -152,13 +152,13 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return isProvidingWeakPower(world, pos, state, side); + return getWeakPower(world, pos, state, side); } @Override 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 b4c5aa6d0..d2dcda75f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -65,7 +65,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } 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 fe5f87d2a..46825a6b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 9f0b22008..47a3c212f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -19,6 +19,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 715e98217..c9e18f5bf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -67,7 +67,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index d281d6d1e..8c4223ca6 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -71,7 +71,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public int isProvidingWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 4b261a7c4..fcd2a5f16 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 1c7490228..4352c2ea2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.subtile.functional; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; 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 b6c0806cd..bd8c091fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -19,7 +19,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -44,7 +44,7 @@ import vazkii.botania.common.lexicon.LexiconData; import com.google.common.base.Function; -public class TileAlfPortal extends TileMod implements IUpdatePlayerListBox { +public class TileAlfPortal extends TileMod implements ITickable { private static final BlockPos[] LIVINGWOOD_POSITIONS = { new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(-2, 1, 0), 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 814ba088f..ab001f87c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -28,7 +28,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -46,7 +46,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary, IUpdatePlayerListBox { +public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary, ITickable { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); @@ -279,7 +279,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.ALTAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 5f0241589..63d376274 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,13 +13,13 @@ package vazkii.botania.common.block.tile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, IUpdatePlayerListBox { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, ITickable { private static final int MAX_MANA = 6400; @@ -100,7 +100,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.AVATAR; } 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 f3bdbb9a2..2edaf85b9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileBifrost extends TileMod implements IUpdatePlayerListBox { +public class TileBifrost extends TileMod implements ITickable { private static final String TAG_TICKS = "ticks"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 545ca0e44..12f061455 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; @@ -36,7 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { +public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; @@ -200,7 +200,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.RUNE_ALTAR; } 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 e7c4907fe..c3600b9b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,10 +22,10 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraftforge.fml.common.registry.VillagerRegistry; -public class TileCocoon extends TileMod implements IUpdatePlayerListBox { +public class TileCocoon extends TileMod implements ITickable { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; 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 e7b3dd264..b6f2afb1c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -29,7 +29,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -49,7 +49,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileEnchanter extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { +public class TileEnchanter extends TileMod implements ISparkAttachable, ITickable { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; 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 0c4da460f..f71f78f30 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -16,13 +16,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; -public class TileEnderEye extends TileMod implements IUpdatePlayerListBox { +public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index b5346daf0..6153d71a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; -public class TileForestEye extends TileMod implements IUpdatePlayerListBox { +public class TileForestEye extends TileMod implements ITickable { public int entities = 0; 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 aeed83d55..25adb17d8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -19,7 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; @@ -30,7 +30,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; -public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerListBox { +public class TileHourglass extends TileSimpleInventory implements ITickable { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; @@ -172,7 +172,7 @@ public class TileHourglass extends TileSimpleInventory implements IUpdatePlayerL } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.HOURGLASS; } 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 1205c4f59..ae07b0307 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; @@ -30,7 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, IUpdatePlayerListBox { +public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, ITickable { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -107,7 +107,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.INCENSE_PLATE; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index ed69a1afe..3c89cc627 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,7 +21,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -37,7 +37,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -public class TileLightRelay extends TileMod implements IWandBindable, IUpdatePlayerListBox { +public class TileLightRelay extends TileMod implements IWandBindable, ITickable { private static final int MAX_DIST = 20; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 76d854dad..fb6cce005 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -12,12 +12,12 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -public class TileManaBeacon extends TileMod implements IUpdatePlayerListBox { +public class TileManaBeacon extends TileMod implements ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 68a571370..69b215961 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,11 +11,11 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -public class TileManaFlame extends TileMod implements IUpdatePlayerListBox { +public class TileManaFlame extends TileMod implements ITickable { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index cae077b5a..874b323de 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -14,13 +14,13 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerListBox { +public class TileOpenCrate extends TileSimpleInventory implements ITickable { @Override public int getSizeInventory() { @@ -28,7 +28,7 @@ public class TileOpenCrate extends TileSimpleInventory implements IUpdatePlayerL } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.OPEN_CRATE; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index f669a3f9c..5a38110e3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -15,7 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +25,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -public class TilePylon extends TileEntity implements IUpdatePlayerListBox { +public class TilePylon extends TileEntity implements ITickable { boolean activated = false; BlockPos centerPos; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index b2fd13271..5c25b6c26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -22,7 +22,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; @@ -44,7 +44,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, IUpdatePlayerListBox { +public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -304,7 +304,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.RUNE_ALTAR; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index e8ba54d1a..7ce6c6c8e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -78,7 +78,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { return getStackInSlot(i); } @@ -137,6 +137,6 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index bc162d464..6acc2d432 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -84,7 +84,7 @@ public class TileSparkChanger extends TileSimpleInventory { } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.SPARK_CHANGER; } 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 f20023109..a96de1dd2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -18,7 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; @@ -29,7 +29,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -public class TileSpawnerClaw extends TileMod implements IManaReceiver, IUpdatePlayerListBox { +public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable { private static final String TAG_MANA = "mana"; 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 c272cff6d..76f96ec60 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos; @@ -35,7 +35,7 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer, IUpdatePlayerListBox { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer, ITickable { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index e401e7454..faee5505e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod implements IUpdatePlayerListBox { +public class TileSpiritShrine extends TileMod implements ITickable { int ticks; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 13de5ce71..68bbcd447 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -public class TileStarfield extends TileMod implements IUpdatePlayerListBox { +public class TileStarfield extends TileMod implements ITickable { @Override public void update() { 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 9a4ec8407..b64614045 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -12,13 +12,14 @@ package vazkii.botania.common.block.tile; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -33,7 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdatePlayerListBox { +public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; @@ -227,9 +228,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, IUpdate @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1))); + List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { - Entity e = (Entity) sparks.get(0); + Entity e = sparks.get(0); return (ISparkEntity) e; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 95b41c283..74157b72a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; -public class TileTeruTeruBozu extends TileMod implements IUpdatePlayerListBox { +public class TileTeruTeruBozu extends TileMod implements ITickable { public boolean wasRaining = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 3c5f1c78c..6ffa2e6cb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index bf398f2a6..e8f7f3ab1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; -public class TileTinyPotato extends TileMod implements IUpdatePlayerListBox { +public class TileTinyPotato extends TileMod implements ITickable { private static final String TAG_NAME = "name"; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index c16e4b511..3645474fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -15,14 +15,14 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickable { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -131,7 +131,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_CRYSTAL_CUBE; } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 89d8302ba..7345b60d5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -80,7 +80,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_FUNNEL; } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 366c42040..7cac8d098 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -24,7 +24,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -45,7 +45,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, IUpdatePlayerListBox { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickable { public static final double RADIUS = 2.5; @@ -196,7 +196,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_INDEX; } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index f873137d4..936316499 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -39,7 +39,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.CORPOREA_INTERCEPTOR; } 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 c85db3c6a..61a367998 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 @@ -13,7 +13,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; @@ -23,7 +23,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; -public class TileBellows extends TileMod implements IUpdatePlayerListBox { +public class TileBellows extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index fab39e870..2a5486981 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.tile.mana; import java.util.ArrayList; import java.util.List; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -22,7 +22,7 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibMisc; -public class TileDistributor extends TileMod implements IManaReceiver, IUpdatePlayerListBox { +public class TileDistributor extends TileMod implements IManaReceiver, ITickable { List validPools = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index b3d738994..8690a1d97 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.tile.mana; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; +import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; @@ -18,13 +20,13 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod implements IManaCollisionGhost, IUpdatePlayerListBox { +public class TileManaDetector extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { if(!worldObj.isRemote) { boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); - boolean expectedState = worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))).size() != 0; + boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); 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 fa187a4d4..6f4460ffb 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 @@ -26,7 +26,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; @@ -62,7 +62,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, IUpdatePlayerListBox { +public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickable { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index c95ac821a..4181709db 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -61,7 +61,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.PRISM; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index f1714046a..e16f1c53c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -11,12 +11,12 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements IUpdatePlayerListBox { +public class TilePump extends TileMod implements ITickable { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index a6eb3e27b..a9f713222 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -25,7 +25,7 @@ import java.util.EnumMap; import java.util.Map; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, IUpdatePlayerListBox { +public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, ITickable { private static final int CONVERSION_RATE = 10; private static final int MAX_MANA = 1280 * CONVERSION_RATE; 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 073f9493e..a0ffffa23 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 @@ -24,7 +24,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.BlockPos; @@ -58,7 +58,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; import vazkii.botania.common.lib.LibBlockNames; -public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, IUpdatePlayerListBox { +public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { private static final int MAX_MANA = 1000; private static final int ULTRA_MAX_MANA = 6400; @@ -600,7 +600,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public String getCommandSenderName() { + public String getName() { return LibBlockNames.SPREADER; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 99591955d..b231a287c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -16,7 +16,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; @@ -26,7 +26,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod implements IUpdatePlayerListBox { +public class TileTurntable extends TileMod implements ITickable { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; 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 61e54503c..224ecdbf2 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 @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -21,7 +21,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; -public abstract class TileRedString extends TileMod implements ITileBound, IUpdatePlayerListBox { +public abstract class TileRedString extends TileMod implements ITileBound, ITickable { private BlockPos binding; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 3e3a5434e..a54ed25c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -49,9 +49,9 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven } @Override - public ItemStack getStackInSlotOnClosing(int slot) { + public ItemStack removeStackFromSlot(int slot) { IInventory inv = getInventory(); - return inv != null ? inv.getStackInSlotOnClosing(slot) : null; + return inv != null ? inv.removeStackFromSlot(slot) : null; } @Override @@ -62,9 +62,9 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven } @Override - public String getCommandSenderName() { + public String getName() { IInventory inv = getInventory(); - return inv != null ? inv.getCommandSenderName() : LibBlockNames.RED_STRING_CONTAINER; + return inv != null ? inv.getName() : LibBlockNames.RED_STRING_CONTAINER; } @Override @@ -76,7 +76,7 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven @Override public IChatComponent getDisplayName() { IInventory inv = getInventory(); - return inv != null ? inv.getDisplayName() : new ChatComponentText(getCommandSenderName()); + return inv != null ? inv.getDisplayName() : new ChatComponentText(getName()); } @Override 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 40bd40b44..d5a3bc949 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 @@ -15,12 +15,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.util.ITickable; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -public class TileRedStringInterceptor extends TileRedString implements IUpdatePlayerListBox { +public class TileRedStringInterceptor extends TileRedString implements ITickable { public static List interceptors = new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index d1d322d7e..a5d135359 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -32,7 +32,7 @@ public class CommandShare extends CommandBase { @Override public void processCommand(ICommandSender sender, String[] args) { String json = StatCollector.translateToLocal("botaniamisc.shareMsg"); - json = json.replaceAll("%name%", sender.getCommandSenderName()); + json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); json = json.replaceAll("%entryname%", StatCollector.translateToLocal(args[0])); diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index e1ccd195e..4deb16d15 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; @@ -44,7 +45,7 @@ public final class AliasHandler { private static Item getItem(String name) { for(Object o : Item.itemRegistry.getKeys()) { - Item i = (Item) Item.itemRegistry.getObject(o); + Item i = (Item) Item.itemRegistry.getObject(new ResourceLocation(o)); if(i.getUnlocalizedName().substring("item.".length()).equals(name)) return i; } @@ -54,7 +55,7 @@ public final class AliasHandler { private static Block getBlock(String name) { for(Object o : Block.blockRegistry.getKeys()) { - Block b = (Block) Block.blockRegistry.getObject(o); + Block b = (Block) Block.blockRegistry.getObject(new ResourceLocation(o)); if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) return b; } diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index beb00941f..1983fdd86 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -261,7 +261,7 @@ public class InventoryHelper { } @Override - public ItemStack getStackInSlotOnClosing(int i) { + public ItemStack removeStackFromSlot(int i) { if(i >= inventoryContents.length) return null; @@ -358,7 +358,7 @@ public class InventoryHelper { } @Override - public String getCommandSenderName() { + public String getName() { return null; } @@ -369,7 +369,7 @@ public class InventoryHelper { @Override public IChatComponent getDisplayName() { - return new ChatComponentText(getCommandSenderName()); + return new ChatComponentText(getName()); } @Override diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 4db165e9b..e96dca7cd 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -13,8 +13,8 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import vazkii.botania.common.core.handler.ConfigHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; public final class AdaptorNotifier { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c1889f9b2..088259672 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -2168,7 +2169,7 @@ public final class ModCraftingRecipes { // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { - Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + Item goggles = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemGoggles")); 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); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 34f8197de..7f1877a3b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -17,6 +17,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.common.Botania; @@ -74,7 +75,7 @@ public final class ModManaInfusionRecipes { tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); if(Botania.thaumcraftLoaded) { - Item inkwell = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemInkwell"); + Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemInkwell")); manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 041350ce1..e2a81c230 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -357,8 +357,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getCommandSenderName())) - playersWhoAttacked.add(player.getCommandSenderName()); + if(!playersWhoAttacked.contains(player.getName())) + playersWhoAttacked.add(player.getName()); float dmg = par2; boolean crit = false; @@ -380,7 +380,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi EntityPlayer player = (EntityPlayer) e; - String name = player.getCommandSenderName(); + String name = player.getName(); return !(player instanceof FakePlayer || FAKE_PLAYER_PATTERN.matcher(name).matches()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 1e1b81e10..7b6eb6ecc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -318,7 +318,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if ((this.throwerName == null || this.throwerName.length() == 0) && this.thrower instanceof EntityPlayer) { - this.throwerName = this.thrower.getCommandSenderName(); + this.throwerName = this.thrower.getName(); } tagCompound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 386267e83..fb518cdb4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -167,7 +167,7 @@ public class ItemBottledMana extends ItemMod { if(!player.worldObj.isRemote) { player.attackEntityFrom(DamageSource.magic, player.getHealth() - 1); ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", player.getCommandSenderName()); + ItemNBTHelper.setString(stack, "SkullOwner", player.getName()); player.dropPlayerItemWithRandomChoice(stack, true); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 803dbb741..6d6324f06 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -132,11 +132,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } return wanded; - } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { - String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); + } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { + String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.getDimensionId(), pos); - BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); + BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 9c8ae52b7..2713ecaed 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -33,7 +33,7 @@ public class ItemWorldSeed extends ItemMod { player.rotationYaw = 0F; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCollidingBoundingBoxes(player, player.getBoundingBox()).isEmpty()) + while(!world.getCollidingBoundingBoxes(player, player.getEntityBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); 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 fa4b304b3..3bf997eea 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; @@ -60,7 +61,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range)); + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { if(event.entityLiving instanceof EntityCreeper) 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 43915808e..aad7a5d61 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 @@ -88,7 +88,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } private void addIceBlock(EntityPlayer player, BlockPos coords) { - String user = player.getCommandSenderName(); + String user = player.getName(); if(!playerIceBlocks.containsKey(user)) playerIceBlocks.put(user, new ArrayList()); @@ -102,7 +102,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } private void tickIceRemovers(EntityPlayer player) { - String user = player.getCommandSenderName(); + String user = player.getName(); if(!playerIceBlocks.containsKey(user)) return; 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 0fb9081a8..50dc76d14 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 @@ -14,13 +14,11 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; @@ -43,8 +41,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMagnetRing extends ItemBauble { - IIcon iconOff; - private static final String TAG_COOLDOWN = "cooldown"; private static final List BLACKLIST = Arrays.asList(new String[] { @@ -63,19 +59,6 @@ public class ItemMagnetRing extends ItemBauble { this.range = range; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - iconOff = IconHelper.forItem(par1IconRegister, this, 1); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack stack) { - return getCooldown(stack) <= 0 ? itemIcon : iconOff; - } - @SubscribeEvent public void onTossItem(ItemTossEvent event) { InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 0b6a3c929..50d414f38 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Random; import com.google.common.base.Predicate; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; @@ -62,11 +61,11 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; for(int i = 0; i < 4; i++) { - List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; - EntityLivingBase target = entities.get(rand.nextInt(entities.size())); + EntityLivingBase target = ((EntityLivingBase) entities.get(rand.nextInt(entities.size()))); if(attacker instanceof EntityPlayer) target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); 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 13adbbec1..647dffbb5 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 @@ -50,7 +50,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { addDrop(event, new ItemStack(Items.skull, 1, 4)); else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getCommandSenderName()); + ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getName()); addDrop(event, stack); } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) addDrop(event, new ItemStack(ModItems.gaiaHead)); 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 1258fd90c..c6aac93b3 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 @@ -85,7 +85,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getCommandSenderName()); + ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); burst.setSourceLens(lens); return burst; } @@ -108,7 +108,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 9e3d84bca..c2730607c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.lens; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; @@ -29,13 +30,13 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); + List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range), Predicates.instanceOf(IManaBurst.class))); - for(Entity movable : movables) { + for(Entity movable : ((List) movables)) { if(movable == burst) continue; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 09de0621e..528dfa26a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -139,7 +139,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getCommandSenderName()); + ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); burst.setSourceLens(lens); return burst; } @@ -190,7 +190,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf } for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 0285c8f7a..88f93bfeb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -106,7 +106,7 @@ public class ItemRelic extends ItemMod implements IRelic { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUsernameS(player.getCommandSenderName(), stack); + bindToUsernameS(player.getName(), stack); } public static void bindToUsernameS(String username, ItemStack stack) { @@ -114,7 +114,7 @@ public class ItemRelic extends ItemMod implements IRelic { } public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - return isRightPlayer(player.getCommandSenderName(), stack); + return isRightPlayer(player.getName(), stack); } public static boolean isRightPlayer(String player, ItemStack stack) { From c480a3303a0b11b865c27958974922cdd211e698 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 12:53:59 -0600 Subject: [PATCH 062/935] Remove unneeded casts since 1.8.8 restores generics --- .../client/core/handler/CorporeaAutoCompleteHandler.java | 2 +- .../vazkii/botania/client/gui/GuiAchievementsHacky.java | 2 +- .../vazkii/botania/client/gui/bag/ContainerFlowerBag.java | 6 +++--- .../vazkii/botania/client/gui/box/ContainerBaubleBox.java | 4 ++-- .../java/vazkii/botania/client/gui/box/GuiBaubleBox.java | 2 +- .../vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java | 2 +- .../java/vazkii/botania/common/block/BlockAlfPortal.java | 2 +- .../java/vazkii/botania/common/block/BlockCacophonium.java | 4 ++-- .../java/vazkii/botania/common/block/BlockEnderEye.java | 4 ++-- .../java/vazkii/botania/common/block/BlockGaiaHead.java | 2 +- .../java/vazkii/botania/common/block/BlockHourglass.java | 4 ++-- .../java/vazkii/botania/common/block/BlockLightRelay.java | 4 ++-- .../java/vazkii/botania/common/block/BlockPistonRelay.java | 2 +- .../java/vazkii/botania/common/block/BlockSparkChanger.java | 4 ++-- .../botania/common/block/corporea/BlockCorporeaFunnel.java | 4 ++-- .../common/block/corporea/BlockCorporeaInterceptor.java | 4 ++-- .../common/block/corporea/BlockCorporeaRetainer.java | 4 ++-- .../vazkii/botania/common/block/decor/BlockStarfield.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockBrewery.java | 4 ++-- .../vazkii/botania/common/block/mana/BlockManaDetector.java | 4 ++-- .../java/vazkii/botania/common/block/mana/BlockPrism.java | 6 +++--- .../common/block/string/BlockRedStringDispenser.java | 4 ++-- .../common/block/string/BlockRedStringInterceptor.java | 4 ++-- .../common/block/subtile/generating/SubTileHydroangeas.java | 2 +- .../common/block/subtile/generating/SubTileKekimurus.java | 2 +- .../java/vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- .../vazkii/botania/common/block/tile/TileStarfield.java | 2 +- .../common/block/tile/corporea/TileCorporeaInterceptor.java | 2 +- .../vazkii/botania/common/block/tile/mana/TileBellows.java | 2 +- .../botania/common/block/tile/mana/TileManaDetector.java | 2 +- .../vazkii/botania/common/core/handler/AliasHandler.java | 4 ++-- .../vazkii/botania/common/core/handler/SheddingHandler.java | 6 +++--- .../java/vazkii/botania/common/crafting/ModBrewRecipes.java | 4 ++-- .../botania/common/crafting/recipe/HelmRevealingRecipe.java | 2 +- .../vazkii/botania/common/entity/EntityDoppleganger.java | 4 ++-- .../vazkii/botania/common/entity/EntityEnderAirBottle.java | 2 +- .../vazkii/botania/common/entity/EntityThornChakram.java | 4 ++-- .../vazkii/botania/common/entity/EntityThrowableCopy.java | 2 +- .../java/vazkii/botania/common/item/ItemOpenBucket.java | 2 +- .../common/item/equipment/bauble/ItemIcePendant.java | 2 +- .../botania/common/item/equipment/tool/ToolCommons.java | 2 +- .../item/equipment/tool/elementium/ItemElementiumAxe.java | 2 +- .../item/equipment/tool/terrasteel/ItemTerraSword.java | 2 +- .../java/vazkii/botania/common/item/lens/LensMagnet.java | 2 +- .../botania/common/lexicon/page/PageCraftingRecipe.java | 6 +++--- .../vazkii/botania/common/lexicon/page/PagePetalRecipe.java | 2 +- 46 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 72c4b4706..9e927aff2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -63,7 +63,7 @@ public class CorporeaAutoCompleteHandler { if(item != null && item.getCreativeTab() != null) { curList.clear(); try { - item.getSubItems(item, (CreativeTabs) null, curList); + item.getSubItems(item, null, curList); for(ItemStack stack : curList) itemNames.add(CorporeaHelper.stripControlCodes(stack.getDisplayName().trim())); } diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 547a7018f..7fbc8ef3e 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -27,7 +27,7 @@ public class GuiAchievementsHacky extends GuiAchievements { @Override public void initGui() { super.initGui(); - ((GuiButton) buttonList.get(1)).displayString = ModAchievements.botaniaPage.getName(); + buttonList.get(1).displayString = ModAchievements.botaniaPage.getName(); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 5160afa2a..63199c0ee 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -65,7 +65,7 @@ public class ContainerFlowerBag extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { ItemStack itemstack = null; - Slot slot = (Slot)inventorySlots.get(p_82846_2_); + Slot slot = inventorySlots.get(p_82846_2_); if(slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); @@ -77,14 +77,14 @@ public class ContainerFlowerBag extends Container { } else { int i = itemstack.getItemDamage(); if(i < 16) { - Slot slot1 = (Slot)inventorySlots.get(i); + Slot slot1 = inventorySlots.get(i); if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true)) return null; } } if(itemstack1.stackSize == 0) - slot.putStack((ItemStack)null); + slot.putStack(null); else slot.onSlotChanged(); if(itemstack1.stackSize == itemstack.stackSize) diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 24d54be75..5e19c7e5a 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -91,7 +91,7 @@ public class ContainerBaubleBox extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { ItemStack itemstack = null; - Slot slot = (Slot)inventorySlots.get(p_82846_2_); + Slot slot = inventorySlots.get(p_82846_2_); if(slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); @@ -107,7 +107,7 @@ public class ContainerBaubleBox extends Container { } if(itemstack1.stackSize == 0) - slot.putStack((ItemStack)null); + slot.putStack(null); else slot.onSlotChanged(); if(itemstack1.stackSize == itemstack.stackSize) diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 22dd60d44..642b1bca1 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -43,7 +43,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer { drawTexturedModalRect(k, l, 0, 0, xSize, ySize); for(int i1 = 0; i1 < 4; ++i1) { - Slot slot = (Slot) inventorySlots.inventorySlots.get(i1); + Slot slot = inventorySlots.inventorySlots.get(i1); if(slot.getHasStack() && slot.getSlotStackLimit() == 1) drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index f1a51a896..7d1f7340b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -320,7 +320,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa page.onKeyPressed(par1, par2); if(par2 == 1) { - mc.displayGuiScreen((GuiScreen)null); + mc.displayGuiScreen(null); mc.setIngameFocus(); } else if(par2 == 203 || par2 == 200 || par2 == 201) // Left, Up, Page Up prevPage(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index c4f566246..6afe92d03 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -91,7 +91,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - return ((AlfPortalState) world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE)) == AlfPortalState.OFF ? 0 : 15; + return world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF ? 0 : 15; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 9023358e5..4da8c9fd9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -45,7 +45,7 @@ public class BlockCacophonium extends BlockModContainer { @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } @Override @@ -66,7 +66,7 @@ public class BlockCacophonium extends BlockModContainer { @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 6bd133987..3c417f4c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -50,7 +50,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override @@ -60,7 +60,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return ((Integer) state.getValue(BotaniaStateProps.POWER)); + return state.getValue(BotaniaStateProps.POWER); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index ba3dc8c26..805b248d6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -56,7 +56,7 @@ public class BlockGaiaHead extends BlockSkull { public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList(); - if(!((Boolean) state.getValue(NODROP))) { + if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index bff3801cc..b6d1bfed1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -69,7 +69,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } @Override @@ -115,7 +115,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 0 : 15; + return state.getValue(BotaniaStateProps.POWERED) ? 0 : 15; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index d8bd6c4b0..2c7b53244 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -67,7 +67,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR ? 1 : 0; - if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { meta &= -9; @@ -149,7 +149,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT - && ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; + && state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index e12ccf6d2..d0cd563d0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -211,7 +211,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(block == Blocks.piston_extension) { IBlockState state = getStateAt(s); boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); - EnumFacing dir = ((EnumFacing) state.getValue(BlockPistonMoving.FACING)).getOpposite(); + EnumFacing dir = state.getValue(BlockPistonMoving.FACING).getOpposite(); MinecraftServer server = MinecraftServer.getServer(); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 059aa7c66..c188a83b3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -57,7 +57,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } @Override @@ -83,7 +83,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { ((TileSparkChanger) world.getTileEntity(pos)).doSwap(); 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 93b10c703..dd0884a7f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -43,7 +43,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } @Override @@ -54,7 +54,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { ((TileCorporeaFunnel) world.getTileEntity(pos)).doRequest(); 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 d2dcda75f..3848b56ad 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -46,7 +46,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } @Override @@ -66,7 +66,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override 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 324cae185..9ccc6ef6a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -48,7 +48,7 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } @Override @@ -59,7 +59,7 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { ((TileCorporeaRetainer) world.getTileEntity(pos)).fulfilRequest(); 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 07a50e1f1..45b856dcf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -46,7 +46,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } @Override 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 5dc2c8114..744d01f9a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -63,7 +63,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } @Override @@ -76,7 +76,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { - if(brew.recipe == null && !((Boolean) state.getValue(BotaniaStateProps.POWERED))) + if(brew.recipe == null && !state.getValue(BotaniaStateProps.POWERED)) for(int i = brew.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = brew.getStackInSlot(i); if(stackAt != null) { 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 c9e18f5bf..7519453f6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -53,7 +53,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable @Override public int getMetaFromState(IBlockState state) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 1 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } @Override @@ -68,7 +68,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable @Override public int getWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override 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 43605b8ac..18c6fb4ae 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -67,8 +67,8 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi @Override public int getMetaFromState(IBlockState state) { - return (((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 8 : 0) - + (((Boolean) state.getValue(BotaniaStateProps.HAS_LENS)) ? 1 : 0); + return (state.getValue(BotaniaStateProps.POWERED) ? 8 : 0) + + (state.getValue(BotaniaStateProps.HAS_LENS) ? 1 : 0); } @Override @@ -132,7 +132,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(!world.isRemote) { if(power && !powered) 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 6ad032eee..00268cc91 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -36,7 +36,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Override public int getMetaFromState(IBlockState state) { int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); - if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { meta &= -9; @@ -55,7 +55,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - boolean powered = ((Boolean) state.getValue(BotaniaStateProps.POWERED)); + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { ((TileRedStringDispenser) world.getTileEntity(pos)).tickDispenser(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 8c4223ca6..cd618e032 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -43,7 +43,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public int getMetaFromState(IBlockState state) { int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); - if (((Boolean) state.getValue(BotaniaStateProps.POWERED))) { + if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { meta &= -9; @@ -72,7 +72,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return ((Boolean) state.getValue(BotaniaStateProps.POWERED)) ? 15 : 0; + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override 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 b057005a9..f4f288e52 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 @@ -63,7 +63,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { BlockPos pos = supertile.getPos().add(offset); Material search = getMaterialToSearchFor(); - if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && ((Integer) supertile.getWorld().getBlockState(pos).getValue(BlockLiquid.LEVEL))/* todo 1.8 may crash */ == 0) { + if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && supertile.getWorld().getBlockState(pos).getValue(BlockLiquid.LEVEL)/* todo 1.8 may crash */ == 0) { if(search != Material.water) supertile.getWorld().setBlockToAir(pos); else { 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 777bb8ced..7269cfe06 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 @@ -37,7 +37,7 @@ public class SubTileKekimurus extends SubTileGenerating { IBlockState state = supertile.getWorld().getBlockState(pos); Block block = state.getBlock(); if(block instanceof BlockCake) { - int nextSlicesEaten = ((Integer) state.getValue(BlockCake.BITES)) + 1; + int nextSlicesEaten = state.getValue(BlockCake.BITES) + 1; if(nextSlicesEaten == 6) supertile.getWorld().setBlockToAir(pos); else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); 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 b0e95abd5..a661d6eaa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -27,7 +27,7 @@ public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { - boolean wasLooking = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); + boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 68bbcd447..151416057 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -18,7 +18,7 @@ public class TileStarfield extends TileMod implements ITickable { @Override public void update() { - boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); if(!worldObj.isRemote) { boolean newState = !worldObj.isDaytime(); if(newState != state) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 936316499..b458fd02f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -57,7 +57,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor for(ItemStack stack_ : stacks) missing -= stack_.stackSize; - if(missing > 0 && !((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED))) { + if(missing > 0 && !worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)) { worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(getPos(), getBlockType(), 2); 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 61a367998..c647b6298 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 @@ -68,7 +68,7 @@ public class TileBellows extends TileMod implements ITickable { if(furnace.getBlockType() == Blocks.lit_furnace) { // Copypasta from BlockFurnace - EnumFacing enumfacing = (EnumFacing)worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); + EnumFacing enumfacing = worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY() + worldObj.rand.nextDouble() * 6.0D / 16.0D; double d2 = (double)pos.getZ() + 0.5D; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 8690a1d97..ea33d7782 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -25,7 +25,7 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost, IT @Override public void update() { if(!worldObj.isRemote) { - boolean state = ((Boolean) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)); + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index 4deb16d15..f1339c4f2 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -45,7 +45,7 @@ public final class AliasHandler { private static Item getItem(String name) { for(Object o : Item.itemRegistry.getKeys()) { - Item i = (Item) Item.itemRegistry.getObject(new ResourceLocation(o)); + Item i = Item.itemRegistry.getObject(new ResourceLocation(o)); if(i.getUnlocalizedName().substring("item.".length()).equals(name)) return i; } @@ -55,7 +55,7 @@ public final class AliasHandler { private static Block getBlock(String name) { for(Object o : Block.blockRegistry.getKeys()) { - Block b = (Block) Block.blockRegistry.getObject(new ResourceLocation(o)); + Block b = Block.blockRegistry.getObject(new ResourceLocation(o)); if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) return b; } 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 1700e3d56..e2c912092 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -70,7 +70,7 @@ public final class SheddingHandler { int i = 1; for(ShedPattern pattern : patterns) { - PageShedding page = new PageShedding(String.valueOf(i), (String)EntityList.classToStringMapping.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); + PageShedding page = new PageShedding(String.valueOf(i), EntityList.classToStringMapping.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); LexiconData.shedding.addPage(page); } } @@ -124,7 +124,7 @@ public final class SheddingHandler { lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); if(itemName != null && !itemName.isEmpty() && rate != -1) - patterns.add(new ShedPattern((Class) EntityList.stringToClassMapping.get(key), new ItemStack((Item) Item.itemRegistry.getObject(itemName), 1, metadata), rate, lexiconSize)); + patterns.add(new ShedPattern(EntityList.stringToClassMapping.get(key), new ItemStack(Item.itemRegistry.getObject(itemName), 1, metadata), rate, lexiconSize)); } public static class ShedPattern { @@ -149,7 +149,7 @@ public final class SheddingHandler { } public String getEntityString() { - return (String) EntityList.classToStringMapping.get(EntityClass); + return EntityList.classToStringMapping.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 bafdb0bb5..a5e15741d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -70,8 +70,8 @@ public class ModBrewRecipes { } public static void initTC() { - Item resource = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemResource"); - Item bathSalts = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemBathSalts"); + Item resource = Item.itemRegistry.getObject("Thaumcraft:ItemResource"); + Item bathSalts = Item.itemRegistry.getObject("Thaumcraft:ItemBathSalts"); warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } 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 9553157aa..6f10f03f6 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -24,7 +24,7 @@ public class HelmRevealingRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting var1, World var2) { - Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + Item goggles = Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); 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 e2a81c230..946735139 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -628,10 +628,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } case 1 : { entity = new EntitySkeleton(worldObj); - ((EntitySkeleton) entity).setCurrentItemOrArmor(0, new ItemStack(Items.bow)); + entity.setCurrentItemOrArmor(0, new ItemStack(Items.bow)); if(worldObj.rand.nextInt(8) == 0) { ((EntitySkeleton) entity).setSkeletonType(1); - ((EntitySkeleton) entity).setCurrentItemOrArmor(0, new ItemStack(hard ? ModItems.elementiumSword : Items.stone_sword)); + entity.setCurrentItemOrArmor(0, new ItemStack(hard ? ModItems.elementiumSword : Items.stone_sword)); } break; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index cf2961060..2924cc428 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -53,7 +53,7 @@ public class EntityEnderAirBottle extends EntityThrowable { int range = 4; int rangeY = 4; - for (BlockPos bPos : ((Iterable) BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range)))) { + for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { Block block = worldObj.getBlockState(pos).getBlock(); if(block != null && block.isReplaceableOreGen(worldObj, pos, BlockHelper.forBlock(Blocks.stone))) possibleCoords.add(pos); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 48d496cde..80e10d3ee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -119,9 +119,9 @@ public class EntityThornChakram extends EntityThrowable { boolean fire = isFire(); EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { - ((EntityLivingBase) pos.entityHit).attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); + pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); if(fire) - ((EntityLivingBase) pos.entityHit).setFire(5); + pos.entityHit.setFire(5); else if(worldObj.rand.nextInt(3) == 0) ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); } else { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 7b6eb6ecc..3847e6d12 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -311,7 +311,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); tagCompound.setShort("zTile", (short)this.zTile); - ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); + ResourceLocation resourcelocation = Block.blockRegistry.getNameForObject(this.inTile); tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); tagCompound.setByte("shake", (byte)this.throwableShake); tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 9f8a51466..b723a806f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -44,7 +44,7 @@ public class ItemOpenBucket extends ItemMod { return par1ItemStack; Material material = par2World.getBlockState(pos).getBlock().getMaterial(); - int l = ((Integer) par2World.getBlockState(pos).getValue(BlockLiquid.LEVEL)); + int l = par2World.getBlockState(pos).getValue(BlockLiquid.LEVEL); if((material == Material.lava || material == Material.water) && l == 0) { par2World.setBlockToAir(pos); 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 aad7a5d61..7354ce3c5 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 @@ -93,7 +93,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { playerIceBlocks.put(user, new ArrayList()); List ice = playerIceBlocks.get(user); - if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && ((Integer) player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL)) == 0) { + if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL) == 0) { player.worldObj.setBlockState(coords, Blocks.ice.getDefaultState()); if(!player.worldObj.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 a2feb7077..425211674 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 @@ -51,7 +51,7 @@ public final class ToolCommons { public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { float blockHardness = block == null ? 1F : block.getBlockHardness(world, pos); - for (BlockPos iterPos : ((Iterable) BlockPos.getAllInBox(posStart, posEnd))) { + for (BlockPos iterPos : BlockPos.getAllInBox(posStart, posEnd)) { removeBlockWithDrops(player, stack, world, iterPos, pos, block, materialsListing, silk, fortune, blockHardness, dispose); } } 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 647dffbb5..7915b1272 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 @@ -50,7 +50,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { addDrop(event, new ItemStack(Items.skull, 1, 4)); else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer)event.entityLiving).getName()); + ItemNBTHelper.setString(stack, "SkullOwner", event.entityLiving.getName()); addDrop(event, stack); } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) addDrop(event, new ItemStack(ModItems.gaiaHead)); 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 c6aac93b3..667dd0c03 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 @@ -108,7 +108,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (living.getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 6b048556c..24a9f1c41 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -33,7 +33,7 @@ public class LensMagnet extends Lens { int range = 3; magnetize : { - for (BlockPos pos : ((Iterable) BlockPos.getAllInBox(basePos.add(-range, -range, -range), basePos.add(range, range, range)))) { + for (BlockPos pos : BlockPos.getAllInBox(basePos.add(-range, -range, -range), basePos.add(range, range, range))) { if(entity.worldObj.getTileEntity(pos) instanceof IManaReceiver) { TileEntity tile = entity.worldObj.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index e5988cc05..f047b6203 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -131,8 +131,8 @@ public class PageCraftingRecipe extends PageRecipe { renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems[y * shaped.recipeWidth + x], true); } else if(recipe instanceof ShapedOreRecipe) { ShapedOreRecipe shaped = (ShapedOreRecipe) recipe; - int width = (Integer) ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 4); - int height = (Integer) ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 5); + int width = ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 4); + int height = ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 5); for(int y = 0; y < height; y++) for(int x = 0; x < width; x++) { @@ -153,7 +153,7 @@ public class PageCraftingRecipe extends PageRecipe { if(index >= shapeless.recipeItems.size()) break drawGrid; - renderItemAtGridPos(gui, 1 + x, 1 + y, (ItemStack) shapeless.recipeItems.get(index), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, shapeless.recipeItems.get(index), true); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 36ef3cd12..1eecc24ec 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -71,7 +71,7 @@ public class PagePetalRecipe extends PageRecipe { List inputs = recipe.getInputs(); int degreePerInput = (int) (360F / inputs.size()); - float currentDegree = ConfigHandler.lexiconRotatingItems ? GuiScreen.isShiftKeyDown() ? ticksElapsed : (float) (ticksElapsed + ClientTickHandler.partialTicks) : 0; + float currentDegree = ConfigHandler.lexiconRotatingItems ? GuiScreen.isShiftKeyDown() ? ticksElapsed : ticksElapsed + ClientTickHandler.partialTicks : 0; for(Object obj : inputs) { Object input = obj; From ffe7b4ccc879f24cb492ac9e96cf61540ec98c8d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 13:01:33 -0600 Subject: [PATCH 063/935] API looks to be good again --- .../java/vazkii/botania/api/mana/spark/SparkHelper.java | 6 ++++-- src/main/java/vazkii/botania/api/wiki/WikiHooks.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index add3c3284..4cb1a48e7 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -12,6 +12,8 @@ package vazkii.botania.api.mana.spark; import java.util.List; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; @@ -25,8 +27,8 @@ public final class SparkHelper { public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; - List entities = world.getEntitiesWithinAABB(clazz, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r)); - return entities; + List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r), Predicates.instanceOf(clazz)); + return ((List) entities); } } diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 56c4ef22b..e459bb911 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameData; public class WikiHooks { @@ -24,8 +24,8 @@ public class WikiHooks { private static final Map modWikis = new HashMap(); public static IWikiProvider getWikiFor(Block block) { - UniqueIdentifier mod = GameRegistry.findUniqueIdentifierFor(block); - return getWikiFor(mod == null ? "" : mod.modId.toLowerCase()); + ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); + return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); } public static IWikiProvider getWikiFor(String mod) { From 5d666cd891d16f76e6f2277a9a246899203bc075 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 13:53:31 -0600 Subject: [PATCH 064/935] Some 1.8.8 tessellator changes --- .../core/handler/BoundTileRenderer.java | 51 +++++------ .../core/handler/MultiblockBlockAccess.java | 2 +- .../core/handler/RedStringRenderer.java | 5 +- .../handler/SubTileRadiusRenderHandler.java | 49 ++++++---- .../client/core/helper/IconHelper.java | 90 ------------------- .../client/core/helper/RenderHelper.java | 35 ++++---- .../gui/lexicon/GuiLexiconChallengesList.java | 2 +- .../render/entity/RenderBabylonWeapon.java | 11 +-- .../render/entity/RenderCorporeaSpark.java | 5 +- .../render/entity/RenderPinkWither.java | 2 +- .../client/render/entity/RenderSpark.java | 3 +- .../client/render/entity/RenderSparkBase.java | 21 +++-- .../render/entity/RenderThornChakram.java | 12 +-- .../render/world/SkyblockRenderEvents.java | 4 +- .../render/world/SkyblockSkyRenderer.java | 55 ++++++------ 15 files changed, 136 insertions(+), 211 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 625b8266c..3439fe137 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -18,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -154,42 +155,42 @@ public final class BoundTileRenderer { double ay = aabb.maxY; double az = aabb.maxZ; - tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES); - tessellator.getWorldRenderer().addVertex(ix, iy, iz); - tessellator.getWorldRenderer().addVertex(ix, ay, iz); + tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); + tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); + tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, ay, iz); - tessellator.getWorldRenderer().addVertex(ax, ay, iz); + tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); + tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); - tessellator.getWorldRenderer().addVertex(ax, ay, iz); - tessellator.getWorldRenderer().addVertex(ax, iy, iz); + tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); + tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); - tessellator.getWorldRenderer().addVertex(ax, iy, iz); - tessellator.getWorldRenderer().addVertex(ix, iy, iz); + tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); + tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, iy, az); - tessellator.getWorldRenderer().addVertex(ix, ay, az); + tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); + tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, iy, az); - tessellator.getWorldRenderer().addVertex(ax, iy, az); + tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); + tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ax, iy, az); - tessellator.getWorldRenderer().addVertex(ax, ay, az); + tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); + tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, ay, az); - tessellator.getWorldRenderer().addVertex(ax, ay, az); + tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); + tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, iy, iz); - tessellator.getWorldRenderer().addVertex(ix, iy, az); + tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); + tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ix, ay, iz); - tessellator.getWorldRenderer().addVertex(ix, ay, az); + tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); + tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ax, iy, iz); - tessellator.getWorldRenderer().addVertex(ax, iy, az); + tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); + tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); - tessellator.getWorldRenderer().addVertex(ax, ay, iz); - tessellator.getWorldRenderer().addVertex(ax, ay, az); + tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); + tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); tessellator.draw(); } 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 e9567bab6..7a152ade0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -115,7 +115,7 @@ public class MultiblockBlockAccess implements IBlockAccess { * Returns the multiblock component for the coordinates, adjusted based on the anchor */ protected MultiblockComponent getComponent(BlockPos pos) { - MultiblockComponent comp = multiblock.getComponentForLocation(pos.add(anchorPos.multiply(-1))); + MultiblockComponent comp = multiblock.getComponentForLocation(pos.add(new BlockPos(-anchorPos.getX(), -anchorPos.getY(), -anchorPos.getZ()))); return comp; } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index bbf08863a..fa71c3afc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -18,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -95,7 +96,7 @@ public final class RedStringRenderer { Tessellator tessellator = Tessellator.getInstance(); GL11.glLineWidth(1F); - tessellator.getWorldRenderer().startDrawing(GL11.GL_LINES); + tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().hashCode()).nextInt(10000); double add = vecMag.mag(); @@ -122,7 +123,7 @@ public final class RedStringRenderer { double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul; double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul; - tess.getWorldRenderer().addVertex(x, y, z); + tess.getWorldRenderer().pos(x, y, z).endVertex(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 2224ecfe9..d8a881d58 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -83,6 +84,18 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } + private double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + public void renderRectangle(AxisAlignedBB aabb) { GlStateManager.pushMatrix(); GlStateManager.translate(aabb.minX - getRenderPosX(), aabb.minY - getRenderPosY(), aabb.minZ - getRenderPosZ()); @@ -96,22 +109,22 @@ public final class SubTileRadiusRenderHandler { double z = aabb.maxZ - aabb.minZ - f; Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().addVertex(x, f, f); - tessellator.getWorldRenderer().addVertex(f, f, f); - tessellator.getWorldRenderer().addVertex(f, f, z); - tessellator.getWorldRenderer().addVertex(x, f, z); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + tessellator.getWorldRenderer().pos(x, f, f).endVertex(); + tessellator.getWorldRenderer().pos(f, f, f).endVertex(); + tessellator.getWorldRenderer().pos(f, f, z).endVertex(); + tessellator.getWorldRenderer().pos(x, f, z).endVertex(); tessellator.draw(); x += f; z += f; double f1 = f + f / 4F; GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().addVertex(x, f1, 0); - tessellator.getWorldRenderer().addVertex(0, f1, 0); - tessellator.getWorldRenderer().addVertex(0, f1, z); - tessellator.getWorldRenderer().addVertex(x, f1, z); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + tessellator.getWorldRenderer().pos(x, f1, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f1, z).endVertex(); + tessellator.getWorldRenderer().pos(x, f1, z).endVertex(); tessellator.draw(); GlStateManager.popMatrix(); @@ -136,29 +149,29 @@ public final class SubTileRadiusRenderHandler { radius -= f; Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); - tessellator.getWorldRenderer().addVertex(0, f, 0); + tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); + tessellator.getWorldRenderer().pos(0, f, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.getWorldRenderer().addVertex(xp, f, zp); + tessellator.getWorldRenderer().pos(xp, f, zp).endVertex(); } - tessellator.getWorldRenderer().addVertex(0, f, 0); + tessellator.getWorldRenderer().pos(0, f, 0).endVertex(); tessellator.draw(); radius += f; double f1 = f + f / 4F; GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); - tessellator.getWorldRenderer().addVertex(0, f1, 0); + tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); + tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.getWorldRenderer().addVertex(xp, f1, zp); + tessellator.getWorldRenderer().pos(xp, f1, zp).endVertex(); } - tessellator.getWorldRenderer().addVertex(0, f1, 0); + tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); tessellator.draw(); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index a77ea5552..c21201b9e 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -100,94 +100,4 @@ public final class IconHelper { } - /** - * From 1.7, takes a sprite and renders it in the "flat 3D" style of held items - * Use this ONLY for sprites that don't have a corresponding item! - * For items, use built in methods that use the bakedmodel since those are much more efficient - * Args: tess, maxu, minv, minu, maxv, width, height, thickness(?) - * todo 1.8 find a replacement for this method, possibly the above bakeModelFromIcon - */ - public static void renderItemIn2D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float p_78439_7_) - { - WorldRenderer wr = tess.getWorldRenderer(); - wr.startDrawingQuads(); - wr.setNormal(0.0F, 0.0F, 1.0F); - wr.addVertexWithUV(0.0D, 0.0D, 0.0D, (double)p_78439_1_, (double)p_78439_4_); - wr.addVertexWithUV(1.0D, 0.0D, 0.0D, (double)p_78439_3_, (double)p_78439_4_); - wr.addVertexWithUV(1.0D, 1.0D, 0.0D, (double)p_78439_3_, (double)p_78439_2_); - wr.addVertexWithUV(0.0D, 1.0D, 0.0D, (double)p_78439_1_, (double)p_78439_2_); - tess.draw(); - wr.startDrawingQuads(); - wr.setNormal(0.0F, 0.0F, -1.0F); - wr.addVertexWithUV(0.0D, 1.0D, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)p_78439_2_); - wr.addVertexWithUV(1.0D, 1.0D, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)p_78439_2_); - wr.addVertexWithUV(1.0D, 0.0D, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)p_78439_4_); - wr.addVertexWithUV(0.0D, 0.0D, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)p_78439_4_); - tess.draw(); - float f5 = 0.5F * (p_78439_1_ - p_78439_3_) / (float)width; - float f6 = 0.5F * (p_78439_4_ - p_78439_2_) / (float)height; - wr.startDrawingQuads(); - wr.setNormal(-1.0F, 0.0F, 0.0F); - int k; - float f7; - float f8; - - for (k = 0; k < width; ++k) - { - f7 = (float)k / (float)width; - f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; - wr.addVertexWithUV((double)f7, 0.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_4_); - wr.addVertexWithUV((double)f7, 0.0D, 0.0D, (double)f8, (double)p_78439_4_); - wr.addVertexWithUV((double)f7, 1.0D, 0.0D, (double)f8, (double)p_78439_2_); - wr.addVertexWithUV((double)f7, 1.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_2_); - } - - tess.draw(); - wr.startDrawingQuads(); - wr.setNormal(1.0F, 0.0F, 0.0F); - float f9; - - for (k = 0; k < width; ++k) - { - f7 = (float)k / (float)width; - f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; - f9 = f7 + 1.0F / (float)width; - wr.addVertexWithUV((double)f9, 1.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_2_); - wr.addVertexWithUV((double)f9, 1.0D, 0.0D, (double)f8, (double)p_78439_2_); - wr.addVertexWithUV((double)f9, 0.0D, 0.0D, (double)f8, (double)p_78439_4_); - wr.addVertexWithUV((double)f9, 0.0D, (double)(0.0F - p_78439_7_), (double)f8, (double)p_78439_4_); - } - - tess.draw(); - wr.startDrawingQuads(); - wr.setNormal(0.0F, 1.0F, 0.0F); - - for (k = 0; k < height; ++k) - { - f7 = (float)k / (float)height; - f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; - f9 = f7 + 1.0F / (float)height; - wr.addVertexWithUV(0.0D, (double)f9, 0.0D, (double)p_78439_1_, (double)f8); - wr.addVertexWithUV(1.0D, (double)f9, 0.0D, (double)p_78439_3_, (double)f8); - wr.addVertexWithUV(1.0D, (double)f9, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)f8); - wr.addVertexWithUV(0.0D, (double)f9, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)f8); - } - - tess.draw(); - wr.startDrawingQuads(); - wr.setNormal(0.0F, -1.0F, 0.0F); - - for (k = 0; k < height; ++k) - { - f7 = (float)k / (float)height; - f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; - wr.addVertexWithUV(1.0D, (double)f7, 0.0D, (double)p_78439_3_, (double)f8); - wr.addVertexWithUV(0.0D, (double)f7, 0.0D, (double)p_78439_1_, (double)f8); - wr.addVertexWithUV(0.0D, (double)f7, (double)(0.0F - p_78439_7_), (double)p_78439_1_, (double)f8); - wr.addVertexWithUV(1.0D, (double)f7, (double)(0.0F - p_78439_7_), (double)p_78439_3_, (double)f8); - } - - tess.draw(); - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 56b99f143..9bf18914e 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -18,6 +18,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -113,13 +114,11 @@ public final class RenderHelper { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.shadeModel(GL11.GL_SMOOTH); Tessellator var15 = Tessellator.getInstance(); - var15.getWorldRenderer().startDrawingQuads(); - var15.getWorldRenderer().setColorRGBA_F(var8, var9, var10, var7); - var15.getWorldRenderer().addVertex(par3, par2, z); - var15.getWorldRenderer().addVertex(par1, par2, z); - var15.getWorldRenderer().setColorRGBA_F(var12, var13, var14, var11); - var15.getWorldRenderer().addVertex(par1, par4, z); - var15.getWorldRenderer().addVertex(par3, par4, z); + var15.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); + var15.getWorldRenderer().pos(par3, par2, z).color(var8, var9, var10, var7).endVertex(); + var15.getWorldRenderer().pos(par1, par2, z).color(var8, var9, var10, var7).endVertex(); + var15.getWorldRenderer().pos(par1, par4, z).color(var12, var13, var14, var11).endVertex(); + var15.getWorldRenderer().pos(par3, par4, z).color(var12, var13, var14, var11).endVertex(); var15.draw(); GlStateManager.shadeModel(GL11.GL_FLAT); GlStateManager.disableBlend(); @@ -133,11 +132,11 @@ public final class RenderHelper { public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par6, z, (par3 + 0) * f, (par4 + par6) * f1); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par5, par2 + par6, z, (par3 + par5) * f, (par4 + par6) * f1); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par5, par2 + 0, z, (par3 + par5) * f, (par4 + 0) * f1); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, z, (par3 + 0) * f, (par4 + 0) * f1); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex(); tessellator.draw(); } @@ -171,16 +170,16 @@ public final class RenderHelper { GlStateManager.rotate(random.nextFloat() * 360F, 1F, 0F, 0F); GlStateManager.rotate(random.nextFloat() * 360F, 0F, 1F, 0F); GlStateManager.rotate(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); - tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN); + tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (255F * (1F - f2))); - tessellator.getWorldRenderer().addVertex(0, 0, 0); + tessellator.getWorldRenderer().pos(0, 0, 0).color().endVertex(); tessellator.getWorldRenderer().setColorRGBA_F(0F, 0F, 0F, 0); - tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.getWorldRenderer().addVertex(0.866D * f4, f3, -0.5F * f4); - tessellator.getWorldRenderer().addVertex(0, f3, 1F * f4); - tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index f8d29c09c..3a2895dc0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -73,7 +73,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { } @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) throws IOException { if(par2 == 14 && !notesEnabled) // Backspace back(); else if(par2 == 199) { // Home 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 f692152a0..d522568bc 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -91,11 +92,11 @@ public class RenderBabylonWeapon extends Render { GlStateManager.rotate(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); - tes.getWorldRenderer().startDrawingQuads(); - tes.getWorldRenderer().addVertexWithUV(-1, 0, -1, 0, 0); - tes.getWorldRenderer().addVertexWithUV(-1, 0, 1, 0, 1); - tes.getWorldRenderer().addVertexWithUV(1, 0, 1, 1, 1); - tes.getWorldRenderer().addVertexWithUV(1, 0, -1, 1, 0); + tes.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tes.getWorldRenderer().pos(-1, 0, -1).tex(0, 0).endVertex(); + tes.getWorldRenderer().pos(-1, 0, 1).tex(0, 1).endVertex(); + tes.getWorldRenderer().pos(1, 0, 1).tex(1, 1).endVertex(); + tes.getWorldRenderer().pos(1, 0, -1).tex(1, 0).endVertex(); tes.draw(); ShaderHelper.releaseShader(); 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 cb4f8fc90..d0016cb47 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.Item; @@ -31,7 +32,7 @@ import vazkii.botania.common.item.ItemCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @Override - public IIcon getBaseIcon(EntityCorporeaSpark entity) { + public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } @@ -42,7 +43,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { } @Override - public IIcon getSpinningIcon(EntityCorporeaSpark entity) { + public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { return ItemCorporeaSpark.iconColorStar; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 8a7f21246..59e6f678c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -29,7 +29,7 @@ public class RenderPinkWither extends RenderWither { } @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { BossStatus.statusBarTime = -1; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index d28bcaca0..36149c941 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.IIcon; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSparkUpgrade; @@ -17,7 +18,7 @@ import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderSpark extends RenderSparkBase { @Override - public IIcon getSpinningIcon(EntitySpark entity) { + public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade() - 1; return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; } 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 c22f4502a..6053e8cc9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -18,12 +18,12 @@ import net.minecraft.client.renderer.entity.RenderEntity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.entity.EntitySpark; @@ -38,7 +38,7 @@ public class RenderSparkBase extends RenderEntity { @Override public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { T tEntity = (T) par1Entity; - IIcon iicon = getBaseIcon(tEntity); + TextureAtlasSprite iicon = getBaseIcon(tEntity); GlStateManager.pushMatrix(); GlStateManager.translate((float)par2, (float)par4, (float)par6); @@ -65,7 +65,7 @@ public class RenderSparkBase extends RenderEntity { GlStateManager.rotate(-renderManager.playerViewX, 1F, 0F, 0F); func_77026_a(tessellator, iicon); - IIcon spinningIcon = getSpinningIcon(tEntity); + TextureAtlasSprite spinningIcon = getSpinningIcon(tEntity); if(spinningIcon != null) { GlStateManager.translate(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); GlStateManager.scale(0.2F, 0.2F, 0.2F); @@ -81,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { GlStateManager.popMatrix(); } - public IIcon getBaseIcon(T entity) { + public TextureAtlasSprite getBaseIcon(T entity) { return ItemSpark.worldIcon; } @@ -89,7 +89,7 @@ public class RenderSparkBase extends RenderEntity { // NO-OP } - public IIcon getSpinningIcon(T entity) { + public TextureAtlasSprite getSpinningIcon(T entity) { return null; } @@ -111,13 +111,12 @@ public class RenderSparkBase extends RenderEntity { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().startDrawingQuads(); - p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); p_77026_1_.getWorldRenderer().setBrightness(240); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.draw(); } 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 40a9fba51..a60c6512a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -68,14 +69,13 @@ public class RenderThornChakram extends Render { float f6 = 0.25F; GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - p_77026_1_.getWorldRenderer().startDrawingQuads(); - p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); if(light != -1) p_77026_1_.getWorldRenderer().setBrightness(light); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 007b637fb..0b5145d8c 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -15,14 +15,14 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.world.WorldTypeSkyblock; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SkyblockRenderEvents { @SubscribeEvent public void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; - if(ConfigHandler.enableFancySkybox && world.provider.dimensionId == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { + if(ConfigHandler.enableFancySkybox && world.provider.getDimensionId() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 64bef6bee..60967b0d7 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; @@ -28,7 +29,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibObfuscation; -import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; public class SkyblockSkyRenderer extends IRenderHandler { @@ -56,7 +57,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); GL11.glDisable(GL11.GL_TEXTURE_2D); - Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks); + Vec3 vec3 = world.getSkyColor(mc.getRenderViewEntity(), partialTicks); float f1 = (float)vec3.xCoord; float f2 = (float)vec3.yCoord; float f3 = (float)vec3.zCoord; @@ -68,7 +69,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { f2 = Math.max(0F, f2 - insideVoid); f3 = Math.max(0F, f3 - insideVoid); - Tessellator tessellator1 = Tessellator.instance; + Tessellator tessellator1 = Tessellator.getInstance(); GL11.glDepthMask(false); GL11.glEnable(GL11.GL_FOG); GL11.glColor3f(f1, f2, f3); @@ -97,17 +98,15 @@ public class SkyblockSkyRenderer extends IRenderHandler { f8 = afloat[2]; float f11; - tessellator1.startDrawing(6); - tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3] * (1F - insideVoid)); - tessellator1.addVertex(0.0D, 100.0D, 0.0D); + tessellator1.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + tessellator1.getWorldRenderer().pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3] * (1F - insideVoid)).endVertex(); byte b0 = 16; - tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); for(int j = 0; j <= b0; ++j) { f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; float f12 = MathHelper.sin(f11); float f13 = MathHelper.cos(f11); - tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])); + tessellator1.getWorldRenderer().pos((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); } tessellator1.draw(); @@ -193,7 +192,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); - tessellator1.startDrawingQuads(); + tessellator1.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) @@ -206,11 +205,11 @@ public class SkyblockSkyRenderer extends IRenderHandler { float ut = ang * uPer; if(i % 2 == 0) { - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.getWorldRenderer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator1.getWorldRenderer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); } else { - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.getWorldRenderer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator1.getWorldRenderer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); } } @@ -252,7 +251,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GL11.glRotatef(angle1, 0F, 1F, 0F); GL11.glRotatef(angle2, 0F, 0F, 1F); - tessellator1.startDrawingQuads(); + tessellator1.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) @@ -265,11 +264,11 @@ public class SkyblockSkyRenderer extends IRenderHandler { float ut = ang * uPer; if(i % 2 == 0) { - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.getWorldRenderer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator1.getWorldRenderer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); } else { - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.getWorldRenderer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator1.getWorldRenderer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); } } @@ -296,11 +295,11 @@ public class SkyblockSkyRenderer extends IRenderHandler { float f15 = (float)(i1 + 0) / 2.0F; float f16 = (float)(l + 1) / 4.0F; float f17 = (float)(i1 + 1) / 2.0F; - tessellator1.startDrawingQuads(); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); + tessellator1.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator1.getWorldRenderer().pos((double)(-f10), -100.0D, (double)f10).tex((double)f16, (double)f17).endVertex(); + tessellator1.getWorldRenderer().pos((double)f10, -100.0D, (double)f10).tex((double)f14, (double)f17).endVertex(); + tessellator1.getWorldRenderer().pos((double)f10, -100.0D, (double)(-f10)).tex((double)f14, (double)f15).endVertex(); + tessellator1.getWorldRenderer().pos((double)(-f10), -100.0D, (double)(-f10)).tex((double)f16, (double)f15).endVertex(); tessellator1.draw(); // === Stars @@ -357,11 +356,11 @@ public class SkyblockSkyRenderer extends IRenderHandler { } private void drawObject(Tessellator tess, float f10) { - tess.startDrawingQuads(); - tess.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); - tess.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); - tess.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); - tess.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); + tess.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tess.getWorldRenderer().pos((double)(-f10), 100.0D, (double)(-f10)).tex(0.0D, 0.0D).endVertex(); + tess.getWorldRenderer().pos((double)(f10), 100.0D, (double)(-f10)).tex(1.0D, 0.0D).endVertex(); + tess.getWorldRenderer().pos((double)(f10), 100.0D, (double)(f10)).tex(1.0D, 1.0D).endVertex(); + tess.getWorldRenderer().pos((double)(-f10), 100.0D, (double)(f10)).tex(0.0D, 1.0D).endVertex(); tess.draw(); } From a9b060257fe6996c6ba6e44f68f2a080aba66117 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 19:25:58 -0600 Subject: [PATCH 065/935] 1.8.8 tess fixes, potential double plant fix, bunch of reflectoin in spawner claw --- MC18_notes.txt | 2 + .../botania/api/state/BotaniaStateProps.java | 17 ++ .../botania/api/state/enums/PoolVariant.java | 3 +- .../client/core/handler/LightningHandler.java | 26 +- .../render/tile/RenderTileSkullOverride.java | 2 +- .../botania/common/block/BlockCamo.java | 16 -- .../common/block/BlockLightLauncher.java | 27 ++- .../common/block/BlockModDoubleFlower.java | 223 ++++++++++++++---- .../botania/common/block/BlockModFlower.java | 5 +- .../common/block/BlockSpecialFlower.java | 2 +- .../common/block/decor/BlockManaGlass.java | 15 +- .../block/decor/BlockShimmerwoodPlanks.java | 1 - .../common/block/decor/BlockShinyFlower.java | 3 - .../quartz/BlockSpecialQuartzStairs.java | 2 +- .../decor/stairs/Block18StoneStairs.java | 6 +- .../decor/stairs/BlockEndStoneStairs.java | 2 +- .../decor/stairs/BlockEnderBrickStairs.java | 4 +- .../block/decor/stairs/BlockLivingStairs.java | 5 +- .../block/decor/stairs/BlockModStairs.java | 11 +- .../decor/stairs/BlockPavementStairs.java | 6 +- .../block/decor/stairs/BlockReedStairs.java | 2 +- .../block/decor/stairs/BlockThatchStairs.java | 2 +- .../stairs/bricks/BlockCustomBrickStairs.java | 8 +- .../stairs/bricks/BlockSnowBrickStairs.java | 4 +- .../stairs/bricks/BlockSoulBrickStairs.java | 4 +- .../decor/stairs/bricks/BlockTileStairs.java | 4 +- .../living/BlockDreamwoodPlankStairs.java | 4 +- .../stairs/living/BlockDreamwoodStairs.java | 2 +- .../living/BlockLivingrockBrickStairs.java | 4 +- .../stairs/living/BlockLivingrockStairs.java | 2 +- .../living/BlockLivingwoodPlankStairs.java | 4 +- .../stairs/living/BlockLivingwoodStairs.java | 2 +- .../stairs/living/BlockShimmerrockStairs.java | 2 +- .../living/BlockShimmerwoodPlankStairs.java | 2 +- .../prismarine/BlockDarkPrismarineStairs.java | 4 +- .../BlockPrismarineBrickStairs.java | 4 +- .../prismarine/BlockPrismarineStairs.java | 8 +- .../block/decor/walls/Block18StoneWall.java | 18 +- .../decor/walls/BlockBiomeStoneWall.java | 15 +- .../block/decor/walls/BlockModWall.java | 15 +- .../botania/common/block/mana/BlockPool.java | 2 +- .../functional/SubTileHeiseiDream.java | 6 +- .../common/block/tile/TileEnchanter.java | 5 +- .../common/block/tile/TileSpawnerClaw.java | 45 ++-- .../common/block/tile/mana/TilePool.java | 3 +- .../common/block/tile/mana/TilePump.java | 3 +- .../common/block/tile/mana/TileSpreader.java | 5 +- .../common/core/handler/AliasHandler.java | 8 +- .../common/core/handler/SheddingHandler.java | 3 +- .../common/crafting/ModBrewRecipes.java | 5 +- .../crafting/recipe/HelmRevealingRecipe.java | 3 +- .../common/entity/EntityCorporeaSpark.java | 4 +- .../common/entity/EntityDoppleganger.java | 2 +- .../common/entity/EntityFlyingCreature.java | 2 +- .../common/entity/EntityMagicMissile.java | 3 +- .../common/entity/EntityThrowableCopy.java | 87 ++++--- .../common/entity/EntityThrownItem.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 13 +- .../equipment/bauble/ItemGoldenLaurel.java | 3 +- .../item/equipment/bauble/ItemTinyPlanet.java | 3 +- .../equipment/bauble/ItemUnholyCloak.java | 6 +- .../tool/elementium/ItemElementiumShears.java | 5 +- .../tool/terrasteel/ItemTerraAxe.java | 3 +- .../common/item/relic/ItemLokiRing.java | 2 +- .../common/lexicon/page/PageElvenRecipe.java | 2 +- .../common/lexicon/page/PagePetalRecipe.java | 2 +- .../botania/common/lib/LibObfuscation.java | 5 + 67 files changed, 480 insertions(+), 240 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 100a19167..ff4470aae 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -16,6 +16,8 @@ since BlockPos'es are immutable and thus can be reused everywhere. * Some really needed fields in EntityItem are private now. Reflection time :(. If this is a * Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. Unless someone figures out a way to use the old one +* The alt textures will probably be a resource pack now to decrease complexity... +sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack -- Todo -- * JSON models for everything (tedious/med-hard) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f977617b7..9dfe46ad8 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -96,6 +96,23 @@ public class BotaniaStateProps { // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + // BlockModDoubleFlower + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + // White to gray + return input.ordinal() >= 0 && input.ordinal() <= 7; + } + }); + + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + // Silver to black + return input.ordinal() >= 8 && input.ordinal() <= 15; + } + }); + // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index 852cc2ba4..132f17c46 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -7,7 +7,8 @@ import java.util.Locale; public enum PoolVariant implements IStringSerializable { DEFAULT, CREATIVE, - DILUTED; + DILUTED, + FABULOUS; @Override public String getName() { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index a67c672d1..4f987d8df 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -146,29 +146,29 @@ public class LightningHandler { Vector3 endvec = rendersegment.endpoint.point; int color = inner ? bolt.colorInner : bolt.colorOuter; - tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); + tessellator.getWorldRenderer().putColor(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); - tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.getWorldRenderer().addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); - tessellator.getWorldRenderer().addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).endVertex(); if(rendersegment.next == null) { Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0); - tessellator.getWorldRenderer().addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.getWorldRenderer().addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); - tessellator.getWorldRenderer().addVertexWithUV(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z, 0, 1); + tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).endVertex(); } if(rendersegment.prev == null) { Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.getWorldRenderer().addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0); - tessellator.getWorldRenderer().addVertexWithUV(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z, 0, 1); - tessellator.getWorldRenderer().addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).endVertex(); } } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index fbb94cc6b..78690645c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -38,7 +38,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { public static final ModelSkullOverride modelSkull = new ModelSkullOverride(); @Override - public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { + public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { if (p_147500_1_ instanceof TileEntitySkull) { TileEntitySkull skull = ((TileEntitySkull) p_147500_1_); render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress); diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 46eb57e12..0a35f0ab3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -23,7 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; @@ -38,21 +37,6 @@ public abstract class BlockCamo extends BlockModContainer { super(par2Material); } - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileEntity tile = world.getTileEntity(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - Block block = camo.camo; - if(block != null && isValidBlock(block)) - return block.getIcon(side, camo.camoMeta); - } - - return getIconFromSideAfterCheck(tile, meta, side); - } - public static boolean isValidBlock(Block block) { return block.isOpaqueCube() || isValidRenderType(block.getRenderType()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 31539d5c1..82e8c8f64 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,6 +30,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -42,6 +44,22 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.POWERED); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override @@ -62,14 +80,13 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0; - int meta = world.getBlockMetadata(x, y, z); - boolean powered = (meta & 8) != 0; + boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { - pickUpEntities(world, x, y, z); - world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4); + pickUpEntities(world, pos); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, true), 4); } else if(!power && powered) - world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } public void pickUpEntities(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1790ad53f..ccd69a219 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,17 +10,17 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.IGrowable; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -32,11 +32,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.common.IShearable; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -44,21 +44,58 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +// Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x +public class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { + public static final PropertyEnum HALF = BlockDoublePlant.HALF; private static final int COUNT = 8; final int offset; public BlockModDoubleFlower(boolean second) { + super(Material.vine); + this.setHardness(0.0F); + this.setStepSound(soundTypeGrass); offset = second ? 8 : 0; setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); setHardness(0F); setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); + + if (second) { + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + } else { + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + } + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, HALF); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumDyeColor) state.getValue(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + meta -= offset; + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + meta += offset; + EnumDyeColor color = EnumDyeColor.byMetadata(meta); + return getDefaultState().withProperty(HALF, half).withProperty(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color); } @Override @@ -69,30 +106,13 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return null; } @Override - public int damageDropped(IBlockState p_149692_1_) { - return p_149692_1_ & 7; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon func_149888_a(boolean top, int index) { - return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[index & 7]; - } - - @Override - public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) { - p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_); - p_149889_1_.setBlock(p_149889_2_, p_149889_3_ + 1, p_149889_4_, this, p_149889_5_ | 8, p_149889_6_); - } - - @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos.up(), this, p_149689_6_.getItemDamage() | 8, 2); + public int damageDropped(IBlockState state) { + return getMetaFromState(state.withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)); } @Override @@ -100,9 +120,19 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab return false; } + @Override + public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { + return true; + } + + @Override + public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + // todo 1.8.8 drop + } + @Override public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { - if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(p_149636_6_)) + if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) harvestBlockCopy(p_149636_1_, p_149636_2_, pos, state); } @@ -137,27 +167,31 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void onBlockHarvested(World p_149681_1_, BlockPos pos, IBlockState state, EntityPlayer p_149681_6_) { - if(func_149887_c(p_149681_5_)) { - if(p_149681_1_.getBlockState(pos.down()).getBlock() == this) { - if(!p_149681_6_.capabilities.isCreativeMode) { - int i1 = p_149681_1_.getBlockMetadata(p_149681_2_, p_149681_3_ - 1, p_149681_4_); - int j1 = func_149890_d(i1); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + if(state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + if(world.getBlockState(pos.down()).getBlock() == this) { + if (!player.capabilities.isCreativeMode) { + // IBlockState iblockstate = worldIn.getBlockState(pos.down()); + // BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype = (BlockDoublePlant.EnumPlantType) iblockstate.getValue(VARIANT); - if(j1 != 3 && j1 != 2); - //p_149681_1_.func_147480_a(p_149681_2_, p_149681_3_ - 1, p_149681_4_, true); - else { - /*if (!p_149681_1_.isRemote && p_149681_6_.getCurrentEquippedItem() != null && p_149681_6_.getCurrentEquippedItem().getItem() == Items.shears) - { - this.func_149886_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, i1, p_149681_6_); - }*/ - - p_149681_1_.setBlockToAir(pos.down()); - } - } else p_149681_1_.setBlockToAir(pos.down()); + //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) { + // this.onHarvest(worldIn, pos, iblockstate, player); + // world.setBlockToAir(pos.down()); + // } else { + // world.destroyBlock(pos.down(), true); + // } + //} else { + world.setBlockToAir(pos.down()); + //} + } else { + world.setBlockToAir(pos.down()); + } } - } else if(p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlockState(pos.up()).getBlock() == this) - p_149681_1_.setBlockState(pos.up(), Blocks.air.getDefaultState(), 2); + } else if(player.capabilities.isCreativeMode && world.getBlockState(pos.up()).getBlock() == this) + world.setBlockState(pos.up(), Blocks.air.getDefaultState(), 2); //super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_); } @@ -170,7 +204,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 7)); + ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos).withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)))); return ret; } @@ -212,8 +246,93 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab return LexiconData.flowers; } - int offset(int meta) { - return meta + offset; + + + /** BEGIN COPY BlockDoublePlant **/ + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) + { + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } + @Override + public boolean canPlaceBlockAt(World worldIn, BlockPos pos) + { + return super.canPlaceBlockAt(worldIn, pos) && worldIn.isAirBlock(pos.up()); + } + + @Override + protected void checkAndDropBlock(World worldIn, BlockPos pos, IBlockState state) + { + if (!this.canBlockStay(worldIn, pos, state)) + { + boolean flag = state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER; + BlockPos blockpos = flag ? pos : pos.up(); + BlockPos blockpos1 = flag ? pos.down() : pos; + Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock()); + Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this); + + if (!flag) this.dropBlockAsItem(worldIn, pos, state, 0); //Forge move above the setting to air. + + if (block == this) + { + worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2); + } + + if (block1 == this) + { + worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3); + } + } + } + + @Override + public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) + { + if (state.getBlock() != this) return super.canBlockStay(worldIn, pos, state); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) + { + return worldIn.getBlockState(pos.down()).getBlock() == this; + } + else + { + IBlockState iblockstate = worldIn.getBlockState(pos.up()); + return iblockstate.getBlock() == this && super.canBlockStay(worldIn, pos, iblockstate); + } + } + + @Override + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + { + worldIn.setBlockState(pos.up(), this.getDefaultState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.UPPER), 2); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + { + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) + { + IBlockState iblockstate = worldIn.getBlockState(pos.down()); + + if (iblockstate.getBlock() == this) + { + state = state.withProperty(BotaniaStateProps.COLOR, iblockstate.getValue(BotaniaStateProps.COLOR)); + } + } + + return state; + } + + @Override + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) + { + //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames. + IBlockState state = world.getBlockState(pos); + if (state.getBlock() == this && state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER && world.getBlockState(pos.up()).getBlock() == this) + world.setBlockToAir(pos.up()); + return world.setBlockToAir(pos); + } + + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 961841d69..21c118794 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -153,9 +153,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup public static void placeDoubleFlower(World world, BlockPos pos, EnumDyeColor color, int flags) { Block flower = color.getMetadata() >= 8 ? ModBlocks.doubleFlower2 : ModBlocks.doubleFlower1; - int placeMeta = meta & 7; - world.setBlockState(pos, flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.LOWER), flags); - world.setBlockState(pos.up(), flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); + world.setBlockState(pos, flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.LOWER), flags); + world.setBlockState(pos.up(), flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 96c5e7538..435195af9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -157,7 +157,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public int isProvidingStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { return getWeakPower(world, pos, state, side); } 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 66d7d3b6b..7e835a0f7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -43,20 +44,20 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(world, pos, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); // todo 1.8 wtf + public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { + return shouldSideBeRendered1(world, pos, side.getOpposite()); // todo 1.8 recheck (was 1 - sideInt) } @Override - public int getRenderBlockPass() { - return 1; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.TRANSLUCENT; } @Override 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 eb469f29c..cd2e3d8f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 8a5b03bce..f887fb956 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -34,9 +34,6 @@ import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { - private static IIcon[] icons; - private static IIcon[] iconsAlt; - public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index bd7f49181..4f04f2fec 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockSpecialQuartzStairs extends BlockModStairs { public BlockSpecialQuartzStairs(Block source) { - super(source, 0, "quartzStairs" + ((BlockSpecialQuartz) source).type); + super(source.getDefaultState(), "quartzStairs" + ((BlockSpecialQuartz) source).type); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java index 77fc40da2..bdd7eeee3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java @@ -15,13 +15,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; public class Block18StoneStairs extends BlockLivingStairs { - public Block18StoneStairs(int meta) { - super(ModFluffBlocks.stone, meta); + public Block18StoneStairs(FutureStoneVariant variant) { + super(ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java index 9a508aba0..83856591d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java @@ -21,7 +21,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockEndStoneStairs extends BlockLivingStairs { public BlockEndStoneStairs() { - super(ModBlocks.endStoneBrick, 0); + super(ModBlocks.endStoneBrick.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java index 1ed7a72b2..7e817c279 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java @@ -15,13 +15,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; public class BlockEnderBrickStairs extends BlockLivingStairs { public BlockEnderBrickStairs() { - super(ModBlocks.endStoneBrick, 2); + super(ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java index 2dba633b5..4c03846fc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java @@ -1,11 +1,12 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; public class BlockLivingStairs extends BlockModStairs { - public BlockLivingStairs(Block source, int meta) { - super(source, meta, source.getUnlocalizedName().replaceAll("tile.", "") + meta + "Stairs"); + public BlockLivingStairs(IBlockState state) { + super(state, state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Stairs"); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 191ca88f0..6a6572c62 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -15,17 +16,17 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModStairs extends BlockStairs implements ILexiconable { - public BlockModStairs(Block source, int meta, String name) { - super(source, meta); - setBlockName(name); + public BlockModStairs(IBlockState state, String name) { + super(state); + setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index d30d1f8d2..ce83c5bac 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -11,17 +11,19 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementStairs extends BlockLivingStairs { - public BlockPavementStairs(int meta) { - super(ModFluffBlocks.pavement, meta); + public BlockPavementStairs(EnumDyeColor color) { + super(ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.COLOR, color)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java index 61832d37e..40c9823d5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java @@ -21,7 +21,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockReedStairs extends BlockLivingStairs { public BlockReedStairs() { - super(ModBlocks.reedBlock, 0); + super(ModBlocks.reedBlock.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java index 3e2dc2c36..b21932c25 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java @@ -21,7 +21,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockThatchStairs extends BlockLivingStairs { public BlockThatchStairs() { - super(ModBlocks.thatch, 0); + super(ModBlocks.thatch.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java index ca8f88916..32e30c0cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; import vazkii.botania.common.lexicon.LexiconData; @@ -12,11 +14,11 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockCustomBrickStairs extends BlockLivingStairs { public BlockCustomBrickStairs() { - this(0); + this(CustomBrickVariant.HELLISH_BRICK); } - public BlockCustomBrickStairs(int meta) { - super(ModBlocks.customBrick, meta); + public BlockCustomBrickStairs(CustomBrickVariant variant) { + super(ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java index de545e4c7..da529cbcd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSnowBrickStairs.java @@ -10,10 +10,12 @@ */ package vazkii.botania.common.block.decor.stairs.bricks; +import vazkii.botania.api.state.enums.CustomBrickVariant; + public class BlockSnowBrickStairs extends BlockCustomBrickStairs { public BlockSnowBrickStairs() { - super(2); + super(CustomBrickVariant.FROSTY_BRICK); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java index 7d031030b..27b8cb4cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockSoulBrickStairs.java @@ -10,10 +10,12 @@ */ package vazkii.botania.common.block.decor.stairs.bricks; +import vazkii.botania.api.state.enums.CustomBrickVariant; + public class BlockSoulBrickStairs extends BlockCustomBrickStairs { public BlockSoulBrickStairs() { - super(1); + super(CustomBrickVariant.SOUL_BRICK); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java index 943fe3b39..d8c011596 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockTileStairs.java @@ -10,10 +10,12 @@ */ package vazkii.botania.common.block.decor.stairs.bricks; +import vazkii.botania.api.state.enums.CustomBrickVariant; + public class BlockTileStairs extends BlockCustomBrickStairs { public BlockTileStairs() { - super(3); + super(CustomBrickVariant.ROOF_TILE); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodPlankStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodPlankStairs.java index bba59293c..3b54c82ee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodPlankStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodPlankStairs.java @@ -1,12 +1,14 @@ package vazkii.botania.common.block.decor.stairs.living; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockDreamwoodPlankStairs extends BlockLivingStairs { public BlockDreamwoodPlankStairs() { - super(ModBlocks.dreamwood, 1); + super(ModBlocks.dreamwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS)); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodStairs.java index 7d87c4a0a..a2b688747 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockDreamwoodStairs.java @@ -6,7 +6,7 @@ import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockDreamwoodStairs extends BlockLivingStairs { public BlockDreamwoodStairs() { - super(ModBlocks.dreamwood, 0); + super(ModBlocks.dreamwood.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockBrickStairs.java index 08618fc79..8b85347f6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockBrickStairs.java @@ -1,12 +1,14 @@ package vazkii.botania.common.block.decor.stairs.living; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockLivingrockBrickStairs extends BlockLivingStairs { public BlockLivingrockBrickStairs() { - super(ModBlocks.livingrock, 1); + super(ModBlocks.livingrock.getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK)); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockStairs.java index a974af4e8..16d494738 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingrockStairs.java @@ -6,7 +6,7 @@ import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockLivingrockStairs extends BlockLivingStairs { public BlockLivingrockStairs() { - super(ModBlocks.livingrock, 0); + super(ModBlocks.livingrock.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodPlankStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodPlankStairs.java index 9ffc1a315..e15e00a99 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodPlankStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodPlankStairs.java @@ -1,12 +1,14 @@ package vazkii.botania.common.block.decor.stairs.living; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockLivingwoodPlankStairs extends BlockLivingStairs { public BlockLivingwoodPlankStairs() { - super(ModBlocks.livingwood, 1); + super(ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS)); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java index d1dec721f..40622fdf1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java @@ -6,7 +6,7 @@ import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockLivingwoodStairs extends BlockLivingStairs { public BlockLivingwoodStairs() { - super(ModBlocks.livingwood, 0); + super(ModBlocks.livingwood.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java index 34e6cfe2a..fbc9b1c4a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerrockStairs.java @@ -16,7 +16,7 @@ import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockShimmerrockStairs extends BlockLivingStairs { public BlockShimmerrockStairs() { - super(ModBlocks.shimmerrock, 0); + super(ModBlocks.shimmerrock.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java index 5714756e1..25c221d9f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockShimmerwoodPlankStairs.java @@ -16,7 +16,7 @@ import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; public class BlockShimmerwoodPlankStairs extends BlockLivingStairs { public BlockShimmerwoodPlankStairs() { - super(ModBlocks.shimmerwoodPlanks, 0); + super(ModBlocks.shimmerwoodPlanks.getDefaultState()); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java index 2d3c99963..6cd368765 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java @@ -1,10 +1,12 @@ package vazkii.botania.common.block.decor.stairs.prismarine; +import vazkii.botania.api.state.enums.PrismarineVariant; + public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { public BlockDarkPrismarineStairs() { - super(2); + super(PrismarineVariant.DARK_PRIMSARINE); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java index f3d015e46..4babc82fa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java @@ -1,10 +1,12 @@ package vazkii.botania.common.block.decor.stairs.prismarine; +import vazkii.botania.api.state.enums.PrismarineVariant; + public class BlockPrismarineBrickStairs extends BlockPrismarineStairs { public BlockPrismarineBrickStairs() { - super(1); + super(PrismarineVariant.PRISMARINE_BRICKS); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java index 18867cc7a..504227b83 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; import vazkii.botania.common.lexicon.LexiconData; @@ -12,11 +14,11 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockPrismarineStairs extends BlockLivingStairs { public BlockPrismarineStairs() { - this(0); + this(PrismarineVariant.PRISMARINE); } - public BlockPrismarineStairs(int meta) { - super(ModBlocks.prismarine, meta); + public BlockPrismarineStairs(PrismarineVariant variant) { + super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index d81cd3f3e..e31cb188c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -33,6 +34,7 @@ public class Block18StoneWall extends BlockModWall { super(ModFluffBlocks.stone, 4); setHardness(1.5F); setResistance(10F); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE)); } @Override @@ -41,12 +43,16 @@ public class Block18StoneWall extends BlockModWall { } @Override - protected void specifyDefaultState() { - setDefaultState(blockState.getBaseState() - .withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false) - .withProperty(WEST, false).withProperty(EAST, false) - .withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE) - ); + public int getMetaFromState(IBlockState state) { + return ((Enum) state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta < 0 || meta > 3) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 47a3c212f..d0ae84b91 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,6 +21,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -32,16 +34,25 @@ public class BlockBiomeStoneWall extends BlockModWall { super(ModFluffBlocks.biomeStoneA, 8); setHardness(1.5F); setResistance(10F); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.BIOME); + return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); } @Override - protected void specifyDefaultState() { + public int getMetaFromState(IBlockState state) { + return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + } + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta < 0 || meta >= BiomeStoneVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index c169206e9..f4226fb41 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -37,7 +37,13 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { super(block); this.block = block; setUnlocalizedName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); - specifyDefaultState(); + setDefaultState(blockState.getBaseState() + .withProperty(UP, false) + .withProperty(NORTH, false) + .withProperty(SOUTH, false) + .withProperty(WEST, false) + .withProperty(EAST, false) + ); } @Override @@ -45,13 +51,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST); } - protected void specifyDefaultState() { - setDefaultState(blockState.getBaseState() - .withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false) - .withProperty(WEST, false).withProperty(EAST, false) - ); - } - @Override public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) { return true; 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 1a2cc11ff..e0637af30 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -223,7 +223,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return world.getBlockMetadata(x, y, z) == 3 ? LexiconData.rainbowRod : LexiconData.pool; + return world.getBlockState(pos).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 6cc44c4e4..076fdb296 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; import java.util.List; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIAttackOnCollide; @@ -37,9 +39,9 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; - List mobs = supertile.getWorld().getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List mobs = supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1 && mana >= cost) - for(IMob mob : mobs) { + for(IMob mob : ((List) mobs)) { if(mob instanceof EntityLiving) { EntityLiving entity = (EntityLiving) mob; if(brainwashEntity(entity, mobs)) { 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 b6f2afb1c..7d3329fca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -15,6 +15,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; +import com.google.common.base.Predicates; import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -401,9 +402,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, pos.getY() + 2, pos.getZ() + 1)); + List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, pos.getY() + 2, pos.getZ() + 1), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { - Entity e = (Entity) sparks.get(0); + Entity e = sparks.get(0); return (ISparkEntity) e; } 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 a96de1dd2..1ee89bdd1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.block.tile; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.sql.Ref; import java.util.List; import net.minecraft.entity.Entity; @@ -36,6 +38,11 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable int mana = 0; private static final Method isActivated = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); + private static final Field spawnDelay = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); + private static final Field mobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); + private static final Field prevMobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); + private static final Method spawnNewEntity = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY); + private static final Method getEntityNameToSpawn = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); @Override public void update() { @@ -50,19 +57,21 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable mana -= 6; if(logic.getSpawnerWorld().isRemote) { - if(logic.spawnDelay > 0) - --logic.spawnDelay; + int delay = spawnDelay.getInt(logic); + if(delay > 0) + spawnDelay.setInt(logic, delay - 1); if(Math.random() > 0.5) Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); - logic.prevMobRotation = logic.getMobRotation(); - logic.mobRotation = (logic.getMobRotation() + 1000.0F / (logic.spawnDelay + 200.0F)) % 360.0D; - } else if(logic.spawnDelay == -1) + prevMobRotation.set(logic, logic.getMobRotation()); + mobRotation.set(logic, (logic.getMobRotation() + 1000.0F / (spawnDelay.getInt(logic) + 200.0F)) % 360.0D); + } else if(spawnDelay.getInt(logic) == -1) resetTimer(logic); - if(logic.spawnDelay > 0) { - --logic.spawnDelay; + int delay = spawnDelay.getInt(logic); + if(delay > 0) { + spawnDelay.setInt(logic, delay - 1); return; } @@ -73,28 +82,28 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(logic.getEntityNameToSpawn(), logic.getSpawnerWorld()); + Entity entity = EntityList.createEntityByName(((String) getEntityNameToSpawn.invoke(logic)), logic.getSpawnerWorld()); if (entity == null) return; - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.func_177221_b(), logic.func_177221_b().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerPosition(), logic.getSpawnerPosition().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); if (j >= maxNearbyEntities) { resetTimer(logic); return; } - double d2 = logic.func_177221_b().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - double d3 = logic.func_177221_b().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; - double d4 = logic.func_177221_b().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d2 = logic.getSpawnerPosition().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d3 = logic.getSpawnerPosition().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; + double d4 = logic.getSpawnerPosition().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); if(entityliving == null || entityliving.getCanSpawnHere()) { if(!worldObj.isRemote) - logic.func_98265_a(entity); - logic.getSpawnerWorld().playAuxSFX(2004, logic.func_177221_b(), 0); + spawnNewEntity.invoke(logic, entity, true); + logic.getSpawnerWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); if (entityliving != null) entityliving.spawnExplosionParticle(); @@ -107,23 +116,23 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable resetTimer(logic); } } catch (IllegalAccessException e) { - Botania.instance.handleIMC(); + e.printStackTrace(); } catch (InvocationTargetException e) { e.printStackTrace(); } } } - private void resetTimer(MobSpawnerBaseLogic logic) { + private void resetTimer(MobSpawnerBaseLogic logic) throws IllegalAccessException { int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); if(maxSpawnDelay <= minSpawnDelay) - logic.spawnDelay = minSpawnDelay; + spawnDelay.set(logic, minSpawnDelay); else { int i = maxSpawnDelay - minSpawnDelay; - logic.spawnDelay = minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i); + spawnDelay.set(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i)); } if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) 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 6f4460ffb..d08cc8ed2 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana; import java.awt.Color; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -406,7 +407,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1))); + List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index fbbe79279..0a7f26561 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -53,7 +54,7 @@ public class TilePump extends TileMod implements ITickable { innerRingPos = Math.min(max, innerRingPos); moving = 0F; for(int x = 0; x < 2; x++) - worldObj.spawnParticle("explode", xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 0, 0, 0); + worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0, 0, 0); } } else if(innerRingPos > min) { innerRingPos -= incr * 2; 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 a0ffffa23..19f0fc821 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana; import java.util.List; import java.util.UUID; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -205,10 +206,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, double y = lastPingbackY; double z = lastPingbackZ; AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x, y, z).expand(PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE); - List bursts = worldObj.getEntitiesWithinAABB(IManaBurst.class, aabb); + List bursts = worldObj.getEntitiesWithinAABB(Entity.class, aabb, Predicates.instanceOf(IManaBurst.class)); IManaBurst found = null; UUID identity = getIdentifier(); - for(IManaBurst burst : bursts) + for(IManaBurst burst : ((List) bursts)) if(burst != null && identity.equals(burst.getShooterUIID())) { found = burst; break; diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java index f1339c4f2..68dcab4df 100644 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java @@ -44,8 +44,8 @@ public final class AliasHandler { } private static Item getItem(String name) { - for(Object o : Item.itemRegistry.getKeys()) { - Item i = Item.itemRegistry.getObject(new ResourceLocation(o)); + for(ResourceLocation o : Item.itemRegistry.getKeys()) { + Item i = Item.itemRegistry.getObject(o); if(i.getUnlocalizedName().substring("item.".length()).equals(name)) return i; } @@ -54,8 +54,8 @@ public final class AliasHandler { } private static Block getBlock(String name) { - for(Object o : Block.blockRegistry.getKeys()) { - Block b = Block.blockRegistry.getObject(new ResourceLocation(o)); + for(ResourceLocation o : Block.blockRegistry.getKeys()) { + Block b = Block.blockRegistry.getObject(o); if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) return b; } 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 e2c912092..4dd76a3a0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -27,6 +27,7 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -124,7 +125,7 @@ public final class SheddingHandler { lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); if(itemName != null && !itemName.isEmpty() && rate != -1) - patterns.add(new ShedPattern(EntityList.stringToClassMapping.get(key), new ItemStack(Item.itemRegistry.getObject(itemName), 1, metadata), rate, lexiconSize)); + patterns.add(new ShedPattern(EntityList.stringToClassMapping.get(key), new ItemStack(Item.itemRegistry.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); } public static class ShedPattern { diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index a5e15741d..86333757b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -14,6 +14,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.brew.ModBrews; @@ -70,8 +71,8 @@ public class ModBrewRecipes { } public static void initTC() { - Item resource = Item.itemRegistry.getObject("Thaumcraft:ItemResource"); - Item bathSalts = Item.itemRegistry.getObject("Thaumcraft:ItemBathSalts"); + Item resource = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemResource")); + Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemBathSalts")); warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } 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 6f10f03f6..c6afe01d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -24,7 +25,7 @@ public class HelmRevealingRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting var1, World var2) { - Item goggles = Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + Item goggles = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemGoggles")); if(goggles == null) return false; // NO TC loaded diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 6307b3a95..2e8a5251e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -13,6 +13,7 @@ package vazkii.botania.common.entity; import java.util.ArrayList; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -131,7 +132,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } List getNearbySparks() { - return worldObj.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE)); + List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); + return ((List) ret); } void restartNetwork() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 946735139..800558f3a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -881,7 +881,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos).getBlock().isBeaconBase(world, pos, pos.add(relPos.multiply(-1))); + return world.getBlockState(pos).getBlock().isBeaconBase(world, pos, pos.add(new BlockPos(-relPos.getX(), -relPos.getY(), -relPos.getZ()))); }; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index 8e4440124..dc1ff8eb2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -40,7 +40,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { motionX *= 0.800000011920929D; motionY *= 0.800000011920929D; motionZ *= 0.800000011920929D; - } else if(handleLavaMovement()) { + } else if(isNotColliding()) { moveFlying(par1, par2, 0.02F); moveEntity(motionX, motionY, motionZ); motionX *= 0.5D; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index a12fb6fb5..ee0b741c0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -12,6 +12,7 @@ package vazkii.botania.common.entity; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -162,7 +163,7 @@ public class EntityMagicMissile extends EntityThrowable { setTarget(null); double range = 12; - List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + List entities = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range), Predicates.instanceOf(isEvil() ? EntityPlayer.class : IMob.class)); while(entities.size() > 0) { Entity e = (Entity) entities.get(worldObj.rand.nextInt(entities.size())); if(!(e instanceof EntityLivingBase) || e.isDead) { // Just in case... diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 3847e6d12..48d66f31d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -11,6 +11,7 @@ package vazkii.botania.common.entity; import java.util.List; +import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -21,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +42,6 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile private String throwerName; private int ticksInGround; private int ticksInAir; - private static final String __OBFID = "CL_00001723"; public EntityThrowableCopy(World worldIn) { @@ -48,7 +49,9 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.setSize(0.25F, 0.25F); } - protected void entityInit() {} + protected void entityInit() + { + } /** * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge @@ -57,9 +60,15 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile @SideOnly(Side.CLIENT) public boolean isInRangeToRenderDist(double distance) { - double d1 = this.getEntityBoundingBox().getAverageEdgeLength() * 4.0D; - d1 *= 64.0D; - return distance < d1 * d1; + double d0 = this.getEntityBoundingBox().getAverageEdgeLength() * 4.0D; + + if (Double.isNaN(d0)) + { + d0 = 4.0D; + } + + d0 = d0 * 64.0D; + return distance < d0 * d0; } public EntityThrowableCopy(World worldIn, EntityLivingBase throwerIn) @@ -79,12 +88,12 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F); } - public EntityThrowableCopy(World worldIn, double x, double y, double p_i1778_6_) + public EntityThrowableCopy(World worldIn, double x, double y, double z) { super(worldIn); this.ticksInGround = 0; this.setSize(0.25F, 0.25F); - this.setPosition(x, y, p_i1778_6_); + this.setPosition(x, y, z); } protected float getVelocity() @@ -99,27 +108,25 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. - * - * @param inaccuracy Higher means more error. */ public void setThrowableHeading(double x, double y, double z, float velocity, float inaccuracy) { - float f2 = MathHelper.sqrt_double(x * x + y * y + z * z); - x /= (double)f2; - y /= (double)f2; - z /= (double)f2; - x += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - y += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - z += this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; - x *= (double)velocity; - y *= (double)velocity; - z *= (double)velocity; + float f = MathHelper.sqrt_double(x * x + y * y + z * z); + x = x / (double)f; + y = y / (double)f; + z = z / (double)f; + x = x + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + y = y + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + z = z + this.rand.nextGaussian() * 0.007499999832361937D * (double)inaccuracy; + x = x * (double)velocity; + y = y * (double)velocity; + z = z * (double)velocity; this.motionX = x; this.motionY = y; this.motionZ = z; - float f3 = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(y, (double)f3) * 180.0D / Math.PI); + float f1 = MathHelper.sqrt_double(x * x + z * z); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f1) * 180.0D / Math.PI); this.ticksInGround = 0; } @@ -136,8 +143,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(y, (double)f) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f) * 180.0D / Math.PI); } } @@ -196,7 +203,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (!this.worldObj.isRemote) { Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; EntityLivingBase entitylivingbase = this.getThrower(); @@ -212,7 +219,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (movingobjectposition1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + double d1 = vec3.squareDistanceTo(movingobjectposition1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -233,7 +240,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - this.setInPortal(); + this.func_181015_d(movingobjectposition.getBlockPos()); } else { @@ -245,9 +252,9 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.posY += this.motionY; this.posZ += this.motionZ; float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(MathHelper.func_181159_b(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -311,7 +318,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); tagCompound.setShort("zTile", (short)this.zTile); - ResourceLocation resourcelocation = Block.blockRegistry.getNameForObject(this.inTile); + ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); tagCompound.setByte("shake", (byte)this.throwableShake); tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); @@ -344,12 +351,15 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.throwableShake = tagCompund.getByte("shake") & 255; this.inGround = tagCompund.getByte("inGround") == 1; + this.thrower = null; this.throwerName = tagCompund.getString("ownerName"); if (this.throwerName != null && this.throwerName.length() == 0) { this.throwerName = null; } + + this.thrower = this.getThrower(); } public EntityLivingBase getThrower() @@ -357,6 +367,23 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (this.thrower == null && this.throwerName != null && this.throwerName.length() > 0) { this.thrower = this.worldObj.getPlayerEntityByName(this.throwerName); + + if (this.thrower == null && this.worldObj instanceof WorldServer) + { + try + { + Entity entity = ((WorldServer)this.worldObj).getEntityFromUuid(UUID.fromString(this.throwerName)); + + if (entity instanceof EntityLivingBase) + { + this.thrower = (EntityLivingBase)entity; + } + } + catch (Throwable var2) + { + this.thrower = null; + } + } } return this.thrower; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 77b14f93d..05597c07a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -99,7 +99,7 @@ public class EntityThrownItem extends EntityItem { { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - setInPortal(); + func_181015_d(movingobjectposition.getBlockPos()); } else { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 5eb2ce5de..98ffd619c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -484,20 +485,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.disableCull(); ItemCraftingHalo item = (ItemCraftingHalo) stack.getItem(); mc.renderEngine.bindTexture(item.getGlowResource()); - tess.getWorldRenderer().startDrawingQuads(); + tess.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < segAngles; i++) { float ang = i + seg * segAngles + shift; double xp = Math.cos(ang * Math.PI / 180F) * s; double zp = Math.sin(ang * Math.PI / 180F) * s; - tess.getWorldRenderer().addVertexWithUV(xp * m, y, zp * m, u, v); - tess.getWorldRenderer().addVertexWithUV(xp, y0, zp, u, 0); + tess.getWorldRenderer().pos(xp * m, y, zp * m).tex(u, v).endVertex(); + tess.getWorldRenderer().pos(xp, y0, zp).tex(u, 0).endVertex(); xp = Math.cos((ang + 1) * Math.PI / 180F) * s; zp = Math.sin((ang + 1) * Math.PI / 180F) * s; - tess.getWorldRenderer().addVertexWithUV(xp, y0, zp, 0, 0); - tess.getWorldRenderer().addVertexWithUV(xp * m, y, zp * m, 0, v); + tess.getWorldRenderer().pos(xp, y0, zp).tex(0, 0).endVertex(); + tess.getWorldRenderer().pos(xp * m, y, zp * m).tex(0, v).endVertex(); } y0 = 0; tess.draw(); @@ -577,7 +578,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } mc.getRenderItem().renderItemAndEffectIntoGUI(recipe[9], x + 72, y + 18); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe[9], x + 72, y + 18); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe[9], x + 72, y + 18, ""); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } 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 a7ccbd1a5..a3ed3e373 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -73,7 +74,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { float f3 = itemIcon.getMaxV(); boolean armor = event.entityPlayer.getCurrentArmor(3) != null; Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(-100F, 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 e58917198..8bfd298bf 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -61,7 +62,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public static void applyEffect(World world, double x, double y, double z) { int range = 8; - List entities = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); + List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range), Predicates.instanceOf(IManaBurst.class)); for(Entity entity : entities) { IManaBurst burst = (IManaBurst) entity; ItemStack lens = burst.getSourceLens(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 69146b74a..6fce77524 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -12,6 +12,8 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -36,8 +38,8 @@ public class ItemUnholyCloak extends ItemHolyCloak { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.source.isUnblockable()) { int range = 6; - List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); - for(IMob mob : mobs) + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IMob.class)); + for(IMob mob : ((List) mobs)) if(mob instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); 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 dc4e68ead..fc2d14204 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 @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.google.common.base.Predicates; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -56,9 +57,9 @@ public class ItemElementiumShears extends ItemManasteelShears { if(count != getMaxItemUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = player.worldObj.getEntitiesWithinAABB(IShearable.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List sheep = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IShearable.class)); if(sheep.size() > 0) { - for(IShearable target : sheep) { + 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(Enchantment.fortune.effectId, stack)); 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 7ed09a054..816e424e0 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 @@ -24,6 +24,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.client.core.helper.IconHelper; @@ -46,7 +47,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } public boolean shouldBreak(EntityPlayer player) { 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 22a6fa96c..f5246211a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -103,7 +103,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } else { addCursor : { - BlockPos relPos = lookPos.getBlockPos().add(originCoords.multiply(-1)); + BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ())); for(BlockPos cursor : cursors) if(cursor.equals(relPos)) { 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 47c6fd9a4..b4a05becb 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -76,7 +76,7 @@ public class PageElvenRecipe extends PageRecipe { TextureAtlasSprite portalIcon = BlockAlfPortal.portalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderIcon(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); + ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 1eecc24ec..ba3ca60c1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -100,7 +100,7 @@ public class PagePetalRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c454fa1d9..ef97c2768 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -73,6 +73,11 @@ public final class LibObfuscation { public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" }; public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" }; public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" + public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; + public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "f" }; + public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "e" }; + public static final String[] GET_ENTITY_TO_SPAWN = new String[] { "getEntityNameToSpawn", "func_98276_e", "f" }; + public static final String[] SPAWN_NEW_ENTITY = new String[] { "spawnNewEntity", "func_180613_a", "a" }; // GuiIngame public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "r" }; From 5379cda7542dc0a8ba159d1e6c7813b45fb5b40a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 19:44:52 -0600 Subject: [PATCH 066/935] Update buildcraft api to 7.2.0 and integration mostly --- src/api/java/buildcraft/api/core/BCLog.java | 68 ++-- .../java/buildcraft/api/core/BlockIndex.java | 115 ------- .../buildcraft/api/core/BuildCraftAPI.java | 61 ++-- .../buildcraft/api/core/ConfigAccessor.java | 48 +++ .../java/buildcraft/api/core/EnumColor.java | 290 +++++++----------- .../buildcraft/api/core/EnumPipePart.java | 118 +++++++ .../buildcraft/api/core/IAreaProvider.java | 34 +- src/api/java/buildcraft/api/core/IBox.java | 24 +- .../buildcraft/api/core/IBuildCraftMod.java | 7 + .../java/buildcraft/api/core/ICoreProxy.java | 12 +- .../buildcraft/api/core/IIconProvider.java | 32 +- .../java/buildcraft/api/core/IInvSlot.java | 18 +- .../buildcraft/api/core/INBTLoadable_BC8.java | 14 + .../buildcraft/api/core/INBTStoreable.java | 8 +- .../api/core/INetworkLoadable_BC8.java | 9 + .../buildcraft/api/core/IPathProvider.java | 13 +- .../buildcraft/api/core/ISerializable.java | 35 +-- .../buildcraft/api/core/IWorldProperty.java | 15 +- src/api/java/buildcraft/api/core/IZone.java | 29 +- .../java/buildcraft/api/core/JavaTools.java | 60 ++-- .../java/buildcraft/api/core/Position.java | 200 ------------ .../buildcraft/api/core/SafeTimeTracker.java | 117 +++---- .../java/buildcraft/api/core/StackKey.java | 205 ++++++------- .../buildcraft/api/core/package-info.java | 8 +- .../buildcraft/api/core/render/ICullable.java | 43 ++- .../api/core/render/ITextureStateManager.java | 4 +- .../api/core/render/ITextureStates.java | 24 +- .../api/gates/GateExpansionController.java | 64 ++-- .../buildcraft/api/gates/GateExpansions.java | 83 +++-- src/api/java/buildcraft/api/gates/IGate.java | 28 +- .../buildcraft/api/gates/IGateExpansion.java | 38 ++- .../buildcraft/api/gates/package-info.java | 12 +- .../api/statements/ActionState.java | 10 +- .../api/statements/IActionExternal.java | 14 +- .../api/statements/IActionInternal.java | 14 +- .../api/statements/IActionProvider.java | 25 +- .../api/statements/IActionReceptor.java | 12 +- .../IOverrideDefaultStatements.java | 15 +- .../buildcraft/api/statements/IStatement.java | 68 ++-- .../api/statements/IStatementContainer.java | 17 +- .../api/statements/IStatementParameter.java | 67 ++-- .../api/statements/ITriggerExternal.java | 16 +- .../statements/ITriggerExternalOverride.java | 19 +- .../api/statements/ITriggerInternal.java | 12 +- .../api/statements/ITriggerProvider.java | 24 +- .../api/statements/StatementManager.java | 287 +++++++++-------- .../api/statements/StatementMouseClick.java | 40 ++- .../StatementParameterItemStack.java | 135 ++++---- .../api/statements/StatementSlot.java | 56 ++-- .../IRedstoneStatementContainer.java | 24 +- .../containers/ISidedStatementContainer.java | 8 +- .../api/statements/package-info.java | 12 +- .../api/transport/ICustomPipeConnection.java | 12 + .../buildcraft/api/transport/IInjectable.java | 27 +- .../buildcraft/api/transport/IItemPipe.java | 15 +- .../java/buildcraft/api/transport/IPipe.java | 28 +- .../api/transport/IPipeConnection.java | 35 +-- .../buildcraft/api/transport/IPipeTile.java | 69 ++--- .../api/transport/IStripesActivator.java | 17 +- .../api/transport/IStripesHandler.java | 34 +- .../api/transport/IStripesPipe.java | 15 +- .../api/transport/PipeConnectionAPI.java | 48 +++ .../buildcraft/api/transport/PipeManager.java | 99 +++--- .../buildcraft/api/transport/PipeWire.java | 111 ++++--- .../api/transport/package-info.java | 12 +- .../pluggable/IConnectionMatrix.java | 7 + .../transport/pluggable/IFacadePluggable.java | 10 +- .../IPipePluggableDynamicRenderer.java | 4 +- .../pluggable/IPipePluggableItem.java | 4 +- .../pluggable/IPipePluggableRenderer.java | 13 - .../pluggable/IPipePluggableState.java | 9 + .../IPipePluggableStaticRenderer.java | 19 ++ .../transport/pluggable/IPipeRenderState.java | 5 + .../transport/pluggable/PipePluggable.java | 75 ++--- .../java/cofh/api/energy/IEnergyHandler.java | 59 ++++ .../java/cofh/api/energy/IEnergyProvider.java | 39 +++ .../buildcraft/StatementAPIPlugin.java | 4 +- .../integration/buildcraft/StatementBase.java | 6 +- .../buildcraft/TriggerManaDetector.java | 10 +- .../buildcraft/TriggerManaLevel.java | 8 +- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +- 81 files changed, 1615 insertions(+), 1898 deletions(-) delete mode 100644 src/api/java/buildcraft/api/core/BlockIndex.java create mode 100644 src/api/java/buildcraft/api/core/ConfigAccessor.java create mode 100644 src/api/java/buildcraft/api/core/EnumPipePart.java create mode 100644 src/api/java/buildcraft/api/core/IBuildCraftMod.java create mode 100644 src/api/java/buildcraft/api/core/INBTLoadable_BC8.java create mode 100644 src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java delete mode 100644 src/api/java/buildcraft/api/core/Position.java mode change 100644 => 100755 src/api/java/buildcraft/api/statements/StatementSlot.java create mode 100644 src/api/java/buildcraft/api/transport/ICustomPipeConnection.java create mode 100644 src/api/java/buildcraft/api/transport/PipeConnectionAPI.java create mode 100644 src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java delete mode 100644 src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java create mode 100644 src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java create mode 100644 src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java create mode 100644 src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java mode change 100644 => 100755 src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java create mode 100644 src/api/java/cofh/api/energy/IEnergyHandler.java create mode 100644 src/api/java/cofh/api/energy/IEnergyProvider.java diff --git a/src/api/java/buildcraft/api/core/BCLog.java b/src/api/java/buildcraft/api/core/BCLog.java index 7f2896de1..1ba70725c 100644 --- a/src/api/java/buildcraft/api/core/BCLog.java +++ b/src/api/java/buildcraft/api/core/BCLog.java @@ -1,60 +1,42 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -import java.lang.reflect.Method; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public final class BCLog { + public static final Logger logger = LogManager.getLogger("BuildCraft"); - public static final Logger logger = LogManager.getLogger("BuildCraft"); - - /** - * Deactivate constructor - */ - private BCLog() { - } - - public static void initLog() { - - logger.info("Starting BuildCraft " + getVersion()); - logger.info("Copyright (c) SpaceToad, 2011-2015"); - logger.info("http://www.mod-buildcraft.com"); - } + /** Deactivate constructor */ + private BCLog() {} + @Deprecated public static void logErrorAPI(String mod, Throwable error, Class classFile) { - StringBuilder msg = new StringBuilder(mod); - msg.append(" API error, please update your mods. Error: ").append(error); - StackTraceElement[] stackTrace = error.getStackTrace(); - if (stackTrace.length > 0) { - msg.append(", ").append(stackTrace[0]); - } + logErrorAPI(error, classFile); + } - logger.log(Level.ERROR, msg.toString()); + public static void logErrorAPI(Throwable error, Class classFile) { + StringBuilder msg = new StringBuilder("API error! Please update your mods. Error: "); + msg.append(error); + StackTraceElement[] stackTrace = error.getStackTrace(); + if (stackTrace.length > 0) { + msg.append(", ").append(stackTrace[0]); + } - if (classFile != null) { - msg = new StringBuilder(mod); - msg.append(" API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); - logger.log(Level.ERROR, msg.toString()); - } - } + logger.log(Level.ERROR, msg.toString()); - public static String getVersion() { - try { - Class clazz = Class.forName("buildcraft.core.Version"); - Method method = clazz.getDeclaredMethod("getVersion"); - return String.valueOf(method.invoke(null)); - } catch (Exception e) { - return "UNKNOWN VERSION"; + if (classFile != null) { + msg.append("API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); + logger.log(Level.ERROR, msg.toString()); } } + + @Deprecated + public static String getVersion() { + return BuildCraftAPI.getVersion(); + } } diff --git a/src/api/java/buildcraft/api/core/BlockIndex.java b/src/api/java/buildcraft/api/core/BlockIndex.java deleted file mode 100644 index 8c295fa8f..000000000 --- a/src/api/java/buildcraft/api/core/BlockIndex.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ -package buildcraft.api.core; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * This class is a comparable container for integer block positions. - */ -public class BlockIndex implements Comparable { - - public int x; - public int y; - public int z; - - public BlockIndex() { - - } - - /** - * Creates an index for a block located on x, y. z - */ - public BlockIndex(int x, int y, int z) { - - this.x = x; - this.y = y; - this.z = z; - } - - public BlockIndex(NBTTagCompound c) { - this.x = c.getInteger("i"); - this.y = c.getInteger("j"); - this.z = c.getInteger("k"); - } - - public BlockIndex(Entity entity) { - x = (int) Math.floor(entity.posX); - y = (int) Math.floor(entity.posY); - z = (int) Math.floor(entity.posZ); - } - - public BlockIndex(TileEntity entity) { - this(entity.xCoord, entity.yCoord, entity.zCoord); - } - - /** - * Provides a deterministic and complete ordering of block positions. - */ - @Override - public int compareTo(BlockIndex o) { - - if (o.x < x) { - return 1; - } else if (o.x > x) { - return -1; - } else if (o.z < z) { - return 1; - } else if (o.z > z) { - return -1; - } else if (o.y < y) { - return 1; - } else if (o.y > y) { - return -1; - } else { - return 0; - } - } - - public void writeTo(NBTTagCompound c) { - c.setInteger("i", x); - c.setInteger("j", y); - c.setInteger("k", z); - } - - public Block getBlock(World world) { - return world.getBlock(x, y, z); - } - - @Override - public String toString() { - return "{" + x + ", " + y + ", " + z + "}"; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof BlockIndex) { - BlockIndex b = (BlockIndex) obj; - - return b.x == x && b.y == y && b.z == z; - } - - return false; - } - - @Override - public int hashCode() { - return (x * 37 + y) * 37 + z; - } - - public boolean nextTo(BlockIndex blockIndex) { - return (Math.abs(blockIndex.x - x) <= 1 && blockIndex.y == y && blockIndex.z == z) - || (blockIndex.x == x && Math.abs(blockIndex.y - y) <= 1 && blockIndex.z == z) - || (blockIndex.x == x && blockIndex.y == y && Math.abs(blockIndex.z - z) <= 1); - } -} diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java index 9cb0b07e2..5e172ba18 100644 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ b/src/api/java/buildcraft/api/core/BuildCraftAPI.java @@ -1,45 +1,52 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; +import java.lang.reflect.Method; import java.util.HashMap; -import java.util.HashSet; import java.util.Set; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + import net.minecraft.block.Block; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public final class BuildCraftAPI { - public static ICoreProxy proxy; + public static ICoreProxy proxy; - public static final Set softBlocks = new HashSet(); - public static final HashMap worldProperties = new HashMap(); + public static final Set softBlocks = Sets.newHashSet(); + public static final HashMap worldProperties = Maps.newHashMap(); - /** - * Deactivate constructor - */ - private BuildCraftAPI() { - } + /** Deactivate constructor */ + private BuildCraftAPI() {} - public static IWorldProperty getWorldProperty(String name) { - return worldProperties.get(name); - } - - public static void registerWorldProperty(String name, IWorldProperty property) { - if (worldProperties.containsKey(name)) { - BCLog.logger.warn("The WorldProperty key '" + name + "' is being overidden with " + property.getClass().getSimpleName() + "!"); + public static String getVersion() { + try { + Class clazz = Class.forName("buildcraft.core.Version"); + Method method = clazz.getDeclaredMethod("getVersion"); + return String.valueOf(method.invoke(null)); + } catch (Exception e) { + return "UNKNOWN VERSION"; } - worldProperties.put(name, property); } - public static boolean isSoftBlock(World world, int x, int y, int z) { - return worldProperties.get("soft").get(world, x, y, z); - } + public static IWorldProperty getWorldProperty(String name) { + return worldProperties.get(name); + } + + public static void registerWorldProperty(String name, IWorldProperty property) { + if (worldProperties.containsKey(name)) { + BCLog.logger.warn("The WorldProperty key '" + name + "' is being overidden with " + property.getClass().getSimpleName() + "!"); + } + worldProperties.put(name, property); + } + + public static boolean isSoftBlock(World world, BlockPos pos) { + return worldProperties.get("soft").get(world, pos); + } } diff --git a/src/api/java/buildcraft/api/core/ConfigAccessor.java b/src/api/java/buildcraft/api/core/ConfigAccessor.java new file mode 100644 index 000000000..a66346ac5 --- /dev/null +++ b/src/api/java/buildcraft/api/core/ConfigAccessor.java @@ -0,0 +1,48 @@ +package buildcraft.api.core; + +import java.util.Map; + +import com.google.common.collect.Maps; + +import net.minecraftforge.common.config.Property; + +/** Use this to access the various config options. It is recommended that you use this as opposed to the variables in + * the mod, as users may only install the modules that they want, and not the one you may have refereed to. */ +@Deprecated +public final class ConfigAccessor { + public enum EMod { + CORE, + BUILDERS, + ENERGY, + FACTORY, + ROBITICS, + SILICON, + TRANSPORT + } + + private static Map mods = Maps.newHashMap(); + + private ConfigAccessor() {} + + public static Property getOption(EMod mod, String name) { + if (mods.containsKey(mod)) { + return mods.get(mod).getOption(name); + } else { + return null; + } + } + + public static boolean getBoolean(EMod mod, String name, boolean defaultBoolean) { + Property prop = getOption(mod, name); + if (prop == null) { + return defaultBoolean; + } else { + return prop.getBoolean(defaultBoolean); + } + } + + /** WARNING: INTERNAL USE ONLY! */ + public static void addMod(EMod mod, IBuildCraftMod actual) { + mods.put(mod, actual); + } +} diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index 2147e7261..852eea1ba 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -1,201 +1,147 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import java.util.Locale; import java.util.Random; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -public enum EnumColor { +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; - BLACK, - RED, - GREEN, - BROWN, - BLUE, - PURPLE, - CYAN, - LIGHT_GRAY, - GRAY, - PINK, - LIME, - YELLOW, - LIGHT_BLUE, - MAGENTA, - ORANGE, - WHITE; +/** Use minecraft's EnumDyeColor in as many places as possible. */ +@Deprecated +public enum EnumColor implements IStringSerializable { - public static final EnumColor[] VALUES = values(); - public static final String[] DYES = { - "dyeBlack", - "dyeRed", - "dyeGreen", - "dyeBrown", - "dyeBlue", - "dyePurple", - "dyeCyan", - "dyeLightGray", - "dyeGray", - "dyePink", - "dyeLime", - "dyeYellow", - "dyeLightBlue", - "dyeMagenta", - "dyeOrange", - "dyeWhite"}; - public static final String[] NAMES = { - "Black", - "Red", - "Green", - "Brown", - "Blue", - "Purple", - "Cyan", - "LightGray", - "Gray", - "Pink", - "Lime", - "Yellow", - "LightBlue", - "Magenta", - "Orange", - "White"}; - public static final int[] DARK_HEX = { - 0x2D2D2D, - 0xA33835, - 0x394C1E, - 0x5C3A24, - 0x3441A2, - 0x843FBF, - 0x36809E, - 0x888888, - 0x444444, - 0xE585A0, - 0x3FAA36, - 0xCFC231, - 0x7F9AD1, - 0xFF64FF, - 0xFF6A00, - 0xFFFFFF}; - public static final int[] LIGHT_HEX = { - 0x181414, - 0xBE2B27, - 0x007F0E, - 0x89502D, - 0x253193, - 0x7e34bf, - 0x299799, - 0xa0a7a7, - 0x7A7A7A, - 0xD97199, - 0x39D52E, - 0xFFD91C, - 0x66AAFF, - 0xD943C6, - 0xEA7835, - 0xe4e4e4}; + BLACK, + RED, + GREEN, + BROWN, + BLUE, + PURPLE, + CYAN, + LIGHT_GRAY, + GRAY, + PINK, + LIME, + YELLOW, + LIGHT_BLUE, + MAGENTA, + ORANGE, + WHITE; - @SideOnly(Side.CLIENT) - private static IIcon[] brushIcons; + public static final EnumColor[] VALUES = values(); + public static final String[] DYES = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", + "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; + public static final String[] NAMES = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", + "LightBlue", "Magenta", "Orange", "White" }; + public static final int[] DARK_HEX = { 0x2D2D2D, 0xA33835, 0x394C1E, 0x5C3A24, 0x3441A2, 0x843FBF, 0x36809E, 0x888888, 0x444444, 0xE585A0, + 0x3FAA36, 0xCFC231, 0x7F9AD1, 0xFF64FF, 0xFF6A00, 0xFFFFFF }; + public static final int[] LIGHT_HEX = { 0x181414, 0xBE2B27, 0x007F0E, 0x89502D, 0x253193, 0x7e34bf, 0x299799, 0xa0a7a7, 0x7A7A7A, 0xD97199, + 0x39D52E, 0xFFD91C, 0x66AAFF, 0xD943C6, 0xEA7835, 0xe4e4e4 }; - public int getDarkHex() { - return DARK_HEX[ordinal()]; - } + @SideOnly(Side.CLIENT) + private static ResourceLocation iconSheet; - public int getLightHex() { - return LIGHT_HEX[ordinal()]; - } + @SideOnly(Side.CLIENT) + private static TextureAtlasSprite[] brushSprites; - public static EnumColor fromId(int id) { - if (id < 0 || id >= VALUES.length) { - return WHITE; - } - return VALUES[id]; - } + public int getDarkHex() { + return DARK_HEX[ordinal()]; + } - public static EnumColor fromDye(String dyeTag) { - for (int id = 0; id < DYES.length; id++) { - if (DYES[id].equals(dyeTag)) { - return VALUES[id]; - } - } - return null; - } + public int getLightHex() { + return LIGHT_HEX[ordinal()]; + } - public static EnumColor fromName(String name) { - for (int id = 0; id < NAMES.length; id++) { - if (NAMES[id].equals(name)) { - return VALUES[id]; - } - } - return null; - } + public static EnumColor fromId(int id) { + if (id < 0 || id >= VALUES.length) { + return WHITE; + } + return VALUES[id]; + } - public static EnumColor getRand() { - return VALUES[new Random().nextInt(VALUES.length)]; - } + public static EnumColor fromDye(String dyeTag) { + for (int id = 0; id < DYES.length; id++) { + if (DYES[id].equals(dyeTag)) { + return VALUES[id]; + } + } + return null; + } - public EnumColor getNext() { - EnumColor next = VALUES[(ordinal() + 1) % VALUES.length]; - return next; - } + public static EnumColor fromName(String name) { + for (int id = 0; id < NAMES.length; id++) { + if (NAMES[id].equals(name)) { + return VALUES[id]; + } + } + return null; + } - public EnumColor getPrevious() { - EnumColor previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length]; - return previous; - } + public static EnumColor getRand() { + return VALUES[new Random().nextInt(VALUES.length)]; + } - public EnumColor inverse() { - return EnumColor.VALUES[15 - ordinal()]; - } + public EnumColor getNext() { + EnumColor next = VALUES[(ordinal() + 1) % VALUES.length]; + return next; + } - public String getTag() { - return "color." + name().replace("_", ".").toLowerCase(Locale.ENGLISH); - } + public EnumColor getPrevious() { + EnumColor previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length]; + return previous; + } - public String getBasicTag() { - return name().replace("_", ".").toLowerCase(Locale.ENGLISH); - } + public EnumColor inverse() { + return EnumColor.VALUES[15 - ordinal()]; + } - public String getName() { - return NAMES[ordinal()]; - } + public String getTag() { + return "color." + name().replace("_", ".").toLowerCase(Locale.ENGLISH); + } - public String getLocalizedName() { - return StatCollector.translateToLocal(getTag()); - } + public String getBasicTag() { + return name().replace("_", ".").toLowerCase(Locale.ENGLISH); + } - public String getDye() { - return DYES[ordinal()]; - } + @Override + public String getName() { + return NAMES[ordinal()]; + } - @Override - public String toString() { - String s = name().replace("_", " "); - String[] words = s.split(" "); - StringBuilder b = new StringBuilder(); - for (String word : words) { - b.append(word.charAt(0)).append(word.substring(1).toLowerCase(Locale.ENGLISH)).append(" "); - } - return b.toString().trim(); - } + public String getLocalizedName() { + return StatCollector.translateToLocal(getTag()); + } - public static void setIconArray(IIcon[] icons) { - brushIcons = icons; - } + public String getDye() { + return DYES[ordinal()]; + } - @SideOnly(Side.CLIENT) - public IIcon getIcon() { - return brushIcons [ordinal()]; - } + @Override + public String toString() { + String s = name().replace("_", " "); + String[] words = s.split(" "); + StringBuilder b = new StringBuilder(); + for (String word : words) { + b.append(word.charAt(0)).append(word.substring(1).toLowerCase(Locale.ENGLISH)).append(" "); + } + return b.toString().trim(); + } + + @SideOnly(Side.CLIENT) + public static void registerSprites(TextureAtlasSprite[] sprites) { + brushSprites = sprites; + } + + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getSprite() { + return brushSprites[ordinal()]; + } } diff --git a/src/api/java/buildcraft/api/core/EnumPipePart.java b/src/api/java/buildcraft/api/core/EnumPipePart.java new file mode 100644 index 000000000..f3ea8d6fb --- /dev/null +++ b/src/api/java/buildcraft/api/core/EnumPipePart.java @@ -0,0 +1,118 @@ +package buildcraft.api.core; + +import java.util.Locale; +import java.util.Map; + +import com.google.common.collect.Maps; + +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTBase.NBTPrimitive; +import net.minecraft.nbt.NBTTagString; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; + +import io.netty.buffer.ByteBuf; + +public enum EnumPipePart implements IStringSerializable,INetworkLoadable_BC8 { + DOWN(EnumFacing.DOWN), + UP(EnumFacing.UP), + NORTH(EnumFacing.NORTH), + SOUTH(EnumFacing.SOUTH), + WEST(EnumFacing.WEST), + EAST(EnumFacing.EAST), + /** CENTER, UNKNOWN and ALL are all valid uses of this constant. */ + CENTER(null); + + private static final Map facingMap = Maps.newEnumMap(EnumFacing.class); + private static final Map nameMap = Maps.newHashMap(); + private static final int MAX_VALUES = values().length; + + public final EnumFacing face; + + static { + for (EnumPipePart part : values()) { + nameMap.put(part.name(), part); + if (part.face != null) facingMap.put(part.face, part); + } + } + + public static EnumPipePart fromFacing(EnumFacing face) { + if (face == null) return EnumPipePart.CENTER; + return facingMap.get(face); + } + + public static EnumPipePart[] validFaces() { + return new EnumPipePart[] { DOWN, UP, NORTH, SOUTH, WEST, EAST }; + } + + public static EnumPipePart fromMeta(int meta) { + if (meta < 0 || meta >= MAX_VALUES) return EnumPipePart.CENTER; + return values()[meta]; + } + + private EnumPipePart(EnumFacing face) { + this.face = face; + } + + public int getIndex() { + if (face == null) return 6; + return face.getIndex(); + } + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } + + public EnumPipePart next() { + switch (this) { + case DOWN: + return EAST; + case EAST: + return NORTH; + case NORTH: + return SOUTH; + case SOUTH: + return UP; + case UP: + return WEST; + case WEST: + return DOWN; + default: + return DOWN; + } + } + + public EnumPipePart opposite() { + if (this == CENTER) return CENTER; + return fromFacing(face.getOpposite()); + } + + public static EnumPipePart readFromNBT(NBTBase base) { + if (base == null) return CENTER; + if (base instanceof NBTTagString) { + NBTTagString nbtString = (NBTTagString) base; + String string = nbtString.getString(); + return nameMap.containsKey(string) ? nameMap.get(string) : CENTER; + } else { + byte ord = ((NBTPrimitive) base).getByte(); + if (ord < 0 || ord > 6) return CENTER; + return values()[ord]; + } + } + + public NBTBase writeToNBT() { + return new NBTTagString(name()); + } + + @Override + public EnumPipePart readFromByteBuf(ByteBuf buf) { + byte ord = buf.readByte(); + return fromMeta(ord); + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + buf.writeByte(ordinal()); + } +} diff --git a/src/api/java/buildcraft/api/core/IAreaProvider.java b/src/api/java/buildcraft/api/core/IAreaProvider.java index 4abcf6e95..e504694ba 100644 --- a/src/api/java/buildcraft/api/core/IAreaProvider.java +++ b/src/api/java/buildcraft/api/core/IAreaProvider.java @@ -1,31 +1,17 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -/** - * To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. - */ +import net.minecraft.util.BlockPos; + +/** To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. */ public interface IAreaProvider { - int xMin(); + BlockPos min(); - int yMin(); + BlockPos max(); - int zMin(); - - int xMax(); - - int yMax(); - - int zMax(); - - /** - * Remove from the world all objects used to define the area. - */ - void removeFromWorld(); + /** Remove from the world all objects used to define the area. */ + void removeFromWorld(); } diff --git a/src/api/java/buildcraft/api/core/IBox.java b/src/api/java/buildcraft/api/core/IBox.java index e1e6f7d80..d7c11f4f4 100644 --- a/src/api/java/buildcraft/api/core/IBox.java +++ b/src/api/java/buildcraft/api/core/IBox.java @@ -1,23 +1,19 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; +import net.minecraft.util.BlockPos; + public interface IBox extends IZone { + IBox expand(int amount); - IBox expand(int amount); + IBox contract(int amount); - IBox contract(int amount); + BlockPos min(); - Position pMin(); - - Position pMax(); - - void createLaserData(); + BlockPos max(); + void createLaserData(); } diff --git a/src/api/java/buildcraft/api/core/IBuildCraftMod.java b/src/api/java/buildcraft/api/core/IBuildCraftMod.java new file mode 100644 index 000000000..c287088b1 --- /dev/null +++ b/src/api/java/buildcraft/api/core/IBuildCraftMod.java @@ -0,0 +1,7 @@ +package buildcraft.api.core; + +import net.minecraftforge.common.config.Property; + +public interface IBuildCraftMod { + Property getOption(String name); +} diff --git a/src/api/java/buildcraft/api/core/ICoreProxy.java b/src/api/java/buildcraft/api/core/ICoreProxy.java index 272faebfd..fc10bc092 100755 --- a/src/api/java/buildcraft/api/core/ICoreProxy.java +++ b/src/api/java/buildcraft/api/core/ICoreProxy.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import java.lang.ref.WeakReference; @@ -14,5 +10,5 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.WorldServer; public interface ICoreProxy { - WeakReference getBuildCraftPlayer(WorldServer world); + WeakReference getBuildCraftPlayer(WorldServer world); } diff --git a/src/api/java/buildcraft/api/core/IIconProvider.java b/src/api/java/buildcraft/api/core/IIconProvider.java index fa8657e64..418c08a00 100644 --- a/src/api/java/buildcraft/api/core/IIconProvider.java +++ b/src/api/java/buildcraft/api/core/IIconProvider.java @@ -1,31 +1,13 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ package buildcraft.api.core; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IIconProvider { + public TextureAtlasSprite getIcon(int iconIndex); - /** - * @param iconIndex - */ - @SideOnly(Side.CLIENT) - IIcon getIcon(int iconIndex); - - /** - * A call for the provider to register its Icons. This may be called multiple times but should only be executed once per provider - * @param iconRegister - */ - @SideOnly(Side.CLIENT) - void registerIcons(IIconRegister iconRegister); - + @SideOnly(Side.CLIENT) + public void registerIcons(TextureMap iconRegister); } diff --git a/src/api/java/buildcraft/api/core/IInvSlot.java b/src/api/java/buildcraft/api/core/IInvSlot.java index ea7a7fa30..a047a2f87 100644 --- a/src/api/java/buildcraft/api/core/IInvSlot.java +++ b/src/api/java/buildcraft/api/core/IInvSlot.java @@ -1,21 +1,15 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import net.minecraft.item.ItemStack; public interface IInvSlot { - /** - * Returns the slot number of the underlying Inventory. + /** Returns the slot number of the underlying Inventory. * - * @return the slot number - */ + * @return the slot number */ int getIndex(); boolean canPutStackInSlot(ItemStack stack); @@ -24,7 +18,7 @@ public interface IInvSlot { boolean isItemValidForSlot(ItemStack stack); - ItemStack decreaseStackInSlot(int amount); + ItemStack decreaseStackInSlot(int amount); ItemStack getStackInSlot(); diff --git a/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java b/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java new file mode 100644 index 000000000..8005bcf53 --- /dev/null +++ b/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java @@ -0,0 +1,14 @@ +package buildcraft.api.core; + +import net.minecraft.nbt.NBTBase; + +/** @param The type that will be loaded from and saved too. This essentially allows Immutable objects to be safely + * loaded without helper methods everywhere. However you are allowed to return this if you are a mutable + * object */ +public interface INBTLoadable_BC8 { + /** @return An object that has the properties loaded. WARNIG! This might be the same object as the one this method + * was called on! (You should always replace the object you have stored with whatever this returns) */ + T readFromNBT(NBTBase nbt); + + NBTBase writeToNBT(); +} diff --git a/src/api/java/buildcraft/api/core/INBTStoreable.java b/src/api/java/buildcraft/api/core/INBTStoreable.java index 669eed33c..c34c134ac 100644 --- a/src/api/java/buildcraft/api/core/INBTStoreable.java +++ b/src/api/java/buildcraft/api/core/INBTStoreable.java @@ -2,7 +2,11 @@ package buildcraft.api.core; import net.minecraft.nbt.NBTTagCompound; +/** Use {@link INBTLoadable_BC8} instead of this, as this gives you more control over what NBT goes where, and what + * objects are allowed to do. */ +@Deprecated public interface INBTStoreable { - void readFromNBT(NBTTagCompound tag); - void writeToNBT(NBTTagCompound tag); + void readFromNBT(NBTTagCompound tag); + + void writeToNBT(NBTTagCompound tag); } diff --git a/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java b/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java new file mode 100644 index 000000000..de0f99e95 --- /dev/null +++ b/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java @@ -0,0 +1,9 @@ +package buildcraft.api.core; + +import io.netty.buffer.ByteBuf; + +public interface INetworkLoadable_BC8 { + T readFromByteBuf(ByteBuf buf); + + void writeToByteBuf(ByteBuf buf); +} diff --git a/src/api/java/buildcraft/api/core/IPathProvider.java b/src/api/java/buildcraft/api/core/IPathProvider.java index 2ff392a92..899415227 100644 --- a/src/api/java/buildcraft/api/core/IPathProvider.java +++ b/src/api/java/buildcraft/api/core/IPathProvider.java @@ -2,9 +2,14 @@ package buildcraft.api.core; import java.util.List; -/** - * To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. - */ +import net.minecraft.util.BlockPos; + +/** To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. */ public interface IPathProvider { - List getPath(); + List getPath(); + + /** + * Remove from the world all objects used to define the path. + */ + void removeFromWorld(); } diff --git a/src/api/java/buildcraft/api/core/ISerializable.java b/src/api/java/buildcraft/api/core/ISerializable.java index a7d011ebb..77d56d541 100644 --- a/src/api/java/buildcraft/api/core/ISerializable.java +++ b/src/api/java/buildcraft/api/core/ISerializable.java @@ -1,30 +1,21 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ + * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents + * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.core; import io.netty.buffer.ByteBuf; -/** - * Implemented by classes representing serializable packet state - */ +/** Use {@link INetworkLoadable_BC8} instead, as that gives you more control over how you use objects */ +@Deprecated public interface ISerializable { - /** - * Serializes the state to the stream - * - * @param data - */ - void writeData(ByteBuf data); + /** Serializes the state to the stream + * + * @param data */ + void writeData(ByteBuf data); - /** - * Deserializes the state from the stream - * - * @param data - */ - void readData(ByteBuf data); + /** Deserializes the state from the stream + * + * @param data */ + void readData(ByteBuf data); } diff --git a/src/api/java/buildcraft/api/core/IWorldProperty.java b/src/api/java/buildcraft/api/core/IWorldProperty.java index a55bef1fc..ba440d7d3 100755 --- a/src/api/java/buildcraft/api/core/IWorldProperty.java +++ b/src/api/java/buildcraft/api/core/IWorldProperty.java @@ -1,17 +1,14 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public interface IWorldProperty { - boolean get(World world, int x, int y, int z); + boolean get(World world, BlockPos pos); - void clear(); + void clear(); } diff --git a/src/api/java/buildcraft/api/core/IZone.java b/src/api/java/buildcraft/api/core/IZone.java index 55ef4f80e..5d722ffe6 100755 --- a/src/api/java/buildcraft/api/core/IZone.java +++ b/src/api/java/buildcraft/api/core/IZone.java @@ -1,23 +1,26 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import java.util.Random; +import net.minecraft.util.BlockPos; +import net.minecraft.util.Vec3; + public interface IZone { + /** Returns the smallest possible distance that the index would have to be changed by in order for + * {@link #contains(Vec3)} to return true. If the position is already inside then this will return 0 */ + double distanceTo(BlockPos index); - double distanceTo(BlockIndex index); + /** Returns {@link #distanceTo(BlockPos)} but squared. Usually this will be quicker to calculate. */ + double distanceToSquared(BlockPos index); - double distanceToSquared(BlockIndex index); - - boolean contains(double x, double y, double z); - - BlockIndex getRandomBlockIndex(Random rand); + /** Returns true if the point is enclosed by this zone, such that none of the coordinates lie outside the range + * specified by this zone. */ + boolean contains(Vec3 point); + /** Gets a random position that {@link #contains(Vec3)} will return true. */ + BlockPos getRandomBlockPos(Random rand); } diff --git a/src/api/java/buildcraft/api/core/JavaTools.java b/src/api/java/buildcraft/api/core/JavaTools.java index e8dd4d898..7b7eb513c 100755 --- a/src/api/java/buildcraft/api/core/JavaTools.java +++ b/src/api/java/buildcraft/api/core/JavaTools.java @@ -1,43 +1,39 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import java.util.Arrays; public final class JavaTools { - private JavaTools(){ - - } - - public static T[] concat(T[] first, T[] second) { - T[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } + private JavaTools() { - public static int[] concat(int[] first, int[] second) { - int[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } + } - public static float[] concat(float[] first, float[] second) { - float[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } + public static T[] concat(T[] first, T[] second) { + T[] result = Arrays.copyOf(first, first.length + second.length); + System.arraycopy(second, 0, result, first.length, second.length); + return result; + } - public static String surroundWithQuotes(String stringToSurroundWithQuotes) { - return String.format("\"%s\"", stringToSurroundWithQuotes); - } + public static int[] concat(int[] first, int[] second) { + int[] result = Arrays.copyOf(first, first.length + second.length); + System.arraycopy(second, 0, result, first.length, second.length); + return result; + } - public static String stripSurroundingQuotes(String stringToStripQuotes) { - return stringToStripQuotes.replaceAll("^\"|\"$", ""); - } + public static float[] concat(float[] first, float[] second) { + float[] result = Arrays.copyOf(first, first.length + second.length); + System.arraycopy(second, 0, result, first.length, second.length); + return result; + } + + public static String surroundWithQuotes(String stringToSurroundWithQuotes) { + return String.format("\"%s\"", stringToSurroundWithQuotes); + } + + public static String stripSurroundingQuotes(String stringToStripQuotes) { + return stringToStripQuotes.replaceAll("^\"|\"$", ""); + } } diff --git a/src/api/java/buildcraft/api/core/Position.java b/src/api/java/buildcraft/api/core/Position.java deleted file mode 100644 index 426e09f40..000000000 --- a/src/api/java/buildcraft/api/core/Position.java +++ /dev/null @@ -1,200 +0,0 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ -package buildcraft.api.core; - -import io.netty.buffer.ByteBuf; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -public class Position implements ISerializable { - - public double x, y, z; - public ForgeDirection orientation; - - public Position() { - x = 0; - y = 0; - z = 0; - orientation = ForgeDirection.UNKNOWN; - } - - public Position(double ci, double cj, double ck) { - x = ci; - y = cj; - z = ck; - orientation = ForgeDirection.UNKNOWN; - } - - public Position(double ci, double cj, double ck, ForgeDirection corientation) { - x = ci; - y = cj; - z = ck; - orientation = corientation; - - if (orientation == null) { - orientation = ForgeDirection.UNKNOWN; - } - } - - public Position(Position p) { - x = p.x; - y = p.y; - z = p.z; - orientation = p.orientation; - } - - public Position(NBTTagCompound nbttagcompound) { - readFromNBT(nbttagcompound); - } - - public Position(TileEntity tile) { - x = tile.xCoord; - y = tile.yCoord; - z = tile.zCoord; - orientation = ForgeDirection.UNKNOWN; - } - - public Position(BlockIndex index) { - x = index.x; - y = index.y; - z = index.z; - orientation = ForgeDirection.UNKNOWN; - } - - public void moveRight(double step) { - switch (orientation) { - case SOUTH: - x = x - step; - break; - case NORTH: - x = x + step; - break; - case EAST: - z = z + step; - break; - case WEST: - z = z - step; - break; - default: - } - } - - public void moveLeft(double step) { - moveRight(-step); - } - - public void moveForwards(double step) { - switch (orientation) { - case UP: - y = y + step; - break; - case DOWN: - y = y - step; - break; - case SOUTH: - z = z + step; - break; - case NORTH: - z = z - step; - break; - case EAST: - x = x + step; - break; - case WEST: - x = x - step; - break; - default: - } - } - - public void moveBackwards(double step) { - moveForwards(-step); - } - - public void moveUp(double step) { - switch (orientation) { - case SOUTH: - case NORTH: - case EAST: - case WEST: - y = y + step; - break; - default: - } - - } - - public void moveDown(double step) { - moveUp(-step); - } - - public void writeToNBT(NBTTagCompound nbttagcompound) { - if (orientation == null) { - orientation = ForgeDirection.UNKNOWN; - } - - nbttagcompound.setDouble("i", x); - nbttagcompound.setDouble("j", y); - nbttagcompound.setDouble("k", z); - nbttagcompound.setByte("orientation", (byte) orientation.ordinal()); - } - - public void readFromNBT(NBTTagCompound nbttagcompound) { - x = nbttagcompound.getDouble("i"); - y = nbttagcompound.getDouble("j"); - z = nbttagcompound.getDouble("k"); - orientation = ForgeDirection.values() [nbttagcompound.getByte("orientation")]; - } - - @Override - public String toString() { - return "{" + x + ", " + y + ", " + z + "}"; - } - - public Position min(Position p) { - return new Position(p.x > x ? x : p.x, p.y > y ? y : p.y, p.z > z ? z : p.z); - } - - public Position max(Position p) { - return new Position(p.x < x ? x : p.x, p.y < y ? y : p.y, p.z < z ? z : p.z); - } - - public boolean isClose(Position newPosition, float f) { - double dx = x - newPosition.x; - double dy = y - newPosition.y; - double dz = z - newPosition.z; - - double sqrDis = dx * dx + dy * dy + dz * dz; - - return !(sqrDis > f * f); - } - - @Override - public void readData(ByteBuf stream) { - x = stream.readDouble(); - y = stream.readDouble(); - z = stream.readDouble(); - orientation = ForgeDirection.getOrientation(stream.readByte()); - } - - @Override - public void writeData(ByteBuf stream) { - stream.writeDouble(x); - stream.writeDouble(y); - stream.writeDouble(z); - stream.writeByte(orientation.ordinal()); - } - - @Override - public int hashCode() { - return (51 * (int) x) + (13 * (int) y) + (int) z; - } -} diff --git a/src/api/java/buildcraft/api/core/SafeTimeTracker.java b/src/api/java/buildcraft/api/core/SafeTimeTracker.java index 3e56ee989..9390d87e7 100644 --- a/src/api/java/buildcraft/api/core/SafeTimeTracker.java +++ b/src/api/java/buildcraft/api/core/SafeTimeTracker.java @@ -1,85 +1,68 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import net.minecraft.world.World; public class SafeTimeTracker { - private long lastMark = Long.MIN_VALUE; - private long duration = -1; - private long randomRange = 0; - private long lastRandomDelay = 0; - private long internalDelay = 1; + private long lastMark = Long.MIN_VALUE; + private long duration = -1; + private long randomRange = 0; + private long lastRandomDelay = 0; + private long internalDelay = 1; - /** - * @deprecated should use constructors with parameters instead - */ - public SafeTimeTracker () { + /** Only use this if the delay time changes (say, if you use this to determine when a refining should be complete */ + public SafeTimeTracker() { - } + } - public SafeTimeTracker (long delay) { - internalDelay = delay; - } + public SafeTimeTracker(long delay) { + internalDelay = delay; + } - /** - * In many situations, it is a bad idea to have all objects of the same - * kind to be waiting for the exact same amount of time, as that can lead - * to some situation where they're all synchronized and got to work all - * at the same time. When created with a random range, the mark that is set - * when reaching the expect delay will be added with a random number - * between [0, range[, meaning that the event will take between 0 and range - * more tick to run. - */ - public SafeTimeTracker (long delay, long random) { - internalDelay = delay; - randomRange = random; - } + /** In many situations, it is a bad idea to have all objects of the same kind to be waiting for the exact same + * amount of time, as that can lead to some situation where they're all synchronized and got to work all at the same + * time. When created with a random range, the mark that is set when reaching the expect delay will be added with a + * random number between [0, range[, meaning that the event will take between 0 and range more tick to run. */ + public SafeTimeTracker(long delay, long random) { + internalDelay = delay; + randomRange = random; + } - public boolean markTimeIfDelay(World world) { - return markTimeIfDelay(world, internalDelay); - } + public boolean markTimeIfDelay(World world) { + return markTimeIfDelay(world, internalDelay); + } - /** - * Return true if a given delay has passed since last time marked was called - * successfully. - * - * @deprecated should use the constructor with a delay instead, and call - * this function without a parameter - */ - public boolean markTimeIfDelay(World world, long delay) { - if (world == null) { - return false; - } + /** Return true if a given delay has passed since last time marked was called successfully. */ + public boolean markTimeIfDelay(World world, long delay) { + if (world == null) { + return false; + } - long currentTime = world.getTotalWorldTime(); + long currentTime = world.getTotalWorldTime(); - if (currentTime < lastMark) { - lastMark = currentTime; - return false; - } else if (lastMark + delay + lastRandomDelay <= currentTime) { - duration = currentTime - lastMark; - lastMark = currentTime; - lastRandomDelay = (int) (Math.random() * randomRange); + if (currentTime < lastMark) { + lastMark = currentTime; + return false; + } else if (lastMark + delay + lastRandomDelay <= currentTime) { + duration = currentTime - lastMark; + lastMark = currentTime; + lastRandomDelay = (int) (Math.random() * randomRange); - return true; - } else { - return false; - } - } + return true; + } else { + return false; + } + } - public long durationOfLastDelay() { - return duration > 0 ? duration : 0; - } + public long durationOfLastDelay() { + return duration > 0 ? duration : 0; + } - public void markTime(World world) { - lastMark = world.getTotalWorldTime(); - } -} \ No newline at end of file + public void markTime(World world) { + lastMark = world.getTotalWorldTime(); + } +} diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 776aaafdf..13a8e8989 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import net.minecraft.block.Block; @@ -15,120 +11,115 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -/** - * This class is used whenever stacks needs to be stored as keys. - */ +/** This class is used whenever stacks needs to be stored as keys. */ public final class StackKey { - public final ItemStack stack; - public final FluidStack fluidStack; + public final ItemStack stack; + public final FluidStack fluidStack; - public StackKey(FluidStack fluidStack) { - this(null, fluidStack); - } + public StackKey(FluidStack fluidStack) { + this(null, fluidStack); + } - public StackKey(ItemStack stack) { - this(stack, null); - } + public StackKey(ItemStack stack) { + this(stack, null); + } - public StackKey(ItemStack stack, FluidStack fluidStack) { - this.stack = stack; - this.fluidStack = fluidStack; - } + public StackKey(ItemStack stack, FluidStack fluidStack) { + this.stack = stack; + this.fluidStack = fluidStack; + } - public static StackKey stack(Item item, int amount, int damage) { - return new StackKey(new ItemStack(item, amount, damage)); - } + public static StackKey stack(Item item, int amount, int damage) { + return new StackKey(new ItemStack(item, amount, damage)); + } - public static StackKey stack(Block block, int amount, int damage) { - return new StackKey(new ItemStack(block, amount, damage)); - } + public static StackKey stack(Block block, int amount, int damage) { + return new StackKey(new ItemStack(block, amount, damage)); + } - public static StackKey stack(Item item) { - return new StackKey(new ItemStack(item, 1, 0)); - } + public static StackKey stack(Item item) { + return new StackKey(new ItemStack(item, 1, 0)); + } - public static StackKey stack(Block block) { - return new StackKey(new ItemStack(block, 1, 0)); - } + public static StackKey stack(Block block) { + return new StackKey(new ItemStack(block, 1, 0)); + } - public static StackKey stack(ItemStack itemStack) { - return new StackKey(itemStack); - } + public static StackKey stack(ItemStack itemStack) { + return new StackKey(itemStack); + } - public static StackKey fluid(Fluid fluid, int amount) { - return new StackKey(new FluidStack(fluid, amount)); - } + public static StackKey fluid(Fluid fluid, int amount) { + return new StackKey(new FluidStack(fluid, amount)); + } - public static StackKey fluid(Fluid fluid) { - return new StackKey(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME)); - } + public static StackKey fluid(Fluid fluid) { + return new StackKey(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME)); + } - public static StackKey fluid(FluidStack fluidStack) { - return new StackKey(fluidStack); - } + public static StackKey fluid(FluidStack fluidStack) { + return new StackKey(fluidStack); + } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || o.getClass() != StackKey.class) { - return false; - } - StackKey k = (StackKey) o; - if ((stack == null ^ k.stack == null) || (fluidStack == null ^ k.fluidStack == null)) { - return false; - } - if (stack != null) { - if (stack.getItem() != k.stack.getItem() || - stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() || - !objectsEqual(stack.getTagCompound(), k.stack.getTagCompound())) { - return false; - } - } - if (fluidStack != null) { - if (fluidStack.getFluid().getID() != k.fluidStack.getFluid().getID() || - fluidStack.amount != k.fluidStack.amount || - !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { - return false; - } - } - return true; - } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || o.getClass() != StackKey.class) { + return false; + } + StackKey k = (StackKey) o; + if ((stack == null ^ k.stack == null) || (fluidStack == null ^ k.fluidStack == null)) { + return false; + } + if (stack != null) { + if (stack.getItem() != k.stack.getItem() || stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() || !objectsEqual( + stack.getTagCompound(), k.stack.getTagCompound())) { + return false; + } + } + if (fluidStack != null) { + if (fluidStack.getFluid().getID() != k.fluidStack.getFluid().getID() || fluidStack.amount != k.fluidStack.amount || !objectsEqual( + fluidStack.tag, k.fluidStack.tag)) { + return false; + } + } + return true; + } - @Override - public int hashCode() { - int result = 7; - if (stack != null) { - result = 31 * result + stack.getItem().hashCode(); - result = 31 * result + stack.getItemDamage(); - result = 31 * result + objectHashCode(stack.getTagCompound()); - } - result = 31 * result + 7; - if (fluidStack != null) { - result = 31 * result + fluidStack.getFluid().getID(); - result = 31 * result + fluidStack.amount; - result = 31 * result + objectHashCode(fluidStack.tag); - } - return result; - } + @Override + public int hashCode() { + int result = 7; + if (stack != null) { + result = 31 * result + stack.getItem().hashCode(); + result = 31 * result + stack.getItemDamage(); + result = 31 * result + objectHashCode(stack.getTagCompound()); + } + result = 31 * result + 7; + if (fluidStack != null) { + result = 31 * result + fluidStack.getFluid().getID(); + result = 31 * result + fluidStack.amount; + result = 31 * result + objectHashCode(fluidStack.tag); + } + return result; + } - private boolean objectsEqual(Object o1, Object o2) { - if (o1 == null && o2 == null) { - return true; - } else if (o1 == null || o2 == null) { - return false; - } else { - return o1.equals(o2); - } - } - - private int objectHashCode(Object o) { - return o != null ? o.hashCode() : 0; - } + private boolean objectsEqual(Object o1, Object o2) { + if (o1 == null && o2 == null) { + return true; + } else if (o1 == null || o2 == null) { + return false; + } else { + return o1.equals(o2); + } + } - public StackKey copy() { - return new StackKey(stack != null ? stack.copy() : null, - fluidStack != null ? fluidStack.copy() : null); - } + private int objectHashCode(Object o) { + return o != null ? o.hashCode() : 0; + } + + public StackKey copy() { + return new StackKey(stack != null ? stack.copy() : null, fluidStack != null ? fluidStack.copy() : null); + } } diff --git a/src/api/java/buildcraft/api/core/package-info.java b/src/api/java/buildcraft/api/core/package-info.java index 0fc4db4cc..12cc9ea13 100644 --- a/src/api/java/buildcraft/api/core/package-info.java +++ b/src/api/java/buildcraft/api/core/package-info.java @@ -1,12 +1,10 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "1.5", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") +@API(apiVersion = "2.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api.core; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/core/render/ICullable.java b/src/api/java/buildcraft/api/core/render/ICullable.java index b800c0851..ea4b1f444 100644 --- a/src/api/java/buildcraft/api/core/render/ICullable.java +++ b/src/api/java/buildcraft/api/core/render/ICullable.java @@ -1,32 +1,27 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ + * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents + * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.core.render; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -/* - * This interface designates a block as a state machine responsible for culling - * For implementation details look into FakeBlock implementation - */ +/* This interface designates a block as a state machine responsible for culling For implementation details look into + * FakeBlock implementation */ public interface ICullable { - //Side Rendering States - //They are used to effectively cull obstructed sides while processing facades. - //Make sure your implementation is correct otherwise expect FPS drop - - void setRenderSide(ForgeDirection side, boolean render); - - void setRenderAllSides(); - - boolean shouldSideBeRendered(IBlockAccess blockAccess, int x, int y, int z, int side); - - void setRenderMask(int mask); - + // Side Rendering States + // They are used to effectively cull obstructed sides while processing facades. + // Make sure your implementation is correct otherwise expect FPS drop + + void setRenderSide(EnumFacing side, boolean render); + + void setRenderAllSides(); + + boolean shouldSideBeRendered(IBlockAccess blockAccess, BlockPos pos, int side); + + void setRenderMask(int mask); + } diff --git a/src/api/java/buildcraft/api/core/render/ITextureStateManager.java b/src/api/java/buildcraft/api/core/render/ITextureStateManager.java index 8161d6b93..e401b3e2e 100644 --- a/src/api/java/buildcraft/api/core/render/ITextureStateManager.java +++ b/src/api/java/buildcraft/api/core/render/ITextureStateManager.java @@ -1,7 +1,7 @@ package buildcraft.api.core.render; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; public interface ITextureStateManager { - void set(IIcon icon); + void set(TextureAtlasSprite icon); } diff --git a/src/api/java/buildcraft/api/core/render/ITextureStates.java b/src/api/java/buildcraft/api/core/render/ITextureStates.java index 835caf7fe..593534f6c 100644 --- a/src/api/java/buildcraft/api/core/render/ITextureStates.java +++ b/src/api/java/buildcraft/api/core/render/ITextureStates.java @@ -1,22 +1,18 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ + * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents + * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.core.render; import net.minecraft.block.Block; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; public interface ITextureStates extends ICullable { - ITextureStateManager getTextureState(); - - IIcon getIcon(int side, int meta); - - Block getBlock(); - + ITextureStateManager getTextureState(); + + TextureAtlasSprite getIcon(int side, int meta); + + Block getBlock(); + } diff --git a/src/api/java/buildcraft/api/gates/GateExpansionController.java b/src/api/java/buildcraft/api/gates/GateExpansionController.java index e37ae20a5..749de86f7 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansionController.java +++ b/src/api/java/buildcraft/api/gates/GateExpansionController.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; import java.util.List; @@ -20,45 +16,39 @@ import buildcraft.api.statements.ITriggerInternal; public abstract class GateExpansionController { - public final IGateExpansion type; - public final TileEntity pipeTile; + public final IGateExpansion type; + public final TileEntity pipeTile; - public GateExpansionController(IGateExpansion type, TileEntity pipeTile) { - this.pipeTile = pipeTile; - this.type = type; - } + public GateExpansionController(IGateExpansion type, TileEntity pipeTile) { + this.pipeTile = pipeTile; + this.type = type; + } - public IGateExpansion getType() { - return type; - } + public IGateExpansion getType() { + return type; + } - public boolean isActive() { - return false; - } + public boolean isActive() { + return false; + } - public void tick(IGate gate) { - } + public void tick(IGate gate) {} - public void startResolution() { - } + public void startResolution() {} - public boolean resolveAction(IStatement action, int count) { - return false; - } + public boolean resolveAction(IStatement action, int count) { + return false; + } - public boolean isTriggerActive(IStatement trigger, IStatementParameter[] parameters) { - return false; - } + public boolean isTriggerActive(IStatement trigger, IStatementParameter[] parameters) { + return false; + } - public void addTriggers(List list) { - } + public void addTriggers(List list) {} - public void addActions(List list) { - } + public void addActions(List list) {} - public void writeToNBT(NBTTagCompound nbt) { - } + public void writeToNBT(NBTTagCompound nbt) {} - public void readFromNBT(NBTTagCompound nbt) { - } + public void readFromNBT(NBTTagCompound nbt) {} } diff --git a/src/api/java/buildcraft/api/gates/GateExpansions.java b/src/api/java/buildcraft/api/gates/GateExpansions.java index bc667f58e..b1e600371 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansions.java +++ b/src/api/java/buildcraft/api/gates/GateExpansions.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; import java.util.ArrayList; @@ -19,48 +15,47 @@ import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; public final class GateExpansions { - private static final Map expansions = new HashMap(); - private static final ArrayList expansionIDs = new ArrayList(); - private static final Map recipes = HashBiMap.create(); + private static final Map expansions = new HashMap(); + private static final ArrayList expansionIDs = new ArrayList(); + private static final Map recipes = HashBiMap.create(); - private GateExpansions() { - } + private GateExpansions() {} - public static void registerExpansion(IGateExpansion expansion) { - registerExpansion(expansion.getUniqueIdentifier(), expansion); - } + public static void registerExpansion(IGateExpansion expansion) { + registerExpansion(expansion.getUniqueIdentifier(), expansion); + } - public static void registerExpansion(String identifier, IGateExpansion expansion) { - expansions.put(identifier, expansion); - expansionIDs.add(expansion); - } + public static void registerExpansion(String identifier, IGateExpansion expansion) { + expansions.put(identifier, expansion); + expansionIDs.add(expansion); + } - public static void registerExpansion(IGateExpansion expansion, ItemStack addedRecipe) { - registerExpansion(expansion.getUniqueIdentifier(), expansion); - recipes.put(expansion, addedRecipe); - } + public static void registerExpansion(IGateExpansion expansion, ItemStack addedRecipe) { + registerExpansion(expansion.getUniqueIdentifier(), expansion); + recipes.put(expansion, addedRecipe); + } - public static IGateExpansion getExpansion(String identifier) { - return expansions.get(identifier); - } + public static IGateExpansion getExpansion(String identifier) { + return expansions.get(identifier); + } - public static Set getExpansions() { - Set set = new HashSet(); - set.addAll(expansionIDs); - return set; - } + public static Set getExpansions() { + Set set = new HashSet(); + set.addAll(expansionIDs); + return set; + } - public static Map getRecipesForPostInit() { - return recipes; - } - - // The code below is used by networking. - - public static IGateExpansion getExpansionByID(int id) { - return expansionIDs.get(id); - } - - public static int getExpansionID(IGateExpansion expansion) { - return expansionIDs.indexOf(expansion); - } + public static Map getRecipesForPostInit() { + return recipes; + } + + // The code below is used by networking. + + public static IGateExpansion getExpansionByID(int id) { + return expansionIDs.get(id); + } + + public static int getExpansionID(IGateExpansion expansion) { + return expansionIDs.indexOf(expansion); + } } diff --git a/src/api/java/buildcraft/api/gates/IGate.java b/src/api/java/buildcraft/api/gates/IGate.java index 6127caadb..df2364937 100644 --- a/src/api/java/buildcraft/api/gates/IGate.java +++ b/src/api/java/buildcraft/api/gates/IGate.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; import java.util.List; @@ -17,16 +13,18 @@ import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.api.transport.IPipe; public interface IGate extends ISidedStatementContainer { - @Deprecated - void setPulsing(boolean pulse); + @Deprecated + void setPulsing(boolean pulse); - IPipe getPipe(); + IPipe getPipe(); - List getTriggers(); - List getActions(); + List getTriggers(); - List getActiveActions(); + List getActions(); - List getTriggerParameters(int index); - List getActionParameters(int index); + List getActiveActions(); + + List getTriggerParameters(int index); + + List getActionParameters(int index); } diff --git a/src/api/java/buildcraft/api/gates/IGateExpansion.java b/src/api/java/buildcraft/api/gates/IGateExpansion.java index ad61fad66..f197c0ca7 100644 --- a/src/api/java/buildcraft/api/gates/IGateExpansion.java +++ b/src/api/java/buildcraft/api/gates/IGateExpansion.java @@ -1,30 +1,34 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; -import net.minecraft.client.renderer.texture.IIconRegister; +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IGateExpansion { - String getUniqueIdentifier(); + String getUniqueIdentifier(); - String getDisplayName(); + String getDisplayName(); - GateExpansionController makeController(TileEntity pipeTile); + GateExpansionController makeController(TileEntity pipeTile); - void registerBlockOverlay(IIconRegister iconRegister); + @SideOnly(Side.CLIENT) + void textureStitch(TextureMap map); - void registerItemOverlay(IIconRegister iconRegister); + @SideOnly(Side.CLIENT) + IGateStaticRenderState getRenderState(); - IIcon getOverlayBlock(); - - IIcon getOverlayItem(); + public interface IGateStaticRenderState { + List bake(VertexFormat format); + } } diff --git a/src/api/java/buildcraft/api/gates/package-info.java b/src/api/java/buildcraft/api/gates/package-info.java index 83cb2a2c4..b86ad48bd 100644 --- a/src/api/java/buildcraft/api/gates/package-info.java +++ b/src/api/java/buildcraft/api/gates/package-info.java @@ -1,12 +1,8 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ @API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates") package buildcraft.api.gates; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/statements/ActionState.java b/src/api/java/buildcraft/api/statements/ActionState.java index 72e4d58ba..15f547c07 100755 --- a/src/api/java/buildcraft/api/statements/ActionState.java +++ b/src/api/java/buildcraft/api/statements/ActionState.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; public class ActionState { diff --git a/src/api/java/buildcraft/api/statements/IActionExternal.java b/src/api/java/buildcraft/api/statements/IActionExternal.java index 1d6e2eb54..21ffc92c4 100644 --- a/src/api/java/buildcraft/api/statements/IActionExternal.java +++ b/src/api/java/buildcraft/api/statements/IActionExternal.java @@ -1,16 +1,12 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IActionExternal extends IStatement { - void actionActivate(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters); + void actionActivate(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters); } diff --git a/src/api/java/buildcraft/api/statements/IActionInternal.java b/src/api/java/buildcraft/api/statements/IActionInternal.java index 6a019a459..c3c77a4b1 100644 --- a/src/api/java/buildcraft/api/statements/IActionInternal.java +++ b/src/api/java/buildcraft/api/statements/IActionInternal.java @@ -1,15 +1,11 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; public interface IActionInternal extends IStatement { - void actionActivate(IStatementContainer source, IStatementParameter[] parameters); - + void actionActivate(IStatementContainer source, IStatementParameter[] parameters); + } diff --git a/src/api/java/buildcraft/api/statements/IActionProvider.java b/src/api/java/buildcraft/api/statements/IActionProvider.java index 147d4d39d..63625b05a 100644 --- a/src/api/java/buildcraft/api/statements/IActionProvider.java +++ b/src/api/java/buildcraft/api/statements/IActionProvider.java @@ -1,28 +1,19 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import java.util.Collection; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IActionProvider { - /** - * Returns the list of actions that are available from the statement container holding the - * gate. - */ - Collection getInternalActions(IStatementContainer container); + /** Returns the list of actions that are available from the statement container holding the gate. */ + Collection getInternalActions(IStatementContainer container); - /** - * Returns the list of actions available to a gate next to the given block. - */ - Collection getExternalActions(ForgeDirection side, TileEntity tile); + /** Returns the list of actions available to a gate next to the given block. */ + Collection getExternalActions(EnumFacing side, TileEntity tile); } diff --git a/src/api/java/buildcraft/api/statements/IActionReceptor.java b/src/api/java/buildcraft/api/statements/IActionReceptor.java index db7cea027..34155b86a 100644 --- a/src/api/java/buildcraft/api/statements/IActionReceptor.java +++ b/src/api/java/buildcraft/api/statements/IActionReceptor.java @@ -1,13 +1,9 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; public interface IActionReceptor { - void actionActivated(IStatement statement, IStatementParameter[] parameters); + void actionActivated(IStatement statement, IStatementParameter[] parameters); } diff --git a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java b/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java index c9c7db8ed..cb2dc78e1 100644 --- a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java +++ b/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java @@ -1,16 +1,13 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import java.util.List; public interface IOverrideDefaultStatements { - List overrideTriggers(); - List overrideActions(); + List overrideTriggers(); + + List overrideActions(); } diff --git a/src/api/java/buildcraft/api/statements/IStatement.java b/src/api/java/buildcraft/api/statements/IStatement.java index e466efd2b..dc0254332 100644 --- a/src/api/java/buildcraft/api/statements/IStatement.java +++ b/src/api/java/buildcraft/api/statements/IStatement.java @@ -1,56 +1,36 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IStatement { - /** - * Every statement needs a unique tag, it should be in the format of - * "<modid>:<name>. - * - * @return the unique id - */ - String getUniqueTag(); + /** Every statement needs a unique tag, it should be in the format of "<modid>:<name>. + * + * @return the unique id */ + String getUniqueTag(); - @SideOnly(Side.CLIENT) - IIcon getIcon(); + /** Return the maximum number of parameter this statement can have, 0 if none. */ + int maxParameters(); - @SideOnly(Side.CLIENT) - void registerIcons(IIconRegister iconRegister); + /** Return the minimum number of parameter this statement can have, 0 if none. */ + int minParameters(); - /** - * Return the maximum number of parameter this statement can have, 0 if none. - */ - int maxParameters(); + /** Return the statement description in the UI */ + String getDescription(); - /** - * Return the minimum number of parameter this statement can have, 0 if none. - */ - int minParameters(); + /** Create parameters for the statement. */ + IStatementParameter createParameter(int index); - /** - * Return the statement description in the UI - */ - String getDescription(); + /** This returns the statement after a left rotation. Used in particular in blueprints orientation. */ + IStatement rotateLeft(); - /** - * Create parameters for the statement. - */ - IStatementParameter createParameter(int index); - - /** - * This returns the statement after a left rotation. Used in particular in - * blueprints orientation. - */ - IStatement rotateLeft(); + /** This should return the icon for this statement, suitable for rending directly into a GUI. This should refer to a + * texture on the map block texture map. */ + @SideOnly(Side.CLIENT) + TextureAtlasSprite getGuiSprite(); } diff --git a/src/api/java/buildcraft/api/statements/IStatementContainer.java b/src/api/java/buildcraft/api/statements/IStatementContainer.java index 43a4f51ef..f4a73465f 100644 --- a/src/api/java/buildcraft/api/statements/IStatementContainer.java +++ b/src/api/java/buildcraft/api/statements/IStatementContainer.java @@ -1,19 +1,12 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import net.minecraft.tileentity.TileEntity; -/** - * This is implemented by objects containing Statements, such as - * Gates and TileEntities. - */ +/** This is implemented by objects containing Statements, such as Gates and TileEntities. */ public interface IStatementContainer { - TileEntity getTile(); + TileEntity getTile(); } diff --git a/src/api/java/buildcraft/api/statements/IStatementParameter.java b/src/api/java/buildcraft/api/statements/IStatementParameter.java index 9a9e397cd..7ef29c793 100755 --- a/src/api/java/buildcraft/api/statements/IStatementParameter.java +++ b/src/api/java/buildcraft/api/statements/IStatementParameter.java @@ -1,59 +1,36 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IStatementParameter { - - /** - * Every parameter needs a unique tag, it should be in the format of - * "<modi>:<name>". - * - * @return the unique id - */ - String getUniqueTag(); - - @SideOnly(Side.CLIENT) - IIcon getIcon(); - ItemStack getItemStack(); + /** Every parameter needs a unique tag, it should be in the format of "<modid>:<name>". + * + * @return the unique id */ + String getUniqueTag(); - /** - * Something that is initially unintuitive: you HAVE to - * keep your icons as static variables, due to the fact - * that every IStatementParameter is instantiated upon creation, - * in opposition to IStatements which are singletons (due to the - * fact that they, unlike Parameters, store no additional data) - */ - @SideOnly(Side.CLIENT) - void registerIcons(IIconRegister iconRegister); - - /** - * Return the parameter description in the UI - */ - String getDescription(); + @SideOnly(Side.CLIENT) + TextureAtlasSprite getIcon(); - void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse); + ItemStack getItemStack(); - void readFromNBT(NBTTagCompound compound); + /** Return the parameter description in the UI */ + String getDescription(); - void writeToNBT(NBTTagCompound compound); + void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse); - /** - * This returns the parameter after a left rotation. Used in particular in - * blueprints orientation. - */ - IStatementParameter rotateLeft(); + void readFromNBT(NBTTagCompound compound); + + void writeToNBT(NBTTagCompound compound); + + /** This returns the parameter after a left rotation. Used in particular in blueprints orientation. */ + IStatementParameter rotateLeft(); } diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternal.java b/src/api/java/buildcraft/api/statements/ITriggerExternal.java index 532f67a5f..3db589cbc 100644 --- a/src/api/java/buildcraft/api/statements/ITriggerExternal.java +++ b/src/api/java/buildcraft/api/statements/ITriggerExternal.java @@ -1,18 +1,14 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface ITriggerExternal extends IStatement { - boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters); - + boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters); + } diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java b/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java index 7103c06ac..b8628deec 100644 --- a/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java +++ b/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java @@ -1,17 +1,16 @@ package buildcraft.api.statements; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; -/** - * This interface can be used by tiles to override external trigger - * behaviour. +/** This interface can be used by tiles to override external trigger behaviour. * - * Please use wisely. - */ + * Please use wisely. */ public interface ITriggerExternalOverride { - public enum Result { - TRUE, FALSE, IGNORE - } + public enum Result { + TRUE, + FALSE, + IGNORE + } - Result override(ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters); + Result override(EnumFacing side, IStatementContainer source, IStatementParameter[] parameters); } diff --git a/src/api/java/buildcraft/api/statements/ITriggerInternal.java b/src/api/java/buildcraft/api/statements/ITriggerInternal.java index a4241d3da..610a5728b 100755 --- a/src/api/java/buildcraft/api/statements/ITriggerInternal.java +++ b/src/api/java/buildcraft/api/statements/ITriggerInternal.java @@ -1,15 +1,11 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; public interface ITriggerInternal extends IStatement { - boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters); + boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters); } diff --git a/src/api/java/buildcraft/api/statements/ITriggerProvider.java b/src/api/java/buildcraft/api/statements/ITriggerProvider.java index 548f107bf..d6ffbd42f 100644 --- a/src/api/java/buildcraft/api/statements/ITriggerProvider.java +++ b/src/api/java/buildcraft/api/statements/ITriggerProvider.java @@ -1,28 +1,20 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import java.util.Collection; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface ITriggerProvider { - /** - * Returns the list of triggers that are available from the object holding the gate. - */ - Collection getInternalTriggers(IStatementContainer container); + /** Returns the list of triggers that are available from the object holding the gate. */ + Collection getInternalTriggers(IStatementContainer container); - /** - * Returns the list of triggers available to a gate next to the given block. - */ - Collection getExternalTriggers(ForgeDirection side, TileEntity tile); + /** Returns the list of triggers available to a gate next to the given block. */ + Collection getExternalTriggers(EnumFacing side, TileEntity tile); } diff --git a/src/api/java/buildcraft/api/statements/StatementManager.java b/src/api/java/buildcraft/api/statements/StatementManager.java index fec7d9510..419ee1d07 100644 --- a/src/api/java/buildcraft/api/statements/StatementManager.java +++ b/src/api/java/buildcraft/api/statements/StatementManager.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import java.util.Collection; @@ -14,169 +10,168 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; + +import buildcraft.api.core.BCLog; public final class StatementManager { - public static Map statements = new HashMap(); - public static Map> parameters = new HashMap>(); - private static List triggerProviders = new LinkedList(); - private static List actionProviders = new LinkedList(); + public static Map statements = new HashMap(); + public static Map> parameters = new HashMap>(); + private static List triggerProviders = new LinkedList(); + private static List actionProviders = new LinkedList(); - /** - * Deactivate constructor - */ - private StatementManager() { - } + /** Deactivate constructor */ + private StatementManager() {} - public static void registerTriggerProvider(ITriggerProvider provider) { - if (provider != null && !triggerProviders.contains(provider)) { - triggerProviders.add(provider); - } - } + public static void registerTriggerProvider(ITriggerProvider provider) { + if (provider != null && !triggerProviders.contains(provider)) { + triggerProviders.add(provider); + } + } - public static void registerActionProvider(IActionProvider provider) { - if (provider != null && !actionProviders.contains(provider)) { - actionProviders.add(provider); - } - } + public static void registerActionProvider(IActionProvider provider) { + if (provider != null && !actionProviders.contains(provider)) { + actionProviders.add(provider); + } + } - public static void registerStatement(IStatement statement) { - statements.put(statement.getUniqueTag(), statement); - } + public static void registerStatement(IStatement statement) { + statements.put(statement.getUniqueTag(), statement); + } - public static void registerParameterClass(Class param) { - parameters.put(createParameter(param).getUniqueTag(), param); - } - - @Deprecated - public static void registerParameterClass(String name, Class param) { - parameters.put(name, param); - } + public static void registerParameterClass(Class param) { + parameters.put(createParameter(param).getUniqueTag(), param); + } - public static List getExternalTriggers(ForgeDirection side, TileEntity entity) { - List result; + @Deprecated + public static void registerParameterClass(String name, Class param) { + parameters.put(name, param); + } - if (entity instanceof IOverrideDefaultStatements) { - result = ((IOverrideDefaultStatements) entity).overrideTriggers(); - if (result != null) { - return result; - } - } + public static List getExternalTriggers(EnumFacing side, TileEntity entity) { + List result; + + if (entity instanceof IOverrideDefaultStatements) { + result = ((IOverrideDefaultStatements) entity).overrideTriggers(); + if (result != null) { + return result; + } + } + + result = new LinkedList(); + + for (ITriggerProvider provider : triggerProviders) { + Collection toAdd = provider.getExternalTriggers(side, entity); + + if (toAdd != null) { + for (ITriggerExternal t : toAdd) { + if (!result.contains(t)) { + result.add(t); + } + } + } + } + + return result; + } + + public static List getExternalActions(EnumFacing side, TileEntity entity) { + List result = new LinkedList(); + + if (entity instanceof IOverrideDefaultStatements) { + result = ((IOverrideDefaultStatements) entity).overrideActions(); + if (result != null) { + return result; + } + } + + result = new LinkedList(); - result = new LinkedList(); - - for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getExternalTriggers(side, entity); + for (IActionProvider provider : actionProviders) { + Collection toAdd = provider.getExternalActions(side, entity); - if (toAdd != null) { - for (ITriggerExternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } + if (toAdd != null) { + for (IActionExternal t : toAdd) { + if (!result.contains(t)) { + result.add(t); + } + } + } + } - return result; - } + return result; + } - public static List getExternalActions(ForgeDirection side, TileEntity entity) { - List result = new LinkedList(); + public static List getInternalTriggers(IStatementContainer container) { + List result = new LinkedList(); - if (entity instanceof IOverrideDefaultStatements) { - result = ((IOverrideDefaultStatements) entity).overrideActions(); - if (result != null) { - return result; - } else { - result = new LinkedList(); - } - } - - for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getExternalActions(side, entity); + for (ITriggerProvider provider : triggerProviders) { + Collection toAdd = provider.getInternalTriggers(container); - if (toAdd != null) { - for (IActionExternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } + if (toAdd != null) { + for (ITriggerInternal t : toAdd) { + if (!result.contains(t)) { + result.add(t); + } + } + } + } - return result; - } + return result; + } - public static List getInternalTriggers(IStatementContainer container) { - List result = new LinkedList(); + public static List getInternalActions(IStatementContainer container) { + List result = new LinkedList(); - for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getInternalTriggers(container); + for (IActionProvider provider : actionProviders) { + Collection toAdd = provider.getInternalActions(container); - if (toAdd != null) { - for (ITriggerInternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } + if (toAdd != null) { + for (IActionInternal t : toAdd) { + if (!result.contains(t)) { + result.add(t); + } + } + } + } - return result; - } + return result; + } - public static List getInternalActions(IStatementContainer container) { - List result = new LinkedList(); + public static IStatementParameter createParameter(String kind) { + return createParameter(parameters.get(kind)); + } - for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getInternalActions(container); + private static IStatementParameter createParameter(Class param) { + try { + return param.newInstance(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (Error error) { + BCLog.logErrorAPI(error, IStatementParameter.class); + throw error; + } - if (toAdd != null) { - for (IActionInternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } + return null; + } - return result; - } - - public static IStatementParameter createParameter(String kind) { - return createParameter(parameters.get(kind)); - } - - private static IStatementParameter createParameter(Class param) { - try { - return param.newInstance(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - - return null; - } - - /** - * Generally, this function should be called by every mod implementing - * the Statements API ***as a container*** (that is, adding its own gates) - * on the client side from a given Item of choice. - */ - @SideOnly(Side.CLIENT) - public static void registerIcons(IIconRegister register) { - for (IStatement statement : statements.values()) { - statement.registerIcons(register); - } - - for (Class parameter : parameters.values()) { - createParameter(parameter).registerIcons(register); - } - } + // /** + // * Generally, this function should be called by every mod implementing + // * the Statements API ***as a container*** (that is, adding its own gates) + // * on the client side from a given Item of choice. + // */ + // @SideOnly(Side.CLIENT) + // public static void registerIcons(TextureAtlasSpriteRegister register) { + // for (IStatement statement : statements.values()) { + // statement.registerIcons(register); + // } + // + // for (Class parameter : parameters.values()) { + // createParameter(parameter).registerIcons(register); + // } + // } } diff --git a/src/api/java/buildcraft/api/statements/StatementMouseClick.java b/src/api/java/buildcraft/api/statements/StatementMouseClick.java index 54688ebb8..c39ed336f 100644 --- a/src/api/java/buildcraft/api/statements/StatementMouseClick.java +++ b/src/api/java/buildcraft/api/statements/StatementMouseClick.java @@ -1,27 +1,23 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; public final class StatementMouseClick { - private int button; - private boolean shift; - - public StatementMouseClick(int button, boolean shift) { - this.button = button; - this.shift = shift; - } - - public boolean isShift() { - return shift; - } - - public int getButton() { - return button; - } + private int button; + private boolean shift; + + public StatementMouseClick(int button, boolean shift) { + this.button = button; + this.shift = shift; + } + + public boolean isShift() { + return shift; + } + + public int getButton() { + return button; + } } diff --git a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java b/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java index 3bccda5d3..def3c36ac 100755 --- a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java +++ b/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java @@ -1,88 +1,83 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; -import net.minecraft.client.renderer.texture.IIconRegister; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; public class StatementParameterItemStack implements IStatementParameter { - - protected ItemStack stack; - @Override - public IIcon getIcon() { - return null; - } + protected ItemStack stack; - @Override - public ItemStack getItemStack() { - return stack; - } + @Override + public TextureAtlasSprite getIcon() { + return null; + } - @Override - public void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse) { - if (stack != null) { - this.stack = stack.copy(); - this.stack.stackSize = 1; - } else { - this.stack = null; - } - } + @Override + public ItemStack getItemStack() { + return stack; + } - @Override - public void writeToNBT(NBTTagCompound compound) { - if (stack != null) { - NBTTagCompound tagCompound = new NBTTagCompound(); - stack.writeToNBT(tagCompound); - compound.setTag("stack", tagCompound); - } - } + @Override + public void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse) { + if (stack != null) { + this.stack = stack.copy(); + this.stack.stackSize = 1; + } else { + this.stack = null; + } + } - @Override - public void readFromNBT(NBTTagCompound compound) { - stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("stack")); - } + @Override + public void writeToNBT(NBTTagCompound compound) { + if (stack != null) { + NBTTagCompound tagCompound = new NBTTagCompound(); + stack.writeToNBT(tagCompound); + compound.setTag("stack", tagCompound); + } + } - @Override - public boolean equals(Object object) { - if (object instanceof StatementParameterItemStack) { - StatementParameterItemStack param = (StatementParameterItemStack) object; + @Override + public void readFromNBT(NBTTagCompound compound) { + stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("stack")); + } - return ItemStack.areItemStacksEqual(stack, param.stack) - && ItemStack.areItemStackTagsEqual(stack, param.stack); - } else { - return false; - } - } + @Override + public boolean equals(Object object) { + if (object instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) object; - @Override - public String getDescription() { - if (stack != null) { - return stack.getDisplayName(); - } else { - return ""; - } - } + return ItemStack.areItemStacksEqual(stack, param.stack) && ItemStack.areItemStackTagsEqual(stack, param.stack); + } else { + return false; + } + } - @Override - public String getUniqueTag() { - return "buildcraft:stack"; - } + @Override + public String getDescription() { + if (stack != null) { + return stack.getDisplayName(); + } else { + return ""; + } + } - @Override - public void registerIcons(IIconRegister iconRegister) { - - } + @Override + public String getUniqueTag() { + return "buildcraft:stack"; + } - @Override - public IStatementParameter rotateLeft() { - return this; - } + // @Override + // public void registerIcons(TextureAtlasSpriteRegister iconRegister) { + // + // } + + @Override + public IStatementParameter rotateLeft() { + return this; + } } diff --git a/src/api/java/buildcraft/api/statements/StatementSlot.java b/src/api/java/buildcraft/api/statements/StatementSlot.java old mode 100644 new mode 100755 index 6d8c1c2ce..11d5441fe --- a/src/api/java/buildcraft/api/statements/StatementSlot.java +++ b/src/api/java/buildcraft/api/statements/StatementSlot.java @@ -1,36 +1,32 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ + * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents + * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.statements; public class StatementSlot { - public IStatement statement; - public IStatementParameter[] parameters; + public IStatement statement; + public IStatementParameter[] parameters; - @Override - public boolean equals(Object o) { - if (o == null || !(o instanceof StatementSlot)) { - return false; - } - StatementSlot s = (StatementSlot) o; - if (s.statement != statement || parameters.length != s.parameters.length) { - return false; - } - for (int i = 0; i < parameters.length; i++) { - IStatementParameter p1 = parameters[i]; - IStatementParameter p2 = s.parameters[i]; - if (p1 == null && p2 != null) { - return false; - } - if (!(p1.equals(p2))) { - return false; - } - } - return true; - } + @Override + public boolean equals(Object o) { + if (o == null || !(o instanceof StatementSlot)) { + return false; + } + StatementSlot s = (StatementSlot) o; + if (s.statement != statement || parameters.length != s.parameters.length) { + return false; + } + for (int i = 0; i < parameters.length; i++) { + IStatementParameter p1 = parameters[i]; + IStatementParameter p2 = s.parameters[i]; + if (p1 == null && p2 != null) { + return false; + } + if (!(p1.equals(p2))) { + return false; + } + } + return true; + } } diff --git a/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java b/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java index 0856041cb..5b34bfd94 100644 --- a/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java +++ b/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java @@ -1,19 +1,17 @@ package buildcraft.api.statements.containers; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IRedstoneStatementContainer { - /** - * Get the redstone input from a given side. - * @param side The side - use "UNKNOWN" for maximum input. - * @return The redstone input, from 0 to 15. - */ - int getRedstoneInput(ForgeDirection side); + /** Get the redstone input from a given side. + * + * @param side The side - use "UNKNOWN" for maximum input. + * @return The redstone input, from 0 to 15. */ + int getRedstoneInput(EnumFacing side); - /** - * Set the redstone input for a given side. - * @param side The side - use "UNKNOWN" for all sides. - * @return Whether the set was successful. - */ - boolean setRedstoneOutput(ForgeDirection side, int value); + /** Set the redstone input for a given side. + * + * @param side The side - use "UNKNOWN" for all sides. + * @return Whether the set was successful. */ + boolean setRedstoneOutput(EnumFacing side, int value); } diff --git a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java index 6262bf2f8..b65ace45a 100644 --- a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java +++ b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java @@ -1,12 +1,10 @@ package buildcraft.api.statements.containers; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import buildcraft.api.statements.IStatementContainer; -/** - * Created by asie on 3/14/15. - */ +/** Created by asie on 3/14/15. */ public interface ISidedStatementContainer extends IStatementContainer { - ForgeDirection getSide(); + EnumFacing getSide(); } diff --git a/src/api/java/buildcraft/api/statements/package-info.java b/src/api/java/buildcraft/api/statements/package-info.java index ed7613ea2..7dd2c74e6 100644 --- a/src/api/java/buildcraft/api/statements/package-info.java +++ b/src/api/java/buildcraft/api/statements/package-info.java @@ -1,12 +1,8 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements") package buildcraft.api.statements; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java b/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java new file mode 100644 index 000000000..c4cc1efdf --- /dev/null +++ b/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java @@ -0,0 +1,12 @@ +package buildcraft.api.transport; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +public interface ICustomPipeConnection { + /** @return How long the connecting pipe should extend for. Values less than -4/16 indicate that the pipe will not + * connect at all, and will render as it it was not connected. */ + public float getExtension(World world, BlockPos pos, EnumFacing face, IBlockState state); +} diff --git a/src/api/java/buildcraft/api/transport/IInjectable.java b/src/api/java/buildcraft/api/transport/IInjectable.java index 6a05a688a..0de9e2005 100644 --- a/src/api/java/buildcraft/api/transport/IInjectable.java +++ b/src/api/java/buildcraft/api/transport/IInjectable.java @@ -1,23 +1,18 @@ package buildcraft.api.transport; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.EnumColor; +import net.minecraft.util.EnumFacing; public interface IInjectable { - boolean canInjectItems(ForgeDirection from); + boolean canInjectItems(EnumFacing from); - /** - * Offers an ItemStack for 3addition to the pipe. Will be rejected if the - * pipe doesn't accept items from that side. - * - * @param stack ItemStack offered for addition. Do not manipulate this! - * @param doAdd If false no actual addition should take place. Implementors - * should simulate. - * @param from Orientation the ItemStack is offered from. - * @param color The color of the item to be added to the pipe, or null for no color. - * @return Amount of items used from the passed stack. - */ - int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); + /** Offers an ItemStack for 3addition to the pipe. Will be rejected if the pipe doesn't accept items from that side. + * + * @param stack ItemStack offered for addition. Do not manipulate this! + * @param doAdd If false no actual addition should take place. Implementors should simulate. + * @param from Orientation the ItemStack is offered from. + * @param color The color of the item to be added to the pipe, or null for no color. + * @return Amount of items used from the passed stack. */ + int injectItem(ItemStack stack, boolean doAdd, EnumFacing from, EnumDyeColor color); } diff --git a/src/api/java/buildcraft/api/transport/IItemPipe.java b/src/api/java/buildcraft/api/transport/IItemPipe.java index f5f766775..c943a81a6 100644 --- a/src/api/java/buildcraft/api/transport/IItemPipe.java +++ b/src/api/java/buildcraft/api/transport/IItemPipe.java @@ -1,16 +1,11 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ + * BuildCraft is distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL. Please check the contents + * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.transport; -/** - * To be implemented by the real item pipe in Transport mod, but leaves knowledge for classes that do not have direct dependency on transport. - */ +/** To be implemented by the real item pipe in Transport mod, but leaves knowledge for classes that do not have direct + * dependency on transport. */ public interface IItemPipe { } diff --git a/src/api/java/buildcraft/api/transport/IPipe.java b/src/api/java/buildcraft/api/transport/IPipe.java index 94b021d02..96a7a764c 100755 --- a/src/api/java/buildcraft/api/transport/IPipe.java +++ b/src/api/java/buildcraft/api/transport/IPipe.java @@ -1,25 +1,21 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import buildcraft.api.gates.IGate; public interface IPipe { - IPipeTile getTile(); + IPipeTile getTile(); - IGate getGate(ForgeDirection side); - - boolean hasGate(ForgeDirection side); - - boolean isWired(PipeWire wire); - - boolean isWireActive(PipeWire wire); + IGate getGate(EnumFacing side); + + boolean hasGate(EnumFacing side); + + boolean isWired(PipeWire wire); + + boolean isWireActive(PipeWire wire); } diff --git a/src/api/java/buildcraft/api/transport/IPipeConnection.java b/src/api/java/buildcraft/api/transport/IPipeConnection.java index 4899f24bd..0b25ec818 100644 --- a/src/api/java/buildcraft/api/transport/IPipeConnection.java +++ b/src/api/java/buildcraft/api/transport/IPipeConnection.java @@ -1,29 +1,24 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IPipeConnection { - enum ConnectOverride { + enum ConnectOverride { - CONNECT, DISCONNECT, DEFAULT - } + CONNECT, + DISCONNECT, + DEFAULT + } - /** - * Allows you to override pipe connection logic. - * - * @param type - * @param with - * @return CONNECT to force a connection, DISCONNECT to force no connection, - * and DEFAULT to let the pipe decide. - */ - ConnectOverride overridePipeConnection(IPipeTile.PipeType type, ForgeDirection with); + /** Allows you to override pipe connection logic. + * + * @param type + * @param with + * @return CONNECT to force a connection, DISCONNECT to force no connection, and DEFAULT to let the pipe decide. */ + ConnectOverride overridePipeConnection(IPipeTile.PipeType type, EnumFacing with); } diff --git a/src/api/java/buildcraft/api/transport/IPipeTile.java b/src/api/java/buildcraft/api/transport/IPipeTile.java index 1bdd04f09..5ed528422 100644 --- a/src/api/java/buildcraft/api/transport/IPipeTile.java +++ b/src/api/java/buildcraft/api/transport/IPipeTile.java @@ -1,62 +1,51 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.core.EnumColor; import buildcraft.api.transport.pluggable.PipePluggable; public interface IPipeTile extends IInjectable { - enum PipeType { - ITEM, FLUID, POWER, STRUCTURE - } + enum PipeType { + ITEM, + FLUID, + POWER, + STRUCTURE + } - PipeType getPipeType(); + PipeType getPipeType(); - World getWorld(); + World getWorldBC(); - int x(); + /** True if the pipe is connected to the block/pipe in the specific direction + * + * @param with + * @return true if connect */ + boolean isPipeConnected(EnumFacing with); - int y(); + Block getNeighborBlock(EnumFacing dir); - int z(); + TileEntity getNeighborTile(EnumFacing dir); - /** - * True if the pipe is connected to the block/pipe in the specific direction - * - * @param with - * @return true if connect - */ - boolean isPipeConnected(ForgeDirection with); + IPipe getNeighborPipe(EnumFacing dir); - Block getNeighborBlock(ForgeDirection dir); - TileEntity getNeighborTile(ForgeDirection dir); - IPipe getNeighborPipe(ForgeDirection dir); - - IPipe getPipe(); - int getPipeColor(); + IPipe getPipe(); - PipePluggable getPipePluggable(ForgeDirection direction); // Now in IPluggableProvider - boolean hasPipePluggable(ForgeDirection direction); // Now in IPluggableProvider - boolean hasBlockingPluggable(ForgeDirection direction); + int getPipeColor(); - void scheduleNeighborChange(); - void scheduleRenderUpdate(); + PipePluggable getPipePluggable(EnumFacing direction); // Now in IPluggableProvider - // For compatibility with BC 6.2.x and below - int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); + boolean hasPipePluggable(EnumFacing direction); // Now in IPluggableProvider - @Deprecated // Now in IInjectable - int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); + boolean hasBlockingPluggable(EnumFacing direction); + + void scheduleNeighborChange(); + + void scheduleRenderUpdate(); } diff --git a/src/api/java/buildcraft/api/transport/IStripesActivator.java b/src/api/java/buildcraft/api/transport/IStripesActivator.java index 47308ae0a..540346d7b 100644 --- a/src/api/java/buildcraft/api/transport/IStripesActivator.java +++ b/src/api/java/buildcraft/api/transport/IStripesActivator.java @@ -1,17 +1,14 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; public interface IStripesActivator { - void sendItem(ItemStack itemStack, ForgeDirection direction); - void dropItem(ItemStack itemStack, ForgeDirection direction); + void sendItem(ItemStack itemStack, EnumFacing direction); + + void dropItem(ItemStack itemStack, EnumFacing direction); } diff --git a/src/api/java/buildcraft/api/transport/IStripesHandler.java b/src/api/java/buildcraft/api/transport/IStripesHandler.java index a9cc011f6..71f420552 100644 --- a/src/api/java/buildcraft/api/transport/IStripesHandler.java +++ b/src/api/java/buildcraft/api/transport/IStripesHandler.java @@ -1,28 +1,24 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public interface IStripesHandler { - enum StripesHandlerType { - ITEM_USE, - BLOCK_BREAK - } - - StripesHandlerType getType(); - - boolean shouldHandle(ItemStack stack); - - boolean handle(World world, int x, int y, int z, ForgeDirection direction, - ItemStack stack, EntityPlayer player, IStripesActivator activator); + enum StripesHandlerType { + ITEM_USE, + BLOCK_BREAK + } + + StripesHandlerType getType(); + + boolean shouldHandle(ItemStack stack); + + boolean handle(World world, BlockPos pos, EnumFacing direction, ItemStack stack, EntityPlayer player, IStripesActivator activator); } diff --git a/src/api/java/buildcraft/api/transport/IStripesPipe.java b/src/api/java/buildcraft/api/transport/IStripesPipe.java index 30a8452d5..569c53954 100644 --- a/src/api/java/buildcraft/api/transport/IStripesPipe.java +++ b/src/api/java/buildcraft/api/transport/IStripesPipe.java @@ -1,12 +1,9 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; -public interface IStripesPipe extends IPipe, IStripesActivator { -} +import cofh.api.energy.IEnergyHandler; + +public interface IStripesPipe extends IPipe, IStripesActivator, IEnergyHandler {} diff --git a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java new file mode 100644 index 000000000..e79da2646 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java @@ -0,0 +1,48 @@ +package buildcraft.api.transport; + +import java.util.Map; + +import com.google.common.collect.Maps; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +/** Use this class to register blocks with custom block sizes so that pipes can connect to them properly. Note that you + * do not need to register a custom pipe connection if your block implements ICustomPipeConnection. The registered + * version does not override your own implementation. */ +public final class PipeConnectionAPI { + private static final Map connections = Maps.newHashMap(); + private static final ICustomPipeConnection NOTHING = new ICustomPipeConnection() { + @Override + public float getExtension(World world, BlockPos pos, EnumFacing face, IBlockState state) { + return 0; + } + }; + + /** Register a block with a custom connection. Useful if you don't own the block class or are adding it for some-one + * + * @param block The block instance + * @param connection The connection instance */ + public static void registerConnection(Block block, ICustomPipeConnection connection) { + connections.put(block, connection); + } + + public static void registerConnectionAsNothing(Block block) { + connections.put(block, NOTHING); + } + + /** Gets the current custom connection that the block uses. Will be null if nothing has been set. */ + public static ICustomPipeConnection getCustomConnection(Block block) { + if (block instanceof ICustomPipeConnection) { + return (ICustomPipeConnection) block; + } + ICustomPipeConnection connection = connections.get(block); + if (connection != null) { + return connection; + } + return null; + } +} diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java index 896f08210..0fd0f8aad 100755 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ b/src/api/java/buildcraft/api/transport/PipeManager.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import java.util.ArrayList; @@ -15,64 +11,61 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import buildcraft.api.transport.pluggable.PipePluggable; public abstract class PipeManager { - public static List stripesHandlers = new ArrayList(); - public static ArrayList> pipePluggables = new ArrayList>(); - private static Map> pipePluggableNames = - new HashMap>(); - private static Map, String> pipePluggableByNames = - new HashMap, String>(); - private static Map stripesHandlerPriorities = - new HashMap(); + public static List stripesHandlers = new ArrayList(); + public static ArrayList> pipePluggables = new ArrayList>(); + private static Map> pipePluggableNames = new HashMap>(); + private static Map, String> pipePluggableByNames = new HashMap, String>(); + private static Map stripesHandlerPriorities = new HashMap(); - @Deprecated - public static boolean canExtractItems(Object extractor, World world, int i, int j, int k) { - return true; - } + @Deprecated + public static boolean canExtractItems(Object extractor, World world, BlockPos pos) { + return true; + } - @Deprecated - public static boolean canExtractFluids(Object extractor, World world, int i, int j, int k) { - return true; - } + @Deprecated + public static boolean canExtractFluids(Object extractor, World world, BlockPos pos) { + return true; + } - @Deprecated - public static void registerStripesHandler(IStripesHandler handler) { - registerStripesHandler(handler, 0); - } + @Deprecated + public static void registerStripesHandler(IStripesHandler handler) { + registerStripesHandler(handler, 0); + } - /** - * Register a Stripes Pipe handler. - * @param handler The handler. - * @param priority The priority - 0 is normal, higher numbers have higher priority. - */ - public static void registerStripesHandler(IStripesHandler handler, int priority) { - stripesHandlers.add(handler); - stripesHandlerPriorities.put(handler, priority); + /** Register a Stripes Pipe handler. + * + * @param handler The handler. + * @param priority The priority - 0 is normal, higher numbers have higher priority. */ + public static void registerStripesHandler(IStripesHandler handler, int priority) { + stripesHandlers.add(handler); + stripesHandlerPriorities.put(handler, priority); - Collections.sort(stripesHandlers, new Comparator() { - @Override - public int compare(IStripesHandler o1, IStripesHandler o2) { - return stripesHandlerPriorities.get(o2) - stripesHandlerPriorities.get(o1); - } - }); - } + Collections.sort(stripesHandlers, new Comparator() { + @Override + public int compare(IStripesHandler o1, IStripesHandler o2) { + return stripesHandlerPriorities.get(o2) - stripesHandlerPriorities.get(o1); + } + }); + } - public static void registerPipePluggable(Class pluggable, String name) { - pipePluggables.add(pluggable); - pipePluggableNames.put(name, pluggable); - pipePluggableByNames.put(pluggable, name); - } + public static void registerPipePluggable(Class pluggable, String name) { + pipePluggables.add(pluggable); + pipePluggableNames.put(name, pluggable); + pipePluggableByNames.put(pluggable, name); + } - public static Class getPluggableByName(String pluggableName) { - return pipePluggableNames.get(pluggableName); - } + public static Class getPluggableByName(String pluggableName) { + return pipePluggableNames.get(pluggableName); + } - public static String getPluggableName(Class aClass) { - return pipePluggableByNames.get(aClass); - } + public static String getPluggableName(Class aClass) { + return pipePluggableByNames.get(aClass); + } } diff --git a/src/api/java/buildcraft/api/transport/PipeWire.java b/src/api/java/buildcraft/api/transport/PipeWire.java index eb8665e15..5864db9c3 100644 --- a/src/api/java/buildcraft/api/transport/PipeWire.java +++ b/src/api/java/buildcraft/api/transport/PipeWire.java @@ -1,11 +1,7 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import java.util.Locale; @@ -15,60 +11,63 @@ import net.minecraft.item.ItemStack; public enum PipeWire { - RED, BLUE, GREEN, YELLOW; - public static Item item; - public static final PipeWire[] VALUES = values(); + RED, + BLUE, + GREEN, + YELLOW; + public static Item item; + public static final PipeWire[] VALUES = values(); - public PipeWire reverse() { - switch (this) { - case RED: - return YELLOW; - case BLUE: - return GREEN; - case GREEN: - return BLUE; - default: - return RED; - } - } + public PipeWire reverse() { + switch (this) { + case RED: + return YELLOW; + case BLUE: + return GREEN; + case GREEN: + return BLUE; + default: + return RED; + } + } - public String getTag() { - return name().toLowerCase(Locale.ENGLISH) + "PipeWire"; - } + public String getTag() { + return name().toLowerCase(Locale.ENGLISH) + "PipeWire"; + } - public String getColor() { - String name = this.toString().toLowerCase(Locale.ENGLISH); - char first = Character.toUpperCase(name.charAt(0)); - return first + name.substring(1); - } + public String getColor() { + String name = this.toString().toLowerCase(Locale.ENGLISH); + char first = Character.toUpperCase(name.charAt(0)); + return first + name.substring(1); + } - public ItemStack getStack() { - return getStack(1); - } + public ItemStack getStack() { + return getStack(1); + } - public ItemStack getStack(int qty) { - if (item == null) { - return null; - } else { - return new ItemStack(item, qty, ordinal()); - } - } + public ItemStack getStack(int qty) { + if (item == null) { + return null; + } else { + return new ItemStack(item, qty, ordinal()); + } + } - public boolean isPipeWire(ItemStack stack) { - if (stack == null) { - return false; - } else if (stack.getItem() != item) { - return false; - } else { - return stack.getItemDamage() == ordinal(); - } - } + public boolean isPipeWire(ItemStack stack) { + if (stack == null) { + return false; + } else if (stack.getItem() != item) { + return false; + } else { + return stack.getItemDamage() == ordinal(); + } + } - public static PipeWire fromOrdinal(int ordinal) { - if (ordinal < 0 || ordinal >= VALUES.length) { - return RED; - } else { - return VALUES[ordinal]; - } - } + public static PipeWire fromOrdinal(int ordinal) { + if (ordinal < 0 || ordinal >= VALUES.length) { + return RED; + } else { + return VALUES[ordinal]; + } + } } diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java index b670143c6..7ab0064d3 100644 --- a/src/api/java/buildcraft/api/transport/package-info.java +++ b/src/api/java/buildcraft/api/transport/package-info.java @@ -1,12 +1,8 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ @API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") package buildcraft.api.transport; -import cpw.mods.fml.common.API; +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java b/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java new file mode 100644 index 000000000..4bede4d03 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java @@ -0,0 +1,7 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.util.EnumFacing; + +public interface IConnectionMatrix { + boolean isConnected(EnumFacing face); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java index 6289714ac..a3ad9f329 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java @@ -1,13 +1,11 @@ package buildcraft.api.transport.pluggable; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; public interface IFacadePluggable { - Block getCurrentBlock(); + IBlockState getCurrentState(); - int getCurrentMetadata(); + boolean isTransparent(); - boolean isTransparent(); - - boolean isHollow(); + boolean isHollow(); } diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java index 614c65ff9..2601a356d 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java @@ -1,9 +1,9 @@ package buildcraft.api.transport.pluggable; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import buildcraft.api.transport.IPipe; public interface IPipePluggableDynamicRenderer { - void renderPluggable(IPipe pipe, ForgeDirection side, PipePluggable pipePluggable, double x, double y, double z); + void renderDynamicPluggable(IPipe pipe, EnumFacing side, PipePluggable pipePluggable, double x, double y, double z); } diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java index 0ac208905..b9295e5f0 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java @@ -1,10 +1,10 @@ package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import buildcraft.api.transport.IPipe; public interface IPipePluggableItem { - PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack); + PipePluggable createPipePluggable(IPipe pipe, EnumFacing side, ItemStack stack); } diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java deleted file mode 100644 index 2cd4bc276..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java +++ /dev/null @@ -1,13 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraftforge.common.util.ForgeDirection; - -import buildcraft.api.core.render.ITextureStates; -import buildcraft.api.transport.IPipe; - -public interface IPipePluggableRenderer { - void renderPluggable(RenderBlocks renderblocks, IPipe pipe, ForgeDirection side, - PipePluggable pipePluggable, ITextureStates blockStateMachine, - int renderPass, int x, int y, int z); -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java new file mode 100644 index 000000000..7b657dfd0 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java @@ -0,0 +1,9 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.util.EnumFacing; + +public interface IPipePluggableState { + IConnectionMatrix getPluggableConnections(); + + PipePluggable getPluggable(EnumFacing face); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java new file mode 100644 index 000000000..e4bfc3f60 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java @@ -0,0 +1,19 @@ +package buildcraft.api.transport.pluggable; + +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.util.EnumFacing; + +import buildcraft.api.transport.IPipe; + +public interface IPipePluggableStaticRenderer { + List bakeCutout(IPipeRenderState render, IPipePluggableState pluggableState, IPipe pipe, PipePluggable pluggable, EnumFacing face); + + /** Use this if you need to render in the translucent pass. */ + public interface Translucent extends IPipePluggableStaticRenderer { + /** For performance return a list that is as small as possible */ + List bakeTranslucent(IPipeRenderState render, IPipePluggableState pluggableState, IPipe pipe, PipePluggable pluggable, + EnumFacing face); + } +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java b/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java new file mode 100644 index 000000000..d923061fd --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java @@ -0,0 +1,5 @@ +package buildcraft.api.transport.pluggable; + +public interface IPipeRenderState { + IConnectionMatrix getPipeConnectionMatrix(); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java old mode 100644 new mode 100755 index 223ce7096..02a0bd3ab --- a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java +++ b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java @@ -1,67 +1,60 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com +/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ + * The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which + * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import buildcraft.api.core.INBTStoreable; import buildcraft.api.core.ISerializable; import buildcraft.api.transport.IPipeTile; -/** - * An IPipePluggable MUST have an empty constructor for client-side - * rendering! - */ +/** An IPipePluggable MUST have an empty constructor for client-side rendering! */ public abstract class PipePluggable implements INBTStoreable, ISerializable { - public abstract ItemStack[] getDropItems(IPipeTile pipe); + public abstract ItemStack[] getDropItems(IPipeTile pipe); - public void update(IPipeTile pipe, ForgeDirection direction) { + public void update(IPipeTile pipe, EnumFacing direction) { - } + } - public void onAttachedPipe(IPipeTile pipe, ForgeDirection direction) { - validate(pipe, direction); - } + public void onAttachedPipe(IPipeTile pipe, EnumFacing direction) { + validate(pipe, direction); + } - public void onDetachedPipe(IPipeTile pipe, ForgeDirection direction) { - invalidate(); - } + public void onDetachedPipe(IPipeTile pipe, EnumFacing direction) { + invalidate(); + } - public abstract boolean isBlocking(IPipeTile pipe, ForgeDirection direction); + public abstract boolean isBlocking(IPipeTile pipe, EnumFacing direction); - public void invalidate() { + public void invalidate() { - } + } - public void validate(IPipeTile pipe, ForgeDirection direction) { + public void validate(IPipeTile pipe, EnumFacing direction) { - } + } - public boolean isSolidOnSide(IPipeTile pipe, ForgeDirection direction) { - return false; - } + public boolean isSolidOnSide(IPipeTile pipe, EnumFacing direction) { + return false; + } - public abstract AxisAlignedBB getBoundingBox(ForgeDirection side); + public abstract AxisAlignedBB getBoundingBox(EnumFacing side); - @SideOnly(Side.CLIENT) - public abstract IPipePluggableRenderer getRenderer(); + @SideOnly(Side.CLIENT) + public abstract IPipePluggableStaticRenderer getRenderer(); - @SideOnly(Side.CLIENT) - public IPipePluggableDynamicRenderer getDynamicRenderer() { - return null; - } + @SideOnly(Side.CLIENT) + public IPipePluggableDynamicRenderer getDynamicRenderer() { + return null; + } - public boolean requiresRenderUpdate(PipePluggable old) { - return true; - } + public boolean requiresRenderUpdate(PipePluggable old) { + return true; + } } diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java new file mode 100644 index 000000000..a25517c4a --- /dev/null +++ b/src/api/java/cofh/api/energy/IEnergyHandler.java @@ -0,0 +1,59 @@ +package cofh.api.energy; + +import net.minecraft.util.EnumFacing; + + +/** + * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects. + *

+ * A reference implementation is provided {@link TileEnergyHandler}. + * + * @author King Lemming + * + */ +public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver { + + // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things) + + /** + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * + * @param from + * Orientation the energy is received from. + * @param maxReceive + * Maximum amount of energy to receive. + * @param simulate + * If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received. + */ + @Override + int receiveEnergy(EnumFacing facing, int maxReceive, boolean simulate); + + /** + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * + * @param from + * Orientation the energy is extracted from. + * @param maxExtract + * Maximum amount of energy to extract. + * @param simulate + * If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted. + */ + @Override + int extractEnergy(EnumFacing facing, int maxExtract, boolean simulate); + + + /** + * Returns the amount of energy currently stored. + */ + @Override + int getEnergyStored(EnumFacing facing); + + /** + * Returns the maximum amount of energy that can be stored. + */ + @Override + int getMaxEnergyStored(EnumFacing facing); + +} diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java new file mode 100644 index 000000000..12ec6f4aa --- /dev/null +++ b/src/api/java/cofh/api/energy/IEnergyProvider.java @@ -0,0 +1,39 @@ +package cofh.api.energy; + +import net.minecraft.util.EnumFacing; + + +/** + * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects. + *

+ * A reference implementation is provided {@link TileEnergyHandler}. + * + * @author King Lemming + * + */ +public interface IEnergyProvider extends IEnergyConnection { + + /** + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * + * @param from + * Orientation the energy is extracted from. + * @param maxExtract + * Maximum amount of energy to extract. + * @param simulate + * If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted. + */ + int extractEnergy(EnumFacing facing, int maxExtract, boolean simulate); + + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(EnumFacing facing); + + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(EnumFacing facing); + +} diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 49b424d97..2f2bc4d34 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -44,7 +44,7 @@ public class StatementAPIPlugin implements ITriggerProvider { } @Override - public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { + public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { ArrayList list = new ArrayList(); if (tile instanceof IManaBlock) { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index cbf799357..ab08cb575 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -1,14 +1,14 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.util.IIcon; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; public abstract class StatementBase implements IStatement { - protected IIcon icon; + protected TextureAtlasSprite icon; @Override - public IIcon getIcon() { + public TextureAtlasSprite getGuiSprite() { return icon; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 1b6dda0bd..68737cac2 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,6 +1,8 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.client.renderer.texture.IIconRegister; +import com.google.common.base.Predicates; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -20,7 +22,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern } @Override - public void registerIcons(IIconRegister iconRegister) { + public void registerIcons(TextureMap iconRegister) { icon = IconHelper.forName(iconRegister, "triggers/manaDetector"); } @@ -32,9 +34,9 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern @Override public boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters) { World world = source.getTile().getWorld(); - int x = source.getTile().xCoord, y = source.getTile().yCoord, z = source.getTile().zCoord; + int x = source.getTile().getPos().getX(), y = source.getTile().getPos().getY(), z = source.getTile().getPos().getZ(); - boolean output = world.getEntitiesWithinAABB(IManaBurst.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size() != 0; + boolean output = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(output) for(int i = 0; i < 4; i++) Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index f655d56af..4361e9773 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,9 +1,9 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.text.WordUtils; @@ -35,7 +35,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal } @Override - public void registerIcons(IIconRegister iconRegister) { + public void registerIcons(TextureMap iconRegister) { icon = IconHelper.forName(iconRegister, "triggers/mana" + WordUtils.capitalizeFully(state.name())); } @@ -45,7 +45,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal } @Override - public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if(target instanceof IManaBlock) { if(state == State.EMPTY) return ((IManaBlock) target).getCurrentMana() == 0; else if(state == State.CONTAINS) return ((IManaBlock) target).getCurrentMana() > 0; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index cbad8aa76..9ec63f7bf 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,9 +1,9 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -19,7 +19,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } @Override - public void registerIcons(IIconRegister iconRegister) { + public void registerIcons(TextureMap iconRegister) { icon = IconHelper.forName(iconRegister, "triggers/runeAltarCanCraft"); } @@ -29,7 +29,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } @Override - public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters) { if(target instanceof TileRuneAltar) return ((TileRuneAltar) target).hasValidRecipe(); return false; } From a23f3173685f9b794ee16b6ee0a68b1e4c4459f6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 19:49:51 -0600 Subject: [PATCH 067/935] Finish BC integratoin --- .../vazkii/botania/common/core/proxy/CommonProxy.java | 5 +++-- .../integration/buildcraft/StatementAPIPlugin.java | 10 ++++++++++ .../integration/buildcraft/TriggerManaDetector.java | 8 +++++--- .../integration/buildcraft/TriggerManaLevel.java | 8 +++++--- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +++++--- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 150212ed3..342eefd36 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -64,6 +64,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.ModEntities; //import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8 //import vazkii.botania.common.block.ModBanners; +import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -132,8 +133,8 @@ public class CommonProxy { FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); -// if(Botania.bcTriggersLoaded) todo 1.8 -// new StatementAPIPlugin(); + if(Botania.bcTriggersLoaded) + new StatementAPIPlugin(); } public void postInit(FMLPostInitializationEvent event) { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 2f2bc4d34..838d8beb9 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -5,6 +5,7 @@ import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -34,6 +35,15 @@ public class StatementAPIPlugin implements ITriggerProvider { StatementManager.registerStatement(triggerRuneAltarCanCraft); StatementManager.registerTriggerProvider(this); + + // Register them all to the event bus so they can stitch textures + MinecraftForge.EVENT_BUS.register(triggerManaEmpty); + MinecraftForge.EVENT_BUS.register(triggerManaContains); + MinecraftForge.EVENT_BUS.register(triggerManaSpace); + MinecraftForge.EVENT_BUS.register(triggerManaFull); + MinecraftForge.EVENT_BUS.register(triggerManaDetector); + + MinecraftForge.EVENT_BUS.register(triggerRuneAltarCanCraft); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 68737cac2..a1801d6aa 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -6,6 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; @@ -21,9 +23,9 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern return "botania:manaDetector"; } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/manaDetector"); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/manaDetector"); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 4361e9773..a7f9bbb3d 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; @@ -34,9 +36,9 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal return "botania:mana" + state.name(); } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/mana" + WordUtils.capitalizeFully(state.name())); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name())); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index 9ec63f7bf..c519ae9e3 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -4,6 +4,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -18,9 +20,9 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE return "botania:runeAltarCanCraft"; } - @Override - public void registerIcons(TextureMap iconRegister) { - icon = IconHelper.forName(iconRegister, "triggers/runeAltarCanCraft"); + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre evt) { + icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft"); } @Override From 320f6405e49c1650148ecff5ad836242b18cfb21 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 22:40:52 -0600 Subject: [PATCH 068/935] Rendering tweaks, and fix up all stairs/slabs/walls --- MC18_notes.txt | 1 + .../botania/api/state/BotaniaStateProps.java | 8 +-- .../client/core/handler/LightningHandler.java | 36 ++++++------- .../client/core/helper/RenderHelper.java | 9 ++-- .../render/entity/RenderBabylonWeapon.java | 3 +- .../render/entity/RenderCorporeaSpark.java | 8 +++ .../botania/common/block/ModFluffBlocks.java | 50 +++++++++++++------ .../decor/quartz/BlockSpecialQuartzSlab.java | 15 ------ .../block/decor/slabs/Block18StoneSlab.java | 6 ++- .../decor/slabs/BlockBiomeStoneSlab.java | 5 +- .../block/decor/slabs/BlockDirtPathSlab.java | 2 +- .../block/decor/slabs/BlockEndStoneSlab.java | 2 +- .../decor/slabs/BlockEnderBrickSlab.java | 4 +- .../block/decor/slabs/BlockLivingSlab.java | 13 +++-- .../block/decor/slabs/BlockModSlab.java | 43 ++++++++++++++-- .../block/decor/slabs/BlockPavementSlab.java | 6 ++- .../block/decor/slabs/BlockReedSlab.java | 2 +- .../block/decor/slabs/BlockThatchSlab.java | 2 +- .../slabs/bricks/BlockCustomBrickSlab.java | 8 +-- .../slabs/bricks/BlockSnowBrickSlab.java | 3 +- .../slabs/bricks/BlockSoulBrickSlab.java | 3 +- .../decor/slabs/bricks/BlockTileSlab.java | 3 +- .../slabs/living/BlockDreamwoodPlankSlab.java | 4 +- .../slabs/living/BlockDreamwoodSlab.java | 2 +- .../living/BlockLivingrockBrickSlab.java | 4 +- .../slabs/living/BlockLivingrockSlab.java | 2 +- .../living/BlockLivingwoodPlankSlab.java | 4 +- .../slabs/living/BlockLivingwoodSlab.java | 2 +- .../slabs/living/BlockShimmerrockSlab.java | 2 +- .../living/BlockShimmerwoodPlankSlab.java | 2 +- .../prismarine/BlockDarkPrismarineSlab.java | 3 +- .../prismarine/BlockPrismarineBrickSlab.java | 3 +- .../slabs/prismarine/BlockPrismarineSlab.java | 8 +-- .../decor/stairs/BlockBiomeStoneStairs.java | 6 +-- .../decor/stairs/BlockPavementStairs.java | 2 +- .../common/item/relic/ItemKingKey.java | 19 +++---- 36 files changed, 184 insertions(+), 111 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index ff4470aae..7e5434e25 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -18,6 +18,7 @@ since BlockPos'es are immutable and thus can be reused everywhere. Unless someone figures out a way to use the old one * The alt textures will probably be a resource pack now to decrease complexity... sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack +* Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them -- Todo -- * JSON models for everything (tedious/med-hard) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 9dfe46ad8..b28839111 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -19,12 +19,6 @@ public class BotaniaStateProps { /** Common properties to all blocks to use **/ - // Cardinal connection booleans (think fence or wall) - public static final PropertyBool CONNECT_NORTH = PropertyBool.create("north"); - public static final PropertyBool CONNECT_SOUTH = PropertyBool.create("south"); - public static final PropertyBool CONNECT_WEST = PropertyBool.create("west"); - public static final PropertyBool CONNECT_EAST = PropertyBool.create("east"); - // The 16 Minecraft colors public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); @@ -51,7 +45,7 @@ public class BotaniaStateProps { /** Properties for individual blocks **/ - // Block18Stone, + // Block18Stone public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 4f987d8df..7b7a6301d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -25,6 +25,7 @@ import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; @@ -87,15 +88,13 @@ public class LightningHandler { ParticleRenderDispatcher.lightningCount = 0; render.bindTexture(outsideResource); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(0xF000F0); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false); tessellator.draw(); render.bindTexture(insideResource); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(0xF000F0); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true); tessellator.draw(); @@ -146,29 +145,32 @@ public class LightningHandler { Vector3 endvec = rendersegment.endpoint.point; int color = inner ? bolt.colorInner : bolt.colorOuter; - tessellator.getWorldRenderer().putColor(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha())); + int r = (color & 0xFF0000) >> 16; + int g = (color & 0xFF00) >> 8; + int b = (color & 0xFF); + int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); if(rendersegment.next == null) { Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex(); } if(rendersegment.prev == null) { Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); } } } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 9bf18914e..31fd4f4a6 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -173,9 +173,12 @@ public final class RenderHelper { tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; - tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (255F * (1F - f2))); - tessellator.getWorldRenderer().pos(0, 0, 0).color().endVertex(); - tessellator.getWorldRenderer().setColorRGBA_F(0F, 0F, 0F, 0); + int r = (color & 0xFF0000) >> 16; + int g = (color & 0xFF00) >> 8; + int b = (color & 0xFF); + tessellator.getWorldRenderer().putColorMultiplier(r, g, b, (int) (255F * (1F - f2))); + tessellator.getWorldRenderer().pos(0, 0, 0).endVertex(); + tessellator.getWorldRenderer().putColorMultiplier(0F, 0F, 0F, 0); tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).endVertex(); tessellator.getWorldRenderer().pos(0, f3, 1F * f4).endVertex(); 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 d522568bc..870dbdf6a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; @@ -60,7 +61,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.scale(s, s, s); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.rotate(45F, 0F, 0F, 1F); - IIcon icon = ItemKingKey.weaponIcons[weapon.getVariety()]; + TextureAtlasSprite icon = ItemKingKey.weaponIcons[weapon.getVariety()]; GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); 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 d0016cb47..b27ed254b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -15,9 +15,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -31,6 +33,10 @@ import vazkii.botania.common.item.ItemCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { + public RenderCorporeaSpark(RenderManager p_i46185_1_) { + super(p_i46185_1_); + } + @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; @@ -39,6 +45,8 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { int network = Math.min(15, entity.getNetwork()); + int hex = EnumDyeColor.byMetadata(network).getMapColor().colorValue; + GlStateManager.color(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2], a); } diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 3c2ea950d..dd0296024 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -11,6 +11,11 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; +import net.minecraft.item.EnumDyeColor; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.block.decor.Block18Stone; import vazkii.botania.common.block.decor.BlockPavement; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; @@ -77,6 +82,8 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Collection; + public final class ModFluffBlocks { public static Block livingwoodStairs; @@ -297,27 +304,40 @@ public final class ModFluffBlocks { dirtPathSlab = new BlockDirtPathSlab(false); dirtPathSlabFull = new BlockDirtPathSlab(true); - for(int i = 0; i < 24; i++) { - int meta = i % 16; - Block block = i < 16 ? biomeStoneA : biomeStoneB; - biomeStoneStairs[i] = new BlockBiomeStoneStairs(block, meta); - biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i); - biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i); + int count = 0; + for (BiomeStoneVariant variant : BiomeStoneVariant.values()) { + biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant)); + biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); + biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); + count++; + } + + for (BiomeBrickVariant variant : BiomeBrickVariant.values()) { + biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant)); + biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); + biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); + count++; } biomeStoneWall = new BlockBiomeStoneWall(); - for(int i = 0; i < 8; i++) { - int meta = i > 3 ? i + 4 : i; - stoneStairs[i] = new Block18StoneStairs(meta); - stoneSlabs[i] = new Block18StoneSlab(false, meta, i); - stoneFullSlabs[i] = new Block18StoneSlab(true, meta, i); + count = 0; + for(FutureStoneVariant variant : FutureStoneVariant.values()) { + if (!(variant.ordinal() >= 0 && variant.ordinal() <= 3 || variant.ordinal() >= 8 && variant.ordinal() <= 11)) { + // Filter - only get the base blocks, and the brick versions + continue; + } + + stoneStairs[count] = new Block18StoneStairs(variant); + stoneSlabs[count] = new Block18StoneSlab(false, variant, count); + stoneFullSlabs[count] = new Block18StoneSlab(true, variant, count); + count++; } stoneWall = new Block18StoneWall(); - for(int i = 0; i < pavementStairs.length; i++) { - pavementStairs[i] = new BlockPavementStairs(i); - pavementSlabs[i] = new BlockPavementSlab(false, i, i); - pavementFullSlabs[i] = new BlockPavementSlab(true, i, i); + count = 0; + for (EnumDyeColor color : ((Collection) BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues())) { + pavementStairs[count] = new BlockPavementStairs(color); + count++; } endStoneSlab = new BlockEndStoneSlab(false); 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 f5c839e15..65d6f8afb 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 @@ -96,21 +96,6 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { return new ItemStack(getSingleBlock()); } - @Override - public boolean isDouble() { - return getFullBlock() == this; - } - - @Override - public IProperty getVariantProperty() { - return null; - } - - @Override - public Object getVariant(ItemStack stack) { - return null; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java index 6526bc1a9..b69c8011d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; @@ -23,8 +25,8 @@ public class Block18StoneSlab extends BlockLivingSlab { int index; - public Block18StoneSlab(boolean full, int meta, int index) { - super(full, ModFluffBlocks.stone, meta); + public Block18StoneSlab(boolean full, FutureStoneVariant variant, int index) { + super(full, ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); this.index = index; setHardness(1.5F); setResistance(10F); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index 57ec2b292..0b5c5ce15 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -24,8 +25,8 @@ public class BlockBiomeStoneSlab extends BlockLivingSlab { int index; - public BlockBiomeStoneSlab(boolean full, Block source, int meta, int index) { - super(full, source, meta); + public BlockBiomeStoneSlab(boolean full, IBlockState state, int index) { + super(full, state); this.index = index; setHardness(1.5F); setResistance(10F); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java index 766b536cc..61ca05ff2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockDirtPathSlab extends BlockLivingSlab { public BlockDirtPathSlab(boolean full) { - super(full, ModBlocks.dirtPath, 0); + super(full, ModBlocks.dirtPath.getDefaultState()); setHardness(0.6F); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index 8e04c7053..cc92807ef 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockEndStoneSlab extends BlockLivingSlab { public BlockEndStoneSlab(boolean full) { - super(full, ModBlocks.endStoneBrick, 0); + super(full, ModBlocks.endStoneBrick.getDefaultState()); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index 0161321fd..bfe85c8b9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; @@ -23,7 +25,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockEnderBrickSlab extends BlockLivingSlab { public BlockEnderBrickSlab(boolean full) { - super(full, ModBlocks.endStoneBrick, 2); + super(full, ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 47c5e51e3..5a0a65de1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -1,19 +1,18 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockLivingSlab extends BlockModSlab { - Block source; - int meta; + IBlockState sourceState; - public BlockLivingSlab(boolean full, Block source, int meta) { - super(full, source.getMaterial(), source.getUnlocalizedName().replaceAll("tile.", "") + meta + "Slab" + (full ? "Full" : "")); - setStepSound(source.stepSound); - this.source = source; - this.meta = meta; + public BlockLivingSlab(boolean full, IBlockState state) { + super(full, state.getBlock().getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); + setStepSound(state.getBlock().stepSound); + this.sourceState = state; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 709067452..a6ee70be3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -5,11 +5,14 @@ import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -24,15 +27,34 @@ import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; + protected final boolean doubleSlab; + public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); // todo 1.8.8 statemapper ignore this prop for everything public BlockModSlab(boolean full, Material mat, String name) { super(mat); this.name = name; setUnlocalizedName(name); + doubleSlab = full; if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } + setDefaultState(blockState.getBaseState().withProperty(DUMMY, DummyEnum.SINGLETON)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, getVariantProperty()); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; } public abstract BlockSlab getFullBlock(); @@ -69,17 +91,32 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public abstract boolean isDouble(); + public final boolean isDouble() { + return doubleSlab; + } @Override - public abstract IProperty getVariantProperty(); + public final IProperty getVariantProperty() { + return DUMMY; + } @Override - public abstract Object getVariant(ItemStack stack); + public final Object getVariant(ItemStack stack) { + return DummyEnum.SINGLETON; + } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } + public enum DummyEnum implements IStringSerializable { + SINGLETON { + @Override + public String getName() { + return name(); + } + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index e22c09114..71f07e238 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -12,10 +12,12 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.lexicon.LexiconData; @@ -23,8 +25,8 @@ public class BlockPavementSlab extends BlockLivingSlab { int index; - public BlockPavementSlab(boolean full, int meta, int index) { - super(full, ModFluffBlocks.pavement, meta); + public BlockPavementSlab(boolean full, EnumDyeColor color, int index) { + super(full, ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color)); this.index = index; setHardness(2F); setResistance(10F); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index bf821d25c..37fea06e9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockReedSlab extends BlockLivingSlab { public BlockReedSlab(boolean full) { - super(full, ModBlocks.reedBlock, 0); + super(full, ModBlocks.reedBlock.getDefaultState()); setHardness(1.0F); setStepSound(soundTypeWood); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index 0ff31277e..84fb8b514 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockThatchSlab extends BlockLivingSlab { public BlockThatchSlab(boolean full) { - super(full, ModBlocks.thatch, 0); + super(full, ModBlocks.thatch.getDefaultState()); setHardness(1.0F); setStepSound(soundTypeGrass); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index ac246e112..b652ba4bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -24,11 +26,11 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockCustomBrickSlab extends BlockLivingSlab { public BlockCustomBrickSlab(boolean full) { - this(full, 0); + this(full, CustomBrickVariant.HELLISH_BRICK); } - public BlockCustomBrickSlab(boolean full, int meta) { - super(full, ModBlocks.customBrick, meta); + public BlockCustomBrickSlab(boolean full, CustomBrickVariant variant) { + super(full, ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant)); setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java index f827d8207..e30f16395 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSnowBrickSlab.java @@ -11,12 +11,13 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.common.block.ModFluffBlocks; public class BlockSnowBrickSlab extends BlockCustomBrickSlab { public BlockSnowBrickSlab(boolean full) { - super(full, 2); + super(full, CustomBrickVariant.FROSTY_BRICK); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java index d3afdf03e..f67a5599c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockSoulBrickSlab.java @@ -11,12 +11,13 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.common.block.ModFluffBlocks; public class BlockSoulBrickSlab extends BlockCustomBrickSlab { public BlockSoulBrickSlab(boolean full) { - super(full, 1); + super(full, CustomBrickVariant.SOUL_BRICK); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java index 41ac1e919..52819c430 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockTileSlab.java @@ -11,12 +11,13 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.common.block.ModFluffBlocks; public class BlockTileSlab extends BlockCustomBrickSlab { public BlockTileSlab(boolean full) { - super(full, 3); + super(full, CustomBrickVariant.ROOF_TILE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java index 3474f89ed..13f337a65 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodPlankSlab.java @@ -1,6 +1,8 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -8,7 +10,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockDreamwoodPlankSlab extends BlockLivingSlab { public BlockDreamwoodPlankSlab(boolean full) { - super(full, ModBlocks.dreamwood, 1); + super(full, ModBlocks.dreamwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS)); setHardness(2.0F); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java index 9531c1eb9..f797778c2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockDreamwoodSlab.java @@ -8,7 +8,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockDreamwoodSlab extends BlockLivingSlab { public BlockDreamwoodSlab(boolean full) { - super(full, ModBlocks.dreamwood, 0); + super(full, ModBlocks.dreamwood.getDefaultState()); setHardness(2.0F); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java index f4cc7b46b..f6dcffa08 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java @@ -1,6 +1,8 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -8,7 +10,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingrockBrickSlab extends BlockLivingSlab { public BlockLivingrockBrickSlab(boolean full) { - super(full, ModBlocks.livingrock, 1); + super(full, ModBlocks.livingrock.getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK)); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java index 4866a6712..0bc39aa7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java @@ -8,7 +8,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingrockSlab extends BlockLivingSlab { public BlockLivingrockSlab(boolean full) { - super(full, ModBlocks.livingrock, 0); + super(full, ModBlocks.livingrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java index 4ecc38374..1d1756033 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodPlankSlab.java @@ -1,6 +1,8 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -8,7 +10,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingwoodPlankSlab extends BlockLivingSlab { public BlockLivingwoodPlankSlab(boolean full) { - super(full, ModBlocks.livingwood, 1); + super(full, ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS)); setHardness(2.0F); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java index 53ea9e745..abd4a2046 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingwoodSlab.java @@ -8,7 +8,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockLivingwoodSlab extends BlockLivingSlab { public BlockLivingwoodSlab(boolean full) { - super(full, ModBlocks.livingwood, 0); + super(full, ModBlocks.livingwood.getDefaultState()); setHardness(2.0F); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java index 8302a1647..c3530b308 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java @@ -18,7 +18,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockShimmerrockSlab extends BlockLivingSlab { public BlockShimmerrockSlab(boolean full) { - super(full, ModBlocks.shimmerrock, 0); + super(full, ModBlocks.shimmerrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java index 1f4b2fb09..97172da14 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java @@ -18,7 +18,7 @@ import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; public class BlockShimmerwoodPlankSlab extends BlockLivingSlab { public BlockShimmerwoodPlankSlab(boolean full) { - super(full, ModBlocks.shimmerwoodPlanks, 0); + super(full, ModBlocks.shimmerwoodPlanks.getDefaultState()); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeWood); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java index 4d11d827e..a5e50fd2d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java @@ -1,12 +1,13 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.common.block.ModFluffBlocks; public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { public BlockDarkPrismarineSlab(boolean full) { - super(full, 2); + super(full, PrismarineVariant.DARK_PRIMSARINE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java index 9b7f5fa7a..23fe690a0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java @@ -1,12 +1,13 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.common.block.ModFluffBlocks; public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { public BlockPrismarineBrickSlab(boolean full) { - super(full, 1); + super(full, PrismarineVariant.PRISMARINE_BRICKS); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index 8e4de8496..b6a4bae8f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -14,11 +16,11 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockPrismarineSlab extends BlockLivingSlab { public BlockPrismarineSlab(boolean full) { - this(full, 0); + this(full, PrismarineVariant.PRISMARINE); } - public BlockPrismarineSlab(boolean full, int meta) { - super(full, ModBlocks.prismarine, meta); + public BlockPrismarineSlab(boolean full, PrismarineVariant variant) { + super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index c00be8d6d..a79a0cb1c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.stairs; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -20,8 +20,8 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockBiomeStoneStairs extends BlockLivingStairs { - public BlockBiomeStoneStairs(Block source, int meta) { - super(source, meta); + public BlockBiomeStoneStairs(IBlockState state) { + super(state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index ce83c5bac..f72d49be0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementStairs extends BlockLivingStairs { public BlockPavementStairs(EnumDyeColor color) { - super(ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.COLOR, color)); + super(ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index d51ab85b5..89fed889a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -12,11 +12,14 @@ package vazkii.botania.common.item.relic; import java.util.Random; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -31,20 +34,18 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_CHARGING = "charging"; private static final int WEAPON_TYPES = 12; - // public static IIcon[] weaponIcons; + public static TextureAtlasSprite[] weaponIcons; public ItemKingKey() { super(LibItemNames.KING_KEY); } -// @Override -// public void registerIcons(IIconRegister par1IconRegister) { -// super.registerIcons(par1IconRegister); -// -// weaponIcons = new IIcon[WEAPON_TYPES]; -// for(int i = 0; i < WEAPON_TYPES; i++) -// weaponIcons[i] = IconHelper.forName(par1IconRegister, "gateWeapon" + i); -// } todo 1.8 + @SubscribeEvent + public void registerIcons(TextureStitchEvent.Pre event) { + weaponIcons = new TextureAtlasSprite[WEAPON_TYPES]; + for(int i = 0; i < WEAPON_TYPES; i++) + weaponIcons[i] = IconHelper.forName(event.map, "gateWeapon" + i); + } @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { From 0db00970abe4eb97b46881f9f0f8d2f82632a075 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 22:44:11 -0600 Subject: [PATCH 069/935] Made futurestone registration a bit less hardcody --- .../java/vazkii/botania/common/block/ModFluffBlocks.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index dd0296024..ed48b86cd 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import vazkii.botania.api.state.BotaniaStateProps; @@ -83,6 +84,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; import java.util.Collection; +import java.util.Set; public final class ModFluffBlocks { @@ -320,9 +322,13 @@ public final class ModFluffBlocks { } biomeStoneWall = new BlockBiomeStoneWall(); + Set allowed = ImmutableSet.of(FutureStoneVariant.ANDESITE, FutureStoneVariant.ANDESITE_BRICK, + FutureStoneVariant.BASALT, FutureStoneVariant.BASALT_BRICK, FutureStoneVariant.DIORITE, FutureStoneVariant.DIORITE_BRICK, + FutureStoneVariant.GRANITE, FutureStoneVariant.GRANITE_BRICK); + count = 0; for(FutureStoneVariant variant : FutureStoneVariant.values()) { - if (!(variant.ordinal() >= 0 && variant.ordinal() <= 3 || variant.ordinal() >= 8 && variant.ordinal() <= 11)) { + if (!allowed.contains(variant)) { // Filter - only get the base blocks, and the brick versions continue; } From b21d6f5ee64f06f811759ff2e240ed609a723a90 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 11:13:23 -0600 Subject: [PATCH 070/935] All non rendering components compile --- MC18_notes.txt | 1 + .../java/vazkii/botania/api/BotaniaAPI.java | 6 +++++- .../botania/client/core/proxy/ClientProxy.java | 12 ++++++------ .../vazkii/botania/client/fx/FXSparkle.java | 16 +++++++--------- .../java/vazkii/botania/client/fx/FXWisp.java | 15 +++++++-------- .../render/entity/RenderBabylonWeapon.java | 7 +++---- .../render/entity/RenderCorporeaSpark.java | 8 ++++---- .../render/entity/RenderDoppleganger.java | 9 ++++----- .../client/render/entity/RenderManaStorm.java | 9 ++++----- .../client/render/entity/RenderPixie.java | 10 ++++------ .../render/entity/RenderPoolMinecart.java | 7 +++---- .../render/entity/RenderThornChakram.java | 9 ++++----- .../botania/common/block/BlockPistonRelay.java | 2 +- .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 2 +- .../botania/common/brew/potion/PotionClear.java | 2 +- .../common/brew/potion/PotionEmptiness.java | 2 +- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../botania/common/brew/potion/PotionMod.java | 4 ++-- .../common/brew/potion/PotionSoulCross.java | 2 +- .../botania/common/core/proxy/CommonProxy.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 3 ++- .../botania/common/item/ItemOpenBucket.java | 3 ++- .../armor/manaweave/ItemManaweaveArmor.java | 17 +++++++---------- .../equipment/bauble/ItemBaubleCosmetic.java | 2 -- .../item/equipment/bauble/ItemDivaCharm.java | 5 +++-- .../item/equipment/bauble/ItemFlightTiara.java | 12 ++++++------ .../item/equipment/bauble/ItemMagnetRing.java | 9 ++------- 29 files changed, 85 insertions(+), 97 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 7e5434e25..fd1c58afa 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -8,6 +8,7 @@ This can be changed to match vanilla signature, but either would break backward Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts * Multiblock system reworked to use states and blockposes +* Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. -- Other -- * Most things left untouched to make patches from upstream easier diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f4820f02c..a8af5a43e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -332,7 +332,11 @@ public final class BotaniaAPI { String key = getMagnetKey(stack); return magnetBlacklist.contains(key); } - + + public static boolean isBlockBlacklistedFromMagnet(IBlockState state) { + return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state), 0); + } + public static boolean isBlockBlacklistedFromMagnet(Block block, int meta) { return isBlockBlacklistedFromMagnet(block, meta, 0); } 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 1d437bec3..270285700 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -61,7 +61,7 @@ import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; -import vazkii.botania.client.integration.nei.NEIGuiHooks; +// todo 1.8.8 restore when nei updates import vazkii.botania.client.integration.nei.NEIGuiHooks; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; import vazkii.botania.client.render.entity.RenderDoppleganger; @@ -307,19 +307,19 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); - ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); + // todo 1.8.8 awaiting forge issue ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark()); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager())); @@ -331,7 +331,7 @@ public class ClientProxy extends CommonProxy { @Override @Optional.Method(modid = "NotEnoughItems") public void registerNEIStuff() { - NEIGuiHooks.init(); + // todo 1.8.8 restore when nei updates NEIGuiHooks.init(); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index af2a3251a..aa2448722 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -18,6 +18,7 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; @@ -71,13 +72,13 @@ public class FXSparkle extends EntityFX { GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -105,13 +106,10 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.getWorldRenderer().setBrightness(0x0000f0); - - tessellator.getWorldRenderer().setColorRGBA_F(particleRed * var16, particleGreen * var16, particleBlue * var16, 1); - tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12, var9, var11); - tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12, var9, var10); - tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12, var8, var10); - tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12, var8, var11); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 6de0de3bc..c30082fd2 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -18,6 +18,7 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -84,7 +85,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -92,7 +93,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GlStateManager.disableDepth(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); @@ -120,12 +121,10 @@ public class FXWisp extends EntityFX { float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); - tessellator.getWorldRenderer().setBrightness(240); - tessellator.getWorldRenderer().setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F); - tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1); - tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1); - tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, 1, 0); - tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10, 0, 0); + tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); } @Override 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 870dbdf6a..6bccb9ae3 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -32,7 +32,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.item.relic.ItemKingKey; -public class RenderBabylonWeapon extends Render { +public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); @@ -41,8 +41,7 @@ public class RenderBabylonWeapon extends Render { } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityBabylonWeapon weapon = (EntityBabylonWeapon) par1Entity; + public void doRender(EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { GlStateManager.pushMatrix(); GlStateManager.translate((float)par2, (float)par4, (float)par6); GlStateManager.rotate(weapon.getRotation(), 0F, 1F, 0F); @@ -109,7 +108,7 @@ public class RenderBabylonWeapon extends Render { } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityBabylonWeapon p_110775_1_) { return null; } 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 b27ed254b..d1755ba5f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -23,8 +23,6 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -46,8 +44,10 @@ public class RenderCorporeaSpark extends RenderSparkBase { public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { int network = Math.min(15, entity.getNetwork()); int hex = EnumDyeColor.byMetadata(network).getMapColor().colorValue; - - GlStateManager.color(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2], a); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); + GlStateManager.color(r, g, b, a); } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index ab2fe9088..c0d1dc218 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -24,7 +24,7 @@ import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; -public class RenderDoppleganger extends RenderBiped { +public class RenderDoppleganger extends RenderBiped { public static float DEFAULT_GRAIN_INTENSITY = 0.05F; public static float DEFAULT_DISFIGURATION = 0.025F; @@ -65,8 +65,7 @@ public class RenderDoppleganger extends RenderBiped { } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityDoppleganger dopple = (EntityDoppleganger) par1Entity; + public void doRender(EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { BossBarHandler.setCurrentBoss(dopple); int invulTime = dopple.getInvulTime(); @@ -79,12 +78,12 @@ public class RenderDoppleganger extends RenderBiped { } ShaderHelper.useShader(ShaderHelper.doppleganger, callback); - super.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(dopple, par2, par4, par6, par8, par9); ShaderHelper.releaseShader(); } @Override - protected ResourceLocation getEntityTexture(Entity par1Entity) { + protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { return Minecraft.getMinecraft().thePlayer.getLocationSkin(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index d7aaaf7c6..460c0ae3f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -22,27 +22,26 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; -public class RenderManaStorm extends Render { +public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { super(renderManager); } @Override - public void doRender(Entity e, double x, double y, double z, float something, float pticks) { + public void doRender(EntityManaStorm storm, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); - EntityManaStorm storm = (EntityManaStorm) e; float maxScale = 1.95F; float scale = 0.05F + ((float) storm.burstsFired / EntityManaStorm.TOTAL_BURSTS - (storm.deathTime == 0 ? 0 : storm.deathTime + pticks) / EntityManaStorm.DEATH_TIME) * maxScale; - RenderHelper.renderStar(0x00FF00, scale, scale, scale, e.getUniqueID().getMostSignificantBits()); + RenderHelper.renderStar(0x00FF00, scale, scale, scale, storm.getUniqueID().getMostSignificantBits()); GlStateManager.disableBlend(); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityManaStorm p_110775_1_) { return null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 8f19ec82b..14c6de07e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -27,7 +27,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; -public class RenderPixie extends RenderLiving { +public class RenderPixie extends RenderLiving { ShaderCallback callback = new ShaderCallback() { @@ -50,17 +50,15 @@ public class RenderPixie extends RenderLiving { } @Override - protected ResourceLocation getEntityTexture(Entity entity) { + protected ResourceLocation getEntityTexture(EntityPixie entity) { return new ResourceLocation(LibResources.MODEL_PIXIE); } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityPixie pixie = (EntityPixie) par1Entity; - + public void doRender(EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { if(pixie.getType() == 1) ShaderHelper.useShader(ShaderHelper.doppleganger, callback); - super.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(pixie, par2, par4, par6, par8, par9); if(pixie.getType() == 1) ShaderHelper.releaseShader(); } 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 ec9720f05..7b9d2df98 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -18,17 +18,16 @@ import net.minecraft.entity.item.EntityMinecart; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.entity.EntityPoolMinecart; -public class RenderPoolMinecart extends RenderMinecart { +public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager p_i46155_1_) { super(p_i46155_1_); } @Override - protected void func_180560_a(EntityMinecart p_147910_1_, float p_147910_2_, IBlockState state) { - EntityPoolMinecart poolCart = (EntityPoolMinecart) p_147910_1_; + protected void func_180560_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { RenderTilePool.forceManaNumber = poolCart.getMana(); - super.func_180560_a(p_147910_1_, p_147910_2_, state); + super.func_180560_a(poolCart, p_147910_2_, state); } 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 a60c6512a..0033c0719 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -28,15 +28,14 @@ import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball -public class RenderThornChakram extends Render { +public class RenderThornChakram extends Render { public RenderThornChakram(RenderManager renderManager) { super(renderManager); } @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - EntityThornChakram c = (EntityThornChakram) p_76986_1_; + public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); IIcon iicon = ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); @@ -45,7 +44,7 @@ public class RenderThornChakram extends Render { GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); GlStateManager.enableRescaleNormal(); GlStateManager.scale(0.5F, 0.5F, 0.5F); - bindEntityTexture(p_76986_1_); + bindEntityTexture(c); Tessellator tessellator = Tessellator.getInstance(); func_77026_a(tessellator, iicon, fire ? 240 : -1); @@ -55,7 +54,7 @@ public class RenderThornChakram extends Render { } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) { return TextureMap.locationBlocksTexture; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index d0cd563d0..0041f4b22 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -65,7 +65,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl setStepSound(soundTypeMetal); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @Override 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 ebd052470..f13369a65 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -22,7 +22,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionAllure extends PotionMod { public PotionAllure() { - super(ConfigHandler.potionIDAllure, LibPotionNames.ALLURE, false, 0x0034E4, 5); + super(LibPotionNames.ALLURE, false, 0x0034E4, 5); MinecraftForge.EVENT_BUS.register(this); } 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 41fde3240..950576e3a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -28,7 +28,7 @@ public class PotionBloodthirst extends PotionMod { private static final int RANGE = 64; public PotionBloodthirst() { - super(ConfigHandler.potionIDBloodthirst, LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); + super(LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); MinecraftForge.EVENT_BUS.register(this); } 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 8fcdf9914..35c4bbfa6 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -20,7 +20,7 @@ import vazkii.botania.common.lib.LibPotionNames; public class PotionClear extends PotionMod { public PotionClear() { - super(ConfigHandler.potionIDClear, LibPotionNames.CLEAR, false, 0xFFFFFF, 0); + super(LibPotionNames.CLEAR, false, 0xFFFFFF, 0); } @Override 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 b5d2f0747..310370dc5 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -27,7 +27,7 @@ public class PotionEmptiness extends PotionMod { private static final int RANGE = 128; public PotionEmptiness() { - super(ConfigHandler.potionIDEmptiness, LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); + super(LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); MinecraftForge.EVENT_BUS.register(this); } 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 68c92ba93..594b2ba84 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -20,7 +20,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { - super(ConfigHandler.potionIDFeatherfeet, LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); + super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 24d3ac6b6..c97056859 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -22,8 +22,8 @@ public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); - public PotionMod(int id, String name, boolean badEffect, int color, int iconIndex) { - super(id, new ResourceLocation("botania", name), badEffect, color); + public PotionMod(String name, boolean badEffect, int color, int iconIndex) { + super(new ResourceLocation("botania", name), badEffect, color); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } 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 339b07aa2..de36f5a22 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionSoulCross extends PotionMod { public PotionSoulCross() { - super(ConfigHandler.potionIDSoulCross, LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); + super(LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 342eefd36..f53c737e7 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -129,7 +129,7 @@ public class CommonProxy { if(Botania.gardenOfGlassLoaded) MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); - FMLCommonHandler.instance().bus().register(new CommonTickHandler()); + MinecraftForge.EVENT_BUS.register(new CommonTickHandler()); FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 98ffd619c..968a7f043 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -397,7 +397,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); - Tessellator.renderingWorldRenderer = false; + // todo 1.8.8 Tessellator.renderingWorldRenderer = false; GlStateManager.pushMatrix(); GlStateManager.enableBlend(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index bbfeef799..f168c0f5c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.helper.IconHelper; @@ -57,7 +58,7 @@ public class ItemGrassSeeds extends ItemMod { super(); setUnlocalizedName(LibItemNames.GRASS_SEEDS); setHasSubtypes(true); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index b723a806f..ff0189ec5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; @@ -50,7 +51,7 @@ public class ItemOpenBucket extends ItemMod { par2World.setBlockToAir(pos); for(int x = 0; x < 5; x++) - par2World.spawnParticle("explode", pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); + par2World.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); return par1ItemStack; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index be9d9f1f1..2a19b2930 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,12 +13,11 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; @@ -34,8 +33,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { - - IIcon iconChristmas; public ItemManaweaveArmor(int type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); @@ -48,21 +45,21 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return models[slot]; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); - } + }*/ @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } - @Override - public IIcon getIconFromDamage(int dmg) { - return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); - } +// @Override +// public IIcon getIconFromDamage(int dmg) { +// return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); +// } todo 1.8.8 to smartmodel or getModel lookup @Override @SideOnly(Side.CLIENT) 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 e378d5378..ebf46af02 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 @@ -16,13 +16,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.oredict.RecipeSorter; 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 3bf997eea..bb9a10363 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 @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; @@ -61,9 +62,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, ((List) mobs))) { if(event.entityLiving instanceof EntityCreeper) ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); event.entityLiving.heal(event.entityLiving.getMaxHealth()); 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 def00a596..faad2732c 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 @@ -26,6 +26,7 @@ import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -89,7 +90,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public ItemFlightTiara() { super(LibItemNames.FLIGHT_TIARA); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); setHasSubtypes(true); } @@ -475,11 +475,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); - tes.getWorldRenderer().startDrawingQuads(); - tes.getWorldRenderer().addVertexWithUV(-0.75, 0, -0.75, 0, 0); - tes.getWorldRenderer().addVertexWithUV(-0.75, 0, 0.75, 0, 1); - tes.getWorldRenderer().addVertexWithUV(0.75, 0, 0.75, 1, 1); - tes.getWorldRenderer().addVertexWithUV(0.75, 0, -0.75, 1, 0); + tes.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tes.getWorldRenderer().pos(-0.75, 0, -0.75).tex(0, 0).endVertex(); + tes.getWorldRenderer().pos(-0.75, 0, 0.75).tex(0, 1).endVertex(); + tes.getWorldRenderer().pos(0.75, 0, 0.75).tex(1, 1).endVertex(); + tes.getWorldRenderer().pos(0.75, 0, -0.75).tex(1, 0).endVertex(); tes.draw(); ShaderHelper.releaseShader(); 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 50dc76d14..62a0c1e42 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 @@ -116,16 +116,11 @@ public class ItemMagnetRing extends ItemBauble { return false; BlockPos pos = new BlockPos(item); - Block block = item.worldObj.getBlockState(x, y, z); - int meta = item.worldObj.getBlockMetadata(x, y, z); - if(BotaniaAPI.isBlockBlacklistedFromMagnet(block, meta)) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos))) return false; - block = item.worldObj.getBlock(x, y - 1, z); - meta = item.worldObj.getBlockMetadata(x, y - 1, z); - - if(BotaniaAPI.isBlockBlacklistedFromMagnet(block, meta)) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos.down()))) return false; return true; From 56228446b885b2c2330acb49fb059bb0f75059e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 12:49:18 -0600 Subject: [PATCH 071/935] Stub out all rendering. Compiles and runsgit add -A --- MC18_notes.txt | 3 +- .../api/lexicon/multiblock/Multiblock.java | 6 +- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/HUDHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 2 +- .../render/entity/RenderBabylonWeapon.java | 2 +- .../render/entity/RenderCorporeaSpark.java | 7 +- .../client/render/entity/RenderPixie.java | 6 +- .../client/render/entity/RenderSpark.java | 11 +- .../client/render/entity/RenderSparkBase.java | 5 +- .../render/entity/RenderThornChakram.java | 5 +- .../render/tile/RenderTileAlfPortal.java | 13 +-- .../client/render/tile/RenderTileAltar.java | 15 +-- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileEnchanter.java | 13 +-- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 15 +-- .../client/render/tile/RenderTilePool.java | 13 +-- .../client/render/tile/RenderTilePrism.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileStarfield.java | 100 +++++++++--------- .../render/tile/RenderTileTerraPlate.java | 13 +-- .../render/tile/RenderTileTinyPotato.java | 80 +++++++------- .../botania/common/block/BlockAvatar.java | 10 ++ .../common/block/BlockModDoubleFlower.java | 31 ++---- .../common/block/BlockModDoubleFlower1.java | 36 +++++++ .../common/block/BlockModDoubleFlower2.java | 37 +++++++ .../botania/common/block/BlockModFlower.java | 9 +- .../common/block/BlockSpecialFlower.java | 6 +- .../botania/common/block/BlockStorage.java | 19 ++++ .../botania/common/block/ModBlocks.java | 4 +- .../botania/common/block/ModFluffBlocks.java | 8 ++ .../common/block/decor/BlockShinyFlower.java | 19 ---- .../decor/biomestone/BlockBiomeStoneB.java | 2 +- .../block/decor/walls/Block18StoneWall.java | 6 +- .../decor/walls/BlockBiomeStoneWall.java | 6 +- .../block/decor/walls/BlockModWall.java | 13 ++- .../botania/common/block/mana/BlockPump.java | 16 +++ .../common/block/tile/TileEnchanter.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 2 + .../botania/common/item/ItemTwigWand.java | 2 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 + .../equipment/bauble/ItemBaubleCosmetic.java | 2 + .../equipment/bauble/ItemBloodPendant.java | 4 +- .../item/equipment/bauble/ItemDivaCharm.java | 2 + .../equipment/bauble/ItemFlightTiara.java | 4 +- .../equipment/bauble/ItemGoldenLaurel.java | 2 + .../item/equipment/bauble/ItemIcePendant.java | 12 +-- .../item/equipment/bauble/ItemItemFinder.java | 10 +- .../equipment/bauble/ItemLavaPendant.java | 10 +- .../item/equipment/bauble/ItemMonocle.java | 2 + .../bauble/ItemSuperLavaPendant.java | 10 +- .../item/material/ItemManaResource.java | 4 +- 57 files changed, 374 insertions(+), 247 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java create mode 100644 src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java diff --git a/MC18_notes.txt b/MC18_notes.txt index fd1c58afa..33bb81bd5 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -27,4 +27,5 @@ sorry :/ The systems needed to dynamically switch out the textures like that is * For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.) - Sub to texture stitch and bake our own model there to use? - This remains the largest portion of what is left - - Where is the method to render an arbitrary baked model? \ No newline at end of file + - Where is the method to render an arbitrary baked model? +* CRITICAL: All blockstates are done, but they appear to not be registered correctly (always have default variant)... is it the itemblock's fault?? \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 0f7669474..94ee3dd3a 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -29,9 +29,9 @@ public class Multiblock { public List components = new ArrayList(); public List materials = new ArrayList(); - public BlockPos minPos; - public BlockPos maxPos; - public BlockPos offPos; + public BlockPos minPos = BlockPos.ORIGIN; + public BlockPos maxPos = BlockPos.ORIGIN; + public BlockPos offPos = BlockPos.ORIGIN; public HashMap locationCache = new HashMap(); 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 e707f8455..fc1321474 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -126,7 +126,7 @@ public final class BaubleRenderHandler { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // for(int j = 0; j < 2; j++) { // IIcon icon = item.getIcon(stack, j); // float f = icon.getMinU(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 3439fe137..2f14b0c0c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -137,7 +137,7 @@ public final class BoundTileRenderer { renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor3ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue()); renderBlockOutline(axis); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c9172dd6a..2ce1d396d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -102,7 +102,7 @@ public final class HUDHandler { profiler.startSection("botania-hud"); MovingObjectPosition pos = mc.objectMouseOver; - if(pos != null) { + if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { Block block = mc.theWorld.getBlockState(pos.getBlockPos()).getBlock(); TileEntity tile = mc.theWorld.getTileEntity(pos.getBlockPos()); 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 270285700..422a17bc6 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -316,7 +316,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); + RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); 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 6bccb9ae3..edd749e57 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -69,7 +69,7 @@ public class RenderBabylonWeapon extends Render { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); GlStateManager.disableLighting(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); GlStateManager.disableCull(); 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 d1755ba5f..20323dfa6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -37,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return null;//entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } @Override @@ -52,11 +53,12 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return ItemCorporeaSpark.iconColorStar; + return null;//ItemCorporeaSpark.iconColorStar; } @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { +/* int time = entity.getItemDisplayTicks(); if(time == 0) return; @@ -108,6 +110,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.disableBlend(); GlStateManager.popMatrix(); +*/ } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 14c6de07e..216fe9ff9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -45,7 +45,7 @@ public class RenderPixie extends RenderLiving { public RenderPixie() { super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); - setRenderPassModel(new ModelPixie()); + //setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } @@ -88,8 +88,8 @@ public class RenderPixie extends RenderLiving { } } - @Override + /*@Override protected int shouldRenderPass(EntityLivingBase par1EntityLivingBase, int par2, float par3) { return setPixieBrightness((EntityPixie)par1EntityLivingBase, par2, par3); - } + }*/ } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 36149c941..7da7e3c52 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -10,17 +10,22 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.IIcon; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderSpark extends RenderSparkBase { + public RenderSpark(RenderManager renderManager) { + super(renderManager); + } + @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { - int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; + return null; + /*int upgrade = entity.getUpgrade() - 1; + return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null;*/ } } 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 6053e8cc9..8872392c2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -82,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return ItemSpark.worldIcon; + return null;//ItemSpark.worldIcon; } public void colorSpinningIcon(T entity, float a) { @@ -112,7 +111,7 @@ public class RenderSparkBase extends RenderEntity { float f6 = 0.25F; p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); - p_77026_1_.getWorldRenderer().setBrightness(240); + //p_77026_1_.getWorldRenderer().setBrightness(240); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); 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 0033c0719..918ff8232 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -37,7 +36,7 @@ public class RenderThornChakram extends Render { @Override public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); - IIcon iicon = ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); + TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); if(iicon != null) { GlStateManager.pushMatrix(); @@ -70,7 +69,7 @@ public class RenderThornChakram extends Render { GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); if(light != -1) - p_77026_1_.getWorldRenderer().setBrightness(light); + //p_77026_1_.getWorldRenderer().setBrightness(light); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); 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 7ecdec696..f1934498a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -70,12 +71,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 19e17fecf..6f707b3ad 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -121,7 +122,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // IIcon icon = stack.getItem().getIcon(stack, 0); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); @@ -171,13 +172,13 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); if(brightness != -1) - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + //tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } 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 0245fbc55..dee5f1fe7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -69,7 +69,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GlStateManager.translate(-1.2F, -3.5F, -0.65F); GlStateManager.rotate(20F, 0F, 0F, 1F); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // int renderPass = 0; // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); 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 7016e9bc2..155ff4d7f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -70,7 +70,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float s = 0.25F; GlStateManager.scale(s, s, s); GlStateManager.scale(2F, 2F, 2F); - mc.getRenderItem().renderItemModel(stack); // todo 1.8 +// mc.getRenderItem().renderItemModel(stack); // todo 1.8 // if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { // GlStateManager.scale(0.5F, 0.5F, 0.5F); // if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 1ebe0d32d..f9ff5bb5f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; @@ -111,12 +112,12 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 2718419f9..75b43e950 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -59,7 +59,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // IIcon icon = stack.getIconIndex(); // // Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 32df4e8d8..7e701257a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -67,7 +67,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.translate(0.1F, -1.46F, 0F); GlStateManager.scale(s, s, s); GlStateManager.rotate(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // int renderPass = 0; // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 4ada1c7fe..f6d388395 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -74,13 +75,13 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().startDrawingQuads(); - p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.getWorldRenderer().setBrightness(240); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); + //p_77026_1_.getWorldRenderer().setBrightness(240); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).endVertex(); p_77026_1_.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 7fcb7ff2e..30c32c351 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -154,12 +155,12 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } 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 3d8c13c94..5baca290e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.render.item.RenderLens; +//import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TilePrism; public class RenderTilePrism extends TileEntitySpecialRenderer { 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 1b24e6560..05ffa4d13 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -72,7 +72,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(2F, 2F, 2F); - mc.getRenderItem().renderItemModel(stack); +// mc.getRenderItem().renderItemModel(stack); // if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { // GlStateManager.scale(0.5F, 0.5F, 0.5F); // if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index f787800d1..338540d6e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -43,7 +43,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index a1bfe2528..580be7a9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; @@ -31,55 +32,55 @@ import org.lwjgl.opengl.GL11; // todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield public class RenderTileStarfield extends TileEntitySpecialRenderer { - private static final ResourceLocation field_147529_c = new ResourceLocation("textures/environment/end_sky.png"); - private static final ResourceLocation field_147526_d = new ResourceLocation("textures/entity/end_portal.png"); + private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); + private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png"); private static final Random field_147527_e = new Random(31100L); FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16); - @Override - public void renderTileEntityAt(TileEntity p_180544_1_, double p_180544_2_, double p_180544_4_, double p_180544_6_, float p_180544_8_, int p_180544_9_) { - float f1 = (float)this.rendererDispatcher.entityX; - float f2 = (float)this.rendererDispatcher.entityY; - float f3 = (float)this.rendererDispatcher.entityZ; + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage) + { + float f = (float)this.rendererDispatcher.entityX; + float f1 = (float)this.rendererDispatcher.entityY; + float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f4 = 0.75F; + float f3 = 0.75F; - for (int j = 0; j < 16; ++j) + for (int i = 0; i < 16; ++i) { GlStateManager.pushMatrix(); - float f5 = (float)(16 - j); - float f6 = 0.0625F; - float f7 = 1.0F / (f5 + 1.0F); + float f4 = (float)(16 - i); + float f5 = 0.0625F; + float f6 = 1.0F / (f4 + 1.0F); - if (j == 0) + if (i == 0) { - this.bindTexture(field_147529_c); - f7 = 0.1F; - f5 = 65.0F; - f6 = 0.125F; + this.bindTexture(END_SKY_TEXTURE); + f6 = 0.1F; + f4 = 65.0F; + f5 = 0.125F; GlStateManager.enableBlend(); GlStateManager.blendFunc(770, 771); } - if (j >= 1) + if (i >= 1) { - this.bindTexture(field_147526_d); + this.bindTexture(END_PORTAL_TEXTURE); } - if (j == 1) + if (i == 1) { GlStateManager.enableBlend(); GlStateManager.blendFunc(1, 1); - f6 = 0.5F; + f5 = 0.5F; } - float f8 = (float)(-(p_180544_4_ + (double)f4)); - float f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; - float f10 = f8 + f5 + (float)ActiveRenderInfo.getPosition().yCoord; - float f11 = f9 / f10; - f11 += (float)(p_180544_4_ + (double)f4); - GlStateManager.translate(f1, f11, f3); + float f7 = (float)(-(y + (double)f3)); + float f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; + float f9 = f7 + f4 + (float)ActiveRenderInfo.getPosition().yCoord; + float f10 = f8 / f9; + f10 = (float)(y + (double)f3) + f10; + GlStateManager.translate(f, f10, f2); GlStateManager.texGen(GlStateManager.TexGen.S, 9217); GlStateManager.texGen(GlStateManager.TexGen.T, 9217); GlStateManager.texGen(GlStateManager.TexGen.R, 9217); @@ -97,35 +98,33 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); - GlStateManager.scale(f6, f6, f6); + GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); - GlStateManager.rotate((float)(j * j * 4321 + j * 9) * 2.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); GlStateManager.translate(-0.5F, -0.5F, 0.0F); - GlStateManager.translate(-f1, -f3, -f2); - f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; - GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f5 / f9, (float)ActiveRenderInfo.getPosition().zCoord * f5 / f9, -f2); + GlStateManager.translate(-f, -f2, -f1); + f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; + GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f4 / f8, (float)ActiveRenderInfo.getPosition().zCoord * f4 / f8, -f1); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.startDrawingQuads(); - float f12 = field_147527_e.nextFloat() * 0.5F + 0.1F; - float f13 = field_147527_e.nextFloat() * 0.5F + 0.4F; - float f14 = field_147527_e.nextFloat() * 0.5F + 0.5F; + worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); + float f11 = (field_147527_e.nextFloat() * 0.5F + 0.1F) * f6; + float f12 = (field_147527_e.nextFloat() * 0.5F + 0.4F) * f6; + float f13 = (field_147527_e.nextFloat() * 0.5F + 0.5F) * f6; - if (j == 0) + if (i == 0) { - f14 = 1.0F; - f13 = 1.0F; - f12 = 1.0F; + f11 = f12 = f13 = 1.0F * f6; } - worldrenderer.setColorRGBA_F(f12 * f7, f13 * f7, f14 * f7, 1.0F); - worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_); - worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); - worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); - worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_); + worldrenderer.pos(x, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x + 1.0D, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x + 1.0D, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); tessellator.draw(); GlStateManager.popMatrix(); GlStateManager.matrixMode(5888); + this.bindTexture(END_SKY_TEXTURE); } GlStateManager.disableBlend(); @@ -136,10 +135,11 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.enableLighting(); } - private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) { - field_147528_b.clear(); - field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); - field_147528_b.flip(); - return field_147528_b; + private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) + { + this.field_147528_b.clear(); + this.field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); + this.field_147528_b.flip(); + return this.field_147528_b; } } 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 3efdb4d30..8e5c1ece4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -69,12 +70,12 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 31e9bc314..1d051bcdf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -19,8 +19,10 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; @@ -151,12 +153,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(23)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(23)); } else if(name.equals("kamina")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.1F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(26)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(26)); } else if(name.equals("haighyorkie")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -167,33 +169,33 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(7)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(7)); } else if(name.equals("direwolf20")) { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -2.2F, -0.5F); - renderIcon(ModItems.cosmetic.getIconFromDamage(0)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(0)); } else if(name.equals("doctor")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.15F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(25)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(25)); } else if(name.equals("snoo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); GlStateManager.rotate(20F, 0F, 0F, 1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(24)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(24)); } else if(name.equals("charlotte")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(12)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(12)); } else if(name.equals("greg") || name.equals("gregorioust")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.5F, -0.4F); - renderIcon(Items.book.getIconFromDamage(0)); + //renderIcon(Items.book.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.5F, 0.5F, 0F); @@ -205,48 +207,48 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(Items.bread.getIconFromDamage(0)); + //renderIcon(Items.bread.getIconFromDamage(0)); } else if(name.equals("martysgames") || name.equals("marty")) { GlStateManager.scale(0.7F, 0.7F, 0.7F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.75F, -2.4F, -0.7F); GlStateManager.rotate(10F, 0F, 0F, 1F); - renderIcon(ItemInfiniteFruit.dasBootIcon); + //renderIcon(ItemInfiniteFruit.dasBootIcon); } else if(name.equals("tromped")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cacophonium.getIconFromDamage(0)); + //renderIcon(ModItems.cacophonium.getIconFromDamage(0)); } else if(name.equals("kain vinosec")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -1.5F, -0.4F); - renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); + //renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); GlStateManager.translate(0F, 0F, 0.85F); - renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); + //renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); } else if(name.equals("mankrik")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.2F, -0.1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(31)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(31)); } else if(name.equals("kurumi")) { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.9F, -2.5F, -1.3F); - renderIcon(ModItems.cosmetic.getIconFromDamage(17)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(17)); } else if(name.equals("ichun")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(15)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(15)); } else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.1F, -0.325F); - renderIcon(Items.painting.getIconFromDamage(0)); + //renderIcon(Items.painting.getIconFromDamage(0)); } else if(name.equals("jibril")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(0F, 0.7F, 0F); @@ -269,13 +271,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1F, 0.45F); - renderIcon(ModItems.cosmetic.getIconFromDamage(8)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(8)); } else if(name.equals("etho") || name.equals("ethoslab")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(Items.cookie.getIconFromDamage(0)); + //renderIcon(Items.cookie.getIconFromDamage(0)); } else if(name.equals("sethbling")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); @@ -286,39 +288,39 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1F, -1.1F, -0.1F); - renderIcon(Items.stick.getIconFromDamage(0)); + //renderIcon(Items.stick.getIconFromDamage(0)); } else if(name.equals("kingdaddydmac")) { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -2.5F, 1.075F); - renderIcon(ModItems.manaRing.getIconFromDamage(0)); + //renderIcon(ModItems.manaRing.getIconFromDamage(0)); GlStateManager.translate(0F, 0F, -4F); - renderIcon(ModItems.manaRing.getIconFromDamage(0)); + //renderIcon(ModItems.manaRing.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(1.5F, -0.5F, 0.7F); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState()); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState(), 1.0F); } else if(name.equals("sjin")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.27F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(27)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(27)); } else if(name.equals("martyn") || name.equals("inthelittlewood")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.45F, -0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - renderIcon(Blocks.sapling.getIcon(0, 0)); + //renderIcon(Blocks.sapling.getIcon(0, 0)); }else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { - IIcon icon = ContributorFancinessHandler.flowerMap.get(name); + ItemStack icon = ContributorFancinessHandler.flowerMap.get(name); if(icon != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.5F, -0.5F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - renderIcon(icon); + //renderIcon(icon); ShaderHelper.releaseShader(); } } @@ -349,13 +351,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { OpenGlHelper.glBlendFunc(770, 771, 1, 0); Tessellator tessellator = Tessellator.getInstance(); GlStateManager.disableTexture2D(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); int i = mc.fontRendererObj.getStringWidth(potato.name) / 2; - tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); tessellator.draw(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); @@ -367,13 +368,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.enableBlend(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GlStateManager.disableTexture2D(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); i = mc.fontRendererObj.getStringWidth(s) / 2; - tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); tessellator.draw(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); @@ -395,6 +395,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 256df27fc..f7c8b86a8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -54,6 +54,16 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { return new BlockState(this, BotaniaStateProps.CARDINALS); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index ccd69a219..6148fe2b2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -50,14 +50,16 @@ import java.util.List; import java.util.Random; // Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x -public class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { +public abstract class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { public static final PropertyEnum HALF = BlockDoublePlant.HALF; private static final int COUNT = 8; final int offset; + final boolean second; public BlockModDoubleFlower(boolean second) { super(Material.vine); + this.second = second; this.setHardness(0.0F); this.setStepSound(soundTypeGrass); offset = second ? 8 : 0; @@ -66,37 +68,16 @@ public class BlockModDoubleFlower extends BlockBush implements IGrowable, IShear setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - - if (second) { - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); - } else { - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); - } } @Override - public BlockState createBlockState() { - return new BlockState(this, offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, HALF); - } + public abstract BlockState createBlockState(); @Override - public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); - meta -= offset; - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { - meta |= 8; - } - return meta; - } + public abstract int getMetaFromState(IBlockState state); @Override - public IBlockState getStateFromMeta(int meta) { - BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; - meta &= -9; - meta += offset; - EnumDyeColor color = EnumDyeColor.byMetadata(meta); - return getDefaultState().withProperty(HALF, half).withProperty(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color); - } + public abstract IBlockState getStateFromMeta(int meta); @Override public Block setUnlocalizedName(String par1Str) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java new file mode 100644 index 000000000..350af4c3f --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -0,0 +1,36 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; +import vazkii.botania.api.state.BotaniaStateProps; + +// White to Gray +public class BlockModDoubleFlower1 extends BlockModDoubleFlower { + public BlockModDoubleFlower1() { + super(false); + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta)); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java new file mode 100644 index 000000000..8604b2ddb --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -0,0 +1,37 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; +import vazkii.botania.api.state.BotaniaStateProps; + +// Silver to black +public class BlockModDoubleFlower2 extends BlockModDoubleFlower { + + public BlockModDoubleFlower2() { + super(true); + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2)).getMetadata() - 8; + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 21c118794..3e5af8e12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -60,12 +60,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); } @Override @@ -75,7 +75,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 435195af9..07b9dfc0b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -112,12 +112,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); } @Override @@ -130,7 +130,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid if (meta > 15) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bc7858a70..83eba0f92 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -45,6 +46,24 @@ public class BlockStorage extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.STORAGE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Enum) state.getValue(BotaniaStateProps.STORAGE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= StorageVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d84a51e37..6f201ef2b 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -333,8 +333,8 @@ public final class ModBlocks { endStoneBrick = new BlockEndStoneBrick(); mushroom = new BlockModMushroom(); pump = new BlockPump(); - doubleFlower1 = new BlockModDoubleFlower(false); - doubleFlower2 = new BlockModDoubleFlower(true); + doubleFlower1 = new BlockModDoubleFlower1(); + doubleFlower2 = new BlockModDoubleFlower2(); fakeAir = new BlockFakeAir(); blazeBlock = new BlockBlaze(); corporeaInterceptor = new BlockCorporeaInterceptor(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index ed48b86cd..adbf4d7d3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -83,7 +83,9 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Arrays; import java.util.Collection; +import java.util.Locale; import java.util.Set; public final class ModFluffBlocks { @@ -315,6 +317,10 @@ public final class ModFluffBlocks { } for (BiomeBrickVariant variant : BiomeBrickVariant.values()) { + if (variant.getName().toLowerCase(Locale.ROOT).contains("chiseled")) { + // No chiseled stairs/slabs + continue; + } biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); @@ -343,6 +349,8 @@ public final class ModFluffBlocks { count = 0; for (EnumDyeColor color : ((Collection) BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues())) { pavementStairs[count] = new BlockPavementStairs(color); + pavementSlabs[count] = new BlockPavementSlab(false, color, count); + pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); count++; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index f887fb956..3472db034 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -37,25 +37,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); - } - - @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); - } - - @Override - public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index a0638efe9..b5b558802 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -31,7 +31,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { @Override public int getMetaFromState(IBlockState state) { - return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); + return ((BiomeBrickVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index e31cb188c..86cc6edde 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -34,12 +34,12 @@ public class Block18StoneWall extends BlockModWall { super(ModFluffBlocks.stone, 4); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE)); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); } @Override @@ -52,7 +52,7 @@ public class Block18StoneWall extends BlockModWall { if (meta < 0 || meta > 3) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index d0ae84b91..44da2cace 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -34,12 +34,12 @@ public class BlockBiomeStoneWall extends BlockModWall { super(ModFluffBlocks.biomeStoneA, 8); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); } @Override @@ -52,7 +52,7 @@ public class BlockBiomeStoneWall extends BlockModWall { if (meta < 0 || meta >= BiomeStoneVariant.values().length) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index f4226fb41..0f8a53ee7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -43,12 +43,23 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { .withProperty(SOUTH, false) .withProperty(WEST, false) .withProperty(EAST, false) + .withProperty(VARIANT, EnumType.NORMAL) ); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); } @Override 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 9c2667139..7b552bab6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -42,6 +43,21 @@ public class BlockPump extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + } + @Override public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); 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 7d3329fca..8c8bf8b32 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -103,7 +103,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl for(BlockPos f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(f.up(), ModBlocks.flower)); - mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block.getDefaultState()); + mb.addComponent(BlockPos.ORIGIN.up(), Blocks.lapis_block.getDefaultState()); return mb.makeSet(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 968a7f043..d4f2b3f70 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -395,6 +395,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { +/* Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); // todo 1.8.8 Tessellator.renderingWorldRenderer = false; @@ -506,6 +507,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.popMatrix(); } GlStateManager.popMatrix(); +*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 6d6324f06..a85eb647e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -272,7 +272,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return bound; MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null) { + if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); 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 3f30fb32c..d4fe9a896 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 @@ -113,6 +113,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @SideOnly(Side.CLIENT) public static void renderOnPlayer(ItemStack stack, RenderPlayerEvent event) { +/* if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { GlStateManager.pushMatrix(); float f = willIcon.getMinU(); @@ -128,6 +129,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc IconHelper.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } +*/ } @SubscribeEvent 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 ebf46af02..048b424fa 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 @@ -317,11 +317,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void renderIcon(int i) { +/* IIcon icon = icons[i]; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +*/ } } 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 191fe3515..a9918af7b 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 @@ -173,12 +173,12 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre GlStateManager.scale(0.5F, 0.5F, 0.5F); for(int i = 2; i < 4; i++) { - IIcon icon = icons[i]; + /*IIcon icon = icons[i]; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/ Color color = new Color(getColorFromItemStack(stack, 1)); GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); 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 bb9a10363..94a28e36c 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 @@ -100,6 +100,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -114,6 +115,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble GlStateManager.scale(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } +*/ } } 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 faad2732c..094a9d700 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 @@ -83,7 +83,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final int COST_OVERKILL = COST * 3; private static final int MAX_FLY_TIME = 1200; - public static IIcon[] wingIcons; + //public static IIcon[] wingIcons; private static final int SUBTYPES = 8; private static final int WING_TYPES = 9; @@ -332,6 +332,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* int meta = stack.getItemDamage(); if(type == RenderType.BODY) { if(meta > 0 && meta <= ItemFlightTiara.wingIcons.length) { @@ -451,6 +452,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } else if(meta == 1) // Jibril's Halo renderHalo(event.entityPlayer, event.partialRenderTick); +*/ } @SideOnly(Side.CLIENT) 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 a3ed3e373..c8ed82fb2 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 @@ -67,6 +67,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -85,5 +86,6 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { } ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); } +*/ } } 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 7354ce3c5..0fb82c8e3 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 @@ -21,14 +21,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -42,7 +40,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public static Map> playerIceBlocks = new HashMap(); public ItemIcePendant() { @@ -54,11 +52,11 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { @@ -113,7 +111,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - if(type == RenderType.BODY) { + /*if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; @@ -127,7 +125,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); - } + }*/ } class IceRemover { 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 5ded3be7f..34917a261 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 @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,7 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -56,18 +54,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemItemFinder extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; private static final String TAG_POSITIONS = "highlightPositions"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { @@ -215,6 +213,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); @@ -229,6 +228,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { GlStateManager.scale(0.75F, 0.75F, 0.75F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } +*/ } } 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 bd7ac4f42..14230cfb9 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 @@ -13,11 +13,9 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -29,7 +27,7 @@ import baubles.api.BaubleType; public class ItemLavaPendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public ItemLavaPendant() { super(LibItemNames.LAVA_PENDANT); @@ -46,14 +44,15 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); @@ -69,6 +68,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } +*/ } } 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 cdd730aa5..cfb640808 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 @@ -51,6 +51,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -65,6 +66,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm GlStateManager.scale(0.35F, 0.35F, 0.35F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } +*/ } @SideOnly(Side.CLIENT) 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 4e1171c70..9db5d72d8 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 @@ -14,12 +14,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -33,7 +31,7 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public ItemSuperLavaPendant() { super(LibItemNames.SUPER_LAVA_PENDANT); @@ -58,14 +56,15 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); @@ -81,5 +80,6 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } +*/ } } 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 92186dc7f..2e9d55c42 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -81,10 +81,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent @SideOnly(Side.CLIENT) public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); + /*evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/phiFlower", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/phiFlower"))); evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/goldfish", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/goldfish"))); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat")));*/ } @SubscribeEvent From cff6120aaf3419e92f1f6bef8e33d21aa4bbe98e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 16:16:04 -0600 Subject: [PATCH 072/935] First block models --- MC18_notes.txt | 2 +- .../client/core/handler/ModelHandler.java | 148 ++++++++++++++++++ .../client/core/proxy/ClientProxy.java | 3 + .../botania/client/lib/LibResources.java | 2 +- .../botania/common/block/BlockModFlower.java | 5 - .../block/decor/slabs/BlockModSlab.java | 18 ++- .../block/ItemBlockWithMetadataAndName.java | 7 + .../assets/botania/blockstates/flower.json | 71 +++++++++ .../assets/botania/blockstates/mushroom.json | 71 +++++++++ .../botania/blockstates/shinyFlower.json | 71 +++++++++ .../assets/botania/blockstates/storage.json | 9 ++ .../models/block/dragonstone_block.json | 6 + .../models/block/elementium_block.json | 6 + .../models/block/mana_diamond_block.json | 6 + .../botania/models/block/manasteel_block.json | 6 + .../models/block/terrasteel_block.json | 6 + .../botania/models/item/black_flower.json | 6 + .../botania/models/item/black_mushroom.json | 6 + .../models/item/black_shinyFlower.json | 6 + .../botania/models/item/blue_flower.json | 6 + .../botania/models/item/blue_mushroom.json | 6 + .../botania/models/item/blue_shinyFlower.json | 6 + .../botania/models/item/brown_flower.json | 6 + .../botania/models/item/brown_mushroom.json | 6 + .../models/item/brown_shinyFlower.json | 6 + .../botania/models/item/cyan_flower.json | 6 + .../botania/models/item/cyan_mushroom.json | 6 + .../botania/models/item/cyan_shinyFlower.json | 6 + .../models/item/dragonstone_block.json | 10 ++ .../botania/models/item/elementium_block.json | 10 ++ .../botania/models/item/gray_flower.json | 6 + .../botania/models/item/gray_mushroom.json | 6 + .../botania/models/item/gray_shinyFlower.json | 6 + .../botania/models/item/green_flower.json | 6 + .../botania/models/item/green_mushroom.json | 6 + .../models/item/green_shinyFlower.json | 6 + .../models/item/light_blue_flower.json | 6 + .../models/item/light_blue_mushroom.json | 6 + .../models/item/light_blue_shinyFlower.json | 6 + .../botania/models/item/lime_flower.json | 6 + .../botania/models/item/lime_mushroom.json | 6 + .../botania/models/item/lime_shinyFlower.json | 6 + .../botania/models/item/magenta_flower.json | 6 + .../botania/models/item/magenta_mushroom.json | 6 + .../models/item/magenta_shinyFlower.json | 6 + .../models/item/mana_diamond_block.json | 10 ++ .../botania/models/item/manasteel_block.json | 10 ++ .../botania/models/item/orange_flower.json | 6 + .../botania/models/item/orange_mushroom.json | 6 + .../models/item/orange_shinyFlower.json | 6 + .../botania/models/item/pink_flower.json | 6 + .../botania/models/item/pink_mushroom.json | 6 + .../botania/models/item/pink_shinyFlower.json | 6 + .../botania/models/item/purple_flower.json | 6 + .../botania/models/item/purple_mushroom.json | 6 + .../models/item/purple_shinyFlower.json | 6 + .../botania/models/item/red_flower.json | 6 + .../botania/models/item/red_mushroom.json | 6 + .../botania/models/item/red_shinyFlower.json | 6 + .../botania/models/item/silver_flower.json | 6 + .../botania/models/item/silver_mushroom.json | 6 + .../models/item/silver_shinyFlower.json | 6 + .../botania/models/item/standard_item.json | 15 ++ .../botania/models/item/standard_tool.json | 15 ++ .../botania/models/item/terrasteel_block.json | 10 ++ .../botania/models/item/white_flower.json | 6 + .../botania/models/item/white_mushroom.json | 6 + .../models/item/white_shinyFlower.json | 6 + .../botania/models/item/yellow_flower.json | 6 + .../botania/models/item/yellow_mushroom.json | 6 + .../models/item/yellow_shinyFlower.json | 6 + 71 files changed, 793 insertions(+), 12 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/ModelHandler.java create mode 100644 src/main/resources/assets/botania/blockstates/flower.json create mode 100644 src/main/resources/assets/botania/blockstates/mushroom.json create mode 100644 src/main/resources/assets/botania/blockstates/shinyFlower.json create mode 100644 src/main/resources/assets/botania/blockstates/storage.json create mode 100644 src/main/resources/assets/botania/models/block/dragonstone_block.json create mode 100644 src/main/resources/assets/botania/models/block/elementium_block.json create mode 100644 src/main/resources/assets/botania/models/block/mana_diamond_block.json create mode 100644 src/main/resources/assets/botania/models/block/manasteel_block.json create mode 100644 src/main/resources/assets/botania/models/block/terrasteel_block.json create mode 100644 src/main/resources/assets/botania/models/item/black_flower.json create mode 100644 src/main/resources/assets/botania/models/item/black_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/black_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/blue_flower.json create mode 100644 src/main/resources/assets/botania/models/item/blue_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/blue_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/brown_flower.json create mode 100644 src/main/resources/assets/botania/models/item/brown_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/brown_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/cyan_flower.json create mode 100644 src/main/resources/assets/botania/models/item/cyan_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/cyan_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/dragonstone_block.json create mode 100644 src/main/resources/assets/botania/models/item/elementium_block.json create mode 100644 src/main/resources/assets/botania/models/item/gray_flower.json create mode 100644 src/main/resources/assets/botania/models/item/gray_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/gray_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/green_flower.json create mode 100644 src/main/resources/assets/botania/models/item/green_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/green_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/light_blue_flower.json create mode 100644 src/main/resources/assets/botania/models/item/light_blue_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/lime_flower.json create mode 100644 src/main/resources/assets/botania/models/item/lime_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/lime_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/magenta_flower.json create mode 100644 src/main/resources/assets/botania/models/item/magenta_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/magenta_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/mana_diamond_block.json create mode 100644 src/main/resources/assets/botania/models/item/manasteel_block.json create mode 100644 src/main/resources/assets/botania/models/item/orange_flower.json create mode 100644 src/main/resources/assets/botania/models/item/orange_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/orange_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/pink_flower.json create mode 100644 src/main/resources/assets/botania/models/item/pink_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/pink_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/purple_flower.json create mode 100644 src/main/resources/assets/botania/models/item/purple_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/purple_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/red_flower.json create mode 100644 src/main/resources/assets/botania/models/item/red_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/red_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/silver_flower.json create mode 100644 src/main/resources/assets/botania/models/item/silver_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/silver_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/standard_item.json create mode 100644 src/main/resources/assets/botania/models/item/standard_tool.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteel_block.json create mode 100644 src/main/resources/assets/botania/models/item/white_flower.json create mode 100644 src/main/resources/assets/botania/models/item/white_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/white_shinyFlower.json create mode 100644 src/main/resources/assets/botania/models/item/yellow_flower.json create mode 100644 src/main/resources/assets/botania/models/item/yellow_mushroom.json create mode 100644 src/main/resources/assets/botania/models/item/yellow_shinyFlower.json diff --git a/MC18_notes.txt b/MC18_notes.txt index 33bb81bd5..ca56cc4a4 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -28,4 +28,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is - Sub to texture stitch and bake our own model there to use? - This remains the largest portion of what is left - Where is the method to render an arbitrary baked model? -* CRITICAL: All blockstates are done, but they appear to not be registered correctly (always have default variant)... is it the itemblock's fault?? \ No newline at end of file +* ItemBlocks seem to merge subtypes (shift clicking storage blocks onto each other) \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java new file mode 100644 index 000000000..a010a4c6c --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -0,0 +1,148 @@ +package vazkii.botania.client.core.handler; + +import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.block.decor.slabs.BlockModSlab; + +import java.util.List; + +public final class ModelHandler { + + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); + + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + /** Normal Items **/ + + /** Special Item Meshers **/ + } + + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + List otherSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + }); + + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + List otherFullSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + }); + + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } + + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:" + variant.getName() + "_block"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_mushroom"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_flower"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_shinyFlower"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerItemModel(Item i) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory")); + } + + private ModelHandler() {} +} 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 422a17bc6..e451cfd93 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -51,6 +51,7 @@ import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; @@ -178,6 +179,8 @@ public class ClientProxy extends CommonProxy { } super.preInit(event); + + ModelHandler.registerModels(); } @Override diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 2b6391857..584d12181 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -12,7 +12,7 @@ package vazkii.botania.client.lib; public final class LibResources { - public static final String PREFIX_MOD = "botania:"; // todo 1.8 take out the colon? + public static final String PREFIX_MOD = "botania:"; public static final String PREFIX_LANG = "/assets/botania/lang/"; public static final String PREFIX_SHADER = "/assets/botania/shader/"; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3e5af8e12..f5e4b4271 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -108,11 +108,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return super.setLightLevel(p_149715_1_); } - @Override - public int getRenderType() { - return LibRenderIDs.idSpecialFlower; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index a6ee70be3..3f261bc5d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -28,7 +28,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; protected final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); // todo 1.8.8 statemapper ignore this prop for everything + public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); @@ -39,22 +39,30 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } - setDefaultState(blockState.getBaseState().withProperty(DUMMY, DummyEnum.SINGLETON)); + setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); } @Override public BlockState createBlockState() { - return new BlockState(this, getVariantProperty()); + return new BlockState(this, HALF, getVariantProperty()); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState(); + if (doubleSlab) { + return getDefaultState(); + } else { + return getDefaultState().withProperty(HALF, meta == 8 ? EnumBlockHalf.TOP : EnumBlockHalf.BOTTOM); + } } @Override public int getMetaFromState(IBlockState state) { - return 0; + if (doubleSlab) { + return 0; + } else { + return state.getValue(HALF) == EnumBlockHalf.TOP ? 8 : 0; + } } public abstract BlockSlab getFullBlock(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 4365d5a24..630c88b1b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -25,6 +25,7 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc public ItemBlockWithMetadataAndName(Block par2Block) { super(par2Block); + setHasSubtypes(true); } @Override @@ -47,4 +48,10 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc return block instanceof IPickupAchievement ? ((IPickupAchievement) block).getAchievementOnPickup(stack, player, item) : null; } + @Override + public int getMetadata(int damage) + { + return damage; + } + } diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json new file mode 100644 index 000000000..645d917ac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json new file mode 100644 index 000000000..bdd1fc07a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json new file mode 100644 index 000000000..fd3edfa27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json new file mode 100644 index 000000000..416692109 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -0,0 +1,9 @@ +{ + "variants": { + "variant=manasteel": { "model": "botania:manasteel_block" }, + "variant=terrasteel": { "model": "botania:terrasteel_block" }, + "variant=elementium": { "model": "botania:elementium_block" }, + "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, + "variant=dragonstone": { "model": "botania:dragonstone_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/main/resources/assets/botania/models/block/dragonstone_block.json new file mode 100644 index 000000000..7d0c130d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dragonstone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/main/resources/assets/botania/models/block/elementium_block.json new file mode 100644 index 000000000..a55282f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elementium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/main/resources/assets/botania/models/block/mana_diamond_block.json new file mode 100644 index 000000000..4a875189b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/main/resources/assets/botania/models/block/manasteel_block.json new file mode 100644 index 000000000..bdb8f0a68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/main/resources/assets/botania/models/block/terrasteel_block.json new file mode 100644 index 000000000..add746c6d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/terrasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_flower.json b/src/main/resources/assets/botania/models/item/black_flower.json new file mode 100644 index 000000000..74be17232 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_mushroom.json b/src/main/resources/assets/botania/models/item/black_mushroom.json new file mode 100644 index 000000000..02010cbda --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_shinyFlower.json b/src/main/resources/assets/botania/models/item/black_shinyFlower.json new file mode 100644 index 000000000..9e32d4ab4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_flower.json b/src/main/resources/assets/botania/models/item/blue_flower.json new file mode 100644 index 000000000..08989cd7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_mushroom.json b/src/main/resources/assets/botania/models/item/blue_mushroom.json new file mode 100644 index 000000000..0301bf3fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/blue_shinyFlower.json new file mode 100644 index 000000000..584a504b3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_flower.json b/src/main/resources/assets/botania/models/item/brown_flower.json new file mode 100644 index 000000000..73c83d12c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_mushroom.json b/src/main/resources/assets/botania/models/item/brown_mushroom.json new file mode 100644 index 000000000..39e744fee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_shinyFlower.json b/src/main/resources/assets/botania/models/item/brown_shinyFlower.json new file mode 100644 index 000000000..babb9d96a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_flower.json b/src/main/resources/assets/botania/models/item/cyan_flower.json new file mode 100644 index 000000000..ff1f1f9ec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_mushroom.json b/src/main/resources/assets/botania/models/item/cyan_mushroom.json new file mode 100644 index 000000000..d17557e19 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json b/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json new file mode 100644 index 000000000..23cfb282b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone_block.json b/src/main/resources/assets/botania/models/item/dragonstone_block.json new file mode 100644 index 000000000..a21a57746 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/dragonstone_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium_block.json b/src/main/resources/assets/botania/models/item/elementium_block.json new file mode 100644 index 000000000..5b8856070 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/elementium_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_flower.json b/src/main/resources/assets/botania/models/item/gray_flower.json new file mode 100644 index 000000000..cff1cd61b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_mushroom.json b/src/main/resources/assets/botania/models/item/gray_mushroom.json new file mode 100644 index 000000000..ba46fa3b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_shinyFlower.json b/src/main/resources/assets/botania/models/item/gray_shinyFlower.json new file mode 100644 index 000000000..0bacb5d9b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_flower.json b/src/main/resources/assets/botania/models/item/green_flower.json new file mode 100644 index 000000000..e4aedca11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_mushroom.json b/src/main/resources/assets/botania/models/item/green_mushroom.json new file mode 100644 index 000000000..aed8cc9ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_shinyFlower.json b/src/main/resources/assets/botania/models/item/green_shinyFlower.json new file mode 100644 index 000000000..eb8516159 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_flower.json b/src/main/resources/assets/botania/models/item/light_blue_flower.json new file mode 100644 index 000000000..0ff9e7bd0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_mushroom.json b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json new file mode 100644 index 000000000..02569057b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json new file mode 100644 index 000000000..65e9a89c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_flower.json b/src/main/resources/assets/botania/models/item/lime_flower.json new file mode 100644 index 000000000..16d27ccd3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_mushroom.json b/src/main/resources/assets/botania/models/item/lime_mushroom.json new file mode 100644 index 000000000..60e3fd100 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_shinyFlower.json b/src/main/resources/assets/botania/models/item/lime_shinyFlower.json new file mode 100644 index 000000000..3b6026e2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_flower.json b/src/main/resources/assets/botania/models/item/magenta_flower.json new file mode 100644 index 000000000..4018d6d6e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_mushroom.json b/src/main/resources/assets/botania/models/item/magenta_mushroom.json new file mode 100644 index 000000000..617ad89ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json b/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json new file mode 100644 index 000000000..111119d77 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_diamond_block.json b/src/main/resources/assets/botania/models/item/mana_diamond_block.json new file mode 100644 index 000000000..38382bf2f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_diamond_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/mana_diamond_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel_block.json b/src/main/resources/assets/botania/models/item/manasteel_block.json new file mode 100644 index 000000000..b34dfb7c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/manasteel_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_flower.json b/src/main/resources/assets/botania/models/item/orange_flower.json new file mode 100644 index 000000000..117a1ae96 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_mushroom.json b/src/main/resources/assets/botania/models/item/orange_mushroom.json new file mode 100644 index 000000000..6e0e78438 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_shinyFlower.json b/src/main/resources/assets/botania/models/item/orange_shinyFlower.json new file mode 100644 index 000000000..e1354029b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_flower.json b/src/main/resources/assets/botania/models/item/pink_flower.json new file mode 100644 index 000000000..97aab6cfb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_mushroom.json b/src/main/resources/assets/botania/models/item/pink_mushroom.json new file mode 100644 index 000000000..562925c0b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_shinyFlower.json b/src/main/resources/assets/botania/models/item/pink_shinyFlower.json new file mode 100644 index 000000000..4d1005a14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_flower.json b/src/main/resources/assets/botania/models/item/purple_flower.json new file mode 100644 index 000000000..422e008de --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_mushroom.json b/src/main/resources/assets/botania/models/item/purple_mushroom.json new file mode 100644 index 000000000..d7874c8ba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_shinyFlower.json b/src/main/resources/assets/botania/models/item/purple_shinyFlower.json new file mode 100644 index 000000000..fbc39c447 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_flower.json b/src/main/resources/assets/botania/models/item/red_flower.json new file mode 100644 index 000000000..71adb35b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_mushroom.json b/src/main/resources/assets/botania/models/item/red_mushroom.json new file mode 100644 index 000000000..43d756c6a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_shinyFlower.json b/src/main/resources/assets/botania/models/item/red_shinyFlower.json new file mode 100644 index 000000000..b03af685f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_flower.json b/src/main/resources/assets/botania/models/item/silver_flower.json new file mode 100644 index 000000000..e7e1a7bad --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_mushroom.json b/src/main/resources/assets/botania/models/item/silver_mushroom.json new file mode 100644 index 000000000..edb1409dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_shinyFlower.json b/src/main/resources/assets/botania/models/item/silver_shinyFlower.json new file mode 100644 index 000000000..0bacb5d9b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/standard_item.json b/src/main/resources/assets/botania/models/item/standard_item.json new file mode 100644 index 000000000..25cf45f1e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/standard_item.json @@ -0,0 +1,15 @@ +{ + "parent": "builtin/generated", + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/standard_tool.json b/src/main/resources/assets/botania/models/item/standard_tool.json new file mode 100644 index 000000000..835adad2c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/standard_tool.json @@ -0,0 +1,15 @@ +{ + "parent": "builtin/generated", + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel_block.json b/src/main/resources/assets/botania/models/item/terrasteel_block.json new file mode 100644 index 000000000..a1295c1bc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/terrasteel_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_flower.json b/src/main/resources/assets/botania/models/item/white_flower.json new file mode 100644 index 000000000..c72fbabed --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_mushroom.json b/src/main/resources/assets/botania/models/item/white_mushroom.json new file mode 100644 index 000000000..4f6d7d848 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_shinyFlower.json b/src/main/resources/assets/botania/models/item/white_shinyFlower.json new file mode 100644 index 000000000..e80b16af8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_flower.json b/src/main/resources/assets/botania/models/item/yellow_flower.json new file mode 100644 index 000000000..1fd5e7d07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_mushroom.json b/src/main/resources/assets/botania/models/item/yellow_mushroom.json new file mode 100644 index 000000000..7c1555c74 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json b/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json new file mode 100644 index 000000000..ff3082d61 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering4" + } +} \ No newline at end of file From 42110cec45ab8607d2defcbc01b788a3f3a77e37 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 16:18:34 -0600 Subject: [PATCH 073/935] Fix duplicate eventhandler --- src/main/java/vazkii/botania/common/block/BlockPistonRelay.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 0041f4b22..5cd7daee0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -65,7 +65,6 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl setStepSound(soundTypeMetal); MinecraftForge.EVENT_BUS.register(this); - MinecraftForge.EVENT_BUS.register(this); } @Override From 70353cf143261288c7ddb26b12fb742c2bd86e19 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 16:48:56 -0600 Subject: [PATCH 074/935] Livingrock, and reorganize model names. Sorry for the diff thrashing --- .../client/core/handler/ModelHandler.java | 20 +++++++++++++++---- .../botania/blockstates/livingrock.json | 19 ++++++++++++++++++ .../assets/botania/blockstates/storage.json | 10 +++++----- .../models/block/livingrock_brick.json | 6 ++++++ .../block/livingrock_chiseled_brick.json | 6 ++++++ .../block/livingrock_cracked_brick.json | 6 ++++++ .../models/block/livingrock_default.json | 6 ++++++ .../models/block/livingrock_mossy_brick.json | 6 ++++++ ...ne_block.json => storage_dragonstone.json} | 0 ...ium_block.json => storage_elementium.json} | 0 ...d_block.json => storage_mana_diamond.json} | 0 ...teel_block.json => storage_manasteel.json} | 0 ...eel_block.json => storage_terrasteel.json} | 0 .../{black_flower.json => flower_black.json} | 0 .../{blue_flower.json => flower_blue.json} | 0 .../{brown_flower.json => flower_brown.json} | 0 .../{cyan_flower.json => flower_cyan.json} | 0 .../{gray_flower.json => flower_gray.json} | 0 .../{green_flower.json => flower_green.json} | 0 ...lue_flower.json => flower_light_blue.json} | 0 .../{lime_flower.json => flower_lime.json} | 0 ...agenta_flower.json => flower_magenta.json} | 0 ...{orange_flower.json => flower_orange.json} | 0 .../{pink_flower.json => flower_pink.json} | 0 ...{purple_flower.json => flower_purple.json} | 0 .../item/{red_flower.json => flower_red.json} | 0 ...{silver_flower.json => flower_silver.json} | 0 .../{white_flower.json => flower_white.json} | 0 ...{yellow_flower.json => flower_yellow.json} | 0 ...ntium_block.json => livingrock_brick.json} | 2 +- .../item/livingrock_chiseled_brick.json | 10 ++++++++++ .../models/item/livingrock_cracked_brick.json | 10 ++++++++++ ...ond_block.json => livingrock_default.json} | 2 +- .../models/item/livingrock_mossy_brick.json | 10 ++++++++++ ...lack_mushroom.json => mushroom_black.json} | 0 ...{blue_mushroom.json => mushroom_blue.json} | 0 ...rown_mushroom.json => mushroom_brown.json} | 0 ...{cyan_mushroom.json => mushroom_cyan.json} | 0 ...{gray_mushroom.json => mushroom_gray.json} | 0 ...reen_mushroom.json => mushroom_green.json} | 0 ...mushroom.json => mushroom_light_blue.json} | 0 ...{lime_mushroom.json => mushroom_lime.json} | 0 ...ta_mushroom.json => mushroom_magenta.json} | 0 ...nge_mushroom.json => mushroom_orange.json} | 0 ...{pink_mushroom.json => mushroom_pink.json} | 0 ...ple_mushroom.json => mushroom_purple.json} | 0 .../{red_mushroom.json => mushroom_red.json} | 0 ...ver_mushroom.json => mushroom_silver.json} | 0 ...hite_mushroom.json => mushroom_white.json} | 0 ...low_mushroom.json => mushroom_yellow.json} | 0 ...hinyFlower.json => shinyFlower_black.json} | 0 ...shinyFlower.json => shinyFlower_blue.json} | 0 ...hinyFlower.json => shinyFlower_brown.json} | 0 ...shinyFlower.json => shinyFlower_cyan.json} | 0 ...shinyFlower.json => shinyFlower_gray.json} | 0 ...hinyFlower.json => shinyFlower_green.json} | 0 ...lower.json => shinyFlower_light_blue.json} | 0 ...shinyFlower.json => shinyFlower_lime.json} | 0 ...nyFlower.json => shinyFlower_magenta.json} | 0 ...inyFlower.json => shinyFlower_orange.json} | 0 ...shinyFlower.json => shinyFlower_pink.json} | 0 ...inyFlower.json => shinyFlower_purple.json} | 0 ..._shinyFlower.json => shinyFlower_red.json} | 0 ...inyFlower.json => shinyFlower_silver.json} | 0 ...hinyFlower.json => shinyFlower_white.json} | 0 ...inyFlower.json => shinyFlower_yellow.json} | 0 .../models/item/storage_dragonstone.json | 10 ++++++++++ ...eel_block.json => storage_elementium.json} | 2 +- .../models/item/storage_mana_diamond.json | 10 ++++++++++ ...tone_block.json => storage_manasteel.json} | 2 +- .../models/item/storage_terrasteel.json | 10 ++++++++++ .../botania/models/item/terrasteel_block.json | 10 ---------- 72 files changed, 134 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/livingrock.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_default.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json rename src/main/resources/assets/botania/models/block/{dragonstone_block.json => storage_dragonstone.json} (100%) rename src/main/resources/assets/botania/models/block/{elementium_block.json => storage_elementium.json} (100%) rename src/main/resources/assets/botania/models/block/{mana_diamond_block.json => storage_mana_diamond.json} (100%) rename src/main/resources/assets/botania/models/block/{manasteel_block.json => storage_manasteel.json} (100%) rename src/main/resources/assets/botania/models/block/{terrasteel_block.json => storage_terrasteel.json} (100%) rename src/main/resources/assets/botania/models/item/{black_flower.json => flower_black.json} (100%) rename src/main/resources/assets/botania/models/item/{blue_flower.json => flower_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{brown_flower.json => flower_brown.json} (100%) rename src/main/resources/assets/botania/models/item/{cyan_flower.json => flower_cyan.json} (100%) rename src/main/resources/assets/botania/models/item/{gray_flower.json => flower_gray.json} (100%) rename src/main/resources/assets/botania/models/item/{green_flower.json => flower_green.json} (100%) rename src/main/resources/assets/botania/models/item/{light_blue_flower.json => flower_light_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{lime_flower.json => flower_lime.json} (100%) rename src/main/resources/assets/botania/models/item/{magenta_flower.json => flower_magenta.json} (100%) rename src/main/resources/assets/botania/models/item/{orange_flower.json => flower_orange.json} (100%) rename src/main/resources/assets/botania/models/item/{pink_flower.json => flower_pink.json} (100%) rename src/main/resources/assets/botania/models/item/{purple_flower.json => flower_purple.json} (100%) rename src/main/resources/assets/botania/models/item/{red_flower.json => flower_red.json} (100%) rename src/main/resources/assets/botania/models/item/{silver_flower.json => flower_silver.json} (100%) rename src/main/resources/assets/botania/models/item/{white_flower.json => flower_white.json} (100%) rename src/main/resources/assets/botania/models/item/{yellow_flower.json => flower_yellow.json} (100%) rename src/main/resources/assets/botania/models/item/{elementium_block.json => livingrock_brick.json} (78%) create mode 100644 src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json rename src/main/resources/assets/botania/models/item/{mana_diamond_block.json => livingrock_default.json} (77%) create mode 100644 src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json rename src/main/resources/assets/botania/models/item/{black_mushroom.json => mushroom_black.json} (100%) rename src/main/resources/assets/botania/models/item/{blue_mushroom.json => mushroom_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{brown_mushroom.json => mushroom_brown.json} (100%) rename src/main/resources/assets/botania/models/item/{cyan_mushroom.json => mushroom_cyan.json} (100%) rename src/main/resources/assets/botania/models/item/{gray_mushroom.json => mushroom_gray.json} (100%) rename src/main/resources/assets/botania/models/item/{green_mushroom.json => mushroom_green.json} (100%) rename src/main/resources/assets/botania/models/item/{light_blue_mushroom.json => mushroom_light_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{lime_mushroom.json => mushroom_lime.json} (100%) rename src/main/resources/assets/botania/models/item/{magenta_mushroom.json => mushroom_magenta.json} (100%) rename src/main/resources/assets/botania/models/item/{orange_mushroom.json => mushroom_orange.json} (100%) rename src/main/resources/assets/botania/models/item/{pink_mushroom.json => mushroom_pink.json} (100%) rename src/main/resources/assets/botania/models/item/{purple_mushroom.json => mushroom_purple.json} (100%) rename src/main/resources/assets/botania/models/item/{red_mushroom.json => mushroom_red.json} (100%) rename src/main/resources/assets/botania/models/item/{silver_mushroom.json => mushroom_silver.json} (100%) rename src/main/resources/assets/botania/models/item/{white_mushroom.json => mushroom_white.json} (100%) rename src/main/resources/assets/botania/models/item/{yellow_mushroom.json => mushroom_yellow.json} (100%) rename src/main/resources/assets/botania/models/item/{black_shinyFlower.json => shinyFlower_black.json} (100%) rename src/main/resources/assets/botania/models/item/{blue_shinyFlower.json => shinyFlower_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{brown_shinyFlower.json => shinyFlower_brown.json} (100%) rename src/main/resources/assets/botania/models/item/{cyan_shinyFlower.json => shinyFlower_cyan.json} (100%) rename src/main/resources/assets/botania/models/item/{gray_shinyFlower.json => shinyFlower_gray.json} (100%) rename src/main/resources/assets/botania/models/item/{green_shinyFlower.json => shinyFlower_green.json} (100%) rename src/main/resources/assets/botania/models/item/{light_blue_shinyFlower.json => shinyFlower_light_blue.json} (100%) rename src/main/resources/assets/botania/models/item/{lime_shinyFlower.json => shinyFlower_lime.json} (100%) rename src/main/resources/assets/botania/models/item/{magenta_shinyFlower.json => shinyFlower_magenta.json} (100%) rename src/main/resources/assets/botania/models/item/{orange_shinyFlower.json => shinyFlower_orange.json} (100%) rename src/main/resources/assets/botania/models/item/{pink_shinyFlower.json => shinyFlower_pink.json} (100%) rename src/main/resources/assets/botania/models/item/{purple_shinyFlower.json => shinyFlower_purple.json} (100%) rename src/main/resources/assets/botania/models/item/{red_shinyFlower.json => shinyFlower_red.json} (100%) rename src/main/resources/assets/botania/models/item/{silver_shinyFlower.json => shinyFlower_silver.json} (100%) rename src/main/resources/assets/botania/models/item/{white_shinyFlower.json => shinyFlower_white.json} (100%) rename src/main/resources/assets/botania/models/item/{yellow_shinyFlower.json => shinyFlower_yellow.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/storage_dragonstone.json rename src/main/resources/assets/botania/models/item/{manasteel_block.json => storage_elementium.json} (77%) create mode 100644 src/main/resources/assets/botania/models/item/storage_mana_diamond.json rename src/main/resources/assets/botania/models/item/{dragonstone_block.json => storage_manasteel.json} (77%) create mode 100644 src/main/resources/assets/botania/models/item/storage_terrasteel.json delete mode 100644 src/main/resources/assets/botania/models/item/terrasteel_block.json 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 a010a4c6c..acc33f24c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -10,9 +10,11 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -33,6 +35,7 @@ public final class ModelHandler { registerStorageItemBlocks(); registerMushroomItemBlocks(); registerFlowerItemBlocks(); + registerLivingRockWood(); /** Normal Items **/ /** Special Item Meshers **/ @@ -108,7 +111,7 @@ public final class ModelHandler { private static void registerStorageItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.storage); for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:" + variant.getName() + "_block"; + String name = "botania:" + "storage_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } @@ -117,7 +120,7 @@ public final class ModelHandler { private static void registerMushroomItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + color.getName() + "_mushroom"; + String name = "botania:" + "mushroom_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } @@ -126,19 +129,28 @@ public final class ModelHandler { private static void registerFlowerItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + color.getName() + "_flower"; + String name = "botania:" + "flower_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + color.getName() + "_shinyFlower"; + String name = "botania:" + "shinyFlower_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } } + private static void registerLivingRockWood() { + Item item = Item.getItemFromBlock(ModBlocks.livingrock); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:" + "livingrock_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + private static void registerItemModel(Item i) { ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory")); diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json new file mode 100644 index 000000000..ae0681bca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -0,0 +1,19 @@ +{ + "variants": { + "variant=default": { + "model": "botania:livingrock_default" + }, + "variant=brick": { + "model": "botania:livingrock_brick" + }, + "variant=mossy_brick": { + "model": "botania:livingrock_mossy_brick" + }, + "variant=cracked_brick": { + "model": "botania:livingrock_cracked_brick" + }, + "variant=chiseled_brick": { + "model": "botania:livingrock_chiseled_brick" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 416692109..8099a05fb 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,9 +1,9 @@ { "variants": { - "variant=manasteel": { "model": "botania:manasteel_block" }, - "variant=terrasteel": { "model": "botania:terrasteel_block" }, - "variant=elementium": { "model": "botania:elementium_block" }, - "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, - "variant=dragonstone": { "model": "botania:dragonstone_block" } + "variant=manasteel": { "model": "botania:storage_manasteel" }, + "variant=terrasteel": { "model": "botania:storage_terrasteel" }, + "variant=elementium": { "model": "botania:storage_elementium" }, + "variant=mana_diamond": { "model": "botania:storage_mana_diamond" }, + "variant=dragonstone": { "model": "botania:storage_dragonstone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick.json b/src/main/resources/assets/botania/models/block/livingrock_brick.json new file mode 100644 index 000000000..c79412d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json new file mode 100644 index 000000000..07ee851a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json new file mode 100644 index 000000000..8b4cafa2c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_default.json b/src/main/resources/assets/botania/models/block/livingrock_default.json new file mode 100644 index 000000000..9a8786117 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_default.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json new file mode 100644 index 000000000..bd6a802c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/main/resources/assets/botania/models/block/storage_dragonstone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/dragonstone_block.json rename to src/main/resources/assets/botania/models/block/storage_dragonstone.json diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/main/resources/assets/botania/models/block/storage_elementium.json similarity index 100% rename from src/main/resources/assets/botania/models/block/elementium_block.json rename to src/main/resources/assets/botania/models/block/storage_elementium.json diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/main/resources/assets/botania/models/block/storage_mana_diamond.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mana_diamond_block.json rename to src/main/resources/assets/botania/models/block/storage_mana_diamond.json diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/main/resources/assets/botania/models/block/storage_manasteel.json similarity index 100% rename from src/main/resources/assets/botania/models/block/manasteel_block.json rename to src/main/resources/assets/botania/models/block/storage_manasteel.json diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/main/resources/assets/botania/models/block/storage_terrasteel.json similarity index 100% rename from src/main/resources/assets/botania/models/block/terrasteel_block.json rename to src/main/resources/assets/botania/models/block/storage_terrasteel.json diff --git a/src/main/resources/assets/botania/models/item/black_flower.json b/src/main/resources/assets/botania/models/item/flower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/item/black_flower.json rename to src/main/resources/assets/botania/models/item/flower_black.json diff --git a/src/main/resources/assets/botania/models/item/blue_flower.json b/src/main/resources/assets/botania/models/item/flower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/blue_flower.json rename to src/main/resources/assets/botania/models/item/flower_blue.json diff --git a/src/main/resources/assets/botania/models/item/brown_flower.json b/src/main/resources/assets/botania/models/item/flower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brown_flower.json rename to src/main/resources/assets/botania/models/item/flower_brown.json diff --git a/src/main/resources/assets/botania/models/item/cyan_flower.json b/src/main/resources/assets/botania/models/item/flower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cyan_flower.json rename to src/main/resources/assets/botania/models/item/flower_cyan.json diff --git a/src/main/resources/assets/botania/models/item/gray_flower.json b/src/main/resources/assets/botania/models/item/flower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/item/gray_flower.json rename to src/main/resources/assets/botania/models/item/flower_gray.json diff --git a/src/main/resources/assets/botania/models/item/green_flower.json b/src/main/resources/assets/botania/models/item/flower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/item/green_flower.json rename to src/main/resources/assets/botania/models/item/flower_green.json diff --git a/src/main/resources/assets/botania/models/item/light_blue_flower.json b/src/main/resources/assets/botania/models/item/flower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/light_blue_flower.json rename to src/main/resources/assets/botania/models/item/flower_light_blue.json diff --git a/src/main/resources/assets/botania/models/item/lime_flower.json b/src/main/resources/assets/botania/models/item/flower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lime_flower.json rename to src/main/resources/assets/botania/models/item/flower_lime.json diff --git a/src/main/resources/assets/botania/models/item/magenta_flower.json b/src/main/resources/assets/botania/models/item/flower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/item/magenta_flower.json rename to src/main/resources/assets/botania/models/item/flower_magenta.json diff --git a/src/main/resources/assets/botania/models/item/orange_flower.json b/src/main/resources/assets/botania/models/item/flower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/item/orange_flower.json rename to src/main/resources/assets/botania/models/item/flower_orange.json diff --git a/src/main/resources/assets/botania/models/item/pink_flower.json b/src/main/resources/assets/botania/models/item/flower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pink_flower.json rename to src/main/resources/assets/botania/models/item/flower_pink.json diff --git a/src/main/resources/assets/botania/models/item/purple_flower.json b/src/main/resources/assets/botania/models/item/flower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/item/purple_flower.json rename to src/main/resources/assets/botania/models/item/flower_purple.json diff --git a/src/main/resources/assets/botania/models/item/red_flower.json b/src/main/resources/assets/botania/models/item/flower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/item/red_flower.json rename to src/main/resources/assets/botania/models/item/flower_red.json diff --git a/src/main/resources/assets/botania/models/item/silver_flower.json b/src/main/resources/assets/botania/models/item/flower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/item/silver_flower.json rename to src/main/resources/assets/botania/models/item/flower_silver.json diff --git a/src/main/resources/assets/botania/models/item/white_flower.json b/src/main/resources/assets/botania/models/item/flower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/item/white_flower.json rename to src/main/resources/assets/botania/models/item/flower_white.json diff --git a/src/main/resources/assets/botania/models/item/yellow_flower.json b/src/main/resources/assets/botania/models/item/flower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/item/yellow_flower.json rename to src/main/resources/assets/botania/models/item/flower_yellow.json diff --git a/src/main/resources/assets/botania/models/item/elementium_block.json b/src/main/resources/assets/botania/models/item/livingrock_brick.json similarity index 78% rename from src/main/resources/assets/botania/models/item/elementium_block.json rename to src/main/resources/assets/botania/models/item/livingrock_brick.json index 5b8856070..e7db2c9a4 100644 --- a/src/main/resources/assets/botania/models/item/elementium_block.json +++ b/src/main/resources/assets/botania/models/item/livingrock_brick.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/elementium_block", + "parent": "botania:block/livingrock_brick", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json new file mode 100644 index 000000000..82ca1f8a1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingrock_chiseled_brick", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json new file mode 100644 index 000000000..b134b5b62 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingrock_cracked_brick", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_diamond_block.json b/src/main/resources/assets/botania/models/item/livingrock_default.json similarity index 77% rename from src/main/resources/assets/botania/models/item/mana_diamond_block.json rename to src/main/resources/assets/botania/models/item/livingrock_default.json index 38382bf2f..b87480b27 100644 --- a/src/main/resources/assets/botania/models/item/mana_diamond_block.json +++ b/src/main/resources/assets/botania/models/item/livingrock_default.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/mana_diamond_block", + "parent": "botania:block/livingrock_default", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json new file mode 100644 index 000000000..972cf35c5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingrock_mossy_brick", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_black.json similarity index 100% rename from src/main/resources/assets/botania/models/item/black_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_black.json diff --git a/src/main/resources/assets/botania/models/item/blue_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/blue_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_blue.json diff --git a/src/main/resources/assets/botania/models/item/brown_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brown_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_brown.json diff --git a/src/main/resources/assets/botania/models/item/cyan_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cyan_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_cyan.json diff --git a/src/main/resources/assets/botania/models/item/gray_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/item/gray_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_gray.json diff --git a/src/main/resources/assets/botania/models/item/green_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_green.json similarity index 100% rename from src/main/resources/assets/botania/models/item/green_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_green.json diff --git a/src/main/resources/assets/botania/models/item/light_blue_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/light_blue_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_light_blue.json diff --git a/src/main/resources/assets/botania/models/item/lime_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lime_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_lime.json diff --git a/src/main/resources/assets/botania/models/item/magenta_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/item/magenta_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_magenta.json diff --git a/src/main/resources/assets/botania/models/item/orange_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/item/orange_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_orange.json diff --git a/src/main/resources/assets/botania/models/item/pink_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pink_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_pink.json diff --git a/src/main/resources/assets/botania/models/item/purple_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/item/purple_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_purple.json diff --git a/src/main/resources/assets/botania/models/item/red_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_red.json similarity index 100% rename from src/main/resources/assets/botania/models/item/red_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_red.json diff --git a/src/main/resources/assets/botania/models/item/silver_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/item/silver_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_silver.json diff --git a/src/main/resources/assets/botania/models/item/white_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_white.json similarity index 100% rename from src/main/resources/assets/botania/models/item/white_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_white.json diff --git a/src/main/resources/assets/botania/models/item/yellow_mushroom.json b/src/main/resources/assets/botania/models/item/mushroom_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/item/yellow_mushroom.json rename to src/main/resources/assets/botania/models/item/mushroom_yellow.json diff --git a/src/main/resources/assets/botania/models/item/black_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/item/black_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_black.json diff --git a/src/main/resources/assets/botania/models/item/blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/blue_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_blue.json diff --git a/src/main/resources/assets/botania/models/item/brown_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brown_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_brown.json diff --git a/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/item/cyan_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_cyan.json diff --git a/src/main/resources/assets/botania/models/item/gray_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/item/gray_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_gray.json diff --git a/src/main/resources/assets/botania/models/item/green_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/item/green_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_green.json diff --git a/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json diff --git a/src/main/resources/assets/botania/models/item/lime_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lime_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_lime.json diff --git a/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/item/magenta_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_magenta.json diff --git a/src/main/resources/assets/botania/models/item/orange_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/item/orange_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_orange.json diff --git a/src/main/resources/assets/botania/models/item/pink_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/item/pink_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_pink.json diff --git a/src/main/resources/assets/botania/models/item/purple_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/item/purple_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_purple.json diff --git a/src/main/resources/assets/botania/models/item/red_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/item/red_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_red.json diff --git a/src/main/resources/assets/botania/models/item/silver_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/item/silver_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_silver.json diff --git a/src/main/resources/assets/botania/models/item/white_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/item/white_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_white.json diff --git a/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json b/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/item/yellow_shinyFlower.json rename to src/main/resources/assets/botania/models/item/shinyFlower_yellow.json diff --git a/src/main/resources/assets/botania/models/item/storage_dragonstone.json b/src/main/resources/assets/botania/models/item/storage_dragonstone.json new file mode 100644 index 000000000..bd06a4a3c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/storage_dragonstone.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/storage_dragonstone", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel_block.json b/src/main/resources/assets/botania/models/item/storage_elementium.json similarity index 77% rename from src/main/resources/assets/botania/models/item/manasteel_block.json rename to src/main/resources/assets/botania/models/item/storage_elementium.json index b34dfb7c1..882bed65b 100644 --- a/src/main/resources/assets/botania/models/item/manasteel_block.json +++ b/src/main/resources/assets/botania/models/item/storage_elementium.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/manasteel_block", + "parent": "botania:block/storage_elementium", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json b/src/main/resources/assets/botania/models/item/storage_mana_diamond.json new file mode 100644 index 000000000..5d0e79f83 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/storage_mana_diamond.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/storage_mana_diamond", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone_block.json b/src/main/resources/assets/botania/models/item/storage_manasteel.json similarity index 77% rename from src/main/resources/assets/botania/models/item/dragonstone_block.json rename to src/main/resources/assets/botania/models/item/storage_manasteel.json index a21a57746..3a90a8b51 100644 --- a/src/main/resources/assets/botania/models/item/dragonstone_block.json +++ b/src/main/resources/assets/botania/models/item/storage_manasteel.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/dragonstone_block", + "parent": "botania:block/storage_manasteel", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/botania/models/item/storage_terrasteel.json b/src/main/resources/assets/botania/models/item/storage_terrasteel.json new file mode 100644 index 000000000..a507f6606 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/storage_terrasteel.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/storage_terrasteel", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel_block.json b/src/main/resources/assets/botania/models/item/terrasteel_block.json deleted file mode 100644 index a1295c1bc..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteel_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/terrasteel_block", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file From d2340905d6bb569254752a9ace70c948011f26bb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 17:43:51 -0600 Subject: [PATCH 075/935] Livingwood, and livingrock and livingwood stairs --- .../client/core/handler/ModelHandler.java | 31 +++++++++++++ .../blockstates/livingrock0Stairs.json | 44 +++++++++++++++++++ .../blockstates/livingrock1Stairs.json | 44 +++++++++++++++++++ .../botania/blockstates/livingwood.json | 10 +++++ .../blockstates/livingwood0Stairs.json | 44 +++++++++++++++++++ .../blockstates/livingwood1Stairs.json | 44 +++++++++++++++++++ .../block/livingrock_brick_inner_stairs.json | 8 ++++ .../block/livingrock_brick_outer_stairs.json | 8 ++++ .../models/block/livingrock_brick_stairs.json | 8 ++++ .../models/block/livingrock_inner_stairs.json | 8 ++++ .../models/block/livingrock_outer_stairs.json | 8 ++++ .../models/block/livingrock_stairs.json | 8 ++++ .../models/block/livingwood_default.json | 6 +++ .../models/block/livingwood_framed.json | 6 +++ .../models/block/livingwood_glimmering.json | 6 +++ .../models/block/livingwood_inner_stairs.json | 8 ++++ .../models/block/livingwood_mossy_planks.json | 6 +++ .../models/block/livingwood_outer_stairs.json | 8 ++++ .../block/livingwood_pattern_framed.json | 6 +++ .../models/block/livingwood_planks.json | 6 +++ .../block/livingwood_planks_inner_stairs.json | 8 ++++ .../block/livingwood_planks_outer_stairs.json | 8 ++++ .../block/livingwood_planks_stairs.json | 8 ++++ .../models/block/livingwood_stairs.json | 8 ++++ .../models/item/livingrock0Stairs.json | 13 ++++++ .../models/item/livingrock1Stairs.json | 13 ++++++ .../models/item/livingwood0Stairs.json | 13 ++++++ .../models/item/livingwood1Stairs.json | 13 ++++++ .../models/item/livingwood_default.json | 10 +++++ .../models/item/livingwood_framed.json | 10 +++++ .../models/item/livingwood_glimmering.json | 10 +++++ .../models/item/livingwood_mossy_planks.json | 10 +++++ .../item/livingwood_pattern_framed.json | 10 +++++ .../models/item/livingwood_planks.json | 10 +++++ 34 files changed, 461 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/livingrock0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood1Stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_default.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock0Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock1Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood0Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood1Stairs.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_default.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_planks.json 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 acc33f24c..6ca637560 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -15,6 +15,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -36,6 +37,9 @@ public final class ModelHandler { registerMushroomItemBlocks(); registerFlowerItemBlocks(); registerLivingRockWood(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); /** Normal Items **/ /** Special Item Meshers **/ @@ -149,6 +153,33 @@ public final class ModelHandler { ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } + + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:" + "livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); + + } + + private static void registerSlabs() { + + } + + private static void registerFullSlabs() { + + } + + private static void registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); } private static void registerItemModel(Item i) { diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json new file mode 100644 index 000000000..b80d9a790 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json new file mode 100644 index 000000000..0425096ce --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json new file mode 100644 index 000000000..87074e2b3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -0,0 +1,10 @@ +{ + "variants": { + "variant=default": { "model": "botania:livingwood_default" }, + "variant=planks": { "model": "botania:livingwood_planks" }, + "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, + "variant=framed": { "model": "botania:livingwood_framed" }, + "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:livingwood_glimmering" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json new file mode 100644 index 000000000..0b5ca469c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json new file mode 100644 index 000000000..13a28ac98 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json new file mode 100644 index 000000000..fd830fe0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json new file mode 100644 index 000000000..64526c211 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json new file mode 100644 index 000000000..5b7aabc77 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json new file mode 100644 index 000000000..29bcf876b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json new file mode 100644 index 000000000..eaa8878fe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingrock_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_stairs.json new file mode 100644 index 000000000..3a5e84dd8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_default.json b/src/main/resources/assets/botania/models/block/livingwood_default.json new file mode 100644 index 000000000..0a8062fd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_default.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json new file mode 100644 index 000000000..67ad48c5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json new file mode 100644 index 000000000..3f76a6831 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json new file mode 100644 index 000000000..98ec94ac6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json new file mode 100644 index 000000000..88b9f8d3e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json new file mode 100644 index 000000000..c2aa14218 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json new file mode 100644 index 000000000..a3edcc34f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json new file mode 100644 index 000000000..ff95b9ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json new file mode 100644 index 000000000..0bffa08dd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json new file mode 100644 index 000000000..e70bb4c98 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json new file mode 100644 index 000000000..075da8cef --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } +} diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_stairs.json new file mode 100644 index 000000000..110841261 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } +} diff --git a/src/main/resources/assets/botania/models/item/livingrock0Stairs.json b/src/main/resources/assets/botania/models/item/livingrock0Stairs.json new file mode 100644 index 000000000..58c94dff8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock0Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingrock_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock1Stairs.json b/src/main/resources/assets/botania/models/item/livingrock1Stairs.json new file mode 100644 index 000000000..1d48de23e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock1Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingrock_brick_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood0Stairs.json b/src/main/resources/assets/botania/models/item/livingwood0Stairs.json new file mode 100644 index 000000000..aeb312db2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood0Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingwood_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood1Stairs.json b/src/main/resources/assets/botania/models/item/livingwood1Stairs.json new file mode 100644 index 000000000..1f229b9ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood1Stairs.json @@ -0,0 +1,13 @@ +{ + "parent": "botania:block/livingwood_planks_stairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_default.json b/src/main/resources/assets/botania/models/item/livingwood_default.json new file mode 100644 index 000000000..26fa10fad --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_default.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_default", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_framed.json b/src/main/resources/assets/botania/models/item/livingwood_framed.json new file mode 100644 index 000000000..e9cee1d0f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_framed.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_framed", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json new file mode 100644 index 000000000..a5ce44ad5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_glimmering", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json new file mode 100644 index 000000000..949174e54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_mossy_planks", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json new file mode 100644 index 000000000..6866a6652 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_pattern_framed", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/main/resources/assets/botania/models/item/livingwood_planks.json new file mode 100644 index 000000000..82cf0d370 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_planks.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/livingwood_planks", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file From 33b423aaa18fbf58c6b0637b42923ce7a7e5527f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 20:28:08 -0600 Subject: [PATCH 076/935] Lexicon item model. Alf/managlass blocks, altgrass --- .../client/core/handler/ModelHandler.java | 34 +++++++++++++++---- .../vazkii/botania/client/fx/FXSparkle.java | 12 +++---- .../botania/common/block/BlockAltGrass.java | 6 ++-- .../common/block/decor/BlockElfGlass.java | 10 ------ .../assets/botania/blockstates/altGrass.json | 10 ++++++ .../assets/botania/blockstates/elfGlass.json | 10 ++++++ .../assets/botania/blockstates/manaGlass.json | 7 ++++ .../botania/models/block/altGrass_dry.json | 8 +++++ .../botania/models/block/altGrass_golden.json | 8 +++++ .../models/block/altGrass_infused.json | 8 +++++ .../models/block/altGrass_mutated.json | 8 +++++ .../models/block/altGrass_scorched.json | 8 +++++ .../botania/models/block/altGrass_vivid.json | 8 +++++ .../assets/botania/models/block/elfGlass.json | 6 ++++ .../botania/models/block/elfGlass0.json | 6 ++++ .../botania/models/block/elfGlass1.json | 6 ++++ .../botania/models/block/elfGlass2.json | 6 ++++ .../botania/models/block/elfGlass3.json | 6 ++++ .../botania/models/block/manaGlass.json | 6 ++++ .../botania/models/item/altGrass_dry.json | 10 ++++++ .../botania/models/item/altGrass_golden.json | 10 ++++++ .../botania/models/item/altGrass_infused.json | 10 ++++++ .../botania/models/item/altGrass_mutated.json | 10 ++++++ .../models/item/altGrass_scorched.json | 10 ++++++ .../botania/models/item/altGrass_vivid.json | 10 ++++++ .../assets/botania/models/item/elfGlass.json | 10 ++++++ .../assets/botania/models/item/lexicon.json | 6 ++++ .../assets/botania/models/item/manaGlass.json | 10 ++++++ 28 files changed, 234 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/altGrass.json create mode 100644 src/main/resources/assets/botania/blockstates/elfGlass.json create mode 100644 src/main/resources/assets/botania/blockstates/manaGlass.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_dry.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_golden.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_infused.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_mutated.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_scorched.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_vivid.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass0.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass1.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass2.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass3.json create mode 100644 src/main/resources/assets/botania/models/block/manaGlass.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_dry.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_golden.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_infused.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_mutated.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_scorched.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_vivid.json create mode 100644 src/main/resources/assets/botania/models/item/elfGlass.json create mode 100644 src/main/resources/assets/botania/models/item/lexicon.json create mode 100644 src/main/resources/assets/botania/models/item/manaGlass.json 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 6ca637560..6c05414a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -14,12 +14,15 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.item.ItemGaiaHead; +import vazkii.botania.common.item.ModItems; import java.util.List; @@ -37,10 +40,16 @@ public final class ModelHandler { registerMushroomItemBlocks(); registerFlowerItemBlocks(); registerLivingRockWood(); + registerAltGrass(); registerStairs(); registerSlabs(); registerFullSlabs(); + registerPanes(); + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + /** Normal Items **/ + registerItemModel(ModItems.lexicon); /** Special Item Meshers **/ } @@ -112,10 +121,19 @@ public final class ModelHandler { } } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + private static void registerStorageItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.storage); for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:" + "storage_" + variant.getName(); + String name = "botania:storage_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } @@ -124,7 +142,7 @@ public final class ModelHandler { private static void registerMushroomItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + "mushroom_" + color.getName(); + String name = "botania:mushroom_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } @@ -133,14 +151,14 @@ public final class ModelHandler { private static void registerFlowerItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + "flower_" + color.getName(); + String name = "botania:flower_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + "shinyFlower_" + color.getName(); + String name = "botania:shinyFlower_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } @@ -149,14 +167,14 @@ public final class ModelHandler { private static void registerLivingRockWood() { Item item = Item.getItemFromBlock(ModBlocks.livingrock); for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:" + "livingrock_" + variant.getName(); + String name = "botania:livingrock_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } item = Item.getItemFromBlock(ModBlocks.livingwood); for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:" + "livingwood_" + variant.getName(); + String name = "botania:livingwood_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } @@ -178,6 +196,10 @@ public final class ModelHandler { } + private static void registerPanes() { + + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index aa2448722..4e867bc1a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -72,13 +72,13 @@ public class FXSparkle extends EntityFX { GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -106,10 +106,10 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index ff3dbef55..a9f7bf03c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -88,10 +88,10 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); - Block block = world.getBlockState(pos1.up()).getBlock(); + world.getBlockState(pos1.up()).getBlock(); - if(world.getBlockState(pos1).getBlock() == Blocks.dirt && world.getBlockState(pos).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos.up()) <= 2) - world.setBlockState(pos, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 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); } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 5f07c73af..1cb7fe057 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -10,17 +10,13 @@ */ package vazkii.botania.common.block.decor; -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -30,12 +26,6 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico super(LibBlockNames.ELF_GLASS); } -// @Override -// public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { -// int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); -// return icons[v]; -// } // todo 1.8 use randomized states for this - @Override public boolean isElvenItem(ItemStack stack) { return true; diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json new file mode 100644 index 000000000..a9c6f7706 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "variant=dry": { "model": "botania:altGrass_dry" }, + "variant=golden": { "model": "botania:altGrass_golden" }, + "variant=vivid": { "model": "botania:altGrass_vivid" }, + "variant=scorched": { "model": "botania:altGrass_scorched" }, + "variant=infused": { "model": "botania:altGrass_infused" }, + "variant=mutated": { "model": "botania:altGrass_mutated" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json new file mode 100644 index 000000000..fd88d3deb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elfGlass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:elfGlass0" }, + { "model": "botania:elfGlass1" }, + { "model": "botania:elfGlass2" }, + { "model": "botania:elfGlass3" } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json new file mode 100644 index 000000000..4ca5115ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "botania:manaGlass" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_dry.json b/src/main/resources/assets/botania/models/block/altGrass_dry.json new file mode 100644 index 000000000..dfb175331 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_dry.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass0", + "side": "botania:blocks/altGrass1", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_golden.json b/src/main/resources/assets/botania/models/block/altGrass_golden.json new file mode 100644 index 000000000..24668bae6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_golden.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass2", + "side": "botania:blocks/altGrass3", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_infused.json b/src/main/resources/assets/botania/models/block/altGrass_infused.json new file mode 100644 index 000000000..cba653bda --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_infused.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass8", + "side": "botania:blocks/altGrass9", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_mutated.json b/src/main/resources/assets/botania/models/block/altGrass_mutated.json new file mode 100644 index 000000000..33e9ce82b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_mutated.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass10", + "side": "botania:blocks/altGrass11", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_scorched.json b/src/main/resources/assets/botania/models/block/altGrass_scorched.json new file mode 100644 index 000000000..c79993e04 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_scorched.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass6", + "side": "botania:blocks/altGrass7", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_vivid.json b/src/main/resources/assets/botania/models/block/altGrass_vivid.json new file mode 100644 index 000000000..f1226714e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_vivid.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass4", + "side": "botania:blocks/altGrass5", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass.json b/src/main/resources/assets/botania/models/block/elfGlass.json new file mode 100644 index 000000000..6bea253b2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass0.json b/src/main/resources/assets/botania/models/block/elfGlass0.json new file mode 100644 index 000000000..22f41bd0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass1.json b/src/main/resources/assets/botania/models/block/elfGlass1.json new file mode 100644 index 000000000..c81653d71 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass2.json b/src/main/resources/assets/botania/models/block/elfGlass2.json new file mode 100644 index 000000000..294ace490 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass3.json b/src/main/resources/assets/botania/models/block/elfGlass3.json new file mode 100644 index 000000000..842d799df --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manaGlass.json b/src/main/resources/assets/botania/models/block/manaGlass.json new file mode 100644 index 000000000..dc3338aa9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manaGlass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_dry.json b/src/main/resources/assets/botania/models/item/altGrass_dry.json new file mode 100644 index 000000000..6a70baf25 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_dry.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_dry", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_golden.json b/src/main/resources/assets/botania/models/item/altGrass_golden.json new file mode 100644 index 000000000..45751fb50 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_golden.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_golden", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_infused.json b/src/main/resources/assets/botania/models/item/altGrass_infused.json new file mode 100644 index 000000000..d55365d64 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_infused.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_infused", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_mutated.json b/src/main/resources/assets/botania/models/item/altGrass_mutated.json new file mode 100644 index 000000000..e4632a5c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_mutated.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_mutated", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_scorched.json b/src/main/resources/assets/botania/models/item/altGrass_scorched.json new file mode 100644 index 000000000..d050bcd74 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_scorched.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_scorched", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_vivid.json b/src/main/resources/assets/botania/models/item/altGrass_vivid.json new file mode 100644 index 000000000..47d5b9a35 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_vivid.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_vivid", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elfGlass.json b/src/main/resources/assets/botania/models/item/elfGlass.json new file mode 100644 index 000000000..75ea7c4fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elfGlass.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/elfGlass", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon.json b/src/main/resources/assets/botania/models/item/lexicon.json new file mode 100644 index 000000000..37c3bc24d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lexicon.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lexicon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGlass.json b/src/main/resources/assets/botania/models/item/manaGlass.json new file mode 100644 index 000000000..9bd86d80a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGlass.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/manaGlass", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file From 305b99b3f541cc96105ac344c76f876f82c445af Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 22:37:27 -0500 Subject: [PATCH 077/935] Added Models for Resources and other items --- .../client/core/handler/ModelHandler.java | 361 ++++++++++-------- .../java/vazkii/botania/common/Botania.java | 34 +- .../botania/models/item/blackLotus.json | 6 + .../assets/botania/models/item/createFiles.sh | 7 + .../botania/models/item/dragonstone.json | 1 + .../botania/models/item/dreamwoodTwig.json | 1 + .../botania/models/item/elementium.json | 1 + .../botania/models/item/elementiumNugget.json | 1 + .../botania/models/item/enderAirBottle.json | 1 + .../assets/botania/models/item/gaiaIngot.json | 1 + .../botania/models/item/lifeEssence.json | 1 + .../botania/models/item/livingwoodTwig.json | 1 + .../botania/models/item/manaDiamond.json | 1 + .../assets/botania/models/item/manaPearl.json | 1 + .../botania/models/item/manaPowder.json | 1 + .../botania/models/item/manaString.json | 1 + .../assets/botania/models/item/manasteel.json | 1 + .../botania/models/item/manasteelNugget.json | 1 + .../botania/models/item/manaweaveCloth.json | 1 + .../assets/botania/models/item/pebble.json | 1 + .../botania/models/item/pestleAndMortar.json | 6 + .../assets/botania/models/item/pixieDust.json | 1 + .../botania/models/item/placeholder.json | 1 + .../botania/models/item/prismarineShard.json | 1 + .../assets/botania/models/item/redString.json | 1 + .../botania/models/item/redstoneRoot.json | 1 + .../assets/botania/models/item/root.json | 1 + .../botania/models/item/terrasteel.json | 1 + .../botania/models/item/terrasteelNugget.json | 1 + 29 files changed, 273 insertions(+), 165 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/blackLotus.json create mode 100755 src/main/resources/assets/botania/models/item/createFiles.sh create mode 100644 src/main/resources/assets/botania/models/item/dragonstone.json create mode 100644 src/main/resources/assets/botania/models/item/dreamwoodTwig.json create mode 100644 src/main/resources/assets/botania/models/item/elementium.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumNugget.json create mode 100644 src/main/resources/assets/botania/models/item/enderAirBottle.json create mode 100644 src/main/resources/assets/botania/models/item/gaiaIngot.json create mode 100644 src/main/resources/assets/botania/models/item/lifeEssence.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodTwig.json create mode 100644 src/main/resources/assets/botania/models/item/manaDiamond.json create mode 100644 src/main/resources/assets/botania/models/item/manaPearl.json create mode 100644 src/main/resources/assets/botania/models/item/manaPowder.json create mode 100644 src/main/resources/assets/botania/models/item/manaString.json create mode 100644 src/main/resources/assets/botania/models/item/manasteel.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelNugget.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveCloth.json create mode 100644 src/main/resources/assets/botania/models/item/pebble.json create mode 100644 src/main/resources/assets/botania/models/item/pestleAndMortar.json create mode 100644 src/main/resources/assets/botania/models/item/pixieDust.json create mode 100644 src/main/resources/assets/botania/models/item/placeholder.json create mode 100644 src/main/resources/assets/botania/models/item/prismarineShard.json create mode 100644 src/main/resources/assets/botania/models/item/redString.json create mode 100644 src/main/resources/assets/botania/models/item/redstoneRoot.json create mode 100644 src/main/resources/assets/botania/models/item/root.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteel.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelNugget.json 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 6c05414a8..106aa8a83 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,16 +1,17 @@ package vazkii.botania.client.core.handler; +import java.util.List; + import com.google.common.collect.ImmutableList; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; @@ -23,191 +24,245 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; - -import java.util.List; +import vazkii.botania.common.lib.LibItemNames; public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). - // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files - public static void registerModels() { - /** Custom statemappers **/ - registerStateMappers(); + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple + // and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will + // drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); - /** ItemBlocks **/ - registerStorageItemBlocks(); - registerMushroomItemBlocks(); - registerFlowerItemBlocks(); - registerLivingRockWood(); - registerAltGrass(); - registerStairs(); - registerSlabs(); - registerFullSlabs(); - registerPanes(); - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + registerLivingRockWood(); + registerAltGrass(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); + registerPanes(); + registerStandardItems(); + registerStandardBlocks(); + registerManaResources(); + /** Normal Items **/ - /** Normal Items **/ - registerItemModel(ModItems.lexicon); + /** Special Item Meshers **/ + } - /** Special Item Meshers **/ - } + private static void registerStandardBlocks() { + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); - private static void registerStateMappers() { - // Ignore vanilla variant in flowers - ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + } - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + private static void registerStandardItems() { + registerItemModel(ModItems.pestleAndMortar); + registerItemModel(ModItems.blackLotus); + registerItemModel(ModItems.blackLotus, 1); + registerItemModel(ModItems.lexicon); + registerItemModel(ModItems.manaResource, 0); + registerItemModel(ModItems.manaResource, 1); + } - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, + (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, + (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - for (Block b : ModFluffBlocks.stoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, - ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab - }); + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : otherSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + List otherSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlab, + ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, + ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, + ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, + ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, + ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab }); - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : ModFluffBlocks.stoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, - ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull - }); + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - for (Block b : otherFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - } + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + List otherFullSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlabFull, + ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, + ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, + ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, + ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, + ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, + ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, + ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, + ModFluffBlocks.sunnyQuartzSlabFull }); - private static void registerStorageItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, + (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } - private static void registerMushroomItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.mushroom); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } - } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerFlowerItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.flower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:storage_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - item = Item.getItemFromBlock(ModBlocks.shinyFlower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - } - } + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:mushroom_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:flower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:shinyFlower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerStairs() { - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); + private static void registerLivingRockWood() { + Item item = Item.getItemFromBlock(ModBlocks.livingrock); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:livingrock_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } - } + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), + new ModelResourceLocation(name, "inventory")); + } + } - private static void registerSlabs() { + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); - } + } - private static void registerFullSlabs() { + private static void registerSlabs() { - } + } - private static void registerPanes() { + private static void registerFullSlabs() { - } + } - private static void registerItemModel(Block b) { - registerItemModel(Item.getItemFromBlock(b)); - } + private static void registerPanes() { - private static void registerItemModel(Item i) { - ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); - ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory")); - } + } + + private static void registerManaResources() { + Item item = ModItems.manaResource; + for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); + } + + private static void registerItemModel(Item i) { + registerItemModel(i, 0); + } + + private static void registerItemModel(Item i, int meta) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + System.out.println(loc); + ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); + } - private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 151f73802..3b2b83ef6 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common; -import vazkii.botania.common.core.handler.IMCHandler; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.integration.coloredlights.ILightHelper; -import vazkii.botania.common.integration.coloredlights.LightHelperColored; -import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; -import vazkii.botania.common.lib.LibMisc; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -30,6 +25,14 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.integration.coloredlights.ILightHelper; +import vazkii.botania.common.integration.coloredlights.LightHelperColored; +import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; +import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { @@ -61,9 +64,11 @@ public class Botania { etFuturumLoaded = Loader.isModLoaded("etfuturum"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); - + // TODO remove this \/ + MinecraftForge.EVENT_BUS.register(this); proxy.preInit(event); } + @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); @@ -94,8 +99,13 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - /*@EventHandler - public void missingMappings(FMLMissingMappingsEvent event) { - AliasHandler.onMissingMappings(event); - }*/ + // TODO remove this, was for testing + @SubscribeEvent + public void tooltip(ItemTooltipEvent e) { + e.toolTip.add(e.itemStack.getUnlocalizedName() + ":" + e.itemStack.getItemDamage()); + } + /* + * @EventHandler public void missingMappings(FMLMissingMappingsEvent event) + * { AliasHandler.onMissingMappings(event); } + */ } diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus.json new file mode 100644 index 000000000..68a694482 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/blackLotus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/createFiles.sh b/src/main/resources/assets/botania/models/item/createFiles.sh new file mode 100755 index 000000000..c5739f8bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/createFiles.sh @@ -0,0 +1,7 @@ +Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle' +'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder'); + +for i in "${Files[@]}";do + FileFormat="{\"parent\":\"botania:item/standard_item\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" + echo $FileFormat >> $i".json" +done diff --git a/src/main/resources/assets/botania/models/item/dragonstone.json b/src/main/resources/assets/botania/models/item/dragonstone.json new file mode 100644 index 000000000..3f40ad93e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dragonstone"}} diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json new file mode 100644 index 000000000..9ac500966 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dreamwoodTwig"}} diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json new file mode 100644 index 000000000..1ea04b844 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementium"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json new file mode 100644 index 000000000..809ecbc9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumNugget"}} diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderAirBottle.json new file mode 100644 index 000000000..02103d348 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/enderAirBottle"}} diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaIngot.json new file mode 100644 index 000000000..3acfe0742 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/gaiaIngot"}} diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeEssence.json new file mode 100644 index 000000000..e4101a4af --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/lifeEssence"}} diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json new file mode 100644 index 000000000..195e38efa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/livingwoodTwig"}} diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manaDiamond.json new file mode 100644 index 000000000..759281745 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaDiamond"}} diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manaPearl.json new file mode 100644 index 000000000..087c473bd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPearl"}} diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manaPowder.json new file mode 100644 index 000000000..9df90c85a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPowder"}} diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manaString.json new file mode 100644 index 000000000..08fadb23f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaString"}} diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json new file mode 100644 index 000000000..a9a5973d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteel"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json new file mode 100644 index 000000000..12fb2b672 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelNugget"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json new file mode 100644 index 000000000..fd1ceb9fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveCloth"}} diff --git a/src/main/resources/assets/botania/models/item/pebble.json b/src/main/resources/assets/botania/models/item/pebble.json new file mode 100644 index 000000000..60a49dc9f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pebble"}} diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json new file mode 100644 index 000000000..ddf772436 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/pestleAndMortar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixieDust.json new file mode 100644 index 000000000..23612dd34 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pixieDust"}} diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json new file mode 100644 index 000000000..f5059861c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/placeholder"}} diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json new file mode 100644 index 000000000..f7cdeea95 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/prismarineShard"}} diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redString.json new file mode 100644 index 000000000..53a201b2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redString"}} diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json new file mode 100644 index 000000000..5d8b915d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redstoneRoot"}} diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/root.json new file mode 100644 index 000000000..b8b664832 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/root.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/root"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json new file mode 100644 index 000000000..10d7c5e58 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteel"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json new file mode 100644 index 000000000..34a7681a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelNugget"}} From 9f429c7e1740040f346f79882237521458c2989c Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 23:06:33 -0500 Subject: [PATCH 078/935] Added most tools and armour models --- Botania_Client.launch | 1 + Botania_Server.launch | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 52271 bytes gradle/wrapper/gradle-wrapper.properties | 12 ++-- .../client/core/handler/ModelHandler.java | 52 +++++++++++++++--- .../assets/botania/models/item/createFiles.sh | 12 ++-- .../botania/models/item/elementiumAxe.json | 1 + .../botania/models/item/elementiumBoots.json | 1 + .../botania/models/item/elementiumChest.json | 1 + .../botania/models/item/elementiumHelm.json | 1 + .../botania/models/item/elementiumLegs.json | 1 + .../botania/models/item/elementiumPick.json | 1 + .../botania/models/item/elementiumShears.json | 1 + .../botania/models/item/elementiumShovel.json | 1 + .../botania/models/item/elementiumSword.json | 1 + .../assets/botania/models/item/glassPick.json | 1 + .../botania/models/item/manasteelAxe.json | 1 + .../botania/models/item/manasteelBoots.json | 1 + .../botania/models/item/manasteelChest.json | 1 + .../botania/models/item/manasteelHelm.json | 1 + .../botania/models/item/manasteelLegs.json | 1 + .../botania/models/item/manasteelPick.json | 1 + .../botania/models/item/manasteelShears.json | 1 + .../botania/models/item/manasteelShovel.json | 1 + .../botania/models/item/manasteelSword.json | 1 + .../botania/models/item/manaweaveBoots.json | 1 + .../models/item/manaweaveBootsHoliday.json | 1 + .../botania/models/item/manaweaveChest.json | 1 + .../models/item/manaweaveChestHoliday.json | 1 + .../botania/models/item/manaweaveHelm.json | 1 + .../models/item/manaweaveHelmHoliday.json | 1 + .../botania/models/item/manaweaveLegs.json | 1 + .../models/item/manaweaveLegsHoliday.json | 1 + .../assets/botania/models/item/starSword.json | 1 + .../botania/models/item/terrasteelBoots.json | 1 + .../botania/models/item/terrasteelChest.json | 1 + .../botania/models/item/terrasteelHelm.json | 1 + .../botania/models/item/terrasteelLegs.json | 1 + .../botania/models/item/thunderSword.json | 1 + 39 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 Botania_Client.launch create mode 100644 Botania_Server.launch create mode 100644 src/main/resources/assets/botania/models/item/elementiumAxe.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumBoots.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumChest.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumHelm.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumLegs.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumPick.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumShears.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumShovel.json create mode 100644 src/main/resources/assets/botania/models/item/elementiumSword.json create mode 100644 src/main/resources/assets/botania/models/item/glassPick.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelAxe.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelBoots.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelChest.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelHelm.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelLegs.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelPick.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelShears.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelShovel.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelSword.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveBoots.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveChest.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveHelm.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveLegs.json create mode 100644 src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json create mode 100644 src/main/resources/assets/botania/models/item/starSword.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelBoots.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelChest.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelHelm.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelLegs.json create mode 100644 src/main/resources/assets/botania/models/item/thunderSword.json diff --git a/Botania_Client.launch b/Botania_Client.launch new file mode 100644 index 000000000..529e48409 --- /dev/null +++ b/Botania_Client.launch @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Botania_Server.launch b/Botania_Server.launch new file mode 100644 index 000000000..467a47ede --- /dev/null +++ b/Botania_Server.launch @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..30d399d8d2bf522ff5de94bf434a7cc43a9a74b5 100644 GIT binary patch delta 22949 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 211ae5a57..9397848f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 27 18:34:11 EDT 2014 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +#Mon Sep 14 12:28:28 PDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip 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 106aa8a83..2b34508c3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,5 +1,7 @@ package vazkii.botania.client.core.handler; +import static vazkii.botania.common.item.ModItems.*; + import java.util.List; import com.google.common.collect.ImmutableList; @@ -23,7 +25,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; public final class ModelHandler { @@ -62,12 +63,47 @@ public final class ModelHandler { } private static void registerStandardItems() { - registerItemModel(ModItems.pestleAndMortar); - registerItemModel(ModItems.blackLotus); - registerItemModel(ModItems.blackLotus, 1); - registerItemModel(ModItems.lexicon); - registerItemModel(ModItems.manaResource, 0); - registerItemModel(ModItems.manaResource, 1); + registerItemModel(pestleAndMortar); + registerItemModel(blackLotus); + registerItemModel(blackLotus, 1); + registerItemModel(lexicon); + + registerItemModel(manasteelHelm); + registerItemModel(manasteelChest); + registerItemModel(manasteelLegs); + registerItemModel(manasteelBoots); + + registerItemModel(manasteelPick); + registerItemModel(manasteelShovel); + registerItemModel(manasteelAxe); + registerItemModel(manasteelShears); + registerItemModel(manasteelSword); + + registerItemModel(elementiumHelm); + registerItemModel(elementiumChest); + registerItemModel(elementiumLegs); + registerItemModel(elementiumBoots); + + registerItemModel(elementiumPick); + registerItemModel(elementiumShovel); + registerItemModel(elementiumAxe); + registerItemModel(elementiumShears); + registerItemModel(elementiumSword); + + registerItemModel(manaweaveHelm); + registerItemModel(manaweaveChest); + registerItemModel(manaweaveLegs); + registerItemModel(manaweaveBoots); + + registerItemModel(terrasteelHelm); + registerItemModel(terrasteelHelmRevealing); + registerItemModel(terrasteelChest); + registerItemModel(terrasteelLegs); + registerItemModel(terrasteelBoots); + + registerItemModel(starSword); + registerItemModel(thunderSword); + registerItemModel(glassPick); } private static void registerStateMappers() { @@ -243,7 +279,7 @@ public final class ModelHandler { } private static void registerManaResources() { - Item item = ModItems.manaResource; + Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; ModelLoader.addVariantName(item, name); diff --git a/src/main/resources/assets/botania/models/item/createFiles.sh b/src/main/resources/assets/botania/models/item/createFiles.sh index c5739f8bf..0a84472a3 100755 --- a/src/main/resources/assets/botania/models/item/createFiles.sh +++ b/src/main/resources/assets/botania/models/item/createFiles.sh @@ -1,7 +1,9 @@ -Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle' -'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder'); - +#Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle' +#'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder'); +Files=('glassPick' 'starSword' 'thunderSword') +#Files=( 'Pick' 'Shovel' 'Axe' 'Sword' 'Shears') +Type="standard_tool" for i in "${Files[@]}";do - FileFormat="{\"parent\":\"botania:item/standard_item\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" - echo $FileFormat >> $i".json" + FileFormat="{\"parent\":\"botania:item/$Type\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" + echo $FileFormat >> "$i.json" done diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json new file mode 100644 index 000000000..85e484dba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumAxe"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumBoots.json new file mode 100644 index 000000000..0ff1659ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumBoots"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumChest.json new file mode 100644 index 000000000..da61c403c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumChest"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumHelm.json new file mode 100644 index 000000000..7a9289ea5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumHelm"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumLegs.json new file mode 100644 index 000000000..2c4b207e1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumLegs"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumPick.json new file mode 100644 index 000000000..1ad0b5d21 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumPick"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json new file mode 100644 index 000000000..5d1b51376 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShears"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumShovel.json new file mode 100644 index 000000000..75229c4c9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShovel"}} diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumSword.json new file mode 100644 index 000000000..9021143a9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumSword"}} diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/glassPick.json new file mode 100644 index 000000000..b8406e26c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/glassPick"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelAxe.json new file mode 100644 index 000000000..46e580d2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelAxe"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json new file mode 100644 index 000000000..ccff5d9f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelBoots"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json new file mode 100644 index 000000000..2d81f27c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelChest"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json new file mode 100644 index 000000000..d003d0003 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelHelm"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json new file mode 100644 index 000000000..809e37fce --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelLegs"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/manasteelPick.json new file mode 100644 index 000000000..b97a22ec1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelPick"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json new file mode 100644 index 000000000..658c3d499 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShears"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json new file mode 100644 index 000000000..f1172ad55 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShovel"}} diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json new file mode 100644 index 000000000..caf784268 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelSword"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json new file mode 100644 index 000000000..478b74859 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBoots"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json new file mode 100644 index 000000000..ed06cdca9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBootsHoliday"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json new file mode 100644 index 000000000..35ab59a9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChest"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json new file mode 100644 index 000000000..acd1cd398 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChestHoliday"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json new file mode 100644 index 000000000..7cdfc5a0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelm"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json new file mode 100644 index 000000000..7de483baa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelmHoliday"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json new file mode 100644 index 000000000..65d4b9b57 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegs"}} diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json new file mode 100644 index 000000000..769acc423 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegsHoliday"}} diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/starSword.json new file mode 100644 index 000000000..61fc5fba0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/starSword"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json new file mode 100644 index 000000000..ba51f3bdf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelBoots"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json new file mode 100644 index 000000000..aef53a086 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelChest"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json new file mode 100644 index 000000000..ee6cf6802 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelHelm"}} diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json new file mode 100644 index 000000000..c3172b010 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelLegs"}} diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thunderSword.json new file mode 100644 index 000000000..cca0b971f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -0,0 +1 @@ +{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/thunderSword"}} From e77678593fefaae530f62d4fcf802ac95d1092de Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 23:09:21 -0500 Subject: [PATCH 079/935] remove launch files --- Botania_Client.launch | 1 - Botania_Server.launch | 1 - 2 files changed, 2 deletions(-) delete mode 100644 Botania_Client.launch delete mode 100644 Botania_Server.launch diff --git a/Botania_Client.launch b/Botania_Client.launch deleted file mode 100644 index 529e48409..000000000 --- a/Botania_Client.launch +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Botania_Server.launch b/Botania_Server.launch deleted file mode 100644 index 467a47ede..000000000 --- a/Botania_Server.launch +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 7e0145bf34510f51dd61780f26e5a022fdbbbed9 Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 23:17:09 -0500 Subject: [PATCH 080/935] remove debug code, whoops --- .../java/vazkii/botania/common/Botania.java | 11 +---- .../botania/common/item/ItemManaCookie.java | 14 +++--- .../vazkii/botania/common/item/ModItems.java | 49 ++----------------- 3 files changed, 13 insertions(+), 61 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 3b2b83ef6..51df139d4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -25,7 +23,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; @@ -64,8 +61,7 @@ public class Botania { etFuturumLoaded = Loader.isModLoaded("etfuturum"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); - // TODO remove this \/ - MinecraftForge.EVENT_BUS.register(this); + proxy.preInit(event); } @@ -99,11 +95,6 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - // TODO remove this, was for testing - @SubscribeEvent - public void tooltip(ItemTooltipEvent e) { - e.toolTip.add(e.itemStack.getUnlocalizedName() + ":" + e.itemStack.getItemDamage()); - } /* * @EventHandler public void missingMappings(FMLMissingMappingsEvent event) * { AliasHandler.onMissingMappings(event); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 60b40037d..f194ddbae 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,20 +16,17 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { public ItemManaCookie() { super(0, 0.1F, false); - setPotionEffect(Potion.saturation.id, 1, 0, 1F); + setPotionEffect(Potion.saturation.id, 1, 0, 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(LibItemNames.MANA_COOKIE); } @@ -48,9 +45,12 @@ public class ItemManaCookie extends ItemFood { @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", + "item." + LibResources.PREFIX_MOD); } - // todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); + // todo 1.8 return + // stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? + // totalBiscuitIcon : super.getIconIndex(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5b8c67e09..c7511c368 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -35,34 +35,7 @@ import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs; -import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; -import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; -import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; -import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; -import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; -import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak; -import vazkii.botania.common.item.equipment.bauble.ItemIcePendant; -import vazkii.botania.common.item.equipment.bauble.ItemItemFinder; -import vazkii.botania.common.item.equipment.bauble.ItemKnockbackBelt; -import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant; -import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; -import vazkii.botania.common.item.equipment.bauble.ItemManaRing; -import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; -import vazkii.botania.common.item.equipment.bauble.ItemMonocle; -import vazkii.botania.common.item.equipment.bauble.ItemPixieRing; -import vazkii.botania.common.item.equipment.bauble.ItemReachRing; -import vazkii.botania.common.item.equipment.bauble.ItemSpeedUpBelt; -import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; -import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt; -import vazkii.botania.common.item.equipment.bauble.ItemSwapRing; -import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; -import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; -import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; +import vazkii.botania.common.item.equipment.bauble.*; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; import vazkii.botania.common.item.equipment.tool.ItemStarSword; @@ -103,19 +76,7 @@ import vazkii.botania.common.item.relic.ItemKingKey; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemOdinRing; import vazkii.botania.common.item.relic.ItemThorRing; -import vazkii.botania.common.item.rod.ItemCobbleRod; -import vazkii.botania.common.item.rod.ItemDirtRod; -import vazkii.botania.common.item.rod.ItemDiviningRod; -import vazkii.botania.common.item.rod.ItemExchangeRod; -import vazkii.botania.common.item.rod.ItemFireRod; -import vazkii.botania.common.item.rod.ItemGravityRod; -import vazkii.botania.common.item.rod.ItemMissileRod; -import vazkii.botania.common.item.rod.ItemRainbowRod; -import vazkii.botania.common.item.rod.ItemSkyDirtRod; -import vazkii.botania.common.item.rod.ItemSmeltRod; -import vazkii.botania.common.item.rod.ItemTerraformRod; -import vazkii.botania.common.item.rod.ItemTornadoRod; -import vazkii.botania.common.item.rod.ItemWaterRod; +import vazkii.botania.common.item.rod.*; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -319,7 +280,7 @@ public final class ModItems { terraPick = new ItemTerraPick(); divaCharm = new ItemDivaCharm(); flightTiara = new ItemFlightTiara(); - enderDagger = new ItemEnderDagger(); + enderDagger = new ItemEnderDagger(); quartz = new ItemQuartz(); waterRod = new ItemWaterRod(); elementiumHelm = new ItemElementiumHelm(); @@ -418,7 +379,7 @@ public final class ModItems { baubleBox = new ItemBaubleBox(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); - for(int i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i)); OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); @@ -457,7 +418,7 @@ public final class ModItems { BotaniaAPI.blackListItemFromLoonium(blackLotus); int min = Item.getIdFromItem(Items.record_13); int max = Item.getIdFromItem(Items.record_wait); - for(int i = min; i <= max; i++) + for (int i = min; i <= max; i++) BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i)); OreDictionary.registerOre("rodBlaze", Items.blaze_rod); From 1b1e5e3bf01ad644d1ab17f5fbb1264d2f073502 Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Tue, 22 Dec 2015 23:34:35 -0500 Subject: [PATCH 081/935] Fixed Formatting --- .../client/core/handler/ModelHandler.java | 447 ++++++++---------- .../botania/models/item/blackLotus.json | 9 +- .../botania/models/item/dragonstone.json | 8 +- .../botania/models/item/dreamwoodTwig.json | 8 +- .../botania/models/item/elementium.json | 8 +- .../botania/models/item/elementiumAxe.json | 8 +- .../botania/models/item/elementiumBoots.json | 8 +- .../botania/models/item/elementiumChest.json | 8 +- .../botania/models/item/elementiumHelm.json | 8 +- .../botania/models/item/elementiumLegs.json | 8 +- .../botania/models/item/elementiumNugget.json | 8 +- .../botania/models/item/elementiumPick.json | 8 +- .../botania/models/item/elementiumShears.json | 8 +- .../botania/models/item/elementiumShovel.json | 8 +- .../botania/models/item/elementiumSword.json | 8 +- .../botania/models/item/enderAirBottle.json | 8 +- .../assets/botania/models/item/gaiaIngot.json | 8 +- .../assets/botania/models/item/glassPick.json | 8 +- .../botania/models/item/lifeEssence.json | 8 +- .../botania/models/item/livingwoodTwig.json | 8 +- .../botania/models/item/manaDiamond.json | 8 +- .../assets/botania/models/item/manaPearl.json | 8 +- .../botania/models/item/manaPowder.json | 8 +- .../botania/models/item/manaString.json | 8 +- .../assets/botania/models/item/manasteel.json | 8 +- .../botania/models/item/manasteelAxe.json | 8 +- .../botania/models/item/manasteelBoots.json | 8 +- .../botania/models/item/manasteelChest.json | 8 +- .../botania/models/item/manasteelHelm.json | 8 +- .../botania/models/item/manasteelLegs.json | 8 +- .../botania/models/item/manasteelNugget.json | 8 +- .../botania/models/item/manasteelPick.json | 8 +- .../botania/models/item/manasteelShears.json | 8 +- .../botania/models/item/manasteelShovel.json | 8 +- .../botania/models/item/manasteelSword.json | 8 +- .../botania/models/item/manaweaveBoots.json | 8 +- .../models/item/manaweaveBootsHoliday.json | 8 +- .../botania/models/item/manaweaveChest.json | 8 +- .../models/item/manaweaveChestHoliday.json | 8 +- .../botania/models/item/manaweaveCloth.json | 8 +- .../botania/models/item/manaweaveHelm.json | 8 +- .../models/item/manaweaveHelmHoliday.json | 8 +- .../botania/models/item/manaweaveLegs.json | 8 +- .../models/item/manaweaveLegsHoliday.json | 8 +- .../assets/botania/models/item/pebble.json | 8 +- .../botania/models/item/pestleAndMortar.json | 9 +- .../assets/botania/models/item/pixieDust.json | 8 +- .../botania/models/item/placeholder.json | 8 +- .../botania/models/item/prismarineShard.json | 8 +- .../assets/botania/models/item/redString.json | 8 +- .../botania/models/item/redstoneRoot.json | 8 +- .../assets/botania/models/item/root.json | 8 +- .../assets/botania/models/item/starSword.json | 8 +- .../botania/models/item/terrasteel.json | 8 +- .../botania/models/item/terrasteelBoots.json | 8 +- .../botania/models/item/terrasteelChest.json | 8 +- .../botania/models/item/terrasteelHelm.json | 8 +- .../botania/models/item/terrasteelLegs.json | 8 +- .../botania/models/item/terrasteelNugget.json | 8 +- .../botania/models/item/thunderSword.json | 8 +- 60 files changed, 616 insertions(+), 305 deletions(-) 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 2b34508c3..bc360f576 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,19 +1,16 @@ package vazkii.botania.client.core.handler; -import static vazkii.botania.common.item.ModItems.*; - -import java.util.List; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; @@ -27,278 +24,248 @@ import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.lib.LibItemNames; +import static vazkii.botania.common.item.ModItems.*; + +import java.util.List; + public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // In addition, many of the jsons currently use the vanilla format (simple - // and verified bug-free). - // Once things settle down, we'll move to forge jsons, which will - // drastically cut down on the number of json files - public static void registerModels() { - /** Custom statemappers **/ - registerStateMappers(); + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); - /** ItemBlocks **/ - registerStorageItemBlocks(); - registerMushroomItemBlocks(); - registerFlowerItemBlocks(); - registerLivingRockWood(); - registerAltGrass(); - registerStairs(); - registerSlabs(); - registerFullSlabs(); - registerPanes(); - registerStandardItems(); - registerStandardBlocks(); - registerManaResources(); - /** Normal Items **/ + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + registerLivingRockWood(); + registerAltGrass(); + registerStairs(); + registerSlabs(); + registerFullSlabs(); + registerPanes(); + registerStandardBlocks(); + registerManaResources(); + /** Normal Items **/ + - /** Special Item Meshers **/ - } + /** Special Item Meshers **/ + } + private static void registerStandardBlocks() { + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + } + private static void registerStandardItems() { + registerItemModel(pestleAndMortar); + registerItemModel(blackLotus); + registerItemModel(blackLotus, 1); + registerItemModel(lexicon); - private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + registerItemModel(manasteelHelm); + registerItemModel(manasteelChest); + registerItemModel(manasteelLegs); + registerItemModel(manasteelBoots); - } + registerItemModel(manasteelPick); + registerItemModel(manasteelShovel); + registerItemModel(manasteelAxe); + registerItemModel(manasteelShears); + registerItemModel(manasteelSword); - private static void registerStandardItems() { - registerItemModel(pestleAndMortar); - registerItemModel(blackLotus); - registerItemModel(blackLotus, 1); - registerItemModel(lexicon); + registerItemModel(elementiumHelm); + registerItemModel(elementiumChest); + registerItemModel(elementiumLegs); + registerItemModel(elementiumBoots); - registerItemModel(manasteelHelm); - registerItemModel(manasteelChest); - registerItemModel(manasteelLegs); - registerItemModel(manasteelBoots); + registerItemModel(elementiumPick); + registerItemModel(elementiumShovel); + registerItemModel(elementiumAxe); + registerItemModel(elementiumShears); + registerItemModel(elementiumSword); - registerItemModel(manasteelPick); - registerItemModel(manasteelShovel); - registerItemModel(manasteelAxe); - registerItemModel(manasteelShears); - registerItemModel(manasteelSword); + registerItemModel(manaweaveHelm); + registerItemModel(manaweaveChest); + registerItemModel(manaweaveLegs); + registerItemModel(manaweaveBoots); - registerItemModel(elementiumHelm); - registerItemModel(elementiumChest); - registerItemModel(elementiumLegs); - registerItemModel(elementiumBoots); + registerItemModel(terrasteelHelm); + registerItemModel(terrasteelHelmRevealing); + registerItemModel(terrasteelChest); + registerItemModel(terrasteelLegs); + registerItemModel(terrasteelBoots); - registerItemModel(elementiumPick); - registerItemModel(elementiumShovel); - registerItemModel(elementiumAxe); - registerItemModel(elementiumShears); - registerItemModel(elementiumSword); + registerItemModel(starSword); + registerItemModel(thunderSword); + registerItemModel(glassPick); + } + private static void registerManaResources() { + Item item = manaResource; + for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); + } + } - registerItemModel(manaweaveHelm); - registerItemModel(manaweaveChest); - registerItemModel(manaweaveLegs); - registerItemModel(manaweaveBoots); + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - registerItemModel(terrasteelHelm); - registerItemModel(terrasteelHelmRevealing); - registerItemModel(terrasteelChest); - registerItemModel(terrasteelLegs); - registerItemModel(terrasteelBoots); + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - registerItemModel(starSword); - registerItemModel(thunderSword); - registerItemModel(glassPick); - } + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - private static void registerStateMappers() { - // Ignore vanilla variant in flowers - ModelLoader.setCustomStateMapper(ModBlocks.flower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, - (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, - (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + List otherSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + }); - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } - for (Block b : ModFluffBlocks.stoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - List otherSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlab, - ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, - ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, - ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, - ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, - ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab }); + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - for (Block b : otherSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + List otherFullSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + }); - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } - for (Block b : ModFluffBlocks.stoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { ModFluffBlocks.livingwoodSlabFull, - ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, - ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, - ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, - ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, - ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, - ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, - ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, - ModFluffBlocks.sunnyQuartzSlabFull }); + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:storage_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - for (Block b : otherFullSlabs) { - ModelLoader.setCustomStateMapper(b, - (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - } + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:mushroom_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:flower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } - private static void registerStorageItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:shinyFlower_" + color.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } - private static void registerMushroomItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.mushroom); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerLivingRockWood() { + Item item = Item.getItemFromBlock(ModBlocks.livingrock); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:livingrock_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } - private static void registerFlowerItemBlocks() { - Item item = Item.getItemFromBlock(ModBlocks.flower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } + item = Item.getItemFromBlock(ModBlocks.livingwood); + for (LivingWoodVariant variant : LivingWoodVariant.values()) { + String name = "botania:livingwood_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } - item = Item.getItemFromBlock(ModBlocks.shinyFlower); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerStairs() { + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.livingrockStairs); + registerItemModel(ModFluffBlocks.livingrockBrickStairs); - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } + } - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), - new ModelResourceLocation(name, "inventory")); - } - } + private static void registerSlabs() { - private static void registerStairs() { - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); + } - } + private static void registerFullSlabs() { - private static void registerSlabs() { + } - } + private static void registerPanes() { - private static void registerFullSlabs() { + } - } + private static void registerItemModel(Block b) { + registerItemModel(Item.getItemFromBlock(b)); + } + private static void registerItemModel(Item i,int meta) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); + } + private static void registerItemModel(Item i) { + registerItemModel(i, 0); + } - private static void registerPanes() { - - } - - private static void registerManaResources() { - Item item = manaResource; - for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { - String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); - } - } - - private static void registerItemModel(Block b) { - registerItemModel(Item.getItemFromBlock(b)); - } - - private static void registerItemModel(Item i) { - registerItemModel(i, 0); - } - - private static void registerItemModel(Item i, int meta) { - ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); - System.out.println(loc); - ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); - } - -} + private ModelHandler() {} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus.json index 68a694482..0fdd68e10 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus.json +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -1,6 +1,7 @@ { - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:items/blackLotus" - } + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/blackLotus" + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone.json b/src/main/resources/assets/botania/models/item/dragonstone.json index 3f40ad93e..fe4171316 100644 --- a/src/main/resources/assets/botania/models/item/dragonstone.json +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dragonstone"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dragonstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json index 9ac500966..ad4cc65c0 100644 --- a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/dreamwoodTwig"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/dreamwoodTwig" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json index 1ea04b844..20557e911 100644 --- a/src/main/resources/assets/botania/models/item/elementium.json +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementium"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json index 85e484dba..fde365304 100644 --- a/src/main/resources/assets/botania/models/item/elementiumAxe.json +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumAxe"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumBoots.json index 0ff1659ae..3b3eac354 100644 --- a/src/main/resources/assets/botania/models/item/elementiumBoots.json +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumChest.json index da61c403c..abd22195e 100644 --- a/src/main/resources/assets/botania/models/item/elementiumChest.json +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumHelm.json index 7a9289ea5..d599aa5b3 100644 --- a/src/main/resources/assets/botania/models/item/elementiumHelm.json +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumLegs.json index 2c4b207e1..4f5b4eda4 100644 --- a/src/main/resources/assets/botania/models/item/elementiumLegs.json +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json index 809ecbc9d..4083a6e44 100644 --- a/src/main/resources/assets/botania/models/item/elementiumNugget.json +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/elementiumNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/elementiumNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumPick.json index 1ad0b5d21..4c71badcf 100644 --- a/src/main/resources/assets/botania/models/item/elementiumPick.json +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json index 5d1b51376..c7c41a82c 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShears"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumShovel.json index 75229c4c9..cda4564a9 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShovel.json +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumShovel"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumSword.json index 9021143a9..e5f75013b 100644 --- a/src/main/resources/assets/botania/models/item/elementiumSword.json +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/elementiumSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/elementiumSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderAirBottle.json index 02103d348..ba6b1497e 100644 --- a/src/main/resources/assets/botania/models/item/enderAirBottle.json +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/enderAirBottle"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/enderAirBottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaIngot.json index 3acfe0742..03650aabd 100644 --- a/src/main/resources/assets/botania/models/item/gaiaIngot.json +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/gaiaIngot"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/gaiaIngot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/glassPick.json index b8406e26c..ae9b40053 100644 --- a/src/main/resources/assets/botania/models/item/glassPick.json +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/glassPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/glassPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeEssence.json index e4101a4af..25cdc3ac4 100644 --- a/src/main/resources/assets/botania/models/item/lifeEssence.json +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/lifeEssence"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/lifeEssence" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json index 195e38efa..82e629f29 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/livingwoodTwig"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/livingwoodTwig" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manaDiamond.json index 759281745..ec6de6840 100644 --- a/src/main/resources/assets/botania/models/item/manaDiamond.json +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaDiamond"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaDiamond" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manaPearl.json index 087c473bd..d52005f58 100644 --- a/src/main/resources/assets/botania/models/item/manaPearl.json +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPearl"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPearl" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manaPowder.json index 9df90c85a..b22f30d7c 100644 --- a/src/main/resources/assets/botania/models/item/manaPowder.json +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaPowder"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaPowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manaString.json index 08fadb23f..aafad4fca 100644 --- a/src/main/resources/assets/botania/models/item/manaString.json +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaString"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaString" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json index a9a5973d8..c6bc8b4a3 100644 --- a/src/main/resources/assets/botania/models/item/manasteel.json +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteel"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelAxe.json index 46e580d2b..3618e4037 100644 --- a/src/main/resources/assets/botania/models/item/manasteelAxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelAxe"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelAxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json index ccff5d9f3..c48a7313f 100644 --- a/src/main/resources/assets/botania/models/item/manasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json index 2d81f27c0..50c29c8b6 100644 --- a/src/main/resources/assets/botania/models/item/manasteelChest.json +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json index d003d0003..fd7b58c68 100644 --- a/src/main/resources/assets/botania/models/item/manasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json index 809e37fce..f9a1e7d53 100644 --- a/src/main/resources/assets/botania/models/item/manasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json index 12fb2b672..29c5a61d6 100644 --- a/src/main/resources/assets/botania/models/item/manasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manasteelNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/manasteelPick.json index b97a22ec1..66e17bb4c 100644 --- a/src/main/resources/assets/botania/models/item/manasteelPick.json +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelPick"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelPick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json index 658c3d499..bd49d11d8 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShears.json +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShears"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json index f1172ad55..979e63daf 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShovel.json +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelShovel"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelShovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json index caf784268..8bbcfee9c 100644 --- a/src/main/resources/assets/botania/models/item/manasteelSword.json +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/manasteelSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/manasteelSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json index 478b74859..818be5b7e 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json index ed06cdca9..20cdebbb7 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveBootsHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveBootsHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json index 35ab59a9e..4e5a0a1bf 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json index acd1cd398..6bde05c69 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveChestHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveChestHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json index fd1ceb9fd..1fd6ddc37 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveCloth.json +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveCloth"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveCloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json index 7cdfc5a0c..e3ec41e5e 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json index 7de483baa..8ca9c66fb 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveHelmHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveHelmHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json index 65d4b9b57..fde3761e3 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json index 769acc423..b2f6bb10b 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/manaweaveLegsHoliday"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/manaweaveLegsHoliday" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pebble.json b/src/main/resources/assets/botania/models/item/pebble.json index 60a49dc9f..709f876ae 100644 --- a/src/main/resources/assets/botania/models/item/pebble.json +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pebble"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pebble" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json index ddf772436..0ac7b0451 100644 --- a/src/main/resources/assets/botania/models/item/pestleAndMortar.json +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -1,6 +1,7 @@ { - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:items/pestleAndMortar" - } + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pestleAndMortar" + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixieDust.json index 23612dd34..e89d13f8a 100644 --- a/src/main/resources/assets/botania/models/item/pixieDust.json +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/pixieDust"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/pixieDust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json index f5059861c..49f092321 100644 --- a/src/main/resources/assets/botania/models/item/placeholder.json +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/placeholder"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/placeholder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json index f7cdeea95..d87bab9a4 100644 --- a/src/main/resources/assets/botania/models/item/prismarineShard.json +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/prismarineShard"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/prismarineShard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redString.json index 53a201b2b..6a4dce193 100644 --- a/src/main/resources/assets/botania/models/item/redString.json +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redString"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redString" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json index 5d8b915d0..02a8b6173 100644 --- a/src/main/resources/assets/botania/models/item/redstoneRoot.json +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/redstoneRoot"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/redstoneRoot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/root.json index b8b664832..0d2f7b73d 100644 --- a/src/main/resources/assets/botania/models/item/root.json +++ b/src/main/resources/assets/botania/models/item/root.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/root"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/root" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/starSword.json index 61fc5fba0..bd9e12c03 100644 --- a/src/main/resources/assets/botania/models/item/starSword.json +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/starSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/starSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json index 10d7c5e58..33d20773a 100644 --- a/src/main/resources/assets/botania/models/item/terrasteel.json +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteel"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json index ba51f3bdf..4de87776d 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelBoots"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelBoots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json index aef53a086..c09a12720 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelChest.json +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelChest"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelChest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json index ee6cf6802..ceadee6f3 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelHelm"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelHelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json index c3172b010..80ab18f37 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelLegs"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelLegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json index 34a7681a3..548329dc1 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_item","textures":{"layer0":"botania:items/terrasteelNugget"}} +{ + "parent": "botania:item/standard_item", + "textures": + { + "layer0": "botania:items/terrasteelNugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thunderSword.json index cca0b971f..aee5fd5ab 100644 --- a/src/main/resources/assets/botania/models/item/thunderSword.json +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -1 +1,7 @@ -{"parent":"botania:item/standard_tool","textures":{"layer0":"botania:items/thunderSword"}} +{ + "parent": "botania:item/standard_tool", + "textures": + { + "layer0": "botania:items/thunderSword" + } +} \ No newline at end of file From 57e5a3d0acc6fd21a777dc8a5b89ce178300b790 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 22:47:29 -0600 Subject: [PATCH 082/935] Pylon obj model possibly. item working, tile not so --- .../client/core/handler/ModelHandler.java | 14 ++ .../botania/client/model/IPylonModel.java | 8 +- .../botania/client/model/ModelPylon.java | 125 ++++++++++++++++-- .../botania/client/model/ModelPylonOld.java | 7 +- .../client/render/tile/RenderTilePylon.java | 21 ++- .../botania/common/block/BlockPylon.java | 2 +- .../assets/botania/blockstates/pylon.json | 18 +++ .../assets/botania/models/block/pylon.mtl | 2 + .../botania/{model => models/block}/pylon.obj | 31 +++-- 9 files changed, 187 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/pylon.json create mode 100644 src/main/resources/assets/botania/models/block/pylon.mtl rename src/main/resources/assets/botania/{model => models/block}/pylon.obj (99%) 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 6c05414a8..0b2f7318a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -13,18 +13,22 @@ import net.minecraft.item.Item; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import java.util.List; +import java.util.Locale; public final class ModelHandler { @@ -32,6 +36,8 @@ public final class ModelHandler { // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files public static void registerModels() { + OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + /** Custom statemappers **/ registerStateMappers(); @@ -47,6 +53,7 @@ public final class ModelHandler { registerPanes(); registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); + registerPylons(); /** Normal Items **/ registerItemModel(ModItems.lexicon); @@ -200,6 +207,13 @@ public final class ModelHandler { } + private static void registerPylons() { + Item item = Item.getItemFromBlock(ModBlocks.pylon); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("botania:pylon", "variant=mana")); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/model/IPylonModel.java b/src/main/java/vazkii/botania/client/model/IPylonModel.java index c795092a5..1b0801004 100644 --- a/src/main/java/vazkii/botania/client/model/IPylonModel.java +++ b/src/main/java/vazkii/botania/client/model/IPylonModel.java @@ -10,10 +10,12 @@ */ package vazkii.botania.client.model; +import vazkii.botania.api.state.enums.PylonVariant; + public interface IPylonModel { - public void renderCrystal(); - public void renderRing(); - public void renderGems(); + public void renderCrystal(PylonVariant variant); + public void renderRing(PylonVariant variant); + public void renderGems(PylonVariant variant); } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index ff5a29736..a7839b377 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,30 +10,133 @@ */ package vazkii.botania.client.model; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.crash.CrashReport; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.lib.LibResources; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.pipeline.LightUtil; +import org.lwjgl.opengl.GL11; +import vazkii.botania.api.state.enums.PylonVariant; + +import java.io.IOException; +import java.util.List; +import java.util.Set; public class ModelPylon implements IPylonModel { - //private IModelCustom model; - // todo 1.8 restore + private IFlexibleBakedModel manaCrystal; + private IFlexibleBakedModel manaRingsAndPanes; + private IFlexibleBakedModel manaGems; + + private IFlexibleBakedModel naturaCrystal; + private IFlexibleBakedModel naturaRingsAndPanes; + private IFlexibleBakedModel naturaGems; + + private IFlexibleBakedModel gaiaCrystal; + private IFlexibleBakedModel gaiaRingsAndPanes; + private IFlexibleBakedModel gaiaGems; + + private static final Function TEXTUREGETTER = new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }; + + private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "CrystalRing", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + public ModelPylon() { - //model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); + try { + OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:model/block/pylon.obj"))); + + OBJModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon"))); + OBJModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon1"))); + OBJModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon2"))); + + // Turn off all except "Crystal" + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn off all except "CrystalRing", and "Ring_Panel0x" + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn off all except "Ring_Gem0x" + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + } catch (IOException e) { + throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); + } } @Override - public void renderCrystal() { - //model.renderPart("Crystal"); + public void renderCrystal(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaCrystal); break; + case NATURA: renderModel(naturaCrystal); break; + case GAIA: renderModel(gaiaCrystal); break; + } } @Override - public void renderRing() { - //model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + public void renderRing(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaRingsAndPanes); break; + case NATURA: renderModel(naturaRingsAndPanes); break; + case GAIA: renderModel(gaiaRingsAndPanes); break; + } } @Override - public void renderGems() { - //for(int i = 1; i < 5; i++) - //model.renderPart("Ring_Gem0" + i); + public void renderGems(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaGems); break; + case NATURA: renderModel(naturaGems); break; + case GAIA: renderModel(gaiaGems); break; + } + } + + private void renderModel(IFlexibleBakedModel model) + { + renderModel(model, -1); + } + + private void renderModel(IFlexibleBakedModel model, int color) + { + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); + + for (EnumFacing enumfacing : EnumFacing.values()) + { + this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color); + } + + this.renderQuads(worldrenderer, model.getGeneralQuads(), color); + tessellator.draw(); + } + + private void renderQuads(WorldRenderer renderer, List quads, int color) + { + for (BakedQuad bakedquad : quads) + LightUtil.renderQuadColor(renderer, bakedquad, color); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index c600dd261..a6e664923 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import vazkii.botania.api.state.enums.PylonVariant; public class ModelPylonOld extends ModelBase implements IPylonModel { @@ -119,7 +120,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderCrystal() { + public void renderCrystal(PylonVariant variant) { float f = 1F / 16F; crystal1.render(f); crystal2.render(f); @@ -132,7 +133,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderRing() { + public void renderRing(PylonVariant variant) { float f = 1F / 16F; outside1.render(f); outside2.render(f); @@ -151,7 +152,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderGems() { + public void renderGems(PylonVariant variant) { // NO-OP } 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 adc174e65..02302c602 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -15,13 +15,18 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -57,14 +62,16 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GlStateManager.color(1F, 1F, 1F, a); + PylonVariant variant = null; if(tileentity.getWorld() != null) { - green = tileentity.getBlockMetadata() == 1; - pink = tileentity.getBlockMetadata() == 2; + variant = ((PylonVariant) tileentity.getWorld().getBlockState(tileentity.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT)); + green = variant == PylonVariant.NATURA; + pink = variant == PylonVariant.GAIA; } if(ConfigHandler.oldPylonModel) Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); - else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture); + else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); @@ -88,9 +95,9 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { if(!ConfigHandler.oldPylonModel) GlStateManager.translate(-0.5F, 0F, 0.5F); - model.renderRing(); + model.renderRing(variant); GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); - model.renderGems(); + model.renderGems(variant); GlStateManager.popMatrix(); } @@ -106,7 +113,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.disableCull(); - model.renderCrystal(); + model.renderCrystal(variant); GlStateManager.color(1F, 1F, 1F, a); if(!ShaderHelper.useShaders()) { @@ -125,7 +132,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { else GlStateManager.translate(0F, -0.09F, 0F); ShaderHelper.useShader(ShaderHelper.pylonGlow); - model.renderCrystal(); + model.renderCrystal(variant); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 65fe7c48d..5100cf507 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -105,7 +105,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public int getRenderType() { - return LibRenderIDs.idPylon; + return 2; } @Override diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json new file mode 100644 index 000000000..d182779bd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:pylon.obj", + "transform": "forge:default-block", + "custom": { + "flip-v": true + } + }, + "variants": { + "variant": { + "mana": { "textures": { "#pylon": "botania:model/pylon" } }, + "natura": { "textures": { "#pylon": "botania:model/pylon1" } }, + "gaia": { "textures": { "#pylon": "botania:model/pylon2" } } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pylon.mtl b/src/main/resources/assets/botania/models/block/pylon.mtl new file mode 100644 index 000000000..06fc90146 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pylon.mtl @@ -0,0 +1,2 @@ +newmtl pylon +map_Kd botania:pylon \ No newline at end of file diff --git a/src/main/resources/assets/botania/model/pylon.obj b/src/main/resources/assets/botania/models/block/pylon.obj similarity index 99% rename from src/main/resources/assets/botania/model/pylon.obj rename to src/main/resources/assets/botania/models/block/pylon.obj index dcf1bbe84..825af52a2 100644 --- a/src/main/resources/assets/botania/model/pylon.obj +++ b/src/main/resources/assets/botania/models/block/pylon.obj @@ -4,7 +4,7 @@ # # object Crystal # - +mtllib pylon.mtl v 0.5000 2.0000 -0.5000 v 0.9174 1.3116 -0.5000 v 0.5000 1.3116 -0.9174 @@ -40,7 +40,7 @@ vt 0.1875 0.3594 0.5000 # 14 texture coords g Crystal -s off +usemtl pylon f 1/1/1 2/2/1 3/3/1 f 1/4/2 3/5/2 4/6/2 f 1/1/3 4/7/3 5/3/3 @@ -100,22 +100,21 @@ vt 0.0234 0.7813 0.5817 # 24 texture coords g Ring_Panel03 -s 2 f 7/15/9 8/16/9 9/17/9 -f 9/17/9 10/18/9 7/15/9 -s 4 +f 9/17/9 10/18/9 7/15/9 + f 11/19/10 12/20/10 13/21/10 f 13/21/10 14/22/10 11/19/10 -s 8 + f 7/23/11 10/24/11 12/25/11 -f 12/25/11 11/26/11 7/23/11 -s 16 +f 12/25/11 11/26/11 7/23/11 + f 10/27/12 9/28/12 13/29/12 f 13/29/12 12/30/12 10/27/12 -s 32 + f 9/31/13 8/32/13 14/33/13 f 14/33/13 13/34/13 9/31/13 -s 64 + f 8/35/14 7/36/14 11/37/14 f 11/37/14 14/38/14 8/35/14 # 12 faces @@ -169,22 +168,22 @@ vt 0.0625 0.5234 0.5741 # 24 texture coords g Ring_Gem03 -s 2 + f 15/39/15 16/40/15 17/41/15 f 17/41/15 18/42/15 15/39/15 -s 4 + f 19/43/16 20/44/16 21/45/16 f 21/45/16 22/46/16 19/43/16 -s 8 + f 15/47/17 18/48/17 20/49/17 f 20/49/17 19/50/17 15/47/17 -s 16 + f 18/51/18 17/52/18 21/53/18 f 21/53/18 20/54/18 18/51/18 -s 32 + f 17/55/19 16/56/19 22/57/19 f 22/57/19 21/58/19 17/55/19 -s 64 + f 16/59/20 15/60/20 19/61/20 f 19/61/20 22/62/20 16/59/20 # 12 faces From 3d41be585b84e618224c75414c8b0fbcf30b9a8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 23:26:27 -0600 Subject: [PATCH 083/935] Pylons kinda working --- .../botania/client/model/ModelPylon.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index a7839b377..587184a61 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -26,6 +26,7 @@ import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.pipeline.LightUtil; @@ -57,31 +58,37 @@ public class ModelPylon implements IPylonModel { } }; - private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "CrystalRing", "Ring_Panel01", "Ring_Panel02", + private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); public ModelPylon() { try { - OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:model/block/pylon.obj"))); + OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); - OBJModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon"))); - OBJModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon1"))); - OBJModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon2"))); + IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); + IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); + IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); // Turn off all except "Crystal" - manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - // Turn off all except "CrystalRing", and "Ring_Panel0x" - manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // Turn off all except "Crystal_Ring", and "Ring_Panel0x" + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); // Turn off all except "Ring_Gem0x" - manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); } catch (IOException e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } @@ -125,11 +132,6 @@ public class ModelPylon implements IPylonModel { WorldRenderer worldrenderer = tessellator.getWorldRenderer(); worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); - for (EnumFacing enumfacing : EnumFacing.values()) - { - this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color); - } - this.renderQuads(worldrenderer, model.getGeneralQuads(), color); tessellator.draw(); } From b10615c909fbdc066177b4ac8c703aab9557f95b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 00:42:00 -0600 Subject: [PATCH 084/935] Revert unnecessary changes --- .../java/vazkii/botania/common/Botania.java | 23 +++++---- .../botania/common/item/ItemManaCookie.java | 14 +++--- .../vazkii/botania/common/item/ModItems.java | 49 +++++++++++++++++-- 3 files changed, 62 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 51df139d4..151f73802 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,13 @@ */ package vazkii.botania.common; +import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.integration.coloredlights.ILightHelper; +import vazkii.botania.common.integration.coloredlights.LightHelperColored; +import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; +import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -23,13 +30,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; -import vazkii.botania.common.core.handler.IMCHandler; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.integration.coloredlights.ILightHelper; -import vazkii.botania.common.integration.coloredlights.LightHelperColored; -import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; -import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { @@ -64,7 +64,6 @@ public class Botania { proxy.preInit(event); } - @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); @@ -95,8 +94,8 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - /* - * @EventHandler public void missingMappings(FMLMissingMappingsEvent event) - * { AliasHandler.onMissingMappings(event); } - */ + /*@EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + AliasHandler.onMissingMappings(event); + }*/ } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index f194ddbae..60b40037d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,17 +16,20 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { public ItemManaCookie() { super(0, 0.1F, false); - setPotionEffect(Potion.saturation.id, 1, 0, 1F); + setPotionEffect(Potion.saturation.id, 1, 0, 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(LibItemNames.MANA_COOKIE); } @@ -45,12 +48,9 @@ public class ItemManaCookie extends ItemFood { @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", - "item." + LibResources.PREFIX_MOD); + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - // todo 1.8 return - // stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? - // totalBiscuitIcon : super.getIconIndex(stack); + // todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index c7511c368..5b8c67e09 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -35,7 +35,34 @@ import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs; -import vazkii.botania.common.item.equipment.bauble.*; +import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; +import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; +import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; +import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; +import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak; +import vazkii.botania.common.item.equipment.bauble.ItemIcePendant; +import vazkii.botania.common.item.equipment.bauble.ItemItemFinder; +import vazkii.botania.common.item.equipment.bauble.ItemKnockbackBelt; +import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant; +import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; +import vazkii.botania.common.item.equipment.bauble.ItemManaRing; +import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; +import vazkii.botania.common.item.equipment.bauble.ItemMonocle; +import vazkii.botania.common.item.equipment.bauble.ItemPixieRing; +import vazkii.botania.common.item.equipment.bauble.ItemReachRing; +import vazkii.botania.common.item.equipment.bauble.ItemSpeedUpBelt; +import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; +import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt; +import vazkii.botania.common.item.equipment.bauble.ItemSwapRing; +import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; +import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; +import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; import vazkii.botania.common.item.equipment.tool.ItemStarSword; @@ -76,7 +103,19 @@ import vazkii.botania.common.item.relic.ItemKingKey; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemOdinRing; import vazkii.botania.common.item.relic.ItemThorRing; -import vazkii.botania.common.item.rod.*; +import vazkii.botania.common.item.rod.ItemCobbleRod; +import vazkii.botania.common.item.rod.ItemDirtRod; +import vazkii.botania.common.item.rod.ItemDiviningRod; +import vazkii.botania.common.item.rod.ItemExchangeRod; +import vazkii.botania.common.item.rod.ItemFireRod; +import vazkii.botania.common.item.rod.ItemGravityRod; +import vazkii.botania.common.item.rod.ItemMissileRod; +import vazkii.botania.common.item.rod.ItemRainbowRod; +import vazkii.botania.common.item.rod.ItemSkyDirtRod; +import vazkii.botania.common.item.rod.ItemSmeltRod; +import vazkii.botania.common.item.rod.ItemTerraformRod; +import vazkii.botania.common.item.rod.ItemTornadoRod; +import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -280,7 +319,7 @@ public final class ModItems { terraPick = new ItemTerraPick(); divaCharm = new ItemDivaCharm(); flightTiara = new ItemFlightTiara(); - enderDagger = new ItemEnderDagger(); + enderDagger = new ItemEnderDagger(); quartz = new ItemQuartz(); waterRod = new ItemWaterRod(); elementiumHelm = new ItemElementiumHelm(); @@ -379,7 +418,7 @@ public final class ModItems { baubleBox = new ItemBaubleBox(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); - for (int i = 0; i < 16; i++) { + for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i)); OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); @@ -418,7 +457,7 @@ public final class ModItems { BotaniaAPI.blackListItemFromLoonium(blackLotus); int min = Item.getIdFromItem(Items.record_13); int max = Item.getIdFromItem(Items.record_wait); - for (int i = min; i <= max; i++) + for(int i = min; i <= max; i++) BotaniaAPI.blackListItemFromLoonium(Item.getItemById(i)); OreDictionary.registerOre("rodBlaze", Items.blaze_rod); From 0887191a64c6dc8de9d51f454967a677445ee66a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 14:30:18 -0600 Subject: [PATCH 085/935] All stair models done --- MC18_notes.txt | 1 + .../client/core/handler/ModelHandler.java | 56 +++++++--- .../blockstates/biomeStoneA0Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA10Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA11Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA12Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA13Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA14Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA15Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA1Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA2Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA3Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA4Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA5Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA6Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA7Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA8Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneA9Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB0Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB1Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB2Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB3Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB4Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB5Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB6Stairs.json | 66 ++++++++++++ .../blockstates/biomeStoneB7Stairs.json | 66 ++++++++++++ .../blockstates/customBrick0Stairs.json | 66 ++++++++++++ .../blockstates/customBrick1Stairs.json | 66 ++++++++++++ .../blockstates/customBrick2Stairs.json | 66 ++++++++++++ .../blockstates/customBrick3Stairs.json | 66 ++++++++++++ .../botania/blockstates/dreamwood0Stairs.json | 66 ++++++++++++ .../botania/blockstates/dreamwood1Stairs.json | 66 ++++++++++++ .../assets/botania/blockstates/elfGlass.json | 18 +++- .../blockstates/endStoneBrick0Stairs.json | 66 ++++++++++++ .../blockstates/endStoneBrick2Stairs.json | 66 ++++++++++++ .../blockstates/livingrock0Stairs.json | 102 +++++++++++------- .../blockstates/livingrock1Stairs.json | 102 +++++++++++------- .../blockstates/livingwood0Stairs.json | 102 +++++++++++------- .../blockstates/livingwood1Stairs.json | 102 +++++++++++------- .../assets/botania/blockstates/manaGlass.json | 14 ++- .../botania/blockstates/pavement0Stairs.json | 66 ++++++++++++ .../botania/blockstates/pavement1Stairs.json | 66 ++++++++++++ .../botania/blockstates/pavement2Stairs.json | 66 ++++++++++++ .../botania/blockstates/pavement3Stairs.json | 66 ++++++++++++ .../botania/blockstates/pavement4Stairs.json | 66 ++++++++++++ .../botania/blockstates/pavement5Stairs.json | 66 ++++++++++++ .../blockstates/prismarine0Stairs.json | 66 ++++++++++++ .../blockstates/prismarine1Stairs.json | 66 ++++++++++++ .../blockstates/prismarine2Stairs.json | 66 ++++++++++++ .../blockstates/quartzStairsBlaze.json | 66 ++++++++++++ .../botania/blockstates/quartzStairsDark.json | 66 ++++++++++++ .../botania/blockstates/quartzStairsElf.json | 66 ++++++++++++ .../blockstates/quartzStairsLavender.json | 66 ++++++++++++ .../botania/blockstates/quartzStairsMana.json | 66 ++++++++++++ .../botania/blockstates/quartzStairsRed.json | 66 ++++++++++++ .../blockstates/quartzStairsSunny.json | 66 ++++++++++++ .../botania/blockstates/reedBlock0Stairs.json | 66 ++++++++++++ .../blockstates/shimmerrock0Stairs.json | 66 ++++++++++++ .../blockstates/shimmerwoodPlanks0Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone0Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone10Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone11Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone1Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone2Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone3Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone8Stairs.json | 66 ++++++++++++ .../botania/blockstates/stone9Stairs.json | 66 ++++++++++++ .../botania/blockstates/thatch0Stairs.json | 66 ++++++++++++ .../assets/botania/models/block/elfGlass.json | 6 -- .../botania/models/block/elfGlass0.json | 6 -- .../botania/models/block/elfGlass1.json | 6 -- .../botania/models/block/elfGlass2.json | 6 -- .../botania/models/block/elfGlass3.json | 6 -- .../block/livingrock_brick_inner_stairs.json | 8 -- .../block/livingrock_brick_outer_stairs.json | 8 -- .../models/block/livingrock_brick_stairs.json | 8 -- .../models/block/livingrock_inner_stairs.json | 8 -- .../models/block/livingrock_outer_stairs.json | 8 -- .../models/block/livingrock_stairs.json | 8 -- .../models/block/livingwood_outer_stairs.json | 8 -- .../block/livingwood_planks_inner_stairs.json | 8 -- .../block/livingwood_planks_outer_stairs.json | 8 -- .../block/livingwood_planks_stairs.json | 8 -- .../models/block/livingwood_stairs.json | 8 -- .../botania/models/block/manaGlass.json | 6 -- .../assets/botania/models/item/elfGlass.json | 10 -- .../models/item/livingrock0Stairs.json | 13 --- .../models/item/livingrock1Stairs.json | 13 --- .../models/item/livingwood0Stairs.json | 13 --- .../models/item/livingwood1Stairs.json | 13 --- .../assets/botania/models/item/manaGlass.json | 10 -- 91 files changed, 4277 insertions(+), 376 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick3Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement3Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement4Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement5Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsDark.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsElf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsLavender.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsMana.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsRed.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzStairsSunny.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone0Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone10Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone11Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone1Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone2Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone3Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone8Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/stone9Stairs.json create mode 100644 src/main/resources/assets/botania/blockstates/thatch0Stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/elfGlass.json delete mode 100644 src/main/resources/assets/botania/models/block/elfGlass0.json delete mode 100644 src/main/resources/assets/botania/models/block/elfGlass1.json delete mode 100644 src/main/resources/assets/botania/models/block/elfGlass2.json delete mode 100644 src/main/resources/assets/botania/models/block/elfGlass3.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/manaGlass.json delete mode 100644 src/main/resources/assets/botania/models/item/elfGlass.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock0Stairs.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock1Stairs.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood0Stairs.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood1Stairs.json delete mode 100644 src/main/resources/assets/botania/models/item/manaGlass.json diff --git a/MC18_notes.txt b/MC18_notes.txt index ca56cc4a4..244388b76 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -20,6 +20,7 @@ Unless someone figures out a way to use the old one * The alt textures will probably be a resource pack now to decrease complexity... sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack * Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them +* Quartz stair textures may be assigned incorrectly - resource pack authors check me -- Todo -- * JSON models for everything (tedious/med-hard) 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 69832fa8e..95f4be213 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -7,10 +7,8 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; @@ -18,7 +16,6 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; -import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -45,9 +42,9 @@ public final class ModelHandler { /** ItemBlocks **/ registerStandardBlocks(); - registerStorageItemBlocks(); - registerMushroomItemBlocks(); - registerFlowerItemBlocks(); + registerStorage(); + registerMushrooms(); + registerFlowers(); registerLivingRockWood(); registerAltGrass(); registerStairs(); @@ -194,7 +191,7 @@ public final class ModelHandler { } } - private static void registerStorageItemBlocks() { + private static void registerStorage() { Item item = Item.getItemFromBlock(ModBlocks.storage); for (StorageVariant variant : StorageVariant.values()) { String name = "botania:storage_" + variant.getName(); @@ -203,7 +200,7 @@ public final class ModelHandler { } } - private static void registerMushroomItemBlocks() { + private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:mushroom_" + color.getName(); @@ -212,7 +209,7 @@ public final class ModelHandler { } } - private static void registerFlowerItemBlocks() { + private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:flower_" + color.getName(); @@ -245,11 +242,44 @@ public final class ModelHandler { } private static void registerStairs() { - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + for (Block b : ModFluffBlocks.stoneStairs) { + registerItemModel(b); + } + + for (Block b : ModFluffBlocks.pavementStairs) { + registerItemModel(b); + } + + for (Block b : ModFluffBlocks.biomeStoneStairs) { + registerItemModel(b); + } + + registerItemModel(ModFluffBlocks.blazeQuartzStairs); + registerItemModel(ModFluffBlocks.darkPrismarineStairs); + registerItemModel(ModFluffBlocks.darkQuartzStairs); + registerItemModel(ModFluffBlocks.dreamwoodStairs); + registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); + registerItemModel(ModFluffBlocks.elfQuartzStairs); + registerItemModel(ModFluffBlocks.enderBrickStairs); + registerItemModel(ModFluffBlocks.endStoneStairs); + registerItemModel(ModFluffBlocks.lavenderQuartzStairs); registerItemModel(ModFluffBlocks.livingrockStairs); registerItemModel(ModFluffBlocks.livingrockBrickStairs); - + registerItemModel(ModFluffBlocks.livingwoodStairs); + registerItemModel(ModFluffBlocks.livingwoodPlankStairs); + registerItemModel(ModFluffBlocks.manaQuartzStairs); + registerItemModel(ModFluffBlocks.netherBrickStairs); + registerItemModel(ModFluffBlocks.prismarineStairs); + registerItemModel(ModFluffBlocks.prismarineBrickStairs); + registerItemModel(ModFluffBlocks.redQuartzStairs); + registerItemModel(ModFluffBlocks.reedStairs); + registerItemModel(ModFluffBlocks.shimmerrockStairs); + registerItemModel(ModFluffBlocks.shimmerwoodPlankStairs); + registerItemModel(ModFluffBlocks.snowBrickStairs); + registerItemModel(ModFluffBlocks.soulBrickStairs); + registerItemModel(ModFluffBlocks.sunnyQuartzStairs); + registerItemModel(ModFluffBlocks.thatchStairs); + registerItemModel(ModFluffBlocks.tileStairs); } private static void registerSlabs() { @@ -274,10 +304,12 @@ public final class ModelHandler { private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } + private static void registerItemModel(Item i,int meta) { ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); } + private static void registerItemModel(Item i) { registerItemModel(i, 0); } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json new file mode 100644 index 000000000..0d08236d3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone0", + "top": "botania:blocks/biomeStone0", + "side": "botania:blocks/biomeStone0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json new file mode 100644 index 000000000..1c7bca419 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone10", + "top": "botania:blocks/biomeStone10", + "side": "botania:blocks/biomeStone10" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json new file mode 100644 index 000000000..721f4564e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone11", + "top": "botania:blocks/biomeStone11", + "side": "botania:blocks/biomeStone11" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json new file mode 100644 index 000000000..d2b0fa184 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone12", + "top": "botania:blocks/biomeStone12", + "side": "botania:blocks/biomeStone12" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json new file mode 100644 index 000000000..feb1105eb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone13", + "top": "botania:blocks/biomeStone13", + "side": "botania:blocks/biomeStone13" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json new file mode 100644 index 000000000..663d23369 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone14", + "top": "botania:blocks/biomeStone14", + "side": "botania:blocks/biomeStone14" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json new file mode 100644 index 000000000..6c76e119f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone15", + "top": "botania:blocks/biomeStone15", + "side": "botania:blocks/biomeStone15" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json new file mode 100644 index 000000000..6a87bdc04 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone1", + "top": "botania:blocks/biomeStone1", + "side": "botania:blocks/biomeStone1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json new file mode 100644 index 000000000..15f60bbf1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone2", + "top": "botania:blocks/biomeStone2", + "side": "botania:blocks/biomeStone2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json new file mode 100644 index 000000000..2edb11337 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone3", + "top": "botania:blocks/biomeStone3", + "side": "botania:blocks/biomeStone3" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json new file mode 100644 index 000000000..12b63afe4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone4", + "top": "botania:blocks/biomeStone4", + "side": "botania:blocks/biomeStone4" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json new file mode 100644 index 000000000..1d833491c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone5", + "top": "botania:blocks/biomeStone5", + "side": "botania:blocks/biomeStone5" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json new file mode 100644 index 000000000..abdc37660 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone6", + "top": "botania:blocks/biomeStone6", + "side": "botania:blocks/biomeStone6" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json new file mode 100644 index 000000000..03ce79ed2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone7", + "top": "botania:blocks/biomeStone7", + "side": "botania:blocks/biomeStone7" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json new file mode 100644 index 000000000..d09b9368d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone8", + "top": "botania:blocks/biomeStone8", + "side": "botania:blocks/biomeStone8" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json new file mode 100644 index 000000000..3932c8886 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone9", + "top": "botania:blocks/biomeStone9", + "side": "botania:blocks/biomeStone9" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json new file mode 100644 index 000000000..bb014aa1d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone16", + "top": "botania:blocks/biomeStone16", + "side": "botania:blocks/biomeStone16" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json new file mode 100644 index 000000000..ac7e9f0fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone17", + "top": "botania:blocks/biomeStone17", + "side": "botania:blocks/biomeStone17" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json new file mode 100644 index 000000000..955551485 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone18", + "top": "botania:blocks/biomeStone18", + "side": "botania:blocks/biomeStone18" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json new file mode 100644 index 000000000..abfc2f07e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone19", + "top": "botania:blocks/biomeStone19", + "side": "botania:blocks/biomeStone19" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json new file mode 100644 index 000000000..942aa3f6e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone20", + "top": "botania:blocks/biomeStone20", + "side": "botania:blocks/biomeStone20" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json new file mode 100644 index 000000000..c6a647035 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone21", + "top": "botania:blocks/biomeStone21", + "side": "botania:blocks/biomeStone21" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json new file mode 100644 index 000000000..4ae4695fb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone22", + "top": "botania:blocks/biomeStone22", + "side": "botania:blocks/biomeStone22" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json new file mode 100644 index 000000000..8ea7a37ea --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomeStone23", + "top": "botania:blocks/biomeStone23", + "side": "botania:blocks/biomeStone23" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json new file mode 100644 index 000000000..c1c21d3ef --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/customBrick0", + "top": "botania:blocks/customBrick0", + "side": "botania:blocks/customBrick0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json new file mode 100644 index 000000000..b2b69d58a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/customBrick1", + "top": "botania:blocks/customBrick1", + "side": "botania:blocks/customBrick1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json new file mode 100644 index 000000000..0aeb15fbc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/customBrick2", + "top": "botania:blocks/customBrick2", + "side": "botania:blocks/customBrick2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json new file mode 100644 index 000000000..0aaf3e289 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/customBrick3", + "top": "botania:blocks/customBrick3", + "side": "botania:blocks/customBrick3" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json new file mode 100644 index 000000000..3ba4ff866 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/dreamwood0", + "top": "botania:blocks/dreamwood0", + "side": "botania:blocks/dreamwood0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json new file mode 100644 index 000000000..a7da1db8c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/dreamwood1", + "top": "botania:blocks/dreamwood1", + "side": "botania:blocks/dreamwood1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json index fd88d3deb..c7217df6b 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlass.json +++ b/src/main/resources/assets/botania/blockstates/elfGlass.json @@ -1,10 +1,18 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all" + }, "variants": { "normal": [ - { "model": "botania:elfGlass0" }, - { "model": "botania:elfGlass1" }, - { "model": "botania:elfGlass2" }, - { "model": "botania:elfGlass3" } - ] + { "textures": { "all": "botania:blocks/elfGlass0" } }, + { "textures": { "all": "botania:blocks/elfGlass1" } }, + { "textures": { "all": "botania:blocks/elfGlass2" } }, + { "textures": { "all": "botania:blocks/elfGlass3" } } + ], + "inventory": [{ + "transform": "forge:default-block", + "textures": { "all": "botania:blocks/elfGlass" } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json new file mode 100644 index 000000000..ba92aa5ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/endStoneBrick0", + "top": "botania:blocks/endStoneBrick0", + "side": "botania:blocks/endStoneBrick0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json new file mode 100644 index 000000000..e61c67872 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/endStoneBrick2", + "top": "botania:blocks/endStoneBrick2", + "side": "botania:blocks/endStoneBrick2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json index b80d9a790..968cdfb8e 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json @@ -1,44 +1,66 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + } + }, "variants": { - "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "botania:livingrock_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_inner_stairs", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json index 0425096ce..1d33819f2 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json @@ -1,44 +1,66 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + } + }, "variants": { - "facing=east,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "botania:livingrock_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "botania:livingrock_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "botania:livingrock_brick_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "botania:livingrock_brick_inner_stairs", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json index 0b5ca469c..9670c00c2 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json @@ -1,44 +1,66 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + } + }, "variants": { - "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "botania:livingwood_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_inner_stairs", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json index 13a28ac98..e8009ef35 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json @@ -1,44 +1,66 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + } + }, "variants": { - "facing=east,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "botania:livingwood_planks_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "botania:livingwood_planks_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "botania:livingwood_planks_outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "botania:livingwood_planks_inner_stairs", "x": 180, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] } } diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json index 4ca5115ee..23e66042a 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlass.json +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -1,7 +1,15 @@ { - "variants": { - "normal": { - "model": "botania:manaGlass" + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/manaGlass" } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json new file mode 100644 index 000000000..9858124f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement0", + "top": "botania:blocks/pavement0", + "side": "botania:blocks/pavement0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json new file mode 100644 index 000000000..d1d9c77a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement1", + "top": "botania:blocks/pavement1", + "side": "botania:blocks/pavement1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json new file mode 100644 index 000000000..2ee4d6af4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement2", + "top": "botania:blocks/pavement2", + "side": "botania:blocks/pavement2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json new file mode 100644 index 000000000..6401fe3f4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement3", + "top": "botania:blocks/pavement3", + "side": "botania:blocks/pavement3" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json new file mode 100644 index 000000000..e0c85e718 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement4", + "top": "botania:blocks/pavement4", + "side": "botania:blocks/pavement4" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json new file mode 100644 index 000000000..b9bf7186d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/pavement5", + "top": "botania:blocks/pavement5", + "side": "botania:blocks/pavement5" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json new file mode 100644 index 000000000..c416da64d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/prismarine0", + "top": "botania:blocks/prismarine0", + "side": "botania:blocks/prismarine0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json new file mode 100644 index 000000000..a89d30cfa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/prismarine1", + "top": "botania:blocks/prismarine1", + "side": "botania:blocks/prismarine1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json new file mode 100644 index 000000000..7fc8005ff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/prismarine2", + "top": "botania:blocks/prismarine2", + "side": "botania:blocks/prismarine2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json new file mode 100644 index 000000000..ad0c0f86d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json new file mode 100644 index 000000000..c60d760f0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json new file mode 100644 index 000000000..acebecc27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json new file mode 100644 index 000000000..11968f807 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json new file mode 100644 index 000000000..38967450f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json new file mode 100644 index 000000000..9fb425f8c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json new file mode 100644 index 000000000..16e139894 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json new file mode 100644 index 000000000..8d24b4c7b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/reedBlock0", + "top": "botania:blocks/reedBlock0", + "side": "botania:blocks/reedBlock0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "mdinecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json new file mode 100644 index 000000000..bdde808f3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/shimmerrock", + "top": "botania:blocks/shimmerrock", + "side": "botania:blocks/shimmerrock" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json new file mode 100644 index 000000000..88b6e9550 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/shimmerwoodPlanks", + "top": "botania:blocks/shimmerwoodPlanks", + "side": "botania:blocks/shimmerwoodPlanks" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone0Stairs.json b/src/main/resources/assets/botania/blockstates/stone0Stairs.json new file mode 100644 index 000000000..d7dbb8d16 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone0", + "top": "botania:blocks/stone0", + "side": "botania:blocks/stone0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone10Stairs.json b/src/main/resources/assets/botania/blockstates/stone10Stairs.json new file mode 100644 index 000000000..db791072b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone10", + "top": "botania:blocks/stone10", + "side": "botania:blocks/stone10" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone11Stairs.json b/src/main/resources/assets/botania/blockstates/stone11Stairs.json new file mode 100644 index 000000000..b1c8c95f3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone11", + "top": "botania:blocks/stone11", + "side": "botania:blocks/stone11" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone1Stairs.json b/src/main/resources/assets/botania/blockstates/stone1Stairs.json new file mode 100644 index 000000000..a64c19749 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone1", + "top": "botania:blocks/stone1", + "side": "botania:blocks/stone1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone2Stairs.json b/src/main/resources/assets/botania/blockstates/stone2Stairs.json new file mode 100644 index 000000000..4ef18ccb4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone2", + "top": "botania:blocks/stone2", + "side": "botania:blocks/stone2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone3Stairs.json b/src/main/resources/assets/botania/blockstates/stone3Stairs.json new file mode 100644 index 000000000..84d11a672 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone3", + "top": "botania:blocks/stone3", + "side": "botania:blocks/stone3" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone8Stairs.json b/src/main/resources/assets/botania/blockstates/stone8Stairs.json new file mode 100644 index 000000000..c399ad4ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone8", + "top": "botania:blocks/stone8", + "side": "botania:blocks/stone8" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/stone9Stairs.json b/src/main/resources/assets/botania/blockstates/stone9Stairs.json new file mode 100644 index 000000000..a29c9d1d7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/stone9", + "top": "botania:blocks/stone9", + "side": "botania:blocks/stone9" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json new file mode 100644 index 000000000..ee3e5ca74 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json @@ -0,0 +1,66 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/thatch", + "top": "botania:blocks/thatch", + "side": "botania:blocks/thatch" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "inventory": [{ + "model": "minecraft:stairs", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], + "translation": [ 0, 0.09375, -0.171875 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": { "y": 180 } + } + } + }] + } +} diff --git a/src/main/resources/assets/botania/models/block/elfGlass.json b/src/main/resources/assets/botania/models/block/elfGlass.json deleted file mode 100644 index 6bea253b2..000000000 --- a/src/main/resources/assets/botania/models/block/elfGlass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/elfGlass" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass0.json b/src/main/resources/assets/botania/models/block/elfGlass0.json deleted file mode 100644 index 22f41bd0b..000000000 --- a/src/main/resources/assets/botania/models/block/elfGlass0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/elfGlass0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass1.json b/src/main/resources/assets/botania/models/block/elfGlass1.json deleted file mode 100644 index c81653d71..000000000 --- a/src/main/resources/assets/botania/models/block/elfGlass1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/elfGlass1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass2.json b/src/main/resources/assets/botania/models/block/elfGlass2.json deleted file mode 100644 index 294ace490..000000000 --- a/src/main/resources/assets/botania/models/block/elfGlass2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/elfGlass2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass3.json b/src/main/resources/assets/botania/models/block/elfGlass3.json deleted file mode 100644 index 842d799df..000000000 --- a/src/main/resources/assets/botania/models/block/elfGlass3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/elfGlass3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json deleted file mode 100644 index fd830fe0b..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingrock1", - "top": "botania:blocks/livingrock1", - "side": "botania:blocks/livingrock1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json deleted file mode 100644 index 64526c211..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "botania:blocks/livingrock1", - "top": "botania:blocks/livingrock1", - "side": "botania:blocks/livingrock1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json deleted file mode 100644 index 5b7aabc77..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "botania:blocks/livingrock1", - "top": "botania:blocks/livingrock1", - "side": "botania:blocks/livingrock1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json deleted file mode 100644 index 29bcf876b..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingrock0", - "top": "botania:blocks/livingrock0", - "side": "botania:blocks/livingrock0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json deleted file mode 100644 index eaa8878fe..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "botania:blocks/livingrock0", - "top": "botania:blocks/livingrock0", - "side": "botania:blocks/livingrock0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingrock_stairs.json b/src/main/resources/assets/botania/models/block/livingrock_stairs.json deleted file mode 100644 index 3a5e84dd8..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "botania:blocks/livingrock0", - "top": "botania:blocks/livingrock0", - "side": "botania:blocks/livingrock0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json deleted file mode 100644 index c2aa14218..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "botania:blocks/livingwood0", - "top": "botania:blocks/livingwood0", - "side": "botania:blocks/livingwood0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json deleted file mode 100644 index 0bffa08dd..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingwood1", - "top": "botania:blocks/livingwood1", - "side": "botania:blocks/livingwood1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json deleted file mode 100644 index e70bb4c98..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_outer_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "botania:blocks/livingwood1", - "top": "botania:blocks/livingwood1", - "side": "botania:blocks/livingwood1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json deleted file mode 100644 index 075da8cef..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "botania:blocks/livingwood1", - "top": "botania:blocks/livingwood1", - "side": "botania:blocks/livingwood1" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_stairs.json deleted file mode 100644 index 110841261..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "botania:blocks/livingwood0", - "top": "botania:blocks/livingwood0", - "side": "botania:blocks/livingwood0" - } -} diff --git a/src/main/resources/assets/botania/models/block/manaGlass.json b/src/main/resources/assets/botania/models/block/manaGlass.json deleted file mode 100644 index dc3338aa9..000000000 --- a/src/main/resources/assets/botania/models/block/manaGlass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/manaGlass" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elfGlass.json b/src/main/resources/assets/botania/models/item/elfGlass.json deleted file mode 100644 index 75ea7c4fa..000000000 --- a/src/main/resources/assets/botania/models/item/elfGlass.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/elfGlass", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock0Stairs.json b/src/main/resources/assets/botania/models/item/livingrock0Stairs.json deleted file mode 100644 index 58c94dff8..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock0Stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "botania:block/livingrock_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock1Stairs.json b/src/main/resources/assets/botania/models/item/livingrock1Stairs.json deleted file mode 100644 index 1d48de23e..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock1Stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "botania:block/livingrock_brick_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood0Stairs.json b/src/main/resources/assets/botania/models/item/livingwood0Stairs.json deleted file mode 100644 index aeb312db2..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood0Stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "botania:block/livingwood_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood1Stairs.json b/src/main/resources/assets/botania/models/item/livingwood1Stairs.json deleted file mode 100644 index 1f229b9ee..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood1Stairs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "botania:block/livingwood_planks_stairs", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGlass.json b/src/main/resources/assets/botania/models/item/manaGlass.json deleted file mode 100644 index 9bd86d80a..000000000 --- a/src/main/resources/assets/botania/models/item/manaGlass.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/manaGlass", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file From cfaeecc41a0783335aba30616c19e7936852efe2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 16:03:07 -0600 Subject: [PATCH 086/935] Panes, and fixes so no crashes in debug world --- MC18_notes.txt | 6 ++-- .../client/core/handler/ModelHandler.java | 4 ++- .../render/tile/RenderTileLightRelay.java | 2 +- .../botania/common/block/BlockGhostRail.java | 25 ++++++++++++-- .../common/block/BlockModDoubleFlower.java | 2 +- .../common/block/BlockModDoubleFlower1.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../block/decor/panes/BlockAlfglassPane.java | 5 +++ .../block/decor/panes/BlockBifrostPane.java | 5 +++ .../block/decor/panes/BlockManaglassPane.java | 6 ++++ .../block/decor/panes/BlockModPane.java | 5 --- .../common/block/mana/BlockBellows.java | 4 +-- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../common/block/tile/mana/TileBellows.java | 5 +-- .../block/tile/mana/TileRFGenerator.java | 4 +-- .../botania/blockstates/bifrostPermPane.json | 34 +++++++++++++++++++ .../botania/blockstates/elfGlassPane.json | 34 +++++++++++++++++++ .../botania/blockstates/manaGlassPane.json | 34 +++++++++++++++++++ .../botania/blockstates/reedBlock0Stairs.json | 2 +- 19 files changed, 160 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/bifrostPermPane.json create mode 100644 src/main/resources/assets/botania/blockstates/elfGlassPane.json create mode 100644 src/main/resources/assets/botania/blockstates/manaGlassPane.json diff --git a/MC18_notes.txt b/MC18_notes.txt index 244388b76..de9c28fb4 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -14,13 +14,14 @@ Anyways, vanilla removed it from their method so we follow suit. * Most things left untouched to make patches from upstream easier * Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances since BlockPos'es are immutable and thus can be reused everywhere. -* Some really needed fields in EntityItem are private now. Reflection time :(. If this is a +* Some really needed fields in EntityItem are private now. Reflection time :( * Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. Unless someone figures out a way to use the old one * The alt textures will probably be a resource pack now to decrease complexity... sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack * Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them * Quartz stair textures may be assigned incorrectly - resource pack authors check me +* Glass pane inner faces are not getting culled -- Todo -- * JSON models for everything (tedious/med-hard) @@ -28,5 +29,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is * For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.) - Sub to texture stitch and bake our own model there to use? - This remains the largest portion of what is left - - Where is the method to render an arbitrary baked model? -* ItemBlocks seem to merge subtypes (shift clicking storage blocks onto each other) \ No newline at end of file + - Where is the method to render an arbitrary baked model? \ No newline at end of file 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 95f4be213..0e5979e28 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -291,7 +291,9 @@ public final class ModelHandler { } private static void registerPanes() { - + registerItemModel(ModFluffBlocks.alfglassPane); + registerItemModel(ModFluffBlocks.bifrostPane); + registerItemModel(ModFluffBlocks.managlassPane); } private static void registerPylons() { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index f6d388395..4e009edbf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -76,7 +76,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float f6 = 0.25F; p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); + //p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); //p_77026_1_.getWorldRenderer().setBrightness(240); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).endVertex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index a2f0449a9..52b7311e0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -12,7 +12,11 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -34,6 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { + public static final PropertyEnum SHAPE = BlockRailPowered.SHAPE; private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { @@ -41,6 +46,22 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); MinecraftForge.EVENT_BUS.register(this); setUnlocalizedName(LibBlockNames.GHOST_RAIL); + setDefaultState(blockState.getBaseState().withProperty(SHAPE, EnumRailDirection.NORTH_SOUTH)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, SHAPE); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(SHAPE).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(SHAPE, EnumRailDirection.byMetadata(meta)); } @Override @@ -87,7 +108,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @Override - public IProperty getShapeProperty() { - return null; // todo 1.8 ?? + public IProperty getShapeProperty() { + return BlockRailPowered.SHAPE; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 6148fe2b2..7493e23bb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -212,7 +212,7 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = ((EnumDyeColor) state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 350af4c3f..634f644ae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -31,6 +31,6 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public IBlockState getStateFromMeta(int meta) { BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; meta &= -9; - return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta)); + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 8b98081c4..a3e45b9d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -69,6 +69,6 @@ public class BlockBuriedPetals extends BlockModFlower { @Override public int getRenderType() { - return 0; + return -1; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 081d8e7da..256471165 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; +import net.minecraft.util.EnumWorldBlockLayer; import vazkii.botania.common.block.ModBlocks; public class BlockAlfglassPane extends BlockModPane { @@ -18,4 +19,8 @@ public class BlockAlfglassPane extends BlockModPane { super(ModBlocks.elfGlass); } + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.TRANSLUCENT; + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 536421cb7..13cde90b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; +import net.minecraft.util.EnumWorldBlockLayer; import vazkii.botania.common.block.ModBlocks; public class BlockBifrostPane extends BlockModPane { @@ -18,4 +19,8 @@ public class BlockBifrostPane extends BlockModPane { super(ModBlocks.bifrostPerm); } + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.TRANSLUCENT; + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index d509b38b9..20c8e69ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; +import net.minecraft.util.EnumWorldBlockLayer; import vazkii.botania.common.block.ModBlocks; public class BlockManaglassPane extends BlockModPane { @@ -18,4 +19,9 @@ public class BlockManaglassPane extends BlockModPane { super(ModBlocks.manaGlass); } + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.TRANSLUCENT; + } + } 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 5e3c78f87..b086bbf39 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 @@ -49,11 +49,6 @@ public class BlockModPane extends BlockPane { return false; } - @Override - public int getRenderType() { - return 18; - } - @Override public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { Block block = world.getBlockState(pos).getBlock(); 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 d87acfc5b..01a7f7a83 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -52,12 +52,12 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } @Override 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 1ee89bdd1..26e66a514 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -41,7 +41,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable private static final Field spawnDelay = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); private static final Field mobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); private static final Field prevMobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); - private static final Method spawnNewEntity = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY); + private static final Method spawnNewEntity = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class); private static final Method getEntityNameToSpawn = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); @Override 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 c647b6298..97a850de3 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 @@ -116,8 +116,9 @@ public class TileBellows extends TileMod implements ITickable { } public TileEntity getLinkedTile() { - EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS)); - return worldObj.getTileEntity(getPos().offset(side)); + return null; +// EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS)); +// return worldObj.getTileEntity(getPos().offset(side)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index a9f713222..d75fdfea6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -15,6 +15,7 @@ import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Loader; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import cofh.api.energy.IEnergyConnection; @@ -47,9 +48,8 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - @Optional.Method(modid = "CoFHAPI|energy") public void update() { - if(!worldObj.isRemote) { + if(!worldObj.isRemote && Loader.isModLoaded("CoFHAPI|energy")) { if(deadCache) reCache(); diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json new file mode 100644 index 000000000..14b6a2719 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -0,0 +1,34 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "edge": "botania:blocks/bifrostPermPane", + "pane": "botania:blocks/bifrost" + } + }, + "variants": { + "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, + "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, + "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, + "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, + "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, + "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, + "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, + "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, + "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, + "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, + "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, + "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, + "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, + "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, + "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "inventory": [{ + "transform": "forge:default-item", + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/bifrost" + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json new file mode 100644 index 000000000..4877ed756 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -0,0 +1,34 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "edge": "botania:blocks/elfGlassPane", + "pane": "botania:blocks/elfGlass" + } + }, + "variants": { + "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, + "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, + "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, + "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, + "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, + "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, + "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, + "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, + "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, + "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, + "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, + "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, + "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, + "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, + "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "inventory": [{ + "transform": "forge:default-item", + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/elfGlass" + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json new file mode 100644 index 000000000..27be01075 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -0,0 +1,34 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "edge": "botania:blocks/manaGlassPane", + "pane": "botania:blocks/manaGlass" + } + }, + "variants": { + "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, + "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, + "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, + "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, + "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, + "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, + "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, + "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, + "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, + "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, + "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, + "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, + "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, + "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, + "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "inventory": [{ + "transform": "forge:default-item", + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/manaGlass" + } + }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index 8d24b4c7b..d86dfd521 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -17,7 +17,7 @@ "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "mdinecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, From d23cca33e1422702c6200e5a5e78026485d9f16d Mon Sep 17 00:00:00 2001 From: primetoxinz Date: Wed, 23 Dec 2015 17:07:32 -0500 Subject: [PATCH 087/935] More Item models --- .../botania/client/core/handler/ModelHandler.java | 13 +++++++++++-- .../assets/botania/models/item/cobbleRod.json | 6 ++++++ .../assets/botania/models/item/cosmetic0.json | 6 ++++++ .../assets/botania/models/item/cosmetic1.json | 6 ++++++ .../assets/botania/models/item/cosmetic10.json | 6 ++++++ .../assets/botania/models/item/cosmetic11.json | 6 ++++++ .../assets/botania/models/item/cosmetic12.json | 6 ++++++ .../assets/botania/models/item/cosmetic13.json | 6 ++++++ .../assets/botania/models/item/cosmetic14.json | 6 ++++++ .../assets/botania/models/item/cosmetic15.json | 6 ++++++ .../assets/botania/models/item/cosmetic16.json | 6 ++++++ .../assets/botania/models/item/cosmetic17.json | 6 ++++++ .../assets/botania/models/item/cosmetic18.json | 6 ++++++ .../assets/botania/models/item/cosmetic19.json | 6 ++++++ .../assets/botania/models/item/cosmetic2.json | 6 ++++++ .../assets/botania/models/item/cosmetic20.json | 6 ++++++ .../assets/botania/models/item/cosmetic21.json | 6 ++++++ .../assets/botania/models/item/cosmetic22.json | 6 ++++++ .../assets/botania/models/item/cosmetic23.json | 6 ++++++ .../assets/botania/models/item/cosmetic24.json | 6 ++++++ .../assets/botania/models/item/cosmetic25.json | 6 ++++++ .../assets/botania/models/item/cosmetic26.json | 6 ++++++ .../assets/botania/models/item/cosmetic27.json | 6 ++++++ .../assets/botania/models/item/cosmetic28.json | 6 ++++++ .../assets/botania/models/item/cosmetic29.json | 6 ++++++ .../assets/botania/models/item/cosmetic3.json | 6 ++++++ .../assets/botania/models/item/cosmetic30.json | 6 ++++++ .../assets/botania/models/item/cosmetic31.json | 6 ++++++ .../assets/botania/models/item/cosmetic4.json | 6 ++++++ .../assets/botania/models/item/cosmetic5.json | 6 ++++++ .../assets/botania/models/item/cosmetic6.json | 6 ++++++ .../assets/botania/models/item/cosmetic7.json | 6 ++++++ .../assets/botania/models/item/cosmetic8.json | 6 ++++++ .../assets/botania/models/item/cosmetic9.json | 6 ++++++ .../assets/botania/models/item/craftPattern0.json | 6 ++++++ .../assets/botania/models/item/craftPattern1.json | 6 ++++++ .../assets/botania/models/item/craftPattern2.json | 6 ++++++ .../assets/botania/models/item/craftPattern3.json | 6 ++++++ .../assets/botania/models/item/craftPattern4.json | 6 ++++++ .../assets/botania/models/item/craftPattern5.json | 6 ++++++ .../assets/botania/models/item/craftPattern6.json | 6 ++++++ .../assets/botania/models/item/craftPattern7.json | 6 ++++++ .../assets/botania/models/item/craftPattern8.json | 6 ++++++ .../assets/botania/models/item/dirtRod.json | 6 ++++++ .../assets/botania/models/item/fireRod.json | 6 ++++++ .../assets/botania/models/item/rainbowRod.json | 6 ++++++ .../resources/assets/botania/models/item/rune0.json | 6 ++++++ .../resources/assets/botania/models/item/rune1.json | 6 ++++++ .../assets/botania/models/item/rune10.json | 6 ++++++ .../assets/botania/models/item/rune11.json | 6 ++++++ .../assets/botania/models/item/rune12.json | 6 ++++++ .../assets/botania/models/item/rune13.json | 6 ++++++ .../assets/botania/models/item/rune14.json | 6 ++++++ .../assets/botania/models/item/rune15.json | 6 ++++++ .../resources/assets/botania/models/item/rune2.json | 6 ++++++ .../resources/assets/botania/models/item/rune3.json | 6 ++++++ .../resources/assets/botania/models/item/rune4.json | 6 ++++++ .../resources/assets/botania/models/item/rune5.json | 6 ++++++ .../resources/assets/botania/models/item/rune6.json | 6 ++++++ .../resources/assets/botania/models/item/rune7.json | 6 ++++++ .../resources/assets/botania/models/item/rune8.json | 6 ++++++ .../resources/assets/botania/models/item/rune9.json | 6 ++++++ .../assets/botania/models/item/skyDirtRod.json | 6 ++++++ .../assets/botania/models/item/terraformRod.json | 6 ++++++ .../assets/botania/models/item/tornadoRod.json | 6 ++++++ .../assets/botania/models/item/waterRod.json | 6 ++++++ 66 files changed, 401 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/cobbleRod.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic0.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic1.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic10.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic11.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic12.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic13.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic14.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic15.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic16.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic17.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic18.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic19.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic2.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic20.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic21.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic22.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic23.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic24.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic25.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic26.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic27.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic28.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic29.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic3.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic30.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic31.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic4.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic5.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic6.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic7.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic8.json create mode 100644 src/main/resources/assets/botania/models/item/cosmetic9.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern0.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern1.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern2.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern3.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern4.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern5.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern6.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern7.json create mode 100644 src/main/resources/assets/botania/models/item/craftPattern8.json create mode 100644 src/main/resources/assets/botania/models/item/dirtRod.json create mode 100644 src/main/resources/assets/botania/models/item/fireRod.json create mode 100644 src/main/resources/assets/botania/models/item/rainbowRod.json create mode 100644 src/main/resources/assets/botania/models/item/rune0.json create mode 100644 src/main/resources/assets/botania/models/item/rune1.json create mode 100644 src/main/resources/assets/botania/models/item/rune10.json create mode 100644 src/main/resources/assets/botania/models/item/rune11.json create mode 100644 src/main/resources/assets/botania/models/item/rune12.json create mode 100644 src/main/resources/assets/botania/models/item/rune13.json create mode 100644 src/main/resources/assets/botania/models/item/rune14.json create mode 100644 src/main/resources/assets/botania/models/item/rune15.json create mode 100644 src/main/resources/assets/botania/models/item/rune2.json create mode 100644 src/main/resources/assets/botania/models/item/rune3.json create mode 100644 src/main/resources/assets/botania/models/item/rune4.json create mode 100644 src/main/resources/assets/botania/models/item/rune5.json create mode 100644 src/main/resources/assets/botania/models/item/rune6.json create mode 100644 src/main/resources/assets/botania/models/item/rune7.json create mode 100644 src/main/resources/assets/botania/models/item/rune8.json create mode 100644 src/main/resources/assets/botania/models/item/rune9.json create mode 100644 src/main/resources/assets/botania/models/item/skyDirtRod.json create mode 100644 src/main/resources/assets/botania/models/item/terraformRod.json create mode 100644 src/main/resources/assets/botania/models/item/tornadoRod.json create mode 100644 src/main/resources/assets/botania/models/item/waterRod.json 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 0e5979e28..3e8d99428 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -56,7 +56,10 @@ public final class ModelHandler { /** Normal Items **/ registerStandardItems(); registerManaResources(); - + + registerItemModelMetas(rune, LibItemNames.RUNE, 16); + registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); + registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ } private static void registerStandardBlocks() { @@ -302,7 +305,13 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); } - + private static void registerItemModelMetas(Item item, String loc,int range) { + for(int i =0; i < range;i++) { + String name = "botania:"+loc+i; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name,"inventory")); + } + } private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/resources/assets/botania/models/item/cobbleRod.json b/src/main/resources/assets/botania/models/item/cobbleRod.json new file mode 100644 index 000000000..8ce0f99be --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cobbleRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cobbleRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic0.json b/src/main/resources/assets/botania/models/item/cosmetic0.json new file mode 100644 index 000000000..5742d526d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic0.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic0" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic1.json b/src/main/resources/assets/botania/models/item/cosmetic1.json new file mode 100644 index 000000000..614abe742 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic1.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic1" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic10.json b/src/main/resources/assets/botania/models/item/cosmetic10.json new file mode 100644 index 000000000..68fa8a7bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic10.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic10" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic11.json b/src/main/resources/assets/botania/models/item/cosmetic11.json new file mode 100644 index 000000000..c6e70cdb4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic11.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic11" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic12.json b/src/main/resources/assets/botania/models/item/cosmetic12.json new file mode 100644 index 000000000..e07528f3a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic12.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic12" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic13.json b/src/main/resources/assets/botania/models/item/cosmetic13.json new file mode 100644 index 000000000..879085ab9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic13.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic13" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic14.json b/src/main/resources/assets/botania/models/item/cosmetic14.json new file mode 100644 index 000000000..ee27a480a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic14.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic14" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic15.json b/src/main/resources/assets/botania/models/item/cosmetic15.json new file mode 100644 index 000000000..f06b70080 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic15.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic15" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic16.json b/src/main/resources/assets/botania/models/item/cosmetic16.json new file mode 100644 index 000000000..571573bd8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic16.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic16" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic17.json b/src/main/resources/assets/botania/models/item/cosmetic17.json new file mode 100644 index 000000000..8845f7d25 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic17.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic17" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic18.json b/src/main/resources/assets/botania/models/item/cosmetic18.json new file mode 100644 index 000000000..790df5f85 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic18.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic18" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic19.json b/src/main/resources/assets/botania/models/item/cosmetic19.json new file mode 100644 index 000000000..c4fad7ce9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic19.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic19" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic2.json b/src/main/resources/assets/botania/models/item/cosmetic2.json new file mode 100644 index 000000000..324f807c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic2.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic2" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic20.json b/src/main/resources/assets/botania/models/item/cosmetic20.json new file mode 100644 index 000000000..6c0f14071 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic20.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic20" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic21.json b/src/main/resources/assets/botania/models/item/cosmetic21.json new file mode 100644 index 000000000..653cdba24 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic21.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic21" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic22.json b/src/main/resources/assets/botania/models/item/cosmetic22.json new file mode 100644 index 000000000..cbfde670d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic22.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic22" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic23.json b/src/main/resources/assets/botania/models/item/cosmetic23.json new file mode 100644 index 000000000..9cc81af54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic23.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic23" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic24.json b/src/main/resources/assets/botania/models/item/cosmetic24.json new file mode 100644 index 000000000..5f1f182f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic24.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic24" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic25.json b/src/main/resources/assets/botania/models/item/cosmetic25.json new file mode 100644 index 000000000..0991f35f2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic25.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic25" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic26.json b/src/main/resources/assets/botania/models/item/cosmetic26.json new file mode 100644 index 000000000..d80e95501 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic26.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic26" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic27.json b/src/main/resources/assets/botania/models/item/cosmetic27.json new file mode 100644 index 000000000..c9a469c9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic27.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic27" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic28.json b/src/main/resources/assets/botania/models/item/cosmetic28.json new file mode 100644 index 000000000..950d90f33 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic28.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic28" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic29.json b/src/main/resources/assets/botania/models/item/cosmetic29.json new file mode 100644 index 000000000..db42cc8f0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic29.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic29" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic3.json b/src/main/resources/assets/botania/models/item/cosmetic3.json new file mode 100644 index 000000000..60b3dc449 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic3.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic3" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic30.json b/src/main/resources/assets/botania/models/item/cosmetic30.json new file mode 100644 index 000000000..f3aa478a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic30.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic30" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic31.json b/src/main/resources/assets/botania/models/item/cosmetic31.json new file mode 100644 index 000000000..8b54a07da --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic31.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic31" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic4.json b/src/main/resources/assets/botania/models/item/cosmetic4.json new file mode 100644 index 000000000..9f59fb799 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic4.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic4" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic5.json b/src/main/resources/assets/botania/models/item/cosmetic5.json new file mode 100644 index 000000000..52e86f66c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic5.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic5" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic6.json b/src/main/resources/assets/botania/models/item/cosmetic6.json new file mode 100644 index 000000000..4c17088dd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic6.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic6" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic7.json b/src/main/resources/assets/botania/models/item/cosmetic7.json new file mode 100644 index 000000000..f368359fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic7.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic7" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic8.json b/src/main/resources/assets/botania/models/item/cosmetic8.json new file mode 100644 index 000000000..6123fe1c6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic8.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic8" + } +} diff --git a/src/main/resources/assets/botania/models/item/cosmetic9.json b/src/main/resources/assets/botania/models/item/cosmetic9.json new file mode 100644 index 000000000..3ba022e8e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cosmetic9.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/cosmetic9" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern0.json b/src/main/resources/assets/botania/models/item/craftPattern0.json new file mode 100644 index 000000000..4efae3a6e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern0.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern0" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern1.json b/src/main/resources/assets/botania/models/item/craftPattern1.json new file mode 100644 index 000000000..22bdf01d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern1.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern1" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern2.json b/src/main/resources/assets/botania/models/item/craftPattern2.json new file mode 100644 index 000000000..f760afb6e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern2.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern2" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern3.json b/src/main/resources/assets/botania/models/item/craftPattern3.json new file mode 100644 index 000000000..faa5e55dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern3.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern3" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern4.json b/src/main/resources/assets/botania/models/item/craftPattern4.json new file mode 100644 index 000000000..52cc60cfd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern4.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern4" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern5.json b/src/main/resources/assets/botania/models/item/craftPattern5.json new file mode 100644 index 000000000..a31e915e7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern5.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern5" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern6.json b/src/main/resources/assets/botania/models/item/craftPattern6.json new file mode 100644 index 000000000..948080db3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern6.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern6" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern7.json b/src/main/resources/assets/botania/models/item/craftPattern7.json new file mode 100644 index 000000000..49c1aa9b8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern7.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern7" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftPattern8.json b/src/main/resources/assets/botania/models/item/craftPattern8.json new file mode 100644 index 000000000..025791134 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftPattern8.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/craftPattern8" + } +} diff --git a/src/main/resources/assets/botania/models/item/dirtRod.json b/src/main/resources/assets/botania/models/item/dirtRod.json new file mode 100644 index 000000000..514dd3fc0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dirtRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/dirtRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/fireRod.json b/src/main/resources/assets/botania/models/item/fireRod.json new file mode 100644 index 000000000..bbe9c6709 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fireRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/fireRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/rainbowRod.json b/src/main/resources/assets/botania/models/item/rainbowRod.json new file mode 100644 index 000000000..67a55682b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rainbowRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rainbowRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune0.json b/src/main/resources/assets/botania/models/item/rune0.json new file mode 100644 index 000000000..fc21dc3df --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune0.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune0" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune1.json b/src/main/resources/assets/botania/models/item/rune1.json new file mode 100644 index 000000000..9572b7d65 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune1.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune1" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune10.json b/src/main/resources/assets/botania/models/item/rune10.json new file mode 100644 index 000000000..865f87b70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune10.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune10" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune11.json b/src/main/resources/assets/botania/models/item/rune11.json new file mode 100644 index 000000000..c06891335 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune11.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune11" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune12.json b/src/main/resources/assets/botania/models/item/rune12.json new file mode 100644 index 000000000..c86e1a0a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune12.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune12" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune13.json b/src/main/resources/assets/botania/models/item/rune13.json new file mode 100644 index 000000000..f29565c9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune13.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune13" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune14.json b/src/main/resources/assets/botania/models/item/rune14.json new file mode 100644 index 000000000..78d94dc9c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune14.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune14" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune15.json b/src/main/resources/assets/botania/models/item/rune15.json new file mode 100644 index 000000000..ce7d66dc2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune15.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune15" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune2.json b/src/main/resources/assets/botania/models/item/rune2.json new file mode 100644 index 000000000..93c4450b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune2.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune2" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune3.json b/src/main/resources/assets/botania/models/item/rune3.json new file mode 100644 index 000000000..65dc3477c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune3.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune3" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune4.json b/src/main/resources/assets/botania/models/item/rune4.json new file mode 100644 index 000000000..362bf8b21 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune4.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune4" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune5.json b/src/main/resources/assets/botania/models/item/rune5.json new file mode 100644 index 000000000..530bb7efa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune5.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune5" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune6.json b/src/main/resources/assets/botania/models/item/rune6.json new file mode 100644 index 000000000..eb42efd3d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune6.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune6" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune7.json b/src/main/resources/assets/botania/models/item/rune7.json new file mode 100644 index 000000000..0868de320 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune7.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune7" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune8.json b/src/main/resources/assets/botania/models/item/rune8.json new file mode 100644 index 000000000..8af3e1fb4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune8.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune8" + } +} diff --git a/src/main/resources/assets/botania/models/item/rune9.json b/src/main/resources/assets/botania/models/item/rune9.json new file mode 100644 index 000000000..f4d5b215d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune9.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/rune9" + } +} diff --git a/src/main/resources/assets/botania/models/item/skyDirtRod.json b/src/main/resources/assets/botania/models/item/skyDirtRod.json new file mode 100644 index 000000000..dd9b98b65 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/skyDirtRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/skyDirtRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/terraformRod.json b/src/main/resources/assets/botania/models/item/terraformRod.json new file mode 100644 index 000000000..c67ecbe4c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraformRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/terraformRod" + } +} diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadoRod.json new file mode 100644 index 000000000..437e8167d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tornadoRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/tornadoRod0" + } +} diff --git a/src/main/resources/assets/botania/models/item/waterRod.json b/src/main/resources/assets/botania/models/item/waterRod.json new file mode 100644 index 000000000..2192ba6c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterRod.json @@ -0,0 +1,6 @@ +{ + "parent":"botania:item/standard_item", + "textures":{ + "layer0":"botania:items/waterRod" + } +} From eabb0f94e32ebc959fb57a7002a1514a1ee51165 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 17:19:23 -0600 Subject: [PATCH 088/935] Mana beacon, unstable block, petal block --- .../client/core/handler/ModelHandler.java | 27 +++++++++++++++++-- .../client/core/helper/RenderHelper.java | 12 ++++----- .../common/block/decor/BlockManaBeacon.java | 8 +++++- .../common/block/decor/BlockPetalBlock.java | 3 ++- .../common/block/decor/BlockUnstable.java | 3 ++- .../block/decor/slabs/BlockModSlab.java | 2 +- .../block/ItemBlockWithMetaNameAndColor.java | 19 +++++++++++++ .../block/ItemBlockWithMetadataAndName.java | 2 +- .../lexicon/page/PageCraftingRecipe.java | 2 +- .../botania/blockstates/manaBeacon.json | 16 +++++++++++ .../botania/blockstates/petalBlock.json | 15 +++++++++++ .../botania/blockstates/unstableBlock.json | 15 +++++++++++ .../botania/models/block/cube_all_tinted.json | 18 +++++++++++++ .../botania/models/block/microblock_all.json | 20 ++++++++++++++ .../botania/models/block/miniblock_top.json | 20 ++++++++++++++ 15 files changed, 167 insertions(+), 15 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java create mode 100644 src/main/resources/assets/botania/blockstates/manaBeacon.json create mode 100644 src/main/resources/assets/botania/blockstates/petalBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/unstableBlock.json create mode 100644 src/main/resources/assets/botania/models/block/cube_all_tinted.json create mode 100644 src/main/resources/assets/botania/models/block/microblock_all.json create mode 100644 src/main/resources/assets/botania/models/block/miniblock_top.json 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 0e5979e28..7705159ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -13,6 +13,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; @@ -52,6 +53,7 @@ public final class ModelHandler { registerFullSlabs(); registerPanes(); registerPylons(); + registerUnstableBeaconPetal(); /** Normal Items **/ registerStandardItems(); @@ -59,10 +61,13 @@ public final class ModelHandler { /** Special Item Meshers **/ } + private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + } + private static void registerStandardItems() { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); @@ -106,6 +111,7 @@ public final class ModelHandler { registerItemModel(thunderSword); registerItemModel(glassPick); } + private static void registerManaResources() { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { @@ -116,6 +122,11 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) + ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + // Ignore vanilla variant in flowers ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); @@ -303,6 +314,18 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); } + private static void registerUnstableBeaconPetal() { + // The blocks that are dynamically colored, not through their states + for (EnumDyeColor color : EnumDyeColor.values()) { + Item unstable = Item.getItemFromBlock(ModBlocks.unstableBlock); + Item beacon = Item.getItemFromBlock(ModBlocks.manaBeacon); + Item petal = Item.getItemFromBlock(ModBlocks.petalBlock); + ModelLoader.setCustomModelResourceLocation(unstable, color.getMetadata(), new ModelResourceLocation("botania:unstableBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(beacon, color.getMetadata(), new ModelResourceLocation("botania:manaBeacon", "inventory")); + ModelLoader.setCustomModelResourceLocation(petal, color.getMetadata(), new ModelResourceLocation("botania:petalBlock", "inventory")); + } + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 31fd4f4a6..6b7424553 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -176,13 +176,11 @@ public final class RenderHelper { int r = (color & 0xFF0000) >> 16; int g = (color & 0xFF00) >> 8; int b = (color & 0xFF); - tessellator.getWorldRenderer().putColorMultiplier(r, g, b, (int) (255F * (1F - f2))); - tessellator.getWorldRenderer().pos(0, 0, 0).endVertex(); - tessellator.getWorldRenderer().putColorMultiplier(0F, 0F, 0F, 0); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).endVertex(); + tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 255F * (1F - f2)).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); tessellator.draw(); } 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 571b2390d..770d17284 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -51,6 +52,11 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public int getRenderType() { + return 3; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); @@ -77,7 +83,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } 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 9b7d398c8..9db19fef0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } 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 a37883145..076ccc26b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -33,6 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -76,7 +77,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 3f261bc5d..3c411fd95 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -90,7 +90,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } public void register() { - GameRegistry.registerBlock(this, ItemBlockModSlab.class, name); + GameRegistry.registerBlock(this, isDouble() ? null : ItemBlockModSlab.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java new file mode 100644 index 000000000..093dc909e --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java @@ -0,0 +1,19 @@ +package vazkii.botania.common.item.block; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName { + public ItemBlockWithMetaNameAndColor(Block block) { + super(block); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) + { + return this.block.getRenderColor(this.block.getStateFromMeta(stack.getMetadata())); + } +} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 630c88b1b..fac476911 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -20,7 +20,7 @@ import net.minecraft.stats.Achievement; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; -// todo 1.8 revalidate this (used to extend ItemBlockWithMetadata which got removed) + public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index f047b6203..2f75e7f33 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -171,7 +171,7 @@ public class PageCraftingRecipe extends PageRecipe { Object input = shapeless.getInput().get(index); if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); } } diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json new file mode 100644 index 000000000..08230c4fc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniblock_top", + "textures": { + "all": "botania:blocks/manaBeacon0", + "top": "botania:blocks/manaBeacon1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json new file mode 100644 index 000000000..4e6278648 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:cube_all_tinted", + "textures": { + "all": "botania:blocks/petalBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json new file mode 100644 index 000000000..47a7be21f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:microblock_all", + "textures": { + "all": "botania:blocks/unstableBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_all_tinted.json b/src/main/resources/assets/botania/models/block/cube_all_tinted.json new file mode 100644 index 000000000..bde99787b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cube_all_tinted.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 0 } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/microblock_all.json b/src/main/resources/assets/botania/models/block/microblock_all.json new file mode 100644 index 000000000..9cd2d3fc0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/microblock_all.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 4, 4, 12, 12 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_top.json b/src/main/resources/assets/botania/models/block/miniblock_top.json new file mode 100644 index 000000000..9022ed180 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_top.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "up": { "texture": "#top", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file From 64a8dfbcfed42f407cd6df296b124b6684818620 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 20:26:33 -0600 Subject: [PATCH 089/935] Drums, runic altar, mana pool kinda, distributor, force relay, starfield --- .../client/core/handler/ModelHandler.java | 18 +++++++++++- .../client/render/tile/RenderTilePool.java | 2 +- .../render/tile/RenderTileStarfield.java | 11 +++++-- .../common/block/decor/BlockStarfield.java | 11 +++++++ .../common/block/mana/BlockDistributor.java | 5 ++++ .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 5 ++++ .../botania/common/item/material/ItemDye.java | 1 - .../lexicon/page/PageCraftingRecipe.java | 2 +- .../botania/blockstates/distributor.json | 17 +++++++++++ .../botania/blockstates/forestDrum.json | 7 +++++ .../botania/blockstates/pistonRelay.json | 15 ++++++++++ .../assets/botania/blockstates/runeAltar.json | 17 +++++++++++ .../assets/botania/blockstates/starfield.json | 29 +++++++++++++++++++ .../botania/models/block/biggerthanslab.json | 19 ++++++++++++ .../assets/botania/models/block/drum.json | 18 ++++++++++++ .../botania/models/block/drum_canopy.json | 7 +++++ .../botania/models/block/drum_gathering.json | 7 +++++ .../botania/models/block/drum_wild.json | 7 +++++ .../botania/models/block/thinnerthanslab.json | 19 ++++++++++++ .../botania/models/item/drum_canopy.json | 10 +++++++ .../botania/models/item/drum_gathering.json | 10 +++++++ .../assets/botania/models/item/drum_wild.json | 10 +++++++ 23 files changed, 242 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/distributor.json create mode 100644 src/main/resources/assets/botania/blockstates/forestDrum.json create mode 100644 src/main/resources/assets/botania/blockstates/pistonRelay.json create mode 100644 src/main/resources/assets/botania/blockstates/runeAltar.json create mode 100644 src/main/resources/assets/botania/blockstates/starfield.json create mode 100644 src/main/resources/assets/botania/models/block/biggerthanslab.json create mode 100644 src/main/resources/assets/botania/models/block/drum.json create mode 100644 src/main/resources/assets/botania/models/block/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/block/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/block/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/block/thinnerthanslab.json create mode 100644 src/main/resources/assets/botania/models/item/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/item/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/item/drum_wild.json 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 7705159ed..f2ca9e230 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -54,6 +54,7 @@ public final class ModelHandler { registerPanes(); registerPylons(); registerUnstableBeaconPetal(); + registerDrums(); /** Normal Items **/ registerStandardItems(); @@ -65,7 +66,10 @@ public final class ModelHandler { private static void registerStandardBlocks() { registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); - + registerItemModel(ModBlocks.runeAltar); + registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.distributor); + registerItemModel(ModBlocks.starfield); } private static void registerStandardItems() { @@ -122,6 +126,9 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore redstone power state in some blocks + ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); + // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); @@ -326,6 +333,15 @@ public final class ModelHandler { } } + private static void registerDrums() { + Item item = Item.getItemFromBlock(ModBlocks.forestDrum); + for (LivingRockVariant variant : LivingRockVariant.values()) { + String name = "botania:drum_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 30c32c351..217bbfecd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -73,7 +73,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { time += new Random(tileentity.getPos().hashCode()).nextInt(100000); Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); } else { int hex = pool.color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 580be7a9b..f55132eaf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -44,7 +44,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f3 = 0.75F; + float f3 = 0.24F; for (int i = 0; i < 16; ++i) { @@ -97,7 +97,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.matrixMode(5890); GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); - GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); + GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 20000) / 20000.0F, 0.0F); GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); GlStateManager.rotate((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); @@ -117,6 +117,13 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { f11 = f12 = f13 = 1.0F * f6; } + Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); + f11 = color.getRed() / 255F; + f12 = color.getGreen() / 255F; + f13 = color.getBlue() / 255F; + + f11 *= f6; f12 *= f6; f13 *= f6; + worldrenderer.pos(x, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); worldrenderer.pos(x + 1.0D, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); 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 45b856dcf..3ec634b7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,6 +40,16 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } + @Override + public int getRenderType() { + return 3; + } + + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT_MIPPED; + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.POWERED); 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 7b8a74365..cf1bb11ad 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -35,6 +35,11 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } + @Override + public int getRenderType() { + return 3; + } + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileDistributor(); 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 e0637af30..e4b5ae2f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -192,7 +192,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public int getRenderType() { - return LibRenderIDs.idPool; + return 2; } @Override 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 3dac4408f..e9b02430b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -52,6 +52,11 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex random = new Random(); } + @Override + public int getRenderType() { + return 3; + } + @Override public boolean isOpaqueCube() { return false; 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 7697d2d28..f0f01db83 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -51,7 +51,6 @@ public class ItemDye extends Item16Colors { TileEntity tile = par3World.getTileEntity(pos); if(tile instanceof IDyablePool) { IDyablePool dyable = (IDyablePool) tile; - int itemMeta = par1ItemStack.getItemDamage(); if(color != dyable.getColor()) { dyable.setColor(color); par1ItemStack.stackSize--; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 2f75e7f33..231e00020 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -138,7 +138,7 @@ public class PageCraftingRecipe extends PageRecipe { for(int x = 0; x < width; x++) { Object input = shaped.getInput()[y * width + x]; if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((ArrayList) input).get(0), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); } oreDictRecipe = true; diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json new file mode 100644 index 000000000..3a39b6b79 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "top": "botania:blocks/distributor0", + "side": "botania:blocks/distributor1", + "bottom": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json new file mode 100644 index 000000000..a7f73aba4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "variant=wild": { "model": "botania:drum_wild" }, + "variant=gathering": { "model": "botania:drum_gathering" }, + "variant=canopy": { "model": "botania:drum_canopy" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json new file mode 100644 index 000000000..fb1ccb55e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/pistonRelay" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json new file mode 100644 index 000000000..fcff3d2dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:biggerthanslab", + "textures": { + "top": "botania:blocks/runeAltar1", + "side": "botania:blocks/runeAltar2", + "bottom": "botania:blocks/runeAltar0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json new file mode 100644 index 000000000..e37b30a21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "normal": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + } + }], + "inventory": [{ + "model": "botania:thinnerthanslab", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield0", + "side": "botania:blocks/starfield2" + }, + "transform": { + "firstperson": { + "translation": [ 0, 0.125, 0 ] + } + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/biggerthanslab.json b/src/main/resources/assets/botania/models/block/biggerthanslab.json new file mode 100644 index 000000000..7c944c1fd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/biggerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/drum.json b/src/main/resources/assets/botania/models/block/drum.json new file mode 100644 index 000000000..f7c0d0dae --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [{ + "name": "Drum", + "from": [ 3.0, 0.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "south": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "west": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "east": { "texture": "#side", "uv": [ 3, 2, 13, 16 ] }, + "up": { "texture": "#top", "uv": [ 3, 3, 12, 12 ] }, + "down": { "texture": "#top", "uv": [ 3, 3, 12, 12 ], "cullface": "down" } + } + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json new file mode 100644 index 000000000..915c02d27 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum4", + "side": "botania:blocks/forestDrum5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json new file mode 100644 index 000000000..b92f432f5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum2", + "side": "botania:blocks/forestDrum3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json new file mode 100644 index 000000000..86bd38747 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/drum", + "textures": { + "top": "botania:blocks/forestDrum0", + "side": "botania:blocks/forestDrum1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/thinnerthanslab.json b/src/main/resources/assets/botania/models/block/thinnerthanslab.json new file mode 100644 index 000000000..3e9cc996a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/thinnerthanslab.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 12, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/main/resources/assets/botania/models/item/drum_canopy.json new file mode 100644 index 000000000..0146560c5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_canopy.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_canopy", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/main/resources/assets/botania/models/item/drum_gathering.json new file mode 100644 index 000000000..d23ff797b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_gathering.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_gathering", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/main/resources/assets/botania/models/item/drum_wild.json new file mode 100644 index 000000000..9d0bf43ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/drum_wild.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/drum_wild", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file From d58f15374284fb829ea83223f640df6d7e0b3c33 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Dec 2015 23:54:59 -0600 Subject: [PATCH 090/935] Solid vine and crash fixes for it --- MC18_notes.txt | 4 ++- .../botania/api/mana/IManaCollector.java | 2 +- .../botania/common/block/BlockSolidVines.java | 2 +- .../botania/common/entity/EntityVineBall.java | 16 +++++---- .../assets/botania/blockstates/solidVine.json | 36 +++++++++++++++++++ 5 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/solidVine.json diff --git a/MC18_notes.txt b/MC18_notes.txt index de9c28fb4..e08825fe5 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -21,7 +21,9 @@ Unless someone figures out a way to use the old one sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack * Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them * Quartz stair textures may be assigned incorrectly - resource pack authors check me -* Glass pane inner faces are not getting culled +* Glass pane inner faces are not getting culled (vanilla bug?) +* Some item forms of technical/non-user blocks are removed + * Full list: [all double slab items, all solid vine items] -- Todo -- * JSON models for everything (tedious/med-hard) diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollector.java b/src/main/java/vazkii/botania/api/mana/IManaCollector.java index 280e46007..f62352864 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollector.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollector.java @@ -18,7 +18,7 @@ import vazkii.botania.api.internal.IManaBurst; * * Implementation Instructions:
* - Override invalidate() and onChunkUnload(), calling ManaNetworkEvent.removeCollector(this); on both.
- * - On the first tick of onUpdate(), call ManaNetworkEvent.addCollector(this); + * - On the first tick of update() (or onLoad() in Forge build 1606 or higher), call ManaNetworkEvent.addCollector(this); */ public interface IManaCollector extends IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index d908495df..bf678aa51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -52,7 +52,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, null, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index ba7808459..8ba380c0b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.entity; +import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -21,6 +23,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import java.util.Map; + public class EntityVineBall extends EntityThrowable { public EntityVineBall(World par1World) { @@ -39,18 +43,18 @@ public class EntityVineBall extends EntityThrowable { protected void onImpact(MovingObjectPosition var1) { if(var1 != null) { EnumFacing dir = var1.sideHit; - int[] metaPlace = new int[] { - 1, 4, 8, 2 - }; - if(dir.getAxis() != EnumFacing.Axis.Y) { + Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, + EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); + + if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { Block block = worldObj.getBlockState(pos).getBlock(); if(block.isAir(worldObj, pos)) { - IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(BlockVine.ALL_FACES[dir.getIndex() + 1], true); + IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); worldObj.setBlockState(pos, state, 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); // todo 1.8 verify + worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); pos = pos.down(); } else break; } diff --git a/src/main/resources/assets/botania/blockstates/solidVine.json b/src/main/resources/assets/botania/blockstates/solidVine.json new file mode 100644 index 000000000..67ee020a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solidVine.json @@ -0,0 +1,36 @@ +{ + "variants": { + "east=false,north=false,south=false,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=true,up=false,west=false": { "model": "vine_1" }, + "east=false,north=false,south=false,up=false,west=true": { "model": "vine_1", "y": 90 }, + "east=false,north=true,south=false,up=false,west=false": { "model": "vine_1", "y": 180 }, + "east=true,north=false,south=false,up=false,west=false": { "model": "vine_1", "y": 270 }, + "east=true,north=true,south=false,up=false,west=false": { "model": "vine_2" }, + "east=true,north=false,south=true,up=false,west=false": { "model": "vine_2", "y": 90 }, + "east=false,north=false,south=true,up=false,west=true": { "model": "vine_2", "y": 180 }, + "east=false,north=true,south=false,up=false,west=true": { "model": "vine_2", "y": 270 }, + "east=true,north=false,south=false,up=false,west=true": { "model": "vine_2_opposite" }, + "east=false,north=true,south=true,up=false,west=false": { "model": "vine_2_opposite", "y": 90 }, + "east=true,north=true,south=true,up=false,west=false": { "model": "vine_3" }, + "east=true,north=false,south=true,up=false,west=true": { "model": "vine_3", "y": 90 }, + "east=false,north=true,south=true,up=false,west=true": { "model": "vine_3", "y": 180 }, + "east=true,north=true,south=false,up=false,west=true": { "model": "vine_3", "y": 270 }, + "east=true,north=true,south=true,up=false,west=true": { "model": "vine_4" }, + "east=false,north=false,south=false,up=true,west=false": { "model": "vine_u" }, + "east=false,north=false,south=true,up=true,west=false": { "model": "vine_1u" }, + "east=false,north=false,south=false,up=true,west=true": { "model": "vine_1u", "y": 90 }, + "east=false,north=true,south=false,up=true,west=false": { "model": "vine_1u", "y": 180 }, + "east=true,north=false,south=false,up=true,west=false": { "model": "vine_1u", "y": 270 }, + "east=true,north=true,south=false,up=true,west=false": { "model": "vine_2u" }, + "east=true,north=false,south=true,up=true,west=false": { "model": "vine_2u", "y": 90 }, + "east=false,north=false,south=true,up=true,west=true": { "model": "vine_2u", "y": 180 }, + "east=false,north=true,south=false,up=true,west=true": { "model": "vine_2u", "y": 270 }, + "east=true,north=false,south=false,up=true,west=true": { "model": "vine_2u_opposite" }, + "east=false,north=true,south=true,up=true,west=false": { "model": "vine_2u_opposite", "y": 90 }, + "east=true,north=true,south=true,up=true,west=false": { "model": "vine_3u" }, + "east=true,north=false,south=true,up=true,west=true": { "model": "vine_3u", "y": 90 }, + "east=false,north=true,south=true,up=true,west=true": { "model": "vine_3u", "y": 180 }, + "east=true,north=true,south=false,up=true,west=true": { "model": "vine_3u", "y": 270 }, + "east=true,north=true,south=true,up=true,west=true": { "model": "vine_4u" } + } +} From 319bab35a0bb2edc3d6f37c06714d148fb15d014 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 02:14:21 -0600 Subject: [PATCH 091/935] Lay all groundwork for special flower models. Not yet tested. --- .../api/render/SpecialFlowerModel.java | 257 ++++++++++++++++++ .../botania/api/state/BotaniaStateProps.java | 4 + .../botania/api/state/PropertyClass.java | 35 +++ .../client/core/handler/ModelHandler.java | 3 +- .../client/core/proxy/ClientProxy.java | 3 + .../common/block/BlockSpecialFlower.java | 45 ++- .../botania/blockstates/specialFlower.json | 14 + 7 files changed, 352 insertions(+), 9 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java create mode 100644 src/main/java/vazkii/botania/api/state/PropertyClass.java create mode 100644 src/main/resources/assets/botania/blockstates/specialFlower.json diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java new file mode 100644 index 000000000..5db3c3abe --- /dev/null +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -0,0 +1,257 @@ +package vazkii.botania.api.render; + +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ICustomModelLoader; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IModelCustomData; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.fml.common.FMLLog; +import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.common.block.BlockSpecialFlower; + +import javax.vecmath.Matrix4f; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +public class SpecialFlowerModel implements IModelCustomData { + + /** + * Internal implementation + **/ + // SpecialFlowerModel for when there are no models registered for a subtile + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.>, ModelResourceLocation>of()); + // Models registered from the externel API thus far + private static final Map, ModelResourceLocation> queuedModels = Maps.newHashMap(); + private final ImmutableMap>, ModelResourceLocation> models; + + + public SpecialFlowerModel(ImmutableMap>, ModelResourceLocation> models) { + this.models = models; + } + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after models have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process + * + * @param subTileClass + * @param model + */ + public static void register(Class subTileClass, ModelResourceLocation model) { + queuedModels.put(subTileClass, model); + } + + @Override + public Collection getDependencies() { + return ImmutableList.copyOf(models.values()); + } + + @Override + public Collection getTextures() { + return ImmutableList.of(); + } + + @Override + public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate models) + return new SpecialFlowerBakedModel(models, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + } + + @Override + public IModelState getDefaultState() { + return TRSRTransformation.identity(); + } + + @Override + public IModel process(ImmutableMap customData) { + // Load the base variant from blockstate json, and also add all the model paths we received from external API + ImmutableMap.Builder>, ModelResourceLocation> builder = ImmutableMap.builder(); + for (String key : customData.keySet()) { + if ("base".equals(key)) { + builder.put(Optional.>absent(), getLocation(customData.get(key))); + } + for (Map.Entry, ModelResourceLocation> e : queuedModels.entrySet()) { + builder.put(Optional.>of(e.getKey()), e.getValue()); + } + } + ImmutableMap>, ModelResourceLocation> models = builder.build(); + if (models.isEmpty()) return INSTANCE; + return new SpecialFlowerModel(models); + } + + private ModelResourceLocation getLocation(String json) { + JsonElement e = new JsonParser().parse(json); + if (e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()) { + return new ModelResourceLocation(e.getAsString()); + } + FMLLog.severe("Expect ModelResourceLocation, got: ", json); + return new ModelResourceLocation("builtin/missing", "missing"); + } + + public enum Loader implements ICustomModelLoader { + INSTANCE { + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + } + + @Override + public boolean accepts(ResourceLocation modelLocation) { + return "botania_SPECIAL".equals(modelLocation.getResourceDomain()) + && "specialFlower".equals(modelLocation.getResourcePath()); + } + + @Override + public IModel loadModel(ResourceLocation modelLocation) throws IOException { + // Load a dummy model for now, all actual models added in process(). + return SpecialFlowerModel.INSTANCE; + } + } + } + + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel { + + private final ImmutableMap transforms; + private final ImmutableMap>, ModelResourceLocation> models; + private final VertexFormat vertexFormat; + + private IBakedModel baseModel; + private ImmutableMap, IBakedModel> bakedFlowerModels; + private ImmutableMap, ImmutableList> quads; + + public SpecialFlowerBakedModel(ImmutableMap>, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { + this.models = models; + this.vertexFormat = format; + this.transforms = cameraTransforms; + } + + private void refreshBakedModels() { + if (baseModel == null) { + ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); + baseModel = getModel(manager, Optional.>absent()); + + ImmutableMap.Builder, IBakedModel> builder = ImmutableMap.builder(); + for (Map.Entry>, ModelResourceLocation> e : models.entrySet()) { + if (e.getKey().isPresent()) { + builder.put(e.getKey().get(), getModel(manager, e.getKey())); + } + } + + bakedFlowerModels = builder.build(); + + ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); + quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); + for (EnumFacing side : EnumFacing.values()) { + quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); + } + quads = quadBuilder.build(); + } + } + + private IBakedModel getModel(ModelManager manager, Optional> layer) { + ModelResourceLocation loc = models.get(layer); + if (loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } + + private ImmutableList buildQuads(Optional side) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (IBakedModel model : bakedFlowerModels.values()) { + if (side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } + return builder.build(); + } + + @Override + public List getFaceQuads(EnumFacing side) { + refreshBakedModels(); + return quads.get(Optional.of(side)); + } + + @Override + public List getGeneralQuads() { + refreshBakedModels(); + return quads.get(Optional.absent()); + } + + @Override + public boolean isAmbientOcclusion() { + refreshBakedModels(); + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + refreshBakedModels(); + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + refreshBakedModels(); + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + refreshBakedModels(); + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } + + @Override + public IBakedModel handleBlockState(IBlockState state) { + IExtendedBlockState extendedState = ((IExtendedBlockState) state); + Class clazz = extendedState.getValue(BotaniaStateProps.SUBTILE_CLASS); + return bakedFlowerModels.get(clazz); + } + + @Override + public VertexFormat getFormat() { + return vertexFormat; + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); + } + } +} diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index b28839111..499947994 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -17,6 +17,10 @@ import javax.annotation.Nullable; */ public class BotaniaStateProps { + /** The property for specialFlower **/ + + public static final PropertyClass SUBTILE_CLASS = new PropertyClass("subtile_class"); + /** Common properties to all blocks to use **/ // The 16 Minecraft colors diff --git a/src/main/java/vazkii/botania/api/state/PropertyClass.java b/src/main/java/vazkii/botania/api/state/PropertyClass.java new file mode 100644 index 000000000..bb9f863ae --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/PropertyClass.java @@ -0,0 +1,35 @@ +package vazkii.botania.api.state; + +import net.minecraftforge.common.property.IUnlistedProperty; +import vazkii.botania.api.subtile.SubTileEntity; + +public class PropertyClass implements IUnlistedProperty> { + + private final String name; + + public PropertyClass(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean isValid(Class value) { + return true; + } + + @Override + public Class> getType() { + // todo is there a safe way? + Class clazz = Class.class; + return clazz; + } + + @Override + public String valueToString(Class value) { + return value.getName(); + } +} 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 f2ca9e230..6f77d006d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -129,7 +129,8 @@ public final class ModelHandler { // Ignore redstone power state in some blocks ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); - // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) + // Ignore color in special flower, unstable cube, mana beacon, and petals (handled by color multiplier) + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); 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 e451cfd93..13a9aaabd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -33,6 +33,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,6 +41,7 @@ import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.AnyComponent; +import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.challenge.ModChallenges; @@ -180,6 +182,7 @@ public class ClientProxy extends CommonProxy { super.preInit(event); + ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); ModelHandler.registerModels(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 07b9dfc0b..f577bae6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -12,13 +12,12 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -32,17 +31,23 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.PropertyClass; import vazkii.botania.api.subtile.ISpecialFlower; +import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.integration.coloredlights.LightHelper; @@ -112,12 +117,26 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); + setDefaultState(((IExtendedBlockState) blockState.getBaseState()) + .withProperty(BotaniaStateProps.SUBTILE_CLASS, SubTileDaybloom.class) + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) + ); } @Override public BlockState createBlockState() { - return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); + return new ExtendedBlockState(this, new IProperty[]{ getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_CLASS } ); + } + + @Override + public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); + if (te instanceof TileSpecialFlower) { + Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); + return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_CLASS, clazz); + } else { + return ((IExtendedBlockState) state); + } } @Override @@ -168,7 +187,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public int getRenderType() { - return LibRenderIDs.idSpecialFlower; + return 3; + } + + @Override + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } @Override @@ -257,11 +281,16 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return ((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)) + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)) .getMapColor().colorValue; } + @Override + public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { + return getRenderColor(world.getBlockState(pos)); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json new file mode 100644 index 000000000..5ea130c75 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_SPECIAL:specialFlower", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{ + "custom": { + "base": "minecraft:poppy#normal" + } + }] + } +} \ No newline at end of file From f4ea60ba2c85e7ccbf6beecbcd55a679fe675922 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 03:04:16 -0600 Subject: [PATCH 092/935] IT WORKS --- MC18_notes.txt | 2 + .../api/render/SpecialFlowerModel.java | 47 ++++++++++--------- .../client/core/handler/ModelHandler.java | 9 +++- .../client/core/proxy/ClientProxy.java | 1 - .../common/block/BlockSpecialFlower.java | 19 ++++++++ .../assets/botania/blockstates/daybloom.json | 11 +++++ .../botania/blockstates/specialFlower.json | 2 +- 7 files changed, 66 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/daybloom.json diff --git a/MC18_notes.txt b/MC18_notes.txt index e08825fe5..3127dac58 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -9,6 +9,8 @@ Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts * Multiblock system reworked to use states and blockposes * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. +* Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with + * todo: possibly make the unlisted properties use the subtile string name instead of class. Will be much easier. -- Other -- * Most things left untouched to make patches from upstream easier diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index 5db3c3abe..98eaf22ed 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -42,20 +42,6 @@ import java.util.Map; public class SpecialFlowerModel implements IModelCustomData { - /** - * Internal implementation - **/ - // SpecialFlowerModel for when there are no models registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.>, ModelResourceLocation>of()); - // Models registered from the externel API thus far - private static final Map, ModelResourceLocation> queuedModels = Maps.newHashMap(); - private final ImmutableMap>, ModelResourceLocation> models; - - - public SpecialFlowerModel(ImmutableMap>, ModelResourceLocation> models) { - this.models = models; - } - /** * Register your model for the given subtile class here. * Call this DURING PREINIT. Calling it anytime after models have already baked does not guarantee that your model will work. @@ -70,6 +56,21 @@ public class SpecialFlowerModel implements IModelCustomData { queuedModels.put(subTileClass, model); } + /** + * Internal implementation + **/ + // SpecialFlowerModel for when there are no models registered for a subtile + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.>, ModelResourceLocation>of()); + // Models registered from the externel API thus far + private static final Map, ModelResourceLocation> queuedModels = Maps.newHashMap(); + + + private final ImmutableMap>, ModelResourceLocation> models; + + public SpecialFlowerModel(ImmutableMap>, ModelResourceLocation> models) { + this.models = models; + } + @Override public Collection getDependencies() { return ImmutableList.copyOf(models.values()); @@ -125,8 +126,10 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public boolean accepts(ResourceLocation modelLocation) { - return "botania_SPECIAL".equals(modelLocation.getResourceDomain()) - && "specialFlower".equals(modelLocation.getResourcePath()); + return modelLocation.getResourceDomain().equals("botania_special") && ( + modelLocation.getResourcePath().equals("specialFlower") || + modelLocation.getResourcePath().equals("models/block/specialFlower") || + modelLocation.getResourcePath().equals("models/item/specialFlower")); } @Override @@ -154,7 +157,8 @@ public class SpecialFlowerModel implements IModelCustomData { } private void refreshBakedModels() { - if (baseModel == null) { + System.out.println("Refreshing"); + //if (baseModel == null) { ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); baseModel = getModel(manager, Optional.>absent()); @@ -173,11 +177,11 @@ public class SpecialFlowerModel implements IModelCustomData { quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); } quads = quadBuilder.build(); - } + //} } - private IBakedModel getModel(ModelManager manager, Optional> layer) { - ModelResourceLocation loc = models.get(layer); + private IBakedModel getModel(ModelManager manager, Optional> optClazz) { + ModelResourceLocation loc = models.get(optClazz); if (loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } @@ -205,7 +209,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public List getGeneralQuads() { refreshBakedModels(); - return quads.get(Optional.absent()); + return quads.get(Optional.absent()); } @Override @@ -239,6 +243,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleBlockState(IBlockState state) { + refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); Class clazz = extendedState.getValue(BotaniaStateProps.SUBTILE_CLASS); return bakedFlowerModels.get(clazz); 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 6f77d006d..edfa5e407 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -11,8 +11,10 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; 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.GameData; +import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; @@ -21,6 +23,7 @@ import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -36,8 +39,11 @@ public final class ModelHandler { // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files public static void registerModels() { + ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:daybloom")); + /** Custom statemappers **/ registerStateMappers(); @@ -129,8 +135,7 @@ public final class ModelHandler { // Ignore redstone power state in some blocks ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); - // Ignore color in special flower, unstable cube, mana beacon, and petals (handled by color multiplier) - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); 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 13a9aaabd..9e9c24c24 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -182,7 +182,6 @@ public class ClientProxy extends CommonProxy { super.preInit(event); - ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); ModelHandler.registerModels(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index f577bae6d..d77c7e5ca 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -22,6 +22,8 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -35,9 +37,14 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; @@ -121,6 +128,18 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid .withProperty(BotaniaStateProps.SUBTILE_CLASS, SubTileDaybloom.class) .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(this, new DefaultStateMapper() { + @Override + public ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:specialFlower"); + } + }); } @Override diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json new file mode 100644 index 000000000..0e618b004 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cross", + "textures": { + "cross": "botania:blocks/daybloom" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 5ea130c75..281ffbc7c 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania_SPECIAL:specialFlower", + "model": "botania_special:specialFlower", "transform": "forge:default-block" }, "variants": { From 23cab39892231e61196cad5db0f23eefdb04698a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 11:05:00 -0600 Subject: [PATCH 093/935] All special flowers. item model system not yet done --- .../java/vazkii/botania/api/BotaniaAPI.java | 4 +- .../api/render/SpecialFlowerModel.java | 70 +++++++----- .../botania/api/state/BotaniaStateProps.java | 4 +- .../botania/api/state/PropertyClass.java | 35 ------ .../botania/api/state/PropertyString.java | 33 ++++++ .../client/core/handler/ModelHandler.java | 105 +++++++++++++++++- .../common/block/BlockSpecialFlower.java | 14 ++- .../common/block/tile/TileSpecialFlower.java | 5 + .../botania/blockstates/agricarnation.json | 11 ++ .../blockstates/agricarnationChibi.json | 11 ++ .../botania/blockstates/arcanerose.json | 11 ++ .../botania/blockstates/bellethorn.json | 11 ++ .../botania/blockstates/bellethornChibi.json | 11 ++ .../assets/botania/blockstates/bubbell.json | 11 ++ .../botania/blockstates/bubbellChibi.json | 11 ++ .../assets/botania/blockstates/clayconia.json | 11 ++ .../assets/botania/blockstates/daffomill.json | 11 ++ .../botania/blockstates/dandelifeon.json | 11 ++ .../assets/botania/blockstates/daybloom.json | 2 +- .../botania/blockstates/daybloomDecor.json | 11 ++ .../botania/blockstates/daybloomPrime.json | 11 ++ .../botania/blockstates/dreadthorn.json | 11 ++ .../assets/botania/blockstates/endoflame.json | 11 ++ .../botania/blockstates/entropinnyum.json | 11 ++ .../assets/botania/blockstates/exoflame.json | 11 ++ .../botania/blockstates/fallenKanade.json | 11 ++ .../botania/blockstates/gourmaryllis.json | 11 ++ .../botania/blockstates/heiseiDream.json | 11 ++ .../botania/blockstates/hopperhock.json | 11 ++ .../botania/blockstates/hopperhockChibi.json | 11 ++ .../assets/botania/blockstates/hyacidus.json | 11 ++ .../botania/blockstates/hydroangeas.json | 11 ++ .../botania/blockstates/hydroangeasDecor.json | 11 ++ .../botania/blockstates/jadedAmaranthus.json | 11 ++ .../assets/botania/blockstates/jiyuulia.json | 11 ++ .../assets/botania/blockstates/kekimurus.json | 11 ++ .../assets/botania/blockstates/loonium.json | 11 ++ .../assets/botania/blockstates/manastar.json | 11 ++ .../botania/blockstates/marimorphosis.json | 11 ++ .../blockstates/marimorphosisChibi.json | 11 ++ .../assets/botania/blockstates/medumone.json | 11 ++ .../assets/botania/blockstates/munchdew.json | 11 ++ .../botania/blockstates/narslimmus.json | 11 ++ .../botania/blockstates/nightshade.json | 11 ++ .../botania/blockstates/nightshadeDecor.json | 11 ++ .../botania/blockstates/nightshadePrime.json | 11 ++ .../assets/botania/blockstates/orechid.json | 11 ++ .../botania/blockstates/orechidIgnem.json | 11 ++ .../botania/blockstates/pollidisiac.json | 11 ++ .../assets/botania/blockstates/puredaisy.json | 11 ++ .../botania/blockstates/rafflowsia.json | 11 ++ .../botania/blockstates/rannuncarpus.json | 11 ++ .../blockstates/rannuncarpusChibi.json | 11 ++ .../botania/blockstates/solegnolia.json | 11 ++ .../botania/blockstates/solegnoliaChibi.json | 11 ++ .../botania/blockstates/specialFlower.json | 7 +- .../botania/blockstates/spectranthemum.json | 11 ++ .../botania/blockstates/spectrolus.json | 11 ++ .../botania/blockstates/tangleberrie.json | 11 ++ .../botania/blockstates/thermalily.json | 11 ++ .../assets/botania/blockstates/tigerseye.json | 11 ++ .../botania/blockstates/vinculotus.json | 11 ++ .../botania/models/block/cross_tinted.json | 28 +++++ 63 files changed, 802 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/PropertyClass.java create mode 100644 src/main/java/vazkii/botania/api/state/PropertyString.java create mode 100644 src/main/resources/assets/botania/blockstates/agricarnation.json create mode 100644 src/main/resources/assets/botania/blockstates/agricarnationChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/arcanerose.json create mode 100644 src/main/resources/assets/botania/blockstates/bellethorn.json create mode 100644 src/main/resources/assets/botania/blockstates/bellethornChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/bubbell.json create mode 100644 src/main/resources/assets/botania/blockstates/bubbellChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/clayconia.json create mode 100644 src/main/resources/assets/botania/blockstates/daffomill.json create mode 100644 src/main/resources/assets/botania/blockstates/dandelifeon.json create mode 100644 src/main/resources/assets/botania/blockstates/daybloomDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/daybloomPrime.json create mode 100644 src/main/resources/assets/botania/blockstates/dreadthorn.json create mode 100644 src/main/resources/assets/botania/blockstates/endoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/entropinnyum.json create mode 100644 src/main/resources/assets/botania/blockstates/exoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/fallenKanade.json create mode 100644 src/main/resources/assets/botania/blockstates/gourmaryllis.json create mode 100644 src/main/resources/assets/botania/blockstates/heiseiDream.json create mode 100644 src/main/resources/assets/botania/blockstates/hopperhock.json create mode 100644 src/main/resources/assets/botania/blockstates/hopperhockChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/hyacidus.json create mode 100644 src/main/resources/assets/botania/blockstates/hydroangeas.json create mode 100644 src/main/resources/assets/botania/blockstates/hydroangeasDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/jadedAmaranthus.json create mode 100644 src/main/resources/assets/botania/blockstates/jiyuulia.json create mode 100644 src/main/resources/assets/botania/blockstates/kekimurus.json create mode 100644 src/main/resources/assets/botania/blockstates/loonium.json create mode 100644 src/main/resources/assets/botania/blockstates/manastar.json create mode 100644 src/main/resources/assets/botania/blockstates/marimorphosis.json create mode 100644 src/main/resources/assets/botania/blockstates/marimorphosisChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/medumone.json create mode 100644 src/main/resources/assets/botania/blockstates/munchdew.json create mode 100644 src/main/resources/assets/botania/blockstates/narslimmus.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshade.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshadeDecor.json create mode 100644 src/main/resources/assets/botania/blockstates/nightshadePrime.json create mode 100644 src/main/resources/assets/botania/blockstates/orechid.json create mode 100644 src/main/resources/assets/botania/blockstates/orechidIgnem.json create mode 100644 src/main/resources/assets/botania/blockstates/pollidisiac.json create mode 100644 src/main/resources/assets/botania/blockstates/puredaisy.json create mode 100644 src/main/resources/assets/botania/blockstates/rafflowsia.json create mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpus.json create mode 100644 src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/solegnolia.json create mode 100644 src/main/resources/assets/botania/blockstates/solegnoliaChibi.json create mode 100644 src/main/resources/assets/botania/blockstates/spectranthemum.json create mode 100644 src/main/resources/assets/botania/blockstates/spectrolus.json create mode 100644 src/main/resources/assets/botania/blockstates/tangleberrie.json create mode 100644 src/main/resources/assets/botania/blockstates/thermalily.json create mode 100644 src/main/resources/assets/botania/blockstates/tigerseye.json create mode 100644 src/main/resources/assets/botania/blockstates/vinculotus.json create mode 100644 src/main/resources/assets/botania/models/block/cross_tinted.json diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index a8af5a43e..6a2611e3e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -292,8 +292,6 @@ public final class BotaniaAPI { paintableBlocks.put(paintable, colorProp); return paintable; - - //todo 1.8 improve this } /** @@ -334,7 +332,7 @@ public final class BotaniaAPI { } public static boolean isBlockBlacklistedFromMagnet(IBlockState state) { - return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state), 0); + return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state)); } public static boolean isBlockBlacklistedFromMagnet(Block block, int meta) { diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index 98eaf22ed..5ae966d5e 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -17,6 +17,7 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ICustomModelLoader; @@ -26,13 +27,15 @@ import net.minecraftforge.client.model.IModelCustomData; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.common.block.BlockSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Matrix4f; import java.io.IOException; @@ -49,25 +52,29 @@ public class SpecialFlowerModel implements IModelCustomData { * Tint is applied whenever a player recolors the flower using floral dye * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process * - * @param subTileClass - * @param model + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used for this subtile */ - public static void register(Class subTileClass, ModelResourceLocation model) { - queuedModels.put(subTileClass, model); + public static void register(String subTileName, ModelResourceLocation model) { + queuedModels.put(subTileName, model); + } + + public static void register(Class clazz, ModelResourceLocation model) { + register(BotaniaAPI.getSubTileStringMapping(clazz), model); } /** * Internal implementation **/ // SpecialFlowerModel for when there are no models registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.>, ModelResourceLocation>of()); + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of()); // Models registered from the externel API thus far - private static final Map, ModelResourceLocation> queuedModels = Maps.newHashMap(); + private static final Map queuedModels = Maps.newHashMap(); - private final ImmutableMap>, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> models; - public SpecialFlowerModel(ImmutableMap>, ModelResourceLocation> models) { + public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> models) { this.models = models; } @@ -95,16 +102,16 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IModel process(ImmutableMap customData) { // Load the base variant from blockstate json, and also add all the model paths we received from external API - ImmutableMap.Builder>, ModelResourceLocation> builder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); for (String key : customData.keySet()) { if ("base".equals(key)) { - builder.put(Optional.>absent(), getLocation(customData.get(key))); + builder.put(Optional.absent(), getLocation(customData.get(key))); } - for (Map.Entry, ModelResourceLocation> e : queuedModels.entrySet()) { - builder.put(Optional.>of(e.getKey()), e.getValue()); + for (Map.Entry e : queuedModels.entrySet()) { + builder.put(Optional.of(e.getKey()), e.getValue()); } } - ImmutableMap>, ModelResourceLocation> models = builder.build(); + ImmutableMap, ModelResourceLocation> models = builder.build(); if (models.isEmpty()) return INSTANCE; return new SpecialFlowerModel(models); } @@ -140,30 +147,30 @@ public class SpecialFlowerModel implements IModelCustomData { } } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel { + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { private final ImmutableMap transforms; - private final ImmutableMap>, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> models; private final VertexFormat vertexFormat; private IBakedModel baseModel; - private ImmutableMap, IBakedModel> bakedFlowerModels; + private ImmutableMap bakedFlowerModels; private ImmutableMap, ImmutableList> quads; - public SpecialFlowerBakedModel(ImmutableMap>, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { + public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { this.models = models; this.vertexFormat = format; this.transforms = cameraTransforms; } private void refreshBakedModels() { - System.out.println("Refreshing"); - //if (baseModel == null) { + if (baseModel == null) { + System.out.println("Refreshing baked models"); ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getModel(manager, Optional.>absent()); + baseModel = getModel(manager, Optional.absent()); - ImmutableMap.Builder, IBakedModel> builder = ImmutableMap.builder(); - for (Map.Entry>, ModelResourceLocation> e : models.entrySet()) { + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (Map.Entry, ModelResourceLocation> e : models.entrySet()) { if (e.getKey().isPresent()) { builder.put(e.getKey().get(), getModel(manager, e.getKey())); } @@ -177,10 +184,10 @@ public class SpecialFlowerModel implements IModelCustomData { quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); } quads = quadBuilder.build(); - //} + } } - private IBakedModel getModel(ModelManager manager, Optional> optClazz) { + private IBakedModel getModel(ModelManager manager, Optional optClazz) { ModelResourceLocation loc = models.get(optClazz); if (loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); @@ -245,8 +252,11 @@ public class SpecialFlowerModel implements IModelCustomData { public IBakedModel handleBlockState(IBlockState state) { refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); - Class clazz = extendedState.getValue(BotaniaStateProps.SUBTILE_CLASS); - return bakedFlowerModels.get(clazz); + IBakedModel ret = bakedFlowerModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if (ret == null) { + System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + } + return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; } @Override @@ -258,5 +268,11 @@ public class SpecialFlowerModel implements IModelCustomData { public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + refreshBakedModels(); + return bakedFlowerModels.get(ItemBlockSpecialFlower.getType(stack)); + } } } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 499947994..8f1f680fb 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,8 +10,6 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; -import javax.annotation.Nullable; - /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -19,7 +17,7 @@ public class BotaniaStateProps { /** The property for specialFlower **/ - public static final PropertyClass SUBTILE_CLASS = new PropertyClass("subtile_class"); + public static final PropertyString SUBTILE_ID = new PropertyString("subtile_id"); /** Common properties to all blocks to use **/ diff --git a/src/main/java/vazkii/botania/api/state/PropertyClass.java b/src/main/java/vazkii/botania/api/state/PropertyClass.java deleted file mode 100644 index bb9f863ae..000000000 --- a/src/main/java/vazkii/botania/api/state/PropertyClass.java +++ /dev/null @@ -1,35 +0,0 @@ -package vazkii.botania.api.state; - -import net.minecraftforge.common.property.IUnlistedProperty; -import vazkii.botania.api.subtile.SubTileEntity; - -public class PropertyClass implements IUnlistedProperty> { - - private final String name; - - public PropertyClass(String name) { - this.name = name; - } - - @Override - public String getName() { - return name; - } - - @Override - public boolean isValid(Class value) { - return true; - } - - @Override - public Class> getType() { - // todo is there a safe way? - Class clazz = Class.class; - return clazz; - } - - @Override - public String valueToString(Class value) { - return value.getName(); - } -} diff --git a/src/main/java/vazkii/botania/api/state/PropertyString.java b/src/main/java/vazkii/botania/api/state/PropertyString.java new file mode 100644 index 000000000..ed414b7ea --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/PropertyString.java @@ -0,0 +1,33 @@ +package vazkii.botania.api.state; + +import net.minecraftforge.common.property.IUnlistedProperty; +import vazkii.botania.api.subtile.SubTileEntity; + +public class PropertyString implements IUnlistedProperty { + + private final String name; + + public PropertyString(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean isValid(String value) { + return true; + } + + @Override + public Class getType() { + return String.class; + } + + @Override + public String valueToString(String value) { + return value; + } +} 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 edfa5e407..aa70d67be 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -23,8 +23,50 @@ import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import vazkii.botania.common.block.subtile.SubTileDecor; +import vazkii.botania.common.block.subtile.SubTileManastar; +import vazkii.botania.common.block.subtile.SubTilePureDaisy; +import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; +import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileBubbell; +import vazkii.botania.common.block.subtile.functional.SubTileClayconia; +import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; +import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; +import vazkii.botania.common.block.subtile.functional.SubTileExoflame; +import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; +import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; +import vazkii.botania.common.block.subtile.functional.SubTileHopperhock; +import vazkii.botania.common.block.subtile.functional.SubTileHyacidus; +import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; +import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; +import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; +import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis; +import vazkii.botania.common.block.subtile.functional.SubTileMedumone; +import vazkii.botania.common.block.subtile.functional.SubTileOrechid; +import vazkii.botania.common.block.subtile.functional.SubTileOrechidIgnem; +import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac; +import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; +import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; +import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; +import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; +import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; +import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; +import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; +import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; +import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; +import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; +import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; +import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; +import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; +import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; +import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.block.subtile.generating.SubTileNightshade; +import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; +import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; +import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.item.ItemGaiaHead; +import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -42,7 +84,8 @@ public final class ModelHandler { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:daybloom")); + /** Subtile block models **/ + registerSubtiles(); /** Custom statemappers **/ registerStateMappers(); @@ -69,6 +112,64 @@ public final class ModelHandler { /** Special Item Meshers **/ } + private static void registerSubtiles() { + SpecialFlowerModel.register(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); + SpecialFlowerModel.register(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); + + SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM)); + SpecialFlowerModel.register(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor")); + SpecialFlowerModel.register(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); + SpecialFlowerModel.register(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); + SpecialFlowerModel.register(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); + SpecialFlowerModel.register(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor")); + SpecialFlowerModel.register(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); + SpecialFlowerModel.register(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE)); + SpecialFlowerModel.register(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor")); + SpecialFlowerModel.register(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); + SpecialFlowerModel.register(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); + SpecialFlowerModel.register(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); + SpecialFlowerModel.register(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); + SpecialFlowerModel.register(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); + SpecialFlowerModel.register(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); + SpecialFlowerModel.register(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); + SpecialFlowerModel.register(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); + SpecialFlowerModel.register(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); + SpecialFlowerModel.register(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); + + SpecialFlowerModel.register(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); + SpecialFlowerModel.register(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + SpecialFlowerModel.register(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); + SpecialFlowerModel.register(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); + SpecialFlowerModel.register(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); + SpecialFlowerModel.register(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); + SpecialFlowerModel.register(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); + SpecialFlowerModel.register(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); + SpecialFlowerModel.register(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); + SpecialFlowerModel.register(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); + SpecialFlowerModel.register(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); + SpecialFlowerModel.register(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); + SpecialFlowerModel.register(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); + SpecialFlowerModel.register(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); + SpecialFlowerModel.register(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); + SpecialFlowerModel.register(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); + SpecialFlowerModel.register(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); + SpecialFlowerModel.register(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); + SpecialFlowerModel.register(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); + SpecialFlowerModel.register(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); + SpecialFlowerModel.register(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); + SpecialFlowerModel.register(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); + SpecialFlowerModel.register(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); + SpecialFlowerModel.register(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); + SpecialFlowerModel.register(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); + SpecialFlowerModel.register(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); + SpecialFlowerModel.register(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); + SpecialFlowerModel.register(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); + SpecialFlowerModel.register(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); + SpecialFlowerModel.register(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); + SpecialFlowerModel.register(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); + SpecialFlowerModel.register(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + } + private static void registerStandardBlocks() { registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); @@ -76,6 +177,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.pistonRelay); registerItemModel(ModBlocks.distributor); registerItemModel(ModBlocks.starfield); + registerItemModel(ModBlocks.specialFlower); } private static void registerStandardItems() { @@ -144,7 +246,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index d77c7e5ca..1020c9b4a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -35,6 +36,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; @@ -46,10 +48,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.PropertyClass; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; @@ -125,7 +127,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.SUBTILE_CLASS, SubTileDaybloom.class) + .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); MinecraftForge.EVENT_BUS.register(this); @@ -134,6 +136,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @SubscribeEvent @SideOnly(Side.CLIENT) public void onModelBake(ModelBakeEvent evt) { + // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(this, new DefaultStateMapper() { @Override public ModelResourceLocation getModelResourceLocation(IBlockState state) { @@ -144,15 +147,16 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public BlockState createBlockState() { - return new ExtendedBlockState(this, new IProperty[]{ getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_CLASS } ); + return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); } @Override public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); - if (te instanceof TileSpecialFlower) { + if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); - return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_CLASS, clazz); + String id = BotaniaAPI.getSubTileStringMapping(clazz); + return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, id); } else { return ((IExtendedBlockState) state); } 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 76f96ec60..55508ed22 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -43,6 +43,11 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public String subTileName = ""; SubTileEntity subTile; + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } + @Override public SubTileEntity getSubTile() { return subTile; diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json new file mode 100644 index 000000000..1f4791fcb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnation" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json new file mode 100644 index 000000000..0a787c69f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/agricarnationChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json new file mode 100644 index 000000000..07a49d320 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/arcanerose" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json new file mode 100644 index 000000000..a50a918a3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethorn" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethornChibi.json b/src/main/resources/assets/botania/blockstates/bellethornChibi.json new file mode 100644 index 000000000..4304f7441 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellethornChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bellethornChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json new file mode 100644 index 000000000..230c9d266 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbell" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbellChibi.json b/src/main/resources/assets/botania/blockstates/bubbellChibi.json new file mode 100644 index 000000000..24db9e26f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bubbellChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bubbellChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json new file mode 100644 index 000000000..dd8c1367e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/clayconia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json new file mode 100644 index 000000000..3ae43a628 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daffomill" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json new file mode 100644 index 000000000..5aede7277 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dandelifeon" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json index 0e618b004..a5f94ec99 100644 --- a/src/main/resources/assets/botania/blockstates/daybloom.json +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "minecraft:cross", + "model": "botania:cross_tinted", "textures": { "cross": "botania:blocks/daybloom" } diff --git a/src/main/resources/assets/botania/blockstates/daybloomDecor.json b/src/main/resources/assets/botania/blockstates/daybloomDecor.json new file mode 100644 index 000000000..6c73c3985 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomPrime.json b/src/main/resources/assets/botania/blockstates/daybloomPrime.json new file mode 100644 index 000000000..11abe2aa3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/daybloomPrime.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/daybloomPrime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json new file mode 100644 index 000000000..9e31450b9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/dreadthorn" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json new file mode 100644 index 000000000..b6cacbe4d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/endoflame" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json new file mode 100644 index 000000000..4f617beee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/entropinnyum" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json new file mode 100644 index 000000000..15444e52b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/exoflame" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallenKanade.json b/src/main/resources/assets/botania/blockstates/fallenKanade.json new file mode 100644 index 000000000..828bc4bac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fallenKanade.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/fallenKanade" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json new file mode 100644 index 000000000..53fb50545 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/gourmaryllis" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/heiseiDream.json b/src/main/resources/assets/botania/blockstates/heiseiDream.json new file mode 100644 index 000000000..b64c70bca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/heiseiDream.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/heiseiDream" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json new file mode 100644 index 000000000..61bdcd4ab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhock" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json new file mode 100644 index 000000000..526815ef0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhockChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json new file mode 100644 index 000000000..416dc7d74 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hyacidus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json new file mode 100644 index 000000000..f72ca06f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeas" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json new file mode 100644 index 000000000..652009361 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeasDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json new file mode 100644 index 000000000..699815cd3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jadedAmaranthus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json new file mode 100644 index 000000000..c6122f3b6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/jiyuulia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json new file mode 100644 index 000000000..e96c95a5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/kekimurus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json new file mode 100644 index 000000000..81fb21ab3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/loonium" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json new file mode 100644 index 000000000..f807ab1e2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/manastar" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json new file mode 100644 index 000000000..65fe4fd1e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosis" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json new file mode 100644 index 000000000..f535a40fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosisChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json new file mode 100644 index 000000000..c33f095fa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/medumone" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json new file mode 100644 index 000000000..f0c15b021 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/munchdew" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json new file mode 100644 index 000000000..cc7f449cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/narslimmus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshade.json b/src/main/resources/assets/botania/blockstates/nightshade.json new file mode 100644 index 000000000..eaeb777fa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshade.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshade" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json new file mode 100644 index 000000000..3faed861d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadeDecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadePrime.json b/src/main/resources/assets/botania/blockstates/nightshadePrime.json new file mode 100644 index 000000000..b9fe29f91 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadePrime.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadePrime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json new file mode 100644 index 000000000..1e1db9f86 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechid" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechidIgnem.json b/src/main/resources/assets/botania/blockstates/orechidIgnem.json new file mode 100644 index 000000000..dd0672b64 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orechidIgnem.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/orechidIgnem" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json new file mode 100644 index 000000000..90e8597a2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/pollidisiac" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json new file mode 100644 index 000000000..1ce8a536c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/puredaisy" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json new file mode 100644 index 000000000..8aea70fcb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rafflowsia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json new file mode 100644 index 000000000..01f847cb7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json new file mode 100644 index 000000000..2ab3383d0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpusChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json new file mode 100644 index 000000000..0867bdb89 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnolia" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json new file mode 100644 index 000000000..821339402 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/solegnoliaChibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 281ffbc7c..3a011d524 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -7,7 +7,12 @@ "variants": { "normal": [{ "custom": { - "base": "minecraft:poppy#normal" + "base": "botania:flower#color=white" + } + }], + "inventory": [{ + "custom": { + "base": "minecraft:poppy" } }] } diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json new file mode 100644 index 000000000..11e2c4829 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectranthemum" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json new file mode 100644 index 000000000..b5db8573d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/spectrolus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json new file mode 100644 index 000000000..537af0349 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tangleberrie" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json new file mode 100644 index 000000000..97db80469 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/thermalily" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json new file mode 100644 index 000000000..2c13a52ce --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/tigerseye" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json new file mode 100644 index 000000000..b85f1779b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/vinculotus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cross_tinted.json b/src/main/resources/assets/botania/models/block/cross_tinted.json new file mode 100644 index 000000000..f5aad893c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cross_tinted.json @@ -0,0 +1,28 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } + } + } + ] +} From dcd08963e94a2034a998e71d144e4f03c860c1c4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 12:33:25 -0600 Subject: [PATCH 094/935] Special item models --- .../java/vazkii/botania/api/BotaniaAPI.java | 8 +- .../api/render/SpecialFlowerModel.java | 143 +++++++++++++----- .../botania/blockstates/agricarnation.json | 7 + .../blockstates/agricarnationChibi.json | 7 + .../botania/blockstates/arcanerose.json | 7 + .../botania/blockstates/bellethorn.json | 7 + .../botania/blockstates/bellethornChibi.json | 7 + .../assets/botania/blockstates/bubbell.json | 7 + .../botania/blockstates/bubbellChibi.json | 7 + .../assets/botania/blockstates/clayconia.json | 7 + .../assets/botania/blockstates/daffomill.json | 7 + .../botania/blockstates/dandelifeon.json | 7 + .../assets/botania/blockstates/daybloom.json | 7 + .../botania/blockstates/daybloomDecor.json | 7 + .../botania/blockstates/daybloomPrime.json | 7 + .../botania/blockstates/dreadthorn.json | 7 + .../assets/botania/blockstates/endoflame.json | 7 + .../botania/blockstates/entropinnyum.json | 7 + .../assets/botania/blockstates/exoflame.json | 7 + .../botania/blockstates/fallenKanade.json | 7 + .../botania/blockstates/gourmaryllis.json | 7 + .../botania/blockstates/heiseiDream.json | 7 + .../botania/blockstates/hopperhock.json | 7 + .../botania/blockstates/hopperhockChibi.json | 7 + .../assets/botania/blockstates/hyacidus.json | 7 + .../botania/blockstates/hydroangeas.json | 7 + .../botania/blockstates/hydroangeasDecor.json | 7 + .../botania/blockstates/jadedAmaranthus.json | 7 + .../assets/botania/blockstates/jiyuulia.json | 7 + .../assets/botania/blockstates/kekimurus.json | 7 + .../assets/botania/blockstates/loonium.json | 7 + .../assets/botania/blockstates/manastar.json | 7 + .../botania/blockstates/marimorphosis.json | 7 + .../blockstates/marimorphosisChibi.json | 7 + .../assets/botania/blockstates/medumone.json | 7 + .../assets/botania/blockstates/munchdew.json | 7 + .../botania/blockstates/narslimmus.json | 7 + .../botania/blockstates/nightshade.json | 7 + .../botania/blockstates/nightshadeDecor.json | 7 + .../botania/blockstates/nightshadePrime.json | 7 + .../assets/botania/blockstates/orechid.json | 7 + .../botania/blockstates/orechidIgnem.json | 7 + .../botania/blockstates/pollidisiac.json | 7 + .../assets/botania/blockstates/puredaisy.json | 7 + .../botania/blockstates/rafflowsia.json | 7 + .../botania/blockstates/rannuncarpus.json | 7 + .../blockstates/rannuncarpusChibi.json | 7 + .../botania/blockstates/solegnolia.json | 7 + .../botania/blockstates/solegnoliaChibi.json | 7 + .../botania/blockstates/spectranthemum.json | 7 + .../botania/blockstates/spectrolus.json | 7 + .../botania/blockstates/tangleberrie.json | 7 + .../botania/blockstates/thermalily.json | 7 + .../assets/botania/blockstates/tigerseye.json | 7 + .../botania/blockstates/vinculotus.json | 7 + 55 files changed, 481 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 6a2611e3e..77c00e022 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -88,7 +88,7 @@ public final class BotaniaAPI { public static Map seeds = new HashMap(); public static Set looniumBlacklist = new LinkedHashSet(); - public static Map paintableBlocks = new LinkedHashMap(); + public static Map> paintableBlocks = new LinkedHashMap>(); public static Set magnetBlacklist = new LinkedHashSet(); @@ -285,11 +285,7 @@ public final class BotaniaAPI { * You must also provide the PropertyEnum that this block uses to express its color * The component type of the property must be EnumDyeColor */ - public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ - if (colorProp.getValueClass() != EnumDyeColor.class) { - throw new IllegalArgumentException("Must be EnumDyeColor"); - } - + public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ paintableBlocks.put(paintable, colorProp); return paintable; } diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index 5ae966d5e..c8fecc1b4 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -4,6 +4,7 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -47,40 +48,67 @@ public class SpecialFlowerModel implements IModelCustomData { /** * Register your model for the given subtile class here. - * Call this DURING PREINIT. Calling it anytime after models have already baked does not guarantee that your model will work. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. * Your model json must specify key "tintindex" in all the faces it wants tint applied. * Tint is applied whenever a player recolors the flower using floral dye * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process * - * @param subTileName The String ID of the subtile + * @param subTileName The String ID of the subtile * @param model A path to a blockstate json and variant to be used for this subtile + * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form + */ + public static void register(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { + queuedBlockModels.put(subTileName, model); + queuedItemModels.put(subTileName, itemModel); + } + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process + * + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" */ public static void register(String subTileName, ModelResourceLocation model) { - queuedModels.put(subTileName, model); + register(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); } public static void register(Class clazz, ModelResourceLocation model) { register(BotaniaAPI.getSubTileStringMapping(clazz), model); } + public static void register(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { + register(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); + } + /** * Internal implementation **/ - // SpecialFlowerModel for when there are no models registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of()); + // SpecialFlowerModel for when there are no blockModels registered for a subtile + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); // Models registered from the externel API thus far - private static final Map queuedModels = Maps.newHashMap(); + private static final Map queuedBlockModels = Maps.newHashMap(); + private static final Map queuedItemModels = Maps.newHashMap(); - private final ImmutableMap, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; - public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> models) { - this.models = models; + public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels) { + this.blockModels = blockModels; + this.itemModels = itemModels; } @Override public Collection getDependencies() { - return ImmutableList.copyOf(models.values()); + ImmutableSet.Builder builder = ImmutableSet.builder(); + builder.addAll(blockModels.values()); + builder.addAll(itemModels.values()); + return builder.build(); } @Override @@ -90,8 +118,8 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { - // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate models) - return new SpecialFlowerBakedModel(models, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) + return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); } @Override @@ -102,18 +130,26 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IModel process(ImmutableMap customData) { // Load the base variant from blockstate json, and also add all the model paths we received from external API - ImmutableMap.Builder, ModelResourceLocation> builder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> blockBuilder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> itemBuilder = ImmutableMap.builder(); + for (String key : customData.keySet()) { if ("base".equals(key)) { - builder.put(Optional.absent(), getLocation(customData.get(key))); - } - for (Map.Entry e : queuedModels.entrySet()) { - builder.put(Optional.of(e.getKey()), e.getValue()); + blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); } } - ImmutableMap, ModelResourceLocation> models = builder.build(); - if (models.isEmpty()) return INSTANCE; - return new SpecialFlowerModel(models); + + for (Map.Entry e : queuedBlockModels.entrySet()) { + blockBuilder.put(Optional.of(e.getKey()), e.getValue()); + } + for (Map.Entry e : queuedItemModels.entrySet()) { + itemBuilder.put(Optional.of(e.getKey()), e.getValue()); + } + + ImmutableMap, ModelResourceLocation> blockModels = blockBuilder.build(); + ImmutableMap, ModelResourceLocation> itemModels = itemBuilder.build(); + if (blockModels.isEmpty() && itemModels.isEmpty()) return INSTANCE; + return new SpecialFlowerModel(blockModels, itemModels); } private ModelResourceLocation getLocation(String json) { @@ -141,7 +177,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IModel loadModel(ResourceLocation modelLocation) throws IOException { - // Load a dummy model for now, all actual models added in process(). + // Load a dummy model for now, all actual blockModels added in process(). return SpecialFlowerModel.INSTANCE; } } @@ -150,33 +186,46 @@ public class SpecialFlowerModel implements IModelCustomData { public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { private final ImmutableMap transforms; - private final ImmutableMap, ModelResourceLocation> models; + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; private final VertexFormat vertexFormat; private IBakedModel baseModel; - private ImmutableMap bakedFlowerModels; + private ImmutableMap bakedBlockModels; + private ImmutableMap bakedItemModels; private ImmutableMap, ImmutableList> quads; - public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> models, VertexFormat format, ImmutableMap cameraTransforms) { - this.models = models; + public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels, + VertexFormat format, ImmutableMap cameraTransforms) { + this.blockModels = blockModels; + this.itemModels = itemModels; this.vertexFormat = format; this.transforms = cameraTransforms; } private void refreshBakedModels() { if (baseModel == null) { - System.out.println("Refreshing baked models"); ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getModel(manager, Optional.absent()); + baseModel = getBlockModel(manager, Optional.absent()); ImmutableMap.Builder builder = ImmutableMap.builder(); - for (Map.Entry, ModelResourceLocation> e : models.entrySet()) { + for (Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { if (e.getKey().isPresent()) { - builder.put(e.getKey().get(), getModel(manager, e.getKey())); + builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); } } - bakedFlowerModels = builder.build(); + bakedBlockModels = builder.build(); + + ImmutableMap.Builder builder2 = ImmutableMap.builder(); + for (Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { + if (e.getKey().isPresent()) { + builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); + } + } + + bakedItemModels = builder2.build(); ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); @@ -187,8 +236,16 @@ public class SpecialFlowerModel implements IModelCustomData { } } - private IBakedModel getModel(ModelManager manager, Optional optClazz) { - ModelResourceLocation loc = models.get(optClazz); + private IBakedModel getBlockModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = blockModels.get(opt); + if (loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } + + private IBakedModel getItemModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = itemModels.get(opt); if (loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } @@ -197,13 +254,22 @@ public class SpecialFlowerModel implements IModelCustomData { private ImmutableList buildQuads(Optional side) { ImmutableList.Builder builder = ImmutableList.builder(); - for (IBakedModel model : bakedFlowerModels.values()) { + for (IBakedModel model : bakedBlockModels.values()) { if (side.isPresent()) { builder.addAll(model.getFaceQuads(side.get())); } else { builder.addAll(model.getGeneralQuads()); } } + + for (IBakedModel model : bakedItemModels.values()) { + if (side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } + return builder.build(); } @@ -252,7 +318,7 @@ public class SpecialFlowerModel implements IModelCustomData { public IBakedModel handleBlockState(IBlockState state) { refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedFlowerModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); if (ret == null) { System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); } @@ -272,7 +338,14 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleItemState(ItemStack stack) { refreshBakedModels(); - return bakedFlowerModels.get(ItemBlockSpecialFlower.getType(stack)); + //System.out.println("calling smart item"); + IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + if (item == null) { + System.out.println("Missing item model, selecting block model"); + item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + } + + return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; } } } diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json index 1f4791fcb..fea9affd1 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnation.json +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/agricarnation" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/agricarnation" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json index 0a787c69f..75f3debf9 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json +++ b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/agricarnationChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/agricarnationChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json index 07a49d320..14f2a67b5 100644 --- a/src/main/resources/assets/botania/blockstates/arcanerose.json +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/arcanerose" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/arcanerose" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json index a50a918a3..a32114a6c 100644 --- a/src/main/resources/assets/botania/blockstates/bellethorn.json +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/bellethorn" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bellethorn" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellethornChibi.json b/src/main/resources/assets/botania/blockstates/bellethornChibi.json index 4304f7441..be25798d4 100644 --- a/src/main/resources/assets/botania/blockstates/bellethornChibi.json +++ b/src/main/resources/assets/botania/blockstates/bellethornChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/bellethornChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bellethornChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json index 230c9d266..039acac9a 100644 --- a/src/main/resources/assets/botania/blockstates/bubbell.json +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/bubbell" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bubbell" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bubbellChibi.json b/src/main/resources/assets/botania/blockstates/bubbellChibi.json index 24db9e26f..26771a891 100644 --- a/src/main/resources/assets/botania/blockstates/bubbellChibi.json +++ b/src/main/resources/assets/botania/blockstates/bubbellChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/bubbellChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bubbellChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json index dd8c1367e..00a986196 100644 --- a/src/main/resources/assets/botania/blockstates/clayconia.json +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/clayconia" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/clayconia" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json index 3ae43a628..fff602c34 100644 --- a/src/main/resources/assets/botania/blockstates/daffomill.json +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/daffomill" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daffomill" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json index 5aede7277..4b6c71c69 100644 --- a/src/main/resources/assets/botania/blockstates/dandelifeon.json +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/dandelifeon" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/dandelifeon" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json index a5f94ec99..81dc313b2 100644 --- a/src/main/resources/assets/botania/blockstates/daybloom.json +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/daybloom" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daybloom" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomDecor.json b/src/main/resources/assets/botania/blockstates/daybloomDecor.json index 6c73c3985..4ec50a0e5 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomDecor.json +++ b/src/main/resources/assets/botania/blockstates/daybloomDecor.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/daybloomDecor" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daybloomDecor" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/daybloomPrime.json b/src/main/resources/assets/botania/blockstates/daybloomPrime.json index 11abe2aa3..80792cd90 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomPrime.json +++ b/src/main/resources/assets/botania/blockstates/daybloomPrime.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/daybloomPrime" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/daybloomPrime" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json index 9e31450b9..5c1309347 100644 --- a/src/main/resources/assets/botania/blockstates/dreadthorn.json +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/dreadthorn" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/dreadthorn" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json index b6cacbe4d..1a83629e2 100644 --- a/src/main/resources/assets/botania/blockstates/endoflame.json +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/endoflame" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/endoflame" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json index 4f617beee..5c15e1a4a 100644 --- a/src/main/resources/assets/botania/blockstates/entropinnyum.json +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/entropinnyum" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/entropinnyum" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json index 15444e52b..14c0f9e15 100644 --- a/src/main/resources/assets/botania/blockstates/exoflame.json +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/exoflame" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/exoflame" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallenKanade.json b/src/main/resources/assets/botania/blockstates/fallenKanade.json index 828bc4bac..9dc163cc7 100644 --- a/src/main/resources/assets/botania/blockstates/fallenKanade.json +++ b/src/main/resources/assets/botania/blockstates/fallenKanade.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/fallenKanade" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/fallenKanade" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json index 53fb50545..4002fcdff 100644 --- a/src/main/resources/assets/botania/blockstates/gourmaryllis.json +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/gourmaryllis" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/gourmaryllis" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/heiseiDream.json b/src/main/resources/assets/botania/blockstates/heiseiDream.json index b64c70bca..717513a65 100644 --- a/src/main/resources/assets/botania/blockstates/heiseiDream.json +++ b/src/main/resources/assets/botania/blockstates/heiseiDream.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/heiseiDream" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/heiseiDream" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json index 61bdcd4ab..d154cda9c 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhock.json +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/hopperhock" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hopperhock" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json index 526815ef0..4c4f3f840 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json +++ b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/hopperhockChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hopperhockChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json index 416dc7d74..ea8ff7336 100644 --- a/src/main/resources/assets/botania/blockstates/hyacidus.json +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/hyacidus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hyacidus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json index f72ca06f5..1d0db7d65 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeas.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/hydroangeas" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hydroangeas" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json index 652009361..7667397dc 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/hydroangeasDecor" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hydroangeasDecor" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json index 699815cd3..626df23f9 100644 --- a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json +++ b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/jadedAmaranthus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/jadedAmaranthus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json index c6122f3b6..4297c619d 100644 --- a/src/main/resources/assets/botania/blockstates/jiyuulia.json +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/jiyuulia" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/jiyuulia" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json index e96c95a5a..4f6f415a4 100644 --- a/src/main/resources/assets/botania/blockstates/kekimurus.json +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/kekimurus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/kekimurus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json index 81fb21ab3..35255a6e0 100644 --- a/src/main/resources/assets/botania/blockstates/loonium.json +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/loonium" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/loonium" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json index f807ab1e2..316de14f6 100644 --- a/src/main/resources/assets/botania/blockstates/manastar.json +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/manastar" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/manastar" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json index 65fe4fd1e..9b8864318 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosis.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/marimorphosis" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/marimorphosis" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json index f535a40fd..54ce24860 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/marimorphosisChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/marimorphosisChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json index c33f095fa..8120698cd 100644 --- a/src/main/resources/assets/botania/blockstates/medumone.json +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/medumone" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/medumone" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json index f0c15b021..8d9d7a3a7 100644 --- a/src/main/resources/assets/botania/blockstates/munchdew.json +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/munchdew" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/munchdew" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json index cc7f449cc..143dab445 100644 --- a/src/main/resources/assets/botania/blockstates/narslimmus.json +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/narslimmus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/narslimmus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshade.json b/src/main/resources/assets/botania/blockstates/nightshade.json index eaeb777fa..868ea45b8 100644 --- a/src/main/resources/assets/botania/blockstates/nightshade.json +++ b/src/main/resources/assets/botania/blockstates/nightshade.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/nightshade" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/nightshade" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json index 3faed861d..6da17dd9f 100644 --- a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json +++ b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/nightshadeDecor" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/nightshadeDecor" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadePrime.json b/src/main/resources/assets/botania/blockstates/nightshadePrime.json index b9fe29f91..22ce1d835 100644 --- a/src/main/resources/assets/botania/blockstates/nightshadePrime.json +++ b/src/main/resources/assets/botania/blockstates/nightshadePrime.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/nightshadePrime" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/nightshadePrime" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json index 1e1db9f86..b9ed976ae 100644 --- a/src/main/resources/assets/botania/blockstates/orechid.json +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/orechid" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/orechid" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/orechidIgnem.json b/src/main/resources/assets/botania/blockstates/orechidIgnem.json index dd0672b64..273b5e669 100644 --- a/src/main/resources/assets/botania/blockstates/orechidIgnem.json +++ b/src/main/resources/assets/botania/blockstates/orechidIgnem.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/orechidIgnem" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/orechidIgnem" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json index 90e8597a2..b53aebd9b 100644 --- a/src/main/resources/assets/botania/blockstates/pollidisiac.json +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/pollidisiac" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/pollidisiac" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json index 1ce8a536c..1ea981ff1 100644 --- a/src/main/resources/assets/botania/blockstates/puredaisy.json +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/puredaisy" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/puredaisy" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json index 8aea70fcb..e263bb769 100644 --- a/src/main/resources/assets/botania/blockstates/rafflowsia.json +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/rafflowsia" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/rafflowsia" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json index 01f847cb7..4acadf424 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpus.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/rannuncarpus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/rannuncarpus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json index 2ab3383d0..8e385fd1d 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/rannuncarpusChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/rannuncarpusChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json index 0867bdb89..a5173a435 100644 --- a/src/main/resources/assets/botania/blockstates/solegnolia.json +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/solegnolia" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/solegnolia" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json index 821339402..71f1173eb 100644 --- a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json +++ b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/solegnoliaChibi" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/solegnoliaChibi" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json index 11e2c4829..a9885c596 100644 --- a/src/main/resources/assets/botania/blockstates/spectranthemum.json +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/spectranthemum" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/spectranthemum" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json index b5db8573d..9c5a5fcda 100644 --- a/src/main/resources/assets/botania/blockstates/spectrolus.json +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/spectrolus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/spectrolus" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json index 537af0349..77695bb45 100644 --- a/src/main/resources/assets/botania/blockstates/tangleberrie.json +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/tangleberrie" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/tangleberrie" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json index 97db80469..760e52e70 100644 --- a/src/main/resources/assets/botania/blockstates/thermalily.json +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/thermalily" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/thermalily" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json index 2c13a52ce..8977cfe1c 100644 --- a/src/main/resources/assets/botania/blockstates/tigerseye.json +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/tigerseye" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/tigerseye" + } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json index b85f1779b..dbdf9c15b 100644 --- a/src/main/resources/assets/botania/blockstates/vinculotus.json +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -6,6 +6,13 @@ "textures": { "cross": "botania:blocks/vinculotus" } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/vinculotus" + } }] } } \ No newline at end of file From 70d4450a6ab2a94b0c65c87819d0f59c79be8bb2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 14:00:11 -0600 Subject: [PATCH 095/935] Wand of the Forest, Fel pumpkin, trodden path --- .../client/core/handler/ModelHandler.java | 3 +++ .../assets/botania/blockstates/dirtPath.json | 13 +++++++++++ .../botania/blockstates/felPumpkin.json | 22 +++++++++++++++++++ .../botania/models/block/minusone_all.json | 18 +++++++++++++++ .../assets/botania/models/item/twigWand.json | 9 ++++++++ 5 files changed, 65 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/dirtPath.json create mode 100644 src/main/resources/assets/botania/blockstates/felPumpkin.json create mode 100644 src/main/resources/assets/botania/models/block/minusone_all.json create mode 100644 src/main/resources/assets/botania/models/item/twigWand.json 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 aa70d67be..afa78b5be 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -178,6 +178,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.distributor); registerItemModel(ModBlocks.starfield); registerItemModel(ModBlocks.specialFlower); + registerItemModel(ModBlocks.dirtPath); + registerItemModel(ModBlocks.felPumpkin); } private static void registerStandardItems() { @@ -222,6 +224,7 @@ public final class ModelHandler { registerItemModel(starSword); registerItemModel(thunderSword); registerItemModel(glassPick); + registerItemModel(twigWand); } private static void registerManaResources() { diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json new file mode 100644 index 000000000..9d7444376 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:minusone_all", + "textures": { + "all": "botania:blocks/dirtPath" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json new file mode 100644 index 000000000..afb93a0bf --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "minecraft:blocks/pumpkin_top", + "front": "botania:blocks/felPumpkin", + "side": "minecraft:blocks/pumpkin_side" + } + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 } + }, + "inventory": [{ + "transform": "forge:default-block" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/minusone_all.json b/src/main/resources/assets/botania/models/block/minusone_all.json new file mode 100644 index 000000000..78896926e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/minusone_all.json @@ -0,0 +1,18 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#all", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#all" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#all", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json new file mode 100644 index 000000000..c46913af5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -0,0 +1,9 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/twigWand0", + "layer1": "botania:items/twigWand1", + "layer2": "botania:items/twigWand2", + "layer3": "botania:items/twigWand3" + } +} \ No newline at end of file From 0687f56c32164cb098dc8cc45ae98dfc024bc11a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 14:42:52 -0600 Subject: [PATCH 096/935] Tentatively change relics to use UUID. Still use playernames for display --- MC18_notes.txt | 2 +- .../java/vazkii/botania/api/item/IRelic.java | 10 +-- .../crafting/recipe/AesirRingRecipe.java | 8 ++- .../common/entity/EntityDoppleganger.java | 11 ++-- .../common/item/relic/ItemAesirRing.java | 5 +- .../botania/common/item/relic/ItemRelic.java | 63 ++++++++++++------- .../common/item/relic/ItemRelicBauble.java | 9 +-- 7 files changed, 69 insertions(+), 39 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 3127dac58..ea7bf1c46 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -10,7 +10,7 @@ Anyways, vanilla removed it from their method so we follow suit. * Multiblock system reworked to use states and blockposes * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. * Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with - * todo: possibly make the unlisted properties use the subtile string name instead of class. Will be much easier. +* IRelic changed to use UUIDs -- Other -- * Most things left untouched to make patches from upstream easier diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index aecd1cde4..d907d36b4 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -13,6 +13,8 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import java.util.UUID; + /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. @@ -20,14 +22,14 @@ import net.minecraft.stats.Achievement; public interface IRelic { /** - * Binds to the player name passed in. + * Binds to the player UUID passed in. */ - public void bindToUsername(String playerName, ItemStack stack); + public void bindToUuid(UUID playerName, ItemStack stack); /** - * Gets the username of the person this relic is bound to. + * Gets the UUID of the person this relic is bound to. */ - public String getSoulbindUsername(ItemStack stack); + public UUID getSoulbindUuid(ItemStack stack); /** * Sets the achievement that this relic binds to. diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 1eed8838b..4c1b65d57 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -18,6 +18,8 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import java.util.UUID; + public class AesirRingRecipe implements IRecipe { @Override @@ -44,13 +46,13 @@ public class AesirRingRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting var1) { - String soulbind = null; + UUID soulbind = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { if(stack.getItem() instanceof IRelic) { - String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); + UUID bind = ((IRelic) stack.getItem()).getSoulbindUuid(stack); if(soulbind == null) soulbind = bind; else if(!soulbind.equals(bind)) @@ -60,7 +62,7 @@ public class AesirRingRecipe implements IRecipe { } ItemStack stack = new ItemStack(ModItems.aesirRing); - ((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack); + ((IRelic) ModItems.aesirRing).bindToUuid(soulbind, stack); return stack; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 800558f3a..c6fc22a6b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -13,7 +13,10 @@ package vazkii.botania.common.entity; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.UUID; import java.util.regex.Pattern; import net.minecraft.block.Block; @@ -107,7 +110,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList(); private static boolean isPlayingMusic = false; @@ -357,8 +360,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getName())) - playersWhoAttacked.add(player.getName()); + if(!playersWhoAttacked.contains(player.getUniqueID())) + playersWhoAttacked.add(player.getUniqueID()); float dmg = par2; boolean crit = false; @@ -445,7 +448,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); if(ConfigHandler.relicsEnabled) { ItemStack dice = new ItemStack(ModItems.dice); - ItemRelic.bindToUsernameS(playersWhoAttacked.get(pl), dice); + ItemRelic.bindToUuidS(playersWhoAttacked.get(pl), dice); entityDropItem(dice, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 9c91f84f7..27ba122c0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -61,10 +62,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe if(stack.getItem() != null && stack.getItem() == this) { event.entityItem.setDead(); - String user = getSoulbindUsername(stack); + UUID user = getSoulbindUuid(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); - bindToUsername(user, stack1); + bindToUuid(user, stack1); EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 88f93bfeb..2b7a0276c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,7 +11,9 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; +import com.mojang.authlib.GameProfile; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +32,8 @@ import vazkii.botania.common.item.ModItems; public class ItemRelic extends ItemMod implements IRelic { - private static final String TAG_SOULBIND = "soulbind"; + private static final String TAG_SOLBIND_NAME = "soulbind"; + private static final String TAG_SOULBIND_UUID = "soulbindUuid"; Achievement achievement; @@ -50,15 +53,19 @@ public class ItemRelic extends ItemMod implements IRelic { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { - String bind = getSoulbindUsernameS(stack); - if(bind.isEmpty()) + UUID bind = getSoulbindUuidS(stack); + if(bind == null) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); else { - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list); + String disp = getSoulbindNameS(stack); + if (disp.isEmpty()) { + disp = bind.toString(); + } + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), disp), list); if(!isRightPlayer(player, stack)) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), disp), list); } if(stack.getItem() == ModItems.aesirRing) @@ -86,19 +93,28 @@ public class ItemRelic extends ItemMod implements IRelic { tooltip.add(s.replaceAll("&", "\u00a7")); } - public static String getSoulbindUsernameS(ItemStack stack) { - return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); + public static UUID getSoulbindUuidS(ItemStack stack) { + try { + return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); + } catch (IllegalArgumentException ex) { + // Bad text in tag + return null; + } + } + + public static String getSoulbindNameS(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_SOLBIND_NAME, ""); } public static void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; - String soulbind = getSoulbindUsernameS(stack); - if(soulbind.isEmpty()) { + UUID soulbind = getSoulbindUuidS(stack); + if(soulbind == null) { player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); bindToPlayer(player, stack); - soulbind = getSoulbindUsernameS(stack); + soulbind = getSoulbindUuidS(stack); } if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer())) @@ -106,19 +122,24 @@ public class ItemRelic extends ItemMod implements IRelic { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUsernameS(player.getName(), stack); + bindToUuidS(player.getUniqueID(), stack); + bindToNameS(player.getName(), stack); } - public static void bindToUsernameS(String username, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOULBIND, username); + public static void bindToNameS(String playerName, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOLBIND_NAME, playerName); + } + + public static void bindToUuidS(UUID uuid, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); } public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - return isRightPlayer(player.getName(), stack); + return isRightPlayer(player.getUniqueID(), stack); } - public static boolean isRightPlayer(String player, ItemStack stack) { - return getSoulbindUsernameS(stack).equals(player); + public static boolean isRightPlayer(UUID uuid, ItemStack stack) { + return uuid.equals(getSoulbindUuidS(stack)); } public static DamageSource damageSource() { @@ -126,13 +147,13 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public void bindToUsername(String playerName, ItemStack stack) { - bindToUsernameS(playerName, stack); + public void bindToUuid(UUID playerName, ItemStack stack) { + bindToUuidS(playerName, stack); } @Override - public String getSoulbindUsername(ItemStack stack) { - return getSoulbindUsernameS(stack); + public UUID getSoulbindUuid(ItemStack stack) { + return getSoulbindUuidS(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 6d735743b..7c459db07 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -64,13 +65,13 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void bindToUsername(String playerName, ItemStack stack) { - ItemRelic.bindToUsernameS(playerName, stack); + public void bindToUuid(UUID playerName, ItemStack stack) { + ItemRelic.bindToUuidS(playerName, stack); } @Override - public String getSoulbindUsername(ItemStack stack) { - return ItemRelic.getSoulbindUsernameS(stack); + public UUID getSoulbindUuid(ItemStack stack) { + return ItemRelic.getSoulbindUuidS(stack); } @Override From 32fe7f6ce307f97b66afda75bf87bb143b32fcd2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 15:05:52 -0600 Subject: [PATCH 097/935] Fix landing and break particles in specail flowers --- .../common/block/BlockSpecialFlower.java | 46 +++++++++++++++++-- .../botania/blockstates/specialFlower.json | 8 +--- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1020c9b4a..a6ac0aeb9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -17,28 +17,35 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; 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.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; @@ -208,11 +215,6 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid return true; } - @Override - public int getRenderType() { - return 3; - } - @Override public EnumWorldBlockLayer getBlockLayer() { return EnumWorldBlockLayer.CUTOUT; @@ -332,4 +334,38 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + 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())); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.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()))); + } + } + } + return true; + } else { + return false; + } + } + } diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 3a011d524..8ed1128f1 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -6,14 +6,10 @@ }, "variants": { "normal": [{ - "custom": { - "base": "botania:flower#color=white" - } + "custom": { "base": "minecraft:poppy" } }], "inventory": [{ - "custom": { - "base": "minecraft:poppy" - } + "custom": { "base": "minecraft:poppy" } }] } } \ No newline at end of file From b36f51f6d869079c33f05e3533df3d0fca818ba1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Dec 2015 22:00:24 -0600 Subject: [PATCH 098/935] Clean up a ton of models, add some walls --- build.properties | 2 +- .../botania/api/state/BotaniaStateProps.java | 10 ++ .../client/core/handler/ModelHandler.java | 99 ++++++++----------- .../block/decor/walls/Block18StoneWall.java | 17 +++- .../decor/walls/BlockBiomeStoneWall.java | 23 +++-- .../assets/botania/blockstates/altGrass.json | 32 ++++-- .../botania/blockstates/biomeStoneA0Wall.json | 90 +++++++++++++++++ .../botania/blockstates/forestDrum.json | 11 ++- .../botania/blockstates/livingrock.json | 25 ++--- .../botania/blockstates/livingwood.json | 17 ++-- .../botania/blockstates/stone0Wall.json | 62 ++++++++++++ .../assets/botania/blockstates/storage.json | 15 ++- .../botania/models/block/altGrass_dry.json | 8 -- .../botania/models/block/altGrass_golden.json | 8 -- .../models/block/altGrass_infused.json | 8 -- .../models/block/altGrass_mutated.json | 8 -- .../models/block/altGrass_scorched.json | 8 -- .../botania/models/block/altGrass_vivid.json | 8 -- .../botania/models/block/drum_canopy.json | 7 -- .../botania/models/block/drum_gathering.json | 7 -- .../botania/models/block/drum_wild.json | 7 -- .../models/block/livingrock_brick.json | 6 -- .../block/livingrock_chiseled_brick.json | 6 -- .../block/livingrock_cracked_brick.json | 6 -- .../models/block/livingrock_default.json | 6 -- .../models/block/livingrock_mossy_brick.json | 6 -- .../models/block/livingwood_default.json | 6 -- .../models/block/livingwood_framed.json | 6 -- .../models/block/livingwood_glimmering.json | 6 -- .../models/block/livingwood_inner_stairs.json | 8 -- .../models/block/livingwood_mossy_planks.json | 6 -- .../block/livingwood_pattern_framed.json | 6 -- .../models/block/livingwood_planks.json | 6 -- .../models/block/storage_dragonstone.json | 6 -- .../models/block/storage_elementium.json | 6 -- .../models/block/storage_mana_diamond.json | 6 -- .../models/block/storage_manasteel.json | 6 -- .../models/block/storage_terrasteel.json | 6 -- .../botania/models/block/wall_connect.json | 19 ++++ .../botania/models/item/altGrass_dry.json | 10 -- .../botania/models/item/altGrass_golden.json | 10 -- .../botania/models/item/altGrass_infused.json | 10 -- .../botania/models/item/altGrass_mutated.json | 10 -- .../models/item/altGrass_scorched.json | 10 -- .../botania/models/item/altGrass_vivid.json | 10 -- .../botania/models/item/drum_canopy.json | 10 -- .../botania/models/item/drum_gathering.json | 10 -- .../assets/botania/models/item/drum_wild.json | 10 -- .../botania/models/item/livingrock_brick.json | 10 -- .../item/livingrock_chiseled_brick.json | 10 -- .../models/item/livingrock_cracked_brick.json | 10 -- .../models/item/livingrock_default.json | 10 -- .../models/item/livingrock_mossy_brick.json | 10 -- .../models/item/livingwood_default.json | 10 -- .../models/item/livingwood_framed.json | 10 -- .../models/item/livingwood_glimmering.json | 10 -- .../models/item/livingwood_mossy_planks.json | 10 -- .../item/livingwood_pattern_framed.json | 10 -- .../models/item/livingwood_planks.json | 10 -- .../models/item/storage_dragonstone.json | 10 -- .../models/item/storage_elementium.json | 10 -- .../models/item/storage_mana_diamond.json | 10 -- .../models/item/storage_manasteel.json | 10 -- .../models/item/storage_terrasteel.json | 10 -- 64 files changed, 320 insertions(+), 525 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/stone0Wall.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_dry.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_golden.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_infused.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_mutated.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_scorched.json delete mode 100644 src/main/resources/assets/botania/models/block/altGrass_vivid.json delete mode 100644 src/main/resources/assets/botania/models/block/drum_canopy.json delete mode 100644 src/main/resources/assets/botania/models/block/drum_gathering.json delete mode 100644 src/main/resources/assets/botania/models/block/drum_wild.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_default.json delete mode 100644 src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_default.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_framed.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_glimmering.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks.json delete mode 100644 src/main/resources/assets/botania/models/block/storage_dragonstone.json delete mode 100644 src/main/resources/assets/botania/models/block/storage_elementium.json delete mode 100644 src/main/resources/assets/botania/models/block/storage_mana_diamond.json delete mode 100644 src/main/resources/assets/botania/models/block/storage_manasteel.json delete mode 100644 src/main/resources/assets/botania/models/block/storage_terrasteel.json create mode 100644 src/main/resources/assets/botania/models/block/wall_connect.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_dry.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_golden.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_infused.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_mutated.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_scorched.json delete mode 100644 src/main/resources/assets/botania/models/item/altGrass_vivid.json delete mode 100644 src/main/resources/assets/botania/models/item/drum_canopy.json delete mode 100644 src/main/resources/assets/botania/models/item/drum_gathering.json delete mode 100644 src/main/resources/assets/botania/models/item/drum_wild.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock_brick.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock_default.json delete mode 100644 src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_default.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_framed.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_glimmering.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json delete mode 100644 src/main/resources/assets/botania/models/item/livingwood_planks.json delete mode 100644 src/main/resources/assets/botania/models/item/storage_dragonstone.json delete mode 100644 src/main/resources/assets/botania/models/item/storage_elementium.json delete mode 100644 src/main/resources/assets/botania/models/item/storage_mana_diamond.json delete mode 100644 src/main/resources/assets/botania/models/item/storage_manasteel.json delete mode 100644 src/main/resources/assets/botania/models/item/storage_terrasteel.json diff --git a/build.properties b/build.properties index ed6bf3472..2c249269e 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1635-1.8.8 +forge_version=11.15.0.1649-1.8.8 mc_version=1.8.8 build_number=246 mod_name=Botania diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 8f1f680fb..7bfd2bed8 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,6 +10,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; +import javax.annotation.Nullable; + /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -71,6 +73,14 @@ public class BotaniaStateProps { // BlockBiomeStoneB public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + // BlockBiomeStoneWall + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + @Override + public boolean apply(BiomeStoneVariant input) { + return input.getName().contains("cobble"); + } + }); + // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); 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 afa78b5be..e5e390a24 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; @@ -17,8 +18,12 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -65,13 +70,13 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; -import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.item.ModItems.*; +import java.util.Collection; import java.util.List; import java.util.Locale; @@ -92,18 +97,14 @@ public final class ModelHandler { /** ItemBlocks **/ registerStandardBlocks(); - registerStorage(); registerMushrooms(); registerFlowers(); - registerLivingRockWood(); - registerAltGrass(); registerStairs(); registerSlabs(); registerFullSlabs(); + registerWalls(); registerPanes(); - registerPylons(); registerUnstableBeaconPetal(); - registerDrums(); /** Normal Items **/ registerStandardItems(); @@ -180,6 +181,14 @@ public final class ModelHandler { registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.dirtPath); registerItemModel(ModBlocks.felPumpkin); + + // Blocks which share models with their item, and have only one variant to switch over + registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "botania:altGrass", "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "botania:storage", "variant"); + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "botania:pylon", "variant"); + registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "botania:forestDrum", "variant"); + registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "botania:livingrock", "variant"); + registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "botania:livingwood", "variant"); } private static void registerStandardItems() { @@ -231,7 +240,7 @@ public final class ModelHandler { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); } } @@ -310,29 +319,11 @@ public final class ModelHandler { } } - private static void registerAltGrass() { - Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); - for (AltGrassVariant variant : AltGrassVariant.values()) { - String name = "botania:altGrass_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } - - private static void registerStorage() { - Item item = Item.getItemFromBlock(ModBlocks.storage); - for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:storage_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } - private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:mushroom_" + color.getName(); - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } } @@ -341,34 +332,18 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:flower_" + color.getName(); - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.addVariantName(item, name); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } } - private static void registerLivingRockWood() { - Item item = Item.getItemFromBlock(ModBlocks.livingrock); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:livingrock_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - - item = Item.getItemFromBlock(ModBlocks.livingwood); - for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:livingwood_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); - } - } - private static void registerStairs() { for (Block b : ModFluffBlocks.stoneStairs) { registerItemModel(b); @@ -418,19 +393,28 @@ public final class ModelHandler { } + private static void registerWalls() { + Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); + for (BiomeStoneVariant variant : ((Collection) BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues())) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + } + + item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); + for (FutureStoneVariant variant : ((Collection) BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues())) { + String variantName = "inventory_" + variant.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); + } + } + private static void registerPanes() { registerItemModel(ModFluffBlocks.alfglassPane); registerItemModel(ModFluffBlocks.bifrostPane); registerItemModel(ModFluffBlocks.managlassPane); } - private static void registerPylons() { - Item item = Item.getItemFromBlock(ModBlocks.pylon); - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("botania:pylon", "variant=mana")); - ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); - ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); - } - private static void registerUnstableBeaconPetal() { // The blocks that are dynamically colored, not through their states for (EnumDyeColor color : EnumDyeColor.values()) { @@ -443,15 +427,16 @@ public final class ModelHandler { } } - private static void registerDrums() { - Item item = Item.getItemFromBlock(ModBlocks.forestDrum); - for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:drum_" + variant.getName(); - ModelLoader.addVariantName(item, name); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String baseName, String variantHeader) { + Item item = Item.getItemFromBlock(b); + for (T e : enumclazz.getEnumConstants()) { + String variantName = variantHeader + "=" + e.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); + ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 86cc6edde..c5ced6659 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,10 +32,10 @@ import java.util.List; public class Block18StoneWall extends BlockModWall { public Block18StoneWall() { - super(ModFluffBlocks.stone, 4); + super(ModFluffBlocks.stone, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } @Override @@ -52,7 +53,12 @@ public class Block18StoneWall extends BlockModWall { if (meta < 0 || meta > 3) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); } @Override @@ -71,4 +77,9 @@ public class Block18StoneWall extends BlockModWall { return LexiconData.stoneAlchemy; } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 44da2cace..6f795ed32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,28 +32,33 @@ import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall() { - super(ModFluffBlocks.biomeStoneA, 8); + super(ModFluffBlocks.biomeStoneA, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST).withProperty(VARIANT, EnumType.NORMAL)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); } @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT)).ordinal() - 8; } @Override public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= BiomeStoneVariant.values().length) { + if (meta < 0 || meta >= BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues().size()) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); } @Override @@ -71,4 +77,9 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + } diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json index a9c6f7706..ec9f93048 100644 --- a/src/main/resources/assets/botania/blockstates/altGrass.json +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -1,10 +1,30 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "minecraft:blocks/dirt" }, + "transform": "forge:default-block" + }, "variants": { - "variant=dry": { "model": "botania:altGrass_dry" }, - "variant=golden": { "model": "botania:altGrass_golden" }, - "variant=vivid": { "model": "botania:altGrass_vivid" }, - "variant=scorched": { "model": "botania:altGrass_scorched" }, - "variant=infused": { "model": "botania:altGrass_infused" }, - "variant=mutated": { "model": "botania:altGrass_mutated" } + "variant": { + "dry": { + "textures": { "top": "botania:blocks/altGrass0", "side": "botania:blocks/altGrass1" } + }, + "golden": { + "textures": { "top": "botania:blocks/altGrass2", "side": "botania:blocks/altGrass3" } + }, + "vivid": { + "textures": { "top": "botania:blocks/altGrass4", "side": "botania:blocks/altGrass5" } + }, + "scorched": { + "textures": { "top": "botania:blocks/altGrass6", "side": "botania:blocks/altGrass7" } + }, + "infused": { + "textures": { "top": "botania:blocks/altGrass8", "side": "botania:blocks/altGrass9" } + }, + "mutated": { + "textures": { "top": "botania:blocks/altGrass10", "side": "botania:blocks/altGrass11" } + } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json new file mode 100644 index 000000000..e06c39112 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -0,0 +1,90 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=forest_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=plains_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mountain_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=fungal_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=swamp_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=desert_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=taiga_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=mesa_cobble,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=forest_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=plains_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mountain_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=fungal_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=swamp_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=desert_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=taiga_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=mesa_cobble,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } }, + "plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } }, + "mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } }, + "fungal_cobble": { "textures": { "wall": "botania:blocks/biomeStone11" } }, + "swamp_cobble": { "textures": { "wall": "botania:blocks/biomeStone12" } }, + "desert_cobble": { "textures": { "wall": "botania:blocks/biomeStone13" } }, + "taiga_cobble": { "textures": { "wall": "botania:blocks/biomeStone14" } }, + "mesa_cobble": { "textures": { "wall": "botania:blocks/biomeStone15" } } + }, + "inventory_forest_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone8" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_plains_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone9" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mountain_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone10" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_fungal_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone11" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_swamp_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone12" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_desert_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone13" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_taiga_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone14" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_mesa_cobble": [{ + "textures": { "wall": "botania:blocks/biomeStone15" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index a7f73aba4..a20f0ed41 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -1,7 +1,12 @@ { + "forge_marker": 1, + "defaults": { + "model": "botania:drum", + "transform": "forge:default-block" + }, "variants": { - "variant=wild": { "model": "botania:drum_wild" }, - "variant=gathering": { "model": "botania:drum_gathering" }, - "variant=canopy": { "model": "botania:drum_canopy" } + "variant=wild": [{ "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }], + "variant=gathering": [{ "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }], + "variant=canopy": [{ "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index ae0681bca..4893484b9 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,19 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { - "model": "botania:livingrock_default" - }, - "variant=brick": { - "model": "botania:livingrock_brick" - }, - "variant=mossy_brick": { - "model": "botania:livingrock_mossy_brick" - }, - "variant=cracked_brick": { - "model": "botania:livingrock_cracked_brick" - }, - "variant=chiseled_brick": { - "model": "botania:livingrock_chiseled_brick" - } + "variant=default": [{ "textures": { "all": "botania:blocks/livingrock0" } }], + "variant=brick": [{ "textures": { "all": "botania:blocks/livingrock1" } }], + "variant=mossy_brick": [{ "textures": { "all": "botania:blocks/livingrock2" } }], + "variant=cracked_brick": [{ "textures": { "all": "botania:blocks/livingrock3" } }], + "variant=chiseled_brick": [{ "textures": { "all": "botania:blocks/livingrock4" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 87074e2b3..3f6c42938 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -1,10 +1,15 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=default": { "model": "botania:livingwood_default" }, - "variant=planks": { "model": "botania:livingwood_planks" }, - "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, - "variant=framed": { "model": "botania:livingwood_framed" }, - "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, - "variant=glimmering": { "model": "botania:livingwood_glimmering" } + "variant=default": [{ "textures": { "all": "botania:blocks/livingwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/livingwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/livingwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/livingwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/livingwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/livingwood5" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json new file mode 100644 index 000000000..c77f3f3f8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -0,0 +1,62 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "east=false,north=true,south=true,up=false,variant=andesite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=basalt,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=diorite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,variant=granite,west=false": { "model": null }, + + "east=true,north=false,south=false,up=false,variant=andesite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=basalt,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=diorite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,variant=granite,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "variant": { + "andesite": { "textures": { "wall": "botania:blocks/stone0" } }, + "basalt": { "textures": { "wall": "botania:blocks/stone1" } }, + "diorite": { "textures": { "wall": "botania:blocks/stone2" } }, + "granite": { "textures": { "wall": "botania:blocks/stone3" } } + }, + "inventory_andesite": [{ + "textures": { "wall": "botania:blocks/stone0" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_basalt": [{ + "textures": { "wall": "botania:blocks/stone1" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_diorite": [{ + "textures": { "wall": "botania:blocks/stone2" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }], + "inventory_granite": [{ + "textures": { "wall": "botania:blocks/stone3" }, + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 8099a05fb..0b3e7899a 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,9 +1,14 @@ { + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, "variants": { - "variant=manasteel": { "model": "botania:storage_manasteel" }, - "variant=terrasteel": { "model": "botania:storage_terrasteel" }, - "variant=elementium": { "model": "botania:storage_elementium" }, - "variant=mana_diamond": { "model": "botania:storage_mana_diamond" }, - "variant=dragonstone": { "model": "botania:storage_dragonstone" } + "variant=manasteel": [{ "textures": { "all": "botania:blocks/storage0" } }], + "variant=terrasteel": [{ "textures": { "all": "botania:blocks/storage1" } }], + "variant=elementium": [{ "textures": { "all": "botania:blocks/storage2" } }], + "variant=mana_diamond": [{ "textures": { "all": "botania:blocks/storage3" } }], + "variant=dragonstone": [{ "textures": { "all": "botania:blocks/storage4" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_dry.json b/src/main/resources/assets/botania/models/block/altGrass_dry.json deleted file mode 100644 index dfb175331..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_dry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass0", - "side": "botania:blocks/altGrass1", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_golden.json b/src/main/resources/assets/botania/models/block/altGrass_golden.json deleted file mode 100644 index 24668bae6..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_golden.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass2", - "side": "botania:blocks/altGrass3", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_infused.json b/src/main/resources/assets/botania/models/block/altGrass_infused.json deleted file mode 100644 index cba653bda..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_infused.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass8", - "side": "botania:blocks/altGrass9", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_mutated.json b/src/main/resources/assets/botania/models/block/altGrass_mutated.json deleted file mode 100644 index 33e9ce82b..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_mutated.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass10", - "side": "botania:blocks/altGrass11", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_scorched.json b/src/main/resources/assets/botania/models/block/altGrass_scorched.json deleted file mode 100644 index c79993e04..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_scorched.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass6", - "side": "botania:blocks/altGrass7", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_vivid.json b/src/main/resources/assets/botania/models/block/altGrass_vivid.json deleted file mode 100644 index f1226714e..000000000 --- a/src/main/resources/assets/botania/models/block/altGrass_vivid.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "botania:blocks/altGrass4", - "side": "botania:blocks/altGrass5", - "bottom": "minecraft:blocks/dirt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json deleted file mode 100644 index 915c02d27..000000000 --- a/src/main/resources/assets/botania/models/block/drum_canopy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum4", - "side": "botania:blocks/forestDrum5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json deleted file mode 100644 index b92f432f5..000000000 --- a/src/main/resources/assets/botania/models/block/drum_gathering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum2", - "side": "botania:blocks/forestDrum3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json deleted file mode 100644 index 86bd38747..000000000 --- a/src/main/resources/assets/botania/models/block/drum_wild.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "botania:block/drum", - "textures": { - "top": "botania:blocks/forestDrum0", - "side": "botania:blocks/forestDrum1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick.json b/src/main/resources/assets/botania/models/block/livingrock_brick.json deleted file mode 100644 index c79412d70..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json deleted file mode 100644 index 07ee851a4..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json deleted file mode 100644 index 8b4cafa2c..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_default.json b/src/main/resources/assets/botania/models/block/livingrock_default.json deleted file mode 100644 index 9a8786117..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json deleted file mode 100644 index bd6a802c2..000000000 --- a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingrock2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_default.json b/src/main/resources/assets/botania/models/block/livingwood_default.json deleted file mode 100644 index 0a8062fd9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_default.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json deleted file mode 100644 index 67ad48c5f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json deleted file mode 100644 index 3f76a6831..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json deleted file mode 100644 index 98ec94ac6..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_inner_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "botania:blocks/livingwood0", - "top": "botania:blocks/livingwood0", - "side": "botania:blocks/livingwood0" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json deleted file mode 100644 index 88b9f8d3e..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json deleted file mode 100644 index a3edcc34f..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json deleted file mode 100644 index ff95b9ae9..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/livingwood1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_dragonstone.json b/src/main/resources/assets/botania/models/block/storage_dragonstone.json deleted file mode 100644 index 7d0c130d0..000000000 --- a/src/main/resources/assets/botania/models/block/storage_dragonstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_elementium.json b/src/main/resources/assets/botania/models/block/storage_elementium.json deleted file mode 100644 index a55282f38..000000000 --- a/src/main/resources/assets/botania/models/block/storage_elementium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json b/src/main/resources/assets/botania/models/block/storage_mana_diamond.json deleted file mode 100644 index 4a875189b..000000000 --- a/src/main/resources/assets/botania/models/block/storage_mana_diamond.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_manasteel.json b/src/main/resources/assets/botania/models/block/storage_manasteel.json deleted file mode 100644 index bdb8f0a68..000000000 --- a/src/main/resources/assets/botania/models/block/storage_manasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/storage_terrasteel.json b/src/main/resources/assets/botania/models/block/storage_terrasteel.json deleted file mode 100644 index add746c6d..000000000 --- a/src/main/resources/assets/botania/models/block/storage_terrasteel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:blocks/storage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect.json b/src/main/resources/assets/botania/models/block/wall_connect.json new file mode 100644 index 000000000..281d9a7b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect.json @@ -0,0 +1,19 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#wall" + }, + "elements": [ + { "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#wall", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/altGrass_dry.json b/src/main/resources/assets/botania/models/item/altGrass_dry.json deleted file mode 100644 index 6a70baf25..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_dry.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_dry", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_golden.json b/src/main/resources/assets/botania/models/item/altGrass_golden.json deleted file mode 100644 index 45751fb50..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_golden.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_golden", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_infused.json b/src/main/resources/assets/botania/models/item/altGrass_infused.json deleted file mode 100644 index d55365d64..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_infused.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_infused", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_mutated.json b/src/main/resources/assets/botania/models/item/altGrass_mutated.json deleted file mode 100644 index e4632a5c2..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_mutated.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_mutated", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_scorched.json b/src/main/resources/assets/botania/models/item/altGrass_scorched.json deleted file mode 100644 index d050bcd74..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_scorched.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_scorched", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_vivid.json b/src/main/resources/assets/botania/models/item/altGrass_vivid.json deleted file mode 100644 index 47d5b9a35..000000000 --- a/src/main/resources/assets/botania/models/item/altGrass_vivid.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/altGrass_vivid", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_canopy.json b/src/main/resources/assets/botania/models/item/drum_canopy.json deleted file mode 100644 index 0146560c5..000000000 --- a/src/main/resources/assets/botania/models/item/drum_canopy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_canopy", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_gathering.json b/src/main/resources/assets/botania/models/item/drum_gathering.json deleted file mode 100644 index d23ff797b..000000000 --- a/src/main/resources/assets/botania/models/item/drum_gathering.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_gathering", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/drum_wild.json b/src/main/resources/assets/botania/models/item/drum_wild.json deleted file mode 100644 index 9d0bf43ab..000000000 --- a/src/main/resources/assets/botania/models/item/drum_wild.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/drum_wild", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_brick.json b/src/main/resources/assets/botania/models/item/livingrock_brick.json deleted file mode 100644 index e7db2c9a4..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json deleted file mode 100644 index 82ca1f8a1..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_chiseled_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_chiseled_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json deleted file mode 100644 index b134b5b62..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_cracked_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_cracked_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_default.json b/src/main/resources/assets/botania/models/item/livingrock_default.json deleted file mode 100644 index b87480b27..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json deleted file mode 100644 index 972cf35c5..000000000 --- a/src/main/resources/assets/botania/models/item/livingrock_mossy_brick.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingrock_mossy_brick", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_default.json b/src/main/resources/assets/botania/models/item/livingwood_default.json deleted file mode 100644 index 26fa10fad..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_default", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_framed.json b/src/main/resources/assets/botania/models/item/livingwood_framed.json deleted file mode 100644 index e9cee1d0f..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json b/src/main/resources/assets/botania/models/item/livingwood_glimmering.json deleted file mode 100644 index a5ce44ad5..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_glimmering.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_glimmering", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json deleted file mode 100644 index 949174e54..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_mossy_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_mossy_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json deleted file mode 100644 index 6866a6652..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_pattern_framed.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_pattern_framed", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_planks.json b/src/main/resources/assets/botania/models/item/livingwood_planks.json deleted file mode 100644 index 82cf0d370..000000000 --- a/src/main/resources/assets/botania/models/item/livingwood_planks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/livingwood_planks", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_dragonstone.json b/src/main/resources/assets/botania/models/item/storage_dragonstone.json deleted file mode 100644 index bd06a4a3c..000000000 --- a/src/main/resources/assets/botania/models/item/storage_dragonstone.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_dragonstone", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_elementium.json b/src/main/resources/assets/botania/models/item/storage_elementium.json deleted file mode 100644 index 882bed65b..000000000 --- a/src/main/resources/assets/botania/models/item/storage_elementium.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_elementium", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json b/src/main/resources/assets/botania/models/item/storage_mana_diamond.json deleted file mode 100644 index 5d0e79f83..000000000 --- a/src/main/resources/assets/botania/models/item/storage_mana_diamond.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_mana_diamond", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_manasteel.json b/src/main/resources/assets/botania/models/item/storage_manasteel.json deleted file mode 100644 index 3a90a8b51..000000000 --- a/src/main/resources/assets/botania/models/item/storage_manasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_manasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/storage_terrasteel.json b/src/main/resources/assets/botania/models/item/storage_terrasteel.json deleted file mode 100644 index a507f6606..000000000 --- a/src/main/resources/assets/botania/models/item/storage_terrasteel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "botania:block/storage_terrasteel", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file From 8cda41cdb8e585a6ead15f7f85d437d6d87a30e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 25 Dec 2015 22:44:10 -0600 Subject: [PATCH 099/935] Finish walls, and ALL slabs. Made floating flowers render properly in world. --- .../botania/api/state/BotaniaStateProps.java | 58 ++++---- .../client/core/handler/ModelHandler.java | 133 +++++++++++++++--- .../render/tile/RenderTileFloatingFlower.java | 16 +-- .../block/decor/walls/Block18StoneWall.java | 10 -- .../decor/walls/BlockBiomeStoneWall.java | 10 -- .../block/decor/walls/BlockModWall.java | 10 ++ .../blockstates/biomeStomeA11SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA.json | 25 ++++ .../botania/blockstates/biomeStoneA0Slab.json | 19 +++ .../blockstates/biomeStoneA0SlabFull.json | 9 ++ .../blockstates/biomeStoneA10Slab.json | 19 +++ .../blockstates/biomeStoneA10SlabFull.json | 9 ++ .../blockstates/biomeStoneA11Slab.json | 19 +++ .../blockstates/biomeStoneA11SlabFull.json | 9 ++ .../blockstates/biomeStoneA12Slab.json | 19 +++ .../blockstates/biomeStoneA12SlabFull.json | 9 ++ .../blockstates/biomeStoneA13Slab.json | 19 +++ .../blockstates/biomeStoneA13SlabFull.json | 9 ++ .../blockstates/biomeStoneA14Slab.json | 19 +++ .../blockstates/biomeStoneA14SlabFull.json | 9 ++ .../blockstates/biomeStoneA15Slab.json | 19 +++ .../blockstates/biomeStoneA15SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA1Slab.json | 19 +++ .../blockstates/biomeStoneA1SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA2Slab.json | 19 +++ .../blockstates/biomeStoneA2SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA3Slab.json | 19 +++ .../blockstates/biomeStoneA3SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA4Slab.json | 19 +++ .../blockstates/biomeStoneA4SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA5Slab.json | 19 +++ .../blockstates/biomeStoneA5SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA6Slab.json | 19 +++ .../blockstates/biomeStoneA6SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA7Slab.json | 19 +++ .../blockstates/biomeStoneA7SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA8Slab.json | 19 +++ .../blockstates/biomeStoneA8SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneA9Slab.json | 19 +++ .../blockstates/biomeStoneA9SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB.json | 25 ++++ .../botania/blockstates/biomeStoneB0Slab.json | 19 +++ .../blockstates/biomeStoneB0SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB1Slab.json | 19 +++ .../blockstates/biomeStoneB1SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB2Slab.json | 19 +++ .../blockstates/biomeStoneB2SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB3Slab.json | 19 +++ .../blockstates/biomeStoneB3SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB4Slab.json | 19 +++ .../blockstates/biomeStoneB4SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB5Slab.json | 19 +++ .../blockstates/biomeStoneB5SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB6Slab.json | 19 +++ .../blockstates/biomeStoneB6SlabFull.json | 9 ++ .../botania/blockstates/biomeStoneB7Slab.json | 19 +++ .../blockstates/biomeStoneB7SlabFull.json | 9 ++ .../botania/blockstates/customBrick0Slab.json | 19 +++ .../blockstates/customBrick0SlabFull.json | 9 ++ .../botania/blockstates/customBrick1Slab.json | 19 +++ .../blockstates/customBrick1SlabFull.json | 9 ++ .../botania/blockstates/customBrick2Slab.json | 19 +++ .../blockstates/customBrick2SlabFull.json | 9 ++ .../botania/blockstates/customBrick3Slab.json | 19 +++ .../blockstates/customBrick3SlabFull.json | 9 ++ .../botania/blockstates/dirtPath0Slab.json | 19 +++ .../blockstates/dirtPath0SlabFull.json | 9 ++ .../botania/blockstates/dreamwood0Slab.json | 19 +++ .../blockstates/dreamwood0SlabFull.json | 9 ++ .../botania/blockstates/dreamwood0Wall.json | 37 +++++ .../botania/blockstates/dreamwood1Slab.json | 19 +++ .../blockstates/dreamwood1SlabFull.json | 9 ++ .../botania/blockstates/endStoneBrick.json | 13 ++ .../blockstates/endStoneBrick0Slab.json | 19 +++ .../blockstates/endStoneBrick0SlabFull.json | 9 ++ .../blockstates/endStoneBrick2Slab.json | 19 +++ .../blockstates/endStoneBrick2SlabFull.json | 9 ++ .../assets/botania/blockstates/ghostRail.json | 23 +++ .../botania/blockstates/livingrock0Slab.json | 19 +++ .../blockstates/livingrock0SlabFull.json | 9 ++ .../botania/blockstates/livingrock0Wall.json | 37 +++++ .../botania/blockstates/livingrock1Slab.json | 19 +++ .../blockstates/livingrock1SlabFull.json | 9 ++ .../botania/blockstates/livingwood0Slab.json | 19 +++ .../blockstates/livingwood0SlabFull.json | 9 ++ .../botania/blockstates/livingwood0Wall.json | 37 +++++ .../botania/blockstates/livingwood1Slab.json | 19 +++ .../blockstates/livingwood1SlabFull.json | 9 ++ .../assets/botania/blockstates/pavement.json | 15 ++ .../botania/blockstates/pavement0Slab.json | 19 +++ .../blockstates/pavement0SlabFull.json | 9 ++ .../botania/blockstates/pavement1Slab.json | 19 +++ .../blockstates/pavement1SlabFull.json | 9 ++ .../botania/blockstates/pavement2Slab.json | 19 +++ .../blockstates/pavement2SlabFull.json | 9 ++ .../botania/blockstates/pavement3Slab.json | 19 +++ .../blockstates/pavement3SlabFull.json | 9 ++ .../botania/blockstates/pavement4Slab.json | 19 +++ .../blockstates/pavement4SlabFull.json | 9 ++ .../botania/blockstates/pavement5Slab.json | 19 +++ .../blockstates/pavement5SlabFull.json | 9 ++ .../botania/blockstates/prismarine0Slab.json | 19 +++ .../blockstates/prismarine0SlabFull.json | 9 ++ .../botania/blockstates/prismarine0Wall.json | 37 +++++ .../botania/blockstates/prismarine1Slab.json | 19 +++ .../blockstates/prismarine1SlabFull.json | 9 ++ .../botania/blockstates/prismarine2Slab.json | 19 +++ .../blockstates/prismarine2SlabFull.json | 9 ++ .../blockstates/quartzSlabBlazeFull.json | 13 ++ .../blockstates/quartzSlabBlazeHalf.json | 19 +++ .../blockstates/quartzSlabDarkFull.json | 13 ++ .../blockstates/quartzSlabDarkHalf.json | 19 +++ .../blockstates/quartzSlabElfFull.json | 13 ++ .../blockstates/quartzSlabElfHalf.json | 19 +++ .../blockstates/quartzSlabLavenderFull.json | 13 ++ .../blockstates/quartzSlabLavenderHalf.json | 19 +++ .../blockstates/quartzSlabManaFull.json | 13 ++ .../blockstates/quartzSlabManaHalf.json | 19 +++ .../blockstates/quartzSlabRedFull.json | 13 ++ .../blockstates/quartzSlabRedHalf.json | 19 +++ .../blockstates/quartzSlabSunnyFull.json | 13 ++ .../blockstates/quartzSlabSunnyHalf.json | 19 +++ .../botania/blockstates/reedBlock0Slab.json | 19 +++ .../blockstates/reedBlock0SlabFull.json | 9 ++ .../botania/blockstates/reedBlock0Stairs.json | 4 +- .../botania/blockstates/reedBlock0Wall.json | 37 +++++ .../botania/blockstates/shimmerrock.json | 12 ++ .../botania/blockstates/shimmerrock0Slab.json | 19 +++ .../blockstates/shimmerrock0SlabFull.json | 9 ++ .../blockstates/shimmerwoodPlanks.json | 12 ++ .../blockstates/shimmerwoodPlanks0Slab.json | 19 +++ .../shimmerwoodPlanks0SlabFull.json | 9 ++ .../assets/botania/blockstates/stone.json | 25 ++++ .../botania/blockstates/stone0Slab.json | 19 +++ .../botania/blockstates/stone0SlabFull.json | 9 ++ .../botania/blockstates/stone10Slab.json | 19 +++ .../botania/blockstates/stone10SlabFull.json | 9 ++ .../botania/blockstates/stone11Slab.json | 19 +++ .../botania/blockstates/stone11SlabFull.json | 9 ++ .../botania/blockstates/stone1Slab.json | 19 +++ .../botania/blockstates/stone1SlabFull.json | 9 ++ .../botania/blockstates/stone2Slab.json | 19 +++ .../botania/blockstates/stone2SlabFull.json | 9 ++ .../botania/blockstates/stone3Slab.json | 19 +++ .../botania/blockstates/stone3SlabFull.json | 9 ++ .../botania/blockstates/stone8Slab.json | 19 +++ .../botania/blockstates/stone8SlabFull.json | 9 ++ .../botania/blockstates/stone9Slab.json | 19 +++ .../botania/blockstates/stone9SlabFull.json | 9 ++ .../botania/blockstates/thatch0Slab.json | 19 +++ .../botania/blockstates/thatch0SlabFull.json | 9 ++ .../models/block/wall_connect_bottom_top.json | 20 +++ .../models/block/wall_post_bottom_top.json | 19 +++ 153 files changed, 2393 insertions(+), 79 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick3Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/dirtPath0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/ghostRail.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement3Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement3SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement4Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement4SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement5Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/pavement5SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Wall.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerrock.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone.json create mode 100644 src/main/resources/assets/botania/blockstates/stone0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone0SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone10Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone10SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone11Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone11SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone1Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone1SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone2Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone2SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone3Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone3SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone8Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone8SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/stone9Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/stone9SlabFull.json create mode 100644 src/main/resources/assets/botania/blockstates/thatch0Slab.json create mode 100644 src/main/resources/assets/botania/blockstates/thatch0SlabFull.json create mode 100644 src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json create mode 100644 src/main/resources/assets/botania/models/block/wall_post_bottom_top.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 7bfd2bed8..e4b352b78 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -24,13 +24,13 @@ public class BotaniaStateProps { /** Common properties to all blocks to use **/ // The 16 Minecraft colors - public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); + public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); // The four cardinal directions - public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); + public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); // All 6 directions - public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); + public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); // Redstone power - boolean // Also for any other simple boolean "on/off" state @@ -42,18 +42,18 @@ public class BotaniaStateProps { /** Properties for certain kinds of blocks **/ // The axis directions (think quartz pillars and wood logs) - public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; // Extra Quartz Blocks - public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); /** Properties for individual blocks **/ // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { @Override public boolean apply(FutureStoneVariant variant) { // Just the four kinds (no polished, chiseled, etc.) @@ -62,19 +62,19 @@ public class BotaniaStateProps { }); // BlockAlfPortal - public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); // BlockBiomeStoneA - public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); + public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); // BlockBiomeStoneB - public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { @Override public boolean apply(BiomeStoneVariant input) { return input.getName().contains("cobble"); @@ -82,28 +82,28 @@ public class BotaniaStateProps { }); // BlockCustomBrick - public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); // BlockDreamWood, BlockLivingWood - public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); // BlockEnchanter - public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); // BlockForestDrum - public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); // BlockLightRelay - public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); + public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); // BlockLivingRock - public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // White to gray @@ -111,7 +111,7 @@ public class BotaniaStateProps { } }); - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { // Silver to black @@ -120,10 +120,10 @@ public class BotaniaStateProps { }); // BlockOpenCrate - public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor color) { return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK @@ -133,25 +133,25 @@ public class BotaniaStateProps { }); // BlockPlatform - public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); // BlockPool - public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); + public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); // BlockPylon - public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); // BlockSpreader - public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); // BlockStorage - public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); private BotaniaStateProps() {} } 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 e5e390a24..f7d13208a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,8 +1,10 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -18,8 +20,10 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; @@ -99,9 +103,9 @@ public final class ModelHandler { registerStandardBlocks(); registerMushrooms(); registerFlowers(); + registerPavement(); registerStairs(); registerSlabs(); - registerFullSlabs(); registerWalls(); registerPanes(); registerUnstableBeaconPetal(); @@ -181,14 +185,21 @@ public final class ModelHandler { registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.dirtPath); registerItemModel(ModBlocks.felPumpkin); + registerItemModel(ModBlocks.ghostRail); + registerItemModel(ModBlocks.shimmerrock); + registerItemModel(ModBlocks.shimmerwoodPlanks); // Blocks which share models with their item, and have only one variant to switch over - registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "botania:altGrass", "variant"); - registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "botania:storage", "variant"); - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "botania:pylon", "variant"); - registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "botania:forestDrum", "variant"); - registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "botania:livingrock", "variant"); - registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "botania:livingwood", "variant"); + registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); } private static void registerStandardItems() { @@ -282,11 +293,12 @@ public final class ModelHandler { } List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab }); for (Block b : otherSlabs) { @@ -305,13 +317,14 @@ public final class ModelHandler { for (Block b : ModFluffBlocks.stoneFullSlabs) { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - + List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull }); for (Block b : otherFullSlabs) { @@ -344,6 +357,48 @@ public final class ModelHandler { } } + private static void registerPavement() { + Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); + String name = GameData.getBlockRegistry().getNameForObject(ModFluffBlocks.pavement).toString(); + + for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { + String variant = "color=" + e.getName(); + switch (e) { + case BLACK: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); + break; + } + case BLUE: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); + break; + } + case RED: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); + break; + } + case YELLOW: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); + break; + } + case GREEN: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); + break; + } + case WHITE: + default: { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); + break; + } + } + } + } + private static void registerStairs() { for (Block b : ModFluffBlocks.stoneStairs) { registerItemModel(b); @@ -386,27 +441,70 @@ public final class ModelHandler { } private static void registerSlabs() { + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + registerItemModel(b); + } - } + for (Block b : ModFluffBlocks.pavementSlabs) { + registerItemModel(b); + } - private static void registerFullSlabs() { + for (Block b : ModFluffBlocks.stoneSlabs) { + registerItemModel(b); + } + + registerItemModel(ModFluffBlocks.livingwoodSlab); + registerItemModel(ModFluffBlocks.livingwoodPlankSlab); + registerItemModel(ModFluffBlocks.livingrockSlab); + registerItemModel(ModFluffBlocks.livingrockBrickSlab); + + registerItemModel(ModFluffBlocks.blazeQuartzSlab); + registerItemModel(ModFluffBlocks.darkQuartzSlab); + registerItemModel(ModFluffBlocks.elfQuartzSlab); + registerItemModel(ModFluffBlocks.lavenderQuartzSlab); + registerItemModel(ModFluffBlocks.manaQuartzSlab); + registerItemModel(ModFluffBlocks.redQuartzSlab); + registerItemModel(ModFluffBlocks.sunnyQuartzSlab); + + registerItemModel(ModFluffBlocks.dreamwoodSlab); + registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); + registerItemModel(ModFluffBlocks.prismarineSlab); + registerItemModel(ModFluffBlocks.prismarineBrickSlab); + registerItemModel(ModFluffBlocks.darkPrismarineSlab); + registerItemModel(ModFluffBlocks.dirtPathSlab); + registerItemModel(ModFluffBlocks.shimmerrockSlab); + registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); + registerItemModel(ModFluffBlocks.endStoneSlab); + registerItemModel(ModFluffBlocks.enderBrickSlab); + registerItemModel(ModFluffBlocks.netherBrickSlab); + registerItemModel(ModFluffBlocks.soulBrickSlab); + registerItemModel(ModFluffBlocks.snowBrickSlab); + registerItemModel(ModFluffBlocks.tileSlab); + registerItemModel(ModFluffBlocks.reedSlab); + registerItemModel(ModFluffBlocks.thatchSlab); } private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); - for (BiomeStoneVariant variant : ((Collection) BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues())) { + for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); - for (FutureStoneVariant variant : ((Collection) BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues())) { + for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); } + + registerItemModel(ModFluffBlocks.livingrockWall); + registerItemModel(ModFluffBlocks.livingwoodWall); + registerItemModel(ModFluffBlocks.dreamwoodWall); + registerItemModel(ModFluffBlocks.prismarineWall); + registerItemModel(ModFluffBlocks.reedWall); } private static void registerPanes() { @@ -427,9 +525,10 @@ public final class ModelHandler { } } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String baseName, String variantHeader) { + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { + String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 75b43e950..85577ca7f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,8 +16,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,17 +61,9 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// IIcon icon = stack.getIconIndex(); -// -// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// GlStateManager.translate(0.25F, 0.4F, 0.5F); -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + GlStateManager.translate(0.5F, 0.65F, 0.5F); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.color(1F, 1F, 1F); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index c5ced6659..cd37e895b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -56,11 +56,6 @@ public class Block18StoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); - } - @Override public void register(String name) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); @@ -77,9 +72,4 @@ public class Block18StoneWall extends BlockModWall { return LexiconData.stoneAlchemy; } - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 6f795ed32..5e6fa5f6e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -56,11 +56,6 @@ public class BlockBiomeStoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - return super.getActualState(state, worldIn, pos).withProperty(VARIANT, EnumType.NORMAL); - } - @Override public void register(String name) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); @@ -77,9 +72,4 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 0f8a53ee7..efc30fd78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -47,6 +47,16 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { ); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos).withProperty(VARIANT, EnumType.NORMAL); + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + @Override public BlockState createBlockState() { return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); diff --git a/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json new file mode 100644 index 000000000..b8e1cc61d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStome11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json new file mode 100644 index 000000000..2ec09cc6b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone0" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone1" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone2" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone3" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone4" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone5" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone6" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone7" } }], + "variant=forest_cobble": [{ "textures": { "all": "botania:blocks/biomeStone8" } }], + "variant=plains_cobble": [{ "textures": { "all": "botania:blocks/biomeStone9" } }], + "variant=mountain_cobble": [{ "textures": { "all": "botania:blocks/biomeStone10" } }], + "variant=fungal_cobble": [{ "textures": { "all": "botania:blocks/biomeStone11" } }], + "variant=swamp_cobble": [{ "textures": { "all": "botania:blocks/biomeStone12" } }], + "variant=desert_cobble": [{ "textures": { "all": "botania:blocks/biomeStone13" } }], + "variant=taiga_cobble": [{ "textures": { "all": "botania:blocks/biomeStone14" } }], + "variant=mesa_cobble": [{ "textures": { "all": "botania:blocks/biomeStone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json new file mode 100644 index 000000000..26b01e0ad --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone0", + "top": "botania:blocks/biomeStone0", + "side": "botania:blocks/biomeStone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json new file mode 100644 index 000000000..622220653 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json new file mode 100644 index 000000000..2e3c9ce2d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone10", + "top": "botania:blocks/biomeStone10", + "side": "botania:blocks/biomeStone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json new file mode 100644 index 000000000..a0c0c5ba3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json new file mode 100644 index 000000000..492cdefab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone11", + "top": "botania:blocks/biomeStone11", + "side": "botania:blocks/biomeStone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json new file mode 100644 index 000000000..685aced75 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json new file mode 100644 index 000000000..a78647e5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone12", + "top": "botania:blocks/biomeStone12", + "side": "botania:blocks/biomeStone12" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json new file mode 100644 index 000000000..35fdc8ea2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone12" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json new file mode 100644 index 000000000..3d9e905fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone13", + "top": "botania:blocks/biomeStone13", + "side": "botania:blocks/biomeStone13" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json new file mode 100644 index 000000000..f0da4d47e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone13" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json new file mode 100644 index 000000000..ff31c6527 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone14", + "top": "botania:blocks/biomeStone14", + "side": "botania:blocks/biomeStone14" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json new file mode 100644 index 000000000..5a6e9b1dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone14" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json new file mode 100644 index 000000000..1c3854d5a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone15", + "top": "botania:blocks/biomeStone15", + "side": "botania:blocks/biomeStone15" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json new file mode 100644 index 000000000..985fb290f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone15" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json new file mode 100644 index 000000000..638726afe --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone1", + "top": "botania:blocks/biomeStone1", + "side": "botania:blocks/biomeStone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json new file mode 100644 index 000000000..c052661cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json new file mode 100644 index 000000000..e9dd7f308 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone2", + "top": "botania:blocks/biomeStone2", + "side": "botania:blocks/biomeStone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json new file mode 100644 index 000000000..ad8967e4c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json new file mode 100644 index 000000000..1ff94cdb9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone3", + "top": "botania:blocks/biomeStone3", + "side": "botania:blocks/biomeStone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json new file mode 100644 index 000000000..ae53dde27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json new file mode 100644 index 000000000..d77ac77b1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone4", + "top": "botania:blocks/biomeStone4", + "side": "botania:blocks/biomeStone4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json new file mode 100644 index 000000000..3a02ee0f9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json new file mode 100644 index 000000000..7c2a4ddde --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone5", + "top": "botania:blocks/biomeStone5", + "side": "botania:blocks/biomeStone5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json new file mode 100644 index 000000000..74e8a7dae --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json new file mode 100644 index 000000000..1a2d2d869 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone6", + "top": "botania:blocks/biomeStone6", + "side": "botania:blocks/biomeStone6" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json new file mode 100644 index 000000000..95cdc2830 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone6" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json new file mode 100644 index 000000000..cd57da54c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone7", + "top": "botania:blocks/biomeStone7", + "side": "botania:blocks/biomeStone7" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json new file mode 100644 index 000000000..6b89dbc07 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone7" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json new file mode 100644 index 000000000..5cc3c87d6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone8", + "top": "botania:blocks/biomeStone8", + "side": "botania:blocks/biomeStone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json new file mode 100644 index 000000000..b708579a9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json new file mode 100644 index 000000000..188d82abf --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone9", + "top": "botania:blocks/biomeStone9", + "side": "botania:blocks/biomeStone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json new file mode 100644 index 000000000..c853b5705 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomeStoneB.json new file mode 100644 index 000000000..facaa9134 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone16" } }], + "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone17" } }], + "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone18" } }], + "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone19" } }], + "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone20" } }], + "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone21" } }], + "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone22" } }], + "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone23" } }], + "variant=chiseled_forest": [{ "textures": { "all": "botania:blocks/biomeStone24" } }], + "variant=chiseled_plains": [{ "textures": { "all": "botania:blocks/biomeStone25" } }], + "variant=chiseled_mountain": [{ "textures": { "all": "botania:blocks/biomeStone26" } }], + "variant=chiseled_fungal": [{ "textures": { "all": "botania:blocks/biomeStone27" } }], + "variant=chiseled_swamp": [{ "textures": { "all": "botania:blocks/biomeStone28" } }], + "variant=chiseled_desert": [{ "textures": { "all": "botania:blocks/biomeStone29" } }], + "variant=chiseled_taiga": [{ "textures": { "all": "botania:blocks/biomeStone30" } }], + "variant=chiseled_mesa": [{ "textures": { "all": "botania:blocks/biomeStone31" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json new file mode 100644 index 000000000..37969ece4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone16", + "top": "botania:blocks/biomeStone16", + "side": "botania:blocks/biomeStone16" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json new file mode 100644 index 000000000..a5236f6d8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone16" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json new file mode 100644 index 000000000..1daf216ef --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone17", + "top": "botania:blocks/biomeStone17", + "side": "botania:blocks/biomeStone17" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json new file mode 100644 index 000000000..7612fa942 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone17" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json new file mode 100644 index 000000000..8a077688c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone18", + "top": "botania:blocks/biomeStone18", + "side": "botania:blocks/biomeStone18" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json new file mode 100644 index 000000000..4902a6e0c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone18" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json new file mode 100644 index 000000000..ade89b09b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone19", + "top": "botania:blocks/biomeStone19", + "side": "botania:blocks/biomeStone19" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json new file mode 100644 index 000000000..ad81a7910 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone19" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json new file mode 100644 index 000000000..c0dfa9c93 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone20", + "top": "botania:blocks/biomeStone20", + "side": "botania:blocks/biomeStone20" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json new file mode 100644 index 000000000..12a9d00da --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone20" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json new file mode 100644 index 000000000..068ce5beb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone21", + "top": "botania:blocks/biomeStone21", + "side": "botania:blocks/biomeStone21" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json new file mode 100644 index 000000000..00399c361 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone21" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json new file mode 100644 index 000000000..7da39aff8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone22", + "top": "botania:blocks/biomeStone22", + "side": "botania:blocks/biomeStone22" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json new file mode 100644 index 000000000..cd9d3f0e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone22" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json new file mode 100644 index 000000000..dec2e4dbc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomeStone23", + "top": "botania:blocks/biomeStone23", + "side": "botania:blocks/biomeStone23" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json new file mode 100644 index 000000000..9e7c19c2e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/biomeStone23" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json new file mode 100644 index 000000000..8831d3fe6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick0", + "top": "botania:blocks/customBrick0", + "side": "botania:blocks/customBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json new file mode 100644 index 000000000..c7dd413b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json new file mode 100644 index 000000000..c4b1be5b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick1", + "top": "botania:blocks/customBrick1", + "side": "botania:blocks/customBrick1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json new file mode 100644 index 000000000..e299f14db --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json new file mode 100644 index 000000000..a5f1e51f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick2", + "top": "botania:blocks/customBrick2", + "side": "botania:blocks/customBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json new file mode 100644 index 000000000..dd5a23420 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json new file mode 100644 index 000000000..f91ff8793 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/customBrick3", + "top": "botania:blocks/customBrick3", + "side": "botania:blocks/customBrick3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json b/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json new file mode 100644 index 000000000..cba4e7996 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/customBrick3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json new file mode 100644 index 000000000..609f3c254 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dirtPath", + "top": "botania:blocks/dirtPath", + "side": "botania:blocks/dirtPath" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json new file mode 100644 index 000000000..c5205f908 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dirtPath" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json new file mode 100644 index 000000000..bbbe129ed --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood0", + "top": "botania:blocks/dreamwood0", + "side": "botania:blocks/dreamwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json new file mode 100644 index 000000000..40e378188 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json new file mode 100644 index 000000000..31863d217 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/dreamwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json new file mode 100644 index 000000000..ff2fcf790 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/dreamwood1", + "top": "botania:blocks/dreamwood1", + "side": "botania:blocks/dreamwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json new file mode 100644 index 000000000..47873fc21 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/dreamwood1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick.json b/src/main/resources/assets/botania/blockstates/endStoneBrick.json new file mode 100644 index 000000000..890ba9ef8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick0" } }], + "variant=chiseled_end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick1" } }], + "variant=ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick2" } }], + "variant=pillar_ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick3" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json new file mode 100644 index 000000000..deb5a96ac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick0", + "top": "botania:blocks/endStoneBrick0", + "side": "botania:blocks/endStoneBrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json new file mode 100644 index 000000000..b53fb4fba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json new file mode 100644 index 000000000..26735e56f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/endStoneBrick2", + "top": "botania:blocks/endStoneBrick2", + "side": "botania:blocks/endStoneBrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json new file mode 100644 index 000000000..d3d956779 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/endStoneBrick2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json new file mode 100644 index 000000000..96631fbfc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "rail": "botania:blocks/ghostRail" + }, + "transform": "forge:default-item" + }, + "variants": { + "shape=north_south": { "model": "minecraft:rail_flat" }, + "shape=east_west": { "model": "minecraft:rail_flat", "y": 90 }, + "shape=ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, + "shape=ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, + "shape=ascending_north": { "model": "minecraft:rail_raised_ne" }, + "shape=ascending_south": { "model": "minecraft:rail_raised_sw" }, + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "botania:blocks/ghostRail" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json new file mode 100644 index 000000000..190b2dc17 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock0", + "top": "botania:blocks/livingrock0", + "side": "botania:blocks/livingrock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json new file mode 100644 index 000000000..9bc4eca76 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json new file mode 100644 index 000000000..6da2b10a5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingrock0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json new file mode 100644 index 000000000..66937cf5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingrock1", + "top": "botania:blocks/livingrock1", + "side": "botania:blocks/livingrock1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json new file mode 100644 index 000000000..edf8dd3ea --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingrock1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json new file mode 100644 index 000000000..4f185b5b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood0", + "top": "botania:blocks/livingwood0", + "side": "botania:blocks/livingwood0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json new file mode 100644 index 000000000..41e2ca5c6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json new file mode 100644 index 000000000..a7dc154f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/livingwood0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json new file mode 100644 index 000000000..9dd7a8390 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/livingwood1", + "top": "botania:blocks/livingwood1", + "side": "botania:blocks/livingwood1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json new file mode 100644 index 000000000..a7063094e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/livingwood1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json new file mode 100644 index 000000000..baa9db28b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "color=white": [{ "textures": { "all": "botania:blocks/pavement0" } }], + "color=black": [{ "textures": { "all": "botania:blocks/pavement1" } }], + "color=blue": [{ "textures": { "all": "botania:blocks/pavement2" } }], + "color=red": [{ "textures": { "all": "botania:blocks/pavement3"} }], + "color=yellow": [{ "textures": { "all": "botania:blocks/pavement4"} }], + "color=green": [{ "textures": { "all": "botania:blocks/pavement5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0Slab.json new file mode 100644 index 000000000..14b6c0b05 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement0", + "top": "botania:blocks/pavement0", + "side": "botania:blocks/pavement0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json new file mode 100644 index 000000000..dc17cad32 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1Slab.json new file mode 100644 index 000000000..3b757b046 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement1", + "top": "botania:blocks/pavement1", + "side": "botania:blocks/pavement1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json new file mode 100644 index 000000000..a35d6bb36 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2Slab.json new file mode 100644 index 000000000..2267776d9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement2", + "top": "botania:blocks/pavement2", + "side": "botania:blocks/pavement2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json new file mode 100644 index 000000000..60422e335 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3Slab.json new file mode 100644 index 000000000..fe1f093fd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement3", + "top": "botania:blocks/pavement3", + "side": "botania:blocks/pavement3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json new file mode 100644 index 000000000..a8fb061e5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4Slab.json new file mode 100644 index 000000000..77d541496 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement4", + "top": "botania:blocks/pavement4", + "side": "botania:blocks/pavement4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json new file mode 100644 index 000000000..b3796d2e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement4" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5Slab.json new file mode 100644 index 000000000..9e225f073 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/pavement5", + "top": "botania:blocks/pavement5", + "side": "botania:blocks/pavement5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json new file mode 100644 index 000000000..bdbf59766 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/pavement5" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json new file mode 100644 index 000000000..298f5d686 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine0", + "top": "botania:blocks/prismarine0", + "side": "botania:blocks/prismarine0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json new file mode 100644 index 000000000..461c065a6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json new file mode 100644 index 000000000..05ddceaee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:wall_post", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "wall": "botania:blocks/prismarine0" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json new file mode 100644 index 000000000..e26fcac06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine1", + "top": "botania:blocks/prismarine1", + "side": "botania:blocks/prismarine1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json new file mode 100644 index 000000000..6bf1e8c65 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json new file mode 100644 index 000000000..29219a2ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/prismarine2", + "top": "botania:blocks/prismarine2", + "side": "botania:blocks/prismarine2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json new file mode 100644 index 000000000..ed540022e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/prismarine2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json new file mode 100644 index 000000000..09b750c4e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json new file mode 100644 index 000000000..7705bc87a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json new file mode 100644 index 000000000..1b1039a18 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json new file mode 100644 index 000000000..8ca8be7bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json new file mode 100644 index 000000000..a7172cc7b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json new file mode 100644 index 000000000..d81a802f5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json new file mode 100644 index 000000000..b1a53a9e4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json new file mode 100644 index 000000000..56f856ee3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json new file mode 100644 index 000000000..721c03133 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json new file mode 100644 index 000000000..cceba9781 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json new file mode 100644 index 000000000..a360f41ff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json new file mode 100644 index 000000000..7f7e3954c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json new file mode 100644 index 000000000..30a9b079a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json new file mode 100644 index 000000000..0a36b02be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json new file mode 100644 index 000000000..7eaf54181 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json new file mode 100644 index 000000000..3ddec2017 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_bottom_top", + "textures": { "bottom": "botania:blocks/reedBlock1", "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index d86dfd521..b9d64984b 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/reedBlock0", - "top": "botania:blocks/reedBlock0", + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } }, diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json new file mode 100644 index 000000000..c6c6dfa19 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:wall_post_bottom_top", + "uvlock": true, + "transform": "forge:default-block", + "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } + }, + "variants": { + "east=false,north=true,south=true,up=false,west=false": { "model": null }, + "east=true,north=false,south=false,up=false,west=true": { "model": null }, + + "north": { + "true": { "submodel": "botania:wall_connect_bottom_top" }, + "false": {} + }, + "south": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 180 }, + "false": {} + }, + "west": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 270 }, + "false": {} + }, + "east": { + "true": { "submodel": "botania:wall_connect_bottom_top", "y": 90 }, + "false": {} + }, + "up": { + "true": {}, + "false": {} + }, + "inventory": [{ + "submodel": { "north": { "model": "botania:wall_connect_bottom_top" }, "south": { "model": "botania:wall_connect_bottom_top", "y": 180 }} + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock.json b/src/main/resources/assets/botania/blockstates/shimmerrock.json new file mode 100644 index 000000000..55193392b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json new file mode 100644 index 000000000..77c9c3667 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerrock", + "top": "botania:blocks/shimmerrock", + "side": "botania:blocks/shimmerrock" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json new file mode 100644 index 000000000..7846bb4cb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerrock" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json new file mode 100644 index 000000000..c80cb83d3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json new file mode 100644 index 000000000..0b94b90be --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerwoodPlanks", + "top": "botania:blocks/shimmerwoodPlanks", + "side": "botania:blocks/shimmerwoodPlanks" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json new file mode 100644 index 000000000..ee31766f3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/shimmerwoodPlanks" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json new file mode 100644 index 000000000..249d618ba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=andesite": [{ "textures": { "all": "botania:blocks/stone0" } }], + "variant=basalt": [{ "textures": { "all": "botania:blocks/stone1" } }], + "variant=diorite": [{ "textures": { "all": "botania:blocks/stone2" } }], + "variant=granite": [{ "textures": { "all": "botania:blocks/stone3" } }], + "variant=polished_andesite": [{ "textures": { "all": "botania:blocks/stone4" } }], + "variant=polished_basalt": [{ "textures": { "all": "botania:blocks/stone5" } }], + "variant=polished_diorite": [{ "textures": { "all": "botania:blocks/stone6" } }], + "variant=polished_granite": [{ "textures": { "all": "botania:blocks/stone7" } }], + "variant=andesite_brick": [{ "textures": { "all": "botania:blocks/stone8" } }], + "variant=basalt_brick": [{ "textures": { "all": "botania:blocks/stone9" } }], + "variant=diorite_brick": [{ "textures": { "all": "botania:blocks/stone10" } }], + "variant=granite_brick": [{ "textures": { "all": "botania:blocks/stone11" } }], + "variant=chiseled_andesite": [{ "textures": { "all": "botania:blocks/stone12" } }], + "variant=chiseled_basalt": [{ "textures": { "all": "botania:blocks/stone13" } }], + "variant=chiseled_diorite": [{ "textures": { "all": "botania:blocks/stone14" } }], + "variant=chiseled_granite": [{ "textures": { "all": "botania:blocks/stone15" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json new file mode 100644 index 000000000..69bc192bc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone0", + "top": "botania:blocks/stone0", + "side": "botania:blocks/stone0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json new file mode 100644 index 000000000..abf015306 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone0" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json new file mode 100644 index 000000000..e34591679 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone10", + "top": "botania:blocks/stone10", + "side": "botania:blocks/stone10" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json new file mode 100644 index 000000000..3c06d8495 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone10" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json new file mode 100644 index 000000000..d552b8011 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone11", + "top": "botania:blocks/stone11", + "side": "botania:blocks/stone11" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json new file mode 100644 index 000000000..c23b8fae1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone11" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json new file mode 100644 index 000000000..4508c5ae4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone1", + "top": "botania:blocks/stone1", + "side": "botania:blocks/stone1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json new file mode 100644 index 000000000..f4aabbb94 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone1" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json new file mode 100644 index 000000000..fe8112611 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone2", + "top": "botania:blocks/stone2", + "side": "botania:blocks/stone2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json new file mode 100644 index 000000000..651f4de73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone2" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json new file mode 100644 index 000000000..8cc0f549c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone3", + "top": "botania:blocks/stone3", + "side": "botania:blocks/stone3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json new file mode 100644 index 000000000..f12af79cc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone3" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json new file mode 100644 index 000000000..1b98c7a73 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone8", + "top": "botania:blocks/stone8", + "side": "botania:blocks/stone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json new file mode 100644 index 000000000..b9418ced7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone8" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json new file mode 100644 index 000000000..3c15896c2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/stone9", + "top": "botania:blocks/stone9", + "side": "botania:blocks/stone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json new file mode 100644 index 000000000..17c878f1b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/stone9" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0Slab.json b/src/main/resources/assets/botania/blockstates/thatch0Slab.json new file mode 100644 index 000000000..d71cfd06a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0Slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/thatch", + "top": "botania:blocks/thatch", + "side": "botania:blocks/thatch" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180 + }], + "half=bottom": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json new file mode 100644 index 000000000..427822d3b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "minecraft:cube_all", + "textures": { "all": "botania:blocks/thatch" } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json new file mode 100644 index 000000000..3252c7e70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json @@ -0,0 +1,20 @@ +{ + "__comment": "Stolen from the Forge example/debug code", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 13, 8 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#top" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, + "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" } + }, + "__comment": "North wall" + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json new file mode 100644 index 000000000..c060e1ff3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + }, + "__comment": "Center post" + } + ] +} From e2ac5ecad1e27859f98425ffa58afcb8eb07a8d4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 00:49:30 -0600 Subject: [PATCH 100/935] Fix double flowers fully, a couple more models --- .../botania/api/state/BotaniaStateProps.java | 5 + .../client/core/handler/ModelHandler.java | 29 +++++ .../botania/common/block/BlockGhostRail.java | 10 +- .../common/block/BlockModDoubleFlower.java | 113 +++--------------- .../common/block/BlockModDoubleFlower1.java | 11 +- .../common/block/BlockModDoubleFlower2.java | 11 +- .../common/block/decor/BlockReeds.java | 8 +- .../common/block/mana/BlockManaVoid.java | 5 + .../botania/blockstates/alchemyCatalyst.json | 17 +++ .../blockstates/conjurationCatalyst.json | 17 +++ .../botania/blockstates/doubleFlower1.json | 65 ++++++++++ .../botania/blockstates/doubleFlower2.json | 65 ++++++++++ .../assets/botania/blockstates/dreamwood.json | 15 +++ .../assets/botania/blockstates/manaVoid.json | 15 +++ .../assets/botania/blockstates/reedBlock.json | 19 +++ 15 files changed, 296 insertions(+), 109 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/alchemyCatalyst.json create mode 100644 src/main/resources/assets/botania/blockstates/conjurationCatalyst.json create mode 100644 src/main/resources/assets/botania/blockstates/doubleFlower1.json create mode 100644 src/main/resources/assets/botania/blockstates/doubleFlower2.json create mode 100644 src/main/resources/assets/botania/blockstates/dreamwood.json create mode 100644 src/main/resources/assets/botania/blockstates/manaVoid.json create mode 100644 src/main/resources/assets/botania/blockstates/reedBlock.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index e4b352b78..c8e9691fe 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,6 +2,8 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -96,6 +98,9 @@ public class BotaniaStateProps { // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockGhostRail + public static final PropertyEnum RAIL_DIRECTION = BlockRailPowered.SHAPE; + // BlockLightRelay public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); 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 f7d13208a..e5fcda327 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -3,6 +3,7 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import net.minecraft.block.Block; +import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; @@ -188,6 +189,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.ghostRail); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); + registerItemModel(ModBlocks.manaVoid); + registerItemModel(ModBlocks.alchemyCatalyst); + registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.reedBlock); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); @@ -196,6 +201,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); @@ -257,6 +263,10 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Ignore vanilla facing, variant in double flower + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + // Ignore redstone power state in some blocks ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); @@ -270,6 +280,9 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + // Ignore in special flower to suppress errors (handled in custom statemapper in BlockSpecialFlower + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -355,6 +368,22 @@ public final class ModelHandler { ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower1); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); + } + + item = Item.getItemFromBlock(ModBlocks.doubleFlower2); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); + } } private static void registerPavement() { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 52b7311e0..6bd622ad1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; @@ -38,7 +39,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { - public static final PropertyEnum SHAPE = BlockRailPowered.SHAPE; private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { @@ -46,22 +46,22 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); MinecraftForge.EVENT_BUS.register(this); setUnlocalizedName(LibBlockNames.GHOST_RAIL); - setDefaultState(blockState.getBaseState().withProperty(SHAPE, EnumRailDirection.NORTH_SOUTH)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @Override public BlockState createBlockState() { - return new BlockState(this, SHAPE); + return new BlockState(this, BotaniaStateProps.RAIL_DIRECTION); } @Override public int getMetaFromState(IBlockState state) { - return state.getValue(SHAPE).getMetadata(); + return state.getValue(BotaniaStateProps.RAIL_DIRECTION).getMetadata(); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(SHAPE, EnumRailDirection.byMetadata(meta)); + return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 7493e23bb..63d7e748a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; @@ -30,6 +32,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -50,15 +53,13 @@ import java.util.List; import java.util.Random; // Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x -public abstract class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { - public static final PropertyEnum HALF = BlockDoublePlant.HALF; +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; final int offset; final boolean second; public BlockModDoubleFlower(boolean second) { - super(Material.vine); this.second = second; this.setHardness(0.0F); this.setStepSound(soundTypeGrass); @@ -93,7 +94,7 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public int damageDropped(IBlockState state) { - return getMetaFromState(state.withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)); + return 0; } @Override @@ -106,11 +107,6 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return true; } - @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - // todo 1.8.8 drop - } - @Override public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) @@ -185,7 +181,10 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos).withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)))); + if (world.getBlockState(pos.down()).getBlock() == this + && world.getBlockState(pos.down()).getValue(HALF) == EnumBlockHalf.LOWER) { + ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos.down())))); + } return ret; } @@ -205,14 +204,9 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } - @Override - public int getRenderType() { - return LibRenderIDs.idDoubleFlower; - } - @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMapColor().colorValue; + int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); @@ -227,93 +221,18 @@ public abstract class BlockModDoubleFlower extends BlockBush implements IGrowabl return LexiconData.flowers; } - - - /** BEGIN COPY BlockDoublePlant **/ - @Override - public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) - { - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) - { - return super.canPlaceBlockAt(worldIn, pos) && worldIn.isAirBlock(pos.up()); - } - - @Override - protected void checkAndDropBlock(World worldIn, BlockPos pos, IBlockState state) - { - if (!this.canBlockStay(worldIn, pos, state)) - { - boolean flag = state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER; - BlockPos blockpos = flag ? pos : pos.up(); - BlockPos blockpos1 = flag ? pos.down() : pos; - Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock()); - Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this); - - if (!flag) this.dropBlockAsItem(worldIn, pos, state, 0); //Forge move above the setting to air. - - if (block == this) - { - worldIn.setBlockState(blockpos, Blocks.air.getDefaultState(), 2); - } - - if (block1 == this) - { - worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 3); - } - } - } - - @Override - public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) - { - if (state.getBlock() != this) return super.canBlockStay(worldIn, pos, state); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check. - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { - return worldIn.getBlockState(pos.down()).getBlock() == this; - } - else - { - IBlockState iblockstate = worldIn.getBlockState(pos.up()); - return iblockstate.getBlock() == this && super.canBlockStay(worldIn, pos, iblockstate); - } - } - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) - { - worldIn.setBlockState(pos.up(), this.getDefaultState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.UPPER), 2); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) - { - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) - { + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { IBlockState iblockstate = worldIn.getBlockState(pos.down()); - if (iblockstate.getBlock() == this) - { - state = state.withProperty(BotaniaStateProps.COLOR, iblockstate.getValue(BotaniaStateProps.COLOR)); + if (iblockstate.getBlock() == this) { + PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; + state = state.withProperty(prop, iblockstate.getValue(prop)); } } - return state; + return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); } - @Override - public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames. - IBlockState state = world.getBlockState(pos); - if (state.getBlock() == this && state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER && world.getBlockState(pos.up()).getBlock() == this) - world.setBlockToAir(pos.up()); - return world.setBlockToAir(pos); - } - - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 634f644ae..8d8c1b8b9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -4,23 +4,28 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 8604b2ddb..9f97b95eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; // Silver to black @@ -11,17 +12,21 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + setDefaultState(blockState.getBaseState() + .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } @Override public BlockState createBlockState() { - return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2)).getMetadata() - 8; + int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { meta |= 8; } 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 c965be68e..1d33853d7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -47,7 +48,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.AXIS_FACING))) { + switch (state.getValue(BotaniaStateProps.AXIS_FACING)) { case Z: return 8; case X: return 4; case Y: @@ -67,6 +68,11 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); } + @Override + public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); 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 cf0985358..cd73072a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -45,6 +45,11 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP MinecraftForge.EVENT_BUS.register(this); } + @Override + public int getRenderType() { + return 3; + } + @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json new file mode 100644 index 000000000..e054f42ab --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/alchemyCatalyst0", + "top": "botania:blocks/alchemyCatalyst1", + "side": "botania:blocks/alchemyCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json new file mode 100644 index 000000000..e3f933d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/conjurationCatalyst0", + "top": "botania:blocks/conjurationCatalyst1", + "side": "botania:blocks/conjurationCatalyst2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleFlower1.json new file mode 100644 index 000000000..7d171908a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower1.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], + "half=upper,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], + "half=lower,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], + "half=upper,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], + "half=lower,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], + "half=upper,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], + "half=lower,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], + "half=upper,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], + "half=lower,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], + "half=upper,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], + "half=lower,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], + "half=upper,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], + "half=lower,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], + "half=upper,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], + "half=lower,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], + "half=upper,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], + + "inventory_white": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower0Tall1" }, + "transform": "forge:default-item" + }], + "inventory_orange": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower1Tall1" }, + "transform": "forge:default-item" + }], + "inventory_magenta": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower2Tall1" }, + "transform": "forge:default-item" + }], + "inventory_light_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower3Tall1" }, + "transform": "forge:default-item" + }], + "inventory_yellow": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower4Tall1" }, + "transform": "forge:default-item" + }], + "inventory_lime": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower5Tall1" }, + "transform": "forge:default-item" + }], + "inventory_pink": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower6Tall1" }, + "transform": "forge:default-item" + }], + "inventory_gray": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower7Tall1" }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleFlower2.json new file mode 100644 index 000000000..4bd2b54f4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/doubleFlower2.json @@ -0,0 +1,65 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, + "variants": { + "half=lower,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], + "half=upper,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], + "half=lower,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], + "half=upper,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], + "half=lower,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], + "half=upper,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], + "half=lower,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], + "half=upper,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], + "half=lower,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], + "half=upper,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], + "half=lower,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], + "half=upper,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], + "half=lower,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], + "half=upper,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], + "half=lower,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], + "half=upper,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], + + "inventory_silver": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower8Tall1" }, + "transform": "forge:default-item" + }], + "inventory_cyan": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower9Tall1" }, + "transform": "forge:default-item" + }], + "inventory_purple": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower10Tall1" }, + "transform": "forge:default-item" + }], + "inventory_blue": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower11Tall1" }, + "transform": "forge:default-item" + }], + "inventory_brown": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower12Tall1" }, + "transform": "forge:default-item" + }], + "inventory_green": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower13Tall1" }, + "transform": "forge:default-item" + }], + "inventory_red": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower14Tall1" }, + "transform": "forge:default-item" + }], + "inventory_black": [{ + "model": "builtin/generated", + "textures": { "layer0": "botania:blocks/flower15Tall1" }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood.json b/src/main/resources/assets/botania/blockstates/dreamwood.json new file mode 100644 index 000000000..fb6d48d06 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant=default": [{ "textures": { "all": "botania:blocks/dreamwood0" } }], + "variant=planks": [{ "textures": { "all": "botania:blocks/dreamwood1" } }], + "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/dreamwood2" } }], + "variant=framed": [{ "textures": { "all": "botania:blocks/dreamwood3" } }], + "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/dreamwood4" } }], + "variant=glimmering": [{ "textures": { "all": "botania:blocks/dreamwood5" } }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json new file mode 100644 index 000000000..034836e67 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/manaVoid0" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock.json b/src/main/resources/assets/botania/blockstates/reedBlock.json new file mode 100644 index 000000000..2eecb5a5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/reedBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/reedBlock1", + "top": "botania:blocks/reedBlock1", + "side": "botania:blocks/reedBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "axis=x": [{ "x": 90, "y": 90 }], + "axis=y": [{}], + "axis=z": [{ "x": 90 }], + "inventory": [{}] + } + +} \ No newline at end of file From 2f4785c7b4d0fb8cb65af7b5d135479142621603 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 12:35:46 -0600 Subject: [PATCH 101/935] Clean up flower and mushroom jsons --- .../client/core/handler/ModelHandler.java | 18 ++-- .../assets/botania/blockstates/flower.json | 102 +++++++----------- .../assets/botania/blockstates/mushroom.json | 102 +++++++----------- .../botania/blockstates/shinyFlower.json | 102 +++++++----------- .../botania/models/item/flower_black.json | 6 -- .../botania/models/item/flower_blue.json | 6 -- .../botania/models/item/flower_brown.json | 6 -- .../botania/models/item/flower_cyan.json | 6 -- .../botania/models/item/flower_gray.json | 6 -- .../botania/models/item/flower_green.json | 6 -- .../models/item/flower_light_blue.json | 6 -- .../botania/models/item/flower_lime.json | 6 -- .../botania/models/item/flower_magenta.json | 6 -- .../botania/models/item/flower_orange.json | 6 -- .../botania/models/item/flower_pink.json | 6 -- .../botania/models/item/flower_purple.json | 6 -- .../botania/models/item/flower_red.json | 6 -- .../botania/models/item/flower_silver.json | 6 -- .../botania/models/item/flower_white.json | 6 -- .../botania/models/item/flower_yellow.json | 6 -- .../botania/models/item/mushroom_black.json | 6 -- .../botania/models/item/mushroom_blue.json | 6 -- .../botania/models/item/mushroom_brown.json | 6 -- .../botania/models/item/mushroom_cyan.json | 6 -- .../botania/models/item/mushroom_gray.json | 6 -- .../botania/models/item/mushroom_green.json | 6 -- .../models/item/mushroom_light_blue.json | 6 -- .../botania/models/item/mushroom_lime.json | 6 -- .../botania/models/item/mushroom_magenta.json | 6 -- .../botania/models/item/mushroom_orange.json | 6 -- .../botania/models/item/mushroom_pink.json | 6 -- .../botania/models/item/mushroom_purple.json | 6 -- .../botania/models/item/mushroom_red.json | 6 -- .../botania/models/item/mushroom_silver.json | 6 -- .../botania/models/item/mushroom_white.json | 6 -- .../botania/models/item/mushroom_yellow.json | 6 -- .../models/item/shinyFlower_black.json | 6 -- .../botania/models/item/shinyFlower_blue.json | 6 -- .../models/item/shinyFlower_brown.json | 6 -- .../botania/models/item/shinyFlower_cyan.json | 6 -- .../botania/models/item/shinyFlower_gray.json | 6 -- .../models/item/shinyFlower_green.json | 6 -- .../models/item/shinyFlower_light_blue.json | 6 -- .../botania/models/item/shinyFlower_lime.json | 6 -- .../models/item/shinyFlower_magenta.json | 6 -- .../models/item/shinyFlower_orange.json | 6 -- .../botania/models/item/shinyFlower_pink.json | 6 -- .../models/item/shinyFlower_purple.json | 6 -- .../botania/models/item/shinyFlower_red.json | 6 -- .../models/item/shinyFlower_silver.json | 6 -- .../models/item/shinyFlower_white.json | 6 -- .../models/item/shinyFlower_yellow.json | 6 -- 52 files changed, 117 insertions(+), 495 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/item/flower_black.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_brown.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_cyan.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_gray.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_green.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_light_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_lime.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_magenta.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_orange.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_pink.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_purple.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_red.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_silver.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_white.json delete mode 100644 src/main/resources/assets/botania/models/item/flower_yellow.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_black.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_brown.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_cyan.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_gray.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_green.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_light_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_lime.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_magenta.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_orange.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_pink.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_purple.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_red.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_silver.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_white.json delete mode 100644 src/main/resources/assets/botania/models/item/mushroom_yellow.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_black.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_brown.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_cyan.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_gray.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_green.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_lime.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_magenta.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_orange.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_pink.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_purple.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_red.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_silver.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_white.json delete mode 100644 src/main/resources/assets/botania/models/item/shinyFlower_yellow.json 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 e5fcda327..b027bc2f3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -348,25 +348,25 @@ public final class ModelHandler { private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:mushroom_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:flower_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:shinyFlower_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.doubleFlower1); diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 645d917ac..9ccfc702c 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flower15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/flower0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/flower1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/flower2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/flower3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/flower4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/flower5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/flower6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/flower7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/flower8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/flower9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/flower10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/flower11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/flower12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/flower13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/flower14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/flower15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower15" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index bdd1fc07a..cafdbfede 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/mushroom15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/mushroom0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/mushroom1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/mushroom2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/mushroom3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/mushroom4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/mushroom5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/mushroom6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/mushroom7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/mushroom8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/mushroom9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/mushroom10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/mushroom11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/mushroom12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/mushroom13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/mushroom14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/mushroom15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom15" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index fd3edfa27..c08f56345 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -1,71 +1,41 @@ { "forge_marker": 1, + "defaults": { + "model": "minecraft:cross" + }, "variants": { - "color": { - "white": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering0" } - }, - "orange": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering1" } - }, - "magenta": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering2" } - }, - "light_blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering3" } - }, - "yellow": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering4" } - }, - "lime": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering5" } - }, - "pink": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering6" } - }, - "gray": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering7" } - }, - "silver": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering8" } - }, - "cyan": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering9" } - }, - "purple": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering10" } - }, - "blue": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering11" } - }, - "brown": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering12" } - }, - "green": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering13" } - }, - "red": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering14" } - }, - "black": { - "model": "minecraft:cross", - "textures": { "cross": "botania:blocks/flowerGlimmering15" } - } - } + "color=white": [{ "textures": { "cross": "botania:blocks/flowerGlimmering0" } }], + "color=orange": [{ "textures": { "cross": "botania:blocks/flowerGlimmering1" } }], + "color=magenta": [{ "textures": { "cross": "botania:blocks/flowerGlimmering2" } }], + "color=light_blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering3" } }], + "color=yellow": [{ "textures": { "cross": "botania:blocks/flowerGlimmering4" } }], + "color=lime": [{ "textures": { "cross": "botania:blocks/flowerGlimmering5" } }], + "color=pink": [{ "textures": { "cross": "botania:blocks/flowerGlimmering6" } }], + "color=gray": [{ "textures": { "cross": "botania:blocks/flowerGlimmering7" } }], + "color=silver": [{ "textures": { "cross": "botania:blocks/flowerGlimmering8" } }], + "color=cyan": [{ "textures": { "cross": "botania:blocks/flowerGlimmering9" } }], + "color=purple": [{ "textures": { "cross": "botania:blocks/flowerGlimmering10" } }], + "color=blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering11" } }], + "color=brown": [{ "textures": { "cross": "botania:blocks/flowerGlimmering12" } }], + "color=green": [{ "textures": { "cross": "botania:blocks/flowerGlimmering13" } }], + "color=red": [{ "textures": { "cross": "botania:blocks/flowerGlimmering14" } }], + "color=black": [{ "textures": { "cross": "botania:blocks/flowerGlimmering15" } }], + + "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }], + "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }], + "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering2" } }], + "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering3" } }], + "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering4" } }], + "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering5" } }], + "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering6" } }], + "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering7" } }], + "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering8" } }], + "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering9" } }], + "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering10" } }], + "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering11" } }], + "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering12" } }], + "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering13" } }], + "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering14" } }], + "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering15" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_black.json b/src/main/resources/assets/botania/models/item/flower_black.json deleted file mode 100644 index 74be17232..000000000 --- a/src/main/resources/assets/botania/models/item/flower_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_blue.json b/src/main/resources/assets/botania/models/item/flower_blue.json deleted file mode 100644 index 08989cd7b..000000000 --- a/src/main/resources/assets/botania/models/item/flower_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_brown.json b/src/main/resources/assets/botania/models/item/flower_brown.json deleted file mode 100644 index 73c83d12c..000000000 --- a/src/main/resources/assets/botania/models/item/flower_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_cyan.json b/src/main/resources/assets/botania/models/item/flower_cyan.json deleted file mode 100644 index ff1f1f9ec..000000000 --- a/src/main/resources/assets/botania/models/item/flower_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_gray.json b/src/main/resources/assets/botania/models/item/flower_gray.json deleted file mode 100644 index cff1cd61b..000000000 --- a/src/main/resources/assets/botania/models/item/flower_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_green.json b/src/main/resources/assets/botania/models/item/flower_green.json deleted file mode 100644 index e4aedca11..000000000 --- a/src/main/resources/assets/botania/models/item/flower_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_light_blue.json b/src/main/resources/assets/botania/models/item/flower_light_blue.json deleted file mode 100644 index 0ff9e7bd0..000000000 --- a/src/main/resources/assets/botania/models/item/flower_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_lime.json b/src/main/resources/assets/botania/models/item/flower_lime.json deleted file mode 100644 index 16d27ccd3..000000000 --- a/src/main/resources/assets/botania/models/item/flower_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_magenta.json b/src/main/resources/assets/botania/models/item/flower_magenta.json deleted file mode 100644 index 4018d6d6e..000000000 --- a/src/main/resources/assets/botania/models/item/flower_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_orange.json b/src/main/resources/assets/botania/models/item/flower_orange.json deleted file mode 100644 index 117a1ae96..000000000 --- a/src/main/resources/assets/botania/models/item/flower_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_pink.json b/src/main/resources/assets/botania/models/item/flower_pink.json deleted file mode 100644 index 97aab6cfb..000000000 --- a/src/main/resources/assets/botania/models/item/flower_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_purple.json b/src/main/resources/assets/botania/models/item/flower_purple.json deleted file mode 100644 index 422e008de..000000000 --- a/src/main/resources/assets/botania/models/item/flower_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_red.json b/src/main/resources/assets/botania/models/item/flower_red.json deleted file mode 100644 index 71adb35b7..000000000 --- a/src/main/resources/assets/botania/models/item/flower_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_silver.json b/src/main/resources/assets/botania/models/item/flower_silver.json deleted file mode 100644 index e7e1a7bad..000000000 --- a/src/main/resources/assets/botania/models/item/flower_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower8" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_white.json b/src/main/resources/assets/botania/models/item/flower_white.json deleted file mode 100644 index c72fbabed..000000000 --- a/src/main/resources/assets/botania/models/item/flower_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flower_yellow.json b/src/main/resources/assets/botania/models/item/flower_yellow.json deleted file mode 100644 index 1fd5e7d07..000000000 --- a/src/main/resources/assets/botania/models/item/flower_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flower4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_black.json b/src/main/resources/assets/botania/models/item/mushroom_black.json deleted file mode 100644 index 02010cbda..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_blue.json b/src/main/resources/assets/botania/models/item/mushroom_blue.json deleted file mode 100644 index 0301bf3fd..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_brown.json b/src/main/resources/assets/botania/models/item/mushroom_brown.json deleted file mode 100644 index 39e744fee..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_cyan.json b/src/main/resources/assets/botania/models/item/mushroom_cyan.json deleted file mode 100644 index d17557e19..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_gray.json b/src/main/resources/assets/botania/models/item/mushroom_gray.json deleted file mode 100644 index ba46fa3b6..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_green.json b/src/main/resources/assets/botania/models/item/mushroom_green.json deleted file mode 100644 index aed8cc9ab..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_light_blue.json b/src/main/resources/assets/botania/models/item/mushroom_light_blue.json deleted file mode 100644 index 02569057b..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_lime.json b/src/main/resources/assets/botania/models/item/mushroom_lime.json deleted file mode 100644 index 60e3fd100..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_magenta.json b/src/main/resources/assets/botania/models/item/mushroom_magenta.json deleted file mode 100644 index 617ad89ee..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_orange.json b/src/main/resources/assets/botania/models/item/mushroom_orange.json deleted file mode 100644 index 6e0e78438..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_pink.json b/src/main/resources/assets/botania/models/item/mushroom_pink.json deleted file mode 100644 index 562925c0b..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_purple.json b/src/main/resources/assets/botania/models/item/mushroom_purple.json deleted file mode 100644 index d7874c8ba..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_red.json b/src/main/resources/assets/botania/models/item/mushroom_red.json deleted file mode 100644 index 43d756c6a..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_silver.json b/src/main/resources/assets/botania/models/item/mushroom_silver.json deleted file mode 100644 index edb1409dc..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom8" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_white.json b/src/main/resources/assets/botania/models/item/mushroom_white.json deleted file mode 100644 index 4f6d7d848..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mushroom_yellow.json b/src/main/resources/assets/botania/models/item/mushroom_yellow.json deleted file mode 100644 index 7c1555c74..000000000 --- a/src/main/resources/assets/botania/models/item/mushroom_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/mushroom4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_black.json b/src/main/resources/assets/botania/models/item/shinyFlower_black.json deleted file mode 100644 index 9e32d4ab4..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering15" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_blue.json b/src/main/resources/assets/botania/models/item/shinyFlower_blue.json deleted file mode 100644 index 584a504b3..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering11" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_brown.json b/src/main/resources/assets/botania/models/item/shinyFlower_brown.json deleted file mode 100644 index babb9d96a..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering12" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json b/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json deleted file mode 100644 index 23cfb282b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering9" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_gray.json b/src/main/resources/assets/botania/models/item/shinyFlower_gray.json deleted file mode 100644 index 0bacb5d9b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_green.json b/src/main/resources/assets/botania/models/item/shinyFlower_green.json deleted file mode 100644 index eb8516159..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering13" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json b/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json deleted file mode 100644 index 65e9a89c0..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_lime.json b/src/main/resources/assets/botania/models/item/shinyFlower_lime.json deleted file mode 100644 index 3b6026e2b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json b/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json deleted file mode 100644 index 111119d77..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_orange.json b/src/main/resources/assets/botania/models/item/shinyFlower_orange.json deleted file mode 100644 index e1354029b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_pink.json b/src/main/resources/assets/botania/models/item/shinyFlower_pink.json deleted file mode 100644 index 4d1005a14..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_purple.json b/src/main/resources/assets/botania/models/item/shinyFlower_purple.json deleted file mode 100644 index fbc39c447..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering10" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_red.json b/src/main/resources/assets/botania/models/item/shinyFlower_red.json deleted file mode 100644 index b03af685f..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering14" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_silver.json b/src/main/resources/assets/botania/models/item/shinyFlower_silver.json deleted file mode 100644 index 0bacb5d9b..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_silver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_white.json b/src/main/resources/assets/botania/models/item/shinyFlower_white.json deleted file mode 100644 index e80b16af8..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json b/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json deleted file mode 100644 index ff3082d61..000000000 --- a/src/main/resources/assets/botania/models/item/shinyFlower_yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:blocks/flowerGlimmering4" - } -} \ No newline at end of file From 5fe696875f05623f6f35c68bb2552851cb977335 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 16:21:21 -0600 Subject: [PATCH 102/935] More various models --- .../client/core/handler/ModelHandler.java | 55 +++++++++++++++++++ .../botania/common/block/BlockBifrost.java | 5 +- .../common/block/BlockBifrostPerm.java | 4 +- .../botania/common/block/BlockEnderEye.java | 2 +- .../botania/common/block/BlockFakeAir.java | 5 ++ .../common/block/BlockModContainer.java | 5 ++ .../common/block/decor/BlockManaBeacon.java | 5 -- .../common/block/decor/BlockStarfield.java | 5 -- .../common/block/mana/BlockRuneAltar.java | 5 -- .../common/block/mana/BlockSpawnerClaw.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../equipment/tool/bow/ItemCrystalBow.java | 29 ++++++++++ .../equipment/tool/bow/ItemLivingwoodBow.java | 38 +++++++------ .../assets/botania/blockstates/bifrost.json | 15 +++++ .../botania/blockstates/bifrostPerm.json | 15 +++++ .../botania/blockstates/blazeBlock.json | 14 +++++ .../assets/botania/blockstates/dirtPath.json | 3 +- .../botania/blockstates/enderEyeBlock.json | 19 +++++++ .../assets/botania/blockstates/forestEye.json | 19 +++++++ .../botania/blockstates/manaBeacon.json | 9 ++- .../assets/botania/blockstates/openCrate.json | 23 ++++++++ .../assets/botania/blockstates/thatch.json | 14 +++++ .../botania/blockstates/tinyPlanetBlock.json | 14 +++++ .../botania/blockstates/unstableBlock.json | 9 ++- .../botania/models/block/microblock.json | 20 +++++++ ...ck_all.json => microblock_all_tinted.json} | 0 .../botania/models/block/miniblock_all.json | 20 +++++++ .../models/block/miniblock_all_tinted.json | 20 +++++++ ...ock_top.json => miniblock_top_tinted.json} | 0 .../botania/models/item/crystalBow.json | 18 ++++++ .../models/item/crystalBow_pulling_1.json | 18 ++++++ .../models/item/crystalBow_pulling_2.json | 18 ++++++ .../models/item/crystalBow_pulling_3.json | 18 ++++++ .../models/item/crystalBow_pulling_4.json | 18 ++++++ .../models/item/crystalBow_pulling_5.json | 18 ++++++ .../assets/botania/models/item/dye.json | 6 ++ .../botania/models/item/fertilizer.json | 6 ++ .../assets/botania/models/item/flowerBag.json | 6 ++ .../botania/models/item/livingwoodBow.json | 18 ++++++ .../models/item/livingwoodBow_pulling_1.json | 18 ++++++ .../models/item/livingwoodBow_pulling_2.json | 18 ++++++ .../models/item/livingwoodBow_pulling_3.json | 18 ++++++ .../botania/models/item/obedienceStick.json | 6 ++ .../assets/botania/models/item/petal.json | 6 ++ .../assets/botania/models/item/rune_air.json | 6 ++ .../botania/models/item/rune_autumn.json | 6 ++ .../botania/models/item/rune_earth.json | 6 ++ .../assets/botania/models/item/rune_envy.json | 6 ++ .../assets/botania/models/item/rune_fire.json | 6 ++ .../botania/models/item/rune_gluttony.json | 6 ++ .../botania/models/item/rune_greed.json | 6 ++ .../assets/botania/models/item/rune_lust.json | 6 ++ .../assets/botania/models/item/rune_mana.json | 6 ++ .../botania/models/item/rune_pride.json | 6 ++ .../botania/models/item/rune_sloth.json | 6 ++ .../botania/models/item/rune_spring.json | 6 ++ .../botania/models/item/rune_summer.json | 6 ++ .../botania/models/item/rune_water.json | 6 ++ .../botania/models/item/rune_winter.json | 6 ++ .../botania/models/item/rune_wrath.json | 6 ++ 60 files changed, 633 insertions(+), 49 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/bifrost.json create mode 100644 src/main/resources/assets/botania/blockstates/bifrostPerm.json create mode 100644 src/main/resources/assets/botania/blockstates/blazeBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/enderEyeBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/forestEye.json create mode 100644 src/main/resources/assets/botania/blockstates/openCrate.json create mode 100644 src/main/resources/assets/botania/blockstates/thatch.json create mode 100644 src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json create mode 100644 src/main/resources/assets/botania/models/block/microblock.json rename src/main/resources/assets/botania/models/block/{microblock_all.json => microblock_all_tinted.json} (100%) create mode 100644 src/main/resources/assets/botania/models/block/miniblock_all.json create mode 100644 src/main/resources/assets/botania/models/block/miniblock_all_tinted.json rename src/main/resources/assets/botania/models/block/{miniblock_top.json => miniblock_top_tinted.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/crystalBow.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json create mode 100644 src/main/resources/assets/botania/models/item/dye.json create mode 100644 src/main/resources/assets/botania/models/item/fertilizer.json create mode 100644 src/main/resources/assets/botania/models/item/flowerBag.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json create mode 100644 src/main/resources/assets/botania/models/item/obedienceStick.json create mode 100644 src/main/resources/assets/botania/models/item/petal.json create mode 100644 src/main/resources/assets/botania/models/item/rune_air.json create mode 100644 src/main/resources/assets/botania/models/item/rune_autumn.json create mode 100644 src/main/resources/assets/botania/models/item/rune_earth.json create mode 100644 src/main/resources/assets/botania/models/item/rune_envy.json create mode 100644 src/main/resources/assets/botania/models/item/rune_fire.json create mode 100644 src/main/resources/assets/botania/models/item/rune_gluttony.json create mode 100644 src/main/resources/assets/botania/models/item/rune_greed.json create mode 100644 src/main/resources/assets/botania/models/item/rune_lust.json create mode 100644 src/main/resources/assets/botania/models/item/rune_mana.json create mode 100644 src/main/resources/assets/botania/models/item/rune_pride.json create mode 100644 src/main/resources/assets/botania/models/item/rune_sloth.json create mode 100644 src/main/resources/assets/botania/models/item/rune_spring.json create mode 100644 src/main/resources/assets/botania/models/item/rune_summer.json create mode 100644 src/main/resources/assets/botania/models/item/rune_water.json create mode 100644 src/main/resources/assets/botania/models/item/rune_winter.json create mode 100644 src/main/resources/assets/botania/models/item/rune_wrath.json 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 b027bc2f3..2e66a3f2a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -23,6 +23,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; @@ -114,6 +115,9 @@ public final class ModelHandler { /** Normal Items **/ registerStandardItems(); registerManaResources(); + registerDyesPetals(); + registerRunes(); + registerBows(); /** Special Item Meshers **/ } @@ -193,6 +197,13 @@ public final class ModelHandler { registerItemModel(ModBlocks.alchemyCatalyst); registerItemModel(ModBlocks.conjurationCatalyst); registerItemModel(ModBlocks.reedBlock); + registerItemModel(ModBlocks.bifrost); + registerItemModel(ModBlocks.bifrostPerm); + registerItemModel(ModBlocks.enderEye); + registerItemModel(ModBlocks.tinyPlanet); + registerItemModel(ModBlocks.thatch); + registerItemModel(ModBlocks.blazeBlock); + registerItemModel(ModBlocks.forestEye); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); @@ -206,6 +217,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); } private static void registerStandardItems() { @@ -251,6 +263,9 @@ public final class ModelHandler { registerItemModel(thunderSword); registerItemModel(glassPick); registerItemModel(twigWand); + registerItemModel(flowerBag); + registerItemModel(fertilizer); + registerItemModel(obedienceStick); } private static void registerManaResources() { @@ -262,6 +277,46 @@ public final class ModelHandler { } } + private static void registerDyesPetals() { + Item item = dye; + String name = GameData.getItemRegistry().getNameForObject(item).toString(); + + Item item2 = petal; + String name2 = GameData.getItemRegistry().getNameForObject(item2).toString(); + + for (EnumDyeColor color : EnumDyeColor.values()) { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + + ModelLoader.registerItemVariants(item2, new ModelResourceLocation(name2, "inventory")); + ModelLoader.setCustomModelResourceLocation(item2, color.getMetadata(), new ModelResourceLocation(name2, "inventory")); + } + } + + private static void registerRunes() { + List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); + for (int i = 0; i < variantNames.size(); i++) { + ModelLoader.registerItemVariants(rune, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); + ModelLoader.setCustomModelResourceLocation(rune, i, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); + } + } + + private static void registerBows() { + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_1", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_2", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_3", "inventory")); + registerItemModel(livingwoodBow); + + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_1", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_2", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_3", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_4", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_5", "inventory")); + registerItemModel(crystalBow); + } + private static void registerStateMappers() { // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index ec0ed2519..c055ba4b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -32,6 +32,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -72,12 +73,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); } @Override public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 + return EnumWorldBlockLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index f8d92c744..c16e8df54 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -53,7 +53,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); } @Override @@ -64,7 +64,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 verify + return EnumWorldBlockLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 3c417f4c7..bcb903910 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -60,7 +60,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return state.getValue(BotaniaStateProps.POWER); + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 6e8856513..f2bcec8a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -38,6 +38,11 @@ public class BlockFakeAir extends BlockModContainer { setTickRandomly(true); } + @Override + public int getRenderType() { + return -1; + } + @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { if(shouldRemove(world, pos)) diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index 328f69219..5480eb915 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -32,6 +32,11 @@ public abstract class BlockModContainer extends BlockConta setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Override + public int getRenderType() { + return 3; + } + @Override public Block setUnlocalizedName(String par1Str) { if(shouldRegisterInNameSet()) 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 770d17284..cf0dfb071 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -52,11 +52,6 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } - @Override - public int getRenderType() { - return 3; - } - @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); 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 3ec634b7a..16ce01c95 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -40,11 +40,6 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } - @Override - public int getRenderType() { - return 3; - } - @Override public EnumWorldBlockLayer getBlockLayer() { return EnumWorldBlockLayer.CUTOUT_MIPPED; 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 e9b02430b..3dac4408f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -52,11 +52,6 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex random = new Random(); } - @Override - public int getRenderType() { - return 3; - } - @Override public boolean isOpaqueCube() { return false; 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 d399104c4..b1b7d8c3c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -59,7 +59,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable @Override public int getRenderType() { - return LibRenderIDs.idSpawnerClaw; + return 2; } @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 2d6b29c3f..bfebe0c69 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -143,7 +143,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public int getRenderType() { - return LibRenderIDs.idSpreader; + return 2; } @Override 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 541b15fd4..ee64aa7e8 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 @@ -10,12 +10,16 @@ */ package vazkii.botania.common.item.equipment.tool.bow; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; @@ -49,4 +53,29 @@ public class ItemCrystalBow extends ItemLivingwoodBow { ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false); } + @Override + @SideOnly(Side.CLIENT) + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { + String name = GameData.getItemRegistry().getNameForObject(this).toString(); + + if (useRemaining == 0) { + return new ModelResourceLocation(name, "inventory"); + } + + int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); + + if(j >= 28) + return new ModelResourceLocation(name + "_pulling_5", "inventory"); + if(j >= 23) + return new ModelResourceLocation(name + "_pulling_4", "inventory"); + if(j >= 18) + return new ModelResourceLocation(name + "_pulling_3", "inventory"); + if(j > 13) + return new ModelResourceLocation(name + "_pulling_2", "inventory"); + if(j > 0) + return new ModelResourceLocation(name + "_pulling_1", "inventory"); + + return new ModelResourceLocation(name, "inventory"); + } + } 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 b5b3a73a1..220c8bf4e 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.bow; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -23,6 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -164,21 +166,25 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } -// @Override todo 1.8 -// public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { -// if(stack != usingItem) -// return itemIcon; -// -// int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); -// -// if(j >= 18) -// return pullIcons[2]; -// if(j > 13) -// return pullIcons[1]; -// if(j > 0) -// return pullIcons[0]; -// -// return itemIcon; -// } + @Override + @SideOnly(Side.CLIENT) + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { + String name = GameData.getItemRegistry().getNameForObject(this).toString(); + + if (useRemaining == 0) { + return new ModelResourceLocation(name, "inventory"); + } + + int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); + + if(j >= 18) + return new ModelResourceLocation(name + "_pulling_3", "inventory"); + if(j > 13) + return new ModelResourceLocation(name + "_pulling_2", "inventory"); + if(j > 0) + return new ModelResourceLocation(name + "_pulling_1", "inventory"); + + return new ModelResourceLocation(name, "inventory"); + } } diff --git a/src/main/resources/assets/botania/blockstates/bifrost.json b/src/main/resources/assets/botania/blockstates/bifrost.json new file mode 100644 index 000000000..e10154d99 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrost.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/bifrost" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrostPerm.json b/src/main/resources/assets/botania/blockstates/bifrostPerm.json new file mode 100644 index 000000000..e10154d99 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrostPerm.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/bifrost" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blazeBlock.json b/src/main/resources/assets/botania/blockstates/blazeBlock.json new file mode 100644 index 000000000..128196b32 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blazeBlock.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/blazeBlock" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json index 9d7444376..46fdc670f 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -4,7 +4,8 @@ "model": "botania:minusone_all", "textures": { "all": "botania:blocks/dirtPath" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json new file mode 100644 index 000000000..1d55d3423 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered=true": [{ + "textures": { + "all": "botania:blocks/enderEyeBlock1" + } + }], + "powered=false": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestEye.json b/src/main/resources/assets/botania/blockstates/forestEye.json new file mode 100644 index 000000000..882a5bbc2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forestEye.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:microblock", + "textures": { + "bottom": "botania:blocks/forestEye0", + "top": "botania:blocks/forestEye1", + "north": "botania:blocks/forestEye2", + "south": "botania:blocks/forestEye3", + "west": "botania:blocks/forestEye4", + "east": "botania:blocks/forestEye5" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json index 08230c4fc..646dcd2dc 100644 --- a/src/main/resources/assets/botania/blockstates/manaBeacon.json +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -1,16 +1,15 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniblock_top", + "model": "botania:miniblock_top_tinted", "textures": { "all": "botania:blocks/manaBeacon0", "top": "botania:blocks/manaBeacon1" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json new file mode 100644 index 000000000..4e13284f2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant=open": [{ + "textures": { + "bottom": "botania:blocks/openCrate1", + "side": "botania:blocks/openCrate0", + "top": "botania:blocks/openCrate0" + } + }], + "variant=crafty": [{ + "textures": { + "bottom": "botania:blocks/openCrate3", + "side": "botania:blocks/openCrate2", + "top": "botania:blocks/openCrate2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch.json b/src/main/resources/assets/botania/blockstates/thatch.json new file mode 100644 index 000000000..c3cf1397e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/thatch" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json new file mode 100644 index 000000000..daec2757c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniblock_all", + "textures": { + "all": "botania:blocks/tinyPlanetBlock" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json index 47a7be21f..23238ca79 100644 --- a/src/main/resources/assets/botania/blockstates/unstableBlock.json +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -1,15 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "botania:microblock_all", + "model": "botania:microblock_all_tinted", "textures": { "all": "botania:blocks/unstableBlock" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock.json b/src/main/resources/assets/botania/models/block/microblock.json new file mode 100644 index 000000000..e4ae95d3b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/microblock.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#top" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#top", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#bottom", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#north", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#south", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#west", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#east", "uv": [ 4, 4, 12, 12 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock_all.json b/src/main/resources/assets/botania/models/block/microblock_all_tinted.json similarity index 100% rename from src/main/resources/assets/botania/models/block/microblock_all.json rename to src/main/resources/assets/botania/models/block/microblock_all_tinted.json diff --git a/src/main/resources/assets/botania/models/block/miniblock_all.json b/src/main/resources/assets/botania/models/block/miniblock_all.json new file mode 100644 index 000000000..78ea55b41 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_all.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json new file mode 100644 index 000000000..cda6e04b8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_top.json b/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json similarity index 100% rename from src/main/resources/assets/botania/models/block/miniblock_top.json rename to src/main/resources/assets/botania/models/block/miniblock_top_tinted.json diff --git a/src/main/resources/assets/botania/models/item/crystalBow.json b/src/main/resources/assets/botania/models/item/crystalBow.json new file mode 100644 index 000000000..e76376fa3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow0" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json new file mode 100644 index 000000000..2e13b0c39 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow1" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json new file mode 100644 index 000000000..2b2289c0e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow2" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json new file mode 100644 index 000000000..dcc6f9644 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow3" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json new file mode 100644 index 000000000..860caf32f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow4" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json new file mode 100644 index 000000000..35e5b8261 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow5" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dye.json b/src/main/resources/assets/botania/models/item/dye.json new file mode 100644 index 000000000..fc07382cb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dye.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/dye" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fertilizer.json b/src/main/resources/assets/botania/models/item/fertilizer.json new file mode 100644 index 000000000..b127789a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fertilizer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/fertilizer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flowerBag.json b/src/main/resources/assets/botania/models/item/flowerBag.json new file mode 100644 index 000000000..6e2f4268d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flowerBag.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flowerBag" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow.json b/src/main/resources/assets/botania/models/item/livingwoodBow.json new file mode 100644 index 000000000..3219461c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow0" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json new file mode 100644 index 000000000..498e2a420 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow1" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json new file mode 100644 index 000000000..97ac582f0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow2" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json new file mode 100644 index 000000000..46781e351 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow3" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/obedienceStick.json b/src/main/resources/assets/botania/models/item/obedienceStick.json new file mode 100644 index 000000000..bf67175e8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/obedienceStick.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/obedienceStick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/petal.json b/src/main/resources/assets/botania/models/item/petal.json new file mode 100644 index 000000000..923c5d36e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/petal.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_air.json b/src/main/resources/assets/botania/models/item/rune_air.json new file mode 100644 index 000000000..59f04d8fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_air.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_autumn.json b/src/main/resources/assets/botania/models/item/rune_autumn.json new file mode 100644 index 000000000..260c1f1d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_autumn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_earth.json b/src/main/resources/assets/botania/models/item/rune_earth.json new file mode 100644 index 000000000..49567785b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_earth.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_envy.json b/src/main/resources/assets/botania/models/item/rune_envy.json new file mode 100644 index 000000000..0f461b690 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_envy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_fire.json b/src/main/resources/assets/botania/models/item/rune_fire.json new file mode 100644 index 000000000..eda46b5d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_fire.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_gluttony.json b/src/main/resources/assets/botania/models/item/rune_gluttony.json new file mode 100644 index 000000000..f5a41cfa5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_gluttony.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_greed.json b/src/main/resources/assets/botania/models/item/rune_greed.json new file mode 100644 index 000000000..77df19feb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_greed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_lust.json b/src/main/resources/assets/botania/models/item/rune_lust.json new file mode 100644 index 000000000..ef7a6fd9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_lust.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_mana.json b/src/main/resources/assets/botania/models/item/rune_mana.json new file mode 100644 index 000000000..53aa5fb54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_mana.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_pride.json b/src/main/resources/assets/botania/models/item/rune_pride.json new file mode 100644 index 000000000..69ca1debd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_pride.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_sloth.json b/src/main/resources/assets/botania/models/item/rune_sloth.json new file mode 100644 index 000000000..e348dc95c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_sloth.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_spring.json b/src/main/resources/assets/botania/models/item/rune_spring.json new file mode 100644 index 000000000..ff835b969 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_spring.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_summer.json b/src/main/resources/assets/botania/models/item/rune_summer.json new file mode 100644 index 000000000..f63d15445 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_summer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_water.json b/src/main/resources/assets/botania/models/item/rune_water.json new file mode 100644 index 000000000..539a67aa7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_water.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_winter.json b/src/main/resources/assets/botania/models/item/rune_winter.json new file mode 100644 index 000000000..82a977e8e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_winter.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_wrath.json b/src/main/resources/assets/botania/models/item/rune_wrath.json new file mode 100644 index 000000000..0c7bfb747 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_wrath.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune13" + } +} \ No newline at end of file From 73663e8a0aa23db329dcf0ffcfc3661871cdb3ae Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 17:38:07 -0600 Subject: [PATCH 103/935] Fix rod models, made runic altar and avatar render their items --- .../client/core/handler/ModelHandler.java | 3 ++ .../client/render/tile/RenderTileAvatar.java | 26 +++------------- .../render/tile/RenderTileRuneAltar.java | 31 ++----------------- .../botania/common/block/BlockAvatar.java | 9 ++++-- .../common/item/rod/ItemTornadoRod.java | 9 +++--- .../assets/botania/models/item/fireRod.json | 2 +- .../models/item/tornadoRod_flying.json | 6 ++++ 7 files changed, 28 insertions(+), 58 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/tornadoRod_flying.json 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 de421c138..b58e4d828 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -278,6 +278,9 @@ public final class ModelHandler { registerItemModel(skyDirtRod); registerItemModel(tornadoRod); registerItemModel(terraformRod); + + registerItemModel(tornadoRod); + ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); } private static void registerManaResources() { 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 dee5f1fe7..aef5461f7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -62,29 +63,10 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { if(stack != null) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - float s = 0.4F; + float s = 0.6F; GlStateManager.scale(s, s, s); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-1.2F, -3.5F, -0.65F); - GlStateManager.rotate(20F, 0F, 0F, 1F); - -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// int renderPass = 0; -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); 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 05ffa4d13..fb6a8289f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; @@ -71,34 +72,8 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { if(stack != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.scale(2F, 2F, 2F); -// mc.getRenderItem().renderItemModel(stack); -// if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// GlStateManager.translate(1F, 1.1F, 0F); -// renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); -// GlStateManager.translate(-1F, -1.1F, 0F); -// GlStateManager.scale(2F, 2F, 2F); -// } else { -// int renderPass = 0; -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); -// } -// } + mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + } GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index f7c8b86a8..d42a2a7ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -45,7 +45,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.AVATAR); setBlockBounds(EnumFacing.Axis.Z); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); random = new Random(); } @@ -56,11 +56,14 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } @@ -87,7 +90,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { @Override public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis()); + setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); } public void setBlockBounds(EnumFacing.Axis horiz) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index dc2beeb0a..dca25e6c2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.rod; import java.util.List; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -104,10 +105,10 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } -// @Override todo 1.8 -// public IIcon getIconIndex(ItemStack par1ItemStack) { -// return isFlying(par1ItemStack) ? iconFlying : iconIdle; -// } + @Override + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { + return isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"); + } @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { diff --git a/src/main/resources/assets/botania/models/item/fireRod.json b/src/main/resources/assets/botania/models/item/fireRod.json index a51f8de14..221c33214 100644 --- a/src/main/resources/assets/botania/models/item/fireRod.json +++ b/src/main/resources/assets/botania/models/item/fireRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/fireRod" } diff --git a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json new file mode 100644 index 000000000..e175c1d1b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/tornadoRod1" + } +} \ No newline at end of file From f449fca882ca2b70de7a9344af0f69f987b7f230 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 17:41:50 -0600 Subject: [PATCH 104/935] Actually commit this time --- src/main/resources/assets/botania/models/item/dirtRod.json | 2 +- src/main/resources/assets/botania/models/item/rainbowRod.json | 2 +- src/main/resources/assets/botania/models/item/skyDirtRod.json | 2 +- src/main/resources/assets/botania/models/item/terraformRod.json | 2 +- src/main/resources/assets/botania/models/item/tornadoRod.json | 2 +- .../resources/assets/botania/models/item/tornadoRod_flying.json | 2 +- src/main/resources/assets/botania/models/item/waterRod.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/assets/botania/models/item/dirtRod.json b/src/main/resources/assets/botania/models/item/dirtRod.json index 729232b6f..7040c9163 100644 --- a/src/main/resources/assets/botania/models/item/dirtRod.json +++ b/src/main/resources/assets/botania/models/item/dirtRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/dirtRod" } diff --git a/src/main/resources/assets/botania/models/item/rainbowRod.json b/src/main/resources/assets/botania/models/item/rainbowRod.json index 3396ab1b1..69e12c3b2 100644 --- a/src/main/resources/assets/botania/models/item/rainbowRod.json +++ b/src/main/resources/assets/botania/models/item/rainbowRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/rainbowRod" } diff --git a/src/main/resources/assets/botania/models/item/skyDirtRod.json b/src/main/resources/assets/botania/models/item/skyDirtRod.json index 324642961..6a9523f1b 100644 --- a/src/main/resources/assets/botania/models/item/skyDirtRod.json +++ b/src/main/resources/assets/botania/models/item/skyDirtRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/skyDirtRod" } diff --git a/src/main/resources/assets/botania/models/item/terraformRod.json b/src/main/resources/assets/botania/models/item/terraformRod.json index 3a6978455..aad978d77 100644 --- a/src/main/resources/assets/botania/models/item/terraformRod.json +++ b/src/main/resources/assets/botania/models/item/terraformRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/terraformRod" } diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadoRod.json index 4eb2022b0..f9762ee7d 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod.json +++ b/src/main/resources/assets/botania/models/item/tornadoRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/tornadoRod0" } diff --git a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json index e175c1d1b..5a15f3a97 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json +++ b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/tornadoRod1" } diff --git a/src/main/resources/assets/botania/models/item/waterRod.json b/src/main/resources/assets/botania/models/item/waterRod.json index 1f77b36b1..ec8544bc3 100644 --- a/src/main/resources/assets/botania/models/item/waterRod.json +++ b/src/main/resources/assets/botania/models/item/waterRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/waterRod" } From 794e1352e8abb692ca1bf2a9aea7fe10df7a4d60 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 20:00:34 -0600 Subject: [PATCH 105/935] Lenses and lens rendering on spreader --- .../vazkii/botania/client/core/handler/ModelHandler.java | 9 +++++++++ .../botania/client/render/tile/RenderTileSpreader.java | 5 +++-- .../resources/assets/botania/models/item/lensBounce.json | 7 +++++++ .../resources/assets/botania/models/item/lensDamage.json | 7 +++++++ .../assets/botania/models/item/lensEfficiency.json | 7 +++++++ .../assets/botania/models/item/lensExplosive.json | 7 +++++++ .../resources/assets/botania/models/item/lensFire.json | 7 +++++++ .../assets/botania/models/item/lensFirework.json | 7 +++++++ .../resources/assets/botania/models/item/lensFlare.json | 7 +++++++ .../assets/botania/models/item/lensGravity.json | 7 +++++++ .../assets/botania/models/item/lensInfluence.json | 7 +++++++ .../resources/assets/botania/models/item/lensLight.json | 7 +++++++ .../resources/assets/botania/models/item/lensMagnet.json | 7 +++++++ .../resources/assets/botania/models/item/lensMine.json | 7 +++++++ .../resources/assets/botania/models/item/lensNormal.json | 7 +++++++ .../resources/assets/botania/models/item/lensPaint.json | 7 +++++++ .../assets/botania/models/item/lensPhantom.json | 7 +++++++ .../resources/assets/botania/models/item/lensPiston.json | 7 +++++++ .../resources/assets/botania/models/item/lensPower.json | 7 +++++++ .../assets/botania/models/item/lensRedirect.json | 7 +++++++ .../resources/assets/botania/models/item/lensSpeed.json | 7 +++++++ .../resources/assets/botania/models/item/lensTime.json | 7 +++++++ .../resources/assets/botania/models/item/lensWarp.json | 7 +++++++ .../resources/assets/botania/models/item/lensWeight.json | 7 +++++++ .../resources/assets/botania/models/item/manaCookie.json | 6 ++++++ 25 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/lensBounce.json create mode 100644 src/main/resources/assets/botania/models/item/lensDamage.json create mode 100644 src/main/resources/assets/botania/models/item/lensEfficiency.json create mode 100644 src/main/resources/assets/botania/models/item/lensExplosive.json create mode 100644 src/main/resources/assets/botania/models/item/lensFire.json create mode 100644 src/main/resources/assets/botania/models/item/lensFirework.json create mode 100644 src/main/resources/assets/botania/models/item/lensFlare.json create mode 100644 src/main/resources/assets/botania/models/item/lensGravity.json create mode 100644 src/main/resources/assets/botania/models/item/lensInfluence.json create mode 100644 src/main/resources/assets/botania/models/item/lensLight.json create mode 100644 src/main/resources/assets/botania/models/item/lensMagnet.json create mode 100644 src/main/resources/assets/botania/models/item/lensMine.json create mode 100644 src/main/resources/assets/botania/models/item/lensNormal.json create mode 100644 src/main/resources/assets/botania/models/item/lensPaint.json create mode 100644 src/main/resources/assets/botania/models/item/lensPhantom.json create mode 100644 src/main/resources/assets/botania/models/item/lensPiston.json create mode 100644 src/main/resources/assets/botania/models/item/lensPower.json create mode 100644 src/main/resources/assets/botania/models/item/lensRedirect.json create mode 100644 src/main/resources/assets/botania/models/item/lensSpeed.json create mode 100644 src/main/resources/assets/botania/models/item/lensTime.json create mode 100644 src/main/resources/assets/botania/models/item/lensWarp.json create mode 100644 src/main/resources/assets/botania/models/item/lensWeight.json create mode 100644 src/main/resources/assets/botania/models/item/manaCookie.json 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 b58e4d828..cfa72a1a9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -118,6 +118,7 @@ public final class ModelHandler { registerDyesPetals(); registerRunes(); registerBows(); + registerLens(); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); @@ -332,6 +333,14 @@ public final class ModelHandler { registerItemModel(crystalBow); } + private static void registerLens() { + int counter = 0; + for (String s : LibItemNames.LENS_NAMES) { + ModelLoader.registerItemVariants(lens, new ModelResourceLocation("botania:" + s, "inventory")); + ModelLoader.setCustomModelResourceLocation(lens, counter++, new ModelResourceLocation("botania:" + s, "inventory")); + } + } + private static void registerStateMappers() { // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 6eba216f2..13211e78f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -88,9 +89,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); - GlStateManager.translate(-0.4F, -1.4F, -0.4375F); + GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.FIXED); GlStateManager.popMatrix(); } diff --git a/src/main/resources/assets/botania/models/item/lensBounce.json b/src/main/resources/assets/botania/models/item/lensBounce.json new file mode 100644 index 000000000..ed9ae6661 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensBounce.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensBounce" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensDamage.json b/src/main/resources/assets/botania/models/item/lensDamage.json new file mode 100644 index 000000000..9c80b203c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensDamage.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensDamage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensEfficiency.json b/src/main/resources/assets/botania/models/item/lensEfficiency.json new file mode 100644 index 000000000..05a0e9289 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensEfficiency.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensEfficiency" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensExplosive.json b/src/main/resources/assets/botania/models/item/lensExplosive.json new file mode 100644 index 000000000..c3f3f92fe --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensExplosive.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensExplosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFire.json b/src/main/resources/assets/botania/models/item/lensFire.json new file mode 100644 index 000000000..9ceb71a00 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFire.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFirework.json b/src/main/resources/assets/botania/models/item/lensFirework.json new file mode 100644 index 000000000..27e65fcfc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFirework.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFirework" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFlare.json b/src/main/resources/assets/botania/models/item/lensFlare.json new file mode 100644 index 000000000..ede00f6d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensFlare.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensFlare" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensGravity.json b/src/main/resources/assets/botania/models/item/lensGravity.json new file mode 100644 index 000000000..b9992069b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensGravity.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensGravity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensInfluence.json b/src/main/resources/assets/botania/models/item/lensInfluence.json new file mode 100644 index 000000000..ce2d0179b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensInfluence.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensInfluence" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensLight.json b/src/main/resources/assets/botania/models/item/lensLight.json new file mode 100644 index 000000000..a562f7de0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensLight.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensLight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMagnet.json b/src/main/resources/assets/botania/models/item/lensMagnet.json new file mode 100644 index 000000000..8ac4bf04e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensMagnet.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensMagnet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMine.json b/src/main/resources/assets/botania/models/item/lensMine.json new file mode 100644 index 000000000..de6d48b65 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensMine.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensMine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensNormal.json b/src/main/resources/assets/botania/models/item/lensNormal.json new file mode 100644 index 000000000..b7268d5a2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensNormal.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensNormal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPaint.json b/src/main/resources/assets/botania/models/item/lensPaint.json new file mode 100644 index 000000000..bae6b2002 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPaint.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPaint" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPhantom.json b/src/main/resources/assets/botania/models/item/lensPhantom.json new file mode 100644 index 000000000..370f8095e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPhantom.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPhantom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPiston.json b/src/main/resources/assets/botania/models/item/lensPiston.json new file mode 100644 index 000000000..2a0995932 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPiston.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPiston" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPower.json b/src/main/resources/assets/botania/models/item/lensPower.json new file mode 100644 index 000000000..885049b94 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensPower.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensPower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensRedirect.json b/src/main/resources/assets/botania/models/item/lensRedirect.json new file mode 100644 index 000000000..2680ada51 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensRedirect.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensRedirect" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensSpeed.json b/src/main/resources/assets/botania/models/item/lensSpeed.json new file mode 100644 index 000000000..311ec4308 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensSpeed.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensSpeed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensTime.json b/src/main/resources/assets/botania/models/item/lensTime.json new file mode 100644 index 000000000..63d78ca3b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensTime.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensTime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWarp.json b/src/main/resources/assets/botania/models/item/lensWarp.json new file mode 100644 index 000000000..4f3806e50 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensWarp.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensWarp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWeight.json b/src/main/resources/assets/botania/models/item/lensWeight.json new file mode 100644 index 000000000..1889ddcde --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensWeight.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensWeight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manaCookie.json new file mode 100644 index 000000000..aa65e47b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaCookie.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaCookie" + } +} \ No newline at end of file From d1c309f8ae08005cea3627c3f5dd42df2daf3b88 Mon Sep 17 00:00:00 2001 From: Katrix- Date: Sun, 27 Dec 2015 03:44:40 +0100 Subject: [PATCH 106/935] UUID for relics Maybe better name for a few uuid methods? --- .../java/vazkii/botania/api/item/IRelic.java | 18 +++++ .../crafting/recipe/AesirRingRecipe.java | 29 ++++++-- .../common/entity/EntityDoppleganger.java | 9 +-- .../botania/common/item/relic/ItemRelic.java | 71 ++++++++++++++++++- .../common/item/relic/ItemRelicBauble.java | 16 +++++ 5 files changed, 132 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index aecd1cde4..80427d6e6 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -10,6 +10,8 @@ */ package vazkii.botania.api.item; +import java.util.UUID; + import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -22,6 +24,7 @@ public interface IRelic { /** * Binds to the player name passed in. */ + @Deprecated public void bindToUsername(String playerName, ItemStack stack); /** @@ -29,6 +32,21 @@ public interface IRelic { */ public String getSoulbindUsername(ItemStack stack); + /** + * Binds to the UUID passed in. + */ + public void bindToUUID(UUID uuid, ItemStack stack); + + /** + * Gets the UUID of the person this relic is bound to. + */ + public UUID getSoulbindUUID(ItemStack stack); + + /** + * Checks if the relic is using UUIDs. + */ + public boolean hasUUID(ItemStack stack); + /** * Sets the achievement that this relic binds to. */ diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 5f784a685..70fe742a0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.crafting.recipe; +import java.util.UUID; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -44,22 +46,37 @@ public class AesirRingRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting var1) { String soulbind = null; + UUID soulbindUUID = null; + boolean hasUUID = false; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { if(stack.getItem() instanceof IRelic) { - String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); - if(soulbind == null) - soulbind = bind; - else if(!soulbind.equals(bind)) - return null; + if(((IRelic) stack.getItem()).hasUUID(stack)) { + hasUUID = true; + UUID bindUUID = ((IRelic) stack.getItem()).getSoulbindUUID(stack); + if(soulbindUUID == null) + soulbindUUID = bindUUID; + else if(!soulbindUUID.equals(bindUUID)) + return null; + } + else { + String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); + if(soulbind == null) + soulbind = bind; + else if(!soulbind.equals(bind)) + return null; + } } else return null; } } ItemStack stack = new ItemStack(ModItems.aesirRing); - ((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack); + if(hasUUID) + ((IRelic) ModItems.aesirRing).bindToUUID(soulbindUUID, stack); + else + ((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack); return stack; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c8ee07597..ac0db96e6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -14,6 +14,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.UUID; import java.util.regex.Pattern; import net.minecraft.block.Block; @@ -110,7 +111,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList(); private static boolean isPlayingMusic = false; @@ -364,8 +365,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getCommandSenderName())) - playersWhoAttacked.add(player.getCommandSenderName()); + if(!playersWhoAttacked.contains(player.getUniqueID())) + playersWhoAttacked.add(player.getUniqueID()); float dmg = par2; boolean crit = false; @@ -452,7 +453,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); if(ConfigHandler.relicsEnabled) { ItemStack dice = new ItemStack(ModItems.dice); - ItemRelic.bindToUsernameS(playersWhoAttacked.get(pl), dice); + ItemRelic.bindToUUIDS(playersWhoAttacked.get(pl), dice); entityDropItem(dice, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 0285c8f7a..2c6a88ff6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,17 +11,20 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.common.UsernameCache; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -30,7 +33,9 @@ import vazkii.botania.common.item.ModItems; public class ItemRelic extends ItemMod implements IRelic { + @Deprecated private static final String TAG_SOULBIND = "soulbind"; + private static final String TAG_SOULBIND_UUID = "soulbindUUID"; Achievement achievement; @@ -87,13 +92,25 @@ public class ItemRelic extends ItemMod implements IRelic { } public static String getSoulbindUsernameS(ItemStack stack) { + if(hasUUIDS(stack)) + return UsernameCache.getLastKnownUsername(getSoulbindUUIDS(stack)); return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); } + //TODO: Better name? + public static UUID getSoulbindUUIDS(ItemStack stack) { + if(hasUUIDS(stack)) + return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); + return null; + } + public static void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; + if(!hasUUIDS(stack) && isRightPlayer(player.getCommandSenderName(), stack)) + bindToPlayer(player, stack); + String soulbind = getSoulbindUsernameS(stack); if(soulbind.isEmpty()) { player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); @@ -106,14 +123,22 @@ public class ItemRelic extends ItemMod implements IRelic { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUsernameS(player.getCommandSenderName(), stack); + bindToUUIDS(player.getUniqueID(), stack); } + @Deprecated public static void bindToUsernameS(String username, ItemStack stack) { ItemNBTHelper.setString(stack, TAG_SOULBIND, username); } + //TODO: Better name? + public static void bindToUUIDS(UUID uuid, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); + } + public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { + if(hasUUIDS(stack)) + return isRightPlayer(player.getUniqueID(), stack); return isRightPlayer(player.getCommandSenderName(), stack); } @@ -121,11 +146,40 @@ public class ItemRelic extends ItemMod implements IRelic { return getSoulbindUsernameS(stack).equals(player); } + public static boolean isRightPlayer(UUID uuid, ItemStack stack) { + return getSoulbindUUIDS(stack).equals(uuid); + } + public static DamageSource damageSource() { return new DamageSource("botania-relic"); } + //TODO: Better name? + public static boolean hasUUIDS(ItemStack stack) { + return ItemNBTHelper.verifyExistance(stack, TAG_SOULBIND_UUID); + } + + public static UUID usernameToUUID(String username) { + return getPlayerByName(username).getUniqueID(); + } + + public static EntityPlayer getPlayerByName(String username) { + if(username.isEmpty()) + return null; + + List playerList = MinecraftServer.getServer().getConfigurationManager().playerEntityList; + for(int i = 0; i < playerList.size(); i++) { + + EntityPlayer player = playerList.get(i); + if(player.getCommandSenderName().equals(username)) + return player; + } + + return null; + } + @Override + @Deprecated public void bindToUsername(String playerName, ItemStack stack) { bindToUsernameS(playerName, stack); } @@ -135,6 +189,21 @@ public class ItemRelic extends ItemMod implements IRelic { return getSoulbindUsernameS(stack); } + @Override + public void bindToUUID(UUID uuid, ItemStack stack) { + bindToUUIDS(uuid, stack); + } + + @Override + public UUID getSoulbindUUID(ItemStack stack) { + return getSoulbindUUIDS(stack); + } + + @Override + public boolean hasUUID(ItemStack stack) { + return hasUUIDS(stack); + } + @Override public Achievement getBindAchievement() { return achievement; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 6d735743b..ebf0e0586 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -73,6 +74,21 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { return ItemRelic.getSoulbindUsernameS(stack); } + @Override + public void bindToUUID(UUID uuid, ItemStack stack) { + ItemRelic.bindToUUIDS(uuid, stack); + } + + @Override + public UUID getSoulbindUUID(ItemStack stack) { + return ItemRelic.getSoulbindUUIDS(stack); + } + + @Override + public boolean hasUUID(ItemStack stack) { + return ItemRelic.hasUUIDS(stack); + } + @Override public Achievement getBindAchievement() { return achievement; From 781f586d1986a74a84dd076ff7d97c1a0d596249 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 21:55:32 -0600 Subject: [PATCH 107/935] Upload some files so I can use modelcreator in windows >.> --- altar | 12 +++++ .../client/render/tile/RenderTileAltar.java | 15 +----- .../botania/models/block/petalApothecary.json | 47 ++++++++++++++++++ .../assets/botania/textures/model/altar.png | Bin 2683 -> 4243 bytes .../botania/textures/model/altarCopy.png | Bin 0 -> 2683 bytes 5 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 altar create mode 100644 src/main/resources/assets/botania/models/block/petalApothecary.json create mode 100644 src/main/resources/assets/botania/textures/model/altarCopy.png diff --git a/altar b/altar new file mode 100644 index 000000000..d11cb75ae --- /dev/null +++ b/altar @@ -0,0 +1,12 @@ +altar +up-down +west-south-east-north + +base textures pillar tex + + + + northsouth face cup (1 always faces south) + eastwest face cup (blue always faces east) + cupbase 2 + cubbase \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 6f707b3ad..c739e8702 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -122,19 +123,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// IIcon icon = stack.getItem().getIcon(stack, 0); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } - + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } diff --git a/src/main/resources/assets/botania/models/block/petalApothecary.json b/src/main/resources/assets/botania/models/block/petalApothecary.json new file mode 100644 index 000000000..0d731159b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/petalApothecary.json @@ -0,0 +1,47 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Base 1", + "from": [ 0, 0, 0 ], + "to": [ 16, 1, 0 ], + "faces": { + "down": { "texture": "#all", "uv": [ 16, 0, 31, 15 ], "cullface": "down" }, + "up": { "texture": "#all", "uv": [ 32, 0, 47, 15 ] }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] } + } + }, + { + "name": "Base 2" + }, + { + "name": "Base 3" + }, + { + "name": "Column" + }, + { + "name": "Cup Base 1" + }, + { + "name": "Cup Base 2" + }, + { + "name": "Cup North" + }, + { + "name": "Cup South" + }, + { + "name": "Cup West" + }, + { + "name": "Cup East" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar.png index 45d22bdd62b271e6b407fca8902422257d454dd6..ac67fe3ef9ad265d0eb8e62a069b47b34bc352e7 100644 GIT binary patch literal 4243 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 literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% diff --git a/src/main/resources/assets/botania/textures/model/altarCopy.png b/src/main/resources/assets/botania/textures/model/altarCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..45d22bdd62b271e6b407fca8902422257d454dd6 GIT binary patch literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% literal 0 HcmV?d00001 From 7c41ffcaa170c8acd71ec65d903f6e6b1b4c0d25 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 00:26:41 -0600 Subject: [PATCH 108/935] Destitched model files --- altar | 4 +++- .../textures/model/altar/base/gobletBase.png | Bin 0 -> 798 bytes .../textures/model/altar/base/gobletBase2.png | Bin 0 -> 696 bytes .../textures/model/altar/base/gobletBase3.png | Bin 0 -> 632 bytes .../textures/model/altar/base/gobletStand.png | Bin 0 -> 468 bytes .../textures/model/altar/base/kelkBase.png | Bin 0 -> 471 bytes .../textures/model/altar/base/kelkBase2.png | Bin 0 -> 726 bytes .../textures/model/altar/base/kelkWallNS.png | Bin 0 -> 402 bytes .../textures/model/altar/base/kelkWallWE.png | Bin 0 -> 402 bytes .../textures/model/altar/meta0/gobletBase.png | Bin 0 -> 687 bytes .../textures/model/altar/meta0/gobletBase2.png | Bin 0 -> 612 bytes .../textures/model/altar/meta0/gobletBase3.png | Bin 0 -> 546 bytes .../textures/model/altar/meta0/gobletStand.png | Bin 0 -> 411 bytes .../textures/model/altar/meta0/kelkBase.png | Bin 0 -> 387 bytes .../textures/model/altar/meta0/kelkBase2.png | Bin 0 -> 578 bytes .../textures/model/altar/meta0/kelkWallNS.png | Bin 0 -> 366 bytes .../textures/model/altar/meta0/kelkWallWE.png | Bin 0 -> 366 bytes .../textures/model/altar/meta0/wtfisthis.png | Bin 0 -> 625 bytes .../textures/model/altar/meta1/gobletBase.png | Bin 0 -> 684 bytes .../textures/model/altar/meta1/gobletBase2.png | Bin 0 -> 611 bytes .../textures/model/altar/meta1/gobletBase3.png | Bin 0 -> 545 bytes .../textures/model/altar/meta1/gobletStand.png | Bin 0 -> 414 bytes .../textures/model/altar/meta1/kelkBase.png | Bin 0 -> 387 bytes .../textures/model/altar/meta1/kelkBase2.png | Bin 0 -> 575 bytes .../textures/model/altar/meta1/kelkWallNS.png | Bin 0 -> 364 bytes .../textures/model/altar/meta1/kelkWallWE.png | Bin 0 -> 364 bytes .../textures/model/altar/meta1/wtfisthis.png | Bin 0 -> 499 bytes .../textures/model/altar/meta2/gobletBase.png | Bin 0 -> 670 bytes .../textures/model/altar/meta2/gobletBase2.png | Bin 0 -> 603 bytes .../textures/model/altar/meta2/gobletBase3.png | Bin 0 -> 541 bytes .../textures/model/altar/meta2/gobletStand.png | Bin 0 -> 413 bytes .../textures/model/altar/meta2/kelkBase.png | Bin 0 -> 376 bytes .../textures/model/altar/meta2/kelkBase2.png | Bin 0 -> 568 bytes .../textures/model/altar/meta2/kelkWallNS.png | Bin 0 -> 358 bytes .../textures/model/altar/meta2/kelkWallWE.png | Bin 0 -> 358 bytes .../textures/model/altar/meta2/wtfisthis.png | Bin 0 -> 607 bytes .../textures/model/altar/meta3/gobletBase.png | Bin 0 -> 689 bytes .../textures/model/altar/meta3/gobletBase2.png | Bin 0 -> 625 bytes .../textures/model/altar/meta3/gobletBase3.png | Bin 0 -> 557 bytes .../textures/model/altar/meta3/gobletStand.png | Bin 0 -> 420 bytes .../textures/model/altar/meta3/kelkBase.png | Bin 0 -> 389 bytes .../textures/model/altar/meta3/kelkBase2.png | Bin 0 -> 578 bytes .../textures/model/altar/meta3/kelkWallNS.png | Bin 0 -> 366 bytes .../textures/model/altar/meta3/kelkWallWE.png | Bin 0 -> 366 bytes .../textures/model/altar/meta3/wtfisthis.png | Bin 0 -> 626 bytes .../textures/model/altar/meta4/gobletBase.png | Bin 0 -> 653 bytes .../textures/model/altar/meta4/gobletBase2.png | Bin 0 -> 595 bytes .../textures/model/altar/meta4/gobletBase3.png | Bin 0 -> 527 bytes .../textures/model/altar/meta4/gobletStand.png | Bin 0 -> 400 bytes .../textures/model/altar/meta4/kelkBase.png | Bin 0 -> 374 bytes .../textures/model/altar/meta4/kelkBase2.png | Bin 0 -> 555 bytes .../textures/model/altar/meta4/kelkWallNS.png | Bin 0 -> 347 bytes .../textures/model/altar/meta4/kelkWallWE.png | Bin 0 -> 347 bytes .../textures/model/altar/meta4/wtfisthis.png | Bin 0 -> 633 bytes .../textures/model/altar/meta5/gobletBase.png | Bin 0 -> 733 bytes .../textures/model/altar/meta5/gobletBase2.png | Bin 0 -> 664 bytes .../textures/model/altar/meta5/gobletBase3.png | Bin 0 -> 591 bytes .../textures/model/altar/meta5/gobletStand.png | Bin 0 -> 449 bytes .../textures/model/altar/meta5/kelkBase.png | Bin 0 -> 412 bytes .../textures/model/altar/meta5/kelkBase2.png | Bin 0 -> 617 bytes .../textures/model/altar/meta5/kelkWallNS.png | Bin 0 -> 387 bytes .../textures/model/altar/meta5/kelkWallWE.png | Bin 0 -> 387 bytes .../textures/model/altar/meta5/wtfisthis.png | Bin 0 -> 787 bytes .../textures/model/altar/meta6/gobletBase.png | Bin 0 -> 745 bytes .../textures/model/altar/meta6/gobletBase2.png | Bin 0 -> 666 bytes .../textures/model/altar/meta6/gobletBase3.png | Bin 0 -> 596 bytes .../textures/model/altar/meta6/gobletStand.png | Bin 0 -> 453 bytes .../textures/model/altar/meta6/kelkBase.png | Bin 0 -> 413 bytes .../textures/model/altar/meta6/kelkBase2.png | Bin 0 -> 629 bytes .../textures/model/altar/meta6/kelkWallNS.png | Bin 0 -> 395 bytes .../textures/model/altar/meta6/kelkWallWE.png | Bin 0 -> 395 bytes .../textures/model/altar/meta6/wtfisthis.png | Bin 0 -> 757 bytes .../textures/model/altar/meta7/gobletBase.png | Bin 0 -> 694 bytes .../textures/model/altar/meta7/gobletBase2.png | Bin 0 -> 632 bytes .../textures/model/altar/meta7/gobletBase3.png | Bin 0 -> 581 bytes .../textures/model/altar/meta7/gobletStand.png | Bin 0 -> 422 bytes .../textures/model/altar/meta7/kelkBase.png | Bin 0 -> 403 bytes .../textures/model/altar/meta7/kelkBase2.png | Bin 0 -> 593 bytes .../textures/model/altar/meta7/kelkWallNS.png | Bin 0 -> 372 bytes .../textures/model/altar/meta7/kelkWallWE.png | Bin 0 -> 372 bytes .../textures/model/altar/meta7/wtfisthis.png | Bin 0 -> 667 bytes .../textures/model/altar/mossy/gobletBase.png | Bin 0 -> 1011 bytes .../textures/model/altar/mossy/gobletBase2.png | Bin 0 -> 904 bytes .../textures/model/altar/mossy/gobletBase3.png | Bin 0 -> 791 bytes .../textures/model/altar/mossy/gobletStand.png | Bin 0 -> 586 bytes .../textures/model/altar/mossy/kelkBase.png | Bin 0 -> 471 bytes .../textures/model/altar/mossy/kelkBase2.png | Bin 0 -> 769 bytes .../textures/model/altar/mossy/kelkWallNS.png | Bin 0 -> 518 bytes .../textures/model/altar/mossy/kelkWallWE.png | Bin 0 -> 518 bytes .../assets/botania/textures/model/altarCopy.png | Bin 2683 -> 0 bytes 90 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta3/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta6/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altarCopy.png diff --git a/altar b/altar index d11cb75ae..cc58dfb12 100644 --- a/altar +++ b/altar @@ -9,4 +9,6 @@ base textures pillar tex northsouth face cup (1 always faces south) eastwest face cup (blue always faces east) cupbase 2 - cubbase \ No newline at end of file + cubbase + + water-lava texture simply one level below top of cup \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..bbcc942a1fa99b151affda6f4f28a8d32fb4f0ac GIT binary patch literal 798 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?}D!T^vI)oS#mQ^?v0jaO`*7C3l0aE2pkId9AJSe5<7B%>C7AZ@{9{ zcCTdW4)=+?v6P8PYL=}i_;1W-_t<#z?*GjJ)%Eq$-*?JO znb$18yz-b>ck7-#d*1BZoWF0e;CZ*j6DKt#?7u&K_H1d*sa{4BJV%lqe~fs1{`~n* zzkX@$jq_KV+$knB>wU%%<6x$uyLsW~&Yxczq4R3*c1e_}C^p4=KrlnTXeOa zeXg9F&*l0Rtp8@uzP)>2&T%rBep=HrxbqN0YhmX?g(&%{&Y!`Wy`(ocJI@Pq)eYwS zy5>TEKmXn>F{v_C#e!v<``gk-n%>()&%aosS}@bH}L6aL=z<~`aD zRQ)?zZSus&kCXRKmY0+BGMjz%+b`aK^Z)7E@fQ>ve$MQ)th*DGy4Qv8*>%t(dEM@U;(TT)Ni>tKcRysh19X{}?PAbe4JBuPFm2Uj|QC KKbLh*2~7YU(RZc* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..6b09c1aaded58d305739624b9f5032531c736c1a GIT binary patch literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7??CYT^vIq+@FS>>~eDC`Lh3rzkta1Siw8rpDtMNsHrM|zpLU)uyM$X zX>PX~TP%4Z0&bK{o<3#jmug1cYp+dZ`Pi-IpTF|{yXIWKV6)jvk0v>O%h?(gxclxh zzva%?Ur%j2{P4ApRQjbZN0P8`XUpRmkDx{+&UGv-SQoe6_^p&*^1j6vHMU#C?7RP7 z-+gJJ+FA*_i+WcJ(nXK3wmk~WS$*}9X-v=2BpsIQj%&weZb|y#vODDPxmRVoQ{BJ+ zw(XYgKW=khp#59x>`s@aXqog|7L&tx=4VXLx>0%eZJEtx4Kum^;)9o8PT6%=kGo~Z z!Gr@X7I5cYSd|gK#aPd%!{PQJ%QuU2A1)F7Q(=>_`DQ_PHq5PziUn-%v(98`O-(ZV zan!YaW|{2qTmKkm!R%RJAmF;VHdp)cr9)>9d5Y|d(Tn8R_r>5l!Xc4Id%{+SYE3_F zBGnraqBs4whMP1n+#d?R4dS(4J=LqVyImqCYewpx-GN^|R-|lHU`c$p6&euC2NNbJ zP2{Lw-0q~v)qePo-9P@{^&iiaAAJ8MuTFUH?EB7Ke;Ama^`@_KIl}}@SPY)7elF{r G5}E+O95iSE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..4762be540ba879ffb1c736fb82cd0ca2bcf13a39 GIT binary patch literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhQ9Q4aSVxYe>&~tsw77Nm%sWSg;|bPhOs=ajL=wNu|V%g?~ZT5n>&|y z)vV8+=$J3X!?8z%G4lADHPy;%*qR%CmIuEqvAXpB`_iD5C*GD#ep;lt`|i8F|0--s z=APYcl-7B|e&)3dlS^lrRA!%D^>NSr_o68qBTl^jI_dY{bqzW9rW$Iq9GxMS@E~d9 zkFtdU6HY%}G*_cOY!VxMp2m@SQ4e>%r3 zct_C6FXAEyxosCSG*}iC>`YwtabolAKUI6ROwK?Ztb8#eM5wc+Zu9XZ!_MQ6f7Shy uzot9$zQda4?)y(3JTkZ3@xyl73HkH!OWWse;MfC97!01SelF{r5}E)_M=2fv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png new file mode 100644 index 0000000000000000000000000000000000000000..a3cdcfcb4562a6ce87ba718c3a054d59fad37ca2 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp{|}Tjv*f2dqWPcYBmr!WBxT@Wt2<47)!Qj)wHPS+@V|6uRd$p z!N(sPUhgt^S$vz#>auC?0^irWj#>1*_${~nHm~QT4Kw}b-!{82b6qCOQJ;7VU*WdI z1J6Gv7K030U>tk7L!&DoRP^0<>*IGzW#@1Age&$Ee_OQkK%q=ZWZU1m^M$X!?964J z`*PN)&o+Huzg9i0u-U}un&UmaZBmz5aErI{RgsOlu~J@I_rLF-EYHV2Z%$V9E|V!C zTO!Q%-Opc_`{Gi-r1uRy>vE&*f~A2HfA}2EcdDKLJV$-|Qg3HZ(KbbQck^klQj0*k zo`e_J&Hwq`>wWdjBh&PFRkuFUUnyGezQVq1y4ca?uC%GZKxgoD^>bP0l+XkK!i2)t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd2e951646db2b0112f841c14e715f883729099 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp&p(tjv*f2M<+RUHyenw{GM$SqT#X7ywxdFQ-o`G_f?f+Qjb@KMpWti zy}8*fY2k#>69;8yoaU)HS$#6e%Td7L=I1@;{69n18-5ECI9|Bn_S+3{>mUBEO^(r91x#E6!*^_yGCi-jN+@;a_w!Sh z?s*(~V#N`rAMw(MEpvIEZ!w&6`B;G;gkvnWpE2szL!QMh4Zv_`@O1TaS?83{1OSYV B!8-r| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..a1c645f0c8304b68fd67f5fc62ed7860d78500c7 GIT binary patch literal 726 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?|8WT^vIq+@DT6x$04XKwGWa_k9i3u7Vf6XP--X7SnFwze2-LW7l`b z|JkCJ3FhpRT&phrINTqg+5PJkkEh;Rnd1i^e{5K_>PC)P#QN(QCQ=)6rLSg*ZjIvI zwN5!VF2*d7;or*O?pby1T2sB=C~(~P67xr{-<^kzc^kvMyzM*g=Iw}EKSzAJ@02w! zb>>EG*~Fr9p!=xO?^=N`b3U~lR&-k|ShZJ9Ybw{d=f<-ibsuf|{Ag3>B-6P|gS!uK zcpVVuV%;XeMc-6L!WN`d%x?@f2pFn4`dz-va;I%zY;(9)E1O{>RIbNB=JzHJ|HeIQwjcc>u`o zo0e@Z$#M-m62PL}rtsh-i|aC*qMb3%7%wbUPbz7@aQDM~zJ_yK8iXFOxE3~9$?)-b z<+Ct}KG^csraQb2I0)zBh3A zJ-zc@xp?F217NswW`By;epjwkQpHxXl=t+d1=dzN z_AQw!H-rketvtB-?sfJntJ7{broGru%j=QK9^<0t+ygcN=_WAjCG2Qb+&c)I$ztaD0e F0sx|KN4Nk0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..f64010f7956ecad1e6b70d5d15881688fb1cb286 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq0F8xjv*f2dnb9Hc5{$ud!9Zi#hH)$IjiDRfkiGy?(y&4pZ4l@#ue+? zf!CkC`gZ4;VT;}Q&k8)wKlb&%-nHSq^{#c!GRF;kg?Ft>o|pb-)?#DEKP;S04Bu-H zZ_Dj@+>t1eAi<^`7%Dnz*}>A-j%W8=;{|?Q+Odco+MH^>>4b?@cM$=Ljr9uDz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..f64010f7956ecad1e6b70d5d15881688fb1cb286 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq0F8xjv*f2dnb9Hc5{$ud!9Zi#hH)$IjiDRfkiGy?(y&4pZ4l@#ue+? zf!CkC`gZ4;VT;}Q&k8)wKlb&%-nHSq^{#c!GRF;kg?Ft>o|pb-)?#DEKP;S04Bu-H zZ_Dj@+>t1eAi<^`7%Dnz*}>A-j%W8=;{|?Q+Odco+MH^>>4b?@cM$=Ljr9uDz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..95f00c3c8e96629859270712034ffe29bd9ae5ad GIT binary patch literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?>11T^vI)oS#mQ_GWhEY5lG9t!{Hxw1}%~V2B9o|Nr-+o_iNxtCgtD z&`|bKIFqw!FPwe;u3@^rKE&z|oP1mQR&o|h-{m*Enxo8oF({x|ICKJvF4(QOqgrev zo4DI=HK)hAO>Q7RKVS-2^QTMLBFW-XeWyc3$vwkUtOYw5EiQC8^vI^~TQB@3-#*Ky zrr@68xBh>hPW(Igp#N6g-JAd0e=){)e|^sD@xJc%m4EhE_FVdQ&MBb@07r~2b^rhX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..a494442715d0cbc0ec08a4bb3128ebe34929f595 GIT binary patch literal 612 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhFy$Zo7s`a^|#KpZ@ahM5_1g<6cKej`2YX*W41R_Vx3&n z_Ho4Rc=JZj(DL5QFm}ngHu|T2C92)4mzjQf`qDM#{+}<^Z?Bv){pi;nYx0&q%9*=u zZJ6d$_vJ?#cz6$dN()++zSziCzVz_tK2w2;-@8O6fK{-(nLBCeVNnLgmj`v$MK#>L zy~_LM0i)7e+oA+FlzS~XKH>H6NbaP(1fEOzh3jrwjad`8yol7ll^0T&Vbx?o3 zC3mY*!uu(2)-X9NQsI_4FL|S(f#KM_RG0)08$(d?jl2iDzsWG4u+8?ij9#9*T9mPR z`H_Sr8kwfguQ+)4UAk(VcVPGT^>62`yu9sdSHs@mO({QiB~{$s#B^!N>D_gY*1Q#; z0GD!n%M(4RCd1Ie(`(V$vT4=ls*C5Zh3ZrCY-``8Ot-&$*o{yApZxTL>c%VQiM`U+-vUeo N44$rjF6*2UngEns4$J@m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..6e86876efc3e7b7644c84722d86b59009e50ba1d GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhEDc$aSVxYe>&}=7qcUe>u;T~+i&x(hvf!}h`I&})_nM1pM6Jo@}?;b z#UEW?w4U}$RT=6B++J_o%ouR?yV2EC3q(#crLl|1Ex4Ay_8`Na9hRo< z>n6QVT{YEFbDHa8A1?NQnB;i}&YB(n7GtZ=6LJ!&N9w)KGp*yM>gQCR-(JbsTfX1y z{^=0y<{%yIGBJT=r&=0S&apHyv1$BU_pEwmR%$?3>O~8-7SBr-W-A_^_2Ut+D-Qd- z*JrDd#?eg~M)w}PDP}NqoxRE5^uW~`{ou7cUK@29Zp81~*3j`f+u`t(-=QI+|YS!-{(k}FOn9SoZh_m@6UhB3Lorv^g96TcebSwVQ+L492i*V#J*?b z==l8o+`KeHh(R_pzqx;NZc%$%V`=rj{fEBgZ--TvA1GS#%1yfb;NcFReT-H8Njd(i S|H^?;$l&Sf=d#Wzp$P!Pgz!cH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png new file mode 100644 index 0000000000000000000000000000000000000000..eb30580f6770eb4aa3694231bc3b2623e87b68dd GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp*)^0jv*f2dne!JYck+z-RUC0dhq{>kB3%tc6Pr1pEvbd7Tx{baE;Y4XLK`Q5979mC$;ViLR_=(}JgoS_Zo1xs4_(@`G*C>=c`~ou3u<-Rl9!gv@~Z%YO9z zT=Gclgu=djZJ4UCwv&gmFa67Yx=wcj+t;}wuh+=0zM{Kez48+dm(y$&EwPKQysb!n z%Hi_g$3bpp(IQ1lri-6;Co1pz0b>0Uby*|W@y`6h+@^Tb>l=$$7Co(h?{>U&`{xLt u?0xqW`ZwcMg8Ce`NcCl!%AB9Fhw*K1aF3|^D|KMlF?hQAxvXgW1a17scKvwLs#v?@EzFlqmQUK{?fTcZ zwjy-O_wLN7>E{g}I&d5k*i~C<($kx{>|0fmUBl_;GYS+~u6LijknlMtvvhsB`GZfE zYBI|@>!N)!R!A>oycf;~7U4Lx>x#+2<4(HTHuHf7O;EeM#phzJ-SIzccD(C&rpW8a z$en!?wN#A1<=#AP=Nh}kuYKMK%TM_`DKTrWn#=#Cp*^0fB_@X%s;y1(i8?xCOV>w_ alhWRclFbxt)H#6uXYh3Ob6Mw<&;$T^ZJ2-n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..d7aac80a75b837d33384aad2f28cf2716c44b4d3 GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmzBaSVxYe>yGN`>=yR>u-&z_a<#wxb_-%SJ$Ey8owU={~!6d?y+C& zsRQp0|5C6l@F=&Ed^YE`@kXJ^ z=SNBP8lT<=^=GTO9x1Z5#2yzgRXt*Me(teks3Ns9NBnxJ)Yl^lkHFnZNIZ4&qLdMC2y#IgW~hwNL=1s|Ksn9Mw4|P1)9}P6n*=tc>JB>@w(-&zhrIYTYqKa z)}wsV>wL{ERCXOyyvWPfnOERZ(tLPf&pt+mxm=~)$?3CzQOw}!>gTe~DWM4fYO(gw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..596503278256cd1166c3ba93c08ff303cacb1553 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dnW~Q9WoGbDQ?=f&C_eOn5e63K#0iS5C4uw8FPzrN@vt< z`=BAa%=o4%+xb_QC)%Hz@$l}YPcK*QkIeEny&3EIb=iWWhcAc78+B#~rSTO1?s`^! zyz%U|CzGmT3szW%?7y^f-wut|gZ?v?Seu`bXqoizs?iLC>*C@|AMln;7vK_*S?0(v zoptU0sB6Wwg@Igl41RqMYs3|Q9P9dj7%b9k5F^u)P`ksYBKfGs;|BqgUUzo~&6sn0 s?qeX`u}E#vicXCzrLI{hOu3YOk34@~QsS&!2=pq0r>mdKI;Vst0P$gvD*ylh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..596503278256cd1166c3ba93c08ff303cacb1553 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dnW~Q9WoGbDQ?=f&C_eOn5e63K#0iS5C4uw8FPzrN@vt< z`=BAa%=o4%+xb_QC)%Hz@$l}YPcK*QkIeEny&3EIb=iWWhcAc78+B#~rSTO1?s`^! zyz%U|CzGmT3szW%?7y^f-wut|gZ?v?Seu`bXqoizs?iLC>*C@|AMln;7vK_*S?0(v zoptU0sB6Wwg@Igl41RqMYs3|Q9P9dj7%b9k5F^u)P`ksYBKfGs;|BqgUUzo~&6sn0 s?qeX`u}E#vicXCzrLI{hOu3YOk34@~QsS&!2=pq0r>mdKI;Vst0P$gvD*ylh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..2c4ef9f10c162ff4680071767fa8d4d050f9e4dd GIT binary patch literal 625 zcmV-%0*?KOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0pdwSK~y+TEmDh)qd*KxnsG9-M|)cVS`ebB zfB@b8|Not5wGyhJdDyWnb`~tzx`eslXzU8@k}Z%u@f};XqtOxRukqJrh%AjL=p6ZQ>5@)iEAXAIM?PK1 zN1t`K?e{qD+PW@9&a9W`mpgY8_6@AayW0rS9yV&eoLu>!cXW>ZZd+h-CpUu3u-)vL z?8$)%)@AA8Tcdr((l}QR@EOXE0Xn2Q^W?>3RfL!MyU4^s;8py%$Mx_Rq`T>q$R~a$ zJiYZIiAksP7pZkXLYkJjEv5I#urD`VMFjXH>w>h2=Tv zXhNtS!lmDh)J-HXC);z-rpYL1MWa5Hcp)pZ&VMhaaTHXz_$)jc+e3~>ozczOL8m68 zp+b;3^pR{W!an(;yM>fwdr%E|r|QEJMAkmZJIh6nqsHgp(Q}X-gTPv4GJVh^X35xb z77B{J;GKPf|Aa;AUng)iJ_0jRYuK~Xe)4H=_5wc%O9yLqm?ix}{CH04b#id;tMJuF zCZ&TsZx{;|$5!+rrM(cydIqz^?1ZXeVS#5*lYc=nMpcMOF+bCPCr>525+znt00000 LNkvXXu0mjfy?Grd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..142ddd8941451d6668dafa950506ff5da7917ca0 GIT binary patch literal 684 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?@-|T^vI)oS#mQ_GdB_Xst9m<(enNq}0?P)GO7i_V54xt>2`d>DYwG zXLxv8om_HvrtA;C<=zV>O3hxM=&Egt=9w~F@U+}v8VYIFRaZ)?7PxVQdY{I0LI z$In^2?VDj=&g(T{a_DZUv$MB_^9QVp+&M4LYU_k6mB&wr7d5fulw3DqjFJDwFmKK6 ztpQmbzH`faY82JOLLxgXGQO5-DFBNryp1mp0 z0#0oF+&59*V%vd_dzjQ1nb?bd7Y84{-q&Vlyb>hQpf1Rya$L+INN?ho~Ft|0lVqo z$0w3kFCGna37qaN#B8JVqS*c~*b@zt8Xj{rG)?j5P+oa5@Lf7sHKRb@4CjY8r!d@^ z@pRS*x@6Sa#0_yOV`OC!pxUz7=;=8!QjSY@XHd zKr8#zp5!OoF$`T(>kFCOdE9^53v&2_OkkABW8gDU5=cI7$-(e#y}jw3=~nM0j=QH< zB-$HP1b+K_vaX)*Yw$kt*Z-I~=GWc*^4Ic;|IfHJy{ojW7ayHu6s4m{6jih->krd1 X?~CWxIe$w7CME_?S3j3^P6Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhFaSVxYe>y$a+sRR&^{-6o%>2%b)LBtMAtJ1Q|L@=WbB*zJ$7Ko2 z^c~sx%HQwxDV~=WzIy7_x8D2j*p#g{pD&*J(`v=*qs8lQlz(0xH*?LoQ&<01mTvRA z)fVdY^J1ppgbNHl*XJ7T%A0<1&E1ygve^nBUgZWjZYsTGro(^BN_Q?_ID=M4<4m1$ zhS%Q{jZ;}qU-7)X!6xJNmKk!2>HK$PJF2)BPiT*xlMOQSsblnVRu;C72ChRajR*Ef zpZ8zg$ZQp@o_qMyg0+_~ofPPsQ2P4Rx2Iez!LmO6vvv6@V7itrEL~L7AUMzTd}-I= z)04Rl?Q&9oy(Bk6ZcAxYRTyK!A|Ek}dBPEm4GeDgQ(+QZ%nZTGIl>j2t&cMlosU{R zXYJ%|iIo?wWeWCaUdzlqzp}}|a^7pn@CUp5|CXJHIlRQECRQ+RyH5DB)7I97*M4!I zfXSGwn3p(LMLvopeG*H$b@BPBzjNkp;XU2F&9B>2sPA>f#^2}E3<7fAzE6OMkL_v( z0Xc~UueRN561esIxf;~3(Q_XL{$1Rxw&wTbzrXZt{=YqM!(zAP_lN&Gw(MhAYSI{O U>2i4vFbyzxy85}Sb4q9e004dtVgLXD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..67a37744730f85329d8707513ab6074066d2d7ff GIT binary patch literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhEDQyaSVxYe>yGJ+sRR&ZEv65A2Y$TKE|G1T?@MZ{l9k@pV#_C zEuCT?c`fPs>a$Endri%Me?9$yVfX(%>kJrH{R~rE%i*!}%<)WQ|CD@&>rO>s-1V!M7c^->^{n|e_oz&&{j(!8pFDZCh-vHl zIR@6VL6==)(f1t$Kf{$#2|0&;MKB@qbz|&k`%1d6N!5(6r>4*XRA5+s7x@f2TcX1uzB~JYD@< J);T3K0RWiA@tgnv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png new file mode 100644 index 0000000000000000000000000000000000000000..b559727b9e913f18ce9690250e48efdeeed0f74f GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq5PgMjv*f2dne~+GZ_lByk8s@?`K;rdQnSBi^J*v|N7ha)|@n*`{vit z2L}pHA9&_zw)52G63Yqa??#BlD`%R?zxr0K6eoAfsPjbd?kM?Xn=H?!RIik`yB@T@ z?a|YPx|3Ob-*R;)eZ1_i{QI`k!qsmh62pM1BQIQ8XOK2WV8P>B&E2nK9)e5&i4`2T zSh#PZy@0Y+6>ybcNgdnwm_RZ~kR_r1@c0;Pg|HC$9as z?c*!GQ@L_Z8rnHXfrd^7Eb-|UCKb*}1n?}=jBE$#-20R~T3KbLh*2~7aJ Cov$ze literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..0112b47311f19ac670e2b26f8ae289482b926b19 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnlGL%jv*f2M@0;H@h{%&C}KK!vFvI=I8fZ7r4gudxM^g z%<~h)<=a`eY0c(!jNBXNQ4@Vm;yaUyp3|*T!Kc6Vci81U->RA3Q=K^Lu;#Kfj}?2D zPF|M6}&8vE!@y;kZwnJROBF?9c?RmK4UEAn64IsUY zO}me_cqJ>F9Qb>R&BrqN4)=m3JfXriI%}SGpP2?UW=W@yw$S})#?Q(hUVLyuq4MCO ze-rilLa$A7{4m?wD6^*Kl>E#e{zV@D#M`3!?>D^Ie`%K8Qqx+m>|ax^ebHR|GC1n; ce2pIr1{>4O8=l+$1NxuA)78&qol`;+0BAIxi~s-t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..312e38df90c16800d57cfa6ae86c5d04be79c280 GIT binary patch literal 575 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmh5aSVxYe>%E$nxp6v-N(P-RG-~ zog{uLEitYBRMLeKomD$6%JlO5=log!`rF$x)A*B@vlQQdx3>_aW@6SZweEv_N*;&Q zH!G*-u>7A~{?(#v7vtM?$s8)%s%BN#OgXD`wZvD<`H)K86&b5krbPnoa%l>4gq`P@ zE>|;Cgi13TZv64@#{tRN4IZD&*59{2cX9q&_PVEm2Sj)j^kHfOEtv&8@BMv##h)of zA&G5~C8vZ_oW^X|RWE1huqg?M%-*0M$2=i6ZEdwgjZC!%A5ZFL57XGmM?W-P>vCG- zGoeBw@kwQ#M4eRCh2BK7KjF+7F^g1W0)@_hRQGodIF!m{D98B8>84JQ@AVYJjJPKe z${qYN*Jd25j#Ki6iZ9uJ?}p*B?~mSnU(9xC$MM?|Qxu;5d9vMdSG&yLzUv=Dw|-lH u0dCz&}(iG<&BVS!Dqpn{Uf7@TXrXx}Krty1v zD}SLxdfs&73cq~s*NF#Z;#j}-&$(r|_-vtPs`TWw%CFv8p8cvgxg#xc*@ji#8THYH z2{(_#ByAUL53Bv8J@<8Sca6lK7SC73r+geWB89ZJ6T-G@yGywo|#D=o~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..26a6a6c85569d49b16ef8d26aed6b937e7b36a75 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn!BDZjv*f2dnY~QYH|>0dCz&}(iG<&BVS!Dqpn{Uf7@TXrXx}Krty1v zD}SLxdfs&73cq~s*NF#Z;#j}-&$(r|_-vtPs`TWw%CFv8p8cvgxg#xc*@ji#8THYH z2{(_#ByAUL53Bv8J@<8Sca6lK7SC73r+geWB89ZJ6T-G@yGywo|#D=o~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..c353e4d065cc6ac26381ebca80631979d7f221f4 GIT binary patch literal 499 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0c1%;K~y+TJ(6v2gFp;}@7sV;UN?>vT0yI> zUA0Z>{{N5LV@#1wD3{odlOt4p8c%tDDG1)D{P10OQ@+1d1Z3t%+h2D3Ygxsl9W&y< zWw=#9+rw+wy#V5BbTef2kRE>%(~r?{WO9mL@`jz%YcT=OR4EU1tUAK*@7){Ha0v%1G-w p7_r%1Hlsh1B>%-?Z|yeT>woReLuNrHDck@6002ovPDHLkV1g4)%EABu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..ff3365d309b1682b6e72b2ca0d32ddbd39f58b10 GIT binary patch literal 670 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?}7yT^vI)oS#mA?ZxcK)B2rNWcA+i>aE+Za4&lB+y2&#{4YRChB;}u>5KPVpZV%Z{%y1Q3$LGD^!v=xziooz z%fH$QMaIfxg2e)M-L$u$#O*g)uXSlb0a$Z0d&+E75 zJv$}{&;K1-wocYQZQ^U5hzAqbZE5@XP1-Gnqb2m+*VrSfjm9dbF8=isynpj5>+RTf z;Nu>qwqlP54*%wq$?lPPI!7*lf8r6=4;_vTPi`@FJP~?SQ(U+EdwVhiNW4{skxk

rfYSc9)_p$o(eT7!L6|R5~)A4?U{8lVu0n zU%R}bxpRymHb3O$+p|t{b<8Vk-*XH_mv84w6e>C-G&0G3Tr|m>p}6(t=1s>7!@z3i z1>SiOKIedBoA%%P0zB_P!NR~7aUfE%DRIXkj)*&{q884^9IJuu(CdGAIJWNPhvRO| zzfI)-J>4F#|6BP+GZBj?``0_i?3nt?bbt3&&y{(i-KHxe)_5LG^3@W{4%!$ox$Eex m5S?pFk~XTLOZ5kR=03Fb!i|<`lK+6ohr!d;&t;ucLK6VkLMdwi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..2042cdcd11dd6ffaa7dd2e103edc778f27a42f90 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhMw_saSVxYe>(NH7qg>)%V*}Ui+48floEc#8u;PAeeM~_<<7!U3%TW4 zxVz@gUHaDU+M8v|Up=i0l)L`m4h7$&gjkq9=h({5``#G#I_mZorHuT@ zX*`D~$}}fMGdr&OoVZ`E@LI#_(zUr!f?KxhNZ%5A%6#m@nw#52cw0;_WI?SseJ_;3 z<4fi3P>XMp5(@7;1q7;>!R+B-V+cx)kp8h@&NUOpC-a_9+Z1*E)-qAY>eEREK`9A# zVGad3o_)2}@7Vs-Ma=Kt9R!u#l=5RI)1f|{aJv$l&z+mM)i=Op93^KRX*f``MPiPM z@qp=|E@D^@vrx9_%B`mS?I^5htK{OzN}@M_pafTLB^5~z_@4dboFyt I=akR{08kJPApigX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..32c79728c4e5e6330b8c0b5b5cd92e982570530e GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhW2^7IEF;HKb?Bl?~sE)>u)Bhz*GL2njuFX`1gqK`@eW?&1=4uDSFS2 zNKc;kWJ&6blxN9h)4Z-Oj9r$z-OG8i$DZ%2D}Pz!T>e}(H?C~9_n*%gKlbFfRbfK6TWb#>(?<8vp)3|8As8G?c%#a*kRz z2`c0I*oW(~$+qM(!aICzPfxb{>dO}T$$RDo8;zrzj#+nGo+>-jY3$1^^}fzz{}j&C z%|SY+%ftkh{W9AkImtqJ%Sxsr-?Qp8g{QGEjS%Zic9@|8BzD}Ksijc!tlAW+qg(AQ zTl)OQhaASPkIX`u!#_jKXGp65d7J52pT57I&F!xr`4>EyZj@LV(3Ki_*yQ|^hJ!I_ z3%k5VGTPdaew}8JW8LY>a|^U;)_*2?yLR0Zt3->IZE^7awOMW zn4-5qLu|i%_0D%zymxi7c{hJaIGxbCtfX<)$Cm!f3fupN=^c(bY-@YNC}N>z?3VS$ zeWA@9hbpV9Hl%KF3f|?gw&LQ4BcEUXsQn7jcx7|n)}%z11ihuj3Y!m|U11<)xcE_! z6}yqWREKCXRCL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..85fb1ccb115935f7c33480a9f79b00968b025d58 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnwOp~jv*f2M!b6ujl$PS{C}kQX4<0nr$j&R{&4xhKaHMAkN2Eke1uCr`Kg?x z5yw9Zd*?4FQ}{mC8f`c()%hpf&3H*qnup}s2}ZLNQ%#&tWwcFpk>@{}zRcKUW;oE( N44$rjF6*2UngCSun^FJ( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..a26c7061b584d5e02861143ba5a154f786b17d2c GIT binary patch literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhOYE%*eITdC|WD7IqwO{Qv*FlfAZb>(r%B z1o$%CrQRMZ)a`$pVy$&_VQkC#%W7}JHh=hbN6P$k=7D?X)E7qE+=^Qn&okSV+}*|vE*vo<12rBeA{cN%aq)A|94$(k|x9JTI21D9Rf8N>I`$l;x3s+^0++ZYVi28 z@4WSFmJ_WfcBV7UVBu;4x)p2&vml38_XTnPX59KOXX&t| zO9pm?3aZF?Nz@5QvtC%ruE}%!!F@4@`4%po7K=70cYQqWKYc;VYK|Kv?nj_L^N34X zBX~q!=9)-rx37}-pQIZ)dzNHhvdb^&(ff4wS?pti2J-*~5SJ294VY;azyujh48y&zlv%oUM6(ku)a-`72I0t+%H z6tN^#wIuY`|CV3(^{A_+j2^!ppOZjOX?$wU5e;X9zR1_z-9Z*--(LIiXpzXGj82Ux jrLJimi&RmV>^tS#68}q`bx*qi^df_&tDnm{r-UW|q3eXP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..20800218e4abf7dad8801e3a5d6d9afc6c9eec4e GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn(Lk}jv*f2dncXbYc}9<`OF_1!Nn3JcF{GK@6Z4FJ9|`@Xcei{7+$hY zkw}{((4Ib%nYZ*@&GKn>i2J-*~5SJ294VY;azyujh48y&zlv%oUM6(ku)a-`72I0t+%H z6tN^#wIuY`|CV3(^{A_+j2^!ppOZjOX?$wU5e;X9zR1_z-9Z*--(LIiXpzXGj82Ux jrLJimi&RmV>^tS#68}q`bx*qi^df_&tDnm{r-UW|q3eXP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..376d11e632bea8bb4e20205640c7b05e818a7df3 GIT binary patch literal 607 zcmV-l0-*hgP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0nkZAK~y+TC6bA9<1h?EHH~c@)GgmRy4&vd z|39%$&P>L!DS`k2sdM%%>L5CM^IXGTTnYAbPe+xlIPa!8*}ck=t+&(9tEsh07X4Ub zOD4)l$7_qvH8N-`)|(-Uu2Hw7Iel(X@%Mc%N9#OEGz`IY*ph7a`tO<7Y~cslk`+6u zaFNd01xjH;48!P7GS+C1**}&5|9uHiwP@7$qky3*X51I)?5zlRug=@ysE%BM9oOpq90~h@wP=}ALw|xHT*X>}?&kkJ z3K)zhFS?0>5FsqyytagUVBk~;Es>Ze^x^M02di&HK{rl^b1UvE4mtjh;;w}002ovPDHLkV1oM%4441_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..1d37ae3c71d27456328d0de4a18a817310eabc60 GIT binary patch literal 689 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?_kiT^vI)oS#m=na5+X&3u@0?#a37$g&J#I?m0XH{QiSh`Q*-Rta=h8|h_lb>)~GRh>}ecsu5eO0Jc zTVZ+ZZlAm>kyjyFnFQwC@VS3>=ef@}j>MUUJ(y^BNlI<&eZx0$)%X?}H>)a;Jc`WJIYg>6I+rBr4 z;oIha=Y9qKmQ{{_(etXZcX7ky>E0bO=L{Lno%#y4!lLC1E33mCrXW4W?sKxK0Wp3c za{>>BpU=z-IG}t-so$H)-NAT`3|O2|q_2SexUJ<0t?4VW8NTr>kd6U|M}xoyhfIdN zkRr~6J1je@j>w)3y#_YkYVm=O+I|ms4!i%_uP9*y4u*mqj20Jo7**0G7=K^ymjWr= zVe{_&tZ%H%_Q&@9ykNc{`egj)y%DeL8}w8{9yc1^2M9~5g!vUMKO4~`njxgN@xNA4L&tE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..ff7724cfadcab532321151e3b1221fea72980147 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhCcFiaSVxYe>(l9-(d$H*Wc_OI(ILdyFOSuIPe zdhxFEwO91^ATN6>9nRW_ea{*u*G=Y~apy4?i`}|=pU=C3WOXv$Zs2e?Sa7|abz!8T)K2^wAhxih)-)i6|%BSW^JftVm_X&#=&v9&ClPt{rN-~ol zZl0xiN@Zu!8qRg<=c4{GOx$(pnl5*gwN6u_Q*jMzi@9#)JkE0=jG6mi#uoW5f!gOi zFVyLr+iX4tjlOT?1{Yy^D#I8RYz$hSMjmU~_HSn=)XRHs&vyKG$x--P^KLEnKia?d l|DAjNz;!e8|NX)5xm$c^X<5&H-UCb#44$rjF6*2UngB=T70Lhr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..4406a0e913bebc03128033bff81d11aaeec78694 GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhR*YJaSVxYe>yEPi`kLKrMB5Y?EPcO^~uTB7Tl3`MgNmaKRub|*`pBq zMEyZil9a20?Uh$M7H3)AT5_{u_N<3ig>v7YWm?yJc4y7M_3WX@ecgLH>z+L~I_jnQ z_vEIAg^>6aN-S6JyU%%X+t$X#qOA6ml zm!A&(1eLpJG5L^5?`y~G%TKst{%_mnsjvQ>ZPgQ?!CebPPXF4sS;Ao1i7!8-FU#C9 zWjpdU3})ufbKA}?K4_5W&|&O&&PQ}XXsyNDip)B_;58gx8+GnSH~hF{A^gPZ^Csh5 z2gc7as`k@0!&sI^ToZiuqiOT`0}0DK?ks=xAPc5pR?76B^Us>pE~?pi@82iu3A5&( z7SV1B(&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0ToF^K~zXfy_9Qe!!QtpeStPl%dzut97>uJ z0)^cFY@5tRHe$5fKNT4mYz9`Jyjr>PH2+x3X5GtbzLBupsk<;(mSwV_sa>J17__!N%Hp%0o?afyGFi~n&$Di{t;6=` z*~&%%ufZylGmxztKnur0yraFPat5-g13`B_E>a?AAX~4SyQSmg- z+_QPYIgTp2jh+!T6Tj-lAKk&Mcu{Y$(QD0KFWH#x!0Topq01&oi=0g_2k6i8)cCRm zB=q>QOF(>VhGcxnE4fXP6U%-vffXu7=r40>-dTU?%Dt4}eGO;B4c|F<$XzdT66n3a z@PE2~!spN)YXOn>#Xk?Ms+nLq|HHN#(Z_swhb|jM-v1POCjY_3p0lAsucOz0x^ed@ zCx3QppOm_dKvnoW)sH_GC{EtrzF#eU!7)jJzti0=s`oDPmvWtN(q)$^QhQ0`mojVq Y-?H4V+W&=Wfg!-)>FVdQ&MBb@0Fq#uT>t<8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..72c5bd64ed0d2af46632948fe28b6d0d14d75f9b GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmzBaSVxYe>&~8m$RWj%WtMdBAIXh)-7IpODj&G=KuDtx@_Mct}J|K8~i-wf&knJJ_#DRhnD`lnIL|4-kX`h2hv5F=di(L-x)14Sgm%#=7@+3 zd*|OfKR@U9JU(ywV>@p`m67V>8J9wCIxnBTpvSl}EGdQ&uB%Jj@|wgWe!lY(kILiJ zyrJTm_W3?N+rJl;Y*{o@EqH0cqe~|ym|R+XRnues!Y!vxu8Mi-HRt`Mec$xB*ZG>? rP}y}*?IN#PXWjbP0l+XkKmc#Z= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..5a1118d741c5914b5682c385c9adda947b0af64d GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dndi*I^@99@?G;vmVUMOYh5{xegC6-eHPSD(<%ACrKAein~Kqmpv_;@O_4ry++Gp_u$V?;V~^YI}|@pnPaf+96y($^bFtIe^f4CNZ@rKAein~Kqmpv_;@O_4ry++Gp_u$V?;V~^YI}|@pnPaf+96y($^bFtIe^f4CNZ@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0pm$TK~y+TC6eosqA(DJ^M6OVB|s8L4B;Y( zusTldy#JH!r&Oi1NuNG_`gBBfZiZ@)<;L$t&L;J)7>MiCEzPU1cbi6aYB+tl>(q;= z?seiO{TyUXC{JxbbS%iCgSTa7z^AOxajJsGRiE%gJU@ewp&z zM78$i-51kG%PM?vJzn9ruFyF7n!BUGb-e1NxB9)BplnpB*u$$s<{03zG$#b@EHk_6Pe2 zARfvMG{Vs||wq*+zM?W3_|h;14%_d2937WbwT?lV0Es zY8mQHoz2_zd?bytpbs19fXKJ4cskZk)o8!9ul$OJ+gCN;z!#~4FQx` z1UG&7WYcT&udh}od*KR}Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhW_((aSX|Demdi}pOc}0Yh~C(Yni-7AB9wp{r|uFmgyNa^<^I$+oq(b z-JEIk_JmY9zXZGH(hIBler8V>d;i*`I&PNQ?@FoMWtrbLdEJWMGxys`EAP0voO9`V zZ_9hi7+V@GRX%iF|7+W@y!~ipKo(E*?e`LIo%~ATcbnWhcPZK2aN{+(4F?v#+p(Q7 zXU3bN-2KU0xS0zTc3v+RoX)cE*PVHH&P5!ry#|JJ^RDx>6?;6`vE`@bjKgnE z2Y!3G5^RgjCdY;|*To!ErZ3rl*w6uNh$RzGzyZz)JQmJ{OWRj(w7tK^v<573@RVml zW14Sl_MF%C2MV{Eruc&Fv|YSwmqpgOr@LaDt`zh!MikHcd#mnvhPXuwgZgPz-bQbp zwl&ZCisr?D+|Q(Nhha;-Z=tsyr_9>@^VjILXaAO69LvxuT;t9iH_5wpd8DyJ{fb#2 z1DIIEG!DLQ=9zZAKYT~M(Ozr8(?Z-@O1TaS?83{1ORd4 BA2I*{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..70cf94e1a96760750112aa91900802229b030d38 GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92>BaSVxYe>&~9pOYhxYh_sforeX&z0)-e|NXz;yXMj)w$+}}@;-M? zo|9zD+I`3P(SlV+PwzTAKkU)hFUScu%oU;5k35*8Af9!Ud~KZ<(#-xV2kn z_iBa-8YjJ)j@PoWbzE2B=-3;+_VTt&*9-SjCyKB&ELTlqo~+jJDaxKZW~<-rWulJN z(~l-BIdS0MiAgfQ%kJvTBt7mt1&Kb!ls!;gqlOH~#m|ujH(GS@8M)4qiLPZL&$-9qIp$1LK^* M)78&qol`;+0CzAF%>V!Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..803396d6858adff25b2665011065b791e095ea30 GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhBkP*IEF;HKb>|u?@$1b%jUeG8#1o8-_rZ>e}D1J?&XV4aQE+8 zIc1{TP6_XC6W4Q2UG>f);=f5$b%gY}v+K5>J$~-j^IqQdx99)(QmRpCdjIs2)U^6d zItLa+HrV*(8lF3R`x{d=+iZXL*>>Mq1I~Uo%5)9rN@Zk=J9}5Z|9x>|D#f#ppY=ZVQr7~J z(~r(Eu>>D&VeGU}JF$|9a-Da&0-{`M5ox|9kUCX@`X26ck4G)DK8Z@hG+YW5`*m4zO+m2n?@~7kl zeO~Qby;d&#=^yz=Gv`DrTum(Sr(ai#fxX;&-1$8HtT)(29fnG{%P?evXlhnR1ZOourzyciffUHx3vIVCg!0K6}vXaE2J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe1f2b0c25ec83a5131f78382c4c48d40028902 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn&+M_jv*f2Mq>5arK5k%$KX@X0=xxJi`?|p0A^D~Dx%>Bm@uRo)LvFY{EG>L+$xhL-&zsvgrXk2&uj4tz# zX?JiUPuT4L7KhOB_Ke#?#)$hqSNn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhR*SHaSVxYe>&}^-(dp**WVouv6oeSqq&jGfnx<5IFXVXpG-bl`(`i$+cBvhG#GB-CZ29e-g62(?pUl=* zJM%73O!&Ax`_A;UTA?MrU8>1O|2NE%%3@k(;4XLe!tC(i8>WTAH8OiV{-1pjj?^@*aT+Z1p zle{eO31&c9xYIkNm_nmw^`r6IslHFf#%bj41H(MQY(NuGqp2?Y2oJRacZgK*f zjo(j~TVeQr8{?eJnUe~A1dodpKY1x6(^D0hNe2xl o^7M746!@q#Co4(H@F#v^)~ID_b?4qC0gOuqPgg&ebxsLQ0B$Sq9{>OV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..8880c23edf5238d46e03b02a17f78e8da9b0b8bd GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnlqj*jv*f2dnb2t9WoGb`OJQ8+4n?I{*WX8|L@*vEHq(5BU=hL|E-rL zYB#s>9sdw_L|*#Re!fe#>6v-V>$^{S8&+k$U!3z*G1$fIq0^1JbrNg>EVbrSSiTq4 z76x*)x9>Wxa&@P&B8T-szDE14SBh$YqJ9hZeNkaiW(e3{_cbOyW=a$Hfm4V3oH*S6 zNY8uS-5vBnw4f)OW#wW bE0ljX^9xhmcIz)de=&Hv`njxgN@xNAXPJR| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..8880c23edf5238d46e03b02a17f78e8da9b0b8bd GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnlqj*jv*f2dnb2t9WoGb`OJQ8+4n?I{*WX8|L@*vEHq(5BU=hL|E-rL zYB#s>9sdw_L|*#Re!fe#>6v-V>$^{S8&+k$U!3z*G1$fIq0^1JbrNg>EVbrSSiTq4 z76x*)x9>Wxa&@P&B8T-szDE14SBh$YqJ9hZeNkaiW(e3{_cbOyW=a$Hfm4V3oH*S6 zNY8uS-5vBnw4f)OW#wW bE0ljX^9xhmcIz)de=&Hv`njxgN@xNAXPJR| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..bae696642b68e2cc6726693f4ab269189f12b7c7 GIT binary patch literal 633 zcmV-<0*3vGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0qRLaK~y+T9g^$LtRM_U`SS@<3MzNJj7H<+ zy#EWH%_N2ply>b^h5c@FV!1HiRo6&cl9Mr4GiM%apc<4jYGQk5du2L{ke=;Zb(xj7 zwFRqOh&GQx_Dpo9VPd^!y0g$vp{w$lRCahxPm;mvBjcKimX5?v(%4t00;}SB z2XkbzXF0RJqiz8=`7Jm^Pr4I*(un?>;!IbsCnv2}PkYi^P{C0PW0}U}Km`iDF4X+kf-rZ&W8X4NdTbtGovk1@OW#}Z zRRN5*KtOY$l4ZbL5w39RzN>p`Pmeycv3EsbxJKu0>}`TKkNDJYTRyUVH*-ei8N~MN zCa|Fvr8gK9(hJl4U^Srm&IpHM$ZfXRktU|%;R+eL%rgUC*bnrveO561NFo|y(?@Y6 zS_5F9e{dS>xFPf>D!@Grs>&E;L+vjB6F{*`{~vHlEg} zyJ(08F-!o7@H@_gftnIz#E+N-zg-_Ds#XsMP@%AS@t;SGT(8h&P^gPJGw<;~kwP|p TgWB3G00000NkvXXu0mjfV{sTB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..26113d88088bc456b2ff1ffc178a69a33672563b GIT binary patch literal 733 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?}J#T^vI)oS#nj^k#MxXe|~q>GWRY-k-N(#l;K}bElZV=0K4^mW$p0 z|KB)w{TjFB7P(6v+_4{C%zUN!S#*6>lGnzMb;fV+t$X$E<(6mbzNz1NdT)nyUdW%l z-%cp5leY@4d;fFKvv;>A|4naOYu-~*SZ(uiA=VSD^~x!QFYiuylLv>159VjEh^WYd>m8!ayR3;_1zbr{W*S3+HKbbN!FP3 zDa%gq_gPrREMYune*SS4*rvG`-HZ7g98alAIh!cDXNpWuehu^uLyL5ec7FZ?$iA{9}V^NKkOxzjz?qC-SM#@2rMwsR^^eq6|(4jJ6$6jteQ`d=R(s5`*@4 zi*r)Z`4TUk(nZXFh?Z{&{J6m6u*d&vEWKa{G4vI($Yjh~An7*aeRe|quR!O|KywUh z&YbQ0QE%`g`Sa1zNn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7??OcT^vIq+@DVO^k#MxXe|~ylPAuLeN=aXo$n6* zzSlG7&9o)=^{k^_*W6C&IMHvy+}LsKz|p$MsMVF3>qX}n-aX8rb}lNlQufMR!R)#D zvwLQ|oRFr#m&oyUjd)7F>iZM6Y*p5(+uIwTD@4NOC&($S=hxOdI6*?9L@VBH&g!k_ zw)?uBDe*8iU^HxT5Nf&mc9FNlrt%Ge1u8dZ=bTwvx-Zu#X_@n^g(nsIo(QaZd|Fg^ z&il1XGtD2V{3*LCp*}0>`E51jG^-_&T2aDJS=%a(Y+9%JPN%=8pg$9C>x;;v44sp7 zo<%&bN$yL(bc93s+&s9&U-sDjU=dv1q;Gt1&s)O|$#06!*1&9SGzdz`sq9Q_+Nf%I zt@O^-55G&3ZQf0@x^E_FcvFVdQ&MBb@06erKbN~PV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..bbd3172f89ab30d5e50c99aa17fa89de1361f868 GIT binary patch literal 591 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92;AaSVxYe>&~7_aR4-)>w8s2F-b?keKA<<Kw1YFx`!}<)8=X3^Pj1?q+KBRotiAb@*GNoB ziahY(T-nFz@#nJjG8_8KyU)!x?_L+S@_X(i(dHnX?(WGVYMyuOHFlavKK~YW@Z0sz zdM|g!U2W9*y3co0Qb1R#?>n8eDV`I*Sg4bP0l+XkKNMsD z|1i0<>Fp-%hx6oeIM-a5q4$o>ch9+7PIZROJMP28BDCwb{LJkHSm^!xFE);I!(oJq$0eUEVUY!s&$w_k+4hh`I$;mYQ-AHwur=aZf1(*`a^v?xq|4 zr&XVoKfEaOtWn_I$Ilx6ryY7u6s-C1bN1)Y_8kAJUT{AAc#v86ej#5Yt08l758uW5 wr6##vnYX4~+M>BMGuZ3$vMI}KCw^uKf8Dn5$-286fq}>1>FVdQ&MBb@0Dds3z5oCK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..72e557271680a4dacb0aabed9640235cca3662af GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhTigYaSVxYe>%<6o7qvI)watc%(rRYmu2EpSL`??s3R|&DU42l%#8kiLse5XFK~}&k~yJE#0#I z#grbld;#aQJ^PGS%jC1Xev#K6ZegM2oou_DxABPFuFtE0Mtu;SJL#f9a#~$!rdy`( z0g-1HF7h0kYwj;xb#{^s-}Q_`vFS@-%3iz?shb%eHz%ymywRWe?&*R%hThD#ZnIk6 z)PA-6fXM}y61`l3eT#yPq-JoLGE9E4@11ywkb?B1>iw&P52#!aKu90BP$8^#_Vcof zAE)h1=c;JyJ?|#ZTLN{>23gt7*I11C&q`Q%^swDn#-7PjeRzLvgKXgpqsKFp`c_`Q z_u|K9-wQp_!W|zu7rJJ0mp&QJe4qW#{fU-vbREXb;Aj$C9uLlsWlTE6NL;7WvASFoZ{!lK4~&l!}d_&@*UAF@{{s+tUs?;lsGAG zo;;tEK+kcL*WwjNEL8oPe}DUW(^aqM{OfNYfwW7YaNrde5mP}|Ulb<4k^FOJEt#ty ScIW~9&*16m=d#Wzp$PyZHJon% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..90a772fd41fa804c35aa100c0eee0751bd864c5e GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnlGL%jv*f2dnb8wA2JYV`OLlMeb;`cKo{3;FHJ4Gu0=l_L|neS_`iS6 zTv7c*=4YE)-y6+6qcU5f=6&+qX@`|Q-@5iE6NL;7WvASFoZ{!lK4~&l!}d_&@*UAF@{{s+tUs?;lsGAG zo;;tEK+kcL*WwjNEL8oPe}DUW(^aqM{OfNYfwW7YaNrde5mP}|Ulb<4k^FOJEt#ty ScIW~9&*16m=d#Wzp$PyZHJon% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..a618aed5f2e7d0f3efc86397b6a16384783d22ea GIT binary patch literal 787 zcmV+u1MK{XP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0)$CKK~y+T6_Q(T+CUJ6EoNue;P$m@6(tZC zh!aS#v15G04%bj(NWs{m)=E&IM5sLVA-}(y=b1Tk<~t*;T)OSEhYIikd9m=J48H<6 zjFi+u9>_+yFxP1su#I25FGKE@B&%95%5eNq%tMj~>@XDtHf=#}p;MLj5$!)RuYu1` zU)JG=oRo!fzmCiBYuZs_3)ek4YN1&Ms|=@QW!-0D&t|BcC$e!3V+W)(q{n5+uEQ~+ z>u0K6K(7ILh*^)_sgSy~T_I+f*eY51^wlJiQ2p)E!=z-XaQ6+80C!z^=F>%+CXd*y zlXLueVdDF*%8ypRVUH3ceCPf~xzmqFl1*b+5mxZ^4TWsdg<^|*ql{$6c zQR&aBlDH%rQ~!=+Is~e~pyV#vHOgJG@3YfLK1>wjJCXQMu!FgeKV5+Z=WVcR5IeXV z$!nYD5wkRsIOuC1h=d&}bE&NsPGfZHkOnyI(nbaHAG|e2c=^_v5qz$baXqSb}n6*_9FvdDNUcrmw8`qRzO-ibaqcN4~_Z*binwKJ=L*s1-!>Z*o#4N_J|`BT~(;S)|X#(L7(If{s-M%hV7kq RjOzdZ002ovPDHLkV1glBT@3&L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..1c2eaa39943c36d4a1772117eec8cd4650188608 GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?`3wT^vI)oS#m==_lE-%?_vt**w-Q&|Q)K>6yhi_k4S|b$YZhz>@xANa> zq%4p8J#=*I)eC=Ky8b=0;&0zXeJgu^Uatw4t#>CDB_|wS!KSfw=l$njH-Ao_ZswA; zKlur_CF7kp4-02R+}^DcB;1$85)^-etMh zr?uX&-1EVT?_Zw(U2j=#vGu;;r`ED5pELz97Bc0*zfu$fXF>o+)i+t#i z*V?({ZyG~fVa>6^bzrw`S$yE*ehcR3`=r{G|L#|mumPFETJYw@^@n|q#w_lWWz!fE z3dJi}EZ!M%9A5s-`q+z$Ia?1`SZ-v0bOXvCdcefAId%t&UCcu`vOH>UQ4$ zl=pXME4OSC^_{jPW0Q*OWL3>sI-VC(JiFAqgG?ePEjl?#1Wn44tJl2wbuZV~;QzwF Pl*r)e>gTe~DWM4f^6goc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..3f719496d403f63b13b827e4d28de222cbd4ada4 GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?`*{T^vIq+@DUn>F4Cg(^koze@B$@qCkj?>rvjq!?KU(&G_+8Kk(

$`5&Q9z2ld*l(a`7kw2IINwdQ8JpYql;;DB~AU=-Ms2^1iKB2S`;Im({jt z5%)w9tBu?Al22=AU1RXcfB(vsA?xq${&Q82oo?kUU68!n^}EKVqAQpAX1&y4So-ea zbmeo);kq3X8Z-nrc3E7#ca1Oko$nU2lKJPD-u7~5Zl2oI_jX!o+oKmU3^%ShT(~;% zXq#N2!|U(<^0H@P@?kcsXRu2g4c7U6&6PQkcMIHDv(SC^u|=b z#tX^TFJyj~-Qi7o_%L$!JD8Jj?a!{YgzPmZa-tvyS-4Sayu{G)T5)5ncj9vRC1ku)*<_i|GDq~l>D)I^6dY| bgDRN6D6+9#XR5XXCLIP(S3j3^P6Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh932FaSVxYe>yeLn<-GB^)LUvl(e)gv7|IGNX<-5x#E1`|9|1j^IpaY z&TO~*B2@8U!)XJ9@3&{}oShWuHKwI#jQL@(qHW3tv}9> zbLuo6PwV(|a!VPzv#pN9rsL{ad&1?GaRtfrE&2FW_v-bXOq+f#?1>f=Nsel0+#dC| zb@SP2GB#(oTxK}8)tW1^`u~*}HTx-rr<;;|xY^y8CmeY2;Afuy?oRawMqk^?cGXyi z1;FI9E7KEuHuY6rvORL~EJw@7w9n3x+jTUKZFzL=o&UV8tJyD$x4Ov49t@EO zdw(A%9p4MH`$n{c!V48XzT`QDn;&0eU*Xh-uvXwB+i^c;H+PGdN{=?K7MydIKlRS0 z1rnDp{q-%A{Ganimq){<@Zr(f^*@;nVCGrq^c+s^VPt-6)Lkw6UDg2{4y;FKgx!gh zF{`ip$ldgvg->}O*U@L~MtP9|J()-6-hEdh$`l|`{KllAV6y)I-#7mR9Mk3QD%6VA z@qG5d!+NUT)YQdc*STNEACa|O?Xc$T1FM@n>n5Ll@GBz7zIxZWh_uA5>cB{6@O1Ta JS?83{1OVJk0j~f6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png new file mode 100644 index 0000000000000000000000000000000000000000..2d215596d4df23f5cef49c148d590271649c3717 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp=O>gjv*f2dqcAQnG6Nq_y=6%m{q`j-1!kR=fh?tg?<5{#TWnoPYz38 zZ(6$h_3}1PwY@%h<=>XQwd7WR+Z4s$f91v3m!H1%RhrJ6wDk8T7MCyjzA^skSL$X3 z?~Djc|9R?l%Zx9xi*sNtjRLYBR%>u zwKW$Xd~my(cKq42cc+CimKplS@Z|sSc06(?HotPe?%nCC7krXuIjphBSo^WX@3h}u zG1cR1U+&XsOq057x++fgb=KM5#Drq$&a_6@-+hKoXg)7JI%FWw@|#1hL;S|Isz<#)4*#}u5UKs&9%-GqEuus7 ziF=GhP}-sE@6<{!t-A4AcuKyBaFV_5bcxSQD#67oZDiCBOg(8*ckQWAa$G~$a^qEJ zr$1S{{YidV(%GxcJECLt44<)bB)lu~y?eZS)^zEe-J(<37XM%_*?DA!xPpYf)oZ)^ zS9aaiw3s6#d;x5R$Sv86iY*_neRnV1_lI#;Owt+d1#4cr&h1m1^7T&!uWd>uNbCNV z-KiVrPxC(WK5NeUC;8te9xDDLr+O~v&KrZn5f4Aldr%?P)Njvl=xMY1jE8pT6gMcO zJ&;`O{3Tw~cXrS$v!y1vUYWP1T-u_!G}He{4a1^u-6dsn^lkz}kHOQ`&t;ucLK6V= Cd90`a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..4929a0d1b3bcd2c99c9d57c6f958289e212580b2 GIT binary patch literal 629 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhCcIjaSVxYe>yGNpUF_5^(UvA-HeVE9334QETZ`x6^Iw^eN0m_O~? z?6j>{r@a=K>-)OZ@R`3PPnX}Us5`kF+|#c+UHiKImyOZVy!aJu=Ir{*%;s@iytyTA zM_1p;gbmFSL65nw>LzXyT(da({asG)yYt@sx^_CkBj@oy&l0n>;_DVA8%bpOoINk@ z?Uc*3%%Ht5En&`F^|&27jHb3X&gm)o9|u<^^MA?Doliv*H*xl`?Rxbg^vtOnGV^Es zxw*54$#-Gri<~I^7}w(|1_n>F9o{_%ICFjfzSQfMytnh^mzh;f7k21rTd+BEZ-J=n zYw&3)!PC{xWt~$(69B5y B8dCrO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..7ae6a0ea7d2579d9b82a034f8961c06c5a62ea70 GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnm?W{jv*f2dnet@YBCgQ`79T@rfaL-e%7PALf$5cF3q}Y-qQ5`Kc8~( z0`rF~XU_h7xcf)@NuNo=$JhTWcm4NTdgpn?tajr`cLkUJ4BFzez5PqJ^wg_j-+#^E ze4r66P zEq@ABqI%Bjb19mCF!?FS^|*7+vRya1ugpu|A0+YmbGOq8wjIT6Mc;WI`dCKKTVgTS zvtkWU^+StbJDE0v8U32pKPG6WN%|kIJpSv?A_2W;rN@5&=~Wq>T2YI-rma|{io#^S a!`p9bknuV?>66P zEq@ABqI%Bjb19mCF!?FS^|*7+vRya1ugpu|A0+YmbGOq8wjIT6Mc;WI`dCKKTVgTS zvtkWU^+StbJDE0v8U32pKPG6WN%|kIJpSv?A_2W;rN@5&=~Wq>T2YI-rma|{io#^S a!`p9bknuV?>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0%l1>K~y+TB~sgNn?MxY|EMiwgb5G`L^x2w z#mgnc6dS?{)5QXT1%$Y5)I|M%smJZx?&{3UnVCge-EcmZb}_r%ii9Y2V-ADzZ3owd zWeWL0$TRs!S00wDO0JGbp_KJpv+wSknvX(r9GrPFUS1yhUdr}M+tS;Ub~;H}zH(ie zlxS&La#gA|Rq63@Jo8T>2*&U4o37PLvhtk$pAYG<=X_tK6o!#>ef6$#WhocMP5h)a z_4ak({4Id>wz*3a#&MO3N`wemhJZNv_{~_BM2g!y2Qx4v#F1K8tiOfx<2Zmm>-(Fo z175W0PX6U>VH%9%a6w>C<2nrO@vP7z?4zCNL*FR?2=MOX9nOdgu=pH-4Rh%CpP%4w z<+)%$DhgO~X&G`w_%xBS>@G>Zp3msMYt*J@92)@s&o{`C&kvxsPIfE?Z-j9yh=IkJ zPgB?&>1_*}K?8sRdSC@}0KoIBO24mMM=pswjVi4e*ZF$xkT*|SP5E>OkptyT7z%01 z2Z7b~;F7Uzp(xC&-SRd+NKu4f0*X^e!MHYb2eyFTpJ$;Upv=YL7sJr1N+@#Hbxcs; z(_AJ*O%mXcj@Kbzy{A+pM}D6`QwptwykMU~J_;Z-v`#a|cA{SwAO?|jlCWX8_VLoO zSJ=C@fj!1`!J!a`3N4Y4<*bM8aZ>AA%-{-v%y{m@&_l}hG~DKy_#AJVX8jz4)$KGQk>nr>P4P*xFbq7;|9jQ@ nPX8CB-Zh)P6|)rD(ChjyVOYv4Oz#sy00000NkvXXu0mjf!{=bq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..e5ccab632e771e870fd6331da2ea54abcf527147 GIT binary patch literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?{*OT^vI)oS$C5oh9NZ()zHnG3H6lj5!=yT3uaTlR7vawZ8xFkX!G& zcA-9(eozb7l{VMV_p|2yEDsAUKflcM-<^AY`}6ab%?}U1eEsw1m#1&u{POQd#m;lH zWMabO&9g|#mDFbH2x_lGTLit6Z0&R`PHo-$@~76_ zcwtk+-gysAA5`sS`*Hc@%XNV}`#+aLWFB4r`t{4V7a5riXEw8m*`#{UzWr(KSJuVx z44eYbuXTAdUSA?}^yD>=EjiHz_n&>{>M4Gr!~Fcx{oT7|Yh<>rTefvy!WZrjO9Uru z({Lwb$`gz8)k7;}E_2?MBJ!%%K1J`YbNX!x!X=v>6mRh`Z zvDDKdu=^W!Fka!+;w{kDI~vHOo1eE9{uq81|NWc$Lh(uar{$96{~KxoCJCQc{XgY?>K&iUH&&^+ z2bo$dN!}mdKI;Vst E0LPd_VgLXD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..c28beeccd71cc60f22df4fd560b171c87d7a5423 GIT binary patch literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhQ9Q4aSVxYzdP-=7jqzw>u=`T7k}#(u2`X=rPbBN@u>O#f5+pIiW3<> zPICdRgie(UZ&_>0g&J9tfPn+93MuCtKfn2ZrX|cYx-C0&E#I$oX-*slVA?HAmMmmjAi0^Z%XwdrP^~|LCPPjMLhij&tAj{s&AL44$rjF6*2UngE$15Ig_? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png new file mode 100644 index 0000000000000000000000000000000000000000..d9584c5eca4c85d840cbae9561ca4568dc0dca09 GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmq8aSVxYe>&}^*AWK+*U!wK4Sr9$DG?GPA}Z?Y%JT8x|NjfjmhX;o z65gF_Hhs_jRqpLmXsDIr6J&D$$%itn^m7z2__2mD^LOdy z&dF>)lB{|s$p5ZA6Z&awPqgZUS0XGIEhZl_>0O_;*}`|7&yNa|uItCIYBg#73_G?~ z$fK02=~lYf=BYE4EYz-Vf z#+==5lsDC3Rj`1|V+jQ{&&M;~^5|SDdFLl1=7vtA$Ze+cuhwWk4&z*6 z#p?L;jM2^0Y)Z`x$KO|TE`>X8QRF!t1qTLJnP@2mg&AhyYoIcQAKY6!uQoecNbw~f zzVpBR>-?fy2Kx)2C(XaJ^M-o4-nZime=(h1HqR^P(bE86EHikz`njxgN@xNA=CS!G literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png new file mode 100644 index 0000000000000000000000000000000000000000..c7704b01c3b19c22594b892f60ce5b3bbb63c303 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq2it{jv*f2dxK-S4;k>>`5m&Y^Y)$g1uK3iY1wfo{rg`pTE0}))VF5i zn+FkP6JjPW>ul5VeHkEfMPF>oS)*ILHhlkQMWW0_rO zPMfvcas{5mmfzP(W{Wu(eO<|vd~{Lb!E4)!YfK>qs=ckr>$=mHCvccy?$Jv-6_;Bw zxV;b(Oy0AxB=5veQ$`(Ozjs|nE&wGe^MaCe=1LcJg$o!zYn$_!@lN%zvfr-%u7c#= zOURmuZM3cgDd_X==so(o%r)udoe9Ar%a>^QxqI1ZY)q`VeujA&Fc=v;UHx3vIVCg! E08&G&O8@`> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..d302e0afca9a8432d737013eede977c2206f4564 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp)8&*jv*f2M<<=lI&2`&QtK}xBYpgT>y&L@E?jEc!s2w|_x`J4@i$C) zR~Wrmz{fKw{lc2EwK<&qu8IXGK3mV)_axiLh9fgfyHd}4rkV83><`_)w<#&cCqHsD zUmvRazEpRUZEO5xK%z9_f;yJ(mg}uq#Jy&1glc}0qi$UD3U4E12 zv^)0YR+~3YSa0}I;mN_j(N--Yix~c2*8?kJDP1QmC&AxsE4%rT?oTOUe(j{YQoiw@ zOrPb~l+Ts9b3@_rZ`)J)=3Zeo$GXnVn_4XJ_pGheiN}w5cFjHB{$^q7hV-*8|E9+o ss_sqlsyaI5OPA(L(cnwk%ND2DE6Zn3(%br;0~lrup00i_>zopr02W)JKmY&$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..a67bfe2b286ee7cdc4e00e36669cb617c06d3274 GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92^CaSVxYe>yGNo7s`4^|xN@rPX`4i@CT41_p+Nh}3@g|9^hrJ_Gk@ zLNh8QneEf&6mr3g#fBa!njMO>z#SVW;3=Cp?)yiTId1r1G zbNUf1BJFDKD*OF++ieY=g7|;6d-?b`&va~xe{4K|w(pOQ?+=!4iTvEPt}`jQiDS}- z#c}5^Xd z*IhOiwiWYQNb|j2Q~$nf8>hqbdAte286112m}SRZG!4w@a0uAU`TNoO$4ee=eC9Jp z_km>68ruYEglkI$TO&*zA2BXsuvsvDeq5D9@6YYL2~|R>4?8Y}SpNPHQQG2VG5NUg zV~zvBka#851aG{D)JgSN~?c-X@(Rd?#V{1Gd{N<~P)K9Q>wG bQpa#cMauWkuK!PfG0x!W>gTe~DWM4fjEV`} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2a3e72156b50eeba0a35932320722514d59f5e GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnx~#Fjv*f2dncXcI%FWw@|kbz|NmbWEz($_p{3O&SM&dSWI5AU0kaD+ z+dfPzyK$~$l2pw7#09a_BJahzuiv&bJM`kb`PU15PT%Z#SLz%5{DG&-WCMfWUu<(H zwdDOVir6Um#Z@G7TV~dL=Vx~m*9_*}0%V=*UBV&4Jo`|am;I@pjcmiVvh6^XAx6DS6`Pv;lL{{$jq+_pP7AsvWjg#H)AHy!wjCTelF{r5}E*& C4Us1R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2a3e72156b50eeba0a35932320722514d59f5e GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnx~#Fjv*f2dncXcI%FWw@|kbz|NmbWEz($_p{3O&SM&dSWI5AU0kaD+ z+dfPzyK$~$l2pw7#09a_BJahzuiv&bJM`kb`PU15PT%Z#SLz%5{DG&-WCMfWUu<(H zwdDOVir6Um#Z@G7TV~dL=Vx~m*9_*}0%V=*UBV&4Jo`|am;I@pjcmiVvh6^XAx6DS6`Pv;lL{{$jq+_pP7AsvWjg#H)AHy!wjCTelF{r5}E*& C4Us1R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png new file mode 100644 index 0000000000000000000000000000000000000000..8b9e321568ec19332bbd73419c7f43ab291ae624 GIT binary patch literal 667 zcmV;M0%ZM(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0t`t+K~y+THB#A<+CU8Sv*)sBM)LT;hCs+J z5WoiuY=BKFoB#i%^pHx`Jjk-tYPC9<$#nFt73oZfrBMUX7p?DAxCCyMxK&~B9+}>` ziTTCm$(gy8;gvLLCTgW@mE2jo&NSd^nVth5$e|1`IT5cj^Ts?lw=!mFbno3j zF3zdzYv6OiE3I2C&n2&OlWcQ)v~HmkO0S^=B{c7yeaW(=Hm}xV6lQ+3%@k-1oFEH; zM^&BJH&T4dvqp&7lU45tK`q4K-7*e0TWhhj{L^*V1i)KoG5T}ffy~zCYh!*k%`Fu7 zg7@AYJc!8T7I>lME{~%D51~eOCyvB6c@8o_-P&v>1^VBJp%Pt7?xdV+6;lvR#iEV1 zV0a|(lyQfq{!tc?F@a?3TrafxHEVBmg{4RGkPB_#_Fe|S#l4k;5_|0M3L07so{$>Y zL&OUgfPAmY@%g#4k=VVi<~p)SR!0BsT5JjID9-a?2;zx6st?xAl?3xgQ}^B{6Vq2? zCL$akEC=n^GGCg{~RH}FW=;DeS2U&9bK0)aJhr=jng&?Z* z-CC%G9XgCI7(G>*!Y?oago2OZq$S_rg>YfR{KoXyqQ2cY+-h0qP zklgAT716-tz0c*5Pr7EqIOzZY002ovPDHLkV1fak BEA#*W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png new file mode 100644 index 0000000000000000000000000000000000000000..2fcf2599dedfef193c555a6ae66941308dc264fa GIT binary patch literal 1011 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 Y8}I=C$8$}T!~g&Q07*qoM6N<$f?>Z3c>n+a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd2e951646db2b0112f841c14e715f883729099 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp&p(tjv*f2M<+RUHyenw{GM$SqT#X7ywxdFQ-o`G_f?f+Qjb@KMpWti zy}8*fY2k#>69;8yoaU)HS$#6e%Td7L=I1@;{69n18-5ECI9|Bn_S+3{>mUBEO^(r91x#E6!*^_yGCi-jN+@;a_w!Sh z?s*(~V#N`rAMw(MEpvIEZ!w&6`B;G;gkvnWpE2szL!QMh4Zv_`@O1TaS?83{1OSYV B!8-r| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png new file mode 100644 index 0000000000000000000000000000000000000000..7714163482adac409e34da48a52c8cd875096460 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?_GYT^vIq+@FS>UM1xyuy_B&)NP8|;hYCux2et65pi|Vzj)?!Wp!;& zSAGafJjbr@&i*!M&$v1tK9jWR(}9EYUTs0s$Eww)d@^hmSc;E1BiP!?k#YM~&HR(Vi}cz{@Yc)Uw=ow`$d*>#q-% z#_EW1UzA*Y(WAr(W~_-+FZ;)tK5ifOameug+IUuT+T(!r*B8FtHKVqSd3VF_#2XPO zCizY7+;}r5i929rh{OKZU$u5Mh(GyRbL?Zqks7=9=aq{T?r_5_?<$aazL4X8mpPAf zM{4)yBj11T{c-+f$)O6HV<|?0cMnu6@JMq-6yp+(51eKJJT@9*VeHyXJ0>R-BUG@?z@o^m#Vdw-mCx5O3>k)p=<$ zQ)16m<)UqxYr-m}D+V@a3Ka+N--HWoDwV$`-zSRd=>1la~ z{#|x>yOnA0N3QeVE*917nAf+!w88cN?au1A3~$%*t-aWix#~g=@3QMniCP;(n0GBa zv~|vH_A9z+m)lllZ?F+%KJRcmOyEY_jdE+*9lMIFbG0taRr?ht?{~XBw{pA8)6V6t vD?iTEFtrn2dMtg>l^;G+q~^C*{N#Ssc-!{hJL@OF6w2V~>gTe~DWM4f0RUhE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png new file mode 100644 index 0000000000000000000000000000000000000000..d629c395f4294e62267f0529224d28305b164380 GIT binary patch literal 518 zcmV+h0{Q)kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0e4A6K~zXfy^}p_LNOSH@89UyvCySsacal5 zOE*QVi{i)N_n@eYAE+pZqUi1qJ?-8MmHsZc0rysm$B0ip8Q8 zv4wo~Yqgr1&8A-8pZ;(!A9u>-a=$n-{X%IjTJzdVi`4~{wW`TTlIi%Vljg zo9mHs>D-RpX)G2C!O>>SarJur%Cc)X`sDeA(v-N{%`4!N5w_p&?RFF9zXJDK;NaaW z_{lNm7fMsmjH#d*Q$aJPf@Vww&6ojpDrm-3(2OS~pY^hHJmDKepa1{>07*qo IM6N<$f?AOC`2YX_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png new file mode 100644 index 0000000000000000000000000000000000000000..d629c395f4294e62267f0529224d28305b164380 GIT binary patch literal 518 zcmV+h0{Q)kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0e4A6K~zXfy^}p_LNOSH@89UyvCySsacal5 zOE*QVi{i)N_n@eYAE+pZqUi1qJ?-8MmHsZc0rysm$B0ip8Q8 zv4wo~Yqgr1&8A-8pZ;(!A9u>-a=$n-{X%IjTJzdVi`4~{wW`TTlIi%Vljg zo9mHs>D-RpX)G2C!O>>SarJur%Cc)X`sDeA(v-N{%`4!N5w_p&?RFF9zXJDK;NaaW z_{lNm7fMsmjH#d*Q$aJPf@Vww&6ojpDrm-3(2OS~pY^hHJmDKepa1{>07*qo IM6N<$f?AOC`2YX_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altarCopy.png b/src/main/resources/assets/botania/textures/model/altarCopy.png deleted file mode 100644 index 45d22bdd62b271e6b407fca8902422257d454dd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% From b740a22684e5db12fd31238a24f697984bed2198 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 00:42:24 -0600 Subject: [PATCH 109/935] Fix old tex, temporary json --- .../assets/botania/textures/model/altar.png | Bin 4243 -> 2683 bytes temp.json | 150 ++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 temp.json diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar.png index ac67fe3ef9ad265d0eb8e62a069b47b34bc352e7..45d22bdd62b271e6b407fca8902422257d454dd6 100644 GIT binary patch literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% literal 4243 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 diff --git a/temp.json b/temp.json new file mode 100644 index 000000000..0c912e884 --- /dev/null +++ b/temp.json @@ -0,0 +1,150 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "gobletBase", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 2.0, 16.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } + } + }, + { + "name": "gobletBase2", + "from": [ 1.0, 2.0, 1.0 ], + "to": [ 15.0, 3.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } + } + }, + { + "name": "gobletBase3", + "from": [ 2.0, 3.0, 2.0 ], + "to": [ 14.0, 4.0, 14.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + } + }, + { + "name": "gobletStand", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 12.0, 11.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "kelkBase", + "from": [ 4.0, 12.0, 4.0 ], + "to": [ 12.0, 13.0, 12.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } + } + }, + { + "name": "kelkBase2", + "from": [ 3.0, 13.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + }, + { + "name": "kelkWallNorth", + "from": [ 3.0, 14.0, 2.0 ], + "to": [ 13.0, 20.0, 3.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallSouth", + "from": [ 3.0, 14.0, 13.0 ], + "to": [ 13.0, 20.0, 14.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallWest", + "from": [ 2.0, 14.0, 3.0 ], + "to": [ 3.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + }, + { + "name": "kelkWallEast", + "from": [ 13.0, 14.0, 3.0 ], + "to": [ 14.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + }, + { + "name": "liquid", + "from": [ 3.0, 19.0, 3.0 ], + "to": [ 13.0, 19.0, 13.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + } + ] +} \ No newline at end of file From 33a8d5e33cf09a8b9c39d1605cf30d283f7bf594 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 01:51:06 -0600 Subject: [PATCH 110/935] Done with apothecaries for today >.> --- .../botania/api/state/BotaniaStateProps.java | 5 + .../api/state/enums/AltarLiquidState.java | 16 ++ .../botania/api/state/enums/AltarVariant.java | 22 +++ .../client/core/handler/ModelHandler.java | 12 ++ .../client/render/tile/RenderTileAltar.java | 28 +-- .../botania/common/block/BlockAltar.java | 52 +++++- .../assets/botania/blockstates/altar.json | 168 ++++++++++++++++++ .../assets/botania/models/block/altar.json | 133 ++++++++++++++ .../botania/models/block/altar_liquid.json | 12 ++ .../altar/{base => default}/gobletBase.png | Bin .../altar/{base => default}/gobletBase2.png | Bin .../altar/{base => default}/gobletBase3.png | Bin .../altar/{base => default}/gobletStand.png | Bin .../altar/{base => default}/kelkBase.png | Bin .../altar/{base => default}/kelkBase2.png | Bin .../altar/{base => default}/kelkWallNS.png | Bin .../altar/{base => default}/kelkWallWE.png | Bin .../altar/{meta5 => desert}/gobletBase.png | Bin .../altar/{meta5 => desert}/gobletBase2.png | Bin .../altar/{meta5 => desert}/gobletBase3.png | Bin .../altar/{meta5 => desert}/gobletStand.png | Bin .../altar/{meta5 => desert}/kelkBase.png | Bin .../altar/{meta5 => desert}/kelkBase2.png | Bin .../altar/{meta5 => desert}/kelkWallNS.png | Bin .../altar/{meta5 => desert}/kelkWallWE.png | Bin .../altar/{meta5 => desert}/wtfisthis.png | Bin .../altar/{meta0 => forest}/gobletBase.png | Bin .../altar/{meta0 => forest}/gobletBase2.png | Bin .../altar/{meta0 => forest}/gobletBase3.png | Bin .../altar/{meta0 => forest}/gobletStand.png | Bin .../altar/{meta0 => forest}/kelkBase.png | Bin .../altar/{meta0 => forest}/kelkBase2.png | Bin .../altar/{meta0 => forest}/kelkWallNS.png | Bin .../altar/{meta0 => forest}/kelkWallWE.png | Bin .../altar/{meta0 => forest}/wtfisthis.png | Bin .../altar/{meta3 => fungal}/gobletBase.png | Bin .../altar/{meta3 => fungal}/gobletBase2.png | Bin .../altar/{meta3 => fungal}/gobletBase3.png | Bin .../altar/{meta3 => fungal}/gobletStand.png | Bin .../altar/{meta3 => fungal}/kelkBase.png | Bin .../altar/{meta3 => fungal}/kelkBase2.png | Bin .../altar/{meta3 => fungal}/kelkWallNS.png | Bin .../altar/{meta3 => fungal}/kelkWallWE.png | Bin .../altar/{meta3 => fungal}/wtfisthis.png | Bin .../altar/{meta7 => mesa}/gobletBase.png | Bin .../altar/{meta7 => mesa}/gobletBase2.png | Bin .../altar/{meta7 => mesa}/gobletBase3.png | Bin .../altar/{meta7 => mesa}/gobletStand.png | Bin .../model/altar/{meta7 => mesa}/kelkBase.png | Bin .../model/altar/{meta7 => mesa}/kelkBase2.png | Bin .../altar/{meta7 => mesa}/kelkWallNS.png | Bin .../altar/{meta7 => mesa}/kelkWallWE.png | Bin .../model/altar/{meta7 => mesa}/wtfisthis.png | Bin .../altar/{meta2 => mountain}/gobletBase.png | Bin .../altar/{meta2 => mountain}/gobletBase2.png | Bin .../altar/{meta2 => mountain}/gobletBase3.png | Bin .../altar/{meta2 => mountain}/gobletStand.png | Bin .../altar/{meta2 => mountain}/kelkBase.png | Bin .../altar/{meta2 => mountain}/kelkBase2.png | Bin .../altar/{meta2 => mountain}/kelkWallNS.png | Bin .../altar/{meta2 => mountain}/kelkWallWE.png | Bin .../altar/{meta2 => mountain}/wtfisthis.png | Bin .../altar/{meta1 => plains}/gobletBase.png | Bin .../altar/{meta1 => plains}/gobletBase2.png | Bin .../altar/{meta1 => plains}/gobletBase3.png | Bin .../altar/{meta1 => plains}/gobletStand.png | Bin .../altar/{meta1 => plains}/kelkBase.png | Bin .../altar/{meta1 => plains}/kelkBase2.png | Bin .../altar/{meta1 => plains}/kelkWallNS.png | Bin .../altar/{meta1 => plains}/kelkWallWE.png | Bin .../altar/{meta1 => plains}/wtfisthis.png | Bin .../altar/{meta4 => swamp}/gobletBase.png | Bin .../altar/{meta4 => swamp}/gobletBase2.png | Bin .../altar/{meta4 => swamp}/gobletBase3.png | Bin .../altar/{meta4 => swamp}/gobletStand.png | Bin .../model/altar/{meta4 => swamp}/kelkBase.png | Bin .../altar/{meta4 => swamp}/kelkBase2.png | Bin .../altar/{meta4 => swamp}/kelkWallNS.png | Bin .../altar/{meta4 => swamp}/kelkWallWE.png | Bin .../altar/{meta4 => swamp}/wtfisthis.png | Bin .../altar/{meta6 => taiga}/gobletBase.png | Bin .../altar/{meta6 => taiga}/gobletBase2.png | Bin .../altar/{meta6 => taiga}/gobletBase3.png | Bin .../altar/{meta6 => taiga}/gobletStand.png | Bin .../model/altar/{meta6 => taiga}/kelkBase.png | Bin .../altar/{meta6 => taiga}/kelkBase2.png | Bin .../altar/{meta6 => taiga}/kelkWallNS.png | Bin .../altar/{meta6 => taiga}/kelkWallWE.png | Bin .../altar/{meta6 => taiga}/wtfisthis.png | Bin temp.json | 150 ---------------- 90 files changed, 417 insertions(+), 181 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarVariant.java create mode 100644 src/main/resources/assets/botania/blockstates/altar.json create mode 100644 src/main/resources/assets/botania/models/block/altar.json create mode 100644 src/main/resources/assets/botania/models/block/altar_liquid.json rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/wtfisthis.png (100%) delete mode 100644 temp.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index c8e9691fe..ea13625a2 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -66,6 +66,11 @@ public class BotaniaStateProps { // BlockAlfPortal public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + // BlockAltar + public static final PropertyEnum ALTAR_LIQUID_STATE = PropertyEnum.create("liquid", AltarLiquidState.class); + public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); + public static final PropertyBool MOSSY = PropertyBool.create("mossy"); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java new file mode 100644 index 000000000..78d7f8936 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AltarLiquidState implements IStringSerializable { + NONE, + WATER, + LAVA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java new file mode 100644 index 000000000..659d8436a --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -0,0 +1,22 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AltarVariant implements IStringSerializable { + DEFAULT, + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} 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 cfa72a1a9..a7e1632b5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -21,6 +21,7 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CrateVariant; @@ -111,6 +112,7 @@ public final class ModelHandler { registerWalls(); registerPanes(); registerUnstableBeaconPetal(); + registerAltars(); /** Normal Items **/ registerStandardItems(); @@ -633,6 +635,16 @@ public final class ModelHandler { } } + private static void registerAltars() { + Item item = Item.getItemFromBlock(ModBlocks.altar); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); + for (int i = 0; i < AltarVariant.values().length; i++) { + String variantName = "liquid=none,mossy=false,variant=" + AltarVariant.values()[i].getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variantName)); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index c739e8702..541185828 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -62,11 +62,11 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); + //Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); GlStateManager.scale(1F, -1F, -1F); - model.render(); + //model.render(); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); @@ -130,29 +130,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } } - - // todo 1.8 this theoretically would be completely done in models and getActualState -// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// Block block = lava ? Blocks.lava : Blocks.water; -// int brightness = lava ? 240 : -1; -// float alpha = lava ? 1F : 0.7F; -// -// GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// GlStateManager.disableAlpha(); -// if(lava) -// GlStateManager.disableLighting(); -// GlStateManager.color(1F, 1F, 1F, alpha); -// GlStateManager.translate(w, -0.3F, w); -// GlStateManager.rotate(90F, 1F, 0F, 0F); -// GlStateManager.scale(s, s, s); -// -// renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness); -// if(lava) -// GlStateManager.enableLighting(); -// GlStateManager.enableAlpha(); -// GlStateManager.disableBlend(); -// GlStateManager.popMatrix(); + GlStateManager.popMatrix(); } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a01115eeb..8a70b46af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -15,12 +15,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -38,6 +38,9 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltarLiquidState; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; @@ -63,6 +66,48 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); random = new Random(); + + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.MOSSY, false) + .withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.NONE) + .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) + ); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ALTAR_LIQUID_STATE, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta < 0 || meta >= AltarVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + TileEntity te = worldIn.getTileEntity(pos); + if (te instanceof TileAltar) { + TileAltar altar = ((TileAltar) te); + if (altar.isMossy) { + state = state.withProperty(BotaniaStateProps.MOSSY, true); + } + if (altar.hasLava()) { + state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.LAVA); + } + if (altar.hasWater()) { + state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.WATER); + } + } + return state; } @Override @@ -214,11 +259,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { return false; } - @Override - public int getRenderType() { - return LibRenderIDs.idAltar; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileAltar(); diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json new file mode 100644 index 000000000..5ccfbae44 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -0,0 +1,168 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:altar", + "textures": { + "gobletBase": "botania:model/altar/default/gobletBase", + "gobletBase2": "botania:model/altar/default/gobletBase2", + "gobletBase3": "botania:model/altar/default/gobletBase3", + "gobletStand": "botania:model/altar/default/gobletStand", + "kelkBase": "botania:model/altar/default/kelkBase", + "kelkBase2": "botania:model/altar/default/kelkBase2", + "kelkWallNorth": "botania:model/altar/default/kelkWallNS", + "kelkWallSouth": "botania:model/altar/default/kelkWallNS", + "kelkWallWest": "botania:model/altar/default/kelkWallWE", + "kelkWallEast": "botania:model/altar/default/kelkWallWE" + }, + "transform": "forge:default-block" + }, + "variants": { + "liquid": { + "none": {}, + "water": { + "submodel": { + "waterlayer": { + "model": "botania:altar_liquid", + "textures": { "liquid": "minecraft:blocks/water_still" } + } + } + }, + "lava": { + "submodel": { + "lavalayer": { + "model": "botania:altar_liquid", + "textures": { "liquid": "minecraft:blocks/lava_still" } + } + } + } + }, + "mossy": { + "true": { + "textures": { + "gobletBase": "botania:model/altar/mossy/gobletBase", + "gobletBase2": "botania:model/altar/mossy/gobletBase2", + "gobletBase3": "botania:model/altar/mossy/gobletBase3", + "gobletStand": "botania:model/altar/mossy/gobletStand", + "kelkBase": "botania:model/altar/mossy/kelkBase", + "kelkBase2": "botania:model/altar/mossy/kelkBase2", + "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", + "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" + } + }, + "false": {} + }, + "variant": { + "default": {}, + "forest": { "textures": { + "gobletBase": "botania:model/altar/forest/gobletBase", + "gobletBase2": "botania:model/altar/forest/gobletBase2", + "gobletBase3": "botania:model/altar/forest/gobletBase3", + "gobletStand": "botania:model/altar/forest/gobletStand", + "kelkBase": "botania:model/altar/forest/kelkBase", + "kelkBase2": "botania:model/altar/forest/kelkBase2", + "kelkWallNorth": "botania:model/altar/forest/kelkWallNS", + "kelkWallSouth": "botania:model/altar/forest/kelkWallNS", + "kelkWallWest": "botania:model/altar/forest/kelkWallWE", + "kelkWallEast": "botania:model/altar/forest/kelkWallWE" + }}, + "plains": { "textures": { + "gobletBase": "botania:model/altar/plains/gobletBase", + "gobletBase2": "botania:model/altar/plains/gobletBase2", + "gobletBase3": "botania:model/altar/plains/gobletBase3", + "gobletStand": "botania:model/altar/plains/gobletStand", + "kelkBase": "botania:model/altar/plains/kelkBase", + "kelkBase2": "botania:model/altar/plains/kelkBase2", + "kelkWallNorth": "botania:model/altar/plains/kelkWallNS", + "kelkWallSouth": "botania:model/altar/plains/kelkWallNS", + "kelkWallWest": "botania:model/altar/plains/kelkWallWE", + "kelkWallEast": "botania:model/altar/plains/kelkWallWE" + }}, + "mountain": { "textures": { + "gobletBase": "botania:model/altar/mountain/gobletBase", + "gobletBase2": "botania:model/altar/mountain/gobletBase2", + "gobletBase3": "botania:model/altar/mountain/gobletBase3", + "gobletStand": "botania:model/altar/mountain/gobletStand", + "kelkBase": "botania:model/altar/mountain/kelkBase", + "kelkBase2": "botania:model/altar/mountain/kelkBase2", + "kelkWallNorth": "botania:model/altar/mountain/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mountain/kelkWallNS", + "kelkWallWest": "botania:model/altar/mountain/kelkWallWE", + "kelkWallEast": "botania:model/altar/mountain/kelkWallWE" + }}, + "fungal": { "textures": { + "gobletBase": "botania:model/altar/fungal/gobletBase", + "gobletBase2": "botania:model/altar/fungal/gobletBase2", + "gobletBase3": "botania:model/altar/fungal/gobletBase3", + "gobletStand": "botania:model/altar/fungal/gobletStand", + "kelkBase": "botania:model/altar/fungal/kelkBase", + "kelkBase2": "botania:model/altar/fungal/kelkBase2", + "kelkWallNorth": "botania:model/altar/fungal/kelkWallNS", + "kelkWallSouth": "botania:model/altar/fungal/kelkWallNS", + "kelkWallWest": "botania:model/altar/fungal/kelkWallWE", + "kelkWallEast": "botania:model/altar/fungal/kelkWallWE" + }}, + "swamp": { "textures": { + "gobletBase": "botania:model/altar/swamp/gobletBase", + "gobletBase2": "botania:model/altar/swamp/gobletBase2", + "gobletBase3": "botania:model/altar/swamp/gobletBase3", + "gobletStand": "botania:model/altar/swamp/gobletStand", + "kelkBase": "botania:model/altar/swamp/kelkBase", + "kelkBase2": "botania:model/altar/swamp/kelkBase2", + "kelkWallNorth": "botania:model/altar/swamp/kelkWallNS", + "kelkWallSouth": "botania:model/altar/swamp/kelkWallNS", + "kelkWallWest": "botania:model/altar/swamp/kelkWallWE", + "kelkWallEast": "botania:model/altar/swamp/kelkWallWE" + }}, + "desert": { "textures": { + "gobletBase": "botania:model/altar/desert/gobletBase", + "gobletBase2": "botania:model/altar/desert/gobletBase2", + "gobletBase3": "botania:model/altar/desert/gobletBase3", + "gobletStand": "botania:model/altar/desert/gobletStand", + "kelkBase": "botania:model/altar/desert/kelkBase", + "kelkBase2": "botania:model/altar/desert/kelkBase2", + "kelkWallNorth": "botania:model/altar/desert/kelkWallNS", + "kelkWallSouth": "botania:model/altar/desert/kelkWallNS", + "kelkWallWest": "botania:model/altar/desert/kelkWallWE", + "kelkWallEast": "botania:model/altar/desert/kelkWallWE" + }}, + "taiga": { "textures": { + "gobletBase": "botania:model/altar/taiga/gobletBase", + "gobletBase2": "botania:model/altar/taiga/gobletBase2", + "gobletBase3": "botania:model/altar/taiga/gobletBase3", + "gobletStand": "botania:model/altar/taiga/gobletStand", + "kelkBase": "botania:model/altar/taiga/kelkBase", + "kelkBase2": "botania:model/altar/taiga/kelkBase2", + "kelkWallNorth": "botania:model/altar/taiga/kelkWallNS", + "kelkWallSouth": "botania:model/altar/taiga/kelkWallNS", + "kelkWallWest": "botania:model/altar/taiga/kelkWallWE", + "kelkWallEast": "botania:model/altar/taiga/kelkWallWE" + }}, + "mesa": { "textures": { + "gobletBase": "botania:model/altar/mesa/gobletBase", + "gobletBase2": "botania:model/altar/mesa/gobletBase2", + "gobletBase3": "botania:model/altar/mesa/gobletBase3", + "gobletStand": "botania:model/altar/mesa/gobletStand", + "kelkBase": "botania:model/altar/mesa/kelkBase", + "kelkBase2": "botania:model/altar/mesa/kelkBase2", + "kelkWallNorth": "botania:model/altar/mesa/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mesa/kelkWallNS", + "kelkWallWest": "botania:model/altar/mesa/kelkWallWE", + "kelkWallEast": "botania:model/altar/mesa/kelkWallWE" + }}, + "mossy": { "textures": { + "gobletBase": "botania:model/altar/mossy/gobletBase", + "gobletBase2": "botania:model/altar/mossy/gobletBase2", + "gobletBase3": "botania:model/altar/mossy/gobletBase3", + "gobletStand": "botania:model/altar/mossy/gobletStand", + "kelkBase": "botania:model/altar/mossy/kelkBase", + "kelkBase2": "botania:model/altar/mossy/kelkBase2", + "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", + "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" + }} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json new file mode 100644 index 000000000..f62c1febb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -0,0 +1,133 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "#gobletBase" + }, + "elements": [ + { + "name": "gobletBase", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 2.0, 16.0 ], + "faces": { + "north": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "east": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "south": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "west": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "up": { "texture": "#gobletBase", "uv": [ 4, 0, 8, 4 ] }, + "down": { "texture": "#gobletBase", "uv": [ 8, 0, 12, 4 ], "cullface": "down" } + } + }, + { + "name": "gobletBase2", + "from": [ 1.0, 2.0, 1.0 ], + "to": [ 15.0, 3.0, 15.0 ], + "faces": { + "north": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } + } + }, + { + "name": "gobletBase3", + "from": [ 2.0, 3.0, 2.0 ], + "to": [ 14.0, 4.0, 14.0 ], + "faces": { + "north": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "east": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "south": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "west": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "up": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + } + }, + { + "name": "gobletStand", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 12.0, 11.0 ], + "faces": { + "north": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "east": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "south": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "west": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] } + } + }, + { + "name": "kelkBase", + "from": [ 4.0, 12.0, 4.0 ], + "to": [ 12.0, 13.0, 12.0 ], + "faces": { + "north": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } + } + }, + { + "name": "kelkBase2", + "from": [ 3.0, 13.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + }, + { + "name": "kelkWallNorth", + "from": [ 3.0, 14.0, 2.0 ], + "to": [ 13.0, 20.0, 3.0 ], + "faces": { + "north": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallSouth", + "from": [ 3.0, 14.0, 13.0 ], + "to": [ 13.0, 20.0, 14.0 ], + "faces": { + "north": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallWest", + "from": [ 2.0, 14.0, 3.0 ], + "to": [ 3.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + }, + { + "name": "kelkWallEast", + "from": [ 13.0, 14.0, 3.0 ], + "to": [ 14.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altar_liquid.json b/src/main/resources/assets/botania/models/block/altar_liquid.json new file mode 100644 index 000000000..0f6d658d3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altar_liquid.json @@ -0,0 +1,12 @@ +{ + "elements": [ + { + "name": "liquid", + "from": [ 3.0, 19.0, 3.0 ], + "to": [ 13.0, 19.0, 13.0 ], + "faces": { + "up": { "texture": "#liquid", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png diff --git a/temp.json b/temp.json deleted file mode 100644 index 0c912e884..000000000 --- a/temp.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "gobletBase", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "gobletBase2", - "from": [ 1.0, 2.0, 1.0 ], - "to": [ 15.0, 3.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } - } - }, - { - "name": "gobletBase3", - "from": [ 2.0, 3.0, 2.0 ], - "to": [ 14.0, 4.0, 14.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } - } - }, - { - "name": "gobletStand", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 12.0, 11.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "kelkBase", - "from": [ 4.0, 12.0, 4.0 ], - "to": [ 12.0, 13.0, 12.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } - } - }, - { - "name": "kelkBase2", - "from": [ 3.0, 13.0, 3.0 ], - "to": [ 13.0, 14.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - }, - { - "name": "kelkWallNorth", - "from": [ 3.0, 14.0, 2.0 ], - "to": [ 13.0, 20.0, 3.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } - } - }, - { - "name": "kelkWallSouth", - "from": [ 3.0, 14.0, 13.0 ], - "to": [ 13.0, 20.0, 14.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } - } - }, - { - "name": "kelkWallWest", - "from": [ 2.0, 14.0, 3.0 ], - "to": [ 3.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } - } - }, - { - "name": "kelkWallEast", - "from": [ 13.0, 14.0, 3.0 ], - "to": [ 14.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } - } - }, - { - "name": "liquid", - "from": [ 3.0, 19.0, 3.0 ], - "to": [ 13.0, 19.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - } - ] -} \ No newline at end of file From 65837fbf38f51ae63504f553f6f1a56d64ea641d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 12:52:02 -0600 Subject: [PATCH 111/935] Punt on apothecary. Items first --- .../botania/api/state/BotaniaStateProps.java | 1 - .../api/state/enums/AltarLiquidState.java | 16 -------- .../client/core/handler/ModelHandler.java | 2 +- .../client/render/tile/RenderTileAltar.java | 35 +++++++++++++++--- .../botania/common/block/BlockAltar.java | 20 +++++----- .../{altar.json => altar_temp.json} | 19 ---------- .../botania/models/block/altar_liquid.json | 12 ------ .../model/altar/default/gobletBase.png | Bin 798 -> 932 bytes 8 files changed, 42 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java rename src/main/resources/assets/botania/blockstates/{altar.json => altar_temp.json} (94%) delete mode 100644 src/main/resources/assets/botania/models/block/altar_liquid.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index ea13625a2..9b7040041 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -67,7 +67,6 @@ public class BotaniaStateProps { public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); // BlockAltar - public static final PropertyEnum ALTAR_LIQUID_STATE = PropertyEnum.create("liquid", AltarLiquidState.class); public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); public static final PropertyBool MOSSY = PropertyBool.create("mossy"); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java deleted file mode 100644 index 78d7f8936..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java +++ /dev/null @@ -1,16 +0,0 @@ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum AltarLiquidState implements IStringSerializable { - NONE, - WATER, - LAVA; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } -} 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 a7e1632b5..79663328e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -639,7 +639,7 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.altar); String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); for (int i = 0; i < AltarVariant.values().length; i++) { - String variantName = "liquid=none,mossy=false,variant=" + AltarVariant.values()[i].getName(); + String variantName = "mossy=false,variant=" + AltarVariant.values()[i].getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variantName)); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 541185828..97fe55f40 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -28,6 +28,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -62,11 +64,11 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); - //Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); + Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); GlStateManager.scale(1F, -1F, -1F); - //model.render(); + model.render(); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); @@ -130,6 +132,28 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } } + + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Fluid fluid = lava ? FluidRegistry.LAVA : FluidRegistry.WATER; + int brightness = lava ? 240 : -1; + float alpha = lava ? 1F : 0.7F; + + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableAlpha(); + if(lava) + GlStateManager.disableLighting(); + GlStateManager.color(1F, 1F, 1F, alpha); + GlStateManager.translate(w, -0.3F, w); + GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.scale(s, s, s); + + renderIcon(0, 0, fluid.getStill(), 16, 16, brightness); + if(lava) + GlStateManager.enableLighting(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); GlStateManager.popMatrix(); } GlStateManager.popMatrix(); @@ -137,11 +161,12 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { forceMeta = -1; } - public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, ResourceLocation loc, int par4, int par5, int brightness) { + TextureAtlasSprite par3Icon = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(loc.toString()); Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - if(brightness != -1) - //tessellator.getWorldRenderer().setBrightness(brightness); + //if(brightness != -1) + //tessellator.getWorldRenderer().putBrightness4(brightness, brightness, brightness, brightness); tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 8a70b46af..48a74775a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -28,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -39,7 +40,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltarLiquidState; import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; @@ -69,14 +69,13 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.MOSSY, false) - .withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.NONE) .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.ALTAR_LIQUID_STATE, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); + return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); } @Override @@ -97,19 +96,19 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { TileEntity te = worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = ((TileAltar) te); + if (altar.isMossy) { state = state.withProperty(BotaniaStateProps.MOSSY, true); } - if (altar.hasLava()) { - state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.LAVA); - } - if (altar.hasWater()) { - state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.WATER); - } } return state; } + @Override + public int getRenderType() { + return 2; + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -171,6 +170,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setWater(true); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); } return true; @@ -181,6 +181,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(true); tile.setWater(false); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); return true; } else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { @@ -197,6 +198,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(false); else tile.setWater(false); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); return true; } diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar_temp.json similarity index 94% rename from src/main/resources/assets/botania/blockstates/altar.json rename to src/main/resources/assets/botania/blockstates/altar_temp.json index 5ccfbae44..172fe66d2 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar_temp.json @@ -17,25 +17,6 @@ "transform": "forge:default-block" }, "variants": { - "liquid": { - "none": {}, - "water": { - "submodel": { - "waterlayer": { - "model": "botania:altar_liquid", - "textures": { "liquid": "minecraft:blocks/water_still" } - } - } - }, - "lava": { - "submodel": { - "lavalayer": { - "model": "botania:altar_liquid", - "textures": { "liquid": "minecraft:blocks/lava_still" } - } - } - } - }, "mossy": { "true": { "textures": { diff --git a/src/main/resources/assets/botania/models/block/altar_liquid.json b/src/main/resources/assets/botania/models/block/altar_liquid.json deleted file mode 100644 index 0f6d658d3..000000000 --- a/src/main/resources/assets/botania/models/block/altar_liquid.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "elements": [ - { - "name": "liquid", - "from": [ 3.0, 19.0, 3.0 ], - "to": [ 13.0, 19.0, 13.0 ], - "faces": { - "up": { "texture": "#liquid", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png index bbcc942a1fa99b151affda6f4f28a8d32fb4f0ac..24c7ef284b3a9952dbc6dafac3d7338c741c7f47 100644 GIT binary patch delta 923 zcmbQowuF6xc)bG$8v_Hws?5TBK#HZ<$uool2x>S|Iv5z3qdi?5Ln`LHz3%P*%17q- z$M;(tw67QWGU&UDI2XJ=7yi8aL#gDQ83N8Kaou-TUYZtn?$C{=n^V&0KMNB(dV^^=OLm|^P8@ZAf3Y4Yu~MCX-uro~XMW@N@8v+J z?RziWrnvIT^$CswDxsH3=f@{Y_@W`Sbohm#3UNJt>ayZl3whg;8tWw%@K-XWbowM zw`m$(5qi^)6#D2*cfS5r{^aRN^B9g77Q{}E(L0`DqQud(zA;#{N#TG2&#J3h<>loS z^W3fGs&O#&_4Q?Jjk;7Bc_})GvD%d9g3 z8Y=u@ulwq&TBn~*nm%3pk%d~9lGjq9!w)BTEp=LaQK2u{=kk*$Pgsr@uDF_Y=l*@~ zr~f-SSA?zJvv1#~sI?uBXIS(_uD`zJb}ld+C!b`wY;yDV?ZdzjNo$#n-E9YFsXx@G81oifIve rQ)d0I^>O{LsIEmC_|d8VSMx>sjpD?woVcY6%zX@=u6{1-oD!M<^w`L; delta 788 zcmZ3&K96mJc)bD#8v_HwqPcY~K#H+A$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBK4*bP zWHAE+-(e7DJf6QI1t=&{;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XP{^HrziP70|QgP zr;B4qhV#?uvEHv71&;lWyX0=rb>-A`C$F_N^`38)6rH)hI_(WublUEfOx@u=kvEny zF-gs`6$Sr|`RpDWZ{GdCIiR|}e)`)o?ax1B+72(Yv9a;k8+Sdu`yun1<(F3;6YFl> zvuDqneVg<5EfzfQws_*CriA_Xr_Y`(tvS`pNP_1`(&LX2kI$b!|LNB+t-W#nYLh#~ zgl4_ZIAR=J&s20bFZ|s3^GhRiUTr?g(0b?Y-OPz1&FgRGyn~wO(|I*Zb*h&uS8G$# z)}spCKY#zOzL{ed#c+O0O$Nw9h18aSa|MNk8-qI~KJSjvyUKooapBKCH=EZbR$lL3 zzVz&zdO9_Rw|DRy$=*6EWOZof z)~KTD>eZ|*&#a|Bo)Jkr?q)cJahqFWS5mRHrRBw+%Z{%7aiPXtd0y?@K!!+<;Suqf{UqC4k!F1AXV0X~H+{Mv$^5_dXp64av(J@t^SNBV zg7x3*so%GE@5?z(2GdV#dIonMVrVVwT&NHwKh^m&Shtt-=4R)4VXnHtoL|>m= zd*z0&zRCTI9qDF^=UhDV{N~M>Vh5M6bh*Qo;LEt}U@OSQJWdRowyfQ1AboZJyU#fV zHEm#Tq)oZ`MEBjNPoMV3XKC1gjhK+^R=r|2zrO1qQ1p-PUuKs}ZP#ZC z?KwB)LFqD<^~S0db2SgX_Th|6_xfNJ+=M3e(t+d%;4$j=d#Wz Gp$P!DIC+Ku From 5b1ac0368d924b396352985195e7a9a466ed7a08 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 15:39:45 -0600 Subject: [PATCH 112/935] Quartz, prismarine, various items, fix upper slab uvlock --- .../api/state/enums/CustomBrickVariant.java | 2 +- .../api/state/enums/PrismarineVariant.java | 2 +- .../client/core/handler/ModelHandler.java | 77 +++++++++++-------- .../botania/client/model/ModelHourglass.java | 4 +- .../decor/quartz/BlockSpecialQuartz.java | 6 +- .../prismarine/BlockDarkPrismarineSlab.java | 2 +- .../prismarine/BlockDarkPrismarineStairs.java | 2 +- .../botania/blockstates/biomeStoneA0Slab.json | 3 +- .../blockstates/biomeStoneA10Slab.json | 3 +- .../blockstates/biomeStoneA11Slab.json | 3 +- .../blockstates/biomeStoneA12Slab.json | 3 +- .../blockstates/biomeStoneA13Slab.json | 3 +- .../blockstates/biomeStoneA14Slab.json | 3 +- .../blockstates/biomeStoneA15Slab.json | 3 +- .../botania/blockstates/biomeStoneA1Slab.json | 3 +- .../botania/blockstates/biomeStoneA2Slab.json | 3 +- .../botania/blockstates/biomeStoneA3Slab.json | 3 +- .../botania/blockstates/biomeStoneA4Slab.json | 3 +- .../botania/blockstates/biomeStoneA5Slab.json | 3 +- .../botania/blockstates/biomeStoneA6Slab.json | 3 +- .../botania/blockstates/biomeStoneA7Slab.json | 3 +- .../botania/blockstates/biomeStoneA8Slab.json | 3 +- .../botania/blockstates/biomeStoneA9Slab.json | 3 +- .../botania/blockstates/biomeStoneB0Slab.json | 3 +- .../botania/blockstates/biomeStoneB1Slab.json | 3 +- .../botania/blockstates/biomeStoneB2Slab.json | 3 +- .../botania/blockstates/biomeStoneB3Slab.json | 3 +- .../botania/blockstates/biomeStoneB4Slab.json | 3 +- .../botania/blockstates/biomeStoneB5Slab.json | 3 +- .../botania/blockstates/biomeStoneB6Slab.json | 3 +- .../botania/blockstates/biomeStoneB7Slab.json | 3 +- .../assets/botania/blockstates/cellBlock.json | 14 ++++ .../botania/blockstates/customBrick.json | 27 +++++++ .../botania/blockstates/customBrick0Slab.json | 3 +- .../botania/blockstates/customBrick1Slab.json | 3 +- .../botania/blockstates/customBrick2Slab.json | 3 +- .../botania/blockstates/customBrick3Slab.json | 3 +- .../botania/blockstates/dirtPath0Slab.json | 3 +- .../botania/blockstates/dreamwood0Slab.json | 3 +- .../botania/blockstates/dreamwood1Slab.json | 3 +- .../blockstates/endStoneBrick0Slab.json | 3 +- .../blockstates/endStoneBrick2Slab.json | 3 +- .../botania/blockstates/livingrock0Slab.json | 3 +- .../botania/blockstates/livingrock1Slab.json | 3 +- .../botania/blockstates/livingwood0Slab.json | 3 +- .../botania/blockstates/livingwood1Slab.json | 3 +- .../botania/blockstates/pavement0Slab.json | 3 +- .../botania/blockstates/pavement1Slab.json | 3 +- .../botania/blockstates/pavement2Slab.json | 3 +- .../botania/blockstates/pavement3Slab.json | 3 +- .../botania/blockstates/pavement4Slab.json | 3 +- .../botania/blockstates/pavement5Slab.json | 3 +- .../botania/blockstates/prismarine.json | 14 ++++ .../botania/blockstates/prismarine0Slab.json | 3 +- .../botania/blockstates/prismarine1Slab.json | 3 +- .../botania/blockstates/prismarine2Slab.json | 3 +- .../blockstates/quartzSlabBlazeHalf.json | 3 +- .../blockstates/quartzSlabDarkHalf.json | 3 +- .../blockstates/quartzSlabElfHalf.json | 3 +- .../blockstates/quartzSlabLavenderHalf.json | 3 +- .../blockstates/quartzSlabManaHalf.json | 3 +- .../blockstates/quartzSlabRedHalf.json | 3 +- .../blockstates/quartzSlabSunnyHalf.json | 3 +- .../botania/blockstates/quartzTypeBlaze.json | 16 ++++ .../botania/blockstates/quartzTypeDark.json | 16 ++++ .../botania/blockstates/quartzTypeElf.json | 16 ++++ .../blockstates/quartzTypeLavender.json | 16 ++++ .../botania/blockstates/quartzTypeMana.json | 16 ++++ .../botania/blockstates/quartzTypeRed.json | 16 ++++ .../botania/blockstates/quartzTypeSunny.json | 16 ++++ .../botania/blockstates/reedBlock0Slab.json | 3 +- .../assets/botania/blockstates/seaLamp.json | 14 ++++ .../botania/blockstates/shimmerrock0Slab.json | 3 +- .../blockstates/shimmerwoodPlanks0Slab.json | 3 +- .../botania/blockstates/stone0Slab.json | 3 +- .../botania/blockstates/stone10Slab.json | 3 +- .../botania/blockstates/stone11Slab.json | 3 +- .../botania/blockstates/stone1Slab.json | 3 +- .../botania/blockstates/stone2Slab.json | 3 +- .../botania/blockstates/stone3Slab.json | 3 +- .../botania/blockstates/stone8Slab.json | 3 +- .../botania/blockstates/stone9Slab.json | 3 +- .../botania/blockstates/thatch0Slab.json | 3 +- .../botania/models/item/grassSeeds0.json | 6 ++ .../botania/models/item/grassSeeds1.json | 6 ++ .../botania/models/item/grassSeeds2.json | 6 ++ .../botania/models/item/grassSeeds3.json | 6 ++ .../botania/models/item/grassSeeds4.json | 6 ++ .../botania/models/item/grassSeeds5.json | 6 ++ .../botania/models/item/grassSeeds6.json | 6 ++ .../botania/models/item/grassSeeds7.json | 6 ++ .../botania/models/item/grassSeeds8.json | 6 ++ .../assets/botania/models/item/quartz0.json | 6 ++ .../assets/botania/models/item/quartz1.json | 6 ++ .../assets/botania/models/item/quartz2.json | 6 ++ .../assets/botania/models/item/quartz3.json | 6 ++ .../assets/botania/models/item/quartz4.json | 6 ++ .../assets/botania/models/item/quartz5.json | 6 ++ .../assets/botania/models/item/quartz6.json | 6 ++ .../botania/models/item/signalFlare.json | 7 ++ 100 files changed, 469 insertions(+), 105 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/cellBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/customBrick.json create mode 100644 src/main/resources/assets/botania/blockstates/prismarine.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeDark.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeElf.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeLavender.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeMana.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeRed.json create mode 100644 src/main/resources/assets/botania/blockstates/quartzTypeSunny.json create mode 100644 src/main/resources/assets/botania/blockstates/seaLamp.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds0.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds1.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds2.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds3.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds4.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds5.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds6.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds7.json create mode 100644 src/main/resources/assets/botania/models/item/grassSeeds8.json create mode 100644 src/main/resources/assets/botania/models/item/quartz0.json create mode 100644 src/main/resources/assets/botania/models/item/quartz1.json create mode 100644 src/main/resources/assets/botania/models/item/quartz2.json create mode 100644 src/main/resources/assets/botania/models/item/quartz3.json create mode 100644 src/main/resources/assets/botania/models/item/quartz4.json create mode 100644 src/main/resources/assets/botania/models/item/quartz5.json create mode 100644 src/main/resources/assets/botania/models/item/quartz6.json create mode 100644 src/main/resources/assets/botania/models/item/signalFlare.json diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index f1aeb6476..e8582c8bc 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -9,7 +9,7 @@ public enum CustomBrickVariant implements IStringSerializable { SOUL_BRICK, FROSTY_BRICK, ROOF_TILE, - AZULEJO_1, // todo 1.8 must rename these + AZULEJO_1, AZULEJO_2, AZULEJO_3, AZULEJO_4, diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java index fa72d6b0c..95aa0a100 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -7,7 +7,7 @@ import java.util.Locale; public enum PrismarineVariant implements IStringSerializable { PRISMARINE, PRISMARINE_BRICKS, - DARK_PRIMSARINE; + DARK_PRISMARINE; @Override public String getName() { 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 79663328e..1261e1225 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -25,11 +25,13 @@ import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CrateVariant; +import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; @@ -111,17 +113,21 @@ public final class ModelHandler { registerSlabs(); registerWalls(); registerPanes(); - registerUnstableBeaconPetal(); registerAltars(); + registerQuartzBlocks(); /** Normal Items **/ registerStandardItems(); registerManaResources(); - registerDyesPetals(); registerRunes(); registerBows(); registerLens(); + registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); + registerItemModelAllMeta(dye, EnumDyeColor.values().length); + registerItemModelAllMeta(petal, EnumDyeColor.values().length); + registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); + registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ @@ -209,6 +215,13 @@ public final class ModelHandler { registerItemModel(ModBlocks.thatch); registerItemModel(ModBlocks.blazeBlock); registerItemModel(ModBlocks.forestEye); + registerItemModel(ModBlocks.seaLamp); + registerItemModel(ModBlocks.cellBlock); + + // Item models which all use the same base model and recolored by render layer + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); @@ -223,6 +236,8 @@ public final class ModelHandler { registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); } private static void registerStandardItems() { @@ -295,22 +310,6 @@ public final class ModelHandler { } } - private static void registerDyesPetals() { - Item item = dye; - String name = GameData.getItemRegistry().getNameForObject(item).toString(); - - Item item2 = petal; - String name2 = GameData.getItemRegistry().getNameForObject(item2).toString(); - - for (EnumDyeColor color : EnumDyeColor.values()) { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); - - ModelLoader.registerItemVariants(item2, new ModelResourceLocation(name2, "inventory")); - ModelLoader.setCustomModelResourceLocation(item2, color.getMetadata(), new ModelResourceLocation(name2, "inventory")); - } - } - private static void registerRunes() { List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); for (int i = 0; i < variantNames.size(); i++) { @@ -623,18 +622,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.managlassPane); } - private static void registerUnstableBeaconPetal() { - // The blocks that are dynamically colored, not through their states - for (EnumDyeColor color : EnumDyeColor.values()) { - Item unstable = Item.getItemFromBlock(ModBlocks.unstableBlock); - Item beacon = Item.getItemFromBlock(ModBlocks.manaBeacon); - Item petal = Item.getItemFromBlock(ModBlocks.petalBlock); - ModelLoader.setCustomModelResourceLocation(unstable, color.getMetadata(), new ModelResourceLocation("botania:unstableBlock", "inventory")); - ModelLoader.setCustomModelResourceLocation(beacon, color.getMetadata(), new ModelResourceLocation("botania:manaBeacon", "inventory")); - ModelLoader.setCustomModelResourceLocation(petal, color.getMetadata(), new ModelResourceLocation("botania:petalBlock", "inventory")); - } - } - private static void registerAltars() { Item item = Item.getItemFromBlock(ModBlocks.altar); String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); @@ -645,6 +632,19 @@ public final class ModelHandler { } } + private static void registerQuartzBlocks() { + for (Block b : ImmutableList.of(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { + Item item = Item.getItemFromBlock(b); + String name = GameData.getBlockRegistry().getNameForObject(b).toString(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=normal")); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=chiseled")); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=pillar_y")); + 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")); + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { @@ -655,8 +655,23 @@ 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 = GameData.getItemRegistry().getNameForObject(item).toString(); + for(int i = 0; i < range; i++) { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(loc, "inventory")); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(loc, "inventory")); + } + } + + /** + * Registers each meta of an item to models/item/registryname.json + * Range is exclusive upper bound + */ private static void registerItemModelMetas(Item item, String loc, int range) { - for(int i = 0; i < range;i++) { + for(int i = 0; i < range; i++) { String name = "botania:" + loc + i; ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index d6a0e23dd..57f64a14b 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -66,7 +66,7 @@ public class ModelHourglass extends ModelBase { base1.render(f); base2.render(f); Color c = new Color(color); - GlStateManager.color((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); + GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); GL11.glPushAttrib(GL11.GL_NORMALIZE); GlStateManager.enableNormalize(); @@ -99,7 +99,7 @@ public class ModelHourglass extends ModelBase { } GL11.glPopAttrib(); - GlStateManager.color(1F, 1F, 1F); + GL11.glColor3f(1, 1, 1); glass1.render(f); glass2.render(f); } 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 d95a8013e..89607cb79 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 @@ -57,7 +57,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.QUARTZ_VARIANT).ordinal(); } @Override @@ -105,7 +105,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override public int damageDropped(IBlockState state) { - QuartzVariant variant = ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)); + QuartzVariant variant = state.getValue(BotaniaStateProps.QUARTZ_VARIANT); if (variant == QuartzVariant.PILLAR_X || variant == QuartzVariant.PILLAR_Z) { state = state.withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y); } @@ -119,7 +119,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override public int getRenderType() { - return 39; + return 3; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java index a5e50fd2d..b89bc6f21 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java @@ -7,7 +7,7 @@ import vazkii.botania.common.block.ModFluffBlocks; public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { public BlockDarkPrismarineSlab(boolean full) { - super(full, PrismarineVariant.DARK_PRIMSARINE); + super(full, PrismarineVariant.DARK_PRISMARINE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java index 6cd368765..db71c7774 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java @@ -6,7 +6,7 @@ import vazkii.botania.api.state.enums.PrismarineVariant; public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { public BlockDarkPrismarineStairs() { - super(PrismarineVariant.DARK_PRIMSARINE); + super(PrismarineVariant.DARK_PRISMARINE); } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json index 26b01e0ad..932a9150f 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json index 2e3c9ce2d..42384d85f 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json index 492cdefab..5c5c29ae4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json index a78647e5d..a30da66e1 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json index 3d9e905fd..bfa7b1f12 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json index ff31c6527..40015ed13 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json index 1c3854d5a..efc0755f4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json index 638726afe..6d830d0b3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json index e9dd7f308..494d3e4f9 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json index 1ff94cdb9..e6ebd77a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json index d77ac77b1..659103f1a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json index 7c2a4ddde..2d286158c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json index 1a2d2d869..bc6cf0a01 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json index cd57da54c..e425405d4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json index 5cc3c87d6..fb7879f92 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json index 188d82abf..3628a3d9e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json index 37969ece4..c28daf734 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json index 1daf216ef..d2b187a97 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json index 8a077688c..751fa02bf 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json index ade89b09b..87be524ef 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json index c0dfa9c93..7674c1ff1 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json index 068ce5beb..080478ca7 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json index 7da39aff8..da1feee89 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json index dec2e4dbc..44ab63c49 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json new file mode 100644 index 000000000..b14eadd13 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/cellBlock" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick.json b/src/main/resources/assets/botania/blockstates/customBrick.json new file mode 100644 index 000000000..c8807f13f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/customBrick.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "hellish_brick": { "textures": { "all": "botania:blocks/customBrick0" } }, + "soul_brick": { "textures": { "all": "botania:blocks/customBrick1" } }, + "frosty_brick": { "textures": { "all": "botania:blocks/customBrick2" } }, + "roof_tile": { "textures": { "all": "botania:blocks/customBrick3" } }, + "azulejo_1": { "textures": { "all": "botania:blocks/customBrick4" } }, + "azulejo_2": { "textures": { "all": "botania:blocks/customBrick5" } }, + "azulejo_3": { "textures": { "all": "botania:blocks/customBrick6" } }, + "azulejo_4": { "textures": { "all": "botania:blocks/customBrick7" } }, + "azulejo_5": { "textures": { "all": "botania:blocks/customBrick8" } }, + "azulejo_6": { "textures": { "all": "botania:blocks/customBrick9" } }, + "azulejo_7": { "textures": { "all": "botania:blocks/customBrick10" } }, + "azulejo_8": { "textures": { "all": "botania:blocks/customBrick11" } }, + "azulejo_9": { "textures": { "all": "botania:blocks/customBrick12" } }, + "azulejo_10": { "textures": { "all": "botania:blocks/customBrick13" } }, + "azulejo_11": { "textures": { "all": "botania:blocks/customBrick14" } }, + "azulejo_12": { "textures": { "all": "botania:blocks/customBrick15" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json index 8831d3fe6..003182a31 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json index c4b1be5b2..d1155de5b 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json index a5f1e51f5..34b5c8e59 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json index f91ff8793..58a5330a0 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json index 609f3c254..f052f297d 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json index bbbe129ed..8521a9854 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json index ff2fcf790..550583fe7 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json index deb5a96ac..b3e717f45 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json index 26735e56f..eabc7e3a6 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json index 190b2dc17..9d25d84ea 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json index 66937cf5d..d06490b80 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json index 4f185b5b8..434e23575 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json index 9dd7a8390..9211425a8 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0Slab.json index 14b6c0b05..86d73e29f 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1Slab.json index 3b757b046..4c00ba077 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2Slab.json index 2267776d9..1839a6cba 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3Slab.json index fe1f093fd..ab3ddf3c9 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement3Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4Slab.json index 77d541496..0a1c72b64 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement4Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5Slab.json index 9e225f073..ec83954b1 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement5Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/prismarine.json b/src/main/resources/assets/botania/blockstates/prismarine.json new file mode 100644 index 000000000..06f4f69ea --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prismarine.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "prismarine": { "textures": { "all": "botania:blocks/prismarine0" } }, + "prismarine_bricks": { "textures": { "all": "botania:blocks/prismarine1" } }, + "dark_prismarine": { "textures": { "all": "botania:blocks/prismarine2" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json index 298f5d686..24486d75c 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json index e26fcac06..9c9871a93 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json +++ b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json index 29219a2ca..e4a919630 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json +++ b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json index 7705bc87a..99e35dfbb 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json index 8ca8be7bc..85dd37cca 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json index d81a802f5..78573a0a7 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json index 56f856ee3..87d48c58d 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json index cceba9781..f94866467 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json index 7f7e3954c..38b9e93cb 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json index 0a36b02be..0b8a0aa99 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json new file mode 100644 index 000000000..30250402a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockBlazeQuartz0", "top": "botania:blocks/blockBlazeQuartz1", "side": "botania:blocks/blockBlazeQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledBlazeQuartz1", "top": "botania:blocks/chiseledBlazeQuartz1", "side": "botania:blocks/chiseledBlazeQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json new file mode 100644 index 000000000..381f8deb6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockDarkQuartz0", "top": "botania:blocks/blockDarkQuartz1", "side": "botania:blocks/blockDarkQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledDarkQuartz1", "top": "botania:blocks/chiseledDarkQuartz1", "side": "botania:blocks/chiseledDarkQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json new file mode 100644 index 000000000..836d0e572 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockElfQuartz0", "top": "botania:blocks/blockElfQuartz1", "side": "botania:blocks/blockElfQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledElfQuartz1", "top": "botania:blocks/chiseledElfQuartz1", "side": "botania:blocks/chiseledElfQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json new file mode 100644 index 000000000..c7588ddb6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockLavenderQuartz0", "top": "botania:blocks/blockLavenderQuartz1", "side": "botania:blocks/blockLavenderQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledLavenderQuartz1", "top": "botania:blocks/chiseledLavenderQuartz1", "side": "botania:blocks/chiseledLavenderQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json new file mode 100644 index 000000000..b655625fb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockManaQuartz0", "top": "botania:blocks/blockManaQuartz1", "side": "botania:blocks/blockManaQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledManaQuartz1", "top": "botania:blocks/chiseledManaQuartz1", "side": "botania:blocks/chiseledManaQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json new file mode 100644 index 000000000..b7f12f67c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockRedQuartz0", "top": "botania:blocks/blockRedQuartz1", "side": "botania:blocks/blockRedQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledRedQuartz1", "top": "botania:blocks/chiseledRedQuartz1", "side": "botania:blocks/chiseledRedQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json new file mode 100644 index 000000000..bed541082 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "normal": { "textures": { "bottom": "botania:blocks/blockSunnyQuartz0", "top": "botania:blocks/blockSunnyQuartz1", "side": "botania:blocks/blockSunnyQuartz2" } }, + "chiseled": { "textures": { "bottom": "botania:blocks/chiseledSunnyQuartz1", "top": "botania:blocks/chiseledSunnyQuartz1", "side": "botania:blocks/chiseledSunnyQuartz0" } }, + "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, + "pillar_y": { "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, + "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json index 7eaf54181..73f9957ca 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/seaLamp.json b/src/main/resources/assets/botania/blockstates/seaLamp.json new file mode 100644 index 000000000..a91f2a227 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/seaLamp.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/seaLamp" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json index 77c9c3667..4daa48cde 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json index 0b94b90be..438a1fcf2 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json index 69bc192bc..e89c9749c 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json index e34591679..a35008ce3 100644 --- a/src/main/resources/assets/botania/blockstates/stone10Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone10Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json index d552b8011..9eb36491f 100644 --- a/src/main/resources/assets/botania/blockstates/stone11Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone11Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json index 4508c5ae4..af0f40a52 100644 --- a/src/main/resources/assets/botania/blockstates/stone1Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone1Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json index fe8112611..9fd9a2319 100644 --- a/src/main/resources/assets/botania/blockstates/stone2Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone2Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json index 8cc0f549c..567b35dc0 100644 --- a/src/main/resources/assets/botania/blockstates/stone3Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone3Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json index 1b98c7a73..c841c3a9c 100644 --- a/src/main/resources/assets/botania/blockstates/stone8Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone8Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json index 3c15896c2..85faa62e9 100644 --- a/src/main/resources/assets/botania/blockstates/stone9Slab.json +++ b/src/main/resources/assets/botania/blockstates/stone9Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/blockstates/thatch0Slab.json b/src/main/resources/assets/botania/blockstates/thatch0Slab.json index d71cfd06a..cbeb6431f 100644 --- a/src/main/resources/assets/botania/blockstates/thatch0Slab.json +++ b/src/main/resources/assets/botania/blockstates/thatch0Slab.json @@ -11,7 +11,8 @@ }, "variants": { "half=top": [{ - "x": 180 + "x": 180, + "uvlock": true }], "half=bottom": [{}], "inventory": [{}] diff --git a/src/main/resources/assets/botania/models/item/grassSeeds0.json b/src/main/resources/assets/botania/models/item/grassSeeds0.json new file mode 100644 index 000000000..f99477000 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds1.json b/src/main/resources/assets/botania/models/item/grassSeeds1.json new file mode 100644 index 000000000..2f70b43b4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds2.json b/src/main/resources/assets/botania/models/item/grassSeeds2.json new file mode 100644 index 000000000..acd7540ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds3.json b/src/main/resources/assets/botania/models/item/grassSeeds3.json new file mode 100644 index 000000000..25c399102 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds4.json b/src/main/resources/assets/botania/models/item/grassSeeds4.json new file mode 100644 index 000000000..4f89d6d7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds5.json b/src/main/resources/assets/botania/models/item/grassSeeds5.json new file mode 100644 index 000000000..8d96bf305 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds6.json b/src/main/resources/assets/botania/models/item/grassSeeds6.json new file mode 100644 index 000000000..7e059fa2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds6.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds7.json b/src/main/resources/assets/botania/models/item/grassSeeds7.json new file mode 100644 index 000000000..b509746a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds7.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds8.json b/src/main/resources/assets/botania/models/item/grassSeeds8.json new file mode 100644 index 000000000..1cac2f89a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassSeeds8.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassSeeds8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz0.json b/src/main/resources/assets/botania/models/item/quartz0.json new file mode 100644 index 000000000..7ab7d7462 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz1.json b/src/main/resources/assets/botania/models/item/quartz1.json new file mode 100644 index 000000000..988ddd9e9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz2.json b/src/main/resources/assets/botania/models/item/quartz2.json new file mode 100644 index 000000000..bef9392e6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz3.json b/src/main/resources/assets/botania/models/item/quartz3.json new file mode 100644 index 000000000..1083fca56 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz4.json b/src/main/resources/assets/botania/models/item/quartz4.json new file mode 100644 index 000000000..0ddeca304 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz5.json b/src/main/resources/assets/botania/models/item/quartz5.json new file mode 100644 index 000000000..106269ccf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/quartz6.json b/src/main/resources/assets/botania/models/item/quartz6.json new file mode 100644 index 000000000..6709d39c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/quartz6.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/quartz6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/signalFlare.json b/src/main/resources/assets/botania/models/item/signalFlare.json new file mode 100644 index 000000000..0f955129e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/signalFlare.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/signalFlare0", + "layer1": "botania:items/signalFlare1" + } +} \ No newline at end of file From e83d1600cf912cbdb5d70e5f6b7eafe8aebaa4c7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 16:52:30 -0600 Subject: [PATCH 113/935] Blood pendant, enchanted soil, enchanter, open bucket, prism, fix some rendering --- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/HUDHandler.java | 4 ++-- .../client/core/handler/ModelHandler.java | 8 +++++++ .../handler/SubTileRadiusRenderHandler.java | 8 +++---- .../client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../client/render/tile/RenderTilePrism.java | 5 ++-- .../render/tile/RenderTileSparkChanger.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 3 +-- .../botania/common/item/ItemCraftingHalo.java | 2 +- .../botania/common/item/ItemOpenBucket.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 2 +- .../botania/blockstates/enchantedSoil.json | 16 +++++++++++++ .../assets/botania/blockstates/enchanter.json | 15 ++++++++++++ .../assets/botania/blockstates/prism.json | 23 +++++++++++++++++++ .../assets/botania/models/block/prism.json | 20 ++++++++++++++++ .../botania/models/item/bloodPendant.json | 7 ++++++ .../botania/models/item/laputaShard.json | 6 +++++ .../botania/models/item/openBucket.json | 6 +++++ 21 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/enchantedSoil.json create mode 100644 src/main/resources/assets/botania/blockstates/enchanter.json create mode 100644 src/main/resources/assets/botania/blockstates/prism.json create mode 100644 src/main/resources/assets/botania/models/block/prism.json create mode 100644 src/main/resources/assets/botania/models/item/bloodPendant.json create mode 100644 src/main/resources/assets/botania/models/item/laputaShard.json create mode 100644 src/main/resources/assets/botania/models/item/openBucket.json 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 fc1321474..ab920d928 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -136,7 +136,7 @@ public final class BaubleRenderHandler { // ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); // // Color color = new Color(item.getColorFromItemStack(stack, 1)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 2f14b0c0c..3c6b43fc6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -114,7 +114,7 @@ public final class BoundTileRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(pos.getX() - getRenderPosX(), pos.getY() - getRenderPosY(), pos.getZ() - getRenderPosZ() + 1); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; Block block = world.getBlockState(pos).getBlock(); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 2ce1d396d..fc7305c31 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -259,7 +259,7 @@ public final class HUDHandler { } Color color = new Color(Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed())); mc.renderEngine.bindTexture(manaBar); GlStateManager.enableBlend(); @@ -484,7 +484,7 @@ public final class HUDHandler { RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3); Color color_ = new Color(color); - GlStateManager.color((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); + GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); } } 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 1261e1225..ff5ce6e81 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -123,6 +123,7 @@ public final class ModelHandler { registerBows(); registerLens(); + registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); registerItemModelAllMeta(petal, EnumDyeColor.values().length); @@ -217,6 +218,9 @@ public final class ModelHandler { registerItemModel(ModBlocks.forestEye); registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.cellBlock); + registerItemModel(ModBlocks.enchantedSoil); + registerItemModel(ModBlocks.enchanter); + registerItemModel(ModBlocks.prism); // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); @@ -299,6 +303,10 @@ public final class ModelHandler { registerItemModel(tornadoRod); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); + + registerItemModel(openBucket); + registerItemModel(bloodPendant); + } private static void registerManaResources() { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index d8a881d58..50aee0fab 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -102,7 +102,7 @@ public final class SubTileRadiusRenderHandler { int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; double x = aabb.maxX - aabb.minX - f; @@ -119,7 +119,7 @@ public final class SubTileRadiusRenderHandler { x += f; z += f; double f1 = f + f / 4F; - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); tessellator.getWorldRenderer().pos(x, f1, 0).endVertex(); tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); @@ -139,7 +139,7 @@ public final class SubTileRadiusRenderHandler { int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; @@ -162,7 +162,7 @@ public final class SubTileRadiusRenderHandler { radius += f; double f1 = f + f / 4F; - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { 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 155ff4d7f..9ffc403f5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -87,7 +87,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 7e701257a..0b5d1e74b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -73,7 +73,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); 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 5baca290e..8002c1b0d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -41,8 +42,8 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(0F, 0F, pos); - // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); + GlStateManager.translate(0.5F, 0.5F, pos); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 338540d6e..16511c14e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -48,7 +48,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); // float f = icon.getMinU(); // float f1 = icon.getMaxU(); // float f2 = icon.getMinV(); 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 c913900e6..310b05a28 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -78,7 +78,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION))) { + switch (state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)) { case Z: return 1; case X: default: return 0; 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 18c6fb4ae..deef965ba 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -80,7 +80,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi @Override @SideOnly(Side.CLIENT) public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 + return EnumWorldBlockLayer.TRANSLUCENT; } @Override @@ -123,7 +123,6 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi prism.setInventorySlotContents(0, null); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); -// par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index d4f2b3f70..0a79ea6ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -457,7 +457,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass); if(icon != null) { Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index ff0189ec5..0ee5f41d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -45,7 +45,7 @@ public class ItemOpenBucket extends ItemMod { return par1ItemStack; Material material = par2World.getBlockState(pos).getBlock().getMaterial(); - int l = par2World.getBlockState(pos).getValue(BlockLiquid.LEVEL); + 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) { par2World.setBlockToAir(pos); 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 a9918af7b..247c44c64 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 @@ -181,7 +181,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/ Color color = new Color(getColorFromItemStack(stack, 1)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); + GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json new file mode 100644 index 000000000..9daa1928c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/enchantedSoil0", + "side": "botania:blocks/enchantedSoil1" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json new file mode 100644 index 000000000..fb206fdd8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/enchanter" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing=x": [{}], + "facing=z": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prism.json b/src/main/resources/assets/botania/blockstates/prism.json new file mode 100644 index 000000000..594c03ccd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/prism.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:prism", + "textures": { + "bottom": "botania:blocks/prism0", + "top": "botania:blocks/prism0", + "side": "botania:blocks/prism1" + }, + "transform": "forge:default-block" + }, + "variants": { + "inventory": [{}], + "powered": { + "true": {}, + "false": {} + }, + "has_lens": { + "true": {}, + "false": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/prism.json b/src/main/resources/assets/botania/models/block/prism.json new file mode 100644 index 000000000..021d96f40 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/prism.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "texture": "#bottom", "uv": [ 4, 4, 12, 12 ], "cullface": "down" }, + "up": { "texture": "#top", "uv": [ 4, 4, 12, 12 ], "cullface": "up" }, + "north": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "south": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "west": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] }, + "east": { "texture": "#side", "uv": [ 4, 0, 12, 16 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bloodPendant.json b/src/main/resources/assets/botania/models/item/bloodPendant.json new file mode 100644 index 000000000..5a9531414 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bloodPendant.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/bloodPendant0", + "layer1": "botania:items/bloodPendant1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/laputaShard.json b/src/main/resources/assets/botania/models/item/laputaShard.json new file mode 100644 index 000000000..d71b4eaf7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/laputaShard.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/laputaShard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/openBucket.json b/src/main/resources/assets/botania/models/item/openBucket.json new file mode 100644 index 000000000..ccc57c213 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/openBucket.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/openBucket" + } +} \ No newline at end of file From c513f17f8819340298414a58419931ccfe82ab10 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 20:16:31 -0600 Subject: [PATCH 114/935] All brews, mana tablet, mana gun, incense, and other items --- .../client/core/handler/ModelHandler.java | 87 +++++++++++++++++-- .../render/tile/RenderTileIncensePlate.java | 24 ++--- .../common/block/BlockIncensePlate.java | 9 +- .../botania/common/item/ItemManaGun.java | 2 +- .../assets/botania/models/item/desuGun.json | 7 ++ .../botania/models/item/desuGunClip.json | 7 ++ .../botania/models/item/diviningRod.json | 6 ++ .../botania/models/item/enderDagger.json | 7 ++ .../botania/models/item/exchangeRod.json | 6 ++ .../assets/botania/models/item/flask.json | 6 ++ .../assets/botania/models/item/flask1_0.json | 7 ++ .../assets/botania/models/item/flask1_1.json | 7 ++ .../assets/botania/models/item/flask1_2.json | 7 ++ .../assets/botania/models/item/flask1_3.json | 7 ++ .../assets/botania/models/item/flask1_4.json | 7 ++ .../assets/botania/models/item/flask1_5.json | 7 ++ .../botania/models/item/grassHorn0.json | 6 ++ .../botania/models/item/grassHorn1.json | 6 ++ .../botania/models/item/grassHorn2.json | 6 ++ .../botania/models/item/gravityRod.json | 6 ++ .../botania/models/item/incenseStick.json | 7 ++ .../assets/botania/models/item/keepIvy.json | 6 ++ .../assets/botania/models/item/manaGun.json | 7 ++ .../botania/models/item/manaGunClip.json | 7 ++ .../botania/models/item/manaTablet.json | 7 ++ .../botania/models/item/missileRod.json | 6 ++ .../botania/models/item/overgrowthSeed.json | 6 ++ .../botania/models/item/recordGaia1.json | 6 ++ .../botania/models/item/recordGaia2.json | 6 ++ .../assets/botania/models/item/regenIvy.json | 6 ++ .../assets/botania/models/item/slingshot.json | 6 ++ .../assets/botania/models/item/smeltRod.json | 6 ++ .../assets/botania/models/item/vial.json | 6 ++ .../assets/botania/models/item/vial1_0.json | 7 ++ .../assets/botania/models/item/vial1_1.json | 7 ++ .../assets/botania/models/item/vial1_2.json | 7 ++ .../assets/botania/models/item/vial1_3.json | 7 ++ .../assets/botania/models/item/vineBall.json | 6 ++ .../assets/botania/models/item/virus0.json | 6 ++ .../assets/botania/models/item/virus1.json | 6 ++ .../assets/botania/models/item/worldSeed.json | 6 ++ 41 files changed, 330 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/desuGun.json create mode 100644 src/main/resources/assets/botania/models/item/desuGunClip.json create mode 100644 src/main/resources/assets/botania/models/item/diviningRod.json create mode 100644 src/main/resources/assets/botania/models/item/enderDagger.json create mode 100644 src/main/resources/assets/botania/models/item/exchangeRod.json create mode 100644 src/main/resources/assets/botania/models/item/flask.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_0.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_1.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_2.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_3.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_4.json create mode 100644 src/main/resources/assets/botania/models/item/flask1_5.json create mode 100644 src/main/resources/assets/botania/models/item/grassHorn0.json create mode 100644 src/main/resources/assets/botania/models/item/grassHorn1.json create mode 100644 src/main/resources/assets/botania/models/item/grassHorn2.json create mode 100644 src/main/resources/assets/botania/models/item/gravityRod.json create mode 100644 src/main/resources/assets/botania/models/item/incenseStick.json create mode 100644 src/main/resources/assets/botania/models/item/keepIvy.json create mode 100644 src/main/resources/assets/botania/models/item/manaGun.json create mode 100644 src/main/resources/assets/botania/models/item/manaGunClip.json create mode 100644 src/main/resources/assets/botania/models/item/manaTablet.json create mode 100644 src/main/resources/assets/botania/models/item/missileRod.json create mode 100644 src/main/resources/assets/botania/models/item/overgrowthSeed.json create mode 100644 src/main/resources/assets/botania/models/item/recordGaia1.json create mode 100644 src/main/resources/assets/botania/models/item/recordGaia2.json create mode 100644 src/main/resources/assets/botania/models/item/regenIvy.json create mode 100644 src/main/resources/assets/botania/models/item/slingshot.json create mode 100644 src/main/resources/assets/botania/models/item/smeltRod.json create mode 100644 src/main/resources/assets/botania/models/item/vial.json create mode 100644 src/main/resources/assets/botania/models/item/vial1_0.json create mode 100644 src/main/resources/assets/botania/models/item/vial1_1.json create mode 100644 src/main/resources/assets/botania/models/item/vial1_2.json create mode 100644 src/main/resources/assets/botania/models/item/vial1_3.json create mode 100644 src/main/resources/assets/botania/models/item/vineBall.json create mode 100644 src/main/resources/assets/botania/models/item/virus0.json create mode 100644 src/main/resources/assets/botania/models/item/virus1.json create mode 100644 src/main/resources/assets/botania/models/item/worldSeed.json 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 ff5ce6e81..9d3e0bad8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,10 +8,12 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; @@ -79,6 +81,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -122,16 +126,26 @@ public final class ModelHandler { registerRunes(); registerBows(); registerLens(); + registerBrews(); - registerItemModelAllMeta(laputaShard, 20); - registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); - registerItemModelAllMeta(dye, EnumDyeColor.values().length); - registerItemModelAllMeta(petal, EnumDyeColor.values().length); - registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); - registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); - registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); - registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ + ModelLoader.registerItemVariants(manaGun, + new ModelResourceLocation("botania:manaGun", "inventory"), + new ModelResourceLocation("botania:manaGunClip", "inventory"), + new ModelResourceLocation("botania:desuGun", "inventory"), + new ModelResourceLocation("botania:desuGunClip", "inventory")); + ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name; + if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { + name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; + } else { + name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; + } + return new ModelResourceLocation(name, "inventory"); + } + }); } private static void registerSubtiles() { @@ -294,19 +308,46 @@ public final class ModelHandler { registerItemModel(obedienceStick); registerItemModel(dirtRod); + registerItemModel(waterRod); registerItemModel(cobbleRod); registerItemModel(fireRod); registerItemModel(rainbowRod); registerItemModel(skyDirtRod); registerItemModel(tornadoRod); registerItemModel(terraformRod); + registerItemModel(diviningRod); + registerItemModel(gravityRod); + registerItemModel(missileRod); + registerItemModel(smeltRod); + registerItemModel(exchangeRod); registerItemModel(tornadoRod); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); registerItemModel(openBucket); registerItemModel(bloodPendant); + registerItemModel(manaTablet); + registerItemModel(enderDagger); + registerItemModel(slingshot); + registerItemModel(vineBall); + registerItemModel(regenIvy); + registerItemModel(keepIvy); + registerItemModel(recordGaia1); + registerItemModel(recordGaia2); + registerItemModel(overgrowthSeed); + registerItemModel(worldSeed); + registerItemModel(incenseStick); + registerItemModelAllMeta(laputaShard, 20); + registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); + registerItemModelAllMeta(dye, EnumDyeColor.values().length); + registerItemModelAllMeta(petal, EnumDyeColor.values().length); + registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); + registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); + registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); + registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); + registerItemModelMetas(virus, LibItemNames.VIRUS, 2); + registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } private static void registerManaResources() { @@ -350,6 +391,36 @@ public final class ModelHandler { } } + private static void registerBrews() { + ModelLoader.registerItemVariants(vial, new ModelResourceLocation("botania:vial", "inventory"), new ModelResourceLocation("botania:flask", "inventory")); + ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); + ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); + + for (int i = 0; i < 6; i++) { + ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); + } + + ModelLoader.setCustomMeshDefinition(brewFlask, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); + return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); + } + }); + + for (int i = 0; i < 4; i++) { + ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); + } + + ModelLoader.setCustomMeshDefinition(brewVial, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); + return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); + } + }); + } + private static void registerStateMappers() { // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 0b5d1e74b..8d0144d25 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -44,7 +45,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileIncensePlate plate = (TileIncensePlate) tileentity; - EnumFacing facing = plate.getWorld() != null ? ((EnumFacing) plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS)) : EnumFacing.SOUTH; + EnumFacing facing = plate.getWorld() != null ? plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); @@ -64,25 +65,10 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; - GlStateManager.translate(0.1F, -1.46F, 0F); + GlStateManager.translate(-0.075F, -1.25F, 0F); GlStateManager.scale(s, s, s); - GlStateManager.rotate(180F, 0F, 1F, 0F); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// int renderPass = 0; -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + //GlStateManager.rotate(180F, 0F, 1F, 0F); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index db6e8e111..e1dbf87cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -49,11 +49,14 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } @@ -109,7 +112,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis()); + setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); } public void setBlockBounds(EnumFacing.Axis axis) { @@ -135,7 +138,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public int getRenderType() { - return LibRenderIDs.idIncensePlate; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 87a9dff12..dcbbd5bd8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -120,7 +120,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN - private boolean isSugoiKawaiiDesuNe(ItemStack stack) { + public boolean isSugoiKawaiiDesuNe(ItemStack stack) { return stack.getDisplayName().equalsIgnoreCase("desu gun"); } diff --git a/src/main/resources/assets/botania/models/item/desuGun.json b/src/main/resources/assets/botania/models/item/desuGun.json new file mode 100644 index 000000000..758cff51a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desuGun.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/desuGun0", + "layer1": "botania:items/desuGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desuGunClip.json b/src/main/resources/assets/botania/models/item/desuGunClip.json new file mode 100644 index 000000000..8c966f328 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desuGunClip.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/desuGun2", + "layer1": "botania:items/desuGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diviningRod.json b/src/main/resources/assets/botania/models/item/diviningRod.json new file mode 100644 index 000000000..c845751de --- /dev/null +++ b/src/main/resources/assets/botania/models/item/diviningRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/diviningRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json new file mode 100644 index 000000000..c80b02fd6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderDagger.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/enderDagger0", + "layer1": "botania:items/enderDagger1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exchangeRod.json b/src/main/resources/assets/botania/models/item/exchangeRod.json new file mode 100644 index 000000000..73399018a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/exchangeRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/exchangeRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask.json b/src/main/resources/assets/botania/models/item/flask.json new file mode 100644 index 000000000..c928472fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_0.json b/src/main/resources/assets/botania/models/item/flask1_0.json new file mode 100644 index 000000000..0a1e36b81 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_0.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_1.json b/src/main/resources/assets/botania/models/item/flask1_1.json new file mode 100644 index 000000000..1bb57f645 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_2.json b/src/main/resources/assets/botania/models/item/flask1_2.json new file mode 100644 index 000000000..2b9e5bd7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_3.json b/src/main/resources/assets/botania/models/item/flask1_3.json new file mode 100644 index 000000000..f12b33a32 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_4.json b/src/main/resources/assets/botania/models/item/flask1_4.json new file mode 100644 index 000000000..7d206c59a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_4.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_5.json b/src/main/resources/assets/botania/models/item/flask1_5.json new file mode 100644 index 000000000..02f2c4061 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_5.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grassHorn0.json new file mode 100644 index 000000000..cfa93bea9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grassHorn1.json new file mode 100644 index 000000000..14eb11e09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grassHorn2.json new file mode 100644 index 000000000..f6ffb7eef --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gravityRod.json b/src/main/resources/assets/botania/models/item/gravityRod.json new file mode 100644 index 000000000..5fecdb85b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gravityRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/gravityRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incenseStick.json b/src/main/resources/assets/botania/models/item/incenseStick.json new file mode 100644 index 000000000..ab0ea3d09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/incenseStick.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/incenseStick0", + "layer1": "botania:items/incenseStick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/keepIvy.json b/src/main/resources/assets/botania/models/item/keepIvy.json new file mode 100644 index 000000000..dade275c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/keepIvy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/keepIvy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json new file mode 100644 index 000000000..8fd397c2f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaGun0", + "layer1": "botania:items/manaGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json new file mode 100644 index 000000000..daec0166e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaGun2", + "layer1": "botania:items/manaGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaTablet.json b/src/main/resources/assets/botania/models/item/manaTablet.json new file mode 100644 index 000000000..755e2fd7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaTablet.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaTablet0", + "layer1": "botania:items/manaTablet1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/missileRod.json b/src/main/resources/assets/botania/models/item/missileRod.json new file mode 100644 index 000000000..8a711f8f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/missileRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/missileRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/overgrowthSeed.json b/src/main/resources/assets/botania/models/item/overgrowthSeed.json new file mode 100644 index 000000000..fa0a275d7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/overgrowthSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/overgrowthSeed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia1.json b/src/main/resources/assets/botania/models/item/recordGaia1.json new file mode 100644 index 000000000..ba31e34b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordGaia1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/recordGaia1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia2.json b/src/main/resources/assets/botania/models/item/recordGaia2.json new file mode 100644 index 000000000..0f4886ddc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordGaia2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/recordGaia2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/regenIvy.json b/src/main/resources/assets/botania/models/item/regenIvy.json new file mode 100644 index 000000000..55bbd12b0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/regenIvy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/regenIvy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slingshot.json b/src/main/resources/assets/botania/models/item/slingshot.json new file mode 100644 index 000000000..210997e61 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slingshot.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/slingshot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/smeltRod.json b/src/main/resources/assets/botania/models/item/smeltRod.json new file mode 100644 index 000000000..93cccc526 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/smeltRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/smeltRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial.json b/src/main/resources/assets/botania/models/item/vial.json new file mode 100644 index 000000000..2759bc178 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_0.json b/src/main/resources/assets/botania/models/item/vial1_0.json new file mode 100644 index 000000000..c5f4e920e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_0.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_1.json b/src/main/resources/assets/botania/models/item/vial1_1.json new file mode 100644 index 000000000..4a46d049f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_2.json b/src/main/resources/assets/botania/models/item/vial1_2.json new file mode 100644 index 000000000..4e87695c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_3.json b/src/main/resources/assets/botania/models/item/vial1_3.json new file mode 100644 index 000000000..b3d9ee9db --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vineBall.json b/src/main/resources/assets/botania/models/item/vineBall.json new file mode 100644 index 000000000..dfea69fba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vineBall.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vineBall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus0.json b/src/main/resources/assets/botania/models/item/virus0.json new file mode 100644 index 000000000..a7da91f14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/virus0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/virus0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus1.json b/src/main/resources/assets/botania/models/item/virus1.json new file mode 100644 index 000000000..3c632a483 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/virus1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/virus1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/worldSeed.json b/src/main/resources/assets/botania/models/item/worldSeed.json new file mode 100644 index 000000000..1088eae34 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/worldSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/worldSeed" + } +} \ No newline at end of file From 90fcc98bd036d6a6baa6984857680758214b492b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 20:33:24 -0600 Subject: [PATCH 115/935] Fix wisp particle --- src/main/java/vazkii/botania/client/fx/FXWisp.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index c30082fd2..3ce589f8b 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -85,7 +85,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -120,11 +120,11 @@ public class FXWisp extends EntityFX { float f11 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX); float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); - - tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + // todo 1.8.8 setbrightness call? + tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); } @Override From bf07f10ac73c13ee404db67aa61daa37ce4a6ec9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 22:38:26 -0600 Subject: [PATCH 116/935] Fix brewery rendering and operation --- .../core/handler/MultiblockBlockAccess.java | 2 +- .../client/core/proxy/ClientProxy.java | 2 +- .../botania/client/model/ModelBrewery.java | 8 +++-- .../client/render/tile/RenderTileBrewery.java | 36 +++---------------- .../render/tile/RenderTileStarfield.java | 1 - .../common/block/tile/TileBrewery.java | 8 +++++ 6 files changed, 20 insertions(+), 37 deletions(-) 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 7a152ade0..a854031a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -67,7 +67,7 @@ public class MultiblockBlockAccess implements IBlockAccess { @Override public WorldType getWorldType() { - return null; // todo 1.8 + return WorldType.DEFAULT; } @Override 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 9e9c24c24..1a5b0291c 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -463,7 +463,7 @@ public class ClientProxy extends CommonProxy { } } - private static boolean noclipEnabled = false; + private static boolean noclipEnabled = true; private static boolean corruptSparkle = false; @Override diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index f410799ad..107b67c62 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -59,9 +59,11 @@ public class ModelBrewery extends ModelBase { GlStateManager.rotate(polerot, 0F, 1F, 0F); if(render.brewery.getStackInSlot(0) != null) { GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); + GlStateManager.translate(0, -0.45, 0); + //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); render.renderItemStack(render.brewery.getStackInSlot(0)); - GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); + //GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); + GlStateManager.translate(0, 0.45, 0); GlStateManager.rotate(-180F, 1F, 0F, 0F); } @@ -86,7 +88,9 @@ public class ModelBrewery extends ModelBase { GlStateManager.rotate(rot, 0F, 1F, 0F); GlStateManager.translate(transX, transY, transZ); GlStateManager.rotate(-90F, 1F, 0F, 0F); + GlStateManager.translate(0.125, 0.125, 0); render.renderItemStack(render.brewery.getStackInSlot(i + 1)); + GlStateManager.translate(-0.125, -0.125, 0); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(-transX, -transY, -transZ); GlStateManager.rotate(-rot, 0F, 1F, 0F); 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 9ffc403f5..ec02bd362 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; @@ -65,43 +66,14 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public void renderItemStack(ItemStack stack) { if(stack != null) { Minecraft mc = Minecraft.getMinecraft(); + GlStateManager.pushMatrix(); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.25F; GlStateManager.scale(s, s, s); - GlStateManager.scale(2F, 2F, 2F); -// mc.getRenderItem().renderItemModel(stack); // todo 1.8 -// if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// GlStateManager.translate(1F, 1.1F, 0F); -// GlStateManager.pushMatrix(); -// RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F); -// GlStateManager.popMatrix(); -// GlStateManager.translate(-1F, -1.1F, 0F); -// GlStateManager.scale(2F, 2F, 2F); -// } else { -// int renderPass = 0; -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); -// } -// } + mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.scale(1F / s, 1F / s, 1F / s); - + GlStateManager.popMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index f55132eaf..ad7e1415d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -29,7 +29,6 @@ import org.lwjgl.opengl.GL11; // I HAVE NO IDEA WHAT I'M DOING // SO MUCH STUFF I DON'T UNDERSTAND D: // HELP -// todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 12f061455..b3f613970 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile; import java.awt.Color; import java.util.List; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -20,9 +21,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; @@ -45,6 +48,11 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, int manaLastTick = 0; public int signal = 0; + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } + public boolean addItem(EntityPlayer player, ItemStack stack) { if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; From b701f197ee31dcfac9bb13294f277c141f2410fb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 28 Dec 2015 14:17:10 -0600 Subject: [PATCH 117/935] Some progress on floating flowers --- .../api/render/SpecialFlowerModel.java | 8 + .../block/decor/BlockFloatingFlower.java | 11 +- .../assets/botania/blockstates/cellBlock.json | 4 +- .../botania/blockstates/miniIsland.json | 18 ++ .../botania/models/block/miniIsland.json | 293 ++++++++++++++++++ .../botania/textures/model/miniIslandCopy.png | Bin 0 -> 1471 bytes 6 files changed, 324 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/miniIsland.json create mode 100644 src/main/resources/assets/botania/models/block/miniIsland.json create mode 100644 src/main/resources/assets/botania/textures/model/miniIslandCopy.png diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index c8fecc1b4..c83b2a6e1 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -36,12 +36,14 @@ import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Matrix4f; import java.io.IOException; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Map; public class SpecialFlowerModel implements IModelCustomData { @@ -108,6 +110,12 @@ public class SpecialFlowerModel implements IModelCustomData { ImmutableSet.Builder builder = ImmutableSet.builder(); builder.addAll(blockModels.values()); builder.addAll(itemModels.values()); + + // Force mini island model to be loaded and baked, for use elsewhere. See + for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) { + builder.add(new ModelResourceLocation("botania:miniIsland", i.name().toLowerCase(Locale.ROOT))); + } + return builder.build(); } 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 fe9471395..c22eacd6d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -76,7 +76,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -90,7 +90,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockAccess world, BlockPos pos) { - return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @Override @@ -110,7 +110,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); @@ -168,11 +168,6 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return false; } - @Override - public int getRenderType() { - return LibRenderIDs.idMiniIsland; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileFloatingFlower(); diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json index b14eadd13..7fcc159e0 100644 --- a/src/main/resources/assets/botania/blockstates/cellBlock.json +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -1,9 +1,9 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all", + "model": "botania:miniIsland", "textures": { - "all": "botania:blocks/cellBlock" + "all": "botania:model/miniIslandCopy" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json new file mode 100644 index 000000000..0ce5fa8e9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniIsland" + }, + "variants": { + "grass": { "textures": { "all": "botania:model/miniIsland" } }, + "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, + "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, + "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, + "dry": { "textures": { "all": "botania:model/miniIslandDry" } }, + "golden": { "textures": { "all": "botania:model/miniIslandGolden" } }, + "vivid": { "textures": { "all": "botania:model/miniIslandVivid" } }, + "scorched": { "textures": { "all": "botania:model/miniIslandScorched" } }, + "infused": { "textures": { "all": "botania:model/miniIslandInfused" } }, + "mutated": { "textures": { "all": "botania:model/miniIslandMutated" } } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json new file mode 100644 index 000000000..d7d2fed3d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -0,0 +1,293 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Shape0", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, + "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, + "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, + "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } + } + }, + { + "name": "Shape1-1", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } + } + }, + { + "name": "Shape1-2", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } + } + }, + { + "name": "Shape1-3", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } + } + }, + { + "name": "Shape1-4", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } + } + }, + { + "name": "Shape2-1", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 7.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } + } + }, + { + "name": "Shape2-2", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } + } + }, + { + "name": "Shape2-3", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } + } + }, + { + "name": "Shape2-4", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } + } + }, + { + "name": "Shape2-5", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 7.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } + } + }, + { + "name": "Shape2-6", + "from": [ 5.0, 4.0, 9.0 ], + "to": [ 7.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } + } + }, + { + "name": "Shape2-7", + "from": [ 9.0, 4.0, 9.0 ], + "to": [ 11.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } + } + }, + { + "name": "Shape2-8", + "from": [ 9.0, 4.0, 5.0 ], + "to": [ 11.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } + } + }, + { + "name": "Shape3-1", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 7.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } + } + }, + { + "name": "Shape3-2", + "from": [ 3.0, 5.0, 9.0 ], + "to": [ 5.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } + } + }, + { + "name": "Shape3-3", + "from": [ 9.0, 5.0, 11.0 ], + "to": [ 11.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } + } + }, + { + "name": "Shape3-4", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 7.0, 7.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } + } + }, + { + "name": "Shape3-5", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } + } + }, + { + "name": "Shape3-6", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 7.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } + } + }, + { + "name": "Shape3-7", + "from": [ 11.0, 5.0, 9.0 ], + "to": [ 13.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } + } + }, + { + "name": "Shape3-8", + "from": [ 9.0, 5.0, 3.0 ], + "to": [ 11.0, 7.0, 5.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } + } + }, + { + "name": "Shape4-1", + "from": [ 3.0, 6.0, 3.0 ], + "to": [ 5.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } + } + }, + { + "name": "Shape4-2", + "from": [ 3.0, 6.0, 11.0 ], + "to": [ 5.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } + } + }, + { + "name": "Shape4-3", + "from": [ 11.0, 6.0, 11.0 ], + "to": [ 13.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } + } + }, + { + "name": "Shape4-4", + "from": [ 11.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } + } + } + ] +} diff --git a/src/main/resources/assets/botania/textures/model/miniIslandCopy.png b/src/main/resources/assets/botania/textures/model/miniIslandCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..945d6b6fea2a5e7e6fed2f99bb789c96a5acc2db GIT binary patch literal 1471 zcmV;w1wi_VP)p8RLL{aX*$;kkP-JE^Y#E*e;L`BjRraIb9u>-j!j|Dl z{N9$L>z50w`k~5QMfHo-grnp7N{fTW*BbE5#u*+h)>tYmm@CXBFO-~4VyUojqGvY% zmxk}IvWq3b;=&?+Z_7sRW5Za#c`qO$F@^g3i#)vkFCK3Tk(h$|JwP~`z&~vv^4Az` zzE<5E*c;9gzIF$eZ(#8A<03Q_r)`^?&{Uk0=kpnT<5;^0M-v7Ao~y@7n+I}bXvVur`2n9<;FU6YYd9Q%YaOx}Ko#Si1liskP(s zxZv6&UER*nIRHjpt;X)O(?|YyD#3SuDs=ZqOriVJZee%Y$;@W3JMHZFJqp0d<%Fo$ zHJYG}QhMQDL5HuETqeidIU)Hl`8;cL~cfNV0$_E#DJ{nAYzGt zVFu9RY;uyEPSV_1R~VN!1H(~PN7EBMyIE_Q(&`GMutu-ynj7md;?E~7!H6sFaZ!N9)(Nk=1SQg9AMz%0TX~Z7!b~AqL4|I;5$E> z0DfCO4+I0k*+0%~pap0DIL&{|0C3>)#pkmLzQ5!q%V(8Y` z^Vb6s;RKlS`}@#TyvUwSX35THb>9~Pq!VfEPCJp9LhY_YMRr@YjqH53@Qz@!c&0%J z^4UKZk8tJum6C(dO5KNUkFH+ZBi8dU#|9*3zq)HtM$=7>>63MyGuu zhu+)TKrkQ{vI`uUvFi4KKrkSd7M9p~drtTN4u`)yEEX~gy!jx1zF8x&;R-OBOw?|# z1<>8hRMzC@fIH|vziB0nquxP>uT{5Cq#mU(nN6F%8W@i9z7O_^_K6$-qq|)6_vvRy ztDAo~Py0l!s3Q7~wTqSZ_54aC5{X12kw_#Gi9{liNF)-8L?V$$Boc{4B9TZW5{YC3 Z{0D==Edg$K;=cd@002ovPDHLkV1kQ%+{gd` literal 0 HcmV?d00001 From 8eedaa556349816a0ace9f5a31ade7671ad9e2bd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 28 Dec 2015 16:11:01 -0600 Subject: [PATCH 118/935] Fix texture errors, fix pool and apothecary collision detection --- .../client/core/helper/IconHelper.java | 55 +------------------ .../botania/common/block/BlockAlfPortal.java | 2 +- .../botania/common/block/BlockAltar.java | 3 +- .../botania/common/block/BlockLightRelay.java | 4 +- .../block/decor/BlockFloatingFlower.java | 5 ++ .../block/mana/BlockAlchemyCatalyst.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../common/block/mana/BlockManaVoid.java | 2 +- .../botania/common/block/mana/BlockPool.java | 6 +- .../common/block/mana/BlockTerraPlate.java | 2 +- .../buildcraft/TriggerManaDetector.java | 2 +- .../buildcraft/TriggerManaLevel.java | 2 +- .../buildcraft/TriggerRuneAltarCanCraft.java | 2 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 +- .../item/material/ItemManaResource.java | 17 ++---- .../common/item/relic/ItemKingKey.java | 2 +- 16 files changed, 28 insertions(+), 82 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index c21201b9e..d54099033 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -42,62 +42,11 @@ import java.util.Locale; public final class IconHelper { public static TextureAtlasSprite forName(TextureMap ir, String name) { - return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, name)); + return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD + name)); } public static TextureAtlasSprite forName(TextureMap ir, String name, String dir) { - return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD, dir + "/" + name)); - } - - public static TextureAtlasSprite forBlock(TextureMap ir, Block block) { - return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "")); - } - - public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i) { - return forBlock(ir, block, Integer.toString(i)); - } - - public static TextureAtlasSprite forBlock(TextureMap ir, Block block, int i, String dir) { - return forBlock(ir, block, Integer.toString(i), dir); - } - - public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s) { - return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s); - } - - public static TextureAtlasSprite forBlock(TextureMap ir, Block block, String s, String dir) { - return forName(ir, block.getUnlocalizedName().replaceAll("tile\\.", "") + s, dir); - } - - public static TextureAtlasSprite forItem(TextureMap ir, Item item) { - return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "")); - } - - public static TextureAtlasSprite forItem(TextureMap ir, Item item, int i) { - return forItem(ir, item, Integer.toString(i)); - } - - public static TextureAtlasSprite forItem(TextureMap ir, Item item, String s) { - return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s); - } - - /** - * Load and bake an arbitrary model - */ - public static IFlexibleBakedModel loadAndBakeArbitraryModel(ResourceLocation location) { - - try { - IModel unbaked = ModelLoaderRegistry.getModel(location); - return unbaked.bake(unbaked.getDefaultState(), DefaultVertexFormats.ITEM, new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation input) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - } - }); - } catch (IOException ex) { - return null; - } - + return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD + dir + "/" + name)); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 6afe92d03..e3334034a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -50,7 +50,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - portalTex = IconHelper.forBlock(evt.map, this, "Inside"); + portalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 48a74775a..40e71f413 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -127,7 +127,8 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World par1World, BlockPos pos, Entity par5Entity) { + public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) { + System.out.println("Collide"); if(par5Entity instanceof EntityItem) { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 2c7b53244..8cc774d0b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -85,8 +85,8 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forBlock(evt.map, this, 1); - worldIconRed = IconHelper.forBlock(evt.map, this, 3); + worldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); + worldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); } @Override 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 c22eacd6d..b1b337a39 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -69,6 +69,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public int getRenderType() { + return 2; // todo + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); 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 f4cfb899b..8b249caad 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -47,7 +47,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forBlock(evt.map, this, 3); + overlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); } @Override 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 310b05a28..69438e442 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -68,7 +68,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forBlock(evt.map, this, "Overlay"); + overlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); } @Override 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 cd73072a3..4e2757349 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -53,7 +53,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forBlock(evt.map, this, 1); + overlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); } @Override 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 e4b5ae2f2..d0931ee96 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -101,7 +101,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - manaIcon = IconHelper.forName(evt.map, "manaWater"); + manaIcon = IconHelper.forName(evt.map, "manaWater", "blocks"); } @Override @@ -151,7 +151,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void onEntityCollidedWithBlock(World par1World, BlockPos pos, Entity par5Entity) { + public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) { if(par5Entity instanceof EntityItem) { TilePool tile = (TilePool) par1World.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) @@ -160,7 +160,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void addCollisionBoxesToList(World p_149743_1_, BlockPos pos, IBlockState state, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { + public void addCollisionBoxesToList(World p_149743_1_, BlockPos pos, IBlockState state, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { float f = 1F / 16F; setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F); super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); 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 0cad057f7..fbd89f4e5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -82,7 +82,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forBlock(evt.map, this, "Overlay"); + overlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index a1801d6aa..ac6a9f875 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -25,7 +25,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern @SubscribeEvent public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/manaDetector"); + icon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index a7f9bbb3d..6b0767bd2 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -38,7 +38,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal @SubscribeEvent public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name())); + icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name()), "items"); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index c519ae9e3..c6a707136 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -22,7 +22,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE @SubscribeEvent public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft"); + icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); } @Override 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 d4fe9a896..91e2298a3 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 @@ -61,7 +61,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent evt) { - willIcon = IconHelper.forName(evt.map, "willFlame"); + willIcon = IconHelper.forName(evt.map, "willFlame", "items"); } @Override 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 2e9d55c42..89bbd2239 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -72,19 +72,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent @SideOnly(Side.CLIENT) public void onTextureStitch(TextureStitchEvent.Pre evt) { - tailIcon = IconHelper.forName(evt.map, "tail"); - phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower"); - goldfishIcon = IconHelper.forName(evt.map, "goldfish"); - nerfBatIcon = IconHelper.forName(evt.map, "nerfBat"); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - /*evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/phiFlower", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/phiFlower"))); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/goldfish", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/goldfish"))); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat")));*/ + tailIcon = IconHelper.forName(evt.map, "tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); + goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); + nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 89fed889a..4e8bd5bbd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -44,7 +44,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { public void registerIcons(TextureStitchEvent.Pre event) { weaponIcons = new TextureAtlasSprite[WEAPON_TYPES]; for(int i = 0; i < WEAPON_TYPES; i++) - weaponIcons[i] = IconHelper.forName(event.map, "gateWeapon" + i); + weaponIcons[i] = IconHelper.forName(event.map, "gateWeapon" + i, "items"); } @Override From 2f0915e18c0955da7fd0cbbbdbd20882c916b902 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 28 Dec 2015 17:50:33 -0600 Subject: [PATCH 119/935] Lots more item models, red string block models --- .../client/core/handler/ModelHandler.java | 98 ++++++++++++++++++- .../botania/common/block/BlockAltar.java | 1 - .../tool/manasteel/ItemManasteelSword.java | 6 -- .../tool/terrasteel/ItemTerraPick.java | 2 +- .../common/item/relic/ItemInfiniteFruit.java | 7 +- .../blockstates/redStringComparator.json | 23 +++++ .../blockstates/redStringContainer.json | 23 +++++ .../blockstates/redStringDispenser.json | 27 +++++ .../blockstates/redStringFertilizer.json | 23 +++++ .../blockstates/redStringInterceptor.json | 27 +++++ .../botania/blockstates/redStringRelay.json | 23 +++++ .../assets/botania/models/item/aesirRing.json | 6 ++ .../botania/models/item/ancientWill0.json | 6 ++ .../botania/models/item/ancientWill1.json | 6 ++ .../botania/models/item/ancientWill2.json | 6 ++ .../botania/models/item/ancientWill3.json | 6 ++ .../botania/models/item/ancientWill4.json | 6 ++ .../botania/models/item/ancientWill5.json | 6 ++ .../assets/botania/models/item/auraRing.json | 6 ++ .../botania/models/item/auraRingGreater.json | 6 ++ .../botania/models/item/autocraftingHalo.json | 6 ++ .../assets/botania/models/item/baubleBox.json | 6 ++ .../models/item/blackHoleTalisman0.json | 6 ++ .../models/item/blackHoleTalisman1.json | 6 ++ .../botania/models/item/cacophonium.json | 6 ++ .../assets/botania/models/item/clip.json | 6 ++ .../assets/botania/models/item/cobbleRod.json | 2 +- .../botania/models/item/craftingHalo.json | 6 ++ .../assets/botania/models/item/dice.json | 6 ++ .../botania/models/item/diviningRod.json | 2 +- .../botania/models/item/elucidator.json | 6 ++ .../assets/botania/models/item/enderHand.json | 6 ++ .../botania/models/item/exchangeRod.json | 2 +- .../assets/botania/models/item/flugelEye.json | 6 ++ .../botania/models/item/gravityRod.json | 2 +- .../botania/models/item/infiniteFruit.json | 6 ++ .../models/item/infiniteFruitBoot.json | 6 ++ .../assets/botania/models/item/kingKey.json | 6 ++ .../assets/botania/models/item/lokiRing.json | 6 ++ .../botania/models/item/manaBottle0.json | 6 ++ .../botania/models/item/manaBottle1.json | 6 ++ .../botania/models/item/manaBottle2.json | 6 ++ .../botania/models/item/manaBottle3.json | 6 ++ .../botania/models/item/manaBottle4.json | 6 ++ .../botania/models/item/manaBottle5.json | 6 ++ .../assets/botania/models/item/manaRing.json | 6 ++ .../botania/models/item/manaRingGreater.json | 6 ++ .../botania/models/item/missileRod.json | 2 +- .../assets/botania/models/item/odinRing.json | 6 ++ .../botania/models/item/phantomInk.json | 6 ++ .../botania/models/item/pinkinator.json | 6 ++ .../botania/models/item/poolMinecart.json | 6 ++ .../assets/botania/models/item/sextant.json | 6 ++ .../botania/models/item/slimeBottle0.json | 6 ++ .../botania/models/item/slimeBottle1.json | 6 ++ .../assets/botania/models/item/smeltRod.json | 2 +- .../botania/models/item/spawnerMover.json | 6 ++ .../botania/models/item/spawnerMoverFull.json | 6 ++ .../botania/models/item/spellCloth.json | 6 ++ .../botania/models/item/temperanceStone0.json | 6 ++ .../botania/models/item/temperanceStone1.json | 6 ++ .../assets/botania/models/item/terraAxe0.json | 6 ++ .../assets/botania/models/item/terraAxe1.json | 6 ++ .../assets/botania/models/item/terraPick.json | 6 ++ .../botania/models/item/terraPickEnabled.json | 7 ++ .../botania/models/item/terraPickTipped.json | 6 ++ .../models/item/terraPickTippedEnabled.json | 7 ++ .../botania/models/item/terraSword.json | 6 ++ .../assets/botania/models/item/thorRing.json | 6 ++ .../botania/models/item/thornChakram0.json | 6 ++ .../botania/models/item/thornChakram1.json | 6 ++ .../botania/models/item/tinyPlanet.json | 6 ++ 72 files changed, 583 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/redStringComparator.json create mode 100644 src/main/resources/assets/botania/blockstates/redStringContainer.json create mode 100644 src/main/resources/assets/botania/blockstates/redStringDispenser.json create mode 100644 src/main/resources/assets/botania/blockstates/redStringFertilizer.json create mode 100644 src/main/resources/assets/botania/blockstates/redStringInterceptor.json create mode 100644 src/main/resources/assets/botania/blockstates/redStringRelay.json create mode 100644 src/main/resources/assets/botania/models/item/aesirRing.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill0.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill1.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill2.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill3.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill4.json create mode 100644 src/main/resources/assets/botania/models/item/ancientWill5.json create mode 100644 src/main/resources/assets/botania/models/item/auraRing.json create mode 100644 src/main/resources/assets/botania/models/item/auraRingGreater.json create mode 100644 src/main/resources/assets/botania/models/item/autocraftingHalo.json create mode 100644 src/main/resources/assets/botania/models/item/baubleBox.json create mode 100644 src/main/resources/assets/botania/models/item/blackHoleTalisman0.json create mode 100644 src/main/resources/assets/botania/models/item/blackHoleTalisman1.json create mode 100644 src/main/resources/assets/botania/models/item/cacophonium.json create mode 100644 src/main/resources/assets/botania/models/item/clip.json create mode 100644 src/main/resources/assets/botania/models/item/craftingHalo.json create mode 100644 src/main/resources/assets/botania/models/item/dice.json create mode 100644 src/main/resources/assets/botania/models/item/elucidator.json create mode 100644 src/main/resources/assets/botania/models/item/enderHand.json create mode 100644 src/main/resources/assets/botania/models/item/flugelEye.json create mode 100644 src/main/resources/assets/botania/models/item/infiniteFruit.json create mode 100644 src/main/resources/assets/botania/models/item/infiniteFruitBoot.json create mode 100644 src/main/resources/assets/botania/models/item/kingKey.json create mode 100644 src/main/resources/assets/botania/models/item/lokiRing.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle0.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle1.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle2.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle3.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle4.json create mode 100644 src/main/resources/assets/botania/models/item/manaBottle5.json create mode 100644 src/main/resources/assets/botania/models/item/manaRing.json create mode 100644 src/main/resources/assets/botania/models/item/manaRingGreater.json create mode 100644 src/main/resources/assets/botania/models/item/odinRing.json create mode 100644 src/main/resources/assets/botania/models/item/phantomInk.json create mode 100644 src/main/resources/assets/botania/models/item/pinkinator.json create mode 100644 src/main/resources/assets/botania/models/item/poolMinecart.json create mode 100644 src/main/resources/assets/botania/models/item/sextant.json create mode 100644 src/main/resources/assets/botania/models/item/slimeBottle0.json create mode 100644 src/main/resources/assets/botania/models/item/slimeBottle1.json create mode 100644 src/main/resources/assets/botania/models/item/spawnerMover.json create mode 100644 src/main/resources/assets/botania/models/item/spawnerMoverFull.json create mode 100644 src/main/resources/assets/botania/models/item/spellCloth.json create mode 100644 src/main/resources/assets/botania/models/item/temperanceStone0.json create mode 100644 src/main/resources/assets/botania/models/item/temperanceStone1.json create mode 100644 src/main/resources/assets/botania/models/item/terraAxe0.json create mode 100644 src/main/resources/assets/botania/models/item/terraAxe1.json create mode 100644 src/main/resources/assets/botania/models/item/terraPick.json create mode 100644 src/main/resources/assets/botania/models/item/terraPickEnabled.json create mode 100644 src/main/resources/assets/botania/models/item/terraPickTipped.json create mode 100644 src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json create mode 100644 src/main/resources/assets/botania/models/item/terraSword.json create mode 100644 src/main/resources/assets/botania/models/item/thorRing.json create mode 100644 src/main/resources/assets/botania/models/item/thornChakram0.json create mode 100644 src/main/resources/assets/botania/models/item/thornChakram1.json create mode 100644 src/main/resources/assets/botania/models/item/tinyPlanet.json 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 9d3e0bad8..169ce222d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -82,7 +82,10 @@ import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.brew.ItemBrewBase; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import vazkii.botania.common.item.relic.ItemInfiniteFruit; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -146,6 +149,61 @@ public final class ModelHandler { return new ModelResourceLocation(name, "inventory"); } }); + + ModelLoader.registerItemVariants(spawnerMover, + new ModelResourceLocation("botania:spawnerMover", "inventory"), + new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); + ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (ItemSpawnerMover.hasData(stack)) { + return new ModelResourceLocation("botania:spawnerMover", "inventory"); + } else { + return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); + } + } + }); + + ModelLoader.registerItemVariants(terraPick, + new ModelResourceLocation("botania:terraPick", "inventory"), + new ModelResourceLocation("botania:terraPickEnabled", "inventory"), + new ModelResourceLocation("botania:terraPickTipped", "inventory"), + new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); + ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; + } + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); + } + }); + + ModelLoader.registerItemVariants(infiniteFruit, + new ModelResourceLocation("botania:infiniteFruit", "inventory"), + new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); + ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemInfiniteFruit.isBoot(stack) ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") + : new ModelResourceLocation("botania:infiniteFruit", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manasteelSword, + new ModelResourceLocation("botania:manasteelSword", "inventory"), + new ModelResourceLocation("botania:elucidator", "inventory")); + ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory"); + } + }); } private static void registerSubtiles() { @@ -235,6 +293,13 @@ public final class ModelHandler { registerItemModel(ModBlocks.enchantedSoil); registerItemModel(ModBlocks.enchanter); registerItemModel(ModBlocks.prism); + registerItemModel(ModBlocks.redStringContainer); + registerItemModel(ModBlocks.redStringDispenser); + registerItemModel(ModBlocks.redStringComparator); + registerItemModel(ModBlocks.redStringFertilizer); + registerItemModel(ModBlocks.redStringInterceptor); + registerItemModel(ModBlocks.redStringRelay); + // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); @@ -274,7 +339,6 @@ public final class ModelHandler { registerItemModel(manasteelShovel); registerItemModel(manasteelAxe); registerItemModel(manasteelShears); - registerItemModel(manasteelSword); registerItemModel(elementiumHelm); registerItemModel(elementiumChest); @@ -297,6 +361,8 @@ public final class ModelHandler { registerItemModel(terrasteelChest); registerItemModel(terrasteelLegs); registerItemModel(terrasteelBoots); + registerItemModel(terraSword); + registerItemModelMetas(terraAxe, LibItemNames.TERRA_AXE, 2); registerItemModel(starSword); registerItemModel(thunderSword); @@ -337,11 +403,41 @@ public final class ModelHandler { registerItemModel(overgrowthSeed); registerItemModel(worldSeed); registerItemModel(incenseStick); + registerItemModel(enderHand); + registerItemModel(craftingHalo); + registerItemModel(spellCloth); + registerItemModel(autocraftingHalo); + registerItemModel(sextant); + registerItemModel(cacophonium); + registerItemModel(clip); + registerItemModel(phantomInk); + registerItemModel(poolMinecart); + registerItemModel(pinkinator); + registerItemModel(dice); + registerItemModel(kingKey); + registerItemModel(flugelEye); + registerItemModel(thorRing); + registerItemModel(lokiRing); + registerItemModel(odinRing); + registerItemModel(aesirRing); + registerItemModel(baubleBox); + registerItemModel(tinyPlanet); + registerItemModel(manaRing); + registerItemModel(manaRingGreater); + registerItemModel(auraRing); + registerItemModel(auraRingGreater); registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); registerItemModelAllMeta(petal, EnumDyeColor.values().length); + + registerItemModelMetas(manaBottle, LibItemNames.MANA_BOTTLE, 6); + registerItemModelMetas(ancientWill, LibItemNames.ANCIENT_WILL, 6); + registerItemModelMetas(temperanceStone, LibItemNames.TEMPERANCE_STONE, 2); + registerItemModelMetas(thornChakram, LibItemNames.THORN_CHAKRAM, 2); + registerItemModelMetas(blackHoleTalisman, LibItemNames.BLACK_HOLE_TALISMAN, 2); + registerItemModelMetas(slimeBottle, LibItemNames.SLIME_BOTTLE, 2); registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 40e71f413..352c9cf08 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -128,7 +128,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { @Override public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) { - System.out.println("Collide"); if(par5Entity instanceof EntityItem) { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index a683a0939..a467f0a11 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -64,12 +64,6 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { return true; } -// @Override todo 1.8 -// public IIcon getIconIndex(ItemStack par1ItemStack) { -// String name = par1ItemStack.getDisplayName().toLowerCase().trim(); -// return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack); -// } - @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { if(usesMana(stack) && block.getBlockHardness(world, pos) != 0F) 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 04fd07fdb..9e14866b4 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 @@ -197,7 +197,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F); } - boolean isEnabled(ItemStack stack) { + public static boolean isEnabled(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, TAG_ENABLED, false); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 7f8a86db7..db46b91ce 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -60,12 +60,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } } -// @Override todo 1.8 -// public IIcon getIconIndex(ItemStack par1ItemStack) { -// return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); -// } - - private boolean isBoot(ItemStack par1ItemStack) { + public static boolean isBoot(ItemStack par1ItemStack) { String name = par1ItemStack.getDisplayName().toLowerCase().trim(); return name.equals("das boot"); } diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redStringComparator.json new file mode 100644 index 000000000..8c5c5f473 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringComparator.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringComparator", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringComparator" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redStringContainer.json new file mode 100644 index 000000000..328bf9920 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringContainer.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringContainer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringContainer" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redStringDispenser.json new file mode 100644 index 000000000..77ad927c0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringDispenser.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringContainer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringContainer" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json new file mode 100644 index 000000000..bffa455f4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringFertilizer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringFertilizer" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json new file mode 100644 index 000000000..decdcf9f2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringInterceptor", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringInterceptor" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redStringRelay.json new file mode 100644 index 000000000..1b61585ec --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/redStringRelay.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable", + "textures": { + "top": "botania:blocks/redStringRelay", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringRelay" + }, + "transform": "forge:default-block" + }, + "variants": { + "facing": { + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 }, + "down": { "x": 90 }, + "up": { "x": 270 } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/aesirRing.json b/src/main/resources/assets/botania/models/item/aesirRing.json new file mode 100644 index 000000000..9e7de648c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/aesirRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/aesirRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill0.json b/src/main/resources/assets/botania/models/item/ancientWill0.json new file mode 100644 index 000000000..4dd285d60 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill1.json b/src/main/resources/assets/botania/models/item/ancientWill1.json new file mode 100644 index 000000000..02874c8ac --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill2.json b/src/main/resources/assets/botania/models/item/ancientWill2.json new file mode 100644 index 000000000..13bf9704c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill3.json b/src/main/resources/assets/botania/models/item/ancientWill3.json new file mode 100644 index 000000000..42b1f4b7c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill4.json b/src/main/resources/assets/botania/models/item/ancientWill4.json new file mode 100644 index 000000000..c84a8c87b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill5.json b/src/main/resources/assets/botania/models/item/ancientWill5.json new file mode 100644 index 000000000..1c279ec47 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientWill5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/ancientWill5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/auraRing.json b/src/main/resources/assets/botania/models/item/auraRing.json new file mode 100644 index 000000000..ccc958d23 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/auraRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/auraRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/auraRingGreater.json b/src/main/resources/assets/botania/models/item/auraRingGreater.json new file mode 100644 index 000000000..1215d4ffa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/auraRingGreater.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/auraRingGreater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/autocraftingHalo.json b/src/main/resources/assets/botania/models/item/autocraftingHalo.json new file mode 100644 index 000000000..b03d9d979 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/autocraftingHalo.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/autocraftingHalo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/baubleBox.json b/src/main/resources/assets/botania/models/item/baubleBox.json new file mode 100644 index 000000000..42bb781a5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/baubleBox.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/baubleBox" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json new file mode 100644 index 000000000..ee4eb3ffe --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/blackHoleTalisman0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json new file mode 100644 index 000000000..d15a97712 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/blackHoleTalisman1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cacophonium.json b/src/main/resources/assets/botania/models/item/cacophonium.json new file mode 100644 index 000000000..ba68f4a7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cacophonium.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/cacophonium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/clip.json b/src/main/resources/assets/botania/models/item/clip.json new file mode 100644 index 000000000..f19848b8b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/clip.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/clip" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cobbleRod.json b/src/main/resources/assets/botania/models/item/cobbleRod.json index c3bad7553..9a2f5d672 100644 --- a/src/main/resources/assets/botania/models/item/cobbleRod.json +++ b/src/main/resources/assets/botania/models/item/cobbleRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/cobbleRod" } diff --git a/src/main/resources/assets/botania/models/item/craftingHalo.json b/src/main/resources/assets/botania/models/item/craftingHalo.json new file mode 100644 index 000000000..6a15c3bf6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftingHalo.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/craftingHalo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dice.json b/src/main/resources/assets/botania/models/item/dice.json new file mode 100644 index 000000000..cb70446e0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dice.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/dice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diviningRod.json b/src/main/resources/assets/botania/models/item/diviningRod.json index c845751de..b349ab832 100644 --- a/src/main/resources/assets/botania/models/item/diviningRod.json +++ b/src/main/resources/assets/botania/models/item/diviningRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/diviningRod" } diff --git a/src/main/resources/assets/botania/models/item/elucidator.json b/src/main/resources/assets/botania/models/item/elucidator.json new file mode 100644 index 000000000..c79526c8f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elucidator.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/elucidator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderHand.json b/src/main/resources/assets/botania/models/item/enderHand.json new file mode 100644 index 000000000..910b8b5ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderHand.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/enderHand" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exchangeRod.json b/src/main/resources/assets/botania/models/item/exchangeRod.json index 73399018a..8260f0300 100644 --- a/src/main/resources/assets/botania/models/item/exchangeRod.json +++ b/src/main/resources/assets/botania/models/item/exchangeRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/exchangeRod" } diff --git a/src/main/resources/assets/botania/models/item/flugelEye.json b/src/main/resources/assets/botania/models/item/flugelEye.json new file mode 100644 index 000000000..95fa6d467 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flugelEye.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flugelEye" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gravityRod.json b/src/main/resources/assets/botania/models/item/gravityRod.json index 5fecdb85b..bc58a0f6e 100644 --- a/src/main/resources/assets/botania/models/item/gravityRod.json +++ b/src/main/resources/assets/botania/models/item/gravityRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/gravityRod" } diff --git a/src/main/resources/assets/botania/models/item/infiniteFruit.json b/src/main/resources/assets/botania/models/item/infiniteFruit.json new file mode 100644 index 000000000..8d6fdd76d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/infiniteFruit.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/infiniteFruit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json b/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json new file mode 100644 index 000000000..4e957b4fe --- /dev/null +++ b/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/dasBoot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/kingKey.json b/src/main/resources/assets/botania/models/item/kingKey.json new file mode 100644 index 000000000..c559fe3fb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/kingKey.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/kingKey" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lokiRing.json b/src/main/resources/assets/botania/models/item/lokiRing.json new file mode 100644 index 000000000..e8c375fc2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lokiRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lokiRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle0.json b/src/main/resources/assets/botania/models/item/manaBottle0.json new file mode 100644 index 000000000..591c4eb77 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle1.json b/src/main/resources/assets/botania/models/item/manaBottle1.json new file mode 100644 index 000000000..df30474b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle2.json b/src/main/resources/assets/botania/models/item/manaBottle2.json new file mode 100644 index 000000000..a420a7b1c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle3.json b/src/main/resources/assets/botania/models/item/manaBottle3.json new file mode 100644 index 000000000..af1ea0344 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle4.json b/src/main/resources/assets/botania/models/item/manaBottle4.json new file mode 100644 index 000000000..e62c80cc6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle5.json b/src/main/resources/assets/botania/models/item/manaBottle5.json new file mode 100644 index 000000000..46bba123e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaBottle5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaBottle5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaRing.json b/src/main/resources/assets/botania/models/item/manaRing.json new file mode 100644 index 000000000..24b46391b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaRingGreater.json b/src/main/resources/assets/botania/models/item/manaRingGreater.json new file mode 100644 index 000000000..b9890f29a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaRingGreater.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaRingGreater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/missileRod.json b/src/main/resources/assets/botania/models/item/missileRod.json index 8a711f8f6..7fa6c9a32 100644 --- a/src/main/resources/assets/botania/models/item/missileRod.json +++ b/src/main/resources/assets/botania/models/item/missileRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/missileRod" } diff --git a/src/main/resources/assets/botania/models/item/odinRing.json b/src/main/resources/assets/botania/models/item/odinRing.json new file mode 100644 index 000000000..cc33926c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/odinRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/odinRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/phantomInk.json b/src/main/resources/assets/botania/models/item/phantomInk.json new file mode 100644 index 000000000..cb1e66715 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/phantomInk.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/phantomInk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pinkinator.json b/src/main/resources/assets/botania/models/item/pinkinator.json new file mode 100644 index 000000000..7a6d38ccc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pinkinator.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/pinkinator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/poolMinecart.json b/src/main/resources/assets/botania/models/item/poolMinecart.json new file mode 100644 index 000000000..1eacc84b0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/poolMinecart.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/poolMinecart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sextant.json b/src/main/resources/assets/botania/models/item/sextant.json new file mode 100644 index 000000000..600fa8958 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sextant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sextant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimeBottle0.json b/src/main/resources/assets/botania/models/item/slimeBottle0.json new file mode 100644 index 000000000..3add9af7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slimeBottle0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/slimeBottle0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimeBottle1.json b/src/main/resources/assets/botania/models/item/slimeBottle1.json new file mode 100644 index 000000000..67d70d424 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slimeBottle1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/slimeBottle1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/smeltRod.json b/src/main/resources/assets/botania/models/item/smeltRod.json index 93cccc526..9396ba58b 100644 --- a/src/main/resources/assets/botania/models/item/smeltRod.json +++ b/src/main/resources/assets/botania/models/item/smeltRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/smeltRod" } diff --git a/src/main/resources/assets/botania/models/item/spawnerMover.json b/src/main/resources/assets/botania/models/item/spawnerMover.json new file mode 100644 index 000000000..3d95661df --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spawnerMover.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/spawnerMover0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnerMoverFull.json b/src/main/resources/assets/botania/models/item/spawnerMoverFull.json new file mode 100644 index 000000000..048f272b8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spawnerMoverFull.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/spawnerMover1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spellCloth.json b/src/main/resources/assets/botania/models/item/spellCloth.json new file mode 100644 index 000000000..ea28ea1a6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spellCloth.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/spellCloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperanceStone0.json b/src/main/resources/assets/botania/models/item/temperanceStone0.json new file mode 100644 index 000000000..06d6f09bc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/temperanceStone0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/temperanceStone0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperanceStone1.json b/src/main/resources/assets/botania/models/item/temperanceStone1.json new file mode 100644 index 000000000..e830bf4e8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/temperanceStone1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/temperanceStone1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxe0.json b/src/main/resources/assets/botania/models/item/terraAxe0.json new file mode 100644 index 000000000..0038b73e4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraAxe0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraAxe0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxe1.json b/src/main/resources/assets/botania/models/item/terraAxe1.json new file mode 100644 index 000000000..f6589ce28 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraAxe1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraAxe1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPick.json b/src/main/resources/assets/botania/models/item/terraPick.json new file mode 100644 index 000000000..a2efe8103 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraPick.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraPick0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickEnabled.json b/src/main/resources/assets/botania/models/item/terraPickEnabled.json new file mode 100644 index 000000000..98c33756b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraPickEnabled.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraPick0", + "layer1": "botania:items/terraPick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickTipped.json b/src/main/resources/assets/botania/models/item/terraPickTipped.json new file mode 100644 index 000000000..7315b0fc5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraPickTipped.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraPick2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json b/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json new file mode 100644 index 000000000..d1685cfcb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraPick2", + "layer1": "botania:items/terraPick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraSword.json b/src/main/resources/assets/botania/models/item/terraSword.json new file mode 100644 index 000000000..a536065e0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraSword.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/terraSword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thorRing.json b/src/main/resources/assets/botania/models/item/thorRing.json new file mode 100644 index 000000000..31f651ca3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thorRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/thorRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornChakram0.json b/src/main/resources/assets/botania/models/item/thornChakram0.json new file mode 100644 index 000000000..e228cdba3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thornChakram0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/thornChakram0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornChakram1.json b/src/main/resources/assets/botania/models/item/thornChakram1.json new file mode 100644 index 000000000..6a10d6713 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thornChakram1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/thornChakram1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tinyPlanet.json b/src/main/resources/assets/botania/models/item/tinyPlanet.json new file mode 100644 index 000000000..7d15efe2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tinyPlanet.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/tinyPlanet" + } +} \ No newline at end of file From 43cd84d2cde2ac5f96efceb466d0b003696f7e35 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 28 Dec 2015 19:11:20 -0600 Subject: [PATCH 120/935] Fix multiblock rendering and enchanter activation bug --- .../core/handler/MultiblockRenderHandler.java | 53 +++++-------------- .../common/block/tile/TileEnchanter.java | 2 +- 2 files changed, 13 insertions(+), 42 deletions(-) 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 f990e9760..aa88e0ec4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -34,6 +34,7 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibObfuscation; public final class MultiblockRenderHandler { @@ -44,13 +45,13 @@ public final class MultiblockRenderHandler { public static MultiblockSet currentMultiblock; public static BlockPos anchor; - public static int angle; + public static EnumFacing angle; public static int dimension; public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; - angle = 0; + angle = EnumFacing.DOWN; Minecraft mc = Minecraft.getMinecraft(); if(mc.theWorld != null) @@ -70,7 +71,7 @@ public final class MultiblockRenderHandler { public void onPlayerInteract(PlayerInteractEvent event) { if(currentMultiblock != null && anchor == null && event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer == Minecraft.getMinecraft().thePlayer) { anchor = event.pos; - angle = MathHelper.floor_double(event.entityPlayer.rotationYaw * 4.0 / 360.0 + 0.5) & 3; + angle = event.entityPlayer.getHorizontalFacing(); event.setCanceled(true); } } @@ -79,13 +80,13 @@ public final class MultiblockRenderHandler { if(currentMultiblock != null && dimension == player.worldObj.provider.getDimensionId()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableLighting(); rendering = true; - Multiblock mb = anchor != null ? currentMultiblock.getForFacing(EnumFacing.getHorizontal(angle)) : currentMultiblock.getForEntity(player); + Multiblock mb = anchor != null ? currentMultiblock.getForFacing(angle) : currentMultiblock.getForEntity(player); boolean didAny = false; blockAccess.update(player.worldObj, mb, anchorPos); @@ -95,7 +96,7 @@ public final class MultiblockRenderHandler { didAny = true; rendering = false; GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(!didAny) { setMultiblock(null); @@ -157,38 +158,8 @@ public final class MultiblockRenderHandler { } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); - brd.renderBlockBrightness(state, 1.0F); // todo 1.8 check brightness -// if(comp.shouldDoFancyRender()) { -// int color = block.colorMultiplier(blockAccess, x, y, z); -// float red = (color >> 16 & 255) / 255.0F; -// float green = (color >> 8 & 255) / 255.0F; -// float blue = (color & 255) / 255.0F; -// GlStateManager.color(red, green, blue, alpha); -// IBlockAccess oldBlockAccess = blockRender.blockAccess; -// blockRender.blockAccess = blockAccess; -// Tessellator tessellator = Tessellator.getInstance(); -// blockRender.renderAllFaces = true; -// tessellator.getWorldRenderer().startDrawingQuads(); -// tessellator.disableColor(); -// try { -// blockRender.renderBlockByRenderType(block, x, y, z); -// } -// catch(Exception e) { -// comp.doFancyRender = false; -// } -// tessellator.draw(); -// blockRender.renderAllFaces = false; -// blockRender.blockAccess = oldBlockAccess; -// } -// else { -// int color = block.getRenderColor(meta); -// float red = (color >> 16 & 255) / 255.0F; -// float green = (color >> 8 & 255) / 255.0F; -// float blue = (color & 255) / 255.0F; -// GlStateManager.color(red, green, blue, alpha); -// GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5); -// blockRender.renderBlockAsItem(block, meta, 1F); -// } + GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ()); + brd.renderBlockBrightness(state, 0.5F); // todo 1.8 check brightness } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); 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 8c8bf8b32..5ba54544c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -380,7 +380,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl return false; for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon))) + if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down())) return false; for(BlockPos flower : FLOWER_LOCATIONS) From 8f70814ae66cc7c9c884d7485c27a64a9029844f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 28 Dec 2015 22:21:22 -0600 Subject: [PATCH 121/935] Partially working floaters --- .../api/render/SpecialFlowerModel.java | 2 +- .../client/core/handler/ModelHandler.java | 1 + .../client/model/FloatingFlowerModel.java | 110 ++++++++++++++++++ .../item/block/ItemBlockSpecialFlower.java | 14 +++ .../botania/blockstates/miniIsland.json | 22 ++-- 5 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index c83b2a6e1..b2b7cdcb4 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -113,7 +113,7 @@ public class SpecialFlowerModel implements IModelCustomData { // Force mini island model to be loaded and baked, for use elsewhere. See for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) { - builder.add(new ModelResourceLocation("botania:miniIsland", i.name().toLowerCase(Locale.ROOT))); + builder.add(new ModelResourceLocation("botania:miniIsland", "variant=" + i.name().toLowerCase(Locale.ROOT))); } return builder.build(); 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 169ce222d..a077c879e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -299,6 +299,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringFertilizer); registerItemModel(ModBlocks.redStringInterceptor); registerItemModel(ModBlocks.redStringRelay); + registerItemModel(ModBlocks.floatingSpecialFlower); // Item models which all use the same base model and recolored by render layer diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java new file mode 100644 index 000000000..4bfd5df78 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -0,0 +1,110 @@ +package vazkii.botania.client.model; + +import com.google.common.collect.ImmutableList; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.ISmartItemModel; +import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; + +import java.util.List; + +public class FloatingFlowerModel implements ISmartItemModel { + @Override + public IBakedModel handleItemState(ItemStack stack) { + ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); + + // Item form always has island type grass. + IBakedModel islandType = modelManager.getModel(new ModelResourceLocation("botania:miniIsland", "variant=grass")); + + IBakedModel flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(ItemBlockFloatingSpecialFlower.getType(stack))); + + + return new CompositeBakedModel(flowerModel, islandType); + } + + private class CompositeBakedModel implements IBakedModel { + + private final IBakedModel base; + private final List compose; + + public CompositeBakedModel(IBakedModel base, IBakedModel... compose) { + this.base = base; + this.compose = ImmutableList.copyOf(compose); + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.addAll(base.getFaceQuads(p_177551_1_)); + for (IBakedModel model : compose) { + builder.addAll(model.getFaceQuads(p_177551_1_)); + } + return builder.build(); + } + + @Override + public List getGeneralQuads() { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.addAll(base.getGeneralQuads()); + for (IBakedModel model : compose) { + builder.addAll(model.getGeneralQuads()); + } + return builder.build(); + + } + + @Override + public boolean isAmbientOcclusion() { + return base.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + return base.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + return base.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return base.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return base.getItemCameraTransforms(); + } + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + + @Override + public List getGeneralQuads() { return ImmutableList.of(); } + + @Override + public boolean isAmbientOcclusion() { return false; } + + @Override + public boolean isGui3d() { return true; } + + @Override + public boolean isBuiltInRenderer() { return false; } + + @Override + public TextureAtlasSprite getParticleTexture() { return null; } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } +} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index ab906a45c..37f9369e2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,10 +25,16 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.signature.SubTileSignature; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -40,6 +47,13 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public ItemBlockSpecialFlower(Block block1) { super(block1); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), new FloatingFlowerModel()); } @Override diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 0ce5fa8e9..ec44b455c 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -4,15 +4,17 @@ "model": "botania:miniIsland" }, "variants": { - "grass": { "textures": { "all": "botania:model/miniIsland" } }, - "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, - "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, - "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, - "dry": { "textures": { "all": "botania:model/miniIslandDry" } }, - "golden": { "textures": { "all": "botania:model/miniIslandGolden" } }, - "vivid": { "textures": { "all": "botania:model/miniIslandVivid" } }, - "scorched": { "textures": { "all": "botania:model/miniIslandScorched" } }, - "infused": { "textures": { "all": "botania:model/miniIslandInfused" } }, - "mutated": { "textures": { "all": "botania:model/miniIslandMutated" } } + "variant": { + "grass": { "textures": { "all": "botania:model/miniIslandCopy" } }, + "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, + "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, + "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, + "dry": { "textures": { "all": "botania:model/miniIslandDry" } }, + "golden": { "textures": { "all": "botania:model/miniIslandGolden" } }, + "vivid": { "textures": { "all": "botania:model/miniIslandVivid" } }, + "scorched": { "textures": { "all": "botania:model/miniIslandScorched" } }, + "infused": { "textures": { "all": "botania:model/miniIslandInfused" } }, + "mutated": { "textures": { "all": "botania:model/miniIslandMutated" } } + } } } \ No newline at end of file From 3aef9efe8bf1663e7dce8f957ea0db0fcf8c1d1c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 29 Dec 2015 00:34:13 -0600 Subject: [PATCH 122/935] Floating flowers kinda sorta mostly working --- .../botania/api/state/BotaniaStateProps.java | 5 + .../client/core/handler/ModelHandler.java | 10 ++ .../client/model/FloatingFlowerModel.java | 110 ++++++++++++++---- .../render/tile/RenderTileFloatingFlower.java | 25 ++-- .../block/BlockFloatingSpecialFlower.java | 58 ++++++++- .../block/decor/BlockFloatingFlower.java | 3 +- .../common/block/decor/IFloatingFlower.java | 10 +- .../item/block/ItemBlockSpecialFlower.java | 9 +- 8 files changed, 188 insertions(+), 42 deletions(-) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 9b7040041..d93946055 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -11,6 +11,7 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; +import vazkii.botania.common.block.decor.IFloatingFlower; import javax.annotation.Nullable; @@ -46,6 +47,10 @@ public class BotaniaStateProps { // The axis directions (think quartz pillars and wood logs) public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + // Island type (floating flowers) + // TODO !!!! MOVE TYPE "ISLANDTYPE" INTO API + public static final PropertyEnum ISLAND_TYPE = PropertyEnum.create("islandtype", IFloatingFlower.IslandType.class); + // Extra Quartz Blocks public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); 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 a077c879e..d250eed58 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,8 +8,10 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -519,6 +521,14 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Override for floating flowers + ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:floatingSpecialFlower", "normal"); + } + }); + // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 4bfd5df78..df4765c69 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -1,22 +1,40 @@ package vazkii.botania.client.model; +import com.google.common.base.Function; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.pipeline.IVertexConsumer; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.property.IExtendedBlockState; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nullable; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; import java.util.List; -public class FloatingFlowerModel implements ISmartItemModel { +public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel { + public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); + @Override public IBakedModel handleItemState(ItemStack stack) { ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); @@ -26,41 +44,89 @@ public class FloatingFlowerModel implements ISmartItemModel { IBakedModel flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(ItemBlockFloatingSpecialFlower.getType(stack))); + return new CompositeBakedModel(flowerModel, islandType); + } + + @Override + public IBakedModel handleBlockState(IBlockState state) { + IExtendedBlockState realState = ((IExtendedBlockState) state); + + ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); + + // Item form always has island type grass. + IBakedModel islandType = modelManager.getModel(new ModelResourceLocation("botania:miniIsland", "variant=" + ((IFloatingFlower.IslandType) realState.getValue(BotaniaStateProps.ISLAND_TYPE)).getName())); + + IBakedModel flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(realState.getValue(BotaniaStateProps.SUBTILE_ID))); return new CompositeBakedModel(flowerModel, islandType); } - private class CompositeBakedModel implements IBakedModel { + protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); + final IVertexConsumer consumer = new VertexTransformer(builder) { + @Override + public void put(int element, float... data) { + VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); + switch (formatElement.getUsage()) { + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } + } + } + }; + quad.pipe(consumer); + return builder.build(); + } + + private static class CompositeBakedModel implements IBakedModel { private final IBakedModel base; - private final List compose; + private final List genQuads; - public CompositeBakedModel(IBakedModel base, IBakedModel... compose) { - this.base = base; - this.compose = ImmutableList.copyOf(compose); - } + public CompositeBakedModel(IBakedModel flower, IBakedModel island) { + this.base = flower; - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - ImmutableList.Builder builder = ImmutableList.builder(); - builder.addAll(base.getFaceQuads(p_177551_1_)); - for (IBakedModel model : compose) { - builder.addAll(model.getFaceQuads(p_177551_1_)); + ImmutableList.Builder genBuilder = ImmutableList.builder(); + final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); + + + // Add flower quads, scaled and translated + for (BakedQuad quad : flower.getGeneralQuads()) { + genBuilder.add(transform(quad, transform)); } - return builder.build(); + + for (EnumFacing e : EnumFacing.VALUES) { + genBuilder.addAll(Iterables.transform(flower.getFaceQuads(e), new Function() { + @Override public BakedQuad apply(BakedQuad input) { return transform(input, transform); } + })); + } + + // Add island quads + genBuilder.addAll(island.getGeneralQuads()); + for (EnumFacing e: EnumFacing.VALUES) { + genBuilder.addAll(island.getFaceQuads(e)); + } + + genQuads = genBuilder.build(); } @Override public List getGeneralQuads() { - ImmutableList.Builder builder = ImmutableList.builder(); - builder.addAll(base.getGeneralQuads()); - for (IBakedModel model : compose) { - builder.addAll(model.getGeneralQuads()); - } - return builder.build(); - + return genQuads; } + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return base.isAmbientOcclusion(); @@ -68,7 +134,7 @@ public class FloatingFlowerModel implements ISmartItemModel { @Override public boolean isGui3d() { - return base.isGui3d(); + return true; } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 85577ca7f..f10b76dc0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -12,7 +12,9 @@ package vazkii.botania.client.render.tile; import java.util.Random; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -23,9 +25,12 @@ import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraftforge.client.model.ISmartBlockModel; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.ModelMiniIsland; import vazkii.botania.common.block.decor.IFloatingFlower; @@ -35,6 +40,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); IFloatingFlower flower = (IFloatingFlower) tile; GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -53,19 +59,18 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); } - Minecraft.getMinecraft().renderEngine.bindTexture(flower.getIslandType().getResource()); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.pushMatrix(); - GlStateManager.translate(0.5F, 1.4F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - model.render(); + + IBlockState state = tile.getWorld().getBlockState(tile.getPos()); + state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos()); + IBakedModel ibakedmodel = FloatingFlowerModel.INSTANCE.handleBlockState(state); + + brd.getBlockModelRenderer().renderModelBrightness(ibakedmodel, state, 1.0F, true); + + GlStateManager.popMatrix(); GlStateManager.popMatrix(); - ItemStack stack = flower.getDisplayStack(); - GlStateManager.translate(0.5F, 0.65F, 0.5F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); - GlStateManager.color(1F, 1F, 1F); - GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 2a3c39a03..db5b41c30 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -14,9 +14,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,6 +33,15 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -38,7 +51,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.decor.BlockFloatingFlower; +import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; @@ -55,6 +70,47 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); + setDefaultState(((IExtendedBlockState) blockState.getBaseState()) + .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") + .withProperty(BotaniaStateProps.ISLAND_TYPE, IFloatingFlower.IslandType.GRASS) + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public int getRenderType() { + return 2; // todo + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + } + + @Override + public BlockState createBlockState() { + return new ExtendedBlockState(this, new IProperty[] {BotaniaStateProps.ISLAND_TYPE, BotaniaStateProps.COLOR}, new IUnlistedProperty[] {BotaniaStateProps.SUBTILE_ID}); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); + if (te instanceof TileFloatingSpecialFlower) { + state = state.withProperty(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingSpecialFlower) te).getIslandType()); + } + return state; + } + + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + state = getActualState(state, world, pos); + TileEntity te = world.getTileEntity(pos); + if (te instanceof TileFloatingSpecialFlower) { + state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName); + } + return state; } @Override @@ -62,7 +118,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = originalLight; - return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight); + return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); } @Override 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 b1b337a39..f4f290ca3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -71,7 +72,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public int getRenderType() { - return 2; // todo + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index 74a803eed..407b2db8d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -11,9 +11,12 @@ package vazkii.botania.common.block.decor; import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; +import java.util.Locale; + public interface IFloatingFlower { public ItemStack getDisplayStack(); @@ -22,7 +25,7 @@ public interface IFloatingFlower { public void setIslandType(IslandType type); - public static enum IslandType { + public static enum IslandType implements IStringSerializable { GRASS(LibResources.MODEL_MINI_ISLAND), PODZOL(LibResources.MODEL_MINI_ISLAND_PODZOL), MYCEL(LibResources.MODEL_MINI_ISLAND_MYCEL), @@ -52,6 +55,11 @@ public interface IFloatingFlower { return res; } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } + } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 37f9369e2..b83e6d3a1 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +27,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -47,13 +49,6 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public ItemBlockSpecialFlower(Block block1) { super(block1); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), new FloatingFlowerModel()); } @Override From 5a630fbf391276820de61c63ba69351743c9f712 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 29 Dec 2015 14:45:50 -0600 Subject: [PATCH 123/935] Done with floating flowers completely. Can't get the spinning right though. --- .../botania/api/state/BotaniaStateProps.java | 4 - .../client/core/handler/ModelHandler.java | 13 +++ .../client/model/FloatingFlowerModel.java | 76 +++++++++++++++--- .../render/tile/RenderTileFloatingFlower.java | 5 +- .../block/BlockFloatingSpecialFlower.java | 27 +------ .../block/decor/BlockFloatingFlower.java | 80 ++++++++++++++++++- 6 files changed, 160 insertions(+), 45 deletions(-) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index d93946055..975a10166 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -47,10 +47,6 @@ public class BotaniaStateProps { // The axis directions (think quartz pillars and wood logs) public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; - // Island type (floating flowers) - // TODO !!!! MOVE TYPE "ISLANDTYPE" INTO API - public static final PropertyEnum ISLAND_TYPE = PropertyEnum.create("islandtype", IFloatingFlower.IslandType.class); - // Extra Quartz Blocks public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); 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 d250eed58..f3a2d6081 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,9 +9,11 @@ import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -38,6 +40,7 @@ import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -106,6 +109,7 @@ public final class ModelHandler { public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(FloatingFlowerModel.INSTANCE); /** Subtile block models **/ registerSubtiles(); @@ -303,6 +307,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringRelay); registerItemModel(ModBlocks.floatingSpecialFlower); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); + // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); @@ -529,6 +535,13 @@ public final class ModelHandler { } }); + ModelLoader.setCustomStateMapper(ModBlocks.floatingFlower, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:miniIsland", "normal"); + } + }); + // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index df4765c69..c7e18801d 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -1,8 +1,12 @@ package vazkii.botania.client.model; import com.google.common.base.Function; +import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; +import com.google.common.collect.Table; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -10,6 +14,8 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -22,43 +28,87 @@ import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.property.IExtendedBlockState; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import javax.annotation.Nullable; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; +import java.util.Map; -public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel { +public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); + private static Table CACHE = HashBasedTable.create(); + + private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; + + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + CACHE.clear(); + } + @Override public IBakedModel handleItemState(ItemStack stack) { - ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); + // Items always have GRASS island + IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; + String identifier; - // Item form always has island type grass. - IBakedModel islandType = modelManager.getModel(new ModelResourceLocation("botania:miniIsland", "variant=grass")); + if (Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { + // Magic flower + identifier = ItemBlockFloatingSpecialFlower.getType(stack); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + stack.getItemDamage(); + } - IBakedModel flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(ItemBlockFloatingSpecialFlower.getType(stack))); - - return new CompositeBakedModel(flowerModel, islandType); + return getModel(islandType, identifier); } @Override public IBakedModel handleBlockState(IBlockState state) { - IExtendedBlockState realState = ((IExtendedBlockState) state); + IFloatingFlower.IslandType islandType = state.getValue(BlockFloatingFlower.ISLAND_TYPE); + String identifier; + if (state.getBlock() == ModBlocks.floatingSpecialFlower) { + // Magic flower + IExtendedBlockState realState = ((IExtendedBlockState) state); + identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata(); + } + + return getModel(islandType, identifier); + } + + private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, String identifier) { ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); - // Item form always has island type grass. - IBakedModel islandType = modelManager.getModel(new ModelResourceLocation("botania:miniIsland", "variant=" + ((IFloatingFlower.IslandType) realState.getValue(BotaniaStateProps.ISLAND_TYPE)).getName())); + if (CACHE.contains(islandType, identifier)) { + return CACHE.get(islandType, identifier); + } else { + IBakedModel islandModel = modelManager.getModel(new ModelResourceLocation("botania:miniIsland", "variant=" + islandType.getName())); + IBakedModel flowerModel; - IBakedModel flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(realState.getValue(BotaniaStateProps.SUBTILE_ID))); + if (identifier.startsWith(MUNDANE_PREFIX)) { + int meta = Integer.parseInt(identifier.substring(identifier.indexOf(MUNDANE_PREFIX) + MUNDANE_PREFIX.length())); + flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta)); + } else { + flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(identifier)); + } - return new CompositeBakedModel(flowerModel, islandType); + // Enhance! + CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); + System.out.println("Recreated model"); + CACHE.put(islandType, identifier, model); + return model; + } } protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index f10b76dc0..302dbe7de 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -44,14 +44,15 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { IFloatingFlower flower = (IFloatingFlower) tile; GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); + GlStateManager.translate(d0, d1, d2 + 1); double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); GlStateManager.translate(0.5F, 0F, 0.5F); - GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); + // todo 1.8.8 fix spin + //GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); GlStateManager.translate(-0.5F, 0F, -0.5F); if(tile.getWorld() != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index db5b41c30..b79b78d41 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -72,35 +72,14 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.ISLAND_TYPE, IFloatingFlower.IslandType.GRASS) - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE) + .withProperty(ISLAND_TYPE, IFloatingFlower.IslandType.GRASS)); MinecraftForge.EVENT_BUS.register(this); } - @Override - public int getRenderType() { - return 2; // todo - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); - } - @Override public BlockState createBlockState() { - return new ExtendedBlockState(this, new IProperty[] {BotaniaStateProps.ISLAND_TYPE, BotaniaStateProps.COLOR}, new IUnlistedProperty[] {BotaniaStateProps.SUBTILE_ID}); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world.getTileEntity(pos); - if (te instanceof TileFloatingSpecialFlower) { - state = state.withProperty(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingSpecialFlower) te).getIslandType()); - } - return state; + return new ExtendedBlockState(this, new IProperty[] { ISLAND_TYPE, BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID }); } @Override 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 f4f290ca3..e38d0fed3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -15,9 +15,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -28,19 +36,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.block.tile.TileFloatingFlower; +import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ItemGrassSeeds; @@ -54,6 +70,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser { + // Island type (floating flowers) + // Not in BotaniaStateProps so we don't have to bundle IslandType in the API + public static final PropertyEnum ISLAND_TYPE = PropertyEnum.create("islandtype", IFloatingFlower.IslandType.class); + public BlockFloatingFlower() { this(LibBlockNames.MINI_ISLAND); } @@ -67,7 +87,9 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab float f = 0.1F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE) + .withProperty(ISLAND_TYPE, IFloatingFlower.IslandType.GRASS)); } @Override @@ -75,9 +97,18 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return 2; } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + } + @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + return new BlockState(this, BotaniaStateProps.COLOR, ISLAND_TYPE); } @Override @@ -93,6 +124,51 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); + if (te instanceof TileFloatingFlower) { + state = state.withProperty(ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType()); + } else if (te instanceof TileFloatingSpecialFlower) { + state = state.withProperty(ISLAND_TYPE, ((TileFloatingSpecialFlower) te).getIslandType()); + } + return state; + } + + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + 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())); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.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()))); + } + } + } + return true; + } else { + return false; + } + } + @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockAccess world, BlockPos pos) { From 965ab0188967674f3589dacf53b81b03f28c114c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 29 Dec 2015 14:56:19 -0600 Subject: [PATCH 124/935] Fix the textures --- .../client/model/FloatingFlowerModel.java | 1 - .../botania/blockstates/miniIsland.json | 2 +- .../botania/textures/model/miniIsland.png | Bin 4180 -> 1471 bytes .../botania/textures/model/miniIslandCopy.png | Bin 1471 -> 0 bytes .../botania/textures/model/miniIslandDry.png | Bin 20017 -> 1562 bytes .../textures/model/miniIslandGolden.png | Bin 19969 -> 1474 bytes .../textures/model/miniIslandInfused.png | Bin 19975 -> 1521 bytes .../textures/model/miniIslandMutated.png | Bin 20100 -> 1533 bytes .../textures/model/miniIslandMycelium.png | Bin 26145 -> 1558 bytes .../textures/model/miniIslandPodzol.png | Bin 26145 -> 1503 bytes .../textures/model/miniIslandScorched.png | Bin 19989 -> 1523 bytes .../botania/textures/model/miniIslandSnow.png | Bin 26145 -> 1156 bytes .../textures/model/miniIslandVivid.png | Bin 20059 -> 1547 bytes 13 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/model/miniIslandCopy.png diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index c7e18801d..5e62745af 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -105,7 +105,6 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Enhance! CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); - System.out.println("Recreated model"); CACHE.put(islandType, identifier, model); return model; } diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index ec44b455c..44a91fc1b 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -5,7 +5,7 @@ }, "variants": { "variant": { - "grass": { "textures": { "all": "botania:model/miniIslandCopy" } }, + "grass": { "textures": { "all": "botania:model/miniIsland" } }, "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, diff --git a/src/main/resources/assets/botania/textures/model/miniIsland.png b/src/main/resources/assets/botania/textures/model/miniIsland.png index efed7f62c2e90bf807809878c00247cecdc7ae44..945d6b6fea2a5e7e6fed2f99bb789c96a5acc2db 100644 GIT binary patch delta 1466 zcmV;r1x5PQAioQc7k@wq1^@s6s%dfF00004b3#c}2nYxWd`pu0n+l$-E>3>kZ(;=p&icjTf{i`@qyY$CzPifpKjjzo zZS{2DdqO0p6xk1caZqGtGi({21mM!}-BtFZ-yRjpgu<5LN&McHqU)CntNNkJT}Aba z)r6zt`bvv~#(&ou@XW>;9xc{bDlC{Q%q1_BoK9k?uyCShHvpH0@2;|oCBfptB7Sen zM($(7SigBMAR;k^`umGKy#6m9Zwrx_g8Dr`IGVseZ6Wg47;U~*-5b~&&Jw_9o14&7oRjDC8GYkey9h@U1^=F{E+R37j(>!MP%2Z%eBZK8TPgoHW;L55 zx99l&Su9RO@SM~sO_*w}~#VK|4Y;^(ojNF-gNI06%b+l3!nu-^6TD?}M z)oXR-#(z3=YYd9Q%YaOx__Ra?^wG47^$`6^0?sIBVFCj(K!G{ zUaiLNw9`lacPhbme=2nMNKB#o({5pR+R4mjusiMS_&o~1$>oHo*EO1;jZ%8yUO|Vi zm0Tvr+~nMvx^{1iA>B%UYw0_dm)vqrTleK+O=eJxK4uCo^0T3%5g-hw?O6au%*m{1;h2a4F>8)ikyU1Jd3SE2W=}wVLQg9AMz%0TX~Z7!b~AqL4|I;5$E>0DfCO4+I0k z*+0%~pap0DIL&{|0C3>)#pkmLzQ5!q`pt8m_qHYLq&F5wTR0z4gFdg^-&>(hM3 zM6ReJ`i`}WmG<@gN+c4AL^C3hNF)-8L?V$$Boc{4B9TZW5{X12kw_#GiDU!(2ZO>b U0d9BVzW@LL07*qoM6N<$f_d}dxBvhE literal 4180 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 Z{0D==Edg$K;=cd@002ovPDHLkV1kQ%+{gd` diff --git a/src/main/resources/assets/botania/textures/model/miniIslandDry.png b/src/main/resources/assets/botania/textures/model/miniIslandDry.png index b75dbde6329b1f75f3251541897d5d25d3d9831e..846c8c285e24259f811dd7678cdd6aac8a10ac83 100644 GIT binary patch delta 1559 zcmV+y2I%>*oB^5)kQaYI2nGNE0IF$m-T(jq1am@3R0s$N2z&@+hyVZu(Md!>RCt{2 znO|sIbri=xX_K@`(>7VVwT;F$w<2R>Hm=}wu97M0+|-~@6+75)f;cvO9zKh&BI1ia zOb}G2f`~dF9M$4bp>z7Mi7st4Zb{af+%!$n=HJhUdeb)dUV49>rugvtyxiQJ?>#s7 z{Lb(E&i%#4-#iovh_b!Jo|a((eO`{g{+W$6JaZ%<7AsYDmWBX$<;?kY_NQJ@L@ifi zzjp`ml&Z5&JU=Y5*O%#>?*!o8smtr^M@}fBP$*;n)x+3GPHsK`fdv z6wc?WR7({CLtcNTew@|WGqDBit?l47zEQ4NCA+x9$pc{k-krL<&c0MCk-uK!k&)mH zKFW<@f8)eK5l^WEoL=G?mB5IXcuGb49w3&?Fy;>uPpJ$KY%zR*QO|9}lB>b{;^o64 znn*J|u!U$MT_4d&?~I5gGj;!gzLooh2Nj~uRo$uay&`{>%;+-ZzotbSO|xS-q%bxT zte-~{X|gws=^UBq8ug7jGryXy*|ZGx`v`{=%#M>6XNafN`guI1vT)%Oog*_{qrOpR z=2z1-Jpkd5LNt-a>=@`6(pw^5P6YJ=%>&t(t$6zasj! z`q)1*%q4#m;QTsAA6%X0X1|+gVr5P@&fUW=1Vt)VsMnB(UV3Mp{qFk*glfywYsaRo z0*%X+8U2IZII;!eDV0tx=Y;%E#hi(Zm3i94vIy=Ld8j~wPvbo zHkJZ#`s_5fm4l?Omxv`Zra$cT*=hFph7m2)bw>KrXQ#Qn+E16u!QesMBv!f6I^r;!XzgKj1dDv<98`}5XJ0QH>aB%Prrhc5&70JkvfXK`*bJIc( zpl_9%g{2GtC?sqAIa?tdQVcVot=oZGE&#@gD{FN$k=EJ2_$XlmxMzR-R&o05v}r4Rj%&bbt2@;1BbLl?^!CxZ z?v*p=b^e=$Xe~g(`flzMpwHqEwatRat2iMt$0%&=r^{1 z{$bn(uw{!|l#=K>!S`22^h^E#;L(U*c+%b2ltsjhhatNUmi6xl&Bk&7j^DA*QlI{e zGD_67vF^m3_pKJe&du%r*J3%^k57LD#d39tk!p}|NYRbd1Cc@D_qDRev)yn{@L(h$ zJli1Lw#(2SIqVnRZEhx%yO_K<^Z%;>gg=VQljK~kzDKZGSdOwbr^6wIw|@DGGjGQYuU)JADES>v^zY%d@6Uhn>BrY> zMmmjfNa58V&hhyN*EY2VSk3@gZC-Y7KW<4khB#j)-@B$(SGiP zBK}+~vppZcXt#F%gT2D-@8FPUr{NrbII>N2Z}kz(_89)}aP-BXNL;BA3GM{gv>hSK z8SwK@MQoKSfZ@xGr`JXLdhvhn?J_;R-cHK465)_ySSPY-g?z5G>8pX|C_fwth>&yT zRd~*u;H@`j4X-_Ra#(Cj_5tv9{t8_kt%L~bGUC+uUh%E^3(lT)c2`$+lV;rs-h12F zuS6n|NF)-8L?V$$Boc{4B9TZW5{X12kw_#Gi9{liNN#|?08aufpx6(+UNQgx002ov JPDHLkV1k$o8rJ{- literal 20017 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 C0`{f= diff --git a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png index 74eb540ae92cb7510606538338a07272cd2c4f56..f6b7d231501b06cd0bcfffea943288af78af3dd5 100644 GIT binary patch delta 1470 zcmV;v1ws0OoB_fMkQaYI2nGNE0IF$m-T(jq1am@3R0s$N2z&@+hyVZuc}YY;RCt{2 znSV%IR}{xTQCqb(n&>)pHYLWb%po(h+bDrBDT5863jL zR#-@ZquNIQP*8tkAHE7(3Se`k{*C5}Ar8F##%=)4^p9+`TVN^#-sbwpdy>bb=*wfR zA{^u*THG!IkvK+2N3{(geI7EX5k|U9eWuRHud2&6MOUtm0i>gyc~q;pt<*1ER`52r zGK>rGZ*YIKwAjm@XCM$!=5*%VJ@*0P)@^85t0AwS=-FUD=|k8{)@w)JR)Ngr%814W zxZe+9dlD;y8hd#OM5iFUqMx>r30PQAQd@6yD^{VlM5zV&NPU%}Y=ZVSj{r#C^fOln z%}FLxqh9>(X~Lgw;{r@BtQ8OGXj5Vl8~5((Pa-4G3Y$Iz6yZ0-+0m# zm=U$OT`UOLQI=g7`~$WYX4fs-V15;FfUp|ta*e3~boC7o#KUAG5zhWM&OYrBkhg6xq->$xa$9ydFm`<-t9f;{9jEw8I!XLkisHuQE#rpP+ zy$FBnDwH&}(mxc`6v^%n5zz!(3+T7Xxx!Qi07P#>a7al@y$q;wLTa1xSA&gA%yq>Efv-+-nSUSHOfS;ceypWX=xo)sf4(14W`)aRN?K0Oc%lJJE5>f88N+1ZBscc&0<)<{;q`OIpg>Jse9mf-nhu-3e!>k_5kA7NMnDx zf*Xy{`Gbg`#~U@3K2zUw6mjWBBd<9}xE#vvH&>XR0y~<0c%RPRrtp}D8X&9?k18#zULSv8xdp|u=c8b4*j5i?W4NE!5(()@)5k-!+YOs)Mvgewzyr4|K7vli{^jRlfZNa zz!seDW^B`Vg=yeMY`^giL3^wID36O?|zWnYtoaDP?WDOiL;S&pDLQ z)~gc@(_pC}@2i37D4*Jom@HIYbzd&`v;TYjYdiKL7OE7TeY2l!Nw~GeqsfT&Hjj8^ zlb?7Ij6Pi3O?tu4TOIkW0TMQeL?V$$Boc{4B9TZW5{X12kw_#Gi9{liNF)-8MDoAp Y9|`#VA2R?HegFUf07*qoM6N<$f+%{`r~m)} literal 19969 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 HYv_Lg(XHb^ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandInfused.png b/src/main/resources/assets/botania/textures/model/miniIslandInfused.png index 60efcf6beff2588d50059d68d7541c41f27f012f..e3fc55f571bfaf2a3ad1cc303b40b793b5517fd3 100644 GIT binary patch delta 1517 zcmVDVHl-pgnOP$njJK*49KL1!SG#(|@2|#Gi@salR>jZsQ2;aMo zn$(Q;bzcbLmk4&917LUS*^%}y8w7oW1S2i@t1FG~pC<~lf4Qea-w?4#+FY4&z|9oy zQYWqL7mfCFze0b}L~vR>_e}w*L6$A_0kFIE>`43IU6#(Oq~`AB$N3zOO<{QTyFyKB zxYM1eNey>(C2CSb|35%1k;XqcjXI!FHO*uC0hEFvVwV!&tOTHG(^3(Qr>L4%LNuPD ze(P5bfadWvB9=&J{kuz@s7Z~0D^0W`n$5gYH>@*M$`gO4K+mStHQ@E&uddAAN8>4a zr~3_#taQ2hT%DC)U6*ePD#~00ydJEs&8NCilUnv(O=@IL?lU;D(&g%Nbyj|LUETu_ z@Op^GQ&?TyrA~nCeJo+#Bdm0}`dporUtO1P3Y$-L17xF}d)2$S>iFX4ZCQ#~X z1VCt@8~P_&>K3%^V*wCyl|exXN*&^1duZqPjtGCSpsr?kb!k{G=pBSo2Wb5$H&p0U zslT6)?EBhG(Bo2IM-=dS;N}pxOGnq;83$AUv7ws;H*bUEIjr&!@Otb#-haYY02&WP zP_!!$PY_F_Eg!7$Pz0r4h3>0aoteJzPy{7;5{e5^F0?@gOI^OPUtSwF3g6@+7M%DI zFqVI&uVIylWa2299#cDu{DR_%gk9rkZNF%2l55upuEq%_&HyH(a-OhN0RUX@Byw~g z0k6lj0wSqi=qmy&N_TuQFe5ty80Z^>sSYa2T-kAXEEu&3>L}MQ64TN^Inj8^DEQ{P z;f&SQh{i(^<0!mszXKqo`@28tR+PDjCDMN^tGY!rK0y7Bj>1;DjD?AyC$XxKr z`(o)^3yJOAN=2E=*aVk;E5yV_BAU7x9(-6v6EQ>mA;WYv3xkY_j>new0@&5y7)(vK`zqLk(+1uKr=8r^T6uw4O79{#13$k{)#X9Qz~?I`QJvw+t_ z?a2Z7VXx_HAJ(mN&1G}?47C^1(74}Wrqc;{J=C_Tu(##u>;dp#cnQ5S-Dk zUugClmbwvs=P!Je$9W>yk9P1qfoB#<=Wm#v)~;PG=x!%mKE?cZfyHkN%I2Z;{BHWY zgKzs55jlUA@ZBzeF*^}@ggKxXhK75l>1HOAhM6<(AD0>Nz3PXnDgm#@v`?%opM&pt z=a`-b!J|~bicf{oH=Lc&m=d&Xp$!N^i%NfD7$wn(cGElPw! zic+LS3z4No9(hAiw%;uk&C@gQ^Lu~Kar}<=IA%IDb6)55J+J%zoY!?;_w~n2jP(Xn zaZ!0u006|z&5UiK_chQTOk@u9|A~yy-O$@ywwbdZ07z6%{s|mjEujDaqE<{JBWr7S z7Ki2M&SJyNjf`MyUlyI|2?9Xiiwrx4yV^cZb#6(D;HY-{%K0Yi?#zte_KGA2wT}mh7BTq)}yF1dpE%6 ziL_d|Lijo$5co(;1gNk~uRt!@J0bbrFm;na*lvLePNMdDk+6lpn&5cDGr*d)0$~{` zs&+t@5a3ovrE~(;aKLTlt~ZZ>u#Dl<9Rh&sAtf1stV94N4MrOS?mED^hK>7704F4{ zkiNc}06c>ONOMQJ8F1k$P*E=>b_o!f2Ow>tqgDYzI{>#@6_r3>cPg-OZNDSwxz!7CWwO@is@Rk4Xt#Yf83=9CgA^@W`_3w+{@)8You zr$6cMJ7vL;%1zD_s48fx=+rB8`eUODbo#REmwd z;dUD?udXtbG8CnSE%9|*buPkCZO{D+it28N$7>WZ6*lgBlGqZORSv}xx@^g>WRc8D zwX*QJLI$-W(qyF<(E^lxPAc&ta;Z_nN|k0p3u2eU?nE!NQC^>jHAC6%vxhmDDfa97 z&LZsHwDww}PA!0r7~NB5iaHd2$wv3_yemc}XYum8*Pal2K;xj&5@fT|ANXFD*Nwv+ zfBPWMUGhbOo>2|5;@u))t!huC=Ixt?7qvC!CQ<7yDxaH|cU%6##&d$DF`uXn7XySA zgqu{%#R&x%!pKVv%$zKoHas&s3tO@rGylb0{9M7^HdQN?lg_Tcta@$!m+D0nG-|Jt znTAT!f&^)V)Q)JQYW(sAF-GW>B?o4iUp!_1aKXd154~+wx;1jrF=p~ANq1h*JT3_n z4r#zv*G6?^blvRI>Qd-Z>UR~*psevZHEh?RW_x$ry2Y=hUSnR*0aMTh4ky!WU!FZ~ zKOdXmVwiut$o9O=-m}se|1`q=NLlmsr}Ix7ekAWM=RU+d|BiEQ{>#HlHzYrBd|20Q z`Y!pM;9$T!@jWt;HPH;U#p#QL7cmwGEIOZJac1$O*u^#WNIa@1*ChVvfD5*>f*vc4J8lpygmNm*lN{__n+_F zu3nllrdS%Qo11f-V5GH9%dyaQ;1FG3xHH9P_$X(?+_!4k$pfMLS{L@M>R6?424hiz z0ylZ&9!WmplxLP_lV{pfjw|TR&Nx$UQtCVsE@4o!Zsn$xri_I8*%@!`p4+|57R{Em z)Fpl@(9HEXt#G{5IN*kN_J@?r>s!JyEm+yDLFI41E(t-5*^haB&HiLM&uLEKyybJ6 z=hZJF-NO2?NQ#J>=8rZ;n{Tc$I!!)IPHx|wSkg#3`DE?>wUTkn+nYL2K4Yrng;na|v|OC^}nI z44Pl+ayjGtp{UF|%7x&3+R4FXbK%YRe$0+fO9EgsMSsziSnXIRou5kNhZF$!^ z&L^ME?ZFQ}WuzCTSM{E4KK}vtf%#!?%dvZyW2-Wqwfr93tTlRN^SV)A?AT$XN87nj zDtEU5Uhsb?$dY|=tk9F#GlJKqQR_Cqv@D*2Uuhv=JWMyuR zYBSoUGC`XNo@fNJ!&V3|1Y^Pt!d+*L3*Z>0BfY?1!(7w9tx0#j_rxi~$=q}O5`w0B0nXd=dfRC4 zz}}9G4zbQ1aw&+~&FrA#^;LsW*|IsB3p9vF)>uSu&_47p11a^hvT-Z=r2|&Piw0FG zRxy+jjkw0>XGWXUmu~1cQ@0F0_(x(HHfZ@RtOLni!IZ$RHZt*gmm?@jK9p;7B zC6=Qi4<;V)G0au6Oe$i$XS|_ruR8}uT^hgT9eWkA^sw+9kHQ1zW;?@0iww`avv*N@ zsxEwq0Xoue+>g0SIFgsS`hM@d!n@4}@JIWOP4q6PTF`#5==7fTj&Mb%H|6KH5iXH@ zf|^A;WoED5vvJNjQt`ebb+0E@dA*Lw1)=4t!ImE3TPp8HR9+GA=n-=eeH|6j)AF=; zvy~IVx$O%1>z)h+J(-w&1q++yl4W*1Q)>x)t+1DM_eN^Vq02dW)g`nB`a^p6n^t(H ztHhDqFR*t_wA!j7`fm_MF0yOs@&>D{^B>>%J^`Go!i95Ej$9MUg{$?YCKGUBy4 ze}k7#Z;jwX!7*VKiK3?^kDn+$)U~%wXjTaZp$H z(A>76rQ*aF+v9eeYZrdBY`Y>u5wXoMtv_vTx?S3cE5-Gi)jhq&ruVJEqo&QvB#&Z9 z&Oz%2?C&sNbVoc&V)Qq}WgN~33Dx}4;?{hkXvbS>ecLukR^K%#PWwZXiP*O~Wjghn z`inXJmzrNoI~F^pohNSfde3=J8c%v;Ra1JjG_9aylSj#i;PNXw=tJEKnfUsbgXKXV zWha`RWD;~=mJbB8hHedgYLk5#>br8RzOM9nz{(H#WmaWd2iNo(JU4o|_ldsic+0cC zmR;K_0T2$KF@;EI!|SyXyAR>vsaRP+JB!j`UUrv;-*j zooth|>e>n0r8eRI<>Dv12iYS@i<6QjgalItMyXoxW&qI5X4*S(oGdMfRF;<}nZ}}k znt@(y=s^?!Ncw?nGSvg*z$hSt>8-2WS9(Jk#-!;gJ7O)7mTV)?ooN>A3)%&5u%`xl zPzf|;eLYc9AQ1}S1#-x+Krc^kKVqP+^0&A|=<{SVLK*h03&%rO*^Yd2`5taBn}AsUSb%7=wOP zUnZNwWO>6TexRX{(s7U8SPbcS>NRytwyml~<`4_TD&y?)jRG7*T z3A$IJkuON*uzc-VEKj|uSvGxsf{ssWj!bVFE5L6R3BlcaI@QyGKw~lo)PtrX7LG*0 zQ8;@fiip)BYN1_b=%+ey$t_tlCOv3cjzYoFD0?)d)gq#?-{mtpam%3vLnCv@|1QAH zZZksAs6;x;*Ne>2V|tMpAcF19AR(q3XY~9zgNQ~fPnIuqMWCJ*3Gut;->RT9srA&6 zRL{@W)DUKFVuV8xa5y+x6E!o;jDEk3W6YxZPc8)mZz|{qCD3n1VxjbYTkM8p#;>hE z9G*-)D4UuzCXI+hQ9v?*PJnCUwQz6@h@rzNR4g8jq-oR0WV$v5`bR=cE^$aSeI?&# z(D(Kq!N_!V z-hLc1lyr0BZ#iT_Ii%q!1P~8mq3eOlHkN?F!Ub=h265VOkb(ly6fza7tquMNJwyJd&{n=oXlo>U z&gk=F()@3R_)VBU4Q0lhTn|CNPS$Vh!4CBKwRL(ueA~p>WM4mUvPA1D|ESSFcfF|z z|9#qjEA>P&b#nXDqfS;(kVZoM(mH)vKb54Z4$R*q@NZH6ll-s82yh3z|Dp^}Mfuj@ zul0T`Iwyea3mPz>67z5Ng{gqQD!3#6el`3f`2EP+|8MZM@HiR`hk{BB1%-ze4m8Cn zI1E%N=-MxFn-7`M9`%@HY9lc=O@%@^Nti;cfD9@#e$j<>TT4!rSEI;?0N4%g4n9gty7Z z#hVY8mye4J2yc^*i#H!GFCP~d5Z)#q7jHgXUOp}^AiPaJF5Y~&ynI|-KzN&cT)g>k zdHJ}wfbcf?xOns7^73(U0pV@(aq;HE<>lkz0>azmwaJeJ>kEHM6w@fZ!DX5EcmlUnZdUZUFE{0>FDW z03fCSfE?@K)>~@I^V*~rZ7k{LBdD?-C_MF!W_Yx>NqPF@T-F5D=xsM!5VMNok z6wlZ>(uXv1(E0%OKv?nCOoQn58u^KJw&u%=t4+j}s)fW4nJt=k;-J5`T2csS^%7^- zH!liC)D)JT*T2@3uUm7tR&@Rc{p?=9q3$~ar1G|rkc8#Cq2Kzs>cZAi2s$B5&5ZXN z*>xagR`*T(?9PD$f}4TI%k=bhuQRT?4a>*t2&#=+`|cbvoz*Afshcb?{MEB&aJbc_ zk}Z_pGw<~Z6Z0GTt|`*HzeSs!w<5KY?#eMp_FP;*)wM_XlA*@EO+QxP_TAuQJLDDv5 z0(D7)%(8d;0Bz^3DlM%*-4TtdUU8VJj*H`FRnm2sHw$yar#~QrF8x6wplkrOrQ=kK z2d(;Aj{lW3%R|WvZ?%<{3+(ByOIpDExZq0+DZdQW>Zx+_K~~K++;M-eZ9OI*_jdHj z?22ahTs&p$Qf3^gY_*ydhwqtvAk=hV6|E0a$wA;apuO>MXV-l zR!+VgY)fyohsAx5&%0FRZ|Z8V%Zj8aK3n>@^6ue9{Dv+=NP=^wN!4t`-{C{OLNyRb-%xvj^# z&wGQaMq}sa?We)Pq+|o}#}3IR`>SlF<7mu&b(eS>foGrQ)H(@W?6WkqkiAxL%>p87 z+e@#s7V2LvvLBWpVVGQ1w2Fki;nRSH$sBy*8FA4E`R4w;Qi7Z>E4w0Hk}3_;J^oxc z?>S~fIYl(5eYY5aBVMLQx}NoBKlUhFDM9T)^Rl-&9~Cwf9~jF&pe0;VI=jlfpRQng zPqe{oly>ZbM(vr7s({>$#g{(|wu|mayczj^^`&uVF1W4j5nQ$gTQUTYkIX({z7Vh>(H!ceKf;(iJDO#|HPd= z*o)n#)xE9a{SS(Gx2ic^Uf3M9>`A9in{-RD^pIp>`FLBo$eZ&KiKvCUt_JUH-6@}* z(0T5X#j%J*-t?Q*YOj-;dzX*;E5^y5i;|XnBgCcxu0t!V?bvIU#0Brj*`9pi%ccqK zTA`JT`i74TMdgnyX(Ktu^)|F6iU+^*v-Qy~S58S(Z*)Fz_~CfVmtnVUW#Ig~>-Vu` z8E3$@iDN6X`YEbrLAAT>pLPpoTg61mSzWxPV67{yaiveX;DT^X^j2)>yHV$M?WYk} zuCK*h`Em!7U3PP6FQG*xmiayGCy7HD{cDm2l zM~~4s*k-fmqBY}>HWtR*ZL+COJo(U~j5xOKePr_4KO~f|k8ZJj32yi}`!HOz!~IcY zj)2|$*m92Ly0ZO7jfHw6cjYGhugW!)o>A|WKk$|QZvUrQk3_o)j@jtsAKu<8HCWWC z=5%&^lbcagg>@WhIQG5Y-iLz6L>(FW@vgc6Q)m9VkXikHZlv7Q-1Jno)DeWEuBPAx zlB2|!=*B{Ghm}RL=c+C_B{x0FDoqcAv&4e5Unq`5C|4g}`$WPVix3Oisdm?OvqZUK zZDQrAn6r7B(%X#$%t~roV}YX@TTJV=ln$ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png index fb243edaaf7992a581abf0b5a1e81aa5afc96b8f..f34e10082032f5767510ec43b6f09f7761a9f517 100644 GIT binary patch delta 1529 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 Ur@AH6|IEYO*v6>Pz-{;c0J-KQqyPW_ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png b/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png index dd79e53ed5cc6c7d4a3ab2e3ca60eded610fb64b..8bd2b8b67764b038cb8dfb3c0f62401e761eb101 100644 GIT binary patch delta 1555 zcmV+u2JHEv%mJ1RkQaYI2nGNE0IF$m-T(jq1am@3R0s$N2z&@+hyVZu%}GQ-RCt{2 znO$sCWf;eQ?YgdOyV0)8x`NZK1BqW*mFNY@lIn#JqlsQ{fgjK?q6nH{2ohopTtK*x z3yomB&^Qw#7u=X=2zX(LGc!WaDT_p;Fe&V`!>xz0maepWz36{VVLj)tL!^x{@9*a9 z?D_X;`<&-I@Bh5DF~{yL{UVi_#+NxmN6^RS14nG!!tO2o0$^tRBmnyk56z3OfAJ;Z zaRqqTeU3y*)x~3L*Oy*@=>!0W2G7ik_ixxJ@`VEGg`eo{>C(M_wQy*ET+8JMdc6D* zPa6tTnQ0a^HgbP&(8u7f7j$u7^AgBUn!Zu6*#p2+t5*PUXz+|qv)CWtk>;*D`v(6K z$475GBN8cZIuluB<;7m1XL_J4rUWSU333W=0TcO-211>6%qFq%xWyr=X9j_rL} z#Fa_9LoLLWNj4w&$Od3vvr>#E)8+gfK_7{fO0+viTp52WU-_MLy2?(u+t{_MX?Bc8 z!u0lZmCxhKBv+U8>JpjhD)p5*v%H$F+SohW{X`>S%#O#0&yz^0JW$Ndzb&1S$ zmHJAZSzb+7^#VjAVdBapX2*`851@QLnlzpfX1Yp!rOqs`rmHrN- zC&%`NMQLW#XceejuFRO71zY|Gi7AyPe%8fXJzg$PrA^!RnyL`+csV}&yW!Qn&)dY9 znkBAG)}-|{9196{u30GnrkaBkiv?5Njq#JT0powJr8w*A*|`RBYkc3p!SZxZq*P*S z*Nd6rb=(au3WWmK$A<6&n?D~a>p<@}?lyKSqG%*cCaYqb%`B(`aM#_wuF*)C#(Eo1 zE_(<7hr?K}<*O!^3NUc=6rsYOINfcGCex-LY~biA+H&Vm^ViEdBmKb9Q~0i*<@A*) z+H!yAa66r*x@u#&y*9dn_^pp-EL>mwNr-i{o8hkk+CFC1gjmAA zjICWS?rUw~?C?=QZvIv)xZ@&Mwyi%T?B_X>9chZnsQT>TZ8p;rV(^*V*pJO5SR*;3}Y@8J3%t^@t^1 z{PLioUejp>S}1R|uv`GmFaeO#TVXTZl!?C5fGw1_T39ZC>UjXCE5LHch+%x=%ddz` zeuh!yG@b2!jJa{?l&E>)xvTIBr^rB#=paFFu?&nKlG&yz_~6a)MUEs+ zvtm&xUimb*ed``^O;tFyH!O}1pa1X805zATP!xMBX_sw}1&xUiHxDtQj-S^+q z8KGOxqmeLwWtZ{l-d#1F0hT)eZkm^dd)h7O7BB54u1w+xwwUT})lYbxck*%W3YM$= z`ns5K*EistI*rk8?d!2V(dzaPvK#*{(D%wZ;jF7S{oSE|)7yglB+K1n05!A3mODV$ zJ!FcdnQ8PemH%4>Di_S>F@`bxHzcmh@ERziiWnwQHnFPO#BAGwD&uLJ002ovPDHLk FV1hdCAFTiY literal 26145 zcmeHP30#cZ-#;x{rd6dRxl&xp}E z{BD%%t&!8GOKLqxiILc`BWn97S3~)&n77hpI!AV_KN_?3(T|U7jxK+l)l%`a^U@p3 z%F_)=7xSdEW#soc8M~TB$)B_xH}b>!`*-erEHko>#*7aJ$}$%jI-wnUVxTpWN}Zyc zEqw!sg};!K0og8z*@Us1c}ibw_b(KS+8~zAjh#AECQ1!hN9?dY4y+x-qLLCOx`Px+ zu=FwAw-n69fu;I?RJ;IDNv-?Wh=B!rbViA#!~(1;GsYhHPXnj(=53u0ya_e|aPBh5&Q+GX0A%C=!8K;%WFWZ)EPbG-7Y;V;2Wk%WUes?>(v>R>Af)zR zpk|IIPmf+8gIgi(wcN*d^j)|Hk6&2WdWI~Ok|6;k6l`Y%+ zE+|=F0x4AmUJb!8Hq#I9%6#{(ysYf)j61dqXpg+scCvDoWP5c4e2=8Iw={jY@o9WC zX;HMJWb22VCyld?jm_IFyTP}pVy9#KWjS8E_6yxR&c2!625P0QDl2x_AK2bNI;OkD zcK77F6Q1)JpGpjWNLZGbf^*9(#n!~)PAsBJG|$vm_U2}PY5}1B8t2x_Niq^q{_8*H zh4E^wIvi6bfG9ub-75fCY(L(}M4oOLjE3OvEA%& z<+D@%N(DPD?d}t@KaZ9+z7s$&x_8_5{8U5PIQrxBx~Jt&-5Yam-f4+zTbk&3=ffmb zqNiuenn{M)Vrk=SoV;gw&wlH40y}oR$;bj(b6JTEt~vU;aVKW}J@M+u?{`M~l8BqV zoecF}tL#+8E3b*MyJJ3HWs4n2KXaG3^ZCC#o~t}}cpl`YS7mrI(Zp$tUfjb1#_|i& z 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 Je22Nq{s%MbdZPdU diff --git a/src/main/resources/assets/botania/textures/model/miniIslandScorched.png b/src/main/resources/assets/botania/textures/model/miniIslandScorched.png index 7d94a79991b84a45bdcf107e7ad3c993fef26875..217f7e3516c1a43b74a494e6167c77bf1e052ac1 100644 GIT binary patch delta 1519 zcmV@*go8 zUm1PrLLex-B*FPYGBZU{M@C`Zre4Cb)Eh9g-)LH&lc0Dz;X&zHmxdaB5H zl7)X)55h577k^o@lgKm!bb0^)Cx|HxNGO_s_PPPTw?ubjdlv~s6S_+Iw_(-0X*Pcb{9bhXJjLT+B#!Z>Zrwy? zI;~!-Gn-e{l^eFDu@(Wp7iQzo=orE=xp*9o$w*#2qnpS~r`2n9X7j4LvL`?-J+ra7 z!36-tV>6F1(`ofuo!PvquH0}#qhkP2%(iw^-Tdmg?})qFiSFKY_!(XR=SwE~=G0j% zVR-}#&$NH`**zrjU^pH)j9WRML+#rzXmCHr%sMso?U9QaVxa}Apn?^V$!-cLDU>Gd!$uEy{SAkpSl@Hd6DB$;E zR>@+C?eFDzGt0rw^7HDF^&+NhEM^)7uq11$D>s%BFfcd*_tq{%X9+^lgy{zx7#u-o z?@HLJP}CXe2L?wVJ#a4^3J2$!4%~1Frn+)txx8L)e|xWD%eO3FTlIm zXBdBfu-ZZDGg$R;p{@peh)^tv4)mq;R=OVM~GglK!qyz`a| z%a6d*2Oqc8r}w_}h$Y>o!hEd-_pfCCKNri{-n)z;N{&U-iq#1Cy}Gx#9g;}g;{+Z1 zHW=;+KJR7-uZUQ_d%a=&nOcT8>TG}5w(ltnjgI~IJRl{D5R(c*(S%_ifK(1)WDWNV z0U*JOxS2^I9Fwu&{%yKA5gFV_am77?N?|$6syhe#UYvXHGrTKj49}gbJN5Ai?08`} zKKbA{KK--wTH3e8fZvM~@1Ml6gi=utuv`Jat>(q`>Km4H%lh9zFcOFFm7{;Ay1Dv$ z4!!kHKF+^_a{WO!sIm5Q$h zmb1KPF-xTNYXAV(KOe!d$+TzTxldNx$z5CW&Csu3ehWcyqIqM7t|E?X?;?MEbrG4F z43=(M4FKT2zJNC)mGuA$g+ifFC=?2XLZMJ76bgkxp-?Ck3WY+UP$(1%g+lpX^B0Vn V4G!_Q1GNAE002ovPDHLkV1mn;&j0`b literal 19989 zcmeI4c{tQv`@p|a$WBqxGM12x*@v0NI@ToFvbD`_vJ7T4mWZ-e4@n4-7Q3`45(0>;7#gw?9G zqL%@opnDQxK&@?NEqrP0q|8gx^i4t$Q9`wxBz+sPh=qW0NP=k|U~C~2k#$(Z5y+Vf zY-^^Fdw~s5V4LQy7x#dOtg-Y^A;9C1ih@v15&&61i!%c}*8nBAH|{kDT;ae%x=jNP zcnk&L)-H4_;7kQj+bSz@4iJ+B;P!FRtAM$oz_#mZYC%9$IQdPOZID#@ zIYOm6&OFjX4C*iH;-b4;tJQkZ>V;U+98!j{ZhdgN5;77k^K9f60OTYofTJB54{DVz zZEeLSluK`gzPutbsY)jIPW0a{_5%a=oD<$Qp#v*h60t@k!e`?6%Hg@5TO@J)Y(`Q%A|U*F@k4W=HXn=WA!jQXv$F5})G!wH{9-#@$DqaKOe z9BDas>{bg!h%Z!@D0KhCKQu~aF^1HglI<+E8>*jUVNqpXhjWShl zs5g~06{kil4cNA-WVfkSOv{;N+S_3FjhCTo?LA|X{iJp4oi9oo_{sc563edBs*apL z*W|j`0+LF5oDg}ht6GBCqV(u7l{%}r^83^wH{urBtJ)-CtPl=+ogmIu%ibCU%)!NO zvbdDA<~o4f{W+%E5^*T4NNj@F{=Qfg)!+@+ZMPSXV0@wTJSF z3t+OLal{5ab@_NAQnT{F9P6_uo$kutwYcl+pf;#en2EMpqLzH4o$7T?6n97mvif>- zUsm7MK2)D_pUPVg@hq~j|H(1O9xaEP+t(`f%l4!DMQDeSCe9}^9G(^&bCSa(x|^Ol zR_<`xKDJ;1Ixqv*vPaR{Cim3wlzU4&7kQ2{Pyf!jB=++QD?Ne%Ug6kn(9Ue%RNoP5`YL{#8R7kohp0YMY zBSl#o=2TdeSJYJ`;XLBp?37rz#WAeZ!Wre*TR8uIYO!-s)`nM(%8rb}H3hLni~^RE z(aCVP@puuptLv`X5l`CZoZZ@6-3XDOD3t~2sCY>g#{@=V8Z^$fJlVNJyXx@xvZ{Rs zMTN(3MATZ8OPRySA-a)h?_vM3Bb@c~2ek6jM#A@YEquMIXO(gudR--gw#lm~H7(V( z*s9pR*z#2kwsa^zE3d}9%I#C6v`N!i%}tt?jKtP?Sp$ww9G~Wk=PTM8;NO?(7J20= zAFDFsUh&NzKAe4dOGNfMR(@A-&A?wv!(ii1<34}ozqgch6)BTc7wM2}T}-%!@n;d1 z!J0bW*b_HjH74egQb=jfqmnAy2qzv`{AMAupV_#nSH0J#(Wmi*hKPoWhK=n@+u;lc z+seFEd280KS=ZEZtL1ph!*ooh0pbyIAafw|QD%3=HuoTRo$`Y6i!|$VeeQW~!{yb! z(e606TvuoJ&1Dv+vQDjhSaqr@UoO9Lee(L^?1zl2XWo?GC@-u~I@AAHq@%Rlr#y_r zATMH6Tr0ggoLrL}b}8()aRX7Q*eBA(%iNcRv(E=C#BaoRWwag{HVV7;E_D#baJ?;i z`!TAwd_nW724WsB1R>9&q&<9c$?kLx@m^GnaYh%uh;ag<-GUb{5<6D`>f2e z%=)2%j?=@~Vdijb=h0i}qpPyrQ0zNbuM?ly_qQ2I98H0Hb(e(O5$z%w7Y5W|6j+kW zsYhoja=AsLq}PiKKNtoa?KSKr=yf5x+_v7*tF5?R(QJ2>mAy5(o48ADk~$eO*#_iC ztQ2Ah$48n(dd&GW7P3?2N`eu-gZAOvlOdD+Ih7^~CW*UG?e4ETrQ&)0j{~PvMh6bJ zCbcr9qc?>A{_u_{=>=)u)o@A8=-6nN7^4KgIM*d@h%^kht&_;^Hv7vg)vPO%fw04! zhOWhE8y4wqC$#HbLSHg!)TO)Kdf=MnYVB>a6sN0QiuLur-2HiIB(^83N1``$(P7y2 z&3?hhTI=6M=PMTK%In}$jn~Dk*FW^9iL7>k;{KIy7jRc5hzHj%t7oXf+OTbLkBOVK zm#=?orEME>@Qz-!fvlTOTKzxt}_!`8XgGmScO^Z}) zlgk+|887HNnoDTW=O(WC?yG<;PZ7Q0Rd%3co*PuW+%)fZCwHw!+M?$eG#C1nmiU{v z)Z*;bEkn1;Zgw2dJM#MIU9Lu_SCB5^|`NHCcO6qO;UHagQE@-xgbZSxBi!^CpsVD8{ zrMfqsAA0}6yaSfjqSaBgr<_=M;tJtnH7)-}Ys(rVr;|?aoc?mc4&Qxxf%It1w{2KC zwE6@3j|Uwd)uZEvH!gQL3pv|9pg*8}vi?*yYE&9uG&q*}$!GJa^*;VXO~QAD$3@ko z%O6$Vf3WPXfs;ex!_}`WrJGh{!NF2HS3$@ixOE(=p?d2ifD2-7UkmhcCNAK3jIIkU4@TxCO5rak{~5AKZN} zneq1a{;ZU&uyEavo!dH&mxm5eTD!N)uwGx1Zx9-k$5|U*K}l zCF3-HtItc$OTt9*J-eo=BUKrtm7BaOheK*EgwjU`m9zC)pT4UJexo?~@If}t;AzcB z2y67(==*NPr{Mvb=Hr>gC$x4ttTGI>IL8vDS=W1{o%>&{)ciZJm~* zBGG$pPb9rhlp)SbOiyf%k&1bht#63K^%w<=4}Q)k-lpEx$X+yYe4@E@ks>U7?7^!? zt!;Gk5%D?JK3z9gX#k%P-#uLLs)i+xTgyj@!vy_WDG(j9uSO$S$o( z&yQ!{JKo9vl&qATJULhR@W^Kh3fchx2Kh`USB|UgIy{Btqf4T)$TZy`A3yLQ3IGJ7 zAU_hti^hSFX$+>Xf$Hn3E2{U4>C~w;ujD8o+^f^LcUbtcp0dgOf?8`wcP+AvI1xjj4lRBfg=$R zJ)ABAgT^5cIuIlrfr266FeDC&K;Y4Ocmx*m^`&Yk4*ntpQ0aIFGmEdyfs%o$Cx_#Q zhrzg9t}Yj)%L-t?5I7tT21mk>NGMnX$`1DBkbKR8gGZKep2u?)|6pnx*uugCU9)rT8 zknXeWrz`Q8+p?%kdhm=n0s%!LoRBCy0s~IwujaEV@tT7RhDzd){*{B-)n>V%Qt)(E zfDegd$n+sGXfQut1_3rxIIHIO8H6XYyjcNYk7$M{0_<1CzqA7Hq#LHMq=swa4d(?`K6 zP&kSNr%}i>8eE_L&z;c`C>orEgHqubFn5yCdQg3E=ukRI4~L;(5m+1r{*Rr}sU#X2 zj)p_Aa55E2!lIE-5*mw!lF>La3WJ2BNhtKMolTei7?;^m=NHwfRc338xAtXoNMO*d z&A!Bt3C0jh!s_ec$RH#Vl{`g?1l32Qz)q29NE{6d$DrYQU)JA`<}=a!>iS#jUtLd4 z4=N5rLgC0{D2+ryLy>xD3>5UJ52cY2G$ffs!RYJLzPX-d{*!CF04BIKlDuct`8H|( zH%oKE(cgEy=?VXJ+J8y) zcoJo5`!l3WWl$QG0Q;eIrd!`F3DXsrKL_xiA^6Gs@7v&d(tQ6W4NrUdQsM9I*(^GT zOA4TwFu)Y^FZP9Lhd)~Idj9ol_>bUclXm>y;G^`gR4Nt$t{yT%4~j#9Q=E)NgPDS^ zPt`-f(Nr7-T+RO;d?Xa9?}WhN(Qt4Z1UIq&7x+_{ryHhtl6)C7sv+!KPreoWH^u9p zWxIbXUOyc={=4Hfz3P6$^^6O7Flg z^>J7@_yR8>;OndDY&EZ`8-LT;YF^VBOJ`pu#}N6oHJ;*GR#OMy=@XkHcvqttfhmxgXLhA6OmGlsJiUk#_jH0wt7Ws{mN1@CL% zRT1|6uK3gb^?i5wPyU!0(SOn_k1s(ZJV5x10$lw0@Ms0Nc!2O11-SV0;n50k@c`j3 z3UKk~!=n}8;sL^66yV~|hes>G#RG)DD8R*^506%Wiw6jQQGkm-A0Dj$7Y`8rq5v0v zK0I0hE*>EKMFB4Ue0a11Ts%PdivnEy`S553xOjl@7X`TZ^Wo77aPa`)FA8w+=fk5F z;Nk(oUlict&xc1Vz{LZEzbL@PpAU~#fQttRe^G#oKOY{g02dDs{-OXEe?B}~0WKaO z{6zsS{(N|}0$e;m_=^Hu{Q2-`1-N*C@D~NR`19e>3UKiN;V%ks@#n*%72x6l!e8Wz zOMK?(Ynm_k$Tb&ywpwianPl*}YzW25!4?2QRsul89su|_34RX(Kp-3dUTy;b{9yoC z#5%b3ngsyN`_0lb$eMZ5LO)9-Pni_4&kv0C4 z9d~i={v}BtlL{a<7ggvPp4D%5+ZdZ1Qids}9PrGul59&#TCARtkbbjW-n(izbUdi$ z@p@thdlRBWr+)Iq`LKzw^&{1{KN?Mro>GqjwuPQGKg@1C+Uid`%Hg+I6} z$YGka+$%&PS{(-t_Iz5ZfmodCKkS;=v|{bPD{j7uU5NQFi-pGih_$hPBb>W;v7CSD zqx*L{H)QRYe6rg<%$|;w-?wCNbRH&tPbC~D)GDvcfNinfS7jilUS>UNaY9^D#_rB# z|8zRRRFdUN3L|2kM7{a5I5WCw#qk$s>4XW{z?E3=^W^|Aei_oz;qm7fQAd0A{dGcXl^ya`*p-?e0dlDT(V)zVkrLV2idcFvyCo!mK~nwc=YLbKdxtV+Ytj%E^z1W8>T~b zG1_HJcQW-(LWynUegE9p?N#x0ml5E=H|n0eHnLD{Lhe9d`@=PJh%rkqg?>W2R6v&G zyW0DO3cE4K&m#(A6CP>^!LhQW``Vmf^WRnriDkW3L8Ft#viI7FXfAj;{3bRiEZaoV z+JCPFTWqboLkIX$=g-LIb2Ug^FH40YSdx=#wor$N*_rA3KtpWW(jGYJgu#A$D?7IJIOx+)(oHqh(zo_$SV$w+A z*@&8E+%?(@m`CoD;~mW-QDGa-y!#lK!PpI3)NC5>R?tzo5jA0YOea7>>Ik?}p4No1 z?Sw6eiaO61J2trqNtrH{v2PhMjmYtS9ztE1Xw+aJV~|m*q8RUWqOn2Ar2N2Hg^fp< z;OyY8*je|f&YG#wRd`j?^J!VK+KOcZeSs>>H@@%YX&Mr4oHa%lFM)JRx?y1D0NKIv=r4v7^z!3set6_4=X$c5T1eK0bG1w5YHBq}YAn&$Cy%nKs!QdfK zj{#$6GMIX(v2hn?l502>Tgyq!owmT&L3-!Y={@Pm$%zi%Z#jRSzQ4XZz4z{W|MvuR zupEboh>E!+RSH=`0Go*HPP~{)_QZ*ZEXScrA=@{;oSvuU^t>|va(Z5R|F9VMH$DQm zx@q+N!p!s(j{f?)=kt#MqNX|UhEJb7006u>df)YV%XI+&>BYH$IX)*wrI017-o(uG z6l7PR-6`qCIaq)7CNhaQs@FE2m-h^RqGB#dGTql--tW=}b>cq3yh8Wp=)KYN)Sro;v1Xisg`=(b!J)oXhsQ(rJXNFZiN&2_y_kWqQ|7y$6g?|-yE$fvqymSGrP zb+_tGZ$^Ir?T*>XrvTi}IB{Ry0lF(=I-*P>-uK7*brH>cHP=PWbH!8jF@R+E1yCHQ0o3S46?#@$LjX8%0xt! zLRM;pMO9w0m8}x@~PWEyN-Vd4_d;b&%>nr59!uLBxP#~=CY&3$an})aiZSEc$o4d!K{KIt7 z?f_v}ZY}Gcmah8GkyIbtD-6mT7TO(fcz$`?sP|f7mF|N=FLYgNexJNyq1^$`UmpNy zJ3)ULmgCTbY2wAw0%oHTsS~WZE?#CIDdPY<{}A^2FVHT6G1J6^X~L>ErA|%wgh2&N zwZjvhKviVJLVE@P@J3gLaC$ZoZ7(e#xD*P@a#SNP(4GPB zHdeLv=O;tzE`IxQ!#vJtA>U?5wpkH1LiLX8{_k~A zDP%|bzkqfPsJX7U;gKzcqDEXm{{Bvwrnk<^>O`xPf0U;|Lm@`5m`jrXG$)9E%k1AG z2X)05 P00000NkvXXu0mjf^${~h literal 26145 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 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandVivid.png b/src/main/resources/assets/botania/textures/model/miniIslandVivid.png index 569711bc25d626d8027d1c4894192a023f93f4ca..badf6142b3fd55caa7b10a3e95215c5b0cf22713 100644 GIT binary patch delta 1543 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 Date: Tue, 29 Dec 2015 22:37:19 -0600 Subject: [PATCH 125/935] Petal apothecaries fully restored --- .../botania/api/state/BotaniaStateProps.java | 1 - .../botania/api/state/enums/AltarVariant.java | 3 +- .../client/core/handler/ModelHandler.java | 4 +- .../client/render/tile/RenderTileAltar.java | 4 +- .../botania/common/block/BlockAltar.java | 13 +- .../botania/common/block/tile/TileAltar.java | 16 +- .../assets/botania/blockstates/altar.json | 51 ++++++ .../botania/blockstates/altar_temp.json | 149 ------------------ .../assets/botania/models/block/altar.json | 113 +++++++------ .../assets/botania/textures/model/altar.png | Bin 2683 -> 3278 bytes .../model/altar/default/gobletBase.png | Bin 932 -> 0 bytes .../model/altar/default/gobletBase2.png | Bin 696 -> 0 bytes .../model/altar/default/gobletBase3.png | Bin 632 -> 0 bytes .../model/altar/default/gobletStand.png | Bin 468 -> 0 bytes .../textures/model/altar/default/kelkBase.png | Bin 471 -> 0 bytes .../model/altar/default/kelkBase2.png | Bin 726 -> 0 bytes .../model/altar/default/kelkWallNS.png | Bin 402 -> 0 bytes .../model/altar/default/kelkWallWE.png | Bin 402 -> 0 bytes .../model/altar/desert/gobletBase.png | Bin 733 -> 0 bytes .../model/altar/desert/gobletBase2.png | Bin 664 -> 0 bytes .../model/altar/desert/gobletBase3.png | Bin 591 -> 0 bytes .../model/altar/desert/gobletStand.png | Bin 449 -> 0 bytes .../textures/model/altar/desert/kelkBase.png | Bin 412 -> 0 bytes .../textures/model/altar/desert/kelkBase2.png | Bin 617 -> 0 bytes .../model/altar/desert/kelkWallNS.png | Bin 387 -> 0 bytes .../model/altar/desert/kelkWallWE.png | Bin 387 -> 0 bytes .../textures/model/altar/desert/wtfisthis.png | Bin 787 -> 0 bytes .../model/altar/forest/gobletBase.png | Bin 687 -> 0 bytes .../model/altar/forest/gobletBase2.png | Bin 612 -> 0 bytes .../model/altar/forest/gobletBase3.png | Bin 546 -> 0 bytes .../model/altar/forest/gobletStand.png | Bin 411 -> 0 bytes .../textures/model/altar/forest/kelkBase.png | Bin 387 -> 0 bytes .../textures/model/altar/forest/kelkBase2.png | Bin 578 -> 0 bytes .../model/altar/forest/kelkWallNS.png | Bin 366 -> 0 bytes .../model/altar/forest/kelkWallWE.png | Bin 366 -> 0 bytes .../textures/model/altar/forest/wtfisthis.png | Bin 625 -> 0 bytes .../model/altar/fungal/gobletBase.png | Bin 689 -> 0 bytes .../model/altar/fungal/gobletBase2.png | Bin 625 -> 0 bytes .../model/altar/fungal/gobletBase3.png | Bin 557 -> 0 bytes .../model/altar/fungal/gobletStand.png | Bin 420 -> 0 bytes .../textures/model/altar/fungal/kelkBase.png | Bin 389 -> 0 bytes .../textures/model/altar/fungal/kelkBase2.png | Bin 578 -> 0 bytes .../model/altar/fungal/kelkWallNS.png | Bin 366 -> 0 bytes .../model/altar/fungal/kelkWallWE.png | Bin 366 -> 0 bytes .../textures/model/altar/fungal/wtfisthis.png | Bin 626 -> 0 bytes .../textures/model/altar/mesa/gobletBase.png | Bin 694 -> 0 bytes .../textures/model/altar/mesa/gobletBase2.png | Bin 632 -> 0 bytes .../textures/model/altar/mesa/gobletBase3.png | Bin 581 -> 0 bytes .../textures/model/altar/mesa/gobletStand.png | Bin 422 -> 0 bytes .../textures/model/altar/mesa/kelkBase.png | Bin 403 -> 0 bytes .../textures/model/altar/mesa/kelkBase2.png | Bin 593 -> 0 bytes .../textures/model/altar/mesa/kelkWallNS.png | Bin 372 -> 0 bytes .../textures/model/altar/mesa/kelkWallWE.png | Bin 372 -> 0 bytes .../textures/model/altar/mesa/wtfisthis.png | Bin 667 -> 0 bytes .../textures/model/altar/mossy/gobletBase.png | Bin 1011 -> 0 bytes .../model/altar/mossy/gobletBase2.png | Bin 904 -> 0 bytes .../model/altar/mossy/gobletBase3.png | Bin 791 -> 0 bytes .../model/altar/mossy/gobletStand.png | Bin 586 -> 0 bytes .../textures/model/altar/mossy/kelkBase.png | Bin 471 -> 0 bytes .../textures/model/altar/mossy/kelkBase2.png | Bin 769 -> 0 bytes .../textures/model/altar/mossy/kelkWallNS.png | Bin 518 -> 0 bytes .../textures/model/altar/mossy/kelkWallWE.png | Bin 518 -> 0 bytes .../model/altar/mountain/gobletBase.png | Bin 670 -> 0 bytes .../model/altar/mountain/gobletBase2.png | Bin 603 -> 0 bytes .../model/altar/mountain/gobletBase3.png | Bin 541 -> 0 bytes .../model/altar/mountain/gobletStand.png | Bin 413 -> 0 bytes .../model/altar/mountain/kelkBase.png | Bin 376 -> 0 bytes .../model/altar/mountain/kelkBase2.png | Bin 568 -> 0 bytes .../model/altar/mountain/kelkWallNS.png | Bin 358 -> 0 bytes .../model/altar/mountain/kelkWallWE.png | Bin 358 -> 0 bytes .../model/altar/mountain/wtfisthis.png | Bin 607 -> 0 bytes .../model/altar/plains/gobletBase.png | Bin 684 -> 0 bytes .../model/altar/plains/gobletBase2.png | Bin 611 -> 0 bytes .../model/altar/plains/gobletBase3.png | Bin 545 -> 0 bytes .../model/altar/plains/gobletStand.png | Bin 414 -> 0 bytes .../textures/model/altar/plains/kelkBase.png | Bin 387 -> 0 bytes .../textures/model/altar/plains/kelkBase2.png | Bin 575 -> 0 bytes .../model/altar/plains/kelkWallNS.png | Bin 364 -> 0 bytes .../model/altar/plains/kelkWallWE.png | Bin 364 -> 0 bytes .../textures/model/altar/plains/wtfisthis.png | Bin 499 -> 0 bytes .../textures/model/altar/swamp/gobletBase.png | Bin 653 -> 0 bytes .../model/altar/swamp/gobletBase2.png | Bin 595 -> 0 bytes .../model/altar/swamp/gobletBase3.png | Bin 527 -> 0 bytes .../model/altar/swamp/gobletStand.png | Bin 400 -> 0 bytes .../textures/model/altar/swamp/kelkBase.png | Bin 374 -> 0 bytes .../textures/model/altar/swamp/kelkBase2.png | Bin 555 -> 0 bytes .../textures/model/altar/swamp/kelkWallNS.png | Bin 347 -> 0 bytes .../textures/model/altar/swamp/kelkWallWE.png | Bin 347 -> 0 bytes .../textures/model/altar/swamp/wtfisthis.png | Bin 633 -> 0 bytes .../textures/model/altar/taiga/gobletBase.png | Bin 745 -> 0 bytes .../model/altar/taiga/gobletBase2.png | Bin 666 -> 0 bytes .../model/altar/taiga/gobletBase3.png | Bin 596 -> 0 bytes .../model/altar/taiga/gobletStand.png | Bin 453 -> 0 bytes .../textures/model/altar/taiga/kelkBase.png | Bin 413 -> 0 bytes .../textures/model/altar/taiga/kelkBase2.png | Bin 629 -> 0 bytes .../textures/model/altar/taiga/kelkWallNS.png | Bin 395 -> 0 bytes .../textures/model/altar/taiga/kelkWallWE.png | Bin 395 -> 0 bytes .../textures/model/altar/taiga/wtfisthis.png | Bin 757 -> 0 bytes .../botania/textures/model/altarMeta0.png | Bin 18129 -> 3242 bytes .../botania/textures/model/altarMeta1.png | Bin 17936 -> 3314 bytes .../botania/textures/model/altarMeta2.png | Bin 18112 -> 3387 bytes .../botania/textures/model/altarMeta3.png | Bin 18254 -> 3456 bytes .../botania/textures/model/altarMeta4.png | Bin 18178 -> 3203 bytes .../botania/textures/model/altarMeta5.png | Bin 18698 -> 3773 bytes .../botania/textures/model/altarMeta6.png | Bin 18803 -> 3787 bytes .../botania/textures/model/altarMeta7.png | Bin 18594 -> 3429 bytes .../botania/textures/model/altarMossy.png | Bin 3226 -> 5862 bytes 107 files changed, 128 insertions(+), 226 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/altar.json delete mode 100644 src/main/resources/assets/botania/blockstates/altar_temp.json delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png delete mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 975a10166..f9c02ca6c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -69,7 +69,6 @@ public class BotaniaStateProps { // BlockAltar public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); - public static final PropertyBool MOSSY = PropertyBool.create("mossy"); // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 659d8436a..329ac2949 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -13,7 +13,8 @@ public enum AltarVariant implements IStringSerializable { SWAMP, DESERT, TAIGA, - MESA; + MESA, + MOSSY; @Override public String getName() { 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 f3a2d6081..b62d05d50 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -824,8 +824,8 @@ public final class ModelHandler { private static void registerAltars() { Item item = Item.getItemFromBlock(ModBlocks.altar); String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); - for (int i = 0; i < AltarVariant.values().length; i++) { - String variantName = "mossy=false,variant=" + AltarVariant.values()[i].getName(); + 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.registerItemVariants(item, new ModelResourceLocation(name, variantName)); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 97fe55f40..03a0a085c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -64,11 +64,11 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); +// Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); GlStateManager.scale(1F, -1F, -1F); - model.render(); +// model.render(); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 352c9cf08..7575d9e59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -68,14 +68,13 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { random = new Random(); setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.MOSSY, false) .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); + return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT); } @Override @@ -85,9 +84,10 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { @Override public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= AltarVariant.values().length) { + if (meta < 0 || meta >= AltarVariant.values().length ) { meta = 0; } + System.out.println(AltarVariant.values()[meta]); return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } @@ -98,15 +98,15 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { TileAltar altar = ((TileAltar) te); if (altar.isMossy) { - state = state.withProperty(BotaniaStateProps.MOSSY, true); + state = state.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.MOSSY); } } return state; } @Override - public int getRenderType() { - return 2; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } @Override @@ -145,7 +145,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); TileAltar tile = (TileAltar) par1World.getTileEntity(pos); - if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = tile.getStackInSlot(i); 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 ab001f87c..65d480123 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -68,13 +68,17 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I return false; if(!isMossy && getBlockMetadata() == 0) { - if(stack.getItem() == Item.getItemFromBlock(Blocks.vine) && !worldObj.isRemote) { + if(stack.getItem() == Item.getItemFromBlock(Blocks.vine)) { isMossy = true; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + if (worldObj.isRemote) { + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); + } else { + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + stack.stackSize--; + if(stack.stackSize == 0) + item.setDead(); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + } } } diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json new file mode 100644 index 000000000..20c72391a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:altar", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "default": { "textures": { + "all": "botania:model/altar", + "particle": "minecraft:blocks/cobblestone" + }}, + "forest": { "textures": { + "all": "botania:model/altarMeta0", + "particle": "botania:blocks/biomeStone0" + }}, + "plains": { "textures": { + "all": "botania:model/altarMeta1", + "particle": "botania:blocks/biomeStone1" + }}, + "mountain": { "textures": { + "all": "botania:model/altarMeta2", + "particle": "botania:blocks/biomeStone2" + }}, + "fungal": { "textures": { + "all": "botania:model/altarMeta3", + "particle": "botania:blocks/biomeStone3" + }}, + "swamp": { "textures": { + "all": "botania:model/altarMeta4", + "particle": "botania:blocks/biomeStone4" + }}, + "desert": { "textures": { + "all": "botania:model/altarMeta5", + "particle": "botania:blocks/biomeStone5" + }}, + "taiga": { "textures": { + "all": "botania:model/altarMeta6", + "particle": "botania:blocks/biomeStone6" + }}, + "mesa": { "textures": { + "all": "botania:model/altarMeta7", + "particle": "botania:blocks/biomeStone7" + }}, + "mossy": { "textures": { + "all": "botania:model/altarMossy", + "particle": "minecraft:blocks/cobblestone" + }} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/altar_temp.json b/src/main/resources/assets/botania/blockstates/altar_temp.json deleted file mode 100644 index 172fe66d2..000000000 --- a/src/main/resources/assets/botania/blockstates/altar_temp.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:altar", - "textures": { - "gobletBase": "botania:model/altar/default/gobletBase", - "gobletBase2": "botania:model/altar/default/gobletBase2", - "gobletBase3": "botania:model/altar/default/gobletBase3", - "gobletStand": "botania:model/altar/default/gobletStand", - "kelkBase": "botania:model/altar/default/kelkBase", - "kelkBase2": "botania:model/altar/default/kelkBase2", - "kelkWallNorth": "botania:model/altar/default/kelkWallNS", - "kelkWallSouth": "botania:model/altar/default/kelkWallNS", - "kelkWallWest": "botania:model/altar/default/kelkWallWE", - "kelkWallEast": "botania:model/altar/default/kelkWallWE" - }, - "transform": "forge:default-block" - }, - "variants": { - "mossy": { - "true": { - "textures": { - "gobletBase": "botania:model/altar/mossy/gobletBase", - "gobletBase2": "botania:model/altar/mossy/gobletBase2", - "gobletBase3": "botania:model/altar/mossy/gobletBase3", - "gobletStand": "botania:model/altar/mossy/gobletStand", - "kelkBase": "botania:model/altar/mossy/kelkBase", - "kelkBase2": "botania:model/altar/mossy/kelkBase2", - "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", - "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", - "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", - "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" - } - }, - "false": {} - }, - "variant": { - "default": {}, - "forest": { "textures": { - "gobletBase": "botania:model/altar/forest/gobletBase", - "gobletBase2": "botania:model/altar/forest/gobletBase2", - "gobletBase3": "botania:model/altar/forest/gobletBase3", - "gobletStand": "botania:model/altar/forest/gobletStand", - "kelkBase": "botania:model/altar/forest/kelkBase", - "kelkBase2": "botania:model/altar/forest/kelkBase2", - "kelkWallNorth": "botania:model/altar/forest/kelkWallNS", - "kelkWallSouth": "botania:model/altar/forest/kelkWallNS", - "kelkWallWest": "botania:model/altar/forest/kelkWallWE", - "kelkWallEast": "botania:model/altar/forest/kelkWallWE" - }}, - "plains": { "textures": { - "gobletBase": "botania:model/altar/plains/gobletBase", - "gobletBase2": "botania:model/altar/plains/gobletBase2", - "gobletBase3": "botania:model/altar/plains/gobletBase3", - "gobletStand": "botania:model/altar/plains/gobletStand", - "kelkBase": "botania:model/altar/plains/kelkBase", - "kelkBase2": "botania:model/altar/plains/kelkBase2", - "kelkWallNorth": "botania:model/altar/plains/kelkWallNS", - "kelkWallSouth": "botania:model/altar/plains/kelkWallNS", - "kelkWallWest": "botania:model/altar/plains/kelkWallWE", - "kelkWallEast": "botania:model/altar/plains/kelkWallWE" - }}, - "mountain": { "textures": { - "gobletBase": "botania:model/altar/mountain/gobletBase", - "gobletBase2": "botania:model/altar/mountain/gobletBase2", - "gobletBase3": "botania:model/altar/mountain/gobletBase3", - "gobletStand": "botania:model/altar/mountain/gobletStand", - "kelkBase": "botania:model/altar/mountain/kelkBase", - "kelkBase2": "botania:model/altar/mountain/kelkBase2", - "kelkWallNorth": "botania:model/altar/mountain/kelkWallNS", - "kelkWallSouth": "botania:model/altar/mountain/kelkWallNS", - "kelkWallWest": "botania:model/altar/mountain/kelkWallWE", - "kelkWallEast": "botania:model/altar/mountain/kelkWallWE" - }}, - "fungal": { "textures": { - "gobletBase": "botania:model/altar/fungal/gobletBase", - "gobletBase2": "botania:model/altar/fungal/gobletBase2", - "gobletBase3": "botania:model/altar/fungal/gobletBase3", - "gobletStand": "botania:model/altar/fungal/gobletStand", - "kelkBase": "botania:model/altar/fungal/kelkBase", - "kelkBase2": "botania:model/altar/fungal/kelkBase2", - "kelkWallNorth": "botania:model/altar/fungal/kelkWallNS", - "kelkWallSouth": "botania:model/altar/fungal/kelkWallNS", - "kelkWallWest": "botania:model/altar/fungal/kelkWallWE", - "kelkWallEast": "botania:model/altar/fungal/kelkWallWE" - }}, - "swamp": { "textures": { - "gobletBase": "botania:model/altar/swamp/gobletBase", - "gobletBase2": "botania:model/altar/swamp/gobletBase2", - "gobletBase3": "botania:model/altar/swamp/gobletBase3", - "gobletStand": "botania:model/altar/swamp/gobletStand", - "kelkBase": "botania:model/altar/swamp/kelkBase", - "kelkBase2": "botania:model/altar/swamp/kelkBase2", - "kelkWallNorth": "botania:model/altar/swamp/kelkWallNS", - "kelkWallSouth": "botania:model/altar/swamp/kelkWallNS", - "kelkWallWest": "botania:model/altar/swamp/kelkWallWE", - "kelkWallEast": "botania:model/altar/swamp/kelkWallWE" - }}, - "desert": { "textures": { - "gobletBase": "botania:model/altar/desert/gobletBase", - "gobletBase2": "botania:model/altar/desert/gobletBase2", - "gobletBase3": "botania:model/altar/desert/gobletBase3", - "gobletStand": "botania:model/altar/desert/gobletStand", - "kelkBase": "botania:model/altar/desert/kelkBase", - "kelkBase2": "botania:model/altar/desert/kelkBase2", - "kelkWallNorth": "botania:model/altar/desert/kelkWallNS", - "kelkWallSouth": "botania:model/altar/desert/kelkWallNS", - "kelkWallWest": "botania:model/altar/desert/kelkWallWE", - "kelkWallEast": "botania:model/altar/desert/kelkWallWE" - }}, - "taiga": { "textures": { - "gobletBase": "botania:model/altar/taiga/gobletBase", - "gobletBase2": "botania:model/altar/taiga/gobletBase2", - "gobletBase3": "botania:model/altar/taiga/gobletBase3", - "gobletStand": "botania:model/altar/taiga/gobletStand", - "kelkBase": "botania:model/altar/taiga/kelkBase", - "kelkBase2": "botania:model/altar/taiga/kelkBase2", - "kelkWallNorth": "botania:model/altar/taiga/kelkWallNS", - "kelkWallSouth": "botania:model/altar/taiga/kelkWallNS", - "kelkWallWest": "botania:model/altar/taiga/kelkWallWE", - "kelkWallEast": "botania:model/altar/taiga/kelkWallWE" - }}, - "mesa": { "textures": { - "gobletBase": "botania:model/altar/mesa/gobletBase", - "gobletBase2": "botania:model/altar/mesa/gobletBase2", - "gobletBase3": "botania:model/altar/mesa/gobletBase3", - "gobletStand": "botania:model/altar/mesa/gobletStand", - "kelkBase": "botania:model/altar/mesa/kelkBase", - "kelkBase2": "botania:model/altar/mesa/kelkBase2", - "kelkWallNorth": "botania:model/altar/mesa/kelkWallNS", - "kelkWallSouth": "botania:model/altar/mesa/kelkWallNS", - "kelkWallWest": "botania:model/altar/mesa/kelkWallWE", - "kelkWallEast": "botania:model/altar/mesa/kelkWallWE" - }}, - "mossy": { "textures": { - "gobletBase": "botania:model/altar/mossy/gobletBase", - "gobletBase2": "botania:model/altar/mossy/gobletBase2", - "gobletBase3": "botania:model/altar/mossy/gobletBase3", - "gobletStand": "botania:model/altar/mossy/gobletStand", - "kelkBase": "botania:model/altar/mossy/kelkBase", - "kelkBase2": "botania:model/altar/mossy/kelkBase2", - "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", - "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", - "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", - "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" - }} - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json index f62c1febb..b074823d7 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -1,20 +1,17 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "#gobletBase" - }, "elements": [ { "name": "gobletBase", "from": [ 0.0, 0.0, 0.0 ], "to": [ 16.0, 2.0, 16.0 ], "faces": { - "north": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "south": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "west": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "up": { "texture": "#gobletBase", "uv": [ 4, 0, 8, 4 ] }, - "down": { "texture": "#gobletBase", "uv": [ 8, 0, 12, 4 ], "cullface": "down" } + "west": { "texture": "#all", "uv": [ 0.0, 2.0, 2.0, 2.25 ] }, + "south": { "texture": "#all", "uv": [ 2.0, 2.0, 4.0, 2.25 ] }, + "east": { "texture": "#all", "uv": [ 4.0, 2.0, 6.0, 2.25 ] }, + "north": { "texture": "#all", "uv": [ 6.0, 2.0, 8.0, 2.25 ] }, + "up": { "texture": "#all", "uv": [ 2.0, 0, 4.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 4.0, 0, 6.0, 2.0 ], "cullface": "down" } } }, { @@ -22,11 +19,11 @@ "from": [ 1.0, 2.0, 1.0 ], "to": [ 15.0, 3.0, 15.0 ], "faces": { - "north": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 1.75, 4.125 ] }, + "south": { "texture": "#all", "uv": [ 1.75, 4.0, 3.5, 4.125 ] }, + "east": { "texture": "#all", "uv": [ 3.5, 4.0, 5.25, 4.125 ] }, + "north": { "texture": "#all", "uv": [ 5.25, 4.0, 7.0, 4.125 ] }, + "up": { "texture": "#all", "uv": [ 1.75, 2.25, 3.5, 4.0 ] } } }, { @@ -34,11 +31,11 @@ "from": [ 2.0, 3.0, 2.0 ], "to": [ 14.0, 4.0, 14.0 ], "faces": { - "north": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "east": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "south": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "up": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + "west": { "texture": "#all", "uv": [ 0.0, 5.625, 1.5, 5.75 ] }, + "south": { "texture": "#all", "uv": [ 1.5, 5.625, 3.0, 5.75 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 5.625, 4.5, 5.75 ] }, + "north": { "texture": "#all", "uv": [ 4.5, 5.625, 6.0, 5.75 ] }, + "up": { "texture": "#all", "uv": [ 1.5, 4.125, 3.0, 5.625 ] } } }, { @@ -46,10 +43,10 @@ "from": [ 5.0, 4.0, 5.0 ], "to": [ 11.0, 12.0, 11.0 ], "faces": { - "north": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "east": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "south": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "west": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] } + "west": { "texture": "#all", "uv": [ 8.5, 0.75, 9.25, 1.75 ] }, + "south": { "texture": "#all", "uv": [ 9.25, 0.75, 10.0, 1.75 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 0.75, 10.75, 1.75 ] }, + "north": { "texture": "#all", "uv": [ 10.75, 0.75, 11.5, 1.75 ] } } }, { @@ -57,11 +54,11 @@ "from": [ 4.0, 12.0, 4.0 ], "to": [ 12.0, 13.0, 12.0 ], "faces": { - "north": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "down": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } + "west": { "texture": "#all", "uv": [ 9.0, 6.625, 10.0, 6.75 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 6.625, 11.0, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 11.0, 6.625, 12.0, 6.75 ] }, + "north": { "texture": "#all", "uv": [ 12.0, 6.625, 13.0, 6.75 ] }, + "down": { "texture": "#all", "uv": [ 11.0, 5.625, 12.0, 6.625 ] } } }, { @@ -69,12 +66,12 @@ "from": [ 3.0, 13.0, 3.0 ], "to": [ 13.0, 14.0, 13.0 ], "faces": { - "north": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + "west": { "texture": "#all", "uv": [ 9.0, 5.5, 10.25, 5.625 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 5.5, 11.5, 5.625 ] }, + "east": { "texture": "#all", "uv": [ 11.5, 5.5, 12.75, 5.625 ] }, + "north": { "texture": "#all", "uv": [ 12.75, 5.5, 14.0, 5.625 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 4.25, 11.5, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 11.5, 4.25, 12.75, 5.5 ] } } }, { @@ -82,12 +79,12 @@ "from": [ 3.0, 14.0, 2.0 ], "to": [ 13.0, 20.0, 3.0 ], "faces": { - "north": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125 ] }, + "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, + "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, + "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, + "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, + "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } } }, { @@ -95,12 +92,12 @@ "from": [ 3.0, 14.0, 13.0 ], "to": [ 13.0, 20.0, 14.0 ], "faces": { - "north": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125] }, + "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, + "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, + "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, + "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, + "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } } }, { @@ -108,12 +105,12 @@ "from": [ 2.0, 14.0, 3.0 ], "to": [ 3.0, 20.0, 13.0 ], "faces": { - "north": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } } }, { @@ -121,12 +118,12 @@ "from": [ 13.0, 14.0, 3.0 ], "to": [ 14.0, 20.0, 13.0 ], "faces": { - "north": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar.png index 45d22bdd62b271e6b407fca8902422257d454dd6..8b5a0a406508322de791212f8ba209ef43180ec7 100644 GIT binary patch literal 3278 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 C0yilD literal 2683 zcmeHIXH-+!7QUf~pdy1Hj$#>6zyVPZqzD9%u7oNC5=uzVO}ptpAQ5R1kS3iWAfqlU z!HS?G>WmQ;Y@kvUql05X0U1z4z`PrMKj!EA_kO&$*Sh!YeZFt+v-fw_T~`){3Rq&W z(f|N}B|(9{5deUIT|l}}8-DkK0WR>OL-r2w27uE=i{@~;0H6(o?T+$;_Z=J@wr}6= z?Ck97>gwj^wqwT*cXxLW4-X^~>Fw?9uE}oH`kd%~!!{L&X zl3~N+@dN^aNF)+S1QLlvCXv{4Nkl40(CKt|q0^a6I*Z9FgM>mJ9PnV5%j5C*e7;a9%)Y6ciK|79Kcops1**xVX5aq@=X8w5+V`;K76C<>i%?l~q+$a=E;zsR_Q&|J#4A zz^s*PgXUx5MW7_cOq5PuO3AWie+1c9%O!_zjfUYXY*E>p-Fj_N^_QcmjSypOtxZ!zm|M{|&2ubexN zS1kG|rKO_FaMq^vi&P4{i@toY?nDbFIx^Amge?YdoAsi5K>pf)-V~GW190xnXMLM>V$QW&u9M>GHYu%ocIkHAu2_9Z`FKT> z%gE{vscgSmP)o~X)fbs;g7C+~#lsP2lg~Kaus(21*(meTpqW}Ot7OB=I-yDVrf-On z(;4N_cIb{10%6{X>a-%UC*>GCSP*WFuP#B`eMbzUQ$D?HoQL26`j#LNyGO^S-Z#!~ zg0)htTHrRMv7(g9$njW_q<*7&BY;hNjmJIE7PB~$K;Bw#zEyGCOWQJUH)_+Hum^GvU6Eq zLoWUvxM9$BgWX};&zIhE?{y*boHJ(~h}N&xi*_ZMLSUe9ih^sd@9`zp8lL5Jm>>hG+b`eD3JYJHV6 zl5jv!nH9hE{+~v{K<7lad^APAyt-*Bgy{@8Ejq^&d1<fzOwTSg zyl7z5r+v;P%UJ68?bJHfBCqdEpl7bwbuj)6=95IL_siJGL&40SszUQlwQ-M@k*4V} zWA1IF{>VkDWozH=v-Klph``C6a3`{6MvHQoAEI)!+0;v~YHkntNBv(Tnh&Kov|nbf zA!$Ycs2MlSN5Q`zhlb95Rpu8B&D`uniod>o`&u$HGErHdKHVG{y2bs&?QP@Y`LDT) zRFbKewes}Y1vlDXAZvdTD=dzsY4Jk$+GSkdegW2WOW1s$@{s@zrm%og5|5<@(7C(D zbw4DU#SH%NzlYVj1SGnUFHCwMU)!;BFI;r`;2Kk|U6+TIs{{ll7 Bw%-5% diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png deleted file mode 100644 index 24c7ef284b3a9952dbc6dafac3d7338c741c7f47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#X#z`z{s>Eakt zG3V`dZ~s?5GRHr@-{PQsy~vkA-(AGH;Ptui=iMJlCGX4-a8`-yzO(Yuw77GJZam#A z>3{CzwMCbb%<)9C*@A6~ufNW^d^x!5s8XPap;Rx!ixMjx zG44w*O`JHk-PY}OW1jiv>eZ zJ@XsCe=i5RY~Op~HpP`!u1|0jPzk+MIyY{8`}4{(X~sayfSxhn0b0EzykS{piIpr+ z=x(04@8t`nbDb7W2zmMFQPbVL>2ER{&Y$=9xjg0E=}B>nck|45E{t01w*9s$2UCkc zj+yi!gD2mjH0GREe$p)Vh?smI@tyIKgYF)8dN?eaSwTpFDZOa=dWG z)vP=B?|VP}-^sZmZ1tXf`!+?b?RY%HqAzm&^)0t^fuT70B+F%!o40R2e)FaW7_MQf zLoYo^`LtHu?X#Htu@qtFKnmQazuhdaiGHSa71m>gcxILk23-PZw5HbRp*RdfITtz~OwoR(TxP;el@;6c9p{+&C2F1}t>Q{!^kgjdn! vQcR1$n=iM-znb4~6eoV=#4TN5wqx*g^>bP0l+XkK9goIK diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png deleted file mode 100644 index 6b09c1aaded58d305739624b9f5032531c736c1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7??CYT^vIq+@FS>>~eDC`Lh3rzkta1Siw8rpDtMNsHrM|zpLU)uyM$X zX>PX~TP%4Z0&bK{o<3#jmug1cYp+dZ`Pi-IpTF|{yXIWKV6)jvk0v>O%h?(gxclxh zzva%?Ur%j2{P4ApRQjbZN0P8`XUpRmkDx{+&UGv-SQoe6_^p&*^1j6vHMU#C?7RP7 z-+gJJ+FA*_i+WcJ(nXK3wmk~WS$*}9X-v=2BpsIQj%&weZb|y#vODDPxmRVoQ{BJ+ zw(XYgKW=khp#59x>`s@aXqog|7L&tx=4VXLx>0%eZJEtx4Kum^;)9o8PT6%=kGo~Z z!Gr@X7I5cYSd|gK#aPd%!{PQJ%QuU2A1)F7Q(=>_`DQ_PHq5PziUn-%v(98`O-(ZV zan!YaW|{2qTmKkm!R%RJAmF;VHdp)cr9)>9d5Y|d(Tn8R_r>5l!Xc4Id%{+SYE3_F zBGnraqBs4whMP1n+#d?R4dS(4J=LqVyImqCYewpx-GN^|R-|lHU`c$p6&euC2NNbJ zP2{Lw-0q~v)qePo-9P@{^&iiaAAJ8MuTFUH?EB7Ke;Ama^`@_KIl}}@SPY)7elF{r G5}E+O95iSE diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png deleted file mode 100644 index 4762be540ba879ffb1c736fb82cd0ca2bcf13a39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhQ9Q4aSVxYe>&~tsw77Nm%sWSg;|bPhOs=ajL=wNu|V%g?~ZT5n>&|y z)vV8+=$J3X!?8z%G4lADHPy;%*qR%CmIuEqvAXpB`_iD5C*GD#ep;lt`|i8F|0--s z=APYcl-7B|e&)3dlS^lrRA!%D^>NSr_o68qBTl^jI_dY{bqzW9rW$Iq9GxMS@E~d9 zkFtdU6HY%}G*_cOY!VxMp2m@SQ4e>%r3 zct_C6FXAEyxosCSG*}iC>`YwtabolAKUI6ROwK?Ztb8#eM5wc+Zu9XZ!_MQ6f7Shy uzot9$zQda4?)y(3JTkZ3@xyl73HkH!OWWse;MfC97!01SelF{r5}E)_M=2fv diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png deleted file mode 100644 index a3cdcfcb4562a6ce87ba718c3a054d59fad37ca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp{|}Tjv*f2dqWPcYBmr!WBxT@Wt2<47)!Qj)wHPS+@V|6uRd$p z!N(sPUhgt^S$vz#>auC?0^irWj#>1*_${~nHm~QT4Kw}b-!{82b6qCOQJ;7VU*WdI z1J6Gv7K030U>tk7L!&DoRP^0<>*IGzW#@1Age&$Ee_OQkK%q=ZWZU1m^M$X!?964J z`*PN)&o+Huzg9i0u-U}un&UmaZBmz5aErI{RgsOlu~J@I_rLF-EYHV2Z%$V9E|V!C zTO!Q%-Opc_`{Gi-r1uRy>vE&*f~A2HfA}2EcdDKLJV$-|Qg3HZ(KbbQck^klQj0*k zo`e_J&Hwq`>wWdjBh&PFRkuFUUnyGezQVq1y4ca?uC%GZKxgoD^>bP0l+XkK!i2)t diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png deleted file mode 100644 index 2cd2e951646db2b0112f841c14e715f883729099..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp&p(tjv*f2M<+RUHyenw{GM$SqT#X7ywxdFQ-o`G_f?f+Qjb@KMpWti zy}8*fY2k#>69;8yoaU)HS$#6e%Td7L=I1@;{69n18-5ECI9|Bn_S+3{>mUBEO^(r91x#E6!*^_yGCi-jN+@;a_w!Sh z?s*(~V#N`rAMw(MEpvIEZ!w&6`B;G;gkvnWpE2szL!QMh4Zv_`@O1TaS?83{1OSYV B!8-r| diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png deleted file mode 100644 index a1c645f0c8304b68fd67f5fc62ed7860d78500c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?|8WT^vIq+@DT6x$04XKwGWa_k9i3u7Vf6XP--X7SnFwze2-LW7l`b z|JkCJ3FhpRT&phrINTqg+5PJkkEh;Rnd1i^e{5K_>PC)P#QN(QCQ=)6rLSg*ZjIvI zwN5!VF2*d7;or*O?pby1T2sB=C~(~P67xr{-<^kzc^kvMyzM*g=Iw}EKSzAJ@02w! zb>>EG*~Fr9p!=xO?^=N`b3U~lR&-k|ShZJ9Ybw{d=f<-ibsuf|{Ag3>B-6P|gS!uK zcpVVuV%;XeMc-6L!WN`d%x?@f2pFn4`dz-va;I%zY;(9)E1O{>RIbNB=JzHJ|HeIQwjcc>u`o zo0e@Z$#M-m62PL}rtsh-i|aC*qMb3%7%wbUPbz7@aQDM~zJ_yK8iXFOxE3~9$?)-b z<+Ct}KG^csraQb2I0)zBh3A zJ-zc@xp?F217NswW`By;epjwkQpHxXl=t+d1=dzN z_AQw!H-rketvtB-?sfJntJ7{broGru%j=QK9^<0t+ygcN=_WAjCG2Qb+&c)I$ztaD0e F0sx|KN4Nk0 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png deleted file mode 100644 index f64010f7956ecad1e6b70d5d15881688fb1cb286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq0F8xjv*f2dnb9Hc5{$ud!9Zi#hH)$IjiDRfkiGy?(y&4pZ4l@#ue+? zf!CkC`gZ4;VT;}Q&k8)wKlb&%-nHSq^{#c!GRF;kg?Ft>o|pb-)?#DEKP;S04Bu-H zZ_Dj@+>t1eAi<^`7%Dnz*}>A-j%W8=;{|?Q+Odco+MH^>>4b?@cM$=Ljr9uDz diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png deleted file mode 100644 index f64010f7956ecad1e6b70d5d15881688fb1cb286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq0F8xjv*f2dnb9Hc5{$ud!9Zi#hH)$IjiDRfkiGy?(y&4pZ4l@#ue+? zf!CkC`gZ4;VT;}Q&k8)wKlb&%-nHSq^{#c!GRF;kg?Ft>o|pb-)?#DEKP;S04Bu-H zZ_Dj@+>t1eAi<^`7%Dnz*}>A-j%W8=;{|?Q+Odco+MH^>>4b?@cM$=Ljr9uDz diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png deleted file mode 100644 index 26113d88088bc456b2ff1ffc178a69a33672563b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 733 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?}J#T^vI)oS#nj^k#MxXe|~q>GWRY-k-N(#l;K}bElZV=0K4^mW$p0 z|KB)w{TjFB7P(6v+_4{C%zUN!S#*6>lGnzMb;fV+t$X$E<(6mbzNz1NdT)nyUdW%l z-%cp5leY@4d;fFKvv;>A|4naOYu-~*SZ(uiA=VSD^~x!QFYiuylLv>159VjEh^WYd>m8!ayR3;_1zbr{W*S3+HKbbN!FP3 zDa%gq_gPrREMYune*SS4*rvG`-HZ7g98alAIh!cDXNpWuehu^uLyL5ec7FZ?$iA{9}V^NKkOxzjz?qC-SM#@2rMwsR^^eq6|(4jJ6$6jteQ`d=R(s5`*@4 zi*r)Z`4TUk(nZXFh?Z{&{J6m6u*d&vEWKa{G4vI($Yjh~An7*aeRe|quR!O|KywUh z&YbQ0QE%`g`Sa1zNn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7??OcT^vIq+@DVO^k#MxXe|~ylPAuLeN=aXo$n6* zzSlG7&9o)=^{k^_*W6C&IMHvy+}LsKz|p$MsMVF3>qX}n-aX8rb}lNlQufMR!R)#D zvwLQ|oRFr#m&oyUjd)7F>iZM6Y*p5(+uIwTD@4NOC&($S=hxOdI6*?9L@VBH&g!k_ zw)?uBDe*8iU^HxT5Nf&mc9FNlrt%Ge1u8dZ=bTwvx-Zu#X_@n^g(nsIo(QaZd|Fg^ z&il1XGtD2V{3*LCp*}0>`E51jG^-_&T2aDJS=%a(Y+9%JPN%=8pg$9C>x;;v44sp7 zo<%&bN$yL(bc93s+&s9&U-sDjU=dv1q;Gt1&s)O|$#06!*1&9SGzdz`sq9Q_+Nf%I zt@O^-55G&3ZQf0@x^E_FcvFVdQ&MBb@06erKbN~PV diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png deleted file mode 100644 index bbd3172f89ab30d5e50c99aa17fa89de1361f868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 591 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92;AaSVxYe>&~7_aR4-)>w8s2F-b?keKA<<Kw1YFx`!}<)8=X3^Pj1?q+KBRotiAb@*GNoB ziahY(T-nFz@#nJjG8_8KyU)!x?_L+S@_X(i(dHnX?(WGVYMyuOHFlavKK~YW@Z0sz zdM|g!U2W9*y3co0Qb1R#?>n8eDV`I*Sg4bP0l+XkKNMsD z|1i0<>Fp-%hx6oeIM-a5q4$o>ch9+7PIZROJMP28BDCwb{LJkHSm^!xFE);I!(oJq$0eUEVUY!s&$w_k+4hh`I$;mYQ-AHwur=aZf1(*`a^v?xq|4 zr&XVoKfEaOtWn_I$Ilx6ryY7u6s-C1bN1)Y_8kAJUT{AAc#v86ej#5Yt08l758uW5 wr6##vnYX4~+M>BMGuZ3$vMI}KCw^uKf8Dn5$-286fq}>1>FVdQ&MBb@0Dds3z5oCK diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png deleted file mode 100644 index 72e557271680a4dacb0aabed9640235cca3662af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhTigYaSVxYe>%<6o7qvI)watc%(rRYmu2EpSL`??s3R|&DU42l%#8kiLse5XFK~}&k~yJE#0#I z#grbld;#aQJ^PGS%jC1Xev#K6ZegM2oou_DxABPFuFtE0Mtu;SJL#f9a#~$!rdy`( z0g-1HF7h0kYwj;xb#{^s-}Q_`vFS@-%3iz?shb%eHz%ymywRWe?&*R%hThD#ZnIk6 z)PA-6fXM}y61`l3eT#yPq-JoLGE9E4@11ywkb?B1>iw&P52#!aKu90BP$8^#_Vcof zAE)h1=c;JyJ?|#ZTLN{>23gt7*I11C&q`Q%^swDn#-7PjeRzLvgKXgpqsKFp`c_`Q z_u|K9-wQp_!W|zu7rJJ0mp&QJe4qW#{fU-vbREXb;Aj$C9uLlsWlTE6NL;7WvASFoZ{!lK4~&l!}d_&@*UAF@{{s+tUs?;lsGAG zo;;tEK+kcL*WwjNEL8oPe}DUW(^aqM{OfNYfwW7YaNrde5mP}|Ulb<4k^FOJEt#ty ScIW~9&*16m=d#Wzp$PyZHJon% diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png deleted file mode 100644 index 90a772fd41fa804c35aa100c0eee0751bd864c5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnlGL%jv*f2dnb8wA2JYV`OLlMeb;`cKo{3;FHJ4Gu0=l_L|neS_`iS6 zTv7c*=4YE)-y6+6qcU5f=6&+qX@`|Q-@5iE6NL;7WvASFoZ{!lK4~&l!}d_&@*UAF@{{s+tUs?;lsGAG zo;;tEK+kcL*WwjNEL8oPe}DUW(^aqM{OfNYfwW7YaNrde5mP}|Ulb<4k^FOJEt#ty ScIW~9&*16m=d#Wzp$PyZHJon% diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png deleted file mode 100644 index a618aed5f2e7d0f3efc86397b6a16384783d22ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0)$CKK~y+T6_Q(T+CUJ6EoNue;P$m@6(tZC zh!aS#v15G04%bj(NWs{m)=E&IM5sLVA-}(y=b1Tk<~t*;T)OSEhYIikd9m=J48H<6 zjFi+u9>_+yFxP1su#I25FGKE@B&%95%5eNq%tMj~>@XDtHf=#}p;MLj5$!)RuYu1` zU)JG=oRo!fzmCiBYuZs_3)ek4YN1&Ms|=@QW!-0D&t|BcC$e!3V+W)(q{n5+uEQ~+ z>u0K6K(7ILh*^)_sgSy~T_I+f*eY51^wlJiQ2p)E!=z-XaQ6+80C!z^=F>%+CXd*y zlXLueVdDF*%8ypRVUH3ceCPf~xzmqFl1*b+5mxZ^4TWsdg<^|*ql{$6c zQR&aBlDH%rQ~!=+Is~e~pyV#vHOgJG@3YfLK1>wjJCXQMu!FgeKV5+Z=WVcR5IeXV z$!nYD5wkRsIOuC1h=d&}bE&NsPGfZHkOnyI(nbaHAG|e2c=^_v5qz$baXqSb}n6*_9FvdDNUcrmw8`qRzO-ibaqcN4~_Z*binwKJ=L*s1-!>Z*o#4N_J|`BT~(;S)|X#(L7(If{s-M%hV7kq RjOzdZ002ovPDHLkV1glBT@3&L diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png deleted file mode 100644 index 95f00c3c8e96629859270712034ffe29bd9ae5ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?>11T^vI)oS#mQ_GWhEY5lG9t!{Hxw1}%~V2B9o|Nr-+o_iNxtCgtD z&`|bKIFqw!FPwe;u3@^rKE&z|oP1mQR&o|h-{m*Enxo8oF({x|ICKJvF4(QOqgrev zo4DI=HK)hAO>Q7RKVS-2^QTMLBFW-XeWyc3$vwkUtOYw5EiQC8^vI^~TQB@3-#*Ky zrr@68xBh>hPW(Igp#N6g-JAd0e=){)e|^sD@xJc%m4EhE_FVdQ&MBb@07r~2b^rhX diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png deleted file mode 100644 index a494442715d0cbc0ec08a4bb3128ebe34929f595..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhFy$Zo7s`a^|#KpZ@ahM5_1g<6cKej`2YX*W41R_Vx3&n z_Ho4Rc=JZj(DL5QFm}ngHu|T2C92)4mzjQf`qDM#{+}<^Z?Bv){pi;nYx0&q%9*=u zZJ6d$_vJ?#cz6$dN()++zSziCzVz_tK2w2;-@8O6fK{-(nLBCeVNnLgmj`v$MK#>L zy~_LM0i)7e+oA+FlzS~XKH>H6NbaP(1fEOzh3jrwjad`8yol7ll^0T&Vbx?o3 zC3mY*!uu(2)-X9NQsI_4FL|S(f#KM_RG0)08$(d?jl2iDzsWG4u+8?ij9#9*T9mPR z`H_Sr8kwfguQ+)4UAk(VcVPGT^>62`yu9sdSHs@mO({QiB~{$s#B^!N>D_gY*1Q#; z0GD!n%M(4RCd1Ie(`(V$vT4=ls*C5Zh3ZrCY-``8Ot-&$*o{yApZxTL>c%VQiM`U+-vUeo N44$rjF6*2UngEns4$J@m diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png deleted file mode 100644 index 6e86876efc3e7b7644c84722d86b59009e50ba1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhEDc$aSVxYe>&}=7qcUe>u;T~+i&x(hvf!}h`I&})_nM1pM6Jo@}?;b z#UEW?w4U}$RT=6B++J_o%ouR?yV2EC3q(#crLl|1Ex4Ay_8`Na9hRo< z>n6QVT{YEFbDHa8A1?NQnB;i}&YB(n7GtZ=6LJ!&N9w)KGp*yM>gQCR-(JbsTfX1y z{^=0y<{%yIGBJT=r&=0S&apHyv1$BU_pEwmR%$?3>O~8-7SBr-W-A_^_2Ut+D-Qd- z*JrDd#?eg~M)w}PDP}NqoxRE5^uW~`{ou7cUK@29Zp81~*3j`f+u`t(-=QI+|YS!-{(k}FOn9SoZh_m@6UhB3Lorv^g96TcebSwVQ+L492i*V#J*?b z==l8o+`KeHh(R_pzqx;NZc%$%V`=rj{fEBgZ--TvA1GS#%1yfb;NcFReT-H8Njd(i S|H^?;$l&Sf=d#Wzp$P!Pgz!cH diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png deleted file mode 100644 index eb30580f6770eb4aa3694231bc3b2623e87b68dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp*)^0jv*f2dne!JYck+z-RUC0dhq{>kB3%tc6Pr1pEvbd7Tx{baE;Y4XLK`Q5979mC$;ViLR_=(}JgoS_Zo1xs4_(@`G*C>=c`~ou3u<-Rl9!gv@~Z%YO9z zT=Gclgu=djZJ4UCwv&gmFa67Yx=wcj+t;}wuh+=0zM{Kez48+dm(y$&EwPKQysb!n z%Hi_g$3bpp(IQ1lri-6;Co1pz0b>0Uby*|W@y`6h+@^Tb>l=$$7Co(h?{>U&`{xLt u?0xqW`ZwcMg8Ce`NcCl!%AB9Fhw*K1aF3|^D|KMlF?hQAxvXgW1a17scKvwLs#v?@EzFlqmQUK{?fTcZ zwjy-O_wLN7>E{g}I&d5k*i~C<($kx{>|0fmUBl_;GYS+~u6LijknlMtvvhsB`GZfE zYBI|@>!N)!R!A>oycf;~7U4Lx>x#+2<4(HTHuHf7O;EeM#phzJ-SIzccD(C&rpW8a z$en!?wN#A1<=#AP=Nh}kuYKMK%TM_`DKTrWn#=#Cp*^0fB_@X%s;y1(i8?xCOV>w_ alhWRclFbxt)H#6uXYh3Ob6Mw<&;$T^ZJ2-n diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png deleted file mode 100644 index d7aac80a75b837d33384aad2f28cf2716c44b4d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmzBaSVxYe>yGN`>=yR>u-&z_a<#wxb_-%SJ$Ey8owU={~!6d?y+C& zsRQp0|5C6l@F=&Ed^YE`@kXJ^ z=SNBP8lT<=^=GTO9x1Z5#2yzgRXt*Me(teks3Ns9NBnxJ)Yl^lkHFnZNIZ4&qLdMC2y#IgW~hwNL=1s|Ksn9Mw4|P1)9}P6n*=tc>JB>@w(-&zhrIYTYqKa z)}wsV>wL{ERCXOyyvWPfnOERZ(tLPf&pt+mxm=~)$?3CzQOw}!>gTe~DWM4fYO(gw diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png deleted file mode 100644 index 596503278256cd1166c3ba93c08ff303cacb1553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dnW~Q9WoGbDQ?=f&C_eOn5e63K#0iS5C4uw8FPzrN@vt< z`=BAa%=o4%+xb_QC)%Hz@$l}YPcK*QkIeEny&3EIb=iWWhcAc78+B#~rSTO1?s`^! zyz%U|CzGmT3szW%?7y^f-wut|gZ?v?Seu`bXqoizs?iLC>*C@|AMln;7vK_*S?0(v zoptU0sB6Wwg@Igl41RqMYs3|Q9P9dj7%b9k5F^u)P`ksYBKfGs;|BqgUUzo~&6sn0 s?qeX`u}E#vicXCzrLI{hOu3YOk34@~QsS&!2=pq0r>mdKI;Vst0P$gvD*ylh diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png deleted file mode 100644 index 596503278256cd1166c3ba93c08ff303cacb1553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dnW~Q9WoGbDQ?=f&C_eOn5e63K#0iS5C4uw8FPzrN@vt< z`=BAa%=o4%+xb_QC)%Hz@$l}YPcK*QkIeEny&3EIb=iWWhcAc78+B#~rSTO1?s`^! zyz%U|CzGmT3szW%?7y^f-wut|gZ?v?Seu`bXqoizs?iLC>*C@|AMln;7vK_*S?0(v zoptU0sB6Wwg@Igl41RqMYs3|Q9P9dj7%b9k5F^u)P`ksYBKfGs;|BqgUUzo~&6sn0 s?qeX`u}E#vicXCzrLI{hOu3YOk34@~QsS&!2=pq0r>mdKI;Vst0P$gvD*ylh diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png deleted file mode 100644 index 2c4ef9f10c162ff4680071767fa8d4d050f9e4dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmV-%0*?KOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0pdwSK~y+TEmDh)qd*KxnsG9-M|)cVS`ebB zfB@b8|Not5wGyhJdDyWnb`~tzx`eslXzU8@k}Z%u@f};XqtOxRukqJrh%AjL=p6ZQ>5@)iEAXAIM?PK1 zN1t`K?e{qD+PW@9&a9W`mpgY8_6@AayW0rS9yV&eoLu>!cXW>ZZd+h-CpUu3u-)vL z?8$)%)@AA8Tcdr((l}QR@EOXE0Xn2Q^W?>3RfL!MyU4^s;8py%$Mx_Rq`T>q$R~a$ zJiYZIiAksP7pZkXLYkJjEv5I#urD`VMFjXH>w>h2=Tv zXhNtS!lmDh)J-HXC);z-rpYL1MWa5Hcp)pZ&VMhaaTHXz_$)jc+e3~>ozczOL8m68 zp+b;3^pR{W!an(;yM>fwdr%E|r|QEJMAkmZJIh6nqsHgp(Q}X-gTPv4GJVh^X35xb z77B{J;GKPf|Aa;AUng)iJ_0jRYuK~Xe)4H=_5wc%O9yLqm?ix}{CH04b#id;tMJuF zCZ&TsZx{;|$5!+rrM(cydIqz^?1ZXeVS#5*lYc=nMpcMOF+bCPCr>525+znt00000 LNkvXXu0mjfy?Grd diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png deleted file mode 100644 index 1d37ae3c71d27456328d0de4a18a817310eabc60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?_kiT^vI)oS#m=na5+X&3u@0?#a37$g&J#I?m0XH{QiSh`Q*-Rta=h8|h_lb>)~GRh>}ecsu5eO0Jc zTVZ+ZZlAm>kyjyFnFQwC@VS3>=ef@}j>MUUJ(y^BNlI<&eZx0$)%X?}H>)a;Jc`WJIYg>6I+rBr4 z;oIha=Y9qKmQ{{_(etXZcX7ky>E0bO=L{Lno%#y4!lLC1E33mCrXW4W?sKxK0Wp3c za{>>BpU=z-IG}t-so$H)-NAT`3|O2|q_2SexUJ<0t?4VW8NTr>kd6U|M}xoyhfIdN zkRr~6J1je@j>w)3y#_YkYVm=O+I|ms4!i%_uP9*y4u*mqj20Jo7**0G7=K^ymjWr= zVe{_&tZ%H%_Q&@9ykNc{`egj)y%DeL8}w8{9yc1^2M9~5g!vUMKO4~`njxgN@xNA4L&tE diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png deleted file mode 100644 index ff7724cfadcab532321151e3b1221fea72980147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhCcFiaSVxYe>(l9-(d$H*Wc_OI(ILdyFOSuIPe zdhxFEwO91^ATN6>9nRW_ea{*u*G=Y~apy4?i`}|=pU=C3WOXv$Zs2e?Sa7|abz!8T)K2^wAhxih)-)i6|%BSW^JftVm_X&#=&v9&ClPt{rN-~ol zZl0xiN@Zu!8qRg<=c4{GOx$(pnl5*gwN6u_Q*jMzi@9#)JkE0=jG6mi#uoW5f!gOi zFVyLr+iX4tjlOT?1{Yy^D#I8RYz$hSMjmU~_HSn=)XRHs&vyKG$x--P^KLEnKia?d l|DAjNz;!e8|NX)5xm$c^X<5&H-UCb#44$rjF6*2UngB=T70Lhr diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png deleted file mode 100644 index 4406a0e913bebc03128033bff81d11aaeec78694..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhR*YJaSVxYe>yEPi`kLKrMB5Y?EPcO^~uTB7Tl3`MgNmaKRub|*`pBq zMEyZil9a20?Uh$M7H3)AT5_{u_N<3ig>v7YWm?yJc4y7M_3WX@ecgLH>z+L~I_jnQ z_vEIAg^>6aN-S6JyU%%X+t$X#qOA6ml zm!A&(1eLpJG5L^5?`y~G%TKst{%_mnsjvQ>ZPgQ?!CebPPXF4sS;Ao1i7!8-FU#C9 zWjpdU3})ufbKA}?K4_5W&|&O&&PQ}XXsyNDip)B_;58gx8+GnSH~hF{A^gPZ^Csh5 z2gc7as`k@0!&sI^ToZiuqiOT`0}0DK?ks=xAPc5pR?76B^Us>pE~?pi@82iu3A5&( z7SV1B(&Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0ToF^K~zXfy_9Qe!!QtpeStPl%dzut97>uJ z0)^cFY@5tRHe$5fKNT4mYz9`Jyjr>PH2+x3X5GtbzLBupsk<;(mSwV_sa>J17__!N%Hp%0o?afyGFi~n&$Di{t;6=` z*~&%%ufZylGmxztKnur0yraFPat5-g13`B_E>a?AAX~4SyQSmg- z+_QPYIgTp2jh+!T6Tj-lAKk&Mcu{Y$(QD0KFWH#x!0Topq01&oi=0g_2k6i8)cCRm zB=q>QOF(>VhGcxnE4fXP6U%-vffXu7=r40>-dTU?%Dt4}eGO;B4c|F<$XzdT66n3a z@PE2~!spN)YXOn>#Xk?Ms+nLq|HHN#(Z_swhb|jM-v1POCjY_3p0lAsucOz0x^ed@ zCx3QppOm_dKvnoW)sH_GC{EtrzF#eU!7)jJzti0=s`oDPmvWtN(q)$^QhQ0`mojVq Y-?H4V+W&=Wfg!-)>FVdQ&MBb@0Fq#uT>t<8 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png deleted file mode 100644 index 72c5bd64ed0d2af46632948fe28b6d0d14d75f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmzBaSVxYe>&~8m$RWj%WtMdBAIXh)-7IpODj&G=KuDtx@_Mct}J|K8~i-wf&knJJ_#DRhnD`lnIL|4-kX`h2hv5F=di(L-x)14Sgm%#=7@+3 zd*|OfKR@U9JU(ywV>@p`m67V>8J9wCIxnBTpvSl}EGdQ&uB%Jj@|wgWe!lY(kILiJ zyrJTm_W3?N+rJl;Y*{o@EqH0cqe~|ym|R+XRnues!Y!vxu8Mi-HRt`Mec$xB*ZG>? rP}y}*?IN#PXWjbP0l+XkKmc#Z= diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png deleted file mode 100644 index 5a1118d741c5914b5682c385c9adda947b0af64d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn){wEjv*f2dndi*I^@99@?G;vmVUMOYh5{xegC6-eHPSD(<%ACrKAein~Kqmpv_;@O_4ry++Gp_u$V?;V~^YI}|@pnPaf+96y($^bFtIe^f4CNZ@rKAein~Kqmpv_;@O_4ry++Gp_u$V?;V~^YI}|@pnPaf+96y($^bFtIe^f4CNZ@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0pm$TK~y+TC6eosqA(DJ^M6OVB|s8L4B;Y( zusTldy#JH!r&Oi1NuNG_`gBBfZiZ@)<;L$t&L;J)7>MiCEzPU1cbi6aYB+tl>(q;= z?seiO{TyUXC{JxbbS%iCgSTa7z^AOxajJsGRiE%gJU@ewp&z zM78$i-51kG%PM?vJzn9ruFyF7n!BUGb-e1NxB9)BplnpB*u$$s<{03zG$#b@EHk_6Pe2 zARfvMG{Vs||wq*+zM?W3_|h;14%_d2937WbwT?lV0Es zY8mQHoz2_zd?bytpbs19fXKJ4cskZk)o8!9ul$OJ+gCN;z!#~4FQx` z1UG&7WYcT&udh}od*KR}Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?{*OT^vI)oS$C5oh9NZ()zHnG3H6lj5!=yT3uaTlR7vawZ8xFkX!G& zcA-9(eozb7l{VMV_p|2yEDsAUKflcM-<^AY`}6ab%?}U1eEsw1m#1&u{POQd#m;lH zWMabO&9g|#mDFbH2x_lGTLit6Z0&R`PHo-$@~76_ zcwtk+-gysAA5`sS`*Hc@%XNV}`#+aLWFB4r`t{4V7a5riXEw8m*`#{UzWr(KSJuVx z44eYbuXTAdUSA?}^yD>=EjiHz_n&>{>M4Gr!~Fcx{oT7|Yh<>rTefvy!WZrjO9Uru z({Lwb$`gz8)k7;}E_2?MBJ!%%K1J`YbNX!x!X=v>6mRh`Z zvDDKdu=^W!Fka!+;w{kDI~vHOo1eE9{uq81|NWc$Lh(uar{$96{~KxoCJCQc{XgY?>K&iUH&&^+ z2bo$dN!}mdKI;Vst E0LPd_VgLXD diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png deleted file mode 100644 index c28beeccd71cc60f22df4fd560b171c87d7a5423..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhQ9Q4aSVxYzdP-=7jqzw>u=`T7k}#(u2`X=rPbBN@u>O#f5+pIiW3<> zPICdRgie(UZ&_>0g&J9tfPn+93MuCtKfn2ZrX|cYx-C0&E#I$oX-*slVA?HAmMmmjAi0^Z%XwdrP^~|LCPPjMLhij&tAj{s&AL44$rjF6*2UngE$15Ig_? diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png deleted file mode 100644 index d9584c5eca4c85d840cbae9561ca4568dc0dca09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmq8aSVxYe>&}^*AWK+*U!wK4Sr9$DG?GPA}Z?Y%JT8x|NjfjmhX;o z65gF_Hhs_jRqpLmXsDIr6J&D$$%itn^m7z2__2mD^LOdy z&dF>)lB{|s$p5ZA6Z&awPqgZUS0XGIEhZl_>0O_;*}`|7&yNa|uItCIYBg#73_G?~ z$fK02=~lYf=BYE4EYz-Vf z#+==5lsDC3Rj`1|V+jQ{&&M;~^5|SDdFLl1=7vtA$Ze+cuhwWk4&z*6 z#p?L;jM2^0Y)Z`x$KO|TE`>X8QRF!t1qTLJnP@2mg&AhyYoIcQAKY6!uQoecNbw~f zzVpBR>-?fy2Kx)2C(XaJ^M-o4-nZime=(h1HqR^P(bE86EHikz`njxgN@xNA=CS!G diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png deleted file mode 100644 index c7704b01c3b19c22594b892f60ce5b3bbb63c303..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq2it{jv*f2dxK-S4;k>>`5m&Y^Y)$g1uK3iY1wfo{rg`pTE0}))VF5i zn+FkP6JjPW>ul5VeHkEfMPF>oS)*ILHhlkQMWW0_rO zPMfvcas{5mmfzP(W{Wu(eO<|vd~{Lb!E4)!YfK>qs=ckr>$=mHCvccy?$Jv-6_;Bw zxV;b(Oy0AxB=5veQ$`(Ozjs|nE&wGe^MaCe=1LcJg$o!zYn$_!@lN%zvfr-%u7c#= zOURmuZM3cgDd_X==so(o%r)udoe9Ar%a>^QxqI1ZY)q`VeujA&Fc=v;UHx3vIVCg! E08&G&O8@`> diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png deleted file mode 100644 index d302e0afca9a8432d737013eede977c2206f4564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp)8&*jv*f2M<<=lI&2`&QtK}xBYpgT>y&L@E?jEc!s2w|_x`J4@i$C) zR~Wrmz{fKw{lc2EwK<&qu8IXGK3mV)_axiLh9fgfyHd}4rkV83><`_)w<#&cCqHsD zUmvRazEpRUZEO5xK%z9_f;yJ(mg}uq#Jy&1glc}0qi$UD3U4E12 zv^)0YR+~3YSa0}I;mN_j(N--Yix~c2*8?kJDP1QmC&AxsE4%rT?oTOUe(j{YQoiw@ zOrPb~l+Ts9b3@_rZ`)J)=3Zeo$GXnVn_4XJ_pGheiN}w5cFjHB{$^q7hV-*8|E9+o ss_sqlsyaI5OPA(L(cnwk%ND2DE6Zn3(%br;0~lrup00i_>zopr02W)JKmY&$ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png deleted file mode 100644 index a67bfe2b286ee7cdc4e00e36669cb617c06d3274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92^CaSVxYe>yGNo7s`4^|xN@rPX`4i@CT41_p+Nh}3@g|9^hrJ_Gk@ zLNh8QneEf&6mr3g#fBa!njMO>z#SVW;3=Cp?)yiTId1r1G zbNUf1BJFDKD*OF++ieY=g7|;6d-?b`&va~xe{4K|w(pOQ?+=!4iTvEPt}`jQiDS}- z#c}5^Xd z*IhOiwiWYQNb|j2Q~$nf8>hqbdAte286112m}SRZG!4w@a0uAU`TNoO$4ee=eC9Jp z_km>68ruYEglkI$TO&*zA2BXsuvsvDeq5D9@6YYL2~|R>4?8Y}SpNPHQQG2VG5NUg zV~zvBka#851aG{D)JgSN~?c-X@(Rd?#V{1Gd{N<~P)K9Q>wG bQpa#cMauWkuK!PfG0x!W>gTe~DWM4fjEV`} diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png deleted file mode 100644 index ca2a3e72156b50eeba0a35932320722514d59f5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnx~#Fjv*f2dncXcI%FWw@|kbz|NmbWEz($_p{3O&SM&dSWI5AU0kaD+ z+dfPzyK$~$l2pw7#09a_BJahzuiv&bJM`kb`PU15PT%Z#SLz%5{DG&-WCMfWUu<(H zwdDOVir6Um#Z@G7TV~dL=Vx~m*9_*}0%V=*UBV&4Jo`|am;I@pjcmiVvh6^XAx6DS6`Pv;lL{{$jq+_pP7AsvWjg#H)AHy!wjCTelF{r5}E*& C4Us1R diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png deleted file mode 100644 index ca2a3e72156b50eeba0a35932320722514d59f5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnx~#Fjv*f2dncXcI%FWw@|kbz|NmbWEz($_p{3O&SM&dSWI5AU0kaD+ z+dfPzyK$~$l2pw7#09a_BJahzuiv&bJM`kb`PU15PT%Z#SLz%5{DG&-WCMfWUu<(H zwdDOVir6Um#Z@G7TV~dL=Vx~m*9_*}0%V=*UBV&4Jo`|am;I@pjcmiVvh6^XAx6DS6`Pv;lL{{$jq+_pP7AsvWjg#H)AHy!wjCTelF{r5}E*& C4Us1R diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png deleted file mode 100644 index 8b9e321568ec19332bbd73419c7f43ab291ae624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 667 zcmV;M0%ZM(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0t`t+K~y+THB#A<+CU8Sv*)sBM)LT;hCs+J z5WoiuY=BKFoB#i%^pHx`Jjk-tYPC9<$#nFt73oZfrBMUX7p?DAxCCyMxK&~B9+}>` ziTTCm$(gy8;gvLLCTgW@mE2jo&NSd^nVth5$e|1`IT5cj^Ts?lw=!mFbno3j zF3zdzYv6OiE3I2C&n2&OlWcQ)v~HmkO0S^=B{c7yeaW(=Hm}xV6lQ+3%@k-1oFEH; zM^&BJH&T4dvqp&7lU45tK`q4K-7*e0TWhhj{L^*V1i)KoG5T}ffy~zCYh!*k%`Fu7 zg7@AYJc!8T7I>lME{~%D51~eOCyvB6c@8o_-P&v>1^VBJp%Pt7?xdV+6;lvR#iEV1 zV0a|(lyQfq{!tc?F@a?3TrafxHEVBmg{4RGkPB_#_Fe|S#l4k;5_|0M3L07so{$>Y zL&OUgfPAmY@%g#4k=VVi<~p)SR!0BsT5JjID9-a?2;zx6st?xAl?3xgQ}^B{6Vq2? zCL$akEC=n^GGCg{~RH}FW=;DeS2U&9bK0)aJhr=jng&?Z* z-CC%G9XgCI7(G>*!Y?oago2OZq$S_rg>YfR{KoXyqQ2cY+-h0qP zklgAT716-tz0c*5Pr7EqIOzZY002ovPDHLkV1fak BEA#*W diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png deleted file mode 100644 index 2fcf2599dedfef193c555a6ae66941308dc264fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 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 Y8}I=C$8$}T!~g&Q07*qoM6N<$f?>Z3c>n+a diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png deleted file mode 100644 index 2cd2e951646db2b0112f841c14e715f883729099..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp&p(tjv*f2M<+RUHyenw{GM$SqT#X7ywxdFQ-o`G_f?f+Qjb@KMpWti zy}8*fY2k#>69;8yoaU)HS$#6e%Td7L=I1@;{69n18-5ECI9|Bn_S+3{>mUBEO^(r91x#E6!*^_yGCi-jN+@;a_w!Sh z?s*(~V#N`rAMw(MEpvIEZ!w&6`B;G;gkvnWpE2szL!QMh4Zv_`@O1TaS?83{1OSYV B!8-r| diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png deleted file mode 100644 index 7714163482adac409e34da48a52c8cd875096460..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?_GYT^vIq+@FS>UM1xyuy_B&)NP8|;hYCux2et65pi|Vzj)?!Wp!;& zSAGafJjbr@&i*!M&$v1tK9jWR(}9EYUTs0s$Eww)d@^hmSc;E1BiP!?k#YM~&HR(Vi}cz{@Yc)Uw=ow`$d*>#q-% z#_EW1UzA*Y(WAr(W~_-+FZ;)tK5ifOameug+IUuT+T(!r*B8FtHKVqSd3VF_#2XPO zCizY7+;}r5i929rh{OKZU$u5Mh(GyRbL?Zqks7=9=aq{T?r_5_?<$aazL4X8mpPAf zM{4)yBj11T{c-+f$)O6HV<|?0cMnu6@JMq-6yp+(51eKJJT@9*VeHyXJ0>R-BUG@?z@o^m#Vdw-mCx5O3>k)p=<$ zQ)16m<)UqxYr-m}D+V@a3Ka+N--HWoDwV$`-zSRd=>1la~ z{#|x>yOnA0N3QeVE*917nAf+!w88cN?au1A3~$%*t-aWix#~g=@3QMniCP;(n0GBa zv~|vH_A9z+m)lllZ?F+%KJRcmOyEY_jdE+*9lMIFbG0taRr?ht?{~XBw{pA8)6V6t vD?iTEFtrn2dMtg>l^;G+q~^C*{N#Ssc-!{hJL@OF6w2V~>gTe~DWM4f0RUhE diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png deleted file mode 100644 index d629c395f4294e62267f0529224d28305b164380..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0e4A6K~zXfy^}p_LNOSH@89UyvCySsacal5 zOE*QVi{i)N_n@eYAE+pZqUi1qJ?-8MmHsZc0rysm$B0ip8Q8 zv4wo~Yqgr1&8A-8pZ;(!A9u>-a=$n-{X%IjTJzdVi`4~{wW`TTlIi%Vljg zo9mHs>D-RpX)G2C!O>>SarJur%Cc)X`sDeA(v-N{%`4!N5w_p&?RFF9zXJDK;NaaW z_{lNm7fMsmjH#d*Q$aJPf@Vww&6ojpDrm-3(2OS~pY^hHJmDKepa1{>07*qo IM6N<$f?AOC`2YX_ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png deleted file mode 100644 index d629c395f4294e62267f0529224d28305b164380..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)kP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0e4A6K~zXfy^}p_LNOSH@89UyvCySsacal5 zOE*QVi{i)N_n@eYAE+pZqUi1qJ?-8MmHsZc0rysm$B0ip8Q8 zv4wo~Yqgr1&8A-8pZ;(!A9u>-a=$n-{X%IjTJzdVi`4~{wW`TTlIi%Vljg zo9mHs>D-RpX)G2C!O>>SarJur%Cc)X`sDeA(v-N{%`4!N5w_p&?RFF9zXJDK;NaaW z_{lNm7fMsmjH#d*Q$aJPf@Vww&6ojpDrm-3(2OS~pY^hHJmDKepa1{>07*qo IM6N<$f?AOC`2YX_ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png deleted file mode 100644 index ff3365d309b1682b6e72b2ca0d32ddbd39f58b10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?}7yT^vI)oS#mA?ZxcK)B2rNWcA+i>aE+Za4&lB+y2&#{4YRChB;}u>5KPVpZV%Z{%y1Q3$LGD^!v=xziooz z%fH$QMaIfxg2e)M-L$u$#O*g)uXSlb0a$Z0d&+E75 zJv$}{&;K1-wocYQZQ^U5hzAqbZE5@XP1-Gnqb2m+*VrSfjm9dbF8=isynpj5>+RTf z;Nu>qwqlP54*%wq$?lPPI!7*lf8r6=4;_vTPi`@FJP~?SQ(U+EdwVhiNW4{skxk

rfYSc9)_p$o(eT7!L6|R5~)A4?U{8lVu0n zU%R}bxpRymHb3O$+p|t{b<8Vk-*XH_mv84w6e>C-G&0G3Tr|m>p}6(t=1s>7!@z3i z1>SiOKIedBoA%%P0zB_P!NR~7aUfE%DRIXkj)*&{q884^9IJuu(CdGAIJWNPhvRO| zzfI)-J>4F#|6BP+GZBj?``0_i?3nt?bbt3&&y{(i-KHxe)_5LG^3@W{4%!$ox$Eex m5S?pFk~XTLOZ5kR=03Fb!i|<`lK+6ohr!d;&t;ucLK6VkLMdwi diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png deleted file mode 100644 index 2042cdcd11dd6ffaa7dd2e103edc778f27a42f90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhMw_saSVxYe>(NH7qg>)%V*}Ui+48floEc#8u;PAeeM~_<<7!U3%TW4 zxVz@gUHaDU+M8v|Up=i0l)L`m4h7$&gjkq9=h({5``#G#I_mZorHuT@ zX*`D~$}}fMGdr&OoVZ`E@LI#_(zUr!f?KxhNZ%5A%6#m@nw#52cw0;_WI?SseJ_;3 z<4fi3P>XMp5(@7;1q7;>!R+B-V+cx)kp8h@&NUOpC-a_9+Z1*E)-qAY>eEREK`9A# zVGad3o_)2}@7Vs-Ma=Kt9R!u#l=5RI)1f|{aJv$l&z+mM)i=Op93^KRX*f``MPiPM z@qp=|E@D^@vrx9_%B`mS?I^5htK{OzN}@M_pafTLB^5~z_@4dboFyt I=akR{08kJPApigX diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png deleted file mode 100644 index 32c79728c4e5e6330b8c0b5b5cd92e982570530e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhW2^7IEF;HKb?Bl?~sE)>u)Bhz*GL2njuFX`1gqK`@eW?&1=4uDSFS2 zNKc;kWJ&6blxN9h)4Z-Oj9r$z-OG8i$DZ%2D}Pz!T>e}(H?C~9_n*%gKlbFfRbfK6TWb#>(?<8vp)3|8As8G?c%#a*kRz z2`c0I*oW(~$+qM(!aICzPfxb{>dO}T$$RDo8;zrzj#+nGo+>-jY3$1^^}fzz{}j&C z%|SY+%ftkh{W9AkImtqJ%Sxsr-?Qp8g{QGEjS%Zic9@|8BzD}Ksijc!tlAW+qg(AQ zTl)OQhaASPkIX`u!#_jKXGp65d7J52pT57I&F!xr`4>EyZj@LV(3Ki_*yQ|^hJ!I_ z3%k5VGTPdaew}8JW8LY>a|^U;)_*2?yLR0Zt3->IZE^7awOMW zn4-5qLu|i%_0D%zymxi7c{hJaIGxbCtfX<)$Cm!f3fupN=^c(bY-@YNC}N>z?3VS$ zeWA@9hbpV9Hl%KF3f|?gw&LQ4BcEUXsQn7jcx7|n)}%z11ihuj3Y!m|U11<)xcE_! z6}yqWREKCXRCL diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png deleted file mode 100644 index 85fb1ccb115935f7c33480a9f79b00968b025d58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnwOp~jv*f2M!b6ujl$PS{C}kQX4<0nr$j&R{&4xhKaHMAkN2Eke1uCr`Kg?x z5yw9Zd*?4FQ}{mC8f`c()%hpf&3H*qnup}s2}ZLNQ%#&tWwcFpk>@{}zRcKUW;oE( N44$rjF6*2UngCSun^FJ( diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png deleted file mode 100644 index a26c7061b584d5e02861143ba5a154f786b17d2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhOYE%*eITdC|WD7IqwO{Qv*FlfAZb>(r%B z1o$%CrQRMZ)a`$pVy$&_VQkC#%W7}JHh=hbN6P$k=7D?X)E7qE+=^Qn&okSV+}*|vE*vo<12rBeA{cN%aq)A|94$(k|x9JTI21D9Rf8N>I`$l;x3s+^0++ZYVi28 z@4WSFmJ_WfcBV7UVBu;4x)p2&vml38_XTnPX59KOXX&t| zO9pm?3aZF?Nz@5QvtC%ruE}%!!F@4@`4%po7K=70cYQqWKYc;VYK|Kv?nj_L^N34X zBX~q!=9)-rx37}-pQIZ)dzNHhvdb^&(ff4wS?pti2J-*~5SJ294VY;azyujh48y&zlv%oUM6(ku)a-`72I0t+%H z6tN^#wIuY`|CV3(^{A_+j2^!ppOZjOX?$wU5e;X9zR1_z-9Z*--(LIiXpzXGj82Ux jrLJimi&RmV>^tS#68}q`bx*qi^df_&tDnm{r-UW|q3eXP diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png deleted file mode 100644 index 20800218e4abf7dad8801e3a5d6d9afc6c9eec4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn(Lk}jv*f2dncXbYc}9<`OF_1!Nn3JcF{GK@6Z4FJ9|`@Xcei{7+$hY zkw}{((4Ib%nYZ*@&GKn>i2J-*~5SJ294VY;azyujh48y&zlv%oUM6(ku)a-`72I0t+%H z6tN^#wIuY`|CV3(^{A_+j2^!ppOZjOX?$wU5e;X9zR1_z-9Z*--(LIiXpzXGj82Ux jrLJimi&RmV>^tS#68}q`bx*qi^df_&tDnm{r-UW|q3eXP diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png deleted file mode 100644 index 376d11e632bea8bb4e20205640c7b05e818a7df3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0nkZAK~y+TC6bA9<1h?EHH~c@)GgmRy4&vd z|39%$&P>L!DS`k2sdM%%>L5CM^IXGTTnYAbPe+xlIPa!8*}ck=t+&(9tEsh07X4Ub zOD4)l$7_qvH8N-`)|(-Uu2Hw7Iel(X@%Mc%N9#OEGz`IY*ph7a`tO<7Y~cslk`+6u zaFNd01xjH;48!P7GS+C1**}&5|9uHiwP@7$qky3*X51I)?5zlRug=@ysE%BM9oOpq90~h@wP=}ALw|xHT*X>}?&kkJ z3K)zhFS?0>5FsqyytagUVBk~;Es>Ze^x^M02di&HK{rl^b1UvE4mtjh;;w}002ovPDHLkV1oM%4441_ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png deleted file mode 100644 index 142ddd8941451d6668dafa950506ff5da7917ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 684 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?@-|T^vI)oS#mQ_GdB_Xst9m<(enNq}0?P)GO7i_V54xt>2`d>DYwG zXLxv8om_HvrtA;C<=zV>O3hxM=&Egt=9w~F@U+}v8VYIFRaZ)?7PxVQdY{I0LI z$In^2?VDj=&g(T{a_DZUv$MB_^9QVp+&M4LYU_k6mB&wr7d5fulw3DqjFJDwFmKK6 ztpQmbzH`faY82JOLLxgXGQO5-DFBNryp1mp0 z0#0oF+&59*V%vd_dzjQ1nb?bd7Y84{-q&Vlyb>hQpf1Rya$L+INN?ho~Ft|0lVqo z$0w3kFCGna37qaN#B8JVqS*c~*b@zt8Xj{rG)?j5P+oa5@Lf7sHKRb@4CjY8r!d@^ z@pRS*x@6Sa#0_yOV`OC!pxUz7=;=8!QjSY@XHd zKr8#zp5!OoF$`T(>kFCOdE9^53v&2_OkkABW8gDU5=cI7$-(e#y}jw3=~nM0j=QH< zB-$HP1b+K_vaX)*Yw$kt*Z-I~=GWc*^4Ic;|IfHJy{ojW7ayHu6s4m{6jih->krd1 X?~CWxIe$w7CME_?S3j3^P6Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhFaSVxYe>y$a+sRR&^{-6o%>2%b)LBtMAtJ1Q|L@=WbB*zJ$7Ko2 z^c~sx%HQwxDV~=WzIy7_x8D2j*p#g{pD&*J(`v=*qs8lQlz(0xH*?LoQ&<01mTvRA z)fVdY^J1ppgbNHl*XJ7T%A0<1&E1ygve^nBUgZWjZYsTGro(^BN_Q?_ID=M4<4m1$ zhS%Q{jZ;}qU-7)X!6xJNmKk!2>HK$PJF2)BPiT*xlMOQSsblnVRu;C72ChRajR*Ef zpZ8zg$ZQp@o_qMyg0+_~ofPPsQ2P4Rx2Iez!LmO6vvv6@V7itrEL~L7AUMzTd}-I= z)04Rl?Q&9oy(Bk6ZcAxYRTyK!A|Ek}dBPEm4GeDgQ(+QZ%nZTGIl>j2t&cMlosU{R zXYJ%|iIo?wWeWCaUdzlqzp}}|a^7pn@CUp5|CXJHIlRQECRQ+RyH5DB)7I97*M4!I zfXSGwn3p(LMLvopeG*H$b@BPBzjNkp;XU2F&9B>2sPA>f#^2}E3<7fAzE6OMkL_v( z0Xc~UueRN561esIxf;~3(Q_XL{$1Rxw&wTbzrXZt{=YqM!(zAP_lN&Gw(MhAYSI{O U>2i4vFbyzxy85}Sb4q9e004dtVgLXD diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png deleted file mode 100644 index 67a37744730f85329d8707513ab6074066d2d7ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhEDQyaSVxYe>yGJ+sRR&ZEv65A2Y$TKE|G1T?@MZ{l9k@pV#_C zEuCT?c`fPs>a$Endri%Me?9$yVfX(%>kJrH{R~rE%i*!}%<)WQ|CD@&>rO>s-1V!M7c^->^{n|e_oz&&{j(!8pFDZCh-vHl zIR@6VL6==)(f1t$Kf{$#2|0&;MKB@qbz|&k`%1d6N!5(6r>4*XRA5+s7x@f2TcX1uzB~JYD@< J);T3K0RWiA@tgnv diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png deleted file mode 100644 index b559727b9e913f18ce9690250e48efdeeed0f74f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bq5PgMjv*f2dne~+GZ_lByk8s@?`K;rdQnSBi^J*v|N7ha)|@n*`{vit z2L}pHA9&_zw)52G63Yqa??#BlD`%R?zxr0K6eoAfsPjbd?kM?Xn=H?!RIik`yB@T@ z?a|YPx|3Ob-*R;)eZ1_i{QI`k!qsmh62pM1BQIQ8XOK2WV8P>B&E2nK9)e5&i4`2T zSh#PZy@0Y+6>ybcNgdnwm_RZ~kR_r1@c0;Pg|HC$9as z?c*!GQ@L_Z8rnHXfrd^7Eb-|UCKb*}1n?}=jBE$#-20R~T3KbLh*2~7aJ Cov$ze diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png deleted file mode 100644 index 0112b47311f19ac670e2b26f8ae289482b926b19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`BnlGL%jv*f2M@0;H@h{%&C}KK!vFvI=I8fZ7r4gudxM^g z%<~h)<=a`eY0c(!jNBXNQ4@Vm;yaUyp3|*T!Kc6Vci81U->RA3Q=K^Lu;#Kfj}?2D zPF|M6}&8vE!@y;kZwnJROBF?9c?RmK4UEAn64IsUY zO}me_cqJ>F9Qb>R&BrqN4)=m3JfXriI%}SGpP2?UW=W@yw$S})#?Q(hUVLyuq4MCO ze-rilLa$A7{4m?wD6^*Kl>E#e{zV@D#M`3!?>D^Ie`%K8Qqx+m>|ax^ebHR|GC1n; ce2pIr1{>4O8=l+$1NxuA)78&qol`;+0BAIxi~s-t diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png deleted file mode 100644 index 312e38df90c16800d57cfa6ae86c5d04be79c280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 575 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhHmh5aSVxYe>%E$nxp6v-N(P-RG-~ zog{uLEitYBRMLeKomD$6%JlO5=log!`rF$x)A*B@vlQQdx3>_aW@6SZweEv_N*;&Q zH!G*-u>7A~{?(#v7vtM?$s8)%s%BN#OgXD`wZvD<`H)K86&b5krbPnoa%l>4gq`P@ zE>|;Cgi13TZv64@#{tRN4IZD&*59{2cX9q&_PVEm2Sj)j^kHfOEtv&8@BMv##h)of zA&G5~C8vZ_oW^X|RWE1huqg?M%-*0M$2=i6ZEdwgjZC!%A5ZFL57XGmM?W-P>vCG- zGoeBw@kwQ#M4eRCh2BK7KjF+7F^g1W0)@_hRQGodIF!m{D98B8>84JQ@AVYJjJPKe z${qYN*Jd25j#Ki6iZ9uJ?}p*B?~mSnU(9xC$MM?|Qxu;5d9vMdSG&yLzUv=Dw|-lH u0dCz&}(iG<&BVS!Dqpn{Uf7@TXrXx}Krty1v zD}SLxdfs&73cq~s*NF#Z;#j}-&$(r|_-vtPs`TWw%CFv8p8cvgxg#xc*@ji#8THYH z2{(_#ByAUL53Bv8J@<8Sca6lK7SC73r+geWB89ZJ6T-G@yGywo|#D=o~ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png deleted file mode 100644 index 26a6a6c85569d49b16ef8d26aed6b937e7b36a75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn!BDZjv*f2dnY~QYH|>0dCz&}(iG<&BVS!Dqpn{Uf7@TXrXx}Krty1v zD}SLxdfs&73cq~s*NF#Z;#j}-&$(r|_-vtPs`TWw%CFv8p8cvgxg#xc*@ji#8THYH z2{(_#ByAUL53Bv8J@<8Sca6lK7SC73r+geWB89ZJ6T-G@yGywo|#D=o~ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png deleted file mode 100644 index c353e4d065cc6ac26381ebca80631979d7f221f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0c1%;K~y+TJ(6v2gFp;}@7sV;UN?>vT0yI> zUA0Z>{{N5LV@#1wD3{odlOt4p8c%tDDG1)D{P10OQ@+1d1Z3t%+h2D3Ygxsl9W&y< zWw=#9+rw+wy#V5BbTef2kRE>%(~r?{WO9mL@`jz%YcT=OR4EU1tUAK*@7){Ha0v%1G-w p7_r%1Hlsh1B>%-?Z|yeT>woReLuNrHDck@6002ovPDHLkV1g4)%EABu diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png deleted file mode 100644 index be304e1e106de5e69be8bcca06d35a25fc064d4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhW_((aSX|Demdi}pOc}0Yh~C(Yni-7AB9wp{r|uFmgyNa^<^I$+oq(b z-JEIk_JmY9zXZGH(hIBler8V>d;i*`I&PNQ?@FoMWtrbLdEJWMGxys`EAP0voO9`V zZ_9hi7+V@GRX%iF|7+W@y!~ipKo(E*?e`LIo%~ATcbnWhcPZK2aN{+(4F?v#+p(Q7 zXU3bN-2KU0xS0zTc3v+RoX)cE*PVHH&P5!ry#|JJ^RDx>6?;6`vE`@bjKgnE z2Y!3G5^RgjCdY;|*To!ErZ3rl*w6uNh$RzGzyZz)JQmJ{OWRj(w7tK^v<573@RVml zW14Sl_MF%C2MV{Eruc&Fv|YSwmqpgOr@LaDt`zh!MikHcd#mnvhPXuwgZgPz-bQbp zwl&ZCisr?D+|Q(Nhha;-Z=tsyr_9>@^VjILXaAO69LvxuT;t9iH_5wpd8DyJ{fb#2 z1DIIEG!DLQ=9zZAKYT~M(Ozr8(?Z-@O1TaS?83{1ORd4 BA2I*{ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png deleted file mode 100644 index 70cf94e1a96760750112aa91900802229b030d38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh92>BaSVxYe>&~9pOYhxYh_sforeX&z0)-e|NXz;yXMj)w$+}}@;-M? zo|9zD+I`3P(SlV+PwzTAKkU)hFUScu%oU;5k35*8Af9!Ud~KZ<(#-xV2kn z_iBa-8YjJ)j@PoWbzE2B=-3;+_VTt&*9-SjCyKB&ELTlqo~+jJDaxKZW~<-rWulJN z(~l-BIdS0MiAgfQ%kJvTBt7mt1&Kb!ls!;gqlOH~#m|ujH(GS@8M)4qiLPZL&$-9qIp$1LK^* M)78&qol`;+0CzAF%>V!Z diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png deleted file mode 100644 index 803396d6858adff25b2665011065b791e095ea30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhBkP*IEF;HKb>|u?@$1b%jUeG8#1o8-_rZ>e}D1J?&XV4aQE+8 zIc1{TP6_XC6W4Q2UG>f);=f5$b%gY}v+K5>J$~-j^IqQdx99)(QmRpCdjIs2)U^6d zItLa+HrV*(8lF3R`x{d=+iZXL*>>Mq1I~Uo%5)9rN@Zk=J9}5Z|9x>|D#f#ppY=ZVQr7~J z(~r(Eu>>D&VeGU}JF$|9a-Da&0-{`M5ox|9kUCX@`X26ck4G)DK8Z@hG+YW5`*m4zO+m2n?@~7kl zeO~Qby;d&#=^yz=Gv`DrTum(Sr(ai#fxX;&-1$8HtT)(29fnG{%P?evXlhnR1ZOourzyciffUHx3vIVCg!0K6}vXaE2J diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png deleted file mode 100644 index ebe1f2b0c25ec83a5131f78382c4c48d40028902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bn&+M_jv*f2Mq>5arK5k%$KX@X0=xxJi`?|p0A^D~Dx%>Bm@uRo)LvFY{EG>L+$xhL-&zsvgrXk2&uj4tz# zX?JiUPuT4L7KhOB_Ke#?#)$hqSNn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhR*SHaSVxYe>&}^-(dp**WVouv6oeSqq&jGfnx<5IFXVXpG-bl`(`i$+cBvhG#GB-CZ29e-g62(?pUl=* zJM%73O!&Ax`_A;UTA?MrU8>1O|2NE%%3@k(;4XLe!tC(i8>WTAH8OiV{-1pjj?^@*aT+Z1p zle{eO31&c9xYIkNm_nmw^`r6IslHFf#%bj41H(MQY(NuGqp2?Y2oJRacZgK*f zjo(j~TVeQr8{?eJnUe~A1dodpKY1x6(^D0hNe2xl o^7M746!@q#Co4(H@F#v^)~ID_b?4qC0gOuqPgg&ebxsLQ0B$Sq9{>OV diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png deleted file mode 100644 index 8880c23edf5238d46e03b02a17f78e8da9b0b8bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnlqj*jv*f2dnb2t9WoGb`OJQ8+4n?I{*WX8|L@*vEHq(5BU=hL|E-rL zYB#s>9sdw_L|*#Re!fe#>6v-V>$^{S8&+k$U!3z*G1$fIq0^1JbrNg>EVbrSSiTq4 z76x*)x9>Wxa&@P&B8T-szDE14SBh$YqJ9hZeNkaiW(e3{_cbOyW=a$Hfm4V3oH*S6 zNY8uS-5vBnw4f)OW#wW bE0ljX^9xhmcIz)de=&Hv`njxgN@xNAXPJR| diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png deleted file mode 100644 index 8880c23edf5238d46e03b02a17f78e8da9b0b8bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnlqj*jv*f2dnb2t9WoGb`OJQ8+4n?I{*WX8|L@*vEHq(5BU=hL|E-rL zYB#s>9sdw_L|*#Re!fe#>6v-V>$^{S8&+k$U!3z*G1$fIq0^1JbrNg>EVbrSSiTq4 z76x*)x9>Wxa&@P&B8T-szDE14SBh$YqJ9hZeNkaiW(e3{_cbOyW=a$Hfm4V3oH*S6 zNY8uS-5vBnw4f)OW#wW bE0ljX^9xhmcIz)de=&Hv`njxgN@xNAXPJR| diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png deleted file mode 100644 index bae696642b68e2cc6726693f4ab269189f12b7c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 633 zcmV-<0*3vGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0qRLaK~y+T9g^$LtRM_U`SS@<3MzNJj7H<+ zy#EWH%_N2ply>b^h5c@FV!1HiRo6&cl9Mr4GiM%apc<4jYGQk5du2L{ke=;Zb(xj7 zwFRqOh&GQx_Dpo9VPd^!y0g$vp{w$lRCahxPm;mvBjcKimX5?v(%4t00;}SB z2XkbzXF0RJqiz8=`7Jm^Pr4I*(un?>;!IbsCnv2}PkYi^P{C0PW0}U}Km`iDF4X+kf-rZ&W8X4NdTbtGovk1@OW#}Z zRRN5*KtOY$l4ZbL5w39RzN>p`Pmeycv3EsbxJKu0>}`TKkNDJYTRyUVH*-ei8N~MN zCa|Fvr8gK9(hJl4U^Srm&IpHM$ZfXRktU|%;R+eL%rgUC*bnrveO561NFo|y(?@Y6 zS_5F9e{dS>xFPf>D!@Grs>&E;L+vjB6F{*`{~vHlEg} zyJ(08F-!o7@H@_gftnIz#E+N-zg-_Ds#XsMP@%AS@t;SGT(8h&P^gPJGw<;~kwP|p TgWB3G00000NkvXXu0mjfV{sTB diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png deleted file mode 100644 index 1c2eaa39943c36d4a1772117eec8cd4650188608..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?`3wT^vI)oS#m==_lE-%?_vt**w-Q&|Q)K>6yhi_k4S|b$YZhz>@xANa> zq%4p8J#=*I)eC=Ky8b=0;&0zXeJgu^Uatw4t#>CDB_|wS!KSfw=l$njH-Ao_ZswA; zKlur_CF7kp4-02R+}^DcB;1$85)^-etMh zr?uX&-1EVT?_Zw(U2j=#vGu;;r`ED5pELz97Bc0*zfu$fXF>o+)i+t#i z*V?({ZyG~fVa>6^bzrw`S$yE*ehcR3`=r{G|L#|mumPFETJYw@^@n|q#w_lWWz!fE z3dJi}EZ!M%9A5s-`q+z$Ia?1`SZ-v0bOXvCdcefAId%t&UCcu`vOH>UQ4$ zl=pXME4OSC^_{jPW0Q*OWL3>sI-VC(JiFAqgG?ePEjl?#1Wn44tJl2wbuZV~;QzwF Pl*r)e>gTe~DWM4f^6goc diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png deleted file mode 100644 index 3f719496d403f63b13b827e4d28de222cbd4ada4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0bO7?`*{T^vIq+@DUn>F4Cg(^koze@B$@qCkj?>rvjq!?KU(&G_+8Kk(

$`5&Q9z2ld*l(a`7kw2IINwdQ8JpYql;;DB~AU=-Ms2^1iKB2S`;Im({jt z5%)w9tBu?Al22=AU1RXcfB(vsA?xq${&Q82oo?kUU68!n^}EKVqAQpAX1&y4So-ea zbmeo);kq3X8Z-nrc3E7#ca1Oko$nU2lKJPD-u7~5Zl2oI_jX!o+oKmU3^%ShT(~;% zXq#N2!|U(<^0H@P@?kcsXRu2g4c7U6&6PQkcMIHDv(SC^u|=b z#tX^TFJyj~-Qi7o_%L$!JD8Jj?a!{YgzPmZa-tvyS-4Sayu{G)T5)5ncj9vRC1ku)*<_i|GDq~l>D)I^6dY| bgDRN6D6+9#XR5XXCLIP(S3j3^P6Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chh932FaSVxYe>yeLn<-GB^)LUvl(e)gv7|IGNX<-5x#E1`|9|1j^IpaY z&TO~*B2@8U!)XJ9@3&{}oShWuHKwI#jQL@(qHW3tv}9> zbLuo6PwV(|a!VPzv#pN9rsL{ad&1?GaRtfrE&2FW_v-bXOq+f#?1>f=Nsel0+#dC| zb@SP2GB#(oTxK}8)tW1^`u~*}HTx-rr<;;|xY^y8CmeY2;Afuy?oRawMqk^?cGXyi z1;FI9E7KEuHuY6rvORL~EJw@7w9n3x+jTUKZFzL=o&UV8tJyD$x4Ov49t@EO zdw(A%9p4MH`$n{c!V48XzT`QDn;&0eU*Xh-uvXwB+i^c;H+PGdN{=?K7MydIKlRS0 z1rnDp{q-%A{Ganimq){<@Zr(f^*@;nVCGrq^c+s^VPt-6)Lkw6UDg2{4y;FKgx!gh zF{`ip$ldgvg->}O*U@L~MtP9|J()-6-hEdh$`l|`{KllAV6y)I-#7mR9Mk3QD%6VA z@qG5d!+NUT)YQdc*STNEACa|O?Xc$T1FM@n>n5Ll@GBz7zIxZWh_uA5>cB{6@O1Ta JS?83{1OVJk0j~f6 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png deleted file mode 100644 index 2d215596d4df23f5cef49c148d590271649c3717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bp=O>gjv*f2dqcAQnG6Nq_y=6%m{q`j-1!kR=fh?tg?<5{#TWnoPYz38 zZ(6$h_3}1PwY@%h<=>XQwd7WR+Z4s$f91v3m!H1%RhrJ6wDk8T7MCyjzA^skSL$X3 z?~Djc|9R?l%Zx9xi*sNtjRLYBR%>u zwKW$Xd~my(cKq42cc+CimKplS@Z|sSc06(?HotPe?%nCC7krXuIjphBSo^WX@3h}u zG1cR1U+&XsOq057x++fgb=KM5#Drq$&a_6@-+hKoXg)7JI%FWw@|#1hL;S|Isz<#)4*#}u5UKs&9%-GqEuus7 ziF=GhP}-sE@6<{!t-A4AcuKyBaFV_5bcxSQD#67oZDiCBOg(8*ckQWAa$G~$a^qEJ zr$1S{{YidV(%GxcJECLt44<)bB)lu~y?eZS)^zEe-J(<37XM%_*?DA!xPpYf)oZ)^ zS9aaiw3s6#d;x5R$Sv86iY*_neRnV1_lI#;Owt+d1#4cr&h1m1^7T&!uWd>uNbCNV z-KiVrPxC(WK5NeUC;8te9xDDLr+O~v&KrZn5f4Aldr%?P)Njvl=xMY1jE8pT6gMcO zJ&;`O{3Tw~cXrS$v!y1vUYWP1T-u_!G}He{4a1^u-6dsn^lkz}kHOQ`&t;ucLK6V= Cd90`a diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png deleted file mode 100644 index 4929a0d1b3bcd2c99c9d57c6f958289e212580b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13j}pJ<0chhCcIjaSVxYe>yGNpUF_5^(UvA-HeVE9334QETZ`x6^Iw^eN0m_O~? z?6j>{r@a=K>-)OZ@R`3PPnX}Us5`kF+|#c+UHiKImyOZVy!aJu=Ir{*%;s@iytyTA zM_1p;gbmFSL65nw>LzXyT(da({asG)yYt@sx^_CkBj@oy&l0n>;_DVA8%bpOoINk@ z?Uc*3%%Ht5En&`F^|&27jHb3X&gm)o9|u<^^MA?Doliv*H*xl`?Rxbg^vtOnGV^Es zxw*54$#-Gri<~I^7}w(|1_n>F9o{_%ICFjfzSQfMytnh^mzh;f7k21rTd+BEZ-J=n zYw&3)!PC{xWt~$(69B5y B8dCrO diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png deleted file mode 100644 index 7ae6a0ea7d2579d9b82a034f8961c06c5a62ea70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j!ywFfJby(BP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQ zK+o(?Px5`Bnm?W{jv*f2dnet@YBCgQ`79T@rfaL-e%7PALf$5cF3q}Y-qQ5`Kc8~( z0`rF~XU_h7xcf)@NuNo=$JhTWcm4NTdgpn?tajr`cLkUJ4BFzez5PqJ^wg_j-+#^E ze4r66P zEq@ABqI%Bjb19mCF!?FS^|*7+vRya1ugpu|A0+YmbGOq8wjIT6Mc;WI`dCKKTVgTS zvtkWU^+StbJDE0v8U32pKPG6WN%|kIJpSv?A_2W;rN@5&=~Wq>T2YI-rma|{io#^S a!`p9bknuV?>66P zEq@ABqI%Bjb19mCF!?FS^|*7+vRya1ugpu|A0+YmbGOq8wjIT6Mc;WI`dCKKTVgTS zvtkWU^+StbJDE0v8U32pKPG6WN%|kIJpSv?A_2W;rN@5&=~Wq>T2YI-rma|{io#^S a!`p9bknuV?>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0%l1>K~y+TB~sgNn?MxY|EMiwgb5G`L^x2w z#mgnc6dS?{)5QXT1%$Y5)I|M%smJZx?&{3UnVCge-EcmZb}_r%ii9Y2V-ADzZ3owd zWeWL0$TRs!S00wDO0JGbp_KJpv+wSknvX(r9GrPFUS1yhUdr}M+tS;Ub~;H}zH(ie zlxS&La#gA|Rq63@Jo8T>2*&U4o37PLvhtk$pAYG<=X_tK6o!#>ef6$#WhocMP5h)a z_4ak({4Id>wz*3a#&MO3N`wemhJZNv_{~_BM2g!y2Qx4v#F1K8tiOfx<2Zmm>-(Fo z175W0PX6U>VH%9%a6w>C<2nrO@vP7z?4zCNL*FR?2=MOX9nOdgu=pH-4Rh%CpP%4w z<+)%$DhgO~X&G`w_%xBS>@G>Zp3msMYt*J@92)@s&o{`C&kvxsPIfE?Z-j9yh=IkJ zPgB?&>1_*}K?8sRdSC@}0KoIBO24mMM=pswjVi4e*ZF$xkT*|SP5E>OkptyT7z%01 z2Z7b~;F7Uzp(xC&-SRd+NKu4f0*X^e!MHYb2eyFTpJ$;Upv=YL7sJr1N+@#Hbxcs; z(_AJ*O%mXcj@Kbzy{A+pM}D6`QwptwykMU~J_;Z-v`#a|cA{SwAO?|jlCWX8_VLoO zSJ=C@fj!1`!J!a`3N4Y4<*bM8aZ>AA%-{-v%y{m@&_l}hG~DKy_#AJVX8jz4)$KGQk>nr>P4P*xFbq7;|9jQ@ nPX8CB-Zh)P6|)rD(ChjyVOYv4Oz#sy00000NkvXXu0mjf!{=bq diff --git a/src/main/resources/assets/botania/textures/model/altarMeta0.png b/src/main/resources/assets/botania/textures/model/altarMeta0.png index 1e635f6fcaef897b54c572baac0bcabc34be9e19..03f1bccd4278c58677508d794f04591f22875552 100644 GIT binary patch literal 3242 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 Z?3G|#N_uJR^`_Fil=DM!?bKUp-zOVb5=bxu7 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 I17pL#0o)&=0ssI2 diff --git a/src/main/resources/assets/botania/textures/model/altarMeta1.png b/src/main/resources/assets/botania/textures/model/altarMeta1.png index bd8f9975de57fde920c9232a7091629ee3e7d0dc..717ef23056e8b06b1b92da855457efb3fc18a948 100644 GIT binary patch literal 3314 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 literal 17936 zcmeI4X;@QNw}5wIR1k3hD|J93&O^uuB!@6qQ9uP0s33|Mk`suK1W3XtfR+c<`eF`5b|%t<4~A1Ogq1Q8|wsAr6wrkO*s2jb8*_tB0wkWX%+Lptb2N zbwIM0^Fs1$X(&oIH#4X3X>=CZl4C|Ur?c4fnPdiy&ZN?qR63JFXCO2VLN_OOeN1fz z!7Fa4K!~{6&+Q5aC2P|FxjY!5Qp3Z;&BB>x(olaYox|Z!X$&fZL4h+UvPg-X7eSH8 zCUiRK_G6FA_@Sa;xkxG@tNrr)qzbvUsi`{9r%%_u#KE5eNn~B@AVq2fFPKU*=G)oiksb~-?MkR6?w4?WF7aSm!OJxDluY~-h{%T;D6KCg7vHM)FSlnl5 znS4$dM9_t_PfM9cWH3r~LuFD$C?A~@2DdVyuieWe|r=(O1mWnocuK zDRgFt3-^l54n=u#X{d)(8f4R1Wed9zl4s8*PxTZ@1k!NXG%gi8yC>B>j!=7^9JPU^ z$fD5c6q6Il8YcswHH$G)Ni>mxbCe zxzxUf`?Ru`@)hc0o+aUfk=RG1bm@@#b;C4 zd`lsPW6q*c*p?O+6rq4_!Qu!xegYy#Sz1`K*+L2*WpXGe zkA+frd>)^|qtn=I2GftmrkVHctaJ491^1?bw_SAsIXfdx5}BL_X*k(yHYb9c6I$?T zetaICA}|-wC_);GPT{aoKMIR2Cn5T9^F=5}k-AVK zKhL73P~6dw&qsR-Mbn>yd7&~?-F>W0yW7vFhTd5TUG<>pVhE3~?(8;vb#p)kT{`~)v0X6H+!2AH7#2*#dP`fL(d*JUStuvLMAEoXN z@a56ts_(@JJhrfoc$(uv=Tg5I>xtYs-%EY`f)twh9CJ3?oJOV7;HS&9w;F4@1mCo` z8f)5P`MpFWw}JNq%|bE5y{yy^44wBicld0J+E|#IGhyS$4r47AiXzY;FMAQZugTO6 zgkf&cWrWrAX}P4wlFnfFw(O10 zC%s~PX@g*Z;EP&Z_#f1TaFKTh&^TBAfxG+HQMJ+CTJ{YYQ z7X}EvsKtfP2cy;E!T`Y+wYc#4V6<9X7$Eqf78gDrj8=;a0|Z~x;=<>H(Q0vFfZ&T- zT=;x2S}iUN5PVUK3!e{0tHp%@f-h=u;q$?0wYV@q@I@^yd_EYh78eExzNp28&j+K` z;=%yI7qz(X`CznKTo@quq81lEABo$P0MMEvnG>6Y7*>m%)A#@IO` zx)U#cOPaVNdB{i?5$F3BZgurJmCCTqX8l9^1cXG2H#@rc+Iop%W^;Yx!@Q!(%7fcJ z$R_^v-0{@L{H@ZMQPm$41sQ^&F}Et-eQf6>R-U3(&h}lc9C!7747sh@*6MbVuD3x# z&XX&~byJ?-b}gBdQ-5t~MX62QcvGN+2Kr|>Vb^>_s>4& zx3>f|R@yzvR-GgUvO^|bTjr$ao;ZfSE-P1IOeoAA7MJi_Ma!D4wFd`JNf?}#u&jEZ zTZ}mC<$UjN$Gm`w)brb8+DvAgxS325Nv`j`?!%csD%B^l0U^do#{=W|zpgCY;GQ

1MAV(MzN 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 diff --git a/src/main/resources/assets/botania/textures/model/altarMeta3.png b/src/main/resources/assets/botania/textures/model/altarMeta3.png index 4ec0d77603b4bb3b4b850059160e800801a687c9..f3abecabed29fb1ff8ef30edb22ffcedfff0e9db 100644 GIT binary patch literal 3456 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 BhL->U literal 18254 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 literal 18178 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 diff --git a/src/main/resources/assets/botania/textures/model/altarMeta5.png b/src/main/resources/assets/botania/textures/model/altarMeta5.png index 2a903a8a4218d7f9162fb57f6fda6f78f651b722..90b7d6834f2d48d8196240073feba25da4b8cb79 100644 GIT binary patch literal 3773 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 bd#G%SRw;sS9P0L2zf*u2)XJ#Vz%~9q<<(_j literal 18803 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 literal 18594 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 diff --git a/src/main/resources/assets/botania/textures/model/altarMossy.png b/src/main/resources/assets/botania/textures/model/altarMossy.png index fa3e649c4ce89b1a4f4da437afd06bd64b304697..3b77b8d6de3176338cbf1f0405d746e97ff47634 100644 GIT binary patch literal 5862 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 literal 3226 zcmeHJcU05K7XBp^=|x?nDAJUbCQT`!h29qkAP`Cdr1wSw0TKb}9Rx&Ja1mX^LX#p= zMMM$Q-Bob`L2NvwD4+-gdC}ed_x=0+c<-JwGxy&4?#wseoH=K*{CwSHrBtN=0Fd=? zcMbpmkkAGA5+cI>cY>Rxa1g~neV_o)Tp%q#iUEKK;O8CaBFr0DshC>onVOm&KYrZ8 z!oteR%G%l*0)g1r*x1_I+S}Vhyfq|L;`_`rI7I?5(!Hr5`_biNG200WHOmT zp%7x@NEj-XK&6oBcq)-VBjH&>7fYfu$xH@`#bHx0EIcKFLZIQPG%}S=VbI9TI4p}x z=F;eR29?5KP~tfFL^^>=rP63LI-Sm7FsKYRHI6}JF==czQy4IXE`!NrvREuOn@x{P zpmA8jdJc=tVR90fi5w0mK0ZDnA%V-~CMG5(B_$;%C-ZnbKA(T`tPW&*; zh`NxKVS@`3R19;PRGvm$AT2nqqr(39B)bUEg70ld#nTK!2Skml>(e*`W5#3 z`kGPJp;r#$AJ1g3u0iZ>P`W-_B`Ov7${X2aQx~{~ZWnVE=j3k|solR8f2a4QD1(^u zB6{iGWJ`SfP`wz!lRw`7>6nq*v$O~Ha^rp zg0j{u?J_!bpgP!<{J`k)y6aVlF?)YU3dtngXlC>MlfQuuGj(c>jcP+Nevn_#jmy)D ztG#b4uWR2SBH=P!m!1;B%iO}lfD59(nzZ!x_PR1Z$cIy_Dr2&{;3gYWto=f6S0)eL zx_3|8$Pj>mjj`QFDSlWJ!1WwyBRbL)PMKoac1#VoE0=`Qs)OR{cT0-0TMUOun|1^~! zsn!` z(p>zn5n*V74ga;O{mRGHF4fRTZ&29g!);3av(F9wBjuY96GYx78!sc^nO=K`3OJ8G zd4+ii+Ov()8b32L;VY`AX?)s%gTPZUBN5VwLd&X^`Wj?rP!3OISd?v z=)Fn5{_v^nop_)$G|6f?bE8&;D{g=?3~3N)HG)eeq7h}PFfH+0vfB-2=@NI@|WDw75%fK5-~lRYMZ^fZ?NK* zoQTpz@y#+;!v!bkK~f8za_+{%i_T_;9Hvpu7j>GPiEn6zRFxCem3gAc#R5S+fJ6?;Nz`2Fzo7wsoWx z{QIXc4y%E3)UERaZFRN^?33yB&9*dq_Z1hvAqRzOkAycujLtI%;R(%wTl@wC06y-Z#>PFGz^t=UncXh3`R8y34tmOp4(CD2 z;@&9G1YNxSNq55mb-Yt_E8@I-_uYi~JmHzCJO4}{hc~vV3usDvqc$7(%sB0gm=fKFyx8JNd6XdUS<{@l7L*|6MSz^S#~NaYfdHW z37~GNb+$h8>hTVfBKO>cG#$ZIGlL%Ej={2niF)cn(9e6$!Vxt4A6K?ONcD4xX>ds$ z9l+w&Z_*6?g{?t}guz{7i(nmb-u6afE6zO6WO4TdCU)uKh(%2yFeUA&KT=)$R=g&= zyi2}vQp|mUY*#Zzm%MTOH990@7N+R&n}lS4kA`S)A!Hy+an5dDWrr7cv}P=}Wn-yd zJQ+hJ=S_?9yj6Gexlo)~*Pbe6&81Yd4aoV~n`=9BE?4;-KEqSsRftnc>&t)ko5g9T zO)}_QExwFnL8q86)p!3t$=FFE=GB(HWPYtHoK{R?Zf9IDx79I@Nwd5-&biF>|@M5_>TfY>1Dmb<$w_(p)fD zQnLR_A=6Ru+r};J?PylyktsFSm&_eop{S=Fgrcr$|5Xm#7>~01^dKr}W6$!}iJx}X zMtOaoZ})A#DT&$;tlO`?!(8Ld6Kb}eQ+QuqzUK+nc+!K?zv@lR#VVpc6UWu zqfe9`d;9g!ZflY8)XRb!oVWm*RdZE0pt8aGc>nwyJ=%%~diC_SSxNS2)@y-SVbs0{ z-g-v5Wvlxfk|S))8ak^&#&@*7gnwXtT=*Lv*dzP(Wn Date: Tue, 29 Dec 2015 23:45:26 -0600 Subject: [PATCH 126/935] Update to 1.8.9, fix apothecary collision --- build.gradle | 2 +- build.properties | 4 ++-- .../client/render/tile/RenderTileAltar.java | 2 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../client/render/tile/RenderTileRuneAltar.java | 2 +- .../client/render/tile/RenderTileSpreader.java | 2 +- .../client/render/tile/RenderTileStarfield.java | 8 ++++---- .../vazkii/botania/common/block/BlockAltar.java | 17 ++++++++++++++++- .../common/entity/EntityThrowableCopy.java | 14 +++++++------- .../botania/common/entity/EntityThrownItem.java | 2 +- 13 files changed, 38 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 1a561c020..c307243fb 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20151128" + mappings = "snapshot_20151229" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number diff --git a/build.properties b/build.properties index 6d5815543..ff6f0b60c 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1649-1.8.8 -mc_version=1.8.8 +forge_version=11.15.0.1656 +mc_version=1.8.9 build_number=248 mod_name=Botania diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 03a0a085c..f85f8b54d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -125,7 +125,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } 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 aef5461f7..863814a29 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -66,7 +66,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { float s = 0.6F; GlStateManager.scale(s, s, s); GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); 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 ec02bd362..af9f704b8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -71,7 +71,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float s = 0.25F; GlStateManager.scale(s, s, s); - mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.scale(1F / s, 1F / s, 1F / s); GlStateManager.popMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 8d0144d25..8fcd3c23d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -68,7 +68,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.translate(-0.075F, -1.25F, 0F); GlStateManager.scale(s, s, s); //GlStateManager.rotate(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F); 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 8002c1b0d..6e28b243f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -43,7 +43,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0.5F, 0.5F, pos); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.NONE); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } } 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 fb6a8289f..57544353c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -72,7 +72,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { if(stack != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); + mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 13211e78f..e22408ae5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -91,7 +91,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.FIXED); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.FIXED); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index ad7e1415d..20b51467d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -84,10 +84,10 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.texGen(GlStateManager.TexGen.T, 9217); GlStateManager.texGen(GlStateManager.TexGen.R, 9217); GlStateManager.texGen(GlStateManager.TexGen.Q, 9216); - GlStateManager.func_179105_a(GlStateManager.TexGen.S, 9473, this.func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.T, 9473, this.func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.R, 9473, this.func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); - GlStateManager.func_179105_a(GlStateManager.TexGen.Q, 9474, this.func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.S, 9473, this.func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.T, 9473, this.func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.R, 9473, this.func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); + GlStateManager.texGen(GlStateManager.TexGen.Q, 9474, this.func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7575d9e59..f5f341b18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; @@ -72,6 +73,21 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { ); } + @Override + public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { + if (collidingEntity instanceof EntityItem) { + float f = 1F / 16F * 2F; + + // Todo 1.8 temporary hack to let items collide from the top. Figure out what changed to break this. + setBlockBounds(f, f, f, 1F - f, 0.65F, 1F -f); + super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); + setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); + return; + } else { + super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); + } + } + @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT); @@ -87,7 +103,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if (meta < 0 || meta >= AltarVariant.values().length ) { meta = 0; } - System.out.println(AltarVariant.values()[meta]); return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 48d66f31d..b5597e2dd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -125,8 +125,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.motionY = y; this.motionZ = z; float f1 = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f1) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * 180.0D / Math.PI); this.ticksInGround = 0; } @@ -143,8 +143,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.func_181159_b(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.func_181159_b(y, (double)f) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * 180.0D / Math.PI); } } @@ -240,7 +240,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - this.func_181015_d(movingobjectposition.getBlockPos()); + this.setPortal(movingobjectposition.getBlockPos()); } else { @@ -252,9 +252,9 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.posY += this.motionY; this.posZ += this.motionZ; float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(MathHelper.func_181159_b(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(MathHelper.func_181159_b(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 05597c07a..c6fcf392b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -99,7 +99,7 @@ public class EntityThrownItem extends EntityItem { { if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) { - func_181015_d(movingobjectposition.getBlockPos()); + setPortal(movingobjectposition.getBlockPos()); } else { From 9f5455aa9fc959645607e1c21111dc1b09adf3ba Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 29 Dec 2015 23:47:28 -0600 Subject: [PATCH 127/935] Let it run on 1.8.8 as well. --- src/main/java/vazkii/botania/common/Botania.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 151f73802..8cb5f366f 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) +@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = "[1.8.8,1.8.9]") public class Botania { public static boolean gardenOfGlassLoaded = false; From b4300a9e3b33be306373035960be6ad71b7a630b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 00:55:21 -0600 Subject: [PATCH 128/935] Corporea item icons (world render broken still). Temp fix for pylon multiblock rendering. --- .../client/core/handler/ModelHandler.java | 3 +++ .../core/handler/MultiblockRenderHandler.java | 17 +++++++++++++ .../render/entity/RenderCorporeaSpark.java | 4 ++-- .../client/render/entity/RenderSpark.java | 5 ++-- .../client/render/entity/RenderSparkBase.java | 2 +- .../common/item/ItemCorporeaSpark.java | 24 ++++++++++++------- .../vazkii/botania/common/item/ItemSpark.java | 15 ++++++++++++ .../botania/common/item/ItemSparkUpgrade.java | 18 ++++++++++++++ .../botania/models/item/corporeaSpark0.json | 6 +++++ .../botania/models/item/corporeaSpark1.json | 6 +++++ .../assets/botania/models/item/spark.json | 6 +++++ .../botania/models/item/sparkUpgrade0.json | 6 +++++ .../botania/models/item/sparkUpgrade1.json | 6 +++++ .../botania/models/item/sparkUpgrade2.json | 6 +++++ .../botania/models/item/sparkUpgrade3.json | 6 +++++ 15 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/corporeaSpark0.json create mode 100644 src/main/resources/assets/botania/models/item/corporeaSpark1.json create mode 100644 src/main/resources/assets/botania/models/item/spark.json create mode 100644 src/main/resources/assets/botania/models/item/sparkUpgrade0.json create mode 100644 src/main/resources/assets/botania/models/item/sparkUpgrade1.json create mode 100644 src/main/resources/assets/botania/models/item/sparkUpgrade2.json create mode 100644 src/main/resources/assets/botania/models/item/sparkUpgrade3.json 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 b62d05d50..21f20fdb4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -435,12 +435,15 @@ public final class ModelHandler { registerItemModel(manaRingGreater); registerItemModel(auraRing); registerItemModel(auraRingGreater); + registerItemModel(spark); registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); registerItemModelAllMeta(petal, EnumDyeColor.values().length); + registerItemModelMetas(sparkUpgrade, LibItemNames.SPARK_UPGRADE, 4); + registerItemModelMetas(corporeaSpark, LibItemNames.CORPOREA_SPARK, 2); registerItemModelMetas(manaBottle, LibItemNames.MANA_BOTTLE, 6); registerItemModelMetas(ancientWill, LibItemNames.ANCIENT_WILL, 6); registerItemModelMetas(temperanceStone, LibItemNames.TEMPERANCE_STONE, 2); 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 aa88e0ec4..ab9bc9c88 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; @@ -48,6 +49,22 @@ public final class MultiblockRenderHandler { public static EnumFacing angle; public static int dimension; + static { + //todo 1.8 remove when fixed by forge + IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { + @Override + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); + } + + @Override + public boolean needsTranslate(IBlockState state) { + return true; + } + }); + } + public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; 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 20323dfa6..aa83257c9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -38,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return null;//entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } @Override @@ -53,7 +53,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return null;//ItemCorporeaSpark.iconColorStar; + return ItemCorporeaSpark.iconColorStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 7da7e3c52..44febf9c5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -23,9 +23,8 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { - return null; - /*int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null;*/ + int upgrade = entity.getUpgrade() - 1; + return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; } } 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 8872392c2..2163e5b9a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -81,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return null;//ItemSpark.worldIcon; + return ItemSpark.worldIcon; } public void colorSpinningIcon(T entity, float a) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 4fb732bc5..876d7dbb3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import java.util.List; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,6 +22,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -28,9 +34,12 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { + public static TextureAtlasSprite worldIcon, worldIconMaster, iconColorStar; + public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -57,14 +66,13 @@ public class ItemCorporeaSpark extends ItemMod { return false; } -// @Override todo 1.8 -// public void registerIcons(IIconRegister par1IconRegister) { -// invIcon = IconHelper.forItem(par1IconRegister, this, 0); -// worldIcon = IconHelper.forItem(par1IconRegister, this, 1); -// invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); -// worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); -// iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); -// } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); + worldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); + iconColorStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); + } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index a5cfa1a6d..3ddfeb2a6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -18,6 +19,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -29,8 +35,17 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { + public static TextureAtlasSprite worldIcon; + public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcon = IconHelper.forName(evt.map, "items/spark1"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index d9f776643..e84d6513e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -12,9 +12,15 @@ package vazkii.botania.common.item; import java.util.List; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; @@ -22,9 +28,21 @@ public class ItemSparkUpgrade extends ItemMod { private static final int VARIANTS = 4; + public static TextureAtlasSprite[] worldIcons; + public ItemSparkUpgrade() { setUnlocalizedName(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onTextureStitch(TextureStitchEvent.Pre evt) { + worldIcons = new TextureAtlasSprite[VARIANTS]; + for(int i = 0; i < VARIANTS; i++) { + worldIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); + } } @Override diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark0.json b/src/main/resources/assets/botania/models/item/corporeaSpark0.json new file mode 100644 index 000000000..6c73c74a6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaSpark0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/corporeaSpark0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark1.json b/src/main/resources/assets/botania/models/item/corporeaSpark1.json new file mode 100644 index 000000000..df14fff6c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaSpark1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/corporeaSpark2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spark.json b/src/main/resources/assets/botania/models/item/spark.json new file mode 100644 index 000000000..dda2c13a6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spark.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/spark0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json new file mode 100644 index 000000000..ff348f4e6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json new file mode 100644 index 000000000..2ab5c2453 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json new file mode 100644 index 000000000..a03ecf536 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json new file mode 100644 index 000000000..4e675445d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/sparkUpgrade3" + } +} \ No newline at end of file From c2470f80eeaffc51c21d4329d4f835465ff32c09 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 13:11:18 -0600 Subject: [PATCH 129/935] Fixes so server works --- .../handler/ContributorFancinessHandler.java | 6 +- .../core/handler/RenderEventHandler.java | 108 ++++++++++++++++++ .../client/core/helper/IconHelper.java | 24 ---- .../client/core/proxy/ClientProxy.java | 8 +- .../render/entity/RenderBabylonWeapon.java | 3 +- .../render/entity/RenderCorporeaSpark.java | 5 +- .../client/render/entity/RenderSpark.java | 3 +- .../render/tile/RenderTileAlfPortal.java | 5 +- .../render/tile/RenderTileEnchanter.java | 3 +- .../render/tile/RenderTileLightRelay.java | 3 +- .../client/render/tile/RenderTilePool.java | 3 +- .../render/tile/RenderTileTerraPlate.java | 3 +- .../render/tile/RenderTileTinyPotato.java | 7 +- .../common/achievement/ModAchievements.java | 3 +- .../botania/common/block/BlockAlfPortal.java | 8 -- .../block/BlockFloatingSpecialFlower.java | 1 - .../botania/common/block/BlockLightRelay.java | 10 -- .../common/block/BlockSpecialFlower.java | 13 --- .../block/decor/BlockFloatingFlower.java | 9 -- .../block/mana/BlockAlchemyCatalyst.java | 11 +- .../common/block/mana/BlockEnchanter.java | 8 -- .../common/block/mana/BlockManaVoid.java | 17 +-- .../botania/common/block/mana/BlockPool.java | 11 +- .../common/block/mana/BlockTerraPlate.java | 9 -- .../buildcraft/StatementAPIPlugin.java | 9 -- .../integration/buildcraft/StatementBase.java | 5 +- .../buildcraft/TriggerManaDetector.java | 12 +- .../buildcraft/TriggerManaLevel.java | 8 +- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +- .../common/item/ItemCorporeaSpark.java | 11 -- .../vazkii/botania/common/item/ItemSpark.java | 7 -- .../botania/common/item/ItemSparkUpgrade.java | 14 +-- .../item/material/ItemManaResource.java | 17 --- .../common/item/relic/ItemKingKey.java | 10 +- .../common/lexicon/page/PageElvenRecipe.java | 3 +- 35 files changed, 167 insertions(+), 218 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java 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 079dd5a16..b32ae3dd8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -92,7 +92,7 @@ public final class ContributorFancinessHandler { private static void renderTwintails(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).tailIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.tailIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -122,7 +122,7 @@ public final class ContributorFancinessHandler { private static void renderPhiFlower(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).phiFlowerIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.phiFlowerIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -142,7 +142,7 @@ public final class ContributorFancinessHandler { private static void renderGoldfish(RenderPlayerEvent event) { GlStateManager.pushMatrix(); - TextureAtlasSprite icon = ((ItemManaResource) ModItems.manaResource).goldfishIcon; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.goldfishIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java new file mode 100644 index 000000000..0b03208ea --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -0,0 +1,108 @@ +package vazkii.botania.client.core.handler; + +import com.google.common.collect.Maps; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.commons.lang3.text.WordUtils; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; +import vazkii.botania.common.item.ItemSparkUpgrade; +import vazkii.botania.common.item.relic.ItemKingKey; + +import java.util.Map; + +public class RenderEventHandler { + + public static final RenderEventHandler INSTANCE = new RenderEventHandler(); + + public TextureAtlasSprite + alfPortalTex, + lightRelayWorldIcon, + lightRelayWorldIconRed, + alchemyCatalystOverlay, + enchanterOverlay, + manaVoidOverlay, + manaWater, + terraPlateOverlay, + corporeaWorldIcon, + corporeaWorldIconMaster, + corporeaIconStar, + sparkWorldIcon, + manaDetectorIcon, + runeAltarTriggerIcon; + + public TextureAtlasSprite[] sparkUpgradeIcons; + public TextureAtlasSprite[] kingKeyWeaponIcons; + public Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + + // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed + public TextureAtlasSprite tailIcon = null; + public TextureAtlasSprite phiFlowerIcon = null; + public TextureAtlasSprite goldfishIcon = null; + public TextureAtlasSprite nerfBatIcon = null; + // end dank_memes + + @SubscribeEvent + public void onModelBake(ModelBakeEvent evt) { + // BlockSpecialFlower + // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal + evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(ModBlocks.specialFlower, new DefaultStateMapper() { + @Override + public ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:specialFlower"); + } + }); + + // Floating flowers + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + } + + @SubscribeEvent + public void onTextureStitch(TextureStitchEvent.Pre evt) { + alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); + lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); + lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); + alchemyCatalystOverlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); + enchanterOverlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); + manaVoidOverlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); + manaWater = IconHelper.forName(evt.map, "manaWater", "blocks"); + terraPlateOverlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); + corporeaWorldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); + corporeaWorldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); + corporeaIconStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); + sparkWorldIcon = IconHelper.forName(evt.map, "spark1", "items"); + + sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; + for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { + sparkUpgradeIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); + } + + tailIcon = IconHelper.forName(evt.map, "tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); + goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); + nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); + + kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; + for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) + kingKeyWeaponIcons[i] = IconHelper.forName(evt.map, "gateWeapon" + i, "items"); + + manaDetectorIcon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); + runeAltarTriggerIcon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); + + for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { + manaLevelTriggerIcons.put(s, IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); + } + } + + private RenderEventHandler() {} +} diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index d54099033..573998ad7 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,34 +10,10 @@ */ package vazkii.botania.client.core.helper; -import com.google.common.base.Function; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelRotation; -import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.ITransformation; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nullable; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Locale; public final class IconHelper { 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 1a5b0291c..0e80d24e8 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -56,6 +56,7 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -182,6 +183,7 @@ public class ClientProxy extends CommonProxy { super.preInit(event); + MinecraftForge.EVENT_BUS.register(RenderEventHandler.INSTANCE); ModelHandler.registerModels(); } @@ -191,7 +193,7 @@ public class ClientProxy extends CommonProxy { ModChallenges.init(); - FMLCommonHandler.instance().bus().register(new ClientTickHandler()); + MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); MinecraftForge.EVENT_BUS.register(new HUDHandler()); MinecraftForge.EVENT_BUS.register(new LightningHandler()); if(ConfigHandler.boundBlockWireframe) @@ -202,10 +204,10 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); - FMLCommonHandler.instance().bus().register(new CorporeaAutoCompleteHandler()); + MinecraftForge.EVENT_BUS.register(new CorporeaAutoCompleteHandler()); if(ConfigHandler.useAdaptativeConfig) - FMLCommonHandler.instance().bus().register(new AdaptorNotifier()); + MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); if(ConfigHandler.versionCheckEnabled) new VersionChecker().init(); 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 edd749e57..8df06e2eb 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -27,6 +27,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -60,7 +61,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.scale(s, s, s); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.rotate(45F, 0F, 0F, 1F); - TextureAtlasSprite icon = ItemKingKey.weaponIcons[weapon.getVariety()]; + TextureAtlasSprite icon = RenderEventHandler.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); 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 aa83257c9..521b7a1fa 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.item.ItemCorporeaSpark; @@ -38,7 +39,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return entity.isMaster() ? RenderEventHandler.INSTANCE.corporeaWorldIconMaster : RenderEventHandler.INSTANCE.corporeaWorldIcon; } @Override @@ -53,7 +54,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return ItemCorporeaSpark.iconColorStar; + return RenderEventHandler.INSTANCE.corporeaIconStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 44febf9c5..3992b8628 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSparkUpgrade; @@ -24,7 +25,7 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; + return upgrade >= 0 && upgrade < RenderEventHandler.INSTANCE.sparkUpgradeIcons.length ? RenderEventHandler.INSTANCE.sparkUpgradeIcons[upgrade] : null; } } 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 f1934498a..4107eb492 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.block.BlockAlfPortal; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -55,11 +56,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { GlStateManager.disableCull(); GlStateManager.disableLighting(); - renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.alfPortalTex, 3, 3, 240); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.translate(0F, 0F, 0.5F); - renderIcon(0, 0, BlockAlfPortal.portalTex, 3, 3, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.alfPortalTex, 3, 3, 240); GlStateManager.enableCull(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index f9ff5bb5f..54537f64a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockEnchanter; import vazkii.botania.common.block.tile.TileEnchanter; @@ -100,7 +101,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { } ShaderHelper.useShader(ShaderHelper.enchanterRune); - renderIcon(0, 0, BlockEnchanter.overlay, 5, 5, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.enchanterOverlay, 5, 5, 240); ShaderHelper.releaseShader(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 8239fb548..f6ac769ef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -24,6 +24,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.BlockLightRelay; @@ -32,7 +33,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) { Minecraft mc = Minecraft.getMinecraft(); - TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? BlockLightRelay.worldIconRed : BlockLightRelay.worldIcon; + TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 217bbfecd..057b0d03f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -29,6 +29,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; @@ -139,7 +140,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.scale(s, s, s); ShaderHelper.useShader(ShaderHelper.manaPool); - renderIcon(0, 0, BlockPool.manaIcon, 16, 16, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.manaWater, 16, 16, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); 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 8e5c1ece4..0e664848f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; @@ -59,7 +60,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ShaderHelper.useShader(ShaderHelper.terraPlateRune); - renderIcon(0, 0, BlockTerraPlate.overlay, 1, 1, 240); + renderIcon(0, 0, RenderEventHandler.INSTANCE.terraPlateOverlay, 1, 1, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 1d051bcdf..854862092 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -33,6 +33,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.TinyPotatoRenderEvent; import vazkii.botania.client.core.handler.ContributorFancinessHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -140,14 +141,14 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.translate(0.45F, 0F, 0.4F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(20F, 1F, 0F, 1F); - renderIcon(((ItemManaResource) ModItems.manaResource).phiFlowerIcon); + renderIcon(RenderEventHandler.INSTANCE.phiFlowerIcon); if(name.equals("vazkii")) { GlStateManager.rotate(-20F, 1F, 0F, 1F); GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1.5F, -1.3F, -0.75F); - renderIcon(((ItemManaResource) ModItems.manaResource).nerfBatIcon); + renderIcon(RenderEventHandler.INSTANCE.nerfBatIcon); } } else if(name.equals("skull kid")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); @@ -164,7 +165,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(((ItemManaResource) ModItems.manaResource).goldfishIcon); + renderIcon(RenderEventHandler.INSTANCE.goldfishIcon); } else if(name.equals("chitoge")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 5e16c5322..5a4f009f3 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -14,6 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; @@ -157,7 +158,7 @@ public final class ModAchievements { botaniaPage = new AchievementPage(LibMisc.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); AchievementPage.registerAchievementPage(botaniaPage); - FMLCommonHandler.instance().bus().register(new AchievementTriggerer()); + MinecraftForge.EVENT_BUS.register(new AchievementTriggerer()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index e3334034a..dfdb23634 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -37,20 +37,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { - public static TextureAtlasSprite portalTex; - public BlockAlfPortal() { super(Material.wood); setHardness(10F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre evt) { - portalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index b79b78d41..0dec520f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -74,7 +74,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE) .withProperty(ISLAND_TYPE, IFloatingFlower.IslandType.GRASS)); - MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8cc774d0b..144684c96 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -48,14 +48,11 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { - public static TextureAtlasSprite worldIcon, worldIconRed; - protected BlockLightRelay() { super(Material.glass); float f = 5F / 16F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); - MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } @@ -82,13 +79,6 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, meta == 1 ? LuminizerVariant.DETECTOR : LuminizerVariant.DEFAULT); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); - worldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); - } - @Override public Block setUnlocalizedName(String par1Str) { register(par1Str); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index fa661d7f1..1281c26f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -137,19 +137,6 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal - evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(this, new DefaultStateMapper() { - @Override - public ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:specialFlower"); - } - }); } @Override 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 16114cc93..899bd9856 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -97,15 +97,6 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return 2; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); - } - @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR, ISLAND_TYPE); 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 8b249caad..2d2075a60 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -23,6 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -30,8 +31,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoolOverlayProvider { - TextureAtlasSprite overlay; - public BlockAlchemyCatalyst() { this(LibBlockNames.ALCHEMY_CATALYST); } @@ -42,12 +41,6 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo setResistance(10.0F); setStepSound(Block.soundTypeStone); setUnlocalizedName(name); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); } @Override @@ -57,7 +50,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo @Override public TextureAtlasSprite getIcon(World world, BlockPos pos) { - return overlay; + return RenderEventHandler.INSTANCE.alchemyCatalystOverlay; } } 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 69438e442..f33be0a81 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -51,7 +51,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; - public static TextureAtlasSprite overlay; public BlockEnchanter() { super(Material.rock); @@ -62,13 +61,6 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); } @Override 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 4e2757349..e3c83e761 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -26,6 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaVoid; @@ -34,26 +35,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider { - TextureAtlasSprite overlay; - public BlockManaVoid() { super(Material.rock); setHardness(2.0F); setResistance(2000F); setStepSound(Block.soundTypeStone); setUnlocalizedName(LibBlockNames.MANA_VOID); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public int getRenderType() { - return 3; - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); } @Override @@ -68,7 +55,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP @Override public TextureAtlasSprite getIcon(World world, BlockPos pos) { - return overlay; + return RenderEventHandler.INSTANCE.manaVoidOverlay; } } 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 d0931ee96..a82ebae64 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -64,8 +64,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; - public static TextureAtlasSprite manaIcon; - public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -74,7 +72,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, setUnlocalizedName(LibBlockNames.POOL); setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); - MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); @@ -87,7 +84,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public int getMetaFromState(IBlockState state) { - return ((PoolVariant) state.getValue(BotaniaStateProps.POOL_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); } @Override @@ -98,12 +95,6 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - manaIcon = IconHelper.forName(evt.map, "manaWater", "blocks"); - } - @Override protected boolean shouldRegisterInNameSet() { return false; 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 fbd89f4e5..cc36f1387 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -40,8 +40,6 @@ import vazkii.botania.common.lib.LibObfuscation; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { - public static TextureAtlasSprite overlay; - public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -50,7 +48,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { setStepSound(soundTypeMetal); setUnlocalizedName(LibBlockNames.TERRA_PLATE); - MinecraftForge.EVENT_BUS.register(this); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } @@ -79,12 +76,6 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { return false; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - overlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); - } - @Override public boolean isFullCube() { return false; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 838d8beb9..c417584d6 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -35,15 +35,6 @@ public class StatementAPIPlugin implements ITriggerProvider { StatementManager.registerStatement(triggerRuneAltarCanCraft); StatementManager.registerTriggerProvider(this); - - // Register them all to the event bus so they can stitch textures - MinecraftForge.EVENT_BUS.register(triggerManaEmpty); - MinecraftForge.EVENT_BUS.register(triggerManaContains); - MinecraftForge.EVENT_BUS.register(triggerManaSpace); - MinecraftForge.EVENT_BUS.register(triggerManaFull); - MinecraftForge.EVENT_BUS.register(triggerManaDetector); - - MinecraftForge.EVENT_BUS.register(triggerRuneAltarCanCraft); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index ab08cb575..b0ca61875 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -5,12 +5,9 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; public abstract class StatementBase implements IStatement { - protected TextureAtlasSprite icon; @Override - public TextureAtlasSprite getGuiSprite() { - return icon; - } + public abstract TextureAtlasSprite getGuiSprite(); @Override public int maxParameters() { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index ac6a9f875..fd6f85d83 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,6 +1,7 @@ package vazkii.botania.common.integration.buildcraft; import com.google.common.base.Predicates; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; @@ -9,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibTriggerNames; @@ -19,13 +21,13 @@ import buildcraft.api.statements.ITriggerInternal; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { @Override - public String getUniqueTag() { - return "botania:manaDetector"; + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.manaDetectorIcon; } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); + @Override + public String getUniqueTag() { + return "botania:manaDetector"; } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 6b0767bd2..c554dd817 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,5 +1,6 @@ package vazkii.botania.common.integration.buildcraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -11,6 +12,7 @@ import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibTriggerNames; import buildcraft.api.statements.IStatementContainer; @@ -36,9 +38,9 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal return "botania:mana" + state.name(); } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(state.name()), "items"); + @Override + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.manaLevelTriggerIcons.get(state); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index c6a707136..b4bdd4059 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,11 +1,13 @@ package vazkii.botania.common.integration.buildcraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -20,9 +22,9 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE return "botania:runeAltarCanCraft"; } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre evt) { - icon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); + @Override + public TextureAtlasSprite getGuiSprite() { + return RenderEventHandler.INSTANCE.runeAltarTriggerIcon; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 876d7dbb3..9eaf26dfc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -34,12 +34,9 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { - public static TextureAtlasSprite worldIcon, worldIconMaster, iconColorStar; - public ItemCorporeaSpark() { setUnlocalizedName(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); } @Override @@ -66,14 +63,6 @@ public class ItemCorporeaSpark extends ItemMod { return false; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); - worldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); - iconColorStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); - } - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 3ddfeb2a6..985f233c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -39,13 +39,6 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcon = IconHelper.forName(evt.map, "items/spark1"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index e84d6513e..38c400024 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -26,23 +26,11 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSparkUpgrade extends ItemMod { - private static final int VARIANTS = 4; - - public static TextureAtlasSprite[] worldIcons; + public static final int VARIANTS = 4; public ItemSparkUpgrade() { setUnlocalizedName(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - worldIcons = new TextureAtlasSprite[VARIANTS]; - for(int i = 0; i < VARIANTS; i++) { - worldIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); - } } @Override 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 89bbd2239..412a669da 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -55,27 +55,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 24; - // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed - public TextureAtlasSprite tailIcon = null; - public TextureAtlasSprite phiFlowerIcon = null; - public TextureAtlasSprite goldfishIcon = null; - public TextureAtlasSprite nerfBatIcon = null; - // end dank_memes - public ItemManaResource() { super(); setUnlocalizedName(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent.Pre evt) { - tailIcon = IconHelper.forName(evt.map, "tail", "items"); - phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); - goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); - nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 4e8bd5bbd..9ba124565 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -33,20 +33,12 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; private static final String TAG_CHARGING = "charging"; - private static final int WEAPON_TYPES = 12; - public static TextureAtlasSprite[] weaponIcons; + public static final int WEAPON_TYPES = 12; public ItemKingKey() { super(LibItemNames.KING_KEY); } - @SubscribeEvent - public void registerIcons(TextureStitchEvent.Pre event) { - weaponIcons = new TextureAtlasSprite[WEAPON_TYPES]; - for(int i = 0; i < WEAPON_TYPES; i++) - weaponIcons[i] = IconHelper.forName(event.map, "gateWeapon" + i, "items"); - } - @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); 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 b4a05becb..dd22cc9d3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -21,6 +21,7 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.BlockAlfPortal; import net.minecraftforge.fml.relauncher.Side; @@ -74,7 +75,7 @@ public class PageElvenRecipe extends PageRecipe { i++; } - TextureAtlasSprite portalIcon = BlockAlfPortal.portalTex; + TextureAtlasSprite portalIcon = RenderEventHandler.INSTANCE.alfPortalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } From a67aeee496108a2bf8e67e0eee4a4b6efe925485 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 14:51:14 -0600 Subject: [PATCH 130/935] SPark changer, terrasteel plate, fix spark entity render --- .../client/core/handler/ModelHandler.java | 2 ++ .../core/handler/RenderEventHandler.java | 1 + .../client/render/entity/RenderSparkBase.java | 5 +++-- .../render/tile/RenderTileSparkChanger.java | 20 +++---------------- .../vazkii/botania/common/item/ItemSpark.java | 2 -- .../botania/blockstates/sparkChanger.json | 19 ++++++++++++++++++ .../assets/botania/blockstates/starfield.json | 4 ++-- .../botania/blockstates/terraPlate.json | 16 +++++++++++++++ .../{thinnerthanslab.json => fourhigh.json} | 0 .../botania/models/block/threehigh.json | 19 ++++++++++++++++++ 10 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/sparkChanger.json create mode 100644 src/main/resources/assets/botania/blockstates/terraPlate.json rename src/main/resources/assets/botania/models/block/{thinnerthanslab.json => fourhigh.json} (100%) create mode 100644 src/main/resources/assets/botania/models/block/threehigh.json 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 21f20fdb4..9f91c8f3a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -306,6 +306,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringInterceptor); registerItemModel(ModBlocks.redStringRelay); registerItemModel(ModBlocks.floatingSpecialFlower); + registerItemModel(ModBlocks.sparkChanger); + registerItemModel(ModBlocks.terraPlate); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java index 0b03208ea..4159d6acf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -69,6 +69,7 @@ public class RenderEventHandler { @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { + System.out.println("CALLING TEXTURE STITCH"); alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); 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 2163e5b9a..ef26a2607 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -25,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSpark; @@ -81,7 +82,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return ItemSpark.worldIcon; + return RenderEventHandler.INSTANCE.sparkWorldIcon; } public void colorSpinningIcon(T entity, float a) { @@ -110,7 +111,7 @@ public class RenderSparkBase extends RenderEntity { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); //p_77026_1_.getWorldRenderer().setBrightness(240); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 16511c14e..7236fbfae 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -41,23 +42,8 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { float s = 0.6F; GlStateManager.scale(s, s, s); GlStateManager.rotate(180F, 0F, 1F, 0F); - - int renderPass = 0; -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + GlStateManager.translate(0.5, 0.5, 0); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 985f233c9..ead1b12c1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -35,8 +35,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { - public static TextureAtlasSprite worldIcon; - public ItemSpark() { setUnlocalizedName(LibItemNames.SPARK); } diff --git a/src/main/resources/assets/botania/blockstates/sparkChanger.json b/src/main/resources/assets/botania/blockstates/sparkChanger.json new file mode 100644 index 000000000..e148127b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/sparkChanger.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:threehigh", + "textures": { + "bottom": "botania:blocks/sparkChanger0", + "top": "botania:blocks/sparkChanger1", + "side": "botania:blocks/sparkChanger2" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index e37b30a21..23adc2498 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -5,7 +5,7 @@ }, "variants": { "normal": [{ - "model": "botania:thinnerthanslab", + "model": "botania:fourhigh", "textures": { "bottom": "botania:blocks/starfield0", "top": "botania:blocks/starfield1", @@ -13,7 +13,7 @@ } }], "inventory": [{ - "model": "botania:thinnerthanslab", + "model": "botania:fourhigh", "textures": { "bottom": "botania:blocks/starfield0", "top": "botania:blocks/starfield0", diff --git a/src/main/resources/assets/botania/blockstates/terraPlate.json b/src/main/resources/assets/botania/blockstates/terraPlate.json new file mode 100644 index 000000000..35e443a5d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/terraPlate.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:threehigh", + "textures": { + "bottom": "botania:blocks/terraPlate0", + "top": "botania:blocks/terraPlate1", + "side": "botania:blocks/terraPlate2" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/thinnerthanslab.json b/src/main/resources/assets/botania/models/block/fourhigh.json similarity index 100% rename from src/main/resources/assets/botania/models/block/thinnerthanslab.json rename to src/main/resources/assets/botania/models/block/fourhigh.json diff --git a/src/main/resources/assets/botania/models/block/threehigh.json b/src/main/resources/assets/botania/models/block/threehigh.json new file mode 100644 index 000000000..b462b3ccb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/threehigh.json @@ -0,0 +1,19 @@ +{ + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 3, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 13, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} From 4dd62fae3738add1279ebd20a0b9f2cce5b630d8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 18:27:06 -0600 Subject: [PATCH 131/935] Corporea blocks, luminizers, comment out nei and cbmp stuff so it can actually build. --- .../client/core/handler/ModelHandler.java | 18 ++++++++++--- .../integration/nei/NEIBotaniaConfig.java | 2 ++ .../client/integration/nei/NEIGuiHooks.java | 4 ++- .../integration/nei/NEIInputHandler.java | 4 ++- .../nei/recipe/RecipeHandlerBrewery.java | 2 ++ .../nei/recipe/RecipeHandlerElvenTrade.java | 8 ++++-- .../recipe/RecipeHandlerFloatingFlowers.java | 2 ++ .../recipe/RecipeHandlerLexicaBotania.java | 4 ++- .../nei/recipe/RecipeHandlerManaPool.java | 2 ++ .../recipe/RecipeHandlerPetalApothecary.java | 2 ++ .../nei/recipe/RecipeHandlerPureDaisy.java | 2 ++ .../nei/recipe/RecipeHandlerRunicAltar.java | 2 ++ .../botania/common/block/BlockLightRelay.java | 4 +-- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../block/corporea/BlockCorporeaIndex.java | 2 +- .../common/block/tile/TileBrewery.java | 5 ---- .../botania/common/block/tile/TileMod.java | 10 +++++++ .../common/block/tile/TileSpecialFlower.java | 5 ---- .../tile/corporea/TileCorporeaRetainer.java | 2 +- .../multipart/MultipartHandler.java | 5 ++-- .../botania/blockstates/buriedPetals.json | 27 +++++++++++++++++++ .../botania/blockstates/corporeaFunnel.json | 19 +++++++++++++ .../blockstates/corporeaInterceptor.json | 19 +++++++++++++ .../botania/blockstates/corporeaRetainer.json | 17 ++++++++++++ .../botania/blockstates/lightLauncher.json | 19 +++++++++++++ .../botania/blockstates/lightRelay.json | 27 +++++++++++++++++++ .../assets/botania/blockstates/starfield.json | 19 ++++++------- .../assets/botania/models/block/dummy.json | 12 +++++++++ 28 files changed, 212 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/buriedPetals.json create mode 100644 src/main/resources/assets/botania/blockstates/corporeaFunnel.json create mode 100644 src/main/resources/assets/botania/blockstates/corporeaInterceptor.json create mode 100644 src/main/resources/assets/botania/blockstates/corporeaRetainer.json create mode 100644 src/main/resources/assets/botania/blockstates/lightLauncher.json create mode 100644 src/main/resources/assets/botania/blockstates/lightRelay.json create mode 100644 src/main/resources/assets/botania/models/block/dummy.json 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 9f91c8f3a..1691f19f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -37,6 +37,7 @@ import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; @@ -128,6 +129,7 @@ public final class ModelHandler { registerPanes(); registerAltars(); registerQuartzBlocks(); + registerLuminizers(); /** Normal Items **/ registerStandardItems(); @@ -308,6 +310,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.floatingSpecialFlower); registerItemModel(ModBlocks.sparkChanger); registerItemModel(ModBlocks.terraPlate); + registerItemModel(ModBlocks.corporeaRetainer); + registerItemModel(ModBlocks.corporeaInterceptor); + registerItemModel(ModBlocks.corporeaFunnel); + registerItemModel(ModBlocks.lightLauncher); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); @@ -551,9 +557,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - // Ignore redstone power state in some blocks - ModelLoader.setCustomStateMapper(ModBlocks.starfield, (new StateMap.Builder()).ignore(BotaniaStateProps.POWERED).build()); - // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); @@ -849,6 +852,15 @@ public final class ModelHandler { } } + private static void registerLuminizers() { + Item item = Item.getItemFromBlock(ModBlocks.lightRelay); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); + for (LuminizerVariant v : LuminizerVariant.values()) { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); + ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java index 277bd5806..2265a28c8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei; import org.lwjgl.input.Keyboard; @@ -60,3 +61,4 @@ public class NEIBotaniaConfig implements IConfigureNEI { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java index 37953eeaf..3d23c8b5f 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Dec 15, 2014, 6:09:38 PM (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; @@ -22,3 +23,4 @@ public class NEIGuiHooks { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java index e1ea06188..02db53a2f 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [25/12/2015, 02:22:32 (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei; import vazkii.botania.api.corporea.CorporeaHelper; @@ -101,3 +102,4 @@ public class NEIInputHandler implements IContainerInputHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java index f0b7bfe78..538be3b66 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -138,3 +139,4 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 2ab363bef..c6cb4b0c5 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -98,7 +99,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } private static boolean hasElvenKnowledge() { - /*EntityPlayer player = Minecraft.getMinecraft().thePlayer; + */ +/*EntityPlayer player = Minecraft.getMinecraft().thePlayer; if (player != null) { for (ItemStack stack : player.inventory.mainInventory) { if (stack != null && stack.getItem() instanceof ILexicon) { @@ -109,7 +111,8 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } } - return false;*/ + return false;*//* + return true; } @@ -166,3 +169,4 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java index d1a1f397a..d70ecdb18 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -79,3 +80,4 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index ea1933074..757048ba6 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [12/12/2015, 23:25:47 (GMT)] - */ + *//* + package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -169,3 +170,4 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 124737484..76db6ea0a 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -155,3 +156,4 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java index 0ab15efba..0b0226079 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -141,3 +142,4 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java index b6953b39f..ccfa58439 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; @@ -136,3 +137,4 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java index 506ad540d..ca9aeabd8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.client.integration.nei.recipe; import java.util.List; @@ -55,3 +56,4 @@ public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary { } } +*/ diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 144684c96..d45842da2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -138,7 +138,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { - return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT + return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR && state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -154,7 +154,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe @Override public int getRenderType() { - return LibRenderIDs.idLightRelay; + return 2; } @Override 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 6b5964580..df317dcc2 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -68,7 +68,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @Override public int getRenderType() { - return LibRenderIDs.idCorporeaCrystalCybe; + return 2; } @Override 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 6161a812e..eb0a8e644 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -44,7 +44,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @Override public int getRenderType() { - return LibRenderIDs.idCorporeaIndex; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index b3f613970..7af25e51d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -48,11 +48,6 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, int manaLastTick = 0; public int signal = 0; - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } - public boolean addItem(EntityPlayer player, ItemStack stack) { if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; 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 752394c91..149689951 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -10,14 +10,24 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; public class TileMod extends TileEntity { + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + // todo: review all subclasses. this could potentially leave stragglers hanging. + // todo: example: open crate and crafty crate should refresh when variants change + return oldState.getBlock() != newState.getBlock(); + } + @Override public void writeToNBT(NBTTagCompound par1nbtTagCompound) { super.writeToNBT(par1nbtTagCompound); 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 726aa111e..bf25397fe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -44,11 +44,6 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public String subTileName = ""; SubTileEntity subTile; - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return oldState.getBlock() != newState.getBlock(); - } - @Override public SubTileEntity getSubTile() { return subTile; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index d10cbe68c..d7fc212ab 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -35,7 +35,7 @@ public class TileCorporeaRetainer extends TileMod { private static final int REQUEST_STRING = 2; boolean pendingRequest = false; - BlockPos requestPos; + BlockPos requestPos = BlockPos.ORIGIN; Object request; int requestCount; diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java index 3592e0d50..b41f47b3d 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)] - */ + *//* + package vazkii.botania.common.integration.multipart; import java.util.ArrayList; @@ -70,4 +71,4 @@ public class MultipartHandler { MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); } -} \ No newline at end of file +}*/ diff --git a/src/main/resources/assets/botania/blockstates/buriedPetals.json b/src/main/resources/assets/botania/blockstates/buriedPetals.json new file mode 100644 index 000000000..52b77d221 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/buriedPetals.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy" + }, + "variants": { + "color": { + "white": { "textures": { "particle": "minecraft:blocks/wool_colored_white" }}, + "orange": { "textures": { "particle": "minecraft:blocks/wool_colored_orange" }}, + "magenta": { "textures": { "particle": "minecraft:blocks/wool_colored_magenta" }}, + "light_blue": { "textures": { "particle": "minecraft:blocks/wool_colored_light_blue" }}, + "yellow": { "textures": { "particle": "minecraft:blocks/wool_colored_yellow" }}, + "lime": { "textures": { "particle": "minecraft:blocks/wool_colored_lime" }}, + "pink": { "textures": { "particle": "minecraft:blocks/wool_colored_pink" }}, + "gray": { "textures": { "particle": "minecraft:blocks/wool_colored_gray" }}, + "silver": { "textures": { "particle": "minecraft:blocks/wool_colored_silver" }}, + "cyan": { "textures": { "particle": "minecraft:blocks/wool_colored_cyan" }}, + "purple": { "textures": { "particle": "minecraft:blocks/wool_colored_purple" }}, + "blue": { "textures": { "particle": "minecraft:blocks/wool_colored_blue" }}, + "brown": { "textures": { "particle": "minecraft:blocks/wool_colored_brown" }}, + "green": { "textures": { "particle": "minecraft:blocks/wool_colored_green" }}, + "red": { "textures": { "particle": "minecraft:blocks/wool_colored_red" }}, + "black": { "textures": { "particle": "minecraft:blocks/wool_colored_black" }} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json new file mode 100644 index 000000000..ba2242e45 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaFunnel0", + "top": "botania:blocks/corporeaFunnel0", + "side": "botania:blocks/corporeaFunnel1" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json new file mode 100644 index 000000000..9e4db20af --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaInterceptor0", + "top": "botania:blocks/corporeaInterceptor0", + "side": "botania:blocks/corporeaInterceptor1" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json new file mode 100644 index 000000000..de67279d8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/corporeaRetainer" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightLauncher.json b/src/main/resources/assets/botania/blockstates/lightLauncher.json new file mode 100644 index 000000000..96cde7753 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lightLauncher.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:fourhigh", + "textures": { + "bottom": "botania:blocks/lightLauncher", + "top": "botania:blocks/lightLauncher", + "side": "botania:blocks/lightLauncher" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightRelay.json b/src/main/resources/assets/botania/blockstates/lightRelay.json new file mode 100644 index 000000000..6b9542b00 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lightRelay.json @@ -0,0 +1,27 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "builtin/generated", + "transform": "forge:default-item" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "variant": { + "default": { + "textures": { + "layer0": "botania:blocks/lightRelay0", + "particle": "botania:blocks/lightRelay1" + } + }, + "detector": { + "textures": { + "layer0": "botania:blocks/lightRelay2", + "particle": "botania:blocks/lightRelay3" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index 23adc2498..aaf085ab4 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -1,19 +1,20 @@ { "forge_marker": 1, "defaults": { + "model": "botania:fourhigh", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + }, "transform": "forge:default-block" }, "variants": { - "normal": [{ - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield1", - "side": "botania:blocks/starfield2" - } - }], + "powered": { + "true": {}, + "false": {} + }, "inventory": [{ - "model": "botania:fourhigh", "textures": { "bottom": "botania:blocks/starfield0", "top": "botania:blocks/starfield0", diff --git a/src/main/resources/assets/botania/models/block/dummy.json b/src/main/resources/assets/botania/models/block/dummy.json new file mode 100644 index 000000000..2a4f56dc6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dummy.json @@ -0,0 +1,12 @@ +{ + "__comment": "Dummy for TESRS that still want to set their block break particle without using code", + "elements": [ + { + "from": [0, 0, 0], + "to": [0, 0, 0], + "faces": { + "up": { "uv": [ 0, 0, 0, 0 ], "texture": "dummythatwillnevergetrendered" } + } + } + ] +} \ No newline at end of file From c5a5657810af3f525faa431b8c92514c00f6e99b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 18:33:56 -0600 Subject: [PATCH 132/935] Missed some >.> also a teeny bit of attribution that probably won't even show up because it runs off the screen --- .../client/render/block/RenderAltar.java | 51 -------------- .../client/render/block/RenderAvatar.java | 2 + .../client/render/block/RenderBellows.java | 2 + .../client/render/block/RenderBrewery.java | 2 + .../client/render/block/RenderCocoon.java | 2 + .../block/RenderCorporeaCrystalCube.java | 2 + .../render/block/RenderCorporeaIndex.java | 2 + .../render/block/RenderDoubleFlower.java | 69 ------------------- .../render/block/RenderFloatingFlower.java | 41 ----------- .../client/render/block/RenderHourglass.java | 4 +- .../render/block/RenderIncensePlate.java | 4 +- .../client/render/block/RenderPool.java | 4 +- .../client/render/block/RenderPump.java | 4 +- .../client/render/block/RenderPylon.java | 52 -------------- .../render/block/RenderSpawnerClaw.java | 4 +- .../render/block/RenderSpecialFlower.java | 4 +- .../client/render/block/RenderSpreader.java | 4 +- .../render/block/RenderTeruTeruBozu.java | 4 +- .../client/render/block/RenderTinyPotato.java | 4 +- .../botania/client/render/item/RenderBow.java | 4 +- .../render/item/RenderFloatingFlowerItem.java | 54 --------------- .../client/render/item/RenderLens.java | 5 +- .../client/render/item/RenderLexicon.java | 4 +- .../render/item/RenderTransparentItem.java | 4 +- src/main/resources/mcmod.info | 2 +- 25 files changed, 52 insertions(+), 282 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderAltar.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderPylon.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java b/src/main/java/vazkii/botania/client/render/block/RenderAltar.java deleted file mode 100644 index d48a3d53b..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderAltar.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 21, 2014, 8:02:01 PM (GMT)] - */ -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.tile.RenderTileAltar; -import vazkii.botania.common.block.tile.TileAltar; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderAltar implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.6F, -0.5F); - GlStateManager.scale(0.9F, 0.9F, 0.9F); - RenderTileAltar.forceMeta = metadata; - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileAltar(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idAltar; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } -} diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java index 8731d5090..4013b2ed0 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java @@ -8,6 +8,7 @@ * * File Created @ [Oct 24, 2015, 11:06:11 PM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderAvatar implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java index 39356db69..3d5032914 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java @@ -8,6 +8,7 @@ * * File Created @ [Aug 28, 2015, 7:13:45 PM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -48,3 +49,4 @@ public class RenderBellows implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java index 800232855..88ef1482b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java @@ -8,6 +8,7 @@ * * File Created @ [Oct 31, 2014, 5:00:12 PM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -51,3 +52,4 @@ public class RenderBrewery implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java index 2299230d8..6337d430f 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java @@ -8,6 +8,7 @@ * * File Created @ [Jul 8, 2015, 5:57:29 PM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderCocoon implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java index b2d0728c4..5c692bb96 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java @@ -8,6 +8,7 @@ * * File Created @ [Apr 30, 2015, 6:22:32 PM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -49,3 +50,4 @@ public class RenderCorporeaCrystalCube implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java index 917e08835..95537392c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java @@ -8,6 +8,7 @@ * * File Created @ [Feb 15, 2015, 1:57:50 AM (GMT)] */ +/* package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -51,3 +52,4 @@ public class RenderCorporeaIndex implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java deleted file mode 100644 index 644f63601..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 22, 2015, 9:00:06 PM (GMT)] - */ -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import vazkii.botania.client.lib.LibRenderIDs; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - // NO-OP - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int p_147774_2_, int p_147774_3_, int p_147774_4_, Block block, int modelId, RenderBlocks renderer) { - BlockDoublePlant p_147774_1_ = (BlockDoublePlant) block; - Tessellator tessellator = Tessellator.getInstance(); - tessellator.setBrightness(p_147774_1_.getMixedBrightnessForBlock(world, p_147774_2_, p_147774_3_, p_147774_4_)); - tessellator.setColorOpaque_F(1F, 1F, 1F); - long j1 = p_147774_2_ * 3129871 ^ p_147774_4_ * 116129781L; - j1 = j1 * j1 * 42317861L + j1 * 11L; - int i1 = world.getBlockMetadata(p_147774_2_, p_147774_3_, p_147774_4_); - boolean flag1 = BlockDoublePlant.func_149887_c(i1); - if (flag1) - { - if (world.getBlock(p_147774_2_, p_147774_3_ - 1, p_147774_4_) != p_147774_1_) - { - return false; - } - - BlockDoublePlant.func_149890_d(world.getBlockMetadata(p_147774_2_, p_147774_3_ - 1, p_147774_4_)); - } - else - { - BlockDoublePlant.func_149890_d(i1); - } - - // Only change here, to use xyz rather than side/meta - IIcon icon = renderer.getBlockIcon(block, world, p_147774_2_, p_147774_3_, p_147774_4_, 0); - RenderSpecialFlower.drawCrossedSquares(world, block, icon, p_147774_2_, p_147774_3_, p_147774_4_, p_147774_2_, p_147774_3_, p_147774_4_, 1F, renderer); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idDoubleFlower; - } - -} diff --git a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java deleted file mode 100644 index a97379407..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 8, 2014, 11:05:38 PM (GMT)] - */ -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; -import vazkii.botania.client.lib.LibRenderIDs; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderFloatingFlower implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - // NO-OP, see RenderFloatingFlowerItem under ./item. - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idMiniIsland; - } - -} diff --git a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java index bab1510da..06df3b26b 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [May 30, 2015, 3:17:41 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -49,3 +50,4 @@ public class RenderHourglass implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java index ab57d1d3b..7b8aa222c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [May 15, 2015, 5:59:56 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -48,3 +49,4 @@ public class RenderIncensePlate implements ISimpleBlockRenderingHandler{ } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPool.java b/src/main/java/vazkii/botania/client/render/block/RenderPool.java index 51b268da6..f261acfa2 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPool.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPool.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jan 26, 2014, 12:25:06 AM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -50,3 +51,4 @@ public class RenderPool implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPump.java b/src/main/java/vazkii/botania/client/render/block/RenderPump.java index 81f4708d5..8af901f00 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderPump.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderPump.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Mar 18, 2015, 4:42:08 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderPump implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java b/src/main/java/vazkii/botania/client/render/block/RenderPylon.java deleted file mode 100644 index 4c602fc5f..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderPylon.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 18, 2014, 10:20:06 PM (GMT)] - */ -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.tile.RenderTilePylon; -import vazkii.botania.common.block.tile.TilePylon; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderPylon implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.7F, -0.5F); - RenderTilePylon.green = metadata == 1; - RenderTilePylon.pink = metadata == 2; - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePylon(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idPylon; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java index 936820083..c8915e02c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jul 23, 2014, 6:23:54 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index f0cccbc07..112378b89 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jan 25, 2014, 4:15:46 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -134,3 +135,4 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMulti } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java index 495f26fdc..6400353d8 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jan 25, 2014, 9:45:58 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -53,3 +54,4 @@ public class RenderSpreader implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java index c49531073..ae77b4978 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Oct 1, 2015, 9:40:27 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderTeruTeruBozu implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java index 70cd0b889..85cbb724a 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jul 18, 2014, 11:43:37 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.block; import net.minecraft.block.Block; @@ -47,3 +48,4 @@ public class RenderTinyPotato implements ISimpleBlockRenderingHandler { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java index 64e225aff..805fab163 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderBow.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Feb 28, 2015, 3:43:09 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.item; import net.minecraft.client.renderer.ItemRenderer; @@ -92,3 +93,4 @@ public class RenderBow implements IItemRenderer { } +*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java b/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java deleted file mode 100644 index b962535c7..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Nov 17, 2014, 5:48:34 PM (GMT)] - */ -package vazkii.botania.client.render.item; - -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.TileFloatingFlower; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; - -public class RenderFloatingFlowerItem implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack stack, Object... data) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - float s = 1.4F; - GlStateManager.scale(s, s, s); - GlStateManager.rotate(-5F, 1F, 0F, 0F); - Item item = stack.getItem(); - TileFloatingFlower.forcedStack = item instanceof ItemBlockFloatingSpecialFlower ? ItemBlockSpecialFlower.ofType(ItemBlockSpecialFlower.getType(stack)) : new ItemStack(ModBlocks.flower, 1, stack.getItemDamage()); - - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileFloatingFlower(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLens.java b/src/main/java/vazkii/botania/client/render/item/RenderLens.java index c25e8f8aa..fad1267bc 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLens.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLens.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Jan 31, 2014, 3:08:00 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.item; import java.awt.Color; @@ -120,4 +121,4 @@ public class RenderLens implements IItemRenderer { tessellator.draw(); } -} \ No newline at end of file +}*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java index 0c98afcce..77e2e89d0 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Mar 25, 2014, 8:49:01 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.item; import net.minecraft.client.Minecraft; @@ -114,3 +115,4 @@ public class RenderLexicon implements IItemRenderer { } } +*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java index 540fe7339..62f2a4e8c 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java @@ -7,7 +7,8 @@ * Botania License: http://botaniamod.net/license.php * * File Created @ [Aug 6, 2014, 10:04:57 PM (GMT)] - */ + *//* + package vazkii.botania.client.render.item; import net.minecraft.client.renderer.ItemRenderer; @@ -77,3 +78,4 @@ public class RenderTransparentItem implements IItemRenderer { } +*/ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5fbcc2dbb..942ddd490 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -9,7 +9,7 @@ "url": "http://www.botaniamod.net", "updateUrl": "", "authorList": ["Vazkii"], - "credits": "Azanor, dylan4ever, Flaxbeard, Futureazoo, wiiv, Rorax, Lorc, Adubbz, WTFG33ks, Auric245524, MegaManki, Kain Vinosec, Kihira, mDiyo, Mikeemoo, ChickenBones, PowerCrystals, cpw", + "credits": "Azanor, dylan4ever, Flaxbeard, Futureazoo, wiiv, Rorax, Lorc, Adubbz, WTFG33ks, Auric245524, MegaManki, Kain Vinosec, Kihira, mDiyo, Mikeemoo, ChickenBones, PowerCrystals, cpw, williewillus", "parent": "", "screenshots": [], "dependencies": [] From 5293f811c80bba4f57edb565afeb21251bbb4446 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 19:34:14 -0600 Subject: [PATCH 133/935] Fix king key weapon and item render --- .../client/core/helper/IconHelper.java | 85 +++++++++++++++++++ .../render/entity/RenderBabylonWeapon.java | 3 +- .../assets/botania/models/item/kingKey.json | 2 +- 3 files changed, 88 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 573998ad7..3b7c2b0a2 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,9 +10,13 @@ */ package vazkii.botania.client.core.helper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; public final class IconHelper { @@ -25,4 +29,85 @@ public final class IconHelper { return ir.registerSprite(new ResourceLocation(LibResources.PREFIX_MOD + dir + "/" + name)); } + /** + * Renders a sprite from the spritesheet with depth, like a "builtin/generated" item model. + * Adapted from ItemRenderer.renderItemIn2D, 1.7.10 + */ + public static void renderIconIn3D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float thickness) { + WorldRenderer wr = tess.getWorldRenderer(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex(); + wr.pos(1.0D, 0.0D, 0.0D).tex(p_78439_3_, p_78439_4_).normal(0, 0, 1).endVertex(); + wr.pos(1.0D, 1.0D, 0.0D).tex(p_78439_3_, p_78439_2_).normal(0, 0, 1).endVertex(); + wr.pos(0.0D, 1.0D, 0.0D).tex(p_78439_1_, p_78439_2_).normal(0, 0, 1).endVertex(); + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + wr.pos(0.0D, 1.0D, (0.0F - thickness)).tex(p_78439_1_, p_78439_2_).normal(0, 0, -1).endVertex(); + wr.pos(1.0D, 1.0D, (0.0F - thickness)).tex(p_78439_3_, p_78439_2_).normal(0, 0, -1).endVertex(); + wr.pos(1.0D, 0.0D, (0.0F - thickness)).tex(p_78439_3_, p_78439_4_).normal(0, 0, -1).endVertex(); + wr.pos(0.0D, 0.0D, (0.0F - thickness)).tex(p_78439_1_, p_78439_4_).normal(0, 0, -1).endVertex(); + tess.draw(); + float f5 = 0.5F * (p_78439_1_ - p_78439_3_) / (float)width; + float f6 = 0.5F * (p_78439_4_ - p_78439_2_) / (float)height; + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + int k; + float f7; + float f8; + + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + wr.pos(f7, 0.0D, (0.0F - thickness)).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); + wr.pos(f7, 1.0D, (0.0F - thickness)).tex(f8, p_78439_2_).normal(-1, 0, 0).endVertex(); + } + + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + float f9; + + for (k = 0; k < width; ++k) + { + f7 = (float)k / (float)width; + f8 = p_78439_1_ + (p_78439_3_ - p_78439_1_) * f7 - f5; + f9 = f7 + 1.0F / (float)width; + wr.pos(f9, 1.0D, (0.0F - thickness)).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 1.0D, 0.0D).tex(f8, p_78439_2_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 0.0D, 0.0D).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); + wr.pos(f9, 0.0D, (0.0F - thickness)).tex(f8, p_78439_4_).normal(1, 0, 0).endVertex(); + } + + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + f9 = f7 + 1.0F / (float)height; + wr.pos(0.0D, f9, 0.0D).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); + wr.pos(1.0D, f9, 0.0D).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); + wr.pos(1.0D, f9, (0.0F - thickness)).tex(p_78439_3_, f8).normal(0, 1, 0).endVertex(); + wr.pos(0.0D, f9, (0.0F - thickness)).tex(p_78439_1_, f8).normal(0, 1, 0).endVertex(); + } + + tess.draw(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + + for (k = 0; k < height; ++k) + { + f7 = (float)k / (float)height; + f8 = p_78439_4_ + (p_78439_2_ - p_78439_4_) * f7 - f6; + wr.pos(1.0D, f7, 0.0D).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); + wr.pos(0.0D, f7, 0.0D).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); + wr.pos(0.0D, f7, (0.0F - thickness)).tex(p_78439_1_, f8).normal(0, -1, 0).endVertex(); + wr.pos(1.0D, f7, (0.0F - thickness)).tex(p_78439_3_, f8).normal(0, -1, 0).endVertex(); + } + + tess.draw(); + + } + } \ No newline at end of file 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 8df06e2eb..d8cbeb00a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -28,6 +28,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -70,7 +71,7 @@ public class RenderBabylonWeapon extends Render { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); GlStateManager.disableLighting(); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); GlStateManager.disableCull(); diff --git a/src/main/resources/assets/botania/models/item/kingKey.json b/src/main/resources/assets/botania/models/item/kingKey.json index c559fe3fb..f543ff9f7 100644 --- a/src/main/resources/assets/botania/models/item/kingKey.json +++ b/src/main/resources/assets/botania/models/item/kingKey.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "botania:item/standard_tool", "textures": { "layer0": "botania:items/kingKey" } From 1cf175d41291d6eeef8e493c22c397ab74a7d642 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 20:56:50 -0600 Subject: [PATCH 134/935] Baubles and stuff --- .../client/core/handler/ModelHandler.java | 47 +++++++++++++++++++ .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 2 +- .../assets/botania/models/item/divaCharm.json | 6 +++ .../botania/models/item/flightTiara.json | 6 +++ .../botania/models/item/goldenLaurel.json | 6 +++ .../assets/botania/models/item/holyCloak.json | 6 +++ .../botania/models/item/icePendant.json | 6 +++ .../botania/models/item/itemFinder.json | 6 +++ .../botania/models/item/knockbackBelt.json | 6 +++ .../botania/models/item/lavaPendant.json | 6 +++ .../models/item/magnetRingGreaterOff.json | 6 +++ .../models/item/magnetRingGreaterOn.json | 6 +++ .../botania/models/item/magnetRingOff.json | 6 +++ .../botania/models/item/magnetRingOn.json | 6 +++ .../botania/models/item/manaMirror.json | 7 +++ .../botania/models/item/miningRing.json | 6 +++ .../assets/botania/models/item/monocle.json | 6 +++ .../assets/botania/models/item/pixieRing.json | 6 +++ .../assets/botania/models/item/reachRing.json | 6 +++ .../botania/models/item/speedUpBelt.json | 6 +++ .../botania/models/item/superLavaPendant.json | 6 +++ .../botania/models/item/superTravelBelt.json | 6 +++ .../assets/botania/models/item/swapRing.json | 6 +++ .../botania/models/item/travelBelt.json | 6 +++ .../botania/models/item/unholyCloak.json | 6 +++ .../assets/botania/models/item/waterRing.json | 6 +++ 27 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/divaCharm.json create mode 100644 src/main/resources/assets/botania/models/item/flightTiara.json create mode 100644 src/main/resources/assets/botania/models/item/goldenLaurel.json create mode 100644 src/main/resources/assets/botania/models/item/holyCloak.json create mode 100644 src/main/resources/assets/botania/models/item/icePendant.json create mode 100644 src/main/resources/assets/botania/models/item/itemFinder.json create mode 100644 src/main/resources/assets/botania/models/item/knockbackBelt.json create mode 100644 src/main/resources/assets/botania/models/item/lavaPendant.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingOff.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingOn.json create mode 100644 src/main/resources/assets/botania/models/item/manaMirror.json create mode 100644 src/main/resources/assets/botania/models/item/miningRing.json create mode 100644 src/main/resources/assets/botania/models/item/monocle.json create mode 100644 src/main/resources/assets/botania/models/item/pixieRing.json create mode 100644 src/main/resources/assets/botania/models/item/reachRing.json create mode 100644 src/main/resources/assets/botania/models/item/speedUpBelt.json create mode 100644 src/main/resources/assets/botania/models/item/superLavaPendant.json create mode 100644 src/main/resources/assets/botania/models/item/superTravelBelt.json create mode 100644 src/main/resources/assets/botania/models/item/swapRing.json create mode 100644 src/main/resources/assets/botania/models/item/travelBelt.json create mode 100644 src/main/resources/assets/botania/models/item/unholyCloak.json create mode 100644 src/main/resources/assets/botania/models/item/waterRing.json 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 1691f19f9..9fde0cc52 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -90,6 +90,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.brew.ItemBrewBase; +import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.relic.ItemInfiniteFruit; import vazkii.botania.common.lib.LibBlockNames; @@ -212,6 +214,28 @@ public final class ModelHandler { : new ModelResourceLocation("botania:manasteelSword", "inventory"); } }); + + ModelLoader.registerItemVariants(magnetRing, + new ModelResourceLocation("botania:magnetRingOn", "inventory"), + new ModelResourceLocation("botania:magnetRingOff", "inventory")); + ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory") + : new ModelResourceLocation("botania:magnetRingOff", "inventory"); + } + }); + + ModelLoader.registerItemVariants(magnetRingGreater, + new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), + new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); + ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); + } + }); } private static void registerSubtiles() { @@ -445,6 +469,29 @@ public final class ModelHandler { registerItemModel(auraRingGreater); registerItemModel(spark); + registerItemModel(waterRing); + registerItemModel(miningRing); + registerItemModel(reachRing); + registerItemModel(swapRing); + registerItemModel(pixieRing); + registerItemModel(travelBelt); + registerItemModel(superTravelBelt); + registerItemModel(speedUpBelt); + registerItemModel(knockbackBelt); + registerItemModel(itemFinder); + registerItemModel(monocle); + registerItemModel(icePendant); + registerItemModel(lavaPendant); + registerItemModel(superLavaPendant); + registerItemModel(holyCloak); + registerItemModel(unholyCloak); + registerItemModel(goldLaurel); + registerItemModel(flightTiara); + registerItemModel(divaCharm); + registerItemModel(manaMirror); + // magnet ring and greater version - custom mesher + + registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); registerItemModelAllMeta(laputaShard, 20); registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); registerItemModelAllMeta(dye, EnumDyeColor.values().length); 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 094a9d700..282d31e48 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 @@ -85,7 +85,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub //public static IIcon[] wingIcons; private static final int SUBTYPES = 8; - private static final int WING_TYPES = 9; + public static final int WING_TYPES = 9; public ItemFlightTiara() { super(LibItemNames.FLIGHT_TIARA); 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 62a0c1e42..6e2442e8c 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 @@ -86,7 +86,7 @@ public class ItemMagnetRing extends ItemBauble { if(cooldown <= 0) { if(player.isSneaking() == ConfigHandler.invertMagnetRing) { double x = player.posX; - double y = player.posY -(player.worldObj.isRemote ? 1.62 : 0) + 0.75; + double y = player.posY + 0.75; double z = player.posZ; List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); diff --git a/src/main/resources/assets/botania/models/item/divaCharm.json b/src/main/resources/assets/botania/models/item/divaCharm.json new file mode 100644 index 000000000..c20e146c3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/divaCharm.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/divaCharm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flightTiara.json b/src/main/resources/assets/botania/models/item/flightTiara.json new file mode 100644 index 000000000..8b234b549 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flightTiara.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flightTiara0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/goldenLaurel.json b/src/main/resources/assets/botania/models/item/goldenLaurel.json new file mode 100644 index 000000000..d2f97da5b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/goldenLaurel.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/goldenLaurel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/holyCloak.json b/src/main/resources/assets/botania/models/item/holyCloak.json new file mode 100644 index 000000000..1b8163e5f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/holyCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/holyCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/icePendant.json b/src/main/resources/assets/botania/models/item/icePendant.json new file mode 100644 index 000000000..dbb2f45b9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/icePendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/icePendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemFinder.json b/src/main/resources/assets/botania/models/item/itemFinder.json new file mode 100644 index 000000000..bf6ab538d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemFinder.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/itemFinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/knockbackBelt.json b/src/main/resources/assets/botania/models/item/knockbackBelt.json new file mode 100644 index 000000000..50c0779a7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/knockbackBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/knockbackBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavaPendant.json b/src/main/resources/assets/botania/models/item/lavaPendant.json new file mode 100644 index 000000000..3d1b8e25a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lavaPendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lavaPendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json new file mode 100644 index 000000000..3154c59b4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRingGreater1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json new file mode 100644 index 000000000..5c07378f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRingGreater0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOff.json b/src/main/resources/assets/botania/models/item/magnetRingOff.json new file mode 100644 index 000000000..abaf8684e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingOff.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRing1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOn.json b/src/main/resources/assets/botania/models/item/magnetRingOn.json new file mode 100644 index 000000000..4ab9474f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingOn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRing0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaMirror.json b/src/main/resources/assets/botania/models/item/manaMirror.json new file mode 100644 index 000000000..0171429d3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaMirror.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaMirror0", + "layer1": "botania:items/manaMirror1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/miningRing.json b/src/main/resources/assets/botania/models/item/miningRing.json new file mode 100644 index 000000000..243994e8f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/miningRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/miningRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/monocle.json b/src/main/resources/assets/botania/models/item/monocle.json new file mode 100644 index 000000000..13eccda05 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/monocle.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/monocle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieRing.json b/src/main/resources/assets/botania/models/item/pixieRing.json new file mode 100644 index 000000000..1033fe8bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixieRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/pixieRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/reachRing.json b/src/main/resources/assets/botania/models/item/reachRing.json new file mode 100644 index 000000000..912bf2073 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/reachRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/reachRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/speedUpBelt.json b/src/main/resources/assets/botania/models/item/speedUpBelt.json new file mode 100644 index 000000000..39105b839 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/speedUpBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/speedUpBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superLavaPendant.json b/src/main/resources/assets/botania/models/item/superLavaPendant.json new file mode 100644 index 000000000..2e3f9e1d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/superLavaPendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/superLavaPendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superTravelBelt.json b/src/main/resources/assets/botania/models/item/superTravelBelt.json new file mode 100644 index 000000000..f0c5f2f11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/superTravelBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/superTravelBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swapRing.json b/src/main/resources/assets/botania/models/item/swapRing.json new file mode 100644 index 000000000..003e659aa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/swapRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/swapRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/travelBelt.json b/src/main/resources/assets/botania/models/item/travelBelt.json new file mode 100644 index 000000000..8d5af6d86 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/travelBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/travelBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/unholyCloak.json b/src/main/resources/assets/botania/models/item/unholyCloak.json new file mode 100644 index 000000000..a65a1145d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/unholyCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/unholyCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterRing.json b/src/main/resources/assets/botania/models/item/waterRing.json new file mode 100644 index 000000000..211c95ee8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/waterRing" + } +} \ No newline at end of file From 0c062967a0332a5b59d23e2c4f2e844b426407fc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 21:23:54 -0600 Subject: [PATCH 135/935] Mana Bomb, Mana Detector --- .../client/core/handler/ModelHandler.java | 2 ++ .../assets/botania/blockstates/manaBomb.json | 14 ++++++++++++++ .../botania/blockstates/manaDetector.json | 17 +++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/manaBomb.json create mode 100644 src/main/resources/assets/botania/blockstates/manaDetector.json 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 9fde0cc52..5f4506926 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -338,6 +338,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.corporeaInterceptor); registerItemModel(ModBlocks.corporeaFunnel); registerItemModel(ModBlocks.lightLauncher); + registerItemModel(ModBlocks.manaDetector); + registerItemModel(ModBlocks.manaBomb); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/resources/assets/botania/blockstates/manaBomb.json b/src/main/resources/assets/botania/blockstates/manaBomb.json new file mode 100644 index 000000000..a0b707133 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaBomb.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/manaBomb" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaDetector.json b/src/main/resources/assets/botania/blockstates/manaDetector.json new file mode 100644 index 000000000..af949d40a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaDetector.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block", + "textures": { + "all": "botania:blocks/manaDetector0" + } + }, + "variants": { + "powered": { + "true": { "textures": { "all": "botania:blocks/manaDetector1" } }, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file From 2cc7e133cc5c3f5b73c2e85839abe1590f66adcb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 22:25:08 -0600 Subject: [PATCH 136/935] fluxfield model, fix pump crash, fix gaia render --- .../botania/client/core/handler/ModelHandler.java | 1 + .../client/render/entity/RenderDoppleganger.java | 6 ++++-- .../botania/common/block/mana/BlockPump.java | 5 ++++- .../assets/botania/blockstates/rfGenerator.json | 14 ++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/rfGenerator.json 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 5f4506926..e17e2ef4b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -340,6 +340,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.lightLauncher); registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaBomb); + registerItemModel(ModBlocks.rfGenerator); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index c0d1dc218..fae42a6fe 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -12,8 +12,10 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -61,7 +63,7 @@ public class RenderDoppleganger extends RenderBiped { }; public RenderDoppleganger(RenderManager renderManager) { - super(renderManager, new ModelBiped(0.5F), 0F); + super(renderManager, new ModelPlayer(0.0F, false), 0F); // todo 1.8 was ModelBiped(0.5) } @Override @@ -84,7 +86,7 @@ public class RenderDoppleganger extends RenderBiped { @Override protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { - return Minecraft.getMinecraft().thePlayer.getLocationSkin(); + return DefaultPlayerSkin.getDefaultSkinLegacy(); } } 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 7b552bab6..3be8af538 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -50,11 +50,14 @@ public class BlockPump extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json new file mode 100644 index 000000000..1b7d47b4c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/rfGenerator" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file From 9ee02b55adf85d45b0204e5a1fe1d9fd13da0f82 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 23:37:49 -0600 Subject: [PATCH 137/935] Fix bifrost rod, gateway core and root model --- .../client/core/handler/ModelHandler.java | 2 ++ .../common/item/rod/ItemRainbowRod.java | 13 ++++++----- .../botania/blockstates/alfheimPortal.json | 22 +++++++++++++++++++ .../assets/botania/blockstates/root.json | 13 +++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/alfheimPortal.json create mode 100644 src/main/resources/assets/botania/blockstates/root.json 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 e17e2ef4b..e2047ff57 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -341,6 +341,8 @@ public final class ModelHandler { registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaBomb); registerItemModel(ModBlocks.rfGenerator); + registerItemModel(ModBlocks.alfPortal); + registerItemModel(ModBlocks.root); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 24dc8fd33..674bfcfb7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -55,7 +55,6 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi double x = par3EntityPlayer.posX; double y = par3EntityPlayer.posY; double z = par3EntityPlayer.posZ; - BlockPos playerPos = new BlockPos(par3EntityPlayer); double lx = 0; double ly = -1; @@ -66,15 +65,17 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; + BlockPos playerPos = new BlockPos((int) x, (int) y, (int) z); while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlockState(playerPos).getBlock().isAir(par2World, playerPos) || par2World.getBlockState(playerPos).getBlock() == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) - for(int j = -2; j < 1; j++) - if(par2World.getBlockState(playerPos.add(i, 0, j)).getBlock().isAir(par2World, playerPos.add(i, 0, j)) || par2World.getBlockState(playerPos.add(i, 0, j)).getBlock() == place) { - par2World.setBlockState(playerPos.add(i, 0, j), place.getDefaultState()); - TileBifrost tile = (TileBifrost) par2World.getTileEntity(playerPos.add(i, 0, j)); + for(int j = -2; j < 1; j++) { + BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); + if(par2World.getBlockState(pos_).getBlock().isAir(par2World, pos_) || par2World.getBlockState(pos_).getBlock() == place) { + par2World.setBlockState(pos_, place.getDefaultState()); + TileBifrost tile = (TileBifrost) par2World.getTileEntity(pos_); if(tile != null) { for(int k = 0; k < 4; k++) Botania.proxy.sparkleFX(par2World, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); @@ -82,6 +83,8 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + } + lx = x; ly = y; lz = z; diff --git a/src/main/resources/assets/botania/blockstates/alfheimPortal.json b/src/main/resources/assets/botania/blockstates/alfheimPortal.json new file mode 100644 index 000000000..812637c1b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/alfheimPortal.json @@ -0,0 +1,22 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal0" + }, + "transform": "forge:default-block" + }, + "variants": { + "state": { + "off": {}, + "on_x": { + "textures": { "all": "botania:blocks/alfheimPortal1" } + }, + "on_z": { + "textures": { "all": "botania:blocks/alfheimPortal1" } + } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/root.json b/src/main/resources/assets/botania/blockstates/root.json new file mode 100644 index 000000000..6bced893d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/root.json @@ -0,0 +1,13 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/root" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file From c8d4c54ed7eb42bc5b825845f5b74cd993c7dae5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 23:47:16 -0600 Subject: [PATCH 138/935] Bandaid for one block off multiblock render --- .../botania/client/core/handler/MultiblockRenderHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ab9bc9c88..25376ea50 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -175,7 +176,8 @@ public final class MultiblockRenderHandler { } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); - GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ()); + GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? + GlStateManager.color(1, 1, 1, alpha); brd.renderBlockBrightness(state, 0.5F); // todo 1.8 check brightness } GlStateManager.color(1F, 1F, 1F, 1F); From b3a83031c171cc4f0d772e37ed67f3b910777249 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 31 Dec 2015 12:45:18 -0600 Subject: [PATCH 139/935] Misc rendering fixes --- .../botania/api/item/IBaubleRender.java | 2 +- .../core/handler/BaubleRenderHandler.java | 14 +-- .../handler/ContributorFancinessHandler.java | 86 +++++++++---------- .../client/core/proxy/ClientProxy.java | 9 ++ .../render/tile/RenderTileTinyPotato.java | 58 +++++++------ .../botania/common/item/ItemCraftingHalo.java | 48 ++++++----- 6 files changed, 110 insertions(+), 107 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index b28fb1cfe..176d4e968 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -54,7 +54,7 @@ public interface IBaubleRender { } public static void translateToHeadLevel(EntityPlayer player) { - GlStateManager.translate(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); + GlStateManager.translate(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); } } 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 ab920d928..5d8d04c81 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -67,7 +67,6 @@ public final class BaubleRenderHandler { if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm) ItemTerrasteelHelm.renderOnPlayer(helm, event); - ContributorFancinessHandler.render(event); GlStateManager.popMatrix(); } @@ -126,18 +125,7 @@ public final class BaubleRenderHandler { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// for(int j = 0; j < 2; j++) { -// IIcon icon = item.getIcon(stack, j); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// -// Color color = new Color(item.getColorFromItemStack(stack, 1)); -// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// } + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.popMatrix(); if(renderedOne) 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 b32ae3dd8..ebc977426 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -21,9 +21,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -33,6 +35,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.subtile.signature.SubTileSignature; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; @@ -41,28 +44,34 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.material.ItemManaResource; import net.minecraftforge.fml.common.FMLLog; -public final class ContributorFancinessHandler { +public final class ContributorFancinessHandler implements LayerRenderer { public volatile static Map flowerMap = null; private volatile static boolean startedLoading = false; private static boolean phi = true; - public static void render(RenderPlayerEvent.Specials event) { - String name = event.entityPlayer.getDisplayName().getUnformattedText(); + @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) { + String name = player.getDisplayName().getUnformattedText(); if(name.equals("Vazkii") || name.equals("_phi")) { if(phi) - renderPhiFlower(event); - else renderTwintails(event); + renderPhiFlower(player); + else renderTwintails(player, partialTicks); } else if(name.equals("haighyorkie")) - renderGoldfish(event); + renderGoldfish(player); firstStart(); - + name = name.toLowerCase(); - if(event.entityPlayer.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name)) - renderFlower(event, flowerMap.get(name)); + if(player.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name)) + renderFlower(player, flowerMap.get(name)); + } + + @Override + public boolean shouldCombineTextures() { + return false; } public static void firstStart() { @@ -90,96 +99,85 @@ public final class ContributorFancinessHandler { } } - private static void renderTwintails(RenderPlayerEvent event) { + private static void renderTwintails(EntityPlayer player, float partialTicks) { GlStateManager.pushMatrix(); TextureAtlasSprite icon = RenderEventHandler.INSTANCE.tailIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - Helper.translateToHeadLevel(event.entityPlayer); + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); + //GlStateManager.rotate(90F, 0F, 1F, 0F); todo 1.8 refine + GlStateManager.translate(0, 1.62, 0); float t = 0.13F; GlStateManager.translate(t, -0.5F, -0.1F); - if(event.entityPlayer.motionY < 0) - GlStateManager.rotate((float) event.entityPlayer.motionY * 20F, 1F, 0F, 0F); + if(player.motionY < 0) + GlStateManager.rotate((float) player.motionY * 20F, -1F, 0F, 0F); - float r = -18F + (float) Math.sin((ClientTickHandler.ticksInGame + event.partialRenderTick) * 0.05F) * 2F; + float r = -18F + (float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.05F) * 2F; GlStateManager.rotate(r, 0F, 0F, 1F); float s = 0.9F; GlStateManager.scale(s, s, s); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.rotate(-r, 0F, 0F, 1F); GlStateManager.translate(-t, -0F, 0F); GlStateManager.scale(-1F, 1F, 1F); GlStateManager.translate(t, -0F, 0F); GlStateManager.rotate(r, 0F, 0F, 1F); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } - private static void renderPhiFlower(RenderPlayerEvent event) { + private static void renderPhiFlower(EntityPlayer player) { GlStateManager.pushMatrix(); TextureAtlasSprite icon = RenderEventHandler.INSTANCE.phiFlowerIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - Helper.translateToHeadLevel(event.entityPlayer); + Helper.translateToHeadLevel(player); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, -0.25F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(90F, 0F, 1F, 0F); + // todo 1.8 refine +// GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.scale(0.4F, 0.4F, 0.4F); - GlStateManager.translate(-1.2F, 0.2F, 0.125F); - GlStateManager.rotate(20F, 1F, 0F, 0F); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + GlStateManager.translate(0.70F, -3.5F, 0.125F); +// GlStateManager.rotate(20F, 1F, 0F, 0F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } - private static void renderGoldfish(RenderPlayerEvent event) { + private static void renderGoldfish(EntityPlayer player) { GlStateManager.pushMatrix(); TextureAtlasSprite icon = RenderEventHandler.INSTANCE.goldfishIcon; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - Helper.rotateIfSneaking(event.entityPlayer); - GlStateManager.rotate(90F, 0F, 1F, 0F); + Helper.rotateIfSneaking(player); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.75F, 0.5F, 0F); GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(1.2F, 0.5F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } - private static void renderFlower(RenderPlayerEvent event, ItemStack flower) { + private static void renderFlower(EntityPlayer player, ItemStack flower) { GlStateManager.pushMatrix(); - Helper.translateToHeadLevel(event.entityPlayer); + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.rotate(-90, 1, 0, 0); + GlStateManager.translate(0, 0, 1.22); // todo 1.8 refine ShaderHelper.useShader(ShaderHelper.gold); - Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, event.entityPlayer, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, player, ItemCameraTransforms.TransformType.THIRD_PERSON); ShaderHelper.releaseShader(); GlStateManager.popMatrix(); - -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// GlStateManager.rotate(180F, 0F, 0F, 1F); -// GlStateManager.rotate(90F, 0F, 1F, 0F); -// GlStateManager.scale(0.5F, 0.5F, 0.5F); -// GlStateManager.translate(-0.5F, 0.7F, 0F); -// -// ShaderHelper.useShader(ShaderHelper.gold); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -// ShaderHelper.releaseShader(); -// GlStateManager.popMatrix(); } public static class ThreadContributorListLoader extends Thread { 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 0e80d24e8..5222deff1 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -15,11 +15,13 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Calendar; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; +import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -49,6 +51,7 @@ import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; @@ -333,6 +336,12 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager())); ShaderHelper.initShaders(); + + Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); + RenderPlayer render = skinMap.get("default"); + render.addLayer(new ContributorFancinessHandler()); + render = skinMap.get("slim"); + render.addLayer(new ContributorFancinessHandler()); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 854862092..dbbecc693 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -34,6 +35,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.TinyPotatoRenderEvent; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -133,7 +135,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); ContributorFancinessHandler.firstStart(); - + // todo 1.8 refine all below float scale = 1F / 4F; GlStateManager.translate(0F, 1F, 0F); GlStateManager.scale(scale, scale, scale); @@ -154,12 +156,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(23)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 23), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("kamina")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.1F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(26)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 26), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("haighyorkie")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -170,33 +172,33 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(7)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 7), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("direwolf20")) { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -2.2F, -0.5F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("doctor")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.15F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(25)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 25), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("snoo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); GlStateManager.rotate(20F, 0F, 0F, 1F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(24)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 24), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("charlotte")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(12)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 12), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("greg") || name.equals("gregorioust")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.5F, -0.4F); - //renderIcon(Items.book.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.book, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.5F, 0.5F, 0F); @@ -208,48 +210,50 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(Items.bread.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.bread, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("martysgames") || name.equals("marty")) { GlStateManager.scale(0.7F, 0.7F, 0.7F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.75F, -2.4F, -0.7F); GlStateManager.rotate(10F, 0F, 0F, 1F); - //renderIcon(ItemInfiniteFruit.dasBootIcon); + ItemStack renderStack = new ItemStack(ModItems.infiniteFruit, 1); + renderStack.setStackDisplayName("das boot"); + Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("tromped")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(ModItems.cacophonium.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cacophonium, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("kain vinosec")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -1.5F, -0.4F); - //renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia1, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.translate(0F, 0F, 0.85F); - //renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia2, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("mankrik")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.2F, -0.1F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(31)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 31), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("kurumi")) { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.9F, -2.5F, -1.3F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(17)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 17), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("ichun")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(15)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 15), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.1F, -0.325F); - //renderIcon(Items.painting.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.painting, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("jibril")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(0F, 0.7F, 0F); @@ -272,13 +276,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1F, 0.45F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(8)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 8), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("etho") || name.equals("ethoslab")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - //renderIcon(Items.cookie.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.cookie, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("sethbling")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); @@ -289,15 +293,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1F, -1.1F, -0.1F); - //renderIcon(Items.stick.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.stick, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("kingdaddydmac")) { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -2.5F, 1.075F); - //renderIcon(ModItems.manaRing.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.translate(0F, 0F, -4F); - //renderIcon(ModItems.manaRing.getIconFromDamage(0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.5F, 1.5F, 1.5F); @@ -307,13 +311,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.27F, -0.4F); - //renderIcon(ModItems.cosmetic.getIconFromDamage(27)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 27), ItemCameraTransforms.TransformType.THIRD_PERSON); } else if(name.equals("martyn") || name.equals("inthelittlewood")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.45F, -0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - //renderIcon(Blocks.sapling.getIcon(0, 0)); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Blocks.sapling, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); }else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { ItemStack icon = ContributorFancinessHandler.flowerMap.get(name); if(icon != null) { @@ -321,7 +325,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.5F, -0.5F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - //renderIcon(icon); + Minecraft.getMinecraft().getRenderItem().renderItem(icon, ItemCameraTransforms.TransformType.THIRD_PERSON); ShaderHelper.releaseShader(); } } @@ -396,6 +400,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 0a79ea6ce..6d966b1c5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -13,12 +13,14 @@ package vazkii.botania.common.item; import java.awt.Color; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -40,6 +42,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -60,6 +63,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibObfuscation; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @@ -393,9 +397,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { render(stack, player, event.partialTicks); } + private double getRenderPosX() { // todo 1.8 + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); + } + + private double getRenderPosY() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); + } + + private double getRenderPosZ() { + return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); + } + @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { -/* Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); // todo 1.8.8 Tessellator.renderingWorldRenderer = false; @@ -409,7 +424,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks; double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks; - GlStateManager.translate(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); + GlStateManager.translate(posX - getRenderPosX(), posY - getRenderPosY() + player.getDefaultEyeHeight(), posZ - getRenderPosZ()); float base = getRotationBase(stack); @@ -439,34 +454,21 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { - mc.renderEngine.bindTexture(slotStack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - if(slotStack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(slotStack.getItem()).getRenderType())) { + if(slotStack.getItem() instanceof ItemBlock) { float scale = seg == 0 ? 0.75F : 0.6F; GlStateManager.scale(scale, scale, scale); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); + GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine - RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(slotStack.getItem()), slotStack.getItemDamage(), 1F); + IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItemDamage()); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); } else { GlStateManager.scale(0.75F, 0.75F, 0.75F); - GlStateManager.translate(0F, 0F, 0.5F); GlStateManager.rotate(90F, 0F, 1F, 0F); - int renderPass = 0; - do { - IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass); - if(icon != null) { - Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass)); - GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < slotStack.getItem().getRenderPasses(slotStack.getItemDamage())); + Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } } GlStateManager.popMatrix(); @@ -479,6 +481,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { y0 = -y; } + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if(seg % 2 == 0) GlStateManager.color(0.6F, 0.6F, 0.6F, a); else GlStateManager.color(1F, 1F, 1F, a); @@ -507,7 +512,6 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.popMatrix(); } GlStateManager.popMatrix(); -*/ } @SideOnly(Side.CLIENT) From bd98879d49c552c56691415330dfb5ae49554aca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 31 Dec 2015 13:13:32 -0600 Subject: [PATCH 140/935] Fix piston relays --- src/main/java/vazkii/botania/common/block/BlockPistonRelay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 5cd7daee0..bbb07afc5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -210,7 +210,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(block == Blocks.piston_extension) { IBlockState state = getStateAt(s); boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); - EnumFacing dir = state.getValue(BlockPistonMoving.FACING).getOpposite(); + EnumFacing dir = state.getValue(BlockPistonMoving.FACING); MinecraftServer server = MinecraftServer.getServer(); From c54b85dfd5e5753d9f2ac84e2cbf951c102c59fb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 31 Dec 2015 13:34:09 -0600 Subject: [PATCH 141/935] Cacophonium block model --- .../client/core/handler/ModelHandler.java | 1 + .../botania/blockstates/cacophoniumBlock.json | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/cacophoniumBlock.json 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 e2047ff57..05629b3c3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -343,6 +343,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.alfPortal); registerItemModel(ModBlocks.root); + registerItemModel(ModBlocks.cacophonium); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json new file mode 100644 index 000000000..51790ca4a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/cacophoniumBlock1", + "top": "botania:blocks/cacophoniumBlock0", + "side": "botania:blocks/cacophoniumBlock1" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} \ No newline at end of file From 48cf387682d2d717d0738b81e3346159511b7277 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 31 Dec 2015 14:28:13 -0600 Subject: [PATCH 142/935] Unssuccessful attempt to fix sky renderer leaking state. Mark for release --- .../render/world/SkyblockSkyRenderer.java | 175 +++++++++--------- 1 file changed, 88 insertions(+), 87 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 968f0352f..3b8d2e949 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; @@ -56,7 +57,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon line. We don't have it here int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.disableTexture2D(); Vec3 vec3 = world.getSkyColor(mc.getRenderViewEntity(), partialTicks); float f1 = (float)vec3.xCoord; float f2 = (float)vec3.yCoord; @@ -72,13 +73,13 @@ public class SkyblockSkyRenderer extends IRenderHandler { f3 = Math.max(0F, f3 - insideVoid); Tessellator tessellator1 = Tessellator.getInstance(); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_FOG); - GL11.glColor3f(f1, f2, f3); - GL11.glCallList(glSkyList); - GL11.glDisable(GL11.GL_FOG); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); + GlStateManager.depthMask(false); + GlStateManager.enableFog(); + GlStateManager.color(f1, f2, f3); + GlStateManager.callList(glSkyList); + GlStateManager.disableFog(); + GlStateManager.disableAlpha(); + GlStateManager.enableBlend(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); RenderHelper.disableStandardItemLighting(); float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); @@ -89,12 +90,12 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Sunset if(afloat != null) { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glPushMatrix(); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.pushMatrix(); + GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F); f6 = afloat[0]; f7 = afloat[1]; f8 = afloat[2]; @@ -112,19 +113,19 @@ public class SkyblockSkyRenderer extends IRenderHandler { } tessellator1.draw(); - GL11.glPopMatrix(); - GL11.glShadeModel(GL11.GL_FLAT); + GlStateManager.popMatrix(); + GlStateManager.shadeModel(GL11.GL_FLAT); } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPushMatrix(); + GlStateManager.enableTexture2D(); + GlStateManager.pushMatrix(); f6 = Math.max(0.2F, 1.0F - world.getRainStrength(partialTicks)) * (1F - insideVoid); f7 = 0.0F; f8 = 0.0F; f9 = 0.0F; - GL11.glTranslatef(f7, f8, f9); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(f7, f8, f9); + GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); float celAng = world.getCelestialAngle(partialTicks); float effCelAng = celAng; @@ -137,48 +138,48 @@ public class SkyblockSkyRenderer extends IRenderHandler { float a = Math.max(0.1F, lowA); OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, (a * 4) * (1F - insideVoid)); - GL11.glRotatef(90F, 0.5F, 0.5F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.color(1F, 1F, 1F, (a * 4) * (1F - insideVoid)); + GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F); for(int p = 0; p < planetTextures.length; p++) { mc.renderEngine.bindTexture(planetTextures[p]); drawObject(tessellator1, f10); switch(p) { case 0: - GL11.glRotatef(70F, 1F, 0F, 0F); + GlStateManager.rotate(70F, 1F, 0F, 0F); f10 = 12F; break; case 1: - GL11.glRotatef(120F, 0F, 0F, 1F); + GlStateManager.rotate(120F, 0F, 0F, 1F); f10 = 15F; break; case 2: - GL11.glRotatef(80F, 1F, 0F, 1F); + GlStateManager.rotate(80F, 1F, 0F, 1F); f10 = 25F; break; case 3: - GL11.glRotatef(100F, 0F, 0F, 1F); + GlStateManager.rotate(100F, 0F, 0F, 1F); f10 = 10F; break; case 4: - GL11.glRotatef(-60F, 1F, 0F, 0.5F); + GlStateManager.rotate(-60F, 1F, 0F, 0.5F); f10 = 40F; } } - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); + GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.popMatrix(); // === Rays mc.renderEngine.bindTexture(textureSkybox); f10 = 20F; a = lowA; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); OpenGlHelper.glBlendFunc(770, 1, 1, 0); - GL11.glTranslatef(0F, -1F, 0F); - GL11.glRotatef(220F, 1F, 0F, 0F); - GL11.glColor4f(1F, 1F, 1F, a); + GlStateManager.translate(0F, -1F, 0F); + GlStateManager.rotate(220F, 1F, 0F, 0F); + GlStateManager.color(1F, 1F, 1F, a); int angles = 90; float s = 3F; float m = 1F; @@ -192,7 +193,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { for(int p = 0; p < 3; p++) { float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); - GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); + GlStateManager.rotate((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); tessellator1.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { @@ -219,23 +220,23 @@ public class SkyblockSkyRenderer extends IRenderHandler { switch(p) { case 0: - GL11.glRotatef(20F, 1F, 0F, 0F); - GL11.glColor4f(1F, 0.4F, 0.4F, a); + GlStateManager.rotate(20F, 1F, 0F, 0F); + GlStateManager.color(1F, 0.4F, 0.4F, a); fuzzPer = (Math.PI * 14) / angles; rotSpeed = 0.2F; break; case 1: - GL11.glRotatef(50F, 1F, 0F, 0F); - GL11.glColor4f(0.4F, 1F, 0.7F, a); + GlStateManager.rotate(50F, 1F, 0F, 0F); + GlStateManager.color(0.4F, 1F, 0.7F, a); fuzzPer = (Math.PI * 6) / angles; rotSpeed = 2F; break; } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); // === Rainbow - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); mc.renderEngine.bindTexture(textureRainbow); f10 = 10F; @@ -249,9 +250,9 @@ public class SkyblockSkyRenderer extends IRenderHandler { Random rand = new Random(day * 0xFF); float angle1 = rand.nextFloat() * 360F; float angle2 = rand.nextFloat() * 360F; - GL11.glColor4f(1F, 1F, 1F, effCelAng1 * (1F - insideVoid)); - GL11.glRotatef(angle1, 0F, 1F, 0F); - GL11.glRotatef(angle2, 0F, 0F, 1F); + GlStateManager.color(1F, 1F, 1F, effCelAng1 * (1F - insideVoid)); + GlStateManager.rotate(angle1, 0F, 1F, 0F); + GlStateManager.rotate(angle2, 0F, 0F, 1F); tessellator1.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { @@ -275,14 +276,14 @@ public class SkyblockSkyRenderer extends IRenderHandler { } tessellator1.draw(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); + GlStateManager.color(1F, 1F, 1F, 1F - insideVoid); OpenGlHelper.glBlendFunc(770, 1, 1, 0); // === Sun - GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); f10 = 60.0F; mc.renderEngine.bindTexture(textureSun); drawObject(tessellator1, f10); @@ -307,54 +308,54 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Stars f6 *= Math.max(0.1F, effCelAng * 2); float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); + GlStateManager.pushMatrix(); + GlStateManager.disableTexture2D(); - GL11.glPushMatrix(); - GL11.glRotatef(t * 3, 0F, 1F, 0F); - GL11.glColor4f(1F, 1F, 1F, f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 3, 0F, 1F, 0F); + GlStateManager.color(1F, 1F, 1F, f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(t, 0F, 1F, 0F); - GL11.glColor4f(0.5F, 1F, 1F, f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t, 0F, 1F, 0F); + GlStateManager.color(0.5F, 1F, 1F, f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(t * 2, 0F, 1F, 0F); - GL11.glColor4f(1F, 0.75F, 0.75F, f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 2, 0F, 1F, 0F); + GlStateManager.color(1F, 0.75F, 0.75F, f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(t * 3, 0F, 0F, 1F); - GL11.glColor4f(1F, 1F, 1F, 0.25F * f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 3, 0F, 0F, 1F); + GlStateManager.color(1F, 1F, 1F, 0.25F * f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(t, 0F, 0F, 1F); - GL11.glColor4f(0.5F, 1F, 1F, 0.25F * f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t, 0F, 0F, 1F); + GlStateManager.color(0.5F, 1F, 1F, 0.25F * f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glRotatef(t * 2, 0F, 0F, 1F); - GL11.glColor4f(1F, 0.75F, 0.75F, 0.25F * f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 2, 0F, 0F, 1F); + GlStateManager.color(1F, 0.75F, 0.75F, 0.25F * f6); + GlStateManager.callList(starGLCallList); + GlStateManager.popMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopMatrix(); + GlStateManager.enableTexture2D(); + GlStateManager.popMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_FOG); - GL11.glPopMatrix(); - GL11.glDepthMask(true); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableBlend(); + GlStateManager.enableAlpha(); + GlStateManager.enableFog(); + GlStateManager.popMatrix(); + GlStateManager.depthMask(true); } private void drawObject(Tessellator tess, float f10) { From 906fb74ec09f8fdce2201f1536bb3a8e67673d58 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 1 Jan 2016 15:35:08 -0600 Subject: [PATCH 143/935] Fix santaweave inv icons --- .../client/core/handler/ModelHandler.java | 54 +++++++++++++++++-- .../armor/manaweave/ItemManaweaveArmor.java | 11 ---- 2 files changed, 49 insertions(+), 16 deletions(-) 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 05629b3c3..f15714f19 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -41,6 +41,7 @@ import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -236,6 +237,54 @@ public final class ModelHandler { : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); } }); + + ModelLoader.registerItemVariants(manaweaveBoots, + new ModelResourceLocation("botania:manaweaveBoots", "inventory"), + new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveChest, + new ModelResourceLocation("botania:manaweaveChest", "inventory"), + new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveHelm, + new ModelResourceLocation("botania:manaweaveHelm", "inventory"), + new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveLegs, + new ModelResourceLocation("botania:manaweaveLegs", "inventory"), + new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); + } + }); } private static void registerSubtiles() { @@ -398,11 +447,6 @@ public final class ModelHandler { registerItemModel(elementiumShears); registerItemModel(elementiumSword); - registerItemModel(manaweaveHelm); - registerItemModel(manaweaveChest); - registerItemModel(manaweaveLegs); - registerItemModel(manaweaveBoots); - registerItemModel(terrasteelHelm); registerItemModel(terrasteelHelmRevealing); registerItemModel(terrasteelChest); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 2a19b2930..a48a58c48 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -45,21 +45,10 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return models[slot]; } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); - }*/ - @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } - -// @Override -// public IIcon getIconFromDamage(int dmg) { -// return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); -// } todo 1.8.8 to smartmodel or getModel lookup @Override @SideOnly(Side.CLIENT) From f7e5054bf4a9a64af57d40a622d372160103be69 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 1 Jan 2016 16:05:17 -0600 Subject: [PATCH 144/935] Fix armor rendering - thanks primetoxinz for the find! --- .../model/armor/ModelArmorElementium.java | 19 ++++++++++--------- .../model/armor/ModelArmorManasteel.java | 19 ++++++++++--------- .../model/armor/ModelArmorManaweave.java | 19 ++++++++++--------- .../model/armor/ModelArmorTerrasteel.java | 19 ++++++++++--------- .../armor/manasteel/ItemManasteelArmor.java | 1 + 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 242b67e4c..6719ea833 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -211,21 +211,21 @@ public class ModelArmorElementium extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 0; - body.showModel = slot == 1; - armR.showModel = slot == 1; - armL.showModel = slot == 1; - legR.showModel = slot == 2; - legL.showModel = slot == 2; - bootL.showModel = slot == 3; - bootR.showModel = slot == 3; + helm.showModel = slot == 3; // 1.8: now reversed. Yay mojang. + body.showModel = slot == 2; + armR.showModel = slot == 2; + armL.showModel = slot == 2; + legR.showModel = slot == 1; + legL.showModel = slot == 1; + bootL.showModel = slot == 0; + bootR.showModel = slot == 0; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 2) { + if(slot == 1) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -240,6 +240,7 @@ public class ModelArmorElementium extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; isSneak = living != null ? living.isSneaking() : false; + isChild = living != null ? living.isChild() : false; if(living != null && living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 3f4f44d7b..a914e7d16 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -141,21 +141,21 @@ public class ModelArmorManasteel extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 0; - body.showModel = slot == 1; - armR.showModel = slot == 1; - armL.showModel = slot == 1; - legR.showModel = slot == 2; - legL.showModel = slot == 2; - bootL.showModel = slot == 3; - bootR.showModel = slot == 3; + helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. + body.showModel = slot == 2; + armR.showModel = slot == 2; + armL.showModel = slot == 2; + legR.showModel = slot == 1; + legL.showModel = slot == 1; + bootL.showModel = slot == 0; + bootR.showModel = slot == 0; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 2) { + if(slot == 1) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -170,6 +170,7 @@ public class ModelArmorManasteel extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; isSneak = living != null ? living.isSneaking() : false; + isChild = living != null ? living.isChild() : false; if(living != null && living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 80f18ee5f..d9dd63093 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -141,21 +141,21 @@ public class ModelArmorManaweave extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 0; - body.showModel = slot == 1; - armR.showModel = slot == 1; - armL.showModel = slot == 1; - legR.showModel = slot == 2; - legL.showModel = slot == 2; - bootL.showModel = slot == 3; - bootR.showModel = slot == 3; + helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. + body.showModel = slot == 2; + armR.showModel = slot == 2; + armL.showModel = slot == 2; + legR.showModel = slot == 1; + legL.showModel = slot == 1; + bootL.showModel = slot == 0; + bootR.showModel = slot == 0; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 2) { + if(slot == 1) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -170,6 +170,7 @@ public class ModelArmorManaweave extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; isSneak = living != null ? living.isSneaking() : false; + isChild = living != null ? living.isChild() : false; if(living != null && living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index d61de8129..fe10a5622 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -232,21 +232,21 @@ public class ModelArmorTerrasteel extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 0; - body.showModel = slot == 1; - armr.showModel = slot == 1; - armL.showModel = slot == 1; - legR.showModel = slot == 2; - legL.showModel = slot == 2; - bootL.showModel = slot == 3; - bootR.showModel = slot == 3; + helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. + body.showModel = slot == 2; + armr.showModel = slot == 2; + armL.showModel = slot == 2; + legR.showModel = slot == 1; + legL.showModel = slot == 1; + bootL.showModel = slot == 0; + bootR.showModel = slot == 0; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armr; bipedLeftArm = armL; - if(slot == 2) { + if(slot == 1) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -261,6 +261,7 @@ public class ModelArmorTerrasteel extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; isSneak = living != null ? living.isSneaking() : false; + isChild = living != null ? living.isChild() : false; if(living != null && living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 1e54ba580..28cc5ce41 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -117,6 +117,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { if(ConfigHandler.enableArmorModels) { + armorSlot--; // 1.8: mojang is dumb and made armorSlot 1-4 instead of 0-3. ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); if(model == null) model = provideArmorModelForSlot(itemStack, armorSlot); From 5d80b7d9ce633ab3819dc7d06b7b4c1a1b3973cd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Jan 2016 19:07:52 -0600 Subject: [PATCH 145/935] Fix thaumcraft 5 goggles of revealing integration. closes #14 --- .../java/vazkii/botania/common/crafting/ModCraftingRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 088259672..ccbb259e8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2169,7 +2169,7 @@ public final class ModCraftingRecipes { // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { - Item goggles = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemGoggles")); + Item goggles = Item.itemRegistry.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); From 3eb67e3fea653642560ce9e8f7a448ccb0294673 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Jan 2016 19:43:41 -0600 Subject: [PATCH 146/935] Corporea index and cube item model --- .../client/core/handler/ModelHandler.java | 13 +++++ .../tile/RenderTileCorporeaCrystalCube.java | 15 +++--- .../render/tile/RenderTileCorporeaIndex.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 47 +++++++++++++++++++ .../block/corporea/BlockCorporeaIndex.java | 46 ++++++++++++++++++ .../models/item/corporeaCrystalCube.json | 3 ++ .../botania/models/item/corporeaIndex.json | 3 ++ 7 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/corporeaCrystalCube.json create mode 100644 src/main/resources/assets/botania/models/item/corporeaIndex.json 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 f15714f19..09c6fa04e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -20,6 +20,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; @@ -43,6 +44,7 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -88,6 +90,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.brew.ItemBrewBase; @@ -136,6 +140,7 @@ public final class ModelHandler { /** Normal Items **/ registerStandardItems(); + registerTESRItems(); registerManaResources(); registerRunes(); registerBows(); @@ -563,6 +568,14 @@ public final class ModelHandler { registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } + // Only for models that absolutely can't be converted to JSON. Use VERY sparingly + private static void registerTESRItems() { + registerItemModel(ModBlocks.corporeaCrystalCube); + registerItemModel(ModBlocks.corporeaIndex); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); + } + private static void registerManaResources() { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { 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 1e9841765..91df8ec9a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -42,15 +42,18 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileentity; - if(entity == null) - entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone)); + ItemStack stack = null; + if (cube != null) { + if(entity == null) + entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone)); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE); - ItemStack stack = cube.getRequestTarget(); - entity.setEntityItemStack(stack); + ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE); + stack = cube.getRequestTarget(); + entity.setEntityItemStack(stack); + } double time = ClientTickHandler.ticksInGame + f; - double worldTicks = tileentity.getWorld() == null ? 0 : time; + double worldTicks = tileentity == null || tileentity.getWorld() == null ? 0 : time; Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 3cd31253f..c2618f57b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -32,6 +32,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks, int digProgress) { TileCorporeaIndex index = (TileCorporeaIndex) tile; + move = index != null; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y, z + 0.5); @@ -44,7 +45,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F); GlStateManager.scale(1F / scale, 1F / scale, 1F / scale); - if(index.closeby > 0F) { + if(index != null && index.closeby > 0F) { float starScale = 0.02F; float starRadius = (float) TileCorporeaIndex.RADIUS * index.closeby + (index.closeby == 1F ? 0F : index.hasCloseby ? partticks : -partticks) * 0.2F; double rads = (index.ticksWithCloseby + partticks) * 2 * Math.PI / 180; 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 df317dcc2..6cdce12ab 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -10,15 +10,26 @@ */ package vazkii.botania.common.block.corporea; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -91,4 +102,40 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) + { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + 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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer) + { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); + } + } + } + return true; + } else { + return false; + } + } + } 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 eb0a8e644..e0a1e8b01 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -10,13 +10,23 @@ */ package vazkii.botania.common.block.corporea; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -57,4 +67,40 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return LexiconData.corporeaIndex; } + @Override + public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) + { + float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); + if (d0 > 2.5D) { + 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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer) + { + if (world.getBlockState(pos).getBlock() == this) { + int i = 4; + EntityDiggingFX.Factory factory = new EntityDiggingFX.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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); + } + } + } + return true; + } else { + return false; + } + } + } diff --git a/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json b/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaIndex.json b/src/main/resources/assets/botania/models/item/corporeaIndex.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaIndex.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file From 4e1065855ed7db543a4fd30071c4670ebeab5bc8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Jan 2016 23:21:55 -0600 Subject: [PATCH 147/935] Some formatting cleanups. Add copyleft header to all new classes --- .../api/lexicon/multiblock/Multiblock.java | 1 + .../api/lexicon/multiblock/MultiblockSet.java | 1 + .../component/ColorSwitchingComponent.java | 7 ++----- .../component/MultiblockComponent.java | 1 + .../botania/api/render/SpecialFlowerModel.java | 18 ++++++++++++------ .../botania/api/state/BotaniaStateProps.java | 12 +++++++++--- .../botania/api/state/PropertyString.java | 9 ++++++++- .../api/state/enums/AlfPortalState.java | 9 +++++++++ .../api/state/enums/AltGrassVariant.java | 9 +++++++++ .../botania/api/state/enums/AltarVariant.java | 9 +++++++++ .../api/state/enums/BiomeBrickVariant.java | 9 +++++++++ .../api/state/enums/BiomeStoneVariant.java | 9 +++++++++ .../botania/api/state/enums/CrateVariant.java | 9 +++++++++ .../api/state/enums/CustomBrickVariant.java | 9 +++++++++ .../botania/api/state/enums/DrumVariant.java | 9 +++++++++ .../api/state/enums/EndBrickVariant.java | 9 +++++++++ .../api/state/enums/FutureStoneVariant.java | 9 +++++++++ .../api/state/enums/LivingRockVariant.java | 9 +++++++++ .../api/state/enums/LivingWoodVariant.java | 9 +++++++++ .../api/state/enums/LuminizerVariant.java | 9 +++++++++ .../api/state/enums/PlatformVariant.java | 9 +++++++++ .../botania/api/state/enums/PoolVariant.java | 9 +++++++++ .../api/state/enums/PrismarineVariant.java | 9 +++++++++ .../botania/api/state/enums/PylonVariant.java | 9 +++++++++ .../botania/api/state/enums/QuartzVariant.java | 9 +++++++++ .../api/state/enums/SpreaderVariant.java | 9 +++++++++ .../api/state/enums/StorageVariant.java | 9 +++++++++ .../client/core/handler/ModelHandler.java | 9 +++++++++ .../client/model/FloatingFlowerModel.java | 10 ++++++++++ .../botania/client/model/ModelPylon.java | 1 + 30 files changed, 234 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 94ee3dd3a..38271b2a8 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -185,4 +185,5 @@ public class Multiblock { public MultiblockComponent getComponentForLocation(BlockPos pos) { return locationCache.get(pos); } + } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index b5f967681..100e286cb 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -35,4 +35,5 @@ public class MultiblockSet { public Multiblock getForFacing(EnumFacing facing) { return mbs.get(facing); } + } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 52239a29e..31b437370 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -24,13 +24,10 @@ import vazkii.botania.api.BotaniaAPI; */ public class ColorSwitchingComponent extends MultiblockComponent { - private final PropertyEnum colorProp; + private final PropertyEnum colorProp; - public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) { + public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) { super(relPos, block.getDefaultState()); - if (colorProp.getValueClass() != EnumDyeColor.class) { - throw new IllegalArgumentException("Must be EnumDyeColor"); - } this.colorProp = colorProp; } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 1c2f3e082..a8281c46e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -88,4 +88,5 @@ public class MultiblockComponent { public boolean shouldDoFancyRender() { return doFancyRender; } + } diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index b2b7cdcb4..4b5f1a274 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.render; import com.google.common.base.Function; @@ -111,7 +119,8 @@ public class SpecialFlowerModel implements IModelCustomData { builder.addAll(blockModels.values()); builder.addAll(itemModels.values()); - // Force mini island model to be loaded and baked, for use elsewhere. See + // Force mini island model to be loaded and baked, for use elsewhere. See FloatingFlowerModel + // TODO 1.8.8!!!! IslandType is not in the API, will crash when botania is not present!! Must relocate this elsewhere! for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) { builder.add(new ModelResourceLocation("botania:miniIsland", "variant=" + i.name().toLowerCase(Locale.ROOT))); } @@ -214,6 +223,7 @@ public class SpecialFlowerModel implements IModelCustomData { private void refreshBakedModels() { if (baseModel == null) { + // If not done already, steal all the real baked models and cache them ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); baseModel = getBlockModel(manager, Optional.absent()); @@ -327,9 +337,6 @@ public class SpecialFlowerModel implements IModelCustomData { refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if (ret == null) { - System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - } return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; } @@ -346,14 +353,13 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleItemState(ItemStack stack) { refreshBakedModels(); - //System.out.println("calling smart item"); IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); if (item == null) { - System.out.println("Missing item model, selecting block model"); item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); } return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; } } + } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f9c02ca6c..b6d60778f 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state; import com.google.common.base.Predicate; @@ -11,9 +19,6 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; -import vazkii.botania.common.block.decor.IFloatingFlower; - -import javax.annotation.Nullable; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -163,4 +168,5 @@ public class BotaniaStateProps { public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); private BotaniaStateProps() {} + } diff --git a/src/main/java/vazkii/botania/api/state/PropertyString.java b/src/main/java/vazkii/botania/api/state/PropertyString.java index ed414b7ea..b3a9799f6 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyString.java +++ b/src/main/java/vazkii/botania/api/state/PropertyString.java @@ -1,7 +1,14 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state; import net.minecraftforge.common.property.IUnlistedProperty; -import vazkii.botania.api.subtile.SubTileEntity; public class PropertyString implements IUnlistedProperty { diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 8851a319b..8fefab1b8 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum AlfPortalState implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index f6c547005..5c39e7641 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -16,4 +24,5 @@ public enum AltGrassVariant implements IStringSerializable { public String getName() { return this.name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 329ac2949..4a537727d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -20,4 +28,5 @@ public enum AltarVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java index 7962ab47c..26fd82de6 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum BiomeBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java index 844667aa8..64d535329 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum BiomeStoneVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java index b8e3c1717..1cf832200 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -12,4 +20,5 @@ public enum CrateVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index e8582c8bc..1576e4c73 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum CustomBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java index abf23d24e..56ea59434 100644 --- a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum DrumVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java index a19544117..d11fe84be 100644 --- a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum EndBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java index bf667f908..6856734a9 100644 --- a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum FutureStoneVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java index 47be762c4..51030e40a 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum LivingRockVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java index 561017457..0c84b36e5 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -16,4 +24,5 @@ public enum LivingWoodVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 3b2db192c..08b89d741 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -12,4 +20,5 @@ public enum LuminizerVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java index 67d7b213b..572b22e49 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PlatformVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index 132f17c46..e57d8b373 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum PoolVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java index 95aa0a100..6e37065d7 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PrismarineVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java index ce316c222..ed431c756 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PylonVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java index 0f5d0a0a8..6d3767ec3 100644 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum QuartzVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java index 333c62ae2..fbae11307 100644 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum SpreaderVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java index e1376be3a..23f5efb7c 100644 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum StorageVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } 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 09c6fa04e..331984185 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; @@ -1018,4 +1026,5 @@ public final class ModelHandler { } private ModelHandler() {} + } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 5e62745af..da7c35b62 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.model; import com.google.common.base.Function; @@ -42,6 +50,7 @@ import java.util.List; import java.util.Map; public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { + public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static Table CACHE = HashBasedTable.create(); @@ -222,4 +231,5 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 587184a61..2e42a52a1 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -141,4 +141,5 @@ public class ModelPylon implements IPylonModel { for (BakedQuad bakedquad : quads) LightUtil.renderQuadColor(renderer, bakedquad, color); } + } From 3c102bbc7584e99dc897c73d1b3991f702d73b87 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Jan 2016 23:32:55 -0600 Subject: [PATCH 148/935] Move mc dep ver out of @Mod --- src/main/java/vazkii/botania/common/Botania.java | 2 +- src/main/java/vazkii/botania/common/lib/LibMisc.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 8cb5f366f..d530e089f 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = "[1.8.8,1.8.9]") +@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS) public class Botania { public static boolean gardenOfGlassLoaded = false; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 9fc32d47c..597fdb274 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -20,6 +20,7 @@ public final class LibMisc { public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft"; + public static final String MC_VERSIONS = "[1.8.8,1.8.9]"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; From 0b27d9d0b5586fa78939ab5be7c151e69b6f48b1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 19:29:09 -0600 Subject: [PATCH 149/935] Attempt at json pool model --- .../client/core/handler/ModelHandler.java | 2 + .../common/item/block/ItemBlockPool.java | 20 +++++ .../assets/botania/blockstates/pool.json | 21 +++++ .../assets/botania/models/block/pool.json | 69 ++++++++++++++++ .../botania/models/block/pool_filled.json | 78 ++++++++++++++++++ .../botania/models/block/pool_tinted.json | 69 ++++++++++++++++ .../botania/textures/model/poolCopy.png | Bin 0 -> 2392 bytes 7 files changed, 259 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/pool.json create mode 100644 src/main/resources/assets/botania/models/block/pool.json create mode 100644 src/main/resources/assets/botania/models/block/pool_filled.json create mode 100644 src/main/resources/assets/botania/models/block/pool_tinted.json create mode 100644 src/main/resources/assets/botania/textures/model/poolCopy.png 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 331984185..3a599dff9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -47,6 +47,7 @@ import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; @@ -430,6 +431,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant"); } private static void registerStandardItems() { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 7c399f962..b4951a548 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -10,15 +10,23 @@ */ package vazkii.botania.common.item.block; +import java.awt.*; import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.client.core.handler.ClientTickHandler; public class ItemBlockPool extends ItemBlockWithMetadataAndName { + private final Random rand = new Random(); + public ItemBlockPool(Block par2Block) { super(par2Block); } @@ -30,4 +38,16 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); } + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + time += rand.nextInt(100000); + return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } else { + return 16777215; + } + } + } diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json new file mode 100644 index 000000000..e515b21c9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:pool", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "default": { "textures": { "all": "botania:model/poolCopy" } }, + "diluted": { "textures": { "all": "botania:model/poolCopy" } }, + "creative": { + "model": "botania:pool_filled", + "textures": { "all": "botania:model/poolCopy", "liquid": "botania:blocks/manaWater" } + }, + "fabulous": { + "model": "botania:pool_tinted", + "textures": { "all": "botania:model/poolCopy" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool.json b/src/main/resources/assets/botania/models/block/pool.json new file mode 100644 index 000000000..65ae0a289 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool.json @@ -0,0 +1,69 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "botania:blocks/livingrock0" + }, + "elements": [ + { + "name": "Base", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 1.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } + } + }, + { + "name": "SideSouth", + "from": [ 0.0, 1.0, 15.0 ], + "to": [ 16.0, 8.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ] }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "cullface": "south" }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + } + }, + { + "name": "SideNorth", + "from": [ 0.0, 1.0, 0.0 ], + "to": [ 16.0, 8.0, 1.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "cullface": "north" }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ] }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + } + }, + { + "name": "SideWest", + "from": [ 0.0, 1.0, 1.0 ], + "to": [ 1.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "cullface": "west" }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ] }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + } + }, + { + "name": "SideEast", + "from": [ 15.0, 1.0, 1.0 ], + "to": [ 16.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ] }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "cullface": "east" }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_filled.json b/src/main/resources/assets/botania/models/block/pool_filled.json new file mode 100644 index 000000000..0ea2aafc8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_filled.json @@ -0,0 +1,78 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "botania:blocks/livingrock0" + }, + "elements": [ + { + "name": "Base", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 1.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } + } + }, + { + "name": "SideSouth", + "from": [ 0.0, 1.0, 15.0 ], + "to": [ 16.0, 8.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ] }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "cullface": "south" }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + } + }, + { + "name": "SideNorth", + "from": [ 0.0, 1.0, 0.0 ], + "to": [ 16.0, 8.0, 1.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "cullface": "north" }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ] }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + } + }, + { + "name": "SideWest", + "from": [ 0.0, 1.0, 1.0 ], + "to": [ 1.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "cullface": "west" }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ] }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + } + }, + { + "name": "SideEast", + "from": [ 15.0, 1.0, 1.0 ], + "to": [ 16.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ] }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "cullface": "east" }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + } + }, + { + "name": "Liquid", + "from": [ 1.0, 7.0, 1.0 ], + "to": [ 15.0, 7.0, 15.0 ], + "faces": { + "up": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "down": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_tinted.json b/src/main/resources/assets/botania/models/block/pool_tinted.json new file mode 100644 index 000000000..d08ac9201 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pool_tinted.json @@ -0,0 +1,69 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "botania:blocks/livingrock0" + }, + "elements": [ + { + "name": "Base", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 1.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "tintindex": 0, "cullface": "down" } + } + }, + { + "name": "SideSouth", + "from": [ 0.0, 1.0, 15.0 ], + "to": [ 16.0, 8.0, 16.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0, "cullface": "south" }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } + } + }, + { + "name": "SideNorth", + "from": [ 0.0, 1.0, 0.0 ], + "to": [ 16.0, 8.0, 1.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0, "cullface": "north" }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } + } + }, + { + "name": "SideWest", + "from": [ 0.0, 1.0, 1.0 ], + "to": [ 1.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0, "cullface": "west" }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } + } + }, + { + "name": "SideEast", + "from": [ 15.0, 1.0, 1.0 ], + "to": [ 16.0, 8.0, 15.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0, "cullface": "east" }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/poolCopy.png b/src/main/resources/assets/botania/textures/model/poolCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..9db5bf16bfde617bd14ac3a1a10ee974666b64fd GIT binary patch literal 2392 zcmV-e38(gnP)#g{uw;*d%ZR)DRQ4!idMfA+;NU|<~<@`~bc zNDe1-Pj|mquYwN(_UMDgfG+QIFQ9(kO9cV&{?l!0rUv9)Rpd73)SpPfleDBy67rHvTa=U(!^jjB$tb37B=nw`1y-wu!ZsNFz)U1Y z#W*C=W9o08BaRH;~9R&+yT>>@t1SQ|(o zr;yW2X8$!n430DpSPYfTD6M6Z5>3Yb`HsAh7+ax*U^pG9HW&C1@K%w#9v3}%zQJZ5 zAtcTDHE9|MZN_?2p~Q(eb%;EIQaBI0{RdK1tTp&l(z=0*I%gCCr!Ux+J>4`>;K(lC zAoIwTQdlF<82Wj_C&=sSsgvZ` zdCDxJHvfq0o^ewoYQ-D`Mn^&rwB3=awl5EmvWat9lCKPD7#RA2^=d^Z5|PNE+cQm$ zB5TMC1!*QuC-TfNhlrM%6f$z1XisnXpPM61{f1_{B_xeBicCuUJdsjF6&g7Ta&55M zvTvUeLeWkwB1PsPxPSjwE-&7o&4d7mkj&CymRDbXg_{Dt?HS!j zKTJ&XNJs(i1Ufo~{X3!?8M_mYpYJJc184HGI7J8(A8O^O3Hf&^qFW zf!-zDA+RlKN+W5z4;-Iws5&Sw-e8r+$eL!GF^d6!BF~9Yl7b=^5u0Zum*|IklCJpj z%de=4H4nQZt$XIpMNR)48RnTP&$<2Z3;C)f%QA>FN`j9QE`*l{_`^5<^qbDn-KU!r zt)~CwU&!lg>h(FsJEo@_ye(0gp~-5Z5EvzJI7kYc6iQoixxvo~V-)i|Zy5o*8L|$Kg z!J+T)aYob?k;G=Tq91?r_Fo?0m;d|^3Z0mfCz%2(Gp0D9l|=}snv&d{aXjr9-2lmB zgaxU|n-ww6bjOxg=dbzY{a>hb$(cQn=Ot2>_<4^}k;ji8QP*#fB>J(V3nQ1g!7Ii4 zw{L&H0B!$7QJ0kK4U@?*bx8^nK1OmQ$gCp8nY^$_E%4LGJWt3J(J~Q20O>fKTB_A6 zR&_;t%!o=7{6wZRyvh0EyA{?bnv^Jtf+XN+oY>#|gr9f6Ux4%L4QJ~OE*Xp|Fk;0k==*4Y%7bcx6CvQ9**4(FGrlZ;`MwW zq?TiULzXv~X&}lOtyf5yuti0Ec8!Y@ARvy6y<>2WsyxF~Ij6@xtE!-EUXf*n;6{>E zB$+tu9?7c;Ar(Ct=gcn;@c#B^y6zF1B5Kt@94N99Rckbw%n0hNpgw!ekKg~9d3fOM z%^lB&j;D4c%p;pkK|c5BPSSQelGBKyLaD&)54b5Hl|ss%7+S_5piPbzGuCJ}wc`E9 z8@}EA0YCO!eOY7cnqzxFM~~8$PxrSR?%uKf{s+ck;<7eaoxME3=l4J3rxV|N^&J%F z4EqPlq$rviZ47H$lBR)=4}1LeYc_So#rB+i_Xr*W9Xi$s6*xRU5}d=9IWi{NsRNf| zH1ww(h5nl46Pa)X=h?LrSz(yQ2}I7n|Me|f6L`M&X!nu*

F1u;3g<3!V3aU3LJ z_GDFtmx_P;%fF_ps>E8w{`AcH@)cTXKJIq-!xL4#Vu*rVOH!PvwM1vpVlA*!cRy)vL8Gl?ojobs#=p( zkvR+G0&4A$a}fhZlWh{D0A#%QL#x5mSH}blrdu_`c(^_6Sw5 zy7-Ee99471se8tIPi_mG(U|T7&%*=j>W{b?qV!DOaX37Z+Z;EvzrG}!Gv0r?!R}za zIs3im{yXhmBv+cb8);LZ>m0@yGLd1TC*=Yup!1TxYbmWD7{PIH2h_G@vEFQG>NR(}JF?*c ztu3M~5N^QF6E1r2lGGlk%o#s+z literal 0 HcmV?d00001 From 75ab2102276cf9f550e723ef772af52adbd85ecc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 19:59:27 -0600 Subject: [PATCH 150/935] Item models fully working. TESRs may be changed in future --- .../botania/common/item/block/ItemBlockPool.java | 4 +--- .../assets/botania/blockstates/pool.json | 4 ++-- .../botania/textures/model/dilutedPoolCopy.png | Bin 0 -> 2196 bytes .../botania/textures/model/infinitePoolCopy.png | Bin 0 -> 1942 bytes 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png create mode 100644 src/main/resources/assets/botania/textures/model/infinitePoolCopy.png diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index b4951a548..05e195ea1 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,8 +26,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; public class ItemBlockPool extends ItemBlockWithMetadataAndName { - private final Random rand = new Random(); - public ItemBlockPool(Block par2Block) { super(par2Block); } @@ -43,7 +42,6 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { public int getColorFromItemStack(ItemStack stack, int renderPass) { if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - time += rand.nextInt(100000); return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { return 16777215; diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index e515b21c9..ea7047149 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -7,10 +7,10 @@ "variants": { "variant": { "default": { "textures": { "all": "botania:model/poolCopy" } }, - "diluted": { "textures": { "all": "botania:model/poolCopy" } }, + "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, "creative": { "model": "botania:pool_filled", - "textures": { "all": "botania:model/poolCopy", "liquid": "botania:blocks/manaWater" } + "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } }, "fabulous": { "model": "botania:pool_tinted", diff --git a/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png b/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..7eae61d149292da1d36e9f8d99af6cc323f9d538 GIT binary patch literal 2196 zcma);`#;nD8^=ehKHS`9g-~X=)iU{h9U{iJHp-GiBaN?PxMwLMr!hpDLnxzF&dMom z4x1=Ubvvb4Wh}z%c3O9nVK+-leRux{-|O+X-q%mp`|*BUujlJ=y>mR=PN^#ED1$&C zRjjikPF|1ylfW+d*+`7$%M17_8tVnfgA9abgFt`_*71Z_V%e8_*eJh2jT_H(_|tnP z4SrKE+;4aC68K+CbEeYzEKB7!I9lN7mN!v&M%9%$Ijdd@yB-X~j;Nt!Lt@9Y$f zF_Jl^3ah;{#>-O$KG2YE;o^3I1T`N+iddBn6bMm%`Xa5W0WAul`((!2^}8IM2;?(Xo~E8PosgF!lf8r z{n{#4!2rIEx-6o7^fjo(FCbW!!T!8hjyfV|qXMFc1N;Co=~-XW+s7k%45Nz>*0Kr? zSR(#m;G&MMstxrCZR5T7O@R6;r+cr%lf^q*_)^_MszHIXVLmhiZ<6|P8QXS&+6TZV zyj5@Is=yR?WkJ}Go2W2NMKn-RITD`dgne1m9rRFEq<9-0#1__n(L;c9yn(7^6$w&7 z|JFn9Us;gE_@jn6C>&h4Z0)D(0;H2lP=41+F+(ZiRlCm3S6{lboK{7n;t^;7bzdVB zG}u{vl!k?du}%_sE~B3$vwf>nkX>AkCqShWy2ec)v62TsGSzLMP;Yn3BZu z<&EQ$+UqudB&9)JO@>5Y(xdp(tFcG_yg+?O@$@93Ly!v2PX?0Q)lV7q+SAZiF4>U* z5LvcKtE_yB&Dvl{+j#0GPFnlpZBk5OsXG_ui6;mLcq9(97>}qJR;D^%y<|5Ue6>7I z4iFEYYcscmZ?!GE9;tXWrYQM=MqE0%XQo-*KDfU#ilrQ4vVe7%PJFgXWp zGoF3wJd(GJ*^Cro4P8T!7s8vm>K2zg6!fpT&d8@YUcK-xzOCJCgmbKil+xQn+zMv* zZ~chW6>oi*p>#3p;tJBH>66x`S?wYIm*I7y!RL`2G>0`0}YR z6<+cY<6~&xV#p&~3|-?qX6J#aUlBVa@lm!<$4XCh-%58Yo?F2eI+b+D47o;i*@gjh z9=OV!!n6bg?_v{SPwl;tl02^n{_-uqC^d4@3d!8`Hrk_4y%l$`lsvn;SSuXvmNu(r zBA>!tEg_PbDS!Kf4$bLg2$B&er&~+BVq<2`be2XM$aefiPksstOpDn#;qXnoanu?9 zwfBuR>M)aw?U{kOtFEQo<>5v<`BrV8OFtX9wDR|;=D*+i@k3lf8}O~ePM;rH-Et~{ z5c_>-F<0qVFdHcRHMMPltbkr4i1`XPrE%SX-vcsuSN8BI?E0hc#ZjQ3@x zue4UqsB`n=ydb5oMzV+vQjJEQW5y zu<j7s;I2dg8oKFP`rs_OjwzoKCMa0jnjjJ;b2?g*SVOX z4{w_t$if{k@45hw$W)eXc75NMI%jy=B5`t*P4Q}s_B{10r1&Ofks^)7W zkjHnOPU<;L-_ejD|BRs)4W5N%g5XJ0WwlB;pj)k;ysEDd(A_oP)VStwrJ}x#S2(Et z0_CPbd*kUV{N~}s+g@mpapj&FAdLxT@>|CSs3*S_ zuSsm?WK+pKNl7QhwJSKrWkPM~Iad(VSrWq%%1V<{B|{nvDe`8Xb4sRi;=f}B%}qz{ z*Qe|&#Fa6>U6`2eh>F^ZeHK(0t z{zp__xU#1T_kAnrhWC2g=4X!>tI9cY(0MC)YXhTSWlsY%V>a!lx!lQx)am_)Q`_%B z5&fS%n6|}bi-_RF<`%w0I$jc1!F+{N#Hh(t#M(A&4Q-Xlm`j`Zv+=tuREz=xj%-D< zYlm(7-i^zttE)I=?O zsFIL$QvK8+IPju~n68%YI&=F|D*Y(0`i@b)Wov4pL`VDoj;+e?yUXo9u?4<8-tun- N22@oLv{}*HxAaD{G zV<(QsvOPVLTHVb@vFc`VDUP$rVtRmN!LyRUCRugsoO92m1L(ioX*ne1ETThUxIN&{ zYy9;BO@(~d5^h$MVg2VcSrS z$xdi6ZFhfrLpdhW_m9(pH5Jl#yUE!!)S!Wm}j>#ym#td0SG#B#g#tQl#5L^^%ZIvg#Zj4$BPyg~B3TT_j zO$*{E#{>%bu0<|tqz>fQ4a4mLeX$|jEO8>pG8ltWo)!+6p9C2laeU4)Qhj!btRus= zL60UuZS&+U{kIRurb3p%yabF*Pi^>=0xW;`{GIw}dbL*s+CTq{zgpn0Y5<0xk5RN4K4`b#hT&vK)7Bp+#VQyI^aZzUu?_|?mJK=yjV|x zN;VY~MJ{TS*NJ#%8*RVZ(*EV=$vdXNql%V-ECcby#>}%BtYAUjGGk0~@#78s%X_pP zEZi(SQU^0Xf%IxWJ{QU%G5mCxq||+VcX9#VnE_9sNY-)E{nVnOWddt=0TrXUcG;5O z6V&>-zggnXYX*O`j+4gJS$pJ5YnL!G3n=@Z?(c6XyY95zb3y^a^%DPqY4DekRMr(v z9QloP3t2_-uCu%VcG7VSOeqtt&L~YH-?jFv@tUhV<&bb*ru^{)O_}P`3*@&q@4EcA z`*_zIWgU&mY9S@>I;u}Ez&nQ9gKZ*uYnw$WZEt>YUYiW+%EHyUvNoK?v{wrK%X?%~ z5uU9qou+~lH?c?76=mO}-Fuh?hBu9Bn`ys#P1*Mra(11?;php^RyK^Znf{x5{CPcT z7**TgnCvtabe|c18asjHw=%%mq5ohxwMWf`^4MFuyQq<6u-3Sa`0E93;iudWmMi>u zZABT%lpIegK>zaI=%?T>7q*zC5yQ#YvQ`oQ;hN$-_{+uQ z4JQ|%9251IA0X?>qNW4C2uK}}wViDD^&RoWX8KNmx4|Z-exh#Pj=Had(SF~9v)Gz< z9dR9DJhjpc=tE~_*$(FFUv14#?wlFqwjn$}qvS-{_xPKoeILkbz94Y?(+?`=mC0?} z5I#J^1tD)+hV9W91Jio@m-oiDarz7Z)#sPfBo{tflOJ00T}N(hLx`jL?1JHk!!+A# zZ}iq~7?WXzTLoOPsjWP8$j0;y*ko9H3pOIuUtXQ`A>(}^`0FLwWlFIH%BC7;^kIsy z;rYrWa%HsCWP^%}_KjfJAE`FgTW$B5VcQTFfpQ%1>k2uq=)ZZu1(~|X{{zC)$&_Zm zB?~Ps3T_cBvx^;+4#mC@d53cz?Z?e_#t_7GUz)*YgQwX&+eq!AN6sRp8A#th{tvhO zp9nZ?qp6U`snB07kc-MFU(_bFON*Y`mvOeYZ+QN)9tV|ZdarGoqp0=&=&j8S1@R84 zJ^CKZYsQQjGiJ<~F=NJz88c?gm@#9z>% literal 0 HcmV?d00001 From b10a642297704fe6b95c6470cb126e8c9f0573bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 22:02:02 -0600 Subject: [PATCH 151/935] Brewery recipe support --- build.gradle | 6 ++ .../integration/jei/JEIBotaniaPlugin.java | 63 ++++++++++++++ .../jei/brewery/BreweryRecipeCategory.java | 87 +++++++++++++++++++ .../jei/brewery/BreweryRecipeHandler.java | 34 ++++++++ .../jei/brewery/BreweryRecipeWrapper.java | 58 +++++++++++++ 5 files changed, 248 insertions(+) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java diff --git a/build.gradle b/build.gradle index c307243fb..48540666b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,9 @@ repositories { name = "chickenbones" url = "http://chickenbones.net/maven/" } + maven { + url "http://dvs1.progwml6.com/files/maven" + } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -46,6 +49,7 @@ minecraft { replace 'GRADLE:VERSION', config.version replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. + useDepAts = true } //This here is for SCP @@ -67,6 +71,8 @@ dependencies { //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.8.9:2.13.7.64" + //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" } diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java new file mode 100644 index 000000000..3c7ada357 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -0,0 +1,63 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jan 3, 2016, 2:32:39 AM (GMT)] + */ + +package vazkii.botania.client.integration.jei; + +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; +import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; + +@JEIPlugin +public class JEIBotaniaPlugin implements IModPlugin { + + private IJeiHelpers jeiHelpers; + private IItemRegistry itemRegistry; + + @Override + public boolean isModLoaded() { + return true; + } + + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { + this.jeiHelpers = jeiHelpers; + } + + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) { + this.itemRegistry = itemRegistry; + } + + @Override + public void register(IModRegistry registry) { + registry.addRecipeCategories( + new BreweryRecipeCategory(jeiHelpers.getGuiHelper()) + ); + + registry.addRecipeHandlers( + new BreweryRecipeHandler() + ); + + registry.addRecipes(BotaniaAPI.brewRecipes); + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { + + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java new file mode 100644 index 000000000..5ac5f76ff --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -0,0 +1,87 @@ +package vazkii.botania.client.integration.jei.brewery; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.List; + +public class BreweryRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + + private static final int slotContainerInput = 0; + private static final int slotIngredient1 = 1; + private static final int slotIngredient2 = 2; + private static final int slotIngredient3 = 3; + private static final int slotIngredient4 = 4; + private static final int slotIngredient5 = 5; + private static final int slotIngredient6 = 6; + private static final int slotOutput = 7; + + public BreweryRecipeCategory(IGuiHelper guiHelper) { + ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); + background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + localizedName = StatCollector.translateToLocal("botania.nei.brewery"); + } + + @Nonnull + @Override + public String getUid() { + return "botania.brewery"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) {} + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + recipeLayout.getItemStacks().init(slotContainerInput, true, 39, 41); + recipeLayout.getItemStacks().init(slotIngredient1, true, 64, 6); + recipeLayout.getItemStacks().init(slotIngredient2, true, 80, 6); + recipeLayout.getItemStacks().init(slotIngredient3, true, 96, 6); + recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); + recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); + recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); + recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); // todo coords + + BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + List inputs = wrapper.getInputs(); + for (int i = 0; i < inputs.size(); i++) { + if (i > slotOutput) { + break; + } + if (inputs.get(i) instanceof ItemStack) { + recipeLayout.getItemStacks().set(i, ((ItemStack) inputs.get(i))); + } else if (inputs.get(i) instanceof Collection) { + recipeLayout.getItemStacks().set(i, ((Collection) inputs.get(i))); + } + } + recipeLayout.getItemStacks().set(slotOutput, wrapper.getOutputs().get(0)); + } +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java new file mode 100644 index 000000000..ea218cfa7 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.brewery; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeBrew; + +import javax.annotation.Nonnull; + +public class BreweryRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeBrew.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.brewery"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { + return new BreweryRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeBrew recipe) { + return recipe.getInputs().size() <= 6; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java new file mode 100644 index 000000000..f52973a3a --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -0,0 +1,58 @@ +package vazkii.botania.client.integration.jei.brewery; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; +import java.util.List; + +public class BreweryRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final List output; + + public BreweryRecipeWrapper(RecipeBrew recipeBrew) { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.add(new ItemStack(ModItems.vial)); + for (Object o : recipeBrew.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + + input = builder.build(); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), new ItemStack(ModBlocks.brewery)); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return output; + } + + @Override + public List getFluidInputs() { return ImmutableList.of(); } + + @Override + public List getFluidOutputs() { return ImmutableList.of(); } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} +} From 6cf82eb98d01ec459c608ef21ef0553fde418d91 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 23:43:24 -0600 Subject: [PATCH 152/935] Rudimentary pure daisy integration --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../puredaisy/PureDaisyRecipeCategory.java | 101 ++++++++++++++++++ .../jei/puredaisy/PureDaisyRecipeHandler.java | 34 ++++++ .../jei/puredaisy/PureDaisyRecipeWrapper.java | 69 ++++++++++++ 4 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 3c7ada357..9b7836898 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; +import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { @@ -45,14 +47,17 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { registry.addRecipeCategories( - new BreweryRecipeCategory(jeiHelpers.getGuiHelper()) + new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), + new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( - new BreweryRecipeHandler() + new BreweryRecipeHandler(), + new PureDaisyRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); + registry.addRecipes(BotaniaAPI.pureDaisyRecipes); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java new file mode 100644 index 000000000..153c952da --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -0,0 +1,101 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lib.LibBlockNames; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class PureDaisyRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + private final IDrawableStatic overlay; + + private static final int inputSlot = 0; + private static final int pureDaisySlot = 1; + private static final int outputSlot = 2; + + public PureDaisyRecipeCategory(IGuiHelper guiHelper) { + ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBlank.png"); + background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.pureDaisy"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + overlay.draw(minecraft, 48, 0); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof PureDaisyRecipeWrapper)) + return; + + PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper); + boolean inputFluid = wrapper.getInputs().isEmpty(); + boolean outputFluid = wrapper.getOutputs().isEmpty(); + + + if (inputFluid) { + recipeLayout.getFluidStacks().init(inputSlot, true, 40, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(inputSlot, wrapper.getFluidInputs().get(0)); + } else { + recipeLayout.getItemStacks().init(inputSlot, true, 40, 12); + if (wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(inputSlot, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(inputSlot, ((ItemStack) wrapper.getInputs().get(0))); + } + } + + recipeLayout.getItemStacks().init(pureDaisySlot, true, 72, 12); + recipeLayout.getItemStacks().set(pureDaisySlot, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + + if (outputFluid) { + recipeLayout.getFluidStacks().init(outputSlot, false, 99, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(outputSlot, wrapper.getFluidOutputs().get(0)); + } else { + recipeLayout.getItemStacks().init(outputSlot, false, 99, 12); + if (wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(outputSlot, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(outputSlot, ((ItemStack) wrapper.getOutputs().get(0))); + } + } + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java new file mode 100644 index 000000000..f46820960 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipePureDaisy; + +import javax.annotation.Nonnull; + +public class PureDaisyRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePureDaisy.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.pureDaisy"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { + return new PureDaisyRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java new file mode 100644 index 000000000..9177b2571 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -0,0 +1,69 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipePureDaisy; + +import javax.annotation.Nonnull; +import java.util.List; + +public class PureDaisyRecipeWrapper implements IRecipeWrapper { + + private List inputs = ImmutableList.of(); + private List outputs = ImmutableList.of(); + private List fluidInputs = ImmutableList.of(); + private List fluidOutputs = ImmutableList.of(); + + public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { + if (recipe.getInput() instanceof String) { + inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput()))); + } else if (recipe.getInput() instanceof Block) { + Block b = ((Block) recipe.getInput()); + if (FluidRegistry.lookupFluidForBlock(b) != null) { + fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); + } else { + inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState()))); + } + } + + Block outBlock = recipe.getOutputState().getBlock(); + if (FluidRegistry.lookupFluidForBlock(outBlock) != null) { + fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000)); + } else { + outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState()))); + } + } + + @Override + public List getInputs() { + return inputs; + } + + @Override + public List getOutputs() { + return outputs; + } + + @Override + public List getFluidInputs() { + return fluidInputs; + } + + @Override + public List getFluidOutputs() { + return fluidOutputs; + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} From 12ae7ed3d111dd9618b59e48241a6157720182b0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 10:01:04 -0600 Subject: [PATCH 153/935] Fix thaumcraft integration crashing --- .../java/vazkii/botania/common/crafting/ModBrewRecipes.java | 4 ++-- .../botania/common/crafting/ModManaInfusionRecipes.java | 2 +- .../botania/common/crafting/recipe/HelmRevealingRecipe.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 86333757b..f805f8644 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -71,8 +71,8 @@ public class ModBrewRecipes { } public static void initTC() { - Item resource = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemResource")); - Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft", "ItemBathSalts")); + Item resource = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); + Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "bath_salts")); warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 7f1877a3b..832358cc9 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -75,7 +75,7 @@ public final class ModManaInfusionRecipes { tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.potato), 1337); if(Botania.thaumcraftLoaded) { - Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("Thaumcraft:ItemInkwell")); + Item inkwell = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "scribing_tools")); manaInkwellRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaInkwell), new ItemStack(inkwell), 35000); } 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 c6afe01d0..3cd25b65a 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", "ItemGoggles")); + Item goggles = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "goggles")); if(goggles == null) return false; // NO TC loaded From ad58fb185595b9ef5c3d22b12d4e6d6e6ce866f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 12:18:19 -0600 Subject: [PATCH 154/935] Partial tiny potato --- .../botania/api/state/BotaniaStateProps.java | 3 ++ .../api/state/enums/PotatoVariant.java | 24 ++++++++++ .../client/core/handler/ModelHandler.java | 1 + .../render/tile/RenderTileTinyPotato.java | 42 ++++++++++++------ .../common/block/decor/BlockTinyPotato.java | 29 ++++++++++-- .../botania/blockstates/tinyPotato.json | 34 ++++++++++++++ .../botania/models/block/tiny_potato.json | 20 +++++++++ .../botania/textures/model/tinyPotatoCopy.png | Bin 0 -> 487 bytes .../textures/model/tinyPotatoGrayCopy.png | Bin 0 -> 446 bytes .../model/tinyPotato_halloweenCopy.png | Bin 0 -> 864 bytes 10 files changed, 136 insertions(+), 17 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java create mode 100644 src/main/resources/assets/botania/blockstates/tinyPotato.json create mode 100644 src/main/resources/assets/botania/models/block/tiny_potato.json create mode 100644 src/main/resources/assets/botania/textures/model/tinyPotatoCopy.png create mode 100644 src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png create mode 100644 src/main/resources/assets/botania/textures/model/tinyPotato_halloweenCopy.png diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index b6d60778f..c4b9c604f 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -167,6 +167,9 @@ public class BotaniaStateProps { // BlockStorage public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); + // BlockTinyPotato + public static final PropertyEnum POTATO_VARIANT = PropertyEnum.create("variant", PotatoVariant.class); + private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java b/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java new file mode 100644 index 000000000..ed7ca2536 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java @@ -0,0 +1,24 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PotatoVariant implements IStringSerializable { + DEFAULT, + HALLOWEEN, + GRAYSCALE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} 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 3a599dff9..c43be5c62 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -407,6 +407,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.alfPortal); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.cacophonium); + registerItemModel(ModBlocks.tinyPotato); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index dbbecc693..30230ae41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; @@ -21,10 +22,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; @@ -33,6 +36,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.TinyPotatoRenderEvent; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -62,7 +66,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft mc = Minecraft.getMinecraft(); - mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); String name = potato.name.toLowerCase(); boolean usedShader = false; @@ -88,17 +92,23 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { usedShader = true; } - GlStateManager.translate(0.5F, 1.5F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata(); - float rotY = meta * 90F - 180F; + GlStateManager.translate(0.5F, 0F, 0.5F); + //GlStateManager.scale(1F, -1F, -1F); + EnumFacing facing = potato.getWorld() == null ? EnumFacing.NORTH : potato.getWorld().getBlockState(potato.getPos()).getValue(BotaniaStateProps.CARDINALS); + float rotY = 0; + switch (facing) { + case NORTH: break; + case SOUTH: rotY = 180; break; + case WEST: rotY = 90; break; + case EAST: rotY = 270; break; + } GlStateManager.rotate(rotY, 0F, 1F, 0F); float jump = potato.jumpTicks; if(jump > 0) jump -= var8; - float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; + float up = (float) Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2; GlStateManager.translate(0F, up, 0F); @@ -108,21 +118,27 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { if(name.equals("pahimar")) { GlStateManager.scale(1F, 0.3F, 1F); GlStateManager.translate(0F, 3.5F, 0F); - } else if(name.equals("kyle hyde")) - mc.renderEngine.bindTexture(textureGrayscale); - else if(name.equals("dinnerbone") || name.equals("grumm")) { + } else if(name.equals("kyle hyde")) { + // 1.8: handled using getActualState - mc.renderEngine.bindTexture(textureGrayscale); + } else if(name.equals("dinnerbone") || name.equals("grumm")) { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(0F, -2.625F, 0F); } else if(name.equals("aureylian")) GlStateManager.color(1F, 0.5F, 1F); + IBlockState state = potato.getWorld().getBlockState(potato.getPos()); + state = state.getBlock().getActualState(state, potato.getWorld(), potato.getPos()); + IBakedModel bakedModel = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); boolean render = !(name.equals("mami") || name.equals("soaryn") || name.equals("eloraam") && jump != 0); - if(render) - model.render(); + if(render) { + mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); + //model.render(); + } if(name.equals("kingdaddydmac")) { GlStateManager.translate(0.5F, 0F, 0F); - model.render(); + mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); + //model.render(); } if(usedShader) @@ -338,7 +354,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(-rotZ, 0F, 0F, 1F); GlStateManager.rotate(-rotY, 0F, 1F, 0F); GlStateManager.color(1F, 1F, 1F); - GlStateManager.scale(1F, -1F, -1F); + //GlStateManager.scale(1F, -1F, -1F); MovingObjectPosition pos = mc.objectMouseOver; if(!name.isEmpty() && pos != null && pos.getBlockPos().equals(potato.getPos())) { 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 3f7f9ee5e..61537ab19 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -28,9 +28,14 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PotatoVariant; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -48,17 +53,20 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; setBlockBounds(f, 0, f, 1F - f, f, 1F - f); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) + .withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT) + ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS); + return new BlockState(this, BotaniaStateProps.CARDINALS, BotaniaStateProps.POTATO_VARIANT); } @Override public int getMetaFromState(IBlockState state) { - switch (((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS))) { + switch (state.getValue(BotaniaStateProps.CARDINALS)) { case NORTH: return 0; case WEST: return 3; case EAST: return 1; @@ -82,6 +90,19 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } + @Override + @SideOnly(Side.CLIENT) + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + if (ClientProxy.dootDoot) { + return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.HALLOWEEN); + } else if (world.getTileEntity(pos) instanceof TileTinyPotato) { + if (((TileTinyPotato) world.getTileEntity(pos)).name.toLowerCase().equals("kyle hyde")) { + return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.GRAYSCALE); + } + } + return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT); + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); @@ -145,7 +166,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { @Override public int getRenderType() { - return LibRenderIDs.idTinyPotato; + return 2; } @Override diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json new file mode 100644 index 000000000..66e158d6d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -0,0 +1,34 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:tiny_potato", + "textures": { + "all": "botania:model/tinyPotatoCopy" + }, + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "default": {}, + "halloween": { + "textures": { "all": "botania:model/tinyPotato_halloweenCopy" } + }, + "grayscale": { + "textures": { "all": "botania:model/tinyPotatoGrayCopy" } + } + }, + "facing": { + "north": {}, + "south": {}, + "west": {}, + "east": {} + }, + "inventory": [{ + "transform": { + "firstperson": { + "translation": [ 0, 0.25, 0 ] + } + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/tiny_potato.json b/src/main/resources/assets/botania/models/block/tiny_potato.json new file mode 100644 index 000000000..38c56cb6c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/tiny_potato.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "minecraft:blocks/hardened_clay" + }, + "elements": [ + { + "name": "Po Ta To", + "from": [ 6.0, 0.0, 6.0 ], + "to": [ 10.0, 6.0, 10.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 10.0 ] }, + "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 10.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 10.0 ] }, + "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 10.0 ] }, + "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoCopy.png b/src/main/resources/assets/botania/textures/model/tinyPotatoCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d0dd3c2f883c1e492edd694bbc18d4b77491e6 GIT binary patch literal 487 zcmVc&25JmqCDRPVTU2>x!Ra`iL6Qs%kTp39Kr-+**urHL- z_wW`L$(c#9mUb7GEG-tSqSuL!Lw)FjB24i2`pTyEyvCc)U+6XO=N?2vh#|sx2PuL! zwJ@{U{^S5LM6A!&2q7S)1Uv#y?bB>O2G0%Pyh8{9>-F{}&by=h$pNGYQcBotHb^N! ziX7#~m|a1eTHp}}9UtRQ4q#^6PDjq2@?*@dpcd5Kb7ltfE|020Rr}{!-V+g=bMVfC z9fOEqW>8TSDG-sWo}F`Ong$^T#2B$!tq@~GhyhL0p!1*p-1q+S*WC+0H9zL*;pVG_ z7!bnq!gIo$Gg3-OZ9+}&*>Rt;ODwXz!y#B;|i*vla{tg51`{M`XoDcle{FwJD3K2oh830g9={ph;?EBk` za}W`7&Vznxe#rYG1(a#m2{Tl8L$$r{K8vZ1-s76yn;A+eP*t!D|H*24KQu5zZNIRv du(0s|@(*+9XeXh@YYYGY002ovPDHLkV1f*j<97f6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png b/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..5da02df33be9cb0bb877db36bdd038b299dde93f GIT binary patch literal 446 zcmV;v0YUzWP)&xB>8Ivjd0$Ea5j}PGI8@vF{7k#4Z-g`nt(rDq9a1YapbTkU1#E-C z#)P!7Z?q#4-+%)bcBqr4;b2~9(uR@RRTcI9q{?;TzhC?O>}OlRlAE^&iESS?+<*E^ z*yyFJA5v93*BuIB1|+Bj008AF06;v70RTGG0DvT!9XPi7vTy{r?vO^Veyfu84W#I^L-673c8o7GijO6X@ZRS1nV)SL<2yopYt=2SWY2>I*?-!*n z3rB$K4k=I5YF(7a7o{%?M}X@NX@{2P>5>Cxt1rvSM*uru**{>}i2Qk8N|`D1jK||l znWt*{m5%_A&fiLzeCsKb7^E`3q4%^pk7MJxQ9J?w#Bp3{z4HhdTwG&taXt0Ce|F{C zloLGiobUUYlAhCCqB%nz7g6>qj&uOfY-se)uF%_QK}v}i@6G@iCp>@j@Sl2H`(^b` zBjE7-E1C_nbD@%GHZ+=Avon!WNk}E3l!8(UzVBx~K@cDaf~n`!ep27tX{8-^w)Rr} z$*b;^;aPfH`}63XABNf+ote)&TYCWhhTw4M=2FuZDTII!0#ZsyDM9tTN2y-aUP_7H z@n--)w||nhfAaDWzV9Q7BJA$Jfe-@S{>eaqS|gT)M|)%PP(DwNMrO~P&!f~nuisv8r)}CB9S9+? z+v*}o5*%F&5JeHT*V_og5OEw&>22+o)r)VZM+pGb0<(em-;D%aQ-|7=Rn>cRD$4Jz z$wNhZY3iuzdcF_Hua>m8E_)uYs-7c&JVUExnjhnGcXCzLa|Glc+;!`E7gf`*d;~BI q!!QiPFbu;m48t%C!!Qi9I{XIn4e*Dow_zIq0000 literal 0 HcmV?d00001 From 46c13be6983010fd1a0d491e378c9d8fe92e1435 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 14:09:18 -0600 Subject: [PATCH 155/935] Fix rotations and nameplates for tiny potato --- .../render/tile/RenderTileTinyPotato.java | 24 +++++-------------- .../botania/blockstates/tinyPotato.json | 6 ++--- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 30230ae41..50a74cf1b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -92,18 +92,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { usedShader = true; } - GlStateManager.translate(0.5F, 0F, 0.5F); - //GlStateManager.scale(1F, -1F, -1F); - EnumFacing facing = potato.getWorld() == null ? EnumFacing.NORTH : potato.getWorld().getBlockState(potato.getPos()).getValue(BotaniaStateProps.CARDINALS); - float rotY = 0; - switch (facing) { - case NORTH: break; - case SOUTH: rotY = 180; break; - case WEST: rotY = 90; break; - case EAST: rotY = 270; break; - } - GlStateManager.rotate(rotY, 0F, 1F, 0F); - float jump = potato.jumpTicks; if(jump > 0) jump -= var8; @@ -117,12 +105,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); if(name.equals("pahimar")) { GlStateManager.scale(1F, 0.3F, 1F); - GlStateManager.translate(0F, 3.5F, 0F); + //GlStateManager.translate(0F, 3.5F, 0F); } else if(name.equals("kyle hyde")) { // 1.8: handled using getActualState - mc.renderEngine.bindTexture(textureGrayscale); } else if(name.equals("dinnerbone") || name.equals("grumm")) { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(0F, -2.625F, 0F); + //GlStateManager.translate(0F, -2.625F, 0F); } else if(name.equals("aureylian")) GlStateManager.color(1F, 0.5F, 1F); @@ -132,11 +120,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { boolean render = !(name.equals("mami") || name.equals("soaryn") || name.equals("eloraam") && jump != 0); if(render) { + GlStateManager.rotate(-90, 0, 1, 0); mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); + GlStateManager.rotate(90, 0, 1, 0); //model.render(); } if(name.equals("kingdaddydmac")) { - GlStateManager.translate(0.5F, 0F, 0F); + GlStateManager.translate(-0.5F, 0F, 0F); mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); //model.render(); } @@ -352,14 +342,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, d0, d1, d2, var8)); GlStateManager.rotate(-rotZ, 0F, 0F, 1F); - GlStateManager.rotate(-rotY, 0F, 1F, 0F); GlStateManager.color(1F, 1F, 1F); - //GlStateManager.scale(1F, -1F, -1F); MovingObjectPosition pos = mc.objectMouseOver; if(!name.isEmpty() && pos != null && pos.getBlockPos().equals(potato.getPos())) { GlStateManager.pushMatrix(); - GlStateManager.translate(0F, -0.6F, 0F); + GlStateManager.translate(0.5F, 0.75F, 0.5F); GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index 66e158d6d..6a38bbccd 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -19,9 +19,9 @@ }, "facing": { "north": {}, - "south": {}, - "west": {}, - "east": {} + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 } }, "inventory": [{ "transform": { From ab4f6f6433a29ff5e9a1b626565bb4fd47ce790f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 19:58:54 -0600 Subject: [PATCH 156/935] workaround for pylon enchant power. closes #16 --- src/main/java/vazkii/botania/common/block/BlockPylon.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index d05853cd4..69a4bf812 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -111,7 +111,12 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public float getEnchantPowerBonus(World world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? 8 : 15; + IBlockState state = world.getBlockState(pos); + if (state.getBlock() != this || state.getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA) { + return 8; + } else { + return 15; + } } @Override From 95118696ce875998cf43714b1b04e9efdad58ab8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 20:57:14 -0600 Subject: [PATCH 157/935] Half complete petal apothecary --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../jei/brewery/BreweryRecipeCategory.java | 2 +- .../PetalApothecaryRecipeCategory.java | 85 +++++++++++++++++++ .../PetalApothecaryRecipeHandler.java | 34 ++++++++ .../PetalApothecaryRecipeWrapper.java | 59 +++++++++++++ .../puredaisy/PureDaisyRecipeCategory.java | 3 +- 6 files changed, 187 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 9b7836898..5d3570f17 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; +import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; @@ -48,16 +50,19 @@ public class JEIBotaniaPlugin implements IModPlugin { public void register(IModRegistry registry) { registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), - new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()) + new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), + new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), - new PureDaisyRecipeHandler() + new PureDaisyRecipeHandler(), + new PetalApothecaryRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); + registry.addRecipes(BotaniaAPI.petalRecipes); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 5ac5f76ff..1962cc9d9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -68,7 +68,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); - recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); // todo coords + recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); List inputs = wrapper.getInputs(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java new file mode 100644 index 000000000..c8034cb47 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -0,0 +1,85 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lib.LibBlockNames; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class PetalApothecaryRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + private final IDrawableStatic overlay; + + public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.petals"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + overlay.draw(minecraft, 48, 0); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) + return; + PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); + + recipeLayout.getItemStacks().init(0, true, 0, 0); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); + + int index = 1, pos = 16; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, pos, 0); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + pos += 16; + index += 1; + } + + recipeLayout.getItemStacks().init(index, false, 32, 0); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java new file mode 100644 index 000000000..6c48db83b --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipePetals; + +import javax.annotation.Nonnull; + +public class PetalApothecaryRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePetals.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.petals"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) { + return new PetalApothecaryRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipePetals recipe) { + return recipe.getInputs().size() <= 16; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java new file mode 100644 index 000000000..46c073f93 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -0,0 +1,59 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipePetals; + +import javax.annotation.Nonnull; +import java.util.List; + +public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + + public PetalApothecaryRecipeWrapper(RecipePetals recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 153c952da..660ed89f0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -27,8 +27,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { private static final int outputSlot = 2; public PureDaisyRecipeCategory(IGuiHelper guiHelper) { - ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBlank.png"); - background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + background = guiHelper.createBlankDrawable(168, 64); localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); From 9bf2e0c555eb53c10a91cd0fb274914b1887eaee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 22:34:45 -0600 Subject: [PATCH 158/935] Semi working petal apothecary itnegration --- .../PetalApothecaryRecipeCategory.java | 32 ++++++++++++++----- .../puredaisy/PureDaisyRecipeCategory.java | 5 +++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index c8034cb47..d3ad4298f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -7,6 +7,7 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -15,6 +16,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.awt.*; import java.util.Collection; public class PetalApothecaryRecipeCategory implements IRecipeCategory { @@ -24,10 +26,10 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { private final IDrawableStatic overlay; public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(168, 64); + background = guiHelper.createBlankDrawable(150, 110); localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), - 0, 0, 64, 46); + 0, 0, 150, 110); } @Nonnull @@ -50,7 +52,11 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { @Override public void drawExtras(Minecraft minecraft) { - overlay.draw(minecraft, 48, 0); + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 0, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); } @Override @@ -62,24 +68,34 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return; PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); - recipeLayout.getItemStacks().init(0, true, 0, 0); + recipeLayout.getItemStacks().init(0, true, 64, 52); recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); - int index = 1, pos = 16; + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); + for (Object o : wrapper.getInputs()) { - recipeLayout.getItemStacks().init(index, true, pos, 0); + recipeLayout.getItemStacks().init(index, true, point.x, point.y); if (o instanceof Collection) { recipeLayout.getItemStacks().set(index, ((Collection) o)); } if (o instanceof ItemStack) { recipeLayout.getItemStacks().set(index, ((ItemStack) o)); } - pos += 16; index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); } - recipeLayout.getItemStacks().init(index, false, 32, 0); + recipeLayout.getItemStacks().init(index, false, 103, 17); recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); } + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) - Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 660ed89f0..98787eb96 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -7,6 +7,7 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -53,7 +54,11 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { @Override public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); } @Override From 10d095d6567fdee1abf0743695724edd5e1ec1c7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 22:46:24 -0600 Subject: [PATCH 159/935] Finish pure daisy integration --- .../jei/petalapothecary/PetalApothecaryRecipeCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index d3ad4298f..3c3adb9e0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -94,7 +94,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { private Point rotatePointAbout(Point in, Point about, double degrees) { double rad = degrees * Math.PI / 180.0; double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; - double newY = Math.sin(rad) * (in.x - about.x) - Math.cos(rad) * (in.y - about.y) + about.y; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; return new Point(((int) newX), ((int) newY)); } From 0e301a4e3358fcec9986072e432147f09ede6e62 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 22:47:47 -0600 Subject: [PATCH 160/935] Fix apothecary light level crash, tiny potato render crash. Closes #17 --- .../vazkii/botania/client/render/tile/RenderTileTinyPotato.java | 2 +- src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 50a74cf1b..310ea8a24 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -345,7 +345,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F); MovingObjectPosition pos = mc.objectMouseOver; - if(!name.isEmpty() && pos != null && pos.getBlockPos().equals(potato.getPos())) { + if(!name.isEmpty() && pos != null && potato.getPos().equals(pos.getBlockPos())) { GlStateManager.pushMatrix(); GlStateManager.translate(0.5F, 0.75F, 0.5F); GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index f5f341b18..9e4d19e3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -153,7 +153,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { @Override public int getLightValue(IBlockAccess world, BlockPos pos) { TileAltar tile = (TileAltar) world.getTileEntity(pos); - return tile.hasLava ? 15 : 0; + return (tile != null && tile.hasLava) ? 15 : 0; } @Override From c8c50f9af0daa460eb9e22007f339f02d38e8a33 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 23:29:50 -0600 Subject: [PATCH 161/935] Future is now part 1: conversions recipes to vanilla --- .../common/crafting/ModCraftingRecipes.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ccbb259e8..51702f039 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -29,6 +29,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.logging.log4j.Level; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -323,6 +324,22 @@ public final class ModCraftingRecipes { public static void init() { int recipeListSize = CraftingManager.getInstance().getRecipeList().size(); + // The future is now (botania -> vanilla recipes for future added items and blocks) + addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10)); + + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); + + addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp)); + + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal())); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal())); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal())); + // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); recipeLexicon = BotaniaAPI.getLatestAddedRecipe(); From 86880bfd4934693a4f6543965926536543f2c2e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 00:05:09 -0600 Subject: [PATCH 162/935] Fix helmet of revealing inv model --- .../vazkii/botania/client/core/handler/ModelHandler.java | 2 ++ .../assets/botania/models/item/elementiumHelmReveal.json | 6 ++++++ .../assets/botania/models/item/manasteelHelmReveal.json | 6 ++++++ .../assets/botania/models/item/terrasteelHelmReveal.json | 6 ++++++ 4 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/botania/models/item/elementiumHelmReveal.json create mode 100644 src/main/resources/assets/botania/models/item/manasteelHelmReveal.json create mode 100644 src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json 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 c43be5c62..527585913 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -443,6 +443,7 @@ public final class ModelHandler { registerItemModel(manaCookie); registerItemModel(manasteelHelm); + registerItemModel(manasteelHelmRevealing); registerItemModel(manasteelChest); registerItemModel(manasteelLegs); registerItemModel(manasteelBoots); @@ -453,6 +454,7 @@ public final class ModelHandler { registerItemModel(manasteelShears); registerItemModel(elementiumHelm); + registerItemModel(elementiumHelmRevealing); registerItemModel(elementiumChest); registerItemModel(elementiumLegs); registerItemModel(elementiumBoots); diff --git a/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json b/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json new file mode 100644 index 000000000..d30c83b55 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/elementiumHelmReveal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json new file mode 100644 index 000000000..fcd9996a5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manasteelHelmReveal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json new file mode 100644 index 000000000..8d6750450 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/terrasteelHelmReveal" + } +} \ No newline at end of file From b24585b13dccb437e55c6163fbc199027d37f680 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 12:25:41 -0600 Subject: [PATCH 163/935] Update a bunch of recipes to take vanilla blocks and items. Also remove prismarine lex entry and move infusion recipe to mana pool page. --- .../botania/common/block/ModBlocks.java | 7 ++ .../common/crafting/ModCraftingRecipes.java | 77 ++++++++----------- .../crafting/ModManaAlchemyRecipes.java | 9 ++- .../botania/common/lexicon/LexiconData.java | 8 +- .../resources/assets/botania/lang/en_US.lang | 10 ++- 5 files changed, 53 insertions(+), 58 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 6f201ef2b..4d93341c5 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -397,6 +397,13 @@ public final class ModBlocks { 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); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 51702f039..e3243bf4f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -164,10 +164,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeVineBall; public static IRecipe recipeSlingshot; public static IRecipe recipeMossStone; - public static IRecipe recipePrismarine; - public static IRecipe recipePrismarineBrick; - public static IRecipe recipeDarkPrismarine; - public static IRecipe recipeSeaLamp; public static IRecipe recipeLensInfluence; public static IRecipe recipeLensWeight; public static IRecipe recipeLensPaint; @@ -265,7 +261,6 @@ public final class ModCraftingRecipes { public static List recipesPetalsDouble; public static IRecipe recipeKeepIvy; public static IRecipe recipeBlackHoleTalisman; - public static List recipe18StonePolish; public static List recipe18StoneBrick; public static List recipe18StoneChisel; public static IRecipe recipeBlazeBlock; @@ -1121,34 +1116,6 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(Blocks.mossy_cobblestone), "cobblestone", new ItemStack(ModItems.vineBall)); recipeMossStone = BotaniaAPI.getLatestAddedRecipe(); - // Prismarine Recipe - addOreDictRecipe(new ItemStack(ModBlocks.prismarine, 1, 0), - " S ", "SBS", " S ", - 'S', LibOreDict.PRISMARINE_SHARD, - 'B', "cobblestone"); - recipePrismarine = BotaniaAPI.getLatestAddedRecipe(); - - // Prismarine Brick Recipe - addOreDictRecipe(new ItemStack(ModBlocks.prismarine, 1, 1), - " S ", "SBS", " S ", - 'S', LibOreDict.PRISMARINE_SHARD, - 'B', new ItemStack(Blocks.stonebrick)); - recipePrismarineBrick = BotaniaAPI.getLatestAddedRecipe(); - - // Dark Prismarine Recipe - addOreDictRecipe(new ItemStack(ModBlocks.prismarine, 1, 2), - " S ", "SBS", " S ", - 'S', LibOreDict.PRISMARINE_SHARD, - 'B', new ItemStack(Blocks.nether_brick)); - recipeDarkPrismarine = BotaniaAPI.getLatestAddedRecipe(); - - // Sea Lantern Recipe - addOreDictRecipe(new ItemStack(ModBlocks.seaLamp), - " S ", "SBS", " S ", - 'S', LibOreDict.PRISMARINE_SHARD, - 'B', "glowstone"); - recipeSeaLamp = BotaniaAPI.getLatestAddedRecipe(); - // Influence Lens Recipe addOreDictRecipe(new ItemStack(ModItems.lens, 1, 12), "PRP", "PLP", "PPP", @@ -1262,7 +1229,7 @@ public final class ModCraftingRecipes { "BSB", "PMP", "PEP", 'B', new ItemStack(Items.blaze_rod), 'S', LibOreDict.ELEMENTIUM, - 'P', new ItemStack(ModBlocks.prismarine, 1, 2), + 'P', new ItemStack(Blocks.prismarine, 1, 2), 'M', new ItemStack(ModBlocks.storage), 'E', LibOreDict.ENDER_AIR_BOTTLE); recipeSpawnerClaw = BotaniaAPI.getLatestAddedRecipe(); @@ -1818,15 +1785,9 @@ public final class ModCraftingRecipes { recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); // 1.8 Stone Recipes - recipe18StonePolish = new ArrayList(); recipe18StoneBrick = new ArrayList(); recipe18StoneChisel = new ArrayList(); for(int i = 0; i < 4; i++) { - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 8, i + 4), - "SSS", "S S", "SSS", - 'S', LibOreDict.STONE_18_VARIANTS[i]); - recipe18StonePolish.add(BotaniaAPI.getLatestAddedRecipe()); - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8), "SS", "SS", 'S', LibOreDict.STONE_18_VARIANTS[i]); @@ -2200,6 +2161,9 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab); addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab); addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab); + addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); + addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); + addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); @@ -2217,12 +2181,19 @@ public final class ModCraftingRecipes { addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0); addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0); addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0); + addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0); for(int i = 0; i < 8; i++) addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); - for(int i = 0; i < 4; i++) - addWall(ModFluffBlocks.stone, i, ModFluffBlocks.stoneWall, i); + + addWall(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneWall, 0); // Andesite todo 1.8 convert to OreDict? + addWall(Blocks.stone, 5, ModFluffBlocks.stoneWall, 0); + addWall(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneWall, 1); // Basalt + addWall(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneWall, 2); // Diorite + addWall(Blocks.stone, 3, ModFluffBlocks.stoneWall, 2); // Diorite + addWall(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneWall, 3); // Granite + addWall(Blocks.stone, 1, ModFluffBlocks.stoneWall, 3); // Granite // Pane Recipes addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane); @@ -2239,11 +2210,23 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); } - // 1.8 Block Stone Stairs & Slabs - for(int i = 0; i < 4; i++) { - addStairsAndSlabs(ModFluffBlocks.stone, i, ModFluffBlocks.stoneStairs[i], ModFluffBlocks.stoneSlabs[i]); - addStairsAndSlabs(ModFluffBlocks.stone, i + 8, ModFluffBlocks.stoneStairs[i + 4], ModFluffBlocks.stoneSlabs[i + 4]); - } + // Andesite Basalt Diorite Granite Stair/Slab todo 1.8 convert to oredict? + addStairsAndSlabs(ModFluffBlocks.stone, 0, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); + addStairsAndSlabs(Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); + + addStairsAndSlabs(ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]); + + addStairsAndSlabs(ModFluffBlocks.stone, 2, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); + addStairsAndSlabs(Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); + + addStairsAndSlabs(ModFluffBlocks.stone, 3, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); + addStairsAndSlabs(Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); + + // Andesite Basalt Diorite Granite Bricks Stair/Slab + addStairsAndSlabs(ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]); + addStairsAndSlabs(ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]); + addStairsAndSlabs(ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]); + addStairsAndSlabs(ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]); // Pavement Stairsm & Stairs for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index efe392ab1..5fb553fc4 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -129,13 +129,14 @@ public final class ModManaAlchemyRecipes { coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt), 120); - prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), 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(ModFluffBlocks.stone), "stone", 200)); - for(int i = 0; i < 4; i++) - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), new ItemStack(ModFluffBlocks.stone, 1, i == 0 ? 3 : i - 1), 200)); + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite todo 1.8.8 might want to un-OD this? + 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(); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7983815f9..cdec44edd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -373,7 +373,7 @@ public final class LexiconData { spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader), new PageText("10")); pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); - pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPowderRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool)); + pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPowderRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.prismarineRecipe)).setIcon(new ItemStack(ModBlocks.pool)); sparks = new BLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesSpark)); @@ -1045,8 +1045,8 @@ public final class LexiconData { shinyFlowers = new BLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); - prismarine = new BLexiconEntry(LibLexicon.MISC_PRISMARINE, categoryMisc); - prismarine.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrismarine), new PageCraftingRecipe("4", ModCraftingRecipes.recipePrismarineBrick), new PageCraftingRecipe("5", ModCraftingRecipes.recipeDarkPrismarine), new PageCraftingRecipe("6", ModCraftingRecipes.recipeSeaLamp)); + //prismarine = new BLexiconEntry(LibLexicon.MISC_PRISMARINE, categoryMisc); + //prismarine.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrismarine), new PageCraftingRecipe("4", ModCraftingRecipes.recipePrismarineBrick), new PageCraftingRecipe("5", ModCraftingRecipes.recipeDarkPrismarine), new PageCraftingRecipe("6", ModCraftingRecipes.recipeSeaLamp)); tinyPotato = new BLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); @@ -1071,7 +1071,7 @@ public final class LexiconData { if(ConfigHandler.stones18Enabled) { stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); - stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StonePolish), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("4", ModCraftingRecipes.recipe18StoneChisel)); + stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StoneBrick), new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneChisel)); } blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 78d0818e9..67e9ca043 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2145,6 +2145,7 @@ botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. botania.page.pool12=Infusing &1String&0 botania.page.pool13=Used &1Mana Infused String&0 to make &1Cobwebs&0 botania.page.pool7=A total space biscuit +botania.page.pool15=Creating &1Prismarine Shards&0 # -- SPARKS botania.entry.sparks=Sparks @@ -3802,9 +3803,12 @@ botania.entry.stoneAlchemy=Stone Alchemy botania.tagline.stoneAlchemy=Create new stone types botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cyle.
Similarly to &1Prismarine&0, some scholars admit that this technique came from the future. Stairs and slabs can be made from the rough and brick variants of these. botania.page.stoneAlchemy1=Creating the stones -botania.page.stoneAlchemy2=Polish -botania.page.stoneAlchemy3=Brickage -botania.page.stoneAlchemy4=Chiseling +botania.page.stoneAlchemy2=Brickage +botania.page.stoneAlchemy3=Chiseling + +#botania.page.stoneAlchemy2=Polish +#botania.page.stoneAlchemy3=Brickage +#botania.page.stoneAlchemy4=Chiseling # -- BLAZE LIGHT botania.entry.blazeBlock=Blaze Light From 28249d1e33c03e804ba7c256df7f7d9aee6919d0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 15:36:10 -0600 Subject: [PATCH 164/935] Elven trade integration --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../elventrade/ElvenTradeRecipeCategory.java | 104 ++++++++++++++++++ .../elventrade/ElvenTradeRecipeHandler.java | 34 ++++++ .../elventrade/ElvenTradeRecipeWrapper.java | 59 ++++++++++ 4 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 5d3570f17..b33f20d29 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; +import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; @@ -51,18 +53,21 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), - new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()) + new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), + new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), new PureDaisyRecipeHandler(), - new PetalApothecaryRecipeHandler() + new PetalApothecaryRecipeHandler(), + new ElvenTradeRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); registry.addRecipes(BotaniaAPI.petalRecipes); + registry.addRecipes(BotaniaAPI.elvenTradeRecipes); } @Override 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 new file mode 100644 index 000000000..0d21846d9 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -0,0 +1,104 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class ElvenTradeRecipeCategory implements IRecipeCategory { + + private final String localizedName; + private final IDrawable background; + private final IDrawable overlay; + + public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { + localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade"); + background = guiHelper.createBlankDrawable(145, 95); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); + } + + @Nonnull + @Override + public String getUid() { + return "botania.elvenTrade"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 0, 4); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) { + minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + TextureAtlasSprite sprite = RenderEventHandler.INSTANCE.alfPortalTex; + Tessellator tess = Tessellator.getInstance(); + WorldRenderer wr = tess.getWorldRenderer(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + int startX = 22; + int startY = 25; + int stopX = 70; + int stopY = 73; + wr.pos(startX, startY, 0).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); + wr.pos(startX, stopY, 0).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, stopY, 0).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, startY, 0).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + tess.draw(); + } + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) + return; + ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper); + + int index = 0, posX = 42; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, posX, 0); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index++; + posX += 18; + } + + recipeLayout.getItemStacks().init(index, false, 93, 41); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java new file mode 100644 index 000000000..bee3e2f28 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeElvenTrade; + +import javax.annotation.Nonnull; + +public class ElvenTradeRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeElvenTrade.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.elvenTrade"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { + return new ElvenTradeRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java new file mode 100644 index 000000000..515124afb --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -0,0 +1,59 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeElvenTrade; + +import javax.annotation.Nonnull; +import java.util.List; + +public class ElvenTradeRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + + public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} From 8e6dc7c637832afe73ec6e5e413279b435027f7f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 16:51:03 -0600 Subject: [PATCH 165/935] JEI integration complete (runic altar, mana infusion) --- .../integration/jei/JEIBotaniaPlugin.java | 18 +++- .../jei/brewery/BreweryRecipeCategory.java | 43 ++++---- .../jei/brewery/BreweryRecipeWrapper.java | 6 +- .../elventrade/ElvenTradeRecipeCategory.java | 1 - .../jei/manapool/ManaPoolRecipeCategory.java | 97 ++++++++++++++++++ .../jei/manapool/ManaPoolRecipeHandler.java | 34 +++++++ .../jei/manapool/ManaPoolRecipeWrapper.java | 74 ++++++++++++++ .../PetalApothecaryRecipeCategory.java | 2 +- .../puredaisy/PureDaisyRecipeCategory.java | 32 +++--- .../runicaltar/RunicAltarRecipeCategory.java | 98 +++++++++++++++++++ .../runicaltar/RunicAltarRecipeHandler.java | 34 +++++++ .../runicaltar/RunicAltarRecipeWrapper.java | 68 +++++++++++++ 12 files changed, 460 insertions(+), 47 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index b33f20d29..d80c81802 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -22,10 +22,14 @@ import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler; +import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeCategory; +import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeHandler; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; +import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory; +import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { @@ -54,25 +58,29 @@ public class JEIBotaniaPlugin implements IModPlugin { new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), - new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()) + new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), + new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), + new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), new PureDaisyRecipeHandler(), new PetalApothecaryRecipeHandler(), - new ElvenTradeRecipeHandler() + new ElvenTradeRecipeHandler(), + new RunicAltarRecipeHandler(), + new ManaPoolRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); registry.addRecipes(BotaniaAPI.petalRecipes); registry.addRecipes(BotaniaAPI.elvenTradeRecipes); + registry.addRecipes(BotaniaAPI.runeAltarRecipes); + registry.addRecipes(BotaniaAPI.manaInfusionRecipes); } @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { - - } + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {} } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 1962cc9d9..32ae594d0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -61,27 +61,32 @@ public class BreweryRecipeCategory implements IRecipeCategory { @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - recipeLayout.getItemStacks().init(slotContainerInput, true, 39, 41); - recipeLayout.getItemStacks().init(slotIngredient1, true, 64, 6); - recipeLayout.getItemStacks().init(slotIngredient2, true, 80, 6); - recipeLayout.getItemStacks().init(slotIngredient3, true, 96, 6); - recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); - recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); - recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); - recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); - + if (!(recipeWrapper instanceof BreweryRecipeWrapper)) + return; BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + List inputs = wrapper.getInputs(); - for (int i = 0; i < inputs.size(); i++) { - if (i > slotOutput) { - break; - } - if (inputs.get(i) instanceof ItemStack) { - recipeLayout.getItemStacks().set(i, ((ItemStack) inputs.get(i))); - } else if (inputs.get(i) instanceof Collection) { - recipeLayout.getItemStacks().set(i, ((Collection) inputs.get(i))); - } + + recipeLayout.getItemStacks().init(0, true, 39, 41); + if (inputs.get(0) instanceof ItemStack) { + recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0))); + } else { + recipeLayout.getItemStacks().set(0, ((Collection) inputs.get(0))); } - recipeLayout.getItemStacks().set(slotOutput, wrapper.getOutputs().get(0)); + + int index = 1, posX = 60; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, posX, 6); + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } else if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + index++; + posX += 18; + } + + recipeLayout.getItemStacks().init(7, false, 87, 41); + recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index f52973a3a..65735e071 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -16,7 +16,7 @@ import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; - private final List output; + private final ItemStack output; public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); @@ -31,7 +31,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } input = builder.build(); - output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), new ItemStack(ModBlocks.brewery)); + output = recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(); } @Override @@ -41,7 +41,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return output; + return ImmutableList.of(output); } @Override 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 0d21846d9..e38ea88cd 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 @@ -17,7 +17,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.RenderEventHandler; -import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; import java.util.Collection; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java new file mode 100644 index 000000000..b63a3b0c4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -0,0 +1,97 @@ +package vazkii.botania.client.integration.jei.manapool; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class ManaPoolRecipeCategory implements IRecipeCategory { + + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; + + public ManaPoolRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.manaPool"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.manaPool"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof ManaPoolRecipeWrapper)) + return; + + ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper); + int index = 0; + + recipeLayout.getItemStacks().init(index, true, 40, 12); + if (wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0))); + } + + index++; + + if (wrapper.getInputs().size() > 1) { + // Has catalyst + recipeLayout.getItemStacks().init(index, true, 20, 12); + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1))); + index++; + } + + recipeLayout.getItemStacks().init(index, true, 70, 12); + recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0)); + index++; + + recipeLayout.getItemStacks().init(index, false, 99, 12); + if (wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0))); + } + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java new file mode 100644 index 000000000..bf591050a --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.manapool; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeManaInfusion; + +import javax.annotation.Nonnull; + +public class ManaPoolRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeManaInfusion.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.manaPool"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { + return new ManaPoolRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) { + return recipe.getManaToConsume() <= 100000; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java new file mode 100644 index 000000000..dad031503 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -0,0 +1,74 @@ +package vazkii.botania.client.integration.jei.manapool; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.mana.TilePool; + +import javax.annotation.Nonnull; +import java.util.List; + +public class ManaPoolRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + private final int mana; + + public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + + if (recipe.getInput() instanceof ItemStack) { + builder.add(recipe.getInput()); + } else if (recipe.getInput() instanceof String) { + builder.add(OreDictionary.getOres(((String) recipe.getInput()))); + } + + if (recipe.isAlchemy()) { + builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); + } else if (recipe.isConjuration()) { + builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); + } + + input = builder.build(); + output = recipe.getOutput(); + mana = recipe.getManaToConsume(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 3c3adb9e0..135d95636 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -54,7 +54,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public void drawExtras(Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); - overlay.draw(minecraft, 0, 0); + overlay.draw(minecraft); GlStateManager.disableBlend(); GlStateManager.disableAlpha(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 98787eb96..94bb346cd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -19,13 +19,9 @@ import java.util.Collection; public class PureDaisyRecipeCategory implements IRecipeCategory { - private final IDrawableStatic background; + private final IDrawable background; private final String localizedName; - private final IDrawableStatic overlay; - - private static final int inputSlot = 0; - private static final int pureDaisySlot = 1; - private static final int outputSlot = 2; + private final IDrawable overlay; public PureDaisyRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); @@ -75,29 +71,29 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { if (inputFluid) { - recipeLayout.getFluidStacks().init(inputSlot, true, 40, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(inputSlot, wrapper.getFluidInputs().get(0)); + recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0)); } else { - recipeLayout.getItemStacks().init(inputSlot, true, 40, 12); + recipeLayout.getItemStacks().init(0, true, 40, 12); if (wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(inputSlot, ((Collection) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, ((Collection) wrapper.getInputs().get(0))); } else { - recipeLayout.getItemStacks().set(inputSlot, ((ItemStack) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0))); } } - recipeLayout.getItemStacks().init(pureDaisySlot, true, 72, 12); - recipeLayout.getItemStacks().set(pureDaisySlot, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + recipeLayout.getItemStacks().init(1, true, 70, 12); + recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); if (outputFluid) { - recipeLayout.getFluidStacks().init(outputSlot, false, 99, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(outputSlot, wrapper.getFluidOutputs().get(0)); + recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0)); } else { - recipeLayout.getItemStacks().init(outputSlot, false, 99, 12); + recipeLayout.getItemStacks().init(2, false, 99, 12); if (wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(outputSlot, ((Collection) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, ((Collection) wrapper.getOutputs().get(0))); } else { - recipeLayout.getItemStacks().set(outputSlot, ((ItemStack) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0))); } } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java new file mode 100644 index 000000000..c1b757012 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -0,0 +1,98 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.awt.*; +import java.util.Collection; + +public class RunicAltarRecipeCategory implements IRecipeCategory { + + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; + + public RunicAltarRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(150, 110); + localizedName = StatCollector.translateToLocal("botania.nei.runicAltar"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 150, 110); + } + + @Nonnull + @Override + public String getUid() { + return "botania.runicAltar"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof RunicAltarRecipeWrapper)) + return; + RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper); + + recipeLayout.getItemStacks().init(0, true, 64, 52); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); + + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); + + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, point.x, point.y); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); + } + + recipeLayout.getItemStacks().init(index, false, 103, 17); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java new file mode 100644 index 000000000..4b83897e6 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeRuneAltar; + +import javax.annotation.Nonnull; + +public class RunicAltarRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeRuneAltar.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.runicAltar"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { + return new RunicAltarRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) { + return recipe.getInputs().size() <= 16; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java new file mode 100644 index 000000000..8f056c9b4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -0,0 +1,68 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.common.block.tile.mana.TilePool; + +import javax.annotation.Nonnull; +import java.util.List; + +public class RunicAltarRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + private final int manaUsage; + + public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + manaUsage = recipe.getManaUsage(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} From b976ed5df152cef0f9996d8b47b7d5c9859c622b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 17:01:46 -0600 Subject: [PATCH 166/935] Cleanup JEI integration, add copyleft. --- .../integration/jei/JEIBotaniaPlugin.java | 8 +------- .../jei/brewery/BreweryRecipeCategory.java | 18 +++++++++--------- .../jei/brewery/BreweryRecipeHandler.java | 8 ++++++++ .../jei/brewery/BreweryRecipeWrapper.java | 9 +++++++++ .../elventrade/ElvenTradeRecipeCategory.java | 8 ++++++++ .../elventrade/ElvenTradeRecipeHandler.java | 8 ++++++++ .../elventrade/ElvenTradeRecipeWrapper.java | 8 ++++++++ .../jei/manapool/ManaPoolRecipeCategory.java | 8 ++++++++ .../jei/manapool/ManaPoolRecipeHandler.java | 8 ++++++++ .../jei/manapool/ManaPoolRecipeWrapper.java | 8 ++++++++ .../PetalApothecaryRecipeCategory.java | 8 ++++++++ .../PetalApothecaryRecipeHandler.java | 8 ++++++++ .../PetalApothecaryRecipeWrapper.java | 8 ++++++++ .../jei/puredaisy/PureDaisyRecipeCategory.java | 8 ++++++++ .../jei/puredaisy/PureDaisyRecipeHandler.java | 8 ++++++++ .../jei/puredaisy/PureDaisyRecipeWrapper.java | 8 ++++++++ .../runicaltar/RunicAltarRecipeCategory.java | 8 ++++++++ .../runicaltar/RunicAltarRecipeHandler.java | 8 ++++++++ .../runicaltar/RunicAltarRecipeWrapper.java | 8 ++++++++ 19 files changed, 147 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index d80c81802..c9036d989 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -5,10 +5,7 @@ * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 3, 2016, 2:32:39 AM (GMT)] */ - package vazkii.botania.client.integration.jei; import mezz.jei.api.IItemRegistry; @@ -35,7 +32,6 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; public class JEIBotaniaPlugin implements IModPlugin { private IJeiHelpers jeiHelpers; - private IItemRegistry itemRegistry; @Override public boolean isModLoaded() { @@ -48,9 +44,7 @@ public class JEIBotaniaPlugin implements IModPlugin { } @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) { - this.itemRegistry = itemRegistry; - } + public void onItemRegistryAvailable(IItemRegistry itemRegistry) {} @Override public void register(IModRegistry registry) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 32ae594d0..607394f58 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.brewery; import mezz.jei.api.IGuiHelper; @@ -20,15 +28,6 @@ public class BreweryRecipeCategory implements IRecipeCategory { private final IDrawableStatic background; private final String localizedName; - private static final int slotContainerInput = 0; - private static final int slotIngredient1 = 1; - private static final int slotIngredient2 = 2; - private static final int slotIngredient3 = 3; - private static final int slotIngredient4 = 4; - private static final int slotIngredient5 = 5; - private static final int slotIngredient6 = 6; - private static final int slotOutput = 7; - public BreweryRecipeCategory(IGuiHelper guiHelper) { ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); @@ -89,4 +88,5 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(7, false, 87, 41); recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0)); } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index ea218cfa7..275cdbccd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.brewery; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 65735e071..d9bb0464e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.brewery; import com.google.common.collect.ImmutableList; @@ -55,4 +63,5 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @Override public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + } 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 e38ea88cd..fe85ab7a2 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 @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.elventrade; import mezz.jei.api.IGuiHelper; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index bee3e2f28..fdf313f76 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.elventrade; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 515124afb..7e0e42572 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.elventrade; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index b63a3b0c4..510ad9691 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.manapool; import mezz.jei.api.IGuiHelper; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index bf591050a..c20595b00 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.manapool; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index dad031503..ad6bc4d92 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.manapool; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 135d95636..1525d35cc 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.petalapothecary; import mezz.jei.api.IGuiHelper; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 6c48db83b..365e81ff2 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.petalapothecary; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 46c073f93..2db1ab24c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.petalapothecary; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 94bb346cd..84012a2c2 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.puredaisy; import mezz.jei.api.IGuiHelper; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java index f46820960..5d5ada961 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.puredaisy; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 9177b2571..311722c28 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.puredaisy; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index c1b757012..3a4a3937f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.runicaltar; import mezz.jei.api.IGuiHelper; diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 4b83897e6..7dbd831b9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.runicaltar; import mezz.jei.api.recipe.IRecipeHandler; diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 8f056c9b4..c30dce006 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.integration.jei.runicaltar; import com.google.common.collect.ImmutableList; From 52cf3df27ef3c8a9ee1ed8fece375f7c3faca241 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 17:15:22 -0600 Subject: [PATCH 167/935] Fix tessellator bugs, fix alf portal crash --- .../client/core/handler/LightningHandler.java | 24 +++++++++---------- .../java/vazkii/botania/client/fx/FXWisp.java | 2 +- .../render/tile/RenderTileLightRelay.java | 11 ++++----- .../common/block/tile/TileAlfPortal.java | 5 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 7b7a6301d..884cdf873 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -150,27 +150,27 @@ public class LightningHandler { int b = (color & 0xFF); int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); if(rendersegment.next == null) { Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); } if(rendersegment.prev == null) { Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); } } } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 3ce589f8b..064b568ce 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -93,7 +93,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GlStateManager.disableDepth(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index f6ac769ef..f2d146c0d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -87,13 +87,12 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - //p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); //p_77026_1_.getWorldRenderer().setBrightness(240); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).endVertex(); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0, 1, 0).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0, 1, 0).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0, 1, 0).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0, 1, 0).endVertex(); p_77026_1_.draw(); } 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 679b7c46e..bc2a39737 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -124,11 +124,12 @@ public class TileAlfPortal extends TileMod implements ITickable { @Override public void update() { - AlfPortalState state = ((AlfPortalState) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE)); - if(state == AlfPortalState.OFF) { + IBlockState iBlockState = worldObj.getBlockState(getPos()); + if(iBlockState.getBlock() != ModBlocks.alfPortal || iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { ticksOpen = 0; return; } + AlfPortalState state = iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE); AlfPortalState newState = getValidState(); if(!hasUnloadedParts) { From 5797d18d9bef4124496d74f06abe2859f259028c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 19:24:30 -0600 Subject: [PATCH 168/935] Fix a bunch of coloring mistakes. Fix flower particles because I'm dumb --- .../vazkii/botania/client/core/proxy/ClientProxy.java | 2 +- .../vazkii/botania/common/block/BlockModDoubleFlower.java | 2 +- .../java/vazkii/botania/common/block/BlockModFlower.java | 4 ++-- .../botania/common/block/decor/BlockBuriedPetals.java | 2 +- .../botania/common/block/decor/BlockFloatingFlower.java | 2 +- .../botania/common/block/decor/BlockModMushroom.java | 2 +- .../vazkii/botania/common/block/tile/TileManaBeacon.java | 4 ++-- .../java/vazkii/botania/common/block/tile/TilePylon.java | 8 ++++---- .../vazkii/botania/common/entity/EntitySignalFlare.java | 4 ++-- .../java/vazkii/botania/common/item/lens/LensFlare.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPaint.java | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) 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 5222deff1..90caf2b5a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -474,7 +474,7 @@ public class ClientProxy extends CommonProxy { } } - private static boolean noclipEnabled = true; + private static boolean noclipEnabled = false; private static boolean corruptSparkle = false; @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 63d7e748a..5aeb178c9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -212,7 +212,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index f5e4b4271..3baf8d444 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -115,13 +115,13 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index a3e45b9d2..791b3882c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -52,7 +52,7 @@ public class BlockBuriedPetals extends BlockModFlower { int b = (hex & 0xFF); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.1 + par5Random.nextFloat() * 0.1, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.1 + par5Random.nextFloat() * 0.1, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); Botania.proxy.setSparkleFXNoClip(false); } 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 899bd9856..df74ecbc3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -189,7 +189,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); } @Override 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 ddcf6f2b3..f8b1c582b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -133,7 +133,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index fb6cce005..4f6c90714 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -35,10 +35,10 @@ public class TileManaBeacon extends TileMod implements ITickable { int b = (hex & 0xFF); Botania.proxy.setWispFXDistanceLimit(false); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r, g, b, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); for(int i = 0; i < 2; i++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, 256, pos.getZ() + 0.5, r, g, b, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, 256, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 5a38110e3..389deda33 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -76,11 +76,11 @@ public class TilePylon extends TileEntity implements ITickable { int b = (hex & 0xFF); if(worldObj.rand.nextInt(4) == 0) - Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r, g, b, (float) Math.random(), 8); + Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r, g, b, (float) Math.random() / 3F, -0.04F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r, g, b, (float) Math.random() / 5F, -0.001F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r, g, b, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 3F, -0.04F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r / 255F, g / 255F, b / 255F, (float) Math.random() / 5F, -0.001F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 49c2b840d..b608564cd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -52,10 +52,10 @@ public class EntitySignalFlare extends Entity { Botania.proxy.setWispFXDistanceLimit(false); for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, r, g, b, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(worldObj, posX + 0.5, 256, posZ + 0.5, r, g, b, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, posX + 0.5, 256, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 7a230d8fc..756351f36 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -64,7 +64,7 @@ public class LensFlare extends Lens { b = (hex & 0xFF); } - Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); + Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r / 255F, g / 255F, b / 255F, 0.4F, mx, my, mz); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 752630157..d3de2a7b3 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -79,7 +79,7 @@ public class LensPaint extends Lens { int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r, g, b, 0.6F + (float) Math.random() * 0.3F, 5); + Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.3F, 5); } } From 89dac440c8829c18d334c3b1a9ec8a16332b06bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 19:27:54 -0600 Subject: [PATCH 169/935] Change starfield item model to match upstream --- src/main/resources/assets/botania/blockstates/starfield.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index aaf085ab4..927faa6b9 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -15,11 +15,6 @@ "false": {} }, "inventory": [{ - "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield0", - "side": "botania:blocks/starfield2" - }, "transform": { "firstperson": { "translation": [ 0, 0.125, 0 ] From 3fe2a0006cb651b24c65cef798dbd2ca9d8ca5ef Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 19:51:41 -0600 Subject: [PATCH 170/935] Change crystal bow draw animation to better reflect when it's fully charged --- .../item/equipment/tool/bow/ItemCrystalBow.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 ee64aa7e8..fe8e85f24 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 @@ -64,15 +64,15 @@ public class ItemCrystalBow extends ItemLivingwoodBow { int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); - if(j >= 28) - return new ModelResourceLocation(name + "_pulling_5", "inventory"); - if(j >= 23) - return new ModelResourceLocation(name + "_pulling_4", "inventory"); if(j >= 18) + return new ModelResourceLocation(name + "_pulling_5", "inventory"); + if(j >= 15) + return new ModelResourceLocation(name + "_pulling_4", "inventory"); + if(j >= 12) return new ModelResourceLocation(name + "_pulling_3", "inventory"); - if(j > 13) + if(j > 9) return new ModelResourceLocation(name + "_pulling_2", "inventory"); - if(j > 0) + if(j > 6) return new ModelResourceLocation(name + "_pulling_1", "inventory"); return new ModelResourceLocation(name, "inventory"); From dc6af948d98339eee09ba259b22dc59f580f7498 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 21:23:50 -0600 Subject: [PATCH 171/935] Don't use a sideonly client method. Closes #18 --- .../common/block/subtile/functional/SubTileDaffomill.java | 4 +++- .../common/block/subtile/functional/SubTileHopperhock.java | 5 ++++- .../common/block/subtile/functional/SubTilePollidisiac.java | 3 ++- .../common/block/subtile/functional/SubTileRannuncarpus.java | 3 ++- .../block/subtile/functional/SubTileSpectranthemum.java | 4 +++- .../common/block/subtile/generating/SubTileEndoflame.java | 4 +++- .../common/block/subtile/generating/SubTileGourmaryllis.java | 4 +++- .../common/block/subtile/generating/SubTileSpectrolus.java | 4 +++- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 3 ++- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 5fca2e086..d3142450b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -18,11 +18,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileDaffomill extends SubTileFunctional { @@ -51,7 +53,7 @@ public class SubTileDaffomill extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); int slowdown = getSlowdownFactor(); for(EntityItem item : items) - if(!item.isDead && item.getAge() >= slowdown) { + if(!item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { item.motionX += orientation.getFrontOffsetX() * 0.05; item.motionY += orientation.getFrontOffsetY() * 0.05; item.motionZ += orientation.getFrontOffsetZ() * 0.05; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index d4422a916..565da3142 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -33,6 +33,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import scala.reflect.internal.util.WeakHashSet; @@ -43,6 +44,7 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileHopperhock extends SubTileFunctional { @@ -73,7 +75,8 @@ public class SubTileHopperhock extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.getAge() >= 105 && item.getAge() < 110 || item.isDead) + int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE); + if(age < (60 + slowdown) || age >= 105 && age < 110 || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index e2febb00d..6d78a8150 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -16,6 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -45,7 +46,7 @@ public class SubTilePollidisiac extends SubTileFunctional { int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); if(animal.getGrowingAge() == 0 && love <= 0) { for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); 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 7522f7463..d4dd2fcb3 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 @@ -31,6 +31,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFlowerPlaceable; @@ -79,7 +80,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 67f0a24a4..7270a9786 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.BlockPos; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -28,6 +29,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileSpectranthemum extends SubTileFunctional { @@ -56,7 +58,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(item.getAge() < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index c25cc52a8..5aed0fe56 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -19,12 +19,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileEndoflame extends SubTileGenerating { @@ -47,7 +49,7 @@ public class SubTileEndoflame extends SubTileGenerating { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { - if(item.getAge() >= (59 + slowdown) && !item.isDead) { + if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= (59 + slowdown) && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; 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 1c22786b1..c10b54d59 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 @@ -19,10 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileGourmaryllis extends SubTileGenerating { @@ -51,7 +53,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && item.getAge() >= slowdown) { + if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { if(cooldown == 0) { if(!remote) { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); 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 581e48e1b..0847f5b80 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 @@ -26,12 +26,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibObfuscation; public class SubTileSpectrolus extends SubTileGenerating { @@ -53,7 +55,7 @@ public class SubTileSpectrolus extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == wool && !item.isDead && item.getAge() >= slowdown) { + if(stack != null && stack.getItem() == wool && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { int meta = stack.getItemDamage(); if(meta == nextColor) { if(!remote) { 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 d08cc8ed2..9bf47933b 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 @@ -142,7 +142,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - if(item.getAge() > 100 && item.getAge() < 130 || !catalystsRegistered) + int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE) + if(age > 100 && age < 130 || !catalystsRegistered) return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { From 34fae04641a9a44a2030fa0d4f1cf6871efeebb3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 21:39:56 -0600 Subject: [PATCH 172/935] Made API dediserver-safe. Remove icon methods from SubTileSignature. --- .../vazkii/botania/api/BotaniaAPIClient.java | 61 ++++++++++ .../api/subtile/signature/BasicSignature.java | 14 --- .../subtile/signature/SubTileSignature.java | 10 -- .../client/core/handler/ModelHandler.java | 113 +++++++++--------- .../client/core/proxy/ClientProxy.java | 8 -- .../render/SpecialFlowerModel.java | 56 +-------- .../common/block/BlockSpecialFlower.java | 11 -- .../common/block/tile/mana/TilePool.java | 2 +- 8 files changed, 121 insertions(+), 154 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/BotaniaAPIClient.java rename src/main/java/vazkii/botania/{api => client}/render/SpecialFlowerModel.java (81%) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java new file mode 100644 index 000000000..e2de209a0 --- /dev/null +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -0,0 +1,61 @@ +package vazkii.botania.api; + +import com.google.common.collect.Maps; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.subtile.SubTileEntity; + +import java.util.Map; + +/** + * Class for API calls that must be made clientside + */ +@SideOnly(Side.CLIENT) +public final class BotaniaAPIClient { + + public static final Map queuedBlockModels = Maps.newHashMap(); + public static final Map queuedItemModels = Maps.newHashMap(); + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process + * + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used for this subtile + * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form + */ + public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { + queuedBlockModels.put(subTileName, model); + queuedItemModels.put(subTileName, itemModel); + } + + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process + * + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" + */ + public static void registerSubtileModel(String subTileName, ModelResourceLocation model) { + registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); + } + + // Convenience overloads for the above two calls + public static void registerSubtileModel(Class clazz, ModelResourceLocation model) { + registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model); + } + + public static void registerSubtileModel(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { + registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); + } + + private BotaniaAPIClient() {} + +} diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index c454fdd2f..66b710147 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -10,15 +10,11 @@ */ package vazkii.botania.api.subtile.signature; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -38,16 +34,6 @@ public class BasicSignature extends SubTileSignature { this.name = name; } - @Override - public void registerIcons(TextureMap register) { - BotaniaAPI.internalHandler.registerBasicSignatureIcons(name, register); - } - - @Override - public TextureAtlasSprite getIconForStack(ItemStack stack) { - return BotaniaAPI.internalHandler.getSubTileIconForName(name); - } - @Override public String getUnlocalizedNameForStack(ItemStack stack) { return unlocalizedName(""); diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 1128b0602..949f0c8e6 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -24,16 +24,6 @@ public abstract class SubTileSignature { public static final String SPECIAL_FLOWER_PREFIX = "flower."; - /** - * Equivalent to Block.registerBlockIcons. - */ - public abstract void registerIcons(TextureMap map); - // todo 1.8 evaluate need for these two - /** - * Gets the icon to display for the flower item. - */ - public abstract TextureAtlasSprite getIconForStack(ItemStack stack); - /** * Gets the display name for the flower item. */ 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 527585913..a1eb126aa 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,11 +9,9 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; @@ -33,7 +31,8 @@ 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.GameData; -import vazkii.botania.api.render.SpecialFlowerModel; +import vazkii.botania.api.BotaniaAPIClient; +import vazkii.botania.client.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.AltarVariant; @@ -53,7 +52,6 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -114,7 +112,6 @@ import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.item.ModItems.*; -import java.util.Collection; import java.util.List; import java.util.Locale; @@ -302,61 +299,61 @@ public final class ModelHandler { } private static void registerSubtiles() { - SpecialFlowerModel.register(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); - SpecialFlowerModel.register(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); + BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); + BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); - SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM)); - SpecialFlowerModel.register(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor")); - SpecialFlowerModel.register(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); - SpecialFlowerModel.register(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); - SpecialFlowerModel.register(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); - SpecialFlowerModel.register(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor")); - SpecialFlowerModel.register(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); - SpecialFlowerModel.register(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE)); - SpecialFlowerModel.register(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor")); - SpecialFlowerModel.register(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); - SpecialFlowerModel.register(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); - SpecialFlowerModel.register(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); - SpecialFlowerModel.register(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); - SpecialFlowerModel.register(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); - SpecialFlowerModel.register(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); - SpecialFlowerModel.register(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); - SpecialFlowerModel.register(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); - SpecialFlowerModel.register(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); - SpecialFlowerModel.register(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); + BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM)); + BotaniaAPIClient.registerSubtileModel(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor")); + BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); + BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); + BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); + BotaniaAPIClient.registerSubtileModel(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor")); + BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); + BotaniaAPIClient.registerSubtileModel(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE)); + BotaniaAPIClient.registerSubtileModel(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor")); + BotaniaAPIClient.registerSubtileModel(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); + BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); + BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); + BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); + BotaniaAPIClient.registerSubtileModel(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS)); + BotaniaAPIClient.registerSubtileModel(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS)); + BotaniaAPIClient.registerSubtileModel(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS)); + BotaniaAPIClient.registerSubtileModel(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS)); + BotaniaAPIClient.registerSubtileModel(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON)); + BotaniaAPIClient.registerSubtileModel(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA)); - SpecialFlowerModel.register(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); - SpecialFlowerModel.register(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); - SpecialFlowerModel.register(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); - SpecialFlowerModel.register(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); - SpecialFlowerModel.register(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); - SpecialFlowerModel.register(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); - SpecialFlowerModel.register(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); - SpecialFlowerModel.register(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); - SpecialFlowerModel.register(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); - SpecialFlowerModel.register(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); - SpecialFlowerModel.register(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); - SpecialFlowerModel.register(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); - SpecialFlowerModel.register(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); - SpecialFlowerModel.register(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); - SpecialFlowerModel.register(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); - SpecialFlowerModel.register(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); - SpecialFlowerModel.register(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); - SpecialFlowerModel.register(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); - SpecialFlowerModel.register(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); - SpecialFlowerModel.register(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); - SpecialFlowerModel.register(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); - SpecialFlowerModel.register(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); - SpecialFlowerModel.register(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); - SpecialFlowerModel.register(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); - SpecialFlowerModel.register(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); - SpecialFlowerModel.register(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); - SpecialFlowerModel.register(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); - SpecialFlowerModel.register(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); - SpecialFlowerModel.register(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); - SpecialFlowerModel.register(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); - SpecialFlowerModel.register(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); - SpecialFlowerModel.register(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN)); + BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN)); + BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM)); + BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE)); + BotaniaAPIClient.registerSubtileModel(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS)); + BotaniaAPIClient.registerSubtileModel(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID)); + BotaniaAPIClient.registerSubtileModel(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM)); + BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE)); + BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME)); + BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION)); + BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK)); + BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE)); + BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA)); + BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS)); + BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS)); + BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC)); + BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA)); + BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM)); + BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL)); + BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS)); + BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM)); + BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE)); + BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS)); + BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL)); + BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); + BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); } private static void registerStandardBlocks() { 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 90caf2b5a..adab4f63a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -34,16 +34,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.AnyComponent; -import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.challenge.ModChallenges; @@ -106,8 +102,6 @@ import vazkii.botania.client.render.tile.RenderTileTerraPlate; import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.client.render.world.SkyblockRenderEvents; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileAvatar; @@ -116,7 +110,6 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; -import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.block.tile.TileLightRelay; @@ -160,7 +153,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.event.FMLInitializationEvent; diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java similarity index 81% rename from src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java rename to src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java index 4b5f1a274..0b2b61734 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java @@ -6,14 +6,13 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.api.render; +package vazkii.botania.client.render; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import net.minecraft.block.state.IBlockState; @@ -41,9 +40,8 @@ import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -56,53 +54,8 @@ import java.util.Map; public class SpecialFlowerModel implements IModelCustomData { - /** - * Register your model for the given subtile class here. - * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used for this subtile - * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form - */ - public static void register(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { - queuedBlockModels.put(subTileName, model); - queuedItemModels.put(subTileName, itemModel); - } - - /** - * Register your model for the given subtile class here. - * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" - */ - public static void register(String subTileName, ModelResourceLocation model) { - register(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); - } - - public static void register(Class clazz, ModelResourceLocation model) { - register(BotaniaAPI.getSubTileStringMapping(clazz), model); - } - - public static void register(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { - register(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); - } - - /** - * Internal implementation - **/ // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); - // Models registered from the externel API thus far - private static final Map queuedBlockModels = Maps.newHashMap(); - private static final Map queuedItemModels = Maps.newHashMap(); - private final ImmutableMap, ModelResourceLocation> blockModels; private final ImmutableMap, ModelResourceLocation> itemModels; @@ -120,7 +73,6 @@ public class SpecialFlowerModel implements IModelCustomData { builder.addAll(itemModels.values()); // Force mini island model to be loaded and baked, for use elsewhere. See FloatingFlowerModel - // TODO 1.8.8!!!! IslandType is not in the API, will crash when botania is not present!! Must relocate this elsewhere! for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) { builder.add(new ModelResourceLocation("botania:miniIsland", "variant=" + i.name().toLowerCase(Locale.ROOT))); } @@ -156,10 +108,10 @@ public class SpecialFlowerModel implements IModelCustomData { } } - for (Map.Entry e : queuedBlockModels.entrySet()) { + for (Map.Entry e : BotaniaAPIClient.queuedBlockModels.entrySet()) { blockBuilder.put(Optional.of(e.getKey()), e.getValue()); } - for (Map.Entry e : queuedItemModels.entrySet()) { + for (Map.Entry e : BotaniaAPIClient.queuedItemModels.entrySet()) { itemBuilder.put(Optional.of(e.getKey()), e.getValue()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1281c26f9..759dfcd1e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -17,7 +17,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; @@ -25,9 +24,6 @@ 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.renderer.block.statemap.DefaultStateMapper; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -42,20 +38,14 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.RegistrySimple; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -63,7 +53,6 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.integration.coloredlights.LightHelper; 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 9bf47933b..d1466210b 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 @@ -142,7 +142,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE) + int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE); if(age > 100 && age < 130 || !catalystsRegistered) return false; From 2ddf71d76f127faf3e0af14ce73c499a3b71a6e4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 21:41:07 -0600 Subject: [PATCH 173/935] Cleanup --- MC18_notes.txt | 11 ++--------- altar | 14 -------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 altar diff --git a/MC18_notes.txt b/MC18_notes.txt index ea7bf1c46..c543eb846 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -11,6 +11,7 @@ Anyways, vanilla removed it from their method so we follow suit. * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. * Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with * IRelic changed to use UUIDs +* Removed icon methods from SubTileSignature -- Other -- * Most things left untouched to make patches from upstream easier @@ -25,12 +26,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is * Quartz stair textures may be assigned incorrectly - resource pack authors check me * Glass pane inner faces are not getting culled (vanilla bug?) * Some item forms of technical/non-user blocks are removed - * Full list: [all double slab items, all solid vine items] - --- Todo -- -* JSON models for everything (tedious/med-hard) -* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med) -* For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.) - - Sub to texture stitch and bake our own model there to use? - - This remains the largest portion of what is left - - Where is the method to render an arbitrary baked model? \ No newline at end of file + * Full list: [all double slab items, all solid vine items] \ No newline at end of file diff --git a/altar b/altar deleted file mode 100644 index cc58dfb12..000000000 --- a/altar +++ /dev/null @@ -1,14 +0,0 @@ -altar -up-down -west-south-east-north - -base textures pillar tex - - - - northsouth face cup (1 always faces south) - eastwest face cup (blue always faces east) - cupbase 2 - cubbase - - water-lava texture simply one level below top of cup \ No newline at end of file From 383cd059cc52318c23d5f587feae747f5266902a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Jan 2016 20:16:22 -0600 Subject: [PATCH 174/935] Fix hourglass having inverted redstone power. How come no one caught this?! --- src/main/java/vazkii/botania/common/block/BlockHourglass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index b6d1bfed1..c46586e1c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -115,7 +115,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return state.getValue(BotaniaStateProps.POWERED) ? 0 : 15; + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override From 929860f8fa0d143e11a59c9bc84d29cb6cf2c725 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Jan 2016 20:56:25 -0600 Subject: [PATCH 175/935] Partial claw model. Fix cell block being a debug floating island. Fix a pure daisy oredict bug by checking for drops instead of state --- .../botania/api/recipe/RecipePureDaisy.java | 2 +- .../botania/api/wiki/SimpleWikiProvider.java | 2 +- .../client/core/handler/ModelHandler.java | 5 +- .../client/core/proxy/ClientProxy.java | 2 +- .../common/block/mana/BlockSpawnerClaw.java | 5 - .../assets/botania/blockstates/cellBlock.json | 4 +- .../botania/blockstates/spawnerClaw.json | 23 ++++ .../assets/botania/models/block/claw.json | 125 ++++++++++++++++++ 8 files changed, 156 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/spawnerClaw.json create mode 100644 src/main/resources/assets/botania/models/block/claw.json diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 568296e76..c9b5e05ba 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -44,7 +44,7 @@ public class RecipePureDaisy { if(input instanceof Block) return state.getBlock() == input; - ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); + ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state)); String oredict = (String) input; return isOreDict(stack, oredict); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 0e166b067..590d3ddc5 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -56,7 +56,7 @@ public class SimpleWikiProvider implements IWikiProvider { ItemStack stack = block.getPickBlock(pos, world, bPos, null); if(stack == null || stack.getItem() == null) - stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos))); + stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); if(stack.getItem() == null) return null; 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 a1eb126aa..9eadc8878 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -179,9 +179,9 @@ public final class ModelHandler { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { if (ItemSpawnerMover.hasData(stack)) { - return new ModelResourceLocation("botania:spawnerMover", "inventory"); - } else { return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); + } else { + return new ModelResourceLocation("botania:spawnerMover", "inventory"); } } }); @@ -405,6 +405,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.cacophonium); registerItemModel(ModBlocks.tinyPotato); + registerItemModel(ModBlocks.spawnerClaw); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); 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 adab4f63a..43691fafb 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -294,7 +294,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower); ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower); ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato()); - ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw()); + // ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw()); ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield()); ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery()); ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate()); 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 b1b7d8c3c..1e77e0a0b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -57,11 +57,6 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable return false; } - @Override - public int getRenderType() { - return 2; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileSpawnerClaw(); diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json index 7fcc159e0..b14eadd13 100644 --- a/src/main/resources/assets/botania/blockstates/cellBlock.json +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -1,9 +1,9 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland", + "model": "minecraft:cube_all", "textures": { - "all": "botania:model/miniIslandCopy" + "all": "botania:blocks/cellBlock" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json new file mode 100644 index 000000000..1d3a49dc9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:claw", + "textures": { + "all": "botania:model/spawnerClaw" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{ + "transform": { + "firstperson": { + "translation": [ 0, 0.25, 0 ] + }, + "gui": { + "translation": [ 0, 0.25, 0 ] + } + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/claw.json new file mode 100644 index 000000000..03214d192 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/claw.json @@ -0,0 +1,125 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Plate", + "from": [ 2.0, 0.0, 2.0 ], + "to": [ 14.0, 1.0, 14.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 12.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + } + }, + { + "name": "Limb_West", + "from": [ -1.0, 0.0, 7.0 ], + "to": [ 2.0, 1.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] } + } + }, + { + "name": "Limb_East", + "from": [ 14.0, 0.0, 7.0 ], + "to": [ 17.0, 1.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] } + } + }, + { + "name": "Limb_North", + "from": [ 7.0, 0.0, -1.0 ], + "to": [ 9.0, 1.0, 2.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } + } + }, + { + "name": "Limb_South", + "from": [ 7.0, 0.0, 14.0 ], + "to": [ 9.0, 1.0, 17.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } + } + }, + { + "name": "Claw_West", + "from": [ -1.0, -5.0, 7.0 ], + "to": [ 0.0, 0.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } + } + }, + { + "name": "Claw_East", + "from": [ 16.0, -5.0, 7.0 ], + "to": [ 17.0, 0.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } + } + }, + { + "name": "Claw_North", + "from": [ 7.0, -5.0, -1.0 ], + "to": [ 9.0, 0.0, 0.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } + } + }, + { + "name": "Claw_South", + "from": [ 7.0, -5.0, 16.0 ], + "to": [ 9.0, 0.0, 17.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } + } + } + ] +} \ No newline at end of file From 92aaa9f70a422f9faf96b723413fc02553aa42e2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Jan 2016 21:40:18 -0600 Subject: [PATCH 176/935] Spreader turntable model --- .../client/core/handler/ModelHandler.java | 1 + .../assets/botania/blockstates/turntable.json | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/turntable.json 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 9eadc8878..34baddb11 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -406,6 +406,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.cacophonium); registerItemModel(ModBlocks.tinyPotato); registerItemModel(ModBlocks.spawnerClaw); + registerItemModel(ModBlocks.turntable); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); diff --git a/src/main/resources/assets/botania/blockstates/turntable.json b/src/main/resources/assets/botania/blockstates/turntable.json new file mode 100644 index 000000000..796d11f8f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/turntable.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/turntable1", + "top": "botania:blocks/turntable0", + "side": "botania:blocks/turntable1" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file From 12dfecb8acef4311d06736aa3cb83b3594df7767 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 08:52:58 -0600 Subject: [PATCH 177/935] Add a bunch of dirty, dirty tesr item hook items. Also fix fabulous mana pool leaking its fabulousness --- .../client/core/handler/ModelHandler.java | 27 +++++++- .../client/core/proxy/ClientProxy.java | 59 ------------------ .../botania/client/model/ModelBrewery.java | 7 ++- .../client/render/tile/RenderTileAvatar.java | 10 ++- .../client/render/tile/RenderTileBellows.java | 4 +- .../client/render/tile/RenderTilePool.java | 2 +- .../client/render/tile/RenderTilePump.java | 4 +- .../render/tile/RenderTileSkullOverride.java | 9 +-- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../assets/botania/models/item/avatar.json | 3 + .../assets/botania/models/item/bellows.json | 3 + .../assets/botania/models/item/brewery.json | 3 + .../assets/botania/models/item/gaiaHead.json | 3 + .../assets/botania/models/item/pump.json | 3 + .../botania/models/item/teruTeruBozu.json | 3 + .../botania/textures/model/spawnerClaw.png | Bin 4236 -> 1588 bytes 16 files changed, 68 insertions(+), 74 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/avatar.json create mode 100644 src/main/resources/assets/botania/models/item/bellows.json create mode 100644 src/main/resources/assets/botania/models/item/brewery.json create mode 100644 src/main/resources/assets/botania/models/item/gaiaHead.json create mode 100644 src/main/resources/assets/botania/models/item/pump.json create mode 100644 src/main/resources/assets/botania/models/item/teruTeruBozu.json 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 34baddb11..c4ad1d90d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -97,8 +97,14 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.tile.TileAvatar; +import vazkii.botania.common.block.tile.TileBrewery; +import vazkii.botania.common.block.tile.TileGaiaHead; +import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.brew.ItemBrewBase; @@ -583,9 +589,28 @@ public final class ModelHandler { // Only for models that absolutely can't be converted to JSON. Use VERY sparingly private static void registerTESRItems() { registerItemModel(ModBlocks.corporeaCrystalCube); - registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); + + registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); + + registerItemModel(ModBlocks.avatar); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); + + registerItemModel(ModBlocks.teruTeruBozu); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); + + registerItemModel(ModBlocks.brewery); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); + + registerItemModel(ModBlocks.gaiaHead); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.gaiaHead), 0, TileGaiaHead.class); + + registerItemModel(ModBlocks.bellows); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); + + registerItemModel(ModBlocks.pump); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); } private static void registerManaResources() { 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 43691fafb..9f0142f6a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -224,65 +224,6 @@ public class ClientProxy extends CommonProxy { } private void initRenderers() { -// LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpreader = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPool = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idBrewery = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCorporeaIndex = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idPump = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idDoubleFlower = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCorporeaCrystalCybe = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idTeruTeruBozu = RenderingRegistry.getNextAvailableRenderId(); -// LibRenderIDs.idAvatar = RenderingRegistry.getNextAvailableRenderId(); -// -// RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower); -// RenderingRegistry.registerBlockHandler(new RenderAltar()); -// RenderingRegistry.registerBlockHandler(specialFlowerRender); -// RenderingRegistry.registerBlockHandler(new RenderSpreader()); -// RenderingRegistry.registerBlockHandler(new RenderPool()); -// RenderingRegistry.registerBlockHandler(new RenderPylon()); -// RenderingRegistry.registerBlockHandler(new RenderFloatingFlower()); -// RenderingRegistry.registerBlockHandler(new RenderTinyPotato()); -// RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw()); -// RenderingRegistry.registerBlockHandler(new RenderBrewery()); -// RenderingRegistry.registerBlockHandler(new RenderCorporeaIndex()); -// RenderingRegistry.registerBlockHandler(new RenderPump()); -// RenderingRegistry.registerBlockHandler(new RenderDoubleFlower()); -// RenderingRegistry.registerBlockHandler(new RenderCorporeaCrystalCube()); -// RenderingRegistry.registerBlockHandler(new RenderIncensePlate()); -// RenderingRegistry.registerBlockHandler(new RenderHourglass()); -// RenderingRegistry.registerBlockHandler(new RenderCocoon()); -// RenderingRegistry.registerBlockHandler(new RenderBellows()); -// RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu()); -// RenderingRegistry.registerBlockHandler(new RenderAvatar()); - -// IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); -// IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); - -// RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); -// RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); -// RenderBow renderBow = new RenderBow(); -// -// MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); -// if(ConfigHandler.lexicon3dModel) -// MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); -// MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); -// MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); -// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); -// MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); -// MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); - RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader()); diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 107b67c62..fadb4b32d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -51,13 +51,14 @@ public class ModelBrewery extends ModelBase { float f = 1F / 16F; float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F; - int plates = render.brewery.getSizeInventory() - 1; + boolean hasTile = render.brewery != null; + int plates = hasTile ? render.brewery.getSizeInventory() - 1 : 7; float deg = (float) time / 16F; float polerot = -deg * 25F; GlStateManager.translate(0F, offset, 0F); GlStateManager.rotate(polerot, 0F, 1F, 0F); - if(render.brewery.getStackInSlot(0) != null) { + if(hasTile && render.brewery.getStackInSlot(0) != null) { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(0, -0.45, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); @@ -80,7 +81,7 @@ public class ModelBrewery extends ModelBase { offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); - if(render.brewery.getStackInSlot(i + 1) != null) { + if(hasTile && render.brewery.getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; 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 863814a29..03a2245ef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -52,13 +52,21 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; + int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 1.6F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); model.render(); + if (avatar == null) { + GlStateManager.color(1F, 1F, 1F); + GlStateManager.scale(1F, -1F, -1F); + GlStateManager.enableRescaleNormal(); + GlStateManager.popMatrix(); + return; + } + ItemStack stack = avatar.getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index c031ad1d7..27e8ece74 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -42,12 +42,12 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; + int meta = bellows != null && bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0.1F, 1F - (bellows.movePos + bellows.moving * f + 0.1F))); + model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : (bellows.movePos + bellows.moving * f + 0.1F)))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 057b0d03f..4f5bac01e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -84,7 +84,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { } model.render(); - GlStateManager.color(1F, 1F, 1F, a); + GL11.glColor4f(1F, 1F, 1F, a); // Use GL11 manually since we call color4ub above, and GlStateManager doesn't know that, so the color leaks GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 890176f08..fa36755ed 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -42,12 +42,12 @@ public class RenderTilePump extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = pump.getWorld() != null ? pump.getBlockMetadata() : 0; + int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0; GlStateManager.translate(0.5F, 0.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f))); + model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 78690645c..d3c0e74e5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -39,14 +39,15 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { @Override public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { - if (p_147500_1_ instanceof TileEntitySkull) { - TileEntitySkull skull = ((TileEntitySkull) p_147500_1_); - render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress); + if (p_147500_1_ != null) { + render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress); + } else { + render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0); } } public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { - boolean gaia = skull instanceof TileGaiaHead; + boolean gaia = skull == null || skull instanceof TileGaiaHead; if(par6 == 3 || gaia) { ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy(); Minecraft minecraft = Minecraft.getMinecraft(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 52e6f234e..b00be52f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -44,7 +44,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); GlStateManager.rotate(180F, 1F, 0F, 0F); double time = Botania.proxy.getWorldElapsedTicks() + f; - boolean hasWorld = tileentity.getWorld() != null; + boolean hasWorld = tileentity != null && tileentity.getWorld() != null; if(hasWorld) time += new Random(tileentity.getPos().hashCode()).nextInt(1000); diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/avatar.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/avatar.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/bellows.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bellows.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/brewery.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brewery.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaHead.json b/src/main/resources/assets/botania/models/item/gaiaHead.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gaiaHead.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pump.json b/src/main/resources/assets/botania/models/item/pump.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pump.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/teruTeruBozu.json b/src/main/resources/assets/botania/models/item/teruTeruBozu.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/teruTeruBozu.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/spawnerClaw.png b/src/main/resources/assets/botania/textures/model/spawnerClaw.png index 44dd720e583d01f7a4226b48fd6ea385b196af1c..65a89b42a442f9c8bd3c8c76c3be2cfe6963eff1 100644 GIT binary patch delta 1584 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 ifE55%0C?w&{|*4 Date: Thu, 7 Jan 2016 10:32:31 -0600 Subject: [PATCH 178/935] Generify stuff, fix gaia head render, hourglass inventory model --- build.properties | 2 +- .../client/core/handler/ModelHandler.java | 9 +++++++-- .../client/core/proxy/ClientProxy.java | 3 ++- .../render/tile/RenderTileAlfPortal.java | 20 +++++++++++++------ .../client/render/tile/RenderTileAltar.java | 6 ++---- .../client/render/tile/RenderTileAvatar.java | 6 ++---- .../client/render/tile/RenderTileBellows.java | 6 ++---- .../client/render/tile/RenderTileBrewery.java | 6 +++--- .../client/render/tile/RenderTileCocoon.java | 6 ++---- .../tile/RenderTileCorporeaCrystalCube.java | 8 +++----- .../render/tile/RenderTileCorporeaIndex.java | 5 ++--- .../render/tile/RenderTileEnchanter.java | 5 ++--- .../render/tile/RenderTileFloatingFlower.java | 1 + .../render/tile/RenderTileHourglass.java | 20 +++++++++---------- .../render/tile/RenderTileIncensePlate.java | 6 ++---- .../render/tile/RenderTileLightRelay.java | 5 +++-- .../client/render/tile/RenderTilePool.java | 16 +++++++-------- .../client/render/tile/RenderTilePrism.java | 6 ++---- .../client/render/tile/RenderTilePump.java | 6 ++---- .../client/render/tile/RenderTilePylon.java | 16 ++++++++------- .../render/tile/RenderTileRedString.java | 5 ++--- .../render/tile/RenderTileRuneAltar.java | 6 ++---- .../render/tile/RenderTileSparkChanger.java | 6 +++--- .../render/tile/RenderTileSpreader.java | 7 +++---- .../render/tile/RenderTileStarfield.java | 8 +++++--- .../render/tile/RenderTileTerraPlate.java | 6 ++---- .../render/tile/RenderTileTeruTeruBozu.java | 5 +++-- .../render/tile/RenderTileTinyPotato.java | 5 ++--- .../botania/common/block/BlockGaiaHead.java | 2 +- .../botania/common/item/ItemGaiaHead.java | 4 ++-- .../assets/botania/models/item/hourglass.json | 3 +++ 31 files changed, 105 insertions(+), 110 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/hourglass.json diff --git a/build.properties b/build.properties index ff6f0b60c..992a27b6f 100644 --- a/build.properties +++ b/build.properties @@ -3,7 +3,7 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ -forge_version=11.15.0.1656 +forge_version=11.15.0.1688 mc_version=1.8.9 build_number=248 mod_name=Botania 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 c4ad1d90d..86f3ea394 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -100,6 +100,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileGaiaHead; +import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -107,6 +108,7 @@ import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; @@ -603,14 +605,17 @@ public final class ModelHandler { registerItemModel(ModBlocks.brewery); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - registerItemModel(ModBlocks.gaiaHead); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.gaiaHead), 0, TileGaiaHead.class); + registerItemModel(ModItems.gaiaHead); + ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); registerItemModel(ModBlocks.bellows); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); registerItemModel(ModBlocks.pump); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); + + registerItemModel(ModBlocks.hourglass); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); } private static void registerManaResources() { 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 9f0142f6a..d95109c94 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -110,6 +110,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; +import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.block.tile.TileLightRelay; @@ -250,7 +251,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); - // todo 1.8.8 awaiting forge issue ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); + ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); 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 4107eb492..67ca9bcde 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -21,18 +21,26 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.common.block.BlockAlfPortal; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; -public class RenderTileAlfPortal extends TileEntitySpecialRenderer { +public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileAlfPortal portal = (TileAlfPortal) tileentity; - int meta = portal.getBlockMetadata(); - if(meta == 0) + public void renderTileEntityAt(TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { + AlfPortalState state; + if (portal.getWorld().getBlockState(portal.getPos()) != ModBlocks.alfPortal) { + state = AlfPortalState.OFF; + } else { + state = portal.getWorld().getBlockState(portal.getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE); + } + + if(state == AlfPortalState.OFF) return; GlStateManager.pushMatrix(); @@ -49,7 +57,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - if(meta == 2) { + if(state == AlfPortalState.ON_X) { GlStateManager.translate(1.25F, 0F, 1.75F); GlStateManager.rotate(90F, 0F, 1F, 0F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index f85f8b54d..b39413a24 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -38,7 +38,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAltar; import vazkii.botania.common.block.tile.TileAltar; -public class RenderTileAltar extends TileEntitySpecialRenderer { +public class RenderTileAltar extends TileEntitySpecialRenderer { private static final ResourceLocation[] textures = new ResourceLocation[] { new ResourceLocation(LibResources.MODEL_ALTAR), @@ -58,9 +58,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { public static int forceMeta = -1; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { - TileAltar altar = (TileAltar) tileentity; - + public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); 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 03a2245ef..9250f4b7d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -33,7 +33,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAvatar; import vazkii.botania.common.block.tile.TileAvatar; -public class RenderTileAvatar extends TileEntitySpecialRenderer { +public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { 180F, 0F, 90F, 270F @@ -43,9 +43,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { - TileAvatar avatar = (TileAvatar) tileentity; - + public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 27e8ece74..0e2b85cfb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -23,7 +23,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.tile.mana.TileBellows; -public class RenderTileBellows extends TileEntitySpecialRenderer { +public class RenderTileBellows extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { 180F, 0F, 90F, 270F @@ -33,9 +33,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileBellows bellows = (TileBellows) tileentity; - + public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); 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 af9f704b8..8c04d7076 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -35,7 +35,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; -public class RenderTileBrewery extends TileEntitySpecialRenderer { +public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); ModelBrewery model = new ModelBrewery(); @@ -43,8 +43,8 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public static boolean rotate = true; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - brewery = (TileBrewery) tileentity; + public void renderTileEntityAt(TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { + this.brewery = brewery; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); 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 1c20841f1..0ef53fb41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -23,15 +23,13 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCocoon; import vazkii.botania.common.block.tile.TileCocoon; -public class RenderTileCocoon extends TileEntitySpecialRenderer { +public class RenderTileCocoon extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_COCOON); ModelCocoon model = new ModelCocoon(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileCocoon cocoon = (TileCocoon) tileentity; - + public void renderTileEntityAt(TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { float rot = 0F; float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F; if(cocoon.timePassed % modval < 10) { 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 91df8ec9a..73eeb4d10 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -32,16 +32,14 @@ import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lib.LibObfuscation; -public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { +public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE); ModelCrystalCube model = new ModelCrystalCube(); EntityItem entity = null; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileentity; - + public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { ItemStack stack = null; if (cube != null) { if(entity == null) @@ -53,7 +51,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { } double time = ClientTickHandler.ticksInGame + f; - double worldTicks = tileentity == null || tileentity.getWorld() == null ? 0 : time; + double worldTicks = cube == null || cube.getWorld() == null ? 0 : time; Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index c2618f57b..b89703d8e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -23,15 +23,14 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { +public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); public static boolean move = true; @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks, int digProgress) { - TileCorporeaIndex index = (TileCorporeaIndex) tile; + public void renderTileEntityAt(TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress) { move = index != null; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 54537f64a..b852eafe9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -34,13 +34,12 @@ import vazkii.botania.common.block.mana.BlockEnchanter; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.lib.LibObfuscation; -public class RenderTileEnchanter extends TileEntitySpecialRenderer { +public class RenderTileEnchanter extends TileEntitySpecialRenderer { EntityItem item; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileEnchanter enchanter = (TileEnchanter) tileentity; + public void renderTileEntityAt(TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { float alphaMod = 0F; if(enchanter.stage == 2) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 302dbe7de..6cc751810 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -33,6 +33,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.ModelMiniIsland; import vazkii.botania.common.block.decor.IFloatingFlower; +import vazkii.botania.common.block.tile.TileFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 0fae3b81a..b1af2c419 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -26,43 +26,41 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; -public class RenderTileHourglass extends TileEntitySpecialRenderer { +public class RenderTileHourglass extends TileEntitySpecialRenderer { ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); ModelHourglass model = new ModelHourglass(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { - TileHourglass hourglass = (TileHourglass) tileentity; - + public void renderTileEntityAt(TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - - int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame; + boolean hasWorld = hourglass != null && hourglass.getWorld() != null; + int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame; if(wtime != 0) - wtime += new Random(tileentity.getPos().hashCode()).nextInt(360); + wtime += new Random(hourglass.getPos().hashCode()).nextInt(360); float time = wtime == 0 ? 0 : wtime + ticks; float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F; float y = 0.55F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F; float z = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F; - ItemStack stack = hourglass.getStackInSlot(0); + ItemStack stack = hasWorld ? hourglass.getStackInSlot(0) : null; float fract1 = stack == null ? 0 : hourglass.timeFraction; float fract2 = stack == null ? 0 : 1F - hourglass.timeFraction; GlStateManager.translate(x, y, z); - float rot = hourglass.flip ? 180F : 1F; - if(hourglass.flipTicks > 0) + float rot = hasWorld && hourglass.flip ? 180F : 1F; + if(hasWorld && hourglass.flipTicks > 0) rot += (hourglass.flipTicks - ticks) * (180F / 4F); GlStateManager.rotate(rot, 0F, 0F, 1F); GlStateManager.scale(1F, -1F, -1F); - model.render(fract1, fract2, hourglass.flip, hourglass.getColor()); + model.render(fract1, fract2, hasWorld && hourglass.flip, hasWorld ? hourglass.getColor() : 0); GlStateManager.scale(1F, -1F, -1F); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 8fcd3c23d..5b64069f4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -32,7 +32,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelIncensePlate; import vazkii.botania.common.block.tile.TileIncensePlate; -public class RenderTileIncensePlate extends TileEntitySpecialRenderer { +public class RenderTileIncensePlate extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { 180F, 0F, 90F, 270F @@ -42,9 +42,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { ModelIncensePlate model = new ModelIncensePlate(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { - TileIncensePlate plate = (TileIncensePlate) tileentity; - + public void renderTileEntityAt(TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) { EnumFacing facing = plate.getWorld() != null ? plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index f2d146c0d..7191ef002 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -27,11 +27,12 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.RenderEventHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.BlockLightRelay; +import vazkii.botania.common.block.tile.TileLightRelay; -public class RenderTileLightRelay extends TileEntitySpecialRenderer { +public class RenderTileLightRelay extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) { + public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { Minecraft mc = Minecraft.getMinecraft(); TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 4f5bac01e..073993e97 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -36,7 +36,7 @@ import vazkii.botania.client.model.ModelPool; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; -public class RenderTilePool extends TileEntitySpecialRenderer { +public class RenderTilePool extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_POOL); private static final ResourceLocation textureInf = new ResourceLocation(LibResources.MODEL_INFINITE_POOL); @@ -49,9 +49,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public static int forceManaNumber = -1; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TilePool pool = (TilePool) tileentity; - + public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -60,9 +58,9 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F, a); GlStateManager.translate(d0, d1, d2); - boolean inf = tileentity.getWorld() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1; - boolean dil = tileentity.getWorld() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2; - boolean fab = tileentity.getWorld() == null ? forceMeta == 3 : tileentity.getBlockMetadata() == 3; + boolean inf = pool.getWorld() == null ? forceMeta == 1 : pool.getBlockMetadata() == 1; + boolean dil = pool.getWorld() == null ? forceMeta == 2 : pool.getBlockMetadata() == 2; + boolean fab = pool.getWorld() == null ? forceMeta == 3 : pool.getBlockMetadata() == 3; Minecraft.getMinecraft().renderEngine.bindTexture(inf ? textureInf : dil ? textureDil : texture); @@ -70,8 +68,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.scale(1F, -1F, -1F); if(fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - if(tileentity != null) - time += new Random(tileentity.getPos().hashCode()).nextInt(100000); + if(pool != null) + time += new Random(pool.getPos().hashCode()).nextInt(100000); Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F); GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); 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 6e28b243f..99b2065d8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -25,11 +25,10 @@ import vazkii.botania.client.core.handler.ClientTickHandler; //import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TilePrism; -public class RenderTilePrism extends TileEntitySpecialRenderer { +public class RenderTilePrism extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partTicks, int digProgress) { - TilePrism prism = (TilePrism) tile; + public void renderTileEntityAt(TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; @@ -39,7 +38,6 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(stack.getItem() instanceof ILens) { - ILens lens = (ILens) stack.getItem(); GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0.5F, 0.5F, pos); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index fa36755ed..b57406bab 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -23,7 +23,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; import vazkii.botania.common.block.tile.mana.TilePump; -public class RenderTilePump extends TileEntitySpecialRenderer { +public class RenderTilePump extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { 180F, 0F, 90F, 270F @@ -33,9 +33,7 @@ public class RenderTilePump extends TileEntitySpecialRenderer { private static final ModelPump model = new ModelPump(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TilePump pump = (TilePump) tileentity; - + public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); 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 02302c602..013715e87 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -34,9 +34,11 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.IPylonModel; import vazkii.botania.client.model.ModelPylon; import vazkii.botania.client.model.ModelPylonOld; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; -public class RenderTilePylon extends TileEntitySpecialRenderer { +public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_PYLON); @@ -52,7 +54,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { public static boolean pink = false; @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); @@ -63,8 +65,8 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GlStateManager.color(1F, 1F, 1F, a); PylonVariant variant = null; - if(tileentity.getWorld() != null) { - variant = ((PylonVariant) tileentity.getWorld().getBlockState(tileentity.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT)); + if(pylon.getWorld() != null && pylon.getWorld().getBlockState(pylon.getPos()).getBlock() == ModBlocks.pylon) { + variant = pylon.getWorld().getBlockState(pylon.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); green = variant == PylonVariant.NATURA; pink = variant == PylonVariant.GAIA; } @@ -73,10 +75,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); + double worldTime = pylon.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); - if(tileentity != null) - worldTime += new Random(tileentity.getPos().hashCode()).nextInt(360); + if(pylon != null) + worldTime += new Random(pylon.getPos().hashCode()).nextInt(360); if(ConfigHandler.oldPylonModel) { GlStateManager.translate(d0 + 0.5, d1 + 2.2, d2 + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 3a7195446..1e46a1ade 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -15,11 +15,10 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; -public class RenderTileRedString extends TileEntitySpecialRenderer { +public class RenderTileRedString extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { - TileRedString trs = (TileRedString) tileentity; + public void renderTileEntityAt(TileRedString trs, double x, double y, double z, float partticks, int digProgress) { RedStringRenderer.redStringTiles.add(trs); } } 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 57544353c..485122928 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -33,14 +33,12 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; -public class RenderTileRuneAltar extends TileEntitySpecialRenderer { +public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ModelSpinningCubes cubes = new ModelSpinningCubes(); @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) { - TileRuneAltar altar = (TileRuneAltar) tileentity; - + public void renderTileEntityAt(TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(x, y, z); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 7236fbfae..a6a9dadb1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -26,16 +26,16 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileSparkChanger; -public class RenderTileSparkChanger extends TileEntitySpecialRenderer { +public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(d0, d1, d2); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0.8F, 0.2F, -0.22F); GlStateManager.color(1F, 1F, 1F, 1F); - ItemStack stack = ((TileSparkChanger) tileentity).getStackInSlot(0); + ItemStack stack = tileentity.getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index e22408ae5..d65f8294c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -34,7 +34,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.tile.mana.TileSpreader; -public class RenderTileSpreader extends TileEntitySpecialRenderer { +public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER); private static final ResourceLocation textureRs = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE); @@ -47,8 +47,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ModelSpreader model = new ModelSpreader(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { - TileSpreader spreader = (TileSpreader) tileentity; + public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -77,7 +76,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F); GlStateManager.pushMatrix(); - double worldTicks = tileentity.getWorld() == null ? 0 : time; + double worldTicks = spreader.getWorld() == null ? 0 : time; GlStateManager.rotate((float) worldTicks % 360, 0F, 1F, 0F); GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F); model.renderCube(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 20b51467d..0af40dcfb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -23,27 +23,28 @@ import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import vazkii.botania.common.block.tile.TileStarfield; // THIS CODE WAS STOLEN FROM THE END PORTAL // OH GOD // I HAVE NO IDEA WHAT I'M DOING // SO MUCH STUFF I DON'T UNDERSTAND D: // HELP -public class RenderTileStarfield extends TileEntitySpecialRenderer { +public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png"); private static final Random field_147527_e = new Random(31100L); FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16); - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage) + public void renderTileEntityAt(TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage) { float f = (float)this.rendererDispatcher.entityX; float f1 = (float)this.rendererDispatcher.entityY; float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f3 = 0.24F; + float f3 = 0.24F; // Botania: move to bottom of block space for (int i = 0; i < 16; ++i) { @@ -116,6 +117,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { f11 = f12 = f13 = 1.0F * f6; } + // Botania: change color based on time Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); f11 = color.getRed() / 255F; f12 = color.getGreen() / 255F; 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 0e664848f..8739931dc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -28,12 +28,10 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; -public class RenderTileTerraPlate extends TileEntitySpecialRenderer { +public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { - TileTerraPlate plate = (TileTerraPlate) tileentity; - + public void renderTileEntityAt(TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) { float max = TileTerraPlate.MAX_MANA / 10F; float alphaMod = Math.min(max, plate.getCurrentMana()) / max; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index b00be52f2..2e5d6cae2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -25,15 +25,16 @@ import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.TileTeruTeruBozu; -public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { +public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN); ModelTeruTeruBozu model = new ModelTeruTeruBozu(); @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.enableBlend(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 310ea8a24..27f78ff35 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -50,7 +50,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.material.ItemManaResource; import vazkii.botania.common.item.relic.ItemInfiniteFruit; -public class RenderTileTinyPotato extends TileEntitySpecialRenderer { +public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); @@ -58,8 +58,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ModelTinyPotato model = new ModelTinyPotato(); @Override - public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { - TileTinyPotato potato = (TileTinyPotato) var1; + public void renderTileEntityAt(TileTinyPotato potato, double d0, double d1, double d2, float var8, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 805b248d6..1243623d4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -42,7 +42,7 @@ public class BlockGaiaHead extends BlockSkull { @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); + GameRegistry.registerBlock(this, null, par1Str); return super.setUnlocalizedName(par1Str); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 8530130c7..389b7d65f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -80,7 +80,7 @@ public class ItemGaiaHead extends ItemMod { if (!worldIn.isRemote) { if (!Blocks.skull.canPlaceBlockOnSide(worldIn, pos, side)) return false; - worldIn.setBlockState(pos, Blocks.skull.getDefaultState().withProperty(BlockSkull.FACING, side), 3); + worldIn.setBlockState(pos, ModBlocks.gaiaHead.getDefaultState().withProperty(BlockSkull.FACING, side), 3); // Botania: skull -> gaia Head int i = 0; if (side == EnumFacing.UP) @@ -94,7 +94,7 @@ public class ItemGaiaHead extends ItemMod { { TileEntitySkull tileentityskull = (TileEntitySkull)tileentity; - if (stack.getMetadata() == 3) + if (stack.getMetadata() == 3) // Botania: Don't retrieve skins { // GameProfile gameprofile = null; // diff --git a/src/main/resources/assets/botania/models/item/hourglass.json b/src/main/resources/assets/botania/models/item/hourglass.json new file mode 100644 index 000000000..7960c6d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/hourglass.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} \ No newline at end of file From 8155dc30591ba4426f5b98f941d7805af2932732 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 11:35:41 -0600 Subject: [PATCH 179/935] Life imbuer model complete --- .../assets/botania/models/block/claw.json | 100 ++++++++---------- .../botania/models/block/miniIsland.json | 2 - 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/claw.json index 03214d192..0ff59d1b2 100644 --- a/src/main/resources/assets/botania/models/block/claw.json +++ b/src/main/resources/assets/botania/models/block/claw.json @@ -9,12 +9,12 @@ "from": [ 2.0, 0.0, 2.0 ], "to": [ 14.0, 1.0, 14.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 12.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + "west": { "texture": "#all", "uv": [ 0.0, 3.0, 3.0, 3.25 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 3.0, 6.0, 3.25 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 3.0, 9.0, 3.25 ] }, + "south": { "texture": "#all", "uv": [ 9.0, 3.0, 12.0, 3.25 ] }, + "up": { "texture": "#all", "uv": [ 3.0, 0.0, 6.0, 3.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 0.0, 9.0, 3.0 ], "cullface": "down" } } }, { @@ -22,12 +22,11 @@ "from": [ -1.0, 0.0, 7.0 ], "to": [ 2.0, 1.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] } + "west": { "texture": "#all", "uv": [ 0.0, 5.25, 0.5, 5.5 ] }, + "north": { "texture": "#all", "uv": [ 0.5, 5.25, 1.25, 5.5 ] }, + "south": { "texture": "#all", "uv": [ 1.25, 5.25, 2.0, 5.5 ] }, + "up": { "texture": "#all", "uv": [ 0.5, 4.75, 1.25, 5.25 ] }, + "down": { "texture": "#all", "uv": [ 1.25, 4.75, 2.0, 5.25 ] } } }, { @@ -35,12 +34,11 @@ "from": [ 14.0, 0.0, 7.0 ], "to": [ 17.0, 1.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 2.0 ] } + "north": { "texture": "#all", "uv": [ 3.25, 5.25, 4.0, 5.5 ] }, + "south": { "texture": "#all", "uv": [ 4.0, 5.25, 4.75, 5.5 ] }, + "east": { "texture": "#all", "uv": [ 4.75, 5.25, 5.25, 5.5 ] }, + "up": { "texture": "#all", "uv": [ 3.25, 4.75, 4.0, 5.25 ] }, + "down": { "texture": "#all", "uv": [ 4.0, 4.75, 4.75, 5.25 ] } } }, { @@ -48,12 +46,11 @@ "from": [ 7.0, 0.0, -1.0 ], "to": [ 9.0, 1.0, 2.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } + "west": { "texture": "#all", "uv": [ 0.0, 4.25, 0.75, 4.5 ] }, + "north": { "texture": "#all", "uv": [ 0.75, 4.25, 1.25, 4.5 ] }, + "east": { "texture": "#all", "uv": [ 1.25, 4.25, 1.75, 4.5 ] }, + "up": { "texture": "#all", "uv": [ 0.75, 3.5, 1.25, 4.25 ] }, + "down": { "texture": "#all", "uv": [ 1.25, 3.5, 1.75, 4.25 ] } } }, { @@ -61,12 +58,11 @@ "from": [ 7.0, 0.0, 14.0 ], "to": [ 9.0, 1.0, 17.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } + "west": { "texture": "#all", "uv": [ 2.75, 4.25, 3.5, 4.5 ] }, + "north": { "texture": "#all", "uv": [ 3.5, 4.25, 4.0, 4.5 ] }, + "east": { "texture": "#all", "uv": [ 4.0, 4.25, 4.5, 4.5 ] }, + "south": { "texture": "#all", "uv": [ 4.5, 4.25, 5.25, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 4.0, 3.5, 4.5, 4.25 ] } } }, { @@ -74,12 +70,11 @@ "from": [ -1.0, -5.0, 7.0 ], "to": [ 0.0, 0.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } + "west": { "texture": "#all", "uv": [ 11.0, 4.5, 11.5, 5.75 ] }, + "north": { "texture": "#all", "uv": [ 11.5, 4.5, 11.75, 5.75 ] }, + "east": { "texture": "#all", "uv": [ 11.75, 4.5, 12.0, 5.75 ] }, + "south": { "texture": "#all", "uv": [ 12.0, 4.5, 12.5, 5.75 ] }, + "down": { "texture": "#all", "uv": [ 11.75, 4.0, 12.0, 4.5 ] } } }, { @@ -87,12 +82,11 @@ "from": [ 16.0, -5.0, 7.0 ], "to": [ 17.0, 0.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } + "west": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.75 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.25, 5.75 ] }, + "east": { "texture": "#all", "uv": [ 8.25, 4.5, 8.5, 5.75 ] }, + "south": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.75 ] }, + "down": { "texture": "#all", "uv": [ 8.25, 4.0, 8.5, 4.5 ] } } }, { @@ -100,12 +94,11 @@ "from": [ 7.0, -5.0, -1.0 ], "to": [ 9.0, 0.0, 0.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } + "west": { "texture": "#all", "uv": [ 5.75, 4.25, 6.0, 5.5 ] }, + "north": { "texture": "#all", "uv": [ 6.0, 4.25, 6.5, 5.5 ] }, + "south": { "texture": "#all", "uv": [ 6.5, 4.25, 7.0, 5.5 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 4.25, 7.25, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.25 ] } } }, { @@ -113,12 +106,11 @@ "from": [ 7.0, -5.0, 16.0 ], "to": [ 9.0, 0.0, 17.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 1.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] } + "west": { "texture": "#all", "uv": [ 9.25, 4.25, 9.5, 5.5 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 4.25, 10.0, 5.5 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 4.25, 10.5, 5.5 ] }, + "east": { "texture": "#all", "uv": [ 10.5, 4.25, 11.25, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 10.0, 4.0, 10.5, 4.25 ] } } } ] diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index d7d2fed3d..26faf293e 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Shape0", From 3b7d7628cfc93319f39efd9d5d77ef819d37adf7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 11:46:36 -0600 Subject: [PATCH 180/935] Derp --- src/main/resources/assets/botania/models/block/claw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/claw.json index 0ff59d1b2..a6ac94af1 100644 --- a/src/main/resources/assets/botania/models/block/claw.json +++ b/src/main/resources/assets/botania/models/block/claw.json @@ -59,9 +59,9 @@ "to": [ 9.0, 1.0, 17.0 ], "faces": { "west": { "texture": "#all", "uv": [ 2.75, 4.25, 3.5, 4.5 ] }, - "north": { "texture": "#all", "uv": [ 3.5, 4.25, 4.0, 4.5 ] }, "east": { "texture": "#all", "uv": [ 4.0, 4.25, 4.5, 4.5 ] }, "south": { "texture": "#all", "uv": [ 4.5, 4.25, 5.25, 4.5 ] }, + "up": { "texture": "#all", "uv": [ 3.5, 3.5, 4.0, 4.25 ] }, "down": { "texture": "#all", "uv": [ 4.0, 3.5, 4.5, 4.25 ] } } }, From baf14c361b4d3b53c2c8c68e08e976a5d3a38049 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 11:59:22 -0600 Subject: [PATCH 181/935] Fix third person render --- .../resources/assets/botania/blockstates/spawnerClaw.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index 1d3a49dc9..da87704b7 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -16,6 +16,11 @@ }, "gui": { "translation": [ 0, 0.25, 0 ] + }, + "thirdperson": { + "translation": [ 0, 0.09375, -0.171875 ], + "rotation": [{ "x": 10 }, { "y": -45 }, { "z": 170 }], + "scale": [ 0.375, 0.375, 0.375 ] } } }] From 85102dea89c98629bc4344b605cdf04820e04fb5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 14:32:38 -0600 Subject: [PATCH 182/935] Mana inkwell item model. Pylon models fully working --- .../client/core/handler/ModelHandler.java | 16 ++- .../core/handler/RenderEventHandler.java | 5 +- .../botania/client/model/ModelPylon.java | 40 +++--- .../botania/client/model/PylonItemModel.java | 132 ++++++++++++++++++ .../assets/botania/blockstates/pylon.json | 3 +- .../botania/models/item/manaInkwell.json | 6 + 6 files changed, 175 insertions(+), 27 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/PylonItemModel.java create mode 100644 src/main/resources/assets/botania/models/item/manaInkwell.json 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 86f3ea394..a93500f4a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -17,16 +17,22 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; @@ -125,9 +131,7 @@ import java.util.Locale; public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). - // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files + // todo reorganize, alphabetize public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); @@ -416,9 +420,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.turntable); + // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); - // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); @@ -427,7 +432,6 @@ public final class ModelHandler { // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); @@ -564,7 +568,7 @@ public final class ModelHandler { registerItemModel(flightTiara); registerItemModel(divaCharm); registerItemModel(manaMirror); - // magnet ring and greater version - custom mesher + registerItemModel(manaInkwell); registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); registerItemModelAllMeta(laputaShard, 20); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java index 4159d6acf..c2512a739 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; @@ -65,11 +66,13 @@ public class RenderEventHandler { evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + + // Pylon item model + evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); } @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - System.out.println("CALLING TEXTURE STITCH"); alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 2e42a52a1..503de6719 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -16,6 +16,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -63,32 +64,31 @@ public class ModelPylon implements IPylonModel { public ModelPylon() { try { + // Load the OBJ OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + // Apply the texture and flip the v's of the model IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); - // Turn off all except "Crystal" - manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // All groups are off by default + // (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group) - // Turn off all except "Crystal_Ring", and "Ring_Panel0x" - manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // Turn on "Crystal" + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - // Turn off all except "Ring_Gem0x" - manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // Turn on "Crystal_Ring", and "Ring_Panel0x" + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn on "Ring_Gem0x" + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); } catch (IOException e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } @@ -105,20 +105,24 @@ public class ModelPylon implements IPylonModel { @Override public void renderRing(PylonVariant variant) { + GlStateManager.disableLighting(); switch (variant) { case MANA: renderModel(manaRingsAndPanes); break; case NATURA: renderModel(naturaRingsAndPanes); break; case GAIA: renderModel(gaiaRingsAndPanes); break; } + GlStateManager.enableLighting(); } @Override public void renderGems(PylonVariant variant) { + GlStateManager.disableLighting(); switch (variant) { case MANA: renderModel(manaGems); break; case NATURA: renderModel(naturaGems); break; case GAIA: renderModel(gaiaGems); break; } + GlStateManager.enableLighting(); } private void renderModel(IFlexibleBakedModel model) diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java new file mode 100644 index 000000000..783fbf5e2 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -0,0 +1,132 @@ +package vazkii.botania.client.model; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.fml.common.FMLLog; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.http.annotation.Immutable; +import org.apache.logging.log4j.Level; + +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import java.io.IOException; +import java.util.List; + +public class PylonItemModel implements ISmartItemModel { + + private IBakedModel mana; + private IBakedModel natura; + private IBakedModel gaia; + private boolean cached = false; + + @Override + public IBakedModel handleItemState(ItemStack stack) { + if (!cached) { + cacheModels(); + } + + switch (stack.getItemDamage()) { + case 2: return gaia; + case 1: return natura; + case 0: return mana; + default: + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + } + } + + private void cacheModels() { + // Load the OBJ + OBJModel model = null; + try { + model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + } catch (IOException e) { + FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); + mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + cached = true; + return; + } + + // Apply the texture and flip the v's of the model + IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); + IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); + IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); + + // All groups are off by default + // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group + + final Function textureGetter = new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }; + + ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", + "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", + "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + + mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + // Natura model is just the crystal + natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + cached = true; + } + + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + + // Wrapper to transform the model before rendering it, so it looks right in the inventory + private class PerspectiveWrapper implements IPerspectiveAwareModel { + + private final IFlexibleBakedModel parent; + + public PerspectiveWrapper(IBakedModel pylonModel) { + this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + switch(cameraTransformType) { + case FIRST_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); + case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); + case THIRD_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); + default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); + } + } + + @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return parent.getFaceQuads(p_177551_1_); } + @Override public List getGeneralQuads() { return parent.getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return parent.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } + } +} diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json index d182779bd..4b99230ed 100644 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -12,7 +12,6 @@ "mana": { "textures": { "#pylon": "botania:model/pylon" } }, "natura": { "textures": { "#pylon": "botania:model/pylon1" } }, "gaia": { "textures": { "#pylon": "botania:model/pylon2" } } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaInkwell.json b/src/main/resources/assets/botania/models/item/manaInkwell.json new file mode 100644 index 000000000..cca65a137 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaInkwell.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaInkwell" + } +} \ No newline at end of file From 064fd20edb7ad42f2e98285b829a3d19480feb51 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 16:56:03 -0600 Subject: [PATCH 183/935] Mana flash and water bowl items --- .../client/core/handler/ModelHandler.java | 2 ++ .../assets/botania/blockstates/manaFlame.json | 19 +++++++++++++++++++ .../assets/botania/models/item/waterBowl.json | 6 ++++++ 3 files changed, 27 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/manaFlame.json create mode 100644 src/main/resources/assets/botania/models/item/waterBowl.json 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 a93500f4a..e8e78b6ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -419,6 +419,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.tinyPotato); registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.turntable); + registerItemModel(ModBlocks.manaFlame); // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); @@ -569,6 +570,7 @@ public final class ModelHandler { registerItemModel(divaCharm); registerItemModel(manaMirror); registerItemModel(manaInkwell); + registerItemModel(waterBowl); registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); registerItemModelAllMeta(laputaShard, 20); diff --git a/src/main/resources/assets/botania/blockstates/manaFlame.json b/src/main/resources/assets/botania/blockstates/manaFlame.json new file mode 100644 index 000000000..6e603cbb6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaFlame.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/fire_layer_0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "minecraft:blocks/fire_layer_0" + }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterBowl.json b/src/main/resources/assets/botania/models/item/waterBowl.json new file mode 100644 index 000000000..0aa3fc48b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterBowl.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/waterBowl" + } +} \ No newline at end of file From e58eb1b3450d88bd2fa31bcd361fe0d7b5fb49f7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 17:03:28 -0600 Subject: [PATCH 184/935] Fix alfportal derp --- .../vazkii/botania/client/render/tile/RenderTileAlfPortal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 67ca9bcde..a5ac940ca 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -34,7 +34,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer Date: Thu, 7 Jan 2016 19:55:54 -0600 Subject: [PATCH 185/935] Safety guards for blockstates, remove all useless casts --- .../vazkii/botania/common/block/BlockAlfPortal.java | 4 ++-- .../vazkii/botania/common/block/BlockAltGrass.java | 10 ++++++---- .../vazkii/botania/common/block/BlockFelPumpkin.java | 2 +- .../vazkii/botania/common/block/BlockLivingrock.java | 2 +- .../vazkii/botania/common/block/BlockLivingwood.java | 2 +- .../vazkii/botania/common/block/BlockModFlower.java | 4 ++-- .../vazkii/botania/common/block/BlockOpenCrate.java | 2 +- .../vazkii/botania/common/block/BlockPlatform.java | 8 ++++---- .../java/vazkii/botania/common/block/BlockPylon.java | 4 ++-- .../botania/common/block/BlockSpecialFlower.java | 8 ++++---- .../java/vazkii/botania/common/block/BlockStorage.java | 4 ++-- .../vazkii/botania/common/block/ModFluffBlocks.java | 2 +- .../botania/common/block/decor/Block18Stone.java | 2 +- .../botania/common/block/decor/BlockBuriedPetals.java | 4 ++-- .../botania/common/block/decor/BlockCustomBrick.java | 4 ++-- .../botania/common/block/decor/BlockEndStoneBrick.java | 2 +- .../botania/common/block/decor/BlockManaBeacon.java | 4 ++-- .../botania/common/block/decor/BlockModMushroom.java | 6 +++--- .../botania/common/block/decor/BlockPavement.java | 2 +- .../botania/common/block/decor/BlockPetalBlock.java | 4 ++-- .../botania/common/block/decor/BlockPrismarine.java | 2 +- .../botania/common/block/decor/BlockShinyFlower.java | 2 +- .../botania/common/block/decor/BlockUnstable.java | 4 ++-- .../block/decor/biomestone/BlockBiomeStoneA.java | 2 +- .../block/decor/biomestone/BlockBiomeStoneB.java | 2 +- .../common/block/decor/walls/Block18StoneWall.java | 2 +- .../common/block/decor/walls/BlockBiomeStoneWall.java | 2 +- .../vazkii/botania/common/block/mana/BlockBellows.java | 2 +- .../botania/common/block/mana/BlockForestDrum.java | 6 +++--- .../vazkii/botania/common/block/mana/BlockPump.java | 2 +- .../botania/common/block/mana/BlockSpreader.java | 4 ++-- .../botania/common/block/string/BlockRedString.java | 2 +- .../common/block/string/BlockRedStringDispenser.java | 2 +- .../common/block/string/BlockRedStringInterceptor.java | 2 +- .../botania/common/block/tile/TileAlfPortal.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 4 +++- .../botania/common/block/tile/TileManaBeacon.java | 2 +- .../botania/common/block/tile/TileOpenCrate.java | 8 ++++++++ .../vazkii/botania/common/block/tile/TilePylon.java | 4 ++-- .../botania/common/block/tile/mana/TilePool.java | 8 ++++++++ .../botania/common/block/tile/mana/TileSpreader.java | 6 ++++++ .../common/block/tile/string/TileRedString.java | 2 +- .../java/vazkii/botania/common/brew/ModPotions.java | 2 +- .../botania/common/entity/EntityPoolMinecart.java | 2 +- .../botania/common/entity/EntityThrowableCopy.java | 4 ++-- 45 files changed, 93 insertions(+), 67 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index dfdb23634..8cc87e9c4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -60,7 +60,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public int getMetaFromState(IBlockState state) { - return ((AlfPortalState) state.getValue(BotaniaStateProps.ALFPORTAL_STATE)).ordinal(); + return state.getValue(BotaniaStateProps.ALFPORTAL_STATE).ordinal(); } @Override @@ -83,7 +83,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF ? 0 : 15; + return world.getBlockState(pos).getBlock() == this && world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index a9f7bf03c..bf3163d60 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -56,7 +56,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal(); } @Override @@ -83,8 +83,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - if(!world.isRemote && world.getLight(pos.up()) >= 9) { - AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + if(!world.isRemote && state.getBlock() == this && world.getLight(pos.up()) >= 9) { + AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); @@ -113,7 +113,9 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Override public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { - AltGrassVariant variant = ((AltGrassVariant) state.getValue(BotaniaStateProps.ALTGRASS_VARIANT)); + if (state.getBlock() != this) + return; + AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); switch(variant) { case DRY: // Dry break; diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index c0a238dbc..028ba8132 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -52,7 +52,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getHorizontalIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getHorizontalIndex(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 1a79596f5..e76391a55 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -50,7 +50,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((LivingRockVariant) state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a7399e0a6..fd685745c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -54,7 +54,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((LivingWoodVariant) state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3baf8d444..c31dde952 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -70,7 +70,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -146,7 +146,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public void grow(World world, Random rand, BlockPos pos, IBlockState state) { - placeDoubleFlower(world, pos, ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)), 1 | 2); + placeDoubleFlower(world, pos, state.getValue(BotaniaStateProps.COLOR), 1 | 2); } public static void placeDoubleFlower(World world, BlockPos pos, EnumDyeColor color, int flags) { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 43e45a294..c6dcfb424 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -73,7 +73,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public int getMetaFromState(IBlockState state) { - return ((CrateVariant) state.getValue(BotaniaStateProps.CRATE_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 0cdfa59b6..8f5e15611 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -57,7 +57,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public int getMetaFromState(IBlockState state) { - return ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal(); } @Override @@ -92,14 +92,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - PlatformVariant variant = ((PlatformVariant) state.getValue(BotaniaStateProps.PLATFORM_VARIANT)); + PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } @Override public float getBlockHardness(World par1World, BlockPos pos) { - PlatformVariant variant = ((PlatformVariant) par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + PlatformVariant variant = par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(par1World, pos); } @@ -110,7 +110,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - PlatformVariant variant = ((PlatformVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT)); + PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); return variant == PlatformVariant.ABSTRUSE ? LexiconData.platform : variant == PlatformVariant.INFRANGIBLE ? null : LexiconData.spectralPlatform; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 69a4bf812..2daf501b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -61,7 +61,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public int getMetaFromState(IBlockState state) { - return ((PylonVariant) state.getValue(BotaniaStateProps.PYLON_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal(); } @Override @@ -126,7 +126,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - PylonVariant variant = ((PylonVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT)); + PylonVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT); return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 759dfcd1e..3ffeedd59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -147,7 +147,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -163,7 +163,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; - return LightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), currentLight); + return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); } @Override @@ -283,7 +283,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public int getRenderColor(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)) + return state.getValue(BotaniaStateProps.COLOR) .getMapColor().colorValue; } @@ -297,7 +297,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.dye) { EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); - EnumDyeColor oldColor = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)); + EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); if(newColor != oldColor) world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 83eba0f92..d47743fd4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -53,7 +53,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.STORAGE_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal(); } @Override @@ -93,7 +93,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - StorageVariant variant = ((StorageVariant) world.getBlockState(pos).getValue(BotaniaStateProps.STORAGE_VARIANT)); + StorageVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.STORAGE_VARIANT); return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index adbf4d7d3..2a27dbb61 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -347,7 +347,7 @@ public final class ModFluffBlocks { stoneWall = new Block18StoneWall(); count = 0; - for (EnumDyeColor color : ((Collection) BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues())) { + for (EnumDyeColor color : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { pavementStairs[count] = new BlockPavementStairs(color); pavementSlabs[count] = new BlockPavementSlab(false, color, count); pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); 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 78ec915ad..c6c762697 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -52,7 +52,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((FutureStoneVariant) state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 791b3882c..8ab9f26e1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -40,12 +40,12 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockAccess world, BlockPos pos) { - return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - EnumDyeColor color = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)); + EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); int hex = color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; 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 259518421..4d89c6956 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -52,7 +52,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((CustomBrickVariant) state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal(); } @Override @@ -92,7 +92,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - CustomBrickVariant variant = ((CustomBrickVariant) world.getBlockState(pos).getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)); + CustomBrickVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT); return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; } 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 93fd8c6f0..0d7b73aee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -52,7 +52,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EndBrickVariant) state.getValue(BotaniaStateProps.ENDBRICK_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.ENDBRICK_VARIANT).ordinal(); } @Override 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 cf0dfb071..361dadb44 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -59,7 +59,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -104,7 +104,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { @Override public int getRenderColor(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @Override 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 f8b1c582b..22969c520 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -70,7 +70,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -117,7 +117,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockAccess world, BlockPos pos) { - return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @Override @@ -127,7 +127,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); 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 8645a56ce..d254c16bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -53,7 +53,7 @@ public class BlockPavement extends BlockMod { @Override public int getMetaFromState(IBlockState state) { - switch ((EnumDyeColor) state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) { + switch (state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) { case GREEN: return 5; case YELLOW: return 4; case RED: return 3; 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 9db19fef0..b05e3fc21 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -53,7 +53,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -83,7 +83,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public int getRenderColor(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @Override 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 3d33913b1..95666e451 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -53,7 +53,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((PrismarineVariant) state.getValue(BotaniaStateProps.PRISMARINE_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index d7c4cfa0a..402ccaa6c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -42,7 +42,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockAccess world, BlockPos pos) { - return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @Override 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 076ccc26b..dce351107 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -58,7 +58,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } @Override @@ -114,7 +114,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public int getRenderColor(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index c8d653c31..3379a6983 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -30,7 +30,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { @Override public int getMetaFromState(IBlockState state) { - return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index b5b558802..305ec2776 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -31,7 +31,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { @Override public int getMetaFromState(IBlockState state) { - return ((BiomeBrickVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index cd37e895b..f6e98269e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -45,7 +45,7 @@ public class Block18StoneWall extends BlockModWall { @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 5e6fa5f6e..e6ae28e1b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -45,7 +45,7 @@ public class BlockBiomeStoneWall extends BlockModWall { @Override public int getMetaFromState(IBlockState state) { - return ((Enum) state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT)).ordinal() - 8; + return state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ordinal() - 8; } @Override 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 01a7f7a83..d6d5e1a0c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -52,7 +52,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override 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 3185feca8..4bb8e57a1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -65,7 +65,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @Override public int getMetaFromState(IBlockState state) { - return ((DrumVariant) state.getValue(BotaniaStateProps.DRUM_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.DRUM_VARIANT).ordinal(); } @Override @@ -112,7 +112,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; - DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); + DrumVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT); if(variant == DrumVariant.WILD) ItemGrassHorn.breakGrass(world, null, 0, pos); else if(variant == DrumVariant.CANOPY) @@ -172,7 +172,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - DrumVariant variant = ((DrumVariant) world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT)); + DrumVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT); switch(variant) { case GATHERING: 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 3be8af538..da966197d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -68,7 +68,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { @Override public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - EnumFacing facing = ((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)); + EnumFacing facing = w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS); setBlockBounds(facing.getAxis()); } 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 bfebe0c69..f5dc4ba1d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -71,7 +71,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public int getMetaFromState(IBlockState state) { - return ((SpreaderVariant) state.getValue(BotaniaStateProps.SPREADER_VARIANT)).ordinal(); + return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal(); } @Override @@ -252,7 +252,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - SpreaderVariant variant = ((SpreaderVariant) world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT)); + SpreaderVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.SPREADER_VARIANT); return variant == SpreaderVariant.MANA ? LexiconData.spreader : variant == SpreaderVariant.REDSTONE ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } 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 04196b686..0394f774d 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -53,7 +53,7 @@ public abstract class BlockRedString extends BlockModContainer im @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + return state.getValue(BotaniaStateProps.FACING).getIndex(); } @Override 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 00268cc91..e29631dc0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -35,7 +35,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + int meta = state.getValue(BotaniaStateProps.FACING).getIndex(); if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index cd618e032..18e691611 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -42,7 +42,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public int getMetaFromState(IBlockState state) { - int meta = ((EnumFacing) state.getValue(BotaniaStateProps.FACING)).getIndex(); + int meta = state.getValue(BotaniaStateProps.FACING).getIndex(); if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { 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 bc2a39737..29d647063 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -194,7 +194,7 @@ public class TileAlfPortal extends TileMod implements ITickable { } public boolean onWanded() { - AlfPortalState state = ((AlfPortalState) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE)); + AlfPortalState state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE); if(state == AlfPortalState.OFF) { AlfPortalState newState = getValidState(); if(newState != AlfPortalState.OFF) { 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 5ba54544c..a90b01434 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -136,7 +136,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl @Override public void update() { IBlockState state = worldObj.getBlockState(getPos()); - EnumFacing.Axis axis = ((EnumFacing.Axis) state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)); + if (state.getBlock() != ModBlocks.enchanter) + return; + EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); if(getBlockMetadata() < PYLON_LOCATIONS.size()) for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 4f6c90714..f2f184082 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -29,7 +29,7 @@ public class TileManaBeacon extends TileMod implements ITickable { } if(!redstone) { - int hex = ((EnumDyeColor) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 874b323de..83b76bd79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -11,17 +11,25 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; public class TileOpenCrate extends TileSimpleInventory implements ITickable { + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return true; + } + @Override public int getSizeInventory() { return 1; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 389deda33..4f89ca9f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -36,7 +36,7 @@ public class TilePylon extends TileEntity implements ITickable { @Override public void update() { ++ticks; - PylonVariant variant = ((PylonVariant) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT)); + PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); if(activated && worldObj.isRemote) { if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && worldObj.getBlockState(centerPos).getBlock().getMetaFromState(worldObj.getBlockState(centerPos)) == 0) { // todo 1.8 clarify @@ -70,7 +70,7 @@ public class TilePylon extends TileEntity implements ITickable { Block block = worldObj.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int hex = ((EnumDyeColor) worldObj.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int hex = worldObj.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); 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 d1466210b..120522499 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 @@ -15,6 +15,7 @@ import java.util.List; import com.google.common.base.Predicates; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -27,12 +28,14 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; @@ -102,6 +105,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int ticks = 0; boolean sendPacket = false; + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return true; + } + @Override public boolean isFull() { Block blockBelow = worldObj.getBlockState(pos.down()).getBlock(); 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 19f0fc821..8b1c4b664 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 @@ -14,6 +14,7 @@ import java.util.List; import java.util.UUID; import com.google.common.base.Predicates; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -141,6 +142,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, List lastTentativeBurst; boolean invalidTentativeBurst = false; + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return true; + } + @Override public boolean isFull() { return mana >= getMaxMana(); 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 224ecdbf2..29b9cc751 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 @@ -76,7 +76,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick } public EnumFacing getOrientation() { - return ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.FACING)); + return worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.FACING); } public TileEntity getTileAtBinding() { diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index f6cbffe31..36c720875 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -60,7 +60,7 @@ public class ModPotions { } } catch (Exception e) { System.err.println("Severe error, please report this to the mod author:"); - System.err.println(e); + e.printStackTrace(); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index e41f83e92..6e4bc283e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -90,7 +90,7 @@ public class EntityPoolMinecart extends EntityMinecart { if(tile != null && tile instanceof IManaPool && !pump.hasRedstone) { IManaPool pool = (IManaPool) tile; - EnumFacing pumpDir = ((EnumFacing) worldObj.getBlockState(posP).getValue(BotaniaStateProps.CARDINALS)); + EnumFacing pumpDir = worldObj.getBlockState(posP).getValue(BotaniaStateProps.CARDINALS); boolean did = false; boolean can = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index b5597e2dd..b37a61a40 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -209,7 +209,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile for (int j = 0; j < list.size(); ++j) { - Entity entity1 = (Entity)list.get(j); + Entity entity1 = list.get(j); if (entity1.canBeCollidedWith() && (entity1 != entitylivingbase || this.ticksInAir >= 5)) { @@ -318,7 +318,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile tagCompound.setShort("xTile", (short)this.xTile); tagCompound.setShort("yTile", (short)this.yTile); tagCompound.setShort("zTile", (short)this.zTile); - ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); + ResourceLocation resourcelocation = Block.blockRegistry.getNameForObject(this.inTile); tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); tagCompound.setByte("shake", (byte)this.throwableShake); tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); From cd77b41d317c5903f3036e27d8e33ff581c97022 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 21:19:39 -0600 Subject: [PATCH 186/935] Incense plate converted to json --- .../client/core/handler/ModelHandler.java | 1 + .../render/tile/RenderTileIncensePlate.java | 4 +-- .../common/block/BlockIncensePlate.java | 5 --- .../botania/blockstates/incensePlate.json | 25 +++++++++++++ .../botania/models/block/incense_plate.json | 34 ++++++++++++++++++ .../botania/textures/model/incensePlate.png | Bin 15141 -> 453 bytes 6 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/incensePlate.json create mode 100644 src/main/resources/assets/botania/models/block/incense_plate.json 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 e8e78b6ed..82bd4bea5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -420,6 +420,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.turntable); registerItemModel(ModBlocks.manaFlame); + registerItemModel(ModBlocks.incensePlate); // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 5b64069f4..f05612bc5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -51,11 +51,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRendererR(z(L`C*$qbs_48a`54V^Vy4nl(Z^o?suK!zScwxSn6`Exu vmQP#eWy0rg{y%8pNF)-8L?V$$#Ve-Pi~nFt#vMbho?bwu81;dRN*l zK~O|Rf(r67B;Xq_2__Sa2r6S}m~Vg(K?yhnQ4(Kx5g~vvh|jfM+dbXYOO~1KDzwz=dYEUJSS)6ZIjm}=j$z$yH)FFib~_Dw&{{)C7vgkC z8Z(?+c9Syg?lv*3iQk{jopZdwV9wNa9p;g?Evj5>eo3Ed;XqbkMw&6ggzNq$*X6+BP8IjcQB>b33C~DT78<7f-vTD}v%{G5UBPk@MzPF1v%Q8ia{MY17~Ie9dL+=WQo8mM=CH`z^tc{ z#BNHq!e<@$n8l=@v$|}w^ftJiKQc4AovMfyNrC{un*4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE| zCAbhEc$475^Fh1>7Xk!t5?pvbh?n3(fZ$CmuKdiKiy#DFSB$~;5*w%Yxd7j3G>fGb zeu`=wN>K|JQPiI|;r$niirOgZ*BXlAn<(mjb;T2HB@|`aUFI8K89#AubxY_w+kGYX z7Ejtfs((rE2L{^jymWZex>L>C;J4Moc|X7W;)UA1i~Aj4G2)4neYRG8H|gDPmt3ds zyZiBlr+&Dxd|FlcjwZk_Sp_z&%o`fr{HQi)T4_;e$O>uShwah1JBDu$9@;(N=KLMp zW6RsmmORwEuZeD|I$qQ7g%j_tET}sBse5^F~xHy?cA*qOn@hAcbZy61Os*5AiA)L7S@K74fKQ&WyqZuzC@?2*++ z2hLVZH`*&())XvgG1XiHH)WIWP|({vhH78dYiC1A;9%JP`henXvld<6^J~HPo4)^J ze`}K|Z}DI4QL%abZx?svjgr?kU;X6dbLY-YY#aF10Y+Xs?2G52bi;#}&L6ul>uB5Q sE#vm>?N9ZjOyj7&-Q9W|dCf$H2i^R Date: Fri, 8 Jan 2016 11:29:03 -0600 Subject: [PATCH 187/935] Revert "Tentatively change relics to use UUID. Still use playernames for display" due to a better solution being merged upstream. This reverts commit 0687f56c32164cb098dc8cc45ae98dfc024bc11a. --- MC18_notes.txt | 1 - .../java/vazkii/botania/api/item/IRelic.java | 10 ++- .../crafting/recipe/AesirRingRecipe.java | 8 +-- .../common/entity/EntityDoppleganger.java | 11 ++-- .../common/item/relic/ItemAesirRing.java | 5 +- .../botania/common/item/relic/ItemRelic.java | 63 +++++++------------ .../common/item/relic/ItemRelicBauble.java | 9 ++- 7 files changed, 38 insertions(+), 69 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index c543eb846..48140b558 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -10,7 +10,6 @@ Anyways, vanilla removed it from their method so we follow suit. * Multiblock system reworked to use states and blockposes * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. * Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with -* IRelic changed to use UUIDs * Removed icon methods from SubTileSignature -- Other -- diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index d907d36b4..aecd1cde4 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -13,8 +13,6 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import java.util.UUID; - /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. @@ -22,14 +20,14 @@ import java.util.UUID; public interface IRelic { /** - * Binds to the player UUID passed in. + * Binds to the player name passed in. */ - public void bindToUuid(UUID playerName, ItemStack stack); + public void bindToUsername(String playerName, ItemStack stack); /** - * Gets the UUID of the person this relic is bound to. + * Gets the username of the person this relic is bound to. */ - public UUID getSoulbindUuid(ItemStack stack); + public String getSoulbindUsername(ItemStack stack); /** * Sets the achievement that this relic binds to. diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 4c1b65d57..1eed8838b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -18,8 +18,6 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; -import java.util.UUID; - public class AesirRingRecipe implements IRecipe { @Override @@ -46,13 +44,13 @@ public class AesirRingRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting var1) { - UUID soulbind = null; + String soulbind = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { if(stack.getItem() instanceof IRelic) { - UUID bind = ((IRelic) stack.getItem()).getSoulbindUuid(stack); + String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); if(soulbind == null) soulbind = bind; else if(!soulbind.equals(bind)) @@ -62,7 +60,7 @@ public class AesirRingRecipe implements IRecipe { } ItemStack stack = new ItemStack(ModItems.aesirRing); - ((IRelic) ModItems.aesirRing).bindToUuid(soulbind, stack); + ((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack); return stack; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 5fadcd58d..719cc4b37 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -14,10 +14,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import java.util.UUID; import java.util.regex.Pattern; import net.minecraft.block.Block; @@ -116,7 +113,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList(); private static boolean isPlayingMusic = false; @@ -366,8 +363,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; - if(!playersWhoAttacked.contains(player.getUniqueID())) - playersWhoAttacked.add(player.getUniqueID()); + if(!playersWhoAttacked.contains(player.getName())) + playersWhoAttacked.add(player.getName()); float dmg = par2; boolean crit = false; @@ -454,7 +451,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); if(ConfigHandler.relicsEnabled) { ItemStack dice = new ItemStack(ModItems.dice); - ItemRelic.bindToUuidS(playersWhoAttacked.get(pl), dice); + ItemRelic.bindToUsernameS(playersWhoAttacked.get(pl), dice); entityDropItem(dice, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 27ba122c0..9c91f84f7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -11,7 +11,6 @@ package vazkii.botania.common.item.relic; import java.util.List; -import java.util.UUID; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -62,10 +61,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe if(stack.getItem() != null && stack.getItem() == this) { event.entityItem.setDead(); - UUID user = getSoulbindUuid(stack); + String user = getSoulbindUsername(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); - bindToUuid(user, stack1); + bindToUsername(user, stack1); EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 2b7a0276c..88f93bfeb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,9 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; -import java.util.UUID; -import com.mojang.authlib.GameProfile; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -32,8 +30,7 @@ import vazkii.botania.common.item.ModItems; public class ItemRelic extends ItemMod implements IRelic { - private static final String TAG_SOLBIND_NAME = "soulbind"; - private static final String TAG_SOULBIND_UUID = "soulbindUuid"; + private static final String TAG_SOULBIND = "soulbind"; Achievement achievement; @@ -53,19 +50,15 @@ public class ItemRelic extends ItemMod implements IRelic { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { - UUID bind = getSoulbindUuidS(stack); - if(bind == null) + String bind = getSoulbindUsernameS(stack); + if(bind.isEmpty()) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); else { - String disp = getSoulbindNameS(stack); - if (disp.isEmpty()) { - disp = bind.toString(); - } - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), disp), list); + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list); if(!isRightPlayer(player, stack)) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), disp), list); + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); } if(stack.getItem() == ModItems.aesirRing) @@ -93,28 +86,19 @@ public class ItemRelic extends ItemMod implements IRelic { tooltip.add(s.replaceAll("&", "\u00a7")); } - public static UUID getSoulbindUuidS(ItemStack stack) { - try { - return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); - } catch (IllegalArgumentException ex) { - // Bad text in tag - return null; - } - } - - public static String getSoulbindNameS(ItemStack stack) { - return ItemNBTHelper.getString(stack, TAG_SOLBIND_NAME, ""); + public static String getSoulbindUsernameS(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); } public static void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; - UUID soulbind = getSoulbindUuidS(stack); - if(soulbind == null) { + String soulbind = getSoulbindUsernameS(stack); + if(soulbind.isEmpty()) { player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); bindToPlayer(player, stack); - soulbind = getSoulbindUuidS(stack); + soulbind = getSoulbindUsernameS(stack); } if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer())) @@ -122,24 +106,19 @@ public class ItemRelic extends ItemMod implements IRelic { } public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUuidS(player.getUniqueID(), stack); - bindToNameS(player.getName(), stack); + bindToUsernameS(player.getName(), stack); } - public static void bindToNameS(String playerName, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOLBIND_NAME, playerName); - } - - public static void bindToUuidS(UUID uuid, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); + public static void bindToUsernameS(String username, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND, username); } public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - return isRightPlayer(player.getUniqueID(), stack); + return isRightPlayer(player.getName(), stack); } - public static boolean isRightPlayer(UUID uuid, ItemStack stack) { - return uuid.equals(getSoulbindUuidS(stack)); + public static boolean isRightPlayer(String player, ItemStack stack) { + return getSoulbindUsernameS(stack).equals(player); } public static DamageSource damageSource() { @@ -147,13 +126,13 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public void bindToUuid(UUID playerName, ItemStack stack) { - bindToUuidS(playerName, stack); + public void bindToUsername(String playerName, ItemStack stack) { + bindToUsernameS(playerName, stack); } @Override - public UUID getSoulbindUuid(ItemStack stack) { - return getSoulbindUuidS(stack); + public String getSoulbindUsername(ItemStack stack) { + return getSoulbindUsernameS(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 7c459db07..6d735743b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -11,7 +11,6 @@ package vazkii.botania.common.item.relic; import java.util.List; -import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -65,13 +64,13 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void bindToUuid(UUID playerName, ItemStack stack) { - ItemRelic.bindToUuidS(playerName, stack); + public void bindToUsername(String playerName, ItemStack stack) { + ItemRelic.bindToUsernameS(playerName, stack); } @Override - public UUID getSoulbindUuid(ItemStack stack) { - return ItemRelic.getSoulbindUuidS(stack); + public String getSoulbindUsername(ItemStack stack) { + return ItemRelic.getSoulbindUsernameS(stack); } @Override From 972943a9acca287535e1e895d8be266d5dbdd021 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 12:33:49 -0600 Subject: [PATCH 188/935] Updates to internal handler and icons --- .../vazkii/botania/api/BotaniaAPIClient.java | 22 +++++-- .../api/internal/DummyMethodHandler.java | 11 ++-- .../api/internal/IInternalMethodHandler.java | 8 ++- .../botania/api/subtile/SubTileEntity.java | 17 ++++-- .../client/model/FloatingFlowerModel.java | 57 ++++++------------- .../client/render/SpecialFlowerModel.java | 4 +- .../core/handler/InternalMethodHandler.java | 17 +++--- 7 files changed, 70 insertions(+), 66 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index e2de209a0..cbf501dd2 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -1,11 +1,13 @@ package vazkii.botania.api; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.Collections; import java.util.Map; /** @@ -14,15 +16,14 @@ import java.util.Map; @SideOnly(Side.CLIENT) public final class BotaniaAPIClient { - public static final Map queuedBlockModels = Maps.newHashMap(); - public static final Map queuedItemModels = Maps.newHashMap(); + private static final Map queuedBlockModels = Maps.newHashMap(); + private static final Map queuedItemModels = Maps.newHashMap(); /** * Register your model for the given subtile class here. * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. * Your model json must specify key "tintindex" in all the faces it wants tint applied. * Tint is applied whenever a player recolors the flower using floral dye - * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process * * @param subTileName The String ID of the subtile * @param model A path to a blockstate json and variant to be used for this subtile @@ -38,7 +39,6 @@ public final class BotaniaAPIClient { * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. * Your model json must specify key "tintindex" in all the faces it wants tint applied. * Tint is applied whenever a player recolors the flower using floral dye - * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process * * @param subTileName The String ID of the subtile * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" @@ -56,6 +56,20 @@ public final class BotaniaAPIClient { registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); } + /** + * @return An immutable view of the registered subtile block model map + */ + public static Map getRegisteredSubtileBlockModels() { + return Collections.unmodifiableMap(queuedBlockModels); + } + + /** + * @return An immutable view of the registered subtile item model map + */ + public static Map getRegisteredSubtileItemModels() { + return Collections.unmodifiableMap(queuedItemModels); + } + private BotaniaAPIClient() {} } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index a51301678..667f51895 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,6 +28,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -134,13 +137,13 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public TextureAtlasSprite getSubTileIconForName(String name) { - return null; //todo 1.8 return Blocks.red_flower.getIcon(0, 0); + public ModelResourceLocation getSubTileBlockModelForName(String name) { + return new ModelResourceLocation("builtin/missing", "missing"); } @Override - public void registerBasicSignatureIcons(String name, TextureMap map) { - // NO-OP + public ModelResourceLocation getSubTileItemModelForName(String name) { + return new ModelResourceLocation("builtin/missing", "missing"); } @Override diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index a6b0585f1..d1a8a26c3 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -85,10 +86,11 @@ public interface IInternalMethodHandler { public String getStackSubTileKey(ItemStack stack); - // todo 1.8 evaluate need for these two - public TextureAtlasSprite getSubTileIconForName(String name); + @SideOnly(Side.CLIENT) + public ModelResourceLocation getSubTileBlockModelForName(String name); - public void registerBasicSignatureIcons(String name, TextureMap map); + @SideOnly(Side.CLIENT) + public ModelResourceLocation getSubTileItemModelForName(String name); public boolean shouldForceCheck(); diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index ac5b5619e..718cc889f 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -17,6 +17,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -94,11 +95,19 @@ public class SubTileEntity { } /** - * Gets the icon for this SubTileEntity, this is a block icon. + * Gets the block model path for this subtile */ - @SideOnly(Side.CLIENT) // todo 1.8 reevaluate need - public TextureAtlasSprite getIcon() { - return BotaniaAPI.internalHandler.getSubTileIconForName(getUnlocalizedName()); + @SideOnly(Side.CLIENT) + public ModelResourceLocation getBlockModel() { + return BotaniaAPI.internalHandler.getSubTileBlockModelForName(getUnlocalizedName()); + } + + /** + * Gets the item model path for this subtile + */ + @SideOnly(Side.CLIENT) + public ModelResourceLocation getItemModel() { + return BotaniaAPI.internalHandler.getSubTileItemModelForName(getUnlocalizedName()); } /** diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index da7c35b62..09541e561 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -96,6 +96,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I return getModel(islandType, identifier); } + // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, String identifier) { ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); @@ -177,59 +178,35 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I genQuads = genBuilder.build(); } - @Override - public List getGeneralQuads() { + // Forward all to flower model + @Override public List getGeneralQuads() { return genQuads; } - - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - - @Override - public boolean isAmbientOcclusion() { + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return base.isAmbientOcclusion(); } - - @Override - public boolean isGui3d() { + @Override public boolean isGui3d() { return true; } - - @Override - public boolean isBuiltInRenderer() { + @Override public boolean isBuiltInRenderer() { return base.isBuiltInRenderer(); } - - @Override - public TextureAtlasSprite getParticleTexture() { + @Override public TextureAtlasSprite getParticleTexture() { return base.getParticleTexture(); } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { + @Override public ItemCameraTransforms getItemCameraTransforms() { return base.getItemCameraTransforms(); } } - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - - @Override - public List getGeneralQuads() { return ImmutableList.of(); } - - @Override - public boolean isAmbientOcclusion() { return false; } - - @Override - public boolean isGui3d() { return true; } - - @Override - public boolean isBuiltInRenderer() { return false; } - - @Override - public TextureAtlasSprite getParticleTexture() { return null; } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + // Dummy results + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } } diff --git a/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java index 0b2b61734..52ab1b668 100644 --- a/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java @@ -108,10 +108,10 @@ public class SpecialFlowerModel implements IModelCustomData { } } - for (Map.Entry e : BotaniaAPIClient.queuedBlockModels.entrySet()) { + for (Map.Entry e : BotaniaAPIClient.getRegisteredSubtileBlockModels().entrySet()) { blockBuilder.put(Optional.of(e.getKey()), e.getValue()); } - for (Map.Entry e : BotaniaAPIClient.queuedItemModels.entrySet()) { + for (Map.Entry e : BotaniaAPIClient.getRegisteredSubtileItemModels().entrySet()) { itemBuilder.put(Optional.of(e.getKey()), e.getValue()); } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 6c52b1a8b..28e42c054 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -30,6 +31,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IManaNetwork; @@ -46,6 +49,7 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.render.SpecialFlowerModel; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockSpecialFlower; @@ -98,18 +102,13 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public TextureAtlasSprite getSubTileIconForName(String name) { -// IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); -// return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; todo 1.8 - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:red_flower"); + public ModelResourceLocation getSubTileBlockModelForName(String name) { + return BotaniaAPIClient.getRegisteredSubtileBlockModels().get(name); } @Override - public void registerBasicSignatureIcons(String name, TextureMap map) { -// IIcon normal = IconHelper.forName(register, name); todo 1.8 -// IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); -// BlockSpecialFlower.icons.put(name, normal); -// BlockSpecialFlower.iconsAlt.put(name, alt == null ? normal : alt); + public ModelResourceLocation getSubTileItemModelForName(String name) { + return BotaniaAPIClient.getRegisteredSubtileItemModels().get(name); } @Override From 9c3a042089cc027d3bd5d964055eba16e2e862be Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 14:14:17 -0600 Subject: [PATCH 189/935] pool tesr now uses baked model --- .../client/core/handler/ModelHandler.java | 17 +++++- .../client/render/tile/RenderTilePool.java | 52 +++++++++++-------- .../assets/botania/blockstates/pool.json | 11 ++-- 3 files changed, 51 insertions(+), 29 deletions(-) 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 82bd4bea5..453ae0bed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -155,6 +155,7 @@ public final class ModelHandler { registerAltars(); registerQuartzBlocks(); registerLuminizers(); + registerPools(); /** Normal Items **/ registerStandardItems(); @@ -445,7 +446,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant"); } private static void registerStandardItems() { @@ -1020,6 +1020,21 @@ public final class ModelHandler { } } + private static void registerPools() { + Item item = Item.getItemFromBlock(ModBlocks.pool); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.pool).toString(); + for (PoolVariant v : PoolVariant.values()) { + if (v == PoolVariant.CREATIVE) { + // Special case to have mana water layer + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_creative")); + ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "inventory_creative")); + } else { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=" + v.getName())); + ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "variant=" + v.getName())); + } + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 073993e97..a503c8f28 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -17,13 +17,18 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -62,31 +67,32 @@ public class RenderTilePool extends TileEntitySpecialRenderer { boolean dil = pool.getWorld() == null ? forceMeta == 2 : pool.getBlockMetadata() == 2; boolean fab = pool.getWorld() == null ? forceMeta == 3 : pool.getBlockMetadata() == 3; - Minecraft.getMinecraft().renderEngine.bindTexture(inf ? textureInf : dil ? textureDil : texture); - - GlStateManager.translate(0.5F, 1.5F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - if(fab) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - if(pool != null) - time += new Random(pool.getPos().hashCode()).nextInt(100000); - - Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F); - GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); - } else { - int hex = pool.color.getMapColor().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); - GlStateManager.color(r, g, b, a); - } - - model.render(); - GL11.glColor4f(1F, 1F, 1F, a); // Use GL11 manually since we call color4ub above, and GlStateManager doesn't know that, so the color leaks - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + int color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha + if (fab) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); + Tessellator tess = Tessellator.getInstance(); + tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); + + for (BakedQuad quad : model.getGeneralQuads()) { + LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); + } + + for (EnumFacing e : EnumFacing.VALUES) { + for (BakedQuad quad: model.getFaceQuads(e)) { + LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); + } + } + + tess.draw(); + + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.color(1, 1, 1, a); + GlStateManager.enableRescaleNormal(); int mana = pool.getCurrentMana(); if(forceManaNumber > -1) diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index ea7047149..77eb376ee 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -8,14 +8,15 @@ "variant": { "default": { "textures": { "all": "botania:model/poolCopy" } }, "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, - "creative": { - "model": "botania:pool_filled", - "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } - }, + "creative": { "textures": { "all": "botania:model/infinitePoolCopy" } }, "fabulous": { "model": "botania:pool_tinted", "textures": { "all": "botania:model/poolCopy" } } - } + }, + "inventory_creative": [{ + "model": "botania:pool_filled", + "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } + }] } } \ No newline at end of file From 84d0c7560598e94a9ac64af0c9b267389df88185 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 14:56:16 -0600 Subject: [PATCH 190/935] Fix lighting, AO is still broken --- .../vazkii/botania/client/render/tile/RenderTilePool.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index a503c8f28..1f9082418 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -69,15 +70,20 @@ public class RenderTilePool extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - int color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha + int color; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } else { + color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha } + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); Tessellator tess = Tessellator.getInstance(); + tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); + GlStateManager.disableLighting(); for (BakedQuad quad : model.getGeneralQuads()) { LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); } From b4df8ce418333d52948db897547ea0694f5a38ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 18:47:31 -0600 Subject: [PATCH 191/935] Full platform models. Fix bore lens crash and add copyleft headers to some things --- .../botania/api/state/BotaniaStateProps.java | 6 +- .../botania/api/state/PropertyState.java | 43 ++++++++++++++ .../botania/api/state/PropertyString.java | 1 + .../client/core/handler/ModelHandler.java | 17 ++++-- .../core/handler/RenderEventHandler.java | 7 ++- .../botania/client/model/PlatformModel.java | 58 +++++++++++++++++++ .../botania/client/model/PylonItemModel.java | 8 +++ .../botania/common/block/BlockCamo.java | 37 +++--------- .../botania/common/block/BlockPlatform.java | 29 +++++++++- .../botania/common/block/tile/TileCamo.java | 16 ++--- .../common/block/tile/TilePlatform.java | 7 +-- .../botania/common/item/lens/LensMine.java | 3 + .../assets/botania/blockstates/platform.json | 14 +++++ 13 files changed, 196 insertions(+), 50 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/PropertyState.java create mode 100644 src/main/java/vazkii/botania/client/model/PlatformModel.java create mode 100644 src/main/resources/assets/botania/blockstates/platform.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index c4b9c604f..4d96a6a68 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -25,10 +25,14 @@ import vazkii.botania.api.state.enums.*; */ public class BotaniaStateProps { - /** The property for specialFlower **/ + /** Unlisted properties **/ + // The property for specialFlower subtile id public static final PropertyString SUBTILE_ID = new PropertyString("subtile_id"); + // The property for platform held blockstate id + public static final PropertyState HELD_STATE = new PropertyState("held_state"); + /** Common properties to all blocks to use **/ // The 16 Minecraft colors diff --git a/src/main/java/vazkii/botania/api/state/PropertyState.java b/src/main/java/vazkii/botania/api/state/PropertyState.java new file mode 100644 index 000000000..a1abccc4f --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/PropertyState.java @@ -0,0 +1,43 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.api.state; + +import net.minecraft.block.state.IBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; + +// An unlisted property that holds an IBlockState. Used for platform rendering +public class PropertyState implements IUnlistedProperty { + + private final String name; + + public PropertyState(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean isValid(IBlockState value) { + return true; + } + + @Override + public Class getType() { + return IBlockState.class; + } + + @Override + public String valueToString(IBlockState value) { + return value.toString(); + } + +} diff --git a/src/main/java/vazkii/botania/api/state/PropertyString.java b/src/main/java/vazkii/botania/api/state/PropertyString.java index b3a9799f6..f1a0b4cdd 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyString.java +++ b/src/main/java/vazkii/botania/api/state/PropertyString.java @@ -10,6 +10,7 @@ package vazkii.botania.api.state; import net.minecraftforge.common.property.IUnlistedProperty; +// An unlisted property that holds a String, used for subtile rendering public class PropertyString implements IUnlistedProperty { private final String name; 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 453ae0bed..2062c09c7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -38,6 +38,7 @@ import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPIClient; +import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.client.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; @@ -446,6 +447,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); } private static void registerStandardItems() { @@ -697,7 +699,7 @@ public final class ModelHandler { } private static void registerStateMappers() { - // Override for floating flowers + // Override to let smartmodels work, see RenderEventHandler ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMapperBase() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { @@ -712,23 +714,28 @@ public final class ModelHandler { } }); + ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation("botania:platform", "normal"); + } + }); + // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - // Ignore color in unstable cube, mana beacon, and petals (handled by color multiplier) + // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by color multiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); // Ignore vanilla variant in flowers ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - // Ignore in special flower to suppress errors (handled in custom statemapper in BlockSpecialFlower - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - // Ignore vanilla variant in walls ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java index c2512a739..c01b35853 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -9,8 +9,10 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; +import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; @@ -43,7 +45,7 @@ public class RenderEventHandler { public TextureAtlasSprite[] kingKeyWeaponIcons; public Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); - // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed + // begin dank_memes public TextureAtlasSprite tailIcon = null; public TextureAtlasSprite phiFlowerIcon = null; public TextureAtlasSprite goldfishIcon = null; @@ -69,6 +71,9 @@ public class RenderEventHandler { // Pylon item model evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); + + // Platforms + evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java new file mode 100644 index 000000000..6b3ea4c30 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -0,0 +1,58 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ + package vazkii.botania.client.model; + +import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.common.property.IExtendedBlockState; +import vazkii.botania.api.state.BotaniaStateProps; + +import java.util.List; + +public class PlatformModel implements ISmartBlockModel { + + @Override + public IBakedModel handleBlockState(IBlockState state) { + EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); + IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); + + Minecraft mc = Minecraft.getMinecraft(); + if (heldState == null && layer == EnumWorldBlockLayer.SOLID) { + // No camo + ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); + return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + } else if (heldState != null){ + if (heldState.getBlock().canRenderInLayer(layer)) { + // Steal camo's model + return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); + } + } + + return this; // This smart model has no quads as seen below, so nothing actually renders + } + + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return true; } + @Override public boolean isGui3d() { return true;} + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + +} diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 783fbf5e2..3988f6061 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.model; import com.google.common.base.Function; diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index c2ba925d9..5c06d34c5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -31,18 +31,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockCamo extends BlockModContainer { - static List validRenderTypes = Arrays.asList(0, 31, 39); - protected BlockCamo(Material par2Material) { super(par2Material); } public static boolean isValidBlock(Block block) { - return block.isOpaqueCube() || isValidRenderType(block.getRenderType()); - } - - public static boolean isValidRenderType(int type) { - return validRenderTypes.contains(type); + return block.isOpaqueCube() || block.getRenderType() == 3; } @Override @@ -72,28 +66,13 @@ public abstract class BlockCamo extends BlockModContainer { } if(doChange && currentStack.getItem() != null) { - int metadata = currentStack.getItemDamage(); + IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); if(block instanceof BlockDirectional) { - switch (par6) { - case DOWN: - case UP: - break; - case NORTH: - metadata = metadata & 12 | 2; - break; - case SOUTH: - metadata = metadata & 12; - break; - case WEST: - metadata = metadata & 12 | 1; - break; - case EAST: - metadata = metadata & 12 | 3; - break; + if (BlockDirectional.FACING.getAllowedValues().contains(par6.getOpposite())) { + changeState = changeState.withProperty(BlockDirectional.FACING, par6.getOpposite()); } } - camo.camo = Block.getBlockFromItem(currentStack.getItem()); - camo.camoMeta = metadata; + camo.camoState = changeState; par1World.markBlockForUpdate(pos); return true; @@ -119,9 +98,9 @@ public abstract class BlockCamo extends BlockModContainer { TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - Block block = camo.camo; - if(block != null) - return block instanceof BlockCamo ? 0xFFFFFF : block.getRenderColor(block.getDefaultState()); // todo + IBlockState state = camo.camoState; + if(state != null) + return state.getBlock() instanceof BlockCamo ? 0xFFFFFF : state.getBlock().getRenderColor(state); } return 0xFFFFFF; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 8f5e15611..8b94277e8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -24,7 +25,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -47,12 +53,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable setResistance(5.0F); setStepSound(Block.soundTypeWood); setUnlocalizedName(LibBlockNames.PLATFORM); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + setDefaultState(((IExtendedBlockState) blockState.getBaseState()) + .withProperty(BotaniaStateProps.HELD_STATE, null) + .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.PLATFORM_VARIANT); + return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE }); } @Override @@ -68,6 +76,21 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); } + @Override + public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + if (world.getTileEntity(pos) instanceof TileCamo) { + TileCamo tile = ((TileCamo) world.getTileEntity(pos)); + return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); + } else { + return ((IExtendedBlockState) state); + } + } + + @Override + public boolean canRenderInLayer(EnumWorldBlockLayer layer) { + return true; + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -93,7 +116,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); - if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } 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 50826c644..39cd30cca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; @@ -21,21 +22,22 @@ public class TileCamo extends TileMod { private static final String TAG_CAMO = "camo"; private static final String TAG_CAMO_META = "camoMeta"; - public Block camo; - public int camoMeta; + public IBlockState camoState; @Override public void writeCustomNBT(NBTTagCompound cmp) { - if(camo != null) { - cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camo).toString()); - cmp.setInteger(TAG_CAMO_META, camoMeta); + if(camoState != null) { + cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camoState.getBlock()).toString()); + cmp.setInteger(TAG_CAMO_META, camoState.getBlock().getMetaFromState(camoState)); } } @Override public void readCustomNBT(NBTTagCompound cmp) { - camo = Block.getBlockFromName(cmp.getString(TAG_CAMO)); - camoMeta = cmp.getInteger(TAG_CAMO_META); + Block b = Block.getBlockFromName(cmp.getString(TAG_CAMO)); + if (b != null) { + camoState = b.getStateFromMeta(cmp.getInteger(TAG_CAMO_META)); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index b3a9059dc..b22e90348 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -25,7 +25,7 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost { public boolean onWanded(EntityPlayer player) { if(player != null) { - if(camo == null || player.isSneaking()) + if(camoState == null || player.isSneaking()) swapSelfAndPass(this, true); else swapSurroudings(this, false); return true; @@ -45,15 +45,14 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost { TileEntity tileAt = worldObj.getTileEntity(pos); if(tileAt != null && tileAt instanceof TilePlatform) { TilePlatform platform = (TilePlatform) tileAt; - if(empty ? platform.camo != null : platform.camo == null) + if(empty ? platform.camoState != null : platform.camoState == null) swapSelfAndPass(platform, empty); } } } void swap(TilePlatform tile, boolean empty) { - tile.camo = empty ? null : camo; - tile.camoMeta = empty ? 0 : camoMeta; + tile.camoState = empty ? null : camoState; worldObj.markBlockForUpdate(tile.getPos()); } 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 f859c3506..05da5ad08 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -36,6 +36,9 @@ public class LensMine extends Lens { World world = entity.worldObj; BlockPos pos_ = pos.getBlockPos(); + if (pos_ == null) + return false; + Block block = world.getBlockState(pos_).getBlock(); ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); diff --git a/src/main/resources/assets/botania/blockstates/platform.json b/src/main/resources/assets/botania/blockstates/platform.json new file mode 100644 index 000000000..a49c7b032 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/platform.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "abstruse": { "textures": { "all": "botania:blocks/platform0" } }, + "spectral": { "textures": { "all": "botania:blocks/platform1" } }, + "infrangible": { "textures": { "all": "botania:blocks/platform2" } } + } + } +} \ No newline at end of file From 9e16c4490bd2555fb958669594bb9d782aa74483 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 19:10:28 -0600 Subject: [PATCH 192/935] Rename RenderEventHandler, restore flugel tiara extra renders, and fix sparkles renderirng too low. Closes #21 --- .../handler/ContributorFancinessHandler.java | 13 +++---------- ...ntHandler.java => MiscellaneousIcons.java} | 14 ++++++++++---- .../client/core/proxy/ClientProxy.java | 6 ++---- .../elventrade/ElvenTradeRecipeCategory.java | 4 ++-- .../render/entity/RenderBabylonWeapon.java | 7 ++----- .../render/entity/RenderCorporeaSpark.java | 18 +++--------------- .../client/render/entity/RenderSpark.java | 5 ++--- .../client/render/entity/RenderSparkBase.java | 5 ++--- .../render/tile/RenderTileAlfPortal.java | 8 +++----- .../render/tile/RenderTileEnchanter.java | 8 ++------ .../render/tile/RenderTileLightRelay.java | 8 ++------ .../client/render/tile/RenderTilePool.java | 8 ++------ .../render/tile/RenderTileTerraPlate.java | 6 ++---- .../render/tile/RenderTileTinyPotato.java | 17 ++++------------- .../block/mana/BlockAlchemyCatalyst.java | 8 ++------ .../common/block/mana/BlockManaVoid.java | 10 ++-------- .../buildcraft/TriggerManaDetector.java | 8 ++------ .../buildcraft/TriggerManaLevel.java | 8 ++------ .../buildcraft/TriggerRuneAltarCanCraft.java | 8 ++------ .../equipment/bauble/ItemFlightTiara.java | 19 ++++++++----------- .../common/lexicon/page/PageElvenRecipe.java | 6 ++---- 21 files changed, 61 insertions(+), 133 deletions(-) rename src/main/java/vazkii/botania/client/core/handler/{RenderEventHandler.java => MiscellaneousIcons.java} (91%) 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 ebc977426..a77e46ce9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -18,19 +18,14 @@ import java.util.Properties; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender.Helper; @@ -39,9 +34,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.item.material.ItemManaResource; import net.minecraftforge.fml.common.FMLLog; public final class ContributorFancinessHandler implements LayerRenderer { @@ -101,7 +94,7 @@ public final class ContributorFancinessHandler implements LayerRenderer manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + public TextureAtlasSprite[] tiaraWingIcons; // begin dank_memes public TextureAtlasSprite tailIcon = null; @@ -111,7 +112,12 @@ public class RenderEventHandler { for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { manaLevelTriggerIcons.put(s, IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); } + + tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; + for (int i = 0; i < tiaraWingIcons.length; i++) { + tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + i, "items"); + } } - private RenderEventHandler() {} + private MiscellaneousIcons() {} } 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 d95109c94..16ac0a542 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -55,7 +55,7 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -95,7 +95,6 @@ import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.client.render.tile.RenderTileRuneAltar; import vazkii.botania.client.render.tile.RenderTileSkullOverride; import vazkii.botania.client.render.tile.RenderTileSparkChanger; -import vazkii.botania.client.render.tile.RenderTileSpawnerClaw; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.client.render.tile.RenderTileStarfield; import vazkii.botania.client.render.tile.RenderTileTerraPlate; @@ -117,7 +116,6 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSparkChanger; -import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTeruTeruBozu; @@ -179,7 +177,7 @@ public class ClientProxy extends CommonProxy { super.preInit(event); - MinecraftForge.EVENT_BUS.register(RenderEventHandler.INSTANCE); + MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); } 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 fe85ab7a2..121b6bc3a 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 @@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import javax.annotation.Nonnull; import java.util.Collection; @@ -71,7 +71,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { @Override public void drawAnimations(Minecraft minecraft) { minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - TextureAtlasSprite sprite = RenderEventHandler.INSTANCE.alfPortalTex; + TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); WorldRenderer wr = tess.getWorldRenderer(); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); 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 d8cbeb00a..2466d3c50 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -14,7 +14,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -22,17 +21,15 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; -import vazkii.botania.common.item.relic.ItemKingKey; public class RenderBabylonWeapon extends Render { @@ -62,7 +59,7 @@ public class RenderBabylonWeapon extends Render { GlStateManager.scale(s, s, s); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.rotate(45F, 0F, 0F, 1F); - TextureAtlasSprite icon = RenderEventHandler.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; + TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; GlStateManager.color(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); 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 521b7a1fa..af957786c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,26 +10,14 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.item.ItemCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @@ -39,7 +27,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? RenderEventHandler.INSTANCE.corporeaWorldIconMaster : RenderEventHandler.INSTANCE.corporeaWorldIcon; + return entity.isMaster() ? MiscellaneousIcons.INSTANCE.corporeaWorldIconMaster : MiscellaneousIcons.INSTANCE.corporeaWorldIcon; } @Override @@ -54,7 +42,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return RenderEventHandler.INSTANCE.corporeaIconStar; + return MiscellaneousIcons.INSTANCE.corporeaIconStar; } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 3992b8628..cbda1c6a2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,9 +12,8 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderSpark extends RenderSparkBase { @@ -25,7 +24,7 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < RenderEventHandler.INSTANCE.sparkUpgradeIcons.length ? RenderEventHandler.INSTANCE.sparkUpgradeIcons[upgrade] : null; + return upgrade >= 0 && upgrade < MiscellaneousIcons.INSTANCE.sparkUpgradeIcons.length ? MiscellaneousIcons.INSTANCE.sparkUpgradeIcons[upgrade] : null; } } 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 ef26a2607..e97be636b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -25,9 +25,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.item.ItemSpark; public class RenderSparkBase extends RenderEntity { @@ -82,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return RenderEventHandler.INSTANCE.sparkWorldIcon; + return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } public void colorSpinningIcon(T entity, float a) { 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 a5ac940ca..552268409 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -17,15 +17,13 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; -import vazkii.botania.common.block.BlockAlfPortal; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -64,11 +62,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @@ -34,7 +30,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon; + TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 1f9082418..beeb87960 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -11,12 +11,10 @@ package vazkii.botania.client.render.tile; import java.awt.Color; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -24,7 +22,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -35,11 +32,10 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; -import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { @@ -150,7 +146,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.scale(s, s, s); ShaderHelper.useShader(ShaderHelper.manaPool); - renderIcon(0, 0, RenderEventHandler.INSTANCE.manaWater, 16, 16, 240); + renderIcon(0, 0, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 240); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); 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 8739931dc..3f2e5bab3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -18,14 +18,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -58,7 +56,7 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -148,14 +139,14 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer 0.1 || Math.abs(player.motionZ) > 0.1) { double x = event.entityLiving.posX - 0.5; - double y = event.entityLiving.posY - 1.7; + double y = event.entityLiving.posY - 0.5; double z = event.entityLiving.posZ - 0.5; player.getGameProfile().getName(); @@ -332,12 +331,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* int meta = stack.getItemDamage(); if(type == RenderType.BODY) { - if(meta > 0 && meta <= ItemFlightTiara.wingIcons.length) { - IIcon icon = ItemFlightTiara.wingIcons[meta - 1]; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) { + TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); boolean flying = event.entityPlayer.capabilities.isFlying; @@ -428,7 +426,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.rotate(rx, 1F, 0F, 0F); GlStateManager.rotate(ry, 0F, 1F, 0F); GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GlStateManager.scale(sr, sr, sr); GlStateManager.rotate(-ry, 0F, 1F, 0F); GlStateManager.rotate(-rx, 1F, 0F, 0F); @@ -440,7 +438,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.rotate(rx, 1F, 0F, 0F); GlStateManager.rotate(ry, 0F, 1F, 0F); GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); GlStateManager.scale(sr, sr, sr); GlStateManager.rotate(-ry, 1F, 0F, 0F); GlStateManager.rotate(-rx, 1F, 0F, 0F); @@ -452,7 +450,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } else if(meta == 1) // Jibril's Halo renderHalo(event.entityPlayer, event.partialRenderTick); -*/ } @SideOnly(Side.CLIENT) 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 dd22cc9d3..60bddbfaf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -7,7 +7,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -21,9 +20,8 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.BlockAlfPortal; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,7 +73,7 @@ public class PageElvenRecipe extends PageRecipe { i++; } - TextureAtlasSprite portalIcon = RenderEventHandler.INSTANCE.alfPortalTex; + TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48); } From f61d47f2dc78b1480818507028e0f8509eb1da5f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 19:53:28 -0600 Subject: [PATCH 193/935] Some cleanup, fix wand of the forest minor bugs. Closes #22 --- .../client/core/handler/HUDHandler.java | 6 +++--- .../core/handler/MiscellaneousIcons.java | 8 +++++++ .../client/core/handler/ModelHandler.java | 21 ++++++++++++------- .../{render => model}/SpecialFlowerModel.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 2 +- .../core/handler/InternalMethodHandler.java | 9 -------- .../assets/botania/models/item/twigWand.json | 3 +-- .../botania/models/item/twigWand_bind.json | 9 ++++++++ 8 files changed, 36 insertions(+), 24 deletions(-) rename src/main/java/vazkii/botania/client/{render => model}/SpecialFlowerModel.java (99%) create mode 100644 src/main/resources/assets/botania/models/item/twigWand_bind.json diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index fc7305c31..5c2ddc827 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -102,9 +102,9 @@ public final class HUDHandler { profiler.startSection("botania-hud"); MovingObjectPosition pos = mc.objectMouseOver; - if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - Block block = mc.theWorld.getBlockState(pos.getBlockPos()).getBlock(); - TileEntity tile = mc.theWorld.getTileEntity(pos.getBlockPos()); + if(pos != null) { + Block block = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null; + TileEntity tile = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; if(equippedStack != null) { if(pos != null && equippedStack.getItem() == ModItems.twigWand) { 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 b06f9cf37..d7e4c76c6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; 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 2062c09c7..d6dad5ae5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -17,29 +17,23 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.model.ISmartItemModel; 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.GameData; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.enums.PlatformVariant; -import vazkii.botania.client.render.SpecialFlowerModel; +import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.AltarVariant; @@ -115,6 +109,7 @@ import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; +import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -310,6 +305,17 @@ public final class ModelHandler { : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); } }); + + ModelLoader.registerItemVariants(twigWand, + new ModelResourceLocation("botania:twigWand", "inventory"), + new ModelResourceLocation("botania:twigWand_bind", "inventory")); + ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); + } + }); } private static void registerSubtiles() { @@ -491,7 +497,6 @@ public final class ModelHandler { registerItemModel(starSword); registerItemModel(thunderSword); registerItemModel(glassPick); - registerItemModel(twigWand); registerItemModel(flowerBag); registerItemModel(fertilizer); diff --git a/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java similarity index 99% rename from src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java rename to src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 52ab1b668..6d9aa9dea 100644 --- a/src/main/java/vazkii/botania/client/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.client.render; +package vazkii.botania.client.model; import com.google.common.base.Function; import com.google.common.base.Optional; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 3c411fd95..460c1dc94 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -105,7 +105,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { @Override public final IProperty getVariantProperty() { - return DUMMY; + return DUMMY; // Vanilla expects us to store different kinds of slabs into one block ID. Except we don't. We need this dummy property and dummy value to satisfy it. } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 28e42c054..72225f35d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,15 +13,11 @@ package vazkii.botania.common.core.handler; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -31,7 +27,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.DummyMethodHandler; @@ -48,11 +43,7 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.render.SpecialFlowerModel; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.BlockModFlower; -import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.item.ModItems; diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json index c46913af5..84641c01f 100644 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -3,7 +3,6 @@ "textures": { "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", - "layer2": "botania:items/twigWand2", - "layer3": "botania:items/twigWand3" + "layer2": "botania:items/twigWand2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand_bind.json b/src/main/resources/assets/botania/models/item/twigWand_bind.json new file mode 100644 index 000000000..c46913af5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/twigWand_bind.json @@ -0,0 +1,9 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/twigWand0", + "layer1": "botania:items/twigWand1", + "layer2": "botania:items/twigWand2", + "layer3": "botania:items/twigWand3" + } +} \ No newline at end of file From 61b8616008c9defd1cf1803a1e126387d1f96247 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 20:34:55 -0600 Subject: [PATCH 194/935] Fix double flowers not dropping from both halves. Closes #24 --- .../botania/common/block/BlockModDoubleFlower.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 5aeb178c9..3ce73dbac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -52,7 +52,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -// Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; @@ -181,10 +180,17 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - if (world.getBlockState(pos.down()).getBlock() == this - && world.getBlockState(pos.down()).getValue(HALF) == EnumBlockHalf.LOWER) { + IBlockState state = world.getBlockState(pos); + IBlockState stateBelow = world.getBlockState(pos.down()); + + if (stateBelow.getBlock() == this && stateBelow.getValue(HALF) == EnumBlockHalf.LOWER && state.getValue(HALF) == EnumBlockHalf.UPPER) { ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos.down())))); } + + if (state.getValue(HALF) == EnumBlockHalf.LOWER) { + ret.add(new ItemStack(this, 1, getMetaFromState(state))); + } + return ret; } From c3dce97e0d3379a644c7a0fde2c4ed273d5cf371 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 23:03:30 -0600 Subject: [PATCH 195/935] Fix pylon and pool rendering in multiblock. Closes #25 --- .../component/MultiblockComponent.java | 2 +- .../component/StateInsensitiveComponent.java | 26 +++++++++++++++++++ .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 25 ++++++++++++++++-- .../common/block/tile/TileAlfPortal.java | 3 ++- 5 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index a8281c46e..4ca2ae01e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -58,7 +58,7 @@ public class MultiblockComponent { } public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos) == state; // todo 1.8? + return world.getBlockState(pos) == state; } public ItemStack[] getMaterials() { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java new file mode 100644 index 000000000..4e1ec47f3 --- /dev/null +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -0,0 +1,26 @@ +package vazkii.botania.api.lexicon.multiblock.component; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +// Multiblock component that only compares blocks, not blockstates +public class StateInsensitiveComponent extends MultiblockComponent { + + public StateInsensitiveComponent(BlockPos relPos, Block block) { + super(relPos, block.getDefaultState(), false, null); + } + + @Override + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock() == this.getBlockState().getBlock(); + } + + @Override + public MultiblockComponent copy() { + return new StateInsensitiveComponent(getRelativePosition(), getBlockState().getBlock()); + } + +} diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 5c2ddc827..805ac287b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -115,7 +115,7 @@ public final class HUDHandler { ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.getBlockPos()); profiler.endSection(); } - } else if(pos != null && equippedStack.getItem() instanceof ILexicon) + } else if(block != null && equippedStack.getItem() instanceof ILexicon) drawLexiconHUD(mc.thePlayer.getCurrentEquippedItem(), block, pos, event.resolution); if(tile != null && tile instanceof TilePool) renderPoolRecipeHUD(event.resolution, (TilePool) tile, equippedStack); 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 25376ea50..28923adcb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,6 +37,7 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibObfuscation; @@ -51,11 +53,15 @@ public final class MultiblockRenderHandler { public static int dimension; static { - //todo 1.8 remove when fixed by forge + // todo 1.8.8 temporary shim, because cannot renderBlockBrightness directly, see MinecraftForge issue 2353 IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { @Override public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + // Steal itemstack model since it has the proper group visibilities configured + ItemStack stack = new ItemStack(ModBlocks.pylon, 1, state.getBlock().getMetaFromState(state)); + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); + GlStateManager.scale(0.65F, 0.65, 0.65F); + GlStateManager.translate(0.5F, -0.75F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); } @@ -64,6 +70,21 @@ public final class MultiblockRenderHandler { return true; } }); + + // TODO also a temporary shim for same reason as above + IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() { + @Override + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + GlStateManager.translate(-0.5F, -0.5F, 0.5F); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState()); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false); + } + + @Override + public boolean needsTranslate(IBlockState state) { + return true; + } + }); } public static void setMultiblock(MultiblockSet set) { 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 29d647063..c2ca42eb1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -28,6 +28,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; +import vazkii.botania.api.lexicon.multiblock.component.StateInsensitiveComponent; import vazkii.botania.api.recipe.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; @@ -114,7 +115,7 @@ public class TileAlfPortal extends TileMod implements ITickable { for(BlockPos p : PYLON_POSITIONS) mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA)); for(BlockPos p : POOL_POSITIONS) - mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool.getDefaultState()); + mb.addComponent(new StateInsensitiveComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool)); mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal.getDefaultState()); mb.setRenderOffset(new BlockPos(0, -1, 0)); From 568ed80ede54371b9a8ca41dce443d45292933fa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 00:03:04 -0600 Subject: [PATCH 196/935] Allow platform to render other smart models --- .../java/vazkii/botania/client/model/PlatformModel.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 6b3ea4c30..516bdd1e3 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -40,7 +40,14 @@ public class PlatformModel implements ISmartBlockModel { } else if (heldState != null){ if (heldState.getBlock().canRenderInLayer(layer)) { // Steal camo's model - return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); + IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); + + if (model instanceof ISmartBlockModel) { + // Their model can be smart too + model = ((ISmartBlockModel) model).handleBlockState(heldState); + } + + return model; } } From 7615d0b893c6e4cb5545847f22a6dc5847f70019 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 17:49:59 -0600 Subject: [PATCH 197/935] Fix recipes for 1.9 purpur not being registered --- .../java/vazkii/botania/common/crafting/ModCraftingRecipes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index b12b79e39..6bc069a1a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2174,6 +2174,7 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab); addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab); + addStairsAndSlabs(ModBlocks.endStoneBrick, 2, ModFluffBlocks.enderBrickStairs, ModFluffBlocks.enderBrickSlab); addStairsAndSlabs(ModBlocks.shimmerrock, 0, ModFluffBlocks.shimmerrockStairs, ModFluffBlocks.shimmerrockSlab); addStairsAndSlabs(ModBlocks.shimmerwoodPlanks, 0, ModFluffBlocks.shimmerwoodPlankStairs, ModFluffBlocks.shimmerwoodPlankSlab); From 1c14dcf8ff0bb1e1466f85e2d935dc1d6242b698 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 18:37:12 -0600 Subject: [PATCH 198/935] Fix pylon crash --- .../vazkii/botania/common/block/tile/TilePylon.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 4f89ca9f8..e431c1a01 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -19,6 +19,7 @@ import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -36,10 +37,14 @@ public class TilePylon extends TileEntity implements ITickable { @Override public void update() { ++ticks; + + if (worldObj.getBlockState(getPos()) != ModBlocks.pylon) + return; + PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); if(activated && worldObj.isRemote) { - if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && worldObj.getBlockState(centerPos).getBlock().getMetaFromState(worldObj.getBlockState(centerPos)) == 0) { // todo 1.8 clarify + if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) { // todo 1.8 clarify activated = false; return; } @@ -93,4 +98,9 @@ public class TilePylon extends TileEntity implements ITickable { return worldObj.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; } + private boolean portalOff() { + return worldObj.getBlockState(centerPos).getBlock() != ModBlocks.alfPortal + || worldObj.getBlockState(centerPos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF; + } + } \ No newline at end of file From 4345bd9728ac1a42214fff67bd6bb66829cf8c2d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 19:01:31 -0600 Subject: [PATCH 199/935] More blockstate guards in TE and blockstate conversions --- .../botania/common/block/tile/TileAlfPortal.java | 5 +++-- .../vazkii/botania/common/block/tile/TileAltar.java | 4 +++- .../botania/common/block/tile/TileEnchanter.java | 11 +++++------ .../botania/common/block/tile/TileEnderEye.java | 3 +++ .../botania/common/block/tile/TileFloatingFlower.java | 7 +++++-- .../botania/common/block/tile/TileManaBeacon.java | 4 ++++ .../vazkii/botania/common/block/tile/TileMod.java | 2 -- .../botania/common/block/tile/TileStarfield.java | 4 ++++ .../common/block/tile/mana/TileManaDetector.java | 3 ++- .../botania/common/block/tile/mana/TilePool.java | 11 ++++++++--- .../botania/common/block/tile/mana/TilePrism.java | 3 ++- .../botania/common/block/tile/mana/TileSpreader.java | 11 +++++++---- .../common/block/tile/string/TileRedString.java | 4 ++++ .../botania/common/item/rod/ItemRainbowRod.java | 11 ++++++----- 14 files changed, 56 insertions(+), 27 deletions(-) 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 c2ca42eb1..9d74ac818 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -127,7 +127,8 @@ public class TileAlfPortal extends TileMod implements ITickable { public void update() { IBlockState iBlockState = worldObj.getBlockState(getPos()); if(iBlockState.getBlock() != ModBlocks.alfPortal || iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { - ticksOpen = 0; + if (iBlockState.getBlock() == ModBlocks.alfPortal) + ticksOpen = 0; return; } AlfPortalState state = iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE); @@ -209,7 +210,7 @@ public class TileAlfPortal extends TileMod implements ITickable { AxisAlignedBB getPortalAABB() { AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); - if(getBlockMetadata() == 2) + if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); return aabb; 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 65d480123..3e66dfe66 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -41,6 +41,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -67,7 +69,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I if(stack == null || item.isDead) return false; - if(!isMossy && getBlockMetadata() == 0) { + if(!isMossy && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { if(stack.getItem() == Item.getItemFromBlock(Blocks.vine)) { isMossy = true; if (worldObj.isRemote) { 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 a90b01434..cd348ad3f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -140,12 +140,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl return; EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); - if(getBlockMetadata() < PYLON_LOCATIONS.size()) - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { - TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); - if(tile != null && tile instanceof TilePylon) - ((TilePylon) tile).activated = false; - } + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { + TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); + if(tile != null && tile instanceof TilePylon) + ((TilePylon) tile).activated = false; + } if(!canEnchanterExist(worldObj, pos, 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 a661d6eaa..14f529838 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -21,12 +21,15 @@ import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.enderEye) + return; boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index a0d1d0c2c..b8407c47a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower; @@ -28,8 +30,9 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { forcedStack = null; return retStack; } - - return new ItemStack(ModBlocks.shinyFlower, 1, getBlockMetadata()); + EnumDyeColor color = worldObj.getBlockState(getPos()).getBlock() != ModBlocks.floatingFlower ? EnumDyeColor.WHITE + : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR); + return new ItemStack(ModBlocks.shinyFlower, 1, color.getMetadata()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index f2f184082..41c28d03e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -16,11 +16,15 @@ import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; public class TileManaBeacon extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.manaBeacon) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); 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 149689951..c7c979a79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -23,8 +23,6 @@ public class TileMod extends TileEntity { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - // todo: review all subclasses. this could potentially leave stragglers hanging. - // todo: example: open crate and crafty crate should refresh when variants change return oldState.getBlock() != newState.getBlock(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 151416057..d07601cd8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -13,11 +13,15 @@ package vazkii.botania.common.block.tile; import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; public class TileStarfield extends TileMod implements ITickable { @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.starfield) + return; + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); if(!worldObj.isRemote) { boolean newState = !worldObj.isDaytime(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index ea33d7782..78b6fa338 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -18,13 +18,14 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod implements IManaCollisionGhost, ITickable { @Override public void update() { - if(!worldObj.isRemote) { + if(!worldObj.isRemote && worldObj.getBlockState(getPos()).getBlock() == ModBlocks.manaDetector) { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) 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 120522499..79f863dd9 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 @@ -51,6 +51,8 @@ import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.helper.RenderHelper; @@ -198,10 +200,13 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void update() { + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pool) + return; + boolean wasDoingTransfer = isDoingTransfer; isDoingTransfer = false; if(manaCap == -1) - manaCap = getBlockMetadata() == 2 ? MAX_MANA_DILLUTED : MAX_MANA; + manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid()) ManaNetworkEvent.addPool(this); @@ -349,7 +354,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } public void renderHUD(Minecraft mc, ScaledResolution res) { - ItemStack pool = new ItemStack(ModBlocks.pool, 1, getBlockMetadata()); + ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); String name = StatCollector.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); @@ -391,7 +396,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public int getCurrentMana() { - return worldObj != null && getBlockMetadata() == 1 ? MAX_MANA : mana; + return worldObj != null && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 4181709db..8f8b571a5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -19,6 +19,7 @@ import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; @@ -26,7 +27,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos public void onBurstCollision(IManaBurst burst) { ItemStack lens = getStackInSlot(0); - boolean active = (getBlockMetadata() & 8) == 0; + boolean active = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); if(active) { 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 8b1c4b664..6a7e9ec9f 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 @@ -48,6 +48,8 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IRedirectable; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; @@ -440,15 +442,16 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public boolean isRedstone() { - return worldObj == null ? staticRedstone : getBlockMetadata() == 1; + return worldObj == null ? staticRedstone : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.REDSTONE; } public boolean isDreamwood() { - return worldObj == null ? staticDreamwood : getBlockMetadata() == 2 || getBlockMetadata() == 3; + SpreaderVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT); + return worldObj == null ? staticDreamwood : variant == SpreaderVariant.ELVEN || variant == SpreaderVariant.GAIA; } public boolean isULTRA_SPREADER() { - return worldObj == null ? staticUltra : getBlockMetadata() == 3; + return worldObj == null ? staticUltra : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.GAIA; } public void checkForReceiver() { @@ -543,7 +546,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, getBlockMetadata()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); 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 29b9cc751..e4609ebca 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 @@ -19,6 +19,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; +import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.block.tile.TileMod; public abstract class TileRedString extends TileMod implements ITileBound, ITickable { @@ -27,6 +28,9 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick @Override public void update() { + if (!(worldObj.getBlockState(getPos()).getBlock() instanceof BlockRedString)) + return; + EnumFacing dir = getOrientation(); BlockPos pos_ = getPos(); int range = getRange(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 674bfcfb7..2795bf6d9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -24,6 +24,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -145,17 +146,17 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int l = 20; AxisAlignedBB axis = null; - switch(te.getBlockMetadata() - 2) { - case 0 : + switch(world.getBlockState(tePos).getValue(BotaniaStateProps.CARDINALS)) { + case NORTH : axis = new AxisAlignedBB(tePos.add(-w, -h, -l), tePos.add(w + 1, h, 0)); break; - case 1 : + case SOUTH : axis = new AxisAlignedBB(tePos.add(-w, -h, 1), tePos.add(w + 1, h, l + 1)); break; - case 2 : + case WEST : axis = new AxisAlignedBB(tePos.add(-l, -h, -w), tePos.add(0, h, w + 1)); break; - case 3 : + case EAST : axis = new AxisAlignedBB(tePos.add(1, -h, -w), tePos.add(l + 1, h, w + 1)); } From 57398723a4053f281472d0928fcb4fbf1da2ce8d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 19:05:37 -0600 Subject: [PATCH 200/935] Cleanup --- .../resources/assets/botania/models/item/createFiles.sh | 9 --------- .../assets/botania/models/item/dank_memes/goldfish.json | 6 ------ .../assets/botania/models/item/dank_memes/nerfBat.json | 6 ------ .../assets/botania/models/item/dank_memes/phiFlower.json | 6 ------ .../assets/botania/models/item/dank_memes/tail.json | 6 ------ 5 files changed, 33 deletions(-) delete mode 100755 src/main/resources/assets/botania/models/item/createFiles.sh delete mode 100644 src/main/resources/assets/botania/models/item/dank_memes/goldfish.json delete mode 100644 src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json delete mode 100644 src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json delete mode 100644 src/main/resources/assets/botania/models/item/dank_memes/tail.json diff --git a/src/main/resources/assets/botania/models/item/createFiles.sh b/src/main/resources/assets/botania/models/item/createFiles.sh deleted file mode 100755 index 0a84472a3..000000000 --- a/src/main/resources/assets/botania/models/item/createFiles.sh +++ /dev/null @@ -1,9 +0,0 @@ -#Files=('manasteel' 'manaPearl' 'manaDiamond' 'livingwoodTwig' 'terrasteel' 'lifeEssence' 'redstoneRoot' 'elementium' 'pixieDust' 'dragonstone' 'prismarineShard' 'placeholder' 'redString' 'dreamwoodTwig' 'gaiaIngot' 'enderAirBottle' -#'manaString' 'manasteelNugget' 'terrasteelNugget' 'elementiumNugget' 'root' 'pebble' 'manaweaveCloth' 'manaPowder'); -Files=('glassPick' 'starSword' 'thunderSword') -#Files=( 'Pick' 'Shovel' 'Axe' 'Sword' 'Shears') -Type="standard_tool" -for i in "${Files[@]}";do - FileFormat="{\"parent\":\"botania:item/$Type\",\"textures\":{\"layer0\":\"botania:items/$i\"}}" - echo $FileFormat >> "$i.json" -done diff --git a/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json b/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json deleted file mode 100644 index d837ff588..000000000 --- a/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "botania:items/goldfish" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json b/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json deleted file mode 100644 index 4d029c6cf..000000000 --- a/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "botania:items/nerfBat" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json b/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json deleted file mode 100644 index 569ced203..000000000 --- a/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "botania:items/phiFlower" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/tail.json b/src/main/resources/assets/botania/models/item/dank_memes/tail.json deleted file mode 100644 index 2e50e9e57..000000000 --- a/src/main/resources/assets/botania/models/item/dank_memes/tail.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "botania:items/tail" - } -} \ No newline at end of file From a6899a9f40f3a2551b819b7732a0590030382471 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 19:31:58 -0600 Subject: [PATCH 201/935] Special flower lighting crash --- .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3ffeedd59..fe698ef22 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -160,7 +160,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); + int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); From 14a7f6b14b42e4695f17e458cc1967e83757a589 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 21:01:50 -0600 Subject: [PATCH 202/935] COrrect Crafty crate models --- .../botania/api/state/BotaniaStateProps.java | 1 + .../botania/api/state/enums/CratePattern.java | 31 +++++++++++++++++ .../client/core/handler/ModelHandler.java | 4 +-- .../botania/common/block/BlockOpenCrate.java | 21 ++++++++++-- .../assets/botania/blockstates/openCrate.json | 33 ++++++++++--------- .../models/block/cube_bottom_other.json | 12 +++++++ 6 files changed, 82 insertions(+), 20 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/CratePattern.java create mode 100644 src/main/resources/assets/botania/models/block/cube_bottom_other.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 4d96a6a68..89f93cca4 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -139,6 +139,7 @@ public class BotaniaStateProps { // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java new file mode 100644 index 000000000..2cbf2a8f8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -0,0 +1,31 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum CratePattern implements IStringSerializable { + NONE, + CRAFTY_1_1, + CRAFTY_2_2, + CRAFTY_1_2, + CRAFTY_2_1, + CRAFTY_1_3, + CRAFTY_3_1, + CRAFTY_2_3, + CRAFTY_3_2, + CRAFTY_DONUT; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} 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 d6dad5ae5..ca5583f87 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -430,7 +430,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.manaFlame); registerItemModel(ModBlocks.incensePlate); - // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler + // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); @@ -450,7 +450,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index c6dcfb424..8bf6e2463 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -41,6 +41,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; @@ -62,13 +63,15 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I setHardness(2.0F); setStepSound(soundTypeWood); setUnlocalizedName(LibBlockNames.OPEN_CRATE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)); + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) + .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); random = new Random(); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CRATE_VARIANT); + return new BlockState(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); } @Override @@ -78,12 +81,24 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I @Override public IBlockState getStateFromMeta(int meta) { - if (meta > CrateVariant.values().length) { + if (meta >= CrateVariant.values().length) { meta = 0; } return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + if (world.getTileEntity(pos) instanceof TileCraftCrate) { + TileCraftCrate tile = ((TileCraftCrate) world.getTileEntity(pos)); + state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); + } else { + state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); + } + + return state; + } + @Override protected boolean shouldRegisterInNameSet() { return false; diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json index 4e13284f2..35e3f6aae 100644 --- a/src/main/resources/assets/botania/blockstates/openCrate.json +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -1,23 +1,26 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "botania:cube_bottom_other", "transform": "forge:default-block" }, "variants": { - "variant=open": [{ - "textures": { - "bottom": "botania:blocks/openCrate1", - "side": "botania:blocks/openCrate0", - "top": "botania:blocks/openCrate0" - } - }], - "variant=crafty": [{ - "textures": { - "bottom": "botania:blocks/openCrate3", - "side": "botania:blocks/openCrate2", - "top": "botania:blocks/openCrate2" - } - }] + "pattern": { + "none": {}, + "crafty_1_1": { "textures": { "other": "botania:blocks/ocPattern0" } }, + "crafty_2_2": { "textures": { "other": "botania:blocks/ocPattern1" } }, + "crafty_1_2": { "textures": { "other": "botania:blocks/ocPattern2" } }, + "crafty_2_1": { "textures": { "other": "botania:blocks/ocPattern3" } }, + "crafty_1_3": { "textures": { "other": "botania:blocks/ocPattern4" } }, + "crafty_3_1": { "textures": { "other": "botania:blocks/ocPattern5" } }, + "crafty_2_3": { "textures": { "other": "botania:blocks/ocPattern6" } }, + "crafty_3_2": { "textures": { "other": "botania:blocks/ocPattern7" } }, + "crafty_donut": { "textures": { "other": "botania:blocks/ocPattern8" } } + }, + "variant": { + "open": { "textures": { "bottom": "botania:blocks/openCrate1", "other": "botania:blocks/openCrate0" } }, + "crafty": { "textures": { "bottom": "botania:blocks/openCrate3", "other": "botania:blocks/openCrate2" } } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_bottom_other.json b/src/main/resources/assets/botania/models/block/cube_bottom_other.json new file mode 100644 index 000000000..8c2629967 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cube_bottom_other.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "#bottom", + "up": "#other", + "north": "#other", + "south": "#other", + "west": "#other", + "east": "#other", + "particle": "#other" + } +} \ No newline at end of file From e1425617992aa9c69d62d3f5e9caf5236bc7b5ab Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 21:22:37 -0600 Subject: [PATCH 203/935] Model cleanup --- .../client/core/handler/ModelHandler.java | 268 +++++++++--------- .../common/item/rod/ItemTornadoRod.java | 5 - 2 files changed, 138 insertions(+), 135 deletions(-) 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 ca5583f87..01dd2c3c8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -116,6 +116,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.relic.ItemInfiniteFruit; +import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -163,57 +164,6 @@ public final class ModelHandler { registerBrews(); /** Special Item Meshers **/ - ModelLoader.registerItemVariants(manaGun, - new ModelResourceLocation("botania:manaGun", "inventory"), - new ModelResourceLocation("botania:manaGunClip", "inventory"), - new ModelResourceLocation("botania:desuGun", "inventory"), - new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name; - if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { - name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; - } else { - name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; - } - return new ModelResourceLocation(name, "inventory"); - } - }); - - ModelLoader.registerItemVariants(spawnerMover, - new ModelResourceLocation("botania:spawnerMover", "inventory"), - new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (ItemSpawnerMover.hasData(stack)) { - return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); - } else { - return new ModelResourceLocation("botania:spawnerMover", "inventory"); - } - } - }); - - ModelLoader.registerItemVariants(terraPick, - new ModelResourceLocation("botania:terraPick", "inventory"), - new ModelResourceLocation("botania:terraPickEnabled", "inventory"), - new ModelResourceLocation("botania:terraPickTipped", "inventory"), - new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; - } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); - } - }); - ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); @@ -225,17 +175,6 @@ public final class ModelHandler { } }); - ModelLoader.registerItemVariants(manasteelSword, - new ModelResourceLocation("botania:manasteelSword", "inventory"), - new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"); - } - }); - ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); @@ -258,6 +197,45 @@ public final class ModelHandler { } }); + ModelLoader.registerItemVariants(manaGun, + new ModelResourceLocation("botania:manaGun", "inventory"), + new ModelResourceLocation("botania:manaGunClip", "inventory"), + new ModelResourceLocation("botania:desuGun", "inventory"), + new ModelResourceLocation("botania:desuGunClip", "inventory")); + ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name; + if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { + name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; + } else { + name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; + } + return new ModelResourceLocation(name, "inventory"); + } + }); + + ModelLoader.registerItemVariants(tornadoRod, + new ModelResourceLocation("botania:tornadoRod", "inventory"), + new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); + ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"); + } + }); + + ModelLoader.registerItemVariants(twigWand, + new ModelResourceLocation("botania:twigWand", "inventory"), + new ModelResourceLocation("botania:twigWand_bind", "inventory")); + ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); + } + }); + ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); @@ -306,14 +284,47 @@ public final class ModelHandler { } }); - ModelLoader.registerItemVariants(twigWand, - new ModelResourceLocation("botania:twigWand", "inventory"), - new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { + ModelLoader.registerItemVariants(manasteelSword, + new ModelResourceLocation("botania:manasteelSword", "inventory"), + new ModelResourceLocation("botania:elucidator", "inventory")); + ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); + return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory"); + } + }); + + ModelLoader.registerItemVariants(spawnerMover, + new ModelResourceLocation("botania:spawnerMover", "inventory"), + new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); + ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (ItemSpawnerMover.hasData(stack)) { + return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); + } else { + return new ModelResourceLocation("botania:spawnerMover", "inventory"); + } + } + }); + + ModelLoader.registerItemVariants(terraPick, + new ModelResourceLocation("botania:terraPick", "inventory"), + new ModelResourceLocation("botania:terraPickEnabled", "inventory"), + new ModelResourceLocation("botania:terraPickTipped", "inventory"), + new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); + ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; + } + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); } }); } @@ -377,83 +388,83 @@ public final class ModelHandler { } private static void registerStandardBlocks() { - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.elfGlass); - registerItemModel(ModBlocks.runeAltar); - registerItemModel(ModBlocks.pistonRelay); - registerItemModel(ModBlocks.distributor); - registerItemModel(ModBlocks.starfield); - registerItemModel(ModBlocks.specialFlower); - registerItemModel(ModBlocks.dirtPath); - registerItemModel(ModBlocks.felPumpkin); - registerItemModel(ModBlocks.ghostRail); - registerItemModel(ModBlocks.shimmerrock); - registerItemModel(ModBlocks.shimmerwoodPlanks); - registerItemModel(ModBlocks.manaVoid); registerItemModel(ModBlocks.alchemyCatalyst); - registerItemModel(ModBlocks.conjurationCatalyst); - registerItemModel(ModBlocks.reedBlock); + registerItemModel(ModBlocks.alfPortal); registerItemModel(ModBlocks.bifrost); registerItemModel(ModBlocks.bifrostPerm); - registerItemModel(ModBlocks.enderEye); - registerItemModel(ModBlocks.tinyPlanet); - registerItemModel(ModBlocks.thatch); registerItemModel(ModBlocks.blazeBlock); - registerItemModel(ModBlocks.forestEye); - registerItemModel(ModBlocks.seaLamp); + registerItemModel(ModBlocks.cacophonium); registerItemModel(ModBlocks.cellBlock); + registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.corporeaFunnel); + registerItemModel(ModBlocks.corporeaInterceptor); + registerItemModel(ModBlocks.corporeaRetainer); + registerItemModel(ModBlocks.dirtPath); + registerItemModel(ModBlocks.distributor); + registerItemModel(ModBlocks.elfGlass); registerItemModel(ModBlocks.enchantedSoil); registerItemModel(ModBlocks.enchanter); + registerItemModel(ModBlocks.enderEye); + registerItemModel(ModBlocks.felPumpkin); + registerItemModel(ModBlocks.floatingSpecialFlower); + registerItemModel(ModBlocks.forestEye); + registerItemModel(ModBlocks.ghostRail); + registerItemModel(ModBlocks.incensePlate); + registerItemModel(ModBlocks.lightLauncher); + registerItemModel(ModBlocks.manaBomb); + registerItemModel(ModBlocks.manaDetector); + registerItemModel(ModBlocks.manaFlame); + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.manaVoid); registerItemModel(ModBlocks.prism); + registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.redStringComparator); registerItemModel(ModBlocks.redStringContainer); registerItemModel(ModBlocks.redStringDispenser); - registerItemModel(ModBlocks.redStringComparator); registerItemModel(ModBlocks.redStringFertilizer); registerItemModel(ModBlocks.redStringInterceptor); registerItemModel(ModBlocks.redStringRelay); - registerItemModel(ModBlocks.floatingSpecialFlower); - registerItemModel(ModBlocks.sparkChanger); - registerItemModel(ModBlocks.terraPlate); - registerItemModel(ModBlocks.corporeaRetainer); - registerItemModel(ModBlocks.corporeaInterceptor); - registerItemModel(ModBlocks.corporeaFunnel); - registerItemModel(ModBlocks.lightLauncher); - registerItemModel(ModBlocks.manaDetector); - registerItemModel(ModBlocks.manaBomb); + registerItemModel(ModBlocks.reedBlock); registerItemModel(ModBlocks.rfGenerator); - registerItemModel(ModBlocks.alfPortal); registerItemModel(ModBlocks.root); - registerItemModel(ModBlocks.cacophonium); - registerItemModel(ModBlocks.tinyPotato); + registerItemModel(ModBlocks.runeAltar); + registerItemModel(ModBlocks.seaLamp); + registerItemModel(ModBlocks.shimmerrock); + registerItemModel(ModBlocks.shimmerwoodPlanks); + registerItemModel(ModBlocks.sparkChanger); registerItemModel(ModBlocks.spawnerClaw); + registerItemModel(ModBlocks.specialFlower); + registerItemModel(ModBlocks.starfield); + registerItemModel(ModBlocks.thatch); + registerItemModel(ModBlocks.terraPlate); + registerItemModel(ModBlocks.tinyPlanet); + registerItemModel(ModBlocks.tinyPotato); registerItemModel(ModBlocks.turntable); - registerItemModel(ModBlocks.manaFlame); - registerItemModel(ModBlocks.incensePlate); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); // Item models which all use the same base model and recolored by render layer - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); - registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); + registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } private static void registerStandardItems() { @@ -516,9 +527,6 @@ public final class ModelHandler { registerItemModel(smeltRod); registerItemModel(exchangeRod); - registerItemModel(tornadoRod); - ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - registerItemModel(openBucket); registerItemModel(bloodPendant); registerItemModel(manaTablet); @@ -604,32 +612,32 @@ public final class ModelHandler { // Only for models that absolutely can't be converted to JSON. Use VERY sparingly private static void registerTESRItems() { + registerItemModel(ModBlocks.avatar); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); + + registerItemModel(ModBlocks.bellows); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); + + registerItemModel(ModBlocks.brewery); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); + registerItemModel(ModBlocks.corporeaCrystalCube); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); - registerItemModel(ModBlocks.avatar); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - - registerItemModel(ModBlocks.teruTeruBozu); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); - - registerItemModel(ModBlocks.brewery); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - registerItemModel(ModItems.gaiaHead); ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerItemModel(ModBlocks.bellows); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); + registerItemModel(ModBlocks.hourglass); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); registerItemModel(ModBlocks.pump); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); - registerItemModel(ModBlocks.hourglass); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); + registerItemModel(ModBlocks.teruTeruBozu); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } private static void registerManaResources() { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index dca25e6c2..1d40ebe4d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -105,11 +105,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } - @Override - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - return isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"); - } - @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; From f3f055a58eb719337f3b4dcf9d27accfe9c26dc6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 21:26:43 -0600 Subject: [PATCH 204/935] More --- .../vazkii/botania/client/core/handler/ModelHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 01dd2c3c8..db3523b60 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -615,7 +615,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.avatar); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - registerItemModel(ModBlocks.bellows); + registerItemModel(ModBlocks.bellows); // todo await animation api ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); registerItemModel(ModBlocks.brewery); @@ -624,16 +624,16 @@ public final class ModelHandler { registerItemModel(ModBlocks.corporeaCrystalCube); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - registerItemModel(ModBlocks.corporeaIndex); + registerItemModel(ModBlocks.corporeaIndex); // todo json maybe? await animation api ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); registerItemModel(ModItems.gaiaHead); ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerItemModel(ModBlocks.hourglass); + registerItemModel(ModBlocks.hourglass); // todo json maybe? ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - registerItemModel(ModBlocks.pump); + registerItemModel(ModBlocks.pump); // todo await animation api ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); registerItemModel(ModBlocks.teruTeruBozu); From 404d99445e4a4a96cd37daf53cb21f767a6af433 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Jan 2016 23:35:18 -0600 Subject: [PATCH 205/935] Sleeves render on spreaders again. Closes #6 --- .../client/core/handler/ModelHandler.java | 2 + .../render/tile/RenderTileSpreader.java | 47 +++--- .../assets/botania/models/block/spreader.json | 137 ++++++++++++++++++ 3 files changed, 165 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/spreader.json 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 db3523b60..cd1cec77f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -33,6 +33,7 @@ import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.enums.PlatformVariant; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; @@ -463,6 +464,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index d65f8294c..f188dc490 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -14,12 +14,15 @@ import java.awt.Color; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockCarpet; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -90,35 +93,37 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer GlStateManager.pushMatrix(); GlStateManager.translate(-0.0F, -1F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.FIXED); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } if(spreader.paddingColor != -1) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Block block = Blocks.carpet; - int color = spreader.paddingColor; - //RenderBlocks render = RenderBlocks.getInstance(); - float f = 1F / 16F; - GlStateManager.translate(0F, -f, 0F); - //render.renderBlockAsItem(block, color, 1F); - GlStateManager.translate(0F, -f * 15, 0F); - //render.renderBlockAsItem(block, color, 1F); - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.rotate(90F, 0F, 1F, 0F); + IBlockState carpet = Blocks.carpet.getDefaultState().withProperty(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor)); - GlStateManager.pushMatrix(); - GlStateManager.scale(f * 14F, 1F, 1F); - //render.renderBlockAsItem(block, color, 1F); - GlStateManager.popMatrix(); + GlStateManager.translate(-0.5F, -0.5F, 0.5F); + float f = 1 / 16F; - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(0F, 0F, -f / 2); - GlStateManager.scale(f * 14F, 1F, f * 15F); - //render.renderBlockAsItem(block, color, 1F); - GlStateManager.translate(0F, f * 15F, 0F); - //render.renderBlockAsItem(block, color, 1F); todo 1.8 + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F); + GlStateManager.rotate(-90, 0, 1, 0); + + GlStateManager.rotate(270, 0, 0, 1); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F); + GlStateManager.rotate(-90, 0, 1, 0); + + GlStateManager.translate(0, 15 * f, 0); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F); + GlStateManager.rotate(-90, 0, 1, 0); + + GlStateManager.translate(15 * f, f, 0); + GlStateManager.rotate(270, 0, 0, 1); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F); + GlStateManager.rotate(-90, 0, 1, 0); + + GlStateManager.translate(0, -1, 0); + GlStateManager.rotate(90, 1, 0, 0); + Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F); } GlStateManager.enableRescaleNormal(); diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/spreader.json new file mode 100644 index 000000000..e057858f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spreader.json @@ -0,0 +1,137 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "__comment": "cubeSide4", + "from": [14, 1, 2], + "to": [15, 14, 15], + "faces": { + "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#all"}, + "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#all"}, + "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#all"}, + "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#all"}, + "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#all"} + } + }, + { + "__comment": "cubeInside", + "from": [5, 4, 5], + "to": [11, 10, 11], + "faces": { + "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#all"}, + "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#all"}, + "north": {"uv": [12, 5.75, 13.5, 7.25], "texture": "#all"}, + "south": {"uv": [9, 5.75, 10.5, 7.25], "texture": "#all"}, + "west": {"uv": [7.5, 5.75, 9, 7.25], "texture": "#all"}, + "east": {"uv": [10.5, 5.75, 12, 7.25], "texture": "#all"} + } + }, + { + "__comment": "cubeHole2", + "from": [2, 1, 14], + "to": [6, 13, 15], + "faces": { + "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, + "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#all"}, + "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#all"}, + "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#all"}, + "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#all"} + } + }, + { + "__comment": "cubeSide5", + "from": [2, 13, 2], + "to": [14, 14, 15], + "faces": { + "down": {"uv": [6, 0, 9, 3.25], "texture": "#all"}, + "up": {"uv": [3, 0, 6, 3.25], "texture": "#all"}, + "north": {"uv": [9.25, 3.25, 12.5, 3.5], "texture": "#all"}, + "south": {"uv": [3, 3.25, 6.25, 3.5], "texture": "#all"}, + "west": {"uv": [0, 3.25, 3, 3.5], "texture": "#all"}, + "east": {"uv": [6.25, 3.25, 9.25, 3.5], "texture": "#all"} + } + }, + { + "__comment": "cubeHole4", + "from": [6, 9, 14], + "to": [10, 13, 15], + "faces": { + "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, + "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#all"}, + "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#all"}, + "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#all"}, + "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#all"} + } + }, + { + "__comment": "cubeHole3", + "from": [6, 1, 14], + "to": [10, 5, 15], + "faces": { + "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, + "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#all"}, + "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#all"}, + "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#all"}, + "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#all"} + } + }, + { + "__comment": "cubeSide1", + "from": [1, 0, 1], + "to": [15, 1, 15], + "faces": { + "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#all"}, + "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#all"}, + "north": {"uv": [10.5, 3.5, 14, 3.75], "texture": "#all"}, + "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#all"}, + "west": {"uv": [0, 3.5, 3.5, 3.75], "texture": "#all"}, + "east": {"uv": [7, 3.5, 10.5, 3.75], "texture": "#all"} + } + }, + { + "__comment": "cubeSide3", + "from": [1, 1, 2], + "to": [2, 14, 15], + "faces": { + "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#all"}, + "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#all"}, + "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#all"}, + "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#all"}, + "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#all"} + } + }, + { + "__comment": "cubeHole1", + "from": [10, 1, 14], + "to": [14, 13, 15], + "faces": { + "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, + "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#all"}, + "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#all"}, + "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#all"}, + "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#all"} + } + }, + { + "__comment": "cubeSide2", + "from": [1, 1, 1], + "to": [15, 14, 2], + "faces": { + "down": {"uv": [7, 0, 10.5, 0.25], "texture": "#all"}, + "up": {"uv": [3.5, 0, 7, 0.25], "texture": "#all"}, + "north": {"uv": [7.25, 0.25, 7.5, 3.5], "texture": "#all"}, + "south": {"uv": [3.5, 0.25, 3.75, 3.5], "texture": "#all"}, + "west": {"uv": [0, 0.25, 3.5, 3.5], "texture": "#all"}, + "east": {"uv": [3.75, 0.25, 7.25, 3.5], "texture": "#all"} + } + } + ] +} From 84204db5873b9afe2bf1180414cde5f17b11a076 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Jan 2016 18:16:30 -0600 Subject: [PATCH 206/935] Fix ender air bottle render, move to java 8, giant import cleanup --- .../java/vazkii/botania/api/BotaniaAPI.java | 36 ++-- .../vazkii/botania/api/BotaniaAPIClient.java | 1 - .../botania/api/corporea/CorporeaHelper.java | 2 +- .../api/internal/DummyMethodHandler.java | 4 - .../api/internal/IInternalMethodHandler.java | 2 - .../botania/api/item/IBaubleRender.java | 3 - .../botania/api/lexicon/LexiconCategory.java | 2 +- .../botania/api/lexicon/LexiconEntry.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 5 +- .../api/lexicon/multiblock/MultiblockSet.java | 1 - .../component/MultiblockComponent.java | 1 - .../component/StateInsensitiveComponent.java | 2 - .../botania/api/state/BotaniaStateProps.java | 47 ++--- .../botania/api/subtile/SubTileEntity.java | 2 - .../api/subtile/SubTileGenerating.java | 1 - .../subtile/signature/SubTileSignature.java | 2 - .../core/handler/BaubleRenderHandler.java | 6 - .../handler/CorporeaAutoCompleteHandler.java | 19 +- .../client/core/handler/HUDHandler.java | 2 - .../handler/ItemsRemainingRenderHandler.java | 2 - .../client/core/handler/LightningHandler.java | 10 +- .../client/core/handler/ModelHandler.java | 169 ++++++------------ .../core/handler/MultiblockBlockAccess.java | 1 - .../core/handler/MultiblockRenderHandler.java | 4 - .../TooltipAdditionDisplayHandler.java | 1 - .../client/core/helper/RenderHelper.java | 1 - .../client/core/proxy/ClientProxy.java | 24 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 1 - .../client/gui/GuiAchievementsHacky.java | 1 - .../botania/client/gui/bag/GuiFlowerBag.java | 3 - .../botania/client/gui/box/GuiBaubleBox.java | 2 - .../client/gui/crafting/GuiCraftingHalo.java | 2 - .../gui/lexicon/GuiLexiconChallenge.java | 4 - .../client/gui/lexicon/GuiLexiconIndex.java | 3 - .../lexicon/button/GuiButtonAchievement.java | 2 - .../gui/lexicon/button/GuiButtonBack.java | 2 - .../button/GuiButtonChallengeIcon.java | 4 - .../lexicon/button/GuiButtonChallenges.java | 2 - .../gui/lexicon/button/GuiButtonDoot.java | 3 - .../lexicon/button/GuiButtonInvisible.java | 2 - .../gui/lexicon/button/GuiButtonNotes.java | 2 - .../gui/lexicon/button/GuiButtonOptions.java | 2 - .../gui/lexicon/button/GuiButtonPage.java | 2 - .../gui/lexicon/button/GuiButtonShare.java | 2 - .../button/GuiButtonUpdateWarning.java | 2 - .../lexicon/button/GuiButtonViewOnline.java | 2 - .../jei/brewery/BreweryRecipeWrapper.java | 1 - .../PetalApothecaryRecipeCategory.java | 2 - .../puredaisy/PureDaisyRecipeCategory.java | 1 - .../client/model/FloatingFlowerModel.java | 8 +- .../botania/client/model/ModelBellows.java | 1 - .../botania/client/model/ModelBrewery.java | 1 - .../botania/client/model/ModelPump.java | 6 +- .../botania/client/model/ModelPylon.java | 9 +- .../botania/client/model/PylonItemModel.java | 8 +- .../render/entity/RenderDoppleganger.java | 3 - .../client/render/entity/RenderManaStorm.java | 4 - .../render/entity/RenderPinkWither.java | 1 - .../client/render/entity/RenderPixie.java | 8 +- .../render/entity/RenderPoolMinecart.java | 2 - .../render/entity/RenderSnowballStack.java | 32 ++++ .../render/entity/RenderThornChakram.java | 3 - .../client/render/tile/RenderTileAltar.java | 8 - .../client/render/tile/RenderTileAvatar.java | 6 - .../client/render/tile/RenderTileBellows.java | 4 - .../client/render/tile/RenderTileBrewery.java | 12 -- .../client/render/tile/RenderTileCocoon.java | 2 - .../tile/RenderTileCorporeaCrystalCube.java | 3 - .../render/tile/RenderTileCorporeaIndex.java | 3 - .../render/tile/RenderTileFloatingFlower.java | 9 - .../render/tile/RenderTileHourglass.java | 1 - .../render/tile/RenderTileIncensePlate.java | 6 - .../client/render/tile/RenderTilePrism.java | 3 - .../client/render/tile/RenderTilePump.java | 4 - .../client/render/tile/RenderTilePylon.java | 4 - .../render/tile/RenderTileRedString.java | 1 - .../render/tile/RenderTileRuneAltar.java | 11 -- .../render/tile/RenderTileSkullOverride.java | 5 - .../render/tile/RenderTileSparkChanger.java | 7 - .../render/tile/RenderTileSpawnerClaw.java | 3 - .../render/tile/RenderTileSpreader.java | 5 - .../render/tile/RenderTileStarfield.java | 3 - .../render/tile/RenderTileTeruTeruBozu.java | 2 - .../common/achievement/ModAchievements.java | 1 - .../botania/common/block/BlockAlfPortal.java | 5 - .../botania/common/block/BlockAltar.java | 1 - .../botania/common/block/BlockBifrost.java | 6 - .../common/block/BlockCacophonium.java | 1 - .../botania/common/block/BlockCamo.java | 3 - .../botania/common/block/BlockCocoon.java | 1 - .../block/BlockFloatingSpecialFlower.java | 9 - .../botania/common/block/BlockForestEye.java | 1 - .../botania/common/block/BlockGaiaHead.java | 4 +- .../botania/common/block/BlockGhostRail.java | 4 - .../botania/common/block/BlockHourglass.java | 1 - .../common/block/BlockIncensePlate.java | 1 - .../botania/common/block/BlockLightRelay.java | 8 - .../vazkii/botania/common/block/BlockMod.java | 3 - .../common/block/BlockModContainer.java | 3 - .../common/block/BlockModDoubleFlower.java | 12 +- .../botania/common/block/BlockModFlower.java | 1 - .../botania/common/block/BlockOpenCrate.java | 5 - .../common/block/BlockPistonRelay.java | 1 - .../botania/common/block/BlockPlatform.java | 2 - .../botania/common/block/BlockPylon.java | 3 - .../botania/common/block/BlockSolidVines.java | 1 - .../common/block/BlockSparkChanger.java | 1 - .../botania/common/block/BlockStorage.java | 3 - .../botania/common/block/ModFluffBlocks.java | 2 - .../corporea/BlockCorporeaCrystalCube.java | 3 - .../block/corporea/BlockCorporeaFunnel.java | 1 - .../block/corporea/BlockCorporeaIndex.java | 1 - .../corporea/BlockCorporeaInterceptor.java | 1 - .../common/block/decor/Block18Stone.java | 1 - .../common/block/decor/BlockBuriedPetals.java | 3 - .../common/block/decor/BlockCustomBrick.java | 1 - .../block/decor/BlockEndStoneBrick.java | 1 - .../block/decor/BlockFloatingFlower.java | 10 -- .../common/block/decor/BlockManaBeacon.java | 4 - .../common/block/decor/BlockModMushroom.java | 4 - .../common/block/decor/BlockPavement.java | 3 - .../common/block/decor/BlockPetalBlock.java | 3 - .../common/block/decor/BlockShinyFlower.java | 4 - .../common/block/decor/BlockStarfield.java | 1 - .../common/block/decor/BlockTinyPotato.java | 4 - .../common/block/decor/BlockUnstable.java | 2 - .../decor/biomestone/BlockBiomeStone.java | 1 - .../decor/biomestone/BlockBiomeStoneB.java | 1 - .../block/decor/panes/BlockModPane.java | 3 - .../decor/quartz/BlockSpecialQuartz.java | 1 - .../decor/quartz/BlockSpecialQuartzSlab.java | 3 - .../decor/slabs/BlockBiomeStoneSlab.java | 1 - .../block/decor/slabs/BlockLivingSlab.java | 3 - .../block/decor/slabs/BlockModSlab.java | 2 - .../block/decor/stairs/BlockLivingStairs.java | 1 - .../block/decor/walls/Block18StoneWall.java | 1 - .../decor/walls/BlockBiomeStoneWall.java | 1 - .../dispenser/BehaviourPoolMinecart.java | 1 - .../common/block/mana/BlockBellows.java | 2 - .../common/block/mana/BlockBrewery.java | 3 - .../common/block/mana/BlockDistributor.java | 2 - .../common/block/mana/BlockEnchanter.java | 8 - .../common/block/mana/BlockForestDrum.java | 1 - .../common/block/mana/BlockManaDetector.java | 1 - .../botania/common/block/mana/BlockPool.java | 10 -- .../botania/common/block/mana/BlockPrism.java | 1 - .../botania/common/block/mana/BlockPump.java | 1 - .../common/block/mana/BlockRuneAltar.java | 3 - .../common/block/mana/BlockSpawnerClaw.java | 1 - .../common/block/mana/BlockSpreader.java | 2 - .../common/block/mana/BlockTerraPlate.java | 7 - .../common/block/mana/BlockTurntable.java | 1 - .../common/block/string/BlockRedString.java | 3 - .../block/subtile/SubTilePureDaisy.java | 1 - .../subtile/functional/SubTileBellethorn.java | 9 +- .../subtile/functional/SubTileDreadthorn.java | 9 +- .../subtile/functional/SubTileHopperhock.java | 1 - .../functional/SubTileSpectranthemum.java | 1 - .../subtile/generating/SubTileDaybloom.java | 3 - .../subtile/generating/SubTileEndoflame.java | 1 - .../generating/SubTileEntropinnyum.java | 3 +- .../generating/SubTileHydroangeas.java | 1 - .../subtile/generating/SubTileSpectrolus.java | 1 - .../common/block/tile/TileAlfPortal.java | 21 +-- .../botania/common/block/tile/TileAltar.java | 1 - .../common/block/tile/TileBrewery.java | 3 - .../botania/common/block/tile/TileCocoon.java | 1 - .../common/block/tile/TileEnchanter.java | 3 +- .../common/block/tile/TileHourglass.java | 4 - .../common/block/tile/TileManaBeacon.java | 2 - .../botania/common/block/tile/TilePylon.java | 2 - .../common/block/tile/TileRuneAltar.java | 1 - .../common/block/tile/TileSpawnerClaw.java | 5 +- .../common/block/tile/TileSpecialFlower.java | 1 - .../common/block/tile/mana/TileBellows.java | 1 - .../common/block/tile/mana/TilePool.java | 1 - .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 3 - .../common/brew/potion/PotionAllure.java | 1 - .../common/brew/potion/PotionBloodthirst.java | 1 - .../common/brew/potion/PotionClear.java | 1 - .../common/brew/potion/PotionEmptiness.java | 1 - .../common/brew/potion/PotionFeatherfeet.java | 1 - .../common/brew/potion/PotionSoulCross.java | 1 - .../common/core/handler/ConfigHandler.java | 2 +- .../common/core/handler/IMCHandler.java | 6 +- .../common/core/handler/SheddingHandler.java | 6 +- .../common/core/helper/InventoryHelper.java | 2 +- .../botania/common/core/helper/Quat.java | 4 +- .../common/entity/EntityDoppleganger.java | 5 +- .../common/entity/EntityManaBurst.java | 1 - .../common/entity/EntitySignalFlare.java | 1 - .../buildcraft/StatementAPIPlugin.java | 5 +- .../coloredlights/ColoredLightHelper.java | 2 +- .../botania/common/item/Item16Colors.java | 2 - .../botania/common/item/ItemAncientWill.java | 1 - .../botania/common/item/ItemBaubleBox.java | 3 - .../common/item/ItemBlackHoleTalisman.java | 1 - .../botania/common/item/ItemBottledMana.java | 1 - .../common/item/ItemCorporeaSpark.java | 7 - .../botania/common/item/ItemCraftPattern.java | 1 - .../botania/common/item/ItemCraftingHalo.java | 6 - .../botania/common/item/ItemGaiaHead.java | 5 - .../botania/common/item/ItemGrassHorn.java | 1 - .../botania/common/item/ItemGrassSeeds.java | 4 - .../botania/common/item/ItemManaCookie.java | 3 - .../botania/common/item/ItemManaGun.java | 1 - .../botania/common/item/ItemManaMirror.java | 2 - .../botania/common/item/ItemManaTablet.java | 1 - .../vazkii/botania/common/item/ItemMod.java | 3 - .../botania/common/item/ItemOpenBucket.java | 2 - .../botania/common/item/ItemSextant.java | 2 +- .../botania/common/item/ItemSignalFlare.java | 3 - .../botania/common/item/ItemSlimeBottle.java | 1 - .../vazkii/botania/common/item/ItemSpark.java | 7 - .../botania/common/item/ItemSparkUpgrade.java | 7 - .../botania/common/item/ItemSpawnerMover.java | 1 - .../common/item/ItemTemperanceStone.java | 1 - .../botania/common/item/ItemThornChakram.java | 1 - .../botania/common/item/ItemTwigWand.java | 3 - .../vazkii/botania/common/item/ItemVirus.java | 1 - .../common/item/block/ItemBlockPool.java | 2 - .../item/block/ItemBlockSpecialFlower.java | 43 ++--- .../common/item/brew/ItemBrewBase.java | 1 - .../common/item/brew/ItemIncenseStick.java | 1 - .../botania/common/item/brew/ItemVial.java | 1 - .../armor/manasteel/ItemManasteelArmor.java | 1 - .../armor/manaweave/ItemManaweaveArmor.java | 2 - .../armor/terrasteel/ItemTerrasteelHelm.java | 8 - .../equipment/bauble/ItemBaubleCosmetic.java | 3 - .../equipment/bauble/ItemBloodPendant.java | 3 - .../item/equipment/bauble/ItemDivaCharm.java | 7 - .../equipment/bauble/ItemGoldenLaurel.java | 7 - .../item/equipment/bauble/ItemHolyCloak.java | 2 - .../item/equipment/bauble/ItemIcePendant.java | 10 +- .../item/equipment/bauble/ItemItemFinder.java | 9 - .../equipment/bauble/ItemKnockbackBelt.java | 2 - .../equipment/bauble/ItemLavaPendant.java | 7 - .../item/equipment/bauble/ItemMagnetRing.java | 4 - .../item/equipment/bauble/ItemMonocle.java | 7 - .../bauble/ItemSuperLavaPendant.java | 8 - .../item/equipment/bauble/ItemTinyPlanet.java | 2 - .../item/equipment/bauble/ItemTravelBelt.java | 2 - .../item/equipment/tool/ItemEnderDagger.java | 1 - .../item/equipment/tool/ItemThunderSword.java | 9 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 1 - .../tool/elementium/ItemElementiumShears.java | 4 - .../tool/manasteel/ItemManasteelAxe.java | 3 - .../tool/manasteel/ItemManasteelPick.java | 3 - .../tool/manasteel/ItemManasteelShears.java | 5 - .../tool/manasteel/ItemManasteelShovel.java | 3 - .../tool/manasteel/ItemManasteelSword.java | 3 - .../tool/terrasteel/ItemTerraAxe.java | 4 - .../tool/terrasteel/ItemTerraPick.java | 4 - .../botania/common/item/lens/ItemLens.java | 2 - .../botania/common/item/lens/LensFlare.java | 1 - .../botania/common/item/lens/LensWarp.java | 1 - .../botania/common/item/material/ItemDye.java | 4 - .../item/material/ItemManaResource.java | 10 -- .../item/material/ItemPestleAndMortar.java | 1 - .../common/item/material/ItemQuartz.java | 1 - .../common/item/material/ItemRune.java | 1 - .../common/item/record/ItemModRecord.java | 3 - .../common/item/relic/ItemExcaliber.java | 35 ---- .../common/item/relic/ItemFlugelEye.java | 1 - .../common/item/relic/ItemInfiniteFruit.java | 3 - .../common/item/relic/ItemKingKey.java | 4 - .../common/item/rod/ItemDiviningRod.java | 2 - .../common/item/rod/ItemGravityRod.java | 6 +- .../common/item/rod/ItemTornadoRod.java | 2 - .../botania/common/lexicon/LexiconData.java | 83 ++++----- .../common/lexicon/page/PageEntity.java | 4 - .../common/lexicon/page/PageMultiblock.java | 1 - .../common/lexicon/page/PageRecipe.java | 1 - .../common/lexicon/page/PageShedding.java | 1 - .../common/world/SkyblockWorldEvents.java | 3 - .../common/world/WorldTypeSkyblock.java | 1 - 277 files changed, 249 insertions(+), 1068 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 77c00e022..21e3f4d40 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -62,34 +62,34 @@ import net.minecraftforge.fml.common.Loader; public final class BotaniaAPI { - private static List categories = new ArrayList(); - private static List allEntries = new ArrayList(); + private static List categories = new ArrayList<>(); + private static List allEntries = new ArrayList<>(); - public static Map knowledgeTypes = new HashMap(); + public static Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap(); + public static Map brewMap = new LinkedHashMap<>(); - public static List petalRecipes = new ArrayList(); - public static List pureDaisyRecipes = new ArrayList(); - public static List manaInfusionRecipes = new ArrayList(); - public static List runeAltarRecipes = new ArrayList(); - public static List elvenTradeRecipes = new ArrayList(); - public static List brewRecipes = new ArrayList(); - public static List miniFlowerRecipes = new ArrayList(); + public static List petalRecipes = new ArrayList<>(); + public static List pureDaisyRecipes = new ArrayList<>(); + public static List manaInfusionRecipes = new ArrayList<>(); + public static List runeAltarRecipes = new ArrayList<>(); + public static List elvenTradeRecipes = new ArrayList<>(); + public static List brewRecipes = new ArrayList<>(); + public static List miniFlowerRecipes = new ArrayList<>(); private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap, SubTileSignature>(); + private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); public static Set subtilesForCreativeMenu = new LinkedHashSet(); - public static Map subTileMods = new HashMap(); + public static Map subTileMods = new HashMap<>(); public static BiMap miniFlowers = HashBiMap. create(); - public static Map oreWeights = new HashMap(); - public static Map oreWeightsNether = new HashMap(); + public static Map oreWeights = new HashMap<>(); + public static Map oreWeightsNether = new HashMap<>(); public static Map seeds = new HashMap(); - public static Set looniumBlacklist = new LinkedHashSet(); - public static Map> paintableBlocks = new LinkedHashMap>(); - public static Set magnetBlacklist = new LinkedHashSet(); + public static Set looniumBlacklist = new LinkedHashSet<>(); + public static Map> paintableBlocks = new LinkedHashMap<>(); + public static Set magnetBlacklist = new LinkedHashSet<>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index cbf501dd2..7e0fab467 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -1,6 +1,5 @@ package vazkii.botania.api; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index b3601d37f..c2a1a27e0 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -33,7 +33,7 @@ public final class CorporeaHelper { private static final List empty = Collections.unmodifiableList(new ArrayList()); private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); - private static final List autoCompleteControllers = new ArrayList(); + private static final List autoCompleteControllers = new ArrayList<>(); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 667f51895..a6a8fb857 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,8 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -28,8 +26,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index d1a8a26c3..655cd8eeb 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,8 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 176d4e968..2ef376071 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -10,14 +10,11 @@ */ package vazkii.botania.api.item; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 06f678d0d..ec30651b7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -20,7 +20,7 @@ public class LexiconCategory implements Comparable { private static int count = 0; public final String unlocalizedName; - public final List entries = new ArrayList(); + public final List entries = new ArrayList<>(); private final int sortingId; private ResourceLocation icon; private int priority = 5; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 222eb806c..274bfd6e6 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -27,7 +27,7 @@ public class LexiconEntry implements Comparable { private KnowledgeType type = BotaniaAPI.basicKnowledge; - public List pages = new ArrayList(); + public List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 38271b2a8..2b4240970 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock; import java.util.*; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -33,7 +32,7 @@ public class Multiblock { public BlockPos maxPos = BlockPos.ORIGIN; public BlockPos offPos = BlockPos.ORIGIN; - public HashMap locationCache = new HashMap(); + public HashMap locationCache = new HashMap<>(); /** * Adds a multiblock component to this multiblock. The component's x y z @@ -125,7 +124,7 @@ public class Multiblock { * orientations. */ public Map createRotations() { - Map ret = new EnumMap(EnumFacing.class); + Map ret = new EnumMap<>(EnumFacing.class); ret.put(EnumFacing.SOUTH, this); diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index 100e286cb..ebc675e1a 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock; import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 4ca2ae01e..451a184ac 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.lexicon.multiblock.component; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java index 4e1ec47f3..4427ccbc1 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -1,8 +1,6 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 89f93cca4..6b3e3e5a1 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -65,12 +65,9 @@ public class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { - @Override - public boolean apply(FutureStoneVariant variant) { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; - } + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; }); // BlockAlfPortal @@ -89,12 +86,7 @@ public class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { - @Override - public boolean apply(BiomeStoneVariant input) { - return input.getName().contains("cobble"); - } - }); + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); @@ -120,36 +112,21 @@ public class BotaniaStateProps { // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); - // BlockModDoubleFlower - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor input) { - // White to gray - return input.ordinal() >= 0 && input.ordinal() <= 7; - } - }); + // BlockModDoubleFlower (white to gray) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor input) { - // Silver to black - return input.ordinal() >= 8 && input.ordinal() <= 15; - } - }); + // (silver to black) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor color) { - return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK - || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED - || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN; - } - }); + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color -> + color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 718cc889f..a75aefb1a 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -10,13 +10,11 @@ */ package vazkii.botania.api.subtile; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 04542ab11..f23687453 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -11,7 +11,6 @@ package vazkii.botania.api.subtile; import java.awt.Color; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 949f0c8e6..11833c014 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -12,8 +12,6 @@ package vazkii.botania.api.subtile.signature; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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 5d8d04c81..e0233a241 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -10,13 +10,9 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 97fad752f..a7e56bb73 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; @@ -39,23 +38,17 @@ public class CorporeaAutoCompleteHandler { boolean isAutoCompleted = false; String originalString = ""; - List completions = new ArrayList(); + List completions = new ArrayList<>(); int position; - static TreeSet itemNames = new TreeSet( - new Comparator() { - @Override - public int compare(String arg0, String arg1) { - return arg0.compareToIgnoreCase(arg1); - } - }); + static TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); private boolean tabLastTick = false; public static void updateItemList() { itemNames.clear(); Iterator iterator = Item.itemRegistry.iterator(); - ArrayList curList = new ArrayList(); + ArrayList curList = new ArrayList<>(); while(iterator.hasNext()) { Item item = iterator.next(); @@ -146,7 +139,7 @@ public class CorporeaAutoCompleteHandler { if(s.isEmpty()) return new ArrayList(); - TreeSet result = new TreeSet(); + TreeSet result = new TreeSet<>(); String[] words = s.split(" "); int i = words.length - 1; String curPrefix = words[i]; @@ -156,11 +149,11 @@ public class CorporeaAutoCompleteHandler { if(i >= 0) curPrefix = words[i] + " " + curPrefix; } - return new ArrayList(result); + return new ArrayList<>(result); } private List getNamesStartingWith(String prefix) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); int length = prefix.length(); SortedSet after = itemNames.tailSet(prefix); for(String str : after) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 805ac287b..f412c7f90 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -36,7 +35,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 55c951968..46dcea7eb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -16,13 +16,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 884cdf873..ebca3690c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -177,11 +177,11 @@ public class LightningHandler { public static class LightningBolt { - public ArrayList segments = new ArrayList(); + public ArrayList segments = new ArrayList<>(); public Vector3 start; public Vector3 end; BlockPos target; - HashMap splitparents = new HashMap(); + HashMap splitparents = new HashMap<>(); public double length; public int numsegments0; @@ -198,7 +198,7 @@ public class LightningHandler { private World world; private Entity source; - public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue(); + public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); public float speed = 1.5F; public static final int fadetime = 20; @@ -350,7 +350,7 @@ public class LightningHandler { return; ArrayList oldsegments = segments; - segments = new ArrayList(); + segments = new ArrayList<>(); Segment prev = null; @@ -431,7 +431,7 @@ public class LightningHandler { } private void calculateCollisionAndDiffs() { - HashMap lastactivesegment = new HashMap(); + HashMap lastactivesegment = new HashMap<>(); Collections.sort(segments, new SegmentSorter()); 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 cd1cec77f..c144b5052 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -168,165 +168,116 @@ public final class ModelHandler { ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemInfiniteFruit.isBoot(stack) ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(infiniteFruit, stack -> + ItemInfiniteFruit.isBoot(stack) + ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") + : new ModelResourceLocation("botania:infiniteFruit", "inventory")); ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRing, stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingOn", "inventory") + : new ModelResourceLocation("botania:magnetRingOff", "inventory")); ModelLoader.registerItemVariants(magnetRingGreater, new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRingGreater, stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name; - if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { - name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; - } else { - name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; - } - return new ModelResourceLocation(name, "inventory"); - } + ModelLoader.setCustomMeshDefinition(manaGun, stack -> { + String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; + return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); }); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod", "inventory"), new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(tornadoRod, stack -> + ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) + ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") + : new ModelResourceLocation("botania:tornadoRod", "inventory")); ModelLoader.registerItemVariants(twigWand, new ModelResourceLocation("botania:twigWand", "inventory"), new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - } + ModelLoader.setCustomMeshDefinition(twigWand, stack -> { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); }); ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveBoots, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory")); ModelLoader.registerItemVariants(manaweaveChest, new ModelResourceLocation("botania:manaweaveChest", "inventory"), new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveChest, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory")); ModelLoader.registerItemVariants(manaweaveHelm, new ModelResourceLocation("botania:manaweaveHelm", "inventory"), new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveHelm, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory")); ModelLoader.registerItemVariants(manaweaveLegs, new ModelResourceLocation("botania:manaweaveLegs", "inventory"), new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveLegs, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory")); ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manasteelSword, stack -> + "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) + ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory")); ModelLoader.registerItemVariants(spawnerMover, new ModelResourceLocation("botania:spawnerMover", "inventory"), new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (ItemSpawnerMover.hasData(stack)) { - return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); - } else { - return new ModelResourceLocation("botania:spawnerMover", "inventory"); - } - } - }); + ModelLoader.setCustomMeshDefinition(spawnerMover, stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory")); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), new ModelResourceLocation("botania:terraPickEnabled", "inventory"), new ModelResourceLocation("botania:terraPickTipped", "inventory"), new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; - } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); + ModelLoader.setCustomMeshDefinition(terraPick, stack -> { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; } + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); }); } @@ -692,24 +643,18 @@ public final class ModelHandler { ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewFlask, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); - return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - } + ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { + int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); + return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); }); for (int i = 0; i < 4; i++) { ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewVial, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); - return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - } + ModelLoader.setCustomMeshDefinition(brewVial, stack -> { + int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); + return new ModelResourceLocation("botania:vial1_" + swigsTaken, "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 a854031a5..6a8e28e17 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; 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 28923adcb..b4384a73d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -10,17 +10,14 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; @@ -37,7 +34,6 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibObfuscation; 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 081742fa2..90d136073 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 6b7424553..5ca7e279d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; 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 16ac0a542..6b844e51b 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -72,6 +72,7 @@ import vazkii.botania.client.render.entity.RenderManaStorm; import vazkii.botania.client.render.entity.RenderPinkWither; import vazkii.botania.client.render.entity.RenderPixie; import vazkii.botania.client.render.entity.RenderPoolMinecart; +import vazkii.botania.client.render.entity.RenderSnowballStack; import vazkii.botania.client.render.entity.RenderSpark; import vazkii.botania.client.render.entity.RenderThornChakram; import vazkii.botania.client.render.tile.RenderTileAlfPortal; @@ -255,17 +256,18 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); - RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); + RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); + RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, RenderThornChakram::new); + RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new); + RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); + RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); + + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem())); ShaderHelper.initShaders(); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 064b568ce..89b68a463 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 7fbc8ef3e..587e5ac1c 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index b6efd239b..3e8fc66b5 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; @@ -23,8 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 642b1bca1..d875c5f3d 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -17,8 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; public class GuiBaubleBox extends InventoryEffectRenderer { diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index 87f867476..693d65910 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -17,8 +17,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - // This is pretty much a copypasta of GuiCrafting >_> public class GuiCraftingHalo extends GuiContainer { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 6adb773c2..5c51c4d5e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -13,14 +13,10 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.ClientTickHandler; 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 d456eab8b..76bfc90ed 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -19,7 +19,6 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,8 +26,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index d08029cfa..91ef081f1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index ec22e8424..5e282a6f1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -17,8 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 4031f8f03..e0b94b4f7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -16,13 +16,9 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.challenge.Challenge; public class GuiButtonChallengeIcon extends GuiButtonLexicon { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index fa7797212..b90c97758 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 786d27b60..984f1e175 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 @@ -15,14 +15,11 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 5d0766590..de39d3a0d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -13,13 +13,11 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index bb3e50bbf..4a56f238a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index d6141d21a..aa1f822d6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 74f725f0c..866c8de3b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -16,8 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 3fba77c56..712e0c0c1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 3c3881484..320a19ddc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 2fc32fcdf..7bfa637d2 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index d9bb0464e..8bfbd619b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 1525d35cc..61e54d303 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -20,8 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.awt.*; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 84012a2c2..e38084158 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -10,7 +10,6 @@ package vazkii.botania.client.integration.jei.puredaisy; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 09541e561..d33a0a922 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -12,7 +12,6 @@ import com.google.common.base.Function; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import com.google.common.collect.Table; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -36,7 +35,6 @@ import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; @@ -47,7 +45,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; -import java.util.Map; +import java.util.stream.Collectors; public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { @@ -164,9 +162,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } for (EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(Iterables.transform(flower.getFaceQuads(e), new Function() { - @Override public BakedQuad apply(BakedQuad input) { return transform(input, transform); } - })); + genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add island quads diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 764b8b28b..15976ddc6 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; public class ModelBellows extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index fadb4b32d..c32f11f6f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.render.tile.RenderTileBrewery; diff --git a/src/main/java/vazkii/botania/client/model/ModelPump.java b/src/main/java/vazkii/botania/client/model/ModelPump.java index e869a3d5e..3f5e9dd97 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPump.java +++ b/src/main/java/vazkii/botania/client/model/ModelPump.java @@ -17,10 +17,10 @@ import net.minecraft.client.model.ModelRenderer; public class ModelPump extends ModelBase{ - private ArrayList parts = new ArrayList(); + private ArrayList parts = new ArrayList<>(); - private ArrayList innerRing = new ArrayList(); - private ArrayList outerRing = new ArrayList(); + private ArrayList innerRing = new ArrayList<>(); + private ArrayList outerRing = new ArrayList<>(); public ModelPump() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 503de6719..f90fcb282 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -14,7 +14,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -22,7 +21,6 @@ import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.crash.CrashReport; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; @@ -52,12 +50,7 @@ public class ModelPylon implements IPylonModel { private IFlexibleBakedModel gaiaRingsAndPanes; private IFlexibleBakedModel gaiaGems; - private static final Function TEXTUREGETTER = new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation input) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - } - }; + private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 3988f6061..bb9f45634 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -31,7 +31,6 @@ import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.apache.http.annotation.Immutable; import org.apache.logging.log4j.Level; import javax.vecmath.Matrix4f; @@ -83,12 +82,7 @@ public class PylonItemModel implements ISmartItemModel { // All groups are off by default // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group - final Function textureGetter = new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation input) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - } - }; + final Function textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index fae42a6fe..b7ad3f037 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -10,13 +10,10 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index 460c0ae3f..bb781be4f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 59e6f678c..3b576dfc5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -12,7 +12,6 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; -import net.minecraft.entity.Entity; import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 216fe9ff9..728d4ec8f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,12 +10,10 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; @@ -43,8 +41,8 @@ public class RenderPixie extends RenderLiving { } }; - public RenderPixie() { - super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); + public RenderPixie(RenderManager renderManager) { + super(renderManager, new ModelPixie(), 0.25F); //setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } 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 7b9d2df98..4fdeb8eb6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -10,11 +10,9 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; -import net.minecraft.entity.item.EntityMinecart; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.entity.EntityPoolMinecart; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java new file mode 100644 index 000000000..d3a69cbd0 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -0,0 +1,32 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.client.render.entity; + +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; + +// Same as RenderSnowball, but ItemStack sensitive +public class RenderSnowballStack extends RenderSnowball { + + private final ItemStack stack; + + public RenderSnowballStack(RenderManager renderManagerIn, ItemStack stack, RenderItem render) { + super(renderManagerIn, stack.getItem(), render); + this.stack = stack; + } + + @Override + public ItemStack func_177082_d(T entity) { + return stack; + } + +} 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 918ff8232..285db6cfe 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -17,14 +17,11 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.common.entity.EntityThornChakram; -import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index b39413a24..e1f3b80e6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -10,28 +10,20 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; 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 9250f4b7d..ba84c4033 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -10,22 +10,16 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 0e2b85cfb..5df13f445 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.tile.mana.TileBellows; 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 8c04d7076..f9d47bee4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -10,25 +10,13 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; 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 0ef53fb41..0ee6aafc0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -13,11 +13,9 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCocoon; 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 73eeb4d10..d5c18e13b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -13,18 +13,15 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index b89703d8e..00612b80d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -14,11 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelEnderCrystal; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 6cc751810..c3d4e41f5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,24 +16,15 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraftforge.client.model.ISmartBlockModel; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.ModelMiniIsland; import vazkii.botania.common.block.decor.IFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index b1af2c419..ef39061b1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index f05612bc5..28dc78357 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -10,22 +10,16 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; 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 99b2065d8..fc213c7a4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -16,9 +16,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index b57406bab..ae77944ba 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; import vazkii.botania.common.block.tile.mana.TilePump; 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 013715e87..68e2077a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -17,13 +17,9 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 1e46a1ade..6ea9a7c57 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -11,7 +11,6 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; 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 485122928..3bce25066 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -10,23 +10,12 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index d3c0e74e5..30cb9f1a0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -13,18 +13,13 @@ package vazkii.botania.client.render.tile; import java.util.Map; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.client.resources.DefaultPlayerSkin; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.model.ModelSkullOverride; import vazkii.botania.client.render.entity.RenderDoppleganger; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index a6a9dadb1..489326aff 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -10,19 +10,12 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileSparkChanger; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java index 32032b735..cedc6db5a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -16,9 +16,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpawnerClaw; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index f188dc490..e32dd3492 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -13,7 +13,6 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -24,12 +23,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 0af40dcfb..56e7d689a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -18,11 +18,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileStarfield; // THIS CODE WAS STOLEN FROM THE END PORTAL diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 2e5d6cae2..037f567b5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -15,11 +15,9 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 5a4f009f3..82b35316b 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -22,7 +22,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibAchievementNames; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.common.FMLCommonHandler; public final class ModAchievements { diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8cc87e9c4..47d93e231 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,15 +20,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 9e4d19e3b..0ec470fb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -42,7 +42,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index c055ba4b4..a6407eef0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -25,18 +24,13 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBifrost extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 4da8c9fd9..91b13e03b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -25,7 +25,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 5c06d34c5..2b299f91f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 062691f8d..54695cb2e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -16,7 +16,6 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 0dec520f9..1629ff832 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -19,8 +19,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -33,15 +31,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -51,7 +43,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 690b6efe7..6cdce7f1b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -18,7 +18,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 1243623d4..32021cc9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -17,7 +17,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -27,7 +26,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -54,7 +52,7 @@ public class BlockGaiaHead extends BlockSkull { @Override public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 6bd622ad1..763bace3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -27,15 +26,12 @@ import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockGhostRail extends BlockRailBase implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index c46586e1c..d352295d8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index f1ef4a45e..0aab68bd4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -26,7 +26,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index d45842da2..8e3f5bddc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -17,7 +17,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -28,18 +27,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 791ed8850..6a95f77f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -13,13 +13,10 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockMod extends Block { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index 5480eb915..dfb4905b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -15,12 +15,9 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 3ce73dbac..a3d12724b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,19 +10,13 @@ */ package vazkii.botania.common.block; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import net.minecraft.block.Block; -import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -35,12 +29,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -119,7 +111,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player)) { - java.util.ArrayList items = new java.util.ArrayList(); + java.util.ArrayList items = new java.util.ArrayList<>(); ItemStack itemstack = this.createStackedBlock(state); if (itemstack != null) @@ -179,7 +171,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); IBlockState state = world.getBlockState(pos); IBlockState stateBelow = world.getBlockState(pos.down()); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index c31dde952..586cc9d5b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -31,7 +31,6 @@ import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 8bf6e2463..e67dce5b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -24,7 +24,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -35,9 +34,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -45,7 +41,6 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index bbb07afc5..1cc24a757 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -42,7 +42,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 8b94277e8..4d6a03d90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -34,10 +34,8 @@ import net.minecraftforge.common.property.IUnlistedProperty; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 2daf501b8..04195a659 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -18,7 +18,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -28,9 +27,7 @@ import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PylonVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index bf678aa51..e9d533f93 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -25,7 +25,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index c188a83b3..8b1b84a90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -28,7 +28,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index d47743fd4..978585d00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -27,13 +27,10 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 2a27dbb61..8be2ffa55 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -83,8 +83,6 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Arrays; -import java.util.Collection; import java.util.Locale; import java.util.Set; 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 6cdce12ab..87c1b383d 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -16,13 +16,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -30,7 +28,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; 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 dd0884a7f..253723730 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -21,7 +21,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; 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 e0a1e8b01..ddbc4eedd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; 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 3848b56ad..4bbe34cff 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -24,7 +24,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; 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 c6c762697..709f7c23a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 8ab9f26e1..9df2c365b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -12,16 +12,13 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; 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 4d89c6956..9a7cf973f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CustomBrickVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 0d7b73aee..0357122d8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 df74ecbc3..bd6f28a9f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -18,15 +18,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.resources.FallbackResourceManager; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -37,12 +32,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -50,8 +42,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; 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 361dadb44..02a248ad1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.awt.Color; import java.util.List; import net.minecraft.block.Block; @@ -18,7 +17,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -30,11 +28,9 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; 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 22969c520..076fee7ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -19,7 +19,6 @@ import net.minecraft.block.BlockMushroom; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; @@ -34,7 +33,6 @@ import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -44,8 +42,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { 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 d254c16bc..f700cf333 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -25,13 +25,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { 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 b05e3fc21..61c890d2a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.awt.Color; import java.util.List; import net.minecraft.block.Block; @@ -18,7 +17,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -31,7 +29,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 402ccaa6c..59effbf09 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -10,10 +10,8 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; @@ -22,8 +20,6 @@ import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; 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 16ce01c95..50b6c6443 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -22,7 +22,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; 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 61537ab19..6d6e7c944 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -19,13 +19,11 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -34,9 +32,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PotatoVariant; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTinyPotato; 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 dce351107..50ada96da 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -19,7 +19,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -34,7 +33,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; 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 1bda5d990..385f8234e 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 @@ -24,7 +24,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 305ec2776..3fa1779ee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -14,7 +14,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; -import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; public class BlockBiomeStoneB extends BlockBiomeStone { 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 0d7d13d65..6378311a0 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 @@ -16,13 +16,10 @@ import net.minecraft.block.material.Material; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { 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 89607cb79..783bd30da 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 @@ -28,7 +28,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.QuartzVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; 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 65d6f8afb..bd2e90848 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 @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -27,8 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartzSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index 0b5c5ce15..4579fc93e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor.slabs; -import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 5a0a65de1..d2b6f0ec1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -1,9 +1,6 @@ package vazkii.botania.common.block.decor.slabs; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockLivingSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 460c1dc94..de6383171 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -21,8 +21,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java index 4c03846fc..5850709e2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java @@ -1,6 +1,5 @@ package vazkii.botania.common.block.decor.stairs; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; public class BlockLivingStairs extends BlockModStairs { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index f6e98269e..c0507111d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index e6ae28e1b..92264bf97 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; 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 4fff32f19..e8415b455 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.dispenser; -import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.block.material.Material; 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 d6d5e1a0c..d64658100 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -19,14 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; 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 744d01f9a..2be8db81a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -19,7 +19,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -37,8 +36,6 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.swing.text.html.ObjectView; - public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { Random random; 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 cf1bb11ad..7358f227d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -18,9 +18,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; 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 f33be0a81..4b69efb76 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -13,12 +13,10 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -31,17 +29,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; 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 4bb8e57a1..fca4ea170 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -37,7 +37,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; 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 7519453f6..fa21162ca 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -29,7 +29,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; 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 a82ebae64..0a7650683 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -19,7 +19,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -34,11 +33,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -47,13 +41,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; 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 deef965ba..bfbe9a649 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -34,7 +34,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePrism; 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 da966197d..e4548f1a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -26,7 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; 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 3dac4408f..a71649683 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -14,8 +14,6 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +26,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; 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 1e77e0a0b..8325eacce 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -23,7 +23,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; 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 f5dc4ba1d..8f4c6bbd1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -41,9 +41,7 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; 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 cc36f1387..7cc4acca2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,16 +20,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.item.ModItems; 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 cd6eb5501..8b0d46fa1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -23,7 +23,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; 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 0394f774d..0a3e75cc1 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -22,13 +22,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockRedString extends BlockModContainer implements ILexiconable { 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 8cf7d5c41..b0ac7b20d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index fcd2a5f16..b47cde68d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -84,14 +84,7 @@ public class SubTileBellethorn extends SubTileFunctional { } public Predicate getSelector() { - return new Predicate() { - - @Override - public boolean apply(Entity entity) { - return !(entity instanceof EntityPlayer); - } - - }; + return entity -> !(entity instanceof EntityPlayer); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 4352c2ea2..22b5aca94 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -25,14 +25,7 @@ public class SubTileDreadthorn extends SubTileBellethorn { @Override public Predicate getSelector() { - return new Predicate() { - - @Override - public boolean apply(Entity var1) { - return var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; - } - - }; + return var1 -> var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index a632c6e7f..6f9167c8e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -36,7 +36,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import scala.reflect.internal.util.WeakHashSet; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 7270a9786..b0039c991 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,7 +19,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index 16b7696e1..48cc7fce7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -10,14 +10,11 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.signature.PassiveFlower; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 5aed0fe56..f6fb2a8cb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -23,7 +23,6 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; 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 11895e3a9..e002877df 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 @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; @@ -65,7 +64,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toBlockPos(), RANGE); - }; + } @Override public LexiconEntry getEntry() { 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 f4f288e52..f9e249781 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 @@ -21,7 +21,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; 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 0847f5b80..c97a5e405 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 @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; 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 9d74ac818..13be55318 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -84,26 +84,11 @@ public class TileAlfPortal extends TileMod implements ITickable { private boolean closeNow = false; private boolean hasUnloadedParts = false; - private static final Function CONVERTER_X_Z = new Function() { - @Override - public BlockPos apply(BlockPos input) { - return new BlockPos(input.getZ(), input.getY(), input.getX()); - } - }; + private static final Function CONVERTER_X_Z = input -> new BlockPos(input.getZ(), input.getY(), input.getX()); - private static final Function CONVERTER_X_Z_FP = new Function() { - @Override - public double[] apply(double[] input) { - return new double[] { input[2], input[1], input[0] }; - } - }; + private static final Function CONVERTER_X_Z_FP = input -> new double[] { input[2], input[1], input[0] }; - private static final Function CONVERTER_Z_SWAP = new Function() { - @Override - public BlockPos apply(BlockPos input) { - return new BlockPos(input.getX(), input.getY(), -input.getZ()); - } - }; + private static final Function CONVERTER_Z_SWAP = input -> new BlockPos(input.getX(), input.getY(), -input.getZ()); public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); 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 3e66dfe66..0468b5c3e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -17,7 +17,6 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 7af25e51d..12f061455 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import java.awt.Color; import java.util.List; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -21,11 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; 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 c3600b9b1..b5d0f35af 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -23,7 +23,6 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -import net.minecraftforge.fml.common.registry.VillagerRegistry; public class TileCocoon extends TileMod implements ITickable { 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 cd348ad3f..4d9b63b5b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import com.google.common.base.Predicates; -import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -80,7 +79,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) }; - private static final Map PYLON_LOCATIONS = new EnumMap(EnumFacing.Axis.class); + private static final Map PYLON_LOCATIONS = new EnumMap<>(EnumFacing.Axis.class); static { PYLON_LOCATIONS.put(EnumFacing.Axis.X, new BlockPos[] { new BlockPos(-5, 1, 0), new BlockPos(5, 1, 0), new BlockPos(-4, 1, 3), new BlockPos(4, 1, 3), new BlockPos(-4, 1, -3 ), new BlockPos(4, 1, -3) }); 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 25adb17d8..b83d649f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -14,7 +14,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,9 +22,6 @@ import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 41c28d03e..5ac481572 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.item.EnumDyeColor; import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index e431c1a01..3a02bfacd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -13,8 +13,6 @@ package vazkii.botania.common.block.tile; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.item.EnumDyeColor; import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 5c25b6c26..cb18e5605 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; 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 26e66a514..9ba37e846 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.sql.Ref; import java.util.List; import net.minecraft.entity.Entity; @@ -115,9 +114,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable if (flag) resetTimer(logic); } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { + } catch (IllegalAccessException | InvocationTargetException e) { e.printStackTrace(); } } 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 bf25397fe..dd1e63285 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.BlockDirt; 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 97a850de3..2be51938e 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 @@ -19,7 +19,6 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; 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 79f863dd9..8b5999da9 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 @@ -19,7 +19,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index d75fdfea6..675407b14 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -112,7 +112,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo if(tile instanceof IEnergyReceiver && ((IEnergyReceiver)tile).canConnectEnergy(side)) { if(receiverCache == null) - receiverCache = new EnumMap(EnumFacing.class); + receiverCache = new EnumMap<>(EnumFacing.class); receiverCache.put(side, (IEnergyReceiver)tile); } } 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 6a7e9ec9f..781124006 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 @@ -19,17 +19,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; 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 f13369a65..41bea1849 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.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 950576e3a..b30680ddd 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -18,7 +18,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.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 35c4bbfa6..efbe3a091 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; public class PotionClear extends PotionMod { 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 310370dc5..3614d8c7a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.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 594b2ba84..11eb1e2d0 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -13,7 +13,6 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.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 de36f5a22..8706bf491 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index b1e6c4bbd..cd4120160 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -406,7 +406,7 @@ public final class ConfigHandler { if(!enabled) return; - AdaptableValue adapt = new AdaptableValue(version, val); + AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { ArrayList list = new ArrayList(); adaptableValues.put(key, list); diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index 5cf46f4b6..ad7e47b87 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -12,10 +12,8 @@ import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; public final class IMCHandler { public static void processMessages(ImmutableList messageList) { - Iterator iterator = messageList.iterator(); - while(iterator.hasNext()) { - IMCMessage message = iterator.next(); - if(message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { + for (IMCMessage message : messageList) { + if (message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { String value = message.getStringValue(); ItemMagnetRing.addItemToBlackList(value); } 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 4dd76a3a0..1d3a491ef 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -37,8 +37,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static ArrayList patterns = new ArrayList(); - public static ArrayList defaultPatterns = new ArrayList(); + public static ArrayList patterns = new ArrayList<>(); + public static ArrayList defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { @@ -86,7 +86,7 @@ public final class SheddingHandler { 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(); + ArrayList defaultNames = new ArrayList<>(); for(ShedPattern pattern : defaultPatterns) { loadFromConfig(config, pattern.getEntityString(), pattern); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 1983fdd86..cb5821ac6 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -100,7 +100,7 @@ public class InventoryHelper { attemptSlots[a] = a; } if(intoSlot > -1) { - Set x = new HashSet(); + Set x = new HashSet<>(); for(int attemptedSlot : attemptSlots) x.add(attemptedSlot); diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index c3268e470..7ae3c753c 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -108,8 +108,8 @@ public class Quat { public String toString() { StringBuilder stringbuilder = new StringBuilder(); Formatter formatter = new Formatter(stringbuilder, Locale.US); - formatter.format("Quaternion:\n", new Object[0]); - formatter.format(" < %f %f %f %f >\n", Double.valueOf(s), Double.valueOf(x), Double.valueOf(y), Double.valueOf(z)); + formatter.format("Quaternion:\n"); + formatter.format(" < %f %f %f %f >\n", s, x, y, z); formatter.close(); return stringbuilder.toString(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 719cc4b37..8dc9e8146 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -22,7 +22,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; @@ -51,8 +50,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; @@ -935,7 +932,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public boolean matches(World world, BlockPos pos) { return world.getBlockState(pos).getBlock().isBeaconBase(world, pos, pos.add(new BlockPos(-relPos.getX(), -relPos.getY(), -relPos.getZ()))); - }; + } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 7dbc0649b..6ca86b952 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index b608564cd..f82c867d0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -11,7 +11,6 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index c417584d6..a5e3e53b0 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -5,7 +5,6 @@ import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -39,14 +38,14 @@ public class StatementAPIPlugin implements ITriggerProvider { @Override public Collection getInternalTriggers(IStatementContainer container) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(triggerManaDetector); return list; } @Override public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (tile instanceof IManaBlock) { list.add(triggerManaEmpty); diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 43b13df5d..6fda3e7fc 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -63,7 +63,7 @@ public class ColoredLightHelper { } private static void initPackedColors() { - packedColors = new EnumMap(EnumDyeColor.class); + packedColors = new EnumMap<>(EnumDyeColor.class); for(EnumDyeColor color : EnumDyeColor.values()) { packedColors.put(color, new int[16]); for(int j = 0; j < 16; j++) diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 6ba258099..3917aa036 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.item; -import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 89c7cc624..de7c4e33c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 765f8bff2..925627a2a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -15,13 +15,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemBaubleBox extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 48369d8e7..0cafad050 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -30,7 +30,6 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index fb518cdb4..3f2fd30b2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -27,7 +27,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.*; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 9eaf26dfc..f9e8cf8b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,13 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index b1803fcdb..a8c95b7d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -20,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 6d966b1c5..b07b68f38 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -10,18 +10,13 @@ */ package vazkii.botania.common.item; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -44,7 +39,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 389b7d65f..9c37bef29 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.item; -import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.BlockPos; @@ -28,8 +25,6 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import java.util.UUID; - public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index e502855ce..d47eadbaf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -31,7 +31,6 @@ import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index f168c0f5c..489d61434 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -30,17 +30,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGrassSeeds extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 60b40037d..363dbb21d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,14 +16,11 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index dcbbd5bd8..82d8de850 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -32,7 +32,6 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 9ba61cb97..58259b6e3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -18,14 +18,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.api.wand.ICoordBoundItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 908560de0..95e65b621 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index ce7b9a5ff..0617b8b95 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -12,12 +12,9 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMod extends Item { diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 0ee5f41d2..861dcd601 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,7 +17,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index b2d6e1267..6f7f49762 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -170,7 +170,7 @@ public class ItemSextant extends ItemMod { @Override public Map createRotations() { - Map ret = new EnumMap(EnumFacing.class); + Map ret = new EnumMap<>(EnumFacing.class); for (EnumFacing e : EnumFacing.HORIZONTALS) { ret.put(e, this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index cda0156a9..bec50e261 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -10,13 +10,11 @@ */ package vazkii.botania.common.item; -import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -27,7 +25,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 2d102ff58..518c615ea 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index ead1b12c1..d2ceddd06 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,15 +18,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntitySpark; diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 38c400024..db69ce687 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -12,16 +12,9 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; public class ItemSparkUpgrade extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 206230dc7..47f282b1f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -25,7 +25,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 3b5b7d3c8..e7365891b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -17,7 +17,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index af05f309a..c3778b99e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -18,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index a85eb647e..454f7fdd1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -17,7 +17,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; @@ -26,7 +25,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -34,7 +32,6 @@ import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockPistonRelay; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 5fec84388..ab685bff4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -26,7 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 05e195ea1..ad777e43e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -12,12 +12,10 @@ package vazkii.botania.common.item.block; import java.awt.*; import java.util.List; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index b83e6d3a1..9071aef24 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,8 +14,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,17 +24,10 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.signature.SubTileSignature; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -120,22 +111,24 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @Override public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { String type = getType(stack); - if(type.equals(LibBlockNames.SUBTILE_DAYBLOOM)) - return ModAchievements.daybloomPickup; - else if(type.equals(LibBlockNames.SUBTILE_ENDOFLAME)) - return ModAchievements.endoflamePickup; - else if(type.equals(LibBlockNames.SUBTILE_KEKIMURUS)) - return ModAchievements.kekimurusPickup; - else if(type.equals(LibBlockNames.SUBTILE_HEISEI_DREAM)) - return ModAchievements.heiseiDreamPickup; - else if(type.equals(LibBlockNames.SUBTILE_POLLIDISIAC)) - return ModAchievements.pollidisiacPickup; - else if(type.equals(LibBlockNames.SUBTILE_BUBBELL)) - return ModAchievements.bubbellPickup; - else if(type.equals(LibBlockNames.SUBTILE_DANDELIFEON)) - return ModAchievements.dandelifeonPickup; - else if(type.equals("")) - return ModAchievements.nullFlower; + switch (type) { + case LibBlockNames.SUBTILE_DAYBLOOM: + return ModAchievements.daybloomPickup; + case LibBlockNames.SUBTILE_ENDOFLAME: + return ModAchievements.endoflamePickup; + case LibBlockNames.SUBTILE_KEKIMURUS: + return ModAchievements.kekimurusPickup; + case LibBlockNames.SUBTILE_HEISEI_DREAM: + return ModAchievements.heiseiDreamPickup; + case LibBlockNames.SUBTILE_POLLIDISIAC: + return ModAchievements.pollidisiacPickup; + case LibBlockNames.SUBTILE_BUBBELL: + return ModAchievements.bubbellPickup; + case LibBlockNames.SUBTILE_DANDELIFEON: + return ModAchievements.dandelifeonPickup; + case "": + return ModAchievements.nullFlower; + } return null; } 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 1e4d4e6b6..4da725da3 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -29,7 +29,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index f52d70459..29f1166f8 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -26,7 +26,6 @@ import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 65296ca4d..886bacd8a 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -17,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 28cc5ce41..8beb0f3ea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -30,7 +30,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManasteel; import vazkii.botania.common.core.BotaniaCreativeTab; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index a48a58c48..9bbe8b5eb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,14 +13,12 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManaweave; 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 91e2298a3..7069ba26e 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 @@ -12,12 +12,7 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,10 +25,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IAncientWillContainer; -import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; 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 048b424fa..ddc1c4c6c 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 @@ -14,8 +14,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +27,6 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; 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 247c44c64..85f21e032 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 @@ -15,9 +15,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -40,7 +38,6 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; 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 94a28e36c..bb93acc2c 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 @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import com.google.common.base.Predicates; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; @@ -29,8 +24,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; 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 c8ed82fb2..864c9b99b 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 @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -24,8 +19,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index b88b0a717..26cf6074b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -21,8 +21,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; 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 0fb82c8e3..2555adfce 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 @@ -17,11 +17,6 @@ import java.util.Map; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -31,10 +26,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; @@ -105,7 +97,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return; List removers = playerIceBlocks.get(user); - for(IceRemover ice : new ArrayList(removers)) + for(IceRemover ice : new ArrayList<>(removers)) ice.tick(player.worldObj, removers); } 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 34917a261..2687981c0 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 @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -31,14 +26,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 0aa51a8b9..e31afe3f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -19,8 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; 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 14230cfb9..39930441c 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 @@ -10,18 +10,11 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; 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 6e2442e8c..900336d00 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.Arrays; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -24,7 +23,6 @@ import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.core.handler.ConfigHandler; @@ -36,8 +34,6 @@ import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMagnetRing extends ItemBauble { 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 cfb640808..8d669d01b 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 @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,8 +22,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; 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 9db5d72d8..a1367c2a7 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 @@ -10,20 +10,12 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; 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 8bfd298bf..9491c25e3 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 @@ -24,8 +24,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; 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 e6e183f13..8bac12fb0 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 @@ -25,8 +25,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 02ee3db55..9ed324536 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 50d414f38..270645409 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -49,14 +49,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); - Predicate selector = new Predicate() { - - @Override - public boolean apply(Entity e) { - return e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); - } - - }; + Predicate selector = e -> e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; 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 220c8bf4e..49b1a6aca 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 @@ -27,7 +27,6 @@ import net.minecraftforge.event.entity.player.ArrowNockEvent; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; 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 fc2d14204..c101056b0 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 @@ -1,6 +1,5 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -16,12 +15,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemElementiumShears extends ItemManasteelShears { 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 39264e3aa..d7aae0654 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 @@ -28,15 +28,12 @@ import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { 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 0d1dec470..29c93f960 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 @@ -28,15 +28,12 @@ import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { 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 fceac2ca5..b9b2a3775 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 @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -31,16 +30,12 @@ import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.core.helper.ObfuscationHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibObfuscation; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { 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 bdd70d63a..a59737cea 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 @@ -27,7 +27,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -35,8 +34,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index a467f0a11..5f3a034f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -22,15 +22,12 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { 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 816e424e0..bf5b83221 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 @@ -27,18 +27,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { 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 9e14866b4..3d9698fed 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 @@ -29,15 +29,11 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.ItemSpark; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 6fee98a2f..e166998cb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -14,7 +14,6 @@ import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumDyeColor; @@ -32,7 +31,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.ITinyPlanetExcempt; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 756351f36..5a72e4947 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.lens; import java.awt.Color; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 220a590fa..8131705d5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; 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 f0f01db83..e46bdcbf0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -24,10 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IDyablePool; -import vazkii.botania.api.item.IManaDissolvable; -import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; 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 412a669da..e944f1e90 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -12,10 +12,7 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; -import java.util.Locale; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -27,17 +24,11 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -49,7 +40,6 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.common.lib.LibMisc; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 93495033e..125964056 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.material; -import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 460a07374..52986ec16 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -16,7 +16,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index fa1711559..43080b9a4 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -20,7 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index abe4b4b81..ba4f0daec 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -14,12 +14,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemModRecord extends ItemRecord { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 528dfa26a..a0603d2c9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -10,41 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.stats.Achievement; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.util.EnumHelper; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.item.IRelic; -import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.api.mana.ILensEffect; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.entity.EntityManaBurst; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; -import vazkii.botania.common.lib.LibItemNames; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - /* public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { 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 3590a6e1c..16fd5940c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index db46b91ce..b3c98677a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -16,12 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 9ba124565..5cff6a37c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -12,17 +12,13 @@ package vazkii.botania.common.item.relic; import java.util.Random; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 170961de8..be2c3986d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -12,13 +12,11 @@ package vazkii.botania.common.item.rod; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; 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 cf9a4fc08..737493ebe 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -89,7 +89,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -107,7 +107,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item == null) { Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -193,7 +193,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 1d40ebe4d..ea2aebf58 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.rod; import java.util.List; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -27,7 +26,6 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModPotions; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index cdec44edd..223a743f4 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -22,6 +22,7 @@ import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -335,7 +336,7 @@ public final class LexiconData { wand.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesTwigWand)); pureDaisy = new BLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); - pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), new PagePetalRecipe("3", ModPetalRecipes.pureDaisyRecipe)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); @@ -424,7 +425,7 @@ public final class LexiconData { redstoneSpreader.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRedstoneSpreader)); manastar = new BLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); - manastar.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.manastarRecipe)); + manastar.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.manastarRecipe)); dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesDreamwoodSpreader), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader)); @@ -457,83 +458,83 @@ public final class LexiconData { flowerSpeed.setIcon(new ItemStack(Blocks.dirt, 1, 2)); jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); - jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); + jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); - bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bellethorneRecipe)); + bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bellethorneRecipe)); dreadthorne = new BLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); - dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe)); + dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.dreadthorneRecipe)); heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe)); + heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.heiseiDreamRecipe)); tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); - tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe)); + tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tigerseyeRecipe)); orechid = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) : new ALexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); - orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidRecipe)); + orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidRecipe)); if(Botania.gardenOfGlassLoaded) orechid.setPriority(); orechidIgnem = new ALexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); - orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidIgnemRecipe)); + orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidIgnemRecipe)); if(ConfigHandler.fallenKanadeEnabled) { fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); - fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe)); + fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe<>("1", ModPetalRecipes.fallenKanadeRecipe)); } exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); - exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.exoflameRecipe)); + exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.exoflameRecipe)); agricarnation = new BLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); - agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.agricarnationRecipe)); + agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.agricarnationRecipe)); hopperhock = new BLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); - hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.hopperhockRecipe)); + hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.hopperhockRecipe)); tangleberrie = new BLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); - tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tangleberrieRecipe)); + tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tangleberrieRecipe)); jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); - jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jiyuuliaRecipe)); + jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jiyuuliaRecipe)); rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); - rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.rannuncarpusRecipe)); + rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.rannuncarpusRecipe)); hyacidus = new BLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); - hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.hyacidusRecipe)); + hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.hyacidusRecipe)); pollidisiac = new BLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); - pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.pollidisiacRecipe)); + pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.pollidisiacRecipe)); clayconia = new BLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); - clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.clayconiaRecipe)); + clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.clayconiaRecipe)); loonium = new ALexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); - loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.looniumRecipe)); + loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.looniumRecipe)); daffomill = new BLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); - daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daffomillRecipe)); + daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.daffomillRecipe)); vinculotus = new BLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); - vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.vinculotusRecipe)); + vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.vinculotusRecipe)); spectranthemum = new ALexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); - spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.spectranthemumRecipe)); + spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.spectranthemumRecipe)); medumone = new BLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); - medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.medumoneRecipe)); + medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.medumoneRecipe)); marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); - marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); + marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe<>("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); - bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bubbellRecipe)); + bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bubbellRecipe)); solegnolia = new BLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); - solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.solegnoliaRecipe)); + solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.solegnoliaRecipe)); // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); @@ -549,46 +550,46 @@ public final class LexiconData { primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); - daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe)); + daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe)); nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); - nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe)); + nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe)); endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); - endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PagePetalRecipe("2", ModPetalRecipes.endoflameRecipe)); + endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PagePetalRecipe<>("2", ModPetalRecipes.endoflameRecipe)); hydroangeas = new BLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); - hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe("1", ModPetalRecipes.hydroangeasRecipe)); + hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe<>("1", ModPetalRecipes.hydroangeasRecipe)); thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); - thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); + thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("1", ModPetalRecipes.thermalilyRecipe)); arcaneRose = new BLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); - arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.arcaneRoseRecipe)); + arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.arcaneRoseRecipe)); munchdew = new BLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); - munchdew.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.munchdewRecipe)); + munchdew.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.munchdewRecipe)); entropinnyum = new BLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); - entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.entropinnyumRecipe)); + entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.entropinnyumRecipe)); kekimurus = new ALexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); - kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe)); + kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.kekimurusRecipe)); gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); - gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe)); + gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.gourmaryllisRecipe)); narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); - narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe)); + narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.narslimmusRecipe)); spectrolus = new ALexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); - spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.spectrolusRecipe)); + spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); rafflowsia = new ALexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); - rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PagePetalRecipe("4", ModPetalRecipes.rafflowsiaRecipe)); + rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("4", ModPetalRecipes.rafflowsiaRecipe)); dandelifeon = new ALexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); - dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), new PageText("7"), new PagePetalRecipe("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); + dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), new PageText("7"), new PagePetalRecipe<>("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); // DEVICES ENTRIES pylon = new BLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); 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 5e58bbbe6..13798efd8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -16,15 +16,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; 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 ceb53842c..ddbbcd94c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -28,7 +28,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index e553d5000..c3c03cb7f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -25,7 +25,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index dca49b71c..dd7f67494 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -29,7 +29,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 673e3a708..0f499285c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -14,7 +14,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -24,12 +23,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; -import vazkii.botania.client.render.world.SkyblockSkyRenderer; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 993477ed9..cd76af252 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -14,7 +14,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; -import net.minecraftforge.common.MinecraftForge; public class WorldTypeSkyblock extends WorldType { From f3cce3d24ecc59453c8cab6014260e0e2703f1a9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Jan 2016 22:53:21 -0600 Subject: [PATCH 207/935] Global safety checks for blockstates while chunks are unloading --- .../botania/client/core/proxy/ClientProxy.java | 6 +++++- .../client/render/tile/RenderTileAlfPortal.java | 9 ++++----- .../client/render/tile/RenderTileAltar.java | 4 ++++ .../client/render/tile/RenderTileAvatar.java | 12 ++++++++++-- .../client/render/tile/RenderTileBellows.java | 4 ++++ .../render/tile/RenderTileFloatingFlower.java | 4 ++++ .../render/tile/RenderTileIncensePlate.java | 6 +++++- .../client/render/tile/RenderTileLightRelay.java | 4 ++++ .../client/render/tile/RenderTilePool.java | 6 ++++++ .../client/render/tile/RenderTilePump.java | 10 ++++++++-- .../client/render/tile/RenderTilePylon.java | 4 ++++ .../client/render/tile/RenderTileSpreader.java | 4 ++++ .../client/render/tile/RenderTileTinyPotato.java | 4 ++++ .../botania/common/block/tile/TileAlfPortal.java | 9 ++++----- .../botania/common/block/tile/TileAltar.java | 4 ++-- .../botania/common/block/tile/TileAvatar.java | 5 ++--- .../botania/common/block/tile/TileBifrost.java | 4 ++-- .../botania/common/block/tile/TileBrewery.java | 5 ++--- .../botania/common/block/tile/TileCocoon.java | 4 ++-- .../common/block/tile/TileCraftCrate.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 6 ++---- .../botania/common/block/tile/TileEnderEye.java | 6 ++---- .../botania/common/block/tile/TileForestEye.java | 4 ++-- .../botania/common/block/tile/TileHourglass.java | 5 ++--- .../common/block/tile/TileIncensePlate.java | 4 ++-- .../common/block/tile/TileLightRelay.java | 4 ++-- .../common/block/tile/TileManaBeacon.java | 7 ++----- .../botania/common/block/tile/TileManaFlame.java | 4 ++-- .../botania/common/block/tile/TileMod.java | 16 +++++++++++++++- .../botania/common/block/tile/TileOpenCrate.java | 4 ++-- .../botania/common/block/tile/TileRuneAltar.java | 4 ++-- .../common/block/tile/TileSpawnerClaw.java | 4 ++-- .../common/block/tile/TileSpecialFlower.java | 4 ++-- .../common/block/tile/TileSpiritShrine.java | 4 ++-- .../botania/common/block/tile/TileStarfield.java | 7 ++----- .../common/block/tile/TileTerraPlate.java | 4 ++-- .../common/block/tile/TileTeruTeruBozu.java | 6 ++---- .../common/block/tile/TileTinyPlanet.java | 4 ++-- .../common/block/tile/TileTinyPotato.java | 4 ++-- .../tile/corporea/TileCorporeaCrystalCube.java | 4 ++-- .../block/tile/corporea/TileCorporeaIndex.java | 4 ++-- .../common/block/tile/mana/TileBellows.java | 4 ++-- .../common/block/tile/mana/TileDistributor.java | 4 ++-- .../common/block/tile/mana/TileManaDetector.java | 6 +++--- .../botania/common/block/tile/mana/TilePool.java | 7 ++----- .../botania/common/block/tile/mana/TilePump.java | 4 ++-- .../common/block/tile/mana/TileRFGenerator.java | 4 ++-- .../common/block/tile/mana/TileSpreader.java | 2 +- .../common/block/tile/mana/TileTurntable.java | 4 ++-- .../common/block/tile/string/TileRedString.java | 7 ++----- .../tile/string/TileRedStringComparator.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 4 ++-- .../botania/common/entity/EntityFallingStar.java | 8 +++++--- .../item/equipment/tool/ItemStarSword.java | 2 +- 54 files changed, 163 insertions(+), 114 deletions(-) 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 6b844e51b..de5885f60 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -180,12 +180,15 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); + initRenderers(); } @Override public void init(FMLInitializationEvent event) { super.init(event); + initAuxiliaryRender(); + ModChallenges.init(); MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); @@ -214,7 +217,6 @@ public class ClientProxy extends CommonProxy { dootDoot = true; } - initRenderers(); } @Override @@ -270,7 +272,9 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem())); ShaderHelper.initShaders(); + } + private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); RenderPlayer render = skinMap.get("default"); render.addLayer(new ContributorFancinessHandler()); 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 552268409..cf273ce9a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -31,13 +31,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { + if (altar != null && altar.getWorld() != null && !altar.getWorld().isBlockLoaded(altar.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); 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 ba84c4033..51e6c3dd8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -17,11 +17,13 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IAvatarWieldable; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAvatar; @@ -38,17 +40,23 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + if (avatar != null && avatar.getWorld() != null && !avatar.getWorld().isBlockLoaded(avatar.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0; + EnumFacing facing = avatar != null && avatar.getWorld() != null + ? avatar.getWorld().getBlockState(avatar.getPos()).getValue(BotaniaStateProps.CARDINALS) + : EnumFacing.SOUTH; GlStateManager.translate(0.5F, 1.6F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); model.render(); if (avatar == null) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 5df13f445..40c31ed6d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -30,6 +30,10 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { + if (bellows != null && bellows.getWorld() != null && !bellows.getWorld().isBlockLoaded(bellows.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index c3d4e41f5..0b7d8fbb4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -32,6 +32,10 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) { + return; + } + BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); IFloatingFlower flower = (IFloatingFlower) tile; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 28dc78357..85553ff37 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -37,7 +37,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index beeb87960..b07257938 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -52,6 +52,10 @@ public class RenderTilePool extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { + if (pool != null && pool.getWorld() != null && !pool.getWorld().isBlockLoaded(pool.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -92,6 +96,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { tess.draw(); + GlStateManager.enableLighting(); + GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index ae77944ba..7b7bc921e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -13,8 +13,10 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; import vazkii.botania.common.block.tile.mana.TilePump; @@ -30,17 +32,21 @@ public class RenderTilePump extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) { + if (pump != null && pump.getWorld() != null && !pump.getWorld().isBlockLoaded(pump.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0; + EnumFacing facing = pump != null && pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.translate(0.5F, 0.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F); + GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); 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 68e2077a6..50ca5f0c8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -51,6 +51,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { + if (pylon != null && pylon.getWorld() != null && !pylon.getWorld().isBlockLoaded(pylon.getPos(), false)) { + return; + } + if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index e32dd3492..e82687fa9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -46,6 +46,10 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { + if (spreader != null && spreader.getWorld() != null && !spreader.getWorld().isBlockLoaded(spreader.getPos(), false)) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 5694eece1..a2756b9d2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -50,6 +50,10 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 21D,1))); boolean didChange = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 63d376274..a2a169c62 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -19,7 +19,7 @@ import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory, ITickable { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory { private static final int MAX_MANA = 6400; @@ -32,8 +32,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid int mana; @Override - public void update() { - + public void updateEntity() { enabled = true; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); 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 2edaf85b9..57fcd2459 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -14,14 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileBifrost extends TileMod implements ITickable { +public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; public int ticks = 0; @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote) { if(ticks <= 0) { worldObj.setBlockToAir(pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 12f061455..6fd2d81ee 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -36,7 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { +public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver { private static final String TAG_MANA = "mana"; @@ -80,8 +80,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public void update() { - + public void updateEntity() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this)) { 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 b5d0f35af..ce5a86a62 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -24,7 +24,7 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -public class TileCocoon extends TileMod implements ITickable { +public class TileCocoon extends TileMod { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; @@ -36,7 +36,7 @@ public class TileCocoon extends TileMod implements ITickable { public int emeraldsGiven; @Override - public void update() { + public void updateEntity() { timePassed++; if(timePassed >= TOTAL_TIME) hatch(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 1064a86f8..0a0bd8129 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -91,7 +91,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote && (craft(true) && canEject() || isFull())) ejectAll(); 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 4d9b63b5b..f60b948ed 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -49,7 +49,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileEnchanter extends TileMod implements ISparkAttachable, ITickable { +public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_STAGE = "stage"; private static final String TAG_STAGE_TICKS = "stageTicks"; @@ -133,10 +133,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } @Override - public void update() { + public void updateEntity() { IBlockState state = worldObj.getBlockState(getPos()); - if (state.getBlock() != ModBlocks.enchanter) - return; EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); 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 14f529838..76ef55b68 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -24,12 +24,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; -public class TileEnderEye extends TileMod implements ITickable { +public class TileEnderEye extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.enderEye) - return; + public void updateEntity() { boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 6153d71a8..4e15d11d3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -14,12 +14,12 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; -public class TileForestEye extends TileMod implements ITickable { +public class TileForestEye extends TileMod { public int entities = 0; @Override - public void update() { + public void updateEntity() { int range = 6; int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { 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 b83d649f5..12288692b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -26,7 +26,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; -public class TileHourglass extends TileSimpleInventory implements ITickable { +public class TileHourglass extends TileSimpleInventory { private static final String TAG_TIME = "time"; private static final String TAG_TIME_FRACTION = "timeFraction"; @@ -43,8 +43,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickable { public boolean move = true; @Override - public void update() { - + public void updateEntity() { int totalTime = getTotalTime(); if(totalTime > 0) { if(move) 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 ae07b0307..6e9ea916b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -30,7 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory, ITickable { +public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -42,7 +42,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven public int comparatorOutput = 0; @Override - public void update() { + public void updateEntity() { ItemStack stack = getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 0dbacae49..47466a07c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -37,7 +37,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -public class TileLightRelay extends TileMod implements IWandBindable, ITickable { +public class TileLightRelay extends TileMod implements IWandBindable { private static final int MAX_DIST = 20; @@ -63,7 +63,7 @@ public class TileLightRelay extends TileMod implements IWandBindable, ITickable } @Override - public void update() { + public void updateEntity() { ticksElapsed++; if(bindPos.getY() > -1 && isValidBinding()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 5ac481572..1f697d583 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -16,13 +16,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileManaBeacon extends TileMod implements ITickable { +public class TileManaBeacon extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.manaBeacon) - return; - + public void updateEntity() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 69b215961..20fe601f1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -15,7 +15,7 @@ import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -public class TileManaFlame extends TileMod implements ITickable { +public class TileManaFlame extends TileMod { private static final String TAG_COLOR = "color"; @@ -32,7 +32,7 @@ public class TileManaFlame extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { float c = 0.3F; if(Math.random() < c) { 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 c7c979a79..510a4d848 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -17,9 +17,10 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.ITickable; import net.minecraft.world.World; -public class TileMod extends TileEntity { +public class TileMod extends TileEntity implements ITickable { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { @@ -61,4 +62,17 @@ public class TileMod extends TileEntity { readCustomNBT(packet.getNbtCompound()); } + @Override + public final void update() { + if (worldObj.isBlockLoaded(getPos(), false)) { + updateEntity(); + } else { + System.out.println("Skipping a tick because our chunk unloaded"); + } + } + + protected void updateEntity() { + // NO-OP + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 83b76bd79..cb806a9e1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileOpenCrate extends TileSimpleInventory implements ITickable { +public class TileOpenCrate extends TileSimpleInventory { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { @@ -41,7 +41,7 @@ public class TileOpenCrate extends TileSimpleInventory implements ITickable { } @Override - public void update() { + public void updateEntity() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index cb18e5605..6293b142f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -43,7 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver, ITickable { +public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -106,7 +106,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public void update() { + public void updateEntity() { // Update every tick. recieveMana(0); 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 9ba37e846..ace660ec7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -30,7 +30,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable { +public class TileSpawnerClaw extends TileMod implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -44,7 +44,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable private static final Method getEntityNameToSpawn = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); @Override - public void update() { + public void updateEntity() { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; 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 dd1e63285..7aa691c78 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -35,7 +35,7 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable { +public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; @@ -72,7 +72,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void update() { + public void updateEntity() { if(subTile != null) { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index faee5505e..58707948c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -13,12 +13,12 @@ package vazkii.botania.common.block.tile; import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; -public class TileSpiritShrine extends TileMod implements ITickable { +public class TileSpiritShrine extends TileMod { int ticks; @Override - public void update() { + public void updateEntity() { if(worldObj.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index d07601cd8..9c8df7544 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -15,13 +15,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -public class TileStarfield extends TileMod implements ITickable { +public class TileStarfield extends TileMod { @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.starfield) - return; - + public void updateEntity() { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); if(!worldObj.isRemote) { boolean newState = !worldObj.isDaytime(); 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 b64614045..eff85c483 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; -public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickable { +public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; @@ -68,7 +68,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab } @Override - public void update() { + public void updateEntity() { boolean removeMana = true; if(hasValidPlatform()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 74157b72a..5657c5e40 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -10,14 +10,12 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; - -public class TileTeruTeruBozu extends TileMod implements ITickable { +public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; @Override - public void update() { + public void updateEntity() { boolean isRaining = worldObj.isRaining(); if(isRaining && worldObj.rand.nextInt(9600) == 0) worldObj.getWorldInfo().setRaining(false); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 6ffa2e6cb..1df9195e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -14,10 +14,10 @@ import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost, ITickable { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost { @Override - public void update() { + public void updateEntity() { ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index e8f7f3ab1..b80cfc69d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -public class TileTinyPotato extends TileMod implements ITickable { +public class TileTinyPotato extends TileMod { private static final String TAG_NAME = "name"; @@ -36,7 +36,7 @@ public class TileTinyPotato extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { if(worldObj.rand.nextInt(100) == 0) jump(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 3645474fd..d709d2ed2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -22,7 +22,7 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, ITickable { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -35,7 +35,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public int compValue = 0; @Override - public void update() { + public void updateEntity() { ++ticks; if(ticks % 20 == 0) updateCount(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 65c5fdffb..11d3798e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -45,7 +45,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor, ITickable { +public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; @@ -152,7 +152,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; @Override - public void update() { + public void updateEntity() { double x = pos.getX() + 0.5; double y = pos.getY() + 0.5; double z = pos.getZ() + 0.5; 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 2be51938e..36abd8cfa 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 @@ -22,7 +22,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; -public class TileBellows extends TileMod implements ITickable { +public class TileBellows extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -36,7 +36,7 @@ public class TileBellows extends TileMod implements ITickable { } @Override - public void update() { + public void updateEntity() { boolean disable = true; TileEntity tile = getLinkedTile(); if(!active && tile instanceof TilePool) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 2a5486981..e26e0fa52 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -22,12 +22,12 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.lib.LibMisc; -public class TileDistributor extends TileMod implements IManaReceiver, ITickable { +public class TileDistributor extends TileMod implements IManaReceiver { List validPools = new ArrayList(); @Override - public void update() { + public void updateEntity() { validPools.clear(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 78b6fa338..d583364a6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -21,11 +21,11 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod implements IManaCollisionGhost, ITickable { +public class TileManaDetector extends TileMod implements IManaCollisionGhost { @Override - public void update() { - if(!worldObj.isRemote && worldObj.getBlockState(getPos()).getBlock() == ModBlocks.manaDetector) { + public void updateEntity() { + if(!worldObj.isRemote) { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState) 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 8b5999da9..64f4d567a 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 @@ -67,7 +67,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket, ITickable { +public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; @@ -198,10 +198,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } @Override - public void update() { - if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pool) - return; - + public void updateEntity() { boolean wasDoingTransfer = isDoingTransfer; isDoingTransfer = false; if(manaCap == -1) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 0a7f26561..93555c126 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -17,7 +17,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements ITickable { +public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -32,7 +32,7 @@ public class TilePump extends TileMod implements ITickable { int lastComparator = 0; @Override - public void update() { + public void updateEntity() { hasRedstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 675407b14..bbb501dcb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -26,7 +26,7 @@ import java.util.EnumMap; import java.util.Map; @Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection, ITickable { +public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { private static final int CONVERSION_RATE = 10; private static final int MAX_MANA = 1280 * CONVERSION_RATE; @@ -48,7 +48,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void update() { + public void updateEntity() { if(!worldObj.isRemote && Loader.isModLoaded("CoFHAPI|energy")) { if(deadCache) reCache(); 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 781124006..56bec53a5 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 @@ -169,7 +169,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void update() { + public void updateEntity() { boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(this); boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index b231a287c..20f095d1d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -26,7 +26,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TileTurntable extends TileMod implements ITickable { +public class TileTurntable extends TileMod { private static final String TAG_SPEED = "speed"; private static final String TAG_BACKWARDS = "backwards"; @@ -35,7 +35,7 @@ public class TileTurntable extends TileMod implements ITickable { boolean backwards = false; @Override - public void update() { + public void updateEntity() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { 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 e4609ebca..10d980da4 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 @@ -22,15 +22,12 @@ import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.block.tile.TileMod; -public abstract class TileRedString extends TileMod implements ITileBound, ITickable { +public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @Override - public void update() { - if (!(worldObj.getBlockState(getPos()).getBlock() instanceof BlockRedString)) - return; - + public void updateEntity() { EnumFacing dir = getOrientation(); BlockPos pos_ = getPos(); int range = getRange(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index e3b787ddd..8157dd1a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -19,7 +19,7 @@ public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; @Override - public void update() { + public void updateEntity() { BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); Block 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 d5a3bc949..daf0f777b 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 @@ -20,12 +20,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -public class TileRedStringInterceptor extends TileRedString implements ITickable { +public class TileRedStringInterceptor extends TileRedString { public static List interceptors = new ArrayList(); @Override - public void update() { + public void updateEntity() { if(!interceptors.contains(this)) interceptors.add(this); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index d971de2d6..c984b088a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -74,9 +74,11 @@ public class EntityFallingStar extends EntityThrowableCopy { else pos.entityHit.attackEntityFrom(DamageSource.generic, 10); } - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) - worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + if (pos.getBlockPos() != null) { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) + worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + } setDead(); } 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 d621371d3..b4a31e676 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 @@ -46,7 +46,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); posVec.add(motVec); From 8e7f1cfac171753cf02671fb21616020b39a385d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Jan 2016 11:23:39 -0600 Subject: [PATCH 208/935] Temporary java 8 reobfuscation fix closes #33. --- build.gradle | 5 ++ .../client/core/handler/ModelHandler.java | 71 ++++++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 48540666b..7a5929442 100644 --- a/build.gradle +++ b/build.gradle @@ -77,6 +77,11 @@ dependencies { sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" } +compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} + processResources { // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { 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 c144b5052..c4a75c99a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -17,6 +17,7 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.IReloadableResourceManager; @@ -165,111 +166,113 @@ public final class ModelHandler { registerBrews(); /** Special Item Meshers **/ + // Must wrap messhers in a wrapper for now, see the MesherWrapper class definition at bottom of file + ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, stack -> + ModelLoader.setCustomMeshDefinition(infiniteFruit, MesherWrapper.of(stack -> ItemInfiniteFruit.isBoot(stack) ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory")); + : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, stack -> + ModelLoader.setCustomMeshDefinition(magnetRing, MesherWrapper.of(stack -> ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory")); + : new ModelResourceLocation("botania:magnetRingOff", "inventory"))); ModelLoader.registerItemVariants(magnetRingGreater, new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, stack -> + ModelLoader.setCustomMeshDefinition(magnetRingGreater, MesherWrapper.of(stack -> ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"))); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, stack -> { + ModelLoader.setCustomMeshDefinition(manaGun, MesherWrapper.of(stack -> { String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); - }); + })); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod", "inventory"), new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, stack -> + ModelLoader.setCustomMeshDefinition(tornadoRod, MesherWrapper.of(stack -> ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") - : new ModelResourceLocation("botania:tornadoRod", "inventory")); + : new ModelResourceLocation("botania:tornadoRod", "inventory"))); ModelLoader.registerItemVariants(twigWand, new ModelResourceLocation("botania:twigWand", "inventory"), new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, stack -> { + ModelLoader.setCustomMeshDefinition(twigWand, MesherWrapper.of(stack -> { String path = "botania:twigWand"; return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - }); + })); ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveBoots, stack -> + ModelLoader.setCustomMeshDefinition(manaweaveBoots, MesherWrapper.of(stack -> ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory")); + : new ModelResourceLocation("botania:manaweaveBoots", "inventory"))); ModelLoader.registerItemVariants(manaweaveChest, new ModelResourceLocation("botania:manaweaveChest", "inventory"), new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveChest, stack -> + ModelLoader.setCustomMeshDefinition(manaweaveChest, MesherWrapper.of(stack -> ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory")); + : new ModelResourceLocation("botania:manaweaveChest", "inventory"))); ModelLoader.registerItemVariants(manaweaveHelm, new ModelResourceLocation("botania:manaweaveHelm", "inventory"), new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveHelm, stack -> + ModelLoader.setCustomMeshDefinition(manaweaveHelm, MesherWrapper.of(stack -> ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory")); + : new ModelResourceLocation("botania:manaweaveHelm", "inventory"))); ModelLoader.registerItemVariants(manaweaveLegs, new ModelResourceLocation("botania:manaweaveLegs", "inventory"), new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveLegs, stack -> + ModelLoader.setCustomMeshDefinition(manaweaveLegs, MesherWrapper.of(stack -> ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory")); + : new ModelResourceLocation("botania:manaweaveLegs", "inventory"))); ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, stack -> + ModelLoader.setCustomMeshDefinition(manasteelSword, MesherWrapper.of(stack -> "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory")); + : new ModelResourceLocation("botania:manasteelSword", "inventory"))); ModelLoader.registerItemVariants(spawnerMover, new ModelResourceLocation("botania:spawnerMover", "inventory"), new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory")); + ModelLoader.setCustomMeshDefinition(spawnerMover, MesherWrapper.of(stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"))); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), new ModelResourceLocation("botania:terraPickEnabled", "inventory"), new ModelResourceLocation("botania:terraPickTipped", "inventory"), new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, stack -> { + ModelLoader.setCustomMeshDefinition(terraPick, MesherWrapper.of(stack -> { String name = "botania:terraPick"; if (ItemTerraPick.isTipped(stack)) { name += "Tipped"; @@ -278,7 +281,7 @@ public final class ModelHandler { name += "Enabled"; } return new ModelResourceLocation(name, "inventory"); - }); + })); } private static void registerSubtiles() { @@ -564,6 +567,7 @@ public final class ModelHandler { } // Only for models that absolutely can't be converted to JSON. Use VERY sparingly + @SuppressWarnings("deprecation") private static void registerTESRItems() { registerItemModel(ModBlocks.avatar); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); @@ -1050,4 +1054,21 @@ public final class ModelHandler { private ModelHandler() {} + // Shim because lambdas/method references for vanilla classes are not reobfuscated properly yet + // See https://github.com/MinecraftForge/ForgeGradle/issues/314 + private interface MesherWrapper extends ItemMeshDefinition { + + static MesherWrapper of(MesherWrapper f) { + return f; + } + + ModelResourceLocation getLocation(ItemStack stack); + + @Override + default ModelResourceLocation getModelLocation(ItemStack stack) { + return getLocation(stack); + } + + } + } From 94d72161a93bd0a3305db096328a5dddc822887b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Jan 2016 14:10:11 -0600 Subject: [PATCH 209/935] Revert mesher lambdas --- .../client/core/handler/ModelHandler.java | 178 +++++++++++------- 1 file changed, 106 insertions(+), 72 deletions(-) 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 c4a75c99a..df5c1a26d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -166,122 +166,173 @@ public final class ModelHandler { registerBrews(); /** Special Item Meshers **/ - // Must wrap messhers in a wrapper for now, see the MesherWrapper class definition at bottom of file + // Cannot use lambdas yet because FG/SS can't reobfuscate them. + // See https://github.com/MinecraftForge/ForgeGradle/issues/314 ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, MesherWrapper.of(stack -> - ItemInfiniteFruit.isBoot(stack) - ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); + ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemInfiniteFruit.isBoot(stack) + ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") + : new ModelResourceLocation("botania:infiniteFruit", "inventory"); + } + }); ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, MesherWrapper.of(stack -> - ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory"))); + ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingOn", "inventory") + : new ModelResourceLocation("botania:magnetRingOff", "inventory"); + } + }); ModelLoader.registerItemVariants(magnetRingGreater, new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, MesherWrapper.of(stack -> - ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"))); + ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); + } + }); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, MesherWrapper.of(stack -> { - String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; - return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); - })); + ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; + return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); + } + }); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod", "inventory"), new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, MesherWrapper.of(stack -> - ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) - ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") - : new ModelResourceLocation("botania:tornadoRod", "inventory"))); + ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) + ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") + : new ModelResourceLocation("botania:tornadoRod", "inventory"); + } + }); ModelLoader.registerItemVariants(twigWand, new ModelResourceLocation("botania:twigWand", "inventory"), new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, MesherWrapper.of(stack -> { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - })); + ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); + } + }); ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveBoots, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"))); + ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); + } + }); ModelLoader.registerItemVariants(manaweaveChest, new ModelResourceLocation("botania:manaweaveChest", "inventory"), new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveChest, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"))); + ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory"); + } + }); ModelLoader.registerItemVariants(manaweaveHelm, new ModelResourceLocation("botania:manaweaveHelm", "inventory"), new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveHelm, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"))); + ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); + } + }); ModelLoader.registerItemVariants(manaweaveLegs, new ModelResourceLocation("botania:manaweaveLegs", "inventory"), new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveLegs, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"))); + ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); + } + }); ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, MesherWrapper.of(stack -> - "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) - ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"))); + ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) + ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory"); + } + }); ModelLoader.registerItemVariants(spawnerMover, new ModelResourceLocation("botania:spawnerMover", "inventory"), new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, MesherWrapper.of(stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"))); + ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"); + } + }); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), new ModelResourceLocation("botania:terraPickEnabled", "inventory"), new ModelResourceLocation("botania:terraPickTipped", "inventory"), new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, MesherWrapper.of(stack -> { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; + ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; + } + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); - })); + }); } private static void registerSubtiles() { @@ -1054,21 +1105,4 @@ public final class ModelHandler { private ModelHandler() {} - // Shim because lambdas/method references for vanilla classes are not reobfuscated properly yet - // See https://github.com/MinecraftForge/ForgeGradle/issues/314 - private interface MesherWrapper extends ItemMeshDefinition { - - static MesherWrapper of(MesherWrapper f) { - return f; - } - - ModelResourceLocation getLocation(ItemStack stack); - - @Override - default ModelResourceLocation getModelLocation(ItemStack stack) { - return getLocation(stack); - } - - } - } From 64e3a96651260276fb67d958518c81a2d2ca6d18 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Jan 2016 14:25:00 -0600 Subject: [PATCH 210/935] I is retarded --- .../client/core/handler/ModelHandler.java | 185 +++++++----------- 1 file changed, 75 insertions(+), 110 deletions(-) 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 df5c1a26d..ea4d8760a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -166,173 +166,123 @@ public final class ModelHandler { registerBrews(); /** Special Item Meshers **/ - // Cannot use lambdas yet because FG/SS can't reobfuscate them. - // See https://github.com/MinecraftForge/ForgeGradle/issues/314 + // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper + // See https://github.com/MinecraftForge/ForgeGradle/issues/314. ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemInfiniteFruit.isBoot(stack) - ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(infiniteFruit, MesherWrapper.of(stack -> + ItemInfiniteFruit.isBoot(stack) + ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") + : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRing, MesherWrapper.of(stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingOn", "inventory") + : new ModelResourceLocation("botania:magnetRingOff", "inventory"))); ModelLoader.registerItemVariants(magnetRingGreater, new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRingGreater, MesherWrapper.of(stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"))); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; - return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaGun, MesherWrapper.of(stack -> { + String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; + return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); + })); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod", "inventory"), new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) - ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") - : new ModelResourceLocation("botania:tornadoRod", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(tornadoRod, MesherWrapper.of(stack -> + ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) + ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") + : new ModelResourceLocation("botania:tornadoRod", "inventory"))); ModelLoader.registerItemVariants(twigWand, new ModelResourceLocation("botania:twigWand", "inventory"), new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(twigWand, MesherWrapper.of(stack -> { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); + })); ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveBoots, MesherWrapper.of(stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory"))); ModelLoader.registerItemVariants(manaweaveChest, new ModelResourceLocation("botania:manaweaveChest", "inventory"), new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveChest, MesherWrapper.of(stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory"))); ModelLoader.registerItemVariants(manaweaveHelm, new ModelResourceLocation("botania:manaweaveHelm", "inventory"), new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveHelm, MesherWrapper.of(stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory"))); ModelLoader.registerItemVariants(manaweaveLegs, new ModelResourceLocation("botania:manaweaveLegs", "inventory"), new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveLegs, MesherWrapper.of(stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory"))); ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) - ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manasteelSword, MesherWrapper.of(stack -> + "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) + ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory"))); ModelLoader.registerItemVariants(spawnerMover, new ModelResourceLocation("botania:spawnerMover", "inventory"), new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(spawnerMover, MesherWrapper.of(stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"))); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), new ModelResourceLocation("botania:terraPickEnabled", "inventory"), new ModelResourceLocation("botania:terraPickTipped", "inventory"), new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; - } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); + ModelLoader.setCustomMeshDefinition(terraPick, MesherWrapper.of(stack -> { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; } - }); + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); + })); } private static void registerSubtiles() { @@ -698,19 +648,19 @@ public final class ModelHandler { ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { + ModelLoader.setCustomMeshDefinition(brewFlask, MesherWrapper.of(stack -> { int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - }); + })); for (int i = 0; i < 4; i++) { ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewVial, stack -> { + ModelLoader.setCustomMeshDefinition(brewVial, MesherWrapper.of(stack -> { int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - }); + })); } private static void registerStateMappers() { @@ -1105,4 +1055,19 @@ public final class ModelHandler { private ModelHandler() {} + private interface MesherWrapper extends ItemMeshDefinition { + + static MesherWrapper of(MesherWrapper w) { + return w; + } + + ModelResourceLocation getLocation(ItemStack stack); + + @Override + default ModelResourceLocation getModelLocation(ItemStack stack) { + return getLocation(stack); + } + + } + } From a172a325e1a50276fe5bd365f29304dc66395041 Mon Sep 17 00:00:00 2001 From: GirafiStudios Date: Mon, 11 Jan 2016 23:45:43 +0100 Subject: [PATCH 211/935] Fixed named Tiny Potatoes rendering (Besides Ible) --- .../api/item/TinyPotatoRenderEvent.java | 7 +- .../render/tile/RenderTileTinyPotato.java | 344 ++++++++++-------- 2 files changed, 187 insertions(+), 164 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 116671ab6..cd86958d3 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -25,14 +25,15 @@ public class TinyPotatoRenderEvent extends Event { public final String name; public final double x, y, z; public final float partTicks; + public final int destroyStage; - public TinyPotatoRenderEvent(TileEntity tile, String name, double x, double y, double z, float partTicks) { + public TinyPotatoRenderEvent(TileEntity tile, String name, double x, double y, double z, float partTicks, int destroyStage) { this.tile = tile; this.name = name; this.x = x; this.y = y; this.z = z; this.partTicks = partTicks; + this.destroyStage = destroyStage; } - -} +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index a2756b9d2..b385e08b2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -10,31 +10,30 @@ */ package vazkii.botania.client.render.tile; -import net.minecraft.block.state.IBlockState; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.TinyPotatoRenderEvent; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTinyPotato; import vazkii.botania.common.block.tile.TileTinyPotato; @@ -42,290 +41,302 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN); private static final ModelTinyPotato model = new ModelTinyPotato(); @Override - public void renderTileEntityAt(TileTinyPotato potato, double d0, double d1, double d2, float var8, int digProgress) { + public void renderTileEntityAt(TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage) { if (potato != null && potato.getWorld() != null && !potato.getWorld().isBlockLoaded(potato.getPos(), false)) { return; } - + GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); + GlStateManager.translate(x, y, z); Minecraft mc = Minecraft.getMinecraft(); - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture); String name = potato.name.toLowerCase(); boolean usedShader = false; - if(name.startsWith("gaia ")) { + if (name.startsWith("gaia ")) { ShaderHelper.useShader(ShaderHelper.doppleganger); name = name.substring(5); usedShader = true; - } else if(name.startsWith("hot ")) { + } else if (name.startsWith("hot ")) { ShaderHelper.useShader(ShaderHelper.halo); name = name.substring(4); usedShader = true; - } else if(name.startsWith("magic ")) { + } else if (name.startsWith("magic ")) { ShaderHelper.useShader(ShaderHelper.enchanterRune); name = name.substring(6); usedShader = true; - } else if(name.startsWith("gold ")) { + } else if (name.startsWith("gold ")) { ShaderHelper.useShader(ShaderHelper.gold); name = name.substring(5); usedShader = true; - } else if(name.startsWith("snoop ")) { + } else if (name.startsWith("snoop ")) { ShaderHelper.useShader(ShaderHelper.terraPlateRune); name = name.substring(6); usedShader = true; } - float jump = potato.jumpTicks; - if(jump > 0) - jump -= var8; + GlStateManager.translate(0.5F, 1.5F, 0.5F); + GlStateManager.scale(1F, -1F, -1F); + int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata(); + float rotY = meta * 90F - 180F; + GlStateManager.rotate(rotY, 0F, 1F, 0F); - float up = (float) Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; + float jump = potato.jumpTicks; + if (jump > 0) + jump -= partialTicks; + + float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F; float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2; GlStateManager.translate(0F, up, 0F); GlStateManager.rotate(rotZ, 0F, 0F, 1F); GlStateManager.pushMatrix(); - if(name.equals("pahimar")) { + if (name.equals("pahimar")) { GlStateManager.scale(1F, 0.3F, 1F); - //GlStateManager.translate(0F, 3.5F, 0F); - } else if(name.equals("kyle hyde")) { - // 1.8: handled using getActualState - mc.renderEngine.bindTexture(textureGrayscale); - } else if(name.equals("dinnerbone") || name.equals("grumm")) { + GlStateManager.translate(0F, 3.5F, 0F); + } else if (name.equals("kyle hyde")) + mc.renderEngine.bindTexture(textureGrayscale); + else if (name.equals("dinnerbone") || name.equals("grumm")) { GlStateManager.rotate(180F, 0F, 0F, 1F); - //GlStateManager.translate(0F, -2.625F, 0F); - } else if(name.equals("aureylian")) + GlStateManager.translate(0F, -2.625F, 0F); + } else if (name.equals("aureylian")) GlStateManager.color(1F, 0.5F, 1F); - IBlockState state = potato.getWorld().getBlockState(potato.getPos()); - state = state.getBlock().getActualState(state, potato.getWorld(), potato.getPos()); - IBakedModel bakedModel = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); boolean render = !(name.equals("mami") || name.equals("soaryn") || name.equals("eloraam") && jump != 0); - if(render) { - GlStateManager.rotate(-90, 0, 1, 0); - mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); - GlStateManager.rotate(90, 0, 1, 0); - //model.render(); - } - if(name.equals("kingdaddydmac")) { - GlStateManager.translate(-0.5F, 0F, 0F); - mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(bakedModel, potato.getWorld().getBlockState(potato.getPos()), 1.0F, false); - //model.render(); + if (render) + model.render(); + if (name.equals("kingdaddydmac")) { + GlStateManager.translate(0.5F, 0F, 0F); + model.render(); } - if(usedShader) + if (usedShader) ShaderHelper.releaseShader(); GlStateManager.popMatrix(); - if(!name.isEmpty()) { + if (!name.isEmpty()) { GlStateManager.pushMatrix(); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); ContributorFancinessHandler.firstStart(); - // todo 1.8 refine all below + float scale = 1F / 4F; GlStateManager.translate(0F, 1F, 0F); GlStateManager.scale(scale, scale, scale); - if(name.equals("phi") || name.equals("vazkii")) { + if (name.equals("phi") || name.equals("vazkii")) { GlStateManager.translate(0.45F, 0F, 0.4F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(20F, 1F, 0F, 1F); renderIcon(MiscellaneousIcons.INSTANCE.phiFlowerIcon); - if(name.equals("vazkii")) { + if (name.equals("vazkii")) { GlStateManager.rotate(-20F, 1F, 0F, 1F); GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1.5F, -1.3F, -0.75F); renderIcon(MiscellaneousIcons.INSTANCE.nerfBatIcon); } - } else if(name.equals("skull kid")) { + } else if (name.equals("skull kid")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 23), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("kamina")) { + GlStateManager.translate(0F, -0.7F, -0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 23)); + } else if (name.equals("kamina")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.1F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 26), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("haighyorkie")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.6F, 0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 26)); + } else if (name.equals("haighyorkie")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); renderIcon(MiscellaneousIcons.INSTANCE.goldfishIcon); - } else if(name.equals("chitoge")) { + } else if (name.equals("chitoge")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -0.7F, 0.1F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 7), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("direwolf20")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.2F, 0.1F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 7)); + } else if (name.equals("direwolf20")) { GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -2.2F, -0.5F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("doctor")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1.7F, 0.5F); + renderItem(new ItemStack(ModItems.cosmetic)); + } else if (name.equals("doctor")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.15F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 25), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("snoo")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.65F, 0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 25)); + } else if (name.equals("snoo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -0.7F, 0.1F); - GlStateManager.rotate(20F, 0F, 0F, 1F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 24), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("charlotte")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.2F, 0F, -0.05F); + GlStateManager.rotate(-20F, 0F, 0F, 1F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 24)); + } else if (name.equals("charlotte")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 12), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("greg") || name.equals("gregorioust")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.7F, 0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 12)); + } else if (name.equals("greg") || name.equals("gregorioust")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1.5F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.book, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); + GlStateManager.rotate(270F, 0F, 1F, 0F); + GlStateManager.translate(0F, -1F, 0.4F); + renderItem(new ItemStack(Items.book)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.translate(0.5F, 0.5F, 0F); GlStateManager.scale(0.3F, 0.3F, 0.3F); - - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.iron_ore.getDefaultState(), 1F); - } else if(name.equals("profmobius")) { + renderItem(new ItemStack(Blocks.iron_ore)); + } else if (name.equals("profmobius")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.bread, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("martysgames") || name.equals("marty")) { + GlStateManager.rotate(270F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.7F, 0.4F); + renderItem(new ItemStack(Items.bread)); + } else if (name.equals("martysgames") || name.equals("marty")) { GlStateManager.scale(0.7F, 0.7F, 0.7F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.75F, -2.4F, -0.7F); - GlStateManager.rotate(10F, 0F, 0F, 1F); - ItemStack renderStack = new ItemStack(ModItems.infiniteFruit, 1); - renderStack.setStackDisplayName("das boot"); - Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("tromped")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.3F, -1.8F, 0.7F); + GlStateManager.rotate(-15F, 0F, 0F, 1F); + renderItem(new ItemStack(ModItems.infiniteFruit, 1).setStackDisplayName("das boot")); + } else if (name.equals("tromped")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(270F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.7F, 0.4F); + renderItem(new ItemStack(ModItems.cacophonium)); + } else if (name.equals("kain vinosec")) { + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cacophonium, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("kain vinosec")) { + GlStateManager.translate(-0.3F, -1F, 0.4F); + renderItem(new ItemStack(ModItems.recordGaia1)); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0F, 0F, -0.85F); + renderItem(new ItemStack(ModItems.recordGaia2)); + } else if (name.equals("mankrik")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.3F, -1.5F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia1, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - GlStateManager.translate(0F, 0F, 0.85F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia2, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("mankrik")) { - GlStateManager.scale(1.25F, 1.25F, 1.25F); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -0.2F, -0.1F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 31), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("kurumi")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.3F, 0.1F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 31)); + } else if (name.equals("kurumi")) { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.9F, -2.5F, -1.3F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 17), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("ichun")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.4F, -2F, 1.3F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 17)); + } else if (name.equals("ichun")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 15), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.7F, 0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 15)); + } else if (name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1.1F, -0.325F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.painting, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("jibril")) { + GlStateManager.translate(-0.1F, -0.6F, -0.325F); + renderItem(new ItemStack(Items.painting)); + } else if (name.equals("jibril")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(0F, 0.7F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); - ItemFlightTiara.renderHalo(null, var8); - } else if(name.equals("nebris")) { - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + ItemFlightTiara.renderHalo(null, partialTicks); + } else if (name.equals("nebris")) { + GlStateManager.scale(2F, 2F, 2F); GlStateManager.rotate(180F, 1F, 0F, 0F); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.glowstone.getDefaultState(), 1F); - } else if(name.equals("ible")) { + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + renderItem(new ItemStack(Blocks.glowstone)); + } else if (name.equals("ible")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); - GlStateManager.translate(0F, 0.7F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(-0.5F, 0F, -0.5F); + GlStateManager.rotate(180F, 1F, 1F, 0F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.portal.getDefaultState(), 1F); - } else if(name.equals("razz") || name.equals("razzleberryfox")) { + renderBlock(Blocks.portal); + } else if (name.equals("razz") || name.equals("razzleberryfox")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1F, 0.45F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 8), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("etho") || name.equals("ethoslab")) { + GlStateManager.translate(0, -0.5F, 0.45F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 8)); + } else if (name.equals("etho") || name.equals("ethoslab")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.5F, -1.2F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.cookie, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("sethbling")) { - mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.translate(0F, -0.7F, 0.4F); + renderItem(new ItemStack(Items.cookie)); + } else if (name.equals("sethbling")) { GlStateManager.scale(1.2F, 1.2F, 1.2F); - GlStateManager.translate(0F, 0.9F, 0F); + GlStateManager.translate(-0.5F, 1.4F, -0.5F); GlStateManager.rotate(180F, 1F, 0F, 0F); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.command_block.getDefaultState(), 1F); - } else if(name.equals("bdoubleo100") || name.equals("bdoubleo")) { + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + renderBlock(Blocks.command_block); + } else if (name.equals("bdoubleo100") || name.equals("bdoubleo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-1F, -1.1F, -0.1F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.stick, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("kingdaddydmac")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.5F, -0.6F, 0.1F); + renderItem(new ItemStack(Items.stick)); + } else if (name.equals("kingdaddydmac")) { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.3F, -2.5F, 1.075F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - GlStateManager.translate(0F, 0F, -4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); + GlStateManager.rotate(270F, 0F, 1F, 0F); + GlStateManager.translate(-0.3F, -2F, -1.075F); + renderItem(new ItemStack(ModItems.manaRing, 1, 0)); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0F, 0F, 4F); + renderItem(new ItemStack(ModItems.manaRing, 1, 0)); + GlStateManager.scale(0.8F, 0.8F, 0.8F); + GlStateManager.translate(-1.7F, -1.2F, -0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.scale(1.5F, 1.5F, 1.5F); - GlStateManager.translate(1.5F, -0.5F, 0.7F); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState(), 1.0F); - } else if(name.equals("sjin")) { + renderBlock(Blocks.cake); + } else if (name.equals("sjin")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -1.27F, -0.4F); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 27), ItemCameraTransforms.TransformType.THIRD_PERSON); - } else if(name.equals("martyn") || name.equals("inthelittlewood")) { + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, -0.77F, 0.4F); + renderItem(new ItemStack(ModItems.cosmetic, 1, 27)); + } else if (name.equals("martyn") || name.equals("inthelittlewood")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.5F, -0.45F, -0.1F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.05F, 0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Blocks.sapling, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON); - }else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { + renderItem(new ItemStack(Blocks.sapling, 0, 0)); + } else if (ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { ItemStack icon = ContributorFancinessHandler.flowerMap.get(name); - if(icon != null) { + if (icon != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.5F, -0.5F, 0F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - Minecraft.getMinecraft().getRenderItem().renderItem(icon, ItemCameraTransforms.TransformType.THIRD_PERSON); + renderItem(icon); ShaderHelper.releaseShader(); } } @@ -333,15 +344,17 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Mon, 11 Jan 2016 20:06:59 -0600 Subject: [PATCH 212/935] Trying to render AO pool --- .../client/render/tile/RenderTilePool.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b07257938..64de16ab2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -29,6 +29,7 @@ import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL14; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; @@ -36,6 +37,7 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { @@ -73,7 +75,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { int color; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + Color jcolor = Color.getHSBColor(time * 0.005F, 0.6F, 1F); + GL14.glSecondaryColor3ub(((byte) jcolor.getRed()), ((byte) jcolor.getGreen()), ((byte) jcolor.getBlue())); } else { color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha } @@ -81,22 +84,25 @@ public class RenderTilePool extends TileEntitySpecialRenderer { IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); Tessellator tess = Tessellator.getInstance(); - tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); +// tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); - GlStateManager.disableLighting(); - for (BakedQuad quad : model.getGeneralQuads()) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - for (EnumFacing e : EnumFacing.VALUES) { - for (BakedQuad quad: model.getFaceQuads(e)) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - } + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModel(pool.getWorld(), model, pool.getWorld().getBlockState(pool.getPos()), pool.getPos(), tess.getWorldRenderer(), false); + GL14.glSecondaryColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); +// GlStateManager.disableLighting(); +// for (BakedQuad quad : model.getGeneralQuads()) { +// LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); +// } +// +// for (EnumFacing e : EnumFacing.VALUES) { +// for (BakedQuad quad: model.getFaceQuads(e)) { +// LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); +// } +// } - tess.draw(); +// tess.draw(); - GlStateManager.enableLighting(); +// GlStateManager.enableLighting(); GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); From f799f7bc32214c0be02531224ede3130f07bf905 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Jan 2016 12:00:29 -0600 Subject: [PATCH 213/935] Revert "Trying to render AO pool" This reverts commit d8a74e2e44e53dc99392ee46ebae75b2443df95d. --- .../client/render/tile/RenderTilePool.java | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 64de16ab2..b07257938 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -29,7 +29,6 @@ import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL14; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; @@ -37,7 +36,6 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { @@ -75,8 +73,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { int color; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - Color jcolor = Color.getHSBColor(time * 0.005F, 0.6F, 1F); - GL14.glSecondaryColor3ub(((byte) jcolor.getRed()), ((byte) jcolor.getGreen()), ((byte) jcolor.getBlue())); + color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha } @@ -84,25 +81,22 @@ public class RenderTilePool extends TileEntitySpecialRenderer { IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); Tessellator tess = Tessellator.getInstance(); -// tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); + tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); + GlStateManager.disableLighting(); + for (BakedQuad quad : model.getGeneralQuads()) { + LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); + } - Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModel(pool.getWorld(), model, pool.getWorld().getBlockState(pool.getPos()), pool.getPos(), tess.getWorldRenderer(), false); - GL14.glSecondaryColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); -// GlStateManager.disableLighting(); -// for (BakedQuad quad : model.getGeneralQuads()) { -// LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); -// } -// -// for (EnumFacing e : EnumFacing.VALUES) { -// for (BakedQuad quad: model.getFaceQuads(e)) { -// LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); -// } -// } + for (EnumFacing e : EnumFacing.VALUES) { + for (BakedQuad quad: model.getFaceQuads(e)) { + LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); + } + } -// tess.draw(); + tess.draw(); -// GlStateManager.enableLighting(); + GlStateManager.enableLighting(); GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); From 19e387f359bdc6ec88cdf4564feec7c741c41435 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Jan 2016 13:58:19 -0600 Subject: [PATCH 214/935] Fix off by one in forest drum meta to state --- .../java/vazkii/botania/common/block/mana/BlockForestDrum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fca4ea170..4875a5ccb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -69,7 +69,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @Override public IBlockState getStateFromMeta(int meta) { - if (meta > DrumVariant.values().length) { + if (meta >= DrumVariant.values().length) { meta = 0; } return getDefaultState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.values()[meta]); From 6c9a01978a73d1e47fd92c3cab60e7e0864b0627 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Jan 2016 15:04:08 -0600 Subject: [PATCH 215/935] Cocoon of caprice model --- .../client/core/handler/ModelHandler.java | 1 + .../client/render/tile/RenderTileCocoon.java | 17 +++++++++------ .../assets/botania/blockstates/cocoon.json | 14 ++++++++++++ .../assets/botania/models/block/cocoon.json | 20 ++++++++++++++++++ .../assets/botania/textures/model/cocoon.png | Bin 16468 -> 1435 bytes 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/cocoon.json create mode 100644 src/main/resources/assets/botania/models/block/cocoon.json 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 ea4d8760a..43b7232a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -352,6 +352,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.cacophonium); registerItemModel(ModBlocks.cellBlock); registerItemModel(ModBlocks.conjurationCatalyst); + registerItemModel(ModBlocks.cocoon); registerItemModel(ModBlocks.corporeaFunnel); registerItemModel(ModBlocks.corporeaInterceptor); registerItemModel(ModBlocks.corporeaRetainer); 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 0ee6aafc0..fc9eada26 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -10,9 +10,12 @@ */ package vazkii.botania.client.render.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -41,12 +44,14 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(0.5F, -0.5F - 3F / 16F, -0.5F + 1F / 16F); - GlStateManager.rotate(rot, 0F, 1F, 0F); - model.render(); + GlStateManager.translate(d0, d1, d2 + 1); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.translate(0.5F, 0, 0F); + GlStateManager.rotate(rot, 1F, 0F, 0F); // todo 1.8 fixme looks a little weird compared to 1.7 + GlStateManager.translate(-0.5F, 0, 0F); + IBlockState state = cocoon.getWorld().getBlockState(cocoon.getPos()); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); GlStateManager.color(1F, 1F, 1F); GlStateManager.enableRescaleNormal(); GlStateManager.popMatrix(); diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json new file mode 100644 index 000000000..74599fbed --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:cocoon", + "textures": { + "all": "botania:model/cocoon" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json new file mode 100644 index 000000000..ef26fab47 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3.0, 0.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 1.0, 0.0, 3.5, 3.5 ] }, + "north": { "texture": "#all", "uv": [ 3.5, 0.0, 6.0, 3.5 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 0.0, 8.5, 3.5 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 0.0, 11.0, 3.5 ] }, + "up": { "texture": "#all", "uv": [ 3.5, 3.5, 6.0, 6.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 3.5, 8.5, 6.0 ], "cullface": "down" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/cocoon.png b/src/main/resources/assets/botania/textures/model/cocoon.png index e0ab41ac4f6f6ef4cbd38809f8dd6f9abab3d822..0d13b347b0d980e65eee25705a917f36756c2fc1 100644 GIT binary patch delta 1431 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 Date: Tue, 12 Jan 2016 23:27:36 -0600 Subject: [PATCH 216/935] Bunch of TE particle textures. Fix a bellows crash and teru teru bozu not working with sunflower --- .../client/core/handler/ModelHandler.java | 11 ++++++++++- .../render/tile/RenderTileSkullOverride.java | 19 ++++--------------- .../botania/common/block/BlockFakeAir.java | 13 +++++++++++++ .../common/block/BlockTeruTeruBozu.java | 2 +- .../common/block/mana/BlockBellows.java | 3 +++ .../assets/botania/blockstates/avatar.json | 12 ++++++++++++ .../assets/botania/blockstates/bellows.json | 12 ++++++++++++ .../assets/botania/blockstates/brewery.json | 12 ++++++++++++ .../blockstates/corporeaCrystalCube.json | 12 ++++++++++++ .../botania/blockstates/corporeaIndex.json | 12 ++++++++++++ .../assets/botania/blockstates/fakeAir.json | 12 ++++++++++++ .../botania/blockstates/gaiaHeadBlock.json | 12 ++++++++++++ .../assets/botania/blockstates/hourglass.json | 12 ++++++++++++ .../assets/botania/blockstates/pump.json | 12 ++++++++++++ .../botania/blockstates/teruTeruBozu.json | 12 ++++++++++++ 15 files changed, 151 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/avatar.json create mode 100644 src/main/resources/assets/botania/blockstates/bellows.json create mode 100644 src/main/resources/assets/botania/blockstates/brewery.json create mode 100644 src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json create mode 100644 src/main/resources/assets/botania/blockstates/corporeaIndex.json create mode 100644 src/main/resources/assets/botania/blockstates/fakeAir.json create mode 100644 src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/hourglass.json create mode 100644 src/main/resources/assets/botania/blockstates/pump.json create mode 100644 src/main/resources/assets/botania/blockstates/teruTeruBozu.json 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 43b7232a8..96327c9e3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; @@ -561,7 +562,7 @@ public final class ModelHandler { registerItemModelMetas(blackHoleTalisman, LibItemNames.BLACK_HOLE_TALISMAN, 2); registerItemModelMetas(slimeBottle, LibItemNames.SLIME_BOTTLE, 2); registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); - registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); + registerItemModelMetas(quartz, LibItemNames.QUARTZ, 7); registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); registerItemModelMetas(virus, LibItemNames.VIRUS, 2); @@ -762,6 +763,14 @@ public final class ModelHandler { for (Block b : otherFullSlabs) { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } + + // Ignore everything in TESR items to suppress missing model errors + ModelLoader.setCustomStateMapper(ModBlocks.avatar, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ModelLoader.setCustomStateMapper(ModBlocks.bellows, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ModelLoader.setCustomStateMapper(ModBlocks.brewery, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.gaiaHead, new StateMap.Builder().ignore(BlockSkull.FACING, BlockSkull.NODROP).build()); + ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.pump, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); } private static void registerMushrooms() { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 30cb9f1a0..a2ef45e2b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -43,18 +43,9 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { boolean gaia = skull == null || skull instanceof TileGaiaHead; - if(par6 == 3 || gaia) { - ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy(); + if(gaia) { Minecraft minecraft = Minecraft.getMinecraft(); - if(gaia) - resourcelocation = minecraft.thePlayer.getLocationSkin(); - else if(gameProfile != null) { - Map map = minecraft.getSkinManager().loadSkinFromCache(gameProfile); - - if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) { - resourcelocation = minecraft.getSkinManager().loadSkin((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); - } - } + ResourceLocation resourcelocation = minecraft.thePlayer.getLocationSkin(); bindTexture(resourcelocation); GlStateManager.pushMatrix(); GlStateManager.disableCull(); @@ -81,13 +72,11 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { GlStateManager.enableRescaleNormal(); GlStateManager.scale(-1.0F, -1.0F, 1.0F); GlStateManager.enableAlpha(); - if(gaia) - ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); modelSkull.render(null, 0F, 0F, 0F, par5, 0F, 0.0625F); - if(gaia) - ShaderHelper.releaseShader(); + ShaderHelper.releaseShader(); GlStateManager.popMatrix(); } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index f2bcec8a1..035cc0d24 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -26,7 +26,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; +import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockModContainer { @@ -43,6 +45,17 @@ public class BlockFakeAir extends BlockModContainer { return -1; } + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public Block setUnlocalizedName(String par1Str) { + GameRegistry.registerBlock(this, null, par1Str); + return super.setUnlocalizedName(par1Str); + } + @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { if(shouldRemove(world, pos)) diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index be36d77a2..7504fc86d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -39,7 +39,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity e) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getEntityItem(); 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 d64658100..aa4d22691 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -55,6 +55,9 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } diff --git a/src/main/resources/assets/botania/blockstates/avatar.json b/src/main/resources/assets/botania/blockstates/avatar.json new file mode 100644 index 000000000..946bd2921 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/avatar.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingwood0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bellows.json b/src/main/resources/assets/botania/blockstates/bellows.json new file mode 100644 index 000000000..946bd2921 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bellows.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingwood0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/brewery.json b/src/main/resources/assets/botania/blockstates/brewery.json new file mode 100644 index 000000000..f458ec0ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brewery.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json new file mode 100644 index 000000000..dc3cd27b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/storage2" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaIndex.json b/src/main/resources/assets/botania/blockstates/corporeaIndex.json new file mode 100644 index 000000000..dc3cd27b2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/corporeaIndex.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/storage2" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fakeAir.json b/src/main/resources/assets/botania/blockstates/fakeAir.json new file mode 100644 index 000000000..482ea550e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fakeAir.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:items/barrier" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json b/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json new file mode 100644 index 000000000..4c72d6125 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/soul_sand" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hourglass.json b/src/main/resources/assets/botania/blockstates/hourglass.json new file mode 100644 index 000000000..4e63db707 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hourglass.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/manaGlass" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json new file mode 100644 index 000000000..f458ec0ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pump.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "botania:blocks/livingrock0" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/teruTeruBozu.json b/src/main/resources/assets/botania/blockstates/teruTeruBozu.json new file mode 100644 index 000000000..d3d2b72a3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/teruTeruBozu.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/wool_colored_white" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file From a30887d6f90573d16433bbf4384ee06ea3351a20 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 00:02:18 -0600 Subject: [PATCH 217/935] Debug thing for me, to dump the texture atlas --- .../core/handler/MiscellaneousIcons.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) 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 d7e4c76c6..74df2b1f3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -10,13 +10,20 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.CommandEvent; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.PlatformModel; @@ -27,6 +34,11 @@ import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.IntBuffer; import java.util.Map; public class MiscellaneousIcons { @@ -127,5 +139,47 @@ public class MiscellaneousIcons { } } + @SubscribeEvent + public void dumpAtlas(ArrowLooseEvent evt) { + if (!evt.entityPlayer.worldObj.isRemote || true) + return; + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + + int width = 1024; + int height = 1024; + + int pixels = width * height; + + IntBuffer buffer = BufferUtils.createIntBuffer(pixels); + int[] pixelValues = new int[pixels]; + + GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, 1); + GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); + + GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); + //GL11.glReadPixels(0, 0, width, height, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); + + buffer.get(pixelValues); + + BufferedImage bufferedimage = new BufferedImage(width, height, 2); + + for (int k = 0; k < height; ++k) + { + for (int l = 0; l < width; ++l) + { + bufferedimage.setRGB(l, k, pixelValues[k * width + l]); + } + } + + File mcFolder = Minecraft.getMinecraft().mcDataDir; + File result = new File(mcFolder, "atlas.png"); + + try { + ImageIO.write(bufferedimage, "png", result); + } catch (IOException e) { + e.printStackTrace(); + } + } + private MiscellaneousIcons() {} } From 3e19a84b6d06ad5caee4039a1e5f4e03d9766d0d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 00:42:32 -0600 Subject: [PATCH 218/935] Fix terra shatterer tooltip darkening screen. Closes #37 --- .../client/core/handler/TooltipAdditionDisplayHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 90d136073..5aa68e18f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -190,7 +190,7 @@ public final class TooltipAdditionDisplayHandler { String rank = StatCollector.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING); - GlStateManager.disableLighting(); + GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { rank = StatCollector.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); From c8d9764fe3acede9da74f20ecae7021fd67618a7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 10:59:10 -0600 Subject: [PATCH 219/935] Read atlas size dynamically --- .../botania/client/core/handler/MiscellaneousIcons.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 74df2b1f3..18c6886cc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -145,8 +145,10 @@ public class MiscellaneousIcons { return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - int width = 1024; - int height = 1024; + 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); + + System.out.printf("Atlas is %d wide by %d tall%n", width, height); int pixels = width * height; @@ -157,8 +159,7 @@ public class MiscellaneousIcons { GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); - //GL11.glReadPixels(0, 0, width, height, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer); - + buffer.get(pixelValues); BufferedImage bufferedimage = new BufferedImage(width, height, 2); From 1402e2a50ad7b7c4b0ed5f1a972e5d6157f4f9eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 12:37:15 -0600 Subject: [PATCH 220/935] Start work on destitching apothecary texmaps --- .../core/handler/MiscellaneousIcons.java | 2 +- .../assets/botania/blockstates/altar.json | 181 +++++++++++++++++- .../assets/botania/models/block/altar.json | 110 +++++------ 3 files changed, 227 insertions(+), 66 deletions(-) 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 18c6886cc..d31332f18 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -141,7 +141,7 @@ public class MiscellaneousIcons { @SubscribeEvent public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.entityPlayer.worldObj.isRemote || true) + if (!evt.entityPlayer.worldObj.isRemote || false) return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 20c72391a..207c7c165 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -1,4 +1,5 @@ { + "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!", "forge_marker": 1, "defaults": { "model": "botania:altar", @@ -7,43 +8,203 @@ "variants": { "variant": { "default": { "textures": { - "all": "botania:model/altar", + "gobletbaseside": "botania:model/altar/default/gobletBase_sides", + "gobletbasetop": "botania:model/altar/default/gobletBase_top", + "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/default/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/default/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/default/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/default/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/default/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/default/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/default/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/default/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom", + "kelkwall": "botania:model/altar/default/kelkWall", "particle": "minecraft:blocks/cobblestone" }}, "forest": { "textures": { - "all": "botania:model/altarMeta0", + "gobletbaseside": "botania:model/altar/forest/gobletBase_sides", + "gobletbasetop": "botania:model/altar/forest/gobletBase_top", + "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/forest/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/forest/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/forest/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/forest/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/forest/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom", + "kelkwall": "botania:model/altar/forest/kelkWall", "particle": "botania:blocks/biomeStone0" }}, "plains": { "textures": { - "all": "botania:model/altarMeta1", + "gobletbaseside": "botania:model/altar/plains/gobletBase_sides", + "gobletbasetop": "botania:model/altar/plains/gobletBase_top", + "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/plains/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/plains/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/plains/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/plains/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/plains/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom", + "kelkwall": "botania:model/altar/plains/kelkWall", "particle": "botania:blocks/biomeStone1" }}, "mountain": { "textures": { - "all": "botania:model/altarMeta2", + "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mountain/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mountain/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mountain/kelkWall", "particle": "botania:blocks/biomeStone2" }}, "fungal": { "textures": { - "all": "botania:model/altarMeta3", + "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides", + "gobletbasetop": "botania:model/altar/fungal/gobletBase_top", + "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/fungal/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom", + "kelkwall": "botania:model/altar/fungal/kelkWall", "particle": "botania:blocks/biomeStone3" }}, "swamp": { "textures": { - "all": "botania:model/altarMeta4", + "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides", + "gobletbasetop": "botania:model/altar/swamp/gobletBase_top", + "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/swamp/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom", + "kelkwall": "botania:model/altar/swamp/kelkWall", "particle": "botania:blocks/biomeStone4" }}, "desert": { "textures": { - "all": "botania:model/altarMeta5", + "gobletbaseside": "botania:model/altar/desert/gobletBase_sides", + "gobletbasetop": "botania:model/altar/desert/gobletBase_top", + "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/desert/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/desert/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/desert/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/desert/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/desert/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom", + "kelkwall": "botania:model/altar/desert/kelkWall", "particle": "botania:blocks/biomeStone5" }}, "taiga": { "textures": { - "all": "botania:model/altarMeta6", + "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides", + "gobletbasetop": "botania:model/altar/taiga/gobletBase_top", + "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/taiga/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom", + "kelkwall": "botania:model/altar/taiga/kelkWall", "particle": "botania:blocks/biomeStone6" }}, "mesa": { "textures": { - "all": "botania:model/altarMeta7", + "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mesa/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mesa/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mesa/kelkWall", "particle": "botania:blocks/biomeStone7" }}, "mossy": { "textures": { - "all": "botania:model/altarMossy", + "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mossy/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mossy/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mossy/kelkWall", "particle": "minecraft:blocks/cobblestone" }} } diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json index b074823d7..d87d20b2a 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -6,12 +6,12 @@ "from": [ 0.0, 0.0, 0.0 ], "to": [ 16.0, 2.0, 16.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 2.0, 2.0, 2.25 ] }, - "south": { "texture": "#all", "uv": [ 2.0, 2.0, 4.0, 2.25 ] }, - "east": { "texture": "#all", "uv": [ 4.0, 2.0, 6.0, 2.25 ] }, - "north": { "texture": "#all", "uv": [ 6.0, 2.0, 8.0, 2.25 ] }, - "up": { "texture": "#all", "uv": [ 2.0, 0, 4.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 0, 6.0, 2.0 ], "cullface": "down" } + "west": { "texture": "#gobletbaseside", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "south": { "texture": "#gobletbaseside", "uv": [ 0.0, 3.0, 16.0, 5.0 ] }, + "east": { "texture": "#gobletbaseside", "uv": [ 0.0, 6.0, 16.0, 8.0 ] }, + "north": { "texture": "#gobletbaseside", "uv": [ 0.0, 9.0, 16.0, 11.0 ] }, + "up": { "texture": "#gobletbasetop", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#gobletbasebottom", "uv": [ 0.0, 0.0, 16.0, 16.0 ], "cullface": "down" } } }, { @@ -19,11 +19,11 @@ "from": [ 1.0, 2.0, 1.0 ], "to": [ 15.0, 3.0, 15.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 4.0, 1.75, 4.125 ] }, - "south": { "texture": "#all", "uv": [ 1.75, 4.0, 3.5, 4.125 ] }, - "east": { "texture": "#all", "uv": [ 3.5, 4.0, 5.25, 4.125 ] }, - "north": { "texture": "#all", "uv": [ 5.25, 4.0, 7.0, 4.125 ] }, - "up": { "texture": "#all", "uv": [ 1.75, 2.25, 3.5, 4.0 ] } + "west": { "texture": "#gobletbase2side", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, + "south": { "texture": "#gobletbase2side", "uv": [ 1.0, 2.0, 15.0, 3.0 ] }, + "east": { "texture": "#gobletbase2side", "uv": [ 1.0, 4.0, 15.0, 5.0 ] }, + "north": { "texture": "#gobletbase2side", "uv": [ 1.0, 6.0, 15.0, 7.0 ] }, + "up": { "texture": "#gobletbase2top", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } } }, { @@ -31,11 +31,11 @@ "from": [ 2.0, 3.0, 2.0 ], "to": [ 14.0, 4.0, 14.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 5.625, 1.5, 5.75 ] }, - "south": { "texture": "#all", "uv": [ 1.5, 5.625, 3.0, 5.75 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 5.625, 4.5, 5.75 ] }, - "north": { "texture": "#all", "uv": [ 4.5, 5.625, 6.0, 5.75 ] }, - "up": { "texture": "#all", "uv": [ 1.5, 4.125, 3.0, 5.625 ] } + "west": { "texture": "#gobletbase3side", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#gobletbase3side", "uv": [ 2.0, 2.0, 14.0, 3.0 ] }, + "east": { "texture": "#gobletbase3side", "uv": [ 2.0, 4.0, 14.0, 5.0 ] }, + "north": { "texture": "#gobletbase3side", "uv": [ 2.0, 6.0, 14.0, 7.0 ] }, + "up": { "texture": "#gobletbase3top", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } } }, { @@ -43,10 +43,10 @@ "from": [ 5.0, 4.0, 5.0 ], "to": [ 11.0, 12.0, 11.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 8.5, 0.75, 9.25, 1.75 ] }, - "south": { "texture": "#all", "uv": [ 9.25, 0.75, 10.0, 1.75 ] }, - "east": { "texture": "#all", "uv": [ 10.0, 0.75, 10.75, 1.75 ] }, - "north": { "texture": "#all", "uv": [ 10.75, 0.75, 11.5, 1.75 ] } + "west": { "texture": "#gobletstandside", "uv": [ 2.0, 0.0, 14.0, 9.0 ] }, + "south": { "texture": "#gobletstandside", "uv": [ 2.0, 0.0, 14.0, 9.0 ] }, + "east": { "texture": "#gobletstandside", "uv": [ 2.0, 9.0, 14.0, 16.0 ] }, + "north": { "texture": "#gobletstandside", "uv": [ 2.0, 9.0, 14.0, 16.0 ] } } }, { @@ -54,11 +54,11 @@ "from": [ 4.0, 12.0, 4.0 ], "to": [ 12.0, 13.0, 12.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 9.0, 6.625, 10.0, 6.75 ] }, - "south": { "texture": "#all", "uv": [ 10.0, 6.625, 11.0, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 11.0, 6.625, 12.0, 6.75 ] }, - "north": { "texture": "#all", "uv": [ 12.0, 6.625, 13.0, 6.75 ] }, - "down": { "texture": "#all", "uv": [ 11.0, 5.625, 12.0, 6.625 ] } + "west": { "texture": "#kelkbaseside", "uv": [ 4.0, 0.0, 12.0, 1.0 ] }, + "south": { "texture": "#kelkbaseside", "uv": [ 4.0, 2.0, 12.0, 3.0 ] }, + "east": { "texture": "#kelkbaseside", "uv": [ 4.0, 4.0, 12.0, 5.0 ] }, + "north": { "texture": "#kelkbaseside", "uv": [ 4.0, 6.0, 12.0, 7.0 ] }, + "down": { "texture": "#kelkbasetopbottom", "uv": [ 9.0, 4.0, 16.0, 12.0 ] } } }, { @@ -66,12 +66,12 @@ "from": [ 3.0, 13.0, 3.0 ], "to": [ 13.0, 14.0, 13.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 9.0, 5.5, 10.25, 5.625 ] }, - "south": { "texture": "#all", "uv": [ 10.25, 5.5, 11.5, 5.625 ] }, - "east": { "texture": "#all", "uv": [ 11.5, 5.5, 12.75, 5.625 ] }, - "north": { "texture": "#all", "uv": [ 12.75, 5.5, 14.0, 5.625 ] }, - "up": { "texture": "#all", "uv": [ 10.25, 4.25, 11.5, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 11.5, 4.25, 12.75, 5.5 ] } + "west": { "texture": "#kelkbase2side", "uv": [ 3.0, 0.0, 13.0, 1.0 ] }, + "south": { "texture": "#kelkbase2side", "uv": [ 3.0, 2.0, 13.0, 3.0 ] }, + "east": { "texture": "#kelkbase2side", "uv": [ 3.0, 4.0, 13.0, 5.0 ] }, + "north": { "texture": "#kelkbase2side", "uv": [ 3.0, 6.0, 13.0, 7.0 ] }, + "up": { "texture": "#kelkbase2top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, + "down": { "texture": "#kelkbase2bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } } }, { @@ -79,12 +79,12 @@ "from": [ 3.0, 14.0, 2.0 ], "to": [ 13.0, 20.0, 3.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125 ] }, - "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, - "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, - "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, - "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, - "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } + "west": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, + "north": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, + "south": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, + "east": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, + "up": { "texture": "#kelkwall", "uv": [ 1.0, 0.0, 11.0, 1.0 ] }, + "down": { "texture": "#kelkwall", "uv": [ 1.0, 8.0, 11.0, 9.0 ] } } }, { @@ -92,12 +92,12 @@ "from": [ 3.0, 14.0, 13.0 ], "to": [ 13.0, 20.0, 14.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125] }, - "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, - "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, - "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, - "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, - "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } + "west": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, + "north": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, + "south": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, + "east": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, + "up": { "texture": "#kelkwall", "uv": [ 1.0, 0.0, 11.0, 1.0 ] }, + "down": { "texture": "#kelkwall", "uv": [ 1.0, 8.0, 11.0, 9.0 ] } } }, { @@ -105,12 +105,12 @@ "from": [ 2.0, 14.0, 3.0 ], "to": [ 3.0, 20.0, 13.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, - "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, - "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, - "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, - "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } + "north": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, + "west": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, + "east": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, + "south": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, + "up": { "texture": "#kelkwall", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, + "down": { "texture": "#kelkwall", "uv": [ 14.0, 0.0, 15.0, 11.0 ] } } }, { @@ -118,12 +118,12 @@ "from": [ 13.0, 14.0, 3.0 ], "to": [ 14.0, 20.0, 13.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, - "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, - "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, - "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, - "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } + "north": { "texture": "#kelkwall", "uv": [ 0.0, 1.0, 1.0, 7.0 ] }, + "west": { "texture": "#kelkwall", "uv": [ 1.0, 1.0, 11.0, 7.0 ] }, + "east": { "texture": "#kelkwall", "uv": [ 1.0, 9.0, 11.0, 15.0 ] }, + "south": { "texture": "#kelkwall", "uv": [ 11.0, 9.0, 12.0, 15.0 ] }, + "up": { "texture": "#kelkwall", "uv": [ 13.0, 0.0, 14.0, 11.0 ] }, + "down": { "texture": "#kelkwall", "uv": [ 14.0, 0.0, 15.0, 11.0 ] } } } ] From 103efe9c7bbee75c3aef886624ace1582f24ad4e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 12:54:02 -0600 Subject: [PATCH 221/935] Destitch cocoon texmap --- .../assets/botania/blockstates/cocoon.json | 7 ++++++- .../assets/botania/models/block/cocoon.json | 14 +++++++------- .../{altar.png => altar/default/original.png} | Bin .../desert/original.png} | Bin .../forest/original.png} | Bin .../fungal/original.png} | Bin .../{altarMeta7.png => altar/mesa/original.png} | Bin .../{altarMossy.png => altar/mossy/original.png} | Bin .../mountain/original.png} | Bin .../plains/original.png} | Bin .../{altarMeta4.png => altar/swamp/original.png} | Bin .../{altarMeta6.png => altar/taiga/original.png} | Bin .../assets/botania/textures/model/cocoon.png | Bin 1435 -> 0 bytes 13 files changed, 13 insertions(+), 8 deletions(-) rename src/main/resources/assets/botania/textures/model/{altar.png => altar/default/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta5.png => altar/desert/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta0.png => altar/forest/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta3.png => altar/fungal/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta7.png => altar/mesa/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMossy.png => altar/mossy/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta2.png => altar/mountain/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta1.png => altar/plains/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta4.png => altar/swamp/original.png} (100%) rename src/main/resources/assets/botania/textures/model/{altarMeta6.png => altar/taiga/original.png} (100%) delete mode 100644 src/main/resources/assets/botania/textures/model/cocoon.png diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json index 74599fbed..7d3170d3e 100644 --- a/src/main/resources/assets/botania/blockstates/cocoon.json +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -3,7 +3,12 @@ "defaults": { "model": "botania:cocoon", "textures": { - "all": "botania:model/cocoon" + "bottom": "botania:model/cocoon_bottom", + "top": "botania:model/cocoon_top", + "north": "botania:model/cocoon_north", + "south": "botania:model/cocoon_south", + "west": "botania:model/cocoon_west", + "east": "botania:model/cocoon_east" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json index ef26fab47..470827526 100644 --- a/src/main/resources/assets/botania/models/block/cocoon.json +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -1,6 +1,6 @@ { "textures": { - "particle": "#all" + "particle": "#west" }, "elements": [ { @@ -8,12 +8,12 @@ "from": [ 3.0, 0.0, 3.0 ], "to": [ 13.0, 14.0, 13.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 1.0, 0.0, 3.5, 3.5 ] }, - "north": { "texture": "#all", "uv": [ 3.5, 0.0, 6.0, 3.5 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 0.0, 8.5, 3.5 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 0.0, 11.0, 3.5 ] }, - "up": { "texture": "#all", "uv": [ 3.5, 3.5, 6.0, 6.0 ] }, - "down": { "texture": "#all", "uv": [ 6.0, 3.5, 8.5, 6.0 ], "cullface": "down" } + "west": { "texture": "#west", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "north": { "texture": "#north", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "south": { "texture": "#south", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "east": { "texture": "#east", "uv": [ 3.0, 1.0, 13.0, 15.0 ] }, + "up": { "texture": "#top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, + "down": { "texture": "#bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ], "cullface": "down" } } } ] diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar/default/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar.png rename to src/main/resources/assets/botania/textures/model/altar/default/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta5.png b/src/main/resources/assets/botania/textures/model/altar/desert/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta5.png rename to src/main/resources/assets/botania/textures/model/altar/desert/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta0.png b/src/main/resources/assets/botania/textures/model/altar/forest/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta0.png rename to src/main/resources/assets/botania/textures/model/altar/forest/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta3.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta7.png b/src/main/resources/assets/botania/textures/model/altar/mesa/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta7.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMossy.png b/src/main/resources/assets/botania/textures/model/altar/mossy/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMossy.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta1.png b/src/main/resources/assets/botania/textures/model/altar/plains/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta1.png rename to src/main/resources/assets/botania/textures/model/altar/plains/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta4.png b/src/main/resources/assets/botania/textures/model/altar/swamp/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta4.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/original.png diff --git a/src/main/resources/assets/botania/textures/model/altarMeta6.png b/src/main/resources/assets/botania/textures/model/altar/taiga/original.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altarMeta6.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/original.png diff --git a/src/main/resources/assets/botania/textures/model/cocoon.png b/src/main/resources/assets/botania/textures/model/cocoon.png deleted file mode 100644 index 0d13b347b0d980e65eee25705a917f36756c2fc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1435 zcmV;M1!Ve(P)(y;+bLW+bz zXamTML3tjTF^rCl=f|>?Mv~aXNziBJP62uFO8GqV-1Od70OYg!{IfB}WB_=cqBarP z^OKX)TXKN^KGbA+2VUS{&1AHqqM9qJuG+t(yA@=dLC|dQ!^!Xknl-yOWdCEH5vy zw76`~Ny)cXIxvwR(>-kik{Rp|M8vQb$M%0ME{{o)`anc*{+qAXp}ZUw1Bjw(>H0>J z0N5Fo;O;kQrF`4_^10J#69%Cz_u@09ooaEs>&xJ_8qn#q?Mt=JTVl0)Js*@B!SfVn zUpr@mXe0?*o02BTGFF?2XsvXZIax3Dwp5rTRVknEE?vYA1FJnkab}6Hd)B<9Vb5MG!AW8OvW=vOk?LPcTPvMyt8Y&dAnvZX9?LQ)!HEV) z@L>?zUKWMV3dbZcxn8JEM0WPYS+-Vk(RMJ=1^+@OyFKGKk`)NO>L|d)V{rjEV!4EwgNL`c)nB{+4_8i-8mH>zz9c@i&cv9sqp# z#n*PnsI}qr+-zyP8%0&S1-@5xJV*vk!0?eH96ui0Qf@VyOx5c|QI(4q=BdRoez+-o znK7igXA>s4Rei%@TW8QoJ z6DpO%eEiY7CB@$_4h(wZ%*+Wpi{oR*s2r}~1-Y6_OZ4yfl;?3oDTarK?Rl}<`^CT& zAiXPw<(;?Qzz+kmEG5-F`#%gqv^KUKKK$TKpzI~~lfe^UOzr_DD5eEGH?RK+~}SzIY06A%F8WmQR$04FBPy?9)G6{o`4PiE?&NL zZX-ET8JRJ5DJ Date: Wed, 13 Jan 2016 14:13:19 -0600 Subject: [PATCH 222/935] Add nag that this is unofficial right now --- .../java/vazkii/botania/common/Botania.java | 32 +++++++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 4 +++ 2 files changed, 36 insertions(+) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d530e089f..ae4180d54 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,17 @@ */ package vazkii.botania.common; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.event.ClickEvent; +import net.minecraft.event.HoverEvent; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChatStyle; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; @@ -63,7 +74,28 @@ public class Botania { lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); proxy.preInit(event); + MinecraftForge.EVENT_BUS.register(this); } + + @SubscribeEvent // todo temporary nag, remove when merging back into master + public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) { + EntityPlayer player = evt.player; + + IChatComponent message = new ChatComponentTranslation("botaniamisc.unofficial.nag"); + message.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED).setUnderlined(true)); + + IChatComponent message2 = new ChatComponentTranslation("botaniamisc.unofficial.report"); + message2.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)); + + IChatComponent url = new ChatComponentText("https://github.com/williewillus/Botania/issues"); + url.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); + url.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText("CLICK"))); + + player.addChatComponentMessage(message); + + player.addChatComponentMessage(message2.appendSibling(url)); + } + @EventHandler public void init(FMLInitializationEvent event) { proxy.init(event); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 80b174f38..5c918ca5e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -6,6 +6,10 @@ generator.botania-skyblock.info=Not recommended for botania newcomers # Something that is not localized, translators, do NOT change this line. botaniamisc.noloc=botaniamisc.noloc +# todo 1.8 remove when merging into master +botaniamisc.unofficial.nag=WARNING !!!!! This port of Botania is UNOFFICIAL! Do NOT report bugs to Vazkii!!! +botaniamisc.unofficial.report=Report issues to the porter HERE: + botaniamisc.nextPage=Next Page botaniamisc.prevPage=Previous Page botaniamisc.back=Back From b01e9dfed790ca654d5374d0704e177d6b76d588 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jan 2016 17:14:12 -0600 Subject: [PATCH 223/935] Staging changes would be a good idea. Also fix possible potion crash --- .../item/equipment/bauble/ItemBloodPendant.java | 5 ++++- .../model/altar/default/gobletBase2_bottom.png | Bin 0 -> 652 bytes .../model/altar/default/gobletBase2_sides.png | Bin 0 -> 176 bytes .../model/altar/default/gobletBase2_top.png | Bin 0 -> 652 bytes .../model/altar/default/gobletBase3_bottom.png | Bin 0 -> 519 bytes .../model/altar/default/gobletBase3_sides.png | Bin 0 -> 149 bytes .../model/altar/default/gobletBase3_top.png | Bin 0 -> 519 bytes .../model/altar/default/gobletBase_bottom.png | Bin 0 -> 738 bytes .../model/altar/default/gobletBase_sides.png | Bin 0 -> 191 bytes .../model/altar/default/gobletBase_top.png | Bin 0 -> 738 bytes .../model/altar/default/gobletStand_sides.png | Bin 0 -> 252 bytes .../altar/default/gobletStand_top_bottom.png | Bin 0 -> 246 bytes .../model/altar/default/kelkBase2_bottom.png | Bin 0 -> 415 bytes .../model/altar/default/kelkBase2_sides.png | Bin 0 -> 245 bytes .../model/altar/default/kelkBase2_top.png | Bin 0 -> 346 bytes .../model/altar/default/kelkBase_sides.png | Bin 0 -> 230 bytes .../model/altar/default/kelkBase_top_bottom.png | Bin 0 -> 265 bytes .../textures/model/altar/default/kelkWall.png | Bin 0 -> 481 bytes .../botania/textures/model/cocoon_bottom.png | Bin 0 -> 317 bytes .../assets/botania/textures/model/cocoon_east.png | Bin 0 -> 420 bytes .../botania/textures/model/cocoon_north.png | Bin 0 -> 417 bytes .../botania/textures/model/cocoon_south.png | Bin 0 -> 370 bytes .../assets/botania/textures/model/cocoon_top.png | Bin 0 -> 382 bytes .../assets/botania/textures/model/cocoon_west.png | Bin 0 -> 461 bytes 24 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_east.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_north.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_south.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_top.png create mode 100644 src/main/resources/assets/botania/textures/model/cocoon_west.png 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 85f21e032..1b4dd68b5 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 @@ -28,6 +28,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; +import net.minecraftforge.fml.common.registry.GameData; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -141,7 +143,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || Potion.potionTypes[brew.getPotionEffects(stack).get(0).getPotionID()].isInstant()) + FMLControlledNamespacedRegistry potionRegistry = GameData.getPotionRegistry(); + if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || potionRegistry.getObjectById(brew.getPotionEffects(stack).get(0).getPotionID()).isInstant()) return null; ItemStack brewStack = new ItemStack(this); diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a1d26adced0724b65ce90bf0259de29f87c3db GIT binary patch literal 652 zcmV;70(1R|P){a>-8Gn_Yp#{+wB0b zZJQ)XkWyld;qmcNH~>{u;rl+G=P{ejNRkB0vbedq!EqdX-={1~k|aS0!FW98_4O41 z2jJ`L3)gk2>zbk{Xxo;yZFzfpBZ?vxiv_lAGnq`Ns*2TWMZez%zyh!=iztfd_xotA zaU2K7acG(br4+qhkNf+3_WM0QKR@`sfAGKoh~pT5?RHBX$2>njBZQ#S>EL-DT5D#r z8F`*#j3EdDMx)UYu-R-V%aR}nP)ZR5!QY|du-$HvQj(@ARaN1-E=|*LcXxM`uvjcm zN^yRE&SWy-;^G1+CDZ8?+qMCaQes&a0Iut@TrQ7*UyXU5qm()r`ttI^U@#z#W4hfg zuIplqK}tzgRYwV0Yo4B-I6XZj&vV}2-!aC}wk?CffcbpR+1VM!n1g}i@%Xrb)|%mP z$j8SAtJMl)48|CWqM+C75r!dYn$qcX5JGT!drOvOM*zUd$qCoj*VJ{5ZQBSTFvj3{ z9+#JwOsCUBbWPJ7dh4Gt?)Q6!!y#?k0^s{TN-37hC0Ujch9LlHnj(Za0_O8MN-2^g zL2FGA1YBKRA*JN=^OLHoD9aMZaR|eZ&1OSg*GIsw#`SuQZQIzkjnexu196!e&naDu)u-rW)nb3VsJ?)!c3w_@{@OMiCR9IGhOd^*9gr*PdralxqU-)#2w4C3D= WII~{6P;wb)C4;A{pUXO@geCyT=sq0) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a1d26adced0724b65ce90bf0259de29f87c3db GIT binary patch literal 652 zcmV;70(1R|P){a>-8Gn_Yp#{+wB0b zZJQ)XkWyld;qmcNH~>{u;rl+G=P{ejNRkB0vbedq!EqdX-={1~k|aS0!FW98_4O41 z2jJ`L3)gk2>zbk{Xxo;yZFzfpBZ?vxiv_lAGnq`Ns*2TWMZez%zyh!=iztfd_xotA zaU2K7acG(br4+qhkNf+3_WM0QKR@`sfAGKoh~pT5?RHBX$2>njBZQ#S>EL-DT5D#r z8F`*#j3EdDMx)UYu-R-V%aR}nP)ZR5!QY|du-$HvQj(@ARaN1-E=|*LcXxM`uvjcm zN^yRE&SWy-;^G1+CDZ8?+qMCaQes&a0Iut@TrQ7*UyXU5qm()r`ttI^U@#z#W4hfg zuIplqK}tzgRYwV0Yo4B-I6XZj&vV}2-!aC}wk?CffcbpR+1VM!n1g}i@%Xrb)|%mP z$j8SAtJMl)48|CWqM+C75r!dYn$qcX5JGT!drOvOM*zUd$qCoj*VJ{5ZQBSTFvj3{ z9+#JwOsCUBbWPJ7dh4Gt?)Q6!!y#?k0^s{TN-37hC0Ujch9LlHnj(Za0_O8MN-2^g zL2FGA1YBKRA*JN=^OLHoD9aMZaR|eZ&1OSg*GIsw#`SuQZQIzkjnHol#odLD-{%B zRL#41qItY7;5n<4$>cNV{09EIly}qb_oc4u+-^5CO(TjTy4@~85MY`nK@gy68m(3f zAq0cLKmkzSfU2t0>vgWzE4$qeAq1n*2-~&^!w}oH>GgWVam@LAPAAB`8_)9qNRot1 z=I8kNd}0^|hG7uLF~i{yDJ8z|e*>4xh5P-E=Xp%0QxruZpU<;cEObzL?Esc|0D> zW;2S#B2r3(5F|;0X`0_ak|d1BV@jnG$K#RJYK4@N*Xu>GSR|9l&}=pdg5V=W^*7)+ z4(s)r{eF*>5-BB76k*#og+hVtc1u2=M^Th-0Kj!!YPA}V#{*5%P!t6zC5B;8tyXEb z+x%ZC@cza)j&U4^*Xsp9E|((=Lzc@Whr@wFq3{8u8B8Vm1VwxtFWpTURJ~H_G`UfI`&Jo$%TJ!(_002ov JPDHLkV1id#?2`Zh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..f12545dff7e6bcffb0544cfbb536daacc902a12b GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfHol#odLD-{%B zRL#41qItY7;5n<4$>cNV{09EIly}qb_oc4u+-^5CO(TjTy4@~85MY`nK@gy68m(3f zAq0cLKmkzSfU2t0>vgWzE4$qeAq1n*2-~&^!w}oH>GgWVam@LAPAAB`8_)9qNRot1 z=I8kNd}0^|hG7uLF~i{yDJ8z|e*>4xh5P-E=Xp%0QxruZpU<;cEObzL?Esc|0D> zW;2S#B2r3(5F|;0X`0_ak|d1BV@jnG$K#RJYK4@N*Xu>GSR|9l&}=pdg5V=W^*7)+ z4(s)r{eF*>5-BB76k*#og+hVtc1u2=M^Th-0Kj!!YPA}V#{*5%P!t6zC5B;8tyXEb z+x%ZC@cza)j&U4^*Xsp9E|((=Lzc@Whr@wFq3{8u8B8Vm1VwxtFWpTURJ~H_G`UfI`&Jo$%TJ!(_002ov JPDHLkV1id#?2`Zh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f5269c16bf7ee183180f305b6fcec889383dd3a3 GIT binary patch literal 738 zcmV<80v-K{P)QR6wJ!P!SBljSDaEy9sa1jR^}Pi9exG z%1;GaPS5!khR$-{yu5Hao!ISmWupClkLP(f!{M-ObUGb|!y!s3gb?g@JBp&< z?d=V%HS6^nV+{3r9ox16aMCp8csx?C*O^YID5d@c$3ZED>$#yI8Z?jOB94&CLy?(THxhi|e|K$K#UHYPJ4OW?2BG$z(FY@qM4Crzbu?KTBes z=S-(ln$0HNZWn-Btwxq*6h(pSy7<12loIDWW4qmEyI!2Fp6BuK@IacTbUK|sgLb>k&(9B=%?4u(#u&ESExle3DJ4-9;dvg_YL&;wM;40( zo6UyZZijWA@&5jvJkPOh8zBV77%G(tyGl!HCk(uB%xZZ0#K<` zkW!MSDYk7Bh9O}X;xrl!qA22cJR+q8D4)u*ENZnH^?IGd;ZQ!+d_Ko@U7{%BKe>8n Usm|ce^8f$<07*qoM6N<$g5sH4!vFvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1dd433c25fc30b81fb67403b49fce34d9e49da GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfxA)^&6flPBRXz!BJU{;Z_bo|tuWBI8?`0T4b#g@dit;Kw+xRQDH zd=Ch{^HE7jq4SGyLCkRkM#To1A`{@7fG>0fVQjpUXO@geCxQR6wJ!P!SBljSDaEy9sa1jR^}Pi9exG z%1;GaPS5!khR$-{yu5Hao!ISmWupClkLP(f!{M-ObUGb|!y!s3gb?g@JBp&< z?d=V%HS6^nV+{3r9ox16aMCp8csx?C*O^YID5d@c$3ZED>$#yI8Z?jOB94&CLy?(THxhi|e|K$K#UHYPJ4OW?2BG$z(FY@qM4Crzbu?KTBes z=S-(ln$0HNZWn-Btwxq*6h(pSy7<12loIDWW4qmEyI!2Fp6BuK@IacTbUK|sgLb>k&(9B=%?4u(#u&ESExle3DJ4-9;dvg_YL&;wM;40( zo6UyZZijWA@&5jvJkPOh8zBV77%G(tyGl!HCk(uB%xZZ0#K<` zkW!MSDYk7Bh9O}X;xrl!qA22cJR+q8D4)u*ENZnH^?IGd;ZQ!+d_Ko@U7{%BKe>8n Usm|ce^8f$<07*qoM6N<$g5sH4!vFvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..4bd0ec9bebc29728d1f415dd534b3cf5336b6138 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfb&-zp?G?v&ytc zv7{cK%SU#tJ0kJ3`~B~C3^igE?=8<8PhT=+$GX+0-tU_;LsF52!KGzc=8NC^PH{VW zb$%~67h0)UA-gp>89)>QGP@QED;eaiQKpSMw0WO3r?;5ckhAj7^Y>S?Qk%e%S7 zi)RAW2ZWyKS@$~N>hB8EfA0k!erLb`m7SlZ=%djkc7|Y}^BFu{{an^LB{Ts530!Ef literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..21357a3ebdb58e671156d4667572d36d9148ea2d GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfW)#>ldOGRq$ rPgddlY!fWP8kN0CXZIKW`X|i$r$#HCeh@en=x_#4S3j3^P6Z@L2m&n2qSNUx7z`+i0^j#P3_bv+X>vZF5kin<8F`*F91a0E z91ch+snu#90P(w1k|cPZ$L)5*bzOoWAdX`k$3bh2l(HP~d_HNn+e{`CDwPUR6rq%2 zyh(IkUauVR{^K}~X*3%6zE6@QOs7+lB;j;A{jvDx`39`Bpg-**;|2f#002ov JPDHLkV1h*hw!{Dc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..0b1c547a0b3e677a3f7fc8554d72094a583ae280 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyUwr!^i6?xyhobRi5I_KRDwKtZn6LUM?cLO3lo)e*3QLbN4gb#2uP^|ECMr z+=qSh94!@C{4fJqU%xMG{#v3V)jV0G%F@I%PHST)?-mm&DTT{zu!{DOe!YXgFE)(c(22WQ%mvv4FO#tMsTKE6} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c1931da93cb8c334f0925c87c4c41187ab93c51c GIT binary patch literal 346 zcmV-g0j2(lP)!kR%D~^_sSAxm+$djzdut2q92P5k*m- z6GOo3^%{laIHs;^G)-f%SfG?*Hk*wad=HJT>sXe>@puH_`FsNKcsu}DtyV}WrvU&$ zh(26ZRsV0ACQ?ca!3Y2qhT(YO&}=rF_d*{!pU=|`48vf#T#}~g zXvnth{sg7eG$7A&ilP91Z|>B+-@_k(Zpin2s;c62IsvfVZYj$W0M~V=0r&eIfWzUy sd_KqXJhCj~cDu3L?P!{&2mK@c00SUq1%}@Rj{pDw07*qoM6N<$g6jE|hyVZp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..82a9d99a62b4ec2987d343397366e82930b308ce GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfP7nbN$-BWIe&8Xj}5Ww zp4_Tf!j<_*NHe~r==g1p$xB3j`qk#uefnxPJKgAlvl6fQdyZRzq0vV3mhkLNueT_R znXpzoC{||KMh#_`%Toe0-wgS2iB(I=+*=(NseAakhV<-QVpC ct}|CK?>Dk!ow_qJ3+PY=Pgg&ebxsLQ0LD*VLI3~& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..163b2b90a4f834100653d094c1884ee967474e3f GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfKaSXBO zeS6W6tHnT|^`X5WZw8as0k{4KqI(*a-!i@x$r&cbCFHHT`>0bwx9{e+e&#iYlV>#6 zcP2{AV|ZR!*I@W;@&9K+39;d8wt8q@j7siVsL^F0Q+)CJ-_4m)pKRPUTLqZj+dj6K zq{7KyIGy42rU}b5b8jd0JlvPRW@}>e4DW_r>+WX;O-hxF%Klc%&j?g=&T`%BqdbHtya|Qb;2-2RaH#W#P@wl(lkZWGyt^o`HYm3 zX0yrhc*OHOOw**(>Co%-csw3#HXE`mdj&`-F%07wP^naiq6k%0xm+&XZa4b$>dsdx9W9N=dC&!}on=v)Kbc z*L5t*dT;Ql2U1D^gb=h^t#`nu9z;@U8Tj*c(*L|}Up|^991Jxv0x+IT0XV<7>U5{cU=!G^ z*Jx98z1>?4fH67Z1#4%Cd13%iI)}=0>iQjPX9V$-&M}@$8KOHd*dqt=Y{a8Yfp}?Y zs*20SBAFe17w)PG@j~ewPpfAhm#a=ZRHLD$DGVylIa7)(%K%yuiN_;|M6_vT6ZLVB&%`y!J P00000NkvXXu0mjfPFjP) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/cocoon_east.png b/src/main/resources/assets/botania/textures/model/cocoon_east.png new file mode 100644 index 0000000000000000000000000000000000000000..cf7d849a73fab1419519dd0ecd0850aac6b30e0e GIT binary patch literal 420 zcmV;V0bBlwP)W7!dhYbKEaSV?X3eM#lvq3oUL5gsB zeJg#PI>2#VaLxdL#p_ZU7w;c1#!5|H$J>?)&XJ~T6!r&cx&{E;-`z;F<9Lnw&NiTu z=k)OT^$h@+&mufOO<;{_)wLXiS|ijNoHMQz$^Cp5A&F!8#hrk+C_<=pS;z(nG8kjw zx=!he6sQJm0Ya^7E}G6bXON=(Ay!56Sp*_irUGTS1?MtkCtx_dz;rT3IPj6IvJ%Q= za6~RVQu{NowvYg;hDymQgGUO!A2a}sXSBwEbC&7VCMK&4L~bjtV}z4uF)x1A+PqoV7k9 zK!1?p&%9lhyqxFI-oBMW?*%9oqg2c^O?RA1Ey_x20YMPrTtPQUn5HSqdA_4b z95?)A_5wavAASneT`066lo5qCG~22kP+cS$NpE+PZ40jQwinRp^l+}&I$P^A=Xr*V zB!Liz0khcz!1vi7B%C(Rajw8wi?bG`;(9>&St=a};e!Jq_?PnoSC6oS{17XO00000 LNkvXXu0mjfYG$*V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/cocoon_south.png b/src/main/resources/assets/botania/textures/model/cocoon_south.png new file mode 100644 index 0000000000000000000000000000000000000000..3ec44e52833d1a7335fca11279449c3f24e6e756 GIT binary patch literal 370 zcmV-&0ge8NP)#s!eL!&Y>lu%h3e z+`x%_0w^L|@n#hv?W-n^=hM75hBI|B{&;_T{q0SMF%}UGKq4uUO4L+8zl6Ta@sIWT zBf97zrZWKarlTm!=uQNv>xZE+6_g&DowX>fan`b0-A*h-06+e>{XuI5K(WjKxLRD} zTt5%+%JW62vn(GbaXm^U^MISG3bnJA{cgvmX-Fgu=f{CYfKAhc4J49IHsHhj*92Zl zCBgft93nv59@uYN?(Qp0XOL8a6&T)x&*UUPQlXbFH0-x6Fl@rtZY~3WqAY{gad^ct zBg^v1CL+MsXM>0iS@`kCpkqaV$EO-+Ep2;F_?d>1nUp|AMM))&Sd~dDF8S=IwVjb&ShjK z_2*)MwWv_R2524mxex*MI7WzIKJjb>Atgde51T&baL~u32IsQhBM1@TTsHX!b8b^` cezSj4UpBIB_(8-eFaQ7m07*qoM6N<$f=%_EhX4Qo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/cocoon_west.png b/src/main/resources/assets/botania/textures/model/cocoon_west.png new file mode 100644 index 0000000000000000000000000000000000000000..06edf85a5a76ba4d4e36a1a12a19527504aba2b1 GIT binary patch literal 461 zcmV;;0W$uHP)v{6(XBC+b^)Ndf-XYp%^Ai9a- zpHv+LLE9#zuD<+nYzH0E#s&-ydbY>qo_Ef<_rf1BG5)x_KK~TLpce+{NCTiuRcKhO zF0r!a=6zG+#WYDcJ3R+rduNN=8;=e?N=X3fwoRJG1;PS>kP@XN7ndFvSGO$8&jApG zZy2IN>){D^bEBL9z)&XZt2RlJ0wATJzHH@n$8mw9astb$0nmB%vka6Z))9s>QKq67 z2IUIUBmp4S5kdIIyN($22LSX3eI_O+nVFs`Cs?d5Wxu!E0L&`$+nT80HXIzs<@n_6 zXM%Bg&E_7lj?g+mDT$#>EUWhW6nwv%+t50*)OvUts(3_7@p}fwP9pIqf>D^I z1Uk~hI-=VRiPH}ZQOU>Mj;*??gP-+ZI-O^Fra(S z1E5x`Qn&5=E_}aBtfO)ZkOet{q0GWj2`OQ?X#a*U+BKWdoc4pf00000NkvXXu0mjf D Date: Thu, 14 Jan 2016 11:54:08 -0600 Subject: [PATCH 224/935] No longer use the raw potion array, use potio registry --- .../common/block/tile/TileIncensePlate.java | 5 +++-- .../vazkii/botania/common/brew/BrewModPotion.java | 4 ++-- .../java/vazkii/botania/common/brew/ModBrews.java | 3 ++- .../vazkii/botania/common/brew/ModPotions.java | 4 ++-- .../botania/common/core/handler/ConfigHandler.java | 14 +++++++------- .../botania/common/entity/EntityDoppleganger.java | 3 ++- .../botania/common/item/brew/ItemBrewBase.java | 5 +++-- .../botania/common/item/brew/ItemIncenseStick.java | 5 +++-- .../item/equipment/bauble/ItemBloodPendant.java | 4 ++-- 9 files changed, 26 insertions(+), 21 deletions(-) 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 6e9ea916b..debde0414 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -22,6 +22,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -52,8 +53,8 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven if(!worldObj.isRemote) { 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(Potion.potionTypes[effect.getPotionID()]); - boolean nightVision = effect.getPotionID() == Potion.nightVision.id; + PotionEffect currentEffect = player.getActivePotionEffect(GameData.getPotionRegistry().getObjectById(effect.getPotionID())); + boolean nightVision = effect.getPotionID() == Potion.nightVision.getId(); if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); diff --git a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java index 3ec9f03bf..878ec1bbb 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java +++ b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.brew; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraftforge.fml.common.registry.GameData; public class BrewModPotion extends BrewMod { public BrewModPotion(String key, int cost, PotionEffect... effects) { - super(key, Potion.potionTypes[effects[0].getPotionID()].getLiquidColor(), cost, effects); + super(key, GameData.getPotionRegistry().getObjectById(effects[0].getPotionID()).getLiquidColor(), cost, effects); } } diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 5e937e667..0d6cc9d86 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -12,6 +12,7 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; @@ -67,7 +68,7 @@ public class ModBrews { public static void initTC() { Potion warpWardPotion = null; - for(Potion potion : Potion.potionTypes) + for(Potion potion : GameData.getPotionRegistry().typeSafeIterable()) if(potion != null && potion.getName().equals("potion.warpward")) { warpWardPotion = potion; break; diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 36c720875..e9cd3d67f 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -31,8 +31,8 @@ public class ModPotions { public static Potion clear; public static void init() { - if(Potion.potionTypes.length < 256) - extendPotionArray(); +// if(Potion.potionTypes.length < 256) +// extendPotionArray(); todo 1.8 this should be unnecessary thanks to potion registry soulCross = new PotionSoulCross(); featherfeet = new PotionFeatherfeet(); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index cd4120160..513378357 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -101,7 +101,7 @@ public final class ConfigHandler { public static int mushroomQuantity = 40; private static boolean verifiedPotionArray = false; - private static int potionArrayLimit = 0; + private static int potionArrayLimit = 0; // todo 1.8 potion things should be unneeded thanks to potion registry public static int potionIDSoulCross = 91; public static int potionIDFeatherfeet = 92; @@ -282,12 +282,12 @@ public final class ConfigHandler { desc = "The quantity of Botania mushrooms to generate underground, in the world, defaults to 40, the lower the number the less patches generate."; mushroomQuantity = loadPropInt("worldgen.mushroom.quantity", desc, mushroomQuantity); - potionIDSoulCross = loadPropPotionId(LibPotionNames.SOUL_CROSS, potionIDSoulCross); - potionIDFeatherfeet = loadPropPotionId(LibPotionNames.FEATHER_FEET, potionIDFeatherfeet); - potionIDEmptiness = loadPropPotionId(LibPotionNames.EMPTINESS, potionIDEmptiness); - potionIDBloodthirst = loadPropPotionId(LibPotionNames.BLOODTHIRST, potionIDBloodthirst); - potionIDAllure = loadPropPotionId(LibPotionNames.ALLURE, potionIDAllure); - potionIDClear = loadPropPotionId(LibPotionNames.CLEAR, potionIDClear); +// potionIDSoulCross = loadPropPotionId(LibPotionNames.SOUL_CROSS, potionIDSoulCross); todo 1.8 should be unneeded thanks to potion registry +// potionIDFeatherfeet = loadPropPotionId(LibPotionNames.FEATHER_FEET, potionIDFeatherfeet); +// potionIDEmptiness = loadPropPotionId(LibPotionNames.EMPTINESS, potionIDEmptiness); +// potionIDBloodthirst = loadPropPotionId(LibPotionNames.BLOODTHIRST, potionIDBloodthirst); +// potionIDAllure = loadPropPotionId(LibPotionNames.ALLURE, potionIDAllure); +// potionIDClear = loadPropPotionId(LibPotionNames.CLEAR, potionIDClear); if(config.hasChanged()) config.save(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 8dc9e8146..a73de32f3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -49,6 +49,7 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.common.registry.GameData; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBossWithShader; @@ -578,7 +579,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi List remove = new ArrayList(); Collection active = player.getActivePotionEffects(); for(PotionEffect effect : active) - if(effect.getDuration() < 200 && effect.getIsAmbient() && !ReflectionHelper.getPrivateValue(Potion.class, Potion.potionTypes[effect.getPotionID()], LibObfuscation.IS_BAD_EFFECT)) + if(effect.getDuration() < 200 && effect.getIsAmbient() && !GameData.getPotionRegistry().getObjectById(effect.getPotionID()).isBadEffect()) remove.add(effect); active.removeAll(remove); 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 4da725da3..c320af626 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -25,6 +25,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; @@ -78,7 +79,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { PotionEffect newEffect = new PotionEffect(effect.getPotionID(), effect.getDuration(), effect.getAmplifier(), true, true); - Potion potion = Potion.potionTypes[newEffect.getPotionID()]; + Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); if(potion.isInstant()) potion.affectEntity(player, player, player, newEffect.getAmplifier(), 1F); else player.addPotionEffect(newEffect); @@ -137,7 +138,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = Potion.potionTypes[effect.getPotionID()]; + Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 29f1166f8..586fe4af1 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -21,6 +21,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -79,7 +80,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = Potion.potionTypes[effect.getPotionID()]; + Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); @@ -106,7 +107,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - if(!brew.canInfuseIncense() || brew.getPotionEffects(stack).size() != 1 || Potion.potionTypes[brew.getPotionEffects(stack).get(0).getPotionID()].isInstant()) + if(!brew.canInfuseIncense() || brew.getPotionEffects(stack).size() != 1 || GameData.getPotionRegistry().getObjectById(brew.getPotionEffects(stack).get(0).getPotionID()).isInstant()) return null; ItemStack brewStack = new ItemStack(this); 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 1b4dd68b5..9b4cef1b0 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 @@ -94,7 +94,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = Potion.potionTypes[effect.getPotionID()]; + Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); } @@ -114,7 +114,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; boolean doRand = cost < 1; if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { - PotionEffect currentEffect = player.getActivePotionEffect(Potion.potionTypes[effect.getPotionID()]); + PotionEffect currentEffect = player.getActivePotionEffect(GameData.getPotionRegistry().getObjectById(effect.getPotionID())); boolean nightVision = effect.getPotionID() == Potion.nightVision.id; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); From dcb236607debd92d1506259bce7266509d2ab5ff Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 12:08:57 -0600 Subject: [PATCH 225/935] Fix hopperhock placing items one block too far away. Closes #39 --- .../common/block/subtile/functional/SubTileHopperhock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 6f9167c8e..0badf4ac3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -88,7 +88,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), pos_, dir); + IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), pos_); if(inv != null) { List filter = getFilterForInventory(inv, pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); From 3818d2879db31e9b2f10746052f1d70a59fcb1d0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 16:47:48 -0600 Subject: [PATCH 226/935] no longer register gaia tesr onto vanilla skulls --- src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java | 2 -- 1 file changed, 2 deletions(-) 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 de5885f60..d9f353f48 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -256,8 +256,6 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); - RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); From 300b1926ded3eed8e1d10a3cc1b8b25d3cef8e00 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 17:20:05 -0600 Subject: [PATCH 227/935] Possible fix for #38 --- src/main/java/vazkii/botania/client/fx/FXSparkle.java | 1 + src/main/java/vazkii/botania/client/fx/FXWisp.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 4e867bc1a..bd00169f5 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -53,6 +53,7 @@ public class FXSparkle extends EntityFX { particleRed = red; particleGreen = green; particleBlue = blue; + particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; motionX = motionY = motionZ = 0; particleScale *= size; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 89b68a463..6c111d567 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -50,6 +50,7 @@ public class FXWisp extends EntityFX { particleRed = red; particleGreen = green; particleBlue = blue; + particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; motionX = motionY = motionZ = 0; particleScale *= size; From 4a4e583aa88771034092755110c94ca1d8e0a9ed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 21:53:18 -0600 Subject: [PATCH 228/935] Fix wonky petal apothecary collision --- .../java/vazkii/botania/common/block/BlockAltar.java | 10 +++++----- .../vazkii/botania/common/block/tile/TileAltar.java | 3 +-- .../java/vazkii/botania/common/block/tile/TileMod.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 0ec470fb1..adc996135 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -74,17 +74,17 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { @Override public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { - if (collidingEntity instanceof EntityItem) { - float f = 1F / 16F * 2F; + //if (collidingEntity instanceof EntityItem) { + /*float f = 1F / 16F * 2F; // Todo 1.8 temporary hack to let items collide from the top. Figure out what changed to break this. setBlockBounds(f, f, f, 1F - f, 0.65F, 1F -f); super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); - return; - } else { + return;*/ + //} else { super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); - } + //} } @Override 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 7c2d27a07..ace0f4a03 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -227,10 +227,9 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I @Override public void updateEntity() { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 21D,1))); + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); boolean didChange = false; - for(EntityItem item : items) didChange = collideEntityItem(item) || didChange; 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 510a4d848..7d0074d6c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -64,7 +64,7 @@ public class TileMod extends TileEntity implements ITickable { @Override public final void update() { - if (worldObj.isBlockLoaded(getPos(), false)) { + if (!isInvalid() && worldObj.isBlockLoaded(getPos(), false)) { updateEntity(); } else { System.out.println("Skipping a tick because our chunk unloaded"); From 98e28a09672b4f19a19dcc6fd91664a5f4430325 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 22:44:50 -0600 Subject: [PATCH 229/935] Made some things one sided only --- .../common/block/tile/TileCraftCrate.java | 5 ++++- .../botania/common/block/tile/TileEnderEye.java | 9 +++++++-- .../botania/common/block/tile/TileForestEye.java | 2 ++ .../botania/common/block/tile/TileHourglass.java | 6 ++++-- .../botania/common/block/tile/TileManaFlame.java | 2 +- .../botania/common/block/tile/TileOpenCrate.java | 6 ++++-- .../common/block/tile/TileTeruTeruBozu.java | 3 +++ .../common/block/tile/mana/TileBellows.java | 6 +++--- .../common/block/tile/mana/TileManaDetector.java | 16 +++++++--------- .../common/block/tile/mana/TileTurntable.java | 3 +++ 10 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 0a0bd8129..59ea029c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -92,7 +92,10 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void updateEntity() { - if(!worldObj.isRemote && (craft(true) && canEject() || isFull())) + if (worldObj.isRemote) + return; + + if(craft(true) && canEject() || isFull()) ejectAll(); int newSignal = 0; 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 76ef55b68..b7a17df7e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import java.util.List; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -20,6 +21,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -28,6 +30,9 @@ public class TileEnderEye extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); @@ -52,8 +57,8 @@ public class TileEnderEye extends TileMod { double x = getPos().getX() - 0.1 + Math.random() * 1.2; double y = getPos().getY() - 0.1 + Math.random() * 1.2; double z = getPos().getZ() - 0.1 + Math.random() * 1.2; - - worldObj.spawnParticle(EnumParticleTypes.REDSTONE, x, y, z, 1, 0, 0); + + ((WorldServer) worldObj).spawnParticle(EnumParticleTypes.REDSTONE, false, x, y, z, 0, 1.0D, 0.0D, 0.0D, 1.0D); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 4e15d11d3..a2bdc8658 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -20,6 +20,8 @@ public class TileForestEye extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; int range = 6; int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { 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 12288692b..2456219c3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -52,8 +52,10 @@ public class TileHourglass extends TileSimpleInventory { time = 0; flip = !flip; flipTicks = 4; - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); + if (!worldObj.isRemote) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); + } } timeFraction = (float) time / (float) totalTime; } else { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 20fe601f1..263d43cc9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -35,7 +35,7 @@ public class TileManaFlame extends TileMod { public void updateEntity() { float c = 0.3F; - if(Math.random() < c) { + if(worldObj.isRemote && Math.random() < c) { float v = 0.1F; float r = (float) (color >> 16 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index cb806a9e1..fca46222d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -42,6 +42,9 @@ public class TileOpenCrate extends TileSimpleInventory { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); @@ -73,8 +76,7 @@ public class TileOpenCrate extends TileSimpleInventory { ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, -200, LibObfuscation.AGE); setInventorySlotContents(0, null); - if(!worldObj.isRemote) - worldObj.spawnEntityInWorld(item); + worldObj.spawnEntityInWorld(item); } public boolean onWanded(EntityPlayer player, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 5657c5e40..afed2e16b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -16,6 +16,9 @@ public class TileTeruTeruBozu extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean isRaining = worldObj.isRaining(); if(isRaining && worldObj.rand.nextInt(9600) == 0) worldObj.getWorldInfo().setRaining(false); 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 36abd8cfa..ac5c251b0 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 @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; @@ -115,9 +116,8 @@ public class TileBellows extends TileMod { } public TileEntity getLinkedTile() { - return null; -// EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS)); -// return worldObj.getTileEntity(getPos().offset(side)); + EnumFacing side = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); + return worldObj.getTileEntity(getPos().offset(side)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index d583364a6..3f7780184 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -25,16 +25,14 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost { @Override public void updateEntity() { - if(!worldObj.isRemote) { - boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); - boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; - if(state != expectedState) - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; + if(state != expectedState && !worldObj.isRemote) + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); - if(expectedState) - for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); - } + if(expectedState) + for(int i = 0; i < 4; i++) + Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 20f095d1d..a4230ff83 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -36,6 +36,9 @@ public class TileTurntable extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { From bee13337add75ccf7daa95a4af0f2e2ae6de79fe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 10:56:23 -0600 Subject: [PATCH 230/935] Made laputa shard save string block id's instead of integer id's. Also, a possible fix for #40 --- .../botania/common/block/BlockAltar.java | 15 ------------- .../block/tile/mana/TileDistributor.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 22 ++++++++++++++----- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index adc996135..44b4f3350 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -72,21 +72,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { ); } - @Override - public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { - //if (collidingEntity instanceof EntityItem) { - /*float f = 1F / 16F * 2F; - - // Todo 1.8 temporary hack to let items collide from the top. Figure out what changed to break this. - setBlockBounds(f, f, f, 1F - f, 0.65F, 1F -f); - super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); - setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); - return;*/ - //} else { - super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); - //} - } - @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index e26e0fa52..7ba44a24e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -31,7 +31,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { validPools.clear(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); - if(tileAt != null && tileAt instanceof IManaPool) { + if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { IManaReceiver receiver = (IManaReceiver) tileAt; if(!receiver.isFull()) validPools.add(receiver); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index e12cbd007..70fbde749 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -18,12 +18,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; @@ -38,6 +40,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { private static final String TAG_BLOCK = "_block"; + private static final String TAG_BLOCK_NAME = "_blockname"; private static final String TAG_META = "_meta"; private static final String TAG_TILE = "_tile"; private static final String TAG_X = "_x"; @@ -72,7 +75,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { - if(pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { + if(!par3World.isRemote && pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { par3World.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false); spawnBurstFirst(par3World, pos, par1ItemStack); par1ItemStack.stackSize--; @@ -130,7 +133,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet world.playAuxSFX(2001, pos_, Block.getStateId(state)); ItemStack copyLens = new ItemStack(this, 1, lens.getItemDamage()); - ItemNBTHelper.setInt(copyLens, TAG_BLOCK, id); + ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, GameData.getBlockRegistry().getNameForObject(block).toString()); ItemNBTHelper.setInt(copyLens, TAG_META, block.getMetaFromState(state)); NBTTagCompound cmp = new NBTTagCompound(); if(tile != null) @@ -224,8 +227,15 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet BlockPos pos = new BlockPos(x, y, z); if(entity.worldObj.isAirBlock(pos)) { - int id = ItemNBTHelper.getInt(lens, TAG_BLOCK, 0); - Block block = Block.getBlockById(id); + Block block = Blocks.air; + if (lens.hasTagCompound()) { + if (lens.getTagCompound().hasKey(TAG_BLOCK_NAME)) { + block = Block.getBlockFromName(ItemNBTHelper.getString(lens, TAG_BLOCK_NAME, "")); + } else if (lens.getTagCompound().hasKey(TAG_BLOCK)) { + // Attempt to read legacy tag (integer ID) if string block ID is absent + block = Block.getBlockById(ItemNBTHelper.getInt(lens, TAG_BLOCK, 0)); + } + } int meta = ItemNBTHelper.getInt(lens, TAG_META, 0); TileEntity tile = null; @@ -250,8 +260,8 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet public boolean doParticles(IManaBurst burst, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; ItemStack lens = burst.getSourceLens(); - int id = ItemNBTHelper.getInt(lens, TAG_BLOCK, 0); - Block b = Block.getBlockById(id); + String id = ItemNBTHelper.getString(lens, TAG_BLOCK_NAME, "minecraft:air"); + Block b = Block.getBlockFromName(id); int meta = ItemNBTHelper.getInt(lens, TAG_META, 0); entity.worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, entity.posX, entity.posY, entity.posZ, entity.motionX, entity.motionY, entity.motionZ, Block.getStateId(b.getStateFromMeta(meta))); From 2c15b6150ce97a94b3acebe9d5e6ce60af7f51ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 11:27:32 -0600 Subject: [PATCH 231/935] Lots of MOP guards. closes #41 --- .../botania/client/render/tile/RenderTileTinyPotato.java | 2 +- .../vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- src/main/java/vazkii/botania/common/item/ItemSextant.java | 2 +- .../botania/common/item/equipment/bauble/ItemMonocle.java | 2 +- .../common/item/equipment/bauble/ItemSwapRing.java | 2 +- .../java/vazkii/botania/common/item/lens/LensBounce.java | 2 +- .../vazkii/botania/common/item/lens/LensExplosive.java | 2 +- .../java/vazkii/botania/common/item/lens/LensFire.java | 2 +- .../vazkii/botania/common/item/lens/LensFirework.java | 2 +- .../java/vazkii/botania/common/item/lens/LensLight.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPaint.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPiston.java | 2 +- .../vazkii/botania/common/item/lens/LensRedirect.java | 2 +- .../java/vazkii/botania/common/item/lens/LensStorm.java | 2 +- .../java/vazkii/botania/common/item/lens/LensWarp.java | 2 +- .../java/vazkii/botania/common/item/lens/LensWeight.java | 2 +- .../vazkii/botania/common/item/relic/ItemLokiRing.java | 8 ++++---- .../vazkii/botania/common/item/rod/ItemExchangeRod.java | 2 +- .../java/vazkii/botania/common/item/rod/ItemSmeltRod.java | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index b385e08b2..77499d6a9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -352,7 +352,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer list = getCursorList(stack); BlockPos origin = getOriginPos(stack); 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 ab0e55b70..61f77f8d4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -395,7 +395,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra int meta = getBlockMeta(stack); MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { BlockPos bPos = pos.getBlockPos(); Block targetBlock = null; int targetMeta = 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 1fe5bba52..21eac8fbb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -66,7 +66,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); - if(pos != null) { + if(pos != null && pos.getBlockPos() != null) { IBlockState state = p.worldObj.getBlockState(pos.getBlockPos()); ItemStack blockStack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); From 406f89a968b5f3646988f36151a89ebc8bf1176f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 14:14:10 -0600 Subject: [PATCH 232/935] Cleanup, implement some easter egg models I missed --- .../client/core/handler/ModelHandler.java | 29 +++++++- .../client/gui/lexicon/GuiLexiconEntry.java | 2 +- .../client/gui/lexicon/GuiLexiconIndex.java | 1 - .../lexicon/button/GuiButtonInvisible.java | 2 +- .../render/entity/RenderDoppleganger.java | 2 +- .../render/tile/RenderTileSkullOverride.java | 2 +- .../common/block/decor/BlockManaGlass.java | 2 +- .../generating/SubTileHydroangeas.java | 5 +- .../subtile/generating/SubTileRafflowsia.java | 1 - .../subtile/generating/SubTileSpectrolus.java | 1 - .../botania/common/block/tile/TilePylon.java | 2 +- .../botania/common/brew/ModPotions.java | 26 -------- .../common/entity/EntityDoppleganger.java | 4 +- .../common/entity/EntityPinkWither.java | 34 +++++++--- .../botania/common/entity/EntityPixie.java | 66 +++++++++---------- .../botania/common/item/ItemGrassHorn.java | 2 - .../botania/common/item/ItemManaCookie.java | 2 - .../botania/common/item/ItemSlimeBottle.java | 2 - .../item/equipment/bauble/ItemTinyPlanet.java | 1 - .../item/equipment/tool/ToolCommons.java | 4 +- .../tool/elementium/ItemElementiumShears.java | 5 -- .../common/lexicon/page/PageEntity.java | 1 - .../botania/common/lib/LibObfuscation.java | 12 +--- .../botania/models/item/dammitReddit.json | 6 ++ .../botania/models/item/totalBiscuit.json | 6 ++ .../assets/botania/models/item/vuvuzela.json | 6 ++ 26 files changed, 119 insertions(+), 107 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/dammitReddit.json create mode 100644 src/main/resources/assets/botania/models/item/totalBiscuit.json create mode 100644 src/main/resources/assets/botania/models/item/vuvuzela.json 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 96b65ab41..fdac4c41c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -171,6 +171,24 @@ public final class ModelHandler { // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper // See https://github.com/MinecraftForge/ForgeGradle/issues/314. + ModelLoader.registerItemVariants(elementiumShears, + new ModelResourceLocation("botania:elementiumShears", "inventory"), + new ModelResourceLocation("botania:dammitReddit", "inventory")); + ModelLoader.setCustomMeshDefinition(elementiumShears, MesherWrapper.of(stack -> + stack.getDisplayName().equalsIgnoreCase("dammit reddit") + ? new ModelResourceLocation("botania:dammitReddit", "inventory") + : new ModelResourceLocation("botania:elementiumShears", "inventory"))); + + ModelLoader.registerItemVariants(grassHorn, + new ModelResourceLocation("botania:grassHorn0", "inventory"), + new ModelResourceLocation("botania:grassHorn1", "inventory"), + new ModelResourceLocation("botania:grassHorn2", "inventory"), + new ModelResourceLocation("botania:vuvuzela", "inventory")); + ModelLoader.setCustomMeshDefinition(grassHorn, MesherWrapper.of(stack -> + stack.getDisplayName().toLowerCase().contains("vuvuzela") + ? new ModelResourceLocation("botania:vuvuzela", "inventory") + : new ModelResourceLocation("botania:grassHorn" + stack.getMetadata(), "inventory"))); + ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); @@ -221,6 +239,14 @@ public final class ModelHandler { return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); })); + ModelLoader.registerItemVariants(manaCookie, + new ModelResourceLocation("botania:manaCookie", "inventory"), + new ModelResourceLocation("botania:totalBiscuit", "inventory")); + ModelLoader.setCustomMeshDefinition(manaCookie, MesherWrapper.of(stack -> + stack.getDisplayName().toLowerCase().equals("totalbiscuit") + ? new ModelResourceLocation("botania:totalBiscuit", "inventory") + : new ModelResourceLocation("botania:manaCookie", "inventory"))); + ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); @@ -443,7 +469,6 @@ public final class ModelHandler { registerItemModel(blackLotus); registerItemModel(blackLotus, 1); registerItemModel(lexicon); - registerItemModel(manaCookie); registerItemModel(manasteelHelm); registerItemModel(manasteelHelmRevealing); @@ -465,7 +490,6 @@ public final class ModelHandler { registerItemModel(elementiumPick); registerItemModel(elementiumShovel); registerItemModel(elementiumAxe); - registerItemModel(elementiumShears); registerItemModel(elementiumSword); registerItemModel(terrasteelHelm); @@ -578,7 +602,6 @@ public final class ModelHandler { registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); registerItemModelMetas(virus, LibItemNames.VIRUS, 2); - registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } // Only for models that absolutely can't be converted to JSON. Use VERY sparingly diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 7d1f7340b..9a87f5dae 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -409,7 +409,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override public GuiLexicon copy() { - GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); // todo 1.8 recheck last param (was new GuiScreen()) + GuiLexiconEntry gui = new GuiLexiconEntry(entry, this.parent); gui.page = page; gui.setTitle(); return gui; 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 76bfc90ed..16ea0b360 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -107,7 +107,6 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { buttonList.add(leftButton = new GuiButtonPage(13, left, top + guiHeight - 10, false)); buttonList.add(rightButton = new GuiButtonPage(14, left + guiWidth - 18, top + guiHeight - 10, true)); - // todo 1.8 verify componentID searchField = new GuiTextField(15, fontRendererObj, left + guiWidth / 2 + 28, top + guiHeight + 6, 200, 10); searchField.setCanLoseFocus(false); searchField.setFocused(true); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index de39d3a0d..5464ef615 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -86,7 +86,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { key = format.charAt(1); for(EnumChatFormatting ecf : EnumChatFormatting.class.getEnumConstants()) - if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { // todo 1.8 recheck (want last char of code) + if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { if(ecf.ordinal() > 15) ecf = EnumChatFormatting.BLACK; color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()]; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index b7ad3f037..ddf908c85 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -60,7 +60,7 @@ public class RenderDoppleganger extends RenderBiped { }; public RenderDoppleganger(RenderManager renderManager) { - super(renderManager, new ModelPlayer(0.0F, false), 0F); // todo 1.8 was ModelBiped(0.5) + super(renderManager, new ModelPlayer(0.0F, false), 0F); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index a2ef45e2b..cc342fc0c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -35,7 +35,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { @Override public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { if (p_147500_1_ != null) { - render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress); + render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7), p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress); } else { render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0); } 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 7e835a0f7..63777e0d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -52,7 +52,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(world, pos, side.getOpposite()); // todo 1.8 recheck (was 1 - sideInt) + return shouldSideBeRendered1(world, pos, side.getOpposite()); } @Override 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 f9e249781..845363ab8 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 @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -24,6 +25,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidBase; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.signature.PassiveFlower; @@ -62,7 +64,8 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { BlockPos pos = supertile.getPos().add(offset); Material search = getMaterialToSearchFor(); - if(supertile.getWorld().getBlockState(pos).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && supertile.getWorld().getBlockState(pos).getValue(BlockLiquid.LEVEL)/* todo 1.8 may crash */ == 0) { + 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).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) { if(search != Material.water) supertile.getWorld().setBlockToAir(pos); else { 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 1c571f910..0fb2ae5aa 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 @@ -66,7 +66,6 @@ public class SubTileRafflowsia extends SubTileGenerating { float mod = 1F / lastFlowerTimes; - // todo 1.8 why is meta +1 'ed ?? int meta = supertile.getWorld().getBlockMetadata(x, y, z) + 1; IBlockState state = supertile.getWorld().getBlockState(pos); supertile.getWorld().setBlockToAir(pos); 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 c97a5e405..643ee87a9 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 @@ -68,7 +68,6 @@ public class SubTileSpectrolus extends SubTileGenerating { float mx = (float) (Math.random() - 0.5) * m; float my = (float) (Math.random() - 0.5) * m; float mz = (float) (Math.random() - 0.5) * m; - // todo 1.8.8 verify. old: supertile.getWorld().spawnParticle("blockcrack_" + Item.getIdFromItem(stack.getItem()) + "_" + meta, item.posX, item.posY, item.posZ, mx, my, mz); supertile.getWorld().spawnParticle(EnumParticleTypes.ITEM_CRACK, item.posX, item.posY, item.posZ, mx, my, mz, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 3a02bfacd..cb81f3bdc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -42,7 +42,7 @@ public class TilePylon extends TileEntity implements ITickable { PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); if(activated && worldObj.isRemote) { - if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) { // todo 1.8 clarify + if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() || variant != PylonVariant.MANA && portalOff()) { activated = false; return; } diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index e9cd3d67f..0df286d58 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -31,9 +31,6 @@ public class ModPotions { public static Potion clear; public static void init() { -// if(Potion.potionTypes.length < 256) -// extendPotionArray(); todo 1.8 this should be unnecessary thanks to potion registry - soulCross = new PotionSoulCross(); featherfeet = new PotionFeatherfeet(); emptiness = new PotionEmptiness(); @@ -42,27 +39,4 @@ public class ModPotions { clear = new PotionClear(); } - private static void extendPotionArray() { - Potion[] potionTypes = null; - - for (Field f : Potion.class.getDeclaredFields()) { - f.setAccessible(true); - try { - if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { - Field modfield = Field.class.getDeclaredField("modifiers"); - modfield.setAccessible(true); - modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); - - potionTypes = (Potion[])f.get(null); - final Potion[] newPotionTypes = new Potion[256]; - System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); - f.set(null, newPotionTypes); - } - } catch (Exception e) { - System.err.println("Severe error, please report this to the mod author:"); - e.printStackTrace(); - } - } - } - } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index a73de32f3..049bfdddf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -41,6 +41,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.pathfinding.PathNavigateSwimmer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; @@ -118,7 +120,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public EntityDoppleganger(World par1World) { super(par1World); setSize(0.6F, 1.8F); - //todo 1.8 new AI getNavigator().setCanSwim(true); + ((PathNavigateGround) getNavigator()).setCanSwim(true); tasks.addTask(0, new EntityAISwimming(this)); tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, Float.MAX_VALUE)); isImmuneToFire = true; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index b2712e05d..27082bdad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -12,16 +12,40 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.EntityAIArrowAttack; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAINearestAttackableTarget; +import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import java.util.Iterator; + public class EntityPinkWither extends EntityWither { public EntityPinkWither(World p_i1701_1_) { super(p_i1701_1_); + + Iterator taskIter = this.tasks.taskEntries.iterator(); + while (taskIter.hasNext()) { + EntityAITasks.EntityAITaskEntry entry = taskIter.next(); + if (entry.action instanceof EntityAIArrowAttack) { + taskIter.remove(); // Remove firing wither skulls + } + } + + + Iterator targetTaskIter = this.targetTasks.taskEntries.iterator(); + while (targetTaskIter.hasNext()) { + EntityAITasks.EntityAITaskEntry entry = targetTaskIter.next(); + if (entry.action instanceof EntityAIHurtByTarget + || entry.action instanceof EntityAINearestAttackableTarget) { + targetTaskIter.remove(); // Remove revenge and aggro + } + } } @Override @@ -42,11 +66,6 @@ public class EntityPinkWither extends EntityWither { // NO-OP } -// @Override todo 1.8 mtd no longer exists? -// protected void attackEntity(Entity p_70785_1_, float p_70785_2_) { -// // NO-OP -// } - @Override public boolean attackEntityAsMob(Entity p_70652_1_) { return false; @@ -61,11 +80,6 @@ public class EntityPinkWither extends EntityWither { return false; } -// @Override todo 1.8 new AI -// protected boolean isAIEnabled() { -// return false; -// } - @Override protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { // NO-OP diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index d60ac38f9..0fe541d27 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -60,39 +60,39 @@ public class EntityPixie extends EntityFlyingCreature { this.effect = effect; } -// @Override todo 1.8 uh oh ... we can't override this anymore -// protected void updateEntityActionState() { -// EntityLivingBase target = getAttackTarget(); -// if(target != null) { -// double d0 = target.posX + target.width / 2 - posX; -// double d1 = target.posY + target.height / 2 - posY; -// double d2 = target.posZ + target.width / 2 - posZ; -// double d3 = d0 * d0 + d1 * d1 + d2 * d2; -// -// float mod = 0.45F; -// if(getType() == 1) -// mod = 0.1F; -// -// motionX += d0 / d3 * mod; -// motionY += d1 / d3 * mod; -// motionZ += d2 / d3 * mod; -// -// if(Math.sqrt(d3) < 1F) { -// if(summoner != null) { -// if(summoner instanceof EntityPlayer) -// target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage); -// else { -// target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); -// } -// } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); -// if(effect != null && !(target instanceof EntityPlayer)) -// target.addPotionEffect(effect); -// die(); -// } -// } -// -// renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI; -// } + @Override + protected void updateAITasks() { + EntityLivingBase target = getAttackTarget(); + if(target != null) { + double d0 = target.posX + target.width / 2 - posX; + double d1 = target.posY + target.height / 2 - posY; + double d2 = target.posZ + target.width / 2 - posZ; + double d3 = d0 * d0 + d1 * d1 + d2 * d2; + + float mod = 0.45F; + if(getType() == 1) + mod = 0.1F; + + motionX += d0 / d3 * mod; + motionY += d1 / d3 * mod; + motionZ += d2 / d3 * mod; + + if(Math.sqrt(d3) < 1F) { + if(summoner != null) { + if(summoner instanceof EntityPlayer) + target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) summoner), damage); + else { + target.attackEntityFrom(DamageSource.causeMobDamage(summoner), damage); + } + } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); + if(effect != null && !(target instanceof EntityPlayer)) + target.addPotionEffect(effect); + die(); + } + } + + renderYawOffset = rotationYaw = -((float)Math.atan2(motionX, motionZ)) * 180.0F / (float)Math.PI; + } @Override public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index d47eadbaf..4c51a6cdc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -51,8 +51,6 @@ public class ItemGrassHorn extends ItemMod { list.add(new ItemStack(item, 1, i)); } - // todo 1.8 return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack); - @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 363dbb21d..f19f57a88 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -48,6 +48,4 @@ public class ItemManaCookie extends ItemFood { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } - // todo 1.8 return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); - } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 518c615ea..56a2b975f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -19,8 +19,6 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSlimeBottle extends ItemMod { - // todo 1.8 smart model? - public ItemSlimeBottle() { setUnlocalizedName(LibItemNames.SLIME_BOTTLE); setMaxStackSize(1); 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 9491c25e3..88f4bf1e9 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 @@ -108,7 +108,6 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { GlStateManager.translate(0.25F, -0.5F, 0F); GlStateManager.scale(0.5F, 0.5F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F); -// RenderBlocks.getInstance().renderBlockAsItem(ModBlocks.tinyPlanet, 0, 1F); todo 1.8 } } 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 39b2b6d02..31833ac61 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 @@ -137,8 +137,8 @@ public final class ToolCommons { float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; double d0 = player.prevPosX + (player.posX - player.prevPosX) * f; double d1 = player.prevPosY + (player.posY - player.prevPosY) * f; - if (!world.isRemote && player instanceof EntityPlayer) - d1 += ((EntityPlayer) player).eyeHeight; // todo 1.8 possibly unneeded + if (player instanceof EntityPlayer) + d1 += ((EntityPlayer) player).eyeHeight; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; Vec3 vec3 = new Vec3(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); 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 c101056b0..c0d681bcc 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 @@ -41,11 +41,6 @@ public class ItemElementiumShears extends ItemManasteelShears { return par1ItemStack; } -// @Override todo 1.8 -// public IIcon getIconIndex(ItemStack par1ItemStack) { -// return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack); -// } - @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { if(player.worldObj.isRemote) 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 13798efd8..a2e7745b3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -88,7 +88,6 @@ public class PageEntity extends LexiconPage{ GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); - // todo 1.8 yOffset gone GlStateManager.translate(0.0F, 0.0F, 0.0F); Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index ef97c2768..ba8f15405 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -31,8 +31,8 @@ public final class LibObfuscation { // EntityAIAttackOnCollide public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; - // EntityAIAvoidEntity // todo 1.8 - public static final String[] TARGET_ENTITY_CLASS = new String[] { "targetEntityClass", "field_75381_h", "i" }; + // EntityAIAvoidEntity + public static final String[] TARGET_ENTITY_CLASS = new String[] { "field_181064_i", "i" }; // EntityCreeper public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "c" }; @@ -54,9 +54,6 @@ public final class LibObfuscation { public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "g" }; public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "h" }; - // Potion - public static final String[] IS_BAD_EFFECT = new String[] { "isBadEffect", "field_76418_K", "K" }; - // EntityHorse public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "br" }; public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bC" }; @@ -72,7 +69,7 @@ public final class LibObfuscation { public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" }; public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" }; public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" + public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "c" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" see MCP name github issue public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "f" }; public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "e" }; @@ -94,9 +91,6 @@ public final class LibObfuscation { // Entityliving public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "z" }; - - // TextureAtlasSprite - public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "k" }; // RenderGlobal public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "p" }; diff --git a/src/main/resources/assets/botania/models/item/dammitReddit.json b/src/main/resources/assets/botania/models/item/dammitReddit.json new file mode 100644 index 000000000..99039e501 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dammitReddit.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_tool", + "textures": { + "layer0": "botania:items/dammitReddit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/totalBiscuit.json b/src/main/resources/assets/botania/models/item/totalBiscuit.json new file mode 100644 index 000000000..67c022d0e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/totalBiscuit.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/totalBiscuit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vuvuzela.json b/src/main/resources/assets/botania/models/item/vuvuzela.json new file mode 100644 index 000000000..c9bdc160e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vuvuzela.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vuvuzela" + } +} \ No newline at end of file From eb028d6c05d833e5a6fdda74f73f4d537d7dd965 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 21:20:49 -0600 Subject: [PATCH 233/935] Fully fix mana pool models --- .../client/render/tile/RenderTilePool.java | 24 ++++--------------- .../render/tile/RenderTileStarfield.java | 6 +---- .../assets/botania/blockstates/pool.json | 7 ++---- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b07257938..48f9328af 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -75,28 +75,14 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { - color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha + color = pool.getColor().getMapColor().colorValue; } IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); - Tessellator tess = Tessellator.getInstance(); - - tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); - - GlStateManager.disableLighting(); - for (BakedQuad quad : model.getGeneralQuads()) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - - for (EnumFacing e : EnumFacing.VALUES) { - for (BakedQuad quad: model.getFaceQuads(e)) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - } - - tess.draw(); - - GlStateManager.enableLighting(); + int red = (color & 0xFF0000) >> 16; + int green = (color & 0xFF00) >> 8; + int blue = (color & 0xFF) >> 0; + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 56e7d689a..d1e1b1297 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -22,11 +22,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; -// THIS CODE WAS STOLEN FROM THE END PORTAL -// OH GOD -// I HAVE NO IDEA WHAT I'M DOING -// SO MUCH STUFF I DON'T UNDERSTAND D: -// HELP +// This is copied from the vanilla end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 77eb376ee..c904678a3 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:pool", + "model": "botania:pool_tinted", "transform": "forge:default-block" }, "variants": { @@ -9,10 +9,7 @@ "default": { "textures": { "all": "botania:model/poolCopy" } }, "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, "creative": { "textures": { "all": "botania:model/infinitePoolCopy" } }, - "fabulous": { - "model": "botania:pool_tinted", - "textures": { "all": "botania:model/poolCopy" } - } + "fabulous": { "textures": { "all": "botania:model/poolCopy" } } }, "inventory_creative": [{ "model": "botania:pool_filled", From 1d8c53613913d047881eaa494fd13bc5e1339e08 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 21:48:29 -0600 Subject: [PATCH 234/935] Fix pool minecart rendery fully --- .../render/entity/RenderPoolMinecart.java | 9 ++++- .../client/render/tile/RenderTilePool.java | 37 +++++++++---------- 2 files changed, 26 insertions(+), 20 deletions(-) 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 4fdeb8eb6..57f3088a4 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -11,9 +11,15 @@ package vazkii.botania.client.render.entity; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.render.tile.RenderTilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; public class RenderPoolMinecart extends RenderMinecart { @@ -24,8 +30,9 @@ public class RenderPoolMinecart extends RenderMinecart { @Override protected void func_180560_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { + RenderTilePool.forceVariant = PoolVariant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); - super.func_180560_a(poolCart, p_147910_2_, state); + 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/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 48f9328af..4def28bbd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -30,23 +31,21 @@ import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_POOL); - private static final ResourceLocation textureInf = new ResourceLocation(LibResources.MODEL_INFINITE_POOL); - private static final ResourceLocation textureDil = new ResourceLocation(LibResources.MODEL_DILUTED_POOL); - - private static final ModelPool model = new ModelPool(); - - public static int forceMeta = 0; + // Overrides for when we call this TESR without an actual pool + public static PoolVariant forceVariant = PoolVariant.DEFAULT; public static boolean forceMana = false; public static int forceManaNumber = -1; @@ -63,11 +62,13 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GlStateManager.color(1F, 1F, 1F, a); - GlStateManager.translate(d0, d1, d2); - boolean inf = pool.getWorld() == null ? forceMeta == 1 : pool.getBlockMetadata() == 1; - boolean dil = pool.getWorld() == null ? forceMeta == 2 : pool.getBlockMetadata() == 2; - boolean fab = pool.getWorld() == null ? forceMeta == 3 : pool.getBlockMetadata() == 3; + if (pool == null) { // A null pool means we are calling the TESR without a pool (on a minecart). Adjust accordingly + GlStateManager.translate(0, 0, -1); + } else { + GlStateManager.translate(d0, d1, d2); + } + boolean fab = pool == null ? forceVariant == PoolVariant.FABULOUS : pool.getWorld().getBlockState(pool.getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); int color; @@ -75,10 +76,10 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { - color = pool.getColor().getMapColor().colorValue; + color = pool == null ? EnumDyeColor.WHITE.getMapColor().colorValue : pool.getColor().getMapColor().colorValue; } - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; int blue = (color & 0xFF) >> 0; @@ -88,10 +89,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.color(1, 1, 1, a); GlStateManager.enableRescaleNormal(); - int mana = pool.getCurrentMana(); - if(forceManaNumber > -1) - mana = forceManaNumber; - int cap = pool.manaCap; + int mana = pool == null ? forceManaNumber : pool.getCurrentMana(); + int cap = pool == null ? -1 : pool.manaCap; if(cap == -1) cap = TilePool.MAX_MANA; @@ -103,7 +102,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float v = 1F / 8F; float w = -v * 3.5F; - if(pool.getWorld() != null) { + if(pool != null) { Block below = pool.getWorld().getBlockState(pool.getPos().down()).getBlock(); if(below instanceof IPoolOverlayProvider) { TextureAtlasSprite overlay = ((IPoolOverlayProvider) below).getIcon(pool.getWorld(), pool.getPos()); @@ -147,7 +146,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { } GlStateManager.popMatrix(); - forceMeta = 0; + forceVariant = PoolVariant.DEFAULT; forceMana = false; forceManaNumber = -1; } From 46900df6cb6c3265ec8727bb57936bde6c953f29 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 01:42:07 -0600 Subject: [PATCH 235/935] Serverside gourmaryllis --- .../generating/SubTileGourmaryllis.java | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) 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 c10b54d59..1382426a6 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; @@ -19,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.WorldServer; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -38,9 +40,12 @@ public class SubTileGourmaryllis extends SubTileGenerating { public void onUpdate() { super.onUpdate(); + if (supertile.getWorld().isRemote) + return; + if(cooldown > 0) cooldown--; - if(cooldown == 0 && !supertile.getWorld().isRemote) { + if(cooldown == 0) { mana = Math.min(getMaxMana(), mana + storedMana); storedMana = 0; sync(); @@ -48,32 +53,21 @@ public class SubTileGourmaryllis extends SubTileGenerating { int slowdown = getSlowdownFactor(); - boolean remote = supertile.getWorld().isRemote; List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { if(cooldown == 0) { - if(!remote) { - int val = ((ItemFood) stack.getItem()).getHealAmount(stack); - storedMana = val * val * 64; - cooldown = val * 10; - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); - sync(); - } else - for(int i = 0; i < 10; i++) { - float m = 0.2F; - float mx = (float) (Math.random() - 0.5) * m; - float my = (float) (Math.random() - 0.5) * m; - float mz = (float) (Math.random() - 0.5) * m; - supertile.getWorld().spawnParticle(EnumParticleTypes.ITEM_CRACK, item.posX, item.posY, item.posZ, mx, my, mz, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); - } - + int val = ((ItemFood) stack.getItem()).getHealAmount(stack); + storedMana = val * val * 64; + cooldown = val * 10; + supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.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()); } - if(!remote) - item.setDead(); + item.setDead(); } } } From 7907d1d582d562790de09234c53ad5e6d3d85897 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 01:57:31 -0600 Subject: [PATCH 236/935] Fix passives decaying directly into nothing instead of a dead bush --- src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index f23687453..78932d242 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -100,7 +100,7 @@ public class SubTileGenerating extends SubTileEntity { if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { supertile.getWorld().playAuxSFX(2001, supertile.getPos(), Block.getIdFromBlock(supertile.getBlockType())); - if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.DOWN)) + if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.UP)) supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState()); else supertile.getWorld().setBlockToAir(supertile.getPos()); } From a61553828905b2a9e3045321c502b113d0744ead Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 02:07:18 -0600 Subject: [PATCH 237/935] Stop spamming packets when done digesting --- .../common/block/subtile/generating/SubTileGourmaryllis.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1382426a6..c557bd12d 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 @@ -43,7 +43,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { if (supertile.getWorld().isRemote) return; - if(cooldown > 0) + if(cooldown > -1) cooldown--; if(cooldown == 0) { mana = Math.min(getMaxMana(), mana + storedMana); @@ -58,7 +58,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { - if(cooldown == 0) { + if(cooldown <= 0) { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; cooldown = val * 10; From 568ee043dfce249a3a5760955068dfd0b258b6fc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 12:33:05 -0600 Subject: [PATCH 238/935] God dammit --- .../vazkii/botania/client/core/handler/MiscellaneousIcons.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d31332f18..baa9a51d5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.CommandEvent; @@ -141,7 +142,7 @@ public class MiscellaneousIcons { @SubscribeEvent public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.entityPlayer.worldObj.isRemote || false) + if (!evt.entityPlayer.worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"))) return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); From 5e3345a1d74c7d468c952af965042bff894654d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 13:37:18 -0600 Subject: [PATCH 239/935] Fix terra pick and elementium shovel not working correctly. Closes #43 --- .../common/item/equipment/tool/ToolCommons.java | 11 +++++++++-- .../item/equipment/tool/terrasteel/ItemTerraPick.java | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) 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 31833ac61..44126f224 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 @@ -48,10 +48,15 @@ public final class ToolCommons { stack.damageItem(dmg, entity); } + /** + * Pos is the actual block coordinate, posStart and posEnd are deltas from pos + */ public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { float blockHardness = block == null ? 1F : block.getBlockHardness(world, pos); - for (BlockPos iterPos : BlockPos.getAllInBox(posStart, posEnd)) { + for (BlockPos iterPos : BlockPos.getAllInBox(pos.add(posStart), pos.add(posEnd))) { + if (iterPos.equals(pos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it + continue; removeBlockWithDrops(player, stack, world, iterPos, pos, block, materialsListing, silk, fortune, blockHardness, dispose); } } @@ -80,8 +85,10 @@ public final class ToolCommons { Material mat = world.getBlockState(pos).getBlock().getMaterial(); if(!world.isRemote && blk != null && !blk.isAir(world, pos) && blk.getPlayerRelativeBlockHardness(player, world, pos) > 0) { - if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) + if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) { + System.out.println("Fail harvest and material"); return; + } if(!player.capabilities.isCreativeMode) { IBlockState localState = world.getBlockState(pos); 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 3d9698fed..9ebad941f 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 @@ -121,7 +121,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); - if(raycast != null) { + if(!player.worldObj.isRemote && raycast != null) { breakOtherBlock(player, stack, pos, pos, raycast.sideHit); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); // ^ Doable with API access through the IInternalMethodHandler. @@ -268,4 +268,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return isTipped(stack); } + @Override + public boolean shouldCauseReequipAnimation(ItemStack before, ItemStack after, boolean slotChanged) { + return isEnabled(before) != isEnabled(after); + } + } From 4d4ba74ac167278a9a321de045e064547f8e733e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 16:56:17 -0600 Subject: [PATCH 240/935] Fix ender air bottle event handler not being registered, closes #44 --- .../item/material/ItemManaResource.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) 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 e944f1e90..7b82a977d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -25,6 +25,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.recipe.IElvenItem; @@ -49,6 +50,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve super(); setUnlocalizedName(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent @@ -60,21 +62,25 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(rightEvent && correctStack && ender) { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); - if(pos == null) { - ItemStack stack1 = new ItemStack(this, 1, 15); - event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); - - if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) - event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); - - stack.stackSize--; - if(stack.stackSize == 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); - - if(event.world.isRemote) + if (event.entityPlayer.worldObj.isRemote) { event.entityPlayer.swingItem(); - else event.world.playSoundAtEntity(event.entityPlayer, "random.pop", 0.5F, 1F); + } else { + ItemStack stack1 = new ItemStack(this, 1, 15); + event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); + + if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) { + event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); + } else { + event.entityPlayer.openContainer.detectAndSendChanges(); + } + + stack.stackSize--; + if(stack.stackSize == 0) + event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); + + event.world.playSoundAtEntity(event.entityPlayer, "random.pop", 0.5F, 1F); + } } } } From 6e870f4e7968aea3476bba74acfb55ec5864db52 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 16:57:51 -0600 Subject: [PATCH 241/935] Remove some leftover debug messages --- src/main/java/vazkii/botania/common/block/tile/TileMod.java | 2 -- .../vazkii/botania/common/item/equipment/tool/ToolCommons.java | 1 - 2 files changed, 3 deletions(-) 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 7d0074d6c..20e796075 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -66,8 +66,6 @@ public class TileMod extends TileEntity implements ITickable { public final void update() { if (!isInvalid() && worldObj.isBlockLoaded(getPos(), false)) { updateEntity(); - } else { - System.out.println("Skipping a tick because our chunk unloaded"); } } 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 44126f224..5d3a9f95e 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 @@ -86,7 +86,6 @@ public final class ToolCommons { Material mat = world.getBlockState(pos).getBlock().getMaterial(); if(!world.isRemote && blk != null && !blk.isAir(world, pos) && blk.getPlayerRelativeBlockHardness(player, world, pos) > 0) { if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) { - System.out.println("Fail harvest and material"); return; } From be2b66dddfb96ee9b33052a8e3a7859c0718391d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 18:25:31 -0600 Subject: [PATCH 242/935] Partially restore bauble rendering. Everything is probably in the wrong place, but should render. --- .../botania/api/item/IBaubleRender.java | 3 +- .../core/handler/BaubleRenderHandler.java | 44 +++++++++---------- .../core/handler/MiscellaneousIcons.java | 5 ++- .../client/core/proxy/ClientProxy.java | 8 +++- .../armor/terrasteel/ItemTerrasteelHelm.java | 34 ++++++-------- .../equipment/bauble/ItemBaubleCosmetic.java | 18 +++----- .../equipment/bauble/ItemBloodPendant.java | 9 ++-- .../item/equipment/bauble/ItemDivaCharm.java | 19 ++++---- .../equipment/bauble/ItemFlightTiara.java | 17 ++++--- .../equipment/bauble/ItemGoldenLaurel.java | 19 ++++---- .../item/equipment/bauble/ItemHolyCloak.java | 7 ++- .../item/equipment/bauble/ItemIcePendant.java | 5 +-- .../item/equipment/bauble/ItemItemFinder.java | 5 +-- .../equipment/bauble/ItemKnockbackBelt.java | 6 +-- .../equipment/bauble/ItemLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemMonocle.java | 20 ++++----- .../bauble/ItemSuperLavaPendant.java | 6 +-- .../item/equipment/bauble/ItemTinyPlanet.java | 4 +- .../item/equipment/bauble/ItemTravelBelt.java | 5 +-- 19 files changed, 108 insertions(+), 132 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 2ef376071..3802dfded 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -13,7 +13,6 @@ package vazkii.botania.api.item; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +33,7 @@ public interface IBaubleRender { * has a cosmetic bauble attached to it. */ @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type); + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks); /** * A few helper methods for the render. 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 e0233a241..d4b83f80b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -14,12 +14,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; @@ -33,38 +33,37 @@ import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -public final class BaubleRenderHandler { +public final class BaubleRenderHandler implements LayerRenderer { - @SubscribeEvent - public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { - if(!ConfigHandler.renderBaubles || event.entityLiving.getActivePotionEffect(Potion.invisibility) != null) + @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(Potion.invisibility) != null) return; - EntityPlayer player = event.entityPlayer; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); - dispatchRenders(inv, event, RenderType.BODY); + dispatchRenders(inv, player, RenderType.BODY, partialTicks); if(inv.getStackInSlot(3) != null) - renderManaTablet(event); + renderManaTablet(player); - float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; - float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; - float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; + float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks; + float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks; + float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks; GlStateManager.pushMatrix(); GlStateManager.rotate(yawOffset, 0, -1, 0); GlStateManager.rotate(yaw - 270, 0, 1, 0); GlStateManager.rotate(pitch, 0, 0, 1); - dispatchRenders(inv, event, RenderType.HEAD); + dispatchRenders(inv, player, RenderType.HEAD, partialTicks); ItemStack helm = player.inventory.armorItemInSlot(3); if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm) - ItemTerrasteelHelm.renderOnPlayer(helm, event); + ItemTerrasteelHelm.renderOnPlayer(helm, player); GlStateManager.popMatrix(); } - private void dispatchRenders(InventoryBaubles inv, RenderPlayerEvent event, RenderType type) { + private void dispatchRenders(InventoryBaubles inv, EntityPlayer player, RenderType type, float partialTicks) { for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack != null) { @@ -82,7 +81,7 @@ public final class BaubleRenderHandler { if(cosmetic != null) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, event, type); + ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, player, type, partialTicks); GlStateManager.popMatrix(); continue; } @@ -91,24 +90,22 @@ public final class BaubleRenderHandler { if(item instanceof IBaubleRender) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, event, type); + ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, player, type, partialTicks); GlStateManager.popMatrix(); } } } } - private void renderManaTablet(RenderPlayerEvent event) { - EntityPlayer player = event.entityPlayer; + private void renderManaTablet(EntityPlayer player) { boolean renderedOne = false; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); if(stack != null && stack.getItem() == ModItems.manaTablet) { - Item item = stack.getItem(); GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(1) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(1) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.25F, -0.85F, renderedOne ? armor ? 0.2F : 0.28F : armor ? -0.3F : -0.25F); @@ -129,5 +126,8 @@ public final class BaubleRenderHandler { } } - + @Override + public boolean shouldCombineTextures() { + return false; + } } 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 baa9a51d5..e14a6ccd5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -60,7 +60,8 @@ public class MiscellaneousIcons { corporeaIconStar, sparkWorldIcon, manaDetectorIcon, - runeAltarTriggerIcon; + runeAltarTriggerIcon, + terrasteelHelmWillIcon; public TextureAtlasSprite[] sparkUpgradeIcons; public TextureAtlasSprite[] kingKeyWeaponIcons; @@ -138,6 +139,8 @@ public class MiscellaneousIcons { for (int i = 0; i < tiaraWingIcons.length; i++) { tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + i, "items"); } + + terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items"); } @SubscribeEvent 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 d9f353f48..cde2ac25d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -197,7 +197,6 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.boundBlockWireframe) MinecraftForge.EVENT_BUS.register(new BoundTileRenderer()); MinecraftForge.EVENT_BUS.register(new TooltipHandler()); - MinecraftForge.EVENT_BUS.register(new BaubleRenderHandler()); MinecraftForge.EVENT_BUS.register(new DebugHandler()); MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); @@ -274,10 +273,15 @@ public class ClientProxy extends CommonProxy { private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); - RenderPlayer render = skinMap.get("default"); + RenderPlayer render; + + render = skinMap.get("default"); render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); + render = skinMap.get("slim"); render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); } @Override 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 7069ba26e..2d42480f9 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 @@ -12,7 +12,10 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,15 +23,14 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; @@ -39,23 +41,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { private static final String TAG_ANCIENT_WILL = "AncientWill"; - static TextureAtlasSprite willIcon; public ItemTerrasteelHelm() { this(LibItemNames.TERRASTEEL_HELM); - MinecraftForge.EVENT_BUS.register(this); } public ItemTerrasteelHelm(String name) { super(0, name); } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onTextureStitch(TextureStitchEvent evt) { - willIcon = IconHelper.forName(evt.map, "willFlame", "items"); - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { super.onArmorTick(world, player, stack); @@ -104,24 +98,22 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @SideOnly(Side.CLIENT) - public static void renderOnPlayer(ItemStack stack, RenderPlayerEvent event) { -/* + public static void renderOnPlayer(ItemStack stack, EntityPlayer player) { if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { GlStateManager.pushMatrix(); - float f = willIcon.getMinU(); - float f1 = willIcon.getMaxU(); - float f2 = willIcon.getMinV(); - float f3 = willIcon.getMaxV(); - Helper.translateToHeadLevel(event.entityPlayer); + float f = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinU(); + float f1 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxU(); + float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV(); + float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV(); + IBaubleRender.Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, 0.15F, -0.39F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - IconHelper.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } -*/ } @SubscribeEvent 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 87db7e0cb..88daee8d4 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 @@ -14,13 +14,13 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -70,10 +70,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(type == RenderType.HEAD) { - Helper.translateToHeadLevel(event.entityPlayer); + Helper.translateToHeadLevel(player); switch(stack.getItemDamage()) { case 2: faceTranslate(); @@ -231,7 +231,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; } } else { - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); switch(stack.getItemDamage()) { case 0: chestTranslate(); @@ -314,13 +314,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void renderIcon(int i) { -/* - IIcon icon = icons[i]; - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); -*/ + ItemStack stack = new ItemStack(this, 1, i); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); } } 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 9b4cef1b0..ffe53bbc2 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 @@ -26,7 +26,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.common.registry.GameData; @@ -163,17 +162,17 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); for(int i = 2; i < 4; i++) { - /*IIcon icon = icons[i]; + /*IIcon icon = icons[i]; todo 1.8 float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); 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 bb93acc2c..616f5b3b9 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 @@ -13,6 +13,10 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import com.google.common.base.Predicates; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; @@ -20,7 +24,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -92,23 +95,17 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } } 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 ee8285029..7ea631c70 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 @@ -37,7 +37,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -330,17 +329,17 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { int meta = stack.getItemDamage(); 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); - boolean flying = event.entityPlayer.capabilities.isFlying; + boolean flying = player.capabilities.isFlying; float rz = 120F; - float rx = 20F + (float) ((Math.sin((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * (flying ? 0.4F : 0.2F)) + 0.5F) * (flying ? 30F : 5F)); + float rx = 20F + (float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.5F) * (flying ? 30F : 5F)); float ry = 0F; float h = 0.2F; float i = 0.15F; @@ -374,7 +373,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rz = 180F; h = 0.5F; rx = 20F; - ry = -(float) ((Math.sin((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F)); + ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F)); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); break; } @@ -395,7 +394,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rz = 0F; ry = -rx; rx = 0F; - GlStateManager.color(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F); + GlStateManager.color(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.2F); break; } case 8 : { // Mega Ultra Chicken @@ -408,7 +407,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub rx = 0F; s = 1.5F; h = 1.2F; - GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F + 0.25F : 0F)); + GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F)); } } @@ -418,7 +417,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub float f3 = icon.getMaxV(); float sr = 1F / s; - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, h, i); @@ -449,7 +448,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GlStateManager.popMatrix(); } } else if(meta == 1) // Jibril's Halo - renderHalo(event.entityPlayer, event.partialRenderTick); + renderHalo(player, partialTicks); } @SideOnly(Side.CLIENT) 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 864c9b99b..33ad02e67 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 @@ -10,12 +10,15 @@ */ package vazkii.botania.common.item.equipment.bauble; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentTranslation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; @@ -59,15 +62,10 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); @@ -77,8 +75,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { GlStateManager.scale(1.1F, 1.1F, 1F); GlStateManager.translate(-0.05F, -0.1F, 0F); } - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 26cf6074b..2fd863be5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -17,7 +17,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -126,11 +125,11 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); float s = 0.1F; 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 2555adfce..1760990bf 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 @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -102,8 +101,8 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - /*if(type == RenderType.BODY) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { + /*if(type == RenderType.BODY) { todo 1.8 Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; 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 2687981c0..79b870517 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 @@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.village.MerchantRecipe; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.Botania; @@ -203,8 +202,8 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index e31afe3f0..8ab9fb440 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -15,9 +15,9 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; @@ -50,10 +50,10 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(texture); - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, 0.2F, 0F); 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 39930441c..0512d6fa2 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 @@ -11,8 +11,8 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -44,8 +44,8 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { }*/ @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); 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 4c71b1197..c50311882 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 @@ -13,6 +13,9 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,7 +23,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; @@ -43,23 +45,17 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - float f = itemIcon.getMinU(); - float f1 = itemIcon.getMaxU(); - float f2 = itemIcon.getMinV(); - float f3 = itemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.35F, -0.1F, armor ? -0.3F : -0.25F); GlStateManager.scale(0.35F, 0.35F, 0.35F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } -*/ } @SideOnly(Side.CLIENT) 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 a1367c2a7..af23d46f6 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 @@ -12,8 +12,8 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; @@ -55,8 +55,8 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { }*/ @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { -/* + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { +/* todo 1.8 if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); 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 88f4bf1e9..ee0a498b1 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 @@ -18,11 +18,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; @@ -102,7 +102,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { } @Override - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.25F, -0.5F, 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 8bac12fb0..30898c6e6 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 @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -152,10 +151,10 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs @Override @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { + public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); - Helper.rotateIfSneaking(event.entityPlayer); + Helper.rotateIfSneaking(player); GlStateManager.translate(0F, 0.2F, 0F); From 8922ad5362365a97a26c83e3f104e9610305074d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jan 2016 18:38:22 -0600 Subject: [PATCH 243/935] Use the non-insane calendar API --- .../vazkii/botania/client/core/proxy/ClientProxy.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 cde2ac25d..10ae747af 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -14,7 +14,8 @@ import java.awt.Desktop; import java.io.File; import java.io.IOException; import java.net.URI; -import java.util.Calendar; +import java.time.LocalDateTime; +import java.time.Month; import java.util.Map; import net.minecraft.block.Block; @@ -28,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; @@ -209,10 +209,10 @@ public class ClientProxy extends CommonProxy { new VersionChecker().init(); if(ConfigHandler.enableSeasonalFeatures) { - Calendar calendar = Calendar.getInstance(); - if((calendar.get(2) == 11 && calendar.get(5) >= 16) || (calendar.get(2) == 0 && calendar.get(5) <= 2)) + LocalDateTime now = LocalDateTime.now(); + if ((now.getMonth() == Month.DECEMBER && now.getDayOfMonth() >= 16) || (now.getMonth() == Month.JANUARY && now.getDayOfMonth() <= 2)) jingleTheBells = true; - if(calendar.get(2) == 9) + if(now.getMonth() == Month.OCTOBER) dootDoot = true; } From fef08576031165819106b2168003a64697b9894b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Jan 2016 16:31:01 -0600 Subject: [PATCH 244/935] Desert, forest, fungal apothecary textures --- .../model/altar/desert/gobletBase2_bottom.png | Bin 0 -> 562 bytes .../model/altar/desert/gobletBase2_sides.png | Bin 0 -> 185 bytes .../model/altar/desert/gobletBase2_top.png | Bin 0 -> 562 bytes .../model/altar/desert/gobletBase3_bottom.png | Bin 0 -> 471 bytes .../model/altar/desert/gobletBase3_sides.png | Bin 0 -> 151 bytes .../model/altar/desert/gobletBase3_top.png | Bin 0 -> 471 bytes .../model/altar/desert/gobletBase_bottom.png | Bin 0 -> 623 bytes .../model/altar/desert/gobletBase_sides.png | Bin 0 -> 192 bytes .../model/altar/desert/gobletBase_top.png | Bin 0 -> 623 bytes .../model/altar/desert/gobletStand_sides.png | Bin 0 -> 250 bytes .../model/altar/desert/gobletStand_top_bottom.png | Bin 0 -> 244 bytes .../model/altar/desert/kelkBase2_bottom.png | Bin 0 -> 395 bytes .../model/altar/desert/kelkBase2_sides.png | Bin 0 -> 212 bytes .../textures/model/altar/desert/kelkBase2_top.png | Bin 0 -> 340 bytes .../model/altar/desert/kelkBase_sides.png | Bin 0 -> 207 bytes .../model/altar/desert/kelkBase_top_bottom.png | Bin 0 -> 255 bytes .../textures/model/altar/desert/kelkWall.png | Bin 0 -> 457 bytes .../model/altar/forest/gobletBase2_bottom.png | Bin 0 -> 471 bytes .../model/altar/forest/gobletBase2_sides.png | Bin 0 -> 177 bytes .../model/altar/forest/gobletBase2_top.png | Bin 0 -> 471 bytes .../model/altar/forest/gobletBase3_bottom.png | Bin 0 -> 408 bytes .../model/altar/forest/gobletBase3_sides.png | Bin 0 -> 137 bytes .../model/altar/forest/gobletBase3_top.png | Bin 0 -> 408 bytes .../model/altar/forest/gobletBase_bottom.png | Bin 0 -> 540 bytes .../model/altar/forest/gobletBase_sides.png | Bin 0 -> 173 bytes .../model/altar/forest/gobletBase_top.png | Bin 0 -> 540 bytes .../model/altar/forest/gobletStand_sides.png | Bin 0 -> 222 bytes .../model/altar/forest/gobletStand_top_bottom.png | Bin 0 -> 224 bytes .../model/altar/forest/kelkBase2_bottom.png | Bin 0 -> 347 bytes .../model/altar/forest/kelkBase2_sides.png | Bin 0 -> 198 bytes .../textures/model/altar/forest/kelkBase2_top.png | Bin 0 -> 319 bytes .../model/altar/forest/kelkBase_sides.png | Bin 0 -> 191 bytes .../model/altar/forest/kelkBase_top_bottom.png | Bin 0 -> 234 bytes .../textures/model/altar/forest/kelkWall.png | Bin 0 -> 423 bytes .../model/altar/fungal/gobletBase2_bottom.png | Bin 0 -> 508 bytes .../model/altar/fungal/gobletBase2_sides.png | Bin 0 -> 153 bytes .../model/altar/fungal/gobletBase2_top.png | Bin 0 -> 508 bytes .../model/altar/fungal/gobletBase3_bottom.png | Bin 0 -> 442 bytes .../model/altar/fungal/gobletBase3_sides.png | Bin 0 -> 145 bytes .../model/altar/fungal/gobletBase3_top.png | Bin 0 -> 442 bytes .../model/altar/fungal/gobletBase_bottom.png | Bin 0 -> 566 bytes .../model/altar/fungal/gobletBase_sides.png | Bin 0 -> 179 bytes .../model/altar/fungal/gobletBase_top.png | Bin 0 -> 566 bytes .../model/altar/fungal/gobletStand_sides.png | Bin 0 -> 231 bytes .../model/altar/fungal/gobletStand_top_bottom.png | Bin 0 -> 227 bytes .../model/altar/fungal/kelkBase2_bottom.png | Bin 0 -> 332 bytes .../model/altar/fungal/kelkBase2_sides.png | Bin 0 -> 203 bytes .../textures/model/altar/fungal/kelkBase2_top.png | Bin 0 -> 363 bytes .../model/altar/fungal/kelkBase_sides.png | Bin 0 -> 195 bytes .../model/altar/fungal/kelkBase_top_bottom.png | Bin 0 -> 240 bytes .../textures/model/altar/fungal/kelkWall.png | Bin 0 -> 427 bytes .../assets/botania/textures/model/altar/note.txt | 8 ++++++++ 52 files changed, 8 insertions(+) create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/desert/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/forest/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/fungal/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/note.txt diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfb30a2120ae6a515854ea0daff34b74a790791 GIT binary patch literal 562 zcmV-20?qx2P)2vz)y7yMYD@y>rewpXPF_981W{%xH(e)8$6;(JK69B5hdK++70QmO3 z5ewi$##zN#;dXUk-3C;I<;-EN;H=_9V!aKh3X7@ZuJHg^fX!pXXaVgHiJT$k%G!7E{NtR#F0^f>9x*0`v}0mDdUkj1NvjeheSQl@?uq95Ghb+g>@V7A!CgY zW8%}h!CAtewP*7fnOqvK=M~ep7H5Tz%K=gh$5}z2dSjs3hBM$<3k+OAABAvdm+$^e7bTQ^r zuPz>%07*qoM6N<$f<2`C AbN~PV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..bd2a1b41fe66cf8cb03393ac1c6c98b23fdcce87 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf_cfsfy3Y{QOV-+Oul^`U5wk`}ZuK#Jxpi=fBCX>VYP-1&6N`;9i^{ dVgLjT46QECte0lbO9I->;OXk;vd$@?2>^NGLg@ei literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfb30a2120ae6a515854ea0daff34b74a790791 GIT binary patch literal 562 zcmV-20?qx2P)2vz)y7yMYD@y>rewpXPF_981W{%xH(e)8$6;(JK69B5hdK++70QmO3 z5ewi$##zN#;dXUk-3C;I<;-EN;H=_9V!aKh3X7@ZuJHg^fX!pXXaVgHiJT$k%G!7E{NtR#F0^f>9x*0`v}0mDdUkj1NvjeheSQl@?uq95Ghb+g>@V7A!CgY zW8%}h!CAtewP*7fnOqvK=M~ep7H5Tz%K=gh$5}z2dSjs3hBM$<3k+OAABAvdm+$^e7bTQ^r zuPz>%07*qoM6N<$f<2`C AbN~PV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..77d9791867529f6456e2398e42f83002aec54f90 GIT binary patch literal 471 zcmV;|0Vw{7P)2;hyR&^Tb_h8@=jqo<^UeRyEIf5dFFt;lrOZI<6C$ubC~senSZ^aEE3B%B2wY!U zd`Nuy{7V2#4=@7rSwYh(n_a|*#Mj#cV`o@zBW`4Pw{S#-rq#hg-iuc+3jkChGjgJf zT!=C8<)#MU{hRSQplK66C|4H+cMl!_TL||nPfD=ecdqhGSZ=~O;P)RtWSo{6yGE&Y zk*f>K_q)U30>FoK4savGVs3d@2UHV9Ztx-TbLlCaA*HS{C9t`i15^{=ZV%n`y|Uc2 z-Fr$*Tt=1&*O!)671eQg{qD$H-TNFID0blxPu?}o@r^=?G;sU z)-V|xnpRm=ffv(!0J?vS530{tH;OSJ((R>gI-t#k(iv0}=G4R!*CQ+?z}JKrwdDW+ N002ovPDHLkV1mmZ!<7I4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..6a82cf041459b4a272beae62084de0dc60e7518c GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfjJ+b1$A9ZH4k8h9PGd2ofKHw`^%D9UA vo$cSot6?eEb8J8LS?NizE^cUSY-D6e*2;hyR&^Tb_h8@=jqo<^UeRyEIf5dFFt;lrOZI<6C$ubC~senSZ^aEE3B%B2wY!U zd`Nuy{7V2#4=@7rSwYh(n_a|*#Mj#cV`o@zBW`4Pw{S#-rq#hg-iuc+3jkChGjgJf zT!=C8<)#MU{hRSQplK66C|4H+cMl!_TL||nPfD=ecdqhGSZ=~O;P)RtWSo{6yGE&Y zk*f>K_q)U30>FoK4savGVs3d@2UHV9Ztx-TbLlCaA*HS{C9t`i15^{=ZV%n`y|Uc2 z-Fr$*Tt=1&*O!)671eQg{qD$H-TNFID0blxPu?}o@r^=?G;sU z)-V|xnpRm=ffv(!0J?vS530{tH;OSJ((R>gI-t#k(iv0}=G4R!*CQ+?z}JKrwdDW+ N002ovPDHLkV1mmZ!<7I4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..80dc4fb6d9361ae0430a69ad4504f1be7da5b8dc GIT binary patch literal 623 zcmV-#0+9WQP)PC=4-m@iF%2iyIpil?RbnVkw6!; z#3e`&Z@_b3zdV|%(e=julu+N{b)RUPir@tqr^H$?gHxxdLhapzKm@Mm75h`>aLPCb zs>a{VfDFk9UZw|Tkk$CJ85r*XHoJs~W3>zbY!8_@6a4m&sRV{(s6r(U0M#;Oy-hd= zAK%vusZg6oxga$}ToGp;g{Oyr2#7$OxoOJh=SWsAniNF+U-_FE;FIyX&(y(D2glPx&F+{vbxPMOGICrk14A;Lqj*c%iRHrcys8;b z&KHNyN_SRdv@t6*S2DQ}ykmdLtapiHr^H&O4IEu+n+iX2Jie6-#9C;sN_bxPiQCps zA4W<&BHS%JO%(h*3a|UjkZiJN43#)XeNp_}>lCWZCBfT6=0BuJOQs`G4+sDN002ov JPDHLkV1jNx8HE4< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..57c2fab9fdda57f3e1520eaaa78d434b9110b9aa GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfJ}Y5)KL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..80dc4fb6d9361ae0430a69ad4504f1be7da5b8dc GIT binary patch literal 623 zcmV-#0+9WQP)PC=4-m@iF%2iyIpil?RbnVkw6!; z#3e`&Z@_b3zdV|%(e=julu+N{b)RUPir@tqr^H$?gHxxdLhapzKm@Mm75h`>aLPCb zs>a{VfDFk9UZw|Tkk$CJ85r*XHoJs~W3>zbY!8_@6a4m&sRV{(s6r(U0M#;Oy-hd= zAK%vusZg6oxga$}ToGp;g{Oyr2#7$OxoOJh=SWsAniNF+U-_FE;FIyX&(y(D2glPx&F+{vbxPMOGICrk14A;Lqj*c%iRHrcys8;b z&KHNyN_SRdv@t6*S2DQ}ykmdLtapiHr^H&O4IEu+n+iX2Jie6-#9C;sN_bxPiQCps zA4W<&BHS%JO%(h*3a|UjkZiJN43#)XeNp_}>lCWZCBfT6=0BuJOQs`G4+sDN002ov JPDHLkV1jNx8HE4< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..349184a72650be0cf28564fb1a5bf11e8d640a5d GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfpSIj$8BL)W7St zUv=7Ww_=W-^0d7P5!Q3om+yJp{Bzh4+LNgY%w22GS+g0}KF@q8d(d-@*=vc%&I_}A<2aXTI&J>( x?n|L=9OtCqmIYG!HIJq~uxD@m`25)e>_{D=am2iU2yE!PC{xWt~$(697M`V^9D9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..92eacd2f96fdc50608742e0ea92c992137a63c58 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU#0Te|u4O1DKUzKiF+|1V|N(4X*_|DVGYjkY=Iis_42ZYf#SpC}pe7KWWPZsurVIDK~QRdgSCPg4N;V^?xe0$8J%EdmM%67eB&-d;aWrXFJy)|5=6 zH#4n#q&IRbmO`gx8BQE|AvEg=BJqDf;e?|`!u3TJfX{ir`N-RF#pBBo5lD0yP>Rq! zNjYj7o?dgTQCxK^gb>McVU`8PQ;!dEw*zYw@52?dEYNOQ-UchQRs@MO4icA4#-gx>)D`F0D6mq*ifulJ4%HKlZtFEIeEz@yud#EHeUg_FPmDCuF^g1cd9j8hB1WV!;Nx35sr+YVUo6sMMD zZ0otv0wulOfMjKf=2>m75>y&ZQqDu;%$!2~L){Ftq2V~$oD?w%x?XU>vuL|wt( z^@yK~oUfl8C_7iG&Q0?Mpjy5-)hrXs<7*i=>}lrTCHSOK(*cY>%I~^;is=L``aMlF m%NV_<@_CQ?o5LN*A+Y_NVxo;lCXj0;C+U^DRyOoOP6`bt#bD@x;a<5>dEWY z>06l-o|#;GrZ7=0seae0`p<&-_svevJg(97AW+h<HY_qu}z7!C-RP19y|-DqD5bP%;r=7}Yo#Id?FqZn^W{z=Y$7TGOFrK5a@JOB1A`?nKW2nsW1l{!HIp zj1Ov7+A9?Px>#S#dP7{aGA$rip|C4^KU0$4mjGJDI*1HFK=s($!XxeOmG9e8UXw13#l4zdn#vzF0%r<9?q+@obBw y8n)eEdu>c}_(T`)19JARi8Ov@zyD)=0sH5&BO|VDNPHb6Mw<&;$USs$eDn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..045cde5604dc52ec0982d04c6ede675c90a3683c GIT binary patch literal 457 zcmV;)0XF`LP)6h%*cx^aXpEE6CY2{Bl2B#0FSJ zq%er&NPuMz9FD-OkLGaz{0&y07kiM*w{LGK^0n1Hi>;j`xwJ2^34u(gd83 zT%8|qcmFE3@Bet53VnMsh^7u$7dbo5C|7~eYen~iV*c)t5<0nLGIu1II-ryQKwB5F zF48+xEKOiMvvhLF;7Bt($pLtoT1*uh1M4E0-WX(BP?R14_z-bEa&fwTI9oWh7GzrB zy=V-I(l-VYpmvexiKScx&ITFd*?MB{P!U2qEva@9B{v3@4fMN;>&p%R^LLMRkw4>_ zpTAdx07?of+eR=|K+5%54?pJgdzz<_A=84Z;lV#!m@Ztig`^Y_K&RF0qsiQnrxIa* z4l*sMU2IEC91M;$xwoZ(ojFLk|EvB26mctmMUx+500000NkvXXu0mjfQEs}! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ef040a6e558827dc05d6a485befb2eef09cb34b7 GIT binary patch literal 471 zcmV;|0Vw{7P)mGx+m^(_>F%%w ztz2c*m;Qf(e=Gs`_Wf&kcL1hy!Dh!6Ly{mOtbd|HyLB`v06%~Hk_-?YND?$Dx7V3| zHxQ`j0t%9Zu%O-g81gBzypMMVHq~YwTgEg3=4+##%O-fdRNR6-8=3_G1rQPHxsa!{ z8E`$LI%92Yr&+dP8K5slSdfa+XCoEe zHu3I=3jJ=lIhqvn;CQLKh4$X*vr$f&ARk6i4^?U$CxxX#snjpq>cpzQ{!h?KBw2vo@fGtir zWkO@40Z>0b(5@B$a!u6p^w*R%$Tgd-Vt?v0MmHx-N_cF+**q*gAJ2M`n}z$^LYjvE z@IZ@_Yr?zJZk=+>=tEF5cn>r`ZLspUHkiwU!kUL>LCd~bnnwSBsXzN>+OLG01S9|e N002ovPDHLkV1f%J$tVB- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f84f76131401fe6e73207d553204146231101a GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfs({_Fgib4L!GI(q2C<0T|DSbKPYV38Elf6tAQ zYX5#dHP_nd;4tmEy{6gW8|(9H7EI!mGx+m^(_>F%%w ztz2c*m;Qf(e=Gs`_Wf&kcL1hy!Dh!6Ly{mOtbd|HyLB`v06%~Hk_-?YND?$Dx7V3| zHxQ`j0t%9Zu%O-g81gBzypMMVHq~YwTgEg3=4+##%O-fdRNR6-8=3_G1rQPHxsa!{ z8E`$LI%92Yr&+dP8K5slSdfa+XCoEe zHu3I=3jJ=lIhqvn;CQLKh4$X*vr$f&ARk6i4^?U$CxxX#snjpq>cpzQ{!h?KBw2vo@fGtir zWkO@40Z>0b(5@B$a!u6p^w*R%$Tgd-Vt?v0MmHx-N_cF+**q*gAJ2M`n}z$^LYjvE z@IZ@_Yr?zJZk=+>=tEF5cn>r`ZLspUHkiwU!kUL>LCd~bnnwSBsXzN>+OLG01S9|e N002ovPDHLkV1f%J$tVB- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..63362c09df0df9938fe6aff86783b2b1f1f1439b GIT binary patch literal 408 zcmV;J0cZY+P)QRrP0J@K`pSf%{*>*I>*aEQYjSiGT~oKuEWRAr_iK$br7({Iou7b=ZYqwP6h(wsmCq&^6*UnbaN7+KNf6t zY<38E`96_~QfEW6a=0IG3v971LB0;dO}Eb#ZPuiO2Txzm0KB^&_6Bt^!h-%-m>*XF zQm3ph6{1ygb2MGvF4`)r&y_kGWz4+)G&0qc`vjVm;kILau7n4Y zgz#W~T*+OcVuZCf&9XNDn0_pzUa`fun0Ww18{`j#IvKY3zCw6xo$LHc*%l`ieX|Ww z*&6`lKG7dL2;O``pd51J@rQP6baPUt?Qm%DY<8kHE}8|ee}OptTu5E(A0B8?a-Z<( ztmjG@GkP)9-^gtht{rW4LRBlMbP0l+XkK*N-XO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..63362c09df0df9938fe6aff86783b2b1f1f1439b GIT binary patch literal 408 zcmV;J0cZY+P)QRrP0J@K`pSf%{*>*I>*aEQYjSiGT~oKuEWRAr_iK$br7({Iou7b=ZYqwP6h(wsmCq&^6*UnbaN7+KNf6t zY<38E`96_~QfEW6a=0IG3v971LB0;dO}Eb#ZPuiO2Txzm0KB^&_6Bt^!h-%-m>*XF zQm3ph6{1ygb2MGvF4`)r&y_kGWz4+)G&0qc`vjVm;kILau7n4Y zgz#W~T*+OcVuZCf&9XNDn0_pzUa`fun0Ww18{`j#IvKY3zCw6xo$LHc*%l`ieX|Ww z*&6`lKG7dL2;O``pd51J@rQP6baPUt?Qm%DY<8kHE}8|ee}OptTu5E(A0B8?a-Z<( ztmjG@GkP)9-^gtht{rW4L4lA|DiSrl3iOA*@MT9npD0izxgG7^6b&X>2D==ppofDWW0!u%9$zE$?vA*(6ZpUco? z>j$FnK#O3@>ok;a!SqsDUgh8&KF-JAZRpcZeRibgTPJ%`s}jcM2di1K*fD3fAyIVdf!6TS`9mXX*}XkUJq zXxKTZS0nW~x}vBl^Y@BBhN04P4AbVqe4CCAM+k>DM?6Ii4|)r9A7k{OOs93F2z?!t zPV=0OM8KAU?Hv0SV<+n18y>W~Q!j=-KU5puP=k6gY%W--!*St>7JCf{;)E9Rf z^RDuwST`~&v%?K!HtobnL*JY^pV~! RXKSE+44$rjF6*2UngHc&I^+NV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..14ee8eceed82256ac88ae517a61cdb3a27f36a0a GIT binary patch literal 540 zcmV+%0^|LOP)4lA|DiSrl3iOA*@MT9npD0izxgG7^6b&X>2D==ppofDWW0!u%9$zE$?vA*(6ZpUco? z>j$FnK#O3@>ok;a!SqsDUgh8&KF-JAZRpcZeRibgTPJ%`s}jcM2di1K*fD3fAyIVdf!6TS`9mXX*}XkUJq zXxKTZS0nW~x}vBl^Y@BBhN04P4AbVqe4CCAM+k>DM?6Ii4|)r9A7k{OOs93F2z?!t zPV=0OM8KAU?Hv0SV<+n18y>W~Q!j=-KU5puP=k6gY%W--!*St>7Jt1}Q z*(2cRWdE$D{eHeMql1Q$-nOR~8LXf6HZWaR>SXAzR24{8oZY>V0=(DE|2Uoy@=e&GUCOo9EnJsKoq5 Rx&Y`v22WQ%mvv4FO#r7>QVjqA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e8c563d731d79c40d53534fadadc217cd17fad1c GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfaSXBO zeLKOLuh~F=_4sRkdrjYW^*dq|0!2Cuj#;o8^6v2RT2>`xYnv(VSLgQhLfq>oR?c(8 zro?SEYkJS@{;#lFlVLLZt8V9>L)+q~KB)cfI)9=}jeNi+v7;QBo;RYz|K=SqtFrdk z;?yH>EaJ=VMho2u3OvS}(qF?cv)ora Ue5uehpc5H9UHx3vIVCg!0Ld;;lmGw# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f518b7cb3b9abe8c957b4f07cf096fea5a805940 GIT binary patch literal 347 zcmV-h0i^zkP)*$@%B`<-xl9$nhf)*9~Sy>NCD^ltDqjN5|Xi?$j5~1I!FlBeb5HE9o=i zqocVEbaxSew9hkwS%8R8(liO1UbmeZ^RXaKaDE1jTkcfLgk6%-ZW_j~f|g2XJys1_ z1k6{cMqD?uOI@c zA5ZwhZbY1bP4>kLKDx^RWzds6fY5pJpR36j;e+x{X=o(^$nmnkeDPMtp@-A002ovPDHLkV1j_wlxzS1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..6a33c2a9b215ebb0607481e831b0f76e9ead2893 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfUh9V8)kT>>RO`;5(5)1A>V~~HbckkC&8O^X1%Y*WVZ&({$P}$^d zu!4iZS8cY!?I%Th*u4#RZ?S)qGjo}DNKe;^ZuPCJuu06U^M4v!FTgB=1GWyIEP)eDZ+xIXG)tYK& z$SI?=nkAS4Lx`F;t{Q%hMbe#Xz R4kiEq002ovPDHLkV1g6zhdlrQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..3f50ca2e0d74b94cbb2a6c42237800092b6a3efe GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfTBG;nNnIqqjGfw;}h# z@uPY>;?;GH?LTgPTVW^Bs4^!{IPZF+s1#4~^IxabSX1L2CKL;$_R8}lr!%+)TdH#` lVu_r5{O!;CY|_#U`AaL+SuYp7bOXA8!PC{xWt~$(69882Kr8?N literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..c1515edee2698eaeacbef82ea6fd36bd99a03b3f GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfqo=HgM#fYFKjKvbab+} f{dsQwkNMtG>*%SQ?Z1`+9n0Y9>gTe~DWM4f(GghL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..3b5ae72e031417950fd1e1dcdc8a1948e911efd6 GIT binary patch literal 423 zcmV;Y0a*TtP)^+HUrpd1oF0_*WT3;iSXV&{EM<(XCR|7|#ZNUf;^&`r9AB zBz*jGYPD3X8r@N(BqgmfK03-qLBMy8?R{oaEfsMBKrk~*jnI2)uB7{n?;LRq4DUJs z(w|J#Ivbc8&hHFFgpyh(ti55;KIVslIKg?rs>}u@DY7$gZ6qVDG9@Yfab)|qprsOe zk5!wC_Ytf$1j3ZPdmGrSwymod^6vr${UU;ZRofeAC5UeZ{h}ibp7nBri16k^|KtjJ zUFIuHnj*ef=U?C3#kVs92=IIkoR_wT{Sq4oaSW8CtnU)#LFe%&4nAF;8-RErj)8fC zLpd4y)KpewC9CSzV{|1M0Fy($#{R5XN8PvVu Ro&f*=002ovPDHLkV1fbzwXy&J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..782cbc3e204554060c479f70e3edc6008f9adeaf GIT binary patch literal 508 zcmV?;fqTEetiFFwHC~bc|4O#B;|;RA|ljUT6s(xstz;b_n%+l0ctIXDBd~V z*H`wq0kBL@hzKHzStX|9d>T$%!v_E!Ag0iYQjQn~z%_iZOizS;MMPMp%dKXo^F06x zAfn9U8SgsG47q(~Moa?r^lv+5=7uM|^0H^*&X1uSj2c1>C z>l%Rv$R%M`aq5na>JL0sO366q+2cm31yv>G$a#5rSP1({Oo5@FS*8o)Fyox(G(RIE zH!=5VANKVjaQB#UB;_3urPjhVe9-xxc|7CPp*Qa;O11j1aQE2xfs`X5UNJLz8|Zw` zy1g;>$E{snrYBO4{|gMv-I*<`+<+))H9DKRFpk#RIAjQ0ipAK yi@go;?y=NzOj-`iTv8)(&bLR^`JugwFR#D1LH3Q|%LkzV0000gH4}{gF4Ya(n|EV8Un_=?;fqTEetiFFwHC~bc|4O#B;|;RA|ljUT6s(xstz;b_n%+l0ctIXDBd~V z*H`wq0kBL@hzKHzStX|9d>T$%!v_E!Ag0iYQjQn~z%_iZOizS;MMPMp%dKXo^F06x zAfn9U8SgsG47q(~Moa?r^lv+5=7uM|^0H^*&X1uSj2c1>C z>l%Rv$R%M`aq5na>JL0sO366q+2cm31yv>G$a#5rSP1({Oo5@FS*8o)Fyox(G(RIE zH!=5VANKVjaQB#UB;_3urPjhVe9-xxc|7CPp*Qa;O11j1aQE2xfs`X5UNJLz8|Zw` zy1g;>$E{snrYBO4{|gMv-I*<`+<+))H9DKRFpk#RIAjQ0ipAK yi@go;?y=NzOj-`iTv8)(&bLR^`JugwFR#D1LH3Q|%LkzV0000RA$VLH#-2_9k~Q^cSHgr0e9#1_zQRA>G982UZq^ag;2NXjS7jM@s#8X*McG%kRp!kk8Ond#!1!|s{w!y~GZp+6uZgrJC= zlbPFn0@cW_e_~1_aE@-)IL&|P;tFcUtl>Bs;yu9Kc^iMz#Wkg7=6u54S^1hSt`HH1 zeoxBNjl`t_Ko?i!GLg%SyDx53BT+k2o(Ms2{=qxIntrpx+?Kw6sk2#c8Tte7X8~N# z*sRg%YI&d`QfgvOBcC!IEGmC zCZ{woDb{`bpR-1WXU>}#9{K%yk`q!BlOLo!Py6xZt1YwHNA~l121WtQ2Ye+<8JBT$ n?0oj`^6M*w2Q?&Ed4PbyJ;sDJ*yMZ^&`btTS3j3^P6RA$VLH#-2_9k~Q^cSHgr0e9#1_zQRA>G982UZq^ag;2NXjS7jM@s#8X*McG%kRp!kk8Ond#!1!|s{w!y~GZp+6uZgrJC= zlbPFn0@cW_e_~1_aE@-)IL&|P;tFcUtl>Bs;yu9Kc^iMz#Wkg7=6u54S^1hSt`HH1 zeoxBNjl`t_Ko?i!GLg%SyDx53BT+k2o(Ms2{=qxIntrpx+?Kw6sk2#c8Tte7X8~N# z*sRg%YI&d`QfgvOBcPEwUEOSn6)?F)cBKdDDSL=X{rZ`igks2cUy5fNHD=)F;o zoz^O9O&*&P~++WM4PC`&e00j+V%zQy&yCwp$jQ`B(>g)JTXzRQ zRq4GG!kNOK*C(wvRF!%Z^88>*8Qu1UQa7fQx!*pRr%VXOBYz(#(I!;Gs8s{*&a!@D zAsEm6gLPj3M?~qp@!GzKmY7loAZVcXhU2IxA=v5FrSZ(Uu$33?PV$LpiDmsH#hEGH z26~>K9IY}>Gj>u;l)4VnfcJxph_IIx)qrZ?e)~qL=Rmbq(Mw~VpLFj-r@!UQ)162D zKBjK~9Q8Ey|1rjp#>4RbAKSiAk3zIGCJ;bGPIH&_lX~o9jDs3^exRc4Wu<$k_X7~3 zC9c?~l!=xw3z5C7Cmm4`#;3ZNgkbdEMx>>lo|L-s7aC$o74d3c_y7O^07*qoM6N<$ Ef~rgn%K!iX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..0f8f20680043cefb7ec7defd44d3bc99b0009c96 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfgH0?Ox(FtGmr|36(}y02h@i1@U> z{#}zV9-YZ{PEwUEOSn6)?F)cBKdDDSL=X{rZ`igks2cUy5fNHD=)F;o zoz^O9O&*&P~++WM4PC`&e00j+V%zQy&yCwp$jQ`B(>g)JTXzRQ zRq4GG!kNOK*C(wvRF!%Z^88>*8Qu1UQa7fQx!*pRr%VXOBYz(#(I!;Gs8s{*&a!@D zAsEm6gLPj3M?~qp@!GzKmY7loAZVcXhU2IxA=v5FrSZ(Uu$33?PV$LpiDmsH#hEGH z26~>K9IY}>Gj>u;l)4VnfcJxph_IIx)qrZ?e)~qL=Rmbq(Mw~VpLFj-r@!UQ)162D zKBjK~9Q8Ey|1rjp#>4RbAKSiAk3zIGCJ;bGPIH&_lX~o9jDs3^exRc4Wu<$k_X7~3 zC9c?~l!=xw3z5C7Cmm4`#;3ZNgkbdEMx>>lo|L-s7aC$o74d3c_y7O^07*qoM6N<$ Ef~rgn%K!iX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..a22955e82f014d868bdb02e972eeecccc18dc13f GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfqg4_RI?5=SR z&D&|e{z;@`=(~zNc|IRMKTTm!S}F1R{oT8T-(BsDCOByyJ~Ls<33j%*+54aUIB{Uo zifKpYJQh}Fn88`#bRw*c) eb@Ke%gX~Z5%vCB5W_1U;l)=;0&t;ucLK6V+8eww) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..5ff259635a48b4f9d7ea2382ba779800b2d690c2 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf7i8qzVoq4InH1wiA z*POM2KXrnFyu3b7Idut0DbB)G^GQqr z5g}VUjJ9ZPW({UHr8Guc_Voti*t?`GM-t)vfKci5_p22jNq?#5=|W1iZKn8^CeAJ zlO&O6Gr(}p-v)>z=6T6>y*s*&9jZdzeDYDfVrDou`L^i_%W^}W&H1X|@jkFBwwM`X z8b~tG4GpStJArearrR@&9p!wiceeyS-Rdk#%W`Qd5++=2ix7ofo?g2G{NJ=`_m~P@0~(kpEZS qhvjwu60pgx0O$pAuw$-`ezW!kpjPY!TPC zFuUE3{nxGCV96@=T2QcOTl9?ej=kRXyPjMt&BzT{TgASL l>l3F%TwC*T|NRP%xK!!b=O-(s{s%gl!PC{xWt~$(696v6UTpvX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..70068a94bc094696a55ab5e62a5f48a1f683e911 GIT binary patch literal 427 zcmV;c0aX5pP)*=s7Bi6f++@e{g%>KjG;$F@I^^K?#N0>5fK1r*JrbyxZ!N9qKFpU71CCrRvy8`%^z)?7lnau`a8WC{-xa_#=w@fk6)=Tz7 zN7P7FE&!W{PZQ({PBl_jEmxP%4qK;zl$37&n_t_Xm>D8+zk(hO{IXq9l{K4gjdKMT z&DFgx3}HWiAuCt>Z@qr;&aPj6FaQq^=b&&NP4Rfd%)z2+m||elt(oG;FdpJ(4&Gni z7=VbQu3F{<=W>v@iU?I%9}UjsAkW=>|04Mw58@yvIF$p=<{ Date: Sun, 17 Jan 2016 16:41:37 -0600 Subject: [PATCH 245/935] Fix crash and possible desync in flash lens. Closes #47 --- src/main/java/vazkii/botania/common/item/lens/LensLight.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 69dcde589..65d2d9949 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -26,7 +26,7 @@ public class LensLight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if((pos.getBlockPos() == null || !coords.equals(pos.getBlockPos())) && !burst.isFake() && !isManaBlock) { + if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); Block blockAt = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); From dda3151b735477176719382e941bfcf99a9778af Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Jan 2016 17:30:01 -0600 Subject: [PATCH 246/935] Fix piston lens not working properly. Serverside some of the other lenses where safe --- .../java/vazkii/botania/common/item/lens/LensDamage.java | 4 +++- .../vazkii/botania/common/item/lens/LensExplosive.java | 4 ++-- .../java/vazkii/botania/common/item/lens/LensFire.java | 4 +++- .../vazkii/botania/common/item/lens/LensFirework.java | 4 ++-- .../vazkii/botania/common/item/lens/LensInfluence.java | 4 ++-- .../java/vazkii/botania/common/item/lens/LensMine.java | 2 +- .../java/vazkii/botania/common/item/lens/LensPaint.java | 7 +++---- .../java/vazkii/botania/common/item/lens/LensPiston.java | 8 ++++---- .../java/vazkii/botania/common/item/lens/LensStorm.java | 4 ++-- .../java/vazkii/botania/common/item/lens/LensWeight.java | 5 ++--- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 56a6f4980..742da7a8f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -24,6 +24,8 @@ public class LensDamage extends Lens { @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { + if (entity.worldObj.isRemote) + return; AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { @@ -34,7 +36,7 @@ public class LensDamage extends Lens { int mana = burst.getMana(); if(mana >= 16) { burst.setMana(mana - 16); - if(!burst.isFake() && !entity.worldObj.isRemote) + if(!burst.isFake()) living.attackEntityFrom(DamageSource.magic, 8); break; } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index 4d1073fab..a78e785e8 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -21,9 +21,9 @@ public class LensExplosive extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!burst.isFake()) { + if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) + if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, burst.getMana() / 50F, true); } else dead = false; 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 3bbd70caf..25b1954e1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -18,6 +18,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; @@ -26,7 +27,7 @@ public class LensFire extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { EnumFacing dir = pos.sideHit; BlockPos pos_ = pos.getBlockPos().offset(dir); @@ -39,6 +40,7 @@ public class LensFire extends Lens { else if(blockAt == ModBlocks.incensePlate) { TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos.getBlockPos()); plate.ignite(); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(plate); } else if(blockAt_.isAir(entity.worldObj, pos_)) entity.worldObj.setBlockState(pos_, Blocks.fire.getDefaultState()); } 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 b70af9f32..85f642b34 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -25,9 +25,9 @@ public class LensFirework extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!burst.isFake()) { + if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { + if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { ItemStack fireworkStack = generateFirework(burst.getColor()); EntityFireworkRocket rocket = new EntityFireworkRocket(entity.worldObj, entity.posX, entity.posY, entity.posZ, fireworkStack); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index c2730607c..5d23b7e6f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -30,13 +30,13 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); + List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); movables.addAll(entity.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range), Predicates.instanceOf(IManaBurst.class))); - for(Entity movable : ((List) movables)) { + for(Entity movable : movables) { if(movable == burst) continue; 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 05da5ad08..97343ee5d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -36,7 +36,7 @@ public class LensMine extends Lens { World world = entity.worldObj; BlockPos pos_ = pos.getBlockPos(); - if (pos_ == null) + if (world.isRemote || pos_ == null) return false; Block block = world.getBlockState(pos_).getBlock(); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 299398df9..4c284ed28 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -32,7 +32,7 @@ public class LensPaint extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { int storedColor = ItemLens.getStoredColor(stack); - if(!burst.isFake() && storedColor > -1 && storedColor < 17) { + if(!entity.worldObj.isRemote && !burst.isFake() && storedColor > -1 && storedColor < 17) { if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { int r = 20; EnumDyeColor sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); @@ -72,14 +72,13 @@ public class LensPaint extends Lens { IBlockState stateThere = entity.worldObj.getBlockState(coords); if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor) { - if(!entity.worldObj.isRemote) - entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); + entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); int hex = placeColor.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.3F, 5); + Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.3F, 5); // todo 1.8 noop right now due to serversiding } } 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 29f838325..7f7ecf35e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -24,12 +24,12 @@ public class LensPiston extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock && !entity.worldObj.isRemote) { - BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); + if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit.getOpposite()); if(entity.worldObj.isAirBlock(pos_) || entity.worldObj.getBlockState(pos_).getBlock().isReplaceable(entity.worldObj, pos_)) { - IBlockState state = entity.worldObj.getBlockState(pos_); - TileEntity tile = entity.worldObj.getTileEntity(pos_); + IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); + TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); if(state.getBlock().getMobilityFlag() == 0 && state.getBlock() != Blocks.obsidian && state.getBlock().getBlockHardness(entity.worldObj, pos_) >= 0 && tile == null) { entity.worldObj.destroyBlock(pos.getBlockPos(), false); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index a821278b6..0b30f2933 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -20,9 +20,9 @@ public class LensStorm extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!burst.isFake()) { + if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) + if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 5F, true); } else dead = false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index a544e11ae..5b7b61e04 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -23,7 +23,7 @@ public class LensWeight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!burst.isFake() && pos.getBlockPos() != null) { + if(!entity.worldObj.isRemote && !burst.isFake() && pos.getBlockPos() != null) { int harvestLevel = ConfigHandler.harvestLevelWeight; Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); @@ -33,8 +33,7 @@ public class LensWeight extends Lens { if(blockBelow.isAir(entity.worldObj, pos.getBlockPos().down()) && block.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), entity.worldObj.getBlockState(pos.getBlockPos()), null)) { EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, state); - if(!entity.worldObj.isRemote) - entity.worldObj.spawnEntityInWorld(falling); + entity.worldObj.spawnEntityInWorld(falling); } } From eb28396d98d5282d94a88e37d1425f24e75ba123 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 10:31:05 -0600 Subject: [PATCH 247/935] Fully fix contributor fanciness renders. Fix mana gun not being held like a tool in third person --- .../botania/api/item/IBaubleRender.java | 2 +- .../handler/ContributorFancinessHandler.java | 29 +++++++++++++------ .../assets/botania/models/item/manaGun.json | 2 +- .../botania/models/item/manaGunClip.json | 2 +- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 3802dfded..44d467909 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -50,7 +50,7 @@ public interface IBaubleRender { } public static void translateToHeadLevel(EntityPlayer player) { - GlStateManager.translate(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); + GlStateManager.translate(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.25 : 0), 0); } } 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 a77e46ce9..a05c7fd9e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -48,6 +48,15 @@ public final class ContributorFancinessHandler implements LayerRenderer Date: Mon, 18 Jan 2016 11:30:13 -0600 Subject: [PATCH 248/935] Fix mana tablets and terrasteel helm will rendering --- .../client/core/handler/BaubleRenderHandler.java | 13 +++++++++---- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) 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 d4b83f80b..6d8d2f8ec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -106,10 +106,15 @@ public final class BaubleRenderHandler implements LayerRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); boolean armor = player.getCurrentArmor(1) != null; - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.25F, -0.85F, renderedOne ? armor ? 0.2F : 0.28F : armor ? -0.3F : -0.25F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.rotate(90, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); + + if (renderedOne) + GlStateManager.translate(0F, armor ? 0.20F : 0.18F, -0.25F); + else + GlStateManager.translate(0F, armor ? -0.39F : -0.35F, -0.25F); + + GlStateManager.scale(0.75F, 0.75F, 0.75F); GlStateManager.color(1F, 1F, 1F); int light = 15728880; 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 2d42480f9..21edc3c0c 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 @@ -109,7 +109,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.26F, 0.15F, -0.39F); + GlStateManager.translate(-0.26F, -1.45F, -0.39F); GlStateManager.scale(0.5F, 0.5F, 0.5F); IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); From 177f50ca6139d62d52a4e6c0d24c6402e319d158 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 11:45:07 -0600 Subject: [PATCH 249/935] Bandaid for more client chunk unload crashes >.> --- .../vazkii/botania/common/block/tile/mana/TileSpreader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 56bec53a5..67518be86 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 @@ -181,7 +181,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, for(EnumFacing dir : EnumFacing.VALUES) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); - if(tileAt instanceof IManaPool) { + if(worldObj.isBlockLoaded(pos.offset(dir), false) && tileAt instanceof IManaPool) { IManaPool pool = (IManaPool) tileAt; if(wasInNetwork && (pool != receiver || isRedstone())) { if(pool instanceof IKeyLocked && !((IKeyLocked) pool).getOutputKey().equals(getInputKey())) From cec10471fb9cc2f90153789cec2987633da8c88d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 12:15:56 -0600 Subject: [PATCH 250/935] Fix two multiblock crashes, closes #48 --- .../botania/client/core/handler/MultiblockRenderHandler.java | 2 +- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 3 --- src/main/java/vazkii/botania/common/item/ItemSextant.java | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) 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 b4384a73d..df5f30c45 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -86,7 +86,7 @@ public final class MultiblockRenderHandler { public static void setMultiblock(MultiblockSet set) { currentMultiblock = set; anchor = null; - angle = EnumFacing.DOWN; + angle = EnumFacing.SOUTH; Minecraft mc = Minecraft.getMinecraft(); if(mc.theWorld != null) 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 10ae747af..021feaa71 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -395,9 +395,6 @@ public class ClientProxy extends CommonProxy { if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1)) mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); - - if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == iradius - 1) - mb.addComponent(new AnyComponent(new BlockPos(xp - x, 1, zp - z), block.getDefaultState())); } MultiblockRenderHandler.setMultiblock(mb.makeSet()); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 2e06cff7e..764208d33 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -171,11 +171,10 @@ public class ItemSextant extends ItemMod { @Override public Map createRotations() { Map ret = new EnumMap<>(EnumFacing.class); - for (EnumFacing e : EnumFacing.HORIZONTALS) { + for (EnumFacing e : EnumFacing.VALUES) { ret.put(e, this); } return ret; - // return new Multiblock[] { this }; todo 1.8 verify, this was only the first direction } } From 4df1d500ed78b1f51f8466d1fe9590d7a5ca4a2e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 12:45:52 -0600 Subject: [PATCH 251/935] Remove unnecessary face from creative pool item json --- .../resources/assets/botania/models/block/pool_filled.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/pool_filled.json b/src/main/resources/assets/botania/models/block/pool_filled.json index 0ea2aafc8..c02fa6f95 100644 --- a/src/main/resources/assets/botania/models/block/pool_filled.json +++ b/src/main/resources/assets/botania/models/block/pool_filled.json @@ -70,8 +70,7 @@ "from": [ 1.0, 7.0, 1.0 ], "to": [ 15.0, 7.0, 15.0 ], "faces": { - "up": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + "up": { "texture": "#liquid", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } } } ] From f87e2373f80eea644031b7a230532b27715b8dcb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 13:22:54 -0600 Subject: [PATCH 252/935] Tiny planet bauble render --- .../botania/client/core/handler/BaubleRenderHandler.java | 3 +++ .../botania/common/item/equipment/bauble/ItemTinyPlanet.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 6d8d2f8ec..9eaa84e4b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; @@ -80,6 +81,7 @@ public final class BaubleRenderHandler implements LayerRenderer { ItemStack cosmetic = attachable.getCosmeticItem(stack); if(cosmetic != null) { GlStateManager.pushMatrix(); + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, player, type, partialTicks); GlStateManager.popMatrix(); @@ -89,6 +91,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(item instanceof IBaubleRender) { GlStateManager.pushMatrix(); + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, player, type, partialTicks); GlStateManager.popMatrix(); 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 ee0a498b1..b91483524 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 @@ -105,8 +105,8 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.translate(0.25F, -0.5F, 0F); GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0, -1.5F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F); } } From 9b2fa9de65d442d572c8139e5e2388e8b20d668f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 14:11:21 -0600 Subject: [PATCH 253/935] Monocle baubles render --- .../botania/common/item/equipment/bauble/ItemMonocle.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 c50311882..8472fc5b3 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 @@ -50,10 +50,9 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm boolean armor = player.getCurrentArmor(3) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.35F, -0.1F, armor ? -0.3F : -0.25F); - GlStateManager.scale(0.35F, 0.35F, 0.35F); + 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); Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } } From 86ce88f0683d425f4a36972d1bf345d704b62eb7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 14:55:28 -0600 Subject: [PATCH 254/935] Diva charm and golden laurel baubles render --- .../common/item/equipment/bauble/ItemDivaCharm.java | 7 +++---- .../common/item/equipment/bauble/ItemGoldenLaurel.java | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) 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 616f5b3b9..1e04a6824 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 @@ -100,10 +100,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble boolean armor = player.getCurrentArmor(3) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + 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); Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON); } } 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 33ad02e67..43fe0981d 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 @@ -67,13 +67,11 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { boolean armor = player.getCurrentArmor(3) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(-100F, 1F, 0F, 0F); - GlStateManager.translate(-0.5F, -0.55F, 0.3F); + 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); if(armor) { - GlStateManager.scale(1.1F, 1.1F, 1F); - GlStateManager.translate(-0.05F, -0.1F, 0F); + GlStateManager.scale(1.1F, 1.1F, 1.1F); } Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); } From fef9f1b406e0a911b7bd9f3ed01d2125ac8bd0d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 15:12:57 -0600 Subject: [PATCH 255/935] Flugel tiara bauble render --- .../vazkii/botania/client/core/handler/MiscellaneousIcons.java | 2 +- .../botania/common/item/equipment/bauble/ItemFlightTiara.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 e14a6ccd5..52e0ee6a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -137,7 +137,7 @@ public class MiscellaneousIcons { tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; for (int i = 0; i < tiaraWingIcons.length; i++) { - tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + i, "items"); + tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + (i + 1), "items"); } terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items"); 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 7ea631c70..b70fc9c63 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 @@ -465,6 +465,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(player != null) Helper.translateToHeadLevel(player); + GlStateManager.translate(0, 1.5F, 0); GlStateManager.rotate(30, 1, 0, -1); GlStateManager.translate(-0.1F, -0.5F, -0.1F); if(player != null) From a13d6fca53513b4785bb6d2f1c9372d8492b60a4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 15:16:48 -0600 Subject: [PATCH 256/935] Sideonly some things --- .../java/vazkii/botania/api/mana/IPoolOverlayProvider.java | 3 +++ .../vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java | 3 +++ .../java/vazkii/botania/common/block/mana/BlockManaVoid.java | 3 +++ .../botania/common/integration/buildcraft/StatementBase.java | 3 +++ .../common/integration/buildcraft/TriggerManaDetector.java | 3 +++ .../common/integration/buildcraft/TriggerManaLevel.java | 3 +++ .../integration/buildcraft/TriggerRuneAltarCanCraft.java | 3 +++ 7 files changed, 21 insertions(+) diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index 19da6afee..d71451ead 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -13,6 +13,8 @@ package vazkii.botania.api.mana; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A block that implements this can provide an IIcon (block icons only) @@ -21,6 +23,7 @@ import net.minecraft.world.World; */ public interface IPoolOverlayProvider { + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos); } 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 afcf95259..c9505a58d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -45,6 +47,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.alchemyCatalystOverlay; } 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 dac4a7640..187ce65ab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -48,6 +50,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.manaVoidOverlay; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index b0ca61875..4dff6ecdc 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -3,10 +3,13 @@ package vazkii.botania.common.integration.buildcraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class StatementBase implements IStatement { @Override + @SideOnly(Side.CLIENT) public abstract TextureAtlasSprite getGuiSprite(); @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 6edcb6a20..174d97e2d 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -6,6 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.Botania; @@ -17,6 +19,7 @@ import buildcraft.api.statements.ITriggerInternal; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.manaDetectorIcon; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 3ff736215..e502c769e 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; @@ -35,6 +37,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.manaLevelTriggerIcons.get(state); } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index ce66538bd..a8e738a21 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -4,6 +4,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -19,6 +21,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.runeAltarTriggerIcon; } From 4448a6a49823ec056db490ce176e6d4d11f72158 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 15:41:55 -0600 Subject: [PATCH 257/935] Blood, ice, lava, super lava pendants and itemfinder bauble renders --- .../core/handler/MiscellaneousIcons.java | 17 ++++++++++++ .../equipment/bauble/ItemBloodPendant.java | 9 ++++--- .../item/equipment/bauble/ItemIcePendant.java | 25 +++++++++--------- .../item/equipment/bauble/ItemItemFinder.java | 25 +++++++++--------- .../equipment/bauble/ItemLavaPendant.java | 26 +++++++++---------- .../bauble/ItemSuperLavaPendant.java | 26 +++++++++---------- 6 files changed, 72 insertions(+), 56 deletions(-) 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 52e0ee6a8..023171b73 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -75,6 +75,16 @@ public class MiscellaneousIcons { public TextureAtlasSprite nerfBatIcon = null; // end dank_memes + // Icons for baubles that don't render their own model on the player + public TextureAtlasSprite + bloodPendantChain, + bloodPendantGem, + snowflakePendantGem, + itemFinderGem, + pyroclastGem, + crimsonGem; + + @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { // BlockSpecialFlower @@ -141,6 +151,13 @@ public class MiscellaneousIcons { } terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items"); + + bloodPendantChain = IconHelper.forName(evt.map, "bloodPendant2", "items"); + bloodPendantGem = IconHelper.forName(evt.map, "bloodPendant3", "items"); + snowflakePendantGem = IconHelper.forName(evt.map, "icePendantGem", "items"); + itemFinderGem = IconHelper.forName(evt.map, "itemFinderGem", "items"); + pyroclastGem = IconHelper.forName(evt.map, "lavaPendantGem", "items"); + crimsonGem = IconHelper.forName(evt.map, "superLavaPendantGem", "items"); } @SubscribeEvent 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 ffe53bbc2..d563a2de5 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 @@ -16,6 +16,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -39,6 +41,8 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; @@ -171,13 +175,12 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - for(int i = 2; i < 4; i++) { - /*IIcon icon = icons[i]; todo 1.8 + for(TextureAtlasSprite icon : new TextureAtlasSprite[] { MiscellaneousIcons.INSTANCE.bloodPendantChain, MiscellaneousIcons.INSTANCE.bloodPendantGem }) { float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/ + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); Color color = new Color(getColorFromItemStack(stack, 1)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); 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 1760990bf..276cfc93c 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 @@ -17,6 +17,11 @@ import java.util.Map; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -26,12 +31,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - //IIcon gemIcon; public static Map> playerIceBlocks = new HashMap(); public ItemIcePendant() { @@ -43,12 +49,6 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - }*/ - @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { super.onWornTick(stack, entity); @@ -102,21 +102,22 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { - /*if(type == RenderType.BODY) { todo 1.8 + if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); GlStateManager.scale(0.5F, 0.5F, 0.5F); + TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.snowflakePendantGem; float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); - }*/ + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + } } class IceRemover { 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 79b870517..e4c6c0a8f 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 @@ -13,6 +13,11 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -29,6 +34,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.village.MerchantRecipe; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; @@ -44,19 +51,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemItemFinder extends ItemBauble implements IBaubleRender { - //IIcon gemIcon; private static final String TAG_POSITIONS = "highlightPositions"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - }*/ - @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); @@ -203,22 +203,21 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { -/* todo 1.8 + TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.itemFinderGem; if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - boolean armor = event.entityPlayer.getCurrentArmor(3) != null; - Helper.translateToHeadLevel(event.entityPlayer); + boolean armor = player.getCurrentArmor(3) != null; + Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.4F, 0.1F, armor ? -0.3F : -0.25F); + GlStateManager.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F); GlStateManager.scale(0.75F, 0.75F, 0.75F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } -*/ } } 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 0512d6fa2..7ed81f2fa 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 @@ -10,18 +10,23 @@ */ package vazkii.botania.common.item.equipment.bauble; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; public class ItemLavaPendant extends ItemBauble implements IBaubleRender { - //IIcon gemIcon; - public ItemLavaPendant() { super(LibItemNames.LAVA_PENDANT); } @@ -37,31 +42,24 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - }*/ - @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { -/* todo 1.8 if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); GlStateManager.scale(0.5F, 0.5F, 0.5F); + TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem; float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } -*/ } } 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 af23d46f6..f97263d92 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 @@ -10,12 +10,19 @@ */ package vazkii.botania.common.item.equipment.bauble; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; @@ -23,8 +30,6 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { - //IIcon gemIcon; - public ItemSuperLavaPendant() { super(LibItemNames.SUPER_LAVA_PENDANT); } @@ -48,30 +53,23 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - }*/ - @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { -/* todo 1.8 if(type == RenderType.BODY) { - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - Helper.rotateIfSneaking(event.entityPlayer); - boolean armor = event.entityPlayer.getCurrentArmor(2) != null; + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Helper.rotateIfSneaking(player); + boolean armor = player.getCurrentArmor(2) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); GlStateManager.scale(0.5F, 0.5F, 0.5F); + TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem; float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } -*/ } } From ebf399edaab9d23b3a8e932563230596af1ff203 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 17:08:31 -0600 Subject: [PATCH 258/935] Most body based cosmetic baubles --- .../equipment/bauble/ItemBaubleCosmetic.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) 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 88daee8d4..8c22ed04f 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 @@ -235,33 +235,28 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { switch(stack.getItemDamage()) { case 0: chestTranslate(); - scale(0.5F); - GlStateManager.translate(0.5F, 0.7F, 0F); renderIcon(0); break; case 1: chestTranslate(); - scale(0.75F); - GlStateManager.translate(0.15F, -0.1F, 0F); + GlStateManager.translate(0F, 0F, 0.2F); renderIcon(1); break; case 3: chestTranslate(); - scale(0.6F); - GlStateManager.translate(0.35F, 0.3F, 0F); + GlStateManager.translate(0F, 0F, 0.15F); renderIcon(3); break; case 12: chestTranslate(); scale(0.225F); - GlStateManager.translate(1.2F, 1.9F, 0F); + GlStateManager.translate(-0.725F, 0.45F, -0.6F); renderIcon(12); break; case 13: chestTranslate(); - GlStateManager.rotate(-90F, 0F, 1F, 0F); - scale(0.5F); - GlStateManager.translate(-1.3F, -0.4F, -1F); + GlStateManager.rotate(-90F, 0F, 0F, 1F); + GlStateManager.translate(0.33F, -0.15F, 0.55F); renderIcon(13); break; case 14: @@ -278,20 +273,19 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case 16: chestTranslate(); scale(0.225F); - GlStateManager.translate(2.3F, 1.9F, 0F); + GlStateManager.translate(0.725F, 0.45F, -0.6F); renderIcon(16); break; case 21: chestTranslate(); - scale(0.3F); - GlStateManager.translate(1.2F, 0.5F, 0F); + scale(0.5F); + GlStateManager.translate(0F, 0.15F, 0.32F); renderIcon(21); break; case 29: chestTranslate(); - scale(0.8F); - GlStateManager.translate(0.2F, -0.2F, -0.35F); - GlStateManager.rotate(10F, 0F, 0F, 1F); + GlStateManager.translate(0.05F, -0.25F, 0.25F); + GlStateManager.rotate(8F, 0F, 1F, 0F); renderIcon(29); break; } @@ -305,8 +299,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void chestTranslate() { - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.5F, -0.7F, 0.15F); + GlStateManager.translate(0F, 0.5F, 0F); + GlStateManager.rotate(-90F, 1F, 0F, 0F); } public void scale(float f) { From ab3bc85f206a2cbc06f5a3863b6f30643a6affcc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:07:29 -0600 Subject: [PATCH 259/935] Fix magic missile crash. closes #54 --- .../common/entity/EntityMagicMissile.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index ee0b741c0..eafed541a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -181,10 +181,23 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void onImpact(MovingObjectPosition pos) { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - - if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves) && (pos.entityHit == null || getTargetEntity() == pos.entityHit)) - setDead(); + switch (pos.typeOfHit) { + case BLOCK: { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves)) + setDead(); + break; + } + case ENTITY: { + if (pos.entityHit == getTargetEntity()) + setDead(); + break; + } + default: { + setDead(); + break; + } + } } } From a6d89e3d4dd68ab3c7cc6e9f0fc0bce53323d7c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:08:48 -0600 Subject: [PATCH 260/935] Fix thorn chakram impact crash. Closes #59 --- .../botania/common/entity/EntityThornChakram.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 80e10d3ee..d4ca7a69e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -111,10 +111,12 @@ public class EntityThornChakram extends EntityThrowable { if(noClip) return; - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - worldObj.getTileEntity(pos.getBlockPos()); - if(block instanceof BlockBush || block instanceof BlockLeaves) - return; + if (pos.getBlockPos() != null) { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + worldObj.getTileEntity(pos.getBlockPos()); + if(block instanceof BlockBush || block instanceof BlockLeaves) + return; + } boolean fire = isFire(); EntityLivingBase thrower = getThrower(); From 36976e632191327c42f518b57c7161ab63398ea9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:12:22 -0600 Subject: [PATCH 261/935] Fix divining rod looking up blocks with no item form in the OD. CLoses #57 --- .../java/vazkii/botania/common/item/rod/ItemDiviningRod.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index be2c3986d..92907bd98 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -62,6 +63,9 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW for(int k = -range; k < range + 1; k++) { BlockPos pos_ = pos.add(i, j, k); IBlockState state = world.getBlockState(pos_); + if (Item.getItemFromBlock(state.getBlock()) == null) { + continue; + } ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); for(int id : OreDictionary.getOreIDs(orestack)) { String s = OreDictionary.getOreName(id); From 27be487b7e1b55ff455bcde8e4fcb615f6e6edcb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:15:46 -0600 Subject: [PATCH 262/935] Add a gradlew.bat. Closes #56 --- gradlew.bat | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100755 gradlew.bat diff --git a/gradlew.bat b/gradlew.bat new file mode 100755 index 000000000..aec99730b --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From d0e4e436addaf24ea80637d468c72b358630f950 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:52:38 -0600 Subject: [PATCH 263/935] MOve recipes to init and remove thaumcraft after requirement. CLoses #53 --- .../common/core/proxy/CommonProxy.java | 22 +++++++++---------- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f53c737e7..5a477c328 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -94,6 +94,17 @@ public class CommonProxy { ModPotions.init(); ModBrews.init(); + ModAchievements.init(); + ModMultiblocks.init(); + ModBanners.init(); + + ChestGenHandler.init(); + + if(Botania.gardenOfGlassLoaded) + new WorldTypeSkyblock(); + } + + public void init(FMLInitializationEvent event) { ModCraftingRecipes.init(); ModPetalRecipes.init(); ModPureDaisyRecipes.init(); @@ -103,19 +114,8 @@ public class CommonProxy { ModManaInfusionRecipes.init(); ModElvenTradeRecipes.init(); ModBrewRecipes.init(); - ModAchievements.init(); - ModMultiblocks.init(); - ModBanners.init(); - - ChestGenHandler.init(); - LexiconData.init(); - if(Botania.gardenOfGlassLoaded) - new WorldTypeSkyblock(); - } - - public void init(FMLInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeDecorationHandler()); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 597fdb274..f09bd0c0b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ 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:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Baubles"; public static final String MC_VERSIONS = "[1.8.8,1.8.9]"; // Network Contants From 5991387f223fe3a89208ac7f85344328e475f220 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 21:35:14 -0600 Subject: [PATCH 264/935] Actually close #59 --- .../java/vazkii/botania/common/entity/EntityThornChakram.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index d4ca7a69e..7a2d40509 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -126,7 +126,7 @@ public class EntityThornChakram extends EntityThrowable { pos.entityHit.setFire(5); else if(worldObj.rand.nextInt(3) == 0) ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(Potion.poison.id, 60, 0)); - } else { + } else if (pos.getBlockPos() != null) { int bounces = getTimesBounced(); if(bounces < MAX_BOUNCES) { Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); From 3d821e5da4a7eee6c5304cb7a973ea8a5359593a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 21:16:00 -0600 Subject: [PATCH 265/935] Fix some recipes not taking vanilla prismarine. closes #62 --- .../java/vazkii/botania/common/crafting/ModBrewRecipes.java | 3 ++- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 2 +- src/main/java/vazkii/botania/common/item/ModItems.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index f805f8644..805deb042 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -19,6 +19,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibOreDict; public class ModBrewRecipes { @@ -56,7 +57,7 @@ public class ModBrewRecipes { 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), new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.glowstone_dust)); + 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)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 6bc069a1a..c97f68e07 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2087,7 +2087,7 @@ public final class ModCraftingRecipes { 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(ModItems.manaResource, 1, 10)); + 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); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5b8c67e09..dac2559ab 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -462,5 +462,6 @@ public final class ModItems { OreDictionary.registerOre("rodBlaze", Items.blaze_rod); OreDictionary.registerOre("powderBlaze", Items.blaze_powder); + OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(Items.prismarine_shard)); } } From 2a077adb6fcb09fedffe2889b4de7e589fe0f79e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 21:21:26 -0600 Subject: [PATCH 266/935] Safeguard in the smartmodels. Closes #66 --- .../java/vazkii/botania/client/model/FloatingFlowerModel.java | 2 ++ .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8c9b1e533..5d37fb211 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -79,6 +79,8 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I @Override public IBakedModel handleBlockState(IBlockState state) { + if (state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); IExtendedBlockState realState = ((IExtendedBlockState) state); IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); String identifier; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index f52cc9e49..5d99a76e8 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -43,6 +43,7 @@ import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Matrix4f; @@ -284,6 +285,8 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleBlockState(IBlockState state) { + if (state.getBlock() != ModBlocks.specialFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); From 071bcefa6f3af287cc27a20e413ad89d970e89c8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 21:23:23 -0600 Subject: [PATCH 267/935] Anotehr hoepful bandaid for all the clientside crashes --- src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index b86afe895..72d237513 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -206,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override From 98620bb1c5c98b7082a4f61129326ee2e7f2e3a5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 21:30:22 -0600 Subject: [PATCH 268/935] Serverside the distributor. Closes #63 --- .../botania/common/block/tile/mana/TileDistributor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 7ba44a24e..101db37f4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -24,10 +24,12 @@ import vazkii.botania.common.lib.LibMisc; public class TileDistributor extends TileMod implements IManaReceiver { - List validPools = new ArrayList(); + List validPools = new ArrayList<>(); @Override public void updateEntity() { + if (worldObj.isRemote) + return; validPools.clear(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); From 540baa4152b9d177088e1c9b58306c32ab50c325 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 23:06:24 -0600 Subject: [PATCH 269/935] A little debug thign --- .../botania/client/core/handler/DebugHandler.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 2378ee33b..d18576213 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -12,6 +12,8 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -28,6 +30,8 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import java.util.UUID; + public final class DebugHandler { private static final String PREFIX = EnumChatFormatting.GREEN + "[Botania] " + EnumChatFormatting.RESET; @@ -42,7 +46,16 @@ public final class DebugHandler { version = "N/A"; event.left.add(PREFIX + "pS: " + ParticleRenderDispatcher.sparkleFxCount + ", pFS: " + ParticleRenderDispatcher.fakeSparkleFxCount + ", pW: " + ParticleRenderDispatcher.wispFxCount + ", pDIW: " + ParticleRenderDispatcher.depthIgnoringWispFxCount + ", pLB: " + ParticleRenderDispatcher.lightningCount); - event.left.add(PREFIX + "netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); + event.left.add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); + + if (Minecraft.getMinecraft().isIntegratedServerRunning()) { + UUID id = Minecraft.getMinecraft().thePlayer.getUniqueID(); + Entity ent = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id); + if (ent != null) { + World serverWorld = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id).worldObj; + event.left.add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimensionId(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); + } + } if(GuiScreen.isCtrlKeyDown() && GuiScreen.isShiftKeyDown()) { event.left.add(PREFIX + "Config Context"); From b012f5152d50e7df02de80e234138f93ba97af54 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jan 2016 23:14:45 -0600 Subject: [PATCH 270/935] Fix fab pools not being special snowflakes (colors same between all) --- .../java/vazkii/botania/client/render/tile/RenderTilePool.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 4def28bbd..b174f1765 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import java.awt.Color; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -74,6 +75,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { int color; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + if(pool != null) + time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { color = pool == null ? EnumDyeColor.WHITE.getMapColor().colorValue : pool.getColor().getMapColor().colorValue; From 09fb64982a3fed753029c5eb5ff1ef107d171b43 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 20:42:12 -0600 Subject: [PATCH 271/935] A bunch of more baubles --- .../equipment/bauble/ItemBaubleCosmetic.java | 87 +++++++++---------- 1 file changed, 42 insertions(+), 45 deletions(-) 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 8c22ed04f..ad3fc6f56 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 @@ -36,6 +36,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { private static final int SUBTYPES = 32; + private final ItemStack renderStack; public ItemBaubleCosmetic() { super(LibItemNames.COSMETIC); @@ -45,6 +46,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GameRegistry.addRecipe(new CosmeticRemoveRecipe()); RecipeSorter.register("botania:cosmeticAttach", CosmeticAttachRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:cosmeticRemove", CosmeticRemoveRecipe.class, Category.SHAPELESS, ""); + renderStack = new ItemStack(this); } @Override @@ -77,75 +79,76 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { switch(stack.getItemDamage()) { case 2: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.5F, 0F); + GlStateManager.translate(0F, 0F, 0.045F); renderIcon(2); break; case 4: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.5F, 0F); + GlStateManager.translate(0F, 0F, 0.045F); renderIcon(4); break; case 5: faceTranslate(); scale(0.35F); - GlStateManager.translate(0.3F, -0.5F, 0F); + GlStateManager.translate(-0.3F, 0.2F, -0.5F); renderIcon(5); break; case 6: faceTranslate(); - scale(0.35F); - GlStateManager.translate(0.9F, -0.5F, 0F); + scale(0.45F); + GlStateManager.translate(0.2F, 0.2F, -0.4F); renderIcon(6); break; case 7: faceTranslate(); - scale(0.6F); - GlStateManager.translate(0.2F, 0.3F, 0.6F); + scale(0.9F); + GlStateManager.translate(0F, -0.4F, -0.42F); renderIcon(7); break; case 8: faceTranslate(); - GlStateManager.rotate(90F, 0F, 1F, 0F); - scale(0.6F); - GlStateManager.translate(-0.9F, 0F, 0.2F); + GlStateManager.rotate(-90F, 0F, 0F, 1F); + GlStateManager.translate(0F, 0.1F, -0.2F); renderIcon(8); break; case 9: faceTranslate(); - GlStateManager.rotate(90F, 0F, 1F, 0F); - scale(0.6F); - GlStateManager.translate(-0.9F, -0.2F, 0.2F); + GlStateManager.rotate(-90F, 0F, 0F, 1F); + GlStateManager.translate(0F, 0.1F, -0.1F); renderIcon(9); - GlStateManager.translate(0F, 0F, 1F); + GlStateManager.translate(0F, -0.45F, 0F); renderIcon(9); break; case 10: faceTranslate(); - GlStateManager.rotate(90F, 0F, 1F, 0F); - scale(0.4F); - GlStateManager.translate(-0.5F, -0.1F, 0.3F); - GlStateManager.rotate(120F, 0F, 1F, 0F); + GlStateManager.rotate(-90F, 0F, 0F, 1F); + scale(0.6F); + GlStateManager.translate(0F, 0.25F, -0.4F); + + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.2F, 0.15F, 0F); + GlStateManager.rotate(-45F, 0F, 0F, 1F); renderIcon(10); - GlStateManager.rotate(-100F, 0F, 1F, 0F); + GlStateManager.popMatrix(); + + GlStateManager.translate(0.15F, 0.3F, 0F); + GlStateManager.rotate(-135F, 0F, 0F, 1F); renderIcon(10); break; case 11: faceTranslate(); scale(0.6F); - GlStateManager.translate(0.2F, -0.1F, 0.6F); + GlStateManager.translate(0F, 0F, -0.55F); renderIcon(11); break; case 15: faceTranslate(); - GlStateManager.translate(-0.1F, -0.55F, 0F); + GlStateManager.translate(-0.01F, 0F, 0.05F); renderIcon(15); break; case 17: faceTranslate(); scale(0.35F); - GlStateManager.translate(0.3F, -0.6F, 0F); renderIcon(17); break; case 18: @@ -171,32 +174,25 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case 22: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(22); break; case 23: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(23); break; case 24: faceTranslate(); - scale(0.6F); - GlStateManager.translate(0.5F, 0F, 0.1F); - GlStateManager.rotate(60F, 0F, 0F, 1F); + scale(0.8F); + GlStateManager.translate(0F, -0.1F, -0.5F); renderIcon(24); break; case 25: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.5F, 0F); + GlStateManager.translate(0F, 0F, 0.04F); renderIcon(25); break; case 26: faceTranslate(); - GlStateManager.translate(-0.1F, -0.4F, 0F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 1F, 1F, 0.7F); @@ -204,8 +200,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case 27: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.65F, 0F); + scale(0.90F); + GlStateManager.translate(0F, 0F, 0.09F); renderIcon(27); break; case 28: @@ -219,14 +215,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case 30: faceTranslate(); - scale(0.75F); - GlStateManager.translate(0.04F, -0.4F, 0F); renderIcon(30); break; case 31: faceTranslate(); - scale(0.5F); - GlStateManager.translate(0.3F, 0.7F, 0.5F); + scale(0.8F); + GlStateManager.translate(0F, -0.3F, -0.75F); renderIcon(31); break; } @@ -293,9 +287,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void faceTranslate() { - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.4F, 0.1F, -0.25F); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.rotate(-90F, 1F, 0F, 0F); + GlStateManager.scale(1.25F, 1.25F, 1.25F); + GlStateManager.translate(0F, 0.10F, 1.45F); } public void chestTranslate() { @@ -308,7 +303,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void renderIcon(int i) { - ItemStack stack = new ItemStack(this, 1, i); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); + GlStateManager.pushMatrix(); + renderStack.setItemDamage(i); + Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON); + GlStateManager.popMatrix(); } } From 4bf8fd3b989f426b41248c79b3021b4728764410 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 21:18:54 -0600 Subject: [PATCH 272/935] Remove some unused states from tiny potato --- .../botania/api/state/BotaniaStateProps.java | 3 --- .../api/state/enums/PotatoVariant.java | 24 ------------------ .../common/block/decor/BlockTinyPotato.java | 17 +------------ .../botania/blockstates/tinyPotato.json | 9 ------- .../textures/model/tinyPotatoGrayCopy.png | Bin 446 -> 0 bytes .../model/tinyPotato_halloweenCopy.png | Bin 864 -> 0 bytes 6 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java delete mode 100644 src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png delete mode 100644 src/main/resources/assets/botania/textures/model/tinyPotato_halloweenCopy.png diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f571f1951..a2b9d00bc 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -153,9 +153,6 @@ public class BotaniaStateProps { // BlockStorage public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); - // BlockTinyPotato - public static final PropertyEnum POTATO_VARIANT = PropertyEnum.create("variant", PotatoVariant.class); - private BotaniaStateProps() {} } diff --git a/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java b/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java deleted file mode 100644 index ed7ca2536..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PotatoVariant.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum PotatoVariant implements IStringSerializable { - DEFAULT, - HALLOWEEN, - GRAYSCALE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } -} 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 6d6e7c944..62ab1aca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -31,7 +31,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PotatoVariant; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -51,13 +50,12 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { setBlockBounds(f, 0, f, 1F - f, f, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) - .withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT) ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS, BotaniaStateProps.POTATO_VARIANT); + return new BlockState(this, BotaniaStateProps.CARDINALS); } @Override @@ -86,19 +84,6 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } - @Override - @SideOnly(Side.CLIENT) - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - if (ClientProxy.dootDoot) { - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.HALLOWEEN); - } else if (world.getTileEntity(pos) instanceof TileTinyPotato) { - if (((TileTinyPotato) world.getTileEntity(pos)).name.toLowerCase().equals("kyle hyde")) { - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.GRAYSCALE); - } - } - return state.withProperty(BotaniaStateProps.POTATO_VARIANT, PotatoVariant.DEFAULT); - } - @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index 6a38bbccd..fbf298eca 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -8,15 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "variant": { - "default": {}, - "halloween": { - "textures": { "all": "botania:model/tinyPotato_halloweenCopy" } - }, - "grayscale": { - "textures": { "all": "botania:model/tinyPotatoGrayCopy" } - } - }, "facing": { "north": {}, "south": { "y": 180 }, diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png b/src/main/resources/assets/botania/textures/model/tinyPotatoGrayCopy.png deleted file mode 100644 index 5da02df33be9cb0bb877db36bdd038b299dde93f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzWP)&xB>8Ivjd0$Ea5j}PGI8@vF{7k#4Z-g`nt(rDq9a1YapbTkU1#E-C z#)P!7Z?q#4-+%)bcBqr4;b2~9(uR@RRTcI9q{?;TzhC?O>}OlRlAE^&iESS?+<*E^ z*yyFJA5v93*BuIB1|+Bj008AF06;v70RTGG0DvT!9XPi7vTy{r?vO^Veyfu84W#I^L-673c8o7GijO6X@ZRS1nV)SL<2yopYt=2SWY2>I*?-!*n z3rB$K4k=I5YF(7a7o{%?M}X@NX@{2P>5>Cxt1rvSM*uru**{>}i2Qk8N|`D1jK||l znWt*{m5%_A&fiLzeCsKb7^E`3q4%^pk7MJxQ9J?w#Bp3{z4HhdTwG&taXt0Ce|F{C zloLGiobUUYlAhCCqB%nz7g6>qj&uOfY-se)uF%_QK}v}i@6G@iCp>@j@Sl2H`(^b` zBjE7-E1C_nbD@%GHZ+=Avon!WNk}E3l!8(UzVBx~K@cDaf~n`!ep27tX{8-^w)Rr} z$*b;^;aPfH`}63XABNf+ote)&TYCWhhTw4M=2FuZDTII!0#ZsyDM9tTN2y-aUP_7H z@n--)w||nhfAaDWzV9Q7BJA$Jfe-@S{>eaqS|gT)M|)%PP(DwNMrO~P&!f~nuisv8r)}CB9S9+? z+v*}o5*%F&5JeHT*V_og5OEw&>22+o)r)VZM+pGb0<(em-;D%aQ-|7=Rn>cRD$4Jz z$wNhZY3iuzdcF_Hua>m8E_)uYs-7c&JVUExnjhnGcXCzLa|Glc+;!`E7gf`*d;~BI q!!QiPFbu;m48t%C!!Qi9I{XIn4e*Dow_zIq0000 From e5ee04113fe864dc5392ba4bb19824bef54c48b1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 22:32:02 -0600 Subject: [PATCH 273/935] placeholder model for spreader so it shows in JEI. make monocle use blockstates like it should --- .../client/core/handler/ModelHandler.java | 1 + .../item/equipment/bauble/ItemMonocle.java | 14 +- .../assets/botania/models/block/spreader.json | 140 +++++++++--------- 3 files changed, 80 insertions(+), 75 deletions(-) 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 fdac4c41c..db5076b7f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -460,6 +460,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); + // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } 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 8472fc5b3..10bde87d3 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 @@ -11,6 +11,10 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; +import net.minecraft.block.BlockRedstoneComparator; +import net.minecraft.block.BlockRedstoneRepeater; +import net.minecraft.block.BlockRedstoneWire; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -63,8 +67,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm MovingObjectPosition pos = mc.objectMouseOver; if(pos == null || pos.getBlockPos() == null) return; - Block block = player.worldObj.getBlockState(pos.getBlockPos()).getBlock(); - int meta = block.getMetaFromState(player.worldObj.getBlockState(pos.getBlockPos())); // todo 1.8 use states + IBlockState state = player.worldObj.getBlockState(pos.getBlockPos()); + Block block = state.getBlock(); player.worldObj.getTileEntity(pos.getBlockPos()); ItemStack dispStack = null; @@ -72,13 +76,13 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm if(block == Blocks.redstone_wire) { dispStack = new ItemStack(Items.redstone); - text = EnumChatFormatting.RED + "" + meta; + text = EnumChatFormatting.RED + "" + state.getValue(BlockRedstoneWire.POWER); } else if(block == Blocks.unpowered_repeater || block == Blocks.powered_repeater) { dispStack = new ItemStack(Items.repeater); - text = "" + (((meta & 12) >> 2) + 1); + text = "" + state.getValue(BlockRedstoneRepeater.DELAY); } else if(block == Blocks.unpowered_comparator || block == Blocks.powered_comparator) { dispStack = new ItemStack(Items.comparator); - text = (meta & 4) == 4 ? "-" : "+"; + text = state.getValue(BlockRedstoneComparator.MODE) == BlockRedstoneComparator.Mode.SUBTRACT ? "-" : "+"; } if(dispStack == null) diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/spreader.json index e057858f9..1e01caecf 100644 --- a/src/main/resources/assets/botania/models/block/spreader.json +++ b/src/main/resources/assets/botania/models/block/spreader.json @@ -4,133 +4,133 @@ }, "elements": [ { - "__comment": "cubeSide4", + "name": "cubeSide4", "from": [14, 1, 2], "to": [15, 14, 15], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#all"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#all"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#all"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#all"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#all"} + "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, + "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, + "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, + "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, + "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, + "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} } }, { - "__comment": "cubeInside", + "name": "cubeInside", "from": [5, 4, 5], "to": [11, 10, 11], "faces": { - "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#all"}, - "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#all"}, - "north": {"uv": [12, 5.75, 13.5, 7.25], "texture": "#all"}, - "south": {"uv": [9, 5.75, 10.5, 7.25], "texture": "#all"}, - "west": {"uv": [7.5, 5.75, 9, 7.25], "texture": "#all"}, - "east": {"uv": [10.5, 5.75, 12, 7.25], "texture": "#all"} + "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#inside"}, + "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#inside"}, + "north": {"uv": [12, 5.75, 13.5, 7.25], "texture": "#inside"}, + "south": {"uv": [9, 5.75, 10.5, 7.25], "texture": "#inside"}, + "west": {"uv": [7.5, 5.75, 9, 7.25], "texture": "#inside"}, + "east": {"uv": [10.5, 5.75, 12, 7.25], "texture": "#inside"} } }, { - "__comment": "cubeHole2", + "name": "cubeHole2", "from": [2, 1, 14], "to": [6, 13, 15], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#all"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#all"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#all"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#all"} + "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, + "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, + "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, + "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, + "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} } }, { - "__comment": "cubeSide5", + "name": "cubeSide5", "from": [2, 13, 2], "to": [14, 14, 15], "faces": { - "down": {"uv": [6, 0, 9, 3.25], "texture": "#all"}, - "up": {"uv": [3, 0, 6, 3.25], "texture": "#all"}, - "north": {"uv": [9.25, 3.25, 12.5, 3.5], "texture": "#all"}, - "south": {"uv": [3, 3.25, 6.25, 3.5], "texture": "#all"}, - "west": {"uv": [0, 3.25, 3, 3.5], "texture": "#all"}, - "east": {"uv": [6.25, 3.25, 9.25, 3.5], "texture": "#all"} + "down": {"uv": [6, 0, 9, 3.25], "texture": "#side"}, + "up": {"uv": [3, 0, 6, 3.25], "texture": "#side"}, + "north": {"uv": [9.25, 3.25, 12.5, 3.5], "texture": "#side"}, + "south": {"uv": [3, 3.25, 6.25, 3.5], "texture": "#side"}, + "west": {"uv": [0, 3.25, 3, 3.5], "texture": "#side"}, + "east": {"uv": [6.25, 3.25, 9.25, 3.5], "texture": "#side"} } }, { - "__comment": "cubeHole4", + "name": "cubeHole4", "from": [6, 9, 14], "to": [10, 13, 15], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#all"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#all"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#all"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#all"} + "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, + "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, + "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, + "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, + "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} } }, { - "__comment": "cubeHole3", + "name": "cubeHole3", "from": [6, 1, 14], "to": [10, 5, 15], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#all"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#all"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#all"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#all"} + "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, + "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, + "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, + "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, + "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} } }, { - "__comment": "cubeSide1", + "name": "cubeSide1", "from": [1, 0, 1], "to": [15, 1, 15], "faces": { - "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#all"}, - "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#all"}, - "north": {"uv": [10.5, 3.5, 14, 3.75], "texture": "#all"}, - "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#all"}, - "west": {"uv": [0, 3.5, 3.5, 3.75], "texture": "#all"}, - "east": {"uv": [7, 3.5, 10.5, 3.75], "texture": "#all"} + "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#side"}, + "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#side"}, + "north": {"uv": [10.5, 3.5, 14, 3.75], "texture": "#side"}, + "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#side"}, + "west": {"uv": [0, 3.5, 3.5, 3.75], "texture": "#side"}, + "east": {"uv": [7, 3.5, 10.5, 3.75], "texture": "#side"} } }, { - "__comment": "cubeSide3", + "name": "cubeSide3", "from": [1, 1, 2], "to": [2, 14, 15], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#all"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#all"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#all"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#all"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#all"} + "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, + "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, + "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, + "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, + "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, + "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} } }, { - "__comment": "cubeHole1", + "name": "cubeHole1", "from": [10, 1, 14], "to": [14, 13, 15], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#all"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#all"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#all"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#all"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#all"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#all"} + "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, + "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, + "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, + "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, + "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, + "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} } }, { - "__comment": "cubeSide2", + "name": "cubeSide2", "from": [1, 1, 1], "to": [15, 14, 2], "faces": { - "down": {"uv": [7, 0, 10.5, 0.25], "texture": "#all"}, - "up": {"uv": [3.5, 0, 7, 0.25], "texture": "#all"}, - "north": {"uv": [7.25, 0.25, 7.5, 3.5], "texture": "#all"}, - "south": {"uv": [3.5, 0.25, 3.75, 3.5], "texture": "#all"}, - "west": {"uv": [0, 0.25, 3.5, 3.5], "texture": "#all"}, - "east": {"uv": [3.75, 0.25, 7.25, 3.5], "texture": "#all"} + "down": {"uv": [7, 0, 10.5, 0.25], "texture": "#side"}, + "up": {"uv": [3.5, 0, 7, 0.25], "texture": "#side"}, + "north": {"uv": [7.25, 0.25, 7.5, 3.5], "texture": "#side"}, + "south": {"uv": [3.5, 0.25, 3.75, 3.5], "texture": "#side"}, + "west": {"uv": [0, 0.25, 3.5, 3.5], "texture": "#side"}, + "east": {"uv": [3.75, 0.25, 7.25, 3.5], "texture": "#side"} } } ] From eece9a08c1d492a4fc9ec02066d15dd58a0b2bc6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 23:20:04 -0600 Subject: [PATCH 274/935] Actually commit spreader blockstate json --- .../assets/botania/blockstates/spreader.json | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/spreader.json diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json new file mode 100644 index 000000000..31cbca0ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -0,0 +1,39 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:spreader", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "mana": { + "textures": { + "all": "botania:placeholder", + "side": "botania:placeholder", + "inside": "botania:placeholder" + } + }, + "redstone": { + "textures": { + "all": "botania:placeholder", + "side": "botania:placeholder", + "inside": "botania:placeholder" + } + }, + "elven": { + "textures": { + "all": "botania:placeholder", + "side": "botania:placeholder", + "inside": "botania:placeholder" + } + }, + "gaia": { + "textures": { + "all": "botania:placeholder", + "side": "botania:placeholder", + "inside": "botania:placeholder" + } + } + } + } +} \ No newline at end of file From 03cfbfa73eb0314140209bd7287be8d0d336a5b5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 23:28:46 -0600 Subject: [PATCH 275/935] Tentative fix for multiblock transparency --- .../botania/client/core/handler/MultiblockRenderHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 df5f30c45..bae36128f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -178,7 +178,7 @@ public final class MultiblockRenderHandler { private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos, float alpha) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); IBlockState state = comp.getBlockState(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(state == null) @@ -195,7 +195,7 @@ public final class MultiblockRenderHandler { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? GlStateManager.color(1, 1, 1, alpha); - brd.renderBlockBrightness(state, 0.5F); // todo 1.8 check brightness + brd.renderBlockBrightness(state, 1.0F); } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); From 2a738209b753b374396302c4d7f1166f3c03519a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jan 2016 23:47:41 -0600 Subject: [PATCH 276/935] Revert "Tentative fix for multiblock transparency" This reverts commit 03cfbfa73eb0314140209bd7287be8d0d336a5b5. --- .../botania/client/core/handler/MultiblockRenderHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bae36128f..df5f30c45 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -178,7 +178,7 @@ public final class MultiblockRenderHandler { private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos, float alpha) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); IBlockState state = comp.getBlockState(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); if(state == null) @@ -195,7 +195,7 @@ public final class MultiblockRenderHandler { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? GlStateManager.color(1, 1, 1, alpha); - brd.renderBlockBrightness(state, 1.0F); + brd.renderBlockBrightness(state, 0.5F); // todo 1.8 check brightness } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); From fabedeb31a56ffaac3043ad5f85b414a90025cfe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 12:22:33 -0600 Subject: [PATCH 277/935] Bump forge version, improve brewery JEI integration --- build.properties | 2 +- .../integration/jei/brewery/BreweryRecipeCategory.java | 6 ++++-- .../integration/jei/brewery/BreweryRecipeWrapper.java | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index ec803864c..67cc63c17 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jan 08 18:17:27 GMT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.0.1688 +forge_version=11.15.0.1715 mc_version=1.8.9 dir_repo=./ build_number=249 diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 607394f58..ab8edf75e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -18,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.Collection; @@ -74,7 +75,8 @@ public class BreweryRecipeCategory implements IRecipeCategory { } int index = 1, posX = 60; - for (Object o : wrapper.getInputs()) { + for (int i = 1; i < wrapper.getInputs().size(); i++) { + Object o = wrapper.getInputs().get(i); recipeLayout.getItemStacks().init(index, true, posX, 6); if (o instanceof ItemStack) { recipeLayout.getItemStacks().set(index, ((ItemStack) o)); @@ -86,7 +88,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { } recipeLayout.getItemStacks().init(7, false, 87, 41); - recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0)); + recipeLayout.getItemStacks().set(7, wrapper.getOutputs()); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 8bfbd619b..305784d57 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -23,11 +23,11 @@ import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; - private final ItemStack output; + private final List output; public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); - builder.add(new ItemStack(ModItems.vial)); + builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); for (Object o : recipeBrew.getInputs()) { if (o instanceof ItemStack) { builder.add(o); @@ -38,7 +38,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } input = builder.build(); - output = recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy()); } @Override @@ -48,7 +48,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return ImmutableList.of(output); + return output; } @Override From b3a140b8dd55ccfccc8f29b3916ec179a8de820a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 12:50:42 -0600 Subject: [PATCH 278/935] Temporary bandaid for thaumcraft brew integration. Closes #69. --- src/main/java/vazkii/botania/common/brew/ModBrews.java | 8 ++------ .../vazkii/botania/common/crafting/ModBrewRecipes.java | 2 +- .../java/vazkii/botania/common/lexicon/LexiconData.java | 7 ++++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 0d6cc9d86..03e191859 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -67,12 +67,8 @@ public class ModBrews { } public static void initTC() { - Potion warpWardPotion = null; - for(Potion potion : GameData.getPotionRegistry().typeSafeIterable()) - if(potion != null && potion.getName().equals("potion.warpward")) { - warpWardPotion = potion; - break; - } + Potion warpWardPotion = Potion.getPotionFromResourceLocation("minecraft:warp_ward"); + // TODO thaumcraft 5 is currently registering its potions under the Minecraft namespace if(warpWardPotion != null) warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffect(warpWardPotion.id, 12000, 0)).setNotBloodPendantInfusable(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 805deb042..de537025c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -75,7 +75,7 @@ public class ModBrewRecipes { Item resource = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "bath_salts")); - warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); + // todo 1.8 see LexiconData: warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 223a743f4..c7f1083e3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1106,10 +1106,11 @@ public final class LexiconData { if(Botania.thaumcraftLoaded) { tcIntegration = new CLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); - + + // todo 1.8: we removed our after thaumcraft dep, but it turns out we actually need it. Stub out warp ward brew from rendering for now until discussion w/ Azanor if(ConfigHandler.enableThaumcraftStablizers) - tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); - else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); + tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5")/*, new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")*/).setIcon(new ItemStack(ModItems.manaInkwell)); + else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe)/*, new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")*/).setIcon(new ItemStack(ModItems.manaInkwell)); } if(Botania.etFuturumLoaded) { From ba3d9ff9f88bd6a41fe15915df63ead48022ceb7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 16:44:34 -0600 Subject: [PATCH 279/935] Update garden of glass --- GardenOfGlass.jar | Bin 8868 -> 8927 bytes .../common/world/WorldTypeSkyblock.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/GardenOfGlass.jar b/GardenOfGlass.jar index 9dad1c9f39ef30c4da3dfcb789464d958b975f43..a6c9ea5b4d1d56c3fcd5d1c2ea3cf4f644deca91 100644 GIT binary patch delta 513 zcmZ4Ddf#<}0Hg5r7IP22$FEZy85tO^1FsE$kXPMz_nLFQn!(B0oW}2;{(k0ilQ zHP!q{q{$#NlW(96BoVKYCOFV zeyB>*R4mPA+s1Qhhq^C6(SPgbJ|)n%R7JV%S(okBRTZ=Nw=Jl)N`9xyTCQj0%*kW= zdDhK;CvPrj2qkpBut;*+dhprxxW(^jMl3CzlKS$qf_8Jb^ReKh(tvW8B@V-Rz zplS)%CCACS2)n*{UbuT&$DUNrG1eDx(0T+b8!aMl)`j{7TV; o@#bWCB^xFVmdW)jQj^P-w3r+~Otr};m3X*5FflO9lLu)80Osql{r~^~ diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index cd76af252..d3025a41c 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -37,7 +37,7 @@ public class WorldTypeSkyblock extends WorldType { @Override public int getSpawnFuzz() { - return 1; + return 2; } @Override From 400bf95a44e82b7c93bdfd2733a4a2e9ca7d426b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 16:56:30 -0600 Subject: [PATCH 280/935] Fix some lingering GoG worldgen and rendering issues. Closes #8. --- .../client/render/world/SkyblockSkyRenderer.java | 10 +++++----- .../vazkii/botania/common/world/WorldTypeSkyblock.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 3b8d2e949..8b0c2f039 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -80,7 +80,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.disableFog(); GlStateManager.disableAlpha(); GlStateManager.enableBlend(); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); RenderHelper.disableStandardItemLighting(); float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); float f7; @@ -137,7 +137,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { float lowA = Math.max(0F, effCelAng - 0.3F) * f6; float a = Math.max(0.1F, lowA); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, (a * 4) * (1F - insideVoid)); GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F); @@ -176,7 +176,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { f10 = 20F; a = lowA; GlStateManager.pushMatrix(); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); GlStateManager.translate(0F, -1F, 0F); GlStateManager.rotate(220F, 1F, 0F, 0F); GlStateManager.color(1F, 1F, 1F, a); @@ -237,7 +237,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Rainbow GlStateManager.pushMatrix(); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); mc.renderEngine.bindTexture(textureRainbow); f10 = 10F; float effCelAng1 = celAng; @@ -280,7 +280,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.color(1F, 1F, 1F, 1F - insideVoid); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); // === Sun GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index d3025a41c..34e7049bf 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -47,7 +47,7 @@ public class WorldTypeSkyblock extends WorldType { @Override public IChunkProvider getChunkGenerator(World world, String generatorOptions) { - return new ChunkProviderFlat(world, world.getSeed(), false, "2;1x0;"); + return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); } } From ac72a5a6605882745988b47774cb701dbb1c4529 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 22:36:49 -0600 Subject: [PATCH 281/935] Attempt number 991298 to patch the stupid client crash --- .../vazkii/botania/common/block/tile/TileMod.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 20e796075..526abe246 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLLog; public class TileMod extends TileEntity implements ITickable { @@ -65,7 +66,16 @@ public class TileMod extends TileEntity implements ITickable { @Override public final void update() { if (!isInvalid() && worldObj.isBlockLoaded(getPos(), false)) { - updateEntity(); + if (!worldObj.isRemote) + updateEntity(); + else { + try { + updateEntity(); + } catch (Exception e) { // todo 1.8 remove this abhorration after I figure out what's going on. + FMLLog.severe("[Botania]: CLIENT TICK FAILED: " + this.toString()); + FMLLog.severe("[Botania]: PLEASE REPORT"); + } + } } } From 08fa70e25cf962d72c542d0015cb9d4ff6369876 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 22:41:20 -0600 Subject: [PATCH 282/935] Giant annoying message to see where this happens --- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 5 +++++ 1 file changed, 5 insertions(+) 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 64f4d567a..e862dfcf6 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 @@ -35,6 +35,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; @@ -120,6 +121,10 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void recieveMana(int mana) { this.mana = Math.max(0, Math.min(getCurrentMana() + mana, manaCap)); + if (worldObj.isRemote) { + FMLLog.severe("[Botania]: CLIENT POOL RECEIVE MANA"); + FMLLog.severe("[Botania]: WORLD: %s, POS: %s", worldObj, pos); + } worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDispatchable(); } From aee5b8c0c245fb39c1d0f2c5a181d7f93463b3cb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 22:45:43 -0600 Subject: [PATCH 283/935] Revert "Giant annoying message to see where this happens" This reverts commit 08fa70e25cf962d72c542d0015cb9d4ff6369876. --- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 5 ----- 1 file changed, 5 deletions(-) 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 e862dfcf6..64f4d567a 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 @@ -35,7 +35,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; @@ -121,10 +120,6 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void recieveMana(int mana) { this.mana = Math.max(0, Math.min(getCurrentMana() + mana, manaCap)); - if (worldObj.isRemote) { - FMLLog.severe("[Botania]: CLIENT POOL RECEIVE MANA"); - FMLLog.severe("[Botania]: WORLD: %s, POS: %s", worldObj, pos); - } worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDispatchable(); } From 5104ff52d6f414bb3bb9273b3572b9ecdaff9ebd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 23:13:59 -0600 Subject: [PATCH 284/935] Tweak to bandaid --- src/main/java/vazkii/botania/common/block/tile/TileMod.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 526abe246..197501815 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -72,8 +72,9 @@ public class TileMod extends TileEntity implements ITickable { try { updateEntity(); } catch (Exception e) { // todo 1.8 remove this abhorration after I figure out what's going on. - FMLLog.severe("[Botania]: CLIENT TICK FAILED: " + this.toString()); + FMLLog.severe("[Botania]: CLIENT TICK FAILED"); FMLLog.severe("[Botania]: PLEASE REPORT"); + FMLLog.severe("[Botania]: World: %s, Pos: %s, TE: %s", worldObj, pos, this); } } } From eb7a6aee50728f235ab8d11124791fa1151c5873 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 23:55:05 -0600 Subject: [PATCH 285/935] Tweak the bandaid --- src/main/java/vazkii/botania/common/block/tile/TileMod.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 197501815..2d6e78fd1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -72,9 +72,13 @@ public class TileMod extends TileEntity implements ITickable { try { updateEntity(); } catch (Exception e) { // todo 1.8 remove this abhorration after I figure out what's going on. + e.printStackTrace(); FMLLog.severe("[Botania]: CLIENT TICK FAILED"); - FMLLog.severe("[Botania]: PLEASE REPORT"); FMLLog.severe("[Botania]: World: %s, Pos: %s, TE: %s", worldObj, pos, this); + if (this instanceof TileSpecialFlower) { + TileSpecialFlower spec = ((TileSpecialFlower) this); + FMLLog.severe("[Botania]: SUBTILE: %s", spec.getSubTile().getUnlocalizedName()); + } } } } From fddf546474a481fac81b891e1fef3bd133b3a60a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jan 2016 14:15:41 -0600 Subject: [PATCH 286/935] Cleanup and reformat: Delete all ISBRH's and IItemRenderers besides book, reformat to tabs in my new classes, add missing copylefts --- .../vazkii/botania/api/BotaniaAPIClient.java | 144 +++--- .../botania/api/state/BotaniaStateProps.java | 176 ++++--- .../botania/api/state/PropertyObject.java | 66 +-- .../api/state/enums/AlfPortalState.java | 16 +- .../api/state/enums/AltGrassVariant.java | 22 +- .../botania/api/state/enums/AltarVariant.java | 30 +- .../api/state/enums/BiomeBrickVariant.java | 42 +- .../api/state/enums/BiomeStoneVariant.java | 42 +- .../botania/api/state/enums/CratePattern.java | 30 +- .../botania/api/state/enums/CrateVariant.java | 14 +- .../api/state/enums/CustomBrickVariant.java | 42 +- .../botania/api/state/enums/DrumVariant.java | 16 +- .../api/state/enums/EndBrickVariant.java | 18 +- .../api/state/enums/FutureStoneVariant.java | 42 +- .../api/state/enums/LivingRockVariant.java | 20 +- .../api/state/enums/LivingWoodVariant.java | 22 +- .../api/state/enums/LuminizerVariant.java | 14 +- .../api/state/enums/PlatformVariant.java | 16 +- .../botania/api/state/enums/PoolVariant.java | 18 +- .../api/state/enums/PrismarineVariant.java | 16 +- .../botania/api/state/enums/PylonVariant.java | 16 +- .../api/state/enums/QuartzVariant.java | 20 +- .../api/state/enums/SpreaderVariant.java | 18 +- .../api/state/enums/StorageVariant.java | 20 +- .../integration/jei/JEIBotaniaPlugin.java | 80 ++-- .../jei/brewery/BreweryRecipeCategory.java | 111 ++--- .../jei/brewery/BreweryRecipeHandler.java | 40 +- .../jei/brewery/BreweryRecipeWrapper.java | 72 +-- .../elventrade/ElvenTradeRecipeCategory.java | 136 +++--- .../elventrade/ElvenTradeRecipeHandler.java | 40 +- .../elventrade/ElvenTradeRecipeWrapper.java | 74 +-- .../jei/manapool/ManaPoolRecipeCategory.java | 129 +++--- .../jei/manapool/ManaPoolRecipeHandler.java | 40 +- .../jei/manapool/ManaPoolRecipeWrapper.java | 89 ++-- .../PetalApothecaryRecipeCategory.java | 131 +++--- .../PetalApothecaryRecipeHandler.java | 40 +- .../PetalApothecaryRecipeWrapper.java | 74 +-- .../puredaisy/PureDaisyRecipeCategory.java | 135 +++--- .../jei/puredaisy/PureDaisyRecipeHandler.java | 40 +- .../jei/puredaisy/PureDaisyRecipeWrapper.java | 88 ++-- .../runicaltar/RunicAltarRecipeCategory.java | 131 +++--- .../runicaltar/RunicAltarRecipeHandler.java | 40 +- .../runicaltar/RunicAltarRecipeWrapper.java | 85 ++-- .../client/model/FloatingFlowerModel.java | 312 +++++++------ .../botania/client/model/ModelPylon.java | 67 +-- .../botania/client/model/PlatformModel.java | 89 ++-- .../botania/client/model/PylonItemModel.java | 221 +++++---- .../client/model/SpecialFlowerModel.java | 436 +++++++++--------- .../client/render/block/RenderAvatar.java | 51 -- .../client/render/block/RenderBellows.java | 52 --- .../client/render/block/RenderBrewery.java | 55 --- .../client/render/block/RenderCocoon.java | 51 -- .../block/RenderCorporeaCrystalCube.java | 53 --- .../render/block/RenderCorporeaIndex.java | 55 --- .../client/render/block/RenderHourglass.java | 53 --- .../render/block/RenderIncensePlate.java | 52 --- .../client/render/block/RenderPool.java | 54 --- .../client/render/block/RenderPump.java | 51 -- .../render/block/RenderSpawnerClaw.java | 51 -- .../render/block/RenderSpecialFlower.java | 138 ------ .../client/render/block/RenderSpreader.java | 57 --- .../render/block/RenderTeruTeruBozu.java | 51 -- .../client/render/block/RenderTinyPotato.java | 51 -- .../botania/client/render/item/RenderBow.java | 96 ---- .../client/render/item/RenderLens.java | 124 ----- .../render/item/RenderTransparentItem.java | 81 ---- 66 files changed, 1877 insertions(+), 2879 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderAvatar.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderBellows.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderBrewery.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderCocoon.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderHourglass.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderPool.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderPump.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderSpreader.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java delete mode 100644 src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderBow.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderLens.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 68e31ce4a..3db57c7ff 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + *

+ * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api; import com.google.common.base.Preconditions; @@ -7,8 +15,8 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.api.subtile.SubTileEntity; import java.util.Collections; import java.util.Map; @@ -19,80 +27,82 @@ import java.util.Map; @SideOnly(Side.CLIENT) public final class BotaniaAPIClient { - private static final Map subtileBlockModels = Maps.newHashMap(); - private static final Map subtileItemModels = Maps.newHashMap(); - private static final Map islandTypeModels = Maps.newHashMap(); + private static final Map subtileBlockModels = Maps.newHashMap(); + private static final Map subtileItemModels = Maps.newHashMap(); + private static final Map islandTypeModels = Maps.newHashMap(); - /** - * Register your model for the given subtile class here. - * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used for this subtile - * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form - */ - public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { - Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); - subtileBlockModels.put(subTileName, model); - subtileItemModels.put(subTileName, itemModel); - } + private BotaniaAPIClient() { + } - /** - * Register your model for the given subtile class here. - * Call this DURING PREINIT. - * Your model json must specify key "tintindex" in all the faces it wants tint applied. - * Tint is applied whenever a player recolors the flower using floral dye - * - * @param subTileName The String ID of the subtile - * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" - */ - public static void registerSubtileModel(String subTileName, ModelResourceLocation model) { - registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); - } + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used for this subtile + * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form + */ + public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) { + Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); + subtileBlockModels.put(subTileName, model); + subtileItemModels.put(subTileName, itemModel); + } - // Convenience overloads for the above two calls - public static void registerSubtileModel(Class clazz, ModelResourceLocation model) { - registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model); - } + /** + * Register your model for the given subtile class here. + * Call this DURING PREINIT. + * Your model json must specify key "tintindex" in all the faces it wants tint applied. + * Tint is applied whenever a player recolors the flower using floral dye + * + * @param subTileName The String ID of the subtile + * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" + */ + public static void registerSubtileModel(String subTileName, ModelResourceLocation model) { + registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); + } - public static void registerSubtileModel(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { - registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); - } + // Convenience overloads for the above two calls + public static void registerSubtileModel(Class clazz, ModelResourceLocation model) { + registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model); + } - /** - * @return An immutable and live view of the registered subtile block model map - */ - public static Map getRegisteredSubtileBlockModels() { - return Collections.unmodifiableMap(subtileBlockModels); - } + public static void registerSubtileModel(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { + registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); + } - /** - * @return An immutable and live view of the registered subtile item model map - */ - public static Map getRegisteredSubtileItemModels() { - return Collections.unmodifiableMap(subtileItemModels); - } + /** + * @return An immutable and live view of the registered subtile block model map + */ + public static Map getRegisteredSubtileBlockModels() { + return Collections.unmodifiableMap(subtileBlockModels); + } - /** - * Registers your model for island type islandType here. - * Call this DURING PREINIT. - * @param islandType The islandtype to register - * @param model The variant within a blockstate json to use as the islandtype's model - */ - public static void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ModelResourceLocation model) { - Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); - islandTypeModels.put(islandType, model); - } + /** + * @return An immutable and live view of the registered subtile item model map + */ + public static Map getRegisteredSubtileItemModels() { + return Collections.unmodifiableMap(subtileItemModels); + } - /** - * @return An immutable and live view of the registered island type model map - */ - public static Map getRegisteredIslandTypeModels() { - return Collections.unmodifiableMap(islandTypeModels); - } + /** + * Registers your model for island type islandType here. + * Call this DURING PREINIT. + * + * @param islandType The islandtype to register + * @param model The variant within a blockstate json to use as the islandtype's model + */ + public static void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ModelResourceLocation model) { + Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); + islandTypeModels.put(islandType, model); + } - private BotaniaAPIClient() {} + /** + * @return An immutable and live view of the registered island type model map + */ + public static Map getRegisteredIslandTypeModels() { + return Collections.unmodifiableMap(islandTypeModels); + } } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index a2b9d00bc..92f49feb0 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -26,133 +26,131 @@ import vazkii.botania.api.state.enums.*; */ public class BotaniaStateProps { - /** Unlisted properties **/ + /** Unlisted properties **/ - // The property for specialFlower subtile id - public static final PropertyObject SUBTILE_ID = new PropertyObject<>("subtile_id", String.class); + // The property for specialFlower subtile id + public static final PropertyObject SUBTILE_ID = new PropertyObject<>("subtile_id", String.class); - // The property for floating flower island type - public static final PropertyObject ISLAND_TYPE = new PropertyObject<>("islandtype", IFloatingFlower.IslandType.class); + // The property for floating flower island type + public static final PropertyObject ISLAND_TYPE = new PropertyObject<>("islandtype", IFloatingFlower.IslandType.class); - // The property for platform held blockstate id - public static final PropertyObject HELD_STATE = new PropertyObject<>("held_state", IBlockState.class); + // The property for platform held blockstate id + public static final PropertyObject HELD_STATE = new PropertyObject<>("held_state", IBlockState.class); - /** Common properties to all blocks to use **/ + /** Common properties to all blocks to use **/ - // The 16 Minecraft colors - public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); + // The 16 Minecraft colors + public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); - // The four cardinal directions - public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); + // The four cardinal directions + public static final PropertyEnum CARDINALS = PropertyEnum.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL); - // All 6 directions - public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); + // All 6 directions + public static final PropertyEnum FACING = PropertyEnum.create("facing", EnumFacing.class); - // Redstone power - boolean - // Also for any other simple boolean "on/off" state - public static final PropertyBool POWERED = PropertyBool.create("powered"); + // Redstone power - boolean + // Also for any other simple boolean "on/off" state + public static final PropertyBool POWERED = PropertyBool.create("powered"); - // Redstone power - int - public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); + /** Properties for certain kinds of blocks **/ - /** Properties for certain kinds of blocks **/ + // The axis directions (think quartz pillars and wood logs) + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; - // The axis directions (think quartz pillars and wood logs) - public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + // Extra Quartz Blocks + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); - // Extra Quartz Blocks - public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + /** Properties for individual blocks **/ - /** Properties for individual blocks **/ + // Block18Stone + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); - // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + // Block18StoneWall + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; + }); - // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; - }); + // BlockAlfPortal + public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); - // BlockAlfPortal - public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + // BlockAltar + public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); - // BlockAltar - public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); + // BlockAltGrass + public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); - // BlockAltGrass - public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + // BlockBiomeStoneA + public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); - // BlockBiomeStoneA - public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); + // BlockBiomeStoneB + public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); - // BlockBiomeStoneB - public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); + // BlockBiomeStoneWall + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); - // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); + // BlockCustomBrick + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); - // BlockCustomBrick - public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + // BlockDreamWood, BlockLivingWood + public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); - // BlockDreamWood, BlockLivingWood - public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); + // BlockEnchanter + public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); - // BlockEnchanter - public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + // BlockEndStoneBrick + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); - // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + // BlockForestDrum + public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); - // BlockForestDrum - public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); + // BlockGhostRail + public static final PropertyEnum RAIL_DIRECTION = BlockRailPowered.SHAPE; - // BlockGhostRail - public static final PropertyEnum RAIL_DIRECTION = BlockRailPowered.SHAPE; + // BlockLightRelay + public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); - // BlockLightRelay - public static final PropertyEnum LUMINIZER_VARIANT = PropertyEnum.create("variant", LuminizerVariant.class); + // BlockLivingRock + public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); - // BlockLivingRock - public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); + // BlockModDoubleFlower (white to gray) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); - // BlockModDoubleFlower (white to gray) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); + // (silver to black) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); - // (silver to black) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); + // BlockOpenCrate + public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); - // BlockOpenCrate - public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); - public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); + // BlockPavement + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color -> + color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); - // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color -> - color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK - || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED - || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); + // BlockPlatform + public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); - // BlockPlatform - public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); + // BlockPool + public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); - // BlockPool - public static final PropertyEnum POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class); + // BlockPrism + public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); - // BlockPrism - public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); + // BlockPrismarine + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); - // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + // BlockPylon + public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); - // BlockPylon - public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); + // BlockSpreader + public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); - // BlockSpreader - public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); + // BlockStorage + public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); - // BlockStorage - public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); - - private BotaniaStateProps() {} + private BotaniaStateProps() { + } } diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index fc09cf7fd..78ce6dd9b 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + *

+ * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state; import com.google.common.base.Function; @@ -8,39 +16,39 @@ import net.minecraftforge.common.property.IUnlistedProperty; // Generic base class for unlisted properties public class PropertyObject implements IUnlistedProperty { - private final String name; - private final Class clazz; - private final Predicate validator; - private final Function stringFunction; + private final String name; + private final Class clazz; + private final Predicate validator; + private final Function stringFunction; - public PropertyObject(String name, Class clazz, Predicate validator, Function stringFunction) { - this.name = name; - this.clazz = clazz; - this.validator = validator; - this.stringFunction = stringFunction; - } + public PropertyObject(String name, Class clazz, Predicate validator, Function stringFunction) { + this.name = name; + this.clazz = clazz; + this.validator = validator; + this.stringFunction = stringFunction; + } - public PropertyObject(String name, Class clazz) { - this(name, clazz, Predicates.alwaysTrue(), Object::toString); - } + public PropertyObject(String name, Class clazz) { + this(name, clazz, Predicates.alwaysTrue(), Object::toString); + } - @Override - public String getName() { - return name; - } + @Override + public String getName() { + return name; + } - @Override - public boolean isValid(T value) { - return validator.apply(value); - } + @Override + public boolean isValid(T value) { + return validator.apply(value); + } - @Override - public Class getType() { - return clazz; - } + @Override + public Class getType() { + return clazz; + } - @Override - public String valueToString(T value) { - return stringFunction.apply(value); - } + @Override + public String valueToString(T value) { + return stringFunction.apply(value); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 8fefab1b8..91d52e25d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,13 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum AlfPortalState implements IStringSerializable { - OFF, - ON_Z, - ON_X; + OFF, + ON_Z, + ON_X; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index 5c39e7641..612742b73 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,16 +13,16 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum AltGrassVariant implements IStringSerializable { - DRY, - GOLDEN, - VIVID, - SCORCHED, - INFUSED, - MUTATED; + DRY, + GOLDEN, + VIVID, + SCORCHED, + INFUSED, + MUTATED; - @Override - public String getName() { - return this.name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return this.name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 4a537727d..056b2b428 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,20 +13,20 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum AltarVariant implements IStringSerializable { - DEFAULT, - FOREST, - PLAINS, - MOUNTAIN, - FUNGAL, - SWAMP, - DESERT, - TAIGA, - MESA, - MOSSY; + DEFAULT, + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + MOSSY; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java index 26fd82de6..4808a5893 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,26 +13,26 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum BiomeBrickVariant implements IStringSerializable { - FOREST, - PLAINS, - MOUNTAIN, - FUNGAL, - SWAMP, - DESERT, - TAIGA, - MESA, - CHISELED_FOREST, - CHISELED_PLAINS, - CHISELED_MOUNTAIN, - CHISELED_FUNGAL, - CHISELED_SWAMP, - CHISELED_DESERT, - CHISELED_TAIGA, - CHISELED_MESA; + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + CHISELED_FOREST, + CHISELED_PLAINS, + CHISELED_MOUNTAIN, + CHISELED_FUNGAL, + CHISELED_SWAMP, + CHISELED_DESERT, + CHISELED_TAIGA, + CHISELED_MESA; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java index 64d535329..946e8fee0 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,26 +13,26 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum BiomeStoneVariant implements IStringSerializable { - FOREST, - PLAINS, - MOUNTAIN, - FUNGAL, - SWAMP, - DESERT, - TAIGA, - MESA, - FOREST_COBBLE, - PLAINS_COBBLE, - MOUNTAIN_COBBLE, - FUNGAL_COBBLE, - SWAMP_COBBLE, - DESERT_COBBLE, - TAIGA_COBBLE, - MESA_COBBLE; + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + FOREST_COBBLE, + PLAINS_COBBLE, + MOUNTAIN_COBBLE, + FUNGAL_COBBLE, + SWAMP_COBBLE, + DESERT_COBBLE, + TAIGA_COBBLE, + MESA_COBBLE; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java index 2cbf2a8f8..653a29776 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,19 +13,19 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum CratePattern implements IStringSerializable { - NONE, - CRAFTY_1_1, - CRAFTY_2_2, - CRAFTY_1_2, - CRAFTY_2_1, - CRAFTY_1_3, - CRAFTY_3_1, - CRAFTY_2_3, - CRAFTY_3_2, - CRAFTY_DONUT; + NONE, + CRAFTY_1_1, + CRAFTY_2_2, + CRAFTY_1_2, + CRAFTY_2_1, + CRAFTY_1_3, + CRAFTY_3_1, + CRAFTY_2_3, + CRAFTY_3_2, + CRAFTY_DONUT; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java index 1cf832200..ba2fa8784 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,12 +13,12 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum CrateVariant implements IStringSerializable { - OPEN, - CRAFTY; + OPEN, + CRAFTY; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index 1576e4c73..182a4c019 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,26 +13,26 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum CustomBrickVariant implements IStringSerializable { - HELLISH_BRICK, - SOUL_BRICK, - FROSTY_BRICK, - ROOF_TILE, - AZULEJO_1, - AZULEJO_2, - AZULEJO_3, - AZULEJO_4, - AZULEJO_5, - AZULEJO_6, - AZULEJO_7, - AZULEJO_8, - AZULEJO_9, - AZULEJO_10, - AZULEJO_11, - AZULEJO_12; + HELLISH_BRICK, + SOUL_BRICK, + FROSTY_BRICK, + ROOF_TILE, + AZULEJO_1, + AZULEJO_2, + AZULEJO_3, + AZULEJO_4, + AZULEJO_5, + AZULEJO_6, + AZULEJO_7, + AZULEJO_8, + AZULEJO_9, + AZULEJO_10, + AZULEJO_11, + AZULEJO_12; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java index 56ea59434..50d954002 100644 --- a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,13 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum DrumVariant implements IStringSerializable { - WILD, - GATHERING, - CANOPY; + WILD, + GATHERING, + CANOPY; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java index d11fe84be..bbec78401 100644 --- a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,14 +13,14 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum EndBrickVariant implements IStringSerializable { - END_STONE_BRICKS, - CHISELED_END_STONE_BRICKS, - ENDER_BRICKS, - PILLAR_ENDER_BRICKS; + END_STONE_BRICKS, + CHISELED_END_STONE_BRICKS, + ENDER_BRICKS, + PILLAR_ENDER_BRICKS; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java index 6856734a9..079c7aeef 100644 --- a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,26 +13,26 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum FutureStoneVariant implements IStringSerializable { - ANDESITE, - BASALT, - DIORITE, - GRANITE, - POLISHED_ANDESITE, - POLISHED_BASALT, - POLISHED_DIORITE, - POLISHED_GRANITE, - ANDESITE_BRICK, - BASALT_BRICK, - DIORITE_BRICK, - GRANITE_BRICK, - CHISELED_ANDESITE, - CHISELED_BASALT, - CHISELED_DIORITE, - CHISELED_GRANITE; + ANDESITE, + BASALT, + DIORITE, + GRANITE, + POLISHED_ANDESITE, + POLISHED_BASALT, + POLISHED_DIORITE, + POLISHED_GRANITE, + ANDESITE_BRICK, + BASALT_BRICK, + DIORITE_BRICK, + GRANITE_BRICK, + CHISELED_ANDESITE, + CHISELED_BASALT, + CHISELED_DIORITE, + CHISELED_GRANITE; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java index 51030e40a..bd28a9730 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,15 +13,15 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum LivingRockVariant implements IStringSerializable { - DEFAULT, - BRICK, - MOSSY_BRICK, - CRACKED_BRICK, - CHISELED_BRICK; + DEFAULT, + BRICK, + MOSSY_BRICK, + CRACKED_BRICK, + CHISELED_BRICK; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java index 0c84b36e5..e9d27c2f1 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,16 +13,16 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum LivingWoodVariant implements IStringSerializable { - DEFAULT, - PLANKS, - MOSSY_PLANKS, - FRAMED, - PATTERN_FRAMED, - GLIMMERING; + DEFAULT, + PLANKS, + MOSSY_PLANKS, + FRAMED, + PATTERN_FRAMED, + GLIMMERING; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 08b89d741..26b74ee8f 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,12 +13,12 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum LuminizerVariant implements IStringSerializable { - DEFAULT, - DETECTOR; + DEFAULT, + DETECTOR; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java index 572b22e49..37c2e64db 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,13 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum PlatformVariant implements IStringSerializable { - ABSTRUSE, - SPECTRAL, - INFRANGIBLE; + ABSTRUSE, + SPECTRAL, + INFRANGIBLE; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index e57d8b373..fe2a2e702 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,14 +13,14 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum PoolVariant implements IStringSerializable { - DEFAULT, - CREATIVE, - DILUTED, - FABULOUS; + DEFAULT, + CREATIVE, + DILUTED, + FABULOUS; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java index 6e37065d7..15eb2e77a 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,13 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum PrismarineVariant implements IStringSerializable { - PRISMARINE, - PRISMARINE_BRICKS, - DARK_PRISMARINE; + PRISMARINE, + PRISMARINE_BRICKS, + DARK_PRISMARINE; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java index ed431c756..3a4ed9f09 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,13 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum PylonVariant implements IStringSerializable { - MANA, - NATURA, - GAIA; + MANA, + NATURA, + GAIA; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java index 6d3767ec3..3bb9a1ea2 100644 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,15 +13,15 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum QuartzVariant implements IStringSerializable { - NORMAL, - CHISELED, - PILLAR_Y, - PILLAR_X, - PILLAR_Z; + NORMAL, + CHISELED, + PILLAR_Y, + PILLAR_X, + PILLAR_Z; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java index fbae11307..3794b113f 100644 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,14 +13,14 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum SpreaderVariant implements IStringSerializable { - MANA, - REDSTONE, - ELVEN, - GAIA; + MANA, + REDSTONE, + ELVEN, + GAIA; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java index 23f5efb7c..6626730d4 100644 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -13,15 +13,15 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum StorageVariant implements IStringSerializable { - MANASTEEL, - TERRASTEEL, - ELEMENTIUM, - MANA_DIAMOND, - DRAGONSTONE; + MANASTEEL, + TERRASTEEL, + ELEMENTIUM, + MANA_DIAMOND, + DRAGONSTONE; - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index c9036d989..4d999a48f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -31,50 +31,52 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { - private IJeiHelpers jeiHelpers; + private IJeiHelpers jeiHelpers; - @Override - public boolean isModLoaded() { - return true; - } + @Override + public boolean isModLoaded() { + return true; + } - @Override - public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { - this.jeiHelpers = jeiHelpers; - } + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { + this.jeiHelpers = jeiHelpers; + } - @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) {} + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) { + } - @Override - public void register(IModRegistry registry) { - registry.addRecipeCategories( - new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), - new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), - new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), - new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), - new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), - new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) - ); + @Override + public void register(IModRegistry registry) { + registry.addRecipeCategories( + new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), + new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), + new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), + new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), + new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), + new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) + ); - registry.addRecipeHandlers( - new BreweryRecipeHandler(), - new PureDaisyRecipeHandler(), - new PetalApothecaryRecipeHandler(), - new ElvenTradeRecipeHandler(), - new RunicAltarRecipeHandler(), - new ManaPoolRecipeHandler() - ); + registry.addRecipeHandlers( + new BreweryRecipeHandler(), + new PureDaisyRecipeHandler(), + new PetalApothecaryRecipeHandler(), + new ElvenTradeRecipeHandler(), + new RunicAltarRecipeHandler(), + new ManaPoolRecipeHandler() + ); - registry.addRecipes(BotaniaAPI.brewRecipes); - registry.addRecipes(BotaniaAPI.pureDaisyRecipes); - registry.addRecipes(BotaniaAPI.petalRecipes); - registry.addRecipes(BotaniaAPI.elvenTradeRecipes); - registry.addRecipes(BotaniaAPI.runeAltarRecipes); - registry.addRecipes(BotaniaAPI.manaInfusionRecipes); - } + registry.addRecipes(BotaniaAPI.brewRecipes); + registry.addRecipes(BotaniaAPI.pureDaisyRecipes); + registry.addRecipes(BotaniaAPI.petalRecipes); + registry.addRecipes(BotaniaAPI.elvenTradeRecipes); + registry.addRecipes(BotaniaAPI.runeAltarRecipes); + registry.addRecipes(BotaniaAPI.manaInfusionRecipes); + } - @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {} + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index ab8edf75e..4a39cead6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.Collection; @@ -26,69 +25,71 @@ import java.util.List; public class BreweryRecipeCategory implements IRecipeCategory { - private final IDrawableStatic background; - private final String localizedName; + private final IDrawableStatic background; + private final String localizedName; - public BreweryRecipeCategory(IGuiHelper guiHelper) { - ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); - background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); - localizedName = StatCollector.translateToLocal("botania.nei.brewery"); - } + public BreweryRecipeCategory(IGuiHelper guiHelper) { + ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); + background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + localizedName = StatCollector.translateToLocal("botania.nei.brewery"); + } - @Nonnull - @Override - public String getUid() { - return "botania.brewery"; - } + @Nonnull + @Override + public String getUid() { + return "botania.brewery"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) {} + @Override + public void drawExtras(Minecraft minecraft) { + } - @Override - public void drawAnimations(Minecraft minecraft) {} + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof BreweryRecipeWrapper)) - return; - BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof BreweryRecipeWrapper)) + return; + BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); - List inputs = wrapper.getInputs(); + List inputs = wrapper.getInputs(); - recipeLayout.getItemStacks().init(0, true, 39, 41); - if (inputs.get(0) instanceof ItemStack) { - recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0))); - } else { - recipeLayout.getItemStacks().set(0, ((Collection) inputs.get(0))); - } + recipeLayout.getItemStacks().init(0, true, 39, 41); + if(inputs.get(0) instanceof ItemStack) { + recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0))); + } else { + recipeLayout.getItemStacks().set(0, ((Collection) inputs.get(0))); + } - int index = 1, posX = 60; - for (int i = 1; i < wrapper.getInputs().size(); i++) { - Object o = wrapper.getInputs().get(i); - recipeLayout.getItemStacks().init(index, true, posX, 6); - if (o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); - } else if (o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); - } - index++; - posX += 18; - } + int index = 1, posX = 60; + for(int i = 1; i < wrapper.getInputs().size(); i++) { + Object o = wrapper.getInputs().get(i); + recipeLayout.getItemStacks().init(index, true, posX, 6); + if(o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } else if(o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + index++; + posX += 18; + } - recipeLayout.getItemStacks().init(7, false, 87, 41); - recipeLayout.getItemStacks().set(7, wrapper.getOutputs()); - } + recipeLayout.getItemStacks().init(7, false, 87, 41); + recipeLayout.getItemStacks().set(7, wrapper.getOutputs()); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index 275cdbccd..fdd5a08f6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class BreweryRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeBrew.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeBrew.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.brewery"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.brewery"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { - return new BreweryRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { + return new BreweryRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipeBrew recipe) { - return recipe.getInputs().size() <= 6; - } + @Override + public boolean isRecipeValid(@Nonnull RecipeBrew recipe) { + return recipe.getInputs().size() <= 6; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 305784d57..66aea0384 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -22,45 +22,51 @@ import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { - private final List input; - private final List output; + private final List input; + private final List output; - public BreweryRecipeWrapper(RecipeBrew recipeBrew) { - ImmutableList.Builder builder = ImmutableList.builder(); - builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); - for (Object o : recipeBrew.getInputs()) { - if (o instanceof ItemStack) { - builder.add(o); - } - if (o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); - } - } + public BreweryRecipeWrapper(RecipeBrew recipeBrew) { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); + for(Object o : recipeBrew.getInputs()) { + if(o instanceof ItemStack) { + builder.add(o); + } + if(o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } - input = builder.build(); - output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy()); - } + input = builder.build(); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy()); + } - @Override - public List getInputs() { - return input; - } + @Override + public List getInputs() { + return input; + } - @Override - public List getOutputs() { - return output; - } + @Override + public List getOutputs() { + return output; + } - @Override - public List getFluidInputs() { return ImmutableList.of(); } + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } - @Override - public List getFluidOutputs() { return ImmutableList.of(); } + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } 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 121b6bc3a..d9c6b92c6 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 @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -31,81 +31,81 @@ import java.util.Collection; public class ElvenTradeRecipeCategory implements IRecipeCategory { - private final String localizedName; - private final IDrawable background; - private final IDrawable overlay; + private final String localizedName; + private final IDrawable background; + private final IDrawable overlay; - public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { - localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade"); - background = guiHelper.createBlankDrawable(145, 95); - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); - } + public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { + localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade"); + background = guiHelper.createBlankDrawable(145, 95); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); + } - @Nonnull - @Override - public String getUid() { - return "botania.elvenTrade"; - } + @Nonnull + @Override + public String getUid() { + return "botania.elvenTrade"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) { - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - overlay.draw(minecraft, 0, 4); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - } + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 0, 4); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(Minecraft minecraft) { - minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; - Tessellator tess = Tessellator.getInstance(); - WorldRenderer wr = tess.getWorldRenderer(); - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - int startX = 22; - int startY = 25; - int stopX = 70; - int stopY = 73; - wr.pos(startX, startY, 0).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); - wr.pos(startX, stopY, 0).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); - wr.pos(stopX, stopY, 0).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); - wr.pos(stopX, startY, 0).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); - tess.draw(); - } + @Override + public void drawAnimations(Minecraft minecraft) { + minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; + Tessellator tess = Tessellator.getInstance(); + WorldRenderer wr = tess.getWorldRenderer(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + int startX = 22; + int startY = 25; + int stopX = 70; + int stopY = 73; + wr.pos(startX, startY, 0).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); + wr.pos(startX, stopY, 0).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, stopY, 0).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, startY, 0).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + tess.draw(); + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) - return; - ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper); + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) + return; + ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper); - int index = 0, posX = 42; - for (Object o : wrapper.getInputs()) { - recipeLayout.getItemStacks().init(index, true, posX, 0); - if (o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); - } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); - } - index++; - posX += 18; - } + int index = 0, posX = 42; + for(Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, posX, 0); + if(o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index++; + posX += 18; + } - recipeLayout.getItemStacks().init(index, false, 93, 41); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); - } + recipeLayout.getItemStacks().init(index, false, 93, 41); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index fdf313f76..e80a550af 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class ElvenTradeRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeElvenTrade.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeElvenTrade.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.elvenTrade"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.elvenTrade"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { - return new ElvenTradeRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { + return new ElvenTradeRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) { - return true; - } + @Override + public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) { + return true; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 7e0e42572..5c6a99ce3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -21,47 +21,49 @@ import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { - private final List input; - private final ItemStack output; + private final List input; + private final ItemStack output; - public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); - for (Object o : recipe.getInputs()) { - if (o instanceof ItemStack) { - builder.add(o); - } - if (o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); - } - } - input = builder.build(); - output = recipe.getOutput(); - } + public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(Object o : recipe.getInputs()) { + if(o instanceof ItemStack) { + builder.add(o); + } + if(o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } - @Override - public List getInputs() { - return input; - } + @Override + public List getInputs() { + return input; + } - @Override - public List getOutputs() { - return ImmutableList.of(output); - } + @Override + public List getOutputs() { + return ImmutableList.of(output); + } - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } - @Override - public List getFluidOutputs() { - return ImmutableList.of(); - } + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 510ad9691..17eaaa989 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -25,81 +25,82 @@ import java.util.Collection; public class ManaPoolRecipeCategory implements IRecipeCategory { - private final IDrawable background; - private final String localizedName; - private final IDrawable overlay; + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; - public ManaPoolRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(168, 64); - localizedName = StatCollector.translateToLocal("botania.nei.manaPool"); - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), - 0, 0, 64, 46); - } + public ManaPoolRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.manaPool"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } - @Nonnull - @Override - public String getUid() { - return "botania.manaPool"; - } + @Nonnull + @Override + public String getUid() { + return "botania.manaPool"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) { - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - overlay.draw(minecraft, 48, 0); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - } + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(Minecraft minecraft) {} + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof ManaPoolRecipeWrapper)) - return; + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof ManaPoolRecipeWrapper)) + return; - ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper); - int index = 0; + ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper); + int index = 0; - recipeLayout.getItemStacks().init(index, true, 40, 12); - if (wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getInputs().get(0))); - } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0))); - } + recipeLayout.getItemStacks().init(index, true, 40, 12); + if(wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0))); + } - index++; + index++; - if (wrapper.getInputs().size() > 1) { - // Has catalyst - recipeLayout.getItemStacks().init(index, true, 20, 12); - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1))); - index++; - } + if(wrapper.getInputs().size() > 1) { + // Has catalyst + recipeLayout.getItemStacks().init(index, true, 20, 12); + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1))); + index++; + } - recipeLayout.getItemStacks().init(index, true, 70, 12); - recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0)); - index++; + recipeLayout.getItemStacks().init(index, true, 70, 12); + recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0)); + index++; - recipeLayout.getItemStacks().init(index, false, 99, 12); - if (wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getOutputs().get(0))); - } else { - recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0))); - } - } + recipeLayout.getItemStacks().init(index, false, 99, 12); + if(wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0))); + } + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index c20595b00..8dc1eed45 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class ManaPoolRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeManaInfusion.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeManaInfusion.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.manaPool"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.manaPool"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { - return new ManaPoolRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { + return new ManaPoolRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) { - return recipe.getManaToConsume() <= 100000; - } + @Override + public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) { + return recipe.getManaToConsume() <= 100000; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index ad6bc4d92..b36f4929b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -25,58 +25,59 @@ import java.util.List; public class ManaPoolRecipeWrapper implements IRecipeWrapper { - private final List input; - private final ItemStack output; - private final int mana; + private final List input; + private final ItemStack output; + private final int mana; - public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); - if (recipe.getInput() instanceof ItemStack) { - builder.add(recipe.getInput()); - } else if (recipe.getInput() instanceof String) { - builder.add(OreDictionary.getOres(((String) recipe.getInput()))); - } + if(recipe.getInput() instanceof ItemStack) { + builder.add(recipe.getInput()); + } else if(recipe.getInput() instanceof String) { + builder.add(OreDictionary.getOres(((String) recipe.getInput()))); + } - if (recipe.isAlchemy()) { - builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); - } else if (recipe.isConjuration()) { - builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); - } + if(recipe.isAlchemy()) { + builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); + } else if(recipe.isConjuration()) { + builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); + } - input = builder.build(); - output = recipe.getOutput(); - mana = recipe.getManaToConsume(); - } + input = builder.build(); + output = recipe.getOutput(); + mana = recipe.getManaToConsume(); + } - @Override - public List getInputs() { - return input; - } + @Override + public List getInputs() { + return input; + } - @Override - public List getOutputs() { - return ImmutableList.of(output); - } + @Override + public List getOutputs() { + return ImmutableList.of(output); + } - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } - @Override - public List getFluidOutputs() { - return ImmutableList.of(); - } + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - GlStateManager.enableAlpha(); - HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10); - GlStateManager.disableAlpha(); - } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 61e54d303..ebd012818 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -27,81 +27,82 @@ import java.util.Collection; public class PetalApothecaryRecipeCategory implements IRecipeCategory { - private final IDrawableStatic background; - private final String localizedName; - private final IDrawableStatic overlay; + private final IDrawableStatic background; + private final String localizedName; + private final IDrawableStatic overlay; - public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(150, 110); - localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), - 0, 0, 150, 110); - } + public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(150, 110); + localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 150, 110); + } - @Nonnull - @Override - public String getUid() { - return "botania.petals"; - } + @Nonnull + @Override + public String getUid() { + return "botania.petals"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) { - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - overlay.draw(minecraft); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - } + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(Minecraft minecraft) {} + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) - return; - PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) + return; + PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); - recipeLayout.getItemStacks().init(0, true, 64, 52); - recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); + recipeLayout.getItemStacks().init(0, true, 64, 52); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); - int index = 1; - double angleBetweenEach = 360.0 / wrapper.getInputs().size(); - Point point = new Point(64, 20), center = new Point(64, 52); + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); - for (Object o : wrapper.getInputs()) { - recipeLayout.getItemStacks().init(index, true, point.x, point.y); - if (o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); - } - if (o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); - } - index += 1; - point = rotatePointAbout(point, center, angleBetweenEach); - } + for(Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, point.x, point.y); + if(o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if(o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); + } - recipeLayout.getItemStacks().init(index, false, 103, 17); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); - } + recipeLayout.getItemStacks().init(index, false, 103, 17); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } - private Point rotatePointAbout(Point in, Point about, double degrees) { - double rad = degrees * Math.PI / 180.0; - double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; - double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; - return new Point(((int) newX), ((int) newY)); - } + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 365e81ff2..9c462db79 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class PetalApothecaryRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipePetals.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePetals.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.petals"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.petals"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) { - return new PetalApothecaryRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) { + return new PetalApothecaryRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipePetals recipe) { - return recipe.getInputs().size() <= 16; - } + @Override + public boolean isRecipeValid(@Nonnull RecipePetals recipe) { + return recipe.getInputs().size() <= 16; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 2db1ab24c..9104b69ec 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -21,47 +21,49 @@ import java.util.List; public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { - private final List input; - private final ItemStack output; + private final List input; + private final ItemStack output; - public PetalApothecaryRecipeWrapper(RecipePetals recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); - for (Object o : recipe.getInputs()) { - if (o instanceof ItemStack) { - builder.add(o); - } - if (o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); - } - } - input = builder.build(); - output = recipe.getOutput(); - } + public PetalApothecaryRecipeWrapper(RecipePetals recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(Object o : recipe.getInputs()) { + if(o instanceof ItemStack) { + builder.add(o); + } + if(o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } - @Override - public List getInputs() { - return input; - } + @Override + public List getInputs() { + return input; + } - @Override - public List getOutputs() { - return ImmutableList.of(output); - } + @Override + public List getOutputs() { + return ImmutableList.of(output); + } - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } - @Override - public List getFluidOutputs() { - return ImmutableList.of(); - } + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index e38084158..84140ac3b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -26,83 +26,84 @@ import java.util.Collection; public class PureDaisyRecipeCategory implements IRecipeCategory { - private final IDrawable background; - private final String localizedName; - private final IDrawable overlay; + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; - public PureDaisyRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(168, 64); - localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), - 0, 0, 64, 46); - } + public PureDaisyRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } - @Nonnull - @Override - public String getUid() { - return "botania.pureDaisy"; - } + @Nonnull + @Override + public String getUid() { + return "botania.pureDaisy"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) { - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - overlay.draw(minecraft, 48, 0); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - } + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(Minecraft minecraft) {} + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof PureDaisyRecipeWrapper)) - return; + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof PureDaisyRecipeWrapper)) + return; - PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper); - boolean inputFluid = wrapper.getInputs().isEmpty(); - boolean outputFluid = wrapper.getOutputs().isEmpty(); + PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper); + boolean inputFluid = wrapper.getInputs().isEmpty(); + boolean outputFluid = wrapper.getOutputs().isEmpty(); - if (inputFluid) { - recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0)); - } else { - recipeLayout.getItemStacks().init(0, true, 40, 12); - if (wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(0, ((Collection) wrapper.getInputs().get(0))); - } else { - recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0))); - } - } + if(inputFluid) { + recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0)); + } else { + recipeLayout.getItemStacks().init(0, true, 40, 12); + if(wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(0, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0))); + } + } - recipeLayout.getItemStacks().init(1, true, 70, 12); - recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + recipeLayout.getItemStacks().init(1, true, 70, 12); + recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); - if (outputFluid) { - recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0)); - } else { - recipeLayout.getItemStacks().init(2, false, 99, 12); - if (wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(2, ((Collection) wrapper.getOutputs().get(0))); - } else { - recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0))); - } - } - } + if(outputFluid) { + recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0)); + } else { + recipeLayout.getItemStacks().init(2, false, 99, 12); + if(wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(2, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0))); + } + } + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java index 5d5ada961..200912976 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class PureDaisyRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipePureDaisy.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePureDaisy.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.pureDaisy"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.pureDaisy"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { - return new PureDaisyRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { + return new PureDaisyRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) { - return true; - } + @Override + public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) { + return true; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 311722c28..1666d0cde 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -23,55 +23,57 @@ import java.util.List; public class PureDaisyRecipeWrapper implements IRecipeWrapper { - private List inputs = ImmutableList.of(); - private List outputs = ImmutableList.of(); - private List fluidInputs = ImmutableList.of(); - private List fluidOutputs = ImmutableList.of(); + private List inputs = ImmutableList.of(); + private List outputs = ImmutableList.of(); + private List fluidInputs = ImmutableList.of(); + private List fluidOutputs = ImmutableList.of(); - public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { - if (recipe.getInput() instanceof String) { - inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput()))); - } else if (recipe.getInput() instanceof Block) { - Block b = ((Block) recipe.getInput()); - if (FluidRegistry.lookupFluidForBlock(b) != null) { - fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); - } else { - inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState()))); - } - } + public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { + if(recipe.getInput() instanceof String) { + inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput()))); + } else if(recipe.getInput() instanceof Block) { + Block b = ((Block) recipe.getInput()); + if(FluidRegistry.lookupFluidForBlock(b) != null) { + fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); + } else { + inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState()))); + } + } - Block outBlock = recipe.getOutputState().getBlock(); - if (FluidRegistry.lookupFluidForBlock(outBlock) != null) { - fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000)); - } else { - outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState()))); - } - } + Block outBlock = recipe.getOutputState().getBlock(); + if(FluidRegistry.lookupFluidForBlock(outBlock) != null) { + fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000)); + } else { + outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState()))); + } + } - @Override - public List getInputs() { - return inputs; - } + @Override + public List getInputs() { + return inputs; + } - @Override - public List getOutputs() { - return outputs; - } + @Override + public List getOutputs() { + return outputs; + } - @Override - public List getFluidInputs() { - return fluidInputs; - } + @Override + public List getFluidInputs() { + return fluidInputs; + } - @Override - public List getFluidOutputs() { - return fluidOutputs; - } + @Override + public List getFluidOutputs() { + return fluidOutputs; + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 3a4a3937f..f65f9f03f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -26,81 +26,82 @@ import java.util.Collection; public class RunicAltarRecipeCategory implements IRecipeCategory { - private final IDrawable background; - private final String localizedName; - private final IDrawable overlay; + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; - public RunicAltarRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(150, 110); - localizedName = StatCollector.translateToLocal("botania.nei.runicAltar"); - overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), - 0, 0, 150, 110); - } + public RunicAltarRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(150, 110); + localizedName = StatCollector.translateToLocal("botania.nei.runicAltar"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 150, 110); + } - @Nonnull - @Override - public String getUid() { - return "botania.runicAltar"; - } + @Nonnull + @Override + public String getUid() { + return "botania.runicAltar"; + } - @Nonnull - @Override - public String getTitle() { - return localizedName; - } + @Nonnull + @Override + public String getTitle() { + return localizedName; + } - @Nonnull - @Override - public IDrawable getBackground() { - return background; - } + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) { - GlStateManager.enableAlpha(); - GlStateManager.enableBlend(); - overlay.draw(minecraft); - GlStateManager.disableBlend(); - GlStateManager.disableAlpha(); - } + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(Minecraft minecraft) {} + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - if (!(recipeWrapper instanceof RunicAltarRecipeWrapper)) - return; - RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper); + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if(!(recipeWrapper instanceof RunicAltarRecipeWrapper)) + return; + RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper); - recipeLayout.getItemStacks().init(0, true, 64, 52); - recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); + recipeLayout.getItemStacks().init(0, true, 64, 52); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); - int index = 1; - double angleBetweenEach = 360.0 / wrapper.getInputs().size(); - Point point = new Point(64, 20), center = new Point(64, 52); + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); - for (Object o : wrapper.getInputs()) { - recipeLayout.getItemStacks().init(index, true, point.x, point.y); - if (o instanceof Collection) { - recipeLayout.getItemStacks().set(index, ((Collection) o)); - } - if (o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, ((ItemStack) o)); - } - index += 1; - point = rotatePointAbout(point, center, angleBetweenEach); - } + for(Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, point.x, point.y); + if(o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if(o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); + } - recipeLayout.getItemStacks().init(index, false, 103, 17); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); - } + recipeLayout.getItemStacks().init(index, false, 103, 17); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } - private Point rotatePointAbout(Point in, Point about, double degrees) { - double rad = degrees * Math.PI / 180.0; - double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; - double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; - return new Point(((int) newX), ((int) newY)); - } + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 7dbd831b9..83156eb25 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -16,27 +16,27 @@ import javax.annotation.Nonnull; public class RunicAltarRecipeHandler implements IRecipeHandler { - @Nonnull - @Override - public Class getRecipeClass() { - return RecipeRuneAltar.class; - } + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeRuneAltar.class; + } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.runicAltar"; - } + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.runicAltar"; + } - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { - return new RunicAltarRecipeWrapper(recipe); - } + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { + return new RunicAltarRecipeWrapper(recipe); + } - @Override - public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) { - return recipe.getInputs().size() <= 16; - } + @Override + public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) { + return recipe.getInputs().size() <= 16; + } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index c30dce006..051b87cc7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -24,53 +24,54 @@ import java.util.List; public class RunicAltarRecipeWrapper implements IRecipeWrapper { - private final List input; - private final ItemStack output; - private final int manaUsage; + private final List input; + private final ItemStack output; + private final int manaUsage; - public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); - for (Object o : recipe.getInputs()) { - if (o instanceof ItemStack) { - builder.add(o); - } - if (o instanceof String) { - builder.add(OreDictionary.getOres(((String) o))); - } - } - input = builder.build(); - output = recipe.getOutput(); - manaUsage = recipe.getManaUsage(); - } + public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(Object o : recipe.getInputs()) { + if(o instanceof ItemStack) { + builder.add(o); + } + if(o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + manaUsage = recipe.getManaUsage(); + } - @Override - public List getInputs() { - return input; - } + @Override + public List getInputs() { + return input; + } - @Override - public List getOutputs() { - return ImmutableList.of(output); - } + @Override + public List getOutputs() { + return ImmutableList.of(output); + } - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } - @Override - public List getFluidOutputs() { - return ImmutableList.of(); - } + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - GlStateManager.enableAlpha(); - HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10); - GlStateManager.disableAlpha(); - } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 5d37fb211..b81582816 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -23,7 +23,6 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.ISmartBlockModel; @@ -35,10 +34,9 @@ import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPIClient; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -49,163 +47,203 @@ import java.util.stream.Collectors; public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { - public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); + public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); + private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; + private static Table CACHE = HashBasedTable.create(); - private static Table CACHE = HashBasedTable.create(); + protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); + final IVertexConsumer consumer = new VertexTransformer(builder) { + @Override + public void put(int element, float... data) { + VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); + switch(formatElement.getUsage()) { + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } + } + } + }; + quad.pipe(consumer); + return builder.build(); + } - private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + CACHE.clear(); + } - @Override - public void onResourceManagerReload(IResourceManager resourceManager) { - CACHE.clear(); - } + @Override + public IBakedModel handleItemState(ItemStack stack) { + // Items always have GRASS island + IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; + String identifier; - @Override - public IBakedModel handleItemState(ItemStack stack) { - // Items always have GRASS island - IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; - String identifier; + if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { + // Magic flower + identifier = ItemBlockFloatingSpecialFlower.getType(stack); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + stack.getItemDamage(); + } - if (Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = ItemBlockFloatingSpecialFlower.getType(stack); - } else { - // Mundane flower - identifier = MUNDANE_PREFIX + stack.getItemDamage(); - } + return getModel(islandType, identifier); + } - return getModel(islandType, identifier); - } + @Override + public IBakedModel handleBlockState(IBlockState state) { + if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + IExtendedBlockState realState = ((IExtendedBlockState) state); + IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); + String identifier; - @Override - public IBakedModel handleBlockState(IBlockState state) { - if (state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - IExtendedBlockState realState = ((IExtendedBlockState) state); - IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); - String identifier; + if(state.getBlock() == ModBlocks.floatingSpecialFlower) { + // Magic flower + identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata(); + } - if (state.getBlock() == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); - } else { - // Mundane flower - identifier = MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata(); - } + return getModel(islandType, identifier); + } - return getModel(islandType, identifier); - } + // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. + private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, String identifier) { + ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); - // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. - private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, String identifier) { - ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); + if(CACHE.contains(islandType, identifier)) { + return CACHE.get(islandType, identifier); + } else { + IBakedModel islandModel = modelManager.getModel(BotaniaAPIClient.getRegisteredIslandTypeModels().get(islandType)); + IBakedModel flowerModel; - if (CACHE.contains(islandType, identifier)) { - return CACHE.get(islandType, identifier); - } else { - IBakedModel islandModel = modelManager.getModel(BotaniaAPIClient.getRegisteredIslandTypeModels().get(islandType)); - IBakedModel flowerModel; + if(identifier.startsWith(MUNDANE_PREFIX)) { + int meta = Integer.parseInt(identifier.substring(identifier.indexOf(MUNDANE_PREFIX) + MUNDANE_PREFIX.length())); + flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta)); + } else { + flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(identifier)); + } - if (identifier.startsWith(MUNDANE_PREFIX)) { - int meta = Integer.parseInt(identifier.substring(identifier.indexOf(MUNDANE_PREFIX) + MUNDANE_PREFIX.length())); - flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta)); - } else { - flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(identifier)); - } + // Enhance! + CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); + FMLLog.info("[Botania]: Cached floating flower model for islandtpye %s and flowertype %s", islandType, identifier); + CACHE.put(islandType, identifier, model); + return model; + } + } - // Enhance! - CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); - FMLLog.info("[Botania]: Cached floating flower model for islandtpye %s and flowertype %s", islandType, identifier); - CACHE.put(islandType, identifier, model); - return model; - } - } + // Dummy results + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return ImmutableList.of(); + } - protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); - final IVertexConsumer consumer = new VertexTransformer(builder) { - @Override - public void put(int element, float... data) { - VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); - switch (formatElement.getUsage()) { - case POSITION: { - float[] newData = new float[4]; - Vector4f vec = new Vector4f(data); - transform.getMatrix().transform(vec); - vec.get(newData); - parent.put(element, newData); - break; - } - default: { - parent.put(element, data); - break; - } - } - } - }; - quad.pipe(consumer); - return builder.build(); - } + @Override + public List getGeneralQuads() { + return ImmutableList.of(); + } - private static class CompositeBakedModel implements IBakedModel { + @Override + public boolean isAmbientOcclusion() { + return false; + } - private final IBakedModel base; - private final List genQuads; + @Override + public boolean isGui3d() { + return true; + } - public CompositeBakedModel(IBakedModel flower, IBakedModel island) { - this.base = flower; + @Override + public boolean isBuiltInRenderer() { + return false; + } - ImmutableList.Builder genBuilder = ImmutableList.builder(); - final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } + + private static class CompositeBakedModel implements IBakedModel { + + private final IBakedModel base; + private final List genQuads; + + public CompositeBakedModel(IBakedModel flower, IBakedModel island) { + this.base = flower; + + ImmutableList.Builder genBuilder = ImmutableList.builder(); + final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); - // Add flower quads, scaled and translated - for (BakedQuad quad : flower.getGeneralQuads()) { - genBuilder.add(transform(quad, transform)); - } + // Add flower quads, scaled and translated + for(BakedQuad quad : flower.getGeneralQuads()) { + genBuilder.add(transform(quad, transform)); + } - for (EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); - } + for(EnumFacing e : EnumFacing.VALUES) { + genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + } - // Add island quads - genBuilder.addAll(island.getGeneralQuads()); - for (EnumFacing e: EnumFacing.VALUES) { - genBuilder.addAll(island.getFaceQuads(e)); - } + // Add island quads + genBuilder.addAll(island.getGeneralQuads()); + for(EnumFacing e : EnumFacing.VALUES) { + genBuilder.addAll(island.getFaceQuads(e)); + } - genQuads = genBuilder.build(); - } + genQuads = genBuilder.build(); + } - // Forward all to flower model - @Override public List getGeneralQuads() { - return genQuads; - } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); - } - @Override public boolean isGui3d() { - return true; - } - @Override public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); - } - @Override public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); - } - @Override public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); - } - } + // Forward all to flower model + @Override + public List getGeneralQuads() { + return genQuads; + } - // Dummy results - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - @Override public List getGeneralQuads() { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { return false; } - @Override public boolean isGui3d() { return true; } - @Override public boolean isBuiltInRenderer() { return false; } - @Override public TextureAtlasSprite getParticleTexture() { return null; } - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return ImmutableList.of(); + } + + @Override + public boolean isAmbientOcclusion() { + return base.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + return true; + } + + @Override + public boolean isBuiltInRenderer() { + return base.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return base.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return base.getItemCameraTransforms(); + } + } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index f90fcb282..786074769 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + *

* File Created @ [Apr 1, 2014, 6:21:48 PM (GMT)] */ package vazkii.botania.client.model; @@ -38,23 +38,17 @@ import java.util.Set; public class ModelPylon implements IPylonModel { + private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); private IFlexibleBakedModel manaCrystal; private IFlexibleBakedModel manaRingsAndPanes; private IFlexibleBakedModel manaGems; - private IFlexibleBakedModel naturaCrystal; private IFlexibleBakedModel naturaRingsAndPanes; private IFlexibleBakedModel naturaGems; - private IFlexibleBakedModel gaiaCrystal; private IFlexibleBakedModel gaiaRingsAndPanes; private IFlexibleBakedModel gaiaGems; - private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - - private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); - public ModelPylon() { try { // Load the OBJ @@ -82,27 +76,39 @@ public class ModelPylon implements IPylonModel { manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - } catch (IOException e) { + } catch(IOException e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } } @Override public void renderCrystal(PylonVariant variant) { - switch (variant) { - case MANA: renderModel(manaCrystal); break; - case NATURA: renderModel(naturaCrystal); break; - case GAIA: renderModel(gaiaCrystal); break; + switch(variant) { + case MANA: + renderModel(manaCrystal); + break; + case NATURA: + renderModel(naturaCrystal); + break; + case GAIA: + renderModel(gaiaCrystal); + break; } } @Override public void renderRing(PylonVariant variant) { GlStateManager.disableLighting(); - switch (variant) { - case MANA: renderModel(manaRingsAndPanes); break; - case NATURA: renderModel(naturaRingsAndPanes); break; - case GAIA: renderModel(gaiaRingsAndPanes); break; + switch(variant) { + case MANA: + renderModel(manaRingsAndPanes); + break; + case NATURA: + renderModel(naturaRingsAndPanes); + break; + case GAIA: + renderModel(gaiaRingsAndPanes); + break; } GlStateManager.enableLighting(); } @@ -110,21 +116,25 @@ public class ModelPylon implements IPylonModel { @Override public void renderGems(PylonVariant variant) { GlStateManager.disableLighting(); - switch (variant) { - case MANA: renderModel(manaGems); break; - case NATURA: renderModel(naturaGems); break; - case GAIA: renderModel(gaiaGems); break; + switch(variant) { + case MANA: + renderModel(manaGems); + break; + case NATURA: + renderModel(naturaGems); + break; + case GAIA: + renderModel(gaiaGems); + break; } GlStateManager.enableLighting(); } - private void renderModel(IFlexibleBakedModel model) - { + private void renderModel(IFlexibleBakedModel model) { renderModel(model, -1); } - private void renderModel(IFlexibleBakedModel model, int color) - { + private void renderModel(IFlexibleBakedModel model, int color) { Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); @@ -133,9 +143,8 @@ public class ModelPylon implements IPylonModel { tessellator.draw(); } - private void renderQuads(WorldRenderer renderer, List quads, int color) - { - for (BakedQuad bakedquad : quads) + private void renderQuads(WorldRenderer renderer, List quads, int color) { + for(BakedQuad bakedquad : quads) LightUtil.renderQuadColor(renderer, bakedquad, color); } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 516bdd1e3..b21744feb 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -2,11 +2,11 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ - package vazkii.botania.client.model; +package vazkii.botania.client.model; import com.google.common.collect.ImmutableList; import net.minecraft.block.state.IBlockState; @@ -27,39 +27,66 @@ import java.util.List; public class PlatformModel implements ISmartBlockModel { - @Override - public IBakedModel handleBlockState(IBlockState state) { - EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); - IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); + @Override + public IBakedModel handleBlockState(IBlockState state) { + EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); + IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); - Minecraft mc = Minecraft.getMinecraft(); - if (heldState == null && layer == EnumWorldBlockLayer.SOLID) { - // No camo - ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); - return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - } else if (heldState != null){ - if (heldState.getBlock().canRenderInLayer(layer)) { - // Steal camo's model - IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); + Minecraft mc = Minecraft.getMinecraft(); + if(heldState == null && layer == EnumWorldBlockLayer.SOLID) { + // No camo + ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); + return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + } else if(heldState != null) { + if(heldState.getBlock().canRenderInLayer(layer)) { + // Steal camo's model + IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); - if (model instanceof ISmartBlockModel) { - // Their model can be smart too - model = ((ISmartBlockModel) model).handleBlockState(heldState); - } + if(model instanceof ISmartBlockModel) { + // Their model can be smart too + model = ((ISmartBlockModel) model).handleBlockState(heldState); + } - return model; - } - } + return model; + } + } - return this; // This smart model has no quads as seen below, so nothing actually renders - } + return this; // This smart model has no quads as seen below, so nothing actually renders + } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - @Override public List getGeneralQuads() { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { return true; } - @Override public boolean isGui3d() { return true;} - @Override public boolean isBuiltInRenderer() { return false; } - @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); } - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return ImmutableList.of(); + } + + @Override + public List getGeneralQuads() { + return ImmutableList.of(); + } + + @Override + public boolean isAmbientOcclusion() { + return true; + } + + @Override + public boolean isGui3d() { + return true; + } + + @Override + public boolean isBuiltInRenderer() { + return false; + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } } diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index bb9f45634..32dcd2311 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -40,95 +40,160 @@ import java.util.List; public class PylonItemModel implements ISmartItemModel { - private IBakedModel mana; - private IBakedModel natura; - private IBakedModel gaia; - private boolean cached = false; + private IBakedModel mana; + private IBakedModel natura; + private IBakedModel gaia; + private boolean cached = false; - @Override - public IBakedModel handleItemState(ItemStack stack) { - if (!cached) { - cacheModels(); - } + @Override + public IBakedModel handleItemState(ItemStack stack) { + if(!cached) { + cacheModels(); + } - switch (stack.getItemDamage()) { - case 2: return gaia; - case 1: return natura; - case 0: return mana; - default: - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - } - } + switch(stack.getItemDamage()) { + case 2: + return gaia; + case 1: + return natura; + case 0: + return mana; + default: + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + } + } - private void cacheModels() { - // Load the OBJ - OBJModel model = null; - try { - model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); - } catch (IOException e) { - FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); - mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - cached = true; - return; - } + private void cacheModels() { + // Load the OBJ + OBJModel model = null; + try { + model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + } catch(IOException e) { + FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); + mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + cached = true; + return; + } - // Apply the texture and flip the v's of the model - IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); - IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); - IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); + // Apply the texture and flip the v's of the model + IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); + IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); + IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); - // All groups are off by default - // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group + // All groups are off by default + // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group - final Function textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + final Function textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", - "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", - "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", + "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", + "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); - mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - // Natura model is just the crystal - natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - cached = true; - } + mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + // Natura model is just the crystal + natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + cached = true; + } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } - @Override public List getGeneralQuads() { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { return false; } - @Override public boolean isGui3d() { return true; } - @Override public boolean isBuiltInRenderer() { return false; } - @Override public TextureAtlasSprite getParticleTexture() { return null; } - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return ImmutableList.of(); + } - // Wrapper to transform the model before rendering it, so it looks right in the inventory - private class PerspectiveWrapper implements IPerspectiveAwareModel { + @Override + public List getGeneralQuads() { + return ImmutableList.of(); + } - private final IFlexibleBakedModel parent; + @Override + public boolean isAmbientOcclusion() { + return false; + } - public PerspectiveWrapper(IBakedModel pylonModel) { - this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); - } + @Override + public boolean isGui3d() { + return true; + } - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - switch(cameraTransformType) { - case FIRST_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); - case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); - case THIRD_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); - default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); - } - } + @Override + public boolean isBuiltInRenderer() { + return false; + } - @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return parent.getFaceQuads(p_177551_1_); } - @Override public List getGeneralQuads() { return parent.getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } - @Override public boolean isGui3d() { return parent.isGui3d(); } - @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } - @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } - } + @Override + public TextureAtlasSprite getParticleTexture() { + return null; + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } + + // Wrapper to transform the model before rendering it, so it looks right in the inventory + private class PerspectiveWrapper implements IPerspectiveAwareModel { + + private final IFlexibleBakedModel parent; + + public PerspectiveWrapper(IBakedModel pylonModel) { + this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + switch(cameraTransformType) { + case FIRST_PERSON: + return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); + case GUI: + return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); + case THIRD_PERSON: + return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); + default: + return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); + } + } + + @Override + public VertexFormat getFormat() { + return Attributes.DEFAULT_BAKED_FORMAT; + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) { + return parent.getFaceQuads(p_177551_1_); + } + + @Override + public List getGeneralQuads() { + return parent.getGeneralQuads(); + } + + @Override + public boolean isAmbientOcclusion() { + return parent.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() { + return parent.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() { + return parent.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return parent.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return parent.getItemCameraTransforms(); + } + } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 5d99a76e8..ef5c77b55 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -2,7 +2,7 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + *

* Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ @@ -42,7 +42,6 @@ import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -50,269 +49,268 @@ import javax.vecmath.Matrix4f; import java.io.IOException; import java.util.Collection; import java.util.List; -import java.util.Locale; import java.util.Map; public class SpecialFlowerModel implements IModelCustomData { - // SpecialFlowerModel for when there are no blockModels registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); + // SpecialFlowerModel for when there are no blockModels registered for a subtile + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); - private final ImmutableMap, ModelResourceLocation> blockModels; - private final ImmutableMap, ModelResourceLocation> itemModels; + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; - public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> blockModels, - ImmutableMap, ModelResourceLocation> itemModels) { - this.blockModels = blockModels; - this.itemModels = itemModels; - } + public SpecialFlowerModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels) { + this.blockModels = blockModels; + this.itemModels = itemModels; + } - @Override - public Collection getDependencies() { - ImmutableSet.Builder builder = ImmutableSet.builder(); - builder.addAll(blockModels.values()); - builder.addAll(itemModels.values()); + @Override + public Collection getDependencies() { + ImmutableSet.Builder builder = ImmutableSet.builder(); + builder.addAll(blockModels.values()); + builder.addAll(itemModels.values()); - // Force island models to be loaded and baked. See FloatingFlowerModel. - builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values()); + // Force island models to be loaded and baked. See FloatingFlowerModel. + builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values()); - return builder.build(); - } + return builder.build(); + } - @Override - public Collection getTextures() { - return ImmutableList.of(); - } + @Override + public Collection getTextures() { + return ImmutableList.of(); + } - @Override - public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { - // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) - return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); - } + @Override + public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) + return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + } - @Override - public IModelState getDefaultState() { - return TRSRTransformation.identity(); - } + @Override + public IModelState getDefaultState() { + return TRSRTransformation.identity(); + } - @Override - public IModel process(ImmutableMap customData) { - // Load the base variant from blockstate json, and also add all the model paths we received from external API - ImmutableMap.Builder, ModelResourceLocation> blockBuilder = ImmutableMap.builder(); - ImmutableMap.Builder, ModelResourceLocation> itemBuilder = ImmutableMap.builder(); + @Override + public IModel process(ImmutableMap customData) { + // Load the base variant from blockstate json, and also add all the model paths we received from external API + ImmutableMap.Builder, ModelResourceLocation> blockBuilder = ImmutableMap.builder(); + ImmutableMap.Builder, ModelResourceLocation> itemBuilder = ImmutableMap.builder(); - for (String key : customData.keySet()) { - if ("base".equals(key)) { - blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); - } - } + for(String key : customData.keySet()) { + if("base".equals(key)) { + blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); + } + } - for (Map.Entry e : BotaniaAPIClient.getRegisteredSubtileBlockModels().entrySet()) { - blockBuilder.put(Optional.of(e.getKey()), e.getValue()); - } - for (Map.Entry e : BotaniaAPIClient.getRegisteredSubtileItemModels().entrySet()) { - itemBuilder.put(Optional.of(e.getKey()), e.getValue()); - } + for(Map.Entry e : BotaniaAPIClient.getRegisteredSubtileBlockModels().entrySet()) { + blockBuilder.put(Optional.of(e.getKey()), e.getValue()); + } + for(Map.Entry e : BotaniaAPIClient.getRegisteredSubtileItemModels().entrySet()) { + itemBuilder.put(Optional.of(e.getKey()), e.getValue()); + } - ImmutableMap, ModelResourceLocation> blockModels = blockBuilder.build(); - ImmutableMap, ModelResourceLocation> itemModels = itemBuilder.build(); - if (blockModels.isEmpty() && itemModels.isEmpty()) return INSTANCE; - return new SpecialFlowerModel(blockModels, itemModels); - } + ImmutableMap, ModelResourceLocation> blockModels = blockBuilder.build(); + ImmutableMap, ModelResourceLocation> itemModels = itemBuilder.build(); + if(blockModels.isEmpty() && itemModels.isEmpty()) return INSTANCE; + return new SpecialFlowerModel(blockModels, itemModels); + } - private ModelResourceLocation getLocation(String json) { - JsonElement e = new JsonParser().parse(json); - if (e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()) { - return new ModelResourceLocation(e.getAsString()); - } - FMLLog.severe("Expect ModelResourceLocation, got: ", json); - return new ModelResourceLocation("builtin/missing", "missing"); - } + private ModelResourceLocation getLocation(String json) { + JsonElement e = new JsonParser().parse(json); + if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString()) { + return new ModelResourceLocation(e.getAsString()); + } + FMLLog.severe("Expect ModelResourceLocation, got: ", json); + return new ModelResourceLocation("builtin/missing", "missing"); + } - public enum Loader implements ICustomModelLoader { - INSTANCE { - @Override - public void onResourceManagerReload(IResourceManager resourceManager) { - } + public enum Loader implements ICustomModelLoader { + INSTANCE { + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + } - @Override - public boolean accepts(ResourceLocation modelLocation) { - return modelLocation.getResourceDomain().equals("botania_special") && ( - modelLocation.getResourcePath().equals("specialFlower") || - modelLocation.getResourcePath().equals("models/block/specialFlower") || - modelLocation.getResourcePath().equals("models/item/specialFlower")); - } + @Override + public boolean accepts(ResourceLocation modelLocation) { + return modelLocation.getResourceDomain().equals("botania_special") && ( + modelLocation.getResourcePath().equals("specialFlower") || + modelLocation.getResourcePath().equals("models/block/specialFlower") || + modelLocation.getResourcePath().equals("models/item/specialFlower")); + } - @Override - public IModel loadModel(ResourceLocation modelLocation) throws IOException { - // Load a dummy model for now, all actual blockModels added in process(). - return SpecialFlowerModel.INSTANCE; - } - } - } + @Override + public IModel loadModel(ResourceLocation modelLocation) throws IOException { + // Load a dummy model for now, all actual blockModels added in process(). + return SpecialFlowerModel.INSTANCE; + } + } + } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { - private final ImmutableMap transforms; - private final ImmutableMap, ModelResourceLocation> blockModels; - private final ImmutableMap, ModelResourceLocation> itemModels; - private final VertexFormat vertexFormat; + private final ImmutableMap transforms; + private final ImmutableMap, ModelResourceLocation> blockModels; + private final ImmutableMap, ModelResourceLocation> itemModels; + private final VertexFormat vertexFormat; - private IBakedModel baseModel; - private ImmutableMap bakedBlockModels; - private ImmutableMap bakedItemModels; - private ImmutableMap, ImmutableList> quads; + private IBakedModel baseModel; + private ImmutableMap bakedBlockModels; + private ImmutableMap bakedItemModels; + private ImmutableMap, ImmutableList> quads; - public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, - ImmutableMap, ModelResourceLocation> itemModels, - VertexFormat format, ImmutableMap cameraTransforms) { - this.blockModels = blockModels; - this.itemModels = itemModels; - this.vertexFormat = format; - this.transforms = cameraTransforms; - } + public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, + ImmutableMap, ModelResourceLocation> itemModels, + VertexFormat format, ImmutableMap cameraTransforms) { + this.blockModels = blockModels; + this.itemModels = itemModels; + this.vertexFormat = format; + this.transforms = cameraTransforms; + } - private void refreshBakedModels() { - if (baseModel == null) { - // If not done already, steal all the real baked models and cache them - ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getBlockModel(manager, Optional.absent()); + private void refreshBakedModels() { + if(baseModel == null) { + // If not done already, steal all the real baked models and cache them + ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); + baseModel = getBlockModel(manager, Optional.absent()); - ImmutableMap.Builder builder = ImmutableMap.builder(); - for (Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { - if (e.getKey().isPresent()) { - builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); - } - } + ImmutableMap.Builder builder = ImmutableMap.builder(); + for(Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { + if(e.getKey().isPresent()) { + builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); + } + } - bakedBlockModels = builder.build(); + bakedBlockModels = builder.build(); - ImmutableMap.Builder builder2 = ImmutableMap.builder(); - for (Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { - if (e.getKey().isPresent()) { - builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); - } - } + ImmutableMap.Builder builder2 = ImmutableMap.builder(); + for(Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { + if(e.getKey().isPresent()) { + builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); + } + } - bakedItemModels = builder2.build(); + bakedItemModels = builder2.build(); - ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); - quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); - for (EnumFacing side : EnumFacing.values()) { - quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); - } - quads = quadBuilder.build(); - } - } + ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); + quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); + for(EnumFacing side : EnumFacing.values()) { + quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); + } + quads = quadBuilder.build(); + } + } - private IBakedModel getBlockModel(ModelManager manager, Optional opt) { - ModelResourceLocation loc = blockModels.get(opt); - if (loc == null) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } - return manager.getModel(loc); - } + private IBakedModel getBlockModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = blockModels.get(opt); + if(loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } - private IBakedModel getItemModel(ModelManager manager, Optional opt) { - ModelResourceLocation loc = itemModels.get(opt); - if (loc == null) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } - return manager.getModel(loc); - } + private IBakedModel getItemModel(ModelManager manager, Optional opt) { + ModelResourceLocation loc = itemModels.get(opt); + if(loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); + } + return manager.getModel(loc); + } - private ImmutableList buildQuads(Optional side) { - ImmutableList.Builder builder = ImmutableList.builder(); - for (IBakedModel model : bakedBlockModels.values()) { - if (side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } - } + private ImmutableList buildQuads(Optional side) { + ImmutableList.Builder builder = ImmutableList.builder(); + for(IBakedModel model : bakedBlockModels.values()) { + if(side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } - for (IBakedModel model : bakedItemModels.values()) { - if (side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } - } + for(IBakedModel model : bakedItemModels.values()) { + if(side.isPresent()) { + builder.addAll(model.getFaceQuads(side.get())); + } else { + builder.addAll(model.getGeneralQuads()); + } + } - return builder.build(); - } + return builder.build(); + } - @Override - public List getFaceQuads(EnumFacing side) { - refreshBakedModels(); - return quads.get(Optional.of(side)); - } + @Override + public List getFaceQuads(EnumFacing side) { + refreshBakedModels(); + return quads.get(Optional.of(side)); + } - @Override - public List getGeneralQuads() { - refreshBakedModels(); - return quads.get(Optional.absent()); - } + @Override + public List getGeneralQuads() { + refreshBakedModels(); + return quads.get(Optional.absent()); + } - @Override - public boolean isAmbientOcclusion() { - refreshBakedModels(); - return baseModel.isAmbientOcclusion(); - } + @Override + public boolean isAmbientOcclusion() { + refreshBakedModels(); + return baseModel.isAmbientOcclusion(); + } - @Override - public boolean isGui3d() { - refreshBakedModels(); - return baseModel.isGui3d(); - } + @Override + public boolean isGui3d() { + refreshBakedModels(); + return baseModel.isGui3d(); + } - @Override - public boolean isBuiltInRenderer() { - refreshBakedModels(); - return baseModel.isBuiltInRenderer(); - } + @Override + public boolean isBuiltInRenderer() { + refreshBakedModels(); + return baseModel.isBuiltInRenderer(); + } - @Override - public TextureAtlasSprite getParticleTexture() { - refreshBakedModels(); - return baseModel.getParticleTexture(); - } + @Override + public TextureAtlasSprite getParticleTexture() { + refreshBakedModels(); + return baseModel.getParticleTexture(); + } - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; - } + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return ItemCameraTransforms.DEFAULT; + } - @Override - public IBakedModel handleBlockState(IBlockState state) { - if (state.getBlock() != ModBlocks.specialFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - refreshBakedModels(); - IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; - } + @Override + public IBakedModel handleBlockState(IBlockState state) { + if(state.getBlock() != ModBlocks.specialFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + refreshBakedModels(); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); + IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; + } - @Override - public VertexFormat getFormat() { - return vertexFormat; - } + @Override + public VertexFormat getFormat() { + return vertexFormat; + } - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); - } + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); + } - @Override - public IBakedModel handleItemState(ItemStack stack) { - refreshBakedModels(); - IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); - if (item == null) { - item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); - } + @Override + public IBakedModel handleItemState(ItemStack stack) { + refreshBakedModels(); + IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + if(item == null) { + item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + } - return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; - } - } + return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + } + } } diff --git a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java b/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java deleted file mode 100644 index 4013b2ed0..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderAvatar.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 24, 2015, 11:06:11 PM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileAvatar; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderAvatar implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.6F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileAvatar(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idAvatar; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java deleted file mode 100644 index 3d5032914..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 28, 2015, 7:13:45 PM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.mana.TileBellows; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderBellows implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.3F, -0.5F); - GlStateManager.scale(1.2F, 1.2F, 1.2F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileBellows(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idBellows; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java deleted file mode 100644 index 88ef1482b..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 31, 2014, 5:00:12 PM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.tile.RenderTileBrewery; -import vazkii.botania.common.block.tile.TileBrewery; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderBrewery implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - GlStateManager.scale(1.2F, 1.2F, 1.2F); - RenderTileBrewery.rotate = false; - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileBrewery(), 0.0D, 0.0D, 0.0D, 0.0F); - RenderTileBrewery.rotate = true; - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idBrewery; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java b/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java deleted file mode 100644 index 6337d430f..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderCocoon.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 8, 2015, 5:57:29 PM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileCocoon; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderCocoon implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCocoon(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idCocoon; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java deleted file mode 100644 index 5c692bb96..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaCrystalCube.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 30, 2015, 6:22:32 PM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderCorporeaCrystalCube implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - GlStateManager.disableAlpha(); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCorporeaCrystalCube(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.enableAlpha(); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idCorporeaCrystalCybe; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java deleted file mode 100644 index 95537392c..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderCorporeaIndex.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 15, 2015, 1:57:50 AM (GMT)] - */ -/* -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderCorporeaIndex implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.3F, -0.5F); - GlStateManager.scale(1.4F, 1.4F, 1.4F); - RenderTileCorporeaIndex.move = false; - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileCorporeaIndex(), 0.0D, 0.0D, 0.0D, 0.0F); - RenderTileCorporeaIndex.move = true; - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idCorporeaIndex; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java b/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java deleted file mode 100644 index 06df3b26b..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderHourglass.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 30, 2015, 3:17:41 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileHourglass; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderHourglass implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - GlStateManager.disableAlpha(); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileHourglass(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.enableAlpha(); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idHourglass; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java b/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java deleted file mode 100644 index 7b8aa222c..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderIncensePlate.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 15, 2015, 5:59:56 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileIncensePlate; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderIncensePlate implements ISimpleBlockRenderingHandler{ - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.1F, -0.5F); - GlStateManager.scale(1.4F, 1.4F, 1.4F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileIncensePlate(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idIncensePlate; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPool.java b/src/main/java/vazkii/botania/client/render/block/RenderPool.java deleted file mode 100644 index f261acfa2..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderPool.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 26, 2014, 12:25:06 AM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.common.block.tile.mana.TilePool; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderPool implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - RenderTilePool.forceMeta = metadata; - RenderTilePool.forceMana = RenderTilePool.forceMana | metadata == 1; - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePool(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idPool; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderPump.java b/src/main/java/vazkii/botania/client/render/block/RenderPump.java deleted file mode 100644 index 8af901f00..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderPump.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 18, 2015, 4:42:08 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.mana.TilePump; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderPump implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.25F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePump(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idPump; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java deleted file mode 100644 index c8915e02c..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpawnerClaw.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 23, 2014, 6:23:54 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileSpawnerClaw; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, 0F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileSpawnerClaw(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idSpawnerClaw; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java deleted file mode 100644 index 112378b89..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ /dev/null @@ -1,138 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 25, 2014, 4:15:46 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMultiblockRenderHook { - - int id; - - public RenderSpecialFlower(int id) { - this.id = id; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - // NO-OP - } - - @Override - public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return renderCrossedSquares(blockAccess, block, x, y, z, renderer); - } - - // Copied from RenderBlocks - public static boolean renderCrossedSquares(IBlockAccess blockAccess, Block par1Block, int par2, int par3, int par4, RenderBlocks render) { - Tessellator tessellator = Tessellator.getInstance(); - tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(blockAccess, par2, par3, par4)); - float f = 1.0F; - int l = par1Block.colorMultiplier(blockAccess, par2, par3, par4); - float f1 = (l >> 16 & 255) / 255.0F; - float f2 = (l >> 8 & 255) / 255.0F; - float f3 = (l & 255) / 255.0F; - - if(EntityRenderer.anaglyphEnable) { - float f4 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F; - float f5 = (f1 * 30.0F + f2 * 70.0F) / 100.0F; - float f6 = (f1 * 30.0F + f3 * 70.0F) / 100.0F; - f1 = f4; - f2 = f5; - f3 = f6; - } - - tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); - double d1 = par2; - double d2 = par3; - double d0 = par4; - long sh; - - sh = par2 * 3129871 ^ par4 * 116129781L ^ par3; - sh = sh * sh * 42317861L + sh * 11L; - d1 += ((sh >> 16 & 15L) / 15.0F - 0.5D) * 0.3D; - d2 += (sh >> 32 & 15L) / 15.0F * -0.15D; - d0 += ((sh >> 24 & 15L) / 15.0F - 0.5D) * 0.3D; - - - // Only change here, to use xyz rather than side/meta - IIcon icon = render.getBlockIcon(par1Block, blockAccess, par2, par3, par4, 0); - drawCrossedSquares(blockAccess, par1Block, icon, par2, par3, par4, d1, d2, d0, 1.0F, render); - - return true; - } - - // Copied from RenderBlocks - public static void drawCrossedSquares(IBlockAccess blockAccess, Block par1Block, IIcon icon, int x, int y, int z, double par3, double par5, double par7, float par9, RenderBlocks render) { - Tessellator tessellator = Tessellator.getInstance(); - - double d3 = icon.getMinU(); - double d4 = icon.getMinV(); - double d5 = icon.getMaxU(); - double d6 = icon.getMaxV(); - double d7 = 0.45D * par9; - double d8 = par3 + 0.5D - d7; - double d9 = par3 + 0.5D + d7; - double d10 = par7 + 0.5D - d7; - double d11 = par7 + 0.5D + d7; - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d10, d3, d4); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d10, d3, d6); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d11, d5, d6); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d11, d5, d4); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d11, d3, d4); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d11, d3, d6); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d10, d5, d6); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d10, d5, d4); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d11, d3, d4); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d11, d3, d6); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d10, d5, d6); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d10, d5, d4); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + par9, d10, d3, d4); - tessellator.getWorldRenderer().addVertexWithUV(d9, par5 + 0.0D, d10, d3, d6); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + 0.0D, d11, d5, d6); - tessellator.getWorldRenderer().addVertexWithUV(d8, par5 + par9, d11, d5, d4); - } - - @Override - public int getRenderId() { - return id; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, Block block, int meta, RenderBlocks renderBlocks, MultiblockComponent comp, float alpha) { - Tessellator tess = Tessellator.getInstance(); - tess.startDrawingQuads(); - drawCrossedSquares(world, block, block.getIcon(0, meta), 0, 0, 0, -0.5, -0.5, -0.5, 1F, renderBlocks); - tess.draw(); - } - - @Override - public boolean needsTranslate(IBlockState state) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java b/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java deleted file mode 100644 index 6400353d8..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpreader.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 25, 2014, 9:45:58 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.mana.TileSpreader; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderSpreader implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - TileSpreader.staticRedstone = metadata == 1; - TileSpreader.staticDreamwood = metadata == 2 || metadata == 3; - TileSpreader.staticUltra = metadata == 3; - - TileSpreader spreader = new TileSpreader(); - spreader.rotationX = -180F; - TileEntityRendererDispatcher.instance.renderTileEntityAt(spreader, 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idSpreader; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java deleted file mode 100644 index ae77b4978..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 1, 2015, 9:40:27 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderTeruTeruBozu implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, -0.3F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileTeruTeruBozu(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idTeruTeruBozu; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java b/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java deleted file mode 100644 index 85cbb724a..000000000 --- a/src/main/java/vazkii/botania/client/render/block/RenderTinyPotato.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2014, 11:43:37 PM (GMT)] - *//* - -package vazkii.botania.client.render.block; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileTinyPotato; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -public class RenderTinyPotato implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, 0F, -0.5F); - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileTinyPotato(), 0.0D, 0.0D, 0.0D, 0.0F); - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return LibRenderIDs.idTinyPotato; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderBow.java b/src/main/java/vazkii/botania/client/render/item/RenderBow.java deleted file mode 100644 index 805fab163..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderBow.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 28, 2015, 3:43:09 PM (GMT)] - *//* - -package vazkii.botania.client.render.item; - -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; - -public class RenderBow implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type != ItemRenderType.INVENTORY; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case ENTITY : { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, 0F, 0F); - if(item.isOnItemFrame()) - GlStateManager.translate(0F, -0.3F, 0.01F); - render(item, null, false); - GlStateManager.popMatrix(); - break; - } - case EQUIPPED : { - render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null, true); - break; - } - case EQUIPPED_FIRST_PERSON : { - render(item, data[1] instanceof EntityPlayer ? (EntityPlayer) data[1] : null, false); - break; - } - default : break; - } - } - - public void render(ItemStack item, EntityPlayer player, boolean transform) { - int dmg = item.getItemDamage(); - IIcon icon = item.getItem().getIconFromDamageForRenderPass(dmg, 0); - if(player != null) { - ItemStack using = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, LibObfuscation.ITEM_IN_USE); - int time = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, LibObfuscation.ITEM_IN_USE_COUNT); - icon = item.getItem().getIcon(item, 0, player, using, time); - if(transform) { - GlStateManager.translate(0.2F, -0.3F, 0.1F); - //GlStateManager.rotate(20.0F, 0.0F, 1.0F, 0.0F); - //GlStateManager.rotate(-100.0F, 1.0F, 0.0F, 0.0F); - } - } - - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - float scale = 1F / 16F; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - - GlStateManager.color(1F, 1F, 1F, 1F); - } - - -} -*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLens.java b/src/main/java/vazkii/botania/client/render/item/RenderLens.java deleted file mode 100644 index fad1267bc..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderLens.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 31, 2014, 3:08:00 PM (GMT)] - *//* - -package vazkii.botania.client.render.item; - -import java.awt.Color; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.mana.ILens; -import vazkii.botania.common.item.lens.ItemLens; - -public class RenderLens implements IItemRenderer { - - static RenderItem render = new RenderItem(); - ItemRenderer renderer = new ItemRenderer(Minecraft.getMinecraft()); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type != ItemRenderType.INVENTORY; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case ENTITY : { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, 0F, 0F); - if(item.isOnItemFrame()) - GlStateManager.translate(0F, -0.3F, 0.01F); - render(item); - GlStateManager.popMatrix(); - break; - } - case EQUIPPED : { - render(item); - break; - } - case EQUIPPED_FIRST_PERSON : { - render(item); - break; - } - default : break; - } - } - - public static void render(ItemStack item) { - Color color = new Color(((ILens) item.getItem()).getLensColor(item)); - render(item, color.getRGB()); - } - - public static void render(ItemStack item, int color_) { - int dmg = item.getItemDamage(); - IIcon icon = item.getItem().getIconFromDamageForRenderPass(dmg, 1); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - float scale = 1F / 16F; - - GlStateManager.color(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.enableCull(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Color color = new Color(color_); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255); - - boolean shiny = ItemLens.getStoredColor(item) != -1; - icon = ItemLens.iconGlass; - GlStateManager.scale(scale, scale, scale); - GlStateManager.translate(0F, 0F, -0.5F); - renderShinyLensIcon(icon, shiny); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(-16F, 0F, 0F); - renderShinyLensIcon(icon, shiny); - GlStateManager.disableCull(); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - - GlStateManager.color(1F, 1F, 1F, 1F); - } - - public static void renderShinyLensIcon(IIcon icon, boolean shiny) { - float par1 = 0; - float par2 = 0; - float par4 = 16; - float par5 = 16; - float zLevel = 0F; - Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - if(shiny) - tessellator.setBrightness(240); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, zLevel, icon.getMinU(), icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, zLevel, icon.getMaxU(), icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, zLevel, icon.getMaxU(), icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, zLevel, icon.getMinU(), icon.getMinV()); - tessellator.draw(); - } - -}*/ diff --git a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java b/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java deleted file mode 100644 index 62f2a4e8c..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderTransparentItem.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 6, 2014, 10:04:57 PM (GMT)] - *//* - -package vazkii.botania.client.render.item; - -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderTransparentItem implements IItemRenderer { - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type != ItemRenderType.INVENTORY; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case ENTITY : { - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.5F, 0F, 0F); - if(item.isOnItemFrame()) - GlStateManager.translate(0F, -0.3F, 0.01F); - render(item); - GlStateManager.popMatrix(); - break; - } - case EQUIPPED : { - render(item); - break; - } - case EQUIPPED_FIRST_PERSON : { - render(item); - break; - } - default : break; - } - } - - public void render(ItemStack item) { - int dmg = item.getItemDamage(); - IIcon icon = item.getItem().getIconFromDamageForRenderPass(dmg, 0); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - float scale = 1F / 16F; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); - - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - - GlStateManager.color(1F, 1F, 1F, 1F); - } - - -} -*/ From 79210e484c82c2af0e0491ab9a3134e3f90f12b1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jan 2016 14:18:30 -0600 Subject: [PATCH 287/935] Delete unneeded LibRenderIDs --- .../botania/client/lib/LibRenderIDs.java | 36 ------------------- .../botania/common/block/BlockAvatar.java | 3 +- .../botania/common/block/BlockCocoon.java | 3 +- .../botania/common/block/BlockHourglass.java | 3 +- .../common/block/BlockTeruTeruBozu.java | 3 +- .../common/block/mana/BlockBellows.java | 3 +- .../common/block/mana/BlockBrewery.java | 3 +- .../botania/common/block/mana/BlockPump.java | 3 +- 8 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/lib/LibRenderIDs.java diff --git a/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java b/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java deleted file mode 100644 index 75f424b70..000000000 --- a/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 21, 2014, 8:03:06 PM (GMT)] - */ -package vazkii.botania.client.lib; - -public final class LibRenderIDs { - - public static int idAltar = -1; - public static int idSpecialFlower = -1; - public static int idSpreader = -1; - public static int idPool = -1; - public static int idPylon = -1; - public static int idMiniIsland = -1; - public static int idTinyPotato = -1; - public static int idSpawnerClaw = -1; - public static int idBrewery = -1; - public static int idCorporeaIndex = -1; - public static int idPump = -1; - public static int idDoubleFlower = -1; - public static int idCorporeaCrystalCybe = -1; - public static int idIncensePlate = -1; - public static int idHourglass = -1; - public static int idCocoon = -1; - public static int idLightRelay = -1; - public static int idBellows = -1; - public static int idTeruTeruBozu = -1; - public static int idAvatar = -1; - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index d42a2a7ce..5d5c29382 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -29,7 +29,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; @@ -160,7 +159,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { @Override public int getRenderType() { - return LibRenderIDs.idAvatar; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 54695cb2e..c4b7396a8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -25,7 +25,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -55,7 +54,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { @Override public int getRenderType() { - return LibRenderIDs.idCocoon; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index d352295d8..d59190f33 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -35,7 +35,6 @@ import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.item.ModItems; @@ -177,7 +176,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public int getRenderType() { - return LibRenderIDs.idHourglass; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 7504fc86d..b86891662 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -24,7 +24,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -109,7 +108,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable @Override public int getRenderType() { - return LibRenderIDs.idTeruTeruBozu; + return 2; } @Override 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 aa4d22691..fd210fa1f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; @@ -85,7 +84,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { @Override public int getRenderType() { - return LibRenderIDs.idBellows; + return 2; } @Override 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 2be8db81a..b584fadf2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -29,7 +29,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -144,7 +143,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa @Override public int getRenderType() { - return LibRenderIDs.idBrewery; + return 2; } @Override 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 e4548f1a3..5579468c7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.mana.TilePump; @@ -81,7 +80,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { @Override public int getRenderType() { - return LibRenderIDs.idPump; + return 2; } @Override From 0887f765753af57ff30932dbdb6fc0c6e71d2f38 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jan 2016 18:10:33 -0600 Subject: [PATCH 288/935] Some cleanup in incense plate tesr, move red string tesr to fasttesr, remove life imbuer tesr --- .../render/tile/RenderTileIncensePlate.java | 22 +++------ .../render/tile/RenderTileRedString.java | 7 ++- .../render/tile/RenderTileSpawnerClaw.java | 45 ------------------- .../block/tile/string/TileRedString.java | 5 +++ 4 files changed, 15 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 85553ff37..ec08f2ca7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.tile; +import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -26,14 +27,11 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelIncensePlate; import vazkii.botania.common.block.tile.TileIncensePlate; +import java.util.Map; + public class RenderTileIncensePlate extends TileEntitySpecialRenderer { - private static final float[] ROTATIONS = new float[] { - 180F, 0F, 90F, 270F - }; - - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_INCENSE_PLATE); - ModelIncensePlate model = new ModelIncensePlate(); + private static final Map ROTATIONS = ImmutableMap.of(EnumFacing.NORTH, 180, EnumFacing.SOUTH, 0, EnumFacing.WEST, 270, EnumFacing.EAST, 90); @Override public void renderTileEntityAt(TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) { @@ -45,27 +43,17 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { +public class RenderTileRedString extends FastTESR { @Override - public void renderTileEntityAt(TileRedString trs, double x, double y, double z, float partticks, int digProgress) { + public void renderTileEntityFast(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, WorldRenderer worldRenderer) { RedStringRenderer.redStringTiles.add(trs); } + } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java deleted file mode 100644 index cedc6db5a..000000000 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 23, 2014, 5:46:10 PM (GMT)] - */ -package vazkii.botania.client.render.tile; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelSpawnerClaw; - -public class RenderTileSpawnerClaw extends TileEntitySpecialRenderer { - - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPAWNER_CLAW); - private static final ModelSpawnerClaw model = new ModelSpawnerClaw(); - - @Override - public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8, int digProgress) { - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); - - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - - GlStateManager.translate(0.5F, 1.5F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - - model.render(); - GlStateManager.color(1F, 1F, 1F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.popMatrix(); - } - -} 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 10d980da4..76918d040 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 @@ -90,4 +90,9 @@ public abstract class TileRedString extends TileMod implements ITileBound { return binding == null ? Blocks.air : worldObj.getBlockState(binding).getBlock(); } + @Override + public boolean hasFastRenderer() { + return true; + } + } From 7601eecba300d0e28cb8a6fbebf42328a3d98358 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jan 2016 18:19:20 -0600 Subject: [PATCH 289/935] Fix pylons not showing their fancy particles --- src/main/java/vazkii/botania/common/block/tile/TilePylon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index cb81f3bdc..07fa91a26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -36,7 +36,7 @@ public class TilePylon extends TileEntity implements ITickable { public void update() { ++ticks; - if (worldObj.getBlockState(getPos()) != ModBlocks.pylon) + if (worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pylon) return; PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); From 89e00c7ae888cb429ac8c7aeb7a1cf0b51a92f14 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 00:19:04 -0600 Subject: [PATCH 290/935] First attempt at animation API --- .../client/core/handler/ModelHandler.java | 3 +- .../client/core/proxy/ClientProxy.java | 4 +- .../botania/common/block/mana/BlockPump.java | 5 - .../common/block/tile/mana/TilePump.java | 36 ++++++- .../botania/armatures/block/pump_head.json | 24 +++++ .../assets/botania/asms/block/pump.json | 13 +++ .../assets/botania/blockstates/pump.json | 46 ++++++++- .../assets/botania/models/block/pump.json | 95 +++++++++++++++++++ .../botania/models/block/pump_head.json | 56 +++++++++++ 9 files changed, 268 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/botania/armatures/block/pump_head.json create mode 100644 src/main/resources/assets/botania/asms/block/pump.json create mode 100644 src/main/resources/assets/botania/models/block/pump.json create mode 100644 src/main/resources/assets/botania/models/block/pump_head.json 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 db5076b7f..f404c130a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -630,7 +630,7 @@ public final class ModelHandler { ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); registerItemModel(ModBlocks.pump); // todo await animation api - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); + //ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); registerItemModel(ModBlocks.teruTeruBozu); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); @@ -806,7 +806,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.brewery, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); ModelLoader.setCustomStateMapper(ModBlocks.gaiaHead, new StateMap.Builder().ignore(BlockSkull.FACING, BlockSkull.NODROP).build()); ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - ModelLoader.setCustomStateMapper(ModBlocks.pump, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); } private static void registerMushrooms() { 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 021feaa71..004470d7d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -34,6 +34,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; +import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; @@ -236,14 +237,13 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower); ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower); ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato()); - // ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw()); ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield()); ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery()); ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate()); ClientRegistry.bindTileEntitySpecialRenderer(TileRedString.class, new RenderTileRedString()); ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new RenderTilePump()); + ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new AnimationTESR<>()); ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); 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 5579468c7..c51408b62 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -78,11 +78,6 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } } - @Override - public int getRenderType() { - return 2; - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 93555c126..d8ea04335 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -10,14 +10,23 @@ */ package vazkii.botania.common.block.tile.mana; +import com.google.common.collect.ImmutableMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.IAnimationProvider; +import net.minecraftforge.client.model.animation.ITimeValue; +import net.minecraftforge.client.model.animation.TimeValues; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod { +public class TilePump extends TileMod implements IAnimationProvider { private static final String TAG_ACTIVE = "active"; @@ -31,6 +40,19 @@ public class TilePump extends TileMod { public boolean hasRedstone = false; int lastComparator = 0; + private final TimeValues.VariableValue move; + private final IAnimationStateMachine asm; + + public TilePump() { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { + move = new TimeValues.VariableValue(0); + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + } else { + move = null; + asm = null; + } + } + @Override public void updateEntity() { hasRedstone = false; @@ -64,11 +86,15 @@ public class TilePump extends TileMod { moving = 0F; } } + move.setValue(innerRingPos); + if(!hasCartOnTop) comparator = 0; - if(!hasCart && active) + if(!hasCart && active) { + setActive(false); + } if(active && hasRedstone) setActive(false); @@ -88,6 +114,8 @@ public class TilePump extends TileMod { @Override public void readCustomNBT(NBTTagCompound cmp) { active = cmp.getBoolean(TAG_ACTIVE); + if(worldObj != null && worldObj.isRemote) + asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { @@ -99,4 +127,8 @@ public class TilePump extends TileMod { } } + @Override + public IAnimationStateMachine asm() { + return asm; + } } diff --git a/src/main/resources/assets/botania/armatures/block/pump_head.json b/src/main/resources/assets/botania/armatures/block/pump_head.json new file mode 100644 index 000000000..eccd0533d --- /dev/null +++ b/src/main/resources/assets/botania/armatures/block/pump_head.json @@ -0,0 +1,24 @@ +{ + "joints": { + "head": { "0": [ 1.0 ], "1": [ 1.0 ], "2": [ 1.0 ], "3": [ 1.0 ] } + }, + "clips": { + "default": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "moving": { + "loop": true, + "joint_clips": { + "head": [{ + "variable": "offset_z", + "type": "uniform", + "interpolation": "linear", + "samples": [ 0.0, 3.2, 4.0, 4.8, 8.0, 4.8, 4.0, 3.2, 0.0 ] + }] + }, + "events": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/asms/block/pump.json b/src/main/resources/assets/botania/asms/block/pump.json new file mode 100644 index 000000000..1460a8c95 --- /dev/null +++ b/src/main/resources/assets/botania/asms/block/pump.json @@ -0,0 +1,13 @@ +{ + "parameters": {}, + "clips": { + "default": "botania:block/pump_head@default", + "moving": [ "apply", "botania:block/pump_head@moving", "#move"] + }, + "states": [ "default", "moving" ], + "transitions": { + "default": "moving", + "moving": "default" + }, + "start_state": "default" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json index f458ec0ee..b5742676b 100644 --- a/src/main/resources/assets/botania/blockstates/pump.json +++ b/src/main/resources/assets/botania/blockstates/pump.json @@ -1,12 +1,52 @@ { "forge_marker": 1, "defaults": { - "model": "botania:dummy", + "model": "botania:pump", "textures": { "particle": "botania:blocks/livingrock0" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}] + "facing": { + "north": { + "submodel": { + "head": { + "model": "botania:pump_head" + } + } + }, + "south": { + "y": 180, + "submodel": { + "head": { + "model": "botania:pump_head" + } + } + }, + "west": { + "y": 270, + "submodel": { + "head": { + "model": "botania:pump_head" + } + } + }, + "east": { + "y": 90, + "submodel": { + "head": { + "model": "botania:pump_head" + } + } + } + }, + "inventory": [{ + "submodel": { + "head": { + "model": "botania:pump_head" + } + } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pump.json b/src/main/resources/assets/botania/models/block/pump.json new file mode 100644 index 000000000..aaf097f1b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pump.json @@ -0,0 +1,95 @@ +{ + "elements": [ + { + "name": "EndNorth", + "from": [ 4.0, 0.0, 0.0 ], + "to": [ 12.0, 8.0, 1.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + } + }, + { + "name": "EndSouth", + "from": [ 4.0, 0.0, 15.0 ], + "to": [ 12.0, 8.0, 16.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + } + }, + { + "name": "Axle", + "from": [ 6.0, 2.0, 1.0 ], + "to": [ 10.0, 6.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] } + } + }, + { + "name": "PinkTop", + "from": [ 4.0, 7.0, 11.0 ], + "to": [ 12.0, 8.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + } + }, + { + "name": "PinkBottom", + "from": [ 4.0, 0.0, 11.0 ], + "to": [ 12.0, 1.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + } + }, + { + "name": "PinkWest", + "from": [ 4.0, 1.0, 11.0 ], + "to": [ 5.0, 7.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + } + }, + { + "name": "PinkEast", + "from": [ 11.0, 1.0, 11.0 ], + "to": [ 12.0, 7.0, 15.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pump_head.json b/src/main/resources/assets/botania/models/block/pump_head.json new file mode 100644 index 000000000..8cf6b4e7f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pump_head.json @@ -0,0 +1,56 @@ +{ + "elements": [ + { + "name": "BlueTop", + "from": [ 5.0, 6.0, 1.0 ], + "to": [ 11.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "BlueBottom", + "from": [ 5.0, 1.0, 1.0 ], + "to": [ 11.0, 2.0, 7.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "BlueWest", + "from": [ 5.0, 2.0, 1.0 ], + "to": [ 6.0, 6.0, 7.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] } + } + }, + { + "name": "BlueEast", + "from": [ 10.0, 2.0, 1.0 ], + "to": [ 11.0, 6.0, 7.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] } + } + } + ] +} \ No newline at end of file From 67605075d8161f5ba4f46666637e392acb5e7dbe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 09:38:04 -0600 Subject: [PATCH 291/935] More work on animation api --- .../botania/common/block/mana/BlockPump.java | 22 +++++++++- .../common/block/tile/mana/TilePump.java | 4 +- .../botania/armatures/block/pump_head.json | 4 +- .../assets/botania/asms/block/pump.json | 2 +- .../assets/botania/blockstates/pump.json | 41 +++++-------------- 5 files changed, 35 insertions(+), 38 deletions(-) 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 c51408b62..87121e6a9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -21,6 +22,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.common.property.Properties; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockModContainer; @@ -38,12 +43,12 @@ public class BlockPump extends BlockModContainer implements ILexiconable { setStepSound(soundTypeStone); setUnlocalizedName(LibBlockNames.PUMP); setBlockBounds(EnumFacing.Axis.X); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); + setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS); + return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); } @Override @@ -51,6 +56,11 @@ public class BlockPump extends BlockModContainer implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.withProperty(Properties.StaticProperty, true); + } + @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -78,6 +88,14 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } } + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) { + if (worldIn.isRemote && worldIn.getTileEntity(pos) instanceof TilePump) { + ((TilePump) worldIn.getTileEntity(pos)).asm().transition("moving"); + } + return true; + } + @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index d8ea04335..a47e4409e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -46,7 +46,7 @@ public class TilePump extends TileMod implements IAnimationProvider { public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { move = new TimeValues.VariableValue(0); - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of()); } else { move = null; asm = null; @@ -114,8 +114,6 @@ public class TilePump extends TileMod implements IAnimationProvider { @Override public void readCustomNBT(NBTTagCompound cmp) { active = cmp.getBoolean(TAG_ACTIVE); - if(worldObj != null && worldObj.isRemote) - asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { diff --git a/src/main/resources/assets/botania/armatures/block/pump_head.json b/src/main/resources/assets/botania/armatures/block/pump_head.json index eccd0533d..40934c22e 100644 --- a/src/main/resources/assets/botania/armatures/block/pump_head.json +++ b/src/main/resources/assets/botania/armatures/block/pump_head.json @@ -12,10 +12,10 @@ "loop": true, "joint_clips": { "head": [{ - "variable": "offset_z", + "variable": "scale", "type": "uniform", "interpolation": "linear", - "samples": [ 0.0, 3.2, 4.0, 4.8, 8.0, 4.8, 4.0, 3.2, 0.0 ] + "samples": [ 0, 1 ] }] }, "events": {} diff --git a/src/main/resources/assets/botania/asms/block/pump.json b/src/main/resources/assets/botania/asms/block/pump.json index 1460a8c95..6a1a4063d 100644 --- a/src/main/resources/assets/botania/asms/block/pump.json +++ b/src/main/resources/assets/botania/asms/block/pump.json @@ -2,7 +2,7 @@ "parameters": {}, "clips": { "default": "botania:block/pump_head@default", - "moving": [ "apply", "botania:block/pump_head@moving", "#move"] + "moving": "botania:block/pump_head@moving" }, "states": [ "default", "moving" ], "transitions": { diff --git a/src/main/resources/assets/botania/blockstates/pump.json b/src/main/resources/assets/botania/blockstates/pump.json index b5742676b..7379c75d5 100644 --- a/src/main/resources/assets/botania/blockstates/pump.json +++ b/src/main/resources/assets/botania/blockstates/pump.json @@ -1,7 +1,6 @@ { "forge_marker": 1, "defaults": { - "model": "botania:pump", "textures": { "particle": "botania:blocks/livingrock0" }, @@ -9,39 +8,21 @@ }, "variants": { "facing": { - "north": { - "submodel": { - "head": { - "model": "botania:pump_head" - } - } + "north": {}, + "south": { "y": 180 }, + "west": { "y": 270 }, + "east": { "y": 90 } + }, + "static": { + "true": { + "model": "botania:pump" }, - "south": { - "y": 180, - "submodel": { - "head": { - "model": "botania:pump_head" - } - } - }, - "west": { - "y": 270, - "submodel": { - "head": { - "model": "botania:pump_head" - } - } - }, - "east": { - "y": 90, - "submodel": { - "head": { - "model": "botania:pump_head" - } - } + "false": { + "model": "botania:pump_head" } }, "inventory": [{ + "model": "botania:pump", "submodel": { "head": { "model": "botania:pump_head" From 4926137ff0a69fa25033caeb02560455d67386c4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 09:52:04 -0600 Subject: [PATCH 292/935] ITS ALIVE --- .../resources/assets/botania/armatures/block/pump_head.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/botania/armatures/block/pump_head.json b/src/main/resources/assets/botania/armatures/block/pump_head.json index 40934c22e..fc307386b 100644 --- a/src/main/resources/assets/botania/armatures/block/pump_head.json +++ b/src/main/resources/assets/botania/armatures/block/pump_head.json @@ -9,13 +9,13 @@ "events": {} }, "moving": { - "loop": true, + "loop": false, "joint_clips": { "head": [{ - "variable": "scale", + "variable": "offset_z", "type": "uniform", "interpolation": "linear", - "samples": [ 0, 1 ] + "samples": [ 0, 0.75, 0 ] }] }, "events": {} From a94a86b9ce70b024a765eb37c9b72cb8472ec9fa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 10:07:36 -0600 Subject: [PATCH 293/935] Minor hourglass optimization. Closes #76 --- src/main/java/vazkii/botania/common/block/BlockHourglass.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index d59190f33..9548b0627 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -123,7 +123,8 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); + if(state.getValue(BotaniaStateProps.POWERED)) + world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 1 | 2); } @Override From becc642b85d0af483781d15a2db0c2f83a7a16ca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 12:25:54 -0600 Subject: [PATCH 294/935] Animation now correct --- .../resources/assets/botania/armatures/block/pump_head.json | 2 +- src/main/resources/assets/botania/models/item/pump.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/item/pump.json diff --git a/src/main/resources/assets/botania/armatures/block/pump_head.json b/src/main/resources/assets/botania/armatures/block/pump_head.json index fc307386b..b3c9aba64 100644 --- a/src/main/resources/assets/botania/armatures/block/pump_head.json +++ b/src/main/resources/assets/botania/armatures/block/pump_head.json @@ -15,7 +15,7 @@ "variable": "offset_z", "type": "uniform", "interpolation": "linear", - "samples": [ 0, 0.75, 0 ] + "samples": [ 0, 0.5, 0 ] }] }, "events": {} diff --git a/src/main/resources/assets/botania/models/item/pump.json b/src/main/resources/assets/botania/models/item/pump.json deleted file mode 100644 index 7960c6d70..000000000 --- a/src/main/resources/assets/botania/models/item/pump.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "builtin/entity" -} \ No newline at end of file From a7080b243974720cbf093ef05ef337452b62ccf6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Jan 2016 12:35:39 -0600 Subject: [PATCH 295/935] Working! now need to smooth it out --- .../vazkii/botania/common/block/mana/BlockPump.java | 8 -------- .../botania/common/block/tile/mana/TilePump.java | 12 +++++++----- .../resources/assets/botania/asms/block/pump.json | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) 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 87121e6a9..7213a62f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -88,14 +88,6 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } } - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) { - if (worldIn.isRemote && worldIn.getTileEntity(pos) instanceof TilePump) { - ((TilePump) worldIn.getTileEntity(pos)).asm().transition("moving"); - } - return true; - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index a47e4409e..7f25aca3e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -46,7 +46,7 @@ public class TilePump extends TileMod implements IAnimationProvider { public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { move = new TimeValues.VariableValue(0); - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of()); + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; asm = null; @@ -86,15 +86,13 @@ public class TilePump extends TileMod implements IAnimationProvider { moving = 0F; } } - move.setValue(innerRingPos); + move.setValue(innerRingPos / 8 * 0.5F); // rescale to 0 - 0.5 for json animation if(!hasCartOnTop) comparator = 0; - if(!hasCart && active) { - + if(!hasCart && active) setActive(false); - } if(active && hasRedstone) setActive(false); @@ -113,7 +111,11 @@ public class TilePump extends TileMod implements IAnimationProvider { @Override public void readCustomNBT(NBTTagCompound cmp) { + boolean prevActive = active; active = cmp.getBoolean(TAG_ACTIVE); + if(worldObj != null && worldObj.isRemote) + if(prevActive != active) + asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { diff --git a/src/main/resources/assets/botania/asms/block/pump.json b/src/main/resources/assets/botania/asms/block/pump.json index 6a1a4063d..f1217ed0c 100644 --- a/src/main/resources/assets/botania/asms/block/pump.json +++ b/src/main/resources/assets/botania/asms/block/pump.json @@ -2,7 +2,7 @@ "parameters": {}, "clips": { "default": "botania:block/pump_head@default", - "moving": "botania:block/pump_head@moving" + "moving": [ "apply", "botania:block/pump_head@moving", "#move" ] }, "states": [ "default", "moving" ], "transitions": { From 9c58319e688d80d4aadc93be05a20f0309a1425a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 11:19:17 -0600 Subject: [PATCH 296/935] Fix rod of the seas using faulty placement logic that's gone in 1.8. Closes #78. --- .../botania/common/item/rod/ItemWaterRod.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) 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 9db28ad64..cbda1bf31 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -1,10 +1,16 @@ package vazkii.botania.common.item.rod; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -26,13 +32,22 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.doesWaterVaporize()) { - ItemStack stackToPlace = new ItemStack(Blocks.flowing_water); - stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); + // Adapted from bucket code + MovingObjectPosition mop = getMovingObjectPositionFromPlayer(par3World, par2EntityPlayer, false); + + if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + BlockPos hitPos = mop.getBlockPos(); + if(!par3World.isBlockModifiable(par2EntityPlayer, hitPos)) + return false; + 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(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); + } + } - if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, true); - 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 true; From d203cf3fe4ddf17f09ed2771d0d69844f94dacf6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 11:28:39 -0600 Subject: [PATCH 297/935] Fix water bowls being unacquirable. Closes #75. --- .../vazkii/botania/common/world/SkyblockWorldEvents.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 0f499285c..c253dcb11 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -81,10 +81,9 @@ public final class SkyblockWorldEvents { } } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { MovingObjectPosition movingobjectposition = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); - if(movingobjectposition != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && !event.world.isRemote) { - if(event.world.getBlockState(event.pos).getBlock().getMaterial() == Material.water) { + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if(event.world.getBlockState(movingobjectposition.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) From 78308cdb01ca944647e66126e631a1f049a280f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 11:35:49 -0600 Subject: [PATCH 298/935] Probably should have teh null check first. CLoses #73 --- src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 72d237513..efede3c3b 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -206,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override From ad8cf9de8ad76427c099c6893e6136de2928dbe3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 12:18:23 -0600 Subject: [PATCH 299/935] Blockstate tweak in flowers, pick block fix for tall flowers --- .../botania/common/block/BlockModDoubleFlower.java | 9 +++++++++ .../java/vazkii/botania/common/block/BlockModFlower.java | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index a3d12724b..1c6fba0c0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -27,6 +27,7 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -233,4 +234,12 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + IBlockState state = world.getBlockState(pos); + state = state.getBlock().getActualState(state, world, pos); + PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; + return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 586cc9d5b..4cbbb92ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -27,6 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; @@ -77,7 +79,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup if (meta >= EnumDyeColor.values().length) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.withProperty(type, EnumFlowerType.POPPY); } @Override From 779cc7604c750d75ef134b08b276ac0de85dd30a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 12:39:26 -0600 Subject: [PATCH 300/935] Tweak corporea funnel behavior to accomodate 1.8 item frame changes. Closes #81. --- .../tile/corporea/TileCorporeaFunnel.java | 22 ++++++++----------- .../resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 7345b60d5..18d6f0889 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -42,13 +42,10 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } public List getFilter() { - List filter = new ArrayList(); + List filter = new ArrayList<>(); - final int[] orientationToDir = new int[] { - 3, 4, 2, 5 - }; final int[] rotationToStackSize = new int[] { - 1, 16, 32, 64 + 1, 16, 24, 32, 40, 48, 56, 64 }; for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { @@ -95,15 +92,14 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); - for(ItemStack reqStack : stacks) - if(request != null) { - if(inv != null && !(inv instanceof TileCorporeaFunnel) && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, EnumFacing.UP)) - InventoryHelper.insertItemIntoInventory(inv, reqStack); - else { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); - worldObj.spawnEntityInWorld(item); - } + for(ItemStack reqStack : stacks) { + if(inv != null && !(inv instanceof TileCorporeaFunnel) && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, EnumFacing.UP)) + InventoryHelper.insertItemIntoInventory(inv, reqStack); + else { + EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); + worldObj.spawnEntityInWorld(item); } + } } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 5c918ca5e..74fc9e3ec 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3300,7 +3300,7 @@ botania.page.corporeaIndex7=A certain magical one at that botania.entry.corporeaFunnel=Corporea Funnel botania.tagline.corporeaFunnel=Request items from a Corporea network via redstone botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the &4Corporea Network&0 is the &1Corporea Funnel&0, when given access to a network through a &1Corporea Spark&0 on top, it'll pull a single item from the network when given a redstone signal.
This item is put into an inventory 1 or 2 blocks below it, or case one doesn't exist or is full, tossed into the world right above the funnel. -botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
Rotating the item changes how many will be requested at once, starting at 1, rotating once, twice and three times will pull 16, 32 and 64, respectively. +botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
Rotating the item changes how many will be requested at once, starting at 1, rotating once will pull 16, and each rotation thereafter increases the count by 8, up to a maximum of 64. botania.page.corporeaFunnel2=Energistically applied # -- CORPOREA INTERCEPTOR From 75e07e96533dfb402ee329bde8aee9a7a29ca20a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jan 2016 20:33:29 -0600 Subject: [PATCH 301/935] Bump to recommended forge --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 67cc63c17..37f5b413a 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jan 08 18:17:27 GMT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.0.1715 +forge_version=11.15.1.1722 mc_version=1.8.9 dir_repo=./ build_number=249 From 2071fa16d275e34b0dc49c403aeaada1f4c5b0bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jan 2016 21:09:15 -0600 Subject: [PATCH 302/935] Fix trodden dirt being wonky. Closes #68. --- .../common/block/decor/BlockDirtPath.java | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) 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 fab48555e..1446e7ba7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -10,11 +10,17 @@ */ package vazkii.botania.common.block.decor; +import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -23,14 +29,24 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.lang.ref.WeakReference; +import java.util.UUID; + public class BlockDirtPath extends BlockMod implements ILexiconable { + private static final UUID speedBoostUuid = UUID.fromString("c5f17cca-c89f-4f12-81da-8f04b1f27679"); + private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.7, 2).setSaved(false); + public BlockDirtPath() { super(Material.ground); setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); @@ -39,6 +55,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { setStepSound(soundTypeGravel); setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -48,15 +65,13 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { @Override public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { - float speed = 2F; - float max = 0.4F; - - double motionX = Math.abs(entity.motionX); - double motionZ = Math.abs(entity.motionZ); - if(motionX < max) - entity.motionX *= speed; - if(motionZ < max) - entity.motionZ *= speed; + if(!world.isRemote && entity instanceof EntityPlayerMP) { + EntityLivingBase living = ((EntityLivingBase) entity); + IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + if(!attr.hasModifier(speedBoost)) { + attr.applyModifier(speedBoost); + } + } } @Override @@ -102,4 +117,15 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { return LexiconData.dirtPath; } + @SubscribeEvent + public void onTickEnd(TickEvent.WorldTickEvent event) { + if(event.world.isRemote || event.phase != TickEvent.Phase.END) + return; + for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.movementSpeed).hasModifier(speedBoost))) { + if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != this) { + player.getEntityAttribute(SharedMonsterAttributes.movementSpeed).removeModifier(speedBoost); + } + } // todo 1.8 there's probably a better way to do this. + } + } From 4ac196eae3586a45824814737fd080e8729d4bf1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jan 2016 21:19:44 -0600 Subject: [PATCH 303/935] Tweak corporea item frame filter again --- .../java/vazkii/botania/common/block/decor/BlockDirtPath.java | 3 --- .../botania/common/block/tile/corporea/TileCorporeaFunnel.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) 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 1446e7ba7..1b434abac 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -35,11 +34,9 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.lang.ref.WeakReference; import java.util.UUID; public class BlockDirtPath extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 18d6f0889..cb6fd4f1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -45,7 +45,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq List filter = new ArrayList<>(); final int[] rotationToStackSize = new int[] { - 1, 16, 24, 32, 40, 48, 56, 64 + 1, 2, 4, 8, 16, 32, 48, 64 }; for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { From 7db49dae783187d73c8f3ceec661f9ba3cfe7b3c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 28 Jan 2016 11:55:46 -0600 Subject: [PATCH 304/935] Fix heisei dream being completely broken --- .../block/subtile/functional/SubTileHeiseiDream.java | 7 ++++--- .../java/vazkii/botania/common/lib/LibObfuscation.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 076fdb296..54bfb0a1f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -63,8 +63,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { while(newTarget == entity); if(newTarget instanceof EntityLiving) { - List entries = new ArrayList(entity.tasks.taskEntries); - entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); + List entries = new ArrayList<>(entity.tasks.taskEntries); + entries.addAll(new ArrayList<>(entity.targetTasks.taskEntries)); for(EntityAITaskEntry entry : entries) if(entry.action instanceof EntityAINearestAttackableTarget) { @@ -84,7 +84,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { } private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { - ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, IMob.class, LibObfuscation.TARGET_CLASS); + ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Entity.class, LibObfuscation.TARGET_CLASS); + ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Predicates.equalTo(target), LibObfuscation.TARGET_ENTITY_SELECTOR); // todo 1.8 will this leak `target`? ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index ba8f15405..8a4b74d7a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -27,6 +27,7 @@ public final class LibObfuscation { // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; + public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; // EntityAIAttackOnCollide public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; From bc29d37446b48c75d4c901a14f27028d9549a95d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jan 2016 21:00:48 -0600 Subject: [PATCH 305/935] Finish off baubles. Closes #49. --- .../equipment/bauble/ItemBaubleCosmetic.java | 107 +++++++++++++++--- 1 file changed, 93 insertions(+), 14 deletions(-) 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 ad3fc6f56..9c7c78337 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 @@ -13,13 +13,22 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -149,25 +158,26 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case 17: faceTranslate(); scale(0.35F); + GlStateManager.translate(0.25F, 0.2F, -0.60F); renderIcon(17); break; case 18: faceTranslate(); scale(0.75F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(-0.3F, 0.1F, 0.55F); + GlStateManager.rotate(-90F, 0F, 0F, 1F); + GlStateManager.translate(-0.2F, -0.15F, -0.5F); renderIcon(18); break; case 19: faceTranslate(); scale(0.6F); - GlStateManager.translate(0.2F, -0.2F, 0.1F); + GlStateManager.translate(0F, 0F, -0.5F); renderIcon(19); break; case 20: faceTranslate(); scale(0.25F); - GlStateManager.translate(0.4F, 0.5F, -0.1F); + GlStateManager.translate(-0.7F, 0.3F, -1.5F); renderIcon(20); GlStateManager.translate(1.4F, 0F, 0F); renderIcon(20); @@ -207,10 +217,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { case 28: faceTranslate(); scale(0.25F); - GlStateManager.translate(1.55F, -0.2F, -0.1F); + GlStateManager.translate(-0.4F, 0.4F, -1.1F); renderIcon(28); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(-0.1F, 0F, 0.1F); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.775F, -0.4F, 0.04F); renderIcon(28); break; case 30: @@ -255,14 +265,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case 14: chestTranslate(); - scale(0.5F); - GlStateManager.translate(2.3F, 1F, -0.05F); - GlStateManager.rotate(180F, 0F, 1F, 0F); - renderIcon(14); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.color(0F, 0F, 0.3F, 1F); - GlStateManager.translate(-2.6F, 0F, 0.05F); + scale(0.9F); + GlStateManager.translate(0.45F, 0.05F, -0.1F); renderIcon(14); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(0.9F, -0.25F, 0F); + renderKamuiBlack(); break; case 16: chestTranslate(); @@ -308,4 +316,75 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON); GlStateManager.popMatrix(); } + + public void renderKamuiBlack() { + 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); + + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(renderStack); + + GlStateManager.enableRescaleNormal(); + GlStateManager.alphaFunc(516, 0.1F); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.pushMatrix(); + model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON); + + GlStateManager.translate(-0.5F, -0.1F, -0.4F); + this.renderModel(model, renderStack, 0xFF00004C); + + GlStateManager.cullFace(1029); + GlStateManager.popMatrix(); + GlStateManager.disableRescaleNormal(); + GlStateManager.disableBlend(); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.locationBlocksTexture).restoreLastBlurMipmap(); + // + } + + // Adapted from RenderItem.renderModel(model, stack), added extra color param + private void renderModel(IBakedModel model, ItemStack stack, int color) { + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(7, DefaultVertexFormats.ITEM); + + for (EnumFacing enumfacing : EnumFacing.values()) + { + this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color, stack); + } + + this.renderQuads(worldrenderer, model.getGeneralQuads(), color, stack); + tessellator.draw(); + } + + // Copy of RenderItem.renderQuads + private void renderQuads(WorldRenderer renderer, List quads, int color, ItemStack stack) + { + boolean flag = color == -1 && stack != null; + int i = 0; + + for (int j = quads.size(); i < j; ++i) + { + BakedQuad bakedquad = (BakedQuad)quads.get(i); + int k = color; + + if (flag && bakedquad.hasTintIndex()) + { + k = stack.getItem().getColorFromItemStack(stack, bakedquad.getTintIndex()); + + if (EntityRenderer.anaglyphEnable) + { + k = TextureUtil.anaglyphColor(k); + } + + k = k | -16777216; + } + + net.minecraftforge.client.model.pipeline.LightUtil.renderQuadColor(renderer, bakedquad, k); + } + } + } From 6e48bb9a4469c0ee516412d07c30ccab0996daed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jan 2016 16:19:33 -0600 Subject: [PATCH 306/935] Fix thorn chakram render, make it remember the stack used to thrown it (name will persist, etc.) --- .../client/core/proxy/ClientProxy.java | 6 ++-- .../render/entity/RenderSnowballStack.java | 12 ++++---- .../common/entity/EntityThornChakram.java | 29 +++++++++++++++---- .../botania/common/item/ItemThornChakram.java | 4 ++- 4 files changed, 36 insertions(+), 15 deletions(-) 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 004470d7d..0406e080d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -75,7 +75,6 @@ import vazkii.botania.client.render.entity.RenderPixie; import vazkii.botania.client.render.entity.RenderPoolMinecart; import vazkii.botania.client.render.entity.RenderSnowballStack; import vazkii.botania.client.render.entity.RenderSpark; -import vazkii.botania.client.render.entity.RenderThornChakram; import vazkii.botania.client.render.tile.RenderTileAlfPortal; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.client.render.tile.RenderTileAvatar; @@ -91,7 +90,6 @@ import vazkii.botania.client.render.tile.RenderTileIncensePlate; import vazkii.botania.client.render.tile.RenderTileLightRelay; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.client.render.tile.RenderTilePrism; -import vazkii.botania.client.render.tile.RenderTilePump; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.client.render.tile.RenderTileRuneAltar; @@ -258,15 +256,15 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, RenderThornChakram::new); RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new); RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new); RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new); RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.thornChakram, 1, entity.isFire() ? 1 : 0))); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.manaResource, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.manaResource, 1, 15))); ShaderHelper.initShaders(); } 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 d3a69cbd0..016f932b1 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -8,25 +8,27 @@ */ package vazkii.botania.client.render.entity; +import com.google.common.base.Function; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.Entity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { - private final ItemStack stack; + private final Function stackGetter; - public RenderSnowballStack(RenderManager renderManagerIn, ItemStack stack, RenderItem render) { - super(renderManagerIn, stack.getItem(), render); - this.stack = stack; + public RenderSnowballStack(RenderManager renderManagerIn, Item item, RenderItem render, Function stackGetter) { + super(renderManagerIn, item, render); + this.stackGetter = stackGetter; } @Override public ItemStack func_177082_d(T entity) { - return stack; + return stackGetter.apply(entity); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 7a2d40509..da3dd2626 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -18,6 +18,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; @@ -33,13 +34,15 @@ public class EntityThornChakram extends EntityThrowable { private static final int MAX_BOUNCES = 16; boolean bounced = false; + private ItemStack stack; public EntityThornChakram(World world) { super(world); } - public EntityThornChakram(World world, EntityLivingBase e) { + public EntityThornChakram(World world, EntityLivingBase e, ItemStack stack) { super(world, e); + this.stack = stack.copy(); } @Override @@ -77,10 +80,10 @@ public class EntityThornChakram extends EntityThrowable { motionX = motion.x; motionY = motion.y; motionZ = motion.z; - if(MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1) + if(!worldObj.isRemote && MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1) if(!(thrower instanceof EntityPlayer && (((EntityPlayer) thrower).capabilities.isCreativeMode || ((EntityPlayer) thrower).inventory.addItemStackToInventory(getItemStack())))) dropAndKill(); - else if(!worldObj.isRemote) + else setDead(); } } else { @@ -103,7 +106,7 @@ public class EntityThornChakram extends EntityThrowable { } private ItemStack getItemStack() { - return new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0); + return stack != null ? stack.copy() : new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0); } @Override @@ -120,7 +123,7 @@ public class EntityThornChakram extends EntityThrowable { boolean fire = isFire(); EntityLivingBase thrower = getThrower(); - if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { + if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); if(fire) pos.entityHit.setFire(5); @@ -163,4 +166,20 @@ public class EntityThornChakram extends EntityThrowable { dataWatcher.updateObject(31, (byte) (fire ? 1 : 0)); } + @Override + public void writeEntityToNBT(NBTTagCompound compound) { + super.writeEntityToNBT(compound); + if(stack != null) { + compound.setTag("fly_stack", stack.writeToNBT(new NBTTagCompound())); + } + } + + @Override + public void readEntityFromNBT(NBTTagCompound compound) { + super.readEntityFromNBT(compound); + if(compound.hasKey("fly_stack")) { + stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("fly_stack")); + } + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index c3778b99e..d1fc209f9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -49,7 +49,9 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { p_77659_2_.playSoundAtEntity(p_77659_3_, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!p_77659_2_.isRemote) { - EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_); + ItemStack stack = p_77659_1_.copy(); + stack.stackSize = 1; + EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_, stack); c.setFire(p_77659_1_.getItemDamage() != 0); p_77659_2_.spawnEntityInWorld(c); } From a0494475ddc2d141ce97df6bb14fa7fe0e6bc71b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jan 2016 17:31:34 -0600 Subject: [PATCH 307/935] Fix several glcolorub's leaking --- .../vazkii/botania/client/core/handler/BoundTileRenderer.java | 1 + .../java/vazkii/botania/client/core/handler/HUDHandler.java | 2 ++ .../botania/client/core/handler/SubTileRadiusRenderHandler.java | 2 ++ src/main/java/vazkii/botania/client/model/ModelHourglass.java | 2 +- .../botania/common/item/equipment/bauble/ItemBloodPendant.java | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 3c6b43fc6..99474f279 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -142,6 +142,7 @@ public final class BoundTileRenderer { } } + GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index f412c7f90..964488d61 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -264,6 +264,7 @@ public final class HUDHandler { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5); GlStateManager.disableBlend(); + GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); } private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { @@ -484,5 +485,6 @@ public final class HUDHandler { Color color_ = new Color(color); GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); + GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 50aee0fab..da9e6c000 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -127,6 +127,7 @@ public final class SubTileRadiusRenderHandler { tessellator.getWorldRenderer().pos(x, f1, z).endVertex(); tessellator.draw(); + GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); GlStateManager.popMatrix(); } @@ -173,6 +174,7 @@ public final class SubTileRadiusRenderHandler { } tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); tessellator.draw(); + GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 57f64a14b..2deba7bdf 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -99,7 +99,7 @@ public class ModelHourglass extends ModelBase { } GL11.glPopAttrib(); - GL11.glColor3f(1, 1, 1); + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); glass1.render(f); glass2.render(f); } 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 d563a2de5..9a74b33c8 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 @@ -189,6 +189,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); } + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); } } From 727d0480df8bfb73a8a4948872baf3170ebd9708 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jan 2016 23:21:29 -0600 Subject: [PATCH 308/935] Some tweaks to life imbuer --- .../common/block/tile/TileSpawnerClaw.java | 80 ++++++++++--------- 1 file changed, 44 insertions(+), 36 deletions(-) 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 ace660ec7..5935975a4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -51,6 +51,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { MobSpawnerBaseLogic logic = spawner.getSpawnerBaseLogic(); try { + // Directly drawn from MobSpawnerBaseLogic, with inverted isActivated check and mana consumption if(!((Boolean) isActivated.invoke(logic))) { if(!worldObj.isRemote) mana -= 6; @@ -65,54 +66,60 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { prevMobRotation.set(logic, logic.getMobRotation()); mobRotation.set(logic, (logic.getMobRotation() + 1000.0F / (spawnDelay.getInt(logic) + 200.0F)) % 360.0D); - } else if(spawnDelay.getInt(logic) == -1) - resetTimer(logic); + } else { + if(spawnDelay.getInt(logic) == -1) + resetTimer(logic); + int delay = spawnDelay.getInt(logic); + if(delay > 0) { + spawnDelay.setInt(logic, delay - 1); + return; + } - int delay = spawnDelay.getInt(logic); - if(delay > 0) { - spawnDelay.setInt(logic, delay - 1); - return; - } + if(logic.getSpawnerWorld().isRemote) + return; - boolean flag = false; + boolean flag = false; - int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); - int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); - int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); + int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); + int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); + int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); - for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(((String) getEntityNameToSpawn.invoke(logic)), logic.getSpawnerWorld()); + for(int i = 0; i < spawnCount; ++i) { + Entity entity = EntityList.createEntityByName(((String) getEntityNameToSpawn.invoke(logic)), logic.getSpawnerWorld()); - if (entity == null) - return; + if (entity == null) + return; - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerPosition(), logic.getSpawnerPosition().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerPosition(), logic.getSpawnerPosition().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); - if (j >= maxNearbyEntities) { - resetTimer(logic); - return; - } + if (j >= maxNearbyEntities) { + resetTimer(logic); + return; + } - double d2 = logic.getSpawnerPosition().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - double d3 = logic.getSpawnerPosition().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; - double d4 = logic.getSpawnerPosition().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; - entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); + double d2 = logic.getSpawnerPosition().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d3 = logic.getSpawnerPosition().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; + double d4 = logic.getSpawnerPosition().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; + entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); - if(entityliving == null || entityliving.getCanSpawnHere()) { - if(!worldObj.isRemote) - spawnNewEntity.invoke(logic, entity, true); - logic.getSpawnerWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); + if(entityliving == null || entityliving.getCanSpawnHere() && entityliving.isNotColliding()) { + spawnNewEntity.invoke(logic, entity, true); + this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); - if (entityliving != null) - entityliving.spawnExplosionParticle(); + if(entityliving != null) { + entityliving.spawnExplosionParticle(); + } + + flag = true; + } + } + + if (flag) + resetTimer(logic); + } - flag = true; - } - } - if (flag) - resetTimer(logic); } } catch (IllegalAccessException | InvocationTargetException e) { e.printStackTrace(); @@ -120,6 +127,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } } + // Direct copy of MobSpawnerBaseLogic.resetTimer() private void resetTimer(MobSpawnerBaseLogic logic) throws IllegalAccessException { int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); From edceea8922e15acaf163cab52aa24665cce073eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jan 2016 20:03:03 -0600 Subject: [PATCH 309/935] Clean up some jsons --- .../assets/botania/blockstates/enchanter.json | 6 ++-- .../botania/blockstates/enderEyeBlock.json | 9 +++-- .../assets/botania/blockstates/flower.json | 34 ++++++++++--------- .../botania/blockstates/forestDrum.json | 8 +++-- .../assets/botania/blockstates/ghostRail.json | 14 ++++---- .../botania/blockstates/livingrock.json | 12 ++++--- .../botania/blockstates/livingwood.json | 14 ++++---- .../assets/botania/blockstates/mushroom.json | 34 ++++++++++--------- .../assets/botania/blockstates/pavement.json | 14 ++++---- .../botania/blockstates/shinyFlower.json | 34 ++++++++++--------- .../assets/botania/blockstates/stone.json | 34 ++++++++++--------- .../assets/botania/blockstates/storage.json | 12 ++++--- 12 files changed, 123 insertions(+), 102 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index fb206fdd8..71a389c10 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -8,8 +8,10 @@ "transform": "forge:default-block" }, "variants": { - "facing=x": [{}], - "facing=z": [{}], + "facing": { + "x": {}, + "z": {} + }, "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index 1d55d3423..d49d0e4dc 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -8,11 +8,10 @@ "transform": "forge:default-block" }, "variants": { - "powered=true": [{ - "textures": { - "all": "botania:blocks/enderEyeBlock1" - } - }], + "powered": { + "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, + "false": {} + }, "powered=false": [{}], "inventory": [{}] } diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 9ccfc702c..9472ebe07 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/flower0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/flower1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/flower2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/flower3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/flower4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/flower5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/flower6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/flower7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/flower8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/flower9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/flower10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/flower11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/flower12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/flower13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/flower14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/flower15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/flower0" } }, + "orange": { "textures": { "cross": "botania:blocks/flower1" } }, + "magenta": { "textures": { "cross": "botania:blocks/flower2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/flower3" } }, + "yellow": { "textures": { "cross": "botania:blocks/flower4" } }, + "lime": { "textures": { "cross": "botania:blocks/flower5" } }, + "pink": { "textures": { "cross": "botania:blocks/flower6" } }, + "gray": { "textures": { "cross": "botania:blocks/flower7" } }, + "silver": { "textures": { "cross": "botania:blocks/flower8" } }, + "cyan": { "textures": { "cross": "botania:blocks/flower9" } }, + "purple": { "textures": { "cross": "botania:blocks/flower10" } }, + "blue": { "textures": { "cross": "botania:blocks/flower11" } }, + "brown": { "textures": { "cross": "botania:blocks/flower12" } }, + "green": { "textures": { "cross": "botania:blocks/flower13" } }, + "red": { "textures": { "cross": "botania:blocks/flower14" } }, + "black": { "textures": { "cross": "botania:blocks/flower15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }], diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index a20f0ed41..41c22e65e 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -5,8 +5,10 @@ "transform": "forge:default-block" }, "variants": { - "variant=wild": [{ "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }], - "variant=gathering": [{ "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }], - "variant=canopy": [{ "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } }] + "variant": { + "wild": { "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }, + "gathering": { "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }, + "canopy": { "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json index 96631fbfc..891a54fbd 100644 --- a/src/main/resources/assets/botania/blockstates/ghostRail.json +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -7,12 +7,14 @@ "transform": "forge:default-item" }, "variants": { - "shape=north_south": { "model": "minecraft:rail_flat" }, - "shape=east_west": { "model": "minecraft:rail_flat", "y": 90 }, - "shape=ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, - "shape=ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, - "shape=ascending_north": { "model": "minecraft:rail_raised_ne" }, - "shape=ascending_south": { "model": "minecraft:rail_raised_sw" }, + "shape": { + "north_south": { "model": "minecraft:rail_flat" }, + "east_west": { "model": "minecraft:rail_flat", "y": 90 }, + "ascending_east": { "model": "minecraft:rail_raised_ne", "y": 90 }, + "ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, + "ascending_north": { "model": "minecraft:rail_raised_ne" }, + "ascending_south": { "model": "minecraft:rail_raised_sw" } + }, "inventory": [{ "model": "builtin/generated", "textures": { diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index 4893484b9..2202ab749 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -5,10 +5,12 @@ "transform": "forge:default-block" }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/livingrock0" } }], - "variant=brick": [{ "textures": { "all": "botania:blocks/livingrock1" } }], - "variant=mossy_brick": [{ "textures": { "all": "botania:blocks/livingrock2" } }], - "variant=cracked_brick": [{ "textures": { "all": "botania:blocks/livingrock3" } }], - "variant=chiseled_brick": [{ "textures": { "all": "botania:blocks/livingrock4" } }] + "variant": { + "default": { "textures": { "all": "botania:blocks/livingrock0" } }, + "brick": { "textures": { "all": "botania:blocks/livingrock1" } }, + "mossy_brick": { "textures": { "all": "botania:blocks/livingrock2" } }, + "cracked_brick": { "textures": { "all": "botania:blocks/livingrock3" } }, + "chiseled_brick": { "textures": { "all": "botania:blocks/livingrock4" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 3f6c42938..5090da065 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -5,11 +5,13 @@ "transform": "forge:default-block" }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/livingwood0" } }], - "variant=planks": [{ "textures": { "all": "botania:blocks/livingwood1" } }], - "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/livingwood2" } }], - "variant=framed": [{ "textures": { "all": "botania:blocks/livingwood3" } }], - "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/livingwood4" } }], - "variant=glimmering": [{ "textures": { "all": "botania:blocks/livingwood5" } }] + "variant": { + "default": { "textures": { "all": "botania:blocks/livingwood0" } }, + "planks": { "textures": { "all": "botania:blocks/livingwood1" } }, + "mossy_planks": { "textures": { "all": "botania:blocks/livingwood2" } }, + "framed": { "textures": { "all": "botania:blocks/livingwood3" } }, + "pattern_framed": { "textures": { "all": "botania:blocks/livingwood4" } }, + "glimmering": { "textures": { "all": "botania:blocks/livingwood5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index cafdbfede..b5e1da5ae 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/mushroom0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/mushroom1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/mushroom2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/mushroom3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/mushroom4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/mushroom5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/mushroom6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/mushroom7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/mushroom8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/mushroom9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/mushroom10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/mushroom11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/mushroom12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/mushroom13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/mushroom14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/mushroom15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/mushroom0" } }, + "orange": { "textures": { "cross": "botania:blocks/mushroom1" } }, + "magenta": { "textures": { "cross": "botania:blocks/mushroom2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/mushroom3" } }, + "yellow": { "textures": { "cross": "botania:blocks/mushroom4" } }, + "lime": { "textures": { "cross": "botania:blocks/mushroom5" } }, + "pink": { "textures": { "cross": "botania:blocks/mushroom6" } }, + "gray": { "textures": { "cross": "botania:blocks/mushroom7" } }, + "silver": { "textures": { "cross": "botania:blocks/mushroom8" } }, + "cyan": { "textures": { "cross": "botania:blocks/mushroom9" } }, + "purple": { "textures": { "cross": "botania:blocks/mushroom10" } }, + "blue": { "textures": { "cross": "botania:blocks/mushroom11" } }, + "brown": { "textures": { "cross": "botania:blocks/mushroom12" } }, + "green": { "textures": { "cross": "botania:blocks/mushroom13" } }, + "red": { "textures": { "cross": "botania:blocks/mushroom14" } }, + "black": { "textures": { "cross": "botania:blocks/mushroom15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }], diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json index baa9db28b..ed2c481c1 100644 --- a/src/main/resources/assets/botania/blockstates/pavement.json +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -5,11 +5,13 @@ "transform": "forge:default-block" }, "variants": { - "color=white": [{ "textures": { "all": "botania:blocks/pavement0" } }], - "color=black": [{ "textures": { "all": "botania:blocks/pavement1" } }], - "color=blue": [{ "textures": { "all": "botania:blocks/pavement2" } }], - "color=red": [{ "textures": { "all": "botania:blocks/pavement3"} }], - "color=yellow": [{ "textures": { "all": "botania:blocks/pavement4"} }], - "color=green": [{ "textures": { "all": "botania:blocks/pavement5" } }] + "color": { + "white": { "textures": { "all": "botania:blocks/pavement0" } }, + "black": { "textures": { "all": "botania:blocks/pavement1" } }, + "blue": { "textures": { "all": "botania:blocks/pavement2" } }, + "red": { "textures": { "all": "botania:blocks/pavement3"} }, + "yellow": { "textures": { "all": "botania:blocks/pavement4"} }, + "green": { "textures": { "all": "botania:blocks/pavement5" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index c08f56345..a8b2f6868 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -4,22 +4,24 @@ "model": "minecraft:cross" }, "variants": { - "color=white": [{ "textures": { "cross": "botania:blocks/flowerGlimmering0" } }], - "color=orange": [{ "textures": { "cross": "botania:blocks/flowerGlimmering1" } }], - "color=magenta": [{ "textures": { "cross": "botania:blocks/flowerGlimmering2" } }], - "color=light_blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering3" } }], - "color=yellow": [{ "textures": { "cross": "botania:blocks/flowerGlimmering4" } }], - "color=lime": [{ "textures": { "cross": "botania:blocks/flowerGlimmering5" } }], - "color=pink": [{ "textures": { "cross": "botania:blocks/flowerGlimmering6" } }], - "color=gray": [{ "textures": { "cross": "botania:blocks/flowerGlimmering7" } }], - "color=silver": [{ "textures": { "cross": "botania:blocks/flowerGlimmering8" } }], - "color=cyan": [{ "textures": { "cross": "botania:blocks/flowerGlimmering9" } }], - "color=purple": [{ "textures": { "cross": "botania:blocks/flowerGlimmering10" } }], - "color=blue": [{ "textures": { "cross": "botania:blocks/flowerGlimmering11" } }], - "color=brown": [{ "textures": { "cross": "botania:blocks/flowerGlimmering12" } }], - "color=green": [{ "textures": { "cross": "botania:blocks/flowerGlimmering13" } }], - "color=red": [{ "textures": { "cross": "botania:blocks/flowerGlimmering14" } }], - "color=black": [{ "textures": { "cross": "botania:blocks/flowerGlimmering15" } }], + "color": { + "white": { "textures": { "cross": "botania:blocks/flowerGlimmering0" } }, + "orange": { "textures": { "cross": "botania:blocks/flowerGlimmering1" } }, + "magenta": { "textures": { "cross": "botania:blocks/flowerGlimmering2" } }, + "light_blue": { "textures": { "cross": "botania:blocks/flowerGlimmering3" } }, + "yellow": { "textures": { "cross": "botania:blocks/flowerGlimmering4" } }, + "lime": { "textures": { "cross": "botania:blocks/flowerGlimmering5" } }, + "pink": { "textures": { "cross": "botania:blocks/flowerGlimmering6" } }, + "gray": { "textures": { "cross": "botania:blocks/flowerGlimmering7" } }, + "silver": { "textures": { "cross": "botania:blocks/flowerGlimmering8" } }, + "cyan": { "textures": { "cross": "botania:blocks/flowerGlimmering9" } }, + "purple": { "textures": { "cross": "botania:blocks/flowerGlimmering10" } }, + "blue": { "textures": { "cross": "botania:blocks/flowerGlimmering11" } }, + "brown": { "textures": { "cross": "botania:blocks/flowerGlimmering12" } }, + "green": { "textures": { "cross": "botania:blocks/flowerGlimmering13" } }, + "red": { "textures": { "cross": "botania:blocks/flowerGlimmering14" } }, + "black": { "textures": { "cross": "botania:blocks/flowerGlimmering15" } } + }, "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }], "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }], diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json index 249d618ba..f62868e48 100644 --- a/src/main/resources/assets/botania/blockstates/stone.json +++ b/src/main/resources/assets/botania/blockstates/stone.json @@ -5,21 +5,23 @@ "transform": "forge:default-block" }, "variants": { - "variant=andesite": [{ "textures": { "all": "botania:blocks/stone0" } }], - "variant=basalt": [{ "textures": { "all": "botania:blocks/stone1" } }], - "variant=diorite": [{ "textures": { "all": "botania:blocks/stone2" } }], - "variant=granite": [{ "textures": { "all": "botania:blocks/stone3" } }], - "variant=polished_andesite": [{ "textures": { "all": "botania:blocks/stone4" } }], - "variant=polished_basalt": [{ "textures": { "all": "botania:blocks/stone5" } }], - "variant=polished_diorite": [{ "textures": { "all": "botania:blocks/stone6" } }], - "variant=polished_granite": [{ "textures": { "all": "botania:blocks/stone7" } }], - "variant=andesite_brick": [{ "textures": { "all": "botania:blocks/stone8" } }], - "variant=basalt_brick": [{ "textures": { "all": "botania:blocks/stone9" } }], - "variant=diorite_brick": [{ "textures": { "all": "botania:blocks/stone10" } }], - "variant=granite_brick": [{ "textures": { "all": "botania:blocks/stone11" } }], - "variant=chiseled_andesite": [{ "textures": { "all": "botania:blocks/stone12" } }], - "variant=chiseled_basalt": [{ "textures": { "all": "botania:blocks/stone13" } }], - "variant=chiseled_diorite": [{ "textures": { "all": "botania:blocks/stone14" } }], - "variant=chiseled_granite": [{ "textures": { "all": "botania:blocks/stone15" } }] + "variant": { + "andesite": { "textures": { "all": "botania:blocks/stone0" } }, + "basalt": { "textures": { "all": "botania:blocks/stone1" } }, + "diorite": { "textures": { "all": "botania:blocks/stone2" } }, + "granite": { "textures": { "all": "botania:blocks/stone3" } }, + "polished_andesite": { "textures": { "all": "botania:blocks/stone4" } }, + "polished_basalt": { "textures": { "all": "botania:blocks/stone5" } }, + "polished_diorite": { "textures": { "all": "botania:blocks/stone6" } }, + "polished_granite": { "textures": { "all": "botania:blocks/stone7" } }, + "andesite_brick": { "textures": { "all": "botania:blocks/stone8" } }, + "basalt_brick": { "textures": { "all": "botania:blocks/stone9" } }, + "diorite_brick": { "textures": { "all": "botania:blocks/stone10" } }, + "granite_brick": { "textures": { "all": "botania:blocks/stone11" } }, + "chiseled_andesite": { "textures": { "all": "botania:blocks/stone12" } }, + "chiseled_basalt": { "textures": { "all": "botania:blocks/stone13" } }, + "chiseled_diorite": { "textures": { "all": "botania:blocks/stone14" } }, + "chiseled_granite": { "textures": { "all": "botania:blocks/stone15" } } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 0b3e7899a..101c43d96 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -5,10 +5,12 @@ "transform": "forge:default-block" }, "variants": { - "variant=manasteel": [{ "textures": { "all": "botania:blocks/storage0" } }], - "variant=terrasteel": [{ "textures": { "all": "botania:blocks/storage1" } }], - "variant=elementium": [{ "textures": { "all": "botania:blocks/storage2" } }], - "variant=mana_diamond": [{ "textures": { "all": "botania:blocks/storage3" } }], - "variant=dragonstone": [{ "textures": { "all": "botania:blocks/storage4" } }] + "variant": { + "manasteel": { "textures": { "all": "botania:blocks/storage0" } }, + "terrasteel": { "textures": { "all": "botania:blocks/storage1" } }, + "elementium": { "textures": { "all": "botania:blocks/storage2" } }, + "mana_diamond": { "textures": { "all": "botania:blocks/storage3" } }, + "dragonstone": { "textures": { "all": "botania:blocks/storage4" } } + } } } \ No newline at end of file From 576362e400e3a15ebf41b334296ff40ddbda79a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Feb 2016 00:08:10 -0600 Subject: [PATCH 310/935] Big cleanup (begone unchecked warnings!) --- .../java/vazkii/botania/api/BotaniaAPI.java | 16 +++++------ .../java/vazkii/botania/api/brew/Brew.java | 2 +- .../botania/api/corporea/CorporeaHelper.java | 14 +++++----- .../api/internal/DummyManaNetwork.java | 6 ++-- .../botania/api/item/IFloatingFlower.java | 2 +- .../botania/api/lexicon/LexiconEntry.java | 6 ++-- .../api/lexicon/LexiconRecipeMappings.java | 2 +- .../multiblock/IMultiblockRenderHook.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 4 +-- .../vazkii/botania/api/recipe/RecipeBrew.java | 6 ++-- .../botania/api/recipe/RecipeElvenTrade.java | 8 +++--- .../botania/api/recipe/RecipePetals.java | 6 ++-- .../botania/api/recipe/RecipePureDaisy.java | 2 +- .../botania/api/state/BotaniaStateProps.java | 1 - .../vazkii/botania/api/wiki/WikiHooks.java | 2 +- .../client/challenge/ModChallenges.java | 6 ++-- .../core/handler/BaubleRenderHandler.java | 1 - .../core/handler/ClientTickHandler.java | 2 +- .../handler/ContributorFancinessHandler.java | 2 +- .../handler/CorporeaAutoCompleteHandler.java | 6 ++-- .../client/core/handler/DebugHandler.java | 1 - .../core/handler/MiscellaneousIcons.java | 1 - .../client/core/handler/ModelHandler.java | 2 -- .../core/handler/RedStringRenderer.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../vazkii/botania/client/fx/FXSparkle.java | 4 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 4 +-- .../client/gui/lexicon/GuiLexicon.java | 12 ++++---- .../client/gui/lexicon/GuiLexiconHistory.java | 2 +- .../client/gui/lexicon/GuiLexiconIndex.java | 2 +- .../lexicon/button/GuiButtonAchievement.java | 2 +- .../gui/lexicon/button/GuiButtonBack.java | 3 +- .../gui/lexicon/button/GuiButtonBookmark.java | 2 +- .../button/GuiButtonChallengeIcon.java | 2 +- .../button/GuiButtonChallengeInfo.java | 2 +- .../gui/lexicon/button/GuiButtonDoot.java | 2 +- .../gui/lexicon/button/GuiButtonHistory.java | 2 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonOptions.java | 2 +- .../gui/lexicon/button/GuiButtonPage.java | 3 +- .../gui/lexicon/button/GuiButtonShare.java | 3 +- .../button/GuiButtonUpdateWarning.java | 2 +- .../lexicon/button/GuiButtonViewOnline.java | 3 +- .../jei/brewery/BreweryRecipeCategory.java | 1 + .../jei/brewery/BreweryRecipeWrapper.java | 1 + .../elventrade/ElvenTradeRecipeCategory.java | 1 + .../elventrade/ElvenTradeRecipeWrapper.java | 1 + .../runicaltar/RunicAltarRecipeWrapper.java | 1 + .../botania/client/model/ModelPylon.java | 2 -- .../render/entity/RenderPoolMinecart.java | 2 -- .../render/tile/RenderTileAlfPortal.java | 1 - .../render/tile/RenderTileIncensePlate.java | 5 ---- .../client/render/tile/RenderTilePool.java | 7 ----- .../render/tile/RenderTileRedString.java | 1 - .../render/tile/RenderTileSkullOverride.java | 4 --- .../render/world/SkyblockSkyRenderer.java | 1 - .../common/achievement/AchievementMod.java | 2 +- .../botania/common/block/BlockAltGrass.java | 2 +- .../botania/common/block/BlockAltar.java | 3 +- .../common/block/BlockCacophonium.java | 2 +- .../botania/common/block/BlockCell.java | 2 +- .../botania/common/block/BlockCocoon.java | 2 +- .../botania/common/block/BlockFakeAir.java | 5 ++-- .../block/BlockFloatingSpecialFlower.java | 4 +-- .../common/block/BlockLightLauncher.java | 6 ++-- .../botania/common/block/BlockLightRelay.java | 2 +- .../botania/common/block/BlockLivingrock.java | 2 +- .../botania/common/block/BlockLivingwood.java | 2 +- .../common/block/BlockModDoubleFlower.java | 5 ++-- .../botania/common/block/BlockModFlower.java | 3 +- .../botania/common/block/BlockOpenCrate.java | 2 +- .../common/block/BlockPistonRelay.java | 14 +++++----- .../botania/common/block/BlockPlatform.java | 4 +-- .../botania/common/block/BlockPylon.java | 2 +- .../common/block/BlockSpecialFlower.java | 4 +-- .../botania/common/block/BlockStorage.java | 2 +- .../common/block/decor/Block18Stone.java | 2 +- .../common/block/decor/BlockCustomBrick.java | 2 +- .../block/decor/BlockEndStoneBrick.java | 2 +- .../block/decor/BlockFloatingFlower.java | 2 +- .../common/block/decor/BlockManaBeacon.java | 2 +- .../common/block/decor/BlockManaFlame.java | 4 +-- .../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/BlockTinyPotato.java | 5 +--- .../common/block/decor/BlockUnstable.java | 2 +- .../decor/biomestone/BlockBiomeStone.java | 2 +- .../decor/quartz/BlockSpecialQuartz.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 2 +- .../block/decor/walls/Block18StoneWall.java | 2 +- .../decor/walls/BlockBiomeStoneWall.java | 2 +- .../block/decor/walls/BlockModWall.java | 2 +- .../common/block/mana/BlockForestDrum.java | 4 +-- .../common/block/mana/BlockManaDetector.java | 2 +- .../botania/common/block/mana/BlockPool.java | 4 +-- .../botania/common/block/mana/BlockPump.java | 1 - .../common/block/mana/BlockSpawnerClaw.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../subtile/functional/SubTileClayconia.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 4 +-- .../functional/SubTileMarimorphosis.java | 4 +-- .../subtile/functional/SubTileOrechid.java | 4 +-- .../functional/SubTileRannuncarpus.java | 2 +- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../subtile/functional/SubTileTigerseye.java | 4 +-- .../subtile/functional/SubTileVinculotus.java | 4 +-- .../generating/SubTileDandelifeon.java | 2 +- .../generating/SubTileGourmaryllis.java | 1 - .../subtile/generating/SubTileMunchdew.java | 2 +- .../common/block/tile/TileAlfPortal.java | 9 +++--- .../botania/common/block/tile/TileAltar.java | 3 +- .../botania/common/block/tile/TileAvatar.java | 1 - .../common/block/tile/TileBifrost.java | 1 - .../common/block/tile/TileBrewery.java | 1 - .../botania/common/block/tile/TileCocoon.java | 1 - .../common/block/tile/TileEnchanter.java | 3 +- .../common/block/tile/TileEnderEye.java | 3 -- .../common/block/tile/TileForestEye.java | 1 - .../common/block/tile/TileHourglass.java | 1 - .../common/block/tile/TileIncensePlate.java | 1 - .../common/block/tile/TileLightRelay.java | 3 +- .../common/block/tile/TileManaBeacon.java | 2 -- .../common/block/tile/TileManaFlame.java | 1 - .../common/block/tile/TileOpenCrate.java | 1 - .../common/block/tile/TileRuneAltar.java | 3 +- .../common/block/tile/TileSparkChanger.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 1 - .../common/block/tile/TileSpecialFlower.java | 1 - .../common/block/tile/TileSpiritShrine.java | 1 - .../common/block/tile/TileStarfield.java | 2 -- .../common/block/tile/TileTerraPlate.java | 1 - .../common/block/tile/TileTinyPlanet.java | 1 - .../common/block/tile/TileTinyPotato.java | 1 - .../corporea/TileCorporeaCrystalCube.java | 1 - .../tile/corporea/TileCorporeaIndex.java | 7 ++--- .../corporea/TileCorporeaInterceptor.java | 6 +--- .../common/block/tile/mana/TileBellows.java | 1 - .../block/tile/mana/TileDistributor.java | 1 - .../block/tile/mana/TileManaDetector.java | 2 -- .../common/block/tile/mana/TilePool.java | 1 - .../common/block/tile/mana/TilePump.java | 2 -- .../block/tile/mana/TileRFGenerator.java | 1 - .../common/block/tile/mana/TileTurntable.java | 1 - .../block/tile/string/TileRedString.java | 2 -- .../tile/string/TileRedStringInterceptor.java | 7 ++--- .../vazkii/botania/common/brew/ModBrews.java | 1 - .../botania/common/brew/ModPotions.java | 3 -- .../common/core/BotaniaCreativeTab.java | 4 +-- .../common/core/handler/ConfigHandler.java | 7 ++--- .../common/core/handler/IMCHandler.java | 2 -- .../core/handler/InternalMethodHandler.java | 4 +-- .../core/handler/ManaNetworkHandler.java | 8 +++--- .../common/core/handler/SheddingHandler.java | 4 +-- .../common/crafting/ModCraftingRecipes.java | 6 ++-- .../common/crafting/ModElvenTradeRecipes.java | 4 +-- .../crafting/ModManaAlchemyRecipes.java | 28 +++++++++---------- .../crafting/ModManaConjurationRecipes.java | 2 +- .../crafting/ModManaInfusionRecipes.java | 8 +++--- .../common/crafting/ModRuneRecipes.java | 6 ++-- .../common/entity/EntityCorporeaSpark.java | 16 +++++------ .../common/entity/EntityDoppleganger.java | 13 +++------ .../common/entity/EntityEnderAirBottle.java | 4 +-- .../common/entity/EntityManaBurst.java | 4 +-- .../botania/common/entity/EntitySpark.java | 16 +++++------ .../botania/common/item/Item16Colors.java | 2 +- .../botania/common/item/ItemAncientWill.java | 4 +-- .../common/item/ItemBlackHoleTalisman.java | 2 +- .../botania/common/item/ItemBlackLotus.java | 4 +-- .../botania/common/item/ItemBottledMana.java | 2 +- .../botania/common/item/ItemCacophonium.java | 2 +- .../common/item/ItemCorporeaSpark.java | 2 +- .../botania/common/item/ItemCraftPattern.java | 2 +- .../botania/common/item/ItemFertilizer.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 6 ++-- .../botania/common/item/ItemGrassSeeds.java | 8 +++--- .../botania/common/item/ItemKeepIvy.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 4 +-- .../botania/common/item/ItemLexicon.java | 6 ++-- .../botania/common/item/ItemManaGun.java | 2 +- .../botania/common/item/ItemManaTablet.java | 4 +-- .../botania/common/item/ItemPinkinator.java | 2 +- .../botania/common/item/ItemSignalFlare.java | 4 +-- .../botania/common/item/ItemSparkUpgrade.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../common/item/ItemTemperanceStone.java | 2 +- .../botania/common/item/ItemThornChakram.java | 2 +- .../botania/common/item/ItemTwigWand.java | 4 +-- .../vazkii/botania/common/item/ItemVirus.java | 2 +- .../common/item/block/ItemBlockPool.java | 2 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- .../common/item/brew/ItemBrewBase.java | 4 +-- .../common/item/brew/ItemIncenseStick.java | 4 +-- .../botania/common/item/brew/ItemVial.java | 2 +- .../armor/manasteel/ItemManasteelArmor.java | 4 +-- .../armor/manaweave/ItemManaweaveArmor.java | 2 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +-- .../item/equipment/bauble/ItemBauble.java | 4 +-- .../equipment/bauble/ItemBaubleCosmetic.java | 5 ++-- .../equipment/bauble/ItemBloodPendant.java | 4 +-- .../equipment/bauble/ItemFlightTiara.java | 4 +-- .../item/equipment/bauble/ItemIcePendant.java | 4 +-- .../item/equipment/bauble/ItemMagnetRing.java | 5 ++-- .../item/equipment/bauble/ItemManaRing.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 3 -- .../tool/terrasteel/ItemTerraAxe.java | 10 +++---- .../tool/terrasteel/ItemTerraPick.java | 4 +-- .../thaumcraft/ItemManaInkwell.java | 2 +- .../botania/common/item/lens/ItemLens.java | 16 +---------- .../botania/common/item/lens/LensMine.java | 2 +- .../botania/common/item/lens/LensPaint.java | 6 ++-- .../item/material/ItemManaResource.java | 2 +- .../common/item/material/ItemQuartz.java | 2 +- .../common/item/material/ItemRune.java | 2 +- .../botania/common/item/relic/ItemDice.java | 4 +-- .../common/item/relic/ItemLokiRing.java | 2 +- .../common/item/relic/ItemOdinRing.java | 2 +- .../botania/common/item/relic/ItemRelic.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 4 +-- .../botania/common/item/rod/ItemSmeltRod.java | 4 +-- .../common/item/rod/ItemTerraformRod.java | 4 +-- .../botania/common/item/rod/ItemWaterRod.java | 4 --- .../botania/common/lexicon/LexiconData.java | 3 +- .../botania/common/lexicon/page/PageBrew.java | 4 +-- .../lexicon/page/PageCraftingRecipe.java | 7 +++-- .../common/lexicon/page/PageElvenRecipe.java | 5 ++-- .../common/lexicon/page/PageEntity.java | 2 +- .../lexicon/page/PageManaInfusionRecipe.java | 5 ++-- .../common/lexicon/page/PageMultiblock.java | 2 +- .../common/lexicon/page/PagePetalRecipe.java | 5 ++-- .../common/lexicon/page/PageRecipe.java | 5 ++-- .../common/lexicon/page/PageShedding.java | 9 +++--- .../common/lexicon/page/PageTerrasteel.java | 2 +- .../botania/common/lexicon/page/PageText.java | 8 +++--- 237 files changed, 360 insertions(+), 462 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 235846f52..f1c2b97c4 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -72,10 +72,10 @@ public final class BotaniaAPI { public static Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap(); + public static Map brewMap = new LinkedHashMap<>(); - public static List disposableBlocks = new ArrayList(); - public static List semiDisposableBlocks = new ArrayList(); + public static List disposableBlocks = new ArrayList<>(); + public static List semiDisposableBlocks = new ArrayList<>(); public static List petalRecipes = new ArrayList<>(); public static List pureDaisyRecipes = new ArrayList<>(); @@ -87,18 +87,18 @@ public final class BotaniaAPI { private static BiMap> subTiles = HashBiMap.> create(); private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); - public static Set subtilesForCreativeMenu = new LinkedHashSet(); + public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); public static Map subTileMods = new HashMap<>(); public static BiMap miniFlowers = HashBiMap. create(); public static Map oreWeights = new HashMap<>(); public static Map oreWeightsNether = new HashMap<>(); - public static Map seeds = new HashMap(); + public static Map seeds = new HashMap<>(); public static Set looniumBlacklist = new LinkedHashSet<>(); public static Map> paintableBlocks = new LinkedHashMap<>(); public static Set magnetBlacklist = new LinkedHashSet<>(); - public static Set> gravityRodBlacklist = new LinkedHashSet>(); + public static Set> gravityRodBlacklist = new LinkedHashSet<>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); @@ -328,7 +328,7 @@ public final class BotaniaAPI { * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. * Pass in the class for the Entity, e.g. EntityCow.class */ - public static void blacklistEntityFromGravityRod(Class entity) { + public static void blacklistEntityFromGravityRod(Class entity) { gravityRodBlacklist.add(entity); } @@ -646,7 +646,7 @@ public final class BotaniaAPI { */ public static List getLatestAddedRecipes(int x) { List list = CraftingManager.getInstance().getRecipeList(); - List newList = new ArrayList(); + List newList = new ArrayList<>(); for(int i = x - 1; i >= 0; i--) newList.add(list.get(list.size() - 1 - i)); diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index d0dd6ba4d..4da6fc655 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -42,7 +42,7 @@ public class Brew { this.name = name; this.color = color; this.cost = cost; - this.effects = new ArrayList(Arrays.asList(effects)); + this.effects = new ArrayList<>(Arrays.asList(effects)); } /** diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index c2a1a27e0..128db67da 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.corporea; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,6 +17,7 @@ import java.util.WeakHashMap; import java.util.regex.Pattern; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.Entity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -31,8 +31,8 @@ import net.minecraftforge.common.MinecraftForge; public final class CorporeaHelper { - private static final List empty = Collections.unmodifiableList(new ArrayList()); - private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); + private static final List empty = ImmutableList.of(); + private static final WeakHashMap, List> cachedNetworks = new WeakHashMap<>(); private static final List autoCompleteControllers = new ArrayList<>(); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -66,7 +66,7 @@ public final class CorporeaHelper { return cache; } - List inventories = new ArrayList(); + List inventories = new ArrayList<>(); if(network != null) for(ICorporeaSpark otherSpark : network) if(otherSpark != null) { @@ -127,7 +127,7 @@ public final class CorporeaHelper { * called instead if the context for this exists to avoid having to get the value again. */ public static Map getInventoriesWithItemInNetwork(ItemStack stack, List inventories, boolean checkNBT) { - Map countMap = new HashMap(); + Map countMap = new HashMap<>(); for(IInventory inv : inventories) { int count = 0; @@ -172,13 +172,13 @@ public final class CorporeaHelper { * equals or matches (case a regex is passed in) the matcher string. */ public static List requestItem(Object matcher, int itemCount, ICorporeaSpark spark, boolean checkNBT, boolean doit) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); CorporeaRequestEvent event = new CorporeaRequestEvent(matcher, itemCount, spark, checkNBT, doit); if(MinecraftForge.EVENT_BUS.post(event)) return stacks; List inventories = getInventoriesOnNetwork(spark); - Map interceptors = new HashMap(); + Map interceptors = new HashMap<>(); lastRequestMatches = 0; lastRequestExtractions = 0; diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 4b8cc5ac2..c71656857 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,9 +10,9 @@ */ package vazkii.botania.api.internal; -import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -39,12 +39,12 @@ public class DummyManaNetwork implements IManaNetwork { @Override public List getAllCollectorsInWorld(World world) { - return new ArrayList(); + return ImmutableList.of(); } @Override public List getAllPoolsInWorld(World world) { - return new ArrayList(); + return ImmutableList.of(); } } diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index d2e30699a..78502de4f 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -22,7 +22,7 @@ public interface IFloatingFlower { public void setIslandType(IslandType type); public class IslandType { - private static HashMap registry = new HashMap(); + private static HashMap registry = new HashMap<>(); public static final IslandType GRASS = new IslandType("GRASS"); public static final IslandType PODZOL = new IslandType("PODZOL"); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 274bfd6e6..ec907071f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -31,7 +31,7 @@ public class LexiconEntry implements Comparable { private boolean priority = false; private ItemStack icon = null; - private List extraDisplayedRecipes = new ArrayList(); + private List extraDisplayedRecipes = new ArrayList<>(); /** * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display. @@ -126,12 +126,12 @@ public class LexiconEntry implements Comparable { } public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(LexiconPage page : pages) { List l = page.getDisplayedRecipes(); if(l != null) { - ArrayList itemsAddedThisPage = new ArrayList(); + ArrayList itemsAddedThisPage = new ArrayList<>(); for(ItemStack s : l) { addItem: { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 8202a40a7..fc13ea829 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -23,7 +23,7 @@ import vazkii.botania.api.mana.IManaItem; */ public final class LexiconRecipeMappings { - private static Map mappings = new HashMap(); + private static Map mappings = new HashMap<>(); /** * Maps the given stack to the given page of the entry. diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index a4efe59d3..494f98f12 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; */ public interface IMultiblockRenderHook { - public static Map renderHooks = new HashMap(); + public static Map renderHooks = new HashMap<>(); public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha); diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 2b4240970..5cd33ed36 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -25,8 +25,8 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; */ public class Multiblock { - public List components = new ArrayList(); - public List materials = new ArrayList(); + public List components = new ArrayList<>(); + public List materials = new ArrayList<>(); public BlockPos minPos = BlockPos.ORIGIN; public BlockPos maxPos = BlockPos.ORIGIN; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 95577784e..5dec0cc6e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -28,7 +28,7 @@ public class RecipeBrew { public RecipeBrew(Brew brew, Object... inputs) { this.brew = brew; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -39,7 +39,7 @@ public class RecipeBrew { } public boolean matches(IInventory inv) { - List inputsMissing = new ArrayList(inputs); + List inputsMissing = new ArrayList<>(inputs); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -92,7 +92,7 @@ public class RecipeBrew { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public Brew getBrew() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index dbea13e86..ed701973e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -14,7 +14,7 @@ public class RecipeElvenTrade { public RecipeElvenTrade(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -25,8 +25,8 @@ public class RecipeElvenTrade { } public boolean matches(List stacks, boolean remove) { - List inputsMissing = new ArrayList(inputs); - List stacksToRemove = new ArrayList(); + List inputsMissing = new ArrayList<>(inputs); + List stacksToRemove = new ArrayList<>(); for(ItemStack stack : stacks) { if(stack == null) { @@ -84,7 +84,7 @@ public class RecipeElvenTrade { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 60e46357f..05f69049a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -25,7 +25,7 @@ public class RecipePetals { public RecipePetals(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -36,7 +36,7 @@ public class RecipePetals { } public boolean matches(IInventory inv) { - List inputsMissing = new ArrayList(inputs); + List inputsMissing = new ArrayList<>(inputs); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -86,7 +86,7 @@ public class RecipePetals { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index c9b5e05ba..5f4965f77 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -24,7 +24,7 @@ import vazkii.botania.api.subtile.SubTileEntity; public class RecipePureDaisy { - private static final Map> oreMap = new HashMap(); + private static final Map> oreMap = new HashMap<>(); Object input; IBlockState outputState; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 92f49feb0..df620c98c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -14,7 +14,6 @@ import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index e459bb911..479e66e6e 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -21,7 +21,7 @@ public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s"); - private static final Map modWikis = new HashMap(); + private static final Map modWikis = new HashMap<>(); public static IWikiProvider getWikiFor(Block block) { ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 4e1ba5e31..955727633 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -25,12 +25,12 @@ import vazkii.botania.common.lib.LibBlockNames; public final class ModChallenges { - public static final EnumMap> challenges = new EnumMap(EnumChallengeLevel.class); - public static final HashMap challengeLookup = new HashMap(); + public static final EnumMap> challenges = new EnumMap<>(EnumChallengeLevel.class); + public static final HashMap challengeLookup = new HashMap<>(); public static void init() { for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) - challenges.put(level, new ArrayList()); + challenges.put(level, new ArrayList<>()); addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6)); addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.record_13)); 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 9eaa84e4b..d03c55bc7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -32,7 +32,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BaubleRenderHandler implements LayerRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index f2bf0dd69..7708a1f60 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -78,7 +78,7 @@ public class ClientTickHandler { if(player != null) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() instanceof ItemTwigWand) { - List list = new ArrayList(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); + List list = new ArrayList<>(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); for(TileSignature sig : list) { if(!sig.remoteWorld) continue; 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 a05c7fd9e..235b8ccaf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -86,7 +86,7 @@ public final class ContributorFancinessHandler implements LayerRenderer(); for(String key : props.stringPropertyNames()) { String value = props.getProperty(key); diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index a7e56bb73..567b082e2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -11,12 +11,12 @@ package vazkii.botania.client.core.handler; import java.util.ArrayList; -import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiScreen; @@ -134,10 +134,10 @@ public class CorporeaAutoCompleteHandler { originalString = inputField.getText(); } - private ArrayList getNames(String prefix) { + private List getNames(String prefix) { String s = prefix.trim(); if(s.isEmpty()) - return new ArrayList(); + return ImmutableList.of(); TreeSet result = new TreeSet<>(); String[] words = s.split(" "); 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 d18576213..d4399ac22 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; 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 023171b73..ce5a21772 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -18,7 +18,6 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; 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 f404c130a..0470089d6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -18,7 +18,6 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.IReloadableResourceManager; @@ -110,7 +109,6 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.ItemTwigWand; diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index fa71c3afc..61458141b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -33,7 +33,7 @@ import vazkii.botania.common.lib.LibObfuscation; public final class RedStringRenderer { - public static final Queue redStringTiles = new ArrayDeque(); + public static final Queue redStringTiles = new ArrayDeque<>(); static float sizeAlpha = 0F; public static void renderAll() { 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 5aa68e18f..f1867e2da 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -64,7 +64,7 @@ public final class TooltipAdditionDisplayHandler { try { tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); } catch(Exception e) { - tooltip = new ArrayList(); + tooltip = new ArrayList<>(); } int width = 0; for(String s : tooltip) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index bd00169f5..1527b7fc5 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -36,8 +36,8 @@ public class FXSparkle extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - public static Queue queuedRenders = new ArrayDeque(); - public static Queue queuedCorruptRenders = new ArrayDeque(); + public static Queue queuedRenders = new ArrayDeque<>(); + public static Queue queuedCorruptRenders = new ArrayDeque<>(); // Queue values float f; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 6c111d567..d8e7a3c52 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -34,8 +34,8 @@ public class FXWisp extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); - public static Queue queuedRenders = new ArrayDeque(); - public static Queue queuedDepthIgnoringRenders = new ArrayDeque(); + public static Queue queuedRenders = new ArrayDeque<>(); + public static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); // Queue values float f; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 81512fa9d..07ad6592e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -71,7 +71,7 @@ public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); public static ItemStack stackUsed; - public static HashMap notes = new HashMap(); + public static HashMap notes = new HashMap<>(); private static final String TAG_TYPE = "type"; @@ -80,11 +80,11 @@ public class GuiLexicon extends GuiScreen { public static final int BOOKMARK_START = 1337; public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; - public static List bookmarks = new ArrayList(); - public static List bookmarkKeys = new ArrayList(); + public static List bookmarks = new ArrayList<>(); + public static List bookmarkKeys = new ArrayList<>(); boolean bookmarksNeedPopulation = false; - public static Queue tutorial = new ArrayDeque(); + public static Queue tutorial = new ArrayDeque<>(); public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF); @@ -131,7 +131,7 @@ public class GuiLexicon extends GuiScreen { } public void onInitGui() { - allCategories = new ArrayList(BotaniaAPI.getAllCategories()); + allCategories = new ArrayList<>(BotaniaAPI.getAllCategories()); Collections.sort(allCategories); lastTime = ClientTickHandler.ticksInGame; @@ -486,7 +486,7 @@ public class GuiLexicon extends GuiScreen { } void populateBookmarks() { - List remove = new ArrayList(); + List remove = new ArrayList<>(); List buttons = buttonList; for(GuiButton button : buttons) if(button.id >= BOOKMARK_START) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 159d793a4..ae9b6809e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; public class GuiLexiconHistory extends GuiLexiconIndex { - public static List history = new ArrayList(); + public static List history = new ArrayList<>(); public GuiLexiconHistory() { super(null); 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 16ea0b360..5388e985d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -56,7 +56,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { LexiconEntry currentEntry; float infoTime; - List entriesToDisplay = new ArrayList(); + List entriesToDisplay = new ArrayList<>(); public GuiLexiconIndex() { parent = new GuiLexicon(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 91ef081f1..b4bb1ebd2 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -36,7 +36,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.achievements")); int tooltipY = (tooltip.size() - 1) * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 5e282a6f1..cb487887c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -44,7 +45,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } public List getTooltip() { - return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back")); + return Collections.singletonList(StatCollector.translateToLocal("botaniamisc.back")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index ab0c49fcc..5ab60413b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -24,7 +24,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); if(displayString.equals("+")) tooltip.add(StatCollector.translateToLocal("botaniamisc.clickToAdd")); else { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index e0b94b4f7..98a6429a3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -49,7 +49,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { } - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal(challenge.unlocalizedName)); int tooltipY = (tooltip.size() - 1) * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 2d7d6fffa..3f687add8 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -33,7 +33,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo")); int tooltipY = (tooltip.size() + 1) * 5; 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 984f1e175..200021637 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 @@ -44,7 +44,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { GlStateManager.disableLighting(); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!"); tooltip.add(EnumChatFormatting.GRAY + "doot doot"); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 98c9780cc..adb6f8eef 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -34,7 +34,7 @@ public class GuiButtonHistory extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong")); tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.historyDesc")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 4a56f238a..69a92ea02 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -39,7 +39,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 130 : 120, 191, 10, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.hideNotes")); else { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index aa1f822d6..59ca83863 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -36,7 +36,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 180, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) tooltip.add((i == 0 ? EnumChatFormatting.RED : EnumChatFormatting.GRAY) + StatCollector.translateToLocal("botaniamisc.lexiconOptions" + i)); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 866c8de3b..10dce0157 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -39,7 +40,7 @@ public class GuiButtonPage extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) - RenderHelper.renderTooltip(par2, par3, Arrays.asList(StatCollector.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); + RenderHelper.renderTooltip(par2, par3, Collections.singletonList(StatCollector.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 712e0c0c1..41f327f60 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -43,6 +44,6 @@ public class GuiButtonShare extends GuiButtonLexicon { } public List getTooltip() { - return Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.clickToShare")); + return Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.clickToShare")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 320a19ddc..a19718446 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -43,7 +43,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, red ? 153 : 142, 180, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 7bfa637d2..50ad9deed 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -36,7 +37,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); - List tooltip = Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); + List tooltip = Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 4a39cead6..163a9cdd3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -60,6 +60,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { public void drawAnimations(Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof BreweryRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 66aea0384..b903eeb33 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -25,6 +25,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; private final List output; + @SuppressWarnings("unchecked") public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); 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 d9c6b92c6..48c44ef40 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 @@ -86,6 +86,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { tess.draw(); } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 5c6a99ce3..e6e08d18f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -24,6 +24,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; private final ItemStack output; + @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { ImmutableList.Builder builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 051b87cc7..1c3694138 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -28,6 +28,7 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { private final ItemStack output; private final int manaUsage; + @SuppressWarnings("unchecked") public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { ImmutableList.Builder builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 786074769..d4e0813bd 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -13,7 +13,6 @@ package vazkii.botania.client.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -34,7 +33,6 @@ import vazkii.botania.api.state.enums.PylonVariant; import java.io.IOException; import java.util.List; -import java.util.Set; public class ModelPylon implements IPylonModel { 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 57f3088a4..d53b1a780 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -11,11 +11,9 @@ package vazkii.botania.client.render.entity; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.render.tile.RenderTilePool; 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 cf273ce9a..244b41faf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -24,7 +24,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; public class RenderTileAlfPortal extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index ec08f2ca7..2d27a515b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -18,13 +18,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelIncensePlate; import vazkii.botania.common.block.tile.TileIncensePlate; import java.util.Map; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b174f1765..8934fbb6d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -17,18 +17,13 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -38,8 +33,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelPool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 672668597..e67c939bd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -11,7 +11,6 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.client.model.animation.FastTESR; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index cc342fc0c..09deb6be8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -10,12 +10,9 @@ */ package vazkii.botania.client.render.tile; -import java.util.Map; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; -import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -26,7 +23,6 @@ import vazkii.botania.client.render.entity.RenderDoppleganger; import vazkii.botania.common.block.tile.TileGaiaHead; import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; public class RenderTileSkullOverride extends TileEntitySkullRenderer { diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 8b0c2f039..76feb2e26 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 7da1fa5f2..1c09a65f8 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -21,7 +21,7 @@ import vazkii.botania.api.item.IRelic; public class AchievementMod extends Achievement { - public static List achievements = new ArrayList(); + public static List achievements = new ArrayList<>(); public AchievementMod(String name, int x, int y, ItemStack icon, Achievement parent) { super("achievement.botania:" + name, "botania:" + name, x, y, icon, parent); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 57a424607..2e6343f82 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -81,7 +81,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 44b4f3350..cd8f81078 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,7 +26,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; @@ -120,7 +119,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 91b13e03b..2368ce3e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -84,7 +84,7 @@ public class BlockCacophonium extends BlockModContainer { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList stacks = new ArrayList(); + ArrayList stacks = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 953418ec6..93332ca10 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -37,7 +37,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index c4b7396a8..734acc728 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -72,7 +72,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 035cc0d24..ec5d1f5af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,7 +28,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockModContainer { @@ -114,7 +113,7 @@ public class BlockFakeAir extends BlockModContainer { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); // Empty List + return ImmutableList.of(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 8150fd4bc..1b0f4bb43 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -121,7 +121,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -146,7 +146,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 82e8c8f64..b6c701f1f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -90,7 +90,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } public void pickUpEntities(World world, BlockPos pos) { - List relays = new ArrayList(); + List relays = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile instanceof TileLightRelay) { @@ -102,11 +102,11 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { if(!relays.isEmpty()) { AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1)); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); if(!entities.isEmpty()) { - for(Entity entity : ((List) entities)) { + for(Entity entity : entities) { TileLightRelay relay = relays.get(world.rand.nextInt(relays.size())); relay.mountEntity(entity); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8e3f5bddc..aa3f3e9f1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -82,7 +82,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e76391a55..2cb685f17 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -78,7 +78,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index fd685745c..fa2d6c40a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -86,7 +86,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1c6fba0c0..bb772e1a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.properties.PropertyEnum; @@ -189,7 +190,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return ImmutableList.of(); } @Override @@ -198,7 +199,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { for(int i = 0; i < COUNT; ++i) p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 4cbbb92ac..18313016f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -27,7 +27,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -97,7 +96,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index e67dce5b8..1cb4f16b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -106,7 +106,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 1cc24a757..c678dbccd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -49,12 +49,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { - public static Map playerPositions = new HashMap(); - public static Map mappedPositions = new HashMap(); + public static Map playerPositions = new HashMap<>(); + public static Map mappedPositions = new HashMap<>(); - static List removeThese = new ArrayList(); - static List checkedCoords = new ArrayList(); - static Map coordsToCheck = new HashMap(); + static List removeThese = new ArrayList<>(); + static List checkedCoords = new ArrayList<>(); + static Map coordsToCheck = new HashMap<>(); public BlockPistonRelay() { super(Material.gourd); @@ -199,7 +199,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void tickEnd(TickEvent event) { if(event.type == Type.SERVER && event.phase == Phase.END) { - List coordsToCheckCopy = new ArrayList(coordsToCheck.keySet()); + List coordsToCheckCopy = new ArrayList<>(coordsToCheck.keySet()); for(String s : coordsToCheckCopy) { decrCoords(s); if(checkedCoords.contains(s)) @@ -262,7 +262,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } // ConcurrentModificationException failsafe - ArrayList remove = new ArrayList(removeThese); + ArrayList remove = new ArrayList<>(removeThese); for(String s : remove) { coordsToCheck.remove(s); if(checkedCoords.contains(s)) diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 4d6a03d90..21c6912ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -106,13 +106,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 04195a659..764059b12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -86,7 +86,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index fe698ef22..dc366c41e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -203,7 +203,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -237,7 +237,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 978585d00..f43c286c4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -62,7 +62,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } 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 709f7c23a..d2a51f914 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -63,7 +63,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 9a7cf973f..06db61e34 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -79,7 +79,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 0357122d8..7b4dd1206 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -63,7 +63,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } 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 5a60613cc..cdaf1fa11 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -183,7 +183,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(par1, 1, i)); } 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 02a248ad1..e5d8b2a7e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -67,7 +67,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 ab284497a..3916f307d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.block.decor; -import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -100,7 +100,7 @@ public class BlockManaFlame extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return ImmutableList.of(); } @Override 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 076fee7ff..a80889081 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -93,7 +93,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 f700cf333..c73908cb4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -97,7 +97,7 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 61c890d2a..5b26e0532 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -62,7 +62,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 95666e451..9862a9471 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -81,7 +81,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 62ab1aca4..a4dccfbf7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -26,12 +26,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTinyPotato; @@ -121,7 +118,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { 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 50ada96da..aa6ffdd1d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -68,7 +68,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 385f8234e..14c21ed63 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 @@ -40,7 +40,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 783bd30da..989d9b794 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 @@ -123,7 +123,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { par3List.add(new ItemStack(this, 1, 0)); par3List.add(new ItemStack(this, 1, 1)); par3List.add(new ItemStack(this, 1, 2)); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index de6383171..dca05ad12 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -26,7 +26,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; protected final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); + public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index c0507111d..1d444ed83 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -61,7 +61,7 @@ public class Block18StoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 92264bf97..bcf90ac43 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -61,7 +61,7 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index efc30fd78..f81c6e2b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -88,7 +88,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { list.add(new ItemStack(item)); } 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 4875a5ccb..39b9388f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -102,7 +102,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } @@ -119,7 +119,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona else if(!world.isRemote) { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); - List shearables = new ArrayList(); + List shearables = new ArrayList<>(); ItemStack stack = new ItemStack(this, 1, 1); for(EntityLiving entity : entities) { 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 fa21162ca..8ea5f3f84 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -71,7 +71,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } 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 0a7650683..aab35689c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -110,7 +110,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); if(!lastFragile) drops.add(new ItemStack(this, 1, state.getBlock().getMetaFromState(state))); @@ -119,7 +119,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { par3.add(new ItemStack(par1, 1, 0)); par3.add(new ItemStack(par1, 1, 2)); par3.add(new ItemStack(par1, 1, 3)); 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 7213a62f5..4abecefe3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -23,7 +23,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; import vazkii.botania.api.lexicon.ILexiconable; 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 8325eacce..1900da3d6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -41,7 +41,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.mob_spawner)); } 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 8f4c6bbd1..7ed9c7516 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -92,7 +92,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(par1, 1, i)); } 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 5a3a94b1e..b147b9c8f 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 @@ -51,7 +51,7 @@ public class SubTileClayconia extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 0badf4ac3..3e13aa328 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -54,7 +54,7 @@ public class SubTileHopperhock extends SubTileFunctional { private static final int RANGE_MANA_MINI = 2; private static final int RANGE_MINI = 1; - private static Set particled = Collections.newSetFromMap(new WeakHashMap()); + private static Set particled = Collections.newSetFromMap(new WeakHashMap<>()); int filterType = 0; @@ -170,7 +170,7 @@ public class SubTileHopperhock extends SubTileFunctional { } public List getFilterForInventory(IInventory inv, BlockPos pos, boolean recursiveForDoubleChests) { - List filter = new ArrayList(); + List filter = new ArrayList<>(); if(recursiveForDoubleChests) { TileEntity tileEntity = supertile.getWorld().getTileEntity(pos); 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 3e012e90c..6a01101eb 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 @@ -75,7 +75,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public ItemStack getStoneToPut(BlockPos coords) { List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); - List values = new ArrayList(); + List values = new ArrayList<>(); for(int i = 0; i < 8; i++) { int times = 1; if(types.contains(TYPES[i])) @@ -89,7 +89,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); int range = getRange(); int rangeY = getRangeY(); 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 5e8feb37b..75f26b3e3 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 @@ -68,7 +68,7 @@ public class SubTileOrechid extends SubTileFunctional { } public ItemStack getOreToPut() { - Collection values = new ArrayList(); + Collection values = new ArrayList<>(); Map map = getOreMap(); for(String s : map.keySet()) values.add(new StringRandomItem(map.get(s), s)); @@ -98,7 +98,7 @@ public class SubTileOrechid extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); Block source = getSourceBlock(); for(int i = -RANGE; i < RANGE + 1; i++) 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 9eab4700a..0675644d9 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 @@ -70,7 +70,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { BlockData filter = getUnderlyingBlock(); boolean scanned = false; - List validPositions = new ArrayList(); + List validPositions = new ArrayList<>(); int rangePlace = getRange(); int rangePlaceY = getRangeY(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 450711da8..28d0a0af6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); + public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 62d3c1111..fced33208 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -44,8 +44,8 @@ public class SubTileTigerseye extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(EntityLiving entity : entities) { - List entries = new ArrayList(entity.tasks.taskEntries); - entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); + List entries = new ArrayList<>(entity.tasks.taskEntries); + entries.addAll(entity.targetTasks.taskEntries); boolean avoidsOcelots = false; if(shouldAfffect) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 5d42b0904..11e3cf6a7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); + public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; private static final int RANGE = 64; @@ -80,7 +80,7 @@ public class SubTileVinculotus extends SubTileFunctional { int cost = 50; if(event.entity instanceof EntityEnderman) { - List possibleFlowers = new ArrayList(); + List possibleFlowers = new ArrayList<>(); for(SubTileVinculotus flower : existingFlowers) { if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 07841f59a..1c7e21e12 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -52,7 +52,7 @@ public class SubTileDandelifeon extends SubTileGenerating { void runSimulation() { int[][] table = getCellTable(); - List changes = new ArrayList(); + List changes = new ArrayList<>(); new ArrayList(); boolean wipe = false; 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 c557bd12d..fec6996ce 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 @@ -12,7 +12,6 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; 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 f4c15b83d..2ca5e6a40 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 @@ -55,7 +55,7 @@ public class SubTileMunchdew extends SubTileGenerating { int manaPerLeaf = 160; eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) { - List coords = new ArrayList(); + List coords = new ArrayList<>(); BlockPos pos = supertile.getPos(); for(int i = -RANGE; i < RANGE + 1; i++) 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 57bff99ad..4be78e260 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -19,7 +19,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -77,7 +76,7 @@ public class TileAlfPortal extends TileMod { private static final String TAG_STACK = "portalStack"; private static final String TAG_PORTAL_FLAG = "_elvenPortal"; - List stacksIn = new ArrayList(); + List stacksIn = new ArrayList<>(); public int ticksOpen = 0; int ticksSinceLastItem = 0; @@ -289,7 +288,8 @@ public class TileAlfPortal extends TileMod { return checkMultipleConverters(baseConverter) || checkMultipleConverters(CONVERTER_Z_SWAP, baseConverter); } - private boolean checkMultipleConverters(Function... converters) { + @SafeVarargs + private final boolean checkMultipleConverters(Function... 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)) @@ -305,7 +305,8 @@ public class TileAlfPortal extends TileMod { return true; } - private void lightPylons(Function... converters) { + @SafeVarargs + private final void lightPylons(Function... converters) { if(ticksOpen < 50) return; 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 ace0f4a03..fd3cc3ed1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -27,7 +27,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -154,7 +153,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } public void saveLastRecipe() { - lastRecipe = new ArrayList(); + lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = getStackInSlot(i); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index a2a169c62..29959c5bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; 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 57fcd2459..a6889e5bb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; public class TileBifrost extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 6fd2d81ee..42b2850f2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -20,7 +20,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; 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 ce5a86a62..2d1149197 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,7 +22,6 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; public class TileCocoon extends TileMod { 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 f60b948ed..8b814a1ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -29,7 +29,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -68,7 +67,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { int mana = 0; public ItemStack itemToEnchant = null; - List enchants = new ArrayList(); + List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { new BlockPos(0, -1, 0), 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 917034a47..fdaacca0b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -12,18 +12,15 @@ package vazkii.botania.common.block.tile; import java.util.List; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index a2bdc8658..8e13f1a58 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; public class TileForestEye extends TileMod { 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 2456219c3..3edad2b90 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -18,7 +18,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; 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 debde0414..afe409951 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.GameData; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 47466a07c..5d75f4826 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,7 +21,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -109,7 +108,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getEndpoint() { - List pointsPassed = new ArrayList(); + List pointsPassed = new ArrayList<>(); TileLightRelay relay = this; BlockPos lastCoords = null; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 1f697d583..11a9c10ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; public class TileManaBeacon extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 263d43cc9..63a3c625b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index fca46222d..56853d8ac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 6293b142f..97b9d3754 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -21,7 +21,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; @@ -177,7 +176,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void saveLastRecipe() { - lastRecipe = new ArrayList(); + lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = getStackInSlot(i); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 6acc2d432..0611990f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -31,7 +31,7 @@ public class TileSparkChanger extends TileSimpleInventory { return; ItemStack changeStack = getStackInSlot(0); - List attachables = new ArrayList(); + List attachables = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof ISparkAttachable) { 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 5935975a4..ad0a8f308 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -19,7 +19,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; 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 7aa691c78..7441440c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -22,7 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 58707948c..8ab7f4f0f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; public class TileSpiritShrine extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 9c8df7544..48b5b049e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,10 +10,8 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; public class TileStarfield extends TileMod { 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 eff85c483..b6d381e53 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -19,7 +19,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 1df9195e7..acd6e5173 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index b80cfc69d..579752e6e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; public class TileTinyPotato extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index d709d2ed2..55cfb963a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 11d3798e6..beae3b9e8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -24,7 +24,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -50,9 +49,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public static final double RADIUS = 2.5; private static InputHandler input; - public static final Set indexes = Collections.newSetFromMap(new WeakHashMap()); + public static final Set indexes = Collections.newSetFromMap(new WeakHashMap<>()); - private static final Map patterns = new LinkedHashMap(); + private static final Map patterns = new LinkedHashMap<>(); /** * (name) = Item name, or "this" for the name of the item in your hand @@ -285,7 +284,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static List getNearbyIndexes(EntityPlayer player) { - List indexList = new ArrayList(); + List indexList = new ArrayList<>(); for(TileCorporeaIndex index : indexes) if(isInRangeOfIndex(player, index) && index.worldObj.isRemote == player.worldObj.isRemote) indexList.add(index); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index b458fd02f..7a72445ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -88,11 +88,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } public List getFilter() { - List filter = new ArrayList(); - - final int[] orientationToDir = new int[] { - 3, 4, 2, 5 - }; + List filter = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); 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 ac5c251b0..d7ee9fdeb 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 101db37f4..4c056e423 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile.mana; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 3f7780184..b89ab3846 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -12,13 +12,11 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod implements IManaCollisionGhost { 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 64f4d567a..c537922a7 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 @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 7f25aca3e..798f8063a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -13,12 +13,10 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.collect.ImmutableMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.IAnimationProvider; -import net.minecraftforge.client.model.animation.ITimeValue; import net.minecraftforge.client.model.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index bbb501dcb..923e21b49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index a4230ff83..b687ac4a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; 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 76918d040..1e36e4f5c 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 @@ -12,14 +12,12 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; -import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.block.tile.TileMod; public abstract class TileRedString extends TileMod implements ITileBound { 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 daf0f777b..ace85b64e 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 @@ -15,14 +15,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ITickable; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString { - public static List interceptors = new ArrayList(); + public static List interceptors = new ArrayList<>(); @Override public void updateEntity() { @@ -40,11 +39,11 @@ public class TileRedStringInterceptor extends TileRedString { } public static void onInteract(EntityPlayer player, World world, BlockPos pos) { - List remove = new ArrayList(); + List remove = new ArrayList<>(); boolean did = false; // CMEs are amazing - List interceptorsCopy = new ArrayList(interceptors); + List interceptorsCopy = new ArrayList<>(interceptors); for(TileRedStringInterceptor inter : interceptorsCopy) { if(!inter.removeFromList()) { diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 03e191859..5f69e8527 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -12,7 +12,6 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 0df286d58..ae0e1e013 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.brew; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - import net.minecraft.potion.Potion; import vazkii.botania.common.brew.potion.PotionAllure; import vazkii.botania.common.brew.potion.PotionBloodthirst; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7e7bdfee7..2787ae62c 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -28,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); - List list; + List list; public BotaniaCreativeTab() { super(LibMisc.MOD_ID); @@ -52,7 +52,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllReleventItems(List list) { + public void displayAllReleventItems(List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 513378357..ceb77abca 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -26,7 +26,6 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; @@ -358,8 +357,8 @@ public final class ConfigHandler { private int lastBuild; private int currentBuild; - private Map> adaptableValues = new HashMap(); - private List changes = new ArrayList(); + private Map> adaptableValues = new HashMap<>(); + private List changes = new ArrayList<>(); public ConfigAdaptor(boolean enabled) { this.enabled = enabled; @@ -408,7 +407,7 @@ public final class ConfigHandler { AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); adaptableValues.put(key, list); } diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index ad7e47b87..ed67b1d4e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,7 +1,5 @@ package vazkii.botania.common.core.handler; -import java.util.Iterator; - import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 72225f35d..50f6ba0e1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -104,12 +104,12 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public LexiconPage petalRecipesPage(String key, List recipes) { - return new PagePetalRecipe(key, recipes); + return new PagePetalRecipe<>(key, recipes); } @Override public LexiconPage petalRecipePage(String key, RecipePetals recipe) { - return new PagePetalRecipe(key, recipe); + return new PagePetalRecipe<>(key, recipe); } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 564344fe7..0eb8f8009 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -30,8 +30,8 @@ public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); - public WeakHashMap> manaPools = new WeakHashMap(); - public WeakHashMap> manaCollectors = new WeakHashMap(); + public WeakHashMap> manaPools = new WeakHashMap<>(); + public WeakHashMap> manaCollectors = new WeakHashMap<>(); @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { @@ -124,7 +124,7 @@ public final class ManaNetworkHandler implements IManaNetwork { List tiles; if(!map.containsKey(world)) - map.put(world, new ArrayList()); + map.put(world, new ArrayList<>()); tiles = map.get(world); @@ -144,7 +144,7 @@ public final class ManaNetworkHandler implements IManaNetwork { private List getAllInWorld(Map> map, World world) { if(!map.containsKey(world)) - return new ArrayList(); + return new ArrayList<>(); return map.get(world); } 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 1d3a491ef..5ad5c24a8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -93,9 +93,7 @@ public final class SheddingHandler { defaultNames.add(pattern.getEntityString()); } - for(Object o : EntityList.stringToClassMapping.entrySet()) { - Entry entry = (Entry) o; - + for(Entry> entry : EntityList.stringToClassMapping.entrySet()) { if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); if(!defaultNames.contains(name)) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c97f68e07..0fff7af5a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1631,7 +1631,7 @@ public final class ModCraftingRecipes { }); for(int i = 0; i < count; i++) { - List recipe = new ArrayList(); + List recipe = new ArrayList<>(); for(int j = 0; j < 3; j++) { String s = ""; for(int k = 0; k < 3; k++) @@ -1785,8 +1785,8 @@ public final class ModCraftingRecipes { recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); // 1.8 Stone Recipes - recipe18StoneBrick = new ArrayList(); - recipe18StoneChisel = new ArrayList(); + recipe18StoneBrick = new ArrayList<>(); + recipe18StoneChisel = new ArrayList<>(); for(int i = 0; i < 4; i++) { addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8), "SS", "SS", diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index d247b00c2..93a6d4716 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -24,12 +24,12 @@ public class ModElvenTradeRecipes { public static void init() { dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), LibOreDict.LIVING_WOOD); - elementiumRecipes = new ArrayList(); + elementiumRecipes = new ArrayList<>(); elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 7), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL)); elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ModBlocks.storage), new ItemStack(ModBlocks.storage))); pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 8), LibOreDict.MANA_PEARL); - dragonstoneRecipes = new ArrayList(); + dragonstoneRecipes = new ArrayList<>(); 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))); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 5fb553fc4..14ba92411 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -55,7 +55,7 @@ public final class ModManaAlchemyRecipes { public static void init() { leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), 600); - woodRecipes = new ArrayList(); + 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)); @@ -63,12 +63,12 @@ public final class ModManaAlchemyRecipes { 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(); + 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)); glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust, 4), new ItemStack(Blocks.glowstone), 25); - quartzRecipes = new ArrayList(); + quartzRecipes = new ArrayList<>(); 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)); @@ -81,15 +81,15 @@ public final class ModManaAlchemyRecipes { 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 = 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)); - fishRecipes = new ArrayList(); + 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)); - cropRecipes = new ArrayList(); + 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)); @@ -100,30 +100,30 @@ public final class ModManaAlchemyRecipes { 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 = 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)); nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.name_tag), new ItemStack(Items.writable_book), 16000); - stringRecipes = new ArrayList(); + 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)); - slimeballCactusRecipes = new ArrayList(); + 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)); enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl), new ItemStack(Items.ghast_tear), 28000); - redstoneToGlowstoneRecipes = new ArrayList(); + 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)); 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 = 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)); @@ -132,19 +132,19 @@ public final class ModManaAlchemyRecipes { prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(Items.quartz), 200); if(ConfigHandler.stones18Enabled) { - stoneRecipes = new ArrayList(); + stoneRecipes = new ArrayList<>(); stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite todo 1.8.8 might want to un-OD this? 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 = 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)); - flowersRecipes = new ArrayList(); + 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)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index 3923d2df1..998f28901 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -43,7 +43,7 @@ public class ModManaConjurationRecipes { 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(); + 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)); for(int i = 0; i < 2; i++) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 832358cc9..c6defe32f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -44,17 +44,17 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion sugarCaneRecipe; public static void init() { - manasteelRecipes = new ArrayList(); + 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)); manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ender_pearl), 6000); - manaDiamondRecipes = new ArrayList(); + 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)); - manaPowderRecipes = new ArrayList(); + 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)); @@ -67,7 +67,7 @@ public final class ModManaInfusionRecipes { 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 = 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)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index defe59666..cd5413d21 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -52,11 +52,11 @@ public final class ModRuneRecipes { 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 = 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))); - recipesAirRune = new ArrayList(); + 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))); @@ -64,7 +64,7 @@ public final class ModRuneRecipes { 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(); + 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))); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2e8a5251e..e43ed9d48 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -37,9 +37,9 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final String TAG_INVIS = "invis"; ICorporeaSpark master; - List connections = new ArrayList(); - List connectionsClient = new ArrayList(); - List relatives = new ArrayList(); + List connections = new ArrayList<>(); + List connectionsClient = new ArrayList<>(); + List relatives = new ArrayList<>(); boolean firstUpdateClient = true; boolean firstUpdateServer = true; @@ -138,15 +138,15 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { void restartNetwork() { if(worldObj.isRemote) - connectionsClient = new ArrayList(); - else connections = new ArrayList(); - relatives = new ArrayList(); + connectionsClient = new ArrayList<>(); + else connections = new ArrayList<>(); + relatives = new ArrayList<>(); if(master != null) { ICorporeaSpark oldMaster = master; master = null; - oldMaster.registerConnections(oldMaster, this, new ArrayList()); + oldMaster.registerConnections(oldMaster, this, new ArrayList<>()); } } @@ -266,7 +266,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { player.swingItem(); return true; } else { - displayRelatives(new ArrayList(), master); + displayRelatives(new ArrayList<>(), master); return true; } } else if(stack.getItem() == ModItems.dye) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 049bfdddf..68f680749 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -42,7 +42,6 @@ import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.pathfinding.PathNavigateSwimmer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; @@ -70,8 +69,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -104,16 +101,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi new BlockPos(-4, 1, -4) }; - private static final List CHEATY_BLOCKS = Arrays.asList(new String[] { - "OpenBlocks:beartrap", - "ThaumicTinkerer:magnet" - }); + private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", + "ThaumicTinkerer:magnet"); boolean spawnLandmines = false; boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList<>(); private static boolean isPlayingMusic = false; @@ -578,7 +573,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(player.inventory.armorInventory[0] != null || player.inventory.armorInventory[1] != null || player.inventory.armorInventory[2] != null || player.inventory.armorInventory[3] != null) anyWithArmor = true; - List remove = new ArrayList(); + List remove = new ArrayList<>(); Collection active = player.getActivePotionEffects(); for(PotionEffect effect : active) if(effect.getDuration() < 200 && effect.getIsAmbient() && !GameData.getPotionRegistry().getObjectById(effect.getPotionID()).isBadEffect()) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 2924cc428..16b253f9e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -48,8 +48,8 @@ public class EntityEnderAirBottle extends EntityThrowable { } public List getCoordsToPut(BlockPos pos) { - List possibleCoords = new ArrayList(); - List selectedCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); + List selectedCoords = new ArrayList<>(); int range = 4; int rangeY = 4; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 6ca86b952..3956c1450 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -74,14 +74,14 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { final int dataWatcherEntries = 10; final int dataWatcherStart = 32 - dataWatcherEntries; - List alreadyCollidedAt = new ArrayList(); + List alreadyCollidedAt = new ArrayList<>(); boolean fullManaLastTick = true; UUID shooterIdentity = null; int _ticksExisted = 0; boolean scanBeam = false; - public List propsList = new ArrayList(); + public List propsList = new ArrayList<>(); public EntityManaBurst(World world) { super(world); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 44f9b5320..d81c5892c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -46,7 +46,7 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final String TAG_INVIS = "invis"; public static final int INVISIBILITY_DATA_WATCHER_KEY = 27; - Set transfers = Collections.newSetFromMap(new WeakHashMap()); + Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); int removeTransferants = 2; boolean firstTick = false; @@ -93,11 +93,11 @@ public class EntitySpark extends Entity implements ISparkEntity { case 1 : { // Dispersive List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); - Map> receivingPlayers = new HashMap(); + Map> receivingPlayers = new HashMap<>(); ItemStack input = new ItemStack(ModItems.spark); for(EntityPlayer player : players) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); stacks.addAll(Arrays.asList(player.inventory.mainInventory)); stacks.addAll(Arrays.asList(player.inventory.armorInventory)); stacks.addAll(Arrays.asList(PlayerHandler.getPlayerBaubles(player).stackList)); @@ -108,11 +108,11 @@ public class EntitySpark extends Entity implements ISparkEntity { IManaItem manaItem = (IManaItem) stack.getItem(); if(manaItem.canReceiveManaFromItem(stack, input)) { - Map receivingStacks; + Map receivingStacks; boolean add = false; if(!receivingPlayers.containsKey(player)) { add = true; - receivingStacks = new HashMap(); + receivingStacks = new HashMap<>(); } else receivingStacks = receivingPlayers.get(player); int recv = Math.min(getAttachedTile().getCurrentMana(), Math.min(TRANSFER_RATE, manaItem.getMaxMana(stack) - manaItem.getMana(stack))); @@ -126,7 +126,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } if(!receivingPlayers.isEmpty()) { - List keys = new ArrayList(receivingPlayers.keySet()); + List keys = new ArrayList<>(receivingPlayers.keySet()); Collections.shuffle(keys); EntityPlayer player = keys.iterator().next(); @@ -142,7 +142,7 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } case 2 : { // Dominant - List validSparks = new ArrayList(); + List validSparks = new ArrayList<>(); for(ISparkEntity spark : allSparks) { if(spark == this) continue; @@ -333,7 +333,7 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public Collection getTransfers() { - Collection removals = new ArrayList(); + Collection removals = new ArrayList<>(); for(ISparkEntity e : transfers) { ISparkEntity spark = e; diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 3917aa036..fd422919c 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -34,7 +34,7 @@ public class Item16Colors extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index de7c4e33c..a143b341a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -37,13 +37,13 @@ public class ItemAncientWill extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list); addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 0cafad050..135f2779b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -224,7 +224,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.air) { int count = getBlockCount(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 15bde98a7..5e6fd8dca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -36,7 +36,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -82,7 +82,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { list.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 3f2fd30b2..70a4e2032 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -197,7 +197,7 @@ public class ItemBottledMana extends ItemMod { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index a6b1e36b5..29fc6cf3b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -107,7 +107,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) list.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index f9e8cf8b7..4e7441146 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -33,7 +33,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index a8c95b7d2..d143cadfc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -43,7 +43,7 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index d5a8db219..57b6f76c0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -35,7 +35,7 @@ public class ItemFertilizer extends ItemMod { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { final int range = 3; if(!par3World.isRemote) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList<>(); for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 4c51a6cdc..51762dce2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -46,7 +46,7 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -90,7 +90,7 @@ public class ItemGrassHorn extends ItemMod { Random rand = new Random(srcPos.hashCode()); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; - List coords = new ArrayList(); + List coords = new ArrayList<>(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) @@ -106,7 +106,7 @@ public class ItemGrassHorn extends ItemMod { int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); - List items = new ArrayList(); + List items = new ArrayList<>(); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); items.addAll(block.getDrops(world, currCoords, state, 0)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 63a8a6330..e0a0d8f9e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -47,7 +47,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap>(); + private static Map> blockSwappers = new HashMap<>(); private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, @@ -65,7 +65,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(Item par1, CreativeTabs par2, List par3) { + public void getSubItems(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -199,7 +199,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // If a set for the dimension doesn't exist, create it. int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the block swapper blockSwappers.get(dim).add(swapper); @@ -294,7 +294,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * @param pos The positions to use. */ public void tickBlock(BlockPos pos) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList<>(); // Go around this block and aggregate valid blocks. for(int xOffset = -TICK_RANGE; xOffset <= TICK_RANGE; xOffset++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index e680c1be1..34fffa71d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -47,7 +47,7 @@ public class ItemKeepIvy extends ItemMod { @SubscribeEvent public void onPlayerDrops(PlayerDropsEvent event) { - List keeps = new ArrayList(); + List keeps = new ArrayList<>(); for(EntityItem item : event.drops) { ItemStack stack = item.getEntityItem(); if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 70fbde749..c7d46fd6c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -62,14 +62,14 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { list.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 696f9a5f9..21a1e5944 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -77,7 +77,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -88,13 +88,13 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) par3List.add(edition); - List typesKnown = new ArrayList(); + List typesKnown = new ArrayList<>(); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); if(isKnowledgeUnlocked(par1ItemStack, type)) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 82d8de850..26d28ed09 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -180,7 +180,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 69419cd8d..2d7369f0d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -43,7 +43,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { // Empty tablet par3List.add(new ItemStack(par1, 1)); @@ -76,7 +76,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) par3List.add(StatCollector.translateToLocal("botaniamisc.creative")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 51567f8b3..6138ca16b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -55,7 +55,7 @@ public class ItemPinkinator extends ItemMod { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { p_77624_3_.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index bec50e261..2a8b94993 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -97,13 +97,13 @@ public class ItemSignalFlare extends ItemMod { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColor(i)); } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index db69ce687..95169e6f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -27,7 +27,7 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 47f282b1f..cbe2e2e11 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -72,7 +72,7 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { String id = getEntityId(stack); if (id != null) infoList.add(StatCollector.translateToLocal("entity." + id + ".name")); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index e7365891b..c125c1d81 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -40,7 +40,7 @@ public class ItemTemperanceStone extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index d1fc209f9..74de38345 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -32,7 +32,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 454f7fdd1..4c4a995e4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -201,7 +201,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColors(i, i)); } @@ -212,7 +212,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { list.add(StatCollector.translateToLocal(getModeString(stack))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index ab685bff4..04a13bb31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -80,7 +80,7 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index ad777e43e..17090a3f5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -29,7 +29,7 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 9071aef24..76aa07c3b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -72,7 +72,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { String type = getType(par1ItemStack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); 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 c320af626..9508d5955 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -106,7 +106,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); @@ -135,7 +135,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 586fe4af1..1e4cb9507 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -42,7 +42,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -71,7 +71,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 886bacd8a..e257763e7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -33,7 +33,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 8beb0f3ea..08b72458c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -153,13 +153,13 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(GuiScreen.isShiftKeyDown()) addInformationAfterShift(stack, player, list, adv); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(getArmorSetTitle(player), list); addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 9bbe8b5eb..d3079f326 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -99,7 +99,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(ClientProxy.jingleTheBells) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 65b844d6c..9d1fe1633 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -55,8 +55,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); return multimap; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 9c8cf32b7..acf038103 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -82,13 +82,13 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); } - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); 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 9c7c78337..a4f9ccd5e 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 @@ -21,7 +21,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.creativetab.CreativeTabs; @@ -59,7 +58,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -70,7 +69,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.cosmeticBauble"), par3List); super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); } 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 9a74b33c8..e17235e9c 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 @@ -57,7 +57,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -86,7 +86,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { super.addHiddenTooltip(stack, player, list, adv); Brew brew = getBrew(stack); 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 b70fc9c63..6c48d4a49 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 @@ -97,13 +97,13 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); } 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 276cfc93c..a179de7a7 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 @@ -38,7 +38,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - public static Map> playerIceBlocks = new HashMap(); + public static Map> playerIceBlocks = new HashMap<>(); public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); @@ -79,7 +79,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { private void addIceBlock(EntityPlayer player, BlockPos coords) { String user = player.getName(); if(!playerIceBlocks.containsKey(user)) - playerIceBlocks.put(user, new ArrayList()); + playerIceBlocks.put(user, new ArrayList<>()); List ice = playerIceBlocks.get(user); if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL) == 0) { 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 900336d00..a24717512 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 @@ -18,6 +18,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; @@ -39,9 +40,7 @@ public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; - private static final List BLACKLIST = Arrays.asList(new String[] { - "appliedenergistics2:item.ItemCrystalSeed", - }); + private static final List BLACKLIST = Arrays.asList(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); int range; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index adea2709d..b0a5569d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -46,7 +46,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 10000)); } 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 30898c6e6..fe8e29dd0 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 @@ -45,7 +45,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs private static final int COST = 1; private static final int COST_INTERVAL = 10; - public static List playersWithStepup = new ArrayList(); + public static List playersWithStepup = new ArrayList<>(); final float speed; final float jump; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 270645409..9649a30b8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -45,7 +45,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) { if(!(entity instanceof EntityPlayer) && entity != null) { double range = 8; - final List alreadyTargetedEntities = new ArrayList(); + final List alreadyTargetedEntities = new ArrayList<>(); int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 750709fc5..0ae64d402 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -1,8 +1,5 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; 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 d33594057..3d922372b 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 @@ -70,7 +70,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap>(); + private static Map> blockSwappers = new HashMap<>(); public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); @@ -159,7 +159,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // If the mapping for this dimension doesn't exist, create it. int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the swapper blockSwappers.get(dim).add(swapper); @@ -250,8 +250,8 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.range = range; this.treatLeavesSpecial = leaves; - this.candidateQueue = new PriorityQueue(); - this.completedCoords = new HashSet(); + this.candidateQueue = new PriorityQueue<>(); + this.completedCoords = new HashSet<>(); // Add the origin to our candidate queue with the original range candidateQueue.offer(new SwapCandidate(this.origin, this.range)); @@ -325,7 +325,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } public List adjacent(BlockPos original) { - List coords = new ArrayList(); + List coords = new ArrayList<>(); // Visit all the surrounding blocks in the provided radius. // Gotta love these nested loops, right? for(int dx = -SINGLE_BLOCK_RADIUS; dx <= SINGLE_BLOCK_RADIUS; dx++) 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 9ebad941f..9fd919201 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 @@ -69,7 +69,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -78,7 +78,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); String rank = StatCollector.translateToLocal("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 89fc14312..fb8ab01cd 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -41,7 +41,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index e166998cb..a15aa7d02 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -144,26 +144,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, Category.SHAPELESS, ""); } -// @Override todo 1.8 -// public void registerIcons(IIconRegister par1IconRegister) { -// iconGlass = IconHelper.forName(par1IconRegister, "lensInside"); -// -// ringIcons = new IIcon[SUBTYPES]; -// for(int i = 0; i < ringIcons.length; i++) -// ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); -// } - @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < SUBTYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } -// @Override todo 1.8 -// public IIcon getIconFromDamageForRenderPass(int par1, int par2) { -// return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; -// } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; 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 97343ee5d..54ffc4648 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -58,7 +58,7 @@ public class LensMine extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if(!coords.equals(pos.getBlockPos()) && !(tile instanceof IManaBlock) && neededHarvestLevel <= harvestLevel && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { - List items = new ArrayList(); + List items = new ArrayList<>(); items.addAll(block.getDrops(world, pos_, world.getBlockState(pos_), 0)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 4c284ed28..972ae6a21 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -46,14 +46,14 @@ public class LensPaint extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(BotaniaAPI.paintableBlocks.containsKey(block)) { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); - List coordsToPaint = new ArrayList(); - List coordsFound = new ArrayList(); + List coordsToPaint = new ArrayList<>(); + List coordsFound = new ArrayList<>(); BlockPos theseCoords = pos.getBlockPos(); coordsFound.add(theseCoords); do { - List iterCoords = new ArrayList(coordsFound); + List iterCoords = new ArrayList<>(coordsFound); for(BlockPos coords : iterCoords) { coordsFound.remove(coords); coordsToPaint.add(coords); 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 7b82a977d..bd90b4008 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -117,7 +117,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) par3List.add(new ItemStack(par1, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 52986ec16..2bbab22f0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -30,7 +30,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 43080b9a4..71bc42e17 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -34,7 +34,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 bb5ca4be1..54f61b200 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -54,8 +54,8 @@ public class ItemDice extends ItemRelic { int side = SIDES_FOR_MOON_PHASES[moonPhase]; int relic = side; if(hasRelicAlready(player, relic)) { - List possible = new ArrayList(); - List alreadyHas = new ArrayList(); + List possible = new ArrayList<>(); + List alreadyHas = new ArrayList<>(); for(int i = 0; i < 6; i++) if(hasRelicAlready(player, i)) alreadyHas.add(i); 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 f490db37c..629b7910d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -222,7 +222,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC private static List getCursorList(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); - List cursors = new ArrayList(); + List cursors = new ArrayList<>(); int count = cmp.getInteger(TAG_CURSOR_COUNT); for(int i = 0; i < count; i++) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index a54fa2d2b..6e2a4f20e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { - public static List damageNegations = new ArrayList(); + public static List damageNegations = new ArrayList<>(); Multimap attributes = HashMultimap.create(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 88f93bfeb..39a8ef95c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -50,7 +50,7 @@ public class ItemRelic extends ItemMod implements IRelic { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { String bind = getSoulbindUsernameS(stack); if(bind.isEmpty()) 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 61f77f8d4..1dbfcf32e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -162,7 +162,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } // Our result list - List coordsList = new ArrayList(); + List coordsList = new ArrayList<>(); // We subtract 1 from the effective range as the center tile is included // So, with a range of 3, we are visiting tiles at -2, -1, 0, 1, 2 @@ -242,7 +242,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } public static ItemStack removeFromInventory(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta, boolean doit) { - List providers = new ArrayList(); + List providers = new ArrayList<>(); for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { ItemStack invStack = inv.getStackInSlot(i); if(invStack == null) 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 21eac8fbb..28a98d654 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -36,7 +36,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int COST = 300; private static final int COST_PER_TICK = COST / TIME; - public static Map playerData = new WeakHashMap(); + public static Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { setUnlocalizedName(LibItemNames.SMELT_ROD); @@ -88,7 +88,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { p.worldObj.playSoundAtEntity(p, "fire.fire", 1F, 1F); ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, true); - playerData.remove(p.getGameProfile().getName()); + playerData.remove(p); decremented = false; } 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 91708249d..fe354c105 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -108,7 +108,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int yStart = yCenter + range; - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) { @@ -124,7 +124,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(int id : ids) if(validBlocks.contains(OreDictionary.getOreName(id))) { boolean hasAir = false; - List airBlocks = new ArrayList(); + List airBlocks = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { BlockPos pos_ = pos.offset(dir); 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 cbda1bf31..9ded7b9af 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -1,10 +1,6 @@ package vazkii.botania.common.item.rod; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index c7f1083e3..36fdcb9b5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -22,7 +22,6 @@ import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -901,7 +900,7 @@ public final class LexiconData { cosmeticBaubles = new BLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); { - List pages = new ArrayList(); + List pages = new ArrayList<>(); pages.add(new PageText("0")); pages.add(new PageText("1")); for(int i = 0; i < 32; i++) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index d238ce118..9714d0e79 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -64,7 +64,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { int i = 0; y = gui.getTop() + gui.getHeight() - 54; - List inputs = new ArrayList(recipe.getInputs()); + List inputs = new ArrayList<>(recipe.getInputs()); int offset = gui.getWidth() / 2 - inputs.size() * 9; for(Object input : inputs) { @@ -98,7 +98,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(recipe.getOutput(new ItemStack(ModItems.vial))); return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 231e00020..026cb8d22 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -54,7 +55,7 @@ public class PageCraftingRecipe extends PageRecipe { } public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -89,7 +90,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.shapeless"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.shapeless"))); iconY += 20; } @@ -101,7 +102,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.oredict"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.oredict"))); } GlStateManager.disableBlend(); } 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 60bddbfaf..29ab0746c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -2,6 +2,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -39,7 +40,7 @@ public class PageElvenRecipe extends PageRecipe { } public PageElvenRecipe(String unlocalizedName, RecipeElvenTrade recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -114,7 +115,7 @@ public class PageElvenRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(RecipeElvenTrade r : recipes) list.add(r.getOutput()); 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 a2e7745b3..9d115f811 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -39,7 +39,7 @@ public class PageEntity extends LexiconPage{ Class EntityClass = (Class) EntityList.stringToClassMapping.get(entity); this.size = size; try { - entityConstructor = EntityClass.getConstructor(new Class[] {World.class}); + entityConstructor = EntityClass.getConstructor(World.class); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index c56a06618..523955f04 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -55,7 +56,7 @@ public class PageManaInfusionRecipe extends PageRecipe { } public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -154,7 +155,7 @@ public class PageManaInfusionRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(RecipeManaInfusion r : recipes) list.add(r.getOutput()); 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 ddbbcd94c..ac07018e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -103,7 +103,7 @@ public class PageMultiblock extends LexiconPage { GlStateManager.pushMatrix(); GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { - List mats = new ArrayList(); + List mats = new ArrayList<>(); mats.add(StatCollector.translateToLocal("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { String size = "" + stack.stackSize; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index ba3ca60c1..709286060 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -51,7 +52,7 @@ public class PagePetalRecipe extends PageRecipe { } public PagePetalRecipe(String unlocalizedName, T recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -133,7 +134,7 @@ public class PagePetalRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(T r : recipes) list.add(r.getOutput()); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index c3c03cb7f..54aaef122 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -63,7 +64,7 @@ public class PageRecipe extends LexiconPage { if(tooltipStack != null) { List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); boolean first = true; for(String s : tooltipData) { @@ -79,7 +80,7 @@ public class PageRecipe extends LexiconPage { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index dd7f67494..f04d63823 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -79,7 +80,7 @@ public class PageShedding extends PageEntity { if(tooltipStack != null) { List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); boolean first = true; for(String s : tooltipData) { @@ -95,12 +96,12 @@ public class PageShedding extends PageEntity { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } } else if(tooltipEntity) { - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); parsedTooltip.add(EntityList.getEntityString(dummyEntity)); vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); } @@ -147,7 +148,7 @@ public class PageShedding extends PageEntity { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(shedStack); return list; } 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 1dc170972..5a14d194b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -91,7 +91,7 @@ public class PageTerrasteel extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(new ItemStack(ModItems.manaResource, 1, 4)); return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index da05a5159..70c80a625 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -57,11 +57,11 @@ public class PageText extends LexiconPage { String text = StatCollector.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
"); - List> lines = new ArrayList(); + List> lines = new ArrayList<>(); String controlCodes = ""; for(String s : textEntries) { - List words = new ArrayList(); + List words = new ArrayList<>(); String lineStr = ""; String[] tokens = s.split(" "); for(String token : tokens) { @@ -73,7 +73,7 @@ public class PageText extends LexiconPage { if(font.getStringWidth(lineStr) > width) { lines.add(words); lineStr = controlCodes + spaced; - words = new ArrayList(); + words = new ArrayList<>(); } words.add(controlCodes + token); @@ -81,7 +81,7 @@ public class PageText extends LexiconPage { if(!lineStr.isEmpty()) lines.add(words); - lines.add(new ArrayList()); + lines.add(new ArrayList<>()); } int i = 0; From 2fdcbdb6683d912bf0292f474091d8d8ff08d7c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Feb 2016 00:16:18 -0600 Subject: [PATCH 311/935] Fix compile error and a few more warnings. --- .../core/handler/BaubleRenderHandler.java | 1 + .../handler/ContributorFancinessHandler.java | 1 + .../render/tile/RenderTileIncensePlate.java | 1 + .../common/core/handler/ConfigHandler.java | 44 +------------------ .../botania/common/item/ItemKeepIvy.java | 1 - .../equipment/bauble/ItemBaubleCosmetic.java | 1 + .../item/equipment/bauble/ItemMagnetRing.java | 2 +- .../common/item/lens/LensFirework.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- 9 files changed, 9 insertions(+), 46 deletions(-) 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 d03c55bc7..cf181ad70 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -99,6 +99,7 @@ public final class BaubleRenderHandler implements LayerRenderer { } } + @SuppressWarnings("deprecation") private void renderManaTablet(EntityPlayer player) { boolean renderedOne = false; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { 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 235b8ccaf..9a2dfb5b5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -171,6 +171,7 @@ public final class ContributorFancinessHandler implements LayerRenderer ROTATIONS = ImmutableMap.of(EnumFacing.NORTH, 180, EnumFacing.SOUTH, 0, EnumFacing.WEST, 270, EnumFacing.EAST, 90); + @SuppressWarnings("deprecation") @Override public void renderTileEntityAt(TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) { if (plate != null && plate.getWorld() != null && !plate.getWorld().isBlockLoaded(plate.getPos(), false)) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index ceb77abca..c4847b868 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -17,11 +17,11 @@ import java.util.List; import java.util.Map; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.Botania; @@ -36,7 +36,6 @@ public final class ConfigHandler { public static Configuration config; public static ConfigAdaptor adaptor; - private static final String CATEGORY_POTIONS = "potions"; public static final int hardcorePassiveGeneration = 72000; @@ -99,23 +98,13 @@ public final class ConfigHandler { public static double flowerTallChance = 0.05; public static int mushroomQuantity = 40; - private static boolean verifiedPotionArray = false; - private static int potionArrayLimit = 0; // todo 1.8 potion things should be unneeded thanks to potion registry - - public static int potionIDSoulCross = 91; - public static int potionIDFeatherfeet = 92; - public static int potionIDEmptiness = 93; - public static int potionIDBloodthirst = 94; - public static int potionIDAllure = 95; - public static int potionIDClear = 96; - public static void loadConfig(File configFile) { config = new Configuration(configFile); config.load(); load(); - FMLCommonHandler.instance().bus().register(new ChangeListener()); + MinecraftForge.EVENT_BUS.register(new ChangeListener()); } public static void load() { @@ -281,13 +270,6 @@ public final class ConfigHandler { desc = "The quantity of Botania mushrooms to generate underground, in the world, defaults to 40, the lower the number the less patches generate."; mushroomQuantity = loadPropInt("worldgen.mushroom.quantity", desc, mushroomQuantity); -// potionIDSoulCross = loadPropPotionId(LibPotionNames.SOUL_CROSS, potionIDSoulCross); todo 1.8 should be unneeded thanks to potion registry -// potionIDFeatherfeet = loadPropPotionId(LibPotionNames.FEATHER_FEET, potionIDFeatherfeet); -// potionIDEmptiness = loadPropPotionId(LibPotionNames.EMPTINESS, potionIDEmptiness); -// potionIDBloodthirst = loadPropPotionId(LibPotionNames.BLOODTHIRST, potionIDBloodthirst); -// potionIDAllure = loadPropPotionId(LibPotionNames.ALLURE, potionIDAllure); -// potionIDClear = loadPropPotionId(LibPotionNames.CLEAR, potionIDClear); - if(config.hasChanged()) config.save(); } @@ -329,28 +311,6 @@ public final class ConfigHandler { return prop.getBoolean(default_); } - public static int loadPropPotionId(String propName, int default_) { - if(!verifiedPotionArray) - verifyPotionArray(); - - Property prop = config.get(CATEGORY_POTIONS, propName, default_); - int val = prop.getInt(default_); - if(val > potionArrayLimit) { - val = default_; - prop.set(default_); - } - - return val; - } - - private static void verifyPotionArray() { - if(Loader.isModLoaded("DragonAPI")) - potionArrayLimit = Potion.potionTypes.length; - else potionArrayLimit = 127; - - verifiedPotionArray = true; - } - public static class ConfigAdaptor { private boolean enabled; diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 34fffa71d..2682d08fc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -42,7 +42,6 @@ public class ItemKeepIvy extends ItemMod { GameRegistry.addRecipe(new KeepIvyRecipe()); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); } @SubscribeEvent 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 a4f9ccd5e..c7312e803 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 @@ -309,6 +309,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.scale(f, f, f); } + @SuppressWarnings("deprecation") public void renderIcon(int i) { GlStateManager.pushMatrix(); renderStack.setItemDamage(i); 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 a24717512..32166c620 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 @@ -130,7 +130,7 @@ public class ItemMagnetRing extends ItemBauble { } public static void addItemToBlackList(String item) { - BLACKLIST.add(item); + BLACKLIST.add(new ResourceLocation(item)); } @Override 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 85f642b34..18608b1c9 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -61,7 +61,7 @@ public class LensFirework extends Lens { ItemNBTHelper.setCompound(stack, "Explosion", explosion); NBTTagCompound fireworks = new NBTTagCompound(); - fireworks.setInteger("Flight", (int) Math.random() * 3 + 2); + fireworks.setInteger("Flight", (int) (Math.random() * 3 + 2)); // todo 1.8 this bugged in 1.7 to always be 0 (cast before multiplication). is that intended now? NBTTagList explosions = new NBTTagList(); explosions.appendTag(explosion); 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 9d115f811..db08da15c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -104,7 +104,7 @@ public class PageEntity extends LexiconPage{ public void prepDummy() { if(dummyEntity == null || dummyEntity.isDead) { try { - dummyEntity = (Entity) entityConstructor.newInstance(new Object[] {Minecraft.getMinecraft().theWorld}); + dummyEntity = (Entity) entityConstructor.newInstance(Minecraft.getMinecraft().theWorld); } catch (Exception e) { e.printStackTrace(); } From b8e06a3d36c3d3746fa533ead3eeb51c5ca2900c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 3 Feb 2016 16:59:00 -0600 Subject: [PATCH 312/935] update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8b695d602..acf3d1731 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S. +These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod. + + ![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png) Welcome to the Botania repository. From 65fe04af3ae0133fff615e5941463711932c5612 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 13:36:59 -0600 Subject: [PATCH 313/935] Restore thaumcraft integration. Closes #74 --- .../botania/common/block/tile/TileMod.java | 2 +- .../vazkii/botania/common/brew/ModBrews.java | 2 +- .../handler/TerrasteelCraftingHandler.java | 187 ------------------ .../common/crafting/ModBrewRecipes.java | 2 +- .../botania/common/lexicon/LexiconData.java | 5 +- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 6 files changed, 6 insertions(+), 194 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java 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 2d6e78fd1..418a62d66 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -71,7 +71,7 @@ public class TileMod extends TileEntity implements ITickable { else { try { updateEntity(); - } catch (Exception e) { // todo 1.8 remove this abhorration after I figure out what's going on. + } catch (NullPointerException e) { // todo 1.8 remove this abhorration after I figure out what's going on. e.printStackTrace(); FMLLog.severe("[Botania]: CLIENT TICK FAILED"); FMLLog.severe("[Botania]: World: %s, Pos: %s, TE: %s", worldObj, pos, this); diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 5f69e8527..2bdc1cc7f 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -67,7 +67,7 @@ public class ModBrews { public static void initTC() { Potion warpWardPotion = Potion.getPotionFromResourceLocation("minecraft:warp_ward"); - // TODO thaumcraft 5 is currently registering its potions under the Minecraft namespace + // thaumcraft 5 is registering its potions under the Minecraft namespace if(warpWardPotion != null) warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffect(warpWardPotion.id, 12000, 0)).setNotBloodPendantInfusable(); diff --git a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java deleted file mode 100644 index 8f6fe40c8..000000000 --- a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ /dev/null @@ -1,187 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 14, 2014, 4:30:40 PM (GMT)] - */ -package vazkii.botania.common.core.handler; - -import java.util.List; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityBeacon; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibObfuscation; - -// This is legacy code and is no longer used. Check out TileTerraPlate instead. -public final class TerrasteelCraftingHandler { - - private static final String TAG_TIME = "Botania-CraftingTime"; - private static final int TIME = 100; - private static final int MANA_PER_TICK = (int) (TilePool.MAX_MANA / 2 / TIME * 0.9); - - public static void onEntityUpdate(EntityItem item) { - ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 0) { - int time = validateCraftingItem(item); - - if(time != -1) { - doParticles(item, time); - if(time == TIME) - item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); - - getManaFromPools : { - BlockPos pos = new BlockPos(item); - int range = 12; - - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = - range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - TileEntity tile = item.worldObj.getTileEntity(pos_); - - if(tile instanceof IManaPool) { - IManaPool pool = (IManaPool) tile; - - if(!item.worldObj.isRemote && pool.getCurrentMana() >= MANA_PER_TICK) { - pool.recieveMana(-MANA_PER_TICK); - item.worldObj.markBlockForUpdate(tile.getPos()); - incrementCraftingTime(item, time); - break getManaFromPools; - } - } - } - } - } - } - } - - static int validateCraftingItem(EntityItem item) { - ItemStack estack = item.getEntityItem(); - if(estack.stackSize != 1) - return -1; - - BlockPos pos = new BlockPos(item); - - if(item.worldObj.getBlockState(pos.down()).getBlock() != Blocks.beacon) - return -1; - - TileEntityBeacon beacon = (TileEntityBeacon) item.worldObj.getTileEntity(pos.down()); - if(beacon.getField(0) <= 0) // Field 0 -> levels - return -1; - - List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); - - EntityItem diamond = null; - EntityItem pearl = null; - - for(EntityItem otherItem : items) { - if(otherItem == item) - continue; - - ItemStack stack = otherItem.getEntityItem(); - if(stack.getItem() == ModItems.manaResource && stack.stackSize == 1) { - int meta = stack.getItemDamage(); - if(meta == 1) { - if(pearl == null) { - pearl = otherItem; - continue; - } else return -1; - } else if(meta == 2) { - if(diamond == null) { - diamond = otherItem; - continue; - } else return -1; - } else return -1; - } else return -1; - } - - if(diamond != null && pearl != null) { - int time = getTimeInCrafting(item); - if(time > 0) { - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, diamond, 1, LibObfuscation.PICKUP_DELAY); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, diamond, 0, LibObfuscation.AGE); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, pearl, 1, LibObfuscation.PICKUP_DELAY); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, pearl, 0, LibObfuscation.AGE); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, 1, LibObfuscation.PICKUP_DELAY); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, 0, LibObfuscation.AGE); - } - - return time; - } - return -1; - } - - static int getTimeInCrafting(EntityItem item) { - ItemStack stack = item.getEntityItem(); - return ItemNBTHelper.getInt(stack, TAG_TIME, 0); - } - - static void doParticles(EntityItem item, int ticks) { - if(item.worldObj.isRemote) { - int totalSpiritCount = 3; - double tickIncrement = 360D / totalSpiritCount; - - int speed = 5; - double wticks = ticks * speed - tickIncrement; - - double r = Math.sin((ticks - TIME) / 10D) * 2; - double g = Math.sin(wticks * Math.PI / 180 * 0.55); - - for(int i = 0; i < totalSpiritCount; i++) { - double x = (int) item.posX + Math.sin(wticks * Math.PI / 180) * r + 0.5; - double y = (int) item.posY + 0.25; - double z = (int) item.posZ + Math.cos(wticks * Math.PI / 180) * r + 0.5; - - wticks += tickIncrement; - float[] colorsfx = new float[] { - 0F, (float) ticks / (float) TIME, 1F - (float) ticks / (float) TIME - }; - Botania.proxy.wispFX(item.worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(item.worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); - - if(ticks == TIME) - for(int j = 0; j < 15; j++) - Botania.proxy.wispFX(item.worldObj, item.posX, item.posY, item.posZ, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); - } - } - } - - static void incrementCraftingTime(EntityItem item, int time) { - if(time >= TIME) - finalizeCraftingRecipe(item); - - else { - ItemStack stack = item.getEntityItem(); - ItemNBTHelper.setInt(stack, TAG_TIME, time + 1); - } - } - - static void finalizeCraftingRecipe(EntityItem item) { - int x = MathHelper.floor_double(item.posX); - int y = MathHelper.floor_double(item.posY); - int z = MathHelper.floor_double(item.posZ); - - List items = item.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)); - for(EntityItem otherItem : items) - if(otherItem != item) - otherItem.setDead(); - else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4)); - } - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index de537025c..805deb042 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -75,7 +75,7 @@ public class ModBrewRecipes { Item resource = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); Item bathSalts = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "bath_salts")); - // todo 1.8 see LexiconData: warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); + warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 36fdcb9b5..757092e28 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1106,10 +1106,9 @@ public final class LexiconData { if(Botania.thaumcraftLoaded) { tcIntegration = new CLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); - // todo 1.8: we removed our after thaumcraft dep, but it turns out we actually need it. Stub out warp ward brew from rendering for now until discussion w/ Azanor if(ConfigHandler.enableThaumcraftStablizers) - tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5")/*, new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")*/).setIcon(new ItemStack(ModItems.manaInkwell)); - else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe)/*, new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")*/).setIcon(new ItemStack(ModItems.manaInkwell)); + tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); + else tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); } if(Botania.etFuturumLoaded) { diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index f09bd0c0b..597fdb274 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ 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:Baubles"; + public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.8.8,1.8.9]"; // Network Contants From eedfff10f1154a55cddce7da463886631c51dc8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 15:47:28 -0600 Subject: [PATCH 314/935] Fix the warp ward recipe --- .../java/vazkii/botania/common/crafting/ModBrewRecipes.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index 805deb042..4f96ece4e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -72,10 +72,11 @@ public class ModBrewRecipes { } public static void initTC() { - Item resource = Item.itemRegistry.getObject(new ResourceLocation("thaumcraft", "salis_mundus")); + 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")); - warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6)); + warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(salisMundus), new ItemStack(bathSalts), new ItemStack(amber)); } From 6f6f330a5ab99bc10a15e69dab8f5bd3f701e036 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 15:50:46 -0600 Subject: [PATCH 315/935] Fix lexicon npe, closes #94 --- src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 590d3ddc5..67ca7dd0b 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; @@ -53,7 +54,7 @@ public class SimpleWikiProvider implements IWikiProvider { if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, bPos, null); + ItemStack stack = block.getPickBlock(pos, world, bPos, Minecraft.getMinecraft().thePlayer); if(stack == null || stack.getItem() == null) stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); From 75ce19ddc62f75f6b72701383a6bfa0e979d6653 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 15:52:44 -0600 Subject: [PATCH 316/935] Fix querying itemless blocks, closes #90 --- .../java/vazkii/botania/common/item/rod/ItemTerraformRod.java | 3 +++ 1 file changed, 3 insertions(+) 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 fe354c105..e75e8abd2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; @@ -120,6 +121,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP BlockPos pos = new BlockPos(xCenter + i, yStart + k, zCenter + j); IBlockState state = par2World.getBlockState(pos); + if (Item.getItemFromBlock(state.getBlock()) == null) + break; int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); for(int id : ids) if(validBlocks.contains(OreDictionary.getOreName(id))) { From 7e642cb03af0d7c56a8ca010be8282e5db7e5218 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 15:54:42 -0600 Subject: [PATCH 317/935] Mop check for multiblocks. Closes #95 --- .../botania/client/core/handler/MultiblockRenderHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 df5f30c45..2889cb870 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -96,7 +96,7 @@ public final class MultiblockRenderHandler { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); - if(mc.thePlayer != null && mc.objectMouseOver != null && (!mc.thePlayer.isSneaking() || anchor != null)) { + if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { mc.thePlayer.getCurrentEquippedItem(); renderPlayerLook(mc.thePlayer, mc.objectMouseOver); } From b6f51f1ccfb89c4449280b3fca9ce3d9c2119745 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Feb 2016 19:57:29 -0600 Subject: [PATCH 318/935] Preliminary work on lexicon first person model --- .../core/handler/MiscellaneousIcons.java | 4 + .../client/core/handler/ModelHandler.java | 4 + .../client/model/LexiconAnimatedModel.java | 52 +++++++++ .../client/model/LexiconModelDispatcher.java | 65 +++++++++++ .../armatures/block/lexicon_firstperson.json | 41 +++++++ .../asms/item/lexicon_firstperson.json | 15 +++ .../{lexicon.json => lexicon_default.json} | 0 .../models/item/lexicon_firstperson.json | 107 ++++++++++++++++++ 8 files changed, 288 insertions(+) create mode 100644 src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java create mode 100644 src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java create mode 100644 src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json create mode 100644 src/main/resources/assets/botania/asms/item/lexicon_firstperson.json rename src/main/resources/assets/botania/models/item/{lexicon.json => lexicon_default.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/lexicon_firstperson.json 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 ce5a21772..d0fcf0669 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -26,6 +26,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.LexiconModelDispatcher; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.block.ModBlocks; @@ -106,6 +107,9 @@ public class MiscellaneousIcons { // Platforms evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + + // Lexicon + evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModelDispatcher()); } @SubscribeEvent 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 0470089d6..8ffc5d3ff 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -467,6 +467,10 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); + + ModelLoader.registerItemVariants(lexicon, + new ModelResourceLocation("botania:lexicon_default", "inventory"), + new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); diff --git a/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java b/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java new file mode 100644 index 000000000..1edc7cfbb --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java @@ -0,0 +1,52 @@ +package vazkii.botania.client.model; + +import com.google.common.collect.ImmutableMap; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.client.core.handler.ClientTickHandler; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class LexiconAnimatedModel implements ISmartItemModel { + + private final IBakedModel baseModel; + private final Map cache; // No need to free this, LexiconAnimatedModels are destroyed on resource reload + private final IAnimationStateMachine asm; + + protected LexiconAnimatedModel(IBakedModel baseModel) { + this.baseModel = baseModel; + this.cache = new HashMap<>(); + this.asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; + Pair> pair = asm.apply(time); + // baseModel + return baseModel; // todo + } + + @Override public List getFaceQuads(EnumFacing e) { return baseModel.getFaceQuads(e); } + @Override public List getGeneralQuads() { return baseModel.getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { return baseModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return baseModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return baseModel.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return baseModel.getParticleTexture(); } + + @SuppressWarnings("deprecation") + @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); } +} diff --git a/src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java b/src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java new file mode 100644 index 000000000..9b60d6398 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java @@ -0,0 +1,65 @@ +package vazkii.botania.client.model; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.TRSRTransformation; +import org.apache.commons.lang3.tuple.Pair; + +import javax.vecmath.Matrix4f; +import java.util.List; + +/** + * This class handles choosing between the lexicon's default model and the special first person one + */ +public class LexiconModelDispatcher implements IPerspectiveAwareModel { + + private IFlexibleBakedModel normalModel; + private IFlexibleBakedModel specialModel; + + private IFlexibleBakedModel getNormalModel() { + if (normalModel == null) { + normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() + .getRenderItem().getItemModelMesher().getModelManager() + .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + } + return normalModel; + } + + private IFlexibleBakedModel getSpecialModel() { + if (specialModel == null) { + specialModel = new IFlexibleBakedModel.Wrapper(new LexiconAnimatedModel(Minecraft.getMinecraft() + .getRenderItem().getItemModelMesher().getModelManager() + .getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory"))), Attributes.DEFAULT_BAKED_FORMAT); + } + return specialModel; + } + + @SuppressWarnings("deprecation") + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + if (cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { + return Pair.of(getSpecialModel(), new TRSRTransformation(getSpecialModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + } else { + return Pair.of(getNormalModel(), new TRSRTransformation(getNormalModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + } + } + + @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } + @Override public List getFaceQuads(EnumFacing e) { return getNormalModel().getFaceQuads(e); } + @Override public List getGeneralQuads() { return getNormalModel().getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { return getNormalModel().isAmbientOcclusion(); } + @Override public boolean isGui3d() { return getNormalModel().isGui3d(); } + @Override public boolean isBuiltInRenderer() { return getNormalModel().isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return getNormalModel().getParticleTexture(); } + @SuppressWarnings("deprecation") + @Override public ItemCameraTransforms getItemCameraTransforms() { return getNormalModel().getItemCameraTransforms(); } +} diff --git a/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json b/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json new file mode 100644 index 000000000..3c6cc43cd --- /dev/null +++ b/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json @@ -0,0 +1,41 @@ +{ + "joints": { + "spine": { "1": [ 1.0 ] }, + "left_side": {}, + "right_side": {}, + "left_flip": { "4": [ 1.0 ] }, + "right_flip": { "5": [ 1.0 ] } + }, + "clips": { + "closed": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "open": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "opening": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "closing": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "flip_left": { + "loop": false, + "joint_clips": {}, + "events": {} + }, + "flip_right": { + "loop": false, + "joint_clips": {}, + "events": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json b/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json new file mode 100644 index 000000000..d868206a9 --- /dev/null +++ b/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json @@ -0,0 +1,15 @@ +{ + "parameters": {}, + "clips": { + "closed": "botania:block/lexicon_firstperson@closed", + "open": "botania:block/lexicon_firstperson@open" + }, + "states": [ "closed", "open", "opening", "closing" ], + "transitions": { + "closed": "opening", + "opening": "open", + "open": "closing", + "closing": "closed" + }, + "start_state": "closed" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon.json b/src/main/resources/assets/botania/models/item/lexicon_default.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lexicon.json rename to src/main/resources/assets/botania/models/item/lexicon_default.json diff --git a/src/main/resources/assets/botania/models/item/lexicon_firstperson.json b/src/main/resources/assets/botania/models/item/lexicon_firstperson.json new file mode 100644 index 000000000..2a357b0c6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lexicon_firstperson.json @@ -0,0 +1,107 @@ +{ + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + }, + "elements": [ + { + "name": "FrontCover", + "from": [ 5.0, 0.0, 9.0 ], + "to": [ 11.0, 10.0, 9.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] } + } + }, + { + "name": "Spine", + "from": [ 5.0, 0.0, 7.0 ], + "to": [ 5.0, 10.0, 9.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 2.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 2.0 ] } + } + }, + { + "name": "BackCover", + "from": [ 5.0, 0.0, 7.0 ], + "to": [ 11.0, 10.0, 7.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] } + } + }, + { + "name": "LeftPage", + "from": [ 5.0, 1.0, 8.0 ], + "to": [ 10.0, 9.0, 9.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] } + } + }, + { + "name": "LeftPageInner", + "from": [ 5.0, 1.0, 8.0 ], + "to": [ 10.0, 9.0, 8.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] } + } + }, + { + "name": "RightPageInner", + "from": [ 5.0, 1.0, 8.0 ], + "to": [ 10.0, 9.0, 8.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] } + } + }, + { + "name": "RightPage", + "from": [ 5.0, 1.0, 7.0 ], + "to": [ 10.0, 9.0, 8.0 ], + "faces": { + "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, + "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] }, + "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] } + } + } + ] +} \ No newline at end of file From 26bc6b0059d602e20bfb6ad6ea140268f45ebcbf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Feb 2016 15:57:16 -0600 Subject: [PATCH 319/935] Split out alt resources --- .../botania/textures/blocks}/agricarnation.png | Bin .../botania/textures/blocks}/agricarnationChibi.png | Bin .../assets/botania/textures/blocks}/arcanerose.png | Bin .../assets/botania/textures/blocks}/bellethorn.png | Bin .../botania/textures/blocks}/bellethornChibi.png | Bin .../assets/botania/textures/blocks}/bubbell.png | Bin .../botania/textures/blocks}/bubbellChibi.png | Bin .../assets/botania/textures/blocks}/clayconia.png | Bin .../assets/botania/textures/blocks}/daffomill.png | Bin .../assets/botania/textures/blocks}/dandelifeon.png | Bin .../botania/textures/blocks}/dandelifeon.png.mcmeta | 0 .../assets/botania/textures/blocks}/daybloom.png | Bin .../botania/textures/blocks}/daybloomDecor.png | Bin .../botania/textures/blocks}/daybloomPrime.png | Bin .../assets/botania/textures/blocks}/dreadthorn.png | Bin .../assets/botania/textures/blocks}/endoflame.png | Bin .../botania/textures/blocks}/entropinnyum.png | Bin .../assets/botania/textures/blocks}/exoflame.png | Bin .../botania/textures/blocks}/fallenKanade.png | Bin .../assets/botania/textures/blocks}/flower0.png | Bin .../botania/textures/blocks}/flower0Tall0.png | Bin .../botania/textures/blocks}/flower0Tall1.png | Bin .../assets/botania/textures/blocks}/flower1.png | Bin .../assets/botania/textures/blocks}/flower10.png | Bin .../botania/textures/blocks}/flower10Tall0.png | Bin .../botania/textures/blocks}/flower10Tall1.png | Bin .../assets/botania/textures/blocks}/flower11.png | Bin .../botania/textures/blocks}/flower11Tall0.png | Bin .../botania/textures/blocks}/flower11Tall1.png | Bin .../assets/botania/textures/blocks}/flower12.png | Bin .../botania/textures/blocks}/flower12Tall0.png | Bin .../botania/textures/blocks}/flower12Tall1.png | Bin .../assets/botania/textures/blocks}/flower13.png | Bin .../botania/textures/blocks}/flower13Tall0.png | Bin .../botania/textures/blocks}/flower13Tall1.png | Bin .../assets/botania/textures/blocks}/flower14.png | Bin .../botania/textures/blocks}/flower14Tall0.png | Bin .../botania/textures/blocks}/flower14Tall1.png | Bin .../assets/botania/textures/blocks}/flower15.png | Bin .../botania/textures/blocks}/flower15Tall0.png | Bin .../botania/textures/blocks}/flower15Tall1.png | Bin .../assets/botania/textures/blocks}/flower16.png | Bin .../botania/textures/blocks}/flower1Tall0.png | Bin .../botania/textures/blocks}/flower1Tall1.png | Bin .../assets/botania/textures/blocks}/flower2.png | Bin .../botania/textures/blocks}/flower2Tall0.png | Bin .../botania/textures/blocks}/flower2Tall1.png | Bin .../assets/botania/textures/blocks}/flower3.png | Bin .../botania/textures/blocks}/flower3Tall0.png | Bin .../botania/textures/blocks}/flower3Tall1.png | Bin .../assets/botania/textures/blocks}/flower4.png | Bin .../botania/textures/blocks}/flower4Tall0.png | Bin .../botania/textures/blocks}/flower4Tall1.png | Bin .../assets/botania/textures/blocks}/flower5.png | Bin .../botania/textures/blocks}/flower5Tall0.png | Bin .../botania/textures/blocks}/flower5Tall1.png | Bin .../assets/botania/textures/blocks}/flower6.png | Bin .../botania/textures/blocks}/flower6Tall0.png | Bin .../botania/textures/blocks}/flower6Tall1.png | Bin .../assets/botania/textures/blocks}/flower7.png | Bin .../botania/textures/blocks}/flower7Tall0.png | Bin .../botania/textures/blocks}/flower7Tall1.png | Bin .../assets/botania/textures/blocks}/flower8.png | Bin .../botania/textures/blocks}/flower8Tall0.png | Bin .../botania/textures/blocks}/flower8Tall1.png | Bin .../assets/botania/textures/blocks}/flower9.png | Bin .../botania/textures/blocks}/flower9Tall0.png | Bin .../botania/textures/blocks}/flower9Tall1.png | Bin .../botania/textures/blocks}/flowerGlimmering0.png | Bin .../botania/textures/blocks}/flowerGlimmering1.png | Bin .../botania/textures/blocks}/flowerGlimmering10.png | Bin .../botania/textures/blocks}/flowerGlimmering11.png | Bin .../botania/textures/blocks}/flowerGlimmering12.png | Bin .../botania/textures/blocks}/flowerGlimmering13.png | Bin .../botania/textures/blocks}/flowerGlimmering14.png | Bin .../botania/textures/blocks}/flowerGlimmering15.png | Bin .../botania/textures/blocks}/flowerGlimmering2.png | Bin .../botania/textures/blocks}/flowerGlimmering3.png | Bin .../botania/textures/blocks}/flowerGlimmering4.png | Bin .../botania/textures/blocks}/flowerGlimmering5.png | Bin .../botania/textures/blocks}/flowerGlimmering6.png | Bin .../botania/textures/blocks}/flowerGlimmering7.png | Bin .../botania/textures/blocks}/flowerGlimmering8.png | Bin .../botania/textures/blocks}/flowerGlimmering9.png | Bin .../botania/textures/blocks}/gourmaryllis.png | Bin .../assets/botania/textures/blocks}/heiseiDream.png | Bin .../assets/botania/textures/blocks}/hopperhock.png | Bin .../botania/textures/blocks}/hopperhockChibi.png | Bin .../assets/botania/textures/blocks}/hyacidus.png | Bin .../assets/botania/textures/blocks}/hydroangeas.png | Bin .../botania/textures/blocks}/hydroangeasDecor.png | Bin .../botania/textures/blocks}/jadedAmaranthus.png | Bin .../assets/botania/textures/blocks}/jiyuulia.png | Bin .../assets/botania/textures/blocks}/kekimurus.png | Bin .../assets/botania/textures/blocks}/loonium.png | Bin .../assets/botania/textures/blocks}/manastar.png | Bin .../botania/textures/blocks}/marimorphosis.png | Bin .../botania/textures/blocks}/marimorphosisChibi.png | Bin .../assets/botania/textures/blocks}/medumone.png | Bin .../assets/botania/textures/blocks}/munchdew.png | Bin .../assets/botania/textures/blocks}/narslimmus.png | Bin .../assets/botania/textures/blocks}/nightshade.png | Bin .../botania/textures/blocks}/nightshadeDecor.png | Bin .../botania/textures/blocks}/nightshadePrime.png | Bin .../assets/botania/textures/blocks}/orechid.png | Bin .../botania/textures/blocks}/orechidIgnem.png | Bin .../assets/botania/textures/blocks}/pollidisiac.png | Bin .../assets/botania/textures/blocks}/puredaisy.png | Bin .../assets/botania/textures/blocks}/rafflowsia.png | Bin .../botania/textures/blocks}/rannuncarpus.png | Bin .../botania/textures/blocks}/rannuncarpusChibi.png | Bin .../assets/botania/textures/blocks}/solegnolia.png | Bin .../botania/textures/blocks}/solegnoliaChibi.png | Bin .../botania/textures/blocks}/spectranthemum.png | Bin .../assets/botania/textures/blocks}/spectrolus.png | Bin .../botania/textures/blocks}/tangleberrie.png | Bin .../assets/botania/textures/blocks}/thermalily.png | Bin .../assets/botania/textures/blocks}/tigerseye.png | Bin .../assets/botania/textures/blocks}/vinculotus.png | Bin alt_resources/pack.mcmeta | 6 ++++++ .../botania/common/core/handler/ConfigHandler.java | 5 +++-- 121 files changed, 9 insertions(+), 2 deletions(-) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/agricarnation.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/agricarnationChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/arcanerose.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/bellethorn.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/bellethornChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/bubbell.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/bubbellChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/clayconia.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/daffomill.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/dandelifeon.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/dandelifeon.png.mcmeta (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/daybloom.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/daybloomDecor.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/daybloomPrime.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/dreadthorn.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/endoflame.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/entropinnyum.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/exoflame.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/fallenKanade.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower0Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower0Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower10.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower10Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower10Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower11.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower11Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower11Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower12.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower12Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower12Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower13.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower13Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower13Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower14.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower14Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower14Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower15.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower15Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower15Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower16.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower1Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower1Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower2.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower2Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower2Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower3.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower3Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower3Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower4.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower4Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower4Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower5.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower5Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower5Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower6.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower6Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower6Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower7.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower7Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower7Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower8.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower8Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower8Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower9.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower9Tall0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flower9Tall1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering0.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering1.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering10.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering11.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering12.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering13.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering14.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering15.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering2.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering3.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering4.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering5.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering6.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering7.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering8.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/flowerGlimmering9.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/gourmaryllis.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/heiseiDream.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/hopperhock.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/hopperhockChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/hyacidus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/hydroangeas.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/hydroangeasDecor.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/jadedAmaranthus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/jiyuulia.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/kekimurus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/loonium.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/manastar.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/marimorphosis.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/marimorphosisChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/medumone.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/munchdew.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/narslimmus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/nightshade.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/nightshadeDecor.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/nightshadePrime.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/orechid.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/orechidIgnem.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/pollidisiac.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/puredaisy.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/rafflowsia.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/rannuncarpus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/rannuncarpusChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/solegnolia.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/solegnoliaChibi.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/spectranthemum.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/spectrolus.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/tangleberrie.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/thermalily.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/tigerseye.png (100%) rename {src/main/resources/assets/botania/textures/blocks/alt => alt_resources/assets/botania/textures/blocks}/vinculotus.png (100%) create mode 100644 alt_resources/pack.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/alt/agricarnation.png b/alt_resources/assets/botania/textures/blocks/agricarnation.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/agricarnation.png rename to alt_resources/assets/botania/textures/blocks/agricarnation.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png b/alt_resources/assets/botania/textures/blocks/agricarnationChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/agricarnationChibi.png rename to alt_resources/assets/botania/textures/blocks/agricarnationChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/arcanerose.png b/alt_resources/assets/botania/textures/blocks/arcanerose.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/arcanerose.png rename to alt_resources/assets/botania/textures/blocks/arcanerose.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/bellethorn.png b/alt_resources/assets/botania/textures/blocks/bellethorn.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/bellethorn.png rename to alt_resources/assets/botania/textures/blocks/bellethorn.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/bellethornChibi.png b/alt_resources/assets/botania/textures/blocks/bellethornChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/bellethornChibi.png rename to alt_resources/assets/botania/textures/blocks/bellethornChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/bubbell.png b/alt_resources/assets/botania/textures/blocks/bubbell.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/bubbell.png rename to alt_resources/assets/botania/textures/blocks/bubbell.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/bubbellChibi.png b/alt_resources/assets/botania/textures/blocks/bubbellChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/bubbellChibi.png rename to alt_resources/assets/botania/textures/blocks/bubbellChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/clayconia.png b/alt_resources/assets/botania/textures/blocks/clayconia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/clayconia.png rename to alt_resources/assets/botania/textures/blocks/clayconia.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/daffomill.png b/alt_resources/assets/botania/textures/blocks/daffomill.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/daffomill.png rename to alt_resources/assets/botania/textures/blocks/daffomill.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/dandelifeon.png b/alt_resources/assets/botania/textures/blocks/dandelifeon.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/dandelifeon.png rename to alt_resources/assets/botania/textures/blocks/dandelifeon.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/dandelifeon.png.mcmeta b/alt_resources/assets/botania/textures/blocks/dandelifeon.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/dandelifeon.png.mcmeta rename to alt_resources/assets/botania/textures/blocks/dandelifeon.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/alt/daybloom.png b/alt_resources/assets/botania/textures/blocks/daybloom.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/daybloom.png rename to alt_resources/assets/botania/textures/blocks/daybloom.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/daybloomDecor.png b/alt_resources/assets/botania/textures/blocks/daybloomDecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/daybloomDecor.png rename to alt_resources/assets/botania/textures/blocks/daybloomDecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/daybloomPrime.png b/alt_resources/assets/botania/textures/blocks/daybloomPrime.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/daybloomPrime.png rename to alt_resources/assets/botania/textures/blocks/daybloomPrime.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/dreadthorn.png b/alt_resources/assets/botania/textures/blocks/dreadthorn.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/dreadthorn.png rename to alt_resources/assets/botania/textures/blocks/dreadthorn.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/endoflame.png b/alt_resources/assets/botania/textures/blocks/endoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/endoflame.png rename to alt_resources/assets/botania/textures/blocks/endoflame.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/entropinnyum.png b/alt_resources/assets/botania/textures/blocks/entropinnyum.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/entropinnyum.png rename to alt_resources/assets/botania/textures/blocks/entropinnyum.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/exoflame.png b/alt_resources/assets/botania/textures/blocks/exoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/exoflame.png rename to alt_resources/assets/botania/textures/blocks/exoflame.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/fallenKanade.png b/alt_resources/assets/botania/textures/blocks/fallenKanade.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/fallenKanade.png rename to alt_resources/assets/botania/textures/blocks/fallenKanade.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower0.png b/alt_resources/assets/botania/textures/blocks/flower0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower0.png rename to alt_resources/assets/botania/textures/blocks/flower0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall0.png b/alt_resources/assets/botania/textures/blocks/flower0Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower0Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower0Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower0Tall1.png b/alt_resources/assets/botania/textures/blocks/flower0Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower0Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower0Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower1.png b/alt_resources/assets/botania/textures/blocks/flower1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower1.png rename to alt_resources/assets/botania/textures/blocks/flower1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower10.png b/alt_resources/assets/botania/textures/blocks/flower10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower10.png rename to alt_resources/assets/botania/textures/blocks/flower10.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall0.png b/alt_resources/assets/botania/textures/blocks/flower10Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower10Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower10Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower10Tall1.png b/alt_resources/assets/botania/textures/blocks/flower10Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower10Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower10Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower11.png b/alt_resources/assets/botania/textures/blocks/flower11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower11.png rename to alt_resources/assets/botania/textures/blocks/flower11.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall0.png b/alt_resources/assets/botania/textures/blocks/flower11Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower11Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower11Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower11Tall1.png b/alt_resources/assets/botania/textures/blocks/flower11Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower11Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower11Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower12.png b/alt_resources/assets/botania/textures/blocks/flower12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower12.png rename to alt_resources/assets/botania/textures/blocks/flower12.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall0.png b/alt_resources/assets/botania/textures/blocks/flower12Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower12Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower12Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower12Tall1.png b/alt_resources/assets/botania/textures/blocks/flower12Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower12Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower12Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower13.png b/alt_resources/assets/botania/textures/blocks/flower13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower13.png rename to alt_resources/assets/botania/textures/blocks/flower13.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall0.png b/alt_resources/assets/botania/textures/blocks/flower13Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower13Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower13Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower13Tall1.png b/alt_resources/assets/botania/textures/blocks/flower13Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower13Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower13Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower14.png b/alt_resources/assets/botania/textures/blocks/flower14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower14.png rename to alt_resources/assets/botania/textures/blocks/flower14.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall0.png b/alt_resources/assets/botania/textures/blocks/flower14Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower14Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower14Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower14Tall1.png b/alt_resources/assets/botania/textures/blocks/flower14Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower14Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower14Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower15.png b/alt_resources/assets/botania/textures/blocks/flower15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower15.png rename to alt_resources/assets/botania/textures/blocks/flower15.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall0.png b/alt_resources/assets/botania/textures/blocks/flower15Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower15Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower15Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower15Tall1.png b/alt_resources/assets/botania/textures/blocks/flower15Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower15Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower15Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower16.png b/alt_resources/assets/botania/textures/blocks/flower16.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower16.png rename to alt_resources/assets/botania/textures/blocks/flower16.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall0.png b/alt_resources/assets/botania/textures/blocks/flower1Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower1Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower1Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower1Tall1.png b/alt_resources/assets/botania/textures/blocks/flower1Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower1Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower1Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower2.png b/alt_resources/assets/botania/textures/blocks/flower2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower2.png rename to alt_resources/assets/botania/textures/blocks/flower2.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall0.png b/alt_resources/assets/botania/textures/blocks/flower2Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower2Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower2Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower2Tall1.png b/alt_resources/assets/botania/textures/blocks/flower2Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower2Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower2Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower3.png b/alt_resources/assets/botania/textures/blocks/flower3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower3.png rename to alt_resources/assets/botania/textures/blocks/flower3.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall0.png b/alt_resources/assets/botania/textures/blocks/flower3Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower3Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower3Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower3Tall1.png b/alt_resources/assets/botania/textures/blocks/flower3Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower3Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower3Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower4.png b/alt_resources/assets/botania/textures/blocks/flower4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower4.png rename to alt_resources/assets/botania/textures/blocks/flower4.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall0.png b/alt_resources/assets/botania/textures/blocks/flower4Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower4Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower4Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower4Tall1.png b/alt_resources/assets/botania/textures/blocks/flower4Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower4Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower4Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower5.png b/alt_resources/assets/botania/textures/blocks/flower5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower5.png rename to alt_resources/assets/botania/textures/blocks/flower5.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall0.png b/alt_resources/assets/botania/textures/blocks/flower5Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower5Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower5Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower5Tall1.png b/alt_resources/assets/botania/textures/blocks/flower5Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower5Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower5Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower6.png b/alt_resources/assets/botania/textures/blocks/flower6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower6.png rename to alt_resources/assets/botania/textures/blocks/flower6.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall0.png b/alt_resources/assets/botania/textures/blocks/flower6Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower6Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower6Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower6Tall1.png b/alt_resources/assets/botania/textures/blocks/flower6Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower6Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower6Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower7.png b/alt_resources/assets/botania/textures/blocks/flower7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower7.png rename to alt_resources/assets/botania/textures/blocks/flower7.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall0.png b/alt_resources/assets/botania/textures/blocks/flower7Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower7Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower7Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower7Tall1.png b/alt_resources/assets/botania/textures/blocks/flower7Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower7Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower7Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower8.png b/alt_resources/assets/botania/textures/blocks/flower8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower8.png rename to alt_resources/assets/botania/textures/blocks/flower8.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall0.png b/alt_resources/assets/botania/textures/blocks/flower8Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower8Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower8Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower8Tall1.png b/alt_resources/assets/botania/textures/blocks/flower8Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower8Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower8Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower9.png b/alt_resources/assets/botania/textures/blocks/flower9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower9.png rename to alt_resources/assets/botania/textures/blocks/flower9.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall0.png b/alt_resources/assets/botania/textures/blocks/flower9Tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower9Tall0.png rename to alt_resources/assets/botania/textures/blocks/flower9Tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flower9Tall1.png b/alt_resources/assets/botania/textures/blocks/flower9Tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flower9Tall1.png rename to alt_resources/assets/botania/textures/blocks/flower9Tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering0.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering0.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering1.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering1.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering10.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering10.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering10.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering11.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering11.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering11.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering12.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering12.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering12.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering13.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering13.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering13.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering14.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering14.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering14.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering15.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering15.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering15.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering2.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering2.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering2.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering3.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering3.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering3.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering4.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering4.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering4.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering5.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering5.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering5.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering6.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering6.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering6.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering7.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering7.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering7.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering8.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering8.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering8.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering9.png b/alt_resources/assets/botania/textures/blocks/flowerGlimmering9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/flowerGlimmering9.png rename to alt_resources/assets/botania/textures/blocks/flowerGlimmering9.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/gourmaryllis.png b/alt_resources/assets/botania/textures/blocks/gourmaryllis.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/gourmaryllis.png rename to alt_resources/assets/botania/textures/blocks/gourmaryllis.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/heiseiDream.png b/alt_resources/assets/botania/textures/blocks/heiseiDream.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/heiseiDream.png rename to alt_resources/assets/botania/textures/blocks/heiseiDream.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hopperhock.png b/alt_resources/assets/botania/textures/blocks/hopperhock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/hopperhock.png rename to alt_resources/assets/botania/textures/blocks/hopperhock.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hopperhockChibi.png b/alt_resources/assets/botania/textures/blocks/hopperhockChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/hopperhockChibi.png rename to alt_resources/assets/botania/textures/blocks/hopperhockChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hyacidus.png b/alt_resources/assets/botania/textures/blocks/hyacidus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/hyacidus.png rename to alt_resources/assets/botania/textures/blocks/hyacidus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hydroangeas.png b/alt_resources/assets/botania/textures/blocks/hydroangeas.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/hydroangeas.png rename to alt_resources/assets/botania/textures/blocks/hydroangeas.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hydroangeasDecor.png b/alt_resources/assets/botania/textures/blocks/hydroangeasDecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/hydroangeasDecor.png rename to alt_resources/assets/botania/textures/blocks/hydroangeasDecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/jadedAmaranthus.png b/alt_resources/assets/botania/textures/blocks/jadedAmaranthus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/jadedAmaranthus.png rename to alt_resources/assets/botania/textures/blocks/jadedAmaranthus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/jiyuulia.png b/alt_resources/assets/botania/textures/blocks/jiyuulia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/jiyuulia.png rename to alt_resources/assets/botania/textures/blocks/jiyuulia.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/kekimurus.png b/alt_resources/assets/botania/textures/blocks/kekimurus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/kekimurus.png rename to alt_resources/assets/botania/textures/blocks/kekimurus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/loonium.png b/alt_resources/assets/botania/textures/blocks/loonium.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/loonium.png rename to alt_resources/assets/botania/textures/blocks/loonium.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/manastar.png b/alt_resources/assets/botania/textures/blocks/manastar.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/manastar.png rename to alt_resources/assets/botania/textures/blocks/manastar.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/marimorphosis.png b/alt_resources/assets/botania/textures/blocks/marimorphosis.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/marimorphosis.png rename to alt_resources/assets/botania/textures/blocks/marimorphosis.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/marimorphosisChibi.png b/alt_resources/assets/botania/textures/blocks/marimorphosisChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/marimorphosisChibi.png rename to alt_resources/assets/botania/textures/blocks/marimorphosisChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/medumone.png b/alt_resources/assets/botania/textures/blocks/medumone.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/medumone.png rename to alt_resources/assets/botania/textures/blocks/medumone.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/munchdew.png b/alt_resources/assets/botania/textures/blocks/munchdew.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/munchdew.png rename to alt_resources/assets/botania/textures/blocks/munchdew.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/narslimmus.png b/alt_resources/assets/botania/textures/blocks/narslimmus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/narslimmus.png rename to alt_resources/assets/botania/textures/blocks/narslimmus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/nightshade.png b/alt_resources/assets/botania/textures/blocks/nightshade.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/nightshade.png rename to alt_resources/assets/botania/textures/blocks/nightshade.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/nightshadeDecor.png b/alt_resources/assets/botania/textures/blocks/nightshadeDecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/nightshadeDecor.png rename to alt_resources/assets/botania/textures/blocks/nightshadeDecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/nightshadePrime.png b/alt_resources/assets/botania/textures/blocks/nightshadePrime.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/nightshadePrime.png rename to alt_resources/assets/botania/textures/blocks/nightshadePrime.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/orechid.png b/alt_resources/assets/botania/textures/blocks/orechid.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/orechid.png rename to alt_resources/assets/botania/textures/blocks/orechid.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/orechidIgnem.png b/alt_resources/assets/botania/textures/blocks/orechidIgnem.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/orechidIgnem.png rename to alt_resources/assets/botania/textures/blocks/orechidIgnem.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/pollidisiac.png b/alt_resources/assets/botania/textures/blocks/pollidisiac.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/pollidisiac.png rename to alt_resources/assets/botania/textures/blocks/pollidisiac.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/puredaisy.png b/alt_resources/assets/botania/textures/blocks/puredaisy.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/puredaisy.png rename to alt_resources/assets/botania/textures/blocks/puredaisy.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/rafflowsia.png b/alt_resources/assets/botania/textures/blocks/rafflowsia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/rafflowsia.png rename to alt_resources/assets/botania/textures/blocks/rafflowsia.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpus.png b/alt_resources/assets/botania/textures/blocks/rannuncarpus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/rannuncarpus.png rename to alt_resources/assets/botania/textures/blocks/rannuncarpus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png b/alt_resources/assets/botania/textures/blocks/rannuncarpusChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/rannuncarpusChibi.png rename to alt_resources/assets/botania/textures/blocks/rannuncarpusChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/solegnolia.png b/alt_resources/assets/botania/textures/blocks/solegnolia.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/solegnolia.png rename to alt_resources/assets/botania/textures/blocks/solegnolia.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png b/alt_resources/assets/botania/textures/blocks/solegnoliaChibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/solegnoliaChibi.png rename to alt_resources/assets/botania/textures/blocks/solegnoliaChibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/spectranthemum.png b/alt_resources/assets/botania/textures/blocks/spectranthemum.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/spectranthemum.png rename to alt_resources/assets/botania/textures/blocks/spectranthemum.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/spectrolus.png b/alt_resources/assets/botania/textures/blocks/spectrolus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/spectrolus.png rename to alt_resources/assets/botania/textures/blocks/spectrolus.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/tangleberrie.png b/alt_resources/assets/botania/textures/blocks/tangleberrie.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/tangleberrie.png rename to alt_resources/assets/botania/textures/blocks/tangleberrie.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/thermalily.png b/alt_resources/assets/botania/textures/blocks/thermalily.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/thermalily.png rename to alt_resources/assets/botania/textures/blocks/thermalily.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/tigerseye.png b/alt_resources/assets/botania/textures/blocks/tigerseye.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/tigerseye.png rename to alt_resources/assets/botania/textures/blocks/tigerseye.png diff --git a/src/main/resources/assets/botania/textures/blocks/alt/vinculotus.png b/alt_resources/assets/botania/textures/blocks/vinculotus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alt/vinculotus.png rename to alt_resources/assets/botania/textures/blocks/vinculotus.png diff --git a/alt_resources/pack.mcmeta b/alt_resources/pack.mcmeta new file mode 100644 index 000000000..d2be44e4a --- /dev/null +++ b/alt_resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 1, + "description": "Alternate Botania textures by Futureazoo" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index c4847b868..f6119483c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -189,8 +189,9 @@ public final class ConfigHandler { desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); - desc = "Set this to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; - altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); +// todo - this has been split into a separate respack for now +// desc = "Set this to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; +// altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); desc = "Set this to true if you are the chosen one. For lovers of glitch art and just general mad people."; matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode); From 8cf71200ee6200d42011b6c817764c83a411296c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Feb 2016 22:39:43 -0600 Subject: [PATCH 320/935] More lexicon faffing --- .../core/handler/MiscellaneousIcons.java | 4 +- .../client/model/LexiconAnimatedModel.java | 52 ------------- ...ModelDispatcher.java => LexiconModel.java} | 29 +++++-- .../armatures/block/lexicon_firstperson.json | 41 ---------- .../armatures/item/lexicon_firstperson.json | 77 +++++++++++++++++++ .../asms/item/lexicon_firstperson.json | 4 +- .../models/item/lexicon_firstperson.json | 30 +------- 7 files changed, 108 insertions(+), 129 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java rename src/main/java/vazkii/botania/client/model/{LexiconModelDispatcher.java => LexiconModel.java} (68%) delete mode 100644 src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json create mode 100644 src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json 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 d0fcf0669..b650e965f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -26,7 +26,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.model.LexiconModelDispatcher; +import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.block.ModBlocks; @@ -109,7 +109,7 @@ public class MiscellaneousIcons { evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); // Lexicon - evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModelDispatcher()); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java b/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java deleted file mode 100644 index 1edc7cfbb..000000000 --- a/src/main/java/vazkii/botania/client/model/LexiconAnimatedModel.java +++ /dev/null @@ -1,52 +0,0 @@ -package vazkii.botania.client.model; - -import com.google.common.collect.ImmutableMap; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.ISmartItemModel; -import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.Event; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.client.core.handler.ClientTickHandler; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class LexiconAnimatedModel implements ISmartItemModel { - - private final IBakedModel baseModel; - private final Map cache; // No need to free this, LexiconAnimatedModels are destroyed on resource reload - private final IAnimationStateMachine asm; - - protected LexiconAnimatedModel(IBakedModel baseModel) { - this.baseModel = baseModel; - this.cache = new HashMap<>(); - this.asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); - } - - @Override - public IBakedModel handleItemState(ItemStack stack) { - float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; - Pair> pair = asm.apply(time); - // baseModel - return baseModel; // todo - } - - @Override public List getFaceQuads(EnumFacing e) { return baseModel.getFaceQuads(e); } - @Override public List getGeneralQuads() { return baseModel.getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { return baseModel.isAmbientOcclusion(); } - @Override public boolean isGui3d() { return baseModel.isGui3d(); } - @Override public boolean isBuiltInRenderer() { return baseModel.isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { return baseModel.getParticleTexture(); } - - @SuppressWarnings("deprecation") - @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); } -} diff --git a/src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java similarity index 68% rename from src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java rename to src/main/java/vazkii/botania/client/model/LexiconModel.java index 9b60d6398..49b11fdcd 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModelDispatcher.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -1,18 +1,25 @@ package vazkii.botania.client.model; +import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; import java.util.List; @@ -20,10 +27,11 @@ import java.util.List; /** * This class handles choosing between the lexicon's default model and the special first person one */ -public class LexiconModelDispatcher implements IPerspectiveAwareModel { +public class LexiconModel implements IPerspectiveAwareModel { private IFlexibleBakedModel normalModel; private IFlexibleBakedModel specialModel; + private IAnimationStateMachine asm; private IFlexibleBakedModel getNormalModel() { if (normalModel == null) { @@ -36,9 +44,13 @@ public class LexiconModelDispatcher implements IPerspectiveAwareModel { private IFlexibleBakedModel getSpecialModel() { if (specialModel == null) { - specialModel = new IFlexibleBakedModel.Wrapper(new LexiconAnimatedModel(Minecraft.getMinecraft() + specialModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory"))), Attributes.DEFAULT_BAKED_FORMAT); + .getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + } + + if (asm == null) { + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); } return specialModel; } @@ -46,8 +58,13 @@ public class LexiconModelDispatcher implements IPerspectiveAwareModel { @SuppressWarnings("deprecation") @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if (cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - return Pair.of(getSpecialModel(), new TRSRTransformation(getSpecialModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { + IFlexibleBakedModel model = getSpecialModel(); + float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; + + Pair> animate = asm.apply(time); + return Pair.of(model, new TRSRTransformation(model.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + } else { return Pair.of(getNormalModel(), new TRSRTransformation(getNormalModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); } diff --git a/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json b/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json deleted file mode 100644 index 3c6cc43cd..000000000 --- a/src/main/resources/assets/botania/armatures/block/lexicon_firstperson.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "joints": { - "spine": { "1": [ 1.0 ] }, - "left_side": {}, - "right_side": {}, - "left_flip": { "4": [ 1.0 ] }, - "right_flip": { "5": [ 1.0 ] } - }, - "clips": { - "closed": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "open": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "opening": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "closing": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "flip_left": { - "loop": false, - "joint_clips": {}, - "events": {} - }, - "flip_right": { - "loop": false, - "joint_clips": {}, - "events": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json b/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json new file mode 100644 index 000000000..faa380df5 --- /dev/null +++ b/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json @@ -0,0 +1,77 @@ +{ + "joints": { + "spine": { "1": [ 1.0 ] }, + "left_side": { "0": [ 1.0 ], "3": [ 1.0 ] }, + "right_side": { "2": [ 1.0 ], "6": [ 1.0 ] }, + "left_flip": { "4": [ 1.0 ] }, + "right_flip": { "5": [ 1.0 ] } + }, + "clips": { + "closed": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + }, + "open": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + }, + "opening": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + }, + "closing": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + }, + "flip_left": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + }, + "flip_right": { + "loop": false, + "joint_clips": { + "spine": [], + "left_side": [], + "right_side": [], + "left_flip": [], + "right_flip": [] + }, + "events": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json b/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json index d868206a9..6e113890c 100644 --- a/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json +++ b/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json @@ -1,8 +1,8 @@ { "parameters": {}, "clips": { - "closed": "botania:block/lexicon_firstperson@closed", - "open": "botania:block/lexicon_firstperson@open" + "closed": "botania:item/lexicon_firstperson@closed", + "open": "botania:item/lexicon_firstperson@open" }, "states": [ "closed", "open", "opening", "closing" ], "transitions": { diff --git a/src/main/resources/assets/botania/models/item/lexicon_firstperson.json b/src/main/resources/assets/botania/models/item/lexicon_firstperson.json index 2a357b0c6..b0cd2ab5b 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_firstperson.json +++ b/src/main/resources/assets/botania/models/item/lexicon_firstperson.json @@ -1,16 +1,4 @@ { - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - }, "elements": [ { "name": "FrontCover", @@ -20,9 +8,7 @@ "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] } + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] } } }, { @@ -46,9 +32,7 @@ "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 0.0 ] } + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] } } }, { @@ -58,7 +42,6 @@ "faces": { "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] }, "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] } @@ -72,9 +55,7 @@ "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] } + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] } } }, { @@ -85,9 +66,7 @@ "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 0.0 ] } + "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] } } }, { @@ -95,7 +74,6 @@ "from": [ 5.0, 1.0, 7.0 ], "to": [ 10.0, 9.0, 8.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, From fe1d88379da18dad20853bc8596e907e7480e870 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Feb 2016 22:54:40 -0600 Subject: [PATCH 321/935] Fix AABB derp in rod of the skies, closes #98 --- .../java/vazkii/botania/common/item/rod/ItemTornadoRod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index ea2aebf58..d386d4d74 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -138,7 +138,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi if(tile.getCurrentMana() >= COST && tile.isEnabled()) { int range = 5; int rangeY = 3; - List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(te.getPos().add(-0.5 + range, -0.5 + rangeY, -0.5 + range), te.getPos().add(0.5 + range, 0.5 + rangeY, 0.5 + range))); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(te.getPos().add(-0.5 - range, -0.5 - rangeY, -0.5 - range), te.getPos().add(0.5 + range, 0.5 + rangeY, 0.5 + range))); for(EntityPlayer p : players) { if(p.motionY > 0.3 && p.motionY < 2 && !p.isSneaking()) { p.motionY = 2.8; From 7e1ef7aa7f0b7b172f9bd5ce524d4bf434429fc5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Feb 2016 23:54:28 -0600 Subject: [PATCH 322/935] Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102 --- .../botania/client/core/handler/ModelHandler.java | 1 - .../item/equipment/tool/terrasteel/ItemTerraPick.java | 2 +- .../botania/common/item/rod/ItemGravityRod.java | 5 +++++ .../botania/common/item/rod/ItemTerraformRod.java | 11 ++++++----- .../botania/common/item/rod/ItemTornadoRod.java | 6 ++++++ 5 files changed, 18 insertions(+), 7 deletions(-) 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 8ffc5d3ff..119a13c90 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -517,7 +517,6 @@ public final class ModelHandler { registerItemModel(fireRod); registerItemModel(rainbowRod); registerItemModel(skyDirtRod); - registerItemModel(tornadoRod); registerItemModel(terraformRod); registerItemModel(diviningRod); registerItemModel(gravityRod); 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 9fd919201..85ced0aa8 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 @@ -270,7 +270,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean shouldCauseReequipAnimation(ItemStack before, ItemStack after, boolean slotChanged) { - return isEnabled(before) != isEnabled(after); + return after.getItem() != this || isEnabled(before) != isEnabled(after); } } 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 52d1db68a..5cede98a0 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -51,6 +51,11 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { setUnlocalizedName(LibItemNames.GRAVITY_ROD); } + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return newStack.getItem() != this; + } + @Override public void onUpdate(ItemStack stack, World world, Entity par3Entity, int p_77663_4_, boolean p_77663_5_) { if(!(par3Entity instanceof EntityPlayer)) 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 e75e8abd2..1504d1ba2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; @@ -44,7 +45,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP private static final int COST_PER = 55; - static final List validBlocks = Arrays.asList(new String[] { + private static final List validBlocks = ImmutableList.of( "stone", "dirt", "grass", @@ -55,19 +56,19 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP "mycelium", "podzol", "sandstone", - - // Mod support "blockDiorite", "stoneDiorite", "blockGranite", "stoneGranite", "blockAndesite", "stoneAndesite", + + // Mod support "marble", "blockMarble", "limestone", "blockLimestone" - }); + ); public ItemTerraformRod() { super(); @@ -104,7 +105,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int yCenter = (int) par3EntityPlayer.posY; int zCenter = (int) par3EntityPlayer.posZ; - if(yCenter < 62) // Not below sea level + if(yCenter < par2World.getSeaLevel()) // Not below sea level return; int yStart = yCenter + range; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index d386d4d74..64fb8069f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -157,6 +157,12 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return newStack.getItem() != this || isFlying(oldStack) != isFlying(newStack); + } + + @Override public ResourceLocation getOverlayResource(IAvatarTile tile, ItemStack stack) { return avatarOverlay; From 1de504865302ecb98e6ce014be91a890a511ec46 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 11:47:25 -0600 Subject: [PATCH 323/935] More lexicon model work --- .../botania/client/model/LexiconModel.java | 89 +++++++++++++------ 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 49b11fdcd..56d6be0f0 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -6,77 +6,110 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.Event; import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; +import java.io.IOException; import java.util.List; +import java.util.Map; /** * This class handles choosing between the lexicon's default model and the special first person one */ public class LexiconModel implements IPerspectiveAwareModel { - private IFlexibleBakedModel normalModel; - private IFlexibleBakedModel specialModel; - private IAnimationStateMachine asm; + private static final Map missingTransforms; - private IFlexibleBakedModel getNormalModel() { - if (normalModel == null) { - normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + static { + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (ItemCameraTransforms.TransformType t :ItemCameraTransforms.TransformType.values()) { + builder.put(t, TRSRTransformation.identity()); } - return normalModel; + missingTransforms = builder.build(); } - private IFlexibleBakedModel getSpecialModel() { - if (specialModel == null) { - specialModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + private IFlexibleBakedModel normalModel; + private Map normalModelTransforms; + + private IModel specialModel; + private Map specialModelTransforms; + + private IAnimationStateMachine asm; + + private boolean hasInit = false; + + private void initModels() { + if(hasInit) + return; + + normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() + .getRenderItem().getItemModelMesher().getModelManager() + .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); + + try { + normalModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")).getDefaultState()); + specialModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); + specialModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(specialModel.getDefaultState()); + } catch (IOException ex) { + FMLLog.warning("[Botania] Lexicon model couldn't be loaded"); + if(normalModelTransforms == null) + normalModelTransforms = missingTransforms; + if(specialModel == null) + specialModel = ModelLoaderRegistry.getMissingModel(); + if(specialModelTransforms == null) + specialModelTransforms = missingTransforms; } - if (asm == null) { - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); - } - return specialModel; + hasInit = true; } @SuppressWarnings("deprecation") @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + initModels(); if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - IFlexibleBakedModel model = getSpecialModel(); + System.out.println("m8"); float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; Pair> animate = asm.apply(time); - return Pair.of(model, new TRSRTransformation(model.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + IFlexibleBakedModel baked = specialModel.bake(animate.getLeft(), Attributes.DEFAULT_BAKED_FORMAT, ModelLoader.defaultTextureGetter()); + + TRSRTransformation transform = specialModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : specialModelTransforms.get(cameraTransformType); + return Pair.of(baked, transform.getMatrix()); } else { - return Pair.of(getNormalModel(), new TRSRTransformation(getNormalModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + TRSRTransformation transform = normalModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : normalModelTransforms.get(cameraTransformType); + return Pair.of(normalModel, transform.getMatrix()); } } @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing e) { return getNormalModel().getFaceQuads(e); } - @Override public List getGeneralQuads() { return getNormalModel().getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { return getNormalModel().isAmbientOcclusion(); } - @Override public boolean isGui3d() { return getNormalModel().isGui3d(); } - @Override public boolean isBuiltInRenderer() { return getNormalModel().isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { return getNormalModel().getParticleTexture(); } + @Override public List getFaceQuads(EnumFacing e) { initModels(); return normalModel.getFaceQuads(e); } + @Override public List getGeneralQuads() { initModels(); return normalModel.getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { initModels(); return normalModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { initModels(); return normalModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { initModels(); return normalModel.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { initModels(); return normalModel.getParticleTexture(); } @SuppressWarnings("deprecation") - @Override public ItemCameraTransforms getItemCameraTransforms() { return getNormalModel().getItemCameraTransforms(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { initModels(); return normalModel.getItemCameraTransforms(); } } From f41e3933224c6372e0dae12cd9e2a2d3bc130f05 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 11:51:07 -0600 Subject: [PATCH 324/935] Mesa apothecary split --- .../model/altar/mesa/gobletBase2_bottom.png | Bin 0 -> 499 bytes .../model/altar/mesa/gobletBase2_sides.png | Bin 0 -> 180 bytes .../textures/model/altar/mesa/gobletBase2_top.png | Bin 0 -> 499 bytes .../model/altar/mesa/gobletBase3_bottom.png | Bin 0 -> 425 bytes .../model/altar/mesa/gobletBase3_sides.png | Bin 0 -> 143 bytes .../textures/model/altar/mesa/gobletBase3_top.png | Bin 0 -> 425 bytes .../model/altar/mesa/gobletBase_bottom.png | Bin 0 -> 567 bytes .../model/altar/mesa/gobletBase_sides.png | Bin 0 -> 184 bytes .../textures/model/altar/mesa/gobletBase_top.png | Bin 0 -> 567 bytes .../model/altar/mesa/gobletStand_sides.png | Bin 0 -> 227 bytes .../model/altar/mesa/gobletStand_top_bottom.png | Bin 0 -> 226 bytes .../model/altar/mesa/kelkBase2_bottom.png | Bin 0 -> 361 bytes .../textures/model/altar/mesa/kelkBase2_sides.png | Bin 0 -> 197 bytes .../textures/model/altar/mesa/kelkBase2_top.png | Bin 0 -> 316 bytes .../textures/model/altar/mesa/kelkBase_sides.png | Bin 0 -> 192 bytes .../model/altar/mesa/kelkBase_top_bottom.png | Bin 0 -> 244 bytes .../textures/model/altar/mesa/kelkWall.png | Bin 0 -> 420 bytes 17 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mesa/kelkWall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a50fa93464d621b8cda8623372c387da6938be GIT binary patch literal 499 zcmV9X<9uPn6ZHfHogk?UvLnIA&jwO`lnB^uv#{2 zYo(ABS(z^d?_2`#2WX_qb6oM)M`<;j|rG$w9@bm6Y0zh#msG=g=PZO7v z5a4`jEft3P1q5YH?>R1po&g*OhaOJT<|aaiq92=geRRfC8uprx+Q` zaCf9-^Y-|l%J-`)iu-@jx`T6!J?r&2^4RPhR520Uo%?BGErsgNV8+-S1b|d4xmFIU zed6vc)k;w1k`l!o6JgDnZ^z?ngr{v|&Y7#jftzvU<1i3Z`FcDejd)OfsSGexp118) zV9&Ug!klvl`e#{)W}IW}E!E~?uQt$N{hB7m5Lip$_dEk|3;_}0VOjVP!prpL=+wCB zURex*OG?Z+cfxBa3}!?#rkn{Pz0Rf8-TN5LIK@bHM@71biSTI{_%e?Dth)ETzOAvk z6V3XApvsgI&)de*+yKlucc2RJuq@0ub4jW9{COBK5iTi_Yo*kRh%lJ3wg1os_Ka&O pXv^u10l;9^e<_XETUPH{{{T~3?rRnWXCMFo002ovPDHLkV1in2UYA_IBQ7;fw@=Q#fc#Z$ZfA=2@xw;`2lqP&zlhc~uwLEIu%}8be=L^@O_H2D) z`Pk)y@8OBY`G0HXwXK(E*!X^H%FmbAr)Wv?#4cAo?LTkZ+DVQ)j^6*R1*g6KmG|K@ aa{+TgiZg47u9^zaS_V&7KbLh*2~7ZxWkApX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a50fa93464d621b8cda8623372c387da6938be GIT binary patch literal 499 zcmV9X<9uPn6ZHfHogk?UvLnIA&jwO`lnB^uv#{2 zYo(ABS(z^d?_2`#2WX_qb6oM)M`<;j|rG$w9@bm6Y0zh#msG=g=PZO7v z5a4`jEft3P1q5YH?>R1po&g*OhaOJT<|aaiq92=geRRfC8uprx+Q` zaCf9-^Y-|l%J-`)iu-@jx`T6!J?r&2^4RPhR520Uo%?BGErsgNV8+-S1b|d4xmFIU zed6vc)k;w1k`l!o6JgDnZ^z?ngr{v|&Y7#jftzvU<1i3Z`FcDejd)OfsSGexp118) zV9&Ug!klvl`e#{)W}IW}E!E~?uQt$N{hB7m5Lip$_dEk|3;_}0VOjVP!prpL=+wCB zURex*OG?Z+cfxBa3}!?#rkn{Pz0Rf8-TN5LIK@bHM@71biSTI{_%e?Dth)ETzOAvk z6V3XApvsgI&)de*+yKlucc2RJuq@0ub4jW9{COBK5iTi_Yo*kRh%lJ3wg1os_Ka&O pXv^u10l;9^e<_XETUPH{{{T~3?rRnWXCMFo002ovPDHLkV1in2+=f6=<@4jC0k8+a8pDnE z#8OyurmFIFSr|oFb7ruX52q7Fl~_u5;Ev&~_W)>faLi&1VhmN4FY`=Q<>U4BB_P#G zu9bHo@N?e*7_4QEk*dmG3Z(((7%u_8V(b|w=h#YN%bD8{cv@GSwbW)k*Ln#UtmS^1 z`ist5iYh<04KLC!R#nD!eg#lfo|c8+9D6BzTUP)k=P<@}cT3LfFG}pcpn!Ldb4si^ z_l3O_MiIOSOU}3ky8r+L5pKMvs$$KbH8F-aOhIj6*F7@pl&`wG$>92xgguq~&y4gf|GMiI0*`+xKsXp_J2 T*PrJ500000NkvXXu0mjfK)t%; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..d7b9822bd3c6f6dc0b880385ea0ab0020863173e GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf+=f6=<@4jC0k8+a8pDnE z#8OyurmFIFSr|oFb7ruX52q7Fl~_u5;Ev&~_W)>faLi&1VhmN4FY`=Q<>U4BB_P#G zu9bHo@N?e*7_4QEk*dmG3Z(((7%u_8V(b|w=h#YN%bD8{cv@GSwbW)k*Ln#UtmS^1 z`ist5iYh<04KLC!R#nD!eg#lfo|c8+9D6BzTUP)k=P<@}cT3LfFG}pcpn!Ldb4si^ z_l3O_MiIOSOU}3ky8r+L5pKMvs$$KbH8F-aOhIj6*F7@pl&`wG$>92xgguq~&y4gf|GMiI0*`+xKsXp_J2 T*PrJ500000NkvXXu0mjfK)t%; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..632a386fd690d592df2c2d3cef4e3fdb4642799b GIT binary patch literal 567 zcmV-70?7S|P)g67U_Mntgo&U3Ads(1wd))j!qab)Qo6#>B9$sgN>ro?InKy%03nObA(9ZiX% z%GNux8A*g&Yt)>{DUpgQ5kXNUfVFo3iYmtpV9c4>jKvHAB7*mABlQUKjxz5o0{FYG z95aBawNnPbY{rlhd1?(6p+^uAe5(6IhzQON3@PSfd+?|#XiL_S;}QsUpb;``$y zg6|&GocTS^^axah)r^O6&g-g!d<@|{* z!qYg?+_@`-96-&PTWe>D*bTduf{HMikwwTNJlD!(#%jjaJL%B)IF5J(N#y)QMfg$* zUu!+j4wIWZ&7E|_=n?1g9Ga)r_}Dg<-YKeQ0|gKfE;*ClmWA1jTWe>=4?Fc+YnVIT z{VdnEci}n=jH={OmB|cqNB8WH(#XD4M*_!E9reGp#(&^DP2TTruIK;&002ovPDHLk FV1jm=45t79 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..8d00dd9f41dea6929f69ad5afe77a3a1b39dabef GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfeCpJPSGUdC{KUlAsk6G3cDB< zcP)5OA2g>&@0?5Dg67U_Mntgo&U3Ads(1wd))j!qab)Qo6#>B9$sgN>ro?InKy%03nObA(9ZiX% z%GNux8A*g&Yt)>{DUpgQ5kXNUfVFo3iYmtpV9c4>jKvHAB7*mABlQUKjxz5o0{FYG z95aBawNnPbY{rlhd1?(6p+^uAe5(6IhzQON3@PSfd+?|#XiL_S;}QsUpb;``$y zg6|&GocTS^^axah)r^O6&g-g!d<@|{* z!qYg?+_@`-96-&PTWe>D*bTduf{HMikwwTNJlD!(#%jjaJL%B)IF5J(N#y)QMfg$* zUu!+j4wIWZ&7E|_=n?1g9Ga)r_}Dg<-YKeQ0|gKfE;*ClmWA1jTWe>=4?Fc+YnVIT z{VdnEci}n=jH={OmB|cqNB8WH(#XD4M*_!E9reGp#(&^DP2TTruIK;&002ovPDHLk FV1jm=45t79 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2f466527693ae1f774342e104c6e4ffbb99933 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfMvufX6Ul;wBRkz5SQ}khi+f$kKnMwKEZtZ6?WN~2; zJ=iHQ=doem>c80&iqht#-B*OZt_VI3ncDFLAD?K^9U&ixG-OF<6u0DA8kOQDINs^nUKD_d6h_FxYE z0i3lo5w3&V0TAmJyjQ&O7(w00000NkvXX Hu0mjf4_unz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ff9eb461e3d653091843896c9eba84ce911cbc GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfRA2}LM^Jzb_y!_qT#Mybt z39A=*-chR1>$d3H@89nuJwxe5Xvu6%rrSB+>ORC>pDcA|<~wE11)f(f$URe=yW`-T s%-$^%ZmiOnJ>i=!&z`=VfV~u(Q4)zAW=jt5{%A!0N(o^fU6`yE42*(P}2nGJ>4*TH7bQx3ONUG-gE5xV4gRa zbufmqDAog)#m$ucoL*0-?G3b2TqX&}Df6sUBt%F>wgHW`;atnln&02eKLGG~=Y5vZ z4+Af43&35T(>ezbPW&t2t?K}Is%tLdn0=N}Tg$;1?sq$!_m~OvkMsdsmSD~}d^E!V O0000v%3*VMo%2>>V9Q}v z=$v~bRc7nCnj_J-H|FXtm>6M{sd6bzp7B7XMBSbR`bW1%&Hp6OsPgQLeeH$mkHQV@ n>o_{IisvqSuXp1H!w%;1AWhb9RbP0l+XkKX3#{{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..8f1a60724d46fedbdee5b362b5eb247d586d9244 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfhIhbdvkA`+$x~689ZJ6T-G@yGywpneqCn( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..be853b63b17e41dd03b176f4b5b4dced20dbd688 GIT binary patch literal 420 zcmV;V0bBlwP)c$r1vQd7*>%4Rz!-+ z-PuVYlBNI`68x$u1|R0Vc?RIe!-MYH7Jx4|H&j)U2z@Ce5k!@3)9~}@$t?FDUtWy= zc6X+#@UN1rB)j68ANzZiRe9>5aw%MQ=+Jz z0lc**fHQ_JXRI-ZDmvN#_%{rAYw^~iwa$PpXWR&|0HVs@z9)%r8zcLa7(`fwKvkWW zCy6S~oJ`nKE9(&Wy4lS1qRQ{%k>|tV1TcoOxF9bx_#7jv5ZJXX&KS1q_1PENoY@Zp z+oqWTlSKeOz2+M2Q+f*#uJ3`j78$={r?*U5BoTI9$8kKr)XFF4IONRt`+Eg&*0K)a z?Se~tFa_z1VYLKY+JmW?zZSV&)dN|y@eFWj4<_GBdEnw6tlj~9SpNYK=Q0eQQ!NMp O0000 Date: Sun, 7 Feb 2016 12:06:04 -0600 Subject: [PATCH 325/935] Add zipped form of alt textures --- .../alternate_textures_futureazoo.zip | Bin 0 -> 349866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 alt_resources/alternate_textures_futureazoo.zip diff --git a/alt_resources/alternate_textures_futureazoo.zip b/alt_resources/alternate_textures_futureazoo.zip new file mode 100644 index 0000000000000000000000000000000000000000..cd9a93b010a8144eb9b61e0c62f4bd3a76de3075 GIT binary patch literal 349866 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 zΞ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

* Note that {@link IEnergyHandler} is an extension of this. - * + * * @author King Lemming - * + * */ public interface IEnergyConnection { /** * Returns TRUE if the TileEntity can connect on a given side. */ - boolean canConnectEnergy(EnumFacing facing); + boolean canConnectEnergy(EnumFacing from); } diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java index a25517c4a..16b236e7a 100644 --- a/src/api/java/cofh/api/energy/IEnergyHandler.java +++ b/src/api/java/cofh/api/energy/IEnergyHandler.java @@ -2,58 +2,26 @@ package cofh.api.energy; import net.minecraft.util.EnumFacing; - /** * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects. *

* A reference implementation is provided {@link TileEnergyHandler}. + *

+ * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this. * * @author King Lemming * */ -public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver { - - // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things) - - /** - * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. - * - * @param from - * Orientation the energy is received from. - * @param maxReceive - * Maximum amount of energy to receive. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received. - */ - @Override - int receiveEnergy(EnumFacing facing, int maxReceive, boolean simulate); - - /** - * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. - * - * @param from - * Orientation the energy is extracted from. - * @param maxExtract - * Maximum amount of energy to extract. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted. - */ - @Override - int extractEnergy(EnumFacing facing, int maxExtract, boolean simulate); - +public interface IEnergyHandler extends IEnergyConnection { /** * Returns the amount of energy currently stored. */ - @Override - int getEnergyStored(EnumFacing facing); + int getEnergyStored(EnumFacing from); /** * Returns the maximum amount of energy that can be stored. */ - @Override - int getMaxEnergyStored(EnumFacing facing); + int getMaxEnergyStored(EnumFacing from); } diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java index 12ec6f4aa..ef0e09d06 100644 --- a/src/api/java/cofh/api/energy/IEnergyProvider.java +++ b/src/api/java/cofh/api/energy/IEnergyProvider.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumFacing; * @author King Lemming * */ -public interface IEnergyProvider extends IEnergyConnection { +public interface IEnergyProvider extends IEnergyHandler { /** * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. @@ -24,16 +24,6 @@ public interface IEnergyProvider extends IEnergyConnection { * If TRUE, the extraction will only be simulated. * @return Amount of energy that was (or would have been, if simulated) extracted. */ - int extractEnergy(EnumFacing facing, int maxExtract, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(EnumFacing facing); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(EnumFacing facing); + int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); } diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java index b1a9e57cd..989e9baa5 100644 --- a/src/api/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/api/java/cofh/api/energy/IEnergyReceiver.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumFacing; * @author King Lemming * */ -public interface IEnergyReceiver extends IEnergyConnection { +public interface IEnergyReceiver extends IEnergyHandler { /** * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. @@ -24,16 +24,6 @@ public interface IEnergyReceiver extends IEnergyConnection { * If TRUE, the charge will only be simulated. * @return Amount of energy that was (or would have been, if simulated) received. */ - int receiveEnergy(EnumFacing facing, int maxReceive, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(EnumFacing facing); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(EnumFacing facing); + int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); } From bef96830bba888b769f41431a3205c98f5635fe2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Feb 2016 00:29:46 -0600 Subject: [PATCH 337/935] Pump head texture --- .../botania/models/block/pump_head.json | 47 +++++++++--------- .../botania/textures/model/pump_head.png | Bin 0 -> 396 bytes 2 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/pump_head.png diff --git a/src/main/resources/assets/botania/models/block/pump_head.json b/src/main/resources/assets/botania/models/block/pump_head.json index 8cf6b4e7f..7e2907726 100644 --- a/src/main/resources/assets/botania/models/block/pump_head.json +++ b/src/main/resources/assets/botania/models/block/pump_head.json @@ -1,16 +1,19 @@ { + "textures": { + "all": "botania:model/pump_head" + }, "elements": [ { "name": "BlueTop", "from": [ 5.0, 6.0, 1.0 ], "to": [ 11.0, 7.0, 7.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + "north": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, + "east": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, + "south": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, + "up": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 13.0, 6.0 ] } } }, { @@ -18,12 +21,12 @@ "from": [ 5.0, 1.0, 1.0 ], "to": [ 11.0, 2.0, 7.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + "north": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, + "east": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, + "south": { "texture": "#all", "uv": [ 3.0, 5.0, 9.0, 6.0 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 8.0, 11.0, 7.0 ] }, + "up": { "texture": "#all", "uv": [ 7.0, 0.0, 13.0, 6.0 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } } }, { @@ -31,12 +34,10 @@ "from": [ 5.0, 2.0, 1.0 ], "to": [ 6.0, 6.0, 7.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] } + "north": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, + "south": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, + "west": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } } }, { @@ -44,12 +45,10 @@ "from": [ 10.0, 2.0, 1.0 ], "to": [ 11.0, 6.0, 7.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 4.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] } + "north": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] }, + "south": { "texture": "#all", "uv": [ 3.0, 0.0, 4.0, 4.0 ] }, + "west": { "texture": "#all", "uv": [ 3.0, 0.0, 9.0, 6.0 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/pump_head.png b/src/main/resources/assets/botania/textures/model/pump_head.png new file mode 100644 index 0000000000000000000000000000000000000000..355d4d46285a2da8fff17e4621516f9df13b50db GIT binary patch literal 396 zcmV;70dxL|P)H!6fOVHPE5c@<9;q@O-z zq2kU)1c67rzAt_{xhx<~WBe%Pspp~ORisSFjRWk^pzTU5OHkHJ*~&b?PYMiu*sGdo zXxKxajw@KxBUUv*Y+S zy5qCdh(*iG^M Date: Sat, 13 Feb 2016 01:09:48 +0100 Subject: [PATCH 338/935] Fix RF integration Buildcraft pipes are particularly sentitive to directions. --- .../java/vazkii/botania/common/Botania.java | 2 + .../block/tile/mana/TileRFGenerator.java | 54 +++++++------------ 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ae4180d54..5f60f9d81 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -52,6 +52,7 @@ public class Botania { public static boolean bloodMagicLoaded = false; public static boolean coloredLightsLoaded = false; public static boolean etFuturumLoaded = false; + public static boolean rfApiLoaded = false; public static ILightHelper lightHelper; @@ -70,6 +71,7 @@ public class Botania { bloodMagicLoaded = Loader.isModLoaded("AWWayofTime"); // Psh, noob coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); + rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 923e21b49..d11011894 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -14,12 +14,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyReceiver; -import net.minecraftforge.fml.common.Optional; import java.util.EnumMap; import java.util.Map; @@ -31,11 +32,10 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo private static final int MAX_MANA = 1280 * CONVERSION_RATE; private static final String TAG_MANA = "mana"; - int mana = 0; // Thanks to skyboy for help with this cuz I'm a noob with RF - private EnumMap receiverCache; + private EnumMap receiverCache = new EnumMap<>(EnumFacing.class); private boolean deadCache; @Override @@ -43,12 +43,11 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo public void validate() { super.validate(); deadCache = true; - receiverCache = null; } @Override public void updateEntity() { - if(!worldObj.isRemote && Loader.isModLoaded("CoFHAPI|energy")) { + if(!worldObj.isRemote && Botania.rfApiLoaded) { if(deadCache) reCache(); @@ -60,19 +59,17 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo @Optional.Method(modid = "CoFHAPI|energy") protected final int transmitEnergy(int energy) { - if(receiverCache != null) - for(Map.Entry e : receiverCache.entrySet()) { - // todo 1.8 this iteration was in explicit reverse order. was there a reason? - IEnergyReceiver tile = e.getValue(); - if(tile == null) - continue; + // TODO: Share energy amoung receivers ? + for(Map.Entry e : receiverCache.entrySet()) { + IEnergyReceiver tile = e.getValue(); + if (tile == null) + continue; - if(tile.receiveEnergy(e.getKey(), energy, true) > 0) - energy -= tile.receiveEnergy(e.getKey(), energy, false); + energy -= tile.receiveEnergy(e.getKey().getOpposite(), energy, false); - if(energy <= 0) - return 0; - } + if (energy <= 0) + return 0; + } return energy; } @@ -90,28 +87,17 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo public void onNeighborTileChange(BlockPos pos) { TileEntity tile = worldObj.getTileEntity(pos); - if(pos.getX() < getPos().getX()) - addCache(tile, EnumFacing.EAST); - else if(pos.getX() > getPos().getX()) - addCache(tile, EnumFacing.WEST); - else if(pos.getZ() < getPos().getZ()) - addCache(tile, EnumFacing.SOUTH); - else if(pos.getZ() > getPos().getZ()) - addCache(tile, EnumFacing.NORTH); - else if(pos.getY() < getPos().getY()) - addCache(tile, EnumFacing.UP); - else if(pos.getY() > getPos().getY()) - addCache(tile, EnumFacing.DOWN); + BlockPos q = getPos(); + EnumFacing side = EnumFacing.getFacingFromVector(pos.getX() - q.getX(), pos.getY() - q.getY(), pos.getZ() - q.getZ()); + + addCache(tile, side); } @Optional.Method(modid = "CoFHAPI|energy") private void addCache(TileEntity tile, EnumFacing side) { - if(receiverCache != null) - receiverCache.remove(side); + receiverCache.remove(side); - if(tile instanceof IEnergyReceiver && ((IEnergyReceiver)tile).canConnectEnergy(side)) { - if(receiverCache == null) - receiverCache = new EnumMap<>(EnumFacing.class); + if(tile instanceof IEnergyReceiver) { receiverCache.put(side, (IEnergyReceiver)tile); } } From d1d8eb801ccb1c9eb3f073ec5ec3e6bcb6c70c90 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 12 Feb 2016 22:05:22 -0600 Subject: [PATCH 339/935] Actually commit the texture --- .../assets/botania/textures/model/pump_head.png | Bin 396 -> 392 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/model/pump_head.png b/src/main/resources/assets/botania/textures/model/pump_head.png index 355d4d46285a2da8fff17e4621516f9df13b50db..f25511aea73b578a511811621da7cf47cb307925 100644 GIT binary patch delta 349 zcmV-j0iynl1Be5VG=D!yL_t(IjqQ%RO2c3nhM&JVv}w}BDrg1KRqzIMbMEZsO?W3> zf`fv$;3`fo6%h{zir5O;G)Yr?$oY2?TF}XkKHK;4z7MZpii@*Hxw>2@kvWqzN7GdX zs-XCcs0kH+(kG4wG@IMvyHlDLWJN}l7TkUeP;?b3b4p>1n}1leeTm};YKA#onH5BN zg&=~hH5&~LH;Cx?f<+@`K@;3PSmaUlcfo6?ORwK$l1>QXF&|?ErD~C739+7{IFeq~ zo)M_iN5fH3Wy07^(X5PB+vMGS!F4mrD>lPmz}30)`+}NjAaaxYXAj?xDH6fWb4Yt+ z@E*ebTbZ@>h*r5GetMoB-^q;zXm&>H$-~Q+*f4bV_cnjb&u_uWQA-wu!H^M7T_MUU v^fi@IZt?Qyad{oGvy*aousi=H|NMb3@>YlSjkE$S00000NkvXXu0mjfGeD?Z delta 353 zcmV-n0iOPd1B?TZG=D=$L_t(IjopyVN&;aNhM&)wF-OOlEa(R$w?Q{hyVkDTbrao5 zm(Zf1TWA}t+7uC41c{`9I?kw5>imDLf)Q*d1iia+IPb&55oB_6^(wbFDugm&7A0tT z6;BnUpFU-w;?70{fk(Z*FMc|?EFex}{3zwA=b_|Pq)f<-1Apw$pzTU5OHkHJ*~&b? zPYMiu*sGdoXxKxajw@KxBUUv*Y+Sx?1D2)QCmP%kze;ZGmRS+`TzC$vQPX&+*aj!u#bJT%6s>G}ZZHf>lxQ z;{qd1C6^eqUL9^9#vB|(oSqym&*bla@DK70Xfu)a8Pp)Z00000NkvXXu0mjf$y28W From 988e80a3f286611b5992ee0ebe20e3b9c01624e0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 12 Feb 2016 23:07:21 -0600 Subject: [PATCH 340/935] Initial attempt at animated corporea crystal cube --- .../client/core/proxy/ClientProxy.java | 2 +- .../corporea/BlockCorporeaCrystalCube.java | 69 +++++++----------- .../corporea/TileCorporeaCrystalCube.java | 24 +++++- .../armatures/block/crystalcube_cube.json | 19 +++++ .../botania/asms/block/crystalcube_cube.json | 11 +++ .../blockstates/corporeaCrystalCube.json | 26 ++++++- .../models/block/crystalcube_base.json | 29 ++++++++ .../models/block/crystalcube_cube.json | 20 +++++ .../models/item/corporeaCrystalCube.json | 3 - .../model/crystalCube_base_bottom.png | Bin 0 -> 354 bytes .../textures/model/crystalCube_base_sides.png | Bin 0 -> 536 bytes .../textures/model/crystalCube_base_top.png | Bin 0 -> 501 bytes .../textures/model/crystalCube_cube.png | Bin 0 -> 346 bytes .../textures/model/crystalCube_stand.png | Bin 0 -> 256 bytes 14 files changed, 155 insertions(+), 48 deletions(-) create mode 100644 src/main/resources/assets/botania/armatures/block/crystalcube_cube.json create mode 100644 src/main/resources/assets/botania/asms/block/crystalcube_cube.json create mode 100644 src/main/resources/assets/botania/models/block/crystalcube_base.json create mode 100644 src/main/resources/assets/botania/models/block/crystalcube_cube.json delete mode 100644 src/main/resources/assets/botania/models/item/corporeaCrystalCube.json create mode 100644 src/main/resources/assets/botania/textures/model/crystalCube_base_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/crystalCube_base_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/crystalCube_base_top.png create mode 100644 src/main/resources/assets/botania/textures/model/crystalCube_cube.png create mode 100644 src/main/resources/assets/botania/textures/model/crystalCube_stand.png 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 5f89fbdf5..3d8078735 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -242,7 +242,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new AnimationTESR<>()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new AnimationTESR<>()); ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); 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 87c1b383d..c1e0ffcf1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -12,6 +12,8 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; @@ -21,7 +23,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -42,6 +49,27 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi setStepSound(soundTypeMetal); float f = (1F - 10F / 16F) / 2F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); + setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); + } + + @Override + public BlockState createBlockState() { + return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.withProperty(Properties.StaticProperty, true); } @Override @@ -74,11 +102,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return false; } - @Override - public int getRenderType() { - return 2; - } - @Override public TileCorporeaBase createNewTileEntity(World world, int meta) { return new TileCorporeaCrystalCube(); @@ -99,40 +122,4 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } - @Override - public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) - { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); - if (d0 > 2.5D) { - 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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer) - { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - EntityDiggingFX.Factory factory = new EntityDiggingFX.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(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); - } - } - } - return true; - } else { - return false; - } - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 55cfb963a..8e81721f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -12,16 +12,24 @@ package vazkii.botania.common.block.tile.corporea; import java.util.List; +import com.google.common.collect.ImmutableMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.IAnimationProvider; +import net.minecraftforge.client.model.animation.TimeValues; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.lib.LibBlockNames; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -33,6 +41,16 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor int ticks = 0; public int compValue = 0; + private final IAnimationStateMachine asm; + + public TileCorporeaCrystalCube() { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + } else { + asm = null; + } + } + @Override public void updateEntity() { ++ticks; @@ -156,4 +174,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } } + @Override + public IAnimationStateMachine asm() { + return asm; + } } diff --git a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json new file mode 100644 index 000000000..4d895e08e --- /dev/null +++ b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json @@ -0,0 +1,19 @@ +{ + "joints": { + "all": { "0": [ 1.0 ] } + }, + "clips": { + "moving": { + "loop": false, + "joint_clips": { + "all": [{ + "variable": "offset_y", + "type": "uniform", + "interpolation": "linear", + "samples": [ 0, 0.5, 0 ] + }] + }, + "events": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json new file mode 100644 index 000000000..b979aa474 --- /dev/null +++ b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "world_to_cycle": [ "/", 10 ] + }, + "clips": { + "moving": [ "apply", "botania:block/crystalcube_cube@moving", "#world_to_cycle" ] + }, + "states": [ "moving" ], + "transitions": {}, + "start_state": "moving" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json index dc3cd27b2..96f3e56d8 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json +++ b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json @@ -1,12 +1,34 @@ { "forge_marker": 1, "defaults": { - "model": "botania:dummy", "textures": { + "stand": "botania:model/crystalCube_stand", + "base_sides": "botania:model/crystalCube_base_sides", + "base_top": "botania:model/crystalCube_base_top", + "base_bottom": "botania:model/crystalCube_base_bottom", + "cube": "botania:model/crystalCube_cube", "particle": "botania:blocks/storage2" } }, "variants": { - "normal": [{}] + "static": { + "true": { + "model": "botania:crystalcube_base" + }, + "false": { + "model": "botania:crystalcube_cube" + } + }, + "inventory": [{ + "model": "botania:crystalcube_base", + "submodel": { + "cube": { + "model": "botania:crystalcube_cube", + "transform": { + "translation": [ 0, 0.5, 0 ] + } + } + } + }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crystalcube_base.json b/src/main/resources/assets/botania/models/block/crystalcube_base.json new file mode 100644 index 000000000..e14c4f028 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crystalcube_base.json @@ -0,0 +1,29 @@ +{ + "elements": [ + { + "name": "Stand", + "from": [ 5.0, 0.0, 5.0 ], + "to": [ 11.0, 1.0, 11.0 ], + "faces": { + "west": { "texture": "#stand", "uv": [ 5.0, 7.0, 11.0, 8.0 ] }, + "north": { "texture": "#stand", "uv": [ 5.0, 9.0, 11.0, 10.0 ] }, + "east": { "texture": "#stand", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "south": { "texture": "#stand", "uv": [ 5.0, 13.0, 11.0, 14.0 ] }, + "down": { "texture": "#stand", "uv": [ 8.0, 0.0, 14.0, 6.0 ] } + } + }, + { + "name": "Base", + "from": [ 3.0, 1.0, 3.0 ], + "to": [ 13.0, 5.0, 13.0 ], + "faces": { + "west": { "texture": "#base_sides", "uv": [ 3.0, 0.0, 13.0, 4.0 ] }, + "north": { "texture": "#base_sides", "uv": [ 3.0, 4.0, 13.0, 8.0 ] }, + "east": { "texture": "#base_sides", "uv": [ 3.0, 8.0, 13.0, 12.0 ] }, + "south": { "texture": "#base_sides", "uv": [ 3.0, 12.0, 13.0, 16.0 ] }, + "up": { "texture": "#base_top", "uv": [ 3.0, 3.0, 13.0, 13.0 ] }, + "down": { "texture": "#base_bottom", "uv": [ 3.0, 3.0, 13.0, 13.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/crystalcube_cube.json b/src/main/resources/assets/botania/models/block/crystalcube_cube.json new file mode 100644 index 000000000..2dd79d29d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/crystalcube_cube.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#cube" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#cube", "uv": [ 4, 4, 12, 12 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json b/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json deleted file mode 100644 index 7960c6d70..000000000 --- a/src/main/resources/assets/botania/models/item/corporeaCrystalCube.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "builtin/entity" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_base_bottom.png b/src/main/resources/assets/botania/textures/model/crystalCube_base_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..dba1f2d4f3bd7b90c814c3509bb8dfa9d9ad1ba9 GIT binary patch literal 354 zcmV-o0iFJdP)E`E^zwlJR0P@9C0xA%s~QMeX633{8v|KbKV zT`v3`IHOJiCm4)|9CrH(o9ckvig|f$nVfk10+g(Ub_axje1a)|o_hzP4=mt}89aSLRP5+cIG&qazm9p=h4 z62TBRzZQu511vP!Tsx_{SMa%qSTx41Z|iVkm}hnu-7uH~BGDN0W}UoQL0Mb#2zVU4 zS$fT>%rq0@6O`6}ka}+`IL==Uq%PYkF0cJm}Qux(A+`+xak9w!io?+9hplNBUwQ9dUYE&h2W%^(T znwDmAd=jhP0H9?%v}}j(xi20zM`CcK9xT>uM1;liPl`Jo?r%FJf}wo|3yt<43_Lw3 z7zTIP&HYK$B5zih0qmwt)+nKy6`pHpGOitugTr#~XY>CV?A^l5yH6y7A#QJM5%&kk z8l}JY;OWa3y?%>oR7KZUIG;=s2@hd8P3C8B9PFS!^Oo( z;P%!cqoz&0TZMYyV;BaPdrcZ~grge__L@xe4{*mh$>(;!k9N>~1Gg{Bv-4L_N&zsH zcey`snh&ieoBjb?+&B;F>r?}uVbfyo@Q|sz%VcF4?Vryl zR46Y<#czqdRFp;>iMu{8R%uQeaU_NEg8Xa;Vl5RDBPMWGsVF0MA7_j-8{Tgm-5}ee r_!@<1Xk?XQFr8s~=<0vYIClC2i65-y@}G+500000NkvXXu0mjfhJfV_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_cube.png b/src/main/resources/assets/botania/textures/model/crystalCube_cube.png new file mode 100644 index 0000000000000000000000000000000000000000..967fa8b5f84efc3fbc33b2bb7d1cf96b18a3aecb GIT binary patch literal 346 zcmV-g0j2(lP)G%# z2#La5LBtj;$Xi;#)zASifHR&v`Q<#Yi?Uff)El?&C6hvJk3iFrvn(+ZcNS0&V@_K) zjlcJqO`vyBWLzrpdhYPJ46&q&8<<40jCB{J7Nme&#^&eR<>IPNvo)bDB*S=#+j_=5 z)}gxv5aygof5mhZ^I36tIW$O~Mx2QXW91{YK;10t?>X(SCC#3~eVilTPta5!FEYvN z*7g^&hDLdn(D4M9>jfh5aXbgN6H{KmY&$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_stand.png b/src/main/resources/assets/botania/textures/model/crystalCube_stand.png new file mode 100644 index 0000000000000000000000000000000000000000..7c103b9498baa135fa33f92a66e480aca4ee2a56 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf7Wj#Y|c4f%FVt@-&wry;Ix9RY{%8Q6)rnQ>-1rOjEpu1=TInC10G<%r+UpxNvK{fXw^H$A%F)jxZW?5#y=_ZJ$b zE?vL*<)H=D0Uc)HNiW@I%$cFne*fmL{14f@cF*{ZT*+%`Ee_)WdV#^y)z4*}Q$iB} D;RI<@ literal 0 HcmV?d00001 From 9fe4e0f8cc172ca53975aa78b78e3a770a0a647b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Feb 2016 12:28:52 -0600 Subject: [PATCH 341/935] Kinda migrated crystal cuvbe to json --- .../client/core/proxy/ClientProxy.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 111 +++++++++++++++++- .../armatures/block/crystalcube_cube.json | 2 +- .../botania/asms/block/crystalcube_cube.json | 2 +- 4 files changed, 109 insertions(+), 8 deletions(-) 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 3d8078735..5f89fbdf5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -242,7 +242,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TilePrism.class, new RenderTilePrism()); ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaIndex.class, new RenderTileCorporeaIndex()); ClientRegistry.bindTileEntitySpecialRenderer(TilePump.class, new AnimationTESR<>()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new AnimationTESR<>()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCorporeaCrystalCube.class, new RenderTileCorporeaCrystalCube()); ClientRegistry.bindTileEntitySpecialRenderer(TileIncensePlate.class, new RenderTileIncensePlate()); ClientRegistry.bindTileEntitySpecialRenderer(TileHourglass.class, new RenderTileHourglass()); ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); 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 d5c18e13b..63bdf3d9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -10,17 +10,38 @@ */ package vazkii.botania.client.render.tile; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ISmartBlockModel; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.Properties; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -29,6 +50,8 @@ import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lib.LibObfuscation; +import java.util.concurrent.TimeUnit; + public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE); @@ -57,10 +80,10 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(10).expireAfterWrite(100, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() + { + public IBakedModel load(Pair key) throws Exception + { + IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(key.getLeft().getClean()); + if(model instanceof ISmartBlockModel) + { + model = ((ISmartBlockModel)model).handleBlockState(key.getLeft().withProperty(Properties.AnimationProperty, key.getRight())); + } + return model; + } + }); + + private static IBakedModel getModel(IExtendedBlockState state, IModelState modelState) + { + return modelCache.getUnchecked(Pair.of(state, modelState)); + } + + private void renderAnimatedModel(TileCorporeaCrystalCube te, double x, double y, double z, float partialTick) { + // From FastTESR.renderTileEntityAt + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldRenderer = tessellator.getWorldRenderer(); + this.bindTexture(TextureMap.locationBlocksTexture); + RenderHelper.disableStandardItemLighting(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.disableCull(); + + if (Minecraft.isAmbientOcclusionEnabled()) + { + GlStateManager.shadeModel(GL11.GL_SMOOTH); + } + else + { + GlStateManager.shadeModel(GL11.GL_FLAT); + } + + worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); + + // Inlined AnimationTESR.renderTileEntityFast + if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); + BlockPos pos = te.getPos(); + IBlockAccess world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos); + IBlockState state = world.getBlockState(pos); + if(state.getPropertyNames().contains(Properties.StaticProperty)) + { + state = state.withProperty(Properties.StaticProperty, false); + } + if(state instanceof IExtendedBlockState) + { + IExtendedBlockState exState = (IExtendedBlockState)state; + if(exState.getUnlistedNames().contains(Properties.AnimationProperty)) + { + float time = Animation.getWorldTime(getWorld(), partialTick); + Pair> pair = te.asm().apply(time); + // handleEvents(te, time, pair.getRight()); + + IBakedModel model = getModel(exState, pair.getLeft()); + + worldRenderer.setTranslation(x - pos.getX(), y - pos.getY(), z - pos.getZ()); + + blockRenderer.getBlockModelRenderer().renderModel(world, model, state, pos, worldRenderer, false); + } + } + // End inline AnimationTESR.renderTileEntityFast + + worldRenderer.setTranslation(0, 0, 0); + + tessellator.draw(); + + RenderHelper.enableStandardItemLighting(); } } diff --git a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json index 4d895e08e..9b76c413e 100644 --- a/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/armatures/block/crystalcube_cube.json @@ -10,7 +10,7 @@ "variable": "offset_y", "type": "uniform", "interpolation": "linear", - "samples": [ 0, 0.5, 0 ] + "samples": [ 0.275, 0.2875, 0.29665, 0.3, 0.29665, 0.2875, 0.275, 0.2625, 0.25335, 0.25, 0.25335, 0.2625, 0.275 ] }] }, "events": {} diff --git a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json index b979aa474..969465469 100644 --- a/src/main/resources/assets/botania/asms/block/crystalcube_cube.json +++ b/src/main/resources/assets/botania/asms/block/crystalcube_cube.json @@ -1,6 +1,6 @@ { "parameters": { - "world_to_cycle": [ "/", 10 ] + "world_to_cycle": [ "/", 4 ] }, "clips": { "moving": [ "apply", "botania:block/crystalcube_cube@moving", "#world_to_cycle" ] From 333102a08fcdff94495713c17ecf395c0b0a8fae Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Feb 2016 19:13:25 -0600 Subject: [PATCH 342/935] Lambdaify shadercallback --- .../botania/api/internal/ShaderCallback.java | 5 +- .../client/core/handler/BossBarHandler.java | 2 +- .../gui/lexicon/button/GuiButtonCategory.java | 48 +++++++++---------- .../render/entity/RenderDoppleganger.java | 40 +++++++--------- .../client/render/entity/RenderPixie.java | 20 ++++---- .../common/entity/EntityDoppleganger.java | 13 ++--- 6 files changed, 55 insertions(+), 73 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java index 12186a231..26ac40a42 100644 --- a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java +++ b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java @@ -13,8 +13,9 @@ package vazkii.botania.api.internal; /** * A Callback for when a shader is called. Used to define shader uniforms. */ -public abstract class ShaderCallback { +@FunctionalInterface +public interface ShaderCallback { - public abstract void call(int shader); + void call(int shader); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 214d05554..533d162f5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -90,7 +90,7 @@ public final class BossBarHandler { ShaderHelper.releaseShader(); } - static class BarCallback extends ShaderCallback { + static class BarCallback implements ShaderCallback { int x, y; ShaderCallback callback; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index ce8dc452b..e70c20813 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -34,31 +34,6 @@ public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); private static final ResourceLocation stencilResource = new ResourceLocation(LibResources.GUI_STENCIL); - private ShaderCallback shaderCallback = new ShaderCallback() { - - @Override - public void call(int shader) { - TextureManager r = Minecraft.getMinecraft().renderEngine; - int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch"); - int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image"); - int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask"); - - float heightMatch = ticksHovered / time; - OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId()); - ARBShaderObjects.glUniform1iARB(imageUniform, 0); - - OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit); - - GlStateManager.enableTexture2D(); - GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); - - GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId()); - ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit); - - ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch); - } - }; static boolean boundStencil = false; GuiLexicon gui; @@ -66,6 +41,29 @@ public class GuiButtonCategory extends GuiButtonLexicon { ResourceLocation resource = null; float ticksHovered = 0F; float time = 12F; + + private ShaderCallback shaderCallback = shader -> { + TextureManager r = Minecraft.getMinecraft().renderEngine; + int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch"); + int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image"); + int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask"); + + float heightMatch = ticksHovered / time; + OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId()); + ARBShaderObjects.glUniform1iARB(imageUniform, 0); + + OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit); + + GlStateManager.enableTexture2D(); + GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); + + GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId()); + ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit); + + ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch); + }; + int activeTex = 0; public GuiButtonCategory(int id, int x, int y, GuiLexicon gui, LexiconCategory category) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index ddf908c85..733d0b5fd 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -31,33 +31,25 @@ public class RenderDoppleganger extends RenderBiped { public static float grainIntensity = DEFAULT_GRAIN_INTENSITY; public static float disfiguration = DEFAULT_DISFIGURATION; - public static ShaderCallback callback = new ShaderCallback() { + public static ShaderCallback callback = shader -> { + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); - @Override - public void call(int shader) { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); + }; - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); - } - }; + public static ShaderCallback defaultCallback = shader -> { + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); - public static ShaderCallback defaultCallback = new ShaderCallback() { - - @Override - public void call(int shader) { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); - - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY); - } - }; + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY); + }; public RenderDoppleganger(RenderManager renderManager) { super(renderManager, new ModelPlayer(0.0F, false), 0F); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 728d4ec8f..19c073a4c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -27,19 +27,15 @@ import vazkii.botania.common.entity.EntityPixie; public class RenderPixie extends RenderLiving { - ShaderCallback callback = new ShaderCallback() { + ShaderCallback callback = shader -> { + // Frag Uniforms + int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); + ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); - @Override - public void call(int shader) { - // Frag Uniforms - int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); - ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); - - // Vert Uniforms - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F); - } - }; + // Vert Uniforms + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); + ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F); + }; public RenderPixie(RenderManager renderManager) { super(renderManager, new ModelPixie(), 0.25F); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 260050137..45cde6dc0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -904,21 +904,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @SideOnly(Side.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background, int shader) { if(shaderCallback == null) - shaderCallback = new ShaderCallback() { - - @Override - public void call(int shader) { - int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity"); - int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "hpFract"); + shaderCallback = shader1 -> { + int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader1, "grainIntensity"); + int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader1, "hpFract"); float time = getInvulTime(); float grainIntensity = time > 20 ? 1F : Math.max(isHardMode() ? 0.5F : 0F, time / 20F); ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); ARBShaderObjects.glUniform1fARB(hpFractUniform, getHealth() / getMaxHealth()); - } - - }; + }; return background ? null : shaderCallback; } From 37d63bc672fc8e23e23019ef6b1080cceee85723 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Feb 2016 22:31:00 -0600 Subject: [PATCH 343/935] Remove some top level sideonlys where they werent meant to be used, fix wireframes rendering too opaquely --- src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java | 3 --- .../java/vazkii/botania/api/boss/IBotaniaBossWithShader.java | 2 -- .../botania/api/corporea/ICorporeaAutoCompleteController.java | 1 - .../vazkii/botania/api/internal/IInternalMethodHandler.java | 4 ---- src/main/java/vazkii/botania/api/item/IBaubleRender.java | 1 - .../botania/api/item/IWireframeCoordinateListProvider.java | 1 - .../java/vazkii/botania/api/item/TinyPotatoRenderEvent.java | 1 - src/main/java/vazkii/botania/api/mana/ILens.java | 1 - src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java | 1 - src/main/java/vazkii/botania/api/wand/ITileBound.java | 1 - .../vazkii/botania/client/core/handler/BoundTileRenderer.java | 2 +- 11 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index ff6dc710d..8f4ec621f 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -33,7 +33,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * You can use BotaniaAPI.internalMethodHandler.getDefaultBossBarTexture() to get * the one used by botania bosses. */ - @SideOnly(Side.CLIENT) public ResourceLocation getBossBarTexture(); /** @@ -41,7 +40,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * boss bar texture. This is for the background, not the bar that shows * the HP. */ - @SideOnly(Side.CLIENT) public Rectangle getBossBarTextureRect(); /** @@ -50,7 +48,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * HP the boss has. The width of the rectangle will be multiplied by the * faction of the boss's current HP by max HP. */ - @SideOnly(Side.CLIENT) public Rectangle getBossBarHPTextureRect(); /** diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index e64dba2cb..038b287c4 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -30,13 +30,11 @@ public interface IBotaniaBossWithShader extends IBotaniaBoss { * @param background True if rendering the background of the boss bar, * false if rendering the bar itself that shows the HP. */ - @SideOnly(Side.CLIENT) public int getBossBarShaderProgram(boolean background); /** * A callback for the shader, used to pass in uniforms. Return null for no callback. */ - @SideOnly(Side.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background, int shader); } diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index c02047dba..c1b909d5b 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -21,7 +21,6 @@ public interface ICorporeaAutoCompleteController { /** * Return true if auto completion should be enabled. */ - @SideOnly(Side.CLIENT) public boolean shouldAutoComplete(); } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 655cd8eeb..c116a46f3 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -106,16 +106,12 @@ public interface IInternalMethodHandler { @SideOnly(Side.CLIENT) public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound); - @SideOnly(Side.CLIENT) public ItemStack getBindDisplayForFlowerType(SubTileEntity e); - @SideOnly(Side.CLIENT) public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText); - @SideOnly(Side.CLIENT) public ResourceLocation getDefaultBossBarTexture(); - @SideOnly(Side.CLIENT) public void setBossStatus(IBotaniaBoss status); public boolean isBuildcraftPipe(TileEntity tile); diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 44d467909..38de54964 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -32,7 +32,6 @@ public interface IBaubleRender { * rendering. Will not be called if the item is a ICosmeticAttachable and * has a cosmetic bauble attached to it. */ - @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks); /** diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index ae7a1ba13..96a0f25c9 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -29,7 +29,6 @@ public interface IWireframeCoordinateListProvider { * Returns a list of BlockPos for the wireframes to draw. * Can be null. */ - @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index cd86958d3..11b8db411 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -18,7 +18,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. */ -@SideOnly(Side.CLIENT) public class TinyPotatoRenderEvent extends Event { public final TileEntity tile; diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 38ea2fea4..6104a2118 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -19,7 +19,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface ILens extends ILensEffect { - @SideOnly(Side.CLIENT) public int getLensColor(ItemStack stack); /** diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index 4c28dcbf9..4ed522d3a 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -12,7 +12,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface ICoordBoundItem { - @SideOnly(Side.CLIENT) public BlockPos getBinding(ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 3b2f42312..c228281c8 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -24,7 +24,6 @@ public interface ITileBound { /** * Gets where this block is bound to, can return null. */ - @SideOnly(Side.CLIENT) public BlockPos getBinding(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 99474f279..be1071004 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -137,7 +137,7 @@ public final class BoundTileRenderer { renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GL11.glColor3ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue()); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), ((byte) 64)); renderBlockOutline(axis); } } From a647f4c7845792f9b643912dddd671191ea769fc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Feb 2016 16:21:54 -0600 Subject: [PATCH 344/935] Mountain apothecary --- .../model/altar/mountain/gobletBase2_bottom.png | Bin 0 -> 489 bytes .../model/altar/mountain/gobletBase2_sides.png | Bin 0 -> 181 bytes .../model/altar/mountain/gobletBase2_top.png | Bin 0 -> 489 bytes .../model/altar/mountain/gobletBase3_bottom.png | Bin 0 -> 425 bytes .../model/altar/mountain/gobletBase3_sides.png | Bin 0 -> 144 bytes .../model/altar/mountain/gobletBase3_top.png | Bin 0 -> 425 bytes .../model/altar/mountain/gobletBase_bottom.png | Bin 0 -> 555 bytes .../model/altar/mountain/gobletBase_sides.png | Bin 0 -> 191 bytes .../model/altar/mountain/gobletBase_top.png | Bin 0 -> 555 bytes .../model/altar/mountain/gobletStand_sides.png | Bin 0 -> 229 bytes .../altar/mountain/gobletStand_top_bottom.png | Bin 0 -> 224 bytes .../model/altar/mountain/kelkBase2_bottom.png | Bin 0 -> 359 bytes .../model/altar/mountain/kelkBase2_sides.png | Bin 0 -> 192 bytes .../model/altar/mountain/kelkBase2_top.png | Bin 0 -> 318 bytes .../model/altar/mountain/kelkBase_sides.png | Bin 0 -> 189 bytes .../model/altar/mountain/kelkBase_top_bottom.png | Bin 0 -> 241 bytes .../textures/model/altar/mountain/kelkWall.png | Bin 0 -> 429 bytes 17 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mountain/kelkWall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b1f5dc10c548af31adf04c7fa68227e9fe9d04 GIT binary patch literal 489 zcmVZu9~*m!04&pp zh+wAVT<|frA?wov;DE+jY9*#jtrdWE_srwK`V6QF%Wb5TiVq2A27sQ@=4qfaqtuFs zATPp@63&#jWu}z+$y!rzp9TO@DJ;{-x*zgPwfTL2Y)zf1GIZ`DNV$-6!Ko5b!t|J+ zDx_R6Q}z%kr8H&V?$c#qeR@Jlj6=tA8<~b4GiAArs7h0F!c^IPya-N@A!d9?h#b|e zPfusYeHu^^^i(E7F6FWS@b|INcaD%U&n>iwM1+rRXY4x&v;gNQ23qGdSxvJvKNckdjK=W8?Jr<`{DiHJG)0wq< f;FZ^T7hlFdaH`~`{;(KE00000NkvXXu0mjfF4fkP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..08162338da7f0624dea28aab5e8e86e1df78a1c9 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfZu9~*m!04&pp zh+wAVT<|frA?wov;DE+jY9*#jtrdWE_srwK`V6QF%Wb5TiVq2A27sQ@=4qfaqtuFs zATPp@63&#jWu}z+$y!rzp9TO@DJ;{-x*zgPwfTL2Y)zf1GIZ`DNV$-6!Ko5b!t|J+ zDx_R6Q}z%kr8H&V?$c#qeR@Jlj6=tA8<~b4GiAArs7h0F!c^IPya-N@A!d9?h#b|e zPfusYeHu^^^i(E7F6FWS@b|INcaD%U&n>iwM1+rRXY4x&v;gNQ23qGdSxvJvKNckdjK=W8?Jr<`{DiHJG)0wq< f;FZ^T7hlFdaH`~`{;(KE00000NkvXXu0mjfF4fkP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..7b9245ee8ad21b5f76dc80c760efc78ea646715a GIT binary patch literal 425 zcmV;a0apHrP)s3qh5X3#!6?v%<{z{^O?rXjc+pyPjxf zq+DobyuQuE5XiL>gYtR5#mp(SbqDdf?A8+i=8lN;T~$yK9QgHmz}@-sY5OQpo6(xF zU#~c(1%RN+Y02kbTf@u{5z;M^$lmVhE1{0Kea6#vzhx<22{~L`2T+#uX_SO1qWVDL631NXms= z>iN#k*<%O{A&_z*2EDQWC;%`Hf$i#yQbalpRbe#^Jnh!}IbGl*#xX|Ry^~mSAuWYm z+Fky;4i0l-jFHk>FKUc|+Ki=CrXgP3=-*4cW;AzH1l)1xg~bpEL22!V@c)>1adE)% Tzq{G800000NkvXXu0mjf#wEi> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..a360e2bed55e57bce8d732e1eacce583b04bd812 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfs3qh5X3#!6?v%<{z{^O?rXjc+pyPjxf zq+DobyuQuE5XiL>gYtR5#mp(SbqDdf?A8+i=8lN;T~$yK9QgHmz}@-sY5OQpo6(xF zU#~c(1%RN+Y02kbTf@u{5z;M^$lmVhE1{0Kea6#vzhx<22{~L`2T+#uX_SO1qWVDL631NXms= z>iN#k*<%O{A&_z*2EDQWC;%`Hf$i#yQbalpRbe#^Jnh!}IbGl*#xX|Ry^~mSAuWYm z+Fky;4i0l-jFHk>FKUc|+Ki=CrXgP3=-*4cW;AzH1l)1xg~bpEL22!V@c)>1adE)% Tzq{G800000NkvXXu0mjf#wEi> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a3b8f27a6eac03974bce69d0af3dc91f88ef5e2e GIT binary patch literal 555 zcmV+`0@VG9P)z06gCbfRA-1mxf3HptX)2sURYhTDcQ-cTz4?5kv%2rM5=O zl@J0)E=*>q3Sy?XJEn>Qr8W9>zheN=j9e?FRs!JeJl_fF-BA^yDY;bK{R|$7I|h(S z85jV$R!jv;r63{D-RbUxaPsv#(K{m&cx(&3J1N(J1Rx;RzOA@KD&n9NwF2pLp`eVwVTGsTEG zFqv`WLaC={?oMfqb)JyRd8UG?ux|?~pN6U;$j$h%%(P3S+Y2IrWsZFA>)`*MP^b2e z++*zSOlISOijZ>QNQGP)rg}Ou*O7cO!*0gX+SrN7^xV!;nWJ4FzL&~WnPX&%ibYk9 tTNDD85+2EOXlF z#qJfi<-+$UC^0ky_4HPT8GP(t;Iu4fQq7k~exL5y&kvYtIbSt?rfSK_`7uqKOwukt mzgc7N_gb_h)9U|cA?|4=_3P4f_z06gCbfRA-1mxf3HptX)2sURYhTDcQ-cTz4?5kv%2rM5=O zl@J0)E=*>q3Sy?XJEn>Qr8W9>zheN=j9e?FRs!JeJl_fF-BA^yDY;bK{R|$7I|h(S z85jV$R!jv;r63{D-RbUxaPsv#(K{m&cx(&3J1N(J1Rx;RzOA@KD&n9NwF2pLp`eVwVTGsTEG zFqv`WLaC={?oMfqb)JyRd8UG?ux|?~pN6U;$j$h%%(P3S+Y2IrWsZFA>)`*MP^b2e z++*zSOlISOijZ>QNQGP)rg}Ou*O7cO!*0gX+SrN7^xV!;nWJ4FzL&~WnPX&%ibYk9 tT&#(CY^}1&)W9mRznL%V%m#II`W~99UmMG;WZ1-|EQsH?@!$JN`XJm6VARr bdysqfg7pdoGrB5(?qu+E^>bP0l+XkK&;VPx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1a139054eca18ffc459c87117872e61d0dd840f4 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfaSXBO zecQiU=#YU3>vy|J)0mq6|F;!kI>?}yn-Q?GQES2)tIbL2e1CpQWj@|;|JuU-o~NCw znG%-W33@i!e%?8z2f7=it74|=v4pf%u8Vn>dDVPN?-X~JmWBN@w6=yV`n{^2yX0V? zs0&N*(Yq4fkzadNO{c0~OwZHQw{N})l-wbC-Cb?h#7{?-aX(pk;rNG(|9>j#zmoCJ Ut>XJT2k1lwPgg&ebxsLQ0O`hANB{r; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..c61daae04406777ff4fcb83081581e5b8d2930d4 GIT binary patch literal 359 zcmV-t0hs=YP)NQj1plK=lBN(v+d!ol9>3`KYu2tCuy zO84mQ8Tj|(zAiV{S9X3j@HEYg+a7>vjjb3vTLi*S2)|B(w{0j(*jM&AW$ZOkd- zMHn_6yEov=l2#2?0PlrdD$Y5YDr&~XxCJ2PhRgj9fS3zv#xzGBo)5=>thBAauphVdUEuLBP%K zZXn_~EQwqyhepmKWVpGLAN6N?G zyR>PE1QEueKkeWUKW|)B2_n42L{sH*zoV&=e`)d0=M~yLm{FJcRCE9U002ovPDHLk FV1hQhn)(0$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..2e1b92b4c56fd008ff40790371a79ae7de70555f GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfT15{`YkMRIXfG zSy%OE)#;}GZOb=VGUUFuknEkE=AyZULw|j~p?b6fhqutaEwXkjA_<#?qgWPC=19xl zBG$t(eOtFfL){z(jn6!~`xzLf1R1`WuG*L_n8NNc=X>Ka`J@}a3#?B&ad5wVAP{)G zp*ZzB_uZ8*+a7Z%am`NWv7dW=rC_J1pPM}M9Sh^Lc4cu}?|px0&CnqBaN)WcwGTGG z&cEu_Jv)tIm6HEG_4Aww|gE^e<*19xaP%W64xPXvqTY0_W<>Ywa>kE*-M{_V1SsL)3e7 zflFuqPUlXzt!??IWkSJ!-5ERg?zQRl_G@XGsVKRZ-)>*{8J>oj+zGnYX~!O`J{C&m zDLS$<;Tcmzkb-1do41Qab$0r}Gpqr(4;Gf}yLM<>IK!mhkp`bRI)kL=M=Q2(o_6Z+ nB#o^bm%KhR^Z)PO?+5sW_9QPnuJq0w=w=2_S3j3^P65QV?4?wQ%ST^HpN6X7^G4pRgF|9?RY)j%&XITqY? zcBZ?k+hBg|fPs79i;AXr^n3L=fRFF*%i+`k@akqmDTSm)OiEHCm%{7a4WGXLaO?dq zPd{CFc=xtw&X{GkZ9`Jy*!5Jw)5nB3hZmt6BC|AS+%yNXOwNU-3aA?05b+{x>WW?4 z0Py=fpq3YdoC{uLH1J-CNpa3$Ig?A_&9((#h~v8#p>R=5icAIqpk^G;JxPt-rlIQx z)Qq|clv0-EC4w0uV+c_-+NS1qzXPC;iChZDuIKsJXk8)~E?1bfpCST;`85C1_to6>1Ht>z0A9|47eUQdB~Bb{>WZYs;n*=GFq@v%(>SR;A#%$+-n8kY7XYy|5bkg XE!Za;5V3Ir00000NkvXXu0mjf*{8$b literal 0 HcmV?d00001 From 78c65fb065a438ae1007c310b1a933fd3b3ee606 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 16 Feb 2016 13:34:26 -0600 Subject: [PATCH 345/935] All apothecaries done finally --- .../model/altar/plains/gobletBase2_bottom.png | Bin 0 -> 486 bytes .../model/altar/plains/gobletBase2_sides.png | Bin 0 -> 177 bytes .../model/altar/plains/gobletBase2_top.png | Bin 0 -> 486 bytes .../model/altar/plains/gobletBase3_bottom.png | Bin 0 -> 420 bytes .../model/altar/plains/gobletBase3_sides.png | Bin 0 -> 137 bytes .../model/altar/plains/gobletBase3_top.png | Bin 0 -> 420 bytes .../model/altar/plains/gobletBase_bottom.png | Bin 0 -> 560 bytes .../model/altar/plains/gobletBase_sides.png | Bin 0 -> 173 bytes .../model/altar/plains/gobletBase_top.png | Bin 0 -> 560 bytes .../model/altar/plains/gobletStand_sides.png | Bin 0 -> 224 bytes .../model/altar/plains/gobletStand_top_bottom.png | Bin 0 -> 226 bytes .../model/altar/plains/kelkBase2_bottom.png | Bin 0 -> 356 bytes .../model/altar/plains/kelkBase2_sides.png | Bin 0 -> 200 bytes .../textures/model/altar/plains/kelkBase2_top.png | Bin 0 -> 318 bytes .../model/altar/plains/kelkBase_sides.png | Bin 0 -> 191 bytes .../model/altar/plains/kelkBase_top_bottom.png | Bin 0 -> 239 bytes .../textures/model/altar/plains/kelkWall.png | Bin 0 -> 432 bytes .../model/altar/swamp/gobletBase2_bottom.png | Bin 0 -> 463 bytes .../model/altar/swamp/gobletBase2_sides.png | Bin 0 -> 177 bytes .../model/altar/swamp/gobletBase2_top.png | Bin 0 -> 463 bytes .../model/altar/swamp/gobletBase3_bottom.png | Bin 0 -> 392 bytes .../model/altar/swamp/gobletBase3_sides.png | Bin 0 -> 144 bytes .../model/altar/swamp/gobletBase3_top.png | Bin 0 -> 392 bytes .../model/altar/swamp/gobletBase_bottom.png | Bin 0 -> 512 bytes .../model/altar/swamp/gobletBase_sides.png | Bin 0 -> 189 bytes .../textures/model/altar/swamp/gobletBase_top.png | Bin 0 -> 512 bytes .../model/altar/swamp/gobletStand_sides.png | Bin 0 -> 217 bytes .../model/altar/swamp/gobletStand_top_bottom.png | Bin 0 -> 221 bytes .../model/altar/swamp/kelkBase2_bottom.png | Bin 0 -> 341 bytes .../model/altar/swamp/kelkBase2_sides.png | Bin 0 -> 188 bytes .../textures/model/altar/swamp/kelkBase2_top.png | Bin 0 -> 314 bytes .../textures/model/altar/swamp/kelkBase_sides.png | Bin 0 -> 186 bytes .../model/altar/swamp/kelkBase_top_bottom.png | Bin 0 -> 237 bytes .../textures/model/altar/swamp/kelkWall.png | Bin 0 -> 406 bytes .../model/altar/taiga/gobletBase2_bottom.png | Bin 0 -> 564 bytes .../model/altar/taiga/gobletBase2_sides.png | Bin 0 -> 179 bytes .../model/altar/taiga/gobletBase2_top.png | Bin 0 -> 564 bytes .../model/altar/taiga/gobletBase3_bottom.png | Bin 0 -> 481 bytes .../model/altar/taiga/gobletBase3_sides.png | Bin 0 -> 144 bytes .../model/altar/taiga/gobletBase3_top.png | Bin 0 -> 481 bytes .../model/altar/taiga/gobletBase_bottom.png | Bin 0 -> 645 bytes .../model/altar/taiga/gobletBase_sides.png | Bin 0 -> 190 bytes .../textures/model/altar/taiga/gobletBase_top.png | Bin 0 -> 645 bytes .../model/altar/taiga/gobletStand_sides.png | Bin 0 -> 247 bytes .../model/altar/taiga/gobletStand_top_bottom.png | Bin 0 -> 243 bytes .../model/altar/taiga/kelkBase2_bottom.png | Bin 0 -> 392 bytes .../model/altar/taiga/kelkBase2_sides.png | Bin 0 -> 212 bytes .../textures/model/altar/taiga/kelkBase2_top.png | Bin 0 -> 346 bytes .../textures/model/altar/taiga/kelkBase_sides.png | Bin 0 -> 204 bytes .../model/altar/taiga/kelkBase_top_bottom.png | Bin 0 -> 263 bytes .../textures/model/altar/taiga/kelkWall.png | Bin 0 -> 468 bytes 51 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/plains/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/swamp/kelkWall.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/taiga/kelkWall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0ddf97b05b4ba0d02349c9ad91bb1f93f2c86798 GIT binary patch literal 486 zcmV@P)tpO zQnC?~PAAqJQK4Q9GbaSaz4P?4-Vv^+M#;vyMV?+()-56`vsfzKfelTRZ8)xz8nBiPH%-}4baCf?E5kW+&jx5 za6Nyh5opC(w}@+>Z2)Ya66I=l1c0;#w&MbQFzzG5%x0h7=Wz(^HM%)*87c3<)jW_s zE>F2_0f;|F*7wbzB~@;`9D^>$4f|Ru=el(!6qrD|DGEq z)&Bi^YOb}@A!OQfdrh;$H~RBy7EI!1IlA-TbP0l+XkKBvLyW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..0ddf97b05b4ba0d02349c9ad91bb1f93f2c86798 GIT binary patch literal 486 zcmV@P)tpO zQnC?~PAAqJQK4Q9GbaSaz4P?4-Vv^+M#;vyMV?+()-56`vsfzKfelTRZ8)xz8nBiPH%-}4baCf?E5kW+&jx5 za6Nyh5opC(w}@+>Z2)Ya66I=l1c0;#w&MbQFzzG5%x0h7=Wz(^HM%)*87c3<)jW_s zE>F2_Q$|$Sp9c`oAc*v6Zf%_)L}mXb zGhQmq8ybY>job4~%7Ga}O>l37C~E_NA5VoeD5dxkGj9M|7WN5s)Bm%=Ob{>CdwMI85X6+w`4sV_utDQ@Tg4Mr3ynHL9 ztjxuGous58VAYv!m0=qf!|)rqrNX_V&EDfn=Td(G3sHzkY5wy1|Dm5j>8gk`G3<8$ O0000en literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..f9cceb89c14020046979414e7a751e860bf9daec GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfp7?wJlM)h>lO8;1+pw|Ie&5H&iH%YWd8bxz8^k)CFbyd_ fs3F110|X5AD@<57b#8S8n#JJh>gTe~DWM4fxECph literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..19d5089675b0d6ad57073c1799e69ea5cf05d027 GIT binary patch literal 420 zcmV;V0bBlwP)Q$|$Sp9c`oAc*v6Zf%_)L}mXb zGhQmq8ybY>job4~%7Ga}O>l37C~E_NA5VoeD5dxkGj9M|7WN5s)Bm%=Ob{>CdwMI85X6+w`4sV_utDQ@Tg4Mr3ynHL9 ztjxuGous58VAYv!m0=qf!|)rqrNX_V&EDfn=Td(G3sHzkY5wy1|Dm5j>8gk`G3<8$ O0000en literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac6eda60c2dace69c791437dbb12dd1df8c58ca GIT binary patch literal 560 zcmV-00?+-4P)h1ivVr> zH_ETyKRZCH&bkBuYjx&J#!3R<@wEbQykyqJ5djgwTVTt*p-E_UJoXlZch)8F*3l#+ z6TEfmqai9R52qXwngq41^ynlLBKrPOGGRLdu%gt(X*Ez4dUT$*hDMAoRub#t0MOz7 zwX&T7ERP1j;bZ{R#Yv{v@@S-_xQ`2r`_Q3BXL&jZoIj=)H7A(>3V@0T$4e%c#C*wY zwLwm%Tz?!0@3iVWB5yH}pRNUfwg$&@=5&>vx3{tW`%{VN_&W4alO3tG>V$VJEBCJo zoi~*ZqCz<&ZhtH8K}t$Q=XlOcv!Tyhqb|-g8|ROSX*NWK^T)Jz$WlB4x z)3wm*Ky4A7a!5SyZ4c3ib}-FGXdiAQC7CjR%hcxxl(#<2%u`~%6zGHBRwC@$Y}H>P zdkfkc=w@ShU}Y!_ph;MlLFpYHsE>Ex${}GJ$F;@~C@XnNcng+CV>;UYVX~2pWH23# yJSEKXNL;)oFQUJPO2$wnQ@q8V&@KM;>HG)wEi5t|_F>Qf00000f;|F*7wbzC4cE5`}7P5WjOL zc~^XvlmLQMQ<3P44$rjF6*2UngDX2JE8yp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac6eda60c2dace69c791437dbb12dd1df8c58ca GIT binary patch literal 560 zcmV-00?+-4P)h1ivVr> zH_ETyKRZCH&bkBuYjx&J#!3R<@wEbQykyqJ5djgwTVTt*p-E_UJoXlZch)8F*3l#+ z6TEfmqai9R52qXwngq41^ynlLBKrPOGGRLdu%gt(X*Ez4dUT$*hDMAoRub#t0MOz7 zwX&T7ERP1j;bZ{R#Yv{v@@S-_xQ`2r`_Q3BXL&jZoIj=)H7A(>3V@0T$4e%c#C*wY zwLwm%Tz?!0@3iVWB5yH}pRNUfwg$&@=5&>vx3{tW`%{VN_&W4alO3tG>V$VJEBCJo zoi~*ZqCz<&ZhtH8K}t$Q=XlOcv!Tyhqb|-g8|ROSX*NWK^T)Jz$WlB4x z)3wm*Ky4A7a!5SyZ4c3ib}-FGXdiAQC7CjR%hcxxl(#<2%u`~%6zGHBRwC@$Y}H>P zdkfkc=w@ShU}Y!_ph;MlLFpYHsE>Ex${}GJ$F;@~C@XnNcng+CV>;UYVX~2pWH23# yJSEKXNL;)oFQUJPO2$wnQ@q8V&@KM;>HG)wEi5t|_F>Qf0000aSXBO zeLHC*-ys7Ym-llV0%y+n@qd5PbLLYAS~B_+6_+e|$F8vFNLAPQ^wTb#mn*O28So?@ zsjX6Y$J?HK?)s0fMam2kvphCuty6Khy+?S%fnS|&4Yz9)7hE|pP2uGyzlLL3Q>SsO z?yM|==5VI z=Q`F!`M#KSU}F89Z1#l01#5zi$V7e&<-T(M;T3n4wso8x7Bz`0I6v>1P+|LZccaPm zw+f-{vjl#9UwNO`=P?iWm$yeO*06d%z2d%2K0|5C`iUyRzsw$-ZZX*7S#149y#5LE Y{BB=SVI$67pd%SPUHx3vIVCg!02W_a<^TWy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ca15df11d7dc478669e6264d15bce7fb98909d36 GIT binary patch literal 356 zcmV-q0h|7bP)^}pGl|xnOyNGp$IA##2yy5+AchXho2C7QQimNRt7KZOg zGx&F=RwQ6;N1ij>2h3h!KpPg~nWV%IO$8hRkB^7!Qe@3a++j z(JO;_g`(6eN3*OrbQ57n7%PNb0)=+tkhy+t&~7}wv3z}uhzQ%Knv#{A3NaMMK2fsX zt{?(^HxWaoT|2&a6Ji9_BYk6q%A4B;)0j{20DNN!zgM*=DU?fO*AV|APGhFze`tLd zF_qA+{cQ&4KTfewIm57zl&ox@8%kDU$X6-ue0~5~sFRCq|-HSPrR|2P) z9Sm5_a3Nz8%TiChP)Nkl5L$|D9bDc0|9{5aQSAd1DG-u4Kw}Yc*R$j% zPtKcjbK%cR+-@G9?n8bwoKGFwJRyWYQ(06Zv8@9E+DKlWi|Et0fDppWT)lSyB&j0J zG|qXHlCuOefDi(0B;{KRfEzpjm)Zib%@d>&>wpnLG`k^8ryivxQi%m%mM8c?UG&jB zu3z;>*~bTd1Y~>jJu)(_!6aFK80_+2Fjmn)t Q)&Kwi07*qoM6N<$f;%sRAOHXW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..a9c5384b18eeb4bd10c975f50f73628b28d7aadd GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfreoXtAE_8&2R5LQe*x9-=D?(;NBg#pIF%htXO<$WxDOold8v>9`6ipW0=75 z%Oam^`{|U^XZ&k&U;DEsCZuVEs)wv+);5ti7WVPX_PcLod6N9@T>o*lRh(p58r ndG2rvp8WgkM}BiJZ-e;Cx$3O#yNwipE@1F<^>bP0l+XkK)uc#V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..134ae10acd843f9983a3082ff893d2990b3a78e2 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfXsBtiOGv)>L|X| zXnFJN{ust(ijT5gRh;d1#p>;xvpzQ~s@=*lx7PIFXFH`?zb9!Q_$?YBI_p}ZU*xow z{2cFqBGwgtY_AJ8%jokIN&|T_ma_`+{5@lmR&cePUA6pKi-Fs(<1OoZ7xJ6TRqqju ie?CL?|8MF3CjN)hqgP)%?cfP?F@vY8pUXO@geCxqs#+lc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..b938de383dc93e57a9e4d58c2f7aa5c44bea9405 GIT binary patch literal 432 zcmV;h0Z;ykP)cycQA_lZzD+Agp- zuL0=q5~^he6g8aR14M)r6%jB43>K^L;jYh!6Py=Hkr|Mp&Hy)BGPavUiptrOis2!n zxllD8D~D-^2!`yBf)%4#RqCV++GJ&s&%@Mf_*I`S9G{e!4J#0FUp1^MYnO{=~5dZ5K#Uxx0?UUWt4AQxD#M zerXe+=>oHZQ+rT!oGJo!>koiadyt|6aQSUL@AXkVm~tO005n}VsRzxn`a9s%9!$Ca at9}DZdmHR$bQPA& zm-ikKzW4;-{nt`a&+#OLtgR*~Yw4(u#*8&2f zf_KNxdRhzh-wr^8TeZ22c90&K`aBR7^4o&n(6)wAv=nZk@UvXbhyaOfHwR z3-kzbW(+xEwNamSLedyGKA*&rXnRGoj<0;=+W~;4K-=pC1&sVr(Kvb<#(4g=V70vp zgcM1SOt(G-ygMR7EQ#{{@lv0QU%s(BA%(jc6svYRyN~C($SH7qKCxo}bayl;X-S9< z+TML^mBFMpgVRL3K()P&D-^-c?iELazL3`xUR-?X{Rglm=2o4)h@}7k002ovPDHLk FV1f+z%18hJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..ad5dce4011d90035c7ec7069f93ac4801986cb22 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfEv?-6?v{;xI-1+-Fg%3pr)3TAh5g z*D@cj+J07{qMN}W^x-@m`M-B=_w!sbDlVUXe&_n#{X9vNcP;~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6c346c63df5109f71d304b57e1bfb987c7d217fb GIT binary patch literal 463 zcmV;=0WkiFP)QPA& zm-ikKzW4;-{nt`a&+#OLtgR*~Yw4(u#*8&2f zf_KNxdRhzh-wr^8TeZ22c90&K`aBR7^4o&n(6)wAv=nZk@UvXbhyaOfHwR z3-kzbW(+xEwNamSLedyGKA*&rXnRGoj<0;=+W~;4K-=pC1&sVr(Kvb<#(4g=V70vp zgcM1SOt(G-ygMR7EQ#{{@lv0QU%s(BA%(jc6svYRyN~C($SH7qKCxo}bayl;X-S9< z+TML^mBFMpgVRL3K()P&D-^-c?iELazL3`xUR-?X{Rglm=2o4)h@}7k002ovPDHLk FV1f+z%18hJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..63c74a48e0316e780c19b711f374b9ee25e74064 GIT binary patch literal 392 zcmV;30eAk1P)tL3`L)vq*GISI zcxA=b^S6KCUx(b1PoJMdMDXE=3T{q4FIY1)Db_lo!s)|8xbyAHR{_wSBtls$;ej>7 zhtqyu(X5PaXih92SBSvPcLn*Dl(hm75s1o>iy$Hp!SCBPMOgS?}M^dwwEj7uS$UMcm!xp)blc@$DHoN>6Z=7iSR%| z2oE&rBY+6nkIO#2Uk{m@(^OY0);ezEsJ-=6OTt=b^rOLtqgl~BYj3AN08+`6rxQL7 zo5H6PxfbgAiTAMsb{joNB^?b(8GXDeoB!djfbHeV*o?6m5%W-GDR)+e2MBkNI~T0= m{qqE|-{7W1RPHSNKjIJde!Sk_b{!1>0000tL3`L)vq*GISI zcxA=b^S6KCUx(b1PoJMdMDXE=3T{q4FIY1)Db_lo!s)|8xbyAHR{_wSBtls$;ej>7 zhtqyu(X5PaXih92SBSvPcLn*Dl(hm75s1o>iy$Hp!SCBPMOgS?}M^dwwEj7uS$UMcm!xp)blc@$DHoN>6Z=7iSR%| z2oE&rBY+6nkIO#2Uk{m@(^OY0);ezEsJ-=6OTt=b^rOLtqgl~BYj3AN08+`6rxQL7 zo5H6PxfbgAiTAMsb{joNB^?b(8GXDeoB!djfbHeV*o?6m5%W-GDR)+e2MBkNI~T0= m{qqE|-{7W1RPHSNKjIJde!Sk_b{!1>0000~7#u ze*gUw06q-s1`*gW>g_;t0-%3f0F>K-^?`^05FX@lbwma427sFr9#}Wr98p1YngVTr zfVF{^G;5j^g01G}0BBNH4M0o6`q)AQ^hZM@0#PBAgmoi42oL(Bv1%|?R}28_1I>wS zZDtw~-x?xfsyrK_LVZ68_i6tXi3n6gD6fIl+kuE6B52aBa{jtO1U`HVxH*!Pyex$| z`K^M~oqMTV{~j;fGry?pi?WZITawZ~F2Z9U3XeI=l4$p9s)`^Xlv>G0LHna&eUOhr zeLu-(L6cJ7&#jV5-q8R==H>1FBx_C_KTrCjK}=;gpDW6Ve3VbyF&ifvO1O|$##A%b z2mRSupXNlnKS?E%kHWY*T9tA;@L{AQlNTi8>iF>8?B?XN5H7Rv1y=oW?z3)=u8ifa zZVDIYB0@e2$IrKK|JR1X9Nla5AeHoKKPlFYarMo^S0Y6PEeUP+C)Nhm1`%^@kDm!F9brWdCo@j%pWl=$BUw`k7_ZoAJq$gYlHs=2{fsAKDurI00003L7-jHf396Ce|Y`$)Gb{8=cLe-%%j(y-~4gM j|23E1sr9li`8P1sm)Eax<+yqRXg`CetDnm{r-UW|)+t5Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1499ee1e9930a30b31f1c2deb30237e25c7965 GIT binary patch literal 512 zcmV+b0{{JqP)~7#u ze*gUw06q-s1`*gW>g_;t0-%3f0F>K-^?`^05FX@lbwma427sFr9#}Wr98p1YngVTr zfVF{^G;5j^g01G}0BBNH4M0o6`q)AQ^hZM@0#PBAgmoi42oL(Bv1%|?R}28_1I>wS zZDtw~-x?xfsyrK_LVZ68_i6tXi3n6gD6fIl+kuE6B52aBa{jtO1U`HVxH*!Pyex$| z`K^M~oqMTV{~j;fGry?pi?WZITawZ~F2Z9U3XeI=l4$p9s)`^Xlv>G0LHna&eUOhr zeLu-(L6cJ7&#jV5-q8R==H>1FBx_C_KTrCjK}=;gpDW6Ve3VbyF&ifvO1O|$##A%b z2mRSupXNlnKS?E%kHWY*T9tA;@L{AQlNTi8>iF>8?B?XN5H7Rv1y=oW?z3)=u8ifa zZVDIYB0@e2$IrKK|JR1X9Nla5AeHoKKPlFYarMo^S0Y6PEeUP+C)Nhm1`%^@kDm!F9brWdCo@j%pWl=$BUw`k7_ZoAJq$gYlHs=2{fsAKDurI0000I6R#WdnNR!iv_z~SmD%&bxy?3JlhZ|+%h@yMG0vQ|$LL4cdbXdeouM_FjV4E@ z-PE$1p3zj~SyU#0>+0zzl^*@CUu5oh#bR=*jml%ylb-#W85JUDv!(dz+`KaMmdo7gS}89$ zHFe6DuAHC0zp63BalI;TUh!b6vepw#Vfpv5@fU=C=_x9;Y;(GM!ZP__+22(Mrg1YU zHSIL~_IRCsP5g|ui8hwC)1RdU>)couFS+{RyU3V>DYPcFPcbFP=E=Ux* zA(3`H0Cg@Kf{lPgL8}r%z}*4p_X7Z08UzTkfktjUnHptU(9%d_rp^UZBc=%ci-4)o z^&R8=4uG~)+@0lkVm?f3Xkja`v5@b2V(wVpW+V!EKj7wAQ?xYdseo^ZHv~b1Iu+U( zzZ_2hxI2;}5(VkxXMs;-xAhxIalJDK2d#P=+1C)=oFIW#+NB35(?XCyK9BR;46bMF nYJ|92a(Bl29j10!sDD%+lcA7##E|l<00000NkvXXu0mjfgdvD7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..956e494e2d80e98d707edcd363838dd0c82b6703 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf|8pxJq;1=(lVW^7Uj2T;+m4X8 iYU{Nuzj2F;GuTgOw_>e+Da8-8p25@A&t;ucLK6U$EXE?=WES}b1I97y8G5oJi+L*bj8Uw}k&l-}3xvw}MuCQvd(} M07*qoM6N<$f+~N9(*OVf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..db14c3672bed60c9fa4e97dc286eec24f92cc1fa GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfY(#)N6 z+2s{K&$;i3jegIj-J-Hdjq9PwMNx)jkDnfA{ag3AYW>;MtC$bW)Oh62y8hpvW|f>` h>-hcA8#XX}U?{iJVAZv>c@MOl!PC{xWt~$(699ktM8N<6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a3de281beed69233c8c2a79567977798fde06f79 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfmqR!T{%T)sK@$2W9pGN@t+a2M7H^WN9nnA$ucE|5;KjnP>@yCPYyZiSM z9=JK(zQ;QvSg7A+P5@)FH8s#9Hm zlHvLuh;Eh?j=B0NN-K@&>423+D~<3#RA^J>!Kx3oh+JoVJPxsXqf;+5@Y{ zGCh3%wf^m@9-K${7vRz!EWXc`fs1>v`2MeY1$G1yai#&=b^rhX07*qoM6N<$f&zE2 AFaQ7m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9039054eb5f09096daef49d6730db96d1d74ba4a GIT binary patch literal 564 zcmV-40?Yl0P)*AUZcSD}`;2NUZ_*`Qy9L z0MUD7mLav~czc6w8ibUT+ZrJyGRuh0VVffeLAk9tJw5=S0miOHDn;}jKMar(DFphb zN6KwY|NMjyg7wv&=sjcGqVoa(3Cz=Uu_C2}Pzs?GF$Bi0MH$29(`RA`_+gl>%^Otp z4uIfBs(MHF@EainswgJEDRI2L!JST!5-QKhR^=k#ttC2#%FH|wKq`f|7G(^!X(m=m zky7H~`r~4ue|}=@T8hg{)>nIq%MHpH*86LuQd8rZ{Hx{Ra99LhJ-WVUY!{%X#|Lz= zqN;Z&V~|>tQbKA?41TddN;JQ2G1Z!J=x6n;EXm4}_Wq81eF1%aHo#{Qhxw-%=0|TSq*gn0000*AUZcSD}`;2NUZ_*`Qy9L z0MUD7mLav~czc6w8ibUT+ZrJyGRuh0VVffeLAk9tJw5=S0miOHDn;}jKMar(DFphb zN6KwY|NMjyg7wv&=sjcGqVoa(3Cz=Uu_C2}Pzs?GF$Bi0MH$29(`RA`_+gl>%^Otp z4uIfBs(MHF@EainswgJEDRI2L!JST!5-QKhR^=k#ttC2#%FH|wKq`f|7G(^!X(m=m zky7H~`r~4ue|}=@T8hg{)>nIq%MHpH*86LuQd8rZ{Hx{Ra99LhJ-WVUY!{%X#|Lz= zqN;Z&V~|>tQbKA?41TddN;JQ2G1Z!J=x6n;EXm4}_Wq81eF1%aHo#{Qhxw-%=0|TSq*gn0000jZtdwQAE5 zC6Syg9IHv)eeP;Fz#QJoA-uHIzPNt>L9{WXVL&NG41wdzw{(7ku?3yqpp;^IenF0r zn@=AVfF4O&Q=QI9T}SUdIY!oZx0u4wZ#~92X78@ZDG@^$9oT(Q&ldoQ2+9}$a!P1x z(bgh4v;6WIM3`M&9|B_6k%xhLzF@ojiBbwvmV{HlXRfW=;>Df7*-;nxl9Mga21zS!Ce;Ru4cfFj6Az%uJJt}uAEsAIVKtDaW zx~4jvBPpSjLTL>mXlp5FGhSW1=3k9~{Tg#h*vT$4fG!I9ttT`ML)&7H%KroWkMH!} z)B6pGV4P!ea)P#&ZoMX_Na}l(G0!05BknWi7*SfIjX^|+A)vIz6b|DYc^D32ysRDo XZFSD5BX)N-00000NkvXXu0mjfcW=;Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..15bf7e395b276e3c08125618181c137cd46bade9 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf@E42zx^ mTm1h)-K!l5B0WrOK){gYW5T-c!7??Vkqn-$elF{r5}E)jV=j0A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f773377ec04364ca07b44649f9decfece8b87665 GIT binary patch literal 481 zcmV<70UrK|P)jZtdwQAE5 zC6Syg9IHv)eeP;Fz#QJoA-uHIzPNt>L9{WXVL&NG41wdzw{(7ku?3yqpp;^IenF0r zn@=AVfF4O&Q=QI9T}SUdIY!oZx0u4wZ#~92X78@ZDG@^$9oT(Q&ldoQ2+9}$a!P1x z(bgh4v;6WIM3`M&9|B_6k%xhLzF@ojiBbwvmV{HlXRfW=;>Df7*-;nxl9Mga21zS!Ce;Ru4cfFj6Az%uJJt}uAEsAIVKtDaW zx~4jvBPpSjLTL>mXlp5FGhSW1=3k9~{Tg#h*vT$4fG!I9ttT`ML)&7H%KroWkMH!} z)B6pGV4P!ea)P#&ZoMX_Na}l(G0!05BknWi7*SfIjX^|+A)vIz6b|DYc^D32ysRDo XZFSD5BX)N-00000NkvXXu0mjfcW=;Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b46e1388a673f94a61d0ea54982620ac0dbd5e41 GIT binary patch literal 645 zcmV;00($+4P)Ez4cy@YmlgIg>)z9i$Div? zj6p=GK7OL?I`sJZ!Zh@hT}S)nfwDVbyr+Hmx~ur6L0ilAl-7tW^uHdl#(VDm_>=MV z70DTGElWz=o}aK~McH*LR`1tEFALgQjPod^v0Fypv`k?noX_vvYg}E^|9ZsN4MqFm zy&sPHcp}A!Z(FR0;HsMNc4i*OwIjiB_BC=9&j%nx#=hc}l%C(W#>rTlx zEq2SeF*n}hn}!r4@p7TKyMu|}jtZc->u^pd^L|wE f@`kpSc)jpHJ>^OCh`=SV00000NkvXXu0mjf*nT*Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..e6552421cb79bebb0258dc8cb55e8f059b311951 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfs#ajSYy~{{R1Hc;LYP{q>R_g3CD! zyk5NeuYUC8i$^|BEF>f66zOZ+vi^7cFrmx0Uf~L>FVdQ&MBb@0HcOS;Q#;t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b46e1388a673f94a61d0ea54982620ac0dbd5e41 GIT binary patch literal 645 zcmV;00($+4P)Ez4cy@YmlgIg>)z9i$Div? zj6p=GK7OL?I`sJZ!Zh@hT}S)nfwDVbyr+Hmx~ur6L0ilAl-7tW^uHdl#(VDm_>=MV z70DTGElWz=o}aK~McH*LR`1tEFALgQjPod^v0Fypv`k?noX_vvYg}E^|9ZsN4MqFm zy&sPHcp}A!Z(FR0;HsMNc4i*OwIjiB_BC=9&j%nx#=hc}l%C(W#>rTlx zEq2SeF*n}hn}!r4@p7TKyMu|}jtZc->u^pd^L|wE f@`kpSc)jpHJ>^OCh`=SV00000NkvXXu0mjf*nT*Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..d54b52803e665c9286cbf9ca929ed1683aa30a95 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf;Aa`8XH1n7T)>K)6u=*0P78h8}k=tGA|J{7MeFn{q^a(O$t}n-QRpO zXX7iY82xmeTc)?Z%zM22u_J@SafXfqZw+f-vYD^`9Aeqf(l%q3%pyjq;l6>@3tp4ap}wMP=Cy}Yk%kL t$4|MQB-lvKdjiz@VSn?QN6+6q;M{F>UMir%;1tm144$rjF6*2UngFMSWAy+4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..767935f4697d78fd2a07611de51dd7a3808a98e1 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfv?nIv}Ku@yAw|Sw(qInY&lZDD&tB-FK_I|k}&i1!b#lq``jLB9Gg5r zMAf(Um<4;ow!W&}4=2Z;TgH@-q#)aO;o755GJ=XN2Qm%ce-RWtp1R+8ijt;R&-a#X zN0&t|ujk&ervH+Zi@;LDdza^|_LHxS-En`N&8=xwyB()ENjmF$TK$c7h<4u^mw377 p^~Z+u+_P34;{DYB?>v7c)2I9XCF@!(WPq+_@O1TaS?83{1OVxLVcq}$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..8a71f876b8446cd8f323ec2ea1078522ad3b0bad GIT binary patch literal 392 zcmV;30eAk1P)%HXtcxQXG(4KD(^5E}>RiSFte+!3?} z2jK5=kuP6n!qF$%FCHGB!s+D|>(>Q(JOLp4Skl&-DoKchKq|%j<$2d9_W|BoY*o?e z^|58i_U9X^6lyr4H=O}ce0??y8UP_Bbx{xrLGX^?J^k4Q09BG8q(rnDEr`E6x!RDg zV(RS{J)W@r`NkPTTWf-Iv^t%`0A~zpFl2Ol2Y|^^ytSmuch-wJAp|1PoZ0Z{&o1Z= z25jD55mM5>z9D#zElW(EQ6(F^wTBIal;m+tm8R(PG5IQnD8f63R3`{2kxCr~l$#CS zIf8Qlv~`biy~bNh@E()re^1t20l+&8QACxdJ1cK3`6@&5KjfhwmOyd-v|3AMUxaTNJ&Z^m)Z?u`X&MELn*?O)6Ei`C`%e_iDY zy|~IjX*p-VLR;gV?pu zR33o6Iw!NcXE$*6@D7)o+q<93!8ISFC!(t!0A@PDk0R`9g(n0`YlaW^l};QQd>2Jc zoQ+46&fy7xZnsfdBZHupKpieZDWo5ejYj~K&H}JqEC6VAy9lXH8vuAhRN}(g>RkpQ zLaIiBT7}X%%yd$TOXnz^+s&4IKC2G=YY->tai9jw~tYv8Z*9{c%N+%VXa;v}W8metEM0C76Nd(Z`2YX_07*qoM6N<$f)m=33jhEB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..492c908ad32f059cbf919c44158f7c2c6264143d GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#ADAYR!s}y z-Wqg#E8d|M`n$oOQ<}}`Zjbns7{(-H$GOacF0yv2zkKC@0{pCRe@e4$`>g-V_t=>o zt5;2C(%=2v@X~Xid9^~X+Wvm;GRb{etY*?~>|OU&I=`{L?QNFj`{=_UuQGVL`njxg HN@xNAz>{U) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWall.png new file mode 100644 index 0000000000000000000000000000000000000000..fb6714a58b7e9a7e6608b36a011e8679dc094340 GIT binary patch literal 468 zcmV;_0W1EAP)E0PLq&{>A;LFID+B}2)=>%6oMf5d;&?erd#?!K)%y>jxn2@NpqR}GeUIxp%-sgpb@a|r zUOeT?)nzoy*UJUpK7Weji`Q?0HwLFQ`Pn&EDKty5i;AcL5+y60&l--QZ9UoYnwD zLXei_w%||?Y}*3x_2boex1&55xOXFfgFP6ycO!v=Js7zEYyJT}X)| Date: Wed, 17 Feb 2016 16:52:07 -0600 Subject: [PATCH 346/935] Fix a rare crash rendering the debug screen --- .../java/vazkii/botania/client/core/handler/DebugHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d4399ac22..09c356398 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -47,7 +47,7 @@ public final class DebugHandler { event.left.add(PREFIX + "pS: " + ParticleRenderDispatcher.sparkleFxCount + ", pFS: " + ParticleRenderDispatcher.fakeSparkleFxCount + ", pW: " + ParticleRenderDispatcher.wispFxCount + ", pDIW: " + ParticleRenderDispatcher.depthIgnoringWispFxCount + ", pLB: " + ParticleRenderDispatcher.lightningCount); event.left.add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); - if (Minecraft.getMinecraft().isIntegratedServerRunning()) { + if (Minecraft.getMinecraft().isSingleplayer()) { UUID id = Minecraft.getMinecraft().thePlayer.getUniqueID(); Entity ent = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id); if (ent != null) { From 9e0c7ba0c74ac31b44e31ba91c9371a293aa92c0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 17 Feb 2016 17:49:54 -0600 Subject: [PATCH 347/935] Cleanup in modelhandler, tweak to caching in corporea cube renderer --- .../client/core/handler/ModelHandler.java | 27 ++++--------------- .../tile/RenderTileCorporeaCrystalCube.java | 3 ++- 2 files changed, 7 insertions(+), 23 deletions(-) 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 119a13c90..9add37859 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -703,33 +703,16 @@ public final class ModelHandler { } private static void registerStateMappers() { - // Override to let smartmodels work, see RenderEventHandler - ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMapperBase() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:floatingSpecialFlower", "normal"); - } - }); - - ModelLoader.setCustomStateMapper(ModBlocks.floatingFlower, new StateMapperBase() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:miniIsland", "normal"); - } - }); - - ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMapperBase() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:platform", "normal"); - } - }); + // Override to let smart models work, see MiscellaneousIcons + ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.floatingFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); + ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by color multiplier) + // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); 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 63bdf3d9b..8bb440b54 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -143,7 +143,8 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(10).expireAfterWrite(100, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() + // Botania - expanded size to 15 to hold all states, expanded expire time to 1 sec for performance + protected static final LoadingCache, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(15).expireAfterWrite(1000, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() { public IBakedModel load(Pair key) throws Exception { From 4f8376a14801a5a928dfec64c350bec7e67457df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 18 Feb 2016 09:26:16 -0600 Subject: [PATCH 348/935] Fix dark quartz disabled crashing client (Renari), other cleanups in modelhandler. Closes #119. --- .../client/core/handler/ModelHandler.java | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) 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 9add37859..13359ebcf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,7 +8,9 @@ */ package vazkii.botania.client.core.handler; +import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -109,6 +111,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.ItemTwigWand; @@ -641,7 +644,6 @@ public final class ModelHandler { Item item = manaResource; for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); } } @@ -649,7 +651,6 @@ public final class ModelHandler { private static void registerRunes() { List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); for (int i = 0; i < variantNames.size(); i++) { - ModelLoader.registerItemVariants(rune, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); ModelLoader.setCustomModelResourceLocation(rune, i, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); } } @@ -673,13 +674,11 @@ public final class ModelHandler { private static void registerLens() { int counter = 0; for (String s : LibItemNames.LENS_NAMES) { - ModelLoader.registerItemVariants(lens, new ModelResourceLocation("botania:" + s, "inventory")); ModelLoader.setCustomModelResourceLocation(lens, counter++, new ModelResourceLocation("botania:" + s, "inventory")); } } private static void registerBrews() { - ModelLoader.registerItemVariants(vial, new ModelResourceLocation("botania:vial", "inventory"), new ModelResourceLocation("botania:flask", "inventory")); ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); @@ -745,16 +744,16 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); } - List otherSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, - ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab - }); + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab); for (Block b : otherSlabs) { + if (b == null) // Dark quartz disabled + continue; ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); } @@ -771,16 +770,16 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - List otherFullSlabs = ImmutableList.copyOf(new Block[] { - ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, - ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull - }); + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull); for (Block b : otherFullSlabs) { + if (b == null) // Dark quartz disabled + continue; ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } @@ -796,7 +795,6 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } @@ -805,14 +803,12 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_" + color.getName())); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } @@ -820,7 +816,6 @@ public final class ModelHandler { for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); String variant = "inventory_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); } @@ -828,7 +823,6 @@ public final class ModelHandler { for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); String variant = "inventory_" + color.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } } @@ -839,35 +833,29 @@ public final class ModelHandler { for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { String variant = "color=" + e.getName(); - switch (e) { + switch (e) { // Explicit switch needed because saved meta does not match EnumDyeColor case BLACK: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); break; } case BLUE: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); break; } case RED: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); break; } case YELLOW: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); break; } case GREEN: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); break; } case WHITE: default: { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variant)); ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); break; } @@ -890,7 +878,8 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.blazeQuartzStairs); registerItemModel(ModFluffBlocks.darkPrismarineStairs); - registerItemModel(ModFluffBlocks.darkQuartzStairs); + if (ConfigHandler.darkQuartzEnabled) + registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); registerItemModel(ModFluffBlocks.elfQuartzStairs); @@ -935,7 +924,8 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockBrickSlab); registerItemModel(ModFluffBlocks.blazeQuartzSlab); - registerItemModel(ModFluffBlocks.darkQuartzSlab); + if (ConfigHandler.darkQuartzEnabled) + registerItemModel(ModFluffBlocks.darkQuartzSlab); registerItemModel(ModFluffBlocks.elfQuartzSlab); registerItemModel(ModFluffBlocks.lavenderQuartzSlab); registerItemModel(ModFluffBlocks.manaQuartzSlab); @@ -965,14 +955,12 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { String variantName = "inventory_" + variant.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation("botania:stone0Wall", variantName)); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); } @@ -994,18 +982,16 @@ public final class ModelHandler { String name = GameData.getBlockRegistry().getNameForObject(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.registerItemVariants(item, new ModelResourceLocation(name, variantName)); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); } } private static void registerQuartzBlocks() { - for (Block b : ImmutableList.of(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { + for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { + if (b == null) // Dark quartz disabled + continue; Item item = Item.getItemFromBlock(b); String name = GameData.getBlockRegistry().getNameForObject(b).toString(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=normal")); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=chiseled")); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=pillar_y")); 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")); @@ -1016,7 +1002,6 @@ public final class ModelHandler { Item item = Item.getItemFromBlock(ModBlocks.lightRelay); String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); for (LuminizerVariant v : LuminizerVariant.values()) { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); } } @@ -1027,10 +1012,8 @@ public final class ModelHandler { for (PoolVariant v : PoolVariant.values()) { if (v == PoolVariant.CREATIVE) { // Special case to have mana water layer - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory_creative")); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "inventory_creative")); } else { - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "variant=" + v.getName())); ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "variant=" + v.getName())); } } @@ -1041,7 +1024,6 @@ public final class ModelHandler { for (T e : enumclazz.getEnumConstants()) { String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); - ModelLoader.registerItemVariants(item, new ModelResourceLocation(baseName, variantName)); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } } From 59939824a3ac966b83cfff1ada20fd7205bf8596 Mon Sep 17 00:00:00 2001 From: kevsgrove Date: Fri, 19 Feb 2016 07:08:12 -0800 Subject: [PATCH 349/935] Update BlockSolidVines.java --- .../vazkii/botania/common/block/BlockSolidVines.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index e9d533f93..cd1624108 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -41,6 +41,15 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBox(World w, BlockPos pos, IBlockState state) { setBlockBoundsBasedOnState(w, pos); + + if(state.getValue(EAST)) { + return new AxisAlignedBB(pos.add(maxX, minY, minZ), pos.add(maxX, maxY, maxZ)); + } + + if(state.getValue(SOUTH)) { + return new AxisAlignedBB(pos.add(minX, minY, maxZ), pos.add(maxX, maxY, maxZ)); + } + return new AxisAlignedBB(pos.add(minX, minY, minZ), pos.add(maxX, maxY, maxZ)); } From 90f793508a9bc3ff0685a5a44dc7cdaeea4c4a0c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Feb 2016 13:34:16 -0600 Subject: [PATCH 350/935] Tentative uuid fix for relics. #124 --- .../java/vazkii/botania/api/item/IRelic.java | 8 +- .../common/core/helper/ItemNBTHelper.java | 4 + .../common/entity/EntityDoppleganger.java | 2 +- .../botania/common/item/relic/ItemRelic.java | 159 +++++++----------- .../common/item/relic/ItemRelicBauble.java | 26 +-- 5 files changed, 87 insertions(+), 112 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index 80427d6e6..c8d72b877 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -28,8 +28,10 @@ public interface IRelic { public void bindToUsername(String playerName, ItemStack stack); /** - * Gets the username of the person this relic is bound to. + * Gets the username of the person this relic is bound to, or the empty String if the username field is empty. + * You should not use this to determine if a relic is bound, use UUIDs instead. */ + @Deprecated public String getSoulbindUsername(ItemStack stack); /** @@ -38,12 +40,12 @@ public interface IRelic { public void bindToUUID(UUID uuid, ItemStack stack); /** - * Gets the UUID of the person this relic is bound to. + * Gets the UUID of the person this relic is bound to, or null if a well-formed UUID could not be found */ public UUID getSoulbindUUID(ItemStack stack); /** - * Checks if the relic is using UUIDs. + * Checks if the relic contains a well-formed UUID. */ public boolean hasUUID(ItemStack stack); diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index 41c73315f..b0e773ef8 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -88,6 +88,10 @@ public final class ItemNBTHelper { getNBT(stack).setTag(tag, list); } + public static void removeEntry(ItemStack stack, String tag) { + getNBT(stack).removeTag(tag); + } + // GETTERS /////////////////////////////////////////////////////////////////// public static boolean verifyExistance(ItemStack stack, String tag) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 45cde6dc0..21efe684f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -448,7 +448,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); if(ConfigHandler.relicsEnabled) { ItemStack dice = new ItemStack(ModItems.dice); - ItemRelic.bindToUUIDS(playersWhoAttacked.get(pl), dice); + ((ItemRelic) ModItems.dice).bindToUUID(playersWhoAttacked.get(pl), dice); entityDropItem(dice, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 16970a1b0..05d69f75b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -16,10 +16,8 @@ import java.util.UUID; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; @@ -34,8 +32,7 @@ import vazkii.botania.common.item.ModItems; public class ItemRelic extends ItemMod implements IRelic { - @Deprecated - private static final String TAG_SOULBIND = "soulbind"; + private static final String TAG_SOULBIND_NAME = "soulbind"; private static final String TAG_SOULBIND_UUID = "soulbindUUID"; Achievement achievement; @@ -46,25 +43,24 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { - if(p_77663_3_ instanceof EntityPlayer) - updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + if(!world.isRemote && entity instanceof EntityPlayer) + updateRelic(stack, (EntityPlayer) entity); } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { - String bind = getSoulbindUsernameS(stack); - if(bind.isEmpty()) + if(!hasUUID(stack)) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); - else { - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list); - if(!isRightPlayer(player, stack)) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); + } else { + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); + if(!getSoulbindUUID(stack).equals(player.getUniqueID())) + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); } if(stack.getItem() == ModItems.aesirRing) @@ -92,115 +88,84 @@ public class ItemRelic extends ItemMod implements IRelic { tooltip.add(s.replaceAll("&", "\u00a7")); } - public static String getSoulbindUsernameS(ItemStack stack) { - if(hasUUIDS(stack)) - return UsernameCache.getLastKnownUsername(getSoulbindUUIDS(stack)); - return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); - } - - //TODO: Better name? - public static UUID getSoulbindUUIDS(ItemStack stack) { - if(hasUUIDS(stack)) - return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); - return null; - } - - public static void updateRelic(ItemStack stack, EntityPlayer player) { + public void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; - if(!hasUUIDS(stack) && isRightPlayer(player.getName(), stack)) - bindToPlayer(player, stack); + boolean rightPlayer = true; + if(hasUUID(stack)) { + // Sync to username todo is this worth 'optimizing'? + if (UsernameCache.containsUUID(getSoulbindUUID(stack))) { + bindToUsername(UsernameCache.getLastKnownUsername(getSoulbindUUID(stack)), stack); + } else { + bindToUsername("", stack); + } - String soulbind = getSoulbindUsernameS(stack); - if(soulbind.isEmpty()) { - player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); - bindToPlayer(player, stack); - soulbind = getSoulbindUsernameS(stack); + // UUID trumps username + rightPlayer = getSoulbindUUID(stack).equals(player.getUniqueID()); + } else { + if ("".equals(getSoulbindUsername(stack))) { + // New user + bindToUUID(player.getUniqueID(), stack); + player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); + } else { + if (player.getName().equals(getSoulbindUsername(stack))) { + // Old relic, correct owner, convert to UUID + bindToUUID(player.getUniqueID(), stack); + } else { + // Old relic, wrong owner, damage + rightPlayer = false; + } + } } - if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer())) + if(!rightPlayer && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer())) player.attackEntityFrom(damageSource(), 2); } - public static void bindToPlayer(EntityPlayer player, ItemStack stack) { - bindToUUIDS(player.getUniqueID(), stack); - } - - @Deprecated - public static void bindToUsernameS(String username, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOULBIND, username); - } - - //TODO: Better name? - public static void bindToUUIDS(UUID uuid, ItemStack stack) { - ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); - } - - public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { - if(hasUUIDS(stack)) - return isRightPlayer(player.getUniqueID(), stack); - return isRightPlayer(player.getName(), stack); - } - - public static boolean isRightPlayer(String player, ItemStack stack) { - return getSoulbindUsernameS(stack).equals(player); - } - - public static boolean isRightPlayer(UUID uuid, ItemStack stack) { - return getSoulbindUUIDS(stack) != null && getSoulbindUUIDS(stack).equals(uuid); + public boolean isRightPlayer(EntityPlayer player, ItemStack stack) { + if (hasUUID(stack)) { + return getSoulbindUUID(stack).equals(player.getUniqueID()); + } else { + return getSoulbindUsername(stack).equals(player.getName()); + } } public static DamageSource damageSource() { return new DamageSource("botania-relic"); } - //TODO: Better name? - public static boolean hasUUIDS(ItemStack stack) { - return ItemNBTHelper.verifyExistance(stack, TAG_SOULBIND_UUID); + @Override + public void bindToUsername(String playerName, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND_NAME, playerName); } - public static UUID usernameToUUID(String username) { - return getPlayerByName(username) == null ? null : getPlayerByName(username).getUniqueID(); + @Override + public String getSoulbindUsername(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_SOULBIND_NAME, ""); } - public static EntityPlayer getPlayerByName(String username) { - if(username.isEmpty()) - return null; + @Override + public void bindToUUID(UUID uuid, ItemStack stack) { + ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString()); + } - List playerList = MinecraftServer.getServer().getConfigurationManager().playerEntityList; - for (EntityPlayerMP player : playerList) { - if (player.getName().equals(username)) - return player; + @Override + public UUID getSoulbindUUID(ItemStack stack) { + if(ItemNBTHelper.verifyExistance(stack, TAG_SOULBIND_UUID)) { + try { + return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, "")); + } catch (IllegalArgumentException ex) { // Bad UUID in tag + ItemNBTHelper.removeEntry(stack, TAG_SOULBIND_UUID); + } } return null; } - @Override - @Deprecated - public void bindToUsername(String playerName, ItemStack stack) { - bindToUsernameS(playerName, stack); - } - - @Override - public String getSoulbindUsername(ItemStack stack) { - return getSoulbindUsernameS(stack); - } - - @Override - public void bindToUUID(UUID uuid, ItemStack stack) { - bindToUUIDS(uuid, stack); - } - - @Override - public UUID getSoulbindUUID(ItemStack stack) { - return getSoulbindUUIDS(stack); - } - @Override public boolean hasUUID(ItemStack stack) { - return hasUUIDS(stack); + return getSoulbindUUID(stack) != null; } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index ebf0e0586..e3b13ca4b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -17,6 +17,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; @@ -27,6 +28,9 @@ import vazkii.botania.common.item.equipment.bauble.ItemBauble; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; + private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff. If we had traits this would mixed in. + @Override public Item setUnlocalizedName(String ignored) { return this; } // Don't register to the game + }; public ItemRelicBauble(String name) { super(name); @@ -35,7 +39,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Override public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { if(p_77663_3_ instanceof EntityPlayer) - ItemRelic.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + dummy.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); } @Override @@ -43,16 +47,16 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { super.onWornTick(stack, player); if(player instanceof EntityPlayer) { EntityPlayer ePlayer = (EntityPlayer) player; - ItemRelic.updateRelic(stack, ePlayer); - if(ItemRelic.isRightPlayer(ePlayer, stack)) + dummy.updateRelic(stack, ePlayer); + if(dummy.isRightPlayer(ePlayer, stack)) onValidPlayerWornTick(stack, ePlayer); } } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - ItemRelic.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); + dummy.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); } public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { @@ -61,32 +65,32 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Override public boolean canEquip(ItemStack stack, EntityLivingBase player) { - return player instanceof EntityPlayer && ItemRelic.isRightPlayer((EntityPlayer) player, stack); + return player instanceof EntityPlayer && dummy.isRightPlayer(((EntityPlayer) player), stack); } @Override public void bindToUsername(String playerName, ItemStack stack) { - ItemRelic.bindToUsernameS(playerName, stack); + dummy.bindToUsername(playerName, stack); } @Override public String getSoulbindUsername(ItemStack stack) { - return ItemRelic.getSoulbindUsernameS(stack); + return dummy.getSoulbindUsername(stack); } @Override public void bindToUUID(UUID uuid, ItemStack stack) { - ItemRelic.bindToUUIDS(uuid, stack); + dummy.bindToUUID(uuid, stack); } @Override public UUID getSoulbindUUID(ItemStack stack) { - return ItemRelic.getSoulbindUUIDS(stack); + return dummy.getSoulbindUUID(stack); } @Override public boolean hasUUID(ItemStack stack) { - return ItemRelic.hasUUIDS(stack); + return dummy.hasUUID(stack); } @Override From 7967f25c1c5e4eba6beebb605187a1fe1f31deaa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Feb 2016 17:24:31 -0600 Subject: [PATCH 351/935] Change a bunch of heavy reflection to use methodhandles --- .../core/handler/BoundTileRenderer.java | 25 +++++----- .../core/handler/MultiblockRenderHandler.java | 25 +++++----- .../core/handler/RedStringRenderer.java | 25 +++++----- .../handler/SubTileRadiusRenderHandler.java | 37 ++++++++------ .../tile/RenderTileCorporeaCrystalCube.java | 6 ++- .../render/tile/RenderTileEnchanter.java | 6 ++- .../common/block/mana/BlockTerraPlate.java | 2 +- .../subtile/functional/SubTileDaffomill.java | 13 ++++- .../subtile/functional/SubTileHopperhock.java | 9 +++- .../functional/SubTilePollidisiac.java | 10 +++- .../functional/SubTileRannuncarpus.java | 10 +++- .../functional/SubTileSpectranthemum.java | 10 +++- .../subtile/generating/SubTileEndoflame.java | 12 ++++- .../generating/SubTileGourmaryllis.java | 11 ++++- .../subtile/generating/SubTileSpectrolus.java | 11 ++++- .../common/block/tile/TileOpenCrate.java | 9 +++- .../common/block/tile/TileRuneAltar.java | 2 +- .../common/block/tile/mana/TilePool.java | 11 ++++- .../core/handler/BotaniaMethodHandles.java | 48 +++++++++++++++++++ .../common/entity/EntityThrownItem.java | 20 +++++--- .../botania/common/item/ItemCraftingHalo.java | 25 +++++----- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/manasteel/ItemManasteelShears.java | 2 +- .../common/item/relic/ItemAesirRing.java | 24 +++++----- .../common/item/rod/ItemGravityRod.java | 4 +- 25 files changed, 252 insertions(+), 107 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index be1071004..02dadef08 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -36,6 +36,7 @@ import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lib.LibObfuscation; public final class BoundTileRenderer { @@ -98,21 +99,19 @@ public final class BoundTileRenderer { renderBlockOutlineAt(pos, color, 1F); } - private double getRenderPosX() { // todo 1.8 - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); - } - - private double getRenderPosY() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); - } - - private double getRenderPosZ() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); - } - private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return; + } + GlStateManager.pushMatrix(); - GlStateManager.translate(pos.getX() - getRenderPosX(), pos.getY() - getRenderPosY(), pos.getZ() - getRenderPosZ() + 1); + GlStateManager.translate(pos.getX() - renderPosX, pos.getY() - renderPosY, pos.getZ() - renderPosZ + 1); Color colorRGB = new Color(color); GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); 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 2889cb870..c021adea8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -35,6 +35,7 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lib.LibObfuscation; public final class MultiblockRenderHandler { @@ -140,26 +141,24 @@ public final class MultiblockRenderHandler { } } - private double getRenderPosX() { // todo 1.8 - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); - } - - private double getRenderPosY() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); - } - - private double getRenderPosZ() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); - } - private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return true; + } + BlockPos pos = comp.getRelativePosition(); BlockPos pos_ = pos.add(anchorPos); if(anchor != null && comp.matches(world, pos_)) return false; GlStateManager.pushMatrix(); - GlStateManager.translate(-getRenderPosX(), -getRenderPosY(), -getRenderPosZ()); + GlStateManager.translate(-renderPosX, -renderPosY, -renderPosZ); GlStateManager.disableDepth(); doRenderComponent(mb, comp, pos_, 0.4F); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 61458141b..b5d8bab5c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibObfuscation; @@ -68,25 +69,23 @@ public final class RedStringRenderer { sizeAlpha += 0.1F; } - private static double getRenderPosX() { // todo 1.8 - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); - } - - private static double getRenderPosY() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); - } - - private static double getRenderPosZ() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); - } - private static void renderTile(TileRedString tile) { + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return; + } + EnumFacing dir = tile.getOrientation(); BlockPos bind = tile.getBinding(); if(bind != null) { GlStateManager.pushMatrix(); - GlStateManager.translate(tile.getPos().getX() + 0.5 - getRenderPosX(), tile.getPos().getY() + 0.5 - getRenderPosY(), tile.getPos().getZ() + 0.5 - getRenderPosZ()); + GlStateManager.translate(tile.getPos().getX() + 0.5 - renderPosX, tile.getPos().getY() + 0.5 - renderPosY, tile.getPos().getZ() + 0.5 - renderPosZ); Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ()); Vector3 vecNorm = vecOrig.copy().normalize(); Vector3 vecMag = vecNorm.copy().multiply(0.025); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index da9e6c000..a159d4b0d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -31,6 +31,7 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -84,21 +85,19 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private double getRenderPosX() { // todo 1.8 - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); - } - - private double getRenderPosY() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); - } - - private double getRenderPosZ() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); - } - public void renderRectangle(AxisAlignedBB aabb) { + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return; + } + GlStateManager.pushMatrix(); - GlStateManager.translate(aabb.minX - getRenderPosX(), aabb.minY - getRenderPosY(), aabb.minZ - getRenderPosZ()); + GlStateManager.translate(aabb.minX - renderPosX, aabb.minY - renderPosY, aabb.minZ - renderPosZ); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); @@ -132,11 +131,21 @@ public final class SubTileRadiusRenderHandler { } public void renderCircle(BlockPos center, double radius) { + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return; + } + GlStateManager.pushMatrix(); double x = center.getX() + 0.5; double y = center.getY(); double z = center.getZ() + 0.5; - GlStateManager.translate(x - getRenderPosX(), y - getRenderPosY(), z - getRenderPosZ()); + GlStateManager.translate(x - renderPosX, y - renderPosY, z - renderPosZ); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); Color colorRGB = new Color(color); 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 8bb440b54..caa7428b5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -48,6 +48,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lib.LibObfuscation; import java.util.concurrent.TimeUnit; @@ -65,7 +66,10 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { @@ -49,7 +50,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis); int slowdown = getSlowdownFactor(); - for(EntityItem item : items) - if(!item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { + for(EntityItem item : items) { + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(!item.isDead && age >= slowdown) { item.motionX += orientation.getFrontOffsetX() * 0.05; item.motionY += orientation.getFrontOffsetY() * 0.05; item.motionZ += orientation.getFrontOffsetZ() * 0.05; } + } } windTicks--; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 3e13aa328..470791393 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -40,6 +40,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -74,7 +75,13 @@ public class SubTileHopperhock extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE); + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + if(age < (60 + slowdown) || age >= 105 && age < 110 || item.isDead) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 6d78a8150..5e708111c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -20,6 +20,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -46,7 +47,14 @@ public class SubTilePollidisiac extends SubTileFunctional { int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); if(animal.getGrowingAge() == 0 && love <= 0) { for(EntityItem item : items) { - if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(age < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); 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 0675644d9..112e8c409 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 @@ -41,6 +41,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; @@ -80,7 +81,14 @@ public class SubTileRannuncarpus extends SubTileFunctional { List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead) + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(age < (60 + slowdown) || item.isDead) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index b0039c991..74b6c13dc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -24,6 +24,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.relauncher.Side; @@ -57,7 +58,14 @@ public class SubTileSpectranthemum extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { - if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(age < (60 + slowdown) || item.isDead || item.getEntityData().getBoolean(TAG_TELEPORTED)) continue; ItemStack stack = item.getEntityItem(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index f6fb2a8cb..719584c2d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -24,6 +24,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -46,9 +47,16 @@ public class SubTileEndoflame extends SubTileGenerating { int slowdown = getSlowdownFactor(); - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityItem item : items) { - if(((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= (59 + slowdown) && !item.isDead) { + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(age >= (59 + slowdown) && !item.isDead) { ItemStack stack = item.getEntityItem(); if(stack.getItem().hasContainerItem(stack)) continue; 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 fec6996ce..95bb589f3 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 @@ -24,6 +24,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -56,7 +57,15 @@ public class SubTileGourmaryllis extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { + + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && age >= slowdown) { if(cooldown <= 0) { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; 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 643ee87a9..06db0defb 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 @@ -31,6 +31,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -54,7 +55,15 @@ public class SubTileSpectrolus extends SubTileGenerating { for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == wool && !item.isDead && ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE)) >= slowdown) { + + int age; + try { + age = (int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item); + } catch (Throwable t) { + continue; + } + + if(stack != null && stack.getItem() == wool && !item.isDead && age >= slowdown) { int meta = stack.getItemDamage(); if(meta == nextColor) { if(!remote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 56853d8ac..7a60ce9db 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -19,6 +19,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; @@ -71,8 +72,12 @@ public class TileOpenCrate extends TileSimpleInventory { item.motionY = 0; item.motionZ = 0; - if(redstone) - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, -200, LibObfuscation.AGE); + if(redstone) { + try { + BotaniaMethodHandles.SETITEMAGE.invokeExact(item, -200); + } catch (Throwable ignored) {} + } + setInventorySlotContents(0, null); worldObj.spawnEntityInWorld(item); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 97b9d3754..3256491a2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -69,7 +69,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } EntityItem item = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, new ItemStack(ModBlocks.livingrock)); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, 40, LibObfuscation.PICKUP_DELAY); + item.setPickupDelay(40); item.motionX = item.motionY = item.motionZ = 0; if(!worldObj.isRemote) worldObj.spawnEntityInWorld(item); 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 c537922a7..8909d080d 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 @@ -58,6 +58,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; @@ -150,7 +151,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - int age = ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.AGE); + int age; + try { + age = ((int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item)); + } catch (Throwable throwable) { return false; } + if(age > 100 && age < 130 || !catalystsRegistered) return false; @@ -167,7 +172,9 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ItemStack output = recipe.getOutput().copy(); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, outputItem, 105, LibObfuscation.AGE); + try { + BotaniaMethodHandles.SETITEMAGE.invokeExact(outputItem, 105); + } catch (Throwable ignored) {} worldObj.spawnEntityInWorld(outputItem); } diff --git a/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java new file mode 100644 index 000000000..6a65833d6 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java @@ -0,0 +1,48 @@ +package vazkii.botania.common.core.handler; + +import com.google.common.base.Throwables; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.item.EntityItem; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Field; + +public final class BotaniaMethodHandles { + + public static final MethodHandle + GETRENDERPOSX, GETRENDERPOSY, GETRENDERPOSZ, + GETITEMAGE, SETITEMAGE, + GETPICKUPDELAY; // Already has setter in vanilla + + static { + try { + Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); + f.setAccessible(true); + GETRENDERPOSX = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); + f.setAccessible(true); + GETRENDERPOSY = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); + f.setAccessible(true); + GETRENDERPOSZ = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); + f.setAccessible(true); + GETITEMAGE = MethodHandles.publicLookup().unreflectGetter(f); + SETITEMAGE = MethodHandles.publicLookup().unreflectSetter(f); + + f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY); + f.setAccessible(true); + GETPICKUPDELAY = MethodHandles.publicLookup().unreflectGetter(f); + } catch (Throwable t) { + throw Throwables.propagate(t); + } + } + + private BotaniaMethodHandles() {} +} diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index c6fcf392b..e3988ec99 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -22,6 +22,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; @@ -35,12 +36,12 @@ public class EntityThrownItem extends EntityItem { double p_i1710_4_, double p_i1710_6_, EntityItem item) { super(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, item.getEntityItem()); - ObfuscationReflectionHelper.setPrivateValue( - EntityItem.class, - this, - ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, item, LibObfuscation.PICKUP_DELAY), - LibObfuscation.PICKUP_DELAY - ); + int pickupDelay = 0; + try { + pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(item); + } catch (Throwable ignored) {} + + item.setPickupDelay(pickupDelay); motionX = item.motionX; motionY = item.motionY; motionZ = item.motionZ; @@ -70,7 +71,12 @@ public class EntityThrownItem extends EntityItem { { Entity entity1 = (Entity)list.get(j); - if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || ((Integer) ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, this, LibObfuscation.PICKUP_DELAY)) == 0)) + int pickupDelay; + try { + pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(this); + } catch (Throwable ignored) { continue; } + + if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) { float f = 1.0F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index b07b68f38..cd06c64d0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -46,6 +46,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper.GenericInventory; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -391,24 +392,22 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { render(stack, player, event.partialTicks); } - private double getRenderPosX() { // todo 1.8 - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX); - } - - private double getRenderPosY() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY); - } - - private double getRenderPosZ() { - return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ); - } - @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); // todo 1.8.8 Tessellator.renderingWorldRenderer = false; + double renderPosX, renderPosY, renderPosZ; + + try { + renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + } catch (Throwable t) { + return; + } + GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -418,7 +417,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks; double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks; - GlStateManager.translate(posX - getRenderPosX(), posY - getRenderPosY() + player.getDefaultEyeHeight(), posZ - getRenderPosZ()); + GlStateManager.translate(posX - renderPosX, posY - renderPosY + player.getDefaultEyeHeight(), posZ - renderPosZ); float base = getRotationBase(stack); 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 7915b1272..8863e4769 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 @@ -60,7 +60,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { private void addDrop(LivingDropsEvent event, ItemStack drop) { EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entityitem, 10, LibObfuscation.PICKUP_DELAY); + entityitem.setPickupDelay(10); event.drops.add(entityitem); } 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 b9b2a3775..5b2706a99 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 @@ -108,7 +108,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { double d2 = rand.nextFloat() * f + (1D - f) * 0.5; EntityItem entityitem = new EntityItem(player.worldObj, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entityitem, 10, LibObfuscation.PICKUP_DELAY); + entityitem.setPickupDelay(10); player.worldObj.spawnEntityInWorld(entityitem); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 9c91f84f7..e03695d60 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -31,6 +31,7 @@ import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -69,18 +70,17 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; entity.motionZ = event.entityItem.motionZ; - ObfuscationReflectionHelper.setPrivateValue( - EntityItem.class, - entity, - ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, event.entityItem, LibObfuscation.AGE), - LibObfuscation.AGE - ); - ObfuscationReflectionHelper.setPrivateValue( - EntityItem.class, - entity, - ObfuscationReflectionHelper.getPrivateValue(EntityItem.class, event.entityItem, LibObfuscation.PICKUP_DELAY), - LibObfuscation.PICKUP_DELAY - ); + + try { + BotaniaMethodHandles.SETITEMAGE.invokeExact(entity, BotaniaMethodHandles.GETITEMAGE.invokeExact(entity)); + } catch (Throwable ignored) {} + + int pickupDelay = 0; + try { + pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(event.entityItem); + } catch (Throwable ignored) {} + entity.setPickupDelay(pickupDelay); + entity.worldObj.spawnEntityInWorld(entity); } } 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 5cede98a0..ead1886b4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -138,7 +138,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { if(item instanceof EntityItem) - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, ((EntityItem) item), 5, LibObfuscation.PICKUP_DELAY); + ((EntityItem) item).setPickupDelay(5); if(item instanceof EntityLivingBase) { EntityLivingBase targetEntity = (EntityLivingBase)item; @@ -224,7 +224,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setDouble(stack, TAG_DIST, -1); Vector3 moveVector = new Vector3(player.getLookVec().normalize()); if(item instanceof EntityItem) { - ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, ((EntityItem) item), 20, LibObfuscation.PICKUP_DELAY); + ((EntityItem) item).setPickupDelay(20); float mot = IManaProficiencyArmor.Helper.hasProficiency(player) ? 2.25F : 1.5F; item.motionX = moveVector.x * mot; item.motionY = moveVector.y; From b4d69dbac2fb2cf395372e2fa333739b706edf21 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Feb 2016 17:26:29 -0600 Subject: [PATCH 352/935] Fix aesir not binding drops to uuid --- .../java/vazkii/botania/common/item/relic/ItemAesirRing.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index e03695d60..41b4819cd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.List; +import java.util.UUID; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -62,10 +63,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe if(stack.getItem() != null && stack.getItem() == this) { event.entityItem.setDead(); - String user = getSoulbindUsername(stack); + UUID user = getSoulbindUUID(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); - bindToUsername(user, stack1); + bindToUUID(user, stack1); EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); entity.motionX = event.entityItem.motionX; entity.motionY = event.entityItem.motionY; From 91d234e6edaeee8392bfdb9d99ee7c50f4c5d962 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Feb 2016 17:40:20 -0600 Subject: [PATCH 353/935] Fix life aggregator being completely broken --- .../botania/common/item/ItemSpawnerMover.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index cbe2e2e11..1a773a781 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -29,6 +27,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemSpawnerMover extends ItemMod { public static final String TAG_SPAWNER = "spawner"; @@ -106,45 +106,43 @@ public class ItemSpawnerMover extends ItemMod { return true; } else return false; } else { - if(getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, pos, side, xOffset, yOffset, zOffset)) - return true; - return false; + return getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, pos, side, xOffset, yOffset, zOffset); } } + // Adapted from ItemBlock.onItemUse private boolean placeBlock(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xOffset, float yOffset, float zOffset) { - Block block = world.getBlockState(pos).getBlock(); + IBlockState iblockstate = world.getBlockState(pos); + Block block = iblockstate.getBlock(); - if(block == Blocks.snow_layer) - side = EnumFacing.UP; - else if(block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, pos)) { + if(!block.isReplaceable(world, pos)) { pos = pos.offset(side); } - if(itemstack.stackSize == 0) + if(itemstack.stackSize == 0) { return false; - else if(!player.canPlayerEdit(pos, side, itemstack)) + } else if(!player.canPlayerEdit(pos, side, itemstack)) { return false; - else if(pos.getY() == 255 && block.getMaterial().isSolid()) - return false; - else if(world.canBlockBePlaced(Blocks.mob_spawner, pos, false, side, player, itemstack)) { - IBlockState state = block.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, 0, player); + } 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); - if(placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, state)) { - world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.stepSound.getStepSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getFrequency() * 0.8F); + if (placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, iblockstate1)) { + world.playSoundEffect((double) ((float) pos.getX() + 0.5F), (double) ((float) pos.getY() + 0.5F), (double) ((float) pos.getZ() + 0.5F), Blocks.mob_spawner.stepSound.getPlaceSound(), (Blocks.mob_spawner.stepSound.getVolume() + 1.0F) / 2.0F, Blocks.mob_spawner.stepSound.getFrequency() * 0.8F); + --itemstack.stackSize; player.renderBrokenItemStack(itemstack); player.addStat(ModAchievements.spawnerMoverUse, 1); for(int i = 0; i < 100; i++) Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); - - --itemstack.stackSize; } return true; + } else { + return false; } - else return false; } + // Adapted from ItemBlock.placeBlockAt private boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) { if (!world.setBlockState(pos, state, 3)) return false; From d7d4440b0e1bc5bf5845d4ee93cfbc79f7f57517 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Feb 2016 18:18:12 -0600 Subject: [PATCH 354/935] Update spawner claw to use methodhandles --- .../core/handler/BoundTileRenderer.java | 9 +-- .../core/handler/MultiblockRenderHandler.java | 9 +-- .../core/handler/RedStringRenderer.java | 9 +-- .../handler/SubTileRadiusRenderHandler.java | 15 ++-- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileEnchanter.java | 4 +- .../subtile/functional/SubTileDaffomill.java | 4 +- .../subtile/functional/SubTileHopperhock.java | 4 +- .../functional/SubTilePollidisiac.java | 3 +- .../functional/SubTileRannuncarpus.java | 3 +- .../functional/SubTileSpectranthemum.java | 4 +- .../subtile/generating/SubTileEndoflame.java | 4 +- .../generating/SubTileGourmaryllis.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 4 +- .../common/block/tile/TileOpenCrate.java | 4 +- .../common/block/tile/TileSpawnerClaw.java | 56 ++++++------- .../common/block/tile/mana/TilePool.java | 6 +- .../core/handler/BotaniaMethodHandles.java | 78 ++++++++++++++++--- .../common/entity/EntityThrownItem.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 9 +-- .../common/item/relic/ItemAesirRing.java | 6 +- 21 files changed, 128 insertions(+), 117 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 02dadef08..fb09416a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -17,7 +17,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -27,7 +26,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -37,7 +35,6 @@ import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.handler.BotaniaMethodHandles; -import vazkii.botania.common.lib.LibObfuscation; public final class BoundTileRenderer { @@ -103,9 +100,9 @@ public final class BoundTileRenderer { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } 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 c021adea8..c6c743b65 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -14,7 +14,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; @@ -26,7 +25,6 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; @@ -36,7 +34,6 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.BotaniaMethodHandles; -import vazkii.botania.common.lib.LibObfuscation; public final class MultiblockRenderHandler { @@ -145,9 +142,9 @@ public final class MultiblockRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return true; } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index b5d8bab5c..ff032183f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -17,20 +17,17 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibObfuscation; public final class RedStringRenderer { @@ -73,9 +70,9 @@ public final class RedStringRenderer { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index a159d4b0d..37cee3bde 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -15,7 +15,6 @@ import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,7 +23,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; @@ -35,7 +33,6 @@ import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.common.lib.LibObfuscation; public final class SubTileRadiusRenderHandler { @@ -89,9 +86,9 @@ public final class SubTileRadiusRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } @@ -134,9 +131,9 @@ public final class SubTileRadiusRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } 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 caa7428b5..5db894c18 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -40,7 +40,6 @@ import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.Event; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; @@ -49,7 +48,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.BotaniaMethodHandles; -import vazkii.botania.common.lib.LibObfuscation; import java.util.concurrent.TimeUnit; @@ -67,7 +65,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { @@ -51,7 +49,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jul 23, 2014, 5:32:11 PM (GMT)] */ package vazkii.botania.common.block.tile; @@ -26,8 +26,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.WeightedRandom; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.core.handler.BotaniaMethodHandles; public class TileSpawnerClaw extends TileMod implements IManaReceiver { @@ -35,13 +34,6 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { int mana = 0; - private static final Method isActivated = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); - private static final Field spawnDelay = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); - private static final Field mobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); - private static final Field prevMobRotation = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); - private static final Method spawnNewEntity = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class); - private static final Method getEntityNameToSpawn = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); - @Override public void updateEntity() { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); @@ -51,26 +43,26 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { try { // Directly drawn from MobSpawnerBaseLogic, with inverted isActivated check and mana consumption - if(!((Boolean) isActivated.invoke(logic))) { + if(!((boolean) BotaniaMethodHandles.isActivated.invokeExact(logic))) { if(!worldObj.isRemote) mana -= 6; if(logic.getSpawnerWorld().isRemote) { - int delay = spawnDelay.getInt(logic); + int delay = ((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)); if(delay > 0) - spawnDelay.setInt(logic, delay - 1); + BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); if(Math.random() > 0.5) Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); - prevMobRotation.set(logic, logic.getMobRotation()); - mobRotation.set(logic, (logic.getMobRotation() + 1000.0F / (spawnDelay.getInt(logic) + 200.0F)) % 360.0D); + BotaniaMethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation()); + BotaniaMethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D); } else { - if(spawnDelay.getInt(logic) == -1) + if(((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) == -1) resetTimer(logic); - int delay = spawnDelay.getInt(logic); + int delay = ((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)); if(delay > 0) { - spawnDelay.setInt(logic, delay - 1); + BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); return; } @@ -79,12 +71,12 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { boolean flag = false; - int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); - int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); - int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); + int spawnCount = ((int) BotaniaMethodHandles.spawnCount_getter.invokeExact(logic)); + int spawnRange = ((int) BotaniaMethodHandles.spawnRange_getter.invokeExact(logic)); + int maxNearbyEntities = ((int) BotaniaMethodHandles.maxNearbyEntities_getter.invokeExact(logic)); for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(((String) getEntityNameToSpawn.invoke(logic)), logic.getSpawnerWorld()); + Entity entity = EntityList.createEntityByName(((String) BotaniaMethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld()); if (entity == null) return; @@ -103,7 +95,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); if(entityliving == null || entityliving.getCanSpawnHere() && entityliving.isNotColliding()) { - spawnNewEntity.invoke(logic, entity, true); + BotaniaMethodHandles.spawnNewEntity.invokeExact(logic, entity, true); this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); if(entityliving != null) { @@ -120,23 +112,23 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); + } catch (Throwable t) { + t.printStackTrace(); } } } // Direct copy of MobSpawnerBaseLogic.resetTimer() - private void resetTimer(MobSpawnerBaseLogic logic) throws IllegalAccessException { - int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); - int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); - List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + private void resetTimer(MobSpawnerBaseLogic logic) throws Throwable { + int maxSpawnDelay = ((int) BotaniaMethodHandles.maxSpawnDelay_getter.invokeExact(logic)); + int minSpawnDelay = ((int) BotaniaMethodHandles.minSpawnDelay_getter.invokeExact(logic)); + List potentialEntitySpawns = ((List) BotaniaMethodHandles.potentialSpawns_getter.invokeExact(logic)); if(maxSpawnDelay <= minSpawnDelay) - spawnDelay.set(logic, minSpawnDelay); + BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay); else { int i = maxSpawnDelay - minSpawnDelay; - spawnDelay.set(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i)); + BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i)); } if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) 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 8909d080d..a61adfc6b 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 @@ -34,7 +34,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -65,7 +64,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibObfuscation; public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { @@ -153,7 +151,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int age; try { - age = ((int) BotaniaMethodHandles.GETITEMAGE.invokeExact(item)); + age = ((int) BotaniaMethodHandles.itemAge_getter.invokeExact(item)); } catch (Throwable throwable) { return false; } if(age > 100 && age < 130 || !catalystsRegistered) @@ -173,7 +171,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ItemStack output = recipe.getOutput().copy(); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); try { - BotaniaMethodHandles.SETITEMAGE.invokeExact(outputItem, 105); + BotaniaMethodHandles.itemAge_setter.invokeExact(outputItem, 105); } catch (Throwable ignored) {} worldObj.spawnEntityInWorld(outputItem); } diff --git a/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java index 6a65833d6..bede968eb 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java @@ -2,43 +2,103 @@ package vazkii.botania.common.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; +import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; +import java.lang.reflect.Method; +// MethodHandles for frequently reflected fields and methods. +// Handles suffixed with _getter and _setter are for fields, while those without suffixes are normal methods. public final class BotaniaMethodHandles { public static final MethodHandle - GETRENDERPOSX, GETRENDERPOSY, GETRENDERPOSZ, - GETITEMAGE, SETITEMAGE, - GETPICKUPDELAY; // Already has setter in vanilla + renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager + itemAge_getter, itemAge_setter, pickupDelay_getter, // EntityItem, pickup delay already has setter in vanilla + spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, + maxSpawnDelay_getter, minSpawnDelay_getter, + spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, + getEntityNameToSpawn, isActivated, spawnNewEntity; // MobSpawnerBaseLogic static { try { Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); f.setAccessible(true); - GETRENDERPOSX = MethodHandles.publicLookup().unreflectGetter(f); + renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); f.setAccessible(true); - GETRENDERPOSY = MethodHandles.publicLookup().unreflectGetter(f); + renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); f.setAccessible(true); - GETRENDERPOSZ = MethodHandles.publicLookup().unreflectGetter(f); + renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); f.setAccessible(true); - GETITEMAGE = MethodHandles.publicLookup().unreflectGetter(f); - SETITEMAGE = MethodHandles.publicLookup().unreflectSetter(f); + itemAge_getter = MethodHandles.publicLookup().unreflectGetter(f); + itemAge_setter = MethodHandles.publicLookup().unreflectSetter(f); f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY); f.setAccessible(true); - GETPICKUPDELAY = MethodHandles.publicLookup().unreflectGetter(f); + pickupDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_RANGE); + f.setAccessible(true); + spawnRange_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_COUNT); + f.setAccessible(true); + spawnCount_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_NEARBY_ENTITIES); + f.setAccessible(true); + maxNearbyEntities_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_SPAWN_DELAY); + f.setAccessible(true); + maxSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MIN_SPAWN_DELAY); + f.setAccessible(true); + minSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); + f.setAccessible(true); + spawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); + f.setAccessible(true); + spawnDelay_setter = MethodHandles.publicLookup().unreflectSetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); + f.setAccessible(true); + prevMobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); + f.setAccessible(true); + mobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f); + + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + f.setAccessible(true); + potentialSpawns_getter = MethodHandles.publicLookup().unreflectGetter(f); + + Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); + m.setAccessible(true); + isActivated = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class); + m.setAccessible(true); + spawnNewEntity = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); + m.setAccessible(true); + getEntityNameToSpawn = MethodHandles.publicLookup().unreflect(m); } catch (Throwable t) { throw Throwables.propagate(t); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index e3988ec99..d035d848e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -21,10 +21,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibObfuscation; public class EntityThrownItem extends EntityItem { @@ -38,7 +36,7 @@ public class EntityThrownItem extends EntityItem { int pickupDelay = 0; try { - pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(item); + pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(item); } catch (Throwable ignored) {} item.setPickupDelay(pickupDelay); @@ -73,7 +71,7 @@ public class EntityThrownItem extends EntityItem { int pickupDelay; try { - pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(this); + pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(this); } catch (Throwable ignored) { continue; } if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index cd06c64d0..d87552d0f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -17,7 +17,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; @@ -37,7 +36,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -58,7 +56,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.common.lib.LibObfuscation; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @@ -401,9 +398,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.GETRENDERPOSX.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.GETRENDERPOSY.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.GETRENDERPOSZ.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 41b4819cd..82e8be93d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -25,7 +25,6 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; @@ -43,7 +42,6 @@ import com.google.common.collect.Multimap; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.common.lib.LibObfuscation; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { @@ -73,12 +71,12 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe entity.motionZ = event.entityItem.motionZ; try { - BotaniaMethodHandles.SETITEMAGE.invokeExact(entity, BotaniaMethodHandles.GETITEMAGE.invokeExact(entity)); + BotaniaMethodHandles.itemAge_setter.invokeExact(entity, BotaniaMethodHandles.itemAge_getter.invokeExact(entity)); } catch (Throwable ignored) {} int pickupDelay = 0; try { - pickupDelay = (int) BotaniaMethodHandles.GETPICKUPDELAY.invokeExact(event.entityItem); + pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(event.entityItem); } catch (Throwable ignored) {} entity.setPickupDelay(pickupDelay); From 9b3579fe56e0de6fba1bba961b82ef4aadbd592e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 21 Feb 2016 17:03:28 -0600 Subject: [PATCH 355/935] Fix touching client classes in methodhandles. Closes #129 --- .../core/handler/BoundTileRenderer.java | 7 +-- .../core/handler/ClientMethodHandles.java | 38 +++++++++++++ .../core/handler/MultiblockRenderHandler.java | 7 +-- .../core/handler/RedStringRenderer.java | 7 +-- .../handler/SubTileRadiusRenderHandler.java | 13 ++--- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileEnchanter.java | 4 +- .../subtile/functional/SubTileDaffomill.java | 4 +- .../subtile/functional/SubTileHopperhock.java | 4 +- .../functional/SubTilePollidisiac.java | 4 +- .../functional/SubTileRannuncarpus.java | 4 +- .../functional/SubTileSpectranthemum.java | 4 +- .../subtile/generating/SubTileEndoflame.java | 4 +- .../generating/SubTileGourmaryllis.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 4 +- .../common/block/tile/TileOpenCrate.java | 4 +- .../common/block/tile/TileSpawnerClaw.java | 41 +++++++------ .../common/block/tile/mana/TilePool.java | 6 +- ...aMethodHandles.java => MethodHandles.java} | 57 ++++++++----------- .../common/entity/EntityThrownItem.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 8 +-- .../common/item/relic/ItemAesirRing.java | 6 +- 22 files changed, 130 insertions(+), 110 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java rename src/main/java/vazkii/botania/common/core/handler/{BotaniaMethodHandles.java => MethodHandles.java} (58%) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index fb09416a5..e4aa2649a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -34,7 +34,6 @@ import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; public final class BoundTileRenderer { @@ -100,9 +99,9 @@ public final class BoundTileRenderer { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java new file mode 100644 index 000000000..e4db866bc --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -0,0 +1,38 @@ +package vazkii.botania.client.core.handler; + +import com.google.common.base.Throwables; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Field; + +public final class ClientMethodHandles { + + public static final MethodHandle + renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager + + static { + try { + Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); + f.setAccessible(true); + renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); + f.setAccessible(true); + renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); + f.setAccessible(true); + renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); + } catch (IllegalAccessException e) { + FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); + throw Throwables.propagate(e); + } + } + + private ClientMethodHandles() {} +} 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 c6c743b65..6626977c9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -33,7 +33,6 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; public final class MultiblockRenderHandler { @@ -142,9 +141,9 @@ public final class MultiblockRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return true; } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index ff032183f..49a7188e9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -25,7 +25,6 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -70,9 +69,9 @@ public final class RedStringRenderer { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 37cee3bde..bf75e478a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -29,7 +29,6 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -86,9 +85,9 @@ public final class SubTileRadiusRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } @@ -131,9 +130,9 @@ public final class SubTileRadiusRenderHandler { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } 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 5db894c18..92fa0404f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -47,7 +47,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; +import vazkii.botania.common.core.handler.MethodHandles; import java.util.concurrent.TimeUnit; @@ -65,7 +65,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { @@ -49,7 +49,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer 0) - BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); + MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); if(Math.random() > 0.5) Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); - BotaniaMethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation()); - BotaniaMethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D); + MethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation()); + MethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D); } else { - if(((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)) == -1) + if(((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) == -1) resetTimer(logic); - int delay = ((int) BotaniaMethodHandles.spawnDelay_getter.invokeExact(logic)); + int delay = ((int) MethodHandles.spawnDelay_getter.invokeExact(logic)); if(delay > 0) { - BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); + MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); return; } @@ -71,12 +68,12 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { boolean flag = false; - int spawnCount = ((int) BotaniaMethodHandles.spawnCount_getter.invokeExact(logic)); - int spawnRange = ((int) BotaniaMethodHandles.spawnRange_getter.invokeExact(logic)); - int maxNearbyEntities = ((int) BotaniaMethodHandles.maxNearbyEntities_getter.invokeExact(logic)); + int spawnCount = ((int) MethodHandles.spawnCount_getter.invokeExact(logic)); + int spawnRange = ((int) MethodHandles.spawnRange_getter.invokeExact(logic)); + int maxNearbyEntities = ((int) MethodHandles.maxNearbyEntities_getter.invokeExact(logic)); for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(((String) BotaniaMethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld()); + Entity entity = EntityList.createEntityByName(((String) MethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld()); if (entity == null) return; @@ -95,7 +92,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); if(entityliving == null || entityliving.getCanSpawnHere() && entityliving.isNotColliding()) { - BotaniaMethodHandles.spawnNewEntity.invokeExact(logic, entity, true); + MethodHandles.spawnNewEntity.invokeExact(logic, entity, true); this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); if(entityliving != null) { @@ -120,15 +117,15 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { // Direct copy of MobSpawnerBaseLogic.resetTimer() private void resetTimer(MobSpawnerBaseLogic logic) throws Throwable { - int maxSpawnDelay = ((int) BotaniaMethodHandles.maxSpawnDelay_getter.invokeExact(logic)); - int minSpawnDelay = ((int) BotaniaMethodHandles.minSpawnDelay_getter.invokeExact(logic)); - List potentialEntitySpawns = ((List) BotaniaMethodHandles.potentialSpawns_getter.invokeExact(logic)); + int maxSpawnDelay = ((int) MethodHandles.maxSpawnDelay_getter.invokeExact(logic)); + int minSpawnDelay = ((int) MethodHandles.minSpawnDelay_getter.invokeExact(logic)); + List potentialEntitySpawns = ((List) MethodHandles.potentialSpawns_getter.invokeExact(logic)); if(maxSpawnDelay <= minSpawnDelay) - BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay); + MethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay); else { int i = maxSpawnDelay - minSpawnDelay; - BotaniaMethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i)); + MethodHandles.spawnDelay_setter.invokeExact(logic, minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i)); } if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) 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 a61adfc6b..941c3a207 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 @@ -57,7 +57,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; @@ -151,7 +151,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int age; try { - age = ((int) BotaniaMethodHandles.itemAge_getter.invokeExact(item)); + age = ((int) MethodHandles.itemAge_getter.invokeExact(item)); } catch (Throwable throwable) { return false; } if(age > 100 && age < 130 || !catalystsRegistered) @@ -171,7 +171,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ItemStack output = recipe.getOutput().copy(); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); try { - BotaniaMethodHandles.itemAge_setter.invokeExact(outputItem, 105); + MethodHandles.itemAge_setter.invokeExact(outputItem, 105); } catch (Throwable ignored) {} worldObj.spawnEntityInWorld(outputItem); } diff --git a/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java similarity index 58% rename from src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java rename to src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index bede968eb..fd433f44a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BotaniaMethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -1,24 +1,24 @@ package vazkii.botania.common.core.handler; import com.google.common.base.Throwables; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.MobSpawnerBaseLogic; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.lang.reflect.Method; +import static java.lang.invoke.MethodHandles.publicLookup; + // MethodHandles for frequently reflected fields and methods. // Handles suffixed with _getter and _setter are for fields, while those without suffixes are normal methods. -public final class BotaniaMethodHandles { +public final class MethodHandles { public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager itemAge_getter, itemAge_setter, pickupDelay_getter, // EntityItem, pickup delay already has setter in vanilla spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, maxSpawnDelay_getter, minSpawnDelay_getter, @@ -27,82 +27,71 @@ public final class BotaniaMethodHandles { static { try { - Field f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSX); + Field f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); f.setAccessible(true); - renderPosX_getter = MethodHandles.publicLookup().unreflectGetter(f); - - f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSY); - f.setAccessible(true); - renderPosY_getter = MethodHandles.publicLookup().unreflectGetter(f); - - f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); - f.setAccessible(true); - renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); - - f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.AGE); - f.setAccessible(true); - itemAge_getter = MethodHandles.publicLookup().unreflectGetter(f); - itemAge_setter = MethodHandles.publicLookup().unreflectSetter(f); + itemAge_getter = publicLookup().unreflectGetter(f); + itemAge_setter = publicLookup().unreflectSetter(f); f = ReflectionHelper.findField(EntityItem.class, LibObfuscation.PICKUP_DELAY); f.setAccessible(true); - pickupDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + pickupDelay_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_RANGE); f.setAccessible(true); - spawnRange_getter = MethodHandles.publicLookup().unreflectGetter(f); + spawnRange_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_COUNT); f.setAccessible(true); - spawnCount_getter = MethodHandles.publicLookup().unreflectGetter(f); + spawnCount_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_NEARBY_ENTITIES); f.setAccessible(true); - maxNearbyEntities_getter = MethodHandles.publicLookup().unreflectGetter(f); + maxNearbyEntities_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MAX_SPAWN_DELAY); f.setAccessible(true); - maxSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + maxSpawnDelay_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MIN_SPAWN_DELAY); f.setAccessible(true); - minSpawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + minSpawnDelay_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); f.setAccessible(true); - spawnDelay_getter = MethodHandles.publicLookup().unreflectGetter(f); + spawnDelay_getter = publicLookup().unreflectGetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.SPAWN_DELAY); f.setAccessible(true); - spawnDelay_setter = MethodHandles.publicLookup().unreflectSetter(f); + spawnDelay_setter = publicLookup().unreflectSetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.PREV_MOB_ROTATION); f.setAccessible(true); - prevMobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f); + prevMobRotation_setter = publicLookup().unreflectSetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.MOB_ROTATION); f.setAccessible(true); - mobRotation_setter = MethodHandles.publicLookup().unreflectSetter(f); + mobRotation_setter = publicLookup().unreflectSetter(f); f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); f.setAccessible(true); - potentialSpawns_getter = MethodHandles.publicLookup().unreflectGetter(f); + potentialSpawns_getter = publicLookup().unreflectGetter(f); Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); m.setAccessible(true); - isActivated = MethodHandles.publicLookup().unreflect(m); + isActivated = publicLookup().unreflect(m); m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class); m.setAccessible(true); - spawnNewEntity = MethodHandles.publicLookup().unreflect(m); + spawnNewEntity = publicLookup().unreflect(m); m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); m.setAccessible(true); - getEntityNameToSpawn = MethodHandles.publicLookup().unreflect(m); + getEntityNameToSpawn = publicLookup().unreflect(m); } catch (Throwable t) { + FMLLog.severe("[Botania]: Couldn't initialize methodhandles! Things will be broken!"); throw Throwables.propagate(t); } } - private BotaniaMethodHandles() {} + private MethodHandles() {} } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index d035d848e..c0c94e9b9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -21,7 +21,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; public class EntityThrownItem extends EntityItem { @@ -36,7 +36,7 @@ public class EntityThrownItem extends EntityItem { int pickupDelay = 0; try { - pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(item); + pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(item); } catch (Throwable ignored) {} item.setPickupDelay(pickupDelay); @@ -71,7 +71,7 @@ public class EntityThrownItem extends EntityItem { int pickupDelay; try { - pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(this); + pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this); } catch (Throwable ignored) { continue; } if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index d87552d0f..a9716cefb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -38,13 +38,13 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper.GenericInventory; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -398,9 +398,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { double renderPosX, renderPosY, renderPosZ; try { - renderPosX = (double) BotaniaMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosY = (double) BotaniaMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); - renderPosZ = (double) BotaniaMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosX = (double) ClientMethodHandles.renderPosX_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); + renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { return; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 82e8be93d..ee21cb6cf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -31,7 +31,7 @@ import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.handler.BotaniaMethodHandles; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -71,12 +71,12 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe entity.motionZ = event.entityItem.motionZ; try { - BotaniaMethodHandles.itemAge_setter.invokeExact(entity, BotaniaMethodHandles.itemAge_getter.invokeExact(entity)); + MethodHandles.itemAge_setter.invokeExact(entity, MethodHandles.itemAge_getter.invokeExact(entity)); } catch (Throwable ignored) {} int pickupDelay = 0; try { - pickupDelay = (int) BotaniaMethodHandles.pickupDelay_getter.invokeExact(event.entityItem); + pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(event.entityItem); } catch (Throwable ignored) {} entity.setPickupDelay(pickupDelay); From 9d6c10f3540cab449eb5aa4869a3c8f2e316214e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Feb 2016 22:03:57 -0600 Subject: [PATCH 356/935] Slight tweaks to corporea cube rendering --- .../render/tile/RenderTileCorporeaCrystalCube.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 92fa0404f..3f62d394b 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,6 @@ import java.util.concurrent.TimeUnit; public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE); ModelCrystalCube model = new ModelCrystalCube(); EntityItem entity = null; @@ -82,11 +81,9 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(15).expireAfterWrite(1000, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() + // Botania - expanded size to 15 to hold all states + protected static final LoadingCache, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(15).expireAfterWrite(100, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() { public IBakedModel load(Pair key) throws Exception { From 1ed833a4a7587dd1363b8337bf8f9b4dc583126e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Feb 2016 23:10:01 -0600 Subject: [PATCH 357/935] Fix mistake in spawnerclaw, made debug atlas dump harder to trigger --- .../botania/client/core/handler/MiscellaneousIcons.java | 8 +++++--- .../vazkii/botania/common/block/tile/TileSpawnerClaw.java | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) 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 b650e965f..41d034aa5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -19,6 +19,7 @@ import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; import org.lwjgl.BufferUtils; @@ -165,14 +166,15 @@ public class MiscellaneousIcons { @SubscribeEvent public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.entityPlayer.worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"))) + if (!evt.entityPlayer.worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) + || !evt.entityPlayer.isSneaking()) return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); 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); - System.out.printf("Atlas is %d wide by %d tall%n", width, height); + FMLLog.info("[Botania]: Dumped atlas %d wide by %d tall%n", width, height); int pixels = width * height; @@ -202,7 +204,7 @@ public class MiscellaneousIcons { try { ImageIO.write(bufferedimage, "png", result); } catch (IOException e) { - e.printStackTrace(); + FMLLog.warning("[Botania]: Failed to dump debug atlas"); } } 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 a9af18172..173ec7e81 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -91,8 +91,9 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); - if(entityliving == null || entityliving.getCanSpawnHere() && entityliving.isNotColliding()) { - MethodHandles.spawnNewEntity.invokeExact(logic, entity, true); + if(entityliving == null || entityliving.getCanSpawnHere()) { + // Must accept return value so methodhandle dynamically binds correctly + Entity e = ((Entity) MethodHandles.spawnNewEntity.invokeExact(logic, entity, true)); this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); if(entityliving != null) { From 47001131b0d15471fad61f8372ecb0e56403674d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Feb 2016 23:17:52 -0600 Subject: [PATCH 358/935] Move specialflower statemapper to where it belongs --- .../botania/client/core/handler/MiscellaneousIcons.java | 9 --------- .../vazkii/botania/client/core/handler/ModelHandler.java | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) 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 41d034aa5..4c5aba78a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -88,15 +88,6 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { - // BlockSpecialFlower - // Ignore all vanilla rules, redirect all blockstates to blockstates/specialFlower.json#normal - evt.modelManager.getBlockModelShapes().registerBlockWithStateMapper(ModBlocks.specialFlower, new DefaultStateMapper() { - @Override - public ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation("botania:specialFlower"); - } - }); - // Floating flowers evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); 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 78e0afde8..994cc85d1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -20,6 +20,7 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.IReloadableResourceManager; @@ -703,6 +704,9 @@ public final class ModelHandler { } private static void registerStateMappers() { + // Override to let custom model loader work, see SpecialFlowerModel + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + // Override to let smart models work, see MiscellaneousIcons ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.floatingFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); From f51540fd527c2cff03cf050e3ae43fe87131ec8a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 25 Feb 2016 14:56:00 -0600 Subject: [PATCH 359/935] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index acf3d1731..77165292e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -1.8 PORT README: +README: -This is williewillus' 1.8(.8) port of Botania! +This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above -All licensing and distribution rights are exactly as 1.7.10 Botania +All licensing and distribution rights are exactly as 1.7.10 Botania. Use at your own risk as bugs may pop up unexpectedly. -I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No. +As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny. -Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S. +Please report all 1.8+ issues to this repository. These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod. From 18ea3e6bfb6df409368196d8a1eba74a057c8e48 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Feb 2016 19:48:39 -0600 Subject: [PATCH 360/935] Pure daisy now allows variable time recipes, closes #137. --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 15 +++++++++++++-- .../botania/api/recipe/RecipePureDaisy.java | 16 ++++++++++++---- .../common/block/subtile/SubTilePureDaisy.java | 13 ++++++------- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f1c2b97c4..07a7d988a 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -413,13 +413,24 @@ public final class BotaniaAPI { } /** - * Registers a Pure Daisy Recipe. + * Registers a Pure Daisy Recipe with the default time of 150 ticks per block * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { - RecipePureDaisy recipe = new RecipePureDaisy(input, outputState); + return registerPureDaisyRecipe(input, outputState, 150); + } + + /** + * Registers a Pure Daisy Recipe. + * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. + * @param outputState The blockstate to be placed upon recipe completion. + * @param time The amount of time in ticks to complete this recipe + * @return The recipe created. + */ + public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState, int time) { + RecipePureDaisy recipe = new RecipePureDaisy(input, outputState, time); pureDaisyRecipes.add(recipe); return recipe; } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 5f4965f77..a861e4dc9 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -26,15 +27,18 @@ public class RecipePureDaisy { private static final Map> oreMap = new HashMap<>(); - Object input; - IBlockState outputState; + private final Object input; + private final IBlockState outputState; + private final int time; - public RecipePureDaisy(Object input, IBlockState state) { + public RecipePureDaisy(Object input, IBlockState state, int time) { + Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); this.input = input; this.outputState = state; - + this.time = time; if(input != null && !(input instanceof String || input instanceof Block)) throw new IllegalArgumentException("input must be an oredict String or a Block."); + } /** @@ -92,4 +96,8 @@ public class RecipePureDaisy { return outputState; } + public int getTime() { + return time; + } + } 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 b0ac7b20d..b3c7dbfdf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -29,9 +29,6 @@ public class SubTilePureDaisy extends SubTileEntity { private static final String TAG_POSITION = "position"; private static final String TAG_TICKS_REMAINING = "ticksRemaining"; - private static final int TOTAL_TIME = 1200; - private static final int TIME_PER = TOTAL_TIME / 8; - private static final BlockPos[] POSITIONS = { new BlockPos(-1, 0, -1 ), new BlockPos(-1, 0, 0 ), @@ -44,7 +41,7 @@ public class SubTilePureDaisy extends SubTileEntity { }; int positionAt = 0; - int[] ticksRemaining = new int[] { TIME_PER, TIME_PER, TIME_PER, TIME_PER, TIME_PER, TIME_PER, TIME_PER, TIME_PER }; + int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1}; @Override public void onUpdate() { @@ -68,12 +65,14 @@ public class SubTilePureDaisy extends SubTileEntity { if(recipe != null) { - ticksRemaining[positionAt] = ticksRemaining[positionAt] - 1; + if (ticksRemaining[positionAt] == -1) + ticksRemaining[positionAt] = recipe.getTime(); + ticksRemaining[positionAt]--; Botania.proxy.sparkleFX(supertile.getWorld(), coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); if(ticksRemaining[positionAt] <= 0) { - ticksRemaining[positionAt] = TIME_PER; + ticksRemaining[positionAt] = -1; if(recipe.set(world,coords, this)) { for(int i = 0; i < 25; i++) { @@ -87,7 +86,7 @@ public class SubTilePureDaisy extends SubTileEntity { supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(recipe.getOutputState())); } } - } else ticksRemaining[positionAt] = TIME_PER; + } else ticksRemaining[positionAt] = -1; } } From 50420c3b4b0dad03a388e840a54b703144371770 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Feb 2016 20:39:50 -0600 Subject: [PATCH 361/935] Sigh --- .../render/tile/RenderTileFloatingFlower.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 185829bd6..a115f1319 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -37,10 +37,9 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { } BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); - IFloatingFlower flower = (IFloatingFlower) tile; GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2 + 1); + GlStateManager.translate(d0, d1, d2); double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) @@ -48,16 +47,13 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, 0F, 0.5F); // todo 1.8.8 fix spin - //GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); + GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); GlStateManager.translate(-0.5F, 0F, -0.5F); - if(tile.getWorld() != null) { - GlStateManager.translate(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); - GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); - } + GlStateManager.translate(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); + GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.pushMatrix(); IBlockState state = tile.getWorld().getBlockState(tile.getPos()); state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos()); @@ -66,7 +62,6 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { brd.getBlockModelRenderer().renderModelBrightness(ibakedmodel, state, 1.0F, true); GlStateManager.popMatrix(); - GlStateManager.popMatrix(); } From d498b7cd2e1dbdab786754721b15bd003fbd8c13 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Feb 2016 21:15:31 -0600 Subject: [PATCH 362/935] Fix floating flower spinning (thanks gigaherz and tterrag) Closes #9 --- .../client/render/tile/RenderTileFloatingFlower.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index a115f1319..5c4ae4233 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -45,12 +45,10 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { if(tile.getWorld() != null) worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); - GlStateManager.translate(0.5F, 0F, 0.5F); - // todo 1.8.8 fix spin + GlStateManager.translate(0.5F, 0, 0.5F); GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F); - GlStateManager.translate(-0.5F, 0F, -0.5F); + GlStateManager.translate(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5); - GlStateManager.translate(0F, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0F); GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); From ae356abcfe791840faf3c27743a1408f24c821ef Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Feb 2016 14:12:39 -0600 Subject: [PATCH 363/935] Reorganize --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 7 ++++--- .../java/vazkii/botania/api/recipe/RecipePureDaisy.java | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 07a7d988a..0ba3e4fe2 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -413,20 +413,21 @@ public final class BotaniaAPI { } /** - * Registers a Pure Daisy Recipe with the default time of 150 ticks per block + * Registers a Pure Daisy Recipe with the default time * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. * @param outputState The blockstate to be placed upon recipe completion. * @return The recipe created. */ public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState) { - return registerPureDaisyRecipe(input, outputState, 150); + return registerPureDaisyRecipe(input, outputState, RecipePureDaisy.DEFAULT_TIME); } /** * Registers a Pure Daisy Recipe. * @param input The block that works as an input for the recipe. Can be a Block or an oredict String. * @param outputState The blockstate to be placed upon recipe completion. - * @param time The amount of time in ticks to complete this recipe + * @param time The amount of time in ticks to complete this recipe. Note that this is ticks on your block, not total time. + * The Pure Daisy only ticks one block at a time in a round robin fashion. * @return The recipe created. */ public static RecipePureDaisy registerPureDaisyRecipe(Object input, IBlockState outputState, int time) { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index a861e4dc9..ffb9ce340 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -25,12 +25,17 @@ import vazkii.botania.api.subtile.SubTileEntity; public class RecipePureDaisy { + public static final int DEFAULT_TIME = 150; private static final Map> oreMap = new HashMap<>(); private final Object input; private final IBlockState outputState; private final int time; + public RecipePureDaisy(Object input, IBlockState state) { + this(input, state, DEFAULT_TIME); + } + public RecipePureDaisy(Object input, IBlockState state, int time) { Preconditions.checkArgument(time >= 0, "Time must be nonnegative"); this.input = input; @@ -38,7 +43,6 @@ public class RecipePureDaisy { this.time = time; if(input != null && !(input instanceof String || input instanceof Block)) throw new IllegalArgumentException("input must be an oredict String or a Block."); - } /** From 84b171603d1fd7542b06d9048e8c4f1d80b767e5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Feb 2016 15:31:50 -0600 Subject: [PATCH 364/935] Fix planestrider's sash. Closes #139 --- .../item/equipment/bauble/ItemTravelBelt.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 fe8e29dd0..69c0c4dcb 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,14 +79,16 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs if(shouldPlayerHaveStepup(player)) { ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); - 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); - beltItem.onMovedTick(belt, player); + if(player.worldObj.isRemote) { + 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); + beltItem.onMovedTick(belt, player); - if(player.ticksExisted % COST_INTERVAL == 0) - ManaItemHandler.requestManaExact(belt, player, COST, true); - } else beltItem.onNotMovingTick(belt, player); + if(player.ticksExisted % COST_INTERVAL == 0) + ManaItemHandler.requestManaExact(belt, player, COST, true); + } else beltItem.onNotMovingTick(belt, player); + } if(player.isSneaking()) player.stepHeight = 0.50001F; // Not 0.5F because that is the default From 861357f31364c1abe9f09ae3f0ad3150256a2c31 Mon Sep 17 00:00:00 2001 From: Michael Brenan Date: Sat, 27 Feb 2016 23:31:22 -0600 Subject: [PATCH 365/935] Update ItemManaRing to also use durability bar instead of damage --- .../item/equipment/bauble/ItemManaRing.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index b0a5569d5..7e3fcc38c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -50,12 +50,6 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD par3List.add(new ItemStack(par1, 1, 10000)); } - @Override - public int getDamage(ItemStack stack) { - float mana = getMana(stack); - return 1000 - (int) (mana / getMaxMana(stack) * 1000); - } - @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; @@ -78,7 +72,6 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD @Override public void addMana(ItemStack stack, int mana) { setMana(stack, Math.min(getMana(stack) + mana, getMaxMana(stack))); - stack.setItemDamage(getDamage(stack)); } @Override @@ -111,4 +104,16 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD return (float) getMana(stack) / (float) getMaxMana(stack); } + @Override + public boolean showDurabilityBar(ItemStack stack) { + // For mana rings, always show the durability bar. + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + // As in ItemManaTablet, forge seems to have their durability swapped, hence the 1.0 - + return 1.0 - getManaFractionForDisplay(stack); + } + } From a3c30caa40290495d98f49e39b996bb1d726d94b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 01:44:16 -0600 Subject: [PATCH 366/935] Make it compile --- .../botania/common/integration/corporea/WrappedDeepStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index b15b3097f..0d9219602 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -12,9 +12,9 @@ package vazkii.botania.common.integration.corporea; import java.util.ArrayList; import java.util.List; +import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; From e4401efeb6cf04b5a18f525c57544ba3c14fc560 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 10:53:01 -0600 Subject: [PATCH 367/935] Hopperhock --- .../subtile/functional/SubTileHopperhock.java | 23 ++++++---- .../common/core/helper/InventoryHelper2.java | 43 +++++++++++++++++++ 2 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 194563d19..88e3b08a5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.WeakHashMap; +import java.util.stream.IntStream; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -33,6 +34,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; @@ -41,6 +44,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -84,8 +88,7 @@ public class SubTileHopperhock extends SubTileFunctional { continue; ItemStack stack = item.getEntityItem(); - - IInventory invToPutItemIn = null; + IItemHandler invToPutItemIn = null; EnumFacing sideToPutItemIn = null; boolean priorityInv = false; int amountToPutIn = 0; @@ -93,11 +96,14 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), pos_); + IItemHandler inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir); if(inv != null) { - List filter = getFilterForInventory(inv, pos_, true); + List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int availablePut = supertile.getWorld().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir); + + ItemStack simulate = ItemHandlerHelper.insertItem(inv, stack.copy(), true); + int availablePut = supertile.getWorld().isRemote ? 1 : stack.stackSize - (simulate == null ? 0 : simulate.stackSize); + canAccept &= availablePut > 0; if(canAccept) { @@ -124,9 +130,8 @@ public class SubTileHopperhock extends SubTileFunctional { particled.add(item); } } else { - InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.splitStack(amountToPutIn), sideToPutItemIn, -1); + ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. - invToPutItemIn.markDirty(); if(item.getEntityItem().stackSize == 0) item.setDead(); pulledAny = true; @@ -174,7 +179,7 @@ public class SubTileHopperhock extends SubTileFunctional { } } - public List getFilterForInventory(IInventory inv, BlockPos pos, boolean recursiveForDoubleChests) { + public List getFilterForInventory(BlockPos pos, boolean recursiveForDoubleChests) { List filter = new ArrayList<>(); if(recursiveForDoubleChests) { @@ -184,7 +189,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(tileEntity instanceof TileEntityChest) for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { - filter.addAll(getFilterForInventory((IInventory) supertile.getWorld().getTileEntity(pos.offset(dir)), pos.offset(dir), false)); + filter.addAll(getFilterForInventory(pos.offset(dir), false)); break; } } diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java new file mode 100644 index 000000000..fb5c70596 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -0,0 +1,43 @@ +package vazkii.botania.common.core.helper; + +import net.minecraft.block.Block; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.InventoryLargeChest; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.ILockableContainer; +import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; + +public final class InventoryHelper2 { + + public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { + TileEntity te = world.getTileEntity(pos); + + if(te == null) + return null; + + if(te instanceof TileEntityChest) { + Block chestBlock = world.getBlockState(pos).getBlock(); + if(world.getBlockState(pos.west()).getBlock() == chestBlock) + return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) te)); + if(world.getBlockState(pos.east()).getBlock() == chestBlock) + return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.east()))); + if(world.getBlockState(pos.north()).getBlock() == chestBlock) + return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) te)); + if(world.getBlockState(pos.south()).getBlock() == chestBlock) + return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); + } + return te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? + te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + } + + private InventoryHelper2() {} + +} From 6d7fe40cd3af6b3b7c33032c1122fcc631a100f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 11:48:42 -0600 Subject: [PATCH 368/935] Fix pink wither being too aggressive in showing its love. Closes #141 --- .../botania/common/entity/EntityPinkWither.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 27082bdad..ae701aef0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIArrowAttack; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; @@ -37,7 +35,6 @@ public class EntityPinkWither extends EntityWither { } } - Iterator targetTaskIter = this.targetTasks.taskEntries.iterator(); while (targetTaskIter.hasNext()) { EntityAITasks.EntityAITaskEntry entry = targetTaskIter.next(); @@ -62,13 +59,9 @@ public class EntityPinkWither extends EntityWither { } @Override - public void setAttackTarget(EntityLivingBase p_70624_1_) { - // NO-OP - } - - @Override - public boolean attackEntityAsMob(Entity p_70652_1_) { - return false; + public void updateAITasks() { + if(this.ticksExisted % 20 == 0) + this.heal(1.0F); } @Override From b12cd80ad3b318a8c6dbc83a3fe7f2a212bb87c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 12:20:11 -0600 Subject: [PATCH 369/935] Update forge and close #52 --- build.properties | 2 +- .../vazkii/botania/client/model/SpecialFlowerModel.java | 2 +- .../equipment/armor/manasteel/ItemManasteelArmor.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index c8427b4fc..a82be69d2 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Thu Feb 25 19:50:43 GMT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.1.1722 +forge_version=11.15.1.1763 mc_version=1.8.9 dir_repo=./ build_number=250 diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index ef5c77b55..46a0e4402 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -51,7 +51,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -public class SpecialFlowerModel implements IModelCustomData { +public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 08b72458c..b28481ff9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -114,18 +114,20 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot, ModelBiped original) { if(ConfigHandler.enableArmorModels) { armorSlot--; // 1.8: mojang is dumb and made armorSlot 1-4 instead of 0-3. ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); if(model == null) model = provideArmorModelForSlot(itemStack, armorSlot); - if(model != null) + if(model != null) { + model.setModelAttributes(original); return model; + } } - return super.getArmorModel(entityLiving, itemStack, armorSlot); + return super.getArmorModel(entityLiving, itemStack, armorSlot, original); } @SideOnly(Side.CLIENT) From 076a7ee23a4ebfda49f4fc57a7125cff2f27febb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 14:58:18 -0600 Subject: [PATCH 370/935] Tweak tesr guards. closes #142 --- .../render/tile/RenderTileAlfPortal.java | 5 ++-- .../client/render/tile/RenderTileAltar.java | 28 ++----------------- .../client/render/tile/RenderTileAvatar.java | 8 ++++-- .../client/render/tile/RenderTileBellows.java | 8 ++++-- .../client/render/tile/RenderTileBrewery.java | 3 -- .../render/tile/RenderTileFloatingFlower.java | 13 ++++----- .../render/tile/RenderTileIncensePlate.java | 5 ++-- .../render/tile/RenderTileLightRelay.java | 12 ++++++-- .../client/render/tile/RenderTilePool.java | 4 +-- .../client/render/tile/RenderTilePump.java | 9 +++--- .../client/render/tile/RenderTilePylon.java | 4 +-- .../render/tile/RenderTileSpreader.java | 5 ++-- .../render/tile/RenderTileTinyPotato.java | 5 ++-- 13 files changed, 48 insertions(+), 61 deletions(-) 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 244b41faf..38784d69d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -24,15 +24,16 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { - if (portal != null && portal.getWorld() != null && !portal.getWorld().isBlockLoaded(portal.getPos(), false)) { + if (!portal.getWorld().isBlockLoaded(portal.getPos(), false) + || portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) return; - } AlfPortalState state = portal.getWorld().getBlockState(portal.getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index be4ce2d75..95c6c2317 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -28,42 +28,22 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAltar; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; public class RenderTileAltar extends TileEntitySpecialRenderer { - private static final ResourceLocation[] textures = new ResourceLocation[] { - new ResourceLocation(LibResources.MODEL_ALTAR), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 0)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 1)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 2)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 3)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 4)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 5)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 6)), - new ResourceLocation(String.format(LibResources.MODEL_ALTAR_META, 7)) - }; - - private static final ResourceLocation textureMossy = new ResourceLocation(LibResources.MODEL_ALTAR_MOSSY); - - ModelAltar model = new ModelAltar(); - public static int forceMeta = -1; - @Override public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { - if (altar != null && altar.getWorld() != null && !altar.getWorld().isBlockLoaded(altar.getPos(), false)) { + if(!altar.getWorld().isBlockLoaded(altar.getPos(), false) + || altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar) return; - } GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); -// Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); - GlStateManager.scale(1F, -1F, -1F); -// model.render(); - GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); boolean water = altar.hasWater(); @@ -151,8 +131,6 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } GlStateManager.popMatrix(); - - forceMeta = -1; } public void renderIcon(int par1, int par2, ResourceLocation loc, int par4, int par5, int brightness) { 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 51e6c3dd8..38dde5c29 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -27,6 +27,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAvatar; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; public class RenderTileAvatar extends TileEntitySpecialRenderer { @@ -40,9 +41,10 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { - if (avatar != null && avatar.getWorld() != null && !avatar.getWorld().isBlockLoaded(avatar.getPos(), false)) { - return; - } + if (avatar != null) + if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false) + || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) + return; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 40c31ed6d..82021906d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -17,6 +17,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; public class RenderTileBellows extends TileEntitySpecialRenderer { @@ -30,9 +31,10 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { - if (bellows != null && bellows.getWorld() != null && !bellows.getWorld().isBlockLoaded(bellows.getPos(), false)) { - return; - } + if (bellows != null) + if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) + || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) + return; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); 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 f9d47bee4..9fb32c5b8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -28,7 +28,6 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; - public static boolean rotate = true; @Override public void renderTileEntityAt(TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { @@ -43,8 +42,6 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, -1.5F, -0.5F); double time = ClientTickHandler.ticksInGame + f; - if(!rotate) - time = -1; model.render(this, time); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 5c4ae4233..e8efb9b58 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -23,25 +23,22 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.model.ModelMiniIsland; -import vazkii.botania.api.item.IFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { - private static final ModelMiniIsland model = new ModelMiniIsland(); - @Override public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { - if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) { - return; - } + if (tile != null) + if (!tile.getWorld().isBlockLoaded(tile.getPos(), false)) + return; + BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(d0, d1, d2); - double worldTime = tile.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + t); + double worldTime = (double) (ClientTickHandler.ticksInGame + t); if(tile.getWorld() != null) worldTime += new Random(tile.getPos().hashCode()).nextInt(1000); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 9d66f7c61..658d864cc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; import java.util.Map; @@ -31,9 +32,9 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { - if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) { + if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) + || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; - } Minecraft mc = Minecraft.getMinecraft(); - TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon; + TextureAtlasSprite iicon = tile.getWorld().getBlockState(tile.getPos()) + .getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT + ? MiscellaneousIcons.INSTANCE.lightRelayWorldIcon + : MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed; GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 8934fbb6d..b9a7cafd8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -45,9 +45,9 @@ public class RenderTilePool extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { - if (pool != null && pool.getWorld() != null && !pool.getWorld().isBlockLoaded(pool.getPos(), false)) { + if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false) + || pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool)) return; - } GlStateManager.pushMatrix(); GlStateManager.enableBlend(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 7b7bc921e..750893908 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePump; public class RenderTilePump extends TileEntitySpecialRenderer { @@ -32,9 +33,9 @@ public class RenderTilePump extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) { - if (pump != null && pump.getWorld() != null && !pump.getWorld().isBlockLoaded(pump.getPos(), false)) { + if(!pump.getWorld().isBlockLoaded(pump.getPos(), false) + || pump.getWorld().getBlockState(pump.getPos()).getBlock() != ModBlocks.pump) return; - } GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); @@ -42,12 +43,12 @@ public class RenderTilePump extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - EnumFacing facing = pump != null && pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; + EnumFacing facing = pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.translate(0.5F, 0.5F, 0.5F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f))); + model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f))); GlStateManager.color(1F, 1F, 1F); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); 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 50ca5f0c8..5a3065893 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -51,9 +51,9 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { - if (pylon != null && pylon.getWorld() != null && !pylon.getWorld().isBlockLoaded(pylon.getPos(), false)) { + if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) + || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon) return; - } if(model == null) model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index e82687fa9..a714db00c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -30,6 +30,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpreader; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; public class RenderTileSpreader extends TileEntitySpecialRenderer { @@ -46,9 +47,9 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { - if (spreader != null && spreader.getWorld() != null && !spreader.getWorld().isBlockLoaded(spreader.getPos(), false)) { + if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) + || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; - } GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 77499d6a9..669247dfb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -36,6 +36,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTinyPotato; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -48,9 +49,9 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Sun, 28 Feb 2016 15:57:59 -0600 Subject: [PATCH 371/935] Redstrings --- .../tile/string/TileRedStringContainer.java | 160 +++--------------- 1 file changed, 22 insertions(+), 138 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index e1e494832..d7d9f1aa4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -19,147 +19,39 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lib.LibBlockNames; -public class TileRedStringContainer extends TileRedString implements ISidedInventory { +import java.util.Arrays; + +public class TileRedStringContainer extends TileRedString { @Override public boolean acceptBlock(BlockPos pos) { TileEntity tile = worldObj.getTileEntity(pos); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - if(inv instanceof ISidedInventory) { - ISidedInventory sidedInv = (ISidedInventory) inv; - for(EnumFacing e : EnumFacing.VALUES) - if(sidedInv.getSlotsForFace(e).length != 0) - return true; - return false; - } - + return tile != null + && Arrays.stream(EnumFacing.VALUES) + .anyMatch(e -> tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e)); + } + + @Override + public boolean hasCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY + && getTileAtBinding() != null + && getTileAtBinding().hasCapability(cap, side)) return true; - } - - return false; + return super.hasCapability(cap, side); } @Override - public int getSizeInventory() { - IInventory inv = getInventory(); - return inv != null ? inv.getSizeInventory() : 0; - } - - @Override - public ItemStack getStackInSlot(int slot) { - IInventory inv = getInventory(); - return inv != null ? inv.getStackInSlot(slot) : null; - } - - @Override - public ItemStack decrStackSize(int slot, int count) { - IInventory inv = getInventory(); - return inv != null ? inv.decrStackSize(slot, count) : null; - } - - @Override - public ItemStack removeStackFromSlot(int slot) { - IInventory inv = getInventory(); - return inv != null ? inv.removeStackFromSlot(slot) : null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - IInventory inv = getInventory(); - if(inv != null) - inv.setInventorySlotContents(slot, stack); - } - - @Override - public String getName() { - IInventory inv = getInventory(); - return inv != null ? inv.getName() : LibBlockNames.RED_STRING_CONTAINER; - } - - @Override - public boolean hasCustomName() { - IInventory inv = getInventory(); - return inv != null ? inv.hasCustomName() : false; - } - - @Override - public IChatComponent getDisplayName() { - IInventory inv = getInventory(); - return inv != null ? inv.getDisplayName() : new ChatComponentText(getName()); - } - - @Override - public int getInventoryStackLimit() { - IInventory inv = getInventory(); - return inv != null ? inv.getInventoryStackLimit() : 0; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - IInventory inv = getInventory(); - return inv != null ? inv.isUseableByPlayer(player) : false; - } - - @Override - public void openInventory(EntityPlayer player) { - IInventory inv = getInventory(); - if(inv != null) - inv.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) { - IInventory inv = getInventory(); - if(inv != null) - inv.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - IInventory inv = getInventory(); - return inv != null ? inv.isItemValidForSlot(slot, stack) : false; - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) { - - } - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - - } - - @Override - public int[] getSlotsForFace(EnumFacing side) { - IInventory inv = getInventory(); - return inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : inv instanceof IInventory ? InventoryHelper.buildSlotsForLinearInventory(inv) : new int[0]; - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { - IInventory inv = getInventory(); - return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canInsertItem(slot, stack, side) : true; - } - - @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { - IInventory inv = getInventory(); - return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canExtractItem(slot, stack, side) : true; + public T getCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY + && getTileAtBinding() != null + && getTileAtBinding().hasCapability(cap, side)) + return getTileAtBinding().getCapability(cap, side); + return super.getCapability(cap, side); } @Override @@ -170,12 +62,4 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven tile.markDirty(); } - IInventory getInventory() { - TileEntity tile = getTileAtBinding(); - if(tile == null || !(tile instanceof IInventory)) - return null; - - return InventoryHelper.getInventory((IInventory) tile); - } - } From ef2ab91b370e182f8d1786eb9b36b80e3f0bb16b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 20:46:01 -0600 Subject: [PATCH 372/935] All basic tiles --- .../vazkii/botania/api/item/IAvatarTile.java | 10 +- .../botania/api/recipe/IFlowerComponent.java | 4 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 5 +- .../botania/api/recipe/RecipePetals.java | 5 +- .../botania/client/model/ModelBrewery.java | 8 +- .../client/render/tile/RenderTileAltar.java | 6 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../render/tile/RenderTileHourglass.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 4 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileSpreader.java | 2 +- .../botania/common/block/BlockAltar.java | 6 +- .../botania/common/block/BlockAvatar.java | 8 +- .../botania/common/block/BlockHourglass.java | 8 +- .../common/block/BlockIncensePlate.java | 8 +- .../botania/common/block/BlockOpenCrate.java | 4 +- .../common/block/BlockSparkChanger.java | 10 +- .../block/corporea/BlockCorporeaBase.java | 2 +- .../common/block/mana/BlockBrewery.java | 6 +- .../botania/common/block/mana/BlockPrism.java | 8 +- .../common/block/mana/BlockRuneAltar.java | 6 +- .../common/block/mana/BlockSpreader.java | 8 +- .../botania/common/block/tile/TileAltar.java | 65 +++----- .../botania/common/block/tile/TileAvatar.java | 49 ++---- .../common/block/tile/TileBrewery.java | 55 +++---- .../common/block/tile/TileCraftCrate.java | 36 +++-- .../common/block/tile/TileHourglass.java | 26 ++-- .../common/block/tile/TileIncensePlate.java | 44 +++--- .../common/block/tile/TileOpenCrate.java | 9 +- .../common/block/tile/TileRuneAltar.java | 57 +++---- .../block/tile/TileSimpleInventory.java | 146 ++++++++---------- .../common/block/tile/TileSparkChanger.java | 29 ++-- .../corporea/TileCorporeaCrystalCube.java | 10 +- .../tile/corporea/TileCorporeaFunnel.java | 10 +- .../tile/corporea/TileCorporeaIndex.java | 5 - .../corporea/TileCorporeaInterceptor.java | 10 +- .../common/block/tile/mana/TilePrism.java | 31 ++-- .../common/block/tile/mana/TileSpreader.java | 34 ++-- .../common/crafting/recipe/HeadRecipe.java | 5 +- .../common/item/material/ItemManaPetal.java | 3 +- .../item/material/ItemManaResource.java | 3 +- .../common/item/material/ItemPetal.java | 3 +- .../common/item/material/ItemRune.java | 3 +- 45 files changed, 342 insertions(+), 419 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IAvatarTile.java b/src/main/java/vazkii/botania/api/item/IAvatarTile.java index c89f903b2..5112d5cec 100644 --- a/src/main/java/vazkii/botania/api/item/IAvatarTile.java +++ b/src/main/java/vazkii/botania/api/item/IAvatarTile.java @@ -10,13 +10,19 @@ */ package vazkii.botania.api.item; -import net.minecraft.inventory.IInventory; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.mana.IManaReceiver; /** * A TileEntity that implements this is considered an Avatar. */ -public interface IAvatarTile extends IInventory, IManaReceiver { +public interface IAvatarTile extends IManaReceiver { + + /** + * Gets the avatar's inventory + * @return An IItemhandler representing the avatar's inventory + */ + public IItemHandler getInventory(); /** * Gets the amount of ticks that have elapsed on this avatar while it's functional diff --git a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java index ca4612412..329ad9ce2 100644 --- a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java +++ b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java @@ -10,15 +10,15 @@ */ package vazkii.botania.api.recipe; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IPetalApothecary; /** * Have an Item implement this to allow it to be used in the Petal Apothecary. */ public interface IFlowerComponent { - public boolean canFit(ItemStack stack, IInventory apothecary); + public boolean canFit(ItemStack stack, IPetalApothecary apothecary); public int getParticleColor(ItemStack stack); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 5dec0cc6e..40ab346a1 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -38,10 +39,10 @@ public class RecipeBrew { this.inputs = inputsToSet; } - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { List inputsMissing = new ArrayList<>(inputs); - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 05f69049a..f2df5cc57 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; public class RecipePetals { @@ -35,10 +36,10 @@ public class RecipePetals { this.inputs = inputsToSet; } - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { List inputsMissing = new ArrayList<>(inputs); - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index c32f11f6f..47af8b4cd 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -57,11 +57,11 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(0F, offset, 0F); GlStateManager.rotate(polerot, 0F, 1F, 0F); - if(hasTile && render.brewery.getStackInSlot(0) != null) { + if(hasTile && render.brewery.getItemHandler().getStackInSlot(0) != null) { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(0, -0.45, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); - render.renderItemStack(render.brewery.getStackInSlot(0)); + render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(0)); //GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); GlStateManager.translate(0, 0.45, 0); GlStateManager.rotate(-180F, 1F, 0F, 0F); @@ -80,7 +80,7 @@ public class ModelBrewery extends ModelBase { offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); - if(hasTile && render.brewery.getStackInSlot(i + 1) != null) { + if(hasTile && render.brewery.getItemHandler().getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; @@ -89,7 +89,7 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(transX, transY, transZ); GlStateManager.rotate(-90F, 1F, 0F, 0F); GlStateManager.translate(0.125, 0.125, 0); - render.renderItemStack(render.brewery.getStackInSlot(i + 1)); + render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(i + 1)); GlStateManager.translate(-0.125, -0.125, 0); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(-transX, -transY, -transZ); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 95c6c2317..694acc379 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -26,8 +26,6 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelAltar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; @@ -57,7 +55,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { if(water) { int petals = 0; for(int i = 0; i < altar.getSizeInventory(); i++) - if(altar.getStackInSlot(i) != null) + if(altar.getItemHandler().getStackInSlot(i) != null) petals++; else break; @@ -97,7 +95,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F, 1F); - ItemStack stack = altar.getStackInSlot(i); + ItemStack stack = altar.getItemHandler().getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); 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 38dde5c29..26b49fb02 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -69,7 +69,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { return; } - ItemStack stack = avatar.getStackInSlot(0); + ItemStack stack = avatar.getItemHandler().getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index ef39061b1..b88d16f33 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -47,7 +47,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; - ItemStack stack = prism.getStackInSlot(0); + ItemStack stack = prism.getItemHandler().getStackInSlot(0); if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); 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 3bce25066..6dd0f5ca7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -34,7 +34,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer model.renderCube(); GlStateManager.popMatrix(); GlStateManager.scale(1F, -1F, -1F); - ItemStack stack = spreader.getStackInSlot(0); + ItemStack stack = spreader.getItemHandler().getStackInSlot(0); if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index cd8f81078..47a44352e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -145,12 +145,12 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = tile.getStackInSlot(i); + ItemStack stackAt = tile.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - tile.setInventorySlotContents(i, null); + tile.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -269,7 +269,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 5d5c29382..5b455cf76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -69,17 +69,17 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); - ItemStack stackOnAvatar = avatar.getStackInSlot(0); + ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); ItemStack stackOnPlayer = player.getCurrentEquippedItem(); if(stackOnAvatar != null) { ItemStack copyStack = stackOnAvatar.copy(); - avatar.setInventorySlotContents(0, null); + avatar.getItemHandler().setStackInSlot(0, null); if(!player.inventory.addItemStackToInventory(copyStack)) player.dropPlayerItemWithRandomChoice(copyStack, true); return true; } else if(stackOnPlayer != null && stackOnPlayer.getItem() instanceof IAvatarWieldable) { ItemStack copyStack = stackOnPlayer.copy(); - avatar.setInventorySlotContents(0, copyStack); + avatar.getItemHandler().setStackInSlot(0, copyStack); stackOnPlayer.stackSize--; return true; } @@ -110,7 +110,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9548b0627..78eab4dff 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -78,7 +78,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float xs, float ys, float zs) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); - ItemStack hgStack = hourglass.getStackInSlot(0); + ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -90,7 +90,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } if(hgStack == null && TileHourglass.getStackItemTime(stack) > 0) { - hourglass.setInventorySlotContents(0, stack.copy()); + hourglass.getItemHandler().setStackInSlot(0, stack.copy()); hourglass.markDirty(); stack.stackSize = 0; return true; @@ -98,7 +98,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I ItemStack copy = hgStack.copy(); if(!player.inventory.addItemStackToInventory(copy)) player.dropPlayerItemWithRandomChoice(copy, false); - hourglass.setInventorySlotContents(0, null); + hourglass.getItemHandler().setStackInSlot(0, null); hourglass.markDirty(); return true; } @@ -133,7 +133,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 0aab68bd4..00047ce15 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -63,14 +63,14 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); ItemStack stack = player.getCurrentEquippedItem(); - ItemStack plateStack = plate.getStackInSlot(0); + ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); boolean did = false; if(world.isRemote) return true; - if(plateStack == null && plate.isItemValidForSlot(0, stack)) { - plate.setInventorySlotContents(0, stack.copy()); + if(plateStack == null && plate.acceptsItem(stack)) { + plate.getItemHandler().setStackInSlot(0, stack.copy()); stack.stackSize--; did = true; } else if(plateStack != null && !plate.burning) { @@ -82,7 +82,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable ItemStack addStack = plateStack.copy(); if(!player.inventory.addItemStackToInventory(addStack)) player.dropPlayerItemWithRandomChoice(addStack, false); - plate.setInventorySlotContents(0, null); + plate.getItemHandler().setStackInSlot(0, null); did = true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1cb4f16b1..959731a50 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -134,7 +134,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; @@ -208,7 +208,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); - ItemStack item = craft.getStackInSlot(index); + ItemStack item = craft.getItemHandler().getStackInSlot(index); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 8b1b84a90..d2f28fad6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -94,17 +94,17 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); - ItemStack cstack = changer.getStackInSlot(0); + ItemStack cstack = changer.getItemHandler().getStackInSlot(0); ItemStack pstack = player.getCurrentEquippedItem(); if(cstack != null) { - changer.setInventorySlotContents(0, null); + changer.getItemHandler().setStackInSlot(0, null); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); if(!player.inventory.addItemStackToInventory(cstack)) player.dropPlayerItemWithRandomChoice(cstack, false); return true; } else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) { - changer.setInventorySlotContents(0, pstack.copy().splitStack(1)); + changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1)); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); @@ -124,7 +124,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; @@ -164,7 +164,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public int getComparatorInputOverride(World world, BlockPos pos) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); - ItemStack stack = changer.getStackInSlot(0); + ItemStack stack = changer.getItemHandler().getStackInSlot(0); if(stack == null) return 0; return stack.getItemDamage() + 1; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 2b6c7504a..6e8aa7d53 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -45,7 +45,7 @@ public abstract class BlockCorporeaBase extends BlockModContainer= 0; i--) { - ItemStack stackAt = brew.getStackInSlot(i); + ItemStack stackAt = brew.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - brew.setInventorySlotContents(i, null); + brew.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -98,7 +98,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index bfbe9a649..3db03c1a7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -104,7 +104,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi return false; TilePrism prism = (TilePrism) tile; - ItemStack lens = prism.getStackInSlot(0); + ItemStack lens = prism.getItemHandler().getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; @@ -112,14 +112,14 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi if(!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); - prism.setInventorySlotContents(0, heldItem.copy()); + prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); - prism.setInventorySlotContents(0, null); + prism.getItemHandler().setStackInSlot(0, null); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); } @@ -150,7 +150,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index a71649683..002d44833 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -67,12 +67,12 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) for(int i = altar.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = altar.getStackInSlot(i); + ItemStack stackAt = altar.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - altar.setInventorySlotContents(i, null); + altar.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -90,7 +90,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = 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/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 7ed9c7516..753aff781 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -151,7 +151,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand return false; TileSpreader spreader = (TileSpreader) tile; - ItemStack lens = spreader.getStackInSlot(0); + ItemStack lens = spreader.getItemHandler().getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); @@ -164,13 +164,13 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand if (!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); - spreader.setInventorySlotContents(0, heldItem.copy()); + spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); } else if(lens != null && !wool) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); - spreader.setInventorySlotContents(0, null); + spreader.getItemHandler().setStackInSlot(0, null); spreader.markDirty(); } @@ -200,7 +200,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand 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.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/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index fd3cc3ed1..9b82b0201 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -32,6 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -46,7 +47,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary { +public class TileAltar extends TileSimpleInventory implements IPetalApothecary { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); @@ -102,7 +103,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I boolean didChange = false; if(stack.getItem() instanceof IFlowerComponent && ((IFlowerComponent) stack.getItem()).canFit(stack, this)) { - if(getStackInSlot(getSizeInventory() - 1) != null) + if(itemHandler.getStackInSlot(getSizeInventory() - 1) != null) return false; if(!worldObj.isRemote) { @@ -111,10 +112,10 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I item.setDead(); for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { ItemStack stackToPut = stack.copy(); stackToPut.stackSize = 1; - setInventorySlotContents(i, stackToPut); + itemHandler.setStackInSlot(i, stackToPut); didChange = true; worldObj.playSoundAtEntity(item, "game.neutral.swim.splash", 0.1F, 1F); break; @@ -122,12 +123,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } } else if(stack.getItem() != null && SEED_PATTERN.matcher(stack.getItem().getUnlocalizedName(stack)).find()) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { saveLastRecipe(); if(!worldObj.isRemote) { for(int i = 0; i < getSizeInventory(); i++) - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); stack.stackSize--; if(stack.stackSize == 0) @@ -155,7 +156,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public void saveLastRecipe() { lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) break; lastRecipe.add(stack.copy()); @@ -164,12 +165,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } public void trySetLastRecipe(EntityPlayer player) { - tryToSetLastRecipe(player, this, lastRecipe); + tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } - public static void tryToSetLastRecipe(EntityPlayer player, IInventory inv, List lastRecipe) { + public static void tryToSetLastRecipe(EntityPlayer player, IItemHandlerModifiable inv, List lastRecipe) { if(lastRecipe == null || lastRecipe.isEmpty() || player.worldObj.isRemote) return; @@ -188,7 +189,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I ItemStack stackToPut = pstack.copy(); stackToPut.stackSize = 1; - inv.setInventorySlotContents(index, stackToPut); + inv.setStackInSlot(index, stackToPut); didAny = true; index++; break; @@ -218,7 +219,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) + if(itemHandler.getStackInSlot(i) != null) return false; return true; @@ -236,7 +237,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stackAt = getStackInSlot(i); + ItemStack stackAt = itemHandler.getStackInSlot(i); if(stackAt == null) break; @@ -281,39 +282,19 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I isMossy = cmp.getBoolean(TAG_IS_MOSSY); } - @Override - public String getName() { - return LibBlockNames.ALTAR; - } - @Override public int getSizeInventory() { return 16; } @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public int[] getSlotsForFace(EnumFacing var1) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return false; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return false; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -344,7 +325,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i) == null) break; amt++; } @@ -353,7 +334,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I float anglePer = 360F / amt; for(RecipePetals recipe : BotaniaAPI.petalRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(HUDHandler.manaBar); RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); @@ -372,7 +353,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; GL11.glTranslated(xPos, yPos, 0); - mc.getRenderItem().renderItemIntoGUI(getStackInSlot(i), 0, 0); + mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); GL11.glTranslated(-xPos, -yPos, 0); angle += anglePer; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 29959c5bf..1f374f5ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -10,15 +10,15 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; -import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile { private static final int MAX_MANA = 6400; @@ -41,7 +41,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } } - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null && stack.getItem() instanceof IAvatarWieldable) { IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); wieldable.onAvatarUpdate(this, stack); @@ -73,33 +73,13 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() instanceof IAvatarTile; - } - - @Override - public int[] getSlotsForFace(EnumFacing p_94128_1_) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return false; - } - - @Override - public String getName() { - return LibBlockNames.AVATAR; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -114,7 +94,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid @Override public boolean canRecieveManaFromBursts() { - return getStackInSlot(0) != null; + return itemHandler.getStackInSlot(0) != null; } @Override @@ -122,6 +102,11 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid return mana; } + @Override + public IItemHandler getInventory() { + return getItemHandler(); + } + @Override public int getElapsedFunctionalTicks() { return ticksElapsed; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 42b2850f2..3040b4fff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; @@ -35,7 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileBrewery extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -45,17 +46,17 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public int signal = 0; public boolean addItem(EntityPlayer player, ItemStack stack) { - if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) + if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { did = true; ItemStack stackToAdd = stack.copy(); stackToAdd.stackSize = 1; - setInventorySlotContents(i, stackToAdd); + itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -69,7 +70,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(did) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) - if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { + if(recipe.matches(itemHandler) && recipe.getOutput(itemHandler.getStackInSlot(0)) != null) { this.recipe = recipe; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } @@ -82,7 +83,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public void updateEntity() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { this.recipe = recipe; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } @@ -105,14 +106,14 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } if(recipe != null) { - if(!recipe.matches(this)) { + if(!recipe.matches(itemHandler)) { recipe = null; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState(), 1 | 2); } if(recipe != null) { if(mana != manaLastTick) { - Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); + Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; @@ -127,13 +128,13 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, int mana = getManaCost(); recieveMana(-mana); if(!worldObj.isRemote) { - ItemStack output = recipe.getOutput(getStackInSlot(0)); + ItemStack output = recipe.getOutput(itemHandler.getStackInSlot(0)); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); worldObj.spawnEntityInWorld(outputItem); } for(int i = 0; i < getSizeInventory(); i++) - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); craftingFanciness(); } @@ -153,7 +154,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } public int getManaCost() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(recipe == null || stack == null || !(stack.getItem() instanceof IBrewContainer)) return 0; IBrewContainer container = (IBrewContainer) stack.getItem(); @@ -163,7 +164,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public void craftingFanciness() { worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); for(int i = 0; i < 25; i++) { - Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); + Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; @@ -197,17 +198,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, return INFINITE_EXTENT_AABB; } - @Override - public String getName() { - return LibBlockNames.RUNE_ALTAR; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override + /*@Override todo 1.8 public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) @@ -215,16 +206,16 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, accessibleSlot = i; return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - } + }*/ @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return true; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return mana == 0; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -256,7 +247,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe == null) return; - RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(getStackInSlot(0))); + RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(itemHandler.getStackInSlot(0))); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 59ea029c0..4d3655bb0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -77,13 +78,20 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public int getInventoryStackLimit() { - return 1; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return i != 9 && !isLocked(i); + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(slot != 9 && !isLocked(slot)) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } public boolean isLocked(int slot) { @@ -100,7 +108,7 @@ public class TileCraftCrate extends TileOpenCrate { int newSignal = 0; for(; newSignal < 9; newSignal++) // dis for loop be derpy - if(!isLocked(newSignal) && getStackInSlot(newSignal) == null) + if(!isLocked(newSignal) && itemHandler.getStackInSlot(newSignal) == null) break; if(newSignal != signal) { @@ -120,7 +128,7 @@ public class TileCraftCrate extends TileOpenCrate { } }, 3, 3); for(int i = 0; i < 9; i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) continue; @@ -131,15 +139,15 @@ public class TileCraftCrate extends TileOpenCrate { List recipes = CraftingManager.getInstance().getRecipeList(); for(IRecipe recipe : recipes) if(recipe.matches(craft, worldObj)) { - setInventorySlotContents(9, recipe.getCraftingResult(craft)); + itemHandler.setStackInSlot(9, recipe.getCraftingResult(craft)); for(int i = 0; i < 9; i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) continue; ItemStack container = stack.getItem().getContainerItem(stack); - setInventorySlotContents(i, container); + itemHandler.setStackInSlot(i, container); } return true; } @@ -149,7 +157,7 @@ public class TileCraftCrate extends TileOpenCrate { boolean isFull() { for(int i = 0; i < 9; i++) - if(!isLocked(i) && getStackInSlot(i) == null) + if(!isLocked(i) && itemHandler.getStackInSlot(i) == null) return false; return true; @@ -157,10 +165,10 @@ public class TileCraftCrate extends TileOpenCrate { void ejectAll() { for(int i = 0; i < getSizeInventory(); ++i) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) eject(stack, false); - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); markDirty(); } } 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 3edad2b90..42427be9c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; @@ -67,7 +68,7 @@ public class TileHourglass extends TileSimpleInventory { } public int getTotalTime() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null) return 0; @@ -85,7 +86,7 @@ public class TileHourglass extends TileSimpleInventory { } public int getColor() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null) return 0; if(stack.getItem() == Item.getItemFromBlock(Blocks.sand)) @@ -96,11 +97,15 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null) - return false; - Item item = itemstack.getItem(); - return item == Item.getItemFromBlock(Blocks.sand) || item == Item.getItemFromBlock(Blocks.soul_sand); + protected IItemHandlerModifiable createItemHandler() { + 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))) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override @@ -143,7 +148,7 @@ public class TileHourglass extends TileSimpleInventory { int x = res.getScaledWidth() / 2 + 10; int y = res.getScaledHeight() / 2 - 10; - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); @@ -167,9 +172,4 @@ public class TileHourglass extends TileSimpleInventory { } - @Override - public String getName() { - return LibBlockNames.HOURGLASS; - } - } 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 afe409951..3542dcbfe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -22,6 +22,8 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -30,7 +32,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory { +public class TileIncensePlate extends TileSimpleInventory { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -43,7 +45,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven @Override public void updateEntity() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); PotionEffect effect = brew.getPotionEffects(stack).get(0); @@ -74,7 +76,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven Botania.proxy.wispFX(worldObj, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); } } else { - setInventorySlotContents(0, null); + itemHandler.setStackInSlot(0, null); burning = false; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @@ -92,7 +94,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } public void ignite() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null || burning) return; @@ -106,11 +108,6 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven return 1; } - @Override - public String getName() { - return LibBlockNames.INCENSE_PLATE; - } - @Override public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { super.writeCustomNBT(par1nbtTagCompound); @@ -125,24 +122,25 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven burning = par1nbtTagCompound.getBoolean(TAG_BURNING); } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(itemstack) != BotaniaAPI.fallbackBrew; + public boolean acceptsItem(ItemStack stack) { + return stack != null && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != BotaniaAPI.fallbackBrew; } @Override - public int[] getSlotsForFace(EnumFacing side) { - return new int[] { 0 }; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(acceptsItem(stack)) + return super.insertItem(slot, stack, simulate); + else return stack; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { - return isItemValidForSlot(slot, stack); - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return false; + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return null; + } + }; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 973fe91b4..0a36335b8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -33,11 +33,6 @@ public class TileOpenCrate extends TileSimpleInventory { return 1; } - @Override - public String getName() { - return LibBlockNames.OPEN_CRATE; - } - @Override public void updateEntity() { if (worldObj.isRemote) @@ -53,7 +48,7 @@ public class TileOpenCrate extends TileSimpleInventory { } if(canEject()) { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null) eject(stack, redstone); } @@ -77,7 +72,7 @@ public class TileOpenCrate extends TileSimpleInventory { } - setInventorySlotContents(0, null); + itemHandler.setStackInSlot(0, null); worldObj.spawnEntityInWorld(item); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 3256491a2..fe6b19b4c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -26,6 +26,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -42,7 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -83,11 +84,11 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { did = true; ItemStack stackToAdd = stack.copy(); stackToAdd.stackSize = 1; - setInventorySlotContents(i, stackToAdd); + itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -161,7 +162,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor this.manaToGet = currentRecipe.getManaUsage(); else { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { this.manaToGet = recipe.getManaUsage(); break getMana; } @@ -178,7 +179,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public void saveLastRecipe() { lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) break; lastRecipe.add(stack.copy()); @@ -187,14 +188,14 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void trySetLastRecipe(EntityPlayer player) { - TileAltar.tryToSetLastRecipe(player, this, lastRecipe); + TileAltar.tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public boolean hasValidRecipe() { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) + if(recipe.matches(itemHandler)) return true; return false; @@ -206,7 +207,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(currentRecipe != null) recipe = currentRecipe; else for(RecipeRuneAltar recipe_ : BotaniaAPI.runeAltarRecipes) { - if(recipe_.matches(this)) { + if(recipe_.matches(itemHandler)) { recipe = recipe_; break; } @@ -235,14 +236,14 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor saveLastRecipe(); if(!worldObj.isRemote) { for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) { if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) { EntityItem outputItem = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy()); worldObj.spawnEntityInWorld(outputItem); } - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); } } @@ -269,7 +270,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) + if(itemHandler.getStackInSlot(i) != null) return false; return true; @@ -301,17 +302,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor return INFINITE_EXTENT_AABB; } - @Override - public String getName() { - return LibBlockNames.RUNE_ALTAR; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override + /*@Override todo 1.8 public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) @@ -319,16 +310,16 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor accessibleSlot = i; return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - } + }*/ @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return true; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return mana == 0; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -359,7 +350,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i) == null) break; amt++; } @@ -367,7 +358,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(amt > 0) { float anglePer = 360F / amt; for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -399,7 +390,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; GL11.glTranslated(xPos, yPos, 0); - mc.getRenderItem().renderItemIntoGUI(getStackInSlot(i), 0, 0); + mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); GL11.glTranslated(-xPos, -yPos, 0); angle += anglePer; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 7ce6c6c8e..a21995e7f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; -import java.util.Arrays; - -public abstract class TileSimpleInventory extends TileMod implements IInventory { +public abstract class TileSimpleInventory extends TileMod { ItemStack[] inventorySlots = new ItemStack[getSizeInventory()]; + protected IItemHandlerModifiable itemHandler = createItemHandler(); @Override public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { @@ -34,6 +34,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory if (var5 >= 0 && var5 < inventorySlots.length) inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); } + itemHandler = createItemHandler(); } @Override @@ -50,93 +51,72 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory par1NBTTagCompound.setTag("Items", var2); } - @Override - public ItemStack getStackInSlot(int i) { - return inventorySlots[i]; + public abstract int getSizeInventory(); + + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true); + } + + public IItemHandlerModifiable getItemHandler() { + return itemHandler; } @Override - public ItemStack decrStackSize(int i, int j) { - if (inventorySlots[i] != null) { - ItemStack stackAt; + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side); + } - if (inventorySlots[i].stackSize <= j) { - stackAt = inventorySlots[i]; - inventorySlots[i] = null; - return stackAt; - } else { - stackAt = inventorySlots[i].splitStack(j); + @Override + @SuppressWarnings("unchecked") + public T getCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + return (T) itemHandler; + return super.getCapability(cap, side); + } - if (inventorySlots[i].stackSize == 0) - inventorySlots[i] = null; + /* Extension of ItemStackHandler that uses our own slot array, allows for control of writing, + allows control over stack limits, and allows for itemstack-slot validation */ + protected static class SimpleItemStackHandler extends ItemStackHandler { - return stackAt; - } + private final boolean allowWrite; + private final TileSimpleInventory tile; + + public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) { + super(0); + // Overwrite with our array + this.stacks = inv.inventorySlots; + this.allowWrite = allowWrite; + this.tile = inv; } - return null; - } + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(allowWrite) { + ItemStack ret = super.insertItem(slot, stack, simulate); + if(!simulate) + tile.markDirty(); + return ret; + } else return stack; + } - @Override - public ItemStack removeStackFromSlot(int i) { - return getStackInSlot(i); - } + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + if(allowWrite) { + ItemStack ret = super.extractItem(slot, amount, simulate); + if(!simulate) + tile.markDirty(); + return ret; + } else return null; + } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - inventorySlots[i] = itemstack; - } + // Override since our tile handles serialization itself - @Override - public int getInventoryStackLimit() { - return 64; - } + @Override + public NBTTagCompound serializeNBT() { return new NBTTagCompound(); } - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return worldObj.getTileEntity(getPos()) != this ? false : entityplayer.getDistanceSq(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D) <= 64; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Override - public void openInventory(EntityPlayer player) { - // NO-OP - } - - @Override - public void closeInventory(EntityPlayer player) { - // NO-OP - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) {} - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - Arrays.fill(inventorySlots, null); - } - - @Override - public IChatComponent getDisplayName() { - return new ChatComponentText(getName()); + @Override + public void deserializeNBT(NBTTagCompound nbt) { + onLoad(); + } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 0611990f9..8a4aaabe5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -30,7 +31,7 @@ public class TileSparkChanger extends TileSimpleInventory { if(worldObj.isRemote) return; - ItemStack changeStack = getStackInSlot(0); + ItemStack changeStack = itemHandler.getStackInSlot(0); List attachables = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); @@ -56,7 +57,7 @@ public class TileSparkChanger extends TileSimpleInventory { Collection transfers = spark.getTransfers(); if(transfers != null) transfers.clear(); - setInventorySlotContents(0, sparkStack); + itemHandler.setStackInSlot(0, sparkStack); worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDirty(); } @@ -68,13 +69,20 @@ public class TileSparkChanger extends TileSimpleInventory { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() == ModItems.sparkUpgrade; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public int getInventoryStackLimit() { - return 1; + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() == ModItems.sparkUpgrade) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override @@ -83,9 +91,4 @@ public class TileSparkChanger extends TileSimpleInventory { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } - @Override - public String getName() { - return LibBlockNames.SPARK_CHANGER; - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 8e81721f9..1277e38bd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -23,6 +23,7 @@ import net.minecraftforge.client.model.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -143,13 +144,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public String getName() { - return LibBlockNames.CORPOREA_CRYSTAL_CUBE; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index cb6fd4f1e..7d5711a5c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -19,6 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -66,19 +67,14 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq return filter; } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - @Override public int getSizeInventory() { return 1; } @Override - public String getName() { - return LibBlockNames.CORPOREA_FUNNEL; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index beae3b9e8..db37ffa14 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -194,11 +194,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ return 0; } - @Override - public String getName() { - return LibBlockNames.CORPOREA_INDEX; - } - @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof String)) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 7a72445ea..704bdc1b2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -29,8 +30,8 @@ import vazkii.botania.common.lib.LibMisc; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override @@ -38,11 +39,6 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor return 1; } - @Override - public String getName() { - return LibBlockNames.CORPOREA_INTERCEPTOR; - } - @Override public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { // NO-OP diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 8f8b571a5..1ac0be249 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; @@ -23,10 +24,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; -public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost, ISidedInventory { +public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost { public void onBurstCollision(IManaBurst burst) { - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); boolean active = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); @@ -62,23 +63,15 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - public String getName() { - return LibBlockNames.PRISM; - } - - @Override - public int[] getSlotsForFace(EnumFacing p_94128_1_) { - return new int[] { 0 }; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { - return p_102007_2_.getItem() instanceof ILens; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return true; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() instanceof ILens) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } } 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 67518be86..f85f09bdb 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 @@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; @@ -57,6 +58,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { @@ -234,7 +236,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(shouldShoot && receiver != null && receiver instanceof IKeyLocked) shouldShoot = ((IKeyLocked) receiver).getInputKey().equals(getOutputKey()); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); ILensControl control = getLensController(lens); if(control != null) { if(isredstone) { @@ -452,7 +454,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public void checkForReceiver() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); ILensControl control = getLensController(stack); if(control != null && !control.allowBurstShooting(stack, this, false)) return; @@ -480,7 +482,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, float gravity = 0F; BurstProperties props = new BurstProperties(maxMana, ticksBeforeManaLoss, manaLossPerTick, gravity, motionModifier, color); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); if(lens != null && lens.getItem() instanceof ILensEffect) ((ILensEffect) lens.getItem()).apply(lens, props); @@ -547,7 +549,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); if(lens != null) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -607,18 +609,20 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public String getName() { - return LibBlockNames.SPREADER; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack.getItem() instanceof ILens; + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() instanceof ILens) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override 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 5472e75ad..8a13a5ce1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -26,11 +27,11 @@ public class HeadRecipe extends RecipeRuneAltar { } @Override - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { boolean matches = super.matches(inv); if(matches) { - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java index 0c35bf25a..c1382d334 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.material; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; @@ -23,7 +24,7 @@ public class ItemManaPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; } 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 bd90b4008..34b688555 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -28,6 +28,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.Botania; @@ -138,7 +139,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { int meta = stack.getItemDamage(); return meta == 6 || meta == 8 || meta == 5 || meta == 23; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 51aa99dce..e13f09c69 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; @@ -42,7 +43,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 71bc42e17..d7c658ff6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -19,6 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -49,7 +50,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; } From ae89d0f18d26ecd99141986a262c1b5a8dcb81ad Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 18:56:08 -0600 Subject: [PATCH 373/935] Shim to avoid potion idmap shifting on startup. Closes #148 --- .../java/vazkii/botania/api/brew/Brew.java | 18 ++++---- .../botania/api/brew/PotionEffectShim.java | 26 +++++++++++ .../vazkii/botania/common/brew/BrewMod.java | 4 +- .../botania/common/brew/BrewModPotion.java | 5 ++- .../vazkii/botania/common/brew/ModBrews.java | 43 ++++++++++--------- 5 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/brew/PotionEffectShim.java diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 4da6fc655..9e1d92ff6 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -13,7 +13,9 @@ package vazkii.botania.api.brew; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -22,11 +24,11 @@ import net.minecraft.potion.PotionEffect; */ public class Brew { - String key; - String name; - int color; - int cost; - List effects; + private final String key; + private final String name; + private final int color; + private final int cost; + private final List effects; boolean canInfuseBloodPendant = true; boolean canInfuseIncense = true; @@ -37,12 +39,12 @@ public class Brew { * @param cost The cost, in Mana for this brew. * @param effects A list of effects to apply to the player when they drink it. */ - public Brew(String key, String name, int color, int cost, PotionEffect... effects) { + public Brew(String key, String name, int color, int cost, PotionEffectShim... effects) { this.key = key; this.name = name; this.color = color; this.cost = cost; - this.effects = new ArrayList<>(Arrays.asList(effects)); + this.effects = ImmutableList.copyOf(effects); } /** @@ -120,7 +122,7 @@ public class Brew { * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { - return effects; + return effects.stream().map(PotionEffectShim::toVanilla).collect(Collectors.toList()); } } diff --git a/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java b/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java new file mode 100644 index 000000000..6235cad3c --- /dev/null +++ b/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java @@ -0,0 +1,26 @@ +package vazkii.botania.api.brew; + +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraftforge.fml.common.registry.GameData; + +// Version of PotionEffect that doesn't use number ID's +// See https://github.com/MinecraftForge/MinecraftForge/issues/2374 +// todo 1.9 remove? +public class PotionEffectShim { + + public final Potion potion; + public final int duration; + public final int amplifier; + + public PotionEffectShim(Potion potion, int duration, int amplifier) { + this.potion = potion; + this.duration = duration; + this.amplifier = amplifier; + } + + public PotionEffect toVanilla() { + return new PotionEffect(GameData.getPotionRegistry().getId(potion), duration, amplifier, true, true); + } + +} diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index 765c957c1..107dd0a8f 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.brew; -import net.minecraft.potion.PotionEffect; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; +import vazkii.botania.api.brew.PotionEffectShim; public class BrewMod extends Brew { - public BrewMod(String key, int color, int cost, PotionEffect... effects) { + public BrewMod(String key, int color, int cost, PotionEffectShim... effects) { super(key, key, color, cost, effects); BotaniaAPI.registerBrew(this); } diff --git a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java index 878ec1bbb..e87683198 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java +++ b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java @@ -12,11 +12,12 @@ package vazkii.botania.common.brew; import net.minecraft.potion.PotionEffect; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.brew.PotionEffectShim; public class BrewModPotion extends BrewMod { - public BrewModPotion(String key, int cost, PotionEffect... effects) { - super(key, GameData.getPotionRegistry().getObjectById(effects[0].getPotionID()).getLiquidColor(), cost, effects); + public BrewModPotion(String key, int cost, PotionEffectShim... effects) { + super(key, effects[0].potion.getLiquidColor(), cost, effects); } } diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 2bdc1cc7f..92937149d 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -13,6 +13,7 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import vazkii.botania.api.brew.Brew; +import vazkii.botania.api.brew.PotionEffectShim; import vazkii.botania.common.lib.LibBrewNames; public class ModBrews { @@ -42,27 +43,27 @@ public class ModBrews { public static Brew warpWard; public static void init() { - speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffect(Potion.moveSpeed.id, 1800, 1)); - strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffect(Potion.damageBoost.id, 1800, 1)); - haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffect(Potion.digSpeed.id, 1800, 1)); - healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffect(Potion.heal.id, 1, 1)); - jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffect(Potion.jump.id, 1800, 1)); - regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffect(Potion.regeneration.id, 500, 1)); - regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffect(Potion.regeneration.id, 2400, 0)); - resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(Potion.resistance.id, 1800, 1)); - fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(Potion.fireResistance.id, 9600, 0)); - waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(Potion.waterBreathing.id, 9600, 0)); - invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(Potion.invisibility.id, 9600, 0)); - nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0)); - absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.absorption.id, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); + speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffectShim(Potion.moveSpeed, 1800, 1)); + strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffectShim(Potion.damageBoost, 1800, 1)); + haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffectShim(Potion.digSpeed, 1800, 1)); + healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffectShim(Potion.heal, 1, 1)); + jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffectShim(Potion.jump, 1800, 1)); + regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffectShim(Potion.regeneration, 500, 1)); + regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffectShim(Potion.regeneration, 2400, 0)); + resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffectShim(Potion.resistance, 1800, 1)); + fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffectShim(Potion.fireResistance, 9600, 0)); + waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffectShim(Potion.waterBreathing, 9600, 0)); + invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffectShim(Potion.invisibility, 9600, 0)); + nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffectShim(Potion.nightVision, 9600, 0)); + absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffectShim(Potion.absorption, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); - overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 3600, 2), new PotionEffect(Potion.hunger.id, 200, 2)); - soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0)); - featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet.id, 1800, 0)); - emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness.id, 7200, 0)); - bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffect(ModPotions.bloodthrst.id, 7200, 0)); - allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffect(ModPotions.allure.id, 4800, 0)); - clear = new BrewModPotion(LibBrewNames.CLEAR, 4000, new PotionEffect(ModPotions.clear.id, 0, 0)); + overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffectShim(Potion.damageBoost, 1800, 3), new PotionEffectShim(Potion.moveSpeed, 1800, 2), new PotionEffectShim(Potion.weakness, 3600, 2), new PotionEffectShim(Potion.hunger, 200, 2)); + soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffectShim(ModPotions.soulCross, 1800, 0)); + featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffectShim(ModPotions.featherfeet, 1800, 0)); + emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffectShim(ModPotions.emptiness, 7200, 0)); + bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffectShim(ModPotions.bloodthrst, 7200, 0)); + allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffectShim(ModPotions.allure, 4800, 0)); + clear = new BrewModPotion(LibBrewNames.CLEAR, 4000, new PotionEffectShim(ModPotions.clear, 0, 0)); } public static void initTC() { @@ -70,6 +71,6 @@ public class ModBrews { // thaumcraft 5 is registering its potions under the Minecraft namespace if(warpWardPotion != null) - warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffect(warpWardPotion.id, 12000, 0)).setNotBloodPendantInfusable(); + warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffectShim(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable(); } } From c6420168aa29c886856f7fe54672e61d295be393 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 19:00:15 -0600 Subject: [PATCH 374/935] Fix another problem caused by shifting idmap. Closes #147 --- src/main/java/vazkii/botania/api/brew/Brew.java | 11 +++++++++-- .../botania/common/item/brew/ItemIncenseStick.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 9e1d92ff6..916388c08 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -117,12 +117,19 @@ public class Brew { } /** - * Gets the list of potion effects for the ItemStack passed in. + * Get the PotionEffectShim's that this brew has. + */ + public List getPotionEffectsShim(ItemStack stack) { + return effects; + } + + /** + * Gets the list of vanilla PotionEffects for the ItemStack passed in. * Note that for the lexicon, this passes in a botania Managlass * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { - return effects.stream().map(PotionEffectShim::toVanilla).collect(Collectors.toList()); + return getPotionEffectsShim(stack).stream().map(PotionEffectShim::toVanilla).collect(Collectors.toList()); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 1e4cb9507..a4ac14ecf 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -107,7 +107,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - if(!brew.canInfuseIncense() || brew.getPotionEffects(stack).size() != 1 || GameData.getPotionRegistry().getObjectById(brew.getPotionEffects(stack).get(0).getPotionID()).isInstant()) + if(!brew.canInfuseIncense() || brew.getPotionEffectsShim(stack).size() != 1 || brew.getPotionEffectsShim(stack).get(0).potion.isInstant()) return null; ItemStack brewStack = new ItemStack(this); From 1c752992cf1aea7ef22a040f9390a39b13223ca7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 20:18:43 -0600 Subject: [PATCH 375/935] Fix bore+warp lenses breaking the destination block. Closes #149 --- src/main/java/vazkii/botania/common/item/lens/LensWarp.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index c41623165..e45a5cdd2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; @@ -33,7 +34,7 @@ public class LensWarp extends Lens { int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); if(worldId == entity.worldObj.provider.getDimensionId()) { entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - burst.setCollidedAt(pos.getBlockPos()); + burst.setCollidedAt(new BlockPos(x, y, z)); return false; } } From fefb5b5cc4cb0e6ecb13d320339bc360035e0cd3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 20:35:48 -0600 Subject: [PATCH 376/935] Tweak corporea funnel lexicon entry, closes #144 --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 37272010a..4bd949f2f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3302,7 +3302,7 @@ botania.page.corporeaIndex7=A certain magical one at that botania.entry.corporeaFunnel=Corporea Funnel botania.tagline.corporeaFunnel=Request items from a Corporea network via redstone botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the &4Corporea Network&0 is the &1Corporea Funnel&0, when given access to a network through a &1Corporea Spark&0 on top, it'll pull a single item from the network when given a redstone signal.
This item is put into an inventory 1 or 2 blocks below it, or case one doesn't exist or is full, tossed into the world right above the funnel. -botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
Rotating the item changes how many will be requested at once, starting at 1, rotating once will pull 2, twice 4, three times 8, four times 16, five times 32, six times 48, and finally seven times 64 items. +botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
Rotating the item changes how many will be requested at once, starting at 1, rotating will pull 2, 4, 8, 16, 32, 48, and finally 64 items, respectively. botania.page.corporeaFunnel2=Energistically applied # -- CORPOREA INTERCEPTOR From be9e4f731f8ad4a253910f0256039981e3e8537f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 20:41:53 -0600 Subject: [PATCH 377/935] Fix nulls getting into FakeWorldAccess. Closes #143 --- src/main/java/vazkii/botania/client/model/PlatformModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index fa1dac290..60dcfbb06 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -146,7 +147,7 @@ public class PlatformModel implements ISmartBlockModel { if(state.getBlock() instanceof BlockCamo) { state = ((TileCamo) compose.getTileEntity(pos)).camoState; } - return state; + return state == null ? Blocks.air.getDefaultState() : state; } @Override From 38ca4b429d5bea115994bac10183b9e46588b358 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 21:30:33 -0600 Subject: [PATCH 378/935] Fix recipe conflicts, making chiseled botania bricks craftable again. Closes #29 --- .../botania/common/crafting/ModCraftingRecipes.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c2e0c35d8..556404873 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1793,9 +1793,9 @@ public final class ModCraftingRecipes { 'S', LibOreDict.STONE_18_VARIANTS[i]); recipe18StoneBrick.add(BotaniaAPI.getLatestAddedRecipe()); - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 1, i + 12), - "S", "S", - 'S', new ItemStack(ModFluffBlocks.stoneSlabs[i + 4], 1, 0)); + addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), + "SS", "SS", + 'S', new ItemStack(ModFluffBlocks.stone, 1, i + 8)); recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); } @@ -2202,7 +2202,7 @@ public final class ModCraftingRecipes { for(int i = 0; i < 8; i++) { GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.biomeStoneB, 4, i), "SS", "SS", 'S', new ItemStack(ModFluffBlocks.biomeStoneA, 1, i)); - GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.biomeStoneB, 1, i + 8), "S", "S", 'S', new ItemStack(ModFluffBlocks.biomeStoneSlabs[i + 16])); + GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.biomeStoneB, 4, i + 8), "SS", "SS", 'S', new ItemStack(ModFluffBlocks.biomeStoneB, 1, i)); addStairsAndSlabs(ModFluffBlocks.biomeStoneA, i, ModFluffBlocks.biomeStoneStairs[i], ModFluffBlocks.biomeStoneSlabs[i]); addStairsAndSlabs(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneStairs[i + 8], ModFluffBlocks.biomeStoneSlabs[i + 8]); addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); From 70942d708992e82a0221ec1f0eb53a4e0f1a8f2b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 21:49:54 -0600 Subject: [PATCH 379/935] Fix faulty pane culling (vanilla bug) --- .../botania/blockstates/bifrostPermPane.json | 4 ++-- .../botania/blockstates/elfGlassPane.json | 4 ++-- .../botania/blockstates/manaGlassPane.json | 4 ++-- .../botania/models/block/pane_ns_fixed.json | 21 +++++++++++++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/pane_ns_fixed.json diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json index 14b6a2719..5d35ff02d 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index 4877ed756..8ef285391 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index 27be01075..8a3af453d 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/models/block/pane_ns_fixed.json b/src/main/resources/assets/botania/models/block/pane_ns_fixed.json new file mode 100644 index 000000000..b9fd7289f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pane_ns_fixed.json @@ -0,0 +1,21 @@ +{ + "__coment": "Copy of vanilla pane_ns, fixing the incorrect cullfaces there. Remove in 1.9", + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#pane" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#pane" } + } + } + ] +} From a9291566266807cf73802bb742a19e6f12ca8d7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 10:30:46 -0600 Subject: [PATCH 380/935] Fix overeager TE refreshing. Closes #152 and potentially fixes #71 --- .../vazkii/botania/common/block/tile/TileOpenCrate.java | 8 +++++++- .../vazkii/botania/common/block/tile/mana/TilePool.java | 6 +++++- .../botania/common/block/tile/mana/TileSpreader.java | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 973fe91b4..7a2e8448e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lib.LibBlockNames; @@ -25,7 +27,11 @@ public class TileOpenCrate extends TileSimpleInventory { @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); } @Override 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 941c3a207..11511d4e6 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 @@ -106,7 +106,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.POOL_VARIANT) != newState.getValue(BotaniaStateProps.POOL_VARIANT); } @Override 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 67518be86..392e941f3 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 @@ -143,7 +143,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { - return true; + if(oldState.getBlock() != newState.getBlock()) + return true; + if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + return true; + return oldState.getValue(BotaniaStateProps.SPREADER_VARIANT) != newState.getValue(BotaniaStateProps.SPREADER_VARIANT); } @Override From 298d46399fa45df2d637af7d31e121cc08c3349b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 14:01:40 -0600 Subject: [PATCH 381/935] Derp --- .../botania/common/block/tile/TileOpenCrate.java | 16 ++++++++-------- .../common/block/tile/mana/TileSpreader.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 7a2e8448e..389f0a496 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -29,15 +29,15 @@ public class TileOpenCrate extends TileSimpleInventory { public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; - if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) - return true; - return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); - } + if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) + return true; + return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); + } - @Override - public int getSizeInventory() { - return 1; - } + @Override + public int getSizeInventory() { + return 1; + } @Override public String getName() { 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 392e941f3..1ef334cdf 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 @@ -145,7 +145,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; - if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) + if(oldState.getBlock() != ModBlocks.spreader || newState.getBlock() != ModBlocks.spreader) return true; return oldState.getValue(BotaniaStateProps.SPREADER_VARIANT) != newState.getValue(BotaniaStateProps.SPREADER_VARIANT); } From 01ca175951c990198e34171c74c69ed27a12c4fa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 14:15:45 -0600 Subject: [PATCH 382/935] Remove tile ticking shim --- .../botania/common/block/tile/TileMod.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) 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 418a62d66..e82ea2225 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -65,22 +65,8 @@ public class TileMod extends TileEntity implements ITickable { @Override public final void update() { - if (!isInvalid() && worldObj.isBlockLoaded(getPos(), false)) { - if (!worldObj.isRemote) - updateEntity(); - else { - try { - updateEntity(); - } catch (NullPointerException e) { // todo 1.8 remove this abhorration after I figure out what's going on. - e.printStackTrace(); - FMLLog.severe("[Botania]: CLIENT TICK FAILED"); - FMLLog.severe("[Botania]: World: %s, Pos: %s, TE: %s", worldObj, pos, this); - if (this instanceof TileSpecialFlower) { - TileSpecialFlower spec = ((TileSpecialFlower) this); - FMLLog.severe("[Botania]: SUBTILE: %s", spec.getSubTile().getUnlocalizedName()); - } - } - } + if (!isInvalid() && worldObj.isBlockLoaded(getPos())) { + updateEntity(); } } From 40bad433c874e0d8b77c660b9dcd4cb1bca8e060 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 22:13:45 -0600 Subject: [PATCH 383/935] Fel pumpkin can now be placed from dispensers --- .../botania/common/block/BlockFelPumpkin.java | 1 + .../botania/common/block/ModBlocks.java | 2 + .../block/dispenser/BehaviourFelPumpkin.java | 54 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 028ba8132..d30ffa9d4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -64,6 +64,7 @@ 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); + System.out.println("Added?"); 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); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 143256ea7..b0aed942b 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -48,6 +48,7 @@ import vazkii.botania.common.block.decor.BlockStarfield; import vazkii.botania.common.block.decor.BlockThatch; import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.decor.BlockUnstable; +import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; import vazkii.botania.common.block.dispenser.BehaviourSeeds; import vazkii.botania.common.block.dispenser.BehaviourWand; @@ -416,6 +417,7 @@ public final class ModBlocks { 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()); } private static void initTileEntities() { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java new file mode 100644 index 000000000..e90e62177 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -0,0 +1,54 @@ +package vazkii.botania.common.block.dispenser; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.common.block.ModBlocks; + +// Taken from vanilla pumpkin dispense behaviour +public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { + private boolean field_179241_b = true; + + @Override + protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) + { + World world = source.getWorld(); + 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.isRemote) + { + world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); + } + + --stack.stackSize; + } + else + { + this.field_179241_b = false; + } + + return stack; + } + + @Override + protected void playDispenseSound(IBlockSource source) + { + if (this.field_179241_b) + { + source.getWorld().playAuxSFX(1000, source.getBlockPos(), 0); + } + else + { + source.getWorld().playAuxSFX(1001, source.getBlockPos(), 0); + } + } +} From 9aa6405566f4324cc3155716d128248194fd646b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 2 Mar 2016 22:14:08 -0600 Subject: [PATCH 384/935] Remove debug output --- src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index d30ffa9d4..028ba8132 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -64,7 +64,6 @@ 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); - System.out.println("Added?"); 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); From 2f1bc4188abda30916e32a33707fee319d1c09c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 3 Mar 2016 09:49:15 -0600 Subject: [PATCH 385/935] Prevent mobs from riding pool cart --- .../vazkii/botania/common/entity/EntityPoolMinecart.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 6e4bc283e..7373c13a0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -61,7 +61,12 @@ public class EntityPoolMinecart extends EntityMinecart { @Override public EnumMinecartType getMinecartType() { - return EnumMinecartType.RIDEABLE; // todo 1.8 + return EnumMinecartType.RIDEABLE; + } + + @Override + public boolean canBeRidden() { + return false; } @Override From 19ed5877df064558f6612e55485957451351a6bf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 3 Mar 2016 10:33:57 -0600 Subject: [PATCH 386/935] Make API java 7 compileable, so that people who have an optional botania dep don't have to use java 8 --- .../java/vazkii/botania/api/brew/Brew.java | 5 ++- .../botania/api/state/BotaniaStateProps.java | 43 +++++++++++++++---- .../botania/api/state/PropertyObject.java | 10 ++++- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 916388c08..6a590e4da 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -129,7 +129,10 @@ public class Brew { * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { - return getPotionEffectsShim(stack).stream().map(PotionEffectShim::toVanilla).collect(Collectors.toList()); + List ret = new ArrayList<>(); + for(PotionEffectShim s : getPotionEffectsShim(stack)) + ret.add(s.toVanilla()); + return ret; } } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 3e08907a4..f9771a7f9 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -8,6 +8,7 @@ */ package vazkii.botania.api.state; +import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; @@ -22,6 +23,8 @@ import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.*; +import javax.annotation.Nullable; + /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -73,9 +76,12 @@ public class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + @Override + public boolean apply(FutureStoneVariant variant) { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; + } }); // BlockAlfPortal @@ -94,7 +100,12 @@ public class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + @Override + public boolean apply(BiomeStoneVariant input) { + return input.getName().contains("cobble"); + } + }); // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); @@ -121,20 +132,34 @@ public class BotaniaStateProps { public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower (white to gray) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + return input.ordinal() >= 0 && input.ordinal() <= 7; + } + }); // (silver to black) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + return input.ordinal() >= 8 && input.ordinal() <= 15; + } + }); // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color -> - color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor color) { + return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED - || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN; + } + }); // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 78ce6dd9b..328b4dbd7 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -13,6 +13,9 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nullable; +import java.util.Objects; + // Generic base class for unlisted properties public class PropertyObject implements IUnlistedProperty { @@ -29,7 +32,12 @@ public class PropertyObject implements IUnlistedProperty { } public PropertyObject(String name, Class clazz) { - this(name, clazz, Predicates.alwaysTrue(), Object::toString); + this(name, clazz, Predicates.alwaysTrue(), new Function() { + @Override + public String apply(T input) { + return Objects.toString(input); + } + }); } @Override From 3c5f5884312e16373d7bd098a4fcdbdffdd092eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 4 Mar 2016 11:01:55 -0600 Subject: [PATCH 387/935] Get rid of BlockContainer --- .../botania/common/block/BlockAlfPortal.java | 9 ++- .../botania/common/block/BlockAltar.java | 9 ++- .../botania/common/block/BlockAvatar.java | 9 ++- .../botania/common/block/BlockBifrost.java | 9 ++- .../common/block/BlockCacophonium.java | 9 ++- .../botania/common/block/BlockCamo.java | 7 ++- .../botania/common/block/BlockCell.java | 9 ++- .../botania/common/block/BlockCocoon.java | 9 ++- .../botania/common/block/BlockEnderEye.java | 9 ++- .../botania/common/block/BlockFakeAir.java | 9 ++- .../block/BlockFloatingSpecialFlower.java | 2 +- .../botania/common/block/BlockForestEye.java | 10 ++- .../botania/common/block/BlockHourglass.java | 9 ++- .../common/block/BlockIncensePlate.java | 9 ++- .../botania/common/block/BlockLightRelay.java | 9 ++- .../vazkii/botania/common/block/BlockMod.java | 2 +- .../common/block/BlockModContainer.java | 61 ------------------- .../botania/common/block/BlockOpenCrate.java | 11 +++- .../botania/common/block/BlockPlatform.java | 3 +- .../botania/common/block/BlockPylon.java | 9 ++- .../common/block/BlockSparkChanger.java | 9 ++- .../common/block/BlockSpecialFlower.java | 9 ++- .../common/block/BlockTeruTeruBozu.java | 9 ++- .../botania/common/block/BlockTinyPlanet.java | 10 ++- .../block/corporea/BlockCorporeaBase.java | 10 ++- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../block/corporea/BlockCorporeaFunnel.java | 2 +- .../block/corporea/BlockCorporeaIndex.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../block/corporea/BlockCorporeaRetainer.java | 11 +++- .../block/decor/BlockFloatingFlower.java | 11 +++- .../common/block/decor/BlockManaBeacon.java | 11 +++- .../common/block/decor/BlockManaFlame.java | 11 +++- .../common/block/decor/BlockStarfield.java | 11 +++- .../common/block/decor/BlockTinyPotato.java | 11 +++- .../common/block/mana/BlockBellows.java | 11 +++- .../common/block/mana/BlockBrewery.java | 11 +++- .../common/block/mana/BlockDistributor.java | 12 +++- .../common/block/mana/BlockEnchanter.java | 11 +++- .../common/block/mana/BlockManaDetector.java | 11 +++- .../common/block/mana/BlockManaVoid.java | 12 +++- .../botania/common/block/mana/BlockPool.java | 11 +++- .../botania/common/block/mana/BlockPrism.java | 11 +++- .../botania/common/block/mana/BlockPump.java | 12 +++- .../common/block/mana/BlockRFGenerator.java | 12 +++- .../common/block/mana/BlockRuneAltar.java | 11 +++- .../common/block/mana/BlockSpawnerClaw.java | 12 +++- .../common/block/mana/BlockSpreader.java | 11 +++- .../common/block/mana/BlockTerraPlate.java | 11 +++- .../common/block/mana/BlockTurntable.java | 12 +++- .../common/block/string/BlockRedString.java | 9 ++- .../string/BlockRedStringComparator.java | 3 +- .../block/string/BlockRedStringContainer.java | 3 +- .../block/string/BlockRedStringDispenser.java | 2 +- .../string/BlockRedStringFertilizer.java | 2 +- .../string/BlockRedStringInterceptor.java | 2 +- .../block/string/BlockRedStringRelay.java | 3 +- 57 files changed, 347 insertions(+), 182 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/BlockModContainer.java diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 47d93e231..6d0351e57 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { +public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { public BlockAlfPortal() { super(Material.wood); @@ -59,7 +59,12 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileAlfPortal(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index cd8f81078..1c6e721e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -51,7 +51,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockAltar extends BlockModContainer implements ILexiconable { +public class BlockAltar extends BlockMod implements ILexiconable { Random random; @@ -259,7 +259,12 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 5d5c29382..f67905abe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -34,7 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAvatar extends BlockModContainer implements ILexiconable { +public class BlockAvatar extends BlockMod implements ILexiconable { Random random; @@ -163,7 +163,12 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileAvatar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index a6407eef0..47ddb5a14 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -32,7 +32,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockBifrost extends BlockModContainer implements ILexiconable { +public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { super(Material.glass); @@ -81,7 +81,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileBifrost(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 2368ce3e5..be121710a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -28,7 +28,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCacophonium extends BlockModContainer { +public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { super(Material.wood); @@ -98,7 +98,12 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 2b299f91f..5f27a7281 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -26,7 +26,7 @@ import vazkii.botania.common.block.tile.TileCamo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public abstract class BlockCamo extends BlockModContainer { +public abstract class BlockCamo extends BlockMod { protected BlockCamo(Material par2Material) { super(par2Material); @@ -102,4 +102,9 @@ public abstract class BlockCamo extends BlockModContainer { return 0xFFFFFF; } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 93332ca10..6ec393dac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCell extends BlockModContainer implements ILexiconable { +public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { super(Material.gourd); @@ -41,7 +41,12 @@ public class BlockCell extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 734acc728..8775d9bbe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -29,7 +29,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCocoon extends BlockModContainer implements ILexiconable { +public class BlockCocoon extends BlockMod implements ILexiconable { protected BlockCocoon() { super(Material.cloth); @@ -81,7 +81,12 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index bcb903910..3bf8521de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockEnderEye extends BlockModContainer implements ILexiconable { +public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { super(Material.iron); @@ -64,7 +64,12 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileEnderEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index ec5d1f5af..072f3aade 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; -public class BlockFakeAir extends BlockModContainer { +public class BlockFakeAir extends BlockMod { public BlockFakeAir() { super(Material.air); @@ -127,7 +127,12 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileFakeAir(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 2e64b29cc..a606cdc85 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -197,7 +197,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileEntity createTileEntity(World world, IBlockState state) { return new TileFloatingSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 6cdce7f1b..f37321ff7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockForestEye extends BlockModContainer implements ILexiconable { +public class BlockForestEye extends BlockMod implements ILexiconable { public BlockForestEye() { super(Material.iron); @@ -55,7 +56,12 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileForestEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9548b0627..251294a6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -41,7 +41,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockHourglass extends BlockModContainer implements IManaTrigger, IWandable, IWandHUD, ILexiconable { +public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { Random random; @@ -181,7 +181,12 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileHourglass(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 0aab68bd4..117ac8f79 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockIncensePlate extends BlockModContainer implements ILexiconable { +public class BlockIncensePlate extends BlockMod implements ILexiconable { protected BlockIncensePlate() { super(Material.wood); @@ -136,7 +136,12 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileIncensePlate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index aa3f3e9f1..4af6a0d71 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -38,7 +38,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { +public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { protected BlockLightRelay() { super(Material.glass); @@ -150,7 +150,12 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 6a95f77f9..7d6325e4e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -45,7 +45,7 @@ public class BlockMod extends Block { return super.setLightLevel(p_149715_1_); } - boolean registerInCreative() { + protected boolean registerInCreative() { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java deleted file mode 100644 index dfb4905b1..000000000 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 14, 2014, 5:32:55 PM (GMT)] - */ -package vazkii.botania.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public abstract class BlockModContainer extends BlockContainer { - - public int originalLight; - - protected BlockModContainer(Material par2Material) { - super(par2Material); - if(registerInCreative()) - setCreativeTab(BotaniaCreativeTab.INSTANCE); - } - - @Override - public int getRenderType() { - return 3; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - protected boolean shouldRegisterInNameSet() { - return true; - } - - @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); - } - - public boolean registerInCreative() { - return true; - } - - @Override - public abstract T createNewTileEntity(World world, int meta); - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1cb4f16b1..f534861f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -49,7 +49,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { +public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { Random random; @@ -167,8 +167,13 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { - return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 916492f9c..f13d46a30 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -22,6 +22,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -131,7 +132,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public TileCamo createNewTileEntity(World world, int meta) { + public TileEntity createTileEntity(World world, IBlockState state) { return new TilePlatform(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 764059b12..0687e5322 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { +public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { public BlockPylon() { super(Material.iron); @@ -117,7 +117,12 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TilePylon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 8b1b84a90..055a75cf9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -34,7 +34,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockSparkChanger extends BlockModContainer implements ILexiconable { +public class BlockSparkChanger extends BlockMod implements ILexiconable { Random random; @@ -171,7 +171,12 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileSparkChanger(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index dc366c41e..581e4322d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -61,7 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { @@ -257,7 +257,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index b86891662..38ce90f31 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable { +public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { public BlockTeruTeruBozu() { super(Material.cloth); @@ -112,7 +112,12 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileTeruTeruBozu(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 5c49a0663..28a4dbea5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { +public class BlockTinyPlanet extends BlockMod implements ILexiconable { protected BlockTinyPlanet() { super(Material.rock); @@ -45,7 +46,12 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { return new TileTinyPlanet(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 2b6c7504a..854bbf72c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -24,11 +24,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; -public abstract class BlockCorporeaBase extends BlockModContainer implements ICraftAchievement { +public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { Random random; @@ -82,4 +81,9 @@ public abstract class BlockCorporeaBase extends BlockModContainer implements ILexiconable { +public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { super(Material.rock); @@ -58,6 +58,11 @@ public abstract class BlockRedString extends BlockModContainer im return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 52454f072..115f2531b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -36,7 +37,7 @@ public class BlockRedStringComparator extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { return new TileRedStringComparator(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index c4c1e5672..87062e037 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +26,7 @@ public class BlockRedStringContainer extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { return new TileRedStringContainer(); } 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 e29631dc0..db31fe196 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -65,7 +65,7 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState meta) { return new TileRedStringDispenser(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index d5987da7a..1d577d783 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -45,7 +45,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState meta) { return new TileRedStringFertilizer(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 18e691611..474edd332 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -86,7 +86,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { return new TileRedStringInterceptor(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 5a284f116..5c8b47286 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.string; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -25,7 +26,7 @@ public class BlockRedStringRelay extends BlockRedString { } @Override - public TileRedString createNewTileEntity(World world, int meta) { + public TileRedString createTileEntity(World world, IBlockState state) { return new TileRedStringRelay(); } From 28f4321cfbfc40f10c6bb4fe5b363952665490a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 4 Mar 2016 21:33:28 -0600 Subject: [PATCH 388/935] Derp missed one --- .../java/vazkii/botania/common/block/BlockEnchantedSoil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index ab8739f30..e456b29d6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -39,7 +39,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - boolean registerInCreative() { + protected boolean registerInCreative() { return false; } From b581a5544b1d5ef35e9d427198d5977f6bf5fb40 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 4 Mar 2016 22:22:07 -0600 Subject: [PATCH 389/935] Fix memory usage problem caused by vanilla --- .../common/brew/potion/PotionBloodthirst.java | 19 +++++++++++++++---- .../common/brew/potion/PotionEmptiness.java | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) 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 b30680ddd..39fe59463 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -34,12 +34,23 @@ public class PotionBloodthirst extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); - for(EntityPlayer player : players) - if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { - event.setResult(Result.ALLOW); + + AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); + for(EntityPlayer player : event.world.playerEntities) { + if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness) && player.getEntityBoundingBox().intersectsWith(aabb)) { + event.setResult(Result.DENY); return; } + } + +// TODO 1.8 report to forge? world.getEntitiesWithinAABB is hell slow in 1.8+ +// List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); +// for(EntityPlayer player : players) +// if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { +// event.setResult(Result.ALLOW); +// return; +// } + } } 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 3614d8c7a..440bb3d9a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -33,12 +33,22 @@ public class PotionEmptiness extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); - for(EntityPlayer player : players) - if(hasEffect(player)) { + AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); + for(EntityPlayer player : event.world.playerEntities) { + if(hasEffect(player) && player.getEntityBoundingBox().intersectsWith(aabb)) { event.setResult(Result.DENY); return; } + } + +// TODO 1.8 report to forge? world.getEntitiesWithinAABB is hell slow in 1.8+ +// List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); +// for(EntityPlayer player : players) +// if(hasEffect(player)) { +// event.setResult(Result.DENY); +// return; +// } + } } From 274b4ab05abc5d3fdd52239fae7026ccaec75ecd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 4 Mar 2016 23:07:16 -0600 Subject: [PATCH 390/935] onContentsChanged exists --- .../common/block/tile/TileSimpleInventory.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index a21995e7f..4c78c7516 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -92,23 +92,22 @@ public abstract class TileSimpleInventory extends TileMod { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { if(allowWrite) { - ItemStack ret = super.insertItem(slot, stack, simulate); - if(!simulate) - tile.markDirty(); - return ret; + return super.insertItem(slot, stack, simulate); } else return stack; } @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { if(allowWrite) { - ItemStack ret = super.extractItem(slot, amount, simulate); - if(!simulate) - tile.markDirty(); - return ret; + return super.extractItem(slot, amount, simulate); } else return null; } + @Override + public void onContentsChanged(int slot) { + tile.markDirty(); + } + // Override since our tile handles serialization itself @Override From 9975f4b0289b95d43f2132faa59e1d512ac4b364 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Mar 2016 01:34:00 -0600 Subject: [PATCH 391/935] Make piston relays not stringly typed --- .../common/block/BlockPistonRelay.java | 115 ++++++++++-------- .../botania/common/item/ItemTwigWand.java | 4 +- .../botania/common/item/lens/LensWarp.java | 10 +- 3 files changed, 71 insertions(+), 58 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index c678dbccd..be22be5ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -10,13 +10,14 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.List; +import java.util.HashSet; import java.util.Map; import java.util.Random; +import java.util.Set; +import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; import net.minecraft.block.BlockPistonMoving; @@ -49,12 +50,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { - public static Map playerPositions = new HashMap<>(); - public static Map mappedPositions = new HashMap<>(); + public static final Map playerPositions = new HashMap<>(); + public static final Map mappedPositions = new HashMap<>(); - static List removeThese = new ArrayList<>(); - static List checkedCoords = new ArrayList<>(); - static Map coordsToCheck = new HashMap<>(); + private static final Set removeThese = new HashSet<>(); + private static final Set checkedCoords = new HashSet<>(); + private static final TObjectIntHashMap coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1); public BlockPistonRelay() { super(Material.gourd); @@ -81,47 +82,32 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl mapCoords(par1World.provider.getDimensionId(), pos, 2); } - public static String getCoordsAsString(int world, BlockPos pos) { - return world + ":" + pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); - } - static void mapCoords(int world, BlockPos pos, int time) { - String coords = getCoordsAsString(world, pos); - coordsToCheck.put(coords, time); + coordsToCheck.put(new DimWithPos(world, pos), time); } - static void decrCoords(String key) { + static void decrCoords(DimWithPos key) { int time = getTimeInCoords(key); if(time <= 0) removeThese.add(key); - else coordsToCheck.put(key, time - 1); + else coordsToCheck.adjustValue(key, -1); } - static int getTimeInCoords(String key) { + static int getTimeInCoords(DimWithPos key) { return coordsToCheck.get(key); } - static Block getBlockAt(String key) { - MinecraftServer server = MinecraftServer.getServer(); - if(server == null) - return Blocks.air; - - String[] tokens = key.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - World world = server.worldServerForDimension(worldId); - return world.getBlockState(new BlockPos(x, y, z)).getBlock(); + static Block getBlockAt(DimWithPos key) { + IBlockState state = getStateAt(key); + return state == null ? null : state.getBlock(); } - static IBlockState getStateAt(String key) { + static IBlockState getStateAt(DimWithPos key) { MinecraftServer server = MinecraftServer.getServer(); if(server == null) return null; - - String[] tokens = key.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - World world = server.worldServerForDimension(worldId); - return world.getBlockState(new BlockPos(x, y, z)); + return server.worldServerForDimension(key.dim).getBlockState(key.blockPos); } @Override @@ -130,7 +116,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl return false; if(!player.isSneaking()) { - playerPositions.put(player.getName(), getCoordsAsString(world.provider.getDimensionId(), pos)); + playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimensionId(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); @@ -170,15 +156,15 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(tag instanceof NBTTagString) { String value = ((NBTTagString) tag).getString(); - mappedPositions.put(key, value); + mappedPositions.put(DimWithPos.fromString(key), DimWithPos.fromString(value)); } } } @Override public void writeToNBT(NBTTagCompound nbttagcompound) { - for(String s : mappedPositions.keySet()) - nbttagcompound.setString(s, mappedPositions.get(s)); + for(DimWithPos s : mappedPositions.keySet()) + nbttagcompound.setString(s.toString(), mappedPositions.get(s).toString()); } public static WorldData get(World world) { @@ -199,8 +185,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void tickEnd(TickEvent event) { if(event.type == Type.SERVER && event.phase == Phase.END) { - List coordsToCheckCopy = new ArrayList<>(coordsToCheck.keySet()); - for(String s : coordsToCheckCopy) { + for(DimWithPos s : coordsToCheck.keySet()) { decrCoords(s); if(checkedCoords.contains(s)) continue; @@ -214,12 +199,11 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl MinecraftServer server = MinecraftServer.getServer(); if(server != null && getTimeInCoords(s) == 0) { - String newPos; + DimWithPos newPos; { - String[] tokens = s.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - BlockPos pos = new BlockPos(x, y, z); + int worldId = s.dim, x = s.blockPos.getX(), y = s.blockPos.getY(), z = s.blockPos.getZ(); + BlockPos pos = s.blockPos; World world = server.worldServerForDimension(worldId); if(world.isAirBlock(pos.offset(dir))) world.setBlockState(pos.offset(dir), ModBlocks.pistonRelay.getDefaultState()); @@ -228,14 +212,13 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl world.spawnEntityInWorld(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); } checkedCoords.add(s); - newPos = getCoordsAsString(world.provider.getDimensionId(), pos.offset(dir)); + newPos = new DimWithPos(world.provider.getDimensionId(), pos.offset(dir)); } if(mappedPositions.containsKey(s)) { - String pos = mappedPositions.get(s); - String[] tokens = pos.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - BlockPos pos2 = new BlockPos(x, y, z); + DimWithPos pos = mappedPositions.get(s); + int worldId = pos.dim; + BlockPos pos2 = pos.blockPos; World world = server.worldServerForDimension(worldId); IBlockState srcState = world.getBlockState(pos2); @@ -247,7 +230,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { world.setBlockState(pos2, Blocks.air.getDefaultState()); world.setBlockState(pos2.offset(dir), srcState, 1 | 2); - mappedPositions.put(s, getCoordsAsString(world.provider.getDimensionId(), pos2.offset(dir))); + mappedPositions.put(s, new DimWithPos(world.provider.getDimensionId(), pos2.offset(dir))); } } @@ -261,9 +244,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } } - // ConcurrentModificationException failsafe - ArrayList remove = new ArrayList<>(removeThese); - for(String s : remove) { + for(DimWithPos s : removeThese) { coordsToCheck.remove(s); if(checkedCoords.contains(s)) checkedCoords.remove(s); @@ -281,4 +262,38 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pistonRelay; } + + public static class DimWithPos { + public final int dim; + public final BlockPos blockPos; + + public DimWithPos(int dim, BlockPos pos) { + this.dim = dim; + this.blockPos = pos; + } + + @Override + public int hashCode() { + return 31 * dim ^ blockPos.hashCode(); + } + + @Override + public boolean equals(Object o) { + return o instanceof DimWithPos + && dim == ((DimWithPos) o).dim + && blockPos.equals(((DimWithPos) o).blockPos); + } + + @Override + public String toString() { + return dim + ":" + blockPos.getX() + ":" + blockPos.getY() + ":" + blockPos.getZ(); + } + + public static DimWithPos fromString(String s) { + String[] split = s.split(":"); + return new DimWithPos(Integer.parseInt(split[0]), new BlockPos(Integer.parseInt(split[1]), Integer.parseInt(split[2]), Integer.parseInt(split[3]))); + } + + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 4c4a995e4..870d8c65c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -130,8 +130,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return wanded; } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { - String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); - String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.getDimensionId(), pos); + BlockPistonRelay.DimWithPos bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); + BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimensionId(), pos); BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index e45a5cdd2..c0b47bc26 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -28,13 +28,11 @@ public class LensWarp extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - String key = BlockPistonRelay.mappedPositions.get(BlockPistonRelay.getCoordsAsString(entity.worldObj.provider.getDimensionId(), pos.getBlockPos())); + BlockPistonRelay.DimWithPos key = BlockPistonRelay.mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimensionId(), pos.getBlockPos())); if(key != null) { - String[] tokens = key.split(":"); - int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); - if(worldId == entity.worldObj.provider.getDimensionId()) { - entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - burst.setCollidedAt(new BlockPos(x, y, z)); + if(key.dim == entity.worldObj.provider.getDimensionId()) { + entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5); + burst.setCollidedAt(key.blockPos); return false; } } From 67bcd94edf20dcc866339af91805155812775733 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Mar 2016 09:30:44 -0600 Subject: [PATCH 392/935] Fix inverted potion condition --- .../vazkii/botania/common/brew/potion/PotionBloodthirst.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 39fe59463..9c14e68c4 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -38,7 +38,7 @@ public class PotionBloodthirst extends PotionMod { AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); for(EntityPlayer player : event.world.playerEntities) { if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness) && player.getEntityBoundingBox().intersectsWith(aabb)) { - event.setResult(Result.DENY); + event.setResult(Result.ALLOW); return; } } From 036fc4b0cc5f54065555bc7ec64b8654edb2ed96 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Mar 2016 12:12:29 -0600 Subject: [PATCH 393/935] Use cap's native serialization --- .../botania/common/block/tile/TileAltar.java | 6 +-- .../botania/common/block/tile/TileAvatar.java | 3 +- .../common/block/tile/TileBrewery.java | 6 +-- .../common/block/tile/TileCraftCrate.java | 3 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/TileIncensePlate.java | 7 +--- .../common/block/tile/TileRuneAltar.java | 8 +--- .../block/tile/TileSimpleInventory.java | 40 +++---------------- .../common/block/tile/TileSparkChanger.java | 4 +- .../corporea/TileCorporeaCrystalCube.java | 5 +-- .../tile/corporea/TileCorporeaFunnel.java | 4 +- .../corporea/TileCorporeaInterceptor.java | 4 +- .../common/block/tile/mana/TilePrism.java | 6 +-- .../common/block/tile/mana/TileSpreader.java | 5 +-- 14 files changed, 18 insertions(+), 87 deletions(-) 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 9b82b0201..1e0220538 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -22,13 +22,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; @@ -45,7 +42,6 @@ import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibBlockNames; public class TileAltar extends TileSimpleInventory implements IPetalApothecary { @@ -288,7 +284,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override protected int getStackLimit(int slot, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 1f374f5ea..b8737f28d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; @@ -73,7 +72,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override protected int getStackLimit(int slot, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 3040b4fff..be3aa1f93 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -17,12 +17,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; @@ -33,7 +30,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar public class TileBrewery extends TileSimpleInventory implements IManaReceiver { @@ -209,7 +205,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { }*/ @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override protected int getStackLimit(int slot, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 4d3655bb0..ec472e1f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -21,7 +21,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -78,7 +77,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override protected int getStackLimit(int slot, ItemStack stack) { 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 42427be9c..0e6ee69c1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -21,10 +21,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.lib.LibBlockNames; public class TileHourglass extends TileSimpleInventory { @@ -97,7 +95,7 @@ public class TileHourglass extends TileSimpleInventory { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { 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 3542dcbfe..01cd9ffee 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -14,23 +14,18 @@ import java.awt.Color; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.GameData; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; -import vazkii.botania.common.lib.LibBlockNames; public class TileIncensePlate extends TileSimpleInventory { @@ -127,7 +122,7 @@ public class TileIncensePlate extends TileSimpleInventory { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index fe6b19b4c..f8c4d1427 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -17,16 +17,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -40,8 +36,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibObfuscation; public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { @@ -313,7 +307,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver }*/ @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override protected int getStackLimit(int slot, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 4c78c7516..db8a64237 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; @@ -21,39 +20,22 @@ import net.minecraftforge.items.ItemStackHandler; public abstract class TileSimpleInventory extends TileMod { - ItemStack[] inventorySlots = new ItemStack[getSizeInventory()]; - protected IItemHandlerModifiable itemHandler = createItemHandler(); + protected SimpleItemStackHandler itemHandler = createItemHandler(); @Override public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { - NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 10); - inventorySlots = new ItemStack[getSizeInventory()]; - for (int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = var2.getCompoundTagAt(var3); - byte var5 = var4.getByte("Slot"); - if (var5 >= 0 && var5 < inventorySlots.length) - inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); - } itemHandler = createItemHandler(); + itemHandler.deserializeNBT(par1NBTTagCompound); } @Override public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) { - NBTTagList var2 = new NBTTagList(); - for (int var3 = 0; var3 < inventorySlots.length; ++var3) { - if (inventorySlots[var3] != null) { - NBTTagCompound var4 = new NBTTagCompound(); - var4.setByte("Slot", (byte)var3); - inventorySlots[var3].writeToNBT(var4); - var2.appendTag(var4); - } - } - par1NBTTagCompound.setTag("Items", var2); + par1NBTTagCompound.merge(itemHandler.serializeNBT()); } public abstract int getSizeInventory(); - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true); } @@ -82,9 +64,7 @@ public abstract class TileSimpleInventory extends TileMod { private final TileSimpleInventory tile; public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) { - super(0); - // Overwrite with our array - this.stacks = inv.inventorySlots; + super(inv.getSizeInventory()); this.allowWrite = allowWrite; this.tile = inv; } @@ -107,15 +87,5 @@ public abstract class TileSimpleInventory extends TileMod { public void onContentsChanged(int slot) { tile.markDirty(); } - - // Override since our tile handles serialization itself - - @Override - public NBTTagCompound serializeNBT() { return new NBTTagCompound(); } - - @Override - public void deserializeNBT(NBTTagCompound nbt) { - onLoad(); - } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 8a4aaabe5..2e237e997 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -17,12 +17,10 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileSparkChanger extends TileSimpleInventory { @@ -69,7 +67,7 @@ public class TileSparkChanger extends TileSimpleInventory { } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override protected int getStackLimit(int slot, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 1277e38bd..7971d600e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -19,16 +19,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.IAnimationProvider; -import net.minecraftforge.client.model.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.common.lib.LibBlockNames; public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider { @@ -144,7 +141,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false); } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 7d5711a5c..504a28265 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -19,12 +19,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { @@ -73,7 +71,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false); } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 704bdc1b2..18247f350 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -19,18 +19,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 1ac0be249..9675b4999 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -11,10 +11,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.entity.Entity; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; @@ -22,7 +19,6 @@ import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.lib.LibBlockNames; public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost { @@ -63,7 +59,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { 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 f85f09bdb..d702623ce 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 @@ -29,7 +29,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; @@ -58,8 +57,6 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { @@ -609,7 +606,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - protected IItemHandlerModifiable createItemHandler() { + protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override protected int getStackLimit(int slot, ItemStack stack) { From db23bffea6902c3b3c2f1d6826e0dd80a142e82d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Mar 2016 20:43:03 -0600 Subject: [PATCH 394/935] Remove future references to 1.8 from lang file --- src/main/resources/assets/botania/lang/en_US.lang | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4bd949f2f..c51fbc7c6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3742,17 +3742,6 @@ botania.page.shinyFlowers3=Combining any color of &1Floating Flower&0 with any f botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny botania.page.shinyFlowers2=Like Laputa but (a lot) tinier -# -- PRISMARINE -botania.entry.prismarine=Prismarine -botania.tagline.prismarine=UFO Commander, we are the future -botania.page.prismarine0=&1Prismarine&0 is an interesting component and building block. Some scholars even go as far as to say it comes from &4the future&0.
To create it, one requires an &1Alchemy Catalyst&0. Simply tossing some &1Nether Quartz&0 into a &1Mana Pool&0 with the catalyst attached to it will get some of this material. -botania.page.prismarine1=There's various building blocks that can be created using the &1Prismarine Shards&0, to which all but the &1Sea Lantern&0 can be turned into their &1Stair&0 and &1Slab&0 variants. -botania.page.prismarine2=Creating &1Prismarine Shards&0 -botania.page.prismarine3=Crafting &1Prismarine&0 -botania.page.prismarine4=Crafting &1Prismarine Bricks&0 -botania.page.prismarine5=Crafting &1Dark Prismarine&0 -botania.page.prismarine6=Crafting the &1Sea Lantern&0 - # -- NATURAL SHEDDING botania.entry.shedding=Natural Shedding botania.tagline.shedding=Things dropping other things @@ -3807,7 +3796,7 @@ botania.page.phantomInk1=Who you gonna call? # -- STONE ALCHEMY botania.entry.stoneAlchemy=Stone Alchemy botania.tagline.stoneAlchemy=Create new stone types -botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cyle.
Similarly to &1Prismarine&0, some scholars admit that this technique came from the future. Stairs and slabs can be made from the rough and brick variants of these. +botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cycle.
Stairs and slabs can be made from the rough and brick variants of these. botania.page.stoneAlchemy1=Creating the stones botania.page.stoneAlchemy2=Brickage botania.page.stoneAlchemy3=Chiseling @@ -3862,7 +3851,7 @@ botania.page.bcIntegration0=Recent advances in piping technology have allowed &1 # -- BANNER ADDITIONS botania.entry.banners=Banner Additions botania.tagline.banners=Lots of new banner patterns -botania.page.banners0=In the presence of the &1Banners&0 from the future, &1Botania&0 adds &415&0 new icons to them, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. +botania.page.banners0=&1Botania&0 adds &415&0 new icons to banners, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. botania.page.banners1=Showcase of the various banners # -- PREVNTING DECAY From 3084b058dad8e21dc172ff412db442c92853ff92 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 5 Mar 2016 22:02:22 -0600 Subject: [PATCH 395/935] Cleanups in API --- MC18_notes.txt | 29 --------- .../java/vazkii/botania/api/BotaniaAPI.java | 20 ++++-- .../botania/api/mana/TileSignature.java | 12 ++++ .../api/mana/spark/ISparkAttachable.java | 10 +-- .../botania/api/mana/spark/ISparkEntity.java | 14 +--- .../api/mana/spark/SparkUpgradeType.java | 9 +++ .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/ElvenPortalUpdateEvent.java | 2 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 21 ++++-- .../botania/api/recipe/RecipeElvenTrade.java | 11 ++-- .../api/recipe/RecipeManaInfusion.java | 6 +- .../botania/api/recipe/RecipeMiniFlower.java | 2 +- .../botania/api/recipe/RecipePetals.java | 11 ++-- .../botania/api/recipe/RecipeRuneAltar.java | 2 +- .../botania/api/state/BotaniaStateProps.java | 2 +- .../botania/api/subtile/RadiusDescriptor.java | 2 +- .../api/subtile/signature/BasicSignature.java | 2 +- .../botania/api/wiki/SimpleWikiProvider.java | 4 +- .../client/render/entity/RenderSpark.java | 2 +- .../common/block/tile/TileSparkChanger.java | 11 ++-- .../botania/common/entity/EntitySpark.java | 65 ++++++++++--------- 21 files changed, 120 insertions(+), 119 deletions(-) delete mode 100644 MC18_notes.txt create mode 100644 src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java diff --git a/MC18_notes.txt b/MC18_notes.txt deleted file mode 100644 index ff7736d96..000000000 --- a/MC18_notes.txt +++ /dev/null @@ -1,29 +0,0 @@ --- API -- -* Updated to BlockPos and EnumFacing everywhere where it made sense -* Registering repainting blocks will need to also receive a PropertyEnum with EnumDyeColor as the component type -so Botania knows what property to set the color on -* ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively) -This can be changed to match vanilla signature, but either would break backward compat. -* SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block). -Anyways, vanilla removed it from their method so we follow suit. -* SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts -* Multiblock system reworked to use states and blockposes -* Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. -* Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with -* Removed icon methods from SubTileSignature - --- Other -- -* Lang entries to be updated in non-english: Corporea funnel new numbers. Moving of prismarine entry. -* Most things left untouched to make patches from upstream easier -* Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances -since BlockPos'es are immutable and thus can be reused everywhere. -* Some really needed fields in EntityItem are private now. Reflection time :( -* Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. -Unless someone figures out a way to use the old one -* The alt textures will probably be a resource pack now to decrease complexity... -sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack -* Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them -* Quartz stair textures may be assigned incorrectly - resource pack authors check me -* Glass pane inner faces are not getting culled (vanilla bug?) -* Some item forms of technical/non-user blocks are removed - * Full list: [all double slab items, all solid vine items] diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 0ba3e4fe2..a86313d1e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.google.common.base.Preconditions; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockStainedGlass; @@ -38,6 +39,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; @@ -299,14 +301,14 @@ public final class BotaniaAPI { return fallbackBrew; } - /* + /** * Registers a Block as disposable using its Ore Dictionary Name. */ public static void registerDisposableBlock(String oreDictName) { disposableBlocks.add(oreDictName); } - /* + /** * Registers a Block as semi disposable using its Ore Dictionary Name. * This means it will not be trashed when sneaking. */ @@ -317,14 +319,13 @@ public final class BotaniaAPI { /** * Registers a paintableBlock and returns it. * You must also provide the PropertyEnum that this block uses to express its color - * The component type of the property must be EnumDyeColor */ public static Block registerPaintableBlock(Block paintable, PropertyEnum colorProp){ paintableBlocks.put(paintable, colorProp); return paintable; } - /* + /** * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. * Pass in the class for the Entity, e.g. EntityCow.class */ @@ -332,7 +333,7 @@ public final class BotaniaAPI { gravityRodBlacklist.add(entity); } - /* + /** * Checks if the provided Entity is contained in the Blacklist. * Pass in the class for the Entity, e.g. entity.getClass() */ @@ -407,6 +408,7 @@ public final class BotaniaAPI { * @return The recipe created. */ public static RecipePetals registerPetalRecipe(ItemStack output, Object... inputs) { + Preconditions.checkArgument(inputs.length <= 16); RecipePetals recipe = new RecipePetals(output, inputs); petalRecipes.add(recipe); return recipe; @@ -445,6 +447,7 @@ public final class BotaniaAPI { * @return The recipe created. */ public static RecipeRuneAltar registerRuneAltarRecipe(ItemStack output, int mana, Object... inputs) { + Preconditions.checkArgument(inputs.length <= 16); RecipeRuneAltar recipe = new RecipeRuneAltar(output, mana, inputs); runeAltarRecipes.add(recipe); return recipe; @@ -458,6 +461,7 @@ public final class BotaniaAPI { * @return The recipe created. */ public static RecipeManaInfusion registerManaInfusionRecipe(ItemStack output, Object input, int mana) { + Preconditions.checkArgument(mana <= 1000000); RecipeManaInfusion recipe = new RecipeManaInfusion(output, input, mana); manaInfusionRecipes.add(recipe); return recipe; @@ -503,6 +507,7 @@ public final class BotaniaAPI { * @inputs The items used in the recipe, no more than 6. */ public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) { + Preconditions.checkArgument(inputs.length <= 6); RecipeBrew recipe = new RecipeBrew(brew, inputs); brewRecipes.add(recipe); return recipe; @@ -510,9 +515,10 @@ public final class BotaniaAPI { /** * Registers a SubTileEntity, a new special flower. Look in the subtile package of the API. - * If you call this after PostInit you're a failiure and we are very disappointed in you. + * Call this in preInit, and don't forget to register a model in BotaniaAPIClient. */ public static void registerSubTile(String key, Class subtileClass) { + Preconditions.checkArgument(Loader.instance().isInState(LoaderState.PREINITIALIZATION)); subTiles.put(key, subtileClass); subTileMods.put(key, Loader.instance().activeModContainer().getModId()); } @@ -667,7 +673,7 @@ public final class BotaniaAPI { /** * Registers a Wiki provider for a mod so it uses that instead of the fallback - * FTB wiki. Make sure to call this on PostInit only! + * FTB wiki. */ public static void registerModWiki(String mod, IWikiProvider provider) { WikiHooks.registerModWiki(mod, provider); diff --git a/src/main/java/vazkii/botania/api/mana/TileSignature.java b/src/main/java/vazkii/botania/api/mana/TileSignature.java index 5573670da..8f5b98759 100644 --- a/src/main/java/vazkii/botania/api/mana/TileSignature.java +++ b/src/main/java/vazkii/botania/api/mana/TileSignature.java @@ -12,4 +12,16 @@ public class TileSignature { this.remoteWorld = remoteWorld; } + @Override + public int hashCode() { + return Boolean.hashCode(remoteWorld) ^ tile.hashCode(); + } + + @Override + public boolean equals(Object o) { + return o instanceof TileSignature + && tile == ((TileSignature) o).tile + && remoteWorld == ((TileSignature) o).remoteWorld; + } + } diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java index d7708f6f0..6a924671c 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java @@ -38,15 +38,7 @@ public interface ISparkAttachable extends IManaReceiver { /** * Gets the Spark that is attached to this block. A common implementation is - * to check for Spark entities above: - * - List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, new AxisAlignedBB(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); - if(sparks.size() == 1) { - Entity e = (Entity) sparks.get(0); - return (ISparkEntity) e; - } - - return null; + * to check for Spark entities above using world.getEntitiesWithinAABB() */ public ISparkEntity getAttachedSpark(); diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java index e35076ceb..81f6d14ca 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java @@ -19,15 +19,7 @@ public interface ISparkEntity { /** * Which TileEntity is this Spark attached to? A common implementation is checking the block below. - * - int x = MathHelper.floor_double(posX); - int y = MathHelper.floor_double(posY) - 1; - int z = MathHelper.floor_double(posZ); - TileEntity tile = worldObj.getTileEntity(x, y, z); - if(tile != null && tile instanceof ISparkAttachable) - return (ISparkAttachable) tile; - - return null; + * using world.getTileEntity(new BlockPos(this).down()) */ public ISparkAttachable getAttachedTile(); @@ -49,12 +41,12 @@ public interface ISparkEntity { * 3: Recessive
* 4: Isolated */ - public int getUpgrade(); + public SparkUpgradeType getUpgrade(); /** * Sets the upgrade on this Spark. See {@link ISparkEntity#getUpgrade} */ - public void setUpgrade(int upgrade); + public void setUpgrade(SparkUpgradeType upgrade); /** * See {@link ISparkAttachable#areIncomingTranfersDone()} diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java b/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java new file mode 100644 index 000000000..cdfc48a40 --- /dev/null +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkUpgradeType.java @@ -0,0 +1,9 @@ +package vazkii.botania.api.mana.spark; + +public enum SparkUpgradeType { + NONE, + DISPERSIVE, + DOMINANT, + RECESSIVE, + ISOLATED +} diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 37d0091e4..f82edd722 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "76", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "77", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index df0235646..b0933a2cb 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -29,7 +29,7 @@ public class ElvenPortalUpdateEvent extends Event { */ public final TileEntity portalTile; public final AxisAlignedBB aabb; - public boolean open; + public final boolean open; public final List stacksInside; public ElvenPortalUpdateEvent(TileEntity te, AxisAlignedBB aabb, boolean open, List stacks) { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 40ab346a1..bedf6f061 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -13,6 +13,7 @@ package vazkii.botania.api.recipe; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -23,20 +24,20 @@ import vazkii.botania.api.brew.IBrewContainer; public class RecipeBrew { - Brew brew; - List inputs; + private final Brew brew; + private final ImmutableList inputs; public RecipeBrew(Brew brew, Object... inputs) { this.brew = brew; - List inputsToSet = new ArrayList<>(); + ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); else throw new IllegalArgumentException("Invalid input"); } - this.inputs = inputsToSet; + this.inputs = inputsToSet.build(); } public boolean matches(IItemHandler inv) { @@ -112,4 +113,16 @@ public class RecipeBrew { return container.getItemForBrew(brew, stack); } + @Override + public int hashCode() { + return 31 * brew.hashCode() ^ inputs.hashCode(); + } + + @Override + public boolean equals(Object o) { + return o instanceof RecipeBrew + && brew == ((RecipeBrew) o).brew + && inputs.equals(((RecipeBrew) o).inputs); + } + } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index ed701973e..b1dbc324c 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -3,25 +3,26 @@ package vazkii.botania.api.recipe; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class RecipeElvenTrade { - ItemStack output; - List inputs; + private final ItemStack output; + private final ImmutableList inputs; public RecipeElvenTrade(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList<>(); + ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); else throw new IllegalArgumentException("Invalid input"); } - this.inputs = inputsToSet; + this.inputs = inputsToSet.build(); } public boolean matches(List stacks, boolean remove) { @@ -84,7 +85,7 @@ public class RecipeElvenTrade { } public List getInputs() { - return new ArrayList<>(inputs); + return inputs; } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 368c8d4c4..b782f43e2 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -17,9 +17,9 @@ import net.minecraftforge.oredict.OreDictionary; public class RecipeManaInfusion { - ItemStack output; - Object input; - int mana; + private final ItemStack output; + private final Object input; + private final int mana; boolean isAlchemy = false; boolean isConjuration = false; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index 92908c0a7..e4f165ae4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -23,7 +23,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion { @Override public boolean matches(ItemStack stack) { String key = BotaniaAPI.internalHandler.getStackSubTileKey(stack); - String input = this.input instanceof String ? (String) this.input : BotaniaAPI.internalHandler.getStackSubTileKey((ItemStack) this.input); + String input = this.getInput() instanceof String ? (String) this.getInput() : BotaniaAPI.internalHandler.getStackSubTileKey((ItemStack) this.getInput()); return key != null && key.equals(input); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index f2df5cc57..9f1848a9b 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -13,6 +13,7 @@ package vazkii.botania.api.recipe; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; @@ -20,20 +21,20 @@ import net.minecraftforge.oredict.OreDictionary; public class RecipePetals { - ItemStack output; - List inputs; + private final ItemStack output; + private final ImmutableList inputs; public RecipePetals(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList<>(); + ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); else throw new IllegalArgumentException("Invalid input"); } - this.inputs = inputsToSet; + this.inputs = inputsToSet.build(); } public boolean matches(IItemHandler inv) { @@ -87,7 +88,7 @@ public class RecipePetals { } public List getInputs() { - return new ArrayList<>(inputs); + return inputs; } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java index f8bb211c1..22c6dcf37 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java @@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack; public class RecipeRuneAltar extends RecipePetals { - int mana; + private final int mana; public RecipeRuneAltar(ItemStack output, int mana, Object... inputs) { super(output, inputs); diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f9771a7f9..fbf159d3c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -28,7 +28,7 @@ import javax.annotation.Nullable; /** * Holds all Botania block state properties. Use these to set botania blockstates */ -public class BotaniaStateProps { +public final class BotaniaStateProps { /** Unlisted properties **/ diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index 5ff9a45cb..2d8fa4266 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -19,7 +19,7 @@ import net.minecraft.util.BlockPos; */ public class RadiusDescriptor { - final BlockPos subtileCoords; + private final BlockPos subtileCoords; public RadiusDescriptor(BlockPos subtileCoords) { this.subtileCoords = subtileCoords; diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 66b710147..511fa7d1c 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -28,7 +28,7 @@ import vazkii.botania.api.subtile.SubTileGenerating; */ public class BasicSignature extends SubTileSignature { - final String name; + private final String name; public BasicSignature(String name) { this.name = name; diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 132182269..05eb15e7b 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -21,8 +21,8 @@ import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { - final String name, urlBase, replacement; - final boolean lowercase; + private final String name, urlBase, replacement; + private final boolean lowercase; public SimpleWikiProvider(String name, String urlBase) { this(name, urlBase, "%20"); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index cbda1c6a2..b3018ff48 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -23,7 +23,7 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { - int upgrade = entity.getUpgrade() - 1; + int upgrade = entity.getUpgrade().ordinal() - 1; return upgrade >= 0 && upgrade < MiscellaneousIcons.INSTANCE.sparkUpgradeIcons.length ? MiscellaneousIcons.INSTANCE.sparkUpgradeIcons[upgrade] : null; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 2e237e997..f53bdf9e9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -20,6 +20,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; +import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; @@ -37,8 +38,8 @@ public class TileSparkChanger extends TileSimpleInventory { ISparkAttachable attach = (ISparkAttachable) tile; ISparkEntity spark = attach.getAttachedSpark(); if(spark != null) { - int upg = spark.getUpgrade(); - int newUpg = changeStack == null ? 0 : changeStack.getItemDamage() + 1; + SparkUpgradeType upg = spark.getUpgrade(); + SparkUpgradeType newUpg = changeStack == null ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; if(upg != newUpg) attachables.add(attach); } @@ -48,9 +49,9 @@ public class TileSparkChanger extends TileSimpleInventory { if(attachables.size() > 0) { ISparkAttachable attach = attachables.get(worldObj.rand.nextInt(attachables.size())); ISparkEntity spark = attach.getAttachedSpark(); - int upg = spark.getUpgrade(); - ItemStack sparkStack = upg == 0 ? null : new ItemStack(ModItems.sparkUpgrade, 1, upg - 1); - int newUpg = changeStack == null ? 0 : changeStack.getItemDamage() + 1; + SparkUpgradeType upg = spark.getUpgrade(); + ItemStack sparkStack = upg == SparkUpgradeType.NONE ? null : new ItemStack(ModItems.sparkUpgrade, 1, upg.ordinal() - 1); + SparkUpgradeType newUpg = changeStack == null ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; spark.setUpgrade(newUpg); Collection transfers = spark.getTransfers(); if(transfers != null) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index d81c5892c..f349b0cbc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -34,6 +34,7 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; +import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -77,9 +78,9 @@ public class EntitySpark extends Entity implements ISparkEntity { } boolean first = worldObj.isRemote && !firstTick; - int upgrade = getUpgrade(); + SparkUpgradeType upgrade = getUpgrade(); List allSparks = null; - if(first || upgrade == 2 || upgrade == 3) + if(first || upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); if(first) @@ -88,9 +89,9 @@ public class EntitySpark extends Entity implements ISparkEntity { Collection transfers = getTransfers(); - if(upgrade != 0) { + if(upgrade != SparkUpgradeType.NONE) { switch(upgrade) { - case 1 : { // Dispersive + case DISPERSIVE : { List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); Map> receivingPlayers = new HashMap<>(); @@ -141,14 +142,14 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } - case 2 : { // Dominant + case DOMINANT : { List validSparks = new ArrayList<>(); for(ISparkEntity spark : allSparks) { if(spark == this) continue; - int upgrade_ = spark.getUpgrade(); - if(upgrade_ == 0 && spark.getAttachedTile() instanceof IManaPool) + SparkUpgradeType upgrade_ = spark.getUpgrade(); + if(upgrade_ == SparkUpgradeType.NONE && spark.getAttachedTile() instanceof IManaPool) validSparks.add(spark); } if(validSparks.size() > 0) @@ -156,13 +157,13 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } - case 3 : { // Recessive + case RECESSIVE : { // Recessive for(ISparkEntity spark : allSparks) { if(spark == this) continue; - int upgrade_ = spark.getUpgrade(); - if(upgrade_ != 2 && upgrade_ != 3 && upgrade_ != 4) + SparkUpgradeType upgrade_ = spark.getUpgrade(); + if(upgrade_ != SparkUpgradeType.DOMINANT && upgrade_ != SparkUpgradeType.RECESSIVE && upgrade_ != SparkUpgradeType.ISOLATED) transfers.add(spark); } break; @@ -252,13 +253,13 @@ public class EntitySpark extends Entity implements ISparkEntity { public boolean interactFirst(EntityPlayer player) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null) { - int upgrade = getUpgrade(); + SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { - if(upgrade > 0) { + if(upgrade != SparkUpgradeType.NONE) { if(!worldObj.isRemote) - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade - 1), 0F); - setUpgrade(0); + entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); + setUpgrade(SparkUpgradeType.NONE); transfers.clear(); removeTransferants = 2; @@ -272,9 +273,9 @@ public class EntitySpark extends Entity implements ISparkEntity { particleBeam(this, (Entity) spark); return true; } - } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == 0) { + } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) { int newUpgrade = stack.getItemDamage() + 1; - setUpgrade(newUpgrade); + setUpgrade(SparkUpgradeType.values()[newUpgrade]); stack.stackSize--; if(player.worldObj.isRemote) player.swingItem(); @@ -297,13 +298,13 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { - setUpgrade(cmp.getInteger(TAG_UPGRADE)); + setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { - cmp.setInteger(TAG_UPGRADE, getUpgrade()); + cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY)); } @@ -311,10 +312,10 @@ public class EntitySpark extends Entity implements ISparkEntity { public void setDead() { super.setDead(); if(!worldObj.isRemote) { - int upgrade = getUpgrade(); + SparkUpgradeType upgrade = getUpgrade(); entityDropItem(new ItemStack(ModItems.spark), 0F); - if(upgrade > 0) - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade - 1), 0F); + if(upgrade != SparkUpgradeType.NONE) + entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); } } @@ -335,14 +336,16 @@ public class EntitySpark extends Entity implements ISparkEntity { public Collection getTransfers() { Collection removals = new ArrayList<>(); - for(ISparkEntity e : transfers) { - ISparkEntity spark = e; - int upgr = getUpgrade(); - int supgr = spark.getUpgrade(); + for(ISparkEntity spark : transfers) { + SparkUpgradeType upgr = getUpgrade(); + SparkUpgradeType supgr = spark.getUpgrade(); ISparkAttachable atile = spark.getAttachedTile(); - if(!(spark != this && !spark.areIncomingTransfersDone() && atile != null && !atile.isFull() && (upgr == 0 && supgr == 2 || upgr == 3 && (supgr == 0 || supgr == 1) || !(atile instanceof IManaPool)))) - removals.add(e); + if(!(spark != this + && !spark.areIncomingTransfersDone() + && atile != null && !atile.isFull() + && (upgr == SparkUpgradeType.NONE && supgr == SparkUpgradeType.DOMINANT || upgr == SparkUpgradeType.RECESSIVE && (supgr == SparkUpgradeType.NONE || supgr == SparkUpgradeType.DISPERSIVE) || !(atile instanceof IManaPool)))) + removals.add(spark); } if(!removals.isEmpty()) @@ -363,13 +366,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - public int getUpgrade() { - return dataWatcher.getWatchableObjectInt(28); + public SparkUpgradeType getUpgrade() { + return SparkUpgradeType.values()[dataWatcher.getWatchableObjectInt(28)]; } @Override - public void setUpgrade(int upgrade) { - dataWatcher.updateObject(28, upgrade); + public void setUpgrade(SparkUpgradeType upgrade) { + dataWatcher.updateObject(28, upgrade.ordinal()); } @Override From 93f869a8f5d3abb47ee705568948dfd23053942a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 6 Mar 2016 12:20:34 -0600 Subject: [PATCH 396/935] Removed duplicate pool textures --- .../assets/botania/blockstates/pool.json | 10 +++++----- .../botania/textures/model/dilutedPool.png | Bin 5682 -> 2196 bytes .../textures/model/dilutedPoolCopy.png | Bin 2196 -> 0 bytes .../botania/textures/model/infinitePool.png | Bin 5162 -> 1942 bytes .../textures/model/infinitePoolCopy.png | Bin 1942 -> 0 bytes .../assets/botania/textures/model/pool.png | Bin 5964 -> 2392 bytes .../botania/textures/model/poolCopy.png | Bin 2392 -> 0 bytes 7 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png delete mode 100644 src/main/resources/assets/botania/textures/model/infinitePoolCopy.png delete mode 100644 src/main/resources/assets/botania/textures/model/poolCopy.png diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index c904678a3..5c62b19bc 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -6,14 +6,14 @@ }, "variants": { "variant": { - "default": { "textures": { "all": "botania:model/poolCopy" } }, - "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, - "creative": { "textures": { "all": "botania:model/infinitePoolCopy" } }, - "fabulous": { "textures": { "all": "botania:model/poolCopy" } } + "default": { "textures": { "all": "botania:model/pool" } }, + "diluted": { "textures": { "all": "botania:model/dilutedPool" } }, + "creative": { "textures": { "all": "botania:model/infinitePool" } }, + "fabulous": { "textures": { "all": "botania:model/pool" } } }, "inventory_creative": [{ "model": "botania:pool_filled", - "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } + "textures": { "all": "botania:model/infinitePool", "liquid": "botania:blocks/manaWater" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/dilutedPool.png b/src/main/resources/assets/botania/textures/model/dilutedPool.png index 14908d1fa1485475bb64abcb5d64773f53d12b46..7eae61d149292da1d36e9f8d99af6cc323f9d538 100644 GIT binary patch literal 2196 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 VXqOGf2e_jgP*>4;UIVrI@PB!~>p}nk diff --git a/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png b/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png deleted file mode 100644 index 7eae61d149292da1d36e9f8d99af6cc323f9d538..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2196 zcma);`#;nD8^=ehKHS`9g-~X=)iU{h9U{iJHp-GiBaN?PxMwLMr!hpDLnxzF&dMom z4x1=Ubvvb4Wh}z%c3O9nVK+-leRux{-|O+X-q%mp`|*BUujlJ=y>mR=PN^#ED1$&C zRjjikPF|1ylfW+d*+`7$%M17_8tVnfgA9abgFt`_*71Z_V%e8_*eJh2jT_H(_|tnP z4SrKE+;4aC68K+CbEeYzEKB7!I9lN7mN!v&M%9%$Ijdd@yB-X~j;Nt!Lt@9Y$f zF_Jl^3ah;{#>-O$KG2YE;o^3I1T`N+iddBn6bMm%`Xa5W0WAul`((!2^}8IM2;?(Xo~E8PosgF!lf8r z{n{#4!2rIEx-6o7^fjo(FCbW!!T!8hjyfV|qXMFc1N;Co=~-XW+s7k%45Nz>*0Kr? zSR(#m;G&MMstxrCZR5T7O@R6;r+cr%lf^q*_)^_MszHIXVLmhiZ<6|P8QXS&+6TZV zyj5@Is=yR?WkJ}Go2W2NMKn-RITD`dgne1m9rRFEq<9-0#1__n(L;c9yn(7^6$w&7 z|JFn9Us;gE_@jn6C>&h4Z0)D(0;H2lP=41+F+(ZiRlCm3S6{lboK{7n;t^;7bzdVB zG}u{vl!k?du}%_sE~B3$vwf>nkX>AkCqShWy2ec)v62TsGSzLMP;Yn3BZu z<&EQ$+UqudB&9)JO@>5Y(xdp(tFcG_yg+?O@$@93Ly!v2PX?0Q)lV7q+SAZiF4>U* z5LvcKtE_yB&Dvl{+j#0GPFnlpZBk5OsXG_ui6;mLcq9(97>}qJR;D^%y<|5Ue6>7I z4iFEYYcscmZ?!GE9;tXWrYQM=MqE0%XQo-*KDfU#ilrQ4vVe7%PJFgXWp zGoF3wJd(GJ*^Cro4P8T!7s8vm>K2zg6!fpT&d8@YUcK-xzOCJCgmbKil+xQn+zMv* zZ~chW6>oi*p>#3p;tJBH>66x`S?wYIm*I7y!RL`2G>0`0}YR z6<+cY<6~&xV#p&~3|-?qX6J#aUlBVa@lm!<$4XCh-%58Yo?F2eI+b+D47o;i*@gjh z9=OV!!n6bg?_v{SPwl;tl02^n{_-uqC^d4@3d!8`Hrk_4y%l$`lsvn;SSuXvmNu(r zBA>!tEg_PbDS!Kf4$bLg2$B&er&~+BVq<2`be2XM$aefiPksstOpDn#;qXnoanu?9 zwfBuR>M)aw?U{kOtFEQo<>5v<`BrV8OFtX9wDR|;=D*+i@k3lf8}O~ePM;rH-Et~{ z5c_>-F<0qVFdHcRHMMPltbkr4i1`XPrE%SX-vcsuSN8BI?E0hc#ZjQ3@x zue4UqsB`n=ydb5oMzV+vQjJEQW5y zu<j7s;I2dg8oKFP`rs_OjwzoKCMa0jnjjJ;b2?g*SVOX z4{w_t$if{k@45hw$W)eXc75NMI%jy=B5`t*P4Q}s_B{10r1&Ofks^)7W zkjHnOPU<;L-_ejD|BRs)4W5N%g5XJ0WwlB;pj)k;ysEDd(A_oP)VStwrJ}x#S2(Et z0_CPbd*kUV{N~}s+g@mpapj&FAdLxT@>|CSs3*S_ zuSsm?WK+pKNl7QhwJSKrWkPM~Iad(VSrWq%%1V<{B|{nvDe`8Xb4sRi;=f}B%}qz{ z*Qe|&#Fa6>U6`2eh>F^ZeHK(0t z{zp__xU#1T_kAnrhWC2g=4X!>tI9cY(0MC)YXhTSWlsY%V>a!lx!lQx)am_)Q`_%B z5&fS%n6|}bi-_RF<`%w0I$jc1!F+{N#Hh(t#M(A&4Q-Xlm`j`Zv+=tuREz=xj%-D< zYlm(7-i^zttE)I=?O zsFIL$QvK8+IPju~n68%YI&=F|D*Y(0`i@b)Wov4pL`VDoj;+e?yUXo9u?4<8-tun- N22@oLv{}*HxAaD{GV<(QsvOPVLTHVb@vFc`V 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 JDui{&{{dzYp%4H7 diff --git a/src/main/resources/assets/botania/textures/model/infinitePoolCopy.png b/src/main/resources/assets/botania/textures/model/infinitePoolCopy.png deleted file mode 100644 index 7030a3184e7cb3393140e6bcabf6b3976915ae39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1942 zcmV;H2Wj|;P)2@oLv{}*HxAaD{G zV<(QsvOPVLTHVb@vFc`VDUP$rVtRmN!LyRUCRugsoO92m1L(ioX*ne1ETThUxIN&{ zYy9;BO@(~d5^h$MVg2VcSrS z$xdi6ZFhfrLpdhW_m9(pH5Jl#yUE!!)S!Wm}j>#ym#td0SG#B#g#tQl#5L^^%ZIvg#Zj4$BPyg~B3TT_j zO$*{E#{>%bu0<|tqz>fQ4a4mLeX$|jEO8>pG8ltWo)!+6p9C2laeU4)Qhj!btRus= zL60UuZS&+U{kIRurb3p%yabF*Pi^>=0xW;`{GIw}dbL*s+CTq{zgpn0Y5<0xk5RN4K4`b#hT&vK)7Bp+#VQyI^aZzUu?_|?mJK=yjV|x zN;VY~MJ{TS*NJ#%8*RVZ(*EV=$vdXNql%V-ECcby#>}%BtYAUjGGk0~@#78s%X_pP zEZi(SQU^0Xf%IxWJ{QU%G5mCxq||+VcX9#VnE_9sNY-)E{nVnOWddt=0TrXUcG;5O z6V&>-zggnXYX*O`j+4gJS$pJ5YnL!G3n=@Z?(c6XyY95zb3y^a^%DPqY4DekRMr(v z9QloP3t2_-uCu%VcG7VSOeqtt&L~YH-?jFv@tUhV<&bb*ru^{)O_}P`3*@&q@4EcA z`*_zIWgU&mY9S@>I;u}Ez&nQ9gKZ*uYnw$WZEt>YUYiW+%EHyUvNoK?v{wrK%X?%~ z5uU9qou+~lH?c?76=mO}-Fuh?hBu9Bn`ys#P1*Mra(11?;php^RyK^Znf{x5{CPcT z7**TgnCvtabe|c18asjHw=%%mq5ohxwMWf`^4MFuyQq<6u-3Sa`0E93;iudWmMi>u zZABT%lpIegK>zaI=%?T>7q*zC5yQ#YvQ`oQ;hN$-_{+uQ z4JQ|%9251IA0X?>qNW4C2uK}}wViDD^&RoWX8KNmx4|Z-exh#Pj=Had(SF~9v)Gz< z9dR9DJhjpc=tE~_*$(FFUv14#?wlFqwjn$}qvS-{_xPKoeILkbz94Y?(+?`=mC0?} z5I#J^1tD)+hV9W91Jio@m-oiDarz7Z)#sPfBo{tflOJ00T}N(hLx`jL?1JHk!!+A# zZ}iq~7?WXzTLoOPsjWP8$j0;y*ko9H3pOIuUtXQ`A>(}^`0FLwWlFIH%BC7;^kIsy z;rYrWa%HsCWP^%}_KjfJAE`FgTW$B5VcQTFfpQ%1>k2uq=)ZZu1(~|X{{zC)$&_Zm zB?~Ps3T_cBvx^;+4#mC@d53cz?Z?e_#t_7GUz)*YgQwX&+eq!AN6sRp8A#th{tvhO zp9nZ?qp6U`snB07kc-MFU(_bFON*Y`mvOeYZ+QN)9tV|ZdarGoqp0=&=&j8S1@R84 zJ^CKZYsQQjGiJ<~F=NJz88c?gm@#9z>% diff --git a/src/main/resources/assets/botania/textures/model/pool.png b/src/main/resources/assets/botania/textures/model/pool.png index 96a569fc8740fd68e1f65114b7cf8a956b568bd1..9db5bf16bfde617bd14ac3a1a10ee974666b64fd 100644 GIT binary patch literal 2392 zcmV-e38(gnP)#g{uw;*d%ZR)DRQ4!idMfA+;NU|<~<@`~bc zNDe1-Pj|mquYwN(_UMDgfG+QIFQ9(kO9cV&{?l!0rUv9)Rpd73)SpPfleDBy67rHvTa=U(!^jjB$tb37B=nw`1y-wu!ZsNFz)U1Y z#W*C=W9o08BaRH;~9R&+yT>>@t1SQ|(o zr;yW2X8$!n430DpSPYfTD6M6Z5>3Yb`HsAh7+ax*U^pG9HW&C1@K%w#9v3}%zQJZ5 zAtcTDHE9|MZN_?2p~Q(eb%;EIQaBI0{RdK1tTp&l(z=0*I%gCCr!Ux+J>4`>;K(lC zAoIwTQdlF<82Wj_C&=sSsgvZ` zdCDxJHvfq0o^ewoYQ-D`Mn^&rwB3=awl5EmvWat9lCKPD7#RA2^=d^Z5|PNE+cQm$ zB5TMC1!*QuC-TfNhlrM%6f$z1XisnXpPM61{f1_{B_xeBicCuUJdsjF6&g7Ta&55M zvTvUeLeWkwB1PsPxPSjwE-&7o&4d7mkj&CymRDbXg_{Dt?HS!j zKTJ&XNJs(i1Ufo~{X3!?8M_mYpYJJc184HGI7J8(A8O^O3Hf&^qFW zf!-zDA+RlKN+W5z4;-Iws5&Sw-e8r+$eL!GF^d6!BF~9Yl7b=^5u0Zum*|IklCJpj z%de=4H4nQZt$XIpMNR)48RnTP&$<2Z3;C)f%QA>FN`j9QE`*l{_`^5<^qbDn-KU!r zt)~CwU&!lg>h(FsJEo@_ye(0gp~-5Z5EvzJI7kYc6iQoixxvo~V-)i|Zy5o*8L|$Kg z!J+T)aYob?k;G=Tq91?r_Fo?0m;d|^3Z0mfCz%2(Gp0D9l|=}snv&d{aXjr9-2lmB zgaxU|n-ww6bjOxg=dbzY{a>hb$(cQn=Ot2>_<4^}k;ji8QP*#fB>J(V3nQ1g!7Ii4 zw{L&H0B!$7QJ0kK4U@?*bx8^nK1OmQ$gCp8nY^$_E%4LGJWt3J(J~Q20O>fKTB_A6 zR&_;t%!o=7{6wZRyvh0EyA{?bnv^Jtf+XN+oY>#|gr9f6Ux4%L4QJ~OE*Xp|Fk;0k==*4Y%7bcx6CvQ9**4(FGrlZ;`MwW zq?TiULzXv~X&}lOtyf5yuti0Ec8!Y@ARvy6y<>2WsyxF~Ij6@xtE!-EUXf*n;6{>E zB$+tu9?7c;Ar(Ct=gcn;@c#B^y6zF1B5Kt@94N99Rckbw%n0hNpgw!ekKg~9d3fOM z%^lB&j;D4c%p;pkK|c5BPSSQelGBKyLaD&)54b5Hl|ss%7+S_5piPbzGuCJ}wc`E9 z8@}EA0YCO!eOY7cnqzxFM~~8$PxrSR?%uKf{s+ck;<7eaoxME3=l4J3rxV|N^&J%F z4EqPlq$rviZ47H$lBR)=4}1LeYc_So#rB+i_Xr*W9Xi$s6*xRU5}d=9IWi{NsRNf| zH1ww(h5nl46Pa)X=h?LrSz(yQ2}I7n|Me|f6L`M&X!nu*
F1u;3g<3!V3aU3LJ z_GDFtmx_P;%fF_ps>E8w{`AcH@)cTXKJIq-!xL4#Vu*rVOH!PvwM1vpVlA*!cRy)vL8Gl?ojobs#=p( zkvR+G0&4A$a}fhZlWh{D0A#%QL#x5mSH}blrdu_`c(^_6Sw5 zy7-Ee99471se8tIPi_mG(U|T7&%*=j>W{b?qV!DOaX37Z+Z;EvzrG}!Gv0r?!R}za zIs3im{yXhmBv+cb8);LZ>m0@yGLd1TC*=Yup!1TxYbmWD7{PIH2h_G@vEFQG>NR(}JF?*c ztu3M~5N^QF6E1r2lGGlk%o#s+z literal 5964 zcmV-S7qjSzP)pPPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000bkNkl~M^n1Grta4eG8!-FTu-h%B02_XC;%x1i7~Wok4RJMev1zQv*UDw1IIUEl3 zeNUEU91aIU2q>l4?RF$dLRD3yY0Bm0B{4>BZf?+7r6MZf>FI#2*HqPvQCgBE8T)2W z^p2<{O_Y!oq&h)KN#1t!K@p9juRDC>2&rd09+4*_jDBPw5Q3s>Be8d26bQ%j)7Jzs z@cw?s)O09osJ+Mfj)-QIk4Q!ZzK*CuF+MJ-+dx+bT$+$1p6D}j+0$7^mSv=Aij)%X zJuybQuA{DNcDo&m#e%kNF~+c1ED%BvLg4)T938wR4lN0WGD#_tgkDNCDeKK0SuQb2 zi57x(zoncmaNgq*MP?gpaAet(By|WO8O=|LeTzS&Or|AD>(h8`Cot4i*E{m9FgFKOGBq9|Cc zR%BU5Q53`&Su7T0Sw>lw?Du=>x~A(oo;`bpwHCc!ZMf}va;xwjd?K)YjkTImOO%$R zMj;7|j!r=YTw8;yk;xb#9NMoDYKD?2F+kJQ_(5X5K$$V4vBZ0UG%4N z>4+>>5C=lPCrb^34``{0J|)wU!~Tk2u6K;8=Zt1EeAGyzNTtLLJuwDUu92M}(}qMR ztPdN6P#pRLA_fL8c=+%$$BXA^(<1;vptBCG4V`mDda6+ZS`u7fx7(q$CWOG7H*W|b zu;1?iXqtvB%Se)h-~8q`R8@udp6zza)zuYxRG#9V9uOvyj%WC`W;8uxv)QuSuLzU~ z8R!R(mpio3=)7XNdLkgGl7fEdvGI}qa9}iE@a*|ZHmfZJOUMkt4#e1@lqOn(4wiQP zfX-jj)qCpNa&&SG(Q(+V5&4K-1*#-tUvKb6VK8iWErW-u(nM+4A8Mr3NGSn$czB>J zONL>fX&Sn&Lu*abG+bOyunzAXUG%(v`x9MzV154% z9sOt15FN{h_v{ZVeCT+%c|&ZUaNQQyeZuEf);ij{ z=inWKjf{#pO2J?|x~2z}@oauXJ{hxXI|i9BV2DDHmQ$?vte>8+{eX;yJkL2fIbl2= zvsf%xE|;uUEB5<6#u%PGd-es+`}gm;zP?5&#fuj&n9t{E@)UdjM3Rmf{0%}+5$TAJ z*KbK6Gz!%yc^CmtTHizu$9qcE)Tr!x+P4GGQ{Apzm&4QP;=Fi6Vr8 zJXbufAE+CN_XVP^DT;y+0`vJ9Qc8Ba9e?* zRsZ zPuKvXNkwcW+wGRkW<%F?oSmIf*EQ4Wl)mrz@ZkgN^_t`3W6H9m?|W`yf`O%ck!#$hFC#tOD?D%)Ioub~Y@NMAi z{Qw@tCI5w9S?*%Q!zjXBY;gl$2#jmSuEZ2f*p+Dd*?synOkRx~_Tq z_AT4(mc?R$ytugF=;(<1`+Giq{K)n7H9`oEj*gg4rwAc%&T)Kv%=h1a&!k)}IvyM00%iBpOXS6BS>(@)&p-4R0I`1lxri;D{u ziv^p_2Bj49`JA#Waqe?zGRE-7KmL(duU?^dyB$g?LI|JlHP30=7UvuQX__*bO!)cd zpLy}(1+&?VBuO}I-;!4a#biovQcP74eUA%)%m~s%5yL>1CrB-DeaA5L$QaNv;=KoH z+3pXN<7bSklEW?~D2aDHsZMbwI8?;p9`2-gnY19M(g=>BRI@r}Kob0gbgtK9bj|XDT^aanXzB48J9W5=ox8h@U|mLMU;{4YDrd>2&rgDnKN+n zu;$Ny{xg@Cmq;nmT4Svxgn-tX@pz2)o)7}wdz4aNic^v#h#!9Xk671B5*P5ggwWE4 z9@|(nnpsvcIX;DQ%F%er&^~f?eTVB?yi)j~V>-==L&EW-qN!IjwjrM_NC!{nmUx#U zr6SLB%F!u@)}u{Ekw9WJy>oo{c+KVIw>(_k^8CCaslH`**rJ0&nUVM~@VNe!Q8lG1 zCJY3`zy0gK#PRGUWuB21id<>-`#r0}mgomY+MqR*r@v+O^noOufDm-;Bhqy&>wz*Y zP}PJo(P#pLZ)y6TvK$c)dvpjK_A8#Be@8K?=!bz_lZm!%zvOkE=Y0F^xBRW8r^iRs z2TO<^2GG?Agupd5$CX2HmAj-yA@YnnX)%+tSx-I%kjUjcjt@D;#U0AB%o1@I56{~ZA1cLxcDG@#g{uw;*d%ZR)DRQ4!idMfA+;NU|<~<@`~bc zNDe1-Pj|mquYwN(_UMDgfG+QIFQ9(kO9cV&{?l!0rUv9)Rpd73)SpPfleDBy67rHvTa=U(!^jjB$tb37B=nw`1y-wu!ZsNFz)U1Y z#W*C=W9o08BaRH;~9R&+yT>>@t1SQ|(o zr;yW2X8$!n430DpSPYfTD6M6Z5>3Yb`HsAh7+ax*U^pG9HW&C1@K%w#9v3}%zQJZ5 zAtcTDHE9|MZN_?2p~Q(eb%;EIQaBI0{RdK1tTp&l(z=0*I%gCCr!Ux+J>4`>;K(lC zAoIwTQdlF<82Wj_C&=sSsgvZ` zdCDxJHvfq0o^ewoYQ-D`Mn^&rwB3=awl5EmvWat9lCKPD7#RA2^=d^Z5|PNE+cQm$ zB5TMC1!*QuC-TfNhlrM%6f$z1XisnXpPM61{f1_{B_xeBicCuUJdsjF6&g7Ta&55M zvTvUeLeWkwB1PsPxPSjwE-&7o&4d7mkj&CymRDbXg_{Dt?HS!j zKTJ&XNJs(i1Ufo~{X3!?8M_mYpYJJc184HGI7J8(A8O^O3Hf&^qFW zf!-zDA+RlKN+W5z4;-Iws5&Sw-e8r+$eL!GF^d6!BF~9Yl7b=^5u0Zum*|IklCJpj z%de=4H4nQZt$XIpMNR)48RnTP&$<2Z3;C)f%QA>FN`j9QE`*l{_`^5<^qbDn-KU!r zt)~CwU&!lg>h(FsJEo@_ye(0gp~-5Z5EvzJI7kYc6iQoixxvo~V-)i|Zy5o*8L|$Kg z!J+T)aYob?k;G=Tq91?r_Fo?0m;d|^3Z0mfCz%2(Gp0D9l|=}snv&d{aXjr9-2lmB zgaxU|n-ww6bjOxg=dbzY{a>hb$(cQn=Ot2>_<4^}k;ji8QP*#fB>J(V3nQ1g!7Ii4 zw{L&H0B!$7QJ0kK4U@?*bx8^nK1OmQ$gCp8nY^$_E%4LGJWt3J(J~Q20O>fKTB_A6 zR&_;t%!o=7{6wZRyvh0EyA{?bnv^Jtf+XN+oY>#|gr9f6Ux4%L4QJ~OE*Xp|Fk;0k==*4Y%7bcx6CvQ9**4(FGrlZ;`MwW zq?TiULzXv~X&}lOtyf5yuti0Ec8!Y@ARvy6y<>2WsyxF~Ij6@xtE!-EUXf*n;6{>E zB$+tu9?7c;Ar(Ct=gcn;@c#B^y6zF1B5Kt@94N99Rckbw%n0hNpgw!ekKg~9d3fOM z%^lB&j;D4c%p;pkK|c5BPSSQelGBKyLaD&)54b5Hl|ss%7+S_5piPbzGuCJ}wc`E9 z8@}EA0YCO!eOY7cnqzxFM~~8$PxrSR?%uKf{s+ck;<7eaoxME3=l4J3rxV|N^&J%F z4EqPlq$rviZ47H$lBR)=4}1LeYc_So#rB+i_Xr*W9Xi$s6*xRU5}d=9IWi{NsRNf| zH1ww(h5nl46Pa)X=h?LrSz(yQ2}I7n|Me|f6L`M&X!nu*
F1u;3g<3!V3aU3LJ z_GDFtmx_P;%fF_ps>E8w{`AcH@)cTXKJIq-!xL4#Vu*rVOH!PvwM1vpVlA*!cRy)vL8Gl?ojobs#=p( zkvR+G0&4A$a}fhZlWh{D0A#%QL#x5mSH}blrdu_`c(^_6Sw5 zy7-Ee99471se8tIPi_mG(U|T7&%*=j>W{b?qV!DOaX37Z+Z;EvzrG}!Gv0r?!R}za zIs3im{yXhmBv+cb8);LZ>m0@yGLd1TC*=Yup!1TxYbmWD7{PIH2h_G@vEFQG>NR(}JF?*c ztu3M~5N^QF6E1r2lGGlk%o#s+z From 8f4635576951992e8a8060cf910d6807aaae7069 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 6 Mar 2016 14:19:28 -0600 Subject: [PATCH 397/935] Spreader item models. Closes #4. Also fix third person pool model and restore old lexicon model until I'm ready to tackle it --- .../core/handler/MiscellaneousIcons.java | 5 - .../client/core/handler/ModelHandler.java | 4 - .../botania/client/model/LexiconModel.java | 115 ------------ .../botania/common/block/mana/BlockPool.java | 15 ++ .../common/block/mana/BlockSpreader.java | 16 +- .../common/item/block/ItemBlockPool.java | 18 +- .../assets/botania/blockstates/pool.json | 7 +- .../assets/botania/blockstates/spreader.json | 31 ++-- .../assets/botania/models/block/spreader.json | 166 ++++++++---------- .../{lexicon_default.json => lexicon.json} | 0 .../model/spreader_item/elven_inside.png | Bin 0 -> 404 bytes .../model/spreader_item/elven_side.png | Bin 0 -> 536 bytes .../model/spreader_item/gaia_inside.png | Bin 0 -> 404 bytes .../model/spreader_item/gaia_side.png | Bin 0 -> 536 bytes .../model/spreader_item/mana_inside.png | Bin 0 -> 458 bytes .../model/spreader_item/mana_side.png | Bin 0 -> 481 bytes .../model/spreader_item/redstone_inside.png | Bin 0 -> 451 bytes .../model/spreader_item/redstone_material.png | Bin 0 -> 484 bytes .../model/spreader_item/redstone_side.png | Bin 0 -> 501 bytes 19 files changed, 129 insertions(+), 248 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/LexiconModel.java rename src/main/resources/assets/botania/models/item/{lexicon_default.json => lexicon.json} (100%) create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/elven_side.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/gaia_side.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png create mode 100644 src/main/resources/assets/botania/textures/model/spreader_item/redstone_side.png 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 4c5aba78a..41be77176 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -27,10 +27,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -99,9 +97,6 @@ public class MiscellaneousIcons { // Platforms evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); - - // Lexicon - evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @SubscribeEvent 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 994cc85d1..06d014753 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -472,10 +472,6 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); - - ModelLoader.registerItemVariants(lexicon, - new ModelResourceLocation("botania:lexicon_default", "inventory"), - new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java deleted file mode 100644 index c5830b0aa..000000000 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ /dev/null @@ -1,115 +0,0 @@ -package vazkii.botania.client.model; - -import com.google.common.collect.ImmutableMap; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.TRSRTransformation; -import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.Event; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; -import net.minecraftforge.fml.common.FMLLog; -import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; - -import javax.vecmath.Matrix4f; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * This class handles choosing between the lexicon's default model and the special first person one - */ -public class LexiconModel implements IPerspectiveAwareModel { - - private static final Map missingTransforms; - - static { - ImmutableMap.Builder builder = ImmutableMap.builder(); - for (ItemCameraTransforms.TransformType t :ItemCameraTransforms.TransformType.values()) { - builder.put(t, TRSRTransformation.identity()); - } - missingTransforms = builder.build(); - } - - private IFlexibleBakedModel normalModel; - private Map normalModelTransforms; - - private IModel specialModel; - private Map specialModelTransforms; - - private IAnimationStateMachine asm; - - private boolean hasInit = false; - - private void initModels() { - if(hasInit) - return; - - normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); - - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); - - try { - normalModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")).getDefaultState()); - specialModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); - specialModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(specialModel.getDefaultState()); - } catch (IOException ex) { - FMLLog.warning("[Botania] Lexicon model couldn't be loaded"); - if(normalModelTransforms == null) - normalModelTransforms = missingTransforms; - if(specialModel == null) - specialModel = ModelLoaderRegistry.getMissingModel(); - if(specialModelTransforms == null) - specialModelTransforms = missingTransforms; - } - - hasInit = true; - } - - @SuppressWarnings("deprecation") - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - initModels(); - if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - //System.out.println("m8"); - float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; - - Pair> animate = asm.apply(time); - IFlexibleBakedModel baked = specialModel.bake(animate.getLeft(), Attributes.DEFAULT_BAKED_FORMAT, ModelLoader.defaultTextureGetter()); - - TRSRTransformation transform = specialModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : specialModelTransforms.get(cameraTransformType); - return Pair.of(baked, transform.getMatrix()); - - } else { - TRSRTransformation transform = normalModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : normalModelTransforms.get(cameraTransformType); - return Pair.of(normalModel, transform.getMatrix()); - } - } - - @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing e) { initModels(); return normalModel.getFaceQuads(e); } - @Override public List getGeneralQuads() { initModels(); return normalModel.getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { initModels(); return normalModel.isAmbientOcclusion(); } - @Override public boolean isGui3d() { initModels(); return normalModel.isGui3d(); } - @Override public boolean isBuiltInRenderer() { initModels(); return normalModel.isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { initModels(); return normalModel.getParticleTexture(); } - @SuppressWarnings("deprecation") - @Override public ItemCameraTransforms getItemCameraTransforms() { initModels(); return normalModel.getItemCameraTransforms(); } -} 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 e0d607cbb..649ce3d37 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -41,6 +44,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -181,6 +185,17 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return 2; } + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(IBlockState state) { + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } else { + return 16777215; + } + } + @Override public boolean hasComparatorInputOverride() { return true; 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 86e5ce2f4..3b4b746f7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import java.awt.*; import java.util.List; import java.util.Random; @@ -33,6 +34,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -41,9 +44,11 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; +import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -87,7 +92,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); return super.setUnlocalizedName(par1Str); } @@ -139,6 +144,15 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; } + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(IBlockState state) { + if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) + return super.getRenderColor(state); + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); + } + @Override public int getRenderType() { return 2; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 17090a3f5..b1c430e8b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.item.block; -import java.awt.*; import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.client.core.handler.ClientTickHandler; -public class ItemBlockPool extends ItemBlockWithMetadataAndName { +public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public ItemBlockPool(Block par2Block) { super(par2Block); @@ -35,15 +30,4 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) { - if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); - } else { - return 16777215; - } - } - } diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 5c62b19bc..8e7938fd3 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -2,7 +2,12 @@ "forge_marker": 1, "defaults": { "model": "botania:pool_tinted", - "transform": "forge:default-block" + "transform": { + "thirdperson": { + "translation": [ 0, 0.09375, -0.171875], + "rotation": [{"x": 10}, {"y": -45}, {"z": 0}] + } + } }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index 31cbca0ca..f8564bf6e 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -2,36 +2,41 @@ "forge_marker": 1, "defaults": { "model": "botania:spreader", - "transform": "forge:default-block" + "transform": { + "thirdperson": { + "translation": [ 0, 0.09375, -0.171875], + "rotation": [{"x": 10}, {"y": -45}, {"z": 170}] + } + } }, "variants": { "variant": { "mana": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/mana_inside", + "side": "botania:model/spreader_item/mana_side", + "material": "botania:blocks/livingwood0" } }, "redstone": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/redstone_inside", + "side": "botania:model/spreader_item/redstone_side", + "material": "botania:model/spreader_item/redstone_material" } }, "elven": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/elven_inside", + "side": "botania:model/spreader_item/elven_side", + "material": "botania:blocks/dreamwood0" } }, "gaia": { "textures": { - "all": "botania:placeholder", - "side": "botania:placeholder", - "inside": "botania:placeholder" + "inside": "botania:model/spreader_item/gaia_inside", + "side": "botania:model/spreader_item/gaia_side", + "material": "botania:blocks/dreamwood0" } } } diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/spreader.json index 1e01caecf..93cc92e43 100644 --- a/src/main/resources/assets/botania/models/block/spreader.json +++ b/src/main/resources/assets/botania/models/block/spreader.json @@ -1,137 +1,119 @@ { "textures": { - "particle": "#all" + "particle": "#material" }, "elements": [ { - "name": "cubeSide4", - "from": [14, 1, 2], - "to": [15, 14, 15], + "name": "inside", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 10.0, 11.0 ], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} + "north": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "east": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "south": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "west": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "up": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, + "down": { "texture": "#inside", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } } }, { - "name": "cubeInside", - "from": [5, 4, 5], - "to": [11, 10, 11], + "name": "bottom", + "from": [ 1.0, 0.0, 1.0 ], + "to": [ 15.0, 1.0, 15.0 ], "faces": { - "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#inside"}, - "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#inside"}, - "north": {"uv": [12, 5.75, 13.5, 7.25], "texture": "#inside"}, - "south": {"uv": [9, 5.75, 10.5, 7.25], "texture": "#inside"}, - "west": {"uv": [7.5, 5.75, 9, 7.25], "texture": "#inside"}, - "east": {"uv": [10.5, 5.75, 12, 7.25], "texture": "#inside"} + "north": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 2.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 } } }, { - "name": "cubeHole2", - "from": [2, 1, 14], - "to": [6, 13, 15], + "name": "back", + "from": [ 1.0, 1.0, 14.0 ], + "to": [ 15.0, 13.0, 15.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 12.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 0.0, 0.0, 1.0, 12.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 12.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 0.0, 0.0, 1.0, 12.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeSide5", - "from": [2, 13, 2], - "to": [14, 14, 15], + "name": "top", + "from": [ 1.0, 13.0, 1.0 ], + "to": [ 15.0, 14.0, 15.0 ], "faces": { - "down": {"uv": [6, 0, 9, 3.25], "texture": "#side"}, - "up": {"uv": [3, 0, 6, 3.25], "texture": "#side"}, - "north": {"uv": [9.25, 3.25, 12.5, 3.5], "texture": "#side"}, - "south": {"uv": [3, 3.25, 6.25, 3.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 3, 3.5], "texture": "#side"}, - "east": {"uv": [6.25, 3.25, 9.25, 3.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 0.0, 0.0, 14.0, 1.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "tintindex": 0 } } }, { - "name": "cubeHole4", - "from": [6, 9, 14], - "to": [10, 13, 15], + "name": "west", + "from": [ 1.0, 1.0, 2.0 ], + "to": [ 2.0, 13.0, 14.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} + "east": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 }, + "west": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 } } }, { - "name": "cubeHole3", - "from": [6, 1, 14], - "to": [10, 5, 15], + "name": "east", + "from": [ 14.0, 1.0, 2.0 ], + "to": [ 15.0, 13.0, 14.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 1.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 1.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 1.25], "texture": "#top"} + "east": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 }, + "west": { "texture": "#side", "uv": [ 2.0, 2.0, 14.0, 14.0 ], "tintindex": 0 } } }, { - "name": "cubeSide1", - "from": [1, 0, 1], - "to": [15, 1, 15], + "name": "front_bottom", + "from": [ 6.0, 1.0, 1.0 ], + "to": [ 10.0, 5.0, 2.0 ], "faces": { - "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#side"}, - "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#side"}, - "north": {"uv": [10.5, 3.5, 14, 3.75], "texture": "#side"}, - "south": {"uv": [3.5, 3.5, 7, 3.75], "texture": "#side"}, - "west": {"uv": [0, 3.5, 3.5, 3.75], "texture": "#side"}, - "east": {"uv": [7, 3.5, 10.5, 3.75], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "up": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeSide3", - "from": [1, 1, 2], - "to": [2, 14, 15], + "name": "front_top", + "from": [ 6.0, 9.0, 1.0 ], + "to": [ 10.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [0.5, 0, 0.75, 3.25], "texture": "#side"}, - "up": {"uv": [0.25, 0, 0.5, 3.25], "texture": "#side"}, - "north": {"uv": [3.75, 3.25, 7, 6.5], "texture": "#side"}, - "south": {"uv": [0.25, 3.25, 3.5, 6.5], "texture": "#side"}, - "west": {"uv": [0, 3.25, 0.25, 6.5], "texture": "#side"}, - "east": {"uv": [3.5, 3.25, 3.75, 6.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 4.0 ], "tintindex": 0 }, + "down": { "texture": "#material", "uv": [ 0.0, 0.0, 4.0, 1.0 ], "tintindex": 0 } } }, { - "name": "cubeHole1", - "from": [10, 1, 14], - "to": [14, 13, 15], + "name": "front_left", + "from": [ 1.0, 1.0, 1.0 ], + "to": [ 6.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [2, 0, 3, 0.25], "texture": "#top"}, - "up": {"uv": [1, 0, 2, 0.25], "texture": "#top"}, - "north": {"uv": [2.25, 0.25, 2.5, 3.25], "texture": "#top"}, - "south": {"uv": [1, 0.25, 1.25, 3.25], "texture": "#top"}, - "west": {"uv": [0, 0.25, 1, 3.25], "texture": "#top"}, - "east": {"uv": [1.25, 0.25, 2.25, 3.25], "texture": "#top"} + "north": { "texture": "#material", "uv": [ 1.0, 1.0, 5.0, 13.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 1.0, 1.0, 2.0, 13.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 1.0, 1.0, 5.0, 13.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 1.0, 1.0, 2.0, 13.0 ], "tintindex": 0 } } }, { - "name": "cubeSide2", - "from": [1, 1, 1], - "to": [15, 14, 2], + "name": "front_right", + "from": [ 10.0, 1.0, 1.0 ], + "to": [ 15.0, 13.0, 2.0 ], "faces": { - "down": {"uv": [7, 0, 10.5, 0.25], "texture": "#side"}, - "up": {"uv": [3.5, 0, 7, 0.25], "texture": "#side"}, - "north": {"uv": [7.25, 0.25, 7.5, 3.5], "texture": "#side"}, - "south": {"uv": [3.5, 0.25, 3.75, 3.5], "texture": "#side"}, - "west": {"uv": [0, 0.25, 3.5, 3.5], "texture": "#side"}, - "east": {"uv": [3.75, 0.25, 7.25, 3.5], "texture": "#side"} + "north": { "texture": "#material", "uv": [ 12.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "east": { "texture": "#material", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "south": { "texture": "#material", "uv": [ 12.0, 1.0, 16.0, 13.0 ], "tintindex": 0 }, + "west": { "texture": "#material", "uv": [ 15.0, 1.0, 16.0, 13.0 ], "tintindex": 0 } } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lexicon_default.json rename to src/main/resources/assets/botania/models/item/lexicon.json diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png new file mode 100644 index 0000000000000000000000000000000000000000..df635c5ccd31d893796e54b51fda373c80c4312d GIT binary patch literal 404 zcmV;F0c-w=P)O`~wah+}usr zS&aXp8*C2hY8-0<1_|kaDI{oOfPfCBXQ8+2n=bF(_uYGU2Y($Af8kv}eF025BNRgg zVCIfd43(KX1`v6Gt&5`wKrCpRbVdT4wnuoj1AtyD5YMNiqUb6N2sqoQl5JG+Y=>$4 zci$H+34E&$8<)p)ttMToDV2l-t8i>PiB`^#Hgf<=lHds94rcBc&vwwvefsq~v~mXh zyhJpi;N3hjynSJ>aYD~(5znW>f?)I+vhk`if1d)d_?XDbmIaETqSp#|wnNb@p`IS{ zcJ+X=yNPyIBw5MPvs&o2f_wykcs?a00MCOiJA*XIN)ESvFP>A{flN{~O8_A_npg`9 yg2~lRWG72ISU>nFT71q?3{^n>cMi_}f8rY#uZ#BL4XTs?0000;vIi+AM>%PgKRI#m@5plC z;KIS?q`h$@vErblI7!Oxl5*jKi#RNY+1EDD%ql5A+0SK~_nY^ddEeiAZyx0N?|8J~ zIC=RF5M5pYpt?4gbAy|!1OV-w9RTca?*P!YFadx!erB^r7nf}B^nUlte~M2E#P+t{ z0WK~t060B7a&#>4`vG`;dC7U-*xC$0p|1dd>46cm6!2+7Dv<=>{KPstPi3j2<6GwH z!JqTKtFsG$z1>~MeaurpvRckkBI;S31t6Gu1R&hs2S8O*y=`5HjZOiO2$TTu{Pg7b z0p=+nNEXXk>c}T2rvV7m1T1@~8-VfnrfnbbJGg&ve2;kwl$MtPaCdtPWOG1A9*NA@ z{3P=Ej1rO?UtyjCMa9LA4@yMokk#3U*zI!G8mR(NR%4z5Zb+Tat890xj`gh#n}1VF zv*W(zDIlHDjp*tckga<`6iJIAqkt%s2>lfW1l;F(g$QV)R?D$&`{R^WV8BUYz_dgnto*(mWfBIC_FT1J+G!>&95tv aC(j4?yOtpsc-No+0000O`~wah+}usr zS&aXp8*C2hY8-0<1_|kaDI{oOfPfCBXQ8+2n=bF(_uYGU2Y($Af8kv}eF025BNRgg zVCIfd43(KX1`v6Gt&5`wKrCpRbVdT4wnuoj1AtyD5YMNiqUb6N2sqoQl5JG+Y=>$4 zci$H+34E&$8<)p)ttMToDV2l-t8i>PiB`^#Hgf<=lHds94rcBc&vwwvefsq~v~mXh zyhJpi;N3hjynSJ>aYD~(5znW>f?)I+vhk`if1d)d_?XDbmIaETqSp#|wnNb@p`IS{ zcJ+X=yNPyIBw5MPvs&o2f_wykcs?a00MCOiJA*XIN)ESvFP>A{flN{~O8_A_npg`9 yg2~lRWG72ISU>nFT71q?3{^n>cMi_}f8rY#uZ#BL4XTs?0000;vIi+AM>%PgKRI#m@5plC z;KIS?q`h$@vErblI7!Oxl5*jKi#RNY+1EDD%ql5A+0SK~_nY^ddEeiAZyx0N?|8J~ zIC=RF5M5pYpt?4gbAy|!1OV-w9RTca?*P!YFadx!erB^r7nf}B^nUlte~M2E#P+t{ z0WK~t060B7a&#>4`vG`;dC7U-*xC$0p|1dd>46cm6!2+7Dv<=>{KPstPi3j2<6GwH z!JqTKtFsG$z1>~MeaurpvRckkBI;S31t6Gu1R&hs2S8O*y=`5HjZOiO2$TTu{Pg7b z0p=+nNEXXk>c}T2rvV7m1T1@~8-VfnrfnbbJGg&ve2;kwl$MtPaCdtPWOG1A9*NA@ z{3P=Ej1rO?UtyjCMa9LA4@yMokk#3U*zI!G8mR(NR%4z5Zb+Tat890xj`gh#n}1VF zv*W(zDIlHDjp*tckga<`6iJIAqkt%s2>lfW1l;F(g$QV)R?D$&`{R^WV8BUYz_dgnto*(mWfBIC_FT1J+G!>&95tv aC(j4?yOtpsc-No+00000xH<)-e1P(1h5D^Fo;aXdfv$V9OQxFt1 zRBJ@g(pb>a6dchaggMmGauC6tn219^6!S;%HrTz~b$>v8r{{g%=lkXR{D8lPVh5e_ zvS^p`1R|rocf}+S8KqM(0c0LP@oNO4rwV}ox1vp`SuOPQ2LMvj{iv9-CK%IXECt%7 zyiC@t7J9Kua{CMbeRGKvplTri#HS@|eRg15w8`{Zvr%JrPsEU$`E>rT9URAkO*UW%h^ShUSq z;hBL;tlHr%_)2rQ3O;CjHeCNs2Xc*Vb5@jZ4fJA{_gsdBfq4$^PZ%5uT8I>&?;n%MWdK~{-;e@| zUxS}xaf$#QamV3Q$RklPN&ncj&-#Dj8)_7)xw5SaT>t<807*qoM6N<$f)lsL A%m4rY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a40186110ecb62d806c96a148987f99d164b2b88 GIT binary patch literal 481 zcmV<70UrK|P)*8qT``)!FpwQm3blU@n{m~S)y z;P$Ko09fo25r0~4#D<-pp8U7a^#j{&4Ztz*Q6)uiy;3;e@PRlV7p8|w)dnv|be%&|J>He9G-wnf@_F(}cRKRb1Or6jCxip;(rDQ%^ z823-C>+6=>6Y(jK*}`TOeAqbMKFkcGXD{wNV-)d;w_PdmDd2;hj&;r)Gv{s9!P}1* zt2DTOdYtrZ?o03Zh);nwJgg4(OWpyaEVc7G@Rx(D zl1jwmQ^0=%zHg6rvR8eaIl-5ckN6ZIcw)Mn9`Ikk9P=f`Dw>`T#6EssApTr|6HfR7 XEXJQ-@7P(c00000NkvXXu0mjfF=N`U literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png new file mode 100644 index 0000000000000000000000000000000000000000..ea9c2889acdeb529286c23d055fc9d3e06af8b2b GIT binary patch literal 451 zcmV;!0X+VRP)iAaK|A!!rJqOF#SKCTiH4nYyAbvq4uU%cJ+dZu&Ed!C2qocF+AL$ibSPH|@nwR{>;jqD1yb=WrLzwj)uw9)p5COF ztW8caO&`m#5depXJ*ES%m9XT}L3xRd$vPgn!6#oA=koksS2e4cms~n1Ei)mm9rWTJ z;R<2+`jP?Q_VmH={;PwQnUK5fkaA%a^RkauZt#g!%**G}jO5Zmx!VrOYbC54ICh{L z0g_Q4h4Cle)>k>eViyZJ++#C%)cH;$;J69b2)Yp<2^4r@jZpvx`6rZs<~5*uEWILt ti`?lwc01^gjH@HjF`4h$wa@y0;v3aItefJ(G>iZM002ovPDHLkV1i@#$GQLj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_material.png new file mode 100644 index 0000000000000000000000000000000000000000..4db4ca4245248f70f2e32f327695521c94fec5d7 GIT binary patch literal 484 zcmV#rNIkVTgUcGV*67b4lT}%HQ&|W$2IrEuKZMZcJ zrA`~qMJ%U{XOJ)x{Xcx#c=U0a0C?;U6eWWM?m6R>X8ZHaV|O5i5r81M-p4SaAG-ri zX<``ZbKu;1x@3Ua((-VrLI9v+7_kbj>4jQBg?hNicS^5-^b*;s*>g2 zQK-4-KEM0|^v?n7TJAYx74$jK=TOxhr->k$Thq)L6sFH?IBh%t+n;X$x@0)Fex;^_ zT`hFUu-CeV73I}b-W7#|1Y#I*N^?ykUb%S+@A8&o8f2D#ZarQ(u4$c*E)3SSe3?`~ z6vk39j9AxJYaiP`vxQ|qQRe182dtX6uuEnI=9I1hM&T9WAoCJk#MZHuomf5x$qW*z z8r>zsU(>D*EJ2q$@op(dM&FvIq74%0p94Vs3k&;2EMB?Q2m$nRH1P8M-dKqCTGJ&% a8UHV4eKxwbm|9f;0000phd8!;!V8z3;g}P7H>rmEC>o}(~o4^ zdYGMtUDF;!aKXNpWo9=+=ACzT2afpfX!wr%%l;PNaW(@Wi@qIkkZ-mCTqOwrQ)2+Q zO(Ou_Hj(3>%$H8U=%;`FTS$DzYPkfe41DBi*RfCS`Bu9Pz);WGwPn|Ao>PbL82H$% z0cf=|0H(9Kv!5C_lSCxIG8cb4j>TR}oM*EEpx>;|H9Q7X)x$zE?>599G)265D$G2* ze*(~n#b0SgG9H_)6Ss8D9l~Qku~U1QJGN$i-D(1r`bXA(*NJQ672A3W!ebz9xHq4% zrl0v_Rmz54HS^Iz)IUfhw*`BOZxJ2?R_tW93tp{X)qWm{$|s(Gr3VkMJ1S zhjC#uC}dJn_4kw5?ynDiU(FHj>lz*d{tWn1*4Iw)v^EF#6*_782#*1U{;{fCHQ-Ob rYU?Dmn Date: Sun, 6 Mar 2016 17:50:55 -0600 Subject: [PATCH 398/935] Tweak guard in shedding config. Closes #153 --- .../botania/common/core/handler/SheddingHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 5ad5c24a8..b87d97ed0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -122,16 +122,16 @@ public final class SheddingHandler { metadata = config.get("Shedding", key + ".metadata", metadata).getInt(); lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); - if(itemName != null && !itemName.isEmpty() && rate != -1) + 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)); } public static class ShedPattern { - Class EntityClass; - ItemStack itemStack; - int rate; - int lexiconSize; + private final Class EntityClass; + private final ItemStack itemStack; + private final int rate; + private final int lexiconSize; public ShedPattern(Class EntityClass, ItemStack itemStack, int rate, int lexiconSize) { this.EntityClass = EntityClass; From cda20175c80620e727536fa432a1fdfdfb643ae4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 09:40:02 -0600 Subject: [PATCH 399/935] Fix derp when removing workaround. closes #161, #162, #163 --- src/main/java/vazkii/botania/common/block/tile/TileMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e82ea2225..d0f3e6dc0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -65,7 +65,7 @@ public class TileMod extends TileEntity implements ITickable { @Override public final void update() { - if (!isInvalid() && worldObj.isBlockLoaded(getPos())) { + if (!isInvalid() && worldObj.isBlockLoaded(getPos(), !worldObj.isRemote)) { updateEntity(); } } From 9f1a2b8a7d2db1d93db00500477e4ae24d022f1d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 13:09:59 -0600 Subject: [PATCH 400/935] Retrofit corporea to work with capabilities --- .../botania/api/corporea/CorporeaHelper.java | 63 +++++++------------ .../api/corporea/ICorporeaInterceptor.java | 4 +- .../botania/api/corporea/ICorporeaSpark.java | 3 +- .../api/corporea/IWrappedInventory.java | 2 +- .../botania/api/corporea/InvWithLocation.java | 32 ++++++++++ .../api/internal/DummyMethodHandler.java | 3 +- .../api/internal/IInternalMethodHandler.java | 3 +- .../subtile/functional/SubTileHopperhock.java | 7 ++- .../corporea/TileCorporeaInterceptor.java | 7 ++- .../tile/corporea/TileCorporeaRetainer.java | 7 ++- .../core/handler/InternalMethodHandler.java | 7 ++- .../common/core/helper/InventoryHelper2.java | 18 +++--- .../common/entity/EntityCorporeaSpark.java | 8 ++- .../corporea/WrappedDeepStorage.java | 24 +++---- .../corporea/WrappedIInventory.java | 34 +++------- .../corporea/WrappedStorageDrawers.java | 24 ++++--- .../common/item/ItemCorporeaSpark.java | 3 +- 17 files changed, 132 insertions(+), 117 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/corporea/InvWithLocation.java diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index bb1d673cc..db2e537ac 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -32,8 +32,8 @@ import vazkii.botania.api.BotaniaAPI; public final class CorporeaHelper { - private static final List empty = ImmutableList.of(); - private static final WeakHashMap, List> cachedNetworks = new WeakHashMap<>(); + private static final List empty = ImmutableList.of(); + private static final WeakHashMap, List> cachedNetworks = new WeakHashMap<>(); private static final List autoCompleteControllers = new ArrayList<>(); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -55,23 +55,23 @@ public final class CorporeaHelper { * Gets a list of all the inventories on this spark network. This list is cached for use once every tick, * and if something changes during that tick it'll still have the first result. */ - public static List getInventoriesOnNetwork(ICorporeaSpark spark) { + public static List getInventoriesOnNetwork(ICorporeaSpark spark) { ICorporeaSpark master = spark.getMaster(); if(master == null) return empty; List network = master.getConnections(); if(cachedNetworks.containsKey(network)) { - List cache = cachedNetworks.get(network); + List cache = cachedNetworks.get(network); if(cache != null) return cache; } - List inventories = new ArrayList<>(); + List inventories = new ArrayList<>(); if(network != null) for(ICorporeaSpark otherSpark : network) if(otherSpark != null) { - IInventory inv = otherSpark.getSparkInventory(); + InvWithLocation inv = otherSpark.getSparkInventory(); if(inv != null) inventories.add(inv); } @@ -86,7 +86,7 @@ public final class CorporeaHelper { * called instead if the context for those exists to avoid having to get the values again. */ public static int getCountInNetwork(ItemStack stack, ICorporeaSpark spark, boolean checkNBT) { - List inventories = getInventoriesOnNetwork(spark); + List inventories = getInventoriesOnNetwork(spark); return getCountInNetwork(stack, inventories, checkNBT); } @@ -95,18 +95,18 @@ public final class CorporeaHelper { * The higher level function that use a Map< IInventory, Integer > should be * called instead if the context for this exists to avoid having to get the value again. */ - public static int getCountInNetwork(ItemStack stack, List inventories, boolean checkNBT) { - Map map = getInventoriesWithItemInNetwork(stack, inventories, checkNBT); + public static int getCountInNetwork(ItemStack stack, List inventories, boolean checkNBT) { + Map map = getInventoriesWithItemInNetwork(stack, inventories, checkNBT); return getCountInNetwork(stack, map, checkNBT); } /** * Gets the amount of available items in the network of the type passed in, checking NBT or not. */ - public static int getCountInNetwork(ItemStack stack, Map inventories, boolean checkNBT) { + public static int getCountInNetwork(ItemStack stack, Map inventories, boolean checkNBT) { int count = 0; - for(IInventory inv : inventories.keySet()) + for(InvWithLocation inv : inventories.keySet()) count += inventories.get(inv); return count; @@ -117,8 +117,8 @@ public final class CorporeaHelper { * The higher level function that use a List< IInventory > should be * called instead if the context for this exists to avoid having to get the value again. */ - public static Map getInventoriesWithItemInNetwork(ItemStack stack, ICorporeaSpark spark, boolean checkNBT) { - List inventories = getInventoriesOnNetwork(spark); + public static Map getInventoriesWithItemInNetwork(ItemStack stack, ICorporeaSpark spark, boolean checkNBT) { + List inventories = getInventoriesOnNetwork(spark); return getInventoriesWithItemInNetwork(stack, inventories, checkNBT); } @@ -127,8 +127,8 @@ public final class CorporeaHelper { * The deeper level function that use a List< IInventory > should be * called instead if the context for this exists to avoid having to get the value again. */ - public static Map getInventoriesWithItemInNetwork(ItemStack stack,List inventories, boolean checkNBT) { - Map countMap = new HashMap(); + public static Map getInventoriesWithItemInNetwork(ItemStack stack, List inventories, boolean checkNBT) { + Map countMap = new HashMap<>(); List wrappedInventories = BotaniaAPI.internalHandler.wrapInventory(inventories); for (IWrappedInventory inv : wrappedInventories) { CorporeaRequest request = new CorporeaRequest(stack, checkNBT, -1); @@ -174,7 +174,7 @@ public final class CorporeaHelper { if(MinecraftForge.EVENT_BUS.post(event)) return stacks; - List inventories = getInventoriesOnNetwork(spark); + List inventories = getInventoriesOnNetwork(spark); List inventoriesW = BotaniaAPI.internalHandler.wrapInventory(inventories); Map interceptors = new HashMap(); @@ -183,9 +183,9 @@ public final class CorporeaHelper { for(IWrappedInventory inv : inventoriesW) { ICorporeaSpark invSpark = inv.getSpark(); - Object originalInventory = inv.getWrappedObject(); - if(originalInventory instanceof ICorporeaInterceptor) { - ICorporeaInterceptor interceptor = (ICorporeaInterceptor) originalInventory; + InvWithLocation originalInventory = inv.getWrappedObject(); + if(originalInventory.world.getTileEntity(originalInventory.pos) instanceof ICorporeaInterceptor) { + ICorporeaInterceptor interceptor = (ICorporeaInterceptor) originalInventory.world.getTileEntity(originalInventory.pos); interceptor.interceptRequest(matcher, itemCount, invSpark, spark, stacks, inventories, doit); interceptors.put(interceptor, invSpark); } @@ -209,11 +209,8 @@ public final class CorporeaHelper { /** * Gets the spark attached to the inventory passed case it's a TileEntity. */ - public static ICorporeaSpark getSparkForInventory(IInventory inv) { - if(!(inv instanceof TileEntity)) - return null; - - TileEntity tile = (TileEntity) inv; + public static ICorporeaSpark getSparkForInventory(InvWithLocation inv) { + TileEntity tile = inv.world.getTileEntity(inv.pos); return getSparkForBlock(tile.getWorld(), tile.getPos()); } @@ -234,13 +231,6 @@ public final class CorporeaHelper { return getSparkForBlock(world, pos) != null; } - /** - * Gets if the slot passed in can be extracted from by a spark. - */ - public static boolean isValidSlot(IInventory inv, int slot) { - return !(inv instanceof ISidedInventory) || arrayHas(((ISidedInventory) inv).getSlotsForFace(EnumFacing.UP), slot) && ((ISidedInventory) inv).canExtractItem(slot, inv.getStackInSlot(slot), EnumFacing.UP); - } - /** * Gets if two stacks match. */ @@ -283,17 +273,6 @@ public final class CorporeaHelper { cachedNetworks.clear(); } - /** - * Helper method to check if an int array contains an int. - */ - public static boolean arrayHas(int[] arr, int val) { - for (int element : arr) - if(element == val) - return true; - - return false; - } - /** * Helper method to make stacksMatch() less messy. */ diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java index eeea16a79..41756abd5 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java @@ -26,13 +26,13 @@ public interface ICorporeaInterceptor { * at this point, but the list of stacks is not complete. The request parameter can * be either a String or ItemStack. */ - public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit); + public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit); /** * Intercepts a request after all the stacks have been found and processed. Both the * list of inventories and stacks is complete at this point. The request parameter can * be either a String or ItemStack. */ - public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit); + public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit); } diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index 71fb33d5e..ae194f01c 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -12,7 +12,6 @@ package vazkii.botania.api.corporea; import java.util.List; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; /** @@ -38,7 +37,7 @@ public interface ICorporeaSpark { /** * Gets the inventory this spark is bound to, generally the one right below it. */ - public IInventory getSparkInventory(); + public InvWithLocation getSparkInventory(); /** * Gets the list of sparks this spark is connected to, see registerConnections(). This list diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java index 0b588f238..c2ff6ac14 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -24,7 +24,7 @@ public interface IWrappedInventory { /** * Break encapsulation and exposes original inventory. */ - IInventory getWrappedObject(); + InvWithLocation getWrappedObject(); /** * Counts items in the inventory matching the request diff --git a/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java new file mode 100644 index 000000000..e9e795ce6 --- /dev/null +++ b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java @@ -0,0 +1,32 @@ +package vazkii.botania.api.corporea; + +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; + +public class InvWithLocation { + + public final IItemHandler handler; + public final World world; + public final BlockPos pos; + + public InvWithLocation(IItemHandler itemHandler, World world, BlockPos pos) { + this.handler = itemHandler; + this.world = world; + this.pos = pos; + } + + @Override + public int hashCode() { + return 31 * handler.hashCode() ^ world.hashCode() ^ pos.hashCode(); + } + + @Override + public boolean equals(Object o) { + return o instanceof InvWithLocation + && handler.equals(((InvWithLocation) o).handler) + && world == ((InvWithLocation) o).world + && pos.equals(((InvWithLocation) o).pos); + } + +} diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 316d8408f..ad2e66af1 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -28,6 +28,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.RecipeBrew; @@ -229,7 +230,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public List wrapInventory(List inventories) { + public List wrapInventory(List inventories) { return null; } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 972179c7c..eaff0b353 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -27,6 +27,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.recipe.RecipeBrew; @@ -128,6 +129,6 @@ public interface IInternalMethodHandler { /** * Wrap inventories in the network into wrappers providing compatibility for storage mods. */ - List wrapInventory(List inventories); + List wrapInventory(List inventories); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 88e3b08a5..0735e0312 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -38,6 +38,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -96,12 +97,12 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - IItemHandler inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir); + InvWithLocation inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir); if(inv != null) { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - ItemStack simulate = ItemHandlerHelper.insertItem(inv, stack.copy(), true); + ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); int availablePut = supertile.getWorld().isRemote ? 1 : stack.stackSize - (simulate == null ? 0 : simulate.stackSize); canAccept &= availablePut > 0; @@ -113,7 +114,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(priorityInv && !priority) break setInv; - invToPutItemIn = inv; + invToPutItemIn = inv.handler; priorityInv = priority; sideToPutItemIn = dir.getOpposite(); amountToPutIn = availablePut; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 18247f350..071a2b821 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -22,6 +22,7 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibMisc; @@ -38,12 +39,12 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } @Override - public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { + public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { // NO-OP } @Override - public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { + public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { List filter = getFilter(); for(ItemStack stack : filter) if(requestMatches(request, stack)) { @@ -55,7 +56,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); worldObj.scheduleUpdate(getPos(), getBlockType(), 2); - TileEntity requestor = (TileEntity) source.getSparkInventory(); + TileEntity requestor = source.getSparkInventory().world.getTileEntity(source.getSparkInventory().pos); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileCorporeaRetainer) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index d7fc212ab..56d5e4ba4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -17,6 +17,7 @@ import net.minecraft.util.BlockPos; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.block.tile.TileMod; public class TileCorporeaRetainer extends TileMod { @@ -60,9 +61,9 @@ public class TileCorporeaRetainer extends TileMod { ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestPos); if(spark != null) { - IInventory inv = spark.getSparkInventory(); - if(inv != null && inv instanceof ICorporeaRequestor) { - ICorporeaRequestor requestor = (ICorporeaRequestor) inv; + InvWithLocation inv = spark.getSparkInventory(); + if(inv != null && inv.world.getTileEntity(inv.pos) instanceof ICorporeaRequestor) { + ICorporeaRequestor requestor = (ICorporeaRequestor) inv.world.getTileEntity(inv.pos); requestor.doCorporeaRequest(request, requestCount, spark); pendingRequest = false; worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 34478070c..e1ba0ac87 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -33,6 +33,7 @@ import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.lexicon.LexiconPage; @@ -264,9 +265,9 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override - public List wrapInventory(List inventories) { - ArrayList arrayList = new ArrayList(); - for(IInventory inv : inventories) { + public List wrapInventory(List inventories) { + List arrayList = new ArrayList(); + for(InvWithLocation inv : inventories) { ICorporeaSpark spark = CorporeaHelper.getSparkForInventory(inv); IWrappedInventory wrapped = null; // try StorageDrawers integration diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java index fb5c70596..74c9847b2 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -14,28 +14,30 @@ import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; +import vazkii.botania.api.corporea.InvWithLocation; public final class InventoryHelper2 { - public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { + public static InvWithLocation getInventory(World world, BlockPos pos, EnumFacing side) { TileEntity te = world.getTileEntity(pos); if(te == null) return null; - + IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? + te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; if(te instanceof TileEntityChest) { Block chestBlock = world.getBlockState(pos).getBlock(); if(world.getBlockState(pos.west()).getBlock() == chestBlock) - return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) te)); + ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) te)); if(world.getBlockState(pos.east()).getBlock() == chestBlock) - return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.east()))); + ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.east()))); if(world.getBlockState(pos.north()).getBlock() == chestBlock) - return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) te)); + ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) te)); if(world.getBlockState(pos.south()).getBlock() == chestBlock) - return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); + ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); } - return te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? - te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + + return ret == null ? null : new InvWithLocation(ret, world, pos); } private InventoryHelper2() {} diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index e43ed9d48..719e5221d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -25,7 +25,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.item.ModItems; public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @@ -72,7 +74,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public void onUpdate() { super.onUpdate(); - IInventory inv = getSparkInventory(); + InvWithLocation inv = getSparkInventory(); if(inv == null) { if(!worldObj.isRemote) setDead(); @@ -183,11 +185,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } @Override - public IInventory getSparkInventory() { + public InvWithLocation getSparkInventory() { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper.getInventory(worldObj, new BlockPos(x, y, z)); + return InventoryHelper2.getInventory(worldObj, new BlockPos(x, y, z), null); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 0d9219602..9ce510c9b 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -12,7 +12,9 @@ package vazkii.botania.common.integration.corporea; import java.util.ArrayList; import java.util.List; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.items.wrapper.InvWrapper; import org.apache.logging.log4j.Level; import net.minecraft.inventory.IInventory; @@ -21,6 +23,7 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; /** * Wrapper for StorageDrawers compatibility. @@ -31,16 +34,16 @@ public class WrappedDeepStorage extends WrappedInventoryBase { private static boolean checkedInterface = false; private static boolean deepStoragePresent = false; - private IDeepStorageUnit inv; + private final IDeepStorageUnit invRaw; private WrappedDeepStorage(IDeepStorageUnit inv, ICorporeaSpark spark) { - this.inv = inv; + this.invRaw = inv; this.spark = spark; } @Override - public IInventory getWrappedObject() { - return (IInventory) inv; + public InvWithLocation getWrappedObject() { + return new InvWithLocation(new InvWrapper(((IInventory) invRaw)), spark.getSparkInventory().world, spark.getSparkInventory().pos); } @Override @@ -57,7 +60,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { List stacks = new ArrayList(); boolean removedAny = false; - ItemStack prototype = inv.getStoredItemType(); + ItemStack prototype = invRaw.getStoredItemType(); if(prototype == null) { // for the case of barrel without contents set return stacks; @@ -85,7 +88,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { request.extractedItems += rem; if(doit && rem > 0) { - decreaseStoredCount(inv, rem); + decreaseStoredCount(invRaw, rem); removedAny = true; if(spark != null) @@ -109,11 +112,10 @@ public class WrappedDeepStorage extends WrappedInventoryBase { * * @return wrapped inventory or null if it has incompatible type. */ - public static IWrappedInventory wrap(IInventory inv, ICorporeaSpark spark) { - if(!isDeepStorageNeeded()) { - return null; - } - return inv instanceof IDeepStorageUnit ? new WrappedDeepStorage((IDeepStorageUnit) inv, spark) : null; + public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { + if(isDeepStorageNeeded() && inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).inv instanceof IDeepStorageUnit) { + return new WrappedDeepStorage(((IDeepStorageUnit) ((InvWrapper) inv.handler).inv), spark); + } else return null; } /** diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 837df4b9c..475df17bc 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -18,18 +18,19 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; public class WrappedIInventory extends WrappedInventoryBase{ - private IInventory inv; + private InvWithLocation inv; - private WrappedIInventory(IInventory inv, ICorporeaSpark spark) { + private WrappedIInventory(InvWithLocation inv, ICorporeaSpark spark) { this.inv = inv; this.spark = spark; } @Override - public IInventory getWrappedObject() { + public InvWithLocation getWrappedObject() { return inv; } @@ -46,46 +47,31 @@ public class WrappedIInventory extends WrappedInventoryBase{ private List iterateOverSlots(CorporeaRequest request, boolean doit) { List stacks = new ArrayList(); - boolean removedAny = false; - for (int i = inv.getSizeInventory() - 1; i >= 0; i--) { - if(!CorporeaHelper.isValidSlot(inv, i)) - continue; - - ItemStack stackAt = inv.getStackInSlot(i); + for (int i = inv.handler.getSlots() - 1; i >= 0; i--) { + ItemStack stackAt = inv.handler.getStackInSlot(i); // WARNING: this code is very similar in all implementations of // IWrappedInventory - keep it synch if(isMatchingItemStack(request.matcher, request.checkNBT, stackAt)) { int rem = Math.min(stackAt.stackSize, request.count == -1 ? stackAt.stackSize : request.count); if(rem > 0) { - ItemStack copy = stackAt.copy(); - if(rem < copy.stackSize) - copy.stackSize = rem; - stacks.add(copy); + stacks.add(inv.handler.extractItem(i, rem, !doit)); + if(doit && spark != null) + spark.onItemExtracted(stackAt); } request.foundItems += stackAt.stackSize; request.extractedItems += rem; - if(doit && rem > 0) { - inv.decrStackSize(i, rem); - removedAny = true; - if(spark != null) - spark.onItemExtracted(stackAt); - } if(request.count != -1) request.count -= rem; } } - if(removedAny) { - inv.markDirty(); - } - return stacks; } - public static IWrappedInventory wrap(IInventory inv, ICorporeaSpark spark) { + public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { return new WrappedIInventory(inv, spark); } diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index 2ee27ce9c..61eb5d3d0 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -17,9 +17,13 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import vazkii.botania.api.corporea.InvWithLocation; +import vazkii.botania.common.entity.EntityCorporeaSpark; /** * Wrapper for StorageDrawers compatibility. @@ -27,16 +31,16 @@ import vazkii.botania.api.corporea.IWrappedInventory; */ public class WrappedStorageDrawers extends WrappedInventoryBase { - private IDrawerGroup inv; + private IDrawerGroup invRaw; private WrappedStorageDrawers(IDrawerGroup inv, ICorporeaSpark spark) { - this.inv = inv; + this.invRaw = inv; this.spark = spark; } @Override - public IInventory getWrappedObject() { - return (IInventory) inv; + public InvWithLocation getWrappedObject() { + return new InvWithLocation(new InvWrapper((IInventory) invRaw), spark.getSparkInventory().world, spark.getSparkInventory().pos); } @Override @@ -53,8 +57,8 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { List stacks = new ArrayList(); boolean removedAny = false; - for(int i = 0; i < inv.getDrawerCount(); i++) { - IDrawer drawer = inv.getDrawer(i); + for(int i = 0; i < invRaw.getDrawerCount(); i++) { + IDrawer drawer = invRaw.getDrawer(i); if(drawer == null) { continue; } @@ -93,7 +97,7 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { } } if(removedAny) { - inv.markDirtyIfNeeded(); + invRaw.markDirtyIfNeeded(); } return stacks; } @@ -107,7 +111,9 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { * * @return wrapped inventory or null if it has incompatible type. */ - public static IWrappedInventory wrap(IInventory inv, ICorporeaSpark spark) { - return inv instanceof IDrawerGroup ? new WrappedStorageDrawers((IDrawerGroup) inv, spark) : null; + public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { + if(inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).inv instanceof IDrawerGroup) { + return new WrappedStorageDrawers((IDrawerGroup) ((InvWrapper) inv.handler).inv, spark); + } else return null; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 4e7441146..fc2bffb40 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -21,6 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; @@ -41,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); - if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); From 1229141b2f9e57ca2e1b0acae655a1d9814a5bce Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 13:20:49 -0600 Subject: [PATCH 401/935] Fix sparks not being colored by network --- .../botania/api/corporea/ICorporeaSpark.java | 3 ++- .../render/entity/RenderCorporeaSpark.java | 5 ++--- .../client/render/entity/RenderSparkBase.java | 8 ++++---- .../common/entity/EntityCorporeaSpark.java | 17 +++++++++-------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index ae194f01c..cd3197a30 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.api.corporea; import java.util.List; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; /** @@ -81,6 +82,6 @@ public interface ICorporeaSpark { * Gets the network that this spark is on, or the color it's displaying. Sparks may only connect to others * of the same network, and on changing network should trigger a re-cache of the previous network. */ - public int getNetwork(); + public EnumDyeColor getNetwork(); } 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 af957786c..786c5dd22 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -32,12 +32,11 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { - int network = Math.min(15, entity.getNetwork()); - int hex = EnumDyeColor.byMetadata(network).getMapColor().colorValue; + int hex = entity.getNetwork().getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); - GlStateManager.color(r, g, b, a); + GlStateManager.color(r / 255F, g / 255F, b / 255F, a); } @Override 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 e97be636b..5a233746a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -80,19 +80,19 @@ public class RenderSparkBase extends RenderEntity { GlStateManager.popMatrix(); } - public TextureAtlasSprite getBaseIcon(T entity) { + protected TextureAtlasSprite getBaseIcon(T entity) { return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } - public void colorSpinningIcon(T entity, float a) { + protected void colorSpinningIcon(T entity, float a) { // NO-OP } - public TextureAtlasSprite getSpinningIcon(T entity) { + protected TextureAtlasSprite getSpinningIcon(T entity) { return null; } - public void renderCallback(T entity, float pticks) { + protected void renderCallback(T entity, float pticks) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 719e5221d..31149320f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -18,6 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -230,13 +231,13 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { return dataWatcher.getWatchableObjectInt(28) == 1; } - public void setNetwork(int network) { - dataWatcher.updateObject(29, network); + public void setNetwork(EnumDyeColor network) { + dataWatcher.updateObject(29, network.getMetadata()); } @Override - public int getNetwork() { - return dataWatcher.getWatchableObjectInt(29); + public EnumDyeColor getNetwork() { + return EnumDyeColor.byMetadata(dataWatcher.getWatchableObjectInt(29)); } public int getItemDisplayTicks() { @@ -273,8 +274,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } } else if(stack.getItem() == ModItems.dye) { int color = stack.getItemDamage(); - if(color != getNetwork()) { - setNetwork(color); + if(color != getNetwork().getMetadata()) { + setNetwork(EnumDyeColor.byMetadata(color)); if(master != null) restartNetwork(); @@ -303,14 +304,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); - setNetwork(cmp.getInteger(TAG_NETWORK)); + setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); - cmp.setInteger(TAG_NETWORK, getNetwork()); + cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY)); } From bb89013f1e224cee470f08a9fb70fc06de63474c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 13:36:27 -0600 Subject: [PATCH 402/935] According to lexicon sparks only read from top of inventory --- .../java/vazkii/botania/common/entity/EntityCorporeaSpark.java | 3 ++- .../java/vazkii/botania/common/item/ItemCorporeaSpark.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 31149320f..f898723ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -190,7 +191,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper2.getInventory(worldObj, new BlockPos(x, y, z), null); + return InventoryHelper2.getInventory(worldObj, new BlockPos(x, y, z), EnumFacing.UP); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index fc2bffb40..9e9db23d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -42,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); - if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); From 63f160b78b849be23825849de94ba27b0d377dca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 13:40:08 -0600 Subject: [PATCH 403/935] A reference <3 --- src/main/resources/assets/botania/lang/en_US.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c51fbc7c6..06d3c4241 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3282,8 +3282,8 @@ botania.page.corporea3=&1Corporea Sparks&0 have a view of the inventory directly botania.page.corporea4=It's to note that the &1Master Corporea Spark&0, while being part of the network, can not have the items in its inventory extracted from.
Futhermore, no requests for items in the network are ever done passively. Corporea does not have the ability to add new items to the network, those should be inserted physically through &1Hoppers&0 or other methods. botania.page.corporea5=Similarly to normal &1Sparks&0, &1Corporea Sparks&0 have a method of augmentation, that being the ability to color them. While in the world, there's an icon floating around the spark that shows which color it has, this can be changed by right clicking on the spark with a piece of &1Floral Powder&0. These colors define networks. A spark may only be in the same network as another spark if the two have the same color. botania.page.corporea6=The ability to color sparks allows for multiple different &4Corporea Networks&0 to be together in a close area, without interfering with each other.
Viewing the network and removing the spark works exactly the same as a normal spark. Lastly, having two &1Master Corporea Sparks&0 of the same color nearby, while possible, is a bad idea and will cause conflicts and odd behaviour. -botania.page.corporea7=Creating &1Corporea Sparks&0 -botania.page.corporea8=And &1Master Corporea Sparks&0 +botania.page.corporea7=A spark of ingenuity +botania.page.corporea8=Love-coloured # -- CORPOREA INDEX botania.entry.corporeaIndex=Corporea Index From 93174616c7569f4f063d17d1931d51312bb0c27c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 14:01:13 -0600 Subject: [PATCH 404/935] Fall back to null sided cap --- .../vazkii/botania/common/core/helper/InventoryHelper2.java | 2 ++ .../java/vazkii/botania/common/item/ItemCorporeaSpark.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java index 74c9847b2..d82f583e2 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -25,6 +25,8 @@ public final class InventoryHelper2 { return null; IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); if(te instanceof TileEntityChest) { Block chestBlock = world.getBlockState(pos).getBlock(); if(world.getBlockState(pos.west()).getBlock() == chestBlock) diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 9e9db23d2..98384fb5c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -42,7 +42,8 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); - if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { + if((tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); From c105b606c48546699c9b8f87760f8c1b2d34f4fc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 20:26:52 -0600 Subject: [PATCH 405/935] Moar capability fixes. Closes #165 --- .../api/internal/DummyMethodHandler.java | 7 +++ .../api/internal/IInternalMethodHandler.java | 4 ++ .../subtile/functional/SubTileHopperhock.java | 5 +-- .../tile/corporea/TileCorporeaFunnel.java | 31 ++++++++++--- .../core/handler/InternalMethodHandler.java | 8 ++++ .../common/core/helper/InventoryHelper2.java | 31 +++++++++++-- .../common/entity/EntityCorporeaSpark.java | 4 +- .../botania/common/item/ItemFlowerBag.java | 33 ++++++++------ .../item/equipment/bauble/ItemItemFinder.java | 44 +++++++++++++------ 9 files changed, 125 insertions(+), 42 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index ad2e66af1..9cc9a22d2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -26,6 +26,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; @@ -179,6 +181,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { return null; } + @Override + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { + return null; + } + @Override public boolean shouldForceCheck() { return true; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index eaff0b353..311a7b1ca 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -25,6 +25,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; @@ -98,6 +100,8 @@ public interface IInternalMethodHandler { public IInventory getBaublesInventory(EntityPlayer player); + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player); + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side); public boolean hasSolegnoliaAround(Entity e); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 0735e0312..9cda57a15 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.WeakHashMap; -import java.util.stream.IntStream; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -24,7 +23,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -44,7 +42,6 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -97,7 +94,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - InvWithLocation inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir); + InvWithLocation inv = InventoryHelper2.getInventoryWithLocation(supertile.getWorld(), pos_, dir); if(inv != null) { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 504a28265..c09def4f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -15,14 +15,17 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.lib.LibMisc; public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { @@ -80,15 +83,13 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq if(!(request instanceof ItemStack)) return; - IInventory inv = InventoryHelper.getInventory(worldObj, getPos().down()); - if(inv == null || inv instanceof TileCorporeaFunnel) - inv = InventoryHelper.getInventory(worldObj, getPos().down(2)); + IItemHandler inv = getInv(); List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); for(ItemStack reqStack : stacks) { - if(inv != null && !(inv instanceof TileCorporeaFunnel) && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, EnumFacing.UP)) - InventoryHelper.insertItemIntoInventory(inv, reqStack); + if(inv != null && ItemHandlerHelper.insertItemStacked(inv, reqStack, true) == null) + ItemHandlerHelper.insertItemStacked(inv, reqStack, false); else { EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); worldObj.spawnEntityInWorld(item); @@ -96,4 +97,22 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } } + private IItemHandler getInv() { + TileEntity te = worldObj.getTileEntity(pos.down()); + IItemHandler ret = InventoryHelper2.getInventory(worldObj, pos.down(), EnumFacing.UP); + if(ret == null) + ret = InventoryHelper2.getInventory(worldObj, pos.down(), null); + if(ret != null && !(te instanceof TileCorporeaFunnel)) + return ret; + + te = worldObj.getTileEntity(pos.down(2)); + ret = InventoryHelper2.getInventory(worldObj, pos.down(2), EnumFacing.UP); + if(ret == null) + ret = InventoryHelper2.getInventory(worldObj, pos.down(2), null); + if(ret != null && !(te instanceof TileCorporeaFunnel)) + return ret; + + return null; + } + } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index e1ba0ac87..5c1b46411 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -28,6 +28,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.CorporeaHelper; @@ -185,6 +188,11 @@ public class InternalMethodHandler extends DummyMethodHandler { return PlayerHandler.getPlayerBaubles(player); } + @Override + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { + return new InvWrapper(getBaublesInventory(player)); + } + @Override public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { HUDHandler.drawSimpleManaHUD(color, mana, maxMana, name, res); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java index d82f583e2..79c9e1b29 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -16,9 +16,18 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.Iterator; + public final class InventoryHelper2 { - - public static InvWithLocation getInventory(World world, BlockPos pos, EnumFacing side) { + + public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { + IItemHandler ret = getInventory(world, pos, side); + if(ret == null) + return null; + else return new InvWithLocation(ret, world, pos); + } + + public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { TileEntity te = world.getTileEntity(pos); if(te == null) @@ -39,7 +48,23 @@ public final class InventoryHelper2 { ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); } - return ret == null ? null : new InvWithLocation(ret, world, pos); + return ret; + } + + public static Iterable toIterable(IItemHandler itemHandler) { + return () -> new Iterator() { + int index = 0; + + @Override + public boolean hasNext() { + return index < itemHandler.getSlots(); + } + + @Override + public ItemStack next() { + return itemHandler.getStackInSlot(index++); + } + }; } private InventoryHelper2() {} diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index f898723ef..ad8d4bee5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -17,7 +17,6 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,7 +27,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.item.ModItems; @@ -191,7 +189,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper2.getInventory(worldObj, new BlockPos(x, y, z), EnumFacing.UP); + return InventoryHelper2.getInventoryWithLocation(worldObj, new BlockPos(x, y, z), EnumFacing.UP); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 00486feba..0d4efb32e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -23,6 +23,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.InventoryHelper; @@ -94,9 +98,17 @@ public class ItemFlowerBag extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof IInventory) { + if(tile != null) { if(!world.isRemote) { - IInventory inv = (IInventory) tile; + IItemHandler inv = null; + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + else if(tile instanceof IInventory) + inv = new InvWrapper(((IInventory) tile)); + + if(inv == null) + return true; + ItemStack[] stacks = loadStacks(stack); ItemStack[] newStacks = new ItemStack[stacks.length]; boolean putAny = false; @@ -104,14 +116,10 @@ public class ItemFlowerBag extends ItemMod { int i = 0; for(ItemStack petal : stacks) { if(petal != null) { - int count = InventoryHelper.testInventoryInsertion(inv, petal, side); - InventoryHelper.insertItemIntoInventory(inv, petal, side, -1); - - ItemStack newPetal = petal.copy(); - if(newPetal.stackSize == 0) - newPetal = null; - - newStacks[i] = newPetal; + newStacks[i] = ItemHandlerHelper.insertItemStacked(inv, petal, false); + int count = petal.stackSize; + if(newStacks[i] != null) + count = petal.stackSize - newStacks[i].stackSize; putAny |= count > 0; } @@ -119,9 +127,8 @@ public class ItemFlowerBag extends ItemMod { } setStacks(stack, newStacks); - if(putAny && inv instanceof TileEntityChest) { - inv = InventoryHelper.getInventory(inv); - player.displayGUIChest(inv); + if(putAny && tile instanceof TileEntityChest) { + player.displayGUIChest(((TileEntityChest) tile)); } } 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 e4c6c0a8f..e17804d7d 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 @@ -31,8 +31,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; +import net.minecraftforge.items.wrapper.PlayerInvWrapper; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -112,8 +117,10 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(Entity e : entities) { if(e == player) continue; - - if(e instanceof EntityItem) { + if(e.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) { + if(scanInventory(e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), pstack)) + positionsBuilder.append(e.getEntityId()).append(";"); + } else if(e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack istack = item.getEntityItem(); if(player.isSneaking() || istack.isItemEqual(pstack) && ItemStack.areItemStackTagsEqual(istack, pstack)) @@ -121,20 +128,20 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof IInventory) { IInventory inv = (IInventory) e; - if(scanInventory(inv, pstack)) + if(scanInventory(new InvWrapper(inv), pstack)) positionsBuilder.append(e.getEntityId()).append(";"); } else if(e instanceof EntityHorse) { EntityHorse horse = (EntityHorse) e; AnimalChest chest = ReflectionHelper.getPrivateValue(EntityHorse.class, horse, LibObfuscation.HORSE_CHEST); - if(scanInventory(chest, pstack)) + if(scanInventory(new InvWrapper(chest), pstack)) positionsBuilder.append(horse.getEntityId()).append(";"); } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; - InventoryPlayer inv = player_.inventory; - InventoryBaubles binv = PlayerHandler.getPlayerBaubles(player_); - if(scanInventory(inv, pstack) || scanInventory(binv, pstack)) + IItemHandler playerInv = new PlayerInvWrapper(player_.inventory); + IItemHandler binv = new InvWrapper(PlayerHandler.getPlayerBaubles(player_)); + if(scanInventory(playerInv, pstack) || scanInventory(binv, pstack)) positionsBuilder.append(player_.getEntityId()).append(";"); } else if(e instanceof EntityVillager) { @@ -161,10 +168,21 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(int k = -range; k < range + 1; k++) { BlockPos pos_ = pos.add(i, j, k); TileEntity tile = player.worldObj.getTileEntity(pos_); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - if(scanInventory(inv, pstack)) - positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + if(tile != null) { + boolean foundCap = false; + for(EnumFacing e : EnumFacing.VALUES) { + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) + && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { + positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + foundCap = true; + break; + } + } + if(!foundCap && tile instanceof IInventory) { + IInventory inv = (IInventory) tile; + if(scanInventory(new InvWrapper(inv), pstack)) + positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + } } } } @@ -182,11 +200,11 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { return stack1.isItemEqual(stack2) && ItemStack.areItemStackTagsEqual(stack1, stack2); } - boolean scanInventory(IInventory inv, ItemStack pstack) { + boolean scanInventory(IItemHandler inv, ItemStack pstack) { if(pstack == null) return false; - for(int l = 0; l < inv.getSizeInventory(); l++) { + for(int l = 0; l < inv.getSlots(); l++) { ItemStack istack = inv.getStackInSlot(l); if(istack != null && equalStacks(istack, pstack)) return true; From c74e77d9fcb4ae52aaf49afd1726eb844a4f9c19 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 20:44:22 -0600 Subject: [PATCH 406/935] Fix corporea index stars being too bright --- .../botania/client/core/helper/RenderHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index e307c1a6f..695dc245b 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -156,7 +156,7 @@ public final class RenderHelper { GlStateManager.disableTexture2D(); GlStateManager.shadeModel(GL11.GL_SMOOTH); GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 1); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); GlStateManager.disableAlpha(); GlStateManager.enableCull(); GlStateManager.depthMask(false); @@ -176,10 +176,10 @@ public final class RenderHelper { float g = ((color & 0xFF00) >> 8) / 255F; float b = (color & 0xFF) / 255F; tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(r, g, b, 1F - f2).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); tessellator.draw(); } From e25cf207a6559d788fb860adab4735a8ce87784d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 20:46:05 -0600 Subject: [PATCH 407/935] Let rabbits spawn from cocoon of cparice --- .../java/vazkii/botania/common/block/tile/TileCocoon.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2d1149197..80d48a254 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -18,6 +18,7 @@ import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.passive.EntityPig; +import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; @@ -70,7 +71,7 @@ public class TileCocoon extends TileMod { break; } } else { - int entityType = worldObj.rand.nextInt(4); + int entityType = worldObj.rand.nextInt(5); switch(entityType) { case 0: entity = new EntitySheep(worldObj); @@ -86,6 +87,9 @@ public class TileCocoon extends TileMod { case 3: entity = new EntityChicken(worldObj); break; + case 4: + entity = new EntityRabbit(worldObj); + break; } } } From 3097dde3573a4e9a7640e5ffdc1cb64f50ad2985 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 8 Mar 2016 10:57:19 -0600 Subject: [PATCH 408/935] Restore storage drawers compat, closes #166 --- .../common/integration/corporea/WrappedStorageDrawers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index 61eb5d3d0..42bc852df 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -112,8 +112,8 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { * @return wrapped inventory or null if it has incompatible type. */ public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { - if(inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).inv instanceof IDrawerGroup) { - return new WrappedStorageDrawers((IDrawerGroup) ((InvWrapper) inv.handler).inv, spark); + if(inv.world.getTileEntity(inv.pos) instanceof IDrawerGroup) { + return new WrappedStorageDrawers((IDrawerGroup) inv.world.getTileEntity(inv.pos), spark); } else return null; } } From 3a9f0b346ebb578fef65a6a2fd2d673876318338 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 8 Mar 2016 22:44:31 -0600 Subject: [PATCH 409/935] Fix inverted redstone conditions in prism. Closes #167 --- .../java/vazkii/botania/common/block/tile/mana/TilePrism.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 9675b4999..5aed3bc96 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -24,7 +24,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos public void onBurstCollision(IManaBurst burst) { ItemStack lens = itemHandler.getStackInSlot(0); - boolean active = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean active = !worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); if(active) { From 84e38b5a32716f11aa3721682263fe7e03099c2b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 09:35:45 -0600 Subject: [PATCH 410/935] Fix nonssmooth turntable animation. Closes #169 --- .../botania/common/block/tile/mana/TileTurntable.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index b687ac4a7..8a97198ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -35,9 +35,6 @@ public class TileTurntable extends TileMod { @Override public void updateEntity() { - if (worldObj.isRemote) - return; - boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { @@ -53,7 +50,8 @@ public class TileTurntable extends TileMod { spreader.rotationX += speed * (backwards ? -1 : 1); if(spreader.rotationX >= 360F) spreader.rotationX -= 360F; - spreader.checkForReceiver(); + if(!worldObj.isRemote) + spreader.checkForReceiver(); } } } From 769528ceeddcfe9aacb59c37c0e6eadea1a489e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 09:56:30 -0600 Subject: [PATCH 411/935] Fix prism not resyncing when being automated --- .../vazkii/botania/common/block/tile/mana/TilePrism.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 5aed3bc96..71fccecec 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollisionGhost; @@ -70,4 +71,10 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos }; } + @Override + public void markDirty() { + super.markDirty(); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } + } From f5b71f9db1fd299884863da5e4c05fec24dbf464 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 15:44:14 -0600 Subject: [PATCH 412/935] Possible fixes for #171 --- .../java/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +- .../vazkii/botania/common/block/tile/mana/TileSpreader.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index efede3c3b..bd5bb55a3 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -206,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override 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 5ef11c8b0..bb9051089 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 @@ -464,7 +464,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, fakeBurst.setScanBeam(); TileEntity receiver = fakeBurst.getCollidedTile(true); - if(receiver != null && receiver instanceof IManaReceiver) + if(receiver != null + && receiver instanceof IManaReceiver + && receiver.hasWorldObj() + && receiver.getWorld().isBlockLoaded(receiver.getPos(), !receiver.getWorld().isRemote)) this.receiver = (IManaReceiver) receiver; else this.receiver = null; lastTentativeBurst = fakeBurst.propsList; From 4bad74dbfd19656a9b706fe8dd958d68c07e3deb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 20:27:55 -0600 Subject: [PATCH 413/935] Workaround for a jei integration problem, closes #172 --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index a7e51dcba..54cbdd871 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -48,18 +48,18 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), + new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), // Runic must come before petals. See williewillus/Botania#172 new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), - new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), new PureDaisyRecipeHandler(), + new RunicAltarRecipeHandler(), // Runic must come before petals. See williewillus/Botania#172 new PetalApothecaryRecipeHandler(), new ElvenTradeRecipeHandler(), - new RunicAltarRecipeHandler(), new ManaPoolRecipeHandler() ); From 4c1b15b336820b4bfa28a6c6543a71e8e23283f9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 20:50:54 -0600 Subject: [PATCH 414/935] nullcheck spark item. Closes #173 --- src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 98384fb5c..8207a8f15 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -42,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); - if((tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + if(tile != null && (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { From 95f8cc529f8de60d37628f9a5d279c01971ea91c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 09:38:08 -0600 Subject: [PATCH 415/935] Fix dark quartz slab model --- .../java/vazkii/botania/client/core/handler/ModelHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 06d014753..cc5a57e97 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -748,7 +748,7 @@ public final class ModelHandler { List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab); From 3534a6cc5ff5242dfea9a3cc56dd0c551f101cfb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 13:14:42 -0600 Subject: [PATCH 416/935] Close #174 --- .../java/vazkii/botania/common/block/tile/mana/TileBellows.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d7ee9fdeb..6da67e769 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 @@ -65,7 +65,7 @@ public class TileBellows extends TileMod { furnace.setField(0, Math.max(0, furnace.getField(0) - 10)); // burnTime } - if(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; From 8909b26e99368769fe616d7b51b56f880a46caf1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 16:04:31 -0600 Subject: [PATCH 417/935] Update buildscript --- build.gradle | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a4cb31537..a58b5ca9b 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { } repositories { + mavenCentral() maven { name = "chickenbones" url = "http://chickenbones.net/maven/" @@ -53,9 +54,6 @@ minecraft { } //This here is for SCP -repositories { - mavenCentral() -} configurations { sshAntTask } @@ -101,7 +99,7 @@ processResources { */ task deobfJar(type: Jar) { from(sourceSets.main.output) - archiveName = "${baseName} ${version}-deobf.${extension}" + archiveName = "${baseName}.${version}-deobf.${extension}" } artifacts { @@ -216,21 +214,22 @@ def parseConfig(File config) { jar { //rename the default output, for some better... sanity with scipts - archiveName = "${baseName} ${version}.${extension}" + archiveName = "${baseName}.${version}.${extension}" } curseforge { apiKey = priv.cfkey project { - id = "225643" + id = "241973" changelog = """ - See http://botaniamod.net/changelog.php#${version} + See https://github.com/williewillus/Botania/releases/tag/${version} """ - releaseType = "release" + releaseType = "beta" relations { requiredLibrary 'baubles' } } } -defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' +//defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' +defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curse' \ No newline at end of file From cf7f10d082d7cedd9dcfa6491aaacdf021ba59e2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 22:02:45 -0600 Subject: [PATCH 418/935] Fix the pump textures --- .../assets/botania/models/block/pump.json | 80 +++++++++--------- .../assets/botania/textures/model/pump.png | Bin 17895 -> 0 bytes .../textures/model/pump_axle_sides.png | Bin 0 -> 583 bytes .../textures/model/pump_axle_top_bottom.png | Bin 0 -> 471 bytes .../botania/textures/model/pump_end.png | Bin 0 -> 635 bytes .../botania/textures/model/pump_sheath.png | Bin 0 -> 363 bytes 6 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/model/pump.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_axle_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_end.png create mode 100644 src/main/resources/assets/botania/textures/model/pump_sheath.png diff --git a/src/main/resources/assets/botania/models/block/pump.json b/src/main/resources/assets/botania/models/block/pump.json index aaf097f1b..23dd3429c 100644 --- a/src/main/resources/assets/botania/models/block/pump.json +++ b/src/main/resources/assets/botania/models/block/pump.json @@ -1,16 +1,22 @@ { + "textures": { + "axle_sides": "botania:model/pump_axle_sides", + "axle_top_bottom": "botania:model/pump_axle_top_bottom", + "end": "botania:model/pump_end", + "sheath": "botania:model/pump_sheath" + }, "elements": [ { "name": "EndNorth", "from": [ 4.0, 0.0, 0.0 ], "to": [ 12.0, 8.0, 1.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + "north": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "south": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, + "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, + "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } } }, { @@ -18,12 +24,12 @@ "from": [ 4.0, 0.0, 15.0 ], "to": [ 12.0, 8.0, 16.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] } + "south": { "texture": "#end", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, + "north": { "texture": "#end", "uv": [ 8.0, 0.0, 16.0, 8.0 ] }, + "east": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "west": { "texture": "#end", "uv": [ 2.0, 8.0, 4.0, 16.0 ] }, + "up": { "texture": "#end", "uv": [ 6.0, 9.0, 14.0, 10.0 ] }, + "down": { "texture": "#end", "uv": [ 6.0, 11.0, 14.0, 12.0 ] } } }, { @@ -31,12 +37,10 @@ "from": [ 6.0, 2.0, 1.0 ], "to": [ 10.0, 6.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 4.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 4.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 14.0 ] } + "east": { "texture": "#axle_sides", "uv": [ 1.0, 0.0, 15.0, 4.0 ] }, + "west": { "texture": "#axle_sides", "uv": [ 1.0, 5.0, 15.0, 9.0 ] }, + "down": { "texture": "#axle_top_bottom", "uv": [ 4.0, 1.0, 8.0, 15.0 ] }, + "up": { "texture": "#axle_top_bottom", "uv": [ 8.0, 1.0, 12.0, 15.0 ] } } }, { @@ -44,12 +48,11 @@ "from": [ 4.0, 7.0, 11.0 ], "to": [ 12.0, 8.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 5.0, 10.0, 6.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 6.0, 10.0, 7.0 ] }, + "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, + "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } } }, { @@ -57,12 +60,11 @@ "from": [ 4.0, 0.0, 11.0 ], "to": [ 12.0, 1.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 2.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 7.0, 10.0, 8.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 8.0, 10.0, 9.0 ] }, + "up": { "texture": "#sheath", "uv": [ 1.0, 1.0, 9.0, 5.0 ] }, + "down": { "texture": "#sheath", "uv": [ 7.0, 1.0, 15.0, 5.0 ] } } }, { @@ -70,12 +72,9 @@ "from": [ 4.0, 1.0, 11.0 ], "to": [ 5.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } } }, { @@ -83,12 +82,9 @@ "from": [ 11.0, 1.0, 11.0 ], "to": [ 12.0, 7.0, 15.0 ], "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 4.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 4.0 ] } + "north": { "texture": "#sheath", "uv": [ 6.0, 1.0, 7.0, 7.0 ] }, + "east": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] }, + "west": { "texture": "#sheath", "uv": [ 6.0, 1.0, 10.0, 7.0 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/pump.png b/src/main/resources/assets/botania/textures/model/pump.png deleted file mode 100644 index ee73d7d4a375fdeb928cb142917e1574cc7c2df5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17895 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 diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_sides.png b/src/main/resources/assets/botania/textures/model/pump_axle_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7dc48355fbedabe6dc564dcfaca6da1d0c4966 GIT binary patch literal 583 zcmV-N0=WH&P)wG<2Lusz3b*~v}-4ZQBNowp;&@gEFm<2 z-0~7uP~+*730x^S(%pe~@iUK~y#S@?+P|0JMn4Z8zQR$G3zyE4H!}bTfNaTD7e@v- zeX<8565{%`F?2n^v7TGzm4V7M|aZ99{rz$>eWxyZ&LpuLUKLD%` V?Q=S;sUrXY002ovPDHLkV1lb|{)GSl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png b/src/main/resources/assets/botania/textures/model/pump_axle_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fa8ee5ddbe8980d80b4a9a40f6e517cfff7fcb GIT binary patch literal 471 zcmV;|0Vw{7P)^3b|r~Czg&M$?y%1-(!_nko|fMU{r}vU>XNV96B@0%|5vZIZ*QAr* z^*|Jyg0Nr$mVZXXafe1bCf{W|^0?I%cE%!{faUm_#powWSdQX8t!FRTJDqxfuuChB z5QU+s0yg)8G;3lDA76R(EA-=I0$DOVe@il3P~u~9FzGG6n^u4)$6u=(r4Jh=Lc{<7 N002ovPDHLkV1m~@)QkWC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/pump_end.png b/src/main/resources/assets/botania/textures/model/pump_end.png new file mode 100644 index 0000000000000000000000000000000000000000..772dfb411e8d4df38de97c163db08c8d07f5d137 GIT binary patch literal 635 zcmV->0)+jEP)}z|y&Ev^pIQk2)acu!X^Tzp-Y9{VqYUM9}cr`S6BQ&47|qA&U1Y zpIxP7*N8_U&SZjLZ}M&LBg^M6L&?F`GRDI~CL;!&4omfU8h)8L+2^pmg-k<~I>fK~ zR8OCw+umocGDFFc$TVb{L3h`zZ@)C0FyePPmXdUsPluiLN5=BXc>W4Me|%v!SV7s6 zvg2YIn=4mWtv>)pOUf003b?xZ!1@;h`*(4Q9LH1B;p^^(8BTKZdUM^peeu|AZa+8U zv~LDUXx7#qPG6lG^tyeTC1(n_cl*z%N=8 VA1v7XiHm4Q4wrVG#DorO`N?%FTzXk7Tg?kG*LH$ z1o4N4RC-F!;W#+B(80JFpY{FnB=7sdFA)I4iyLcVpWIC`T2WUaVj-|zMtHnUDGT1N z$85#{jigU$B-wMy!Re830K`@e-xCD$J(NswVnv#3W`#sv-VrD32-||fG93>wxj|?H zfCO+nA7d?roe;f**jErOpGM$fy(ZFz)ZCmb^m)90A{(XXKIirpQh+Q&@6idW`=M4?+sRQb#`uT7|}?&M7wPUCxc literal 0 HcmV?d00001 From 55c2a522ee295d6a0a7bfaeb14d3132a7fb86c34 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 11 Mar 2016 23:22:38 -0600 Subject: [PATCH 419/935] Preliminary 3d lexicon --- .../core/handler/ClientMethodHandles.java | 31 +++- .../client/core/handler/RenderLexicon.java | 164 ++++++++++++++++++ .../client/core/proxy/ClientProxy.java | 3 +- .../client/render/item/RenderLexicon.java | 120 ------------- .../botania/common/lib/LibObfuscation.java | 8 + 5 files changed, 204 insertions(+), 122 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java delete mode 100644 src/main/java/vazkii/botania/client/render/item/RenderLexicon.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index e4db866bc..94f828af9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -1,6 +1,7 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; +import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -9,11 +10,15 @@ import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; +import java.lang.reflect.Method; public final class ClientMethodHandles { public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager + renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager + farPlaneDistance_getter, + hurtCameraEffect, setupViewBobbing, getFOVModifier, + enableLightmap, disableLightmap; // EntityRenderer static { try { @@ -28,6 +33,30 @@ public final class ClientMethodHandles { f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); f.setAccessible(true); renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(EntityRenderer.class, LibObfuscation.FAR_PLANE_DISTANCE); + f.setAccessible(true); + farPlaneDistance_getter = MethodHandles.publicLookup().unreflectGetter(f); + + Method m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.HURT_CAMERA_EFFECT, float.class); + m.setAccessible(true); + hurtCameraEffect = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.SETUP_VIEW_BOBBING, float.class); + m.setAccessible(true); + setupViewBobbing = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.ENABLE_LIGHTMAP); + m.setAccessible(true); + enableLightmap = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.DISABLE_LIGHTMAP); + m.setAccessible(true); + disableLightmap = MethodHandles.publicLookup().unreflect(m); + + m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.GET_FOV_MODIFIER, float.class, boolean.class); + m.setAccessible(true); + getFOVModifier = MethodHandles.publicLookup().unreflect(m); } catch (IllegalAccessException e) { FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); throw Throwables.propagate(e); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java new file mode 100644 index 000000000..8b7e42a37 --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -0,0 +1,164 @@ +package vazkii.botania.client.core.handler; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.model.ModelBook; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.util.glu.Project; +import vazkii.botania.client.gui.lexicon.GuiLexicon; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ModItems; + +public class RenderLexicon { + + ModelBook model = new ModelBook(); + ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + + @SubscribeEvent + public void renderItem(RenderHandEvent evt) { + Minecraft mc = Minecraft.getMinecraft(); + if(mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) + return; + evt.setCanceled(true); + + try { + GlStateManager.clear(256); + // Begin copy EntityRenderer.renderHand + GlStateManager.matrixMode(5889); + GlStateManager.loadIdentity(); + float f = 0.07F; + + if (mc.gameSettings.anaglyph) + { + GlStateManager.translate((float)(-(/*xOffset*/0 * 2 - 1)) * f, 0.0F, 0.0F); + } + + float fovModifier = ((float) ClientMethodHandles.getFOVModifier.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks, false)); + float farPlane = ((float) ClientMethodHandles.farPlaneDistance_getter.invokeExact(mc.entityRenderer)); + Project.gluPerspective(fovModifier, (float)mc.displayWidth / (float)mc.displayHeight, 0.05F, farPlane * 2.0F); + GlStateManager.matrixMode(5888); + GlStateManager.loadIdentity(); + + if (mc.gameSettings.anaglyph) + { + GlStateManager.translate((float)(/*xOffset*/0 * 2 - 1) * 0.1F, 0.0F, 0.0F); + } + + GlStateManager.pushMatrix(); + ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + + if (mc.gameSettings.viewBobbing) + { + ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + + boolean flag = mc.getRenderViewEntity() instanceof EntityLivingBase && ((EntityLivingBase)mc.getRenderViewEntity()).isPlayerSleeping(); + + if (mc.gameSettings.thirdPersonView == 0 && !flag && !mc.gameSettings.hideGUI && !mc.playerController.isSpectator()) + { + ClientMethodHandles.enableLightmap.invokeExact(mc.entityRenderer); + // this.itemRenderer.renderItemInFirstPerson(partialTicks); + this.doRender(); + ClientMethodHandles.disableLightmap.invokeExact(mc.entityRenderer); + } + + GlStateManager.popMatrix(); + + if (mc.gameSettings.thirdPersonView == 0 && !flag) + { + mc.getItemRenderer().renderOverlays(ClientTickHandler.partialTicks); + ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + + if (mc.gameSettings.viewBobbing) + { + ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); + } + // End EntityRenderer.renderHand copy + } catch (Throwable throwable) { + FMLLog.warning("[Botania]: Failed to render lexicon"); + throwable.printStackTrace(); + } + + + } + + private void doRender() { + GlStateManager.pushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + float opening = 0F; + float pageFlip = 0F; + + float ticks = ClientTickHandler.ticksWithLexicaOpen; + if(ticks > 0 && ticks < 10) { + if(Minecraft.getMinecraft().currentScreen instanceof GuiLexicon) + ticks += ClientTickHandler.partialTicks; + else ticks -= ClientTickHandler.partialTicks; + } + + GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); + GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F); + GlStateManager.rotate(ticks * 2.5F, 0F, 0F, 1F); + GlStateManager.scale(0.9F, 0.9F, 0.9F); + opening = ticks / 12F; + + float pageFlipTicks = ClientTickHandler.pageFlipTicks; + if(pageFlipTicks > 0) + pageFlipTicks -= ClientTickHandler.partialTicks; + + pageFlip = pageFlipTicks / 5F; + + model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); + if(ticks < 3) { + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.translate(-0.3F, -0.21F, -0.07F); + GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); + boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); + boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); + + String title = ModItems.lexicon.getItemStackDisplayName(null); + String origTitle = title; + + if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) + title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); + if(title.equals(origTitle) && bevo) + title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); + if(title.equals(origTitle) && saice) + title = StatCollector.translateToLocal("item.botania:lexicon.saice"); + + font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); + GlStateManager.translate(0F, 10F, 0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + + GlStateManager.translate(0F, 15F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 10F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 50F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + + GlStateManager.translate(0F, 10F, 0F); + font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + + if(bevo || saice) { + GlStateManager.translate(0F, 10F, 0F); + font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); + } + } + + GlStateManager.popMatrix(); + } + +} 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 5f89fbdf5..1fe3aacb5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -57,6 +57,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -200,7 +201,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); - MinecraftForge.EVENT_BUS.register(new CorporeaAutoCompleteHandler()); + MinecraftForge.EVENT_BUS.register(new RenderLexicon()); if(ConfigHandler.useAdaptativeConfig) MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java b/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java deleted file mode 100644 index 0cd0b4b9e..000000000 --- a/src/main/java/vazkii/botania/client/render/item/RenderLexicon.java +++ /dev/null @@ -1,120 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 25, 2014, 8:49:01 PM (GMT)] - *//* - -package vazkii.botania.client.render.item; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.model.ModelBook; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.lexicon.GuiLexicon; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ModItems; - -public class RenderLexicon implements IItemRenderer { - - ModelBook model = new ModelBook(); - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GlStateManager.pushMatrix(); - Minecraft mc = Minecraft.getMinecraft(); - mc.renderEngine.bindTexture(texture); - float opening = 0F; - float pageFlip = 0F; - - float ticks = ClientTickHandler.ticksWithLexicaOpen; - if(ticks > 0 && ticks < 10) { - if(mc.currentScreen instanceof GuiLexicon) - ticks += ClientTickHandler.partialTicks; - else ticks -= ClientTickHandler.partialTicks; - } - - GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); - GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F); - GlStateManager.rotate(ticks * 2.5F, 0F, 0F, 1F); - GlStateManager.scale(0.9F, 0.9F, 0.9F); - opening = ticks / 12F; - - float pageFlipTicks = ClientTickHandler.pageFlipTicks; - if(pageFlipTicks > 0) - pageFlipTicks -= ClientTickHandler.partialTicks; - - pageFlip = pageFlipTicks / 5F; - - model.render(null, 0F, 0F, pageFlip, opening, 0F, 1F / 16F); - if(ticks < 3) { - FontRenderer font = Minecraft.getMinecraft().fontRenderer; - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.3F, -0.21F, -0.07F); - GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); - boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); - - String title = ModItems.lexicon.getItemStackDisplayName(null); - String origTitle = title; - - if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) - title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); - if(title.equals(origTitle) && bevo) - title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); - if(title.equals(origTitle) && saice) - title = StatCollector.translateToLocal("item.botania:lexicon.saice"); - - font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); - GlStateManager.translate(0F, 10F, 0F); - GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); - - GlStateManager.translate(0F, 15F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 50F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); - - GlStateManager.translate(0F, 10F, 0F); - font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); - - if(bevo || saice) { - GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); - } - } - - GlStateManager.popMatrix(); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 8a4b74d7a..f1eeec021 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -98,4 +98,12 @@ public final class LibObfuscation { public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "q" }; public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "r" }; + // EntityRenderer + public static final String[] FAR_PLANE_DISTANCE = { "farPlaneDistance", "field_78530_s", "k" }; + public static final String[] HURT_CAMERA_EFFECT = { "hurtCameraEffect", "func_78482_e", "d" }; + public static final String[] SETUP_VIEW_BOBBING = { "setupViewBobbing", "func_78475_f", "e" }; + public static final String[] ENABLE_LIGHTMAP = { "enableLightmap", "func_180436_i", "i" }; + public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" }; + public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" }; + } From e031b3b52cc9fe3078225842b890febe894d8814 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 00:23:51 -0600 Subject: [PATCH 420/935] In working state --- .../core/handler/ClientMethodHandles.java | 12 ++- .../client/core/handler/RenderLexicon.java | 85 ++++++++++++++++++- .../botania/common/lib/LibObfuscation.java | 4 + 3 files changed, 96 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index 94f828af9..a17739293 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -2,6 +2,7 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -18,7 +19,8 @@ public final class ClientMethodHandles { renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager farPlaneDistance_getter, hurtCameraEffect, setupViewBobbing, getFOVModifier, - enableLightmap, disableLightmap; // EntityRenderer + enableLightmap, disableLightmap, // EntityRenderer + prevEquippedProgress_getter, equippedProgress_getter; // ItemRenderer static { try { @@ -57,6 +59,14 @@ public final class ClientMethodHandles { m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.GET_FOV_MODIFIER, float.class, boolean.class); m.setAccessible(true); getFOVModifier = MethodHandles.publicLookup().unreflect(m); + + f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.PREV_EQUIPPED_PROGRESS); + f.setAccessible(true); + prevEquippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.EQUIPPED_PROGRESS); + f.setAccessible(true); + equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); throw Throwables.propagate(e); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 8b7e42a37..9e866eaf7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -1,11 +1,17 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderHandEvent; @@ -17,6 +23,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; +// Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { ModelBook model = new ModelBook(); @@ -30,6 +37,7 @@ public class RenderLexicon { evt.setCanceled(true); try { + // Called immediately before EntityRenderer.renderHand GlStateManager.clear(256); // Begin copy EntityRenderer.renderHand GlStateManager.matrixMode(5889); @@ -65,8 +73,7 @@ public class RenderLexicon { if (mc.gameSettings.thirdPersonView == 0 && !flag && !mc.gameSettings.hideGUI && !mc.playerController.isSpectator()) { ClientMethodHandles.enableLightmap.invokeExact(mc.entityRenderer); - // this.itemRenderer.renderItemInFirstPerson(partialTicks); - this.doRender(); + renderItemInFirstPerson(); ClientMethodHandles.disableLightmap.invokeExact(mc.entityRenderer); } @@ -91,6 +98,30 @@ public class RenderLexicon { } + private void renderItemInFirstPerson() throws Throwable { + // Cherry picked from ItemRenderer.renderItemInFirstPerson + float prevEquippedProgress = ((float) ClientMethodHandles.prevEquippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); + float equippedProgress = ((float) ClientMethodHandles.equippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); + float f = 1.0F - (prevEquippedProgress + (equippedProgress - prevEquippedProgress) * ClientTickHandler.partialTicks); + EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; + float f1 = player.getSwingProgress(ClientTickHandler.partialTicks); + float f2 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * ClientTickHandler.partialTicks; + float f3 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * ClientTickHandler.partialTicks; + this.func_178101_a(f2, f3); + this.func_178109_a(player); + this.func_178110_a(player, ClientTickHandler.partialTicks); + GlStateManager.enableRescaleNormal(); + GlStateManager.pushMatrix(); + this.func_178105_d(f1); + this.transformFirstPersonItem(f, f1); + + doRender(); + + GlStateManager.popMatrix(); + GlStateManager.disableRescaleNormal(); + RenderHelper.disableStandardItemLighting(); + } + private void doRender() { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); @@ -106,8 +137,7 @@ public class RenderLexicon { GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F); - GlStateManager.rotate(ticks * 2.5F, 0F, 0F, 1F); - GlStateManager.scale(0.9F, 0.9F, 0.9F); + GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F); opening = ticks / 12F; float pageFlipTicks = ClientTickHandler.pageFlipTicks; @@ -161,4 +191,51 @@ public class RenderLexicon { GlStateManager.popMatrix(); } + // ItemRenderer.func_178101_a + private void func_178101_a(float angle, float p_178101_2_) { + GlStateManager.pushMatrix(); + GlStateManager.rotate(angle, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(p_178101_2_, 0.0F, 1.0F, 0.0F); + RenderHelper.enableStandardItemLighting(); + GlStateManager.popMatrix(); + } + + // Copy - ItemRenderer.func_178109_a + private void func_178109_a(AbstractClientPlayer clientPlayer) { + int i = Minecraft.getMinecraft().theWorld.getCombinedLight(new BlockPos(clientPlayer.posX, clientPlayer.posY + (double)clientPlayer.getEyeHeight(), clientPlayer.posZ), 0); + float f = (float)(i & 65535); + float f1 = (float)(i >> 16); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f, f1); + } + + // Copy - ItemRenderer.func_178110_a + private void func_178110_a(EntityPlayerSP entityplayerspIn, float partialTicks) { + float f = entityplayerspIn.prevRenderArmPitch + (entityplayerspIn.renderArmPitch - entityplayerspIn.prevRenderArmPitch) * partialTicks; + float f1 = entityplayerspIn.prevRenderArmYaw + (entityplayerspIn.renderArmYaw - entityplayerspIn.prevRenderArmYaw) * partialTicks; + GlStateManager.rotate((entityplayerspIn.rotationPitch - f) * 0.1F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate((entityplayerspIn.rotationYaw - f1) * 0.1F, 0.0F, 1.0F, 0.0F); + } + + // Copy - ItemRenderer.func_178105_d + private void func_178105_d(float p_178105_1_) { + float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI * 2.0F); + float f2 = -0.2F * MathHelper.sin(p_178105_1_ * (float)Math.PI); + GlStateManager.translate(f, f1, f2); + } + + // Copy with modification - ItemRenderer.transformFirstPersonItem + private void transformFirstPersonItem(float equipProgress, float swingProgress) { + GlStateManager.translate(1F, -1F, -0.71999997F); // Botania - x(0.56) -> 1; y(-0.52) -> -1 + GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F); + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); // Botania - 45 -> 90 + GlStateManager.rotate(-20, 0, 0, 1); // Botania - added + float f = MathHelper.sin(swingProgress * swingProgress * (float)Math.PI); + float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); + GlStateManager.rotate(f * -20.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(f1 * -20.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); + // GlStateManager.scale(0.4F, 0.4F, 0.4F); Botania - removed + } + } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index f1eeec021..c10625aca 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -106,4 +106,8 @@ public final class LibObfuscation { public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" }; public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" }; + // ItemRenderer + public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; + public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; + } From 949fdde0572f24dc4b109acde69d11c863a67126 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 00:51:34 -0600 Subject: [PATCH 421/935] Made the old model not render in 1p --- .../core/handler/MiscellaneousIcons.java | 15 ++++ .../client/core/handler/ModelHandler.java | 1 + .../client/core/handler/RenderLexicon.java | 9 +- .../client/model/FloatingFlowerModel.java | 2 +- .../botania/client/model/LexiconModel.java | 43 ++++++++++ .../{lexicon.json => lexicon_default.json} | 0 .../models/item/lexicon_firstperson.json | 85 ------------------- 7 files changed, 64 insertions(+), 91 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/LexiconModel.java rename src/main/resources/assets/botania/models/item/{lexicon.json => lexicon_default.json} (100%) delete mode 100644 src/main/resources/assets/botania/models/item/lexicon_firstperson.json 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 41be77176..07d39a81d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -11,22 +11,32 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; +import net.minecraft.util.EnumFacing; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; +import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; @@ -35,10 +45,12 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; import javax.imageio.ImageIO; +import javax.vecmath.Matrix4f; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.nio.IntBuffer; +import java.util.List; import java.util.Map; public class MiscellaneousIcons { @@ -97,6 +109,9 @@ public class MiscellaneousIcons { // Platforms evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + + // Lexicon + evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @SubscribeEvent 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 cc5a57e97..412fdaca2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -472,6 +472,7 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); + ModelLoader.registerItemVariants(lexicon, new ModelResourceLocation("botania:lexicon_default", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 9e866eaf7..6d0d9256a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -20,6 +20,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.util.glu.Project; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; @@ -32,7 +33,7 @@ public class RenderLexicon { @SubscribeEvent public void renderItem(RenderHandEvent evt) { Minecraft mc = Minecraft.getMinecraft(); - if(mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) + if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) return; evt.setCanceled(true); @@ -94,8 +95,6 @@ public class RenderLexicon { FMLLog.warning("[Botania]: Failed to render lexicon"); throwable.printStackTrace(); } - - } private void renderItemInFirstPerson() throws Throwable { @@ -191,7 +190,7 @@ public class RenderLexicon { GlStateManager.popMatrix(); } - // ItemRenderer.func_178101_a + // Copy - ItemRenderer.func_178101_a private void func_178101_a(float angle, float p_178101_2_) { GlStateManager.pushMatrix(); GlStateManager.rotate(angle, 1.0F, 0.0F, 0.0F); @@ -226,7 +225,7 @@ public class RenderLexicon { // Copy with modification - ItemRenderer.transformFirstPersonItem private void transformFirstPersonItem(float equipProgress, float swingProgress) { - GlStateManager.translate(1F, -1F, -0.71999997F); // Botania - x(0.56) -> 1; y(-0.52) -> -1 + GlStateManager.translate(1.2F, -1F, -0.71999997F); // Botania - x(0.56) -> 1; y(-0.52) -> -1 GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F); GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); // Botania - 45 -> 90 GlStateManager.rotate(-20, 0, 0, 1); // Botania - added diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index b81582816..ed67e9528 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -137,7 +137,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Enhance! CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel); - FMLLog.info("[Botania]: Cached floating flower model for islandtpye %s and flowertype %s", islandType, identifier); + FMLLog.info("[Botania]: Cached floating flower model for islandtype %s and flowertype %s", islandType, identifier); CACHE.put(islandType, identifier, model); return model; } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java new file mode 100644 index 000000000..209966c61 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -0,0 +1,43 @@ +package vazkii.botania.client.model; + +import com.google.common.collect.ImmutableList; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.TRSRTransformation; +import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.common.core.handler.ConfigHandler; + +import javax.vecmath.Matrix4f; +import java.util.List; + +public class LexiconModel implements IPerspectiveAwareModel { + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); + IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) { + return Pair.of(this, null); + } + + return Pair.of(new IFlexibleBakedModel.Wrapper(original, Attributes.DEFAULT_BAKED_FORMAT), new TRSRTransformation(original.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + } + + @Override public VertexFormat getFormat() { return DefaultVertexFormats.ITEM; } + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return false; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } +} diff --git a/src/main/resources/assets/botania/models/item/lexicon.json b/src/main/resources/assets/botania/models/item/lexicon_default.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lexicon.json rename to src/main/resources/assets/botania/models/item/lexicon_default.json diff --git a/src/main/resources/assets/botania/models/item/lexicon_firstperson.json b/src/main/resources/assets/botania/models/item/lexicon_firstperson.json deleted file mode 100644 index b0cd2ab5b..000000000 --- a/src/main/resources/assets/botania/models/item/lexicon_firstperson.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "elements": [ - { - "name": "FrontCover", - "from": [ 5.0, 0.0, 9.0 ], - "to": [ 11.0, 10.0, 9.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] } - } - }, - { - "name": "Spine", - "from": [ 5.0, 0.0, 7.0 ], - "to": [ 5.0, 10.0, 9.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 2.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 2.0 ] } - } - }, - { - "name": "BackCover", - "from": [ 5.0, 0.0, 7.0 ], - "to": [ 11.0, 10.0, 7.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 10.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 10.0 ] } - } - }, - { - "name": "LeftPage", - "from": [ 5.0, 1.0, 8.0 ], - "to": [ 10.0, 9.0, 9.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] } - } - }, - { - "name": "LeftPageInner", - "from": [ 5.0, 1.0, 8.0 ], - "to": [ 10.0, 9.0, 8.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] } - } - }, - { - "name": "RightPageInner", - "from": [ 5.0, 1.0, 8.0 ], - "to": [ 10.0, 9.0, 8.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 0.0, 8.0 ] } - } - }, - { - "name": "RightPage", - "from": [ 5.0, 1.0, 7.0 ], - "to": [ 10.0, 9.0, 8.0 ], - "faces": { - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 5.0, 1.0 ] } - } - } - ] -} \ No newline at end of file From 64e1282444281180902efd8a5b058227d457faac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 00:59:11 -0600 Subject: [PATCH 422/935] Done! --- .../botania/client/model/LexiconModel.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 209966c61..adc64729c 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -13,27 +13,27 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; import java.util.List; +@SuppressWarnings("deprecation") public class LexiconModel implements IPerspectiveAwareModel { + + private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); + @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) { + if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) return Pair.of(this, null); - } - - return Pair.of(new IFlexibleBakedModel.Wrapper(original, Attributes.DEFAULT_BAKED_FORMAT), new TRSRTransformation(original.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } - @Override public VertexFormat getFormat() { return DefaultVertexFormats.ITEM; } - @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } + @Override public List getFaceQuads(EnumFacing face) { return ImmutableList.of(); } @Override public List getGeneralQuads() { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } From f1403a4577c8c1be1abe00edd02bc4162f7d5a56 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 13:27:47 -0600 Subject: [PATCH 423/935] Fix terra pick mass harvesting. closes #175 --- .../item/equipment/tool/terrasteel/ItemTerraPick.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 85ced0aa8..496b7d7fb 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 @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -160,13 +161,16 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(ItemTemperanceStone.hasTemperanceActive(player) && level > 2) level = 2; - int range = Math.max(0, level - 1); + int range = level - 1; int rangeY = Math.max(1, range); if(range == 0 && level != 1) return; - ToolCommons.removeBlocksInIteration(player, stack, world, pos, new BlockPos(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0), new BlockPos(doX ? range + 1 : 1, doY ? rangeY * 2 : 1, doZ ? range + 1 : 1), null, MATERIALS, silk, fortune, isTipped(stack)); + BlockPos beginDiff = new BlockPos(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0); + BlockPos endDiff = new BlockPos(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); + + ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack)); if(origLevel == 5) player.addStat(ModAchievements.rankSSPick, 1); } From 3cc7099ab25c6b42f2137d81315691497a18d729 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 14:48:45 -0600 Subject: [PATCH 424/935] Fix itemfinder crash. Closes #176 --- .../botania/common/item/equipment/bauble/ItemItemFinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e17804d7d..62dea3589 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 @@ -139,7 +139,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; - IItemHandler playerInv = new PlayerInvWrapper(player_.inventory); + IItemHandler playerInv = new InvWrapper(player_.inventory); IItemHandler binv = new InvWrapper(PlayerHandler.getPlayerBaubles(player_)); if(scanInventory(playerInv, pstack) || scanInventory(binv, pstack)) positionsBuilder.append(player_.getEntityId()).append(";"); From 099c02157e590fc075bb24b0423bd01867013ad6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 16:26:59 -0600 Subject: [PATCH 425/935] Update buildscript and update checker --- build.gradle | 8 +++++--- build.properties | 8 ++++---- .../botania/common/core/version/ThreadVersionChecker.java | 2 +- .../botania/common/core/version/VersionChecker.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 4 ++-- version/1.8.9.txt | 1 + web/versions.ini | 3 ++- 7 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 version/1.8.9.txt diff --git a/build.gradle b/build.gradle index a58b5ca9b..18cf9cec3 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ artifacts { /** * Increments the buildnumber in your config file, and saves it */ -task incrementBuildNumber(dependsOn: 'reobf') << { +task incrementBuildNumber(dependsOn: 'reobfJar') << { config.build_number = (config.build_number.toString().toInteger()) + 1 configFile.withWriter { config.toProperties().store(it, "") @@ -214,7 +214,7 @@ def parseConfig(File config) { jar { //rename the default output, for some better... sanity with scipts - archiveName = "${baseName}.${version}.${extension}" + archiveName = "${baseName}-unofficial.${version}.${extension}" } curseforge { @@ -225,6 +225,8 @@ curseforge { See https://github.com/williewillus/Botania/releases/tag/${version} """ releaseType = "beta" + addGameVersion '1.8.9' + addGameVersion 'Java 8' relations { requiredLibrary 'baubles' } @@ -232,4 +234,4 @@ curseforge { } //defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' -defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curse' \ No newline at end of file +defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge' \ No newline at end of file diff --git a/build.properties b/build.properties index a82be69d2..689caf676 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Thu Feb 25 19:50:43 GMT 2016 +#Sat Mar 12 16:00:41 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.1.1763 -mc_version=1.8.9 dir_repo=./ -build_number=250 +mc_version=1.8.9 +forge_version=11.15.1.1763 +build_number=299 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 909434221..7f91cb289 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -27,7 +27,7 @@ public class ThreadVersionChecker extends Thread { @Override public void run() { try { - URL url = new URL("https://raw.githubusercontent.com/Vazkii/Botania/master/version/" + MinecraftForge.MC_VERSION + ".txt"); + URL url = new URL("https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"); BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); VersionChecker.onlineVersion = r.readLine(); r.close(); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index c337aa373..0b8414317 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -45,7 +45,7 @@ public final class VersionChecker { if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); - int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); + int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 06d3c4241..8a448425f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -420,12 +420,12 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8/files"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/#%version%"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! botania.versioning.downloadingAlready=The update is already downloading, give it some time, will you? -botania.versioning.error=Woah! It seems like something went wrong while trying to download the Botania update. Is botaniamod.net down? +botania.versioning.error=Woah! It seems like something went wrong while trying to download the Botania update. Is CurseForge down? botania.versioning.disabled=Sorry. This feature is currently disabled due to server host problems, it should be back soon. # BAUBLE TOOLTIPS diff --git a/version/1.8.9.txt b/version/1.8.9.txt new file mode 100644 index 000000000..3b0c86793 --- /dev/null +++ b/version/1.8.9.txt @@ -0,0 +1 @@ +r1.8-299 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 5929531a4..e5181f58c 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -246,4 +246,5 @@ r1.8-245=1.7.10 r1.8-246=1.7.10 r1.8-247=1.7.10 r1.8-248=1.7.10 -r1.8-249=1.7.10 \ No newline at end of file +r1.8-249=1.7.10 +r1.8-299=1.8.9 \ No newline at end of file From 2172d78dd2161be88533523d79fe32043ef810d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 16:36:44 -0600 Subject: [PATCH 426/935] Disable the background downloader for now, at least til we get a file server --- src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 5f90e87f8..8a3d48f02 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -219,7 +219,7 @@ public class CommonProxy { } public void serverStarting(FMLServerStartingEvent event) { - event.registerServerCommand(new CommandDownloadLatest()); + // todo 1.8 - we don't have a file server yet. event.registerServerCommand(new CommandDownloadLatest()); event.registerServerCommand(new CommandShare()); event.registerServerCommand(new CommandOpen()); if(Botania.gardenOfGlassLoaded) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 8a448425f..1f085bb27 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -420,7 +420,7 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8/files"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/#%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%version%"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! From 8f6709437717bc039b69936543e5d0051a73a111 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 16:50:28 -0600 Subject: [PATCH 427/935] Tweak nag and version checker --- src/main/java/vazkii/botania/common/Botania.java | 4 ++-- .../common/core/version/ThreadVersionChecker.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ae77b0bd7..f4829cb9a 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -82,12 +82,12 @@ public class Botania { MinecraftForge.EVENT_BUS.register(this); } - @SubscribeEvent // todo temporary nag, remove when merging back into master + @SubscribeEvent public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) { EntityPlayer player = evt.player; IChatComponent message = new ChatComponentTranslation("botaniamisc.unofficial.nag"); - message.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED).setUnderlined(true)); + message.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)); IChatComponent message2 = new ChatComponentTranslation("botaniamisc.unofficial.report"); message2.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 7f91cb289..f626e8b78 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -11,6 +11,7 @@ package vazkii.botania.common.core.version; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; @@ -18,6 +19,8 @@ import net.minecraftforge.common.MinecraftForge; public class ThreadVersionChecker extends Thread { + private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"; + public ThreadVersionChecker() { setName("Botania Version Checker Thread"); setDaemon(true); @@ -26,12 +29,9 @@ public class ThreadVersionChecker extends Thread { @Override public void run() { - try { - URL url = new URL("https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"); - BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); + try(BufferedReader r = new BufferedReader(new InputStreamReader(new URL(LINK).openStream()))) { VersionChecker.onlineVersion = r.readLine(); - r.close(); - } catch(Exception e) { + } catch(IOException e) { e.printStackTrace(); } VersionChecker.doneChecking = true; From ec1cc498ce424d8a2d91a97d7a85a6e5b989cbac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 20:38:49 -0600 Subject: [PATCH 428/935] Build 299 --- build.properties | 8 ++++---- web/versions.ini | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 689caf676..792543510 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat Mar 12 16:00:41 CST 2016 +#Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.8.9 forge_version=11.15.1.1763 -build_number=299 +mc_version=1.8.9 +dir_repo=./ +build_number=300 mod_name=Botania diff --git a/web/versions.ini b/web/versions.ini index e5181f58c..377b53a06 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -247,4 +247,5 @@ r1.8-246=1.7.10 r1.8-247=1.7.10 r1.8-248=1.7.10 r1.8-249=1.7.10 +r1.8-299=1.8.9 r1.8-299=1.8.9 \ No newline at end of file From e2596f4511d49166dc65a83cfb6b8c46e030cace Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 20:39:07 -0600 Subject: [PATCH 429/935] Fix red string comparator not binding, closes #179 --- .../common/block/tile/string/TileRedStringComparator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 8157dd1a8..8e01ea720 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -20,6 +20,7 @@ public class TileRedStringComparator extends TileRedString { @Override public void updateEntity() { + super.updateEntity(); BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); Block block = getBlockAtBinding(); From bead93c6535d8f0fc78e1729baf33775882178da Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 20:48:48 -0600 Subject: [PATCH 430/935] Minor memory optimization, fix JEI integration for magical flowers --- .../vazkii/botania/common/block/tile/string/TileRedString.java | 2 +- .../botania/common/item/block/ItemBlockSpecialFlower.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 1e36e4f5c..cab389cff 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 @@ -42,7 +42,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { continue; if(acceptBlock(pos_)) { - setBinding(new BlockPos(pos_)); + setBinding(pos_); if(currBinding == null || !currBinding.equals(pos_)) onBound(pos_); break; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 76aa07c3b..28d715cf3 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -40,6 +40,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public ItemBlockSpecialFlower(Block block1) { super(block1); + setHasSubtypes(true); } @Override From 9a756ef79ea05b681eb038e8cab540980e1dfc19 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 12 Mar 2016 21:12:09 -0600 Subject: [PATCH 431/935] Fix particles being culled at render distance. Closes #15 --- .../client/fx/ParticleRenderDispatcher.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index a4743cb10..455d5e895 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -16,7 +16,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; +import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; +import org.lwjgl.util.glu.Project; +import vazkii.botania.client.core.handler.ClientMethodHandles; +import vazkii.botania.client.core.handler.ClientTickHandler; public final class ParticleRenderDispatcher { @@ -29,9 +33,19 @@ public final class ParticleRenderDispatcher { // Called from LightningHandler.onRenderWorldLast since that was // already registered. /shrug public static void dispatch() { + Minecraft mc = Minecraft.getMinecraft(); Tessellator tessellator = Tessellator.getInstance(); - Profiler profiler = Minecraft.getMinecraft().mcProfiler; + float fovModifier, farPlane; + + try { + fovModifier = ((float) ClientMethodHandles.getFOVModifier.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks, true)); + farPlane = ((float) ClientMethodHandles.farPlaneDistance_getter.invokeExact(mc.entityRenderer)); + } catch (Throwable t) { + return; + } + + Profiler profiler = mc.mcProfiler; GL11.glPushAttrib(GL11.GL_LIGHTING); GlStateManager.depthMask(false); @@ -40,12 +54,25 @@ public final class ParticleRenderDispatcher { GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); GlStateManager.disableLighting(); + GlStateManager.matrixMode(GL11.GL_PROJECTION); + GlStateManager.loadIdentity(); + Project.gluPerspective(fovModifier, mc.displayWidth / mc.displayHeight, 0.05F, farPlane * 12); // Extend far plane so starfield and beacons work at lower render dists + + GlStateManager.matrixMode(GL11.GL_MODELVIEW); + GlStateManager.pushMatrix(); + profiler.startSection("sparkle"); FXSparkle.dispatchQueuedRenders(tessellator); profiler.endStartSection("wisp"); FXWisp.dispatchQueuedRenders(tessellator); profiler.endSection(); + GlStateManager.popMatrix(); + + GlStateManager.matrixMode(GL11.GL_PROJECTION); + GlStateManager.loadIdentity(); + Project.gluPerspective(fovModifier, mc.displayWidth / mc.displayHeight, 0.05F, farPlane * MathHelper.SQRT_2); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); GlStateManager.disableBlend(); GlStateManager.depthMask(true); From 8e550e36d28bf12ab970cbe73e01a62e066751eb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 13 Mar 2016 12:26:21 -0500 Subject: [PATCH 432/935] Revert "Fix particles being culled at render distance. Closes #15" This reverts commit 9a756ef79ea05b681eb038e8cab540980e1dfc19. --- .../client/fx/ParticleRenderDispatcher.java | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index 455d5e895..a4743cb10 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -16,11 +16,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; -import net.minecraft.util.MathHelper; import org.lwjgl.opengl.GL11; -import org.lwjgl.util.glu.Project; -import vazkii.botania.client.core.handler.ClientMethodHandles; -import vazkii.botania.client.core.handler.ClientTickHandler; public final class ParticleRenderDispatcher { @@ -33,19 +29,9 @@ public final class ParticleRenderDispatcher { // Called from LightningHandler.onRenderWorldLast since that was // already registered. /shrug public static void dispatch() { - Minecraft mc = Minecraft.getMinecraft(); Tessellator tessellator = Tessellator.getInstance(); - float fovModifier, farPlane; - - try { - fovModifier = ((float) ClientMethodHandles.getFOVModifier.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks, true)); - farPlane = ((float) ClientMethodHandles.farPlaneDistance_getter.invokeExact(mc.entityRenderer)); - } catch (Throwable t) { - return; - } - - Profiler profiler = mc.mcProfiler; + Profiler profiler = Minecraft.getMinecraft().mcProfiler; GL11.glPushAttrib(GL11.GL_LIGHTING); GlStateManager.depthMask(false); @@ -54,25 +40,12 @@ public final class ParticleRenderDispatcher { GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F); GlStateManager.disableLighting(); - GlStateManager.matrixMode(GL11.GL_PROJECTION); - GlStateManager.loadIdentity(); - Project.gluPerspective(fovModifier, mc.displayWidth / mc.displayHeight, 0.05F, farPlane * 12); // Extend far plane so starfield and beacons work at lower render dists - - GlStateManager.matrixMode(GL11.GL_MODELVIEW); - GlStateManager.pushMatrix(); - profiler.startSection("sparkle"); FXSparkle.dispatchQueuedRenders(tessellator); profiler.endStartSection("wisp"); FXWisp.dispatchQueuedRenders(tessellator); profiler.endSection(); - GlStateManager.popMatrix(); - - GlStateManager.matrixMode(GL11.GL_PROJECTION); - GlStateManager.loadIdentity(); - Project.gluPerspective(fovModifier, mc.displayWidth / mc.displayHeight, 0.05F, farPlane * MathHelper.SQRT_2); - GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); GlStateManager.disableBlend(); GlStateManager.depthMask(true); From 4b056375d402847e2892b7d8643bba10df777341 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 13 Mar 2016 12:30:12 -0500 Subject: [PATCH 433/935] Fix pump trying to animate serverside. Closes #181 --- .../java/vazkii/botania/common/block/tile/mana/TilePump.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 798f8063a..a03c7f089 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -84,8 +84,9 @@ public class TilePump extends TileMod implements IAnimationProvider { moving = 0F; } } - move.setValue(innerRingPos / 8 * 0.5F); // rescale to 0 - 0.5 for json animation + if(worldObj.isRemote) + move.setValue(innerRingPos / 8 * 0.5F); // rescale to 0 - 0.5 for json animation if(!hasCartOnTop) comparator = 0; From 199243c120af53a27293b6c5ccc82633c23b04c5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 14 Mar 2016 12:46:29 -0500 Subject: [PATCH 434/935] waterbowl fancification attempt --- .../assets/botania/blockstates/waterBowl.json | 19 ++++++++++++++++++ .../assets/botania/models/item/waterBowl.json | 6 ------ .../botania/textures/items/waterBowl_base.png | Bin 0 -> 149 bytes .../textures/items/waterBowl_cover.png | Bin 0 -> 307 bytes .../textures/items/waterBowl_fluid.png | Bin 0 -> 118 bytes 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/waterBowl.json delete mode 100644 src/main/resources/assets/botania/models/item/waterBowl.json create mode 100644 src/main/resources/assets/botania/textures/items/waterBowl_base.png create mode 100644 src/main/resources/assets/botania/textures/items/waterBowl_cover.png create mode 100644 src/main/resources/assets/botania/textures/items/waterBowl_fluid.png diff --git a/src/main/resources/assets/botania/blockstates/waterBowl.json b/src/main/resources/assets/botania/blockstates/waterBowl.json new file mode 100644 index 000000000..40e2821d0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/waterBowl.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:forgebucket", + "custom": { + "fluid": "water", + "flipGas": false + }, + "textures": { + "base": "botania:items/waterBowl_base", + "fluid": "botania:items/waterBowl_fluid", + "cover": "botania:items/waterBowl_cover" + }, + "transform": "forge:default-item" + }, + "variants": { + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterBowl.json b/src/main/resources/assets/botania/models/item/waterBowl.json deleted file mode 100644 index 0aa3fc48b..000000000 --- a/src/main/resources/assets/botania/models/item/waterBowl.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/standard_item", - "textures": { - "layer0": "botania:items/waterBowl" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/waterBowl_base.png b/src/main/resources/assets/botania/textures/items/waterBowl_base.png new file mode 100644 index 0000000000000000000000000000000000000000..63d16ad6ba640c5f4761dce13b0d9605a4b695c8 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`F`h1tAr-fh6C_x-FowO#`M)u7 zktthr(Len!&)p9y817*^*==;tG})LTjf124N|Gr<+eS&I%N&OzcpEg`!a8~q;|^po x>{2}8*Os_v*2TR|>m-+7=9F~VbZj9zL(+yU%UoIOXnImC`}FJil-Atq*a$g!(<|H1sP%wgQx(%jq^-2$1kE*|?VG-*w! z)3hV6b{$@MZ}wdC{BMl;ezH)N%rix{os4!6 z6N7|xs7q6XD|^0VN$AuWtG&+TPHqWZ?tc41!CvlfpV+o}CcO!{TvreD@aC!K_x-ji z-^<~y@3Z|m&!%|EvXajDoLbFa-pz|zopr07W$*IRF3v literal 0 HcmV?d00001 From b9b7a4e07dcc8a7c4e335b9b0bc4e8efd6a70230 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 14 Mar 2016 13:37:10 -0500 Subject: [PATCH 435/935] Finish waterbowl fancification --- .../botania/common/item/ItemWaterBowl.java | 30 +++++++++++++++++- .../textures/items/waterBowl_cover.png | Bin 307 -> 299 bytes 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index a873f5258..a7ac12b04 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -10,13 +10,41 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; import vazkii.botania.common.lib.LibItemNames; -public class ItemWaterBowl extends ItemMod { +public class ItemWaterBowl extends ItemMod implements IFluidContainerItem { + + private static final FluidStack STACK = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); public ItemWaterBowl() { setMaxStackSize(1); setUnlocalizedName(LibItemNames.WATER_BOWL); } + // Needed for rendering water dynamic model + + @Override + public FluidStack getFluid(ItemStack container) { + return STACK; + } + + @Override + public int getCapacity(ItemStack container) { + return 0; + } + + @Override + public int fill(ItemStack container, FluidStack resource, boolean doFill) { + return 0; + } + + @Override + public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { + return null; + } } diff --git a/src/main/resources/assets/botania/textures/items/waterBowl_cover.png b/src/main/resources/assets/botania/textures/items/waterBowl_cover.png index e969e8d67cb7e59f0fd0c38a76381e3df071b665..2bdfc57198b421c8e6f078cb1a2c575df29a39f3 100644 GIT binary patch delta 255 zcmVX$G=JhrL_t(IjqQ-JZo)tiMBgoT0tJ$Za#e(`K}tzOgPZUHRPbf_ zkTm&%RHmV!v_u0EK_ZfqR46v~rHL&Y>?&Q9sdndPXZ9BU@oT6$(!am5b$k%U7y1g3 z4+dc@fCUhR=Q?UQ9kpNfQQByP(PA5t9Z`6I=eBs5k2}_ADR^|MY>?NlQ8r0ZR`TIOV9B-{tZ7v)8|s_qrS0-8ckc>>4de?G20;JM+6mzdghNJS~py zeB4R)QOYhl73miS<*$qe*A;%b{;I6rXmD(~2o}Z*q6X3^78W+bL5g#~!Ef~g zRtqZ|3k%UkQ35K_#`6-AtW`pm#Ok`ksotBNH*fX#2_}o*+Qto8(@;~blz$*g{`g?Gd%SGav;hDd zF5y%ql&v~F63y-$D^dag7&}!&f>=cdZy9t|m6)qa%x#l|Ri{VW&~UvA_VNa{Nn-3& z(|&&n006U<&%XOQcfANlFHE=R46^l-}n From f86f42b895bda4c6e0afc30ebd0b08afaa8c1a2a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 14 Mar 2016 15:40:49 -0500 Subject: [PATCH 436/935] Fix infinite potion spam with sponge --- .../vazkii/botania/common/item/brew/ItemBrewBase.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 9508d5955..cc4aec2a0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -91,10 +91,13 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup int swigs = getSwigsLeft(stack); if(!player.capabilities.isCreativeMode) { if(swigs == 1) { - ItemStack copy = baseItem.copy(); - if(!player.inventory.addItemStackToInventory(copy)) + if(!player.inventory.addItemStackToInventory(baseItem.copy())) return baseItem.copy(); - return null; + else { + ItemStack copy = stack.copy(); + copy.stackSize = 0; + return copy; + } } From 6622ec52701cc7072aa4f0c0397330c24e63edf8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 16 Mar 2016 22:54:47 -0500 Subject: [PATCH 437/935] Removeold potion handlers --- .../botania/common/brew/potion/PotionBloodthirst.java | 10 ---------- .../botania/common/brew/potion/PotionEmptiness.java | 9 --------- 2 files changed, 19 deletions(-) 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 9c14e68c4..1a4e43cb1 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -34,7 +34,6 @@ public class PotionBloodthirst extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); for(EntityPlayer player : event.world.playerEntities) { if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness) && player.getEntityBoundingBox().intersectsWith(aabb)) { @@ -42,15 +41,6 @@ public class PotionBloodthirst extends PotionMod { return; } } - -// TODO 1.8 report to forge? world.getEntitiesWithinAABB is hell slow in 1.8+ -// List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); -// for(EntityPlayer player : players) -// if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { -// event.setResult(Result.ALLOW); -// return; -// } - } } 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 440bb3d9a..1c9c48f50 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -40,15 +40,6 @@ public class PotionEmptiness extends PotionMod { return; } } - -// TODO 1.8 report to forge? world.getEntitiesWithinAABB is hell slow in 1.8+ -// List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); -// for(EntityPlayer player : players) -// if(hasEffect(player)) { -// event.setResult(Result.DENY); -// return; -// } - } } From 316363d729a6b436fc5d22450369a2484889910a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 00:02:40 -0500 Subject: [PATCH 438/935] Remove redundant check on jaded amaranthus --- .../subtile/functional/SubTileJadedAmaranthus.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 0914372e0..5f8593def 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 @@ -46,13 +46,10 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { Block blockAbove = supertile.getWorld().getBlockState(pos.up()).getBlock(); if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); - if(ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { - IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); - if(ConfigHandler.blockBreakParticles) - supertile.getWorld().playAuxSFX(2001, pos.up(), Block.getStateId(state)); - supertile.getWorld().setBlockState(pos.up(), state, 1 | 2); - } - + IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); + if(ConfigHandler.blockBreakParticles) + supertile.getWorld().playAuxSFX(2001, pos.up(), Block.getStateId(state)); + supertile.getWorld().setBlockState(pos.up(), state, 1 | 2); mana -= COST; sync(); From 5821ede5e6570f38a57bebe0cb78ac940fe31056 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 10:42:42 -0500 Subject: [PATCH 439/935] Lots of name substitutions --- build.gradle | 4 +- build.properties | 4 +- .../buildcraft/api/core/BuildCraftAPI.java | 2 +- .../java/buildcraft/api/core/EnumColor.java | 4 +- .../buildcraft/api/core/IAreaProvider.java | 2 +- src/api/java/buildcraft/api/core/IBox.java | 3 +- .../buildcraft/api/core/IPathProvider.java | 2 +- .../buildcraft/api/core/IWorldProperty.java | 2 +- src/api/java/buildcraft/api/core/IZone.java | 10 +-- .../buildcraft/api/core/render/ICullable.java | 2 +- .../api/transport/ICustomPipeConnection.java | 2 +- .../api/transport/IStripesHandler.java | 2 +- .../api/transport/PipeConnectionAPI.java | 2 +- .../buildcraft/api/transport/PipeManager.java | 2 +- .../transport/pluggable/PipePluggable.java | 2 +- .../api/crafting/IInfusionStabiliser.java | 2 +- .../java/vazkii/botania/api/BotaniaAPI.java | 12 ++-- .../vazkii/botania/api/BotaniaAPIClient.java | 2 +- .../botania/api/corporea/CorporeaHelper.java | 4 +- .../botania/api/corporea/InvWithLocation.java | 2 +- .../api/internal/DummyManaNetwork.java | 2 +- .../api/internal/DummyMethodHandler.java | 4 +- .../api/internal/IInternalMethodHandler.java | 4 +- .../botania/api/internal/IManaBurst.java | 2 +- .../botania/api/internal/IManaNetwork.java | 2 +- .../api/internal/VanillaPacketDispatcher.java | 2 +- ...tendedWireframeCoordinateListProvider.java | 2 +- .../botania/api/item/IFlowerPlaceable.java | 2 +- .../botania/api/item/IGrassHornExcempt.java | 2 +- .../botania/api/item/IHornHarvestable.java | 2 +- .../botania/api/item/ISequentialBreaker.java | 2 +- .../IWireframeCoordinateListProvider.java | 2 +- .../botania/api/lexicon/ILexiconable.java | 2 +- .../botania/api/lexicon/KnowledgeType.java | 6 +- .../botania/api/lexicon/LexiconEntry.java | 4 +- .../api/lexicon/multiblock/Multiblock.java | 2 +- .../multiblock/component/AnyComponent.java | 2 +- .../component/ColorSwitchingComponent.java | 2 +- .../multiblock/component/FlowerComponent.java | 2 +- .../component/MultiblockComponent.java | 2 +- .../component/StateInsensitiveComponent.java | 2 +- .../botania/api/mana/ILaputaImmobile.java | 2 +- .../vazkii/botania/api/mana/ILensEffect.java | 4 +- .../vazkii/botania/api/mana/IManaTrigger.java | 2 +- .../api/mana/IPoolOverlayProvider.java | 2 +- .../botania/api/mana/spark/SparkHelper.java | 2 +- .../api/recipe/ElvenPortalUpdateEvent.java | 2 +- .../botania/api/recipe/RecipePureDaisy.java | 2 +- .../botania/api/state/BotaniaStateProps.java | 2 +- .../botania/api/subtile/RadiusDescriptor.java | 4 +- .../botania/api/subtile/SubTileEntity.java | 8 +-- .../api/subtile/SubTileFunctional.java | 6 +- .../api/subtile/SubTileGenerating.java | 6 +- .../api/subtile/signature/BasicSignature.java | 6 +- .../botania/api/wand/ICoordBoundItem.java | 2 +- .../vazkii/botania/api/wand/ITileBound.java | 2 +- .../botania/api/wand/IWandBindable.java | 2 +- .../vazkii/botania/api/wand/IWandHUD.java | 2 +- .../vazkii/botania/api/wand/IWandable.java | 2 +- .../api/wand/IWireframeAABBProvider.java | 4 +- .../botania/api/wiki/IWikiProvider.java | 8 +-- .../botania/api/wiki/SimpleWikiProvider.java | 10 +-- .../core/handler/BoundTileRenderer.java | 56 +++++++-------- .../handler/CorporeaAutoCompleteHandler.java | 4 +- .../client/core/handler/DebugHandler.java | 4 +- .../client/core/handler/HUDHandler.java | 34 ++++----- .../handler/ItemsRemainingRenderHandler.java | 6 +- .../client/core/handler/LightningHandler.java | 38 +++++----- .../core/handler/MiscellaneousIcons.java | 4 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 6 +- .../core/handler/RedStringRenderer.java | 8 +-- .../client/core/handler/RenderLexicon.java | 24 +++---- .../handler/SubTileRadiusRenderHandler.java | 46 ++++++------ .../TooltipAdditionDisplayHandler.java | 10 +-- .../client/core/handler/TooltipHandler.java | 12 ++-- .../client/core/helper/IconHelper.java | 4 +- .../client/core/helper/RenderHelper.java | 32 ++++----- .../client/core/proxy/ClientProxy.java | 6 +- .../vazkii/botania/client/fx/FXSparkle.java | 20 +++--- .../java/vazkii/botania/client/fx/FXWisp.java | 16 ++--- .../botania/client/gui/bag/GuiFlowerBag.java | 4 +- .../client/gui/bag/InventoryFlowerBag.java | 8 +-- .../client/gui/box/InventoryBaubleBox.java | 8 +-- .../gui/crafting/ContainerCraftingHalo.java | 2 +- .../client/gui/lexicon/GuiLexicon.java | 20 +++--- .../gui/lexicon/GuiLexiconChallenge.java | 12 ++-- .../gui/lexicon/GuiLexiconChallengesList.java | 10 +-- .../client/gui/lexicon/GuiLexiconEntry.java | 14 ++-- .../client/gui/lexicon/GuiLexiconHistory.java | 6 +- .../client/gui/lexicon/GuiLexiconIndex.java | 18 ++--- .../lexicon/button/GuiButtonAchievement.java | 6 +- .../gui/lexicon/button/GuiButtonBack.java | 4 +- .../button/GuiButtonBackWithShift.java | 6 +- .../gui/lexicon/button/GuiButtonBookmark.java | 12 ++-- .../gui/lexicon/button/GuiButtonCategory.java | 4 +- .../button/GuiButtonChallengeIcon.java | 6 +- .../button/GuiButtonChallengeInfo.java | 4 +- .../lexicon/button/GuiButtonChallenges.java | 6 +- .../gui/lexicon/button/GuiButtonDoot.java | 6 +- .../gui/lexicon/button/GuiButtonHistory.java | 8 +-- .../lexicon/button/GuiButtonInvisible.java | 6 +- .../gui/lexicon/button/GuiButtonNotes.java | 8 +-- .../gui/lexicon/button/GuiButtonOptions.java | 6 +- .../gui/lexicon/button/GuiButtonPage.java | 4 +- .../gui/lexicon/button/GuiButtonShare.java | 6 +- .../button/GuiButtonUpdateWarning.java | 6 +- .../lexicon/button/GuiButtonViewOnline.java | 6 +- .../jei/brewery/BreweryRecipeCategory.java | 4 +- .../elventrade/ElvenTradeRecipeCategory.java | 8 +-- .../jei/manapool/ManaPoolRecipeCategory.java | 4 +- .../PetalApothecaryRecipeCategory.java | 4 +- .../puredaisy/PureDaisyRecipeCategory.java | 4 +- .../runicaltar/RunicAltarRecipeCategory.java | 4 +- .../integration/nei/NEIInputHandler.java | 2 +- .../nei/recipe/RecipeHandlerBrewery.java | 4 +- .../nei/recipe/RecipeHandlerElvenTrade.java | 16 ++--- .../recipe/RecipeHandlerFloatingFlowers.java | 4 +- .../recipe/RecipeHandlerLexicaBotania.java | 18 ++--- .../nei/recipe/RecipeHandlerManaPool.java | 4 +- .../recipe/RecipeHandlerPetalApothecary.java | 4 +- .../nei/recipe/RecipeHandlerPureDaisy.java | 4 +- .../nei/recipe/RecipeHandlerRunicAltar.java | 4 +- .../client/model/FloatingFlowerModel.java | 2 +- .../botania/client/model/LexiconModel.java | 4 +- .../botania/client/model/ModelPixie.java | 2 +- .../botania/client/model/ModelPylon.java | 6 +- .../botania/client/model/PlatformModel.java | 12 ++-- .../botania/client/model/PylonItemModel.java | 2 +- .../client/model/SpecialFlowerModel.java | 4 +- .../render/entity/RenderBabylonWeapon.java | 10 +-- .../client/render/entity/RenderSparkBase.java | 12 ++-- .../render/entity/RenderThornChakram.java | 12 ++-- .../render/tile/RenderTileAlfPortal.java | 12 ++-- .../client/render/tile/RenderTileAltar.java | 12 ++-- .../client/render/tile/RenderTileCocoon.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 8 +-- .../render/tile/RenderTileEnchanter.java | 12 ++-- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileLightRelay.java | 12 ++-- .../client/render/tile/RenderTilePool.java | 14 ++-- .../render/tile/RenderTileRedString.java | 4 +- .../render/tile/RenderTileStarfield.java | 2 +- .../render/tile/RenderTileTerraPlate.java | 12 ++-- .../render/tile/RenderTileTinyPotato.java | 8 +-- .../render/world/SkyblockSkyRenderer.java | 52 +++++++------- .../java/vazkii/botania/common/Botania.java | 20 +++--- .../botania/common/block/BlockAlfPortal.java | 8 +-- .../botania/common/block/BlockAltGrass.java | 8 +-- .../botania/common/block/BlockAltar.java | 14 ++-- .../botania/common/block/BlockAvatar.java | 8 +-- .../botania/common/block/BlockBifrost.java | 12 ++-- .../common/block/BlockBifrostPerm.java | 8 +-- .../common/block/BlockCacophonium.java | 8 +-- .../botania/common/block/BlockCamo.java | 2 +- .../botania/common/block/BlockCell.java | 2 +- .../botania/common/block/BlockCocoon.java | 2 +- .../botania/common/block/BlockDreamwood.java | 2 +- .../common/block/BlockEnchantedSoil.java | 2 +- .../botania/common/block/BlockEnderEye.java | 8 +-- .../botania/common/block/BlockFakeAir.java | 4 +- .../botania/common/block/BlockFelPumpkin.java | 8 +-- .../block/BlockFloatingSpecialFlower.java | 10 +-- .../botania/common/block/BlockForestEye.java | 2 +- .../botania/common/block/BlockGaiaHead.java | 2 +- .../botania/common/block/BlockGhostRail.java | 10 +-- .../botania/common/block/BlockHourglass.java | 12 ++-- .../common/block/BlockIncensePlate.java | 8 +-- .../common/block/BlockLightLauncher.java | 10 +-- .../botania/common/block/BlockLightRelay.java | 10 +-- .../botania/common/block/BlockLivingrock.java | 12 ++-- .../botania/common/block/BlockLivingwood.java | 12 ++-- .../botania/common/block/BlockManaBomb.java | 2 +- .../common/block/BlockModDoubleFlower.java | 10 +-- .../common/block/BlockModDoubleFlower1.java | 6 +- .../common/block/BlockModDoubleFlower2.java | 6 +- .../botania/common/block/BlockModFlower.java | 8 +-- .../botania/common/block/BlockOpenCrate.java | 8 +-- .../common/block/BlockPistonRelay.java | 2 +- .../botania/common/block/BlockPlatform.java | 12 ++-- .../botania/common/block/BlockPylon.java | 8 +-- .../botania/common/block/BlockRoot.java | 2 +- .../botania/common/block/BlockSolidVines.java | 8 +-- .../common/block/BlockSparkChanger.java | 8 +-- .../common/block/BlockSpecialFlower.java | 18 ++--- .../botania/common/block/BlockStorage.java | 8 +-- .../common/block/BlockTeruTeruBozu.java | 2 +- .../botania/common/block/BlockTinyPlanet.java | 2 +- .../block/corporea/BlockCorporeaBase.java | 2 +- .../corporea/BlockCorporeaCrystalCube.java | 8 +-- .../block/corporea/BlockCorporeaFunnel.java | 8 +-- .../block/corporea/BlockCorporeaIndex.java | 4 +- .../corporea/BlockCorporeaInterceptor.java | 8 +-- .../block/corporea/BlockCorporeaRetainer.java | 8 +-- .../common/block/decor/Block18Stone.java | 12 ++-- .../common/block/decor/BlockBlaze.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/decor/BlockCustomBrick.java | 12 ++-- .../common/block/decor/BlockDirtPath.java | 4 +- .../common/block/decor/BlockElfGlass.java | 2 +- .../block/decor/BlockEndStoneBrick.java | 12 ++-- .../block/decor/BlockFloatingFlower.java | 8 +-- .../common/block/decor/BlockManaBeacon.java | 8 +-- .../common/block/decor/BlockManaFlame.java | 4 +- .../common/block/decor/BlockManaGlass.java | 8 +-- .../common/block/decor/BlockModMushroom.java | 8 +-- .../common/block/decor/BlockPavement.java | 12 ++-- .../common/block/decor/BlockPetalBlock.java | 8 +-- .../common/block/decor/BlockPrismarine.java | 12 ++-- .../common/block/decor/BlockReeds.java | 8 +-- .../common/block/decor/BlockSeaLamp.java | 2 +- .../common/block/decor/BlockShimmerrock.java | 2 +- .../block/decor/BlockShimmerwoodPlanks.java | 2 +- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockStarfield.java | 14 ++-- .../common/block/decor/BlockThatch.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 8 +-- .../common/block/decor/BlockUnstable.java | 8 +-- .../decor/biomestone/BlockBiomeStone.java | 6 +- .../decor/biomestone/BlockBiomeStoneA.java | 6 +- .../decor/biomestone/BlockBiomeStoneB.java | 6 +- .../block/decor/panes/BlockAlfglassPane.java | 6 +- .../block/decor/panes/BlockBifrostPane.java | 6 +- .../block/decor/panes/BlockManaglassPane.java | 6 +- .../block/decor/panes/BlockModPane.java | 2 +- .../decor/quartz/BlockSpecialQuartz.java | 8 +-- .../decor/quartz/BlockSpecialQuartzSlab.java | 6 +- .../quartz/BlockSpecialQuartzStairs.java | 2 +- .../block/decor/slabs/Block18StoneSlab.java | 2 +- .../decor/slabs/BlockBiomeStoneSlab.java | 2 +- .../block/decor/slabs/BlockDirtPathSlab.java | 2 +- .../block/decor/slabs/BlockEndStoneSlab.java | 2 +- .../decor/slabs/BlockEnderBrickSlab.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 12 ++-- .../block/decor/slabs/BlockPavementSlab.java | 2 +- .../block/decor/slabs/BlockReedSlab.java | 2 +- .../block/decor/slabs/BlockThatchSlab.java | 2 +- .../slabs/bricks/BlockCustomBrickSlab.java | 2 +- .../slabs/prismarine/BlockPrismarineSlab.java | 2 +- .../decor/stairs/Block18StoneStairs.java | 2 +- .../decor/stairs/BlockBiomeStoneStairs.java | 2 +- .../decor/stairs/BlockEndStoneStairs.java | 2 +- .../decor/stairs/BlockEnderBrickStairs.java | 2 +- .../block/decor/stairs/BlockModStairs.java | 2 +- .../decor/stairs/BlockPavementStairs.java | 2 +- .../block/decor/stairs/BlockReedStairs.java | 2 +- .../block/decor/stairs/BlockThatchStairs.java | 2 +- .../stairs/bricks/BlockCustomBrickStairs.java | 2 +- .../prismarine/BlockPrismarineStairs.java | 2 +- .../block/decor/walls/Block18StoneWall.java | 8 +-- .../decor/walls/BlockBiomeStoneWall.java | 8 +-- .../block/decor/walls/BlockModWall.java | 8 +-- .../decor/walls/BlockPrismarineWall.java | 2 +- .../block/dispenser/BehaviourFelPumpkin.java | 2 +- .../dispenser/BehaviourPoolMinecart.java | 2 +- .../block/dispenser/BehaviourSeeds.java | 2 +- .../common/block/dispenser/BehaviourWand.java | 2 +- .../block/mana/BlockAlchemyCatalyst.java | 2 +- .../common/block/mana/BlockBellows.java | 8 +-- .../common/block/mana/BlockBrewery.java | 8 +-- .../block/mana/BlockConjurationCatalyst.java | 2 +- .../common/block/mana/BlockDistributor.java | 2 +- .../common/block/mana/BlockEnchanter.java | 12 ++-- .../common/block/mana/BlockForestDrum.java | 10 +-- .../common/block/mana/BlockManaDetector.java | 10 +-- .../common/block/mana/BlockManaVoid.java | 2 +- .../botania/common/block/mana/BlockPool.java | 10 +-- .../botania/common/block/mana/BlockPrism.java | 16 ++--- .../botania/common/block/mana/BlockPump.java | 6 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 2 +- .../common/block/mana/BlockSpawnerClaw.java | 2 +- .../common/block/mana/BlockSpreader.java | 10 +-- .../common/block/mana/BlockTerraPlate.java | 2 +- .../common/block/mana/BlockTurntable.java | 2 +- .../common/block/string/BlockRedString.java | 8 +-- .../string/BlockRedStringComparator.java | 2 +- .../block/string/BlockRedStringDispenser.java | 8 +-- .../string/BlockRedStringFertilizer.java | 2 +- .../string/BlockRedStringInterceptor.java | 8 +-- .../block/subtile/SubTilePureDaisy.java | 2 +- .../functional/SubTileAgricarnation.java | 2 +- .../subtile/functional/SubTileBellethorn.java | 2 +- .../subtile/functional/SubTileBubbell.java | 2 +- .../subtile/functional/SubTileClayconia.java | 2 +- .../subtile/functional/SubTileDaffomill.java | 2 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../functional/SubTileFallenKanade.java | 2 +- .../functional/SubTileHeiseiDream.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 8 +-- .../subtile/functional/SubTileHyacidus.java | 2 +- .../functional/SubTileJadedAmaranthus.java | 2 +- .../functional/SubTileMarimorphosis.java | 6 +- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 6 +- .../functional/SubTilePollidisiac.java | 2 +- .../functional/SubTileRannuncarpus.java | 4 +- .../functional/SubTileTangleberrie.java | 2 +- .../subtile/functional/SubTileTigerseye.java | 2 +- .../subtile/generating/SubTileArcaneRose.java | 2 +- .../generating/SubTileDandelifeon.java | 2 +- .../subtile/generating/SubTileDaybloom.java | 2 +- .../subtile/generating/SubTileEndoflame.java | 2 +- .../generating/SubTileEntropinnyum.java | 4 +- .../generating/SubTileGourmaryllis.java | 2 +- .../generating/SubTileHydroangeas.java | 2 +- .../subtile/generating/SubTileKekimurus.java | 2 +- .../subtile/generating/SubTileMunchdew.java | 2 +- .../subtile/generating/SubTileNarslimmus.java | 6 +- .../subtile/generating/SubTileRafflowsia.java | 2 +- .../subtile/generating/SubTileSpectrolus.java | 2 +- .../common/block/tile/TileAlfPortal.java | 4 +- .../botania/common/block/tile/TileAltar.java | 8 +-- .../common/block/tile/TileBrewery.java | 2 +- .../botania/common/block/tile/TileCamo.java | 4 +- .../botania/common/block/tile/TileCell.java | 2 +- .../common/block/tile/TileCraftCrate.java | 4 +- .../common/block/tile/TileEnchanter.java | 4 +- .../common/block/tile/TileEnderEye.java | 6 +- .../common/block/tile/TileFakeAir.java | 2 +- .../common/block/tile/TileForestEye.java | 2 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/TileIncensePlate.java | 2 +- .../common/block/tile/TileLightRelay.java | 4 +- .../botania/common/block/tile/TileMod.java | 8 +-- .../common/block/tile/TileOpenCrate.java | 2 +- .../common/block/tile/TilePlatform.java | 2 +- .../botania/common/block/tile/TilePylon.java | 2 +- .../common/block/tile/TileRuneAltar.java | 8 +-- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../common/block/tile/TileSpecialFlower.java | 2 +- .../common/block/tile/TileTerraPlate.java | 4 +- .../tile/corporea/TileCorporeaFunnel.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 8 +-- .../corporea/TileCorporeaInterceptor.java | 2 +- .../tile/corporea/TileCorporeaRetainer.java | 2 +- .../block/tile/mana/TileManaDetector.java | 2 +- .../common/block/tile/mana/TilePool.java | 12 ++-- .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 17 +++-- .../common/block/tile/mana/TileTurntable.java | 4 +- .../block/tile/string/TileRedString.java | 4 +- .../tile/string/TileRedStringComparator.java | 2 +- .../tile/string/TileRedStringContainer.java | 6 +- .../tile/string/TileRedStringDispenser.java | 2 +- .../tile/string/TileRedStringFertilizer.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 2 +- .../block/tile/string/TileRedStringRelay.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 2 +- .../common/brew/potion/PotionEmptiness.java | 2 +- .../core/command/CommandDownloadLatest.java | 10 +-- .../common/core/command/CommandOpen.java | 6 +- .../common/core/command/CommandShare.java | 10 +-- .../core/command/CommandSkyblockSpread.java | 6 +- .../core/handler/BiomeDecorationHandler.java | 2 +- .../common/core/handler/ConfigHandler.java | 10 +-- .../core/handler/InternalMethodHandler.java | 4 +- .../core/handler/ManaNetworkHandler.java | 2 +- .../common/core/helper/InventoryHelper.java | 10 +-- .../common/core/helper/InventoryHelper2.java | 2 +- .../common/core/helper/MathHelper.java | 2 +- .../botania/common/core/helper/Vector3.java | 12 ++-- .../common/core/proxy/CommonProxy.java | 10 +-- .../core/version/ThreadDownloadMod.java | 14 ++-- .../common/core/version/VersionChecker.java | 14 ++-- .../common/crafting/recipe/HeadRecipe.java | 4 +- .../common/entity/EntityBabylonWeapon.java | 10 +-- .../common/entity/EntityCorporeaSpark.java | 6 +- .../common/entity/EntityDoppleganger.java | 8 ++- .../common/entity/EntityEnderAirBottle.java | 10 +-- .../common/entity/EntityFallingStar.java | 8 +-- .../common/entity/EntityFlameRing.java | 2 +- .../common/entity/EntityFlyingCreature.java | 4 +- .../common/entity/EntityMagicLandmine.java | 2 +- .../common/entity/EntityMagicMissile.java | 6 +- .../common/entity/EntityManaBurst.java | 71 ++++++++++--------- .../common/entity/EntityPinkWither.java | 2 +- .../common/entity/EntityPoolMinecart.java | 2 +- .../botania/common/entity/EntitySpark.java | 4 +- .../common/entity/EntityThornChakram.java | 4 +- .../common/entity/EntityThrowableCopy.java | 32 ++++----- .../common/entity/EntityThrownItem.java | 30 ++++---- .../botania/common/entity/EntityVineBall.java | 6 +- .../buildcraft/TriggerManaDetector.java | 6 +- .../buildcraft/TriggerManaLevel.java | 4 +- .../buildcraft/TriggerRuneAltarCanCraft.java | 4 +- .../corporea/WrappedStorageDrawers.java | 2 +- .../botania/common/item/ItemAncientWill.java | 6 +- .../common/item/ItemBlackHoleTalisman.java | 8 +-- .../botania/common/item/ItemBlackLotus.java | 4 +- .../botania/common/item/ItemBottledMana.java | 2 +- .../botania/common/item/ItemCacophonium.java | 8 +-- .../common/item/ItemCorporeaSpark.java | 2 +- .../botania/common/item/ItemCraftPattern.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 18 ++--- .../botania/common/item/ItemFertilizer.java | 2 +- .../botania/common/item/ItemFlowerBag.java | 2 +- .../botania/common/item/ItemGaiaHead.java | 4 +- .../botania/common/item/ItemGrassHorn.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 10 +-- .../botania/common/item/ItemLexicon.java | 20 ++++-- .../botania/common/item/ItemManaGun.java | 14 ++-- .../botania/common/item/ItemManaMirror.java | 2 +- .../botania/common/item/ItemManaTablet.java | 4 +- .../common/item/ItemObedienceStick.java | 2 +- .../botania/common/item/ItemOpenBucket.java | 14 ++-- .../common/item/ItemOvergrowthSeed.java | 2 +- .../botania/common/item/ItemPinkinator.java | 6 +- .../botania/common/item/ItemPoolMinecart.java | 2 +- .../botania/common/item/ItemSextant.java | 8 +-- .../botania/common/item/ItemSignalFlare.java | 6 +- .../botania/common/item/ItemSlimeBottle.java | 2 +- .../vazkii/botania/common/item/ItemSpark.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 6 +- .../common/item/ItemTemperanceStone.java | 6 +- .../botania/common/item/ItemTwigWand.java | 6 +- .../botania/common/item/ItemWorldSeed.java | 2 +- .../block/ItemBlockFloatingSpecialFlower.java | 4 +- .../common/item/block/ItemBlockPool.java | 4 +- .../item/block/ItemBlockSpecialFlower.java | 12 ++-- .../item/block/ItemBlockTinyPotato.java | 6 +- .../common/item/brew/ItemBrewBase.java | 10 +-- .../common/item/brew/ItemIncenseStick.java | 12 ++-- .../armor/elementium/ItemElementiumArmor.java | 6 +- .../armor/manasteel/ItemManasteelArmor.java | 16 ++--- .../armor/manaweave/ItemManaweaveArmor.java | 10 +-- .../armor/terrasteel/ItemTerrasteelArmor.java | 10 +-- .../armor/terrasteel/ItemTerrasteelHelm.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 12 ++-- .../equipment/bauble/ItemBaubleCosmetic.java | 12 ++-- .../equipment/bauble/ItemBloodPendant.java | 12 ++-- .../item/equipment/bauble/ItemDivaCharm.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 14 ++-- .../equipment/bauble/ItemGoldenLaurel.java | 4 +- .../item/equipment/bauble/ItemIcePendant.java | 4 +- .../item/equipment/bauble/ItemItemFinder.java | 4 +- .../item/equipment/bauble/ItemMagnetRing.java | 4 +- .../item/equipment/bauble/ItemMonocle.java | 8 +-- .../item/equipment/bauble/ItemSwapRing.java | 4 +- .../item/equipment/bauble/ItemTinyPlanet.java | 2 +- .../equipment/bauble/ItemUnholyCloak.java | 2 +- .../item/equipment/tool/ItemStarSword.java | 4 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../item/equipment/tool/ToolCommons.java | 14 ++-- .../equipment/tool/bow/ItemCrystalBow.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 4 +- .../tool/elementium/ItemElementiumShovel.java | 6 +- .../tool/manasteel/ItemManasteelAxe.java | 2 +- .../tool/manasteel/ItemManasteelPick.java | 2 +- .../tool/manasteel/ItemManasteelShears.java | 2 +- .../tool/manasteel/ItemManasteelShovel.java | 2 +- .../tool/manasteel/ItemManasteelSword.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 6 +- .../tool/terrasteel/ItemTerraPick.java | 8 +-- .../tool/terrasteel/ItemTerraSword.java | 6 +- .../botania/common/item/lens/ItemLens.java | 12 ++-- .../vazkii/botania/common/item/lens/Lens.java | 4 +- .../botania/common/item/lens/LensBounce.java | 6 +- .../botania/common/item/lens/LensDamage.java | 2 +- .../common/item/lens/LensExplosive.java | 6 +- .../botania/common/item/lens/LensFire.java | 6 +- .../common/item/lens/LensFirework.java | 6 +- .../botania/common/item/lens/LensFlare.java | 2 +- .../common/item/lens/LensInfluence.java | 2 +- .../botania/common/item/lens/LensLight.java | 6 +- .../botania/common/item/lens/LensMagnet.java | 2 +- .../botania/common/item/lens/LensMine.java | 6 +- .../botania/common/item/lens/LensPaint.java | 8 +-- .../botania/common/item/lens/LensPhantom.java | 4 +- .../botania/common/item/lens/LensPiston.java | 6 +- .../common/item/lens/LensRedirect.java | 8 +-- .../botania/common/item/lens/LensStorm.java | 6 +- .../botania/common/item/lens/LensWarp.java | 6 +- .../botania/common/item/lens/LensWeight.java | 4 +- .../botania/common/item/material/ItemDye.java | 2 +- .../item/material/ItemManaResource.java | 6 +- .../common/item/material/ItemPetal.java | 2 +- .../common/item/relic/ItemAesirRing.java | 2 +- .../botania/common/item/relic/ItemDice.java | 8 +-- .../common/item/relic/ItemExcaliber.java | 2 +- .../common/item/relic/ItemFlugelEye.java | 16 ++--- .../common/item/relic/ItemKingKey.java | 2 +- .../common/item/relic/ItemLokiRing.java | 8 +-- .../botania/common/item/relic/ItemRelic.java | 16 ++--- .../common/item/rod/ItemCobbleRod.java | 2 +- .../botania/common/item/rod/ItemDirtRod.java | 4 +- .../common/item/rod/ItemDiviningRod.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 10 +-- .../botania/common/item/rod/ItemFireRod.java | 2 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemRainbowRod.java | 2 +- .../common/item/rod/ItemSkyDirtRod.java | 6 +- .../botania/common/item/rod/ItemSmeltRod.java | 10 +-- .../common/item/rod/ItemTerraformRod.java | 2 +- .../common/item/rod/ItemTornadoRod.java | 2 +- .../botania/common/item/rod/ItemWaterRod.java | 8 +-- .../botania/common/lexicon/page/PageBrew.java | 6 +- .../lexicon/page/PageCraftingRecipe.java | 6 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageGuide.java | 4 +- .../lexicon/page/PageManaInfusionRecipe.java | 14 ++-- .../common/lexicon/page/PageMultiblock.java | 12 ++-- .../common/lexicon/page/PagePetalRecipe.java | 4 +- .../common/lexicon/page/PageRecipe.java | 10 +-- .../common/lexicon/page/PageRuneRecipe.java | 8 +-- .../common/lexicon/page/PageShedding.java | 10 +-- .../botania/common/lexicon/page/PageText.java | 4 +- .../common/lexicon/page/PageTutorial.java | 12 ++-- .../common/world/SkyblockWorldEvents.java | 12 ++-- 512 files changed, 1585 insertions(+), 1568 deletions(-) diff --git a/build.gradle b/build.gradle index 18cf9cec3..70d69630a 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20151229" + mappings = "snapshot_20160318" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -234,4 +234,4 @@ curseforge { } //defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' -defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge' \ No newline at end of file +defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge' diff --git a/build.properties b/build.properties index 792543510..518e2b4a1 100644 --- a/build.properties +++ b/build.properties @@ -2,8 +2,8 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.1.1763 -mc_version=1.8.9 +forge_version=12.16.0.1767-1.9 +mc_version=1.9 dir_repo=./ build_number=300 mod_name=Botania diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java index 5e172ba18..cc883d610 100644 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ b/src/api/java/buildcraft/api/core/BuildCraftAPI.java @@ -12,7 +12,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public final class BuildCraftAPI { diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index 852eea1ba..e93a44be4 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -10,8 +10,8 @@ import java.util.Random; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -117,7 +117,7 @@ public enum EnumColor implements IStringSerializable { } public String getLocalizedName() { - return StatCollector.translateToLocal(getTag()); + return I18n.translateToLocal(getTag()); } public String getDye() { diff --git a/src/api/java/buildcraft/api/core/IAreaProvider.java b/src/api/java/buildcraft/api/core/IAreaProvider.java index e504694ba..02bcf0ca9 100644 --- a/src/api/java/buildcraft/api/core/IAreaProvider.java +++ b/src/api/java/buildcraft/api/core/IAreaProvider.java @@ -4,7 +4,7 @@ * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. */ public interface IAreaProvider { diff --git a/src/api/java/buildcraft/api/core/IBox.java b/src/api/java/buildcraft/api/core/IBox.java index d7c11f4f4..fd9add8e7 100644 --- a/src/api/java/buildcraft/api/core/IBox.java +++ b/src/api/java/buildcraft/api/core/IBox.java @@ -4,7 +4,8 @@ * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -import net.minecraft.util.BlockPos; + +import net.minecraft.util.math.BlockPos; public interface IBox extends IZone { IBox expand(int amount); diff --git a/src/api/java/buildcraft/api/core/IPathProvider.java b/src/api/java/buildcraft/api/core/IPathProvider.java index 899415227..3903c6e81 100644 --- a/src/api/java/buildcraft/api/core/IPathProvider.java +++ b/src/api/java/buildcraft/api/core/IPathProvider.java @@ -2,7 +2,7 @@ package buildcraft.api.core; import java.util.List; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. */ public interface IPathProvider { diff --git a/src/api/java/buildcraft/api/core/IWorldProperty.java b/src/api/java/buildcraft/api/core/IWorldProperty.java index ba440d7d3..415dc12d1 100755 --- a/src/api/java/buildcraft/api/core/IWorldProperty.java +++ b/src/api/java/buildcraft/api/core/IWorldProperty.java @@ -4,7 +4,7 @@ * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface IWorldProperty { diff --git a/src/api/java/buildcraft/api/core/IZone.java b/src/api/java/buildcraft/api/core/IZone.java index 5d722ffe6..21a5df210 100755 --- a/src/api/java/buildcraft/api/core/IZone.java +++ b/src/api/java/buildcraft/api/core/IZone.java @@ -6,12 +6,12 @@ package buildcraft.api.core; import java.util.Random; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; public interface IZone { /** Returns the smallest possible distance that the index would have to be changed by in order for - * {@link #contains(Vec3)} to return true. If the position is already inside then this will return 0 */ + * {@link #contains(Vec3d)} to return true. If the position is already inside then this will return 0 */ double distanceTo(BlockPos index); /** Returns {@link #distanceTo(BlockPos)} but squared. Usually this will be quicker to calculate. */ @@ -19,8 +19,8 @@ public interface IZone { /** Returns true if the point is enclosed by this zone, such that none of the coordinates lie outside the range * specified by this zone. */ - boolean contains(Vec3 point); + boolean contains(Vec3d point); - /** Gets a random position that {@link #contains(Vec3)} will return true. */ + /** Gets a random position that {@link #contains(Vec3d)} will return true. */ BlockPos getRandomBlockPos(Random rand); } diff --git a/src/api/java/buildcraft/api/core/render/ICullable.java b/src/api/java/buildcraft/api/core/render/ICullable.java index ea4b1f444..2399a6927 100644 --- a/src/api/java/buildcraft/api/core/render/ICullable.java +++ b/src/api/java/buildcraft/api/core/render/ICullable.java @@ -4,8 +4,8 @@ * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.core.render; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /* This interface designates a block as a state machine responsible for culling For implementation details look into diff --git a/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java b/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java index c4cc1efdf..37c44f6b9 100644 --- a/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java +++ b/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java @@ -1,7 +1,7 @@ package buildcraft.api.transport; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/api/java/buildcraft/api/transport/IStripesHandler.java b/src/api/java/buildcraft/api/transport/IStripesHandler.java index 71f420552..d96b78e44 100644 --- a/src/api/java/buildcraft/api/transport/IStripesHandler.java +++ b/src/api/java/buildcraft/api/transport/IStripesHandler.java @@ -6,7 +6,7 @@ package buildcraft.api.transport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java index e79da2646..28f497243 100644 --- a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java +++ b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java @@ -6,7 +6,7 @@ import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java index 0fd0f8aad..81030e638 100755 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ b/src/api/java/buildcraft/api/transport/PipeManager.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import buildcraft.api.transport.pluggable.PipePluggable; diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java index 02a0bd3ab..0a944e389 100755 --- a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java +++ b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java @@ -5,7 +5,7 @@ package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java index 1b62de232..79d597d9f 100644 --- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java +++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -1,6 +1,6 @@ package thaumcraft.api.crafting; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index a86313d1e..ebdf94c7d 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -37,7 +37,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.oredict.OreDictionary; @@ -114,7 +114,7 @@ public final class BotaniaAPI { public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18); - public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); + public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); public static KnowledgeType basicKnowledge; public static KnowledgeType elvenKnowledge; @@ -139,9 +139,9 @@ public final class BotaniaAPI { static { registerSubTile("", DummySubTile.class); - basicKnowledge = registerKnowledgeType("minecraft", EnumChatFormatting.RESET, true); - elvenKnowledge = registerKnowledgeType("alfheim", EnumChatFormatting.DARK_GREEN, false); - relicKnowledge = registerKnowledgeType("relic", EnumChatFormatting.DARK_PURPLE, false); + basicKnowledge = registerKnowledgeType("minecraft", TextFormatting.RESET, true); + elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false); + relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false); addOreWeight("oreAluminum", 3940); // Tinkers' Construct addOreWeight("oreAmber", 2075); // Thaumcraft @@ -277,7 +277,7 @@ public final class BotaniaAPI { * @param id The ID for this knowledge type. * @param color The color to display this knowledge type as. */ - public static KnowledgeType registerKnowledgeType(String id, EnumChatFormatting color, boolean autoUnlock) { + public static KnowledgeType registerKnowledgeType(String id, TextFormatting color, boolean autoUnlock) { KnowledgeType type = new KnowledgeType(id, color, autoUnlock); knowledgeTypes.put(id, type); return type; diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 3db57c7ff..fc13589fe 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -10,7 +10,7 @@ package vazkii.botania.api; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index db2e537ac..918149113 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -23,8 +23,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java index e9e795ce6..6fdff5a7d 100644 --- a/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java +++ b/src/main/java/vazkii/botania/api/corporea/InvWithLocation.java @@ -1,6 +1,6 @@ package vazkii.botania.api.corporea; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index c71656857..e6cf022b3 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -14,7 +14,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 9cc9a22d2..37694a2fd 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -22,7 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 311a7b1ca..565e386cf 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,7 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 479e0109d..622001909 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.UUID; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index f2cb29436..54813ef97 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 79d251138..647b4bd31 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public final class VanillaPacketDispatcher { diff --git a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java index 62cafe0d3..61aee3553 100644 --- a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java @@ -12,7 +12,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * An extension of IWireframeCoordinateListProvider that allows for diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index a4ef8facf..f0e636c06 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -11,7 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.subtile.SubTileEntity; /** diff --git a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java index 8a6bbb438..4b54fc0e9 100644 --- a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java +++ b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java index 654d289c5..a6ef982fc 100644 --- a/src/main/java/vazkii/botania/api/item/IHornHarvestable.java +++ b/src/main/java/vazkii/botania/api/item/IHornHarvestable.java @@ -11,7 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index ff09042de..7c088c4dd 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -12,7 +12,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; /** diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 96a0f25c9..c28d4ae66 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java index 008fbb21c..13b076278 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java @@ -12,7 +12,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java b/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java index 5a08c9ceb..26c182067 100644 --- a/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java +++ b/src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java @@ -1,14 +1,14 @@ package vazkii.botania.api.lexicon; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; public class KnowledgeType { public final String id; - public final EnumChatFormatting color; + public final TextFormatting color; public final boolean autoUnlock; - public KnowledgeType(String id, EnumChatFormatting color, boolean autoUnlock) { + public KnowledgeType(String id, TextFormatting color, boolean autoUnlock) { this.id = id; this.color = color; this.autoUnlock = autoUnlock; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index ec907071f..f31fbcb46 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -122,7 +122,7 @@ public class LexiconEntry implements Comparable { } public final String getNameForSorting() { - return (priority ? 0 : 1) + StatCollector.translateToLocal(getUnlocalizedName()); + return (priority ? 0 : 1) + I18n.translateToLocal(getUnlocalizedName()); } public List getDisplayedRecipes() { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 5cd33ed36..09f594ab2 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -14,7 +14,7 @@ import java.util.*; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 60be5b83c..4a7896655 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -12,7 +12,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 31b437370..60d54bf07 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 02a7e1e28..2ce755b55 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 451a184ac..4494bb41c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -13,7 +13,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java index 4427ccbc1..1f5bcf353 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -1,7 +1,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; // Multiblock component that only compares blocks, not blockstates diff --git a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java index 4658e6a24..e6fdb3d91 100644 --- a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java +++ b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.mana; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/mana/ILensEffect.java b/src/main/java/vazkii/botania/api/mana/ILensEffect.java index 4c88f5524..9cac0414b 100644 --- a/src/main/java/vazkii/botania/api/mana/ILensEffect.java +++ b/src/main/java/vazkii/botania/api/mana/ILensEffect.java @@ -11,7 +11,7 @@ package vazkii.botania.api.mana; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; /** @@ -31,7 +31,7 @@ public interface ILensEffect { * any block. This is called after the collision is handled. * @return True to kill the burst. False to keep it alive. */ - public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack); + public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack); /** * Called when a mana burst fired from a mana spreader with this focus is updated. diff --git a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java index 128f6210a..b6eb8403b 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java +++ b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.mana; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index d71451ead..fd3288d8d 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -11,7 +11,7 @@ package vazkii.botania.api.mana; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 4cb1a48e7..58fa96278 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -14,7 +14,7 @@ import java.util.List; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; public final class SparkHelper { diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index b0933a2cb..ba90e0b1c 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.eventhandler.Event; /** diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index ffb9ce340..43d2f3b6f 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -18,7 +18,7 @@ import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index fbf159d3c..7e5d9c2ae 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -17,7 +17,7 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index 2d8fa4266..a9f322fba 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.subtile; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; /** * This object describes the Radius of a SubTileEntity. It can either be diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index a75aefb1a..040f3c63e 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -15,13 +15,13 @@ import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -182,14 +182,14 @@ public class SubTileEntity { } /** - * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) + * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing) */ public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } /** - * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) + * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing) */ public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index bd5bb55a3..0852ee814 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -18,9 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -211,7 +211,7 @@ public class SubTileFunctional extends SubTileEntity { @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 78932d242..d3a08e371 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -23,9 +23,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; @@ -301,7 +301,7 @@ public class SubTileGenerating extends SubTileEntity { @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 511fa7d1c..913d98933 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileEntity; @@ -68,7 +68,7 @@ public class BasicSignature extends SubTileSignature { @Override public void addTooltip(ItemStack stack, EntityPlayer player, List tooltip) { - tooltip.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal(getType())); + tooltip.add(TextFormatting.BLUE + I18n.translateToLocal(getType())); } private String unlocalizedName(String end) { diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index 4ed522d3a..fe32afbb4 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -1,7 +1,7 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index c228281c8..5cde38c06 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.wand; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index ef1e4f7b2..4df323f75 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -12,7 +12,7 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; /** diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index 1c054ec0a..58f09e8f2 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -12,7 +12,7 @@ package vazkii.botania.api.wand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 2bdef4242..5663d0a85 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -12,7 +12,7 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java index 284d9772c..d41acb51d 100644 --- a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java +++ b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java @@ -10,8 +10,8 @@ */ package vazkii.botania.api.wand; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java index 48c9fb4f4..c7ef0b27a 100644 --- a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java @@ -11,7 +11,7 @@ package vazkii.botania.api.wiki; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; /** @@ -24,16 +24,16 @@ public interface IWikiProvider { /** * Gets the name of the block being looked at for display. */ - public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player); + public String getBlockName(World world, RayTraceResult pos, EntityPlayer player); /** * Gets the URL to open when the block is clicked. */ - public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player); + public String getWikiURL(World world, RayTraceResult pos, EntityPlayer player); /** * Gets the name of the wiki for display. */ - public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player); + public String getWikiName(World world, RayTraceResult pos, EntityPlayer player); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 05eb15e7b..b32d11258 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -13,8 +13,8 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import org.apache.commons.lang3.text.WordUtils; @@ -47,7 +47,7 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player) { + public String getBlockName(World world, RayTraceResult pos, EntityPlayer player) { BlockPos bPos = pos.getBlockPos(); Block block = world.getBlockState(bPos).getBlock(); @@ -70,7 +70,7 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player) { + public String getWikiURL(World world, RayTraceResult pos, EntityPlayer player) { String name = getBlockName(world, pos, player); if(name == null) return null; @@ -83,7 +83,7 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player) { + public String getWikiName(World world, RayTraceResult pos, EntityPlayer player) { return name; } diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index e4aa2649a..22a1ccf07 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -21,8 +21,8 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -45,7 +45,7 @@ public final class BoundTileRenderer { GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - // todo 1.8 Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingVertexBuffer = false; EntityPlayer player = Minecraft.getMinecraft().thePlayer; ItemStack stack = player.getCurrentEquippedItem(); @@ -151,42 +151,42 @@ public final class BoundTileRenderer { double ay = aabb.maxY; double az = aabb.maxZ; - tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); - tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); + tessellator.getBuffer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(ix, iy, iz).endVertex(); + tessellator.getBuffer().pos(ix, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); + tessellator.getBuffer().pos(ix, ay, iz).endVertex(); + tessellator.getBuffer().pos(ax, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); + tessellator.getBuffer().pos(ax, ay, iz).endVertex(); + tessellator.getBuffer().pos(ax, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); + tessellator.getBuffer().pos(ax, iy, iz).endVertex(); + tessellator.getBuffer().pos(ix, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); + tessellator.getBuffer().pos(ix, iy, az).endVertex(); + tessellator.getBuffer().pos(ix, ay, az).endVertex(); - tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); + tessellator.getBuffer().pos(ix, iy, az).endVertex(); + tessellator.getBuffer().pos(ax, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); + tessellator.getBuffer().pos(ax, iy, az).endVertex(); + tessellator.getBuffer().pos(ax, ay, az).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); + tessellator.getBuffer().pos(ix, ay, az).endVertex(); + tessellator.getBuffer().pos(ax, ay, az).endVertex(); - tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, iy, az).endVertex(); + tessellator.getBuffer().pos(ix, iy, iz).endVertex(); + tessellator.getBuffer().pos(ix, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ix, ay, az).endVertex(); + tessellator.getBuffer().pos(ix, ay, iz).endVertex(); + tessellator.getBuffer().pos(ix, ay, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, iy, az).endVertex(); + tessellator.getBuffer().pos(ax, iy, iz).endVertex(); + tessellator.getBuffer().pos(ax, iy, az).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex(); - tessellator.getWorldRenderer().pos(ax, ay, az).endVertex(); + tessellator.getBuffer().pos(ax, ay, iz).endVertex(); + tessellator.getBuffer().pos(ax, ay, az).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 567b082e2..66e013288 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -23,7 +23,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; import org.lwjgl.input.Keyboard; @@ -129,7 +129,7 @@ public class CorporeaAutoCompleteHandler { stringbuilder.append(", "); } - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(stringbuilder.toString()), 1); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new TextComponentString(stringbuilder.toString()), 1); isAutoCompleted = true; originalString = inputField.getText(); } 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 09c356398..d203e2399 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -13,7 +13,7 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -33,7 +33,7 @@ import java.util.UUID; public final class DebugHandler { - private static final String PREFIX = EnumChatFormatting.GREEN + "[Botania] " + EnumChatFormatting.RESET; + private static final String PREFIX = TextFormatting.GREEN + "[Botania] " + TextFormatting.RESET; @SubscribeEvent public void onDrawDebugText(RenderGameOverlayEvent.Text event) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index e915394ed..241327231 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -27,10 +27,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; @@ -98,11 +98,11 @@ public final class HUDHandler { if(event.type == ElementType.ALL) { profiler.startSection("botania-hud"); - MovingObjectPosition pos = mc.objectMouseOver; + RayTraceResult pos = mc.objectMouseOver; if(pos != null) { - Block block = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null; - TileEntity tile = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; + Block block = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null; + TileEntity tile = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; if(equippedStack != null) { if(pos != null && equippedStack.getItem() == ModItems.twigWand) { @@ -135,7 +135,7 @@ public final class HUDHandler { if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { profiler.startSection("multiblockRightClick"); - String s = StatCollector.translateToLocal("botaniamisc.rightClickToAnchor"); + String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor"); mc.fontRendererObj.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); profiler.endSection(); } @@ -225,7 +225,7 @@ public final class HUDHandler { if(ticks > 0) { int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); int color = 0x00CC00 + (alpha << 24); - String disp = StatCollector.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem())); + String disp = I18n.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem())); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; @@ -332,7 +332,7 @@ public final class HUDHandler { profiler.endSection(); } - private void drawLexiconHUD(ItemStack stack, Block block, MovingObjectPosition pos, ScaledResolution res) { + private void drawLexiconHUD(ItemStack stack, Block block, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -353,8 +353,8 @@ public final class HUDHandler { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; - drawStr = StatCollector.translateToLocal(entry.getUnlocalizedName()); - secondLine = EnumChatFormatting.ITALIC + StatCollector.translateToLocal(entry.getTagline()); + drawStr = I18n.translateToLocal(entry.getUnlocalizedName()); + secondLine = TextFormatting.ITALIC + I18n.translateToLocal(entry.getTagline()); draw = true; } } @@ -367,7 +367,7 @@ public final class HUDHandler { if(url != null && !url.isEmpty()) { String name = provider.getBlockName(mc.theWorld, pos, mc.thePlayer); String wikiName = provider.getWikiName(mc.theWorld, pos, mc.thePlayer); - drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName; + drawStr = name + " @ " + TextFormatting.AQUA + wikiName; draw = true; } } @@ -388,7 +388,7 @@ public final class HUDHandler { if(!mc.thePlayer.isSneaking()) { GlStateManager.scale(0.5F, 0.5F, 1F); - mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); + mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); GlStateManager.scale(2F, 2F, 1F); } } @@ -400,9 +400,9 @@ public final class HUDHandler { private void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); - String txt0 = StatCollector.translateToLocal("botaniamisc.nearIndex0"); - String txt1 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex1"); - String txt2 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex2"); + String txt0 = I18n.translateToLocal("botaniamisc.nearIndex0"); + String txt1 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex1"); + String txt2 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex2"); int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20; int x = res.getScaledWidth() - l - 20; @@ -435,7 +435,7 @@ public final class HUDHandler { renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana); if(mana < 0) { - String text = StatCollector.translateToLocal("botaniamisc.statusUnknown"); + String text = I18n.translateToLocal("botaniamisc.statusUnknown"); x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2; y -= 1; mc.fontRendererObj.drawString(text, x, y, color); diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 46dcea7eb..018f6d094 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; @@ -61,7 +61,7 @@ public final class ItemsRemainingRenderHandler { GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableBlend(); - String text = EnumChatFormatting.GREEN + stack.getDisplayName(); + String text = TextFormatting.GREEN + stack.getDisplayName(); if(count >= 0) { int max = stack.getMaxStackSize(); int stacks = count / max; @@ -69,7 +69,7 @@ public final class ItemsRemainingRenderHandler { if(stacks == 0) text = "" + count; - else text = count + " (" + EnumChatFormatting.AQUA + stacks + EnumChatFormatting.RESET + "*" + EnumChatFormatting.GRAY + max + EnumChatFormatting.RESET + "+" + EnumChatFormatting.YELLOW + rem + EnumChatFormatting.RESET + ")"; + else text = count + " (" + TextFormatting.AQUA + stacks + TextFormatting.RESET + "*" + TextFormatting.GRAY + max + TextFormatting.RESET + "+" + TextFormatting.YELLOW + rem + TextFormatting.RESET + ")"; } else if(count == -1) text = "\u221E"; diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index ebca3690c..707f53732 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -29,9 +29,9 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -88,13 +88,13 @@ public class LightningHandler { ParticleRenderDispatcher.lightningCount = 0; render.bindTexture(outsideResource); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false); tessellator.draw(); render.bindTexture(insideResource); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(LightningBolt bolt : LightningBolt.boltlist) renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true); tessellator.draw(); @@ -150,27 +150,27 @@ public class LightningHandler { int b = (color & 0xFF); int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); if(rendersegment.next == null) { Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); } if(rendersegment.prev == null) { Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); } } } @@ -415,12 +415,12 @@ public class LightningHandler { } private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { - MovingObjectPosition mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D()); + RayTraceResult mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D()); if(mop == null) return prevresistance; - if(mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if(mop.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { Block block = world.getBlockState(mop.getBlockPos()).getBlock(); if(world.isAirBlock(mop.getBlockPos())) 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 07d39a81d..a30ba5339 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -18,8 +18,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.event.ModelBakeEvent; 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 412fdaca2..aa59fedd5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -24,7 +24,7 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; 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 6a8e28e17..b2793e6b3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -13,7 +13,7 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; 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 6626977c9..d9e910cdf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -15,7 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -108,7 +108,7 @@ public final class MultiblockRenderHandler { } } - private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) { + private void renderPlayerLook(EntityPlayer player, RayTraceResult src) { if(currentMultiblock != null && dimension == player.worldObj.provider.getDimensionId()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); @@ -132,7 +132,7 @@ public final class MultiblockRenderHandler { if(!didAny) { setMultiblock(null); - player.addChatComponentMessage(new ChatComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); } } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 49a7188e9..7a29e100d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -19,7 +19,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -43,7 +43,7 @@ public final class RedStringRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 0F, 0F, sizeAlpha); - // todo 1.8 Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingVertexBuffer = false; TileRedString tile; while((tile = redStringTiles.poll()) != null) renderTile(tile); @@ -91,7 +91,7 @@ public final class RedStringRenderer { Tessellator tessellator = Tessellator.getInstance(); GL11.glLineWidth(1F); - tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); + tessellator.getBuffer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION); double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().hashCode()).nextInt(10000); double add = vecMag.mag(); @@ -118,7 +118,7 @@ public final class RedStringRenderer { double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul; double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul; - tess.getWorldRenderer().pos(x, y, z).endVertex(); + tess.getBuffer().pos(x, y, z).endVertex(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 6d0d9256a..c12eeecbe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -9,11 +9,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -160,30 +160,30 @@ public class RenderLexicon { if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); if(title.equals(origTitle) && bevo) - title = StatCollector.translateToLocal("item.botania:lexicon.bevo"); + title = I18n.translateToLocal("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) - title = StatCollector.translateToLocal("item.botania:lexicon.saice"); + title = I18n.translateToLocal("item.botania:lexicon.saice"); font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); GlStateManager.translate(0F, 10F, 0F); GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); GlStateManager.translate(0F, 15F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 50F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); if(bevo || saice) { GlStateManager.translate(0F, 10F, 0F); - font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); + font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index bf75e478a..5f81a4ef8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -18,9 +18,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; import org.lwjgl.opengl.GL11; @@ -38,7 +38,7 @@ public final class SubTileRadiusRenderHandler { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); - MovingObjectPosition pos = mc.objectMouseOver; + RayTraceResult pos = mc.objectMouseOver; if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null) return; @@ -69,7 +69,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.disableLighting(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - // todo 1.8 Tessellator.renderingWorldRenderer = false; + // todo 1.8 Tessellator.renderingVertexBuffer = false; if(descriptor.isCircle()) renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); @@ -104,22 +104,22 @@ public final class SubTileRadiusRenderHandler { double z = aabb.maxZ - aabb.minZ - f; Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - tessellator.getWorldRenderer().pos(x, f, f).endVertex(); - tessellator.getWorldRenderer().pos(f, f, f).endVertex(); - tessellator.getWorldRenderer().pos(f, f, z).endVertex(); - tessellator.getWorldRenderer().pos(x, f, z).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(x, f, f).endVertex(); + tessellator.getBuffer().pos(f, f, f).endVertex(); + tessellator.getBuffer().pos(f, f, z).endVertex(); + tessellator.getBuffer().pos(x, f, z).endVertex(); tessellator.draw(); x += f; z += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - tessellator.getWorldRenderer().pos(x, f1, 0).endVertex(); - tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); - tessellator.getWorldRenderer().pos(0, f1, z).endVertex(); - tessellator.getWorldRenderer().pos(x, f1, z).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(x, f1, 0).endVertex(); + tessellator.getBuffer().pos(0, f1, 0).endVertex(); + tessellator.getBuffer().pos(0, f1, z).endVertex(); + tessellator.getBuffer().pos(x, f1, z).endVertex(); tessellator.draw(); GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); @@ -155,29 +155,29 @@ public final class SubTileRadiusRenderHandler { radius -= f; Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); - tessellator.getWorldRenderer().pos(0, f, 0).endVertex(); + tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(0, f, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.getWorldRenderer().pos(xp, f, zp).endVertex(); + tessellator.getBuffer().pos(xp, f, zp).endVertex(); } - tessellator.getWorldRenderer().pos(0, f, 0).endVertex(); + tessellator.getBuffer().pos(0, f, 0).endVertex(); tessellator.draw(); radius += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); - tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); + tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(0, f1, 0).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; - tessellator.getWorldRenderer().pos(xp, f1, zp).endVertex(); + tessellator.getBuffer().pos(xp, f1, zp).endVertex(); } - tessellator.getWorldRenderer().pos(0, f1, 0).endVertex(); + tessellator.getBuffer().pos(0, f1, 0).endVertex(); tessellator.draw(); GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); GlStateManager.popMatrix(); 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 f1867e2da..557b2fd07 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -24,8 +24,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -159,7 +159,7 @@ public final class TooltipAdditionDisplayHandler { GlStateManager.scale(0.5F, 0.5F, 1F); boolean mac = Minecraft.isRunningOnMac; - mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF); + 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); @@ -187,13 +187,13 @@ public final class TooltipAdditionDisplayHandler { Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); - String rank = StatCollector.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); + String rank = I18n.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { - rank = StatCollector.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); + rank = I18n.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } 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 ede1e06a5..7644460d3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -12,7 +12,7 @@ package vazkii.botania.client.core.handler; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; @@ -25,15 +25,15 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onTooltipEvent(ItemTooltipEvent event) { if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.dirt) && event.itemStack.getItemDamage() == 1) { - event.toolTip.add(StatCollector.translateToLocal("botaniamisc.coarseDirt0")); - event.toolTip.add(StatCollector.translateToLocal("botaniamisc.coarseDirt1")); + event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt0")); + event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt1")); } else if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.mob_spawner) && event.entityPlayer.capabilities.isCreativeMode) - event.toolTip.add(StatCollector.translateToLocal("botaniamisc.spawnerTip")); + event.toolTip.add(I18n.translateToLocal("botaniamisc.spawnerTip")); if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemRegenIvy.TAG_REGEN, false)) - event.toolTip.add(StatCollector.translateToLocal("botaniamisc.hasIvy")); + event.toolTip.add(I18n.translateToLocal("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemKeepIvy.TAG_KEEP, false)) - event.toolTip.add(StatCollector.translateToLocal("botaniamisc.hasKeepIvy")); + event.toolTip.add(I18n.translateToLocal("botaniamisc.hasKeepIvy")); } } diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 3b7c2b0a2..6892e9caa 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -11,7 +11,7 @@ package vazkii.botania.client.core.helper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -34,7 +34,7 @@ public final class IconHelper { * Adapted from ItemRenderer.renderItemIn2D, 1.7.10 */ public static void renderIconIn3D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float thickness) { - WorldRenderer wr = tess.getWorldRenderer(); + VertexBuffer wr = tess.getBuffer(); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex(); wr.pos(1.0D, 0.0D, 0.0D).tex(p_78439_3_, p_78439_4_).normal(0, 0, 1).endVertex(); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 695dc245b..1f12241ac 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -113,11 +113,11 @@ public final class RenderHelper { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.shadeModel(GL11.GL_SMOOTH); Tessellator var15 = Tessellator.getInstance(); - var15.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); - var15.getWorldRenderer().pos(par3, par2, z).color(var8, var9, var10, var7).endVertex(); - var15.getWorldRenderer().pos(par1, par2, z).color(var8, var9, var10, var7).endVertex(); - var15.getWorldRenderer().pos(par1, par4, z).color(var12, var13, var14, var11).endVertex(); - var15.getWorldRenderer().pos(par3, par4, z).color(var12, var13, var14, var11).endVertex(); + var15.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); + var15.getBuffer().pos(par3, par2, z).color(var8, var9, var10, var7).endVertex(); + var15.getBuffer().pos(par1, par2, z).color(var8, var9, var10, var7).endVertex(); + var15.getBuffer().pos(par1, par4, z).color(var12, var13, var14, var11).endVertex(); + var15.getBuffer().pos(par3, par4, z).color(var12, var13, var14, var11).endVertex(); var15.draw(); GlStateManager.shadeModel(GL11.GL_FLAT); GlStateManager.disableBlend(); @@ -131,11 +131,11 @@ public final class RenderHelper { public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex(); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getBuffer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex(); + tessellator.getBuffer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex(); + tessellator.getBuffer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex(); + tessellator.getBuffer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex(); tessellator.draw(); } @@ -169,17 +169,17 @@ public final class RenderHelper { GlStateManager.rotate(random.nextFloat() * 360F, 1F, 0F, 0F); GlStateManager.rotate(random.nextFloat() * 360F, 0F, 1F, 0F); GlStateManager.rotate(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); - tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; float r = ((color & 0xFF0000) >> 16) / 255F; float g = ((color & 0xFF00) >> 8) / 255F; float b = (color & 0xFF) / 255F; - tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getBuffer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex(); + tessellator.getBuffer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getBuffer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getBuffer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); + tessellator.getBuffer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); tessellator.draw(); } 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 1fe3aacb5..374a999dd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -29,9 +29,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.model.animation.AnimationTESR; @@ -338,7 +338,7 @@ public class ClientProxy extends CommonProxy { } @Override - public boolean openWikiPage(World world, Block block, MovingObjectPosition pos) { + public boolean openWikiPage(World world, Block block, RayTraceResult pos) { IWikiProvider wiki = WikiHooks.getWikiFor(block); String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().thePlayer); if(url != null && !url.isEmpty()) { diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 1527b7fc5..8c62d430c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -17,11 +17,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -73,13 +73,13 @@ public class FXSparkle extends EntityFX { GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -107,15 +107,15 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getBuffer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getBuffer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getBuffer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getBuffer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); } @Override - public void renderParticle(WorldRenderer worldRendererIn, Entity p_180434_2_, float f, float f1, float f2, float f3, float f4, float f5) { + public void renderParticle(VertexBuffer worldRendererIn, Entity p_180434_2_, float f, float f1, float f2, float f3, float f4, float f5) { this.f = f; this.f1 = f1; this.f2 = f2; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index d8e7a3c52..df685a3aa 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -85,7 +85,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -93,7 +93,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GlStateManager.disableDepth(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); @@ -121,14 +121,14 @@ public class FXWisp extends EntityFX { float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); // todo 1.8.8 setbrightness call? - tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); } @Override - public void renderParticle(WorldRenderer wr, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void renderParticle(VertexBuffer wr, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { this.f = f; this.f1 = f1; this.f2 = f2; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 3e8fc66b5..417623f03 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; @@ -35,7 +35,7 @@ public class GuiFlowerBag extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String s = StatCollector.translateToLocal("item.botania:flowerBag.name"); + String s = I18n.translateToLocal("item.botania:flowerBag.name"); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); } diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 94cd95403..94136aaa9 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui.bag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import vazkii.botania.common.item.ItemFlowerBag; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -162,8 +162,8 @@ public class InventoryFlowerBag implements IInventory { } @Override - public IChatComponent getDisplayName() { - return new ChatComponentText(getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(getName()); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 5d59fe39e..150450054 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui.box; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.ITextComponent; import vazkii.botania.common.item.ItemBaubleBox; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -161,8 +161,8 @@ public class InventoryBaubleBox implements IInventory { } @Override - public IChatComponent getDisplayName() { - return new ChatComponentText(getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(getName()); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index 852cfe84c..cfddea98c 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -15,7 +15,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ContainerCraftingHalo extends ContainerWorkbench { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 9cd55faff..72273aa97 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -31,9 +31,9 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.input.Keyboard; @@ -247,7 +247,7 @@ public class GuiLexicon extends GuiScreen { GlStateManager.disableBlend(); GlStateManager.popMatrix(); - RenderHelper.renderTooltip(par1, par2, Arrays.asList(EnumChatFormatting.GOLD + "#goldfishchris", EnumChatFormatting.AQUA + "IT SAYS MANUAL")); + RenderHelper.renderTooltip(par1, par2, Arrays.asList(TextFormatting.GOLD + "#goldfishchris", TextFormatting.AQUA + "IT SAYS MANUAL")); } } @@ -282,7 +282,7 @@ public class GuiLexicon extends GuiScreen { if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10) noteDisplay += "&r_"; - fontRendererObj.drawString(StatCollector.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666); + fontRendererObj.drawString(I18n.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666); boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); @@ -337,9 +337,9 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.drawString(title, left + 18, top + 13, color); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); + fontRendererObj.drawString(String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); - String s = EnumChatFormatting.BOLD + categoryHighlight; + String s = TextFormatting.BOLD + categoryHighlight; fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0); fontRendererObj.setUnicodeFlag(unicode); @@ -478,9 +478,9 @@ public class GuiLexicon extends GuiScreen { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_); if(category != null) - button.displayString = StatCollector.translateToLocal(category.getUnlocalizedName()); + button.displayString = I18n.translateToLocal(category.getUnlocalizedName()); else { - button.displayString = StatCollector.translateToLocal("botaniamisc.lexiconIndex"); + button.displayString = I18n.translateToLocal("botaniamisc.lexiconIndex"); break; } } @@ -508,9 +508,9 @@ public class GuiLexicon extends GuiScreen { } if(isMainPage()) - buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, StatCollector.translateToLocal("botaniamisc.history"), this)); + buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.history"), this)); else if(isChallenge()) - buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, StatCollector.translateToLocal("botaniamisc.info"), this)); + buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.info"), this)); } public static void startTutorial() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 5c51c4d5e..3f2827a34 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -14,8 +14,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; @@ -45,7 +45,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } public void setTitle() { - title = challenge == null ? "(null)" : StatCollector.translateToLocal(challenge.unlocalizedName); + title = challenge == null ? "(null)" : I18n.translateToLocal(challenge.unlocalizedName); } @Override @@ -70,8 +70,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(EnumChatFormatting.BOLD + StatCollector.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0); - fontRendererObj.drawString(StatCollector.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? EnumChatFormatting.DARK_GREEN : EnumChatFormatting.DARK_RED) + StatCollector.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0); + fontRendererObj.drawString(I18n.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); int width = guiWidth - 30; int x = left + 16; @@ -117,7 +117,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } void setCompleteButtonTitle() { - completeButton.displayString = StatCollector.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); + completeButton.displayString = I18n.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); } void back() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 3a2895dc0..a21b9bf9e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -14,8 +14,8 @@ import java.io.IOException; import java.util.List; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.EnumChallengeLevel; import vazkii.botania.client.challenge.ModChallenges; @@ -30,13 +30,13 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { public GuiLexiconChallengesList() { parent = new GuiLexicon(); - title = StatCollector.translateToLocal("botaniamisc.challenges"); + title = I18n.translateToLocal("botaniamisc.challenges"); } @Override public void onInitGui() { super.onInitGui(); - title = StatCollector.translateToLocal("botaniamisc.challenges"); + title = I18n.translateToLocal("botaniamisc.challenges"); buttonList.add(backButton = new GuiButtonBack(12, left + guiWidth / 2 - 8, top + guiHeight + 2)); @@ -67,7 +67,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { if(c.complete) complete++; - fontRendererObj.drawString(EnumChatFormatting.BOLD + StatCollector.translateToLocal(level.getName()) + EnumChatFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); } fontRendererObj.setUnicodeFlag(unicode); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 9a87f5dae..ae1b0ecc6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -19,10 +19,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; @@ -68,9 +68,9 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa return; } - title = StatCollector.translateToLocal(entry.getUnlocalizedName()); + title = I18n.translateToLocal(entry.getUnlocalizedName()); if(entry instanceof IAddonEntry) - subtitle = StatCollector.translateToLocal(((IAddonEntry) entry).getSubtitle()); + subtitle = I18n.translateToLocal(((IAddonEntry) entry).getSubtitle()); else subtitle = null; } @@ -116,7 +116,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa @Override String getTitle() { - return String.format("%s " + EnumChatFormatting.ITALIC + "(%s/%s)", title, page + 1, entry.pages.size()); + return String.format("%s " + TextFormatting.ITALIC + "(%s/%s)", title, page + 1, entry.pages.size()); } @Override @@ -214,7 +214,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa tutorial.poll(); positionTutorialArrow(); if(tutorial.isEmpty()) { - mc.thePlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); hasTutorialArrow = false; } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index ae9b6809e..5e72ae706 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; @@ -24,7 +24,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { public GuiLexiconHistory() { super(null); - title = StatCollector.translateToLocal("botaniamisc.historyLong"); + title = I18n.translateToLocal("botaniamisc.historyLong"); } @Override @@ -33,7 +33,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { ILexicon lex = (ILexicon) stackUsed.getItem(); for(int i = history.size() - 1; i >= 0; i--) { LexiconEntry entry = history.get(i); - if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && StatCollector.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) + if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) entriesToDisplay.add(entry); } } 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 5388e985d..a541c4357 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -22,8 +22,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; @@ -69,7 +69,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } public void setTitle() { - title = StatCollector.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); + title = I18n.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); } @Override @@ -137,7 +137,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { return true; search = search.toLowerCase(); - if(StatCollector.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search)) + if(I18n.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search)) return true; for(ItemStack stack : e.getDisplayedRecipes()) { @@ -157,7 +157,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i - page * 12); LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i); if(entry != null) { - button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? EnumChatFormatting.ITALIC : "") + StatCollector.translateToLocal(entry.getUnlocalizedName()); + button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.translateToLocal(entry.getUnlocalizedName()); button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; @@ -188,14 +188,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(entriesToDisplay.size() == 1) { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = StatCollector.translateToLocal("botaniamisc.enterToView"); + String s = I18n.translateToLocal("botaniamisc.enterToView"); mc.fontRendererObj.drawString(s, left + guiWidth / 2 - mc.fontRendererObj.getStringWidth(s) / 2, top + 30, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } } else { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = StatCollector.translateToLocal("botaniamisc.typeToSearch"); + String s = I18n.translateToLocal("botaniamisc.typeToSearch"); mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } @@ -216,7 +216,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF); GlStateManager.scale(0.5F, 0.5F, 1F); - mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF); GlStateManager.scale(2F, 2F, 1F); } } @@ -226,7 +226,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { int x = currentButton.xPosition; int y = currentButton.yPosition; - String s = StatCollector.translateToLocal(currentEntry.getTagline()); + String s = I18n.translateToLocal(currentEntry.getTagline()); boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); int width = mc.fontRendererObj.getStringWidth(s); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index b4bb1ebd2..1978d8c9f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); List tooltip = new ArrayList<>(); - tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.achievements")); + tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.achievements")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index cb487887c..ee28128cc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -45,7 +45,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(StatCollector.translateToLocal("botaniamisc.back")); + return Collections.singletonList(I18n.translateToLocal("botaniamisc.back")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 329edad85..729e2018f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; import java.util.List; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; public class GuiButtonBackWithShift extends GuiButtonBack { @@ -24,7 +24,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack { @Override public List getTooltip() { - return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back"), EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToIndex")); + return Arrays.asList(I18n.translateToLocal("botaniamisc.back"), TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToIndex")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 5ab60413b..2838e6043 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -26,11 +26,11 @@ public class GuiButtonBookmark extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(displayString.equals("+")) - tooltip.add(StatCollector.translateToLocal("botaniamisc.clickToAdd")); + tooltip.add(I18n.translateToLocal("botaniamisc.clickToAdd")); else { - tooltip.add(String.format(StatCollector.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); - tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToSee")); - tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.shiftToRemove")); + tooltip.add(String.format(I18n.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); + tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToSee")); + tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.shiftToRemove")); } int tooltipY = (tooltip.size() + 1) * 5; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index e70c20813..f0993c978 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -15,7 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.ARBMultitexture; import org.lwjgl.opengl.ARBShaderObjects; @@ -122,7 +122,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { GlStateManager.popMatrix(); if(inside) - gui.categoryHighlight = StatCollector.translateToLocal(getTooltipText()); + gui.categoryHighlight = I18n.translateToLocal(getTooltipText()); } String getTooltipText() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 98a6429a3..59b1b7adb 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -16,8 +16,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; @@ -50,7 +50,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { List tooltip = new ArrayList<>(); - tooltip.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal(challenge.unlocalizedName)); + tooltip.add(TextFormatting.AQUA + I18n.translateToLocal(challenge.unlocalizedName)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 3f687add8..6841c33c0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -34,7 +34,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo")); + tooltip.add(I18n.translateToLocal("botaniamisc.challengeInfo")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index b90c97758..f184b52f5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); List tooltip = new ArrayList(); - tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.challenges")); + tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.challenges")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) 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 200021637..6f13a0903 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 @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; @@ -45,8 +45,8 @@ public class GuiButtonDoot extends GuiButtonLexicon { List tooltip = new ArrayList<>(); - tooltip.add(EnumChatFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!"); - tooltip.add(EnumChatFormatting.GRAY + "doot doot"); + tooltip.add(TextFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!"); + tooltip.add(TextFormatting.GRAY + "doot doot"); if(k == 2) RenderHelper.renderTooltip(xPosition - 100, yPosition + 36, tooltip); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index adb6f8eef..63fca3691 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -35,8 +35,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong")); - tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.historyDesc")); + tooltip.add(I18n.translateToLocal("botaniamisc.historyLong")); + tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.historyDesc")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 5464ef615..c54106407 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -85,10 +85,10 @@ public class GuiButtonInvisible extends GuiButtonLexicon { if(key == 'o' && format.length() > 3) key = format.charAt(1); - for(EnumChatFormatting ecf : EnumChatFormatting.class.getEnumConstants()) + for(TextFormatting ecf : TextFormatting.class.getEnumConstants()) if(ecf.toString().indexOf(ecf.toString().length() - 1) == key) { if(ecf.ordinal() > 15) - ecf = EnumChatFormatting.BLACK; + ecf = TextFormatting.BLACK; color = LibMisc.CONTROL_CODE_COLORS[ecf.ordinal()]; break; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 69a92ea02..2cc57e516 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -41,9 +41,9 @@ public class GuiButtonNotes extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) - tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.hideNotes")); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.hideNotes")); else { - tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.showNotes")); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.showNotes")); if(parent.note != null && !parent.note.isEmpty()) Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 59ca83863..8b6f4684d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -38,7 +38,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) - tooltip.add((i == 0 ? EnumChatFormatting.RED : EnumChatFormatting.GRAY) + StatCollector.translateToLocal("botaniamisc.lexiconOptions" + i)); + tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.translateToLocal("botaniamisc.lexiconOptions" + i)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 10dce0157..7f0e67f73 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -15,7 +15,7 @@ import java.util.Collections; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -40,7 +40,7 @@ public class GuiButtonPage extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) - RenderHelper.renderTooltip(par2, par3, Collections.singletonList(StatCollector.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); + RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 41f327f60..03a8531a3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -16,8 +16,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -44,6 +44,6 @@ public class GuiButtonShare extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.clickToShare")); + return Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.clickToShare")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index a19718446..374358e6a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -15,8 +15,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; @@ -46,7 +46,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { - tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); + tooltip.add(TextFormatting.GRAY + String.format(I18n.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); if(i == 3) tooltip.add(""); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 50ad9deed..b2e9f1cf1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -16,8 +16,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); - List tooltip = Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); + List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 163a9cdd3..be8d303b0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -17,7 +17,7 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import javax.annotation.Nonnull; import java.util.Collection; @@ -31,7 +31,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { public BreweryRecipeCategory(IGuiHelper guiHelper) { ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); - localizedName = StatCollector.translateToLocal("botania.nei.brewery"); + localizedName = I18n.translateToLocal("botania.nei.brewery"); } @Nonnull 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 48c44ef40..526c2118a 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 @@ -16,13 +16,13 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -36,7 +36,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { private final IDrawable overlay; public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { - localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade"); + localizedName = I18n.translateToLocal("botania.nei.elvenTrade"); background = guiHelper.createBlankDrawable(145, 95); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); } @@ -73,7 +73,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); - WorldRenderer wr = tess.getWorldRenderer(); + VertexBuffer wr = tess.getBuffer(); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); int startX = 22; int startY = 25; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 17eaaa989..d12bac0e0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -31,7 +31,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { public ManaPoolRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = StatCollector.translateToLocal("botania.nei.manaPool"); + localizedName = I18n.translateToLocal("botania.nei.manaPool"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index ebd012818..d818385f5 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -33,7 +33,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); + localizedName = I18n.translateToLocal("botania.nei.petalApothecary"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 84140ac3b..0cb9438ad 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -32,7 +32,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { public PureDaisyRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); + localizedName = I18n.translateToLocal("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index f65f9f03f..bb81031f7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -32,7 +32,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { public RunicAltarRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = StatCollector.translateToLocal("botania.nei.runicAltar"); + localizedName = I18n.translateToLocal("botania.nei.runicAltar"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java index 02db53a2f..7fc6be072 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java index 538be3b66..ef5ed3bf6 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java @@ -7,7 +7,7 @@ import java.util.List; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -78,7 +78,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.brewery"); + return I18n.translateToLocal("botania.nei.brewery"); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index c6cb4b0c5..820dfe6be 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -13,7 +13,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -68,7 +68,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.elvenTrade"); + return I18n.translateToLocal("botania.nei.elvenTrade"); } @Override @@ -159,12 +159,12 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getBuffer().startDrawingQuads(); + tessellator.getBuffer().setBrightness(brightness); + tessellator.getBuffer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getBuffer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getBuffer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getBuffer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java index d70ecdb18..c4d4582d9 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java @@ -8,7 +8,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.BlockFloatingSpecialFlower; import vazkii.botania.common.block.BlockSpecialFlower; @@ -44,7 +44,7 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.floatingFlowers"); + return I18n.translateToLocal("botania.nei.floatingFlowers"); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index 757048ba6..552564ea8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -21,8 +21,8 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -88,7 +88,7 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.lexica"); + return I18n.translateToLocal("botania.nei.lexica"); } @Override @@ -113,26 +113,26 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { FontRenderer font = Minecraft.getMinecraft().fontRenderer; CachedLexicaBotaniaRecipe recipeObj = ((CachedLexicaBotaniaRecipe) arecipes.get(recipe)); - String s = EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()); + String s = TextFormatting.UNDERLINE + I18n.translateToLocal(recipeObj.entry.getUnlocalizedName()); font.drawString(s, 82 - font.getStringWidth(s) / 2, 30, 4210752); KnowledgeType type = recipeObj.entry.getKnowledgeType(); - s = type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("\\&.", ""); + s = type.color + I18n.translateToLocal(type.getUnlocalizedName()).replaceAll("\\&.", ""); font.drawString(s, 82 - font.getStringWidth(s) / 2, 42, 4210752); - s = "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\""; + s = "\"" + I18n.translateToLocal(recipeObj.entry.getTagline()) + "\""; PageText.renderText(5, 42, 160, 200, s); String key = LexiconRecipeMappings.stackToString(recipeObj.item.item); String quickInfo = "botania.nei.quickInfo:" + key; - String quickInfoLocal = StatCollector.translateToLocal(quickInfo); + String quickInfoLocal = I18n.translateToLocal(quickInfo); if(GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips) s = "name: " + key; else if(quickInfo.equals(quickInfoLocal)) - s = StatCollector.translateToLocal("botania.nei.lexicaNoInfo"); + s = I18n.translateToLocal("botania.nei.lexicaNoInfo"); else { - s = StatCollector.translateToLocal("botania.nei.lexicaSeparator"); + s = I18n.translateToLocal("botania.nei.lexicaSeparator"); font.drawString(s, 82 - font.getStringWidth(s) / 2, 80, 4210752); s = quickInfoLocal; } diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 76db6ea0a..731f3489b 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -9,7 +9,7 @@ import java.util.List; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -91,7 +91,7 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.manaPool"); + return I18n.translateToLocal("botania.nei.manaPool"); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java index 0b0226079..f8ea4b984 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java @@ -8,7 +8,7 @@ import java.util.List; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -69,7 +69,7 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.petalApothecary"); + return I18n.translateToLocal("botania.nei.petalApothecary"); } public String getRecipeID() { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java index ccfa58439..4eeb2d4ef 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java @@ -9,7 +9,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -74,7 +74,7 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.pureDaisy"); + return I18n.translateToLocal("botania.nei.pureDaisy"); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java index ca9aeabd8..8f5a68d71 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java @@ -4,7 +4,7 @@ package vazkii.botania.client.integration.nei.recipe; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; @@ -31,7 +31,7 @@ public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary { @Override public String getRecipeName() { - return StatCollector.translateToLocal("botania.nei.runicAltar"); + return I18n.translateToLocal("botania.nei.runicAltar"); } @Override diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index ed67e9528..48a3009ac 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -21,7 +21,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index adc64729c..5de57b240 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -7,8 +7,8 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 902ab687e..36bfe0277 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -13,7 +13,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; public class ModelPixie extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index d4e0813bd..5df6b1195 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.crash.CrashReport; @@ -134,14 +134,14 @@ public class ModelPylon implements IPylonModel { private void renderModel(IFlexibleBakedModel model, int color) { Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + VertexBuffer worldrenderer = tessellator.getBuffer(); worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); this.renderQuads(worldrenderer, model.getGeneralQuads(), color); tessellator.draw(); } - private void renderQuads(WorldRenderer renderer, List quads, int color) { + private void renderQuads(VertexBuffer renderer, List quads, int color) { for(BakedQuad bakedquad : quads) LightUtil.renderQuadColor(renderer, bakedquad, color); } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 60dcfbb06..deb94a255 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -14,13 +14,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; @@ -41,7 +41,7 @@ public class PlatformModel implements ISmartBlockModel { if(state.getBlock() != ModBlocks.platform) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); + BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); IBlockAccess heldWorld = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_WORLD); BlockPos heldPos = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_POS); @@ -51,7 +51,7 @@ public class PlatformModel implements ISmartBlockModel { } Minecraft mc = Minecraft.getMinecraft(); - if(heldState == null && layer == EnumWorldBlockLayer.SOLID) { + if(heldState == null && layer == BlockRenderLayer.SOLID) { // No camo ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 32dcd2311..b44ae3974 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -16,7 +16,7 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 46a0e4402..93f49fb4a 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -22,9 +22,9 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.resources.model.ModelManager; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; 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 2466d3c50..08caabb98 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -91,11 +91,11 @@ public class RenderBabylonWeapon extends Render { GlStateManager.rotate(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); - tes.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tes.getWorldRenderer().pos(-1, 0, -1).tex(0, 0).endVertex(); - tes.getWorldRenderer().pos(-1, 0, 1).tex(0, 1).endVertex(); - tes.getWorldRenderer().pos(1, 0, 1).tex(1, 1).endVertex(); - tes.getWorldRenderer().pos(1, 0, -1).tex(1, 0).endVertex(); + tes.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tes.getBuffer().pos(-1, 0, -1).tex(0, 0).endVertex(); + tes.getBuffer().pos(-1, 0, 1).tex(0, 1).endVertex(); + tes.getBuffer().pos(1, 0, 1).tex(1, 1).endVertex(); + tes.getBuffer().pos(1, 0, -1).tex(1, 0).endVertex(); tes.draw(); ShaderHelper.releaseShader(); 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 5a233746a..002d79922 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -110,12 +110,12 @@ public class RenderSparkBase extends RenderEntity { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - //p_77026_1_.getWorldRenderer().setBrightness(240); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + //p_77026_1_.getBuffer().setBrightness(240); + p_77026_1_.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.draw(); } 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 285db6cfe..3629f158f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -64,13 +64,13 @@ public class RenderThornChakram extends Render { float f6 = 0.25F; GlStateManager.rotate(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + p_77026_1_.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); if(light != -1) - //p_77026_1_.getWorldRenderer().setBrightness(light); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + //p_77026_1_.getBuffer().setBrightness(light); + p_77026_1_.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); + p_77026_1_.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.draw(); } 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 38784d69d..5c7bcae97 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -77,12 +77,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, ResourceLocation loc, int par4, int par5, int brightness) { TextureAtlasSprite par3Icon = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(loc.toString()); Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); //if(brightness != -1) - //tessellator.getWorldRenderer().putBrightness4(brightness, brightness, brightness, brightness); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); + //tessellator.getBuffer().putBrightness4(brightness, brightness, brightness, brightness); + tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } 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 fc9eada26..89316b504 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -15,7 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; 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 3f62d394b..faddab3d9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -19,17 +19,17 @@ import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; @@ -161,7 +161,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - //tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); - tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getBuffer().setBrightness(brightness); + tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); + tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index e67c939bd..ea5edf03e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -10,7 +10,7 @@ */ package vazkii.botania.client.render.tile; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraftforge.client.model.animation.FastTESR; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; @@ -18,7 +18,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; public class RenderTileRedString extends FastTESR { @Override - public void renderTileEntityFast(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, WorldRenderer worldRenderer) { + public void renderTileEntityFast(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer worldRenderer) { RedStringRenderer.redStringTiles.add(trs); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index d1e1b1297..b43e9894a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -99,7 +99,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 8d8c1b8b9..8650f2058 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -1,7 +1,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; @@ -19,8 +19,8 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { } @Override - public BlockState createBlockState() { - return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 9f97b95eb..d5e8865f2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -1,7 +1,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; @@ -20,8 +20,8 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { } @Override - public BlockState createBlockState() { - return new BlockState(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 18313016f..d578cc5c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -17,7 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -26,7 +26,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -64,8 +64,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public BlockState createBlockState() { - return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, getTypeProperty(), BotaniaStateProps.COLOR); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 3a4e28d9a..a1a2d1787 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,10 +13,10 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.block.Block; @@ -65,8 +65,8 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index be22be5ce..a883758bb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -32,7 +32,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index f13d46a30..6d2582d01 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -23,10 +23,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; @@ -60,7 +60,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public BlockState createBlockState() { + public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS }); } @@ -92,7 +92,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public boolean canRenderInLayer(EnumWorldBlockLayer layer) { + public boolean canRenderInLayer(BlockRenderLayer layer) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 0687e5322..447509ca8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; @@ -52,8 +52,8 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.PYLON_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 1cae52eab..b231986ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -17,7 +17,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index cd1624108..630e0e9a0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -18,9 +18,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -70,7 +70,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.vine); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 5f0321cf6..70d304354 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -14,14 +14,14 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -50,8 +50,8 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 581e4322d..27615dff9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -18,7 +18,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -32,12 +32,12 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; @@ -129,7 +129,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public BlockState createBlockState() { + public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); } @@ -192,8 +192,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override @@ -217,7 +217,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index f43c286c4..e0b43127d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -14,13 +14,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -44,8 +44,8 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.STORAGE_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 38ce90f31..18f1b8b27 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -19,7 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 28a4dbea5..02441306c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -15,7 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 0db248f96..e55750ede 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -20,7 +20,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; 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 078812788..7e5de67f5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -13,16 +13,16 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; @@ -53,7 +53,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public BlockState createBlockState() { + public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); } 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 28387b7fd..21b851b4c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -12,11 +12,11 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -36,8 +36,8 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override 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 625a3f134..2d475f2cc 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -17,9 +17,9 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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 b732186c5..eae0b703e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -13,11 +13,11 @@ package vazkii.botania.common.block.corporea; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -39,8 +39,8 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override 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 1b125c673..bc127f9cf 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -12,14 +12,14 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,8 +42,8 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override 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 d2a51f914..3302d5e66 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -45,8 +45,8 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.FUTURESTONE_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT); } @Override @@ -85,7 +85,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 a7e4c39a2..d3b46d862 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -16,7 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 9df2c365b..7ee50d87f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -15,7 +15,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; 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 06db61e34..b71e76da7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -45,8 +45,8 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); } @Override @@ -85,7 +85,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 27ea41336..569ff3726 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -21,8 +21,8 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 1cb7fe057..c835bd735 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 7b4dd1206..c1061b71d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -45,8 +45,8 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.ENDBRICK_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.ENDBRICK_VARIANT); } @Override @@ -85,7 +85,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 d22628e9d..2f924f07d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; @@ -26,10 +26,10 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; @@ -87,7 +87,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public BlockState createBlockState() { + public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE }); } 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 f484729ee..e726e8a10 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -22,7 +22,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -49,8 +49,8 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.COLOR); } @Override 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 572edfe0c..d094ad4fa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -20,8 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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 63777e0d2..1830655c6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -14,9 +14,9 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -56,8 +56,8 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.TRANSLUCENT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; } @Override 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 a80889081..65ed116a4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -16,7 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +24,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -60,8 +60,8 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.COLOR); } @Override 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 c73908cb4..6d806751f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -14,15 +14,15 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; @@ -44,8 +44,8 @@ public class BlockPavement extends BlockMod { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.PAVEMENT_COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR); } @Override @@ -103,7 +103,7 @@ public class BlockPavement extends BlockMod { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 5b26e0532..f34d18c53 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -44,8 +44,8 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.COLOR); } @Override 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 9862a9471..998adc9ea 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -47,8 +47,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.PRISMARINE_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); } @Override @@ -87,7 +87,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 1d33853d7..8d9e2969d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -13,12 +13,12 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -42,8 +42,8 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.AXIS_FACING); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.AXIS_FACING); } @Override 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 8cfeb886a..6476ca833 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 46825a6b6..3ef87d3d3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 cd2e3d8f4..38da29c13 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 59effbf09..22faa10ac 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; 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 cf7ac86c7..f9ac7c879 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -11,13 +11,13 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -40,13 +40,13 @@ public class BlockStarfield extends BlockMod implements ILexiconable { } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT_MIPPED; } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override 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 5e00e9611..7144d1625 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 6f87a91ea..05a0dbd7d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -15,13 +15,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.IBlockAccess; @@ -51,8 +51,8 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } @Override 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 aa6ffdd1d..758a58edb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -16,14 +16,14 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -50,8 +50,8 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.COLOR); } @Override 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 14c21ed63..a7895a6a2 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 @@ -19,8 +19,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -62,7 +62,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 3379a6983..e2a2c021b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.biomestone; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -24,8 +24,8 @@ public class BlockBiomeStoneA extends BlockBiomeStone { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.BIOMESTONE_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.BIOMESTONE_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 3fa1779ee..f015011ae 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.biomestone; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; @@ -24,8 +24,8 @@ public class BlockBiomeStoneB extends BlockBiomeStone { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.BIOMEBRICK_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.BIOMEBRICK_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 256471165..464b99dd0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; public class BlockAlfglassPane extends BlockModPane { @@ -20,7 +20,7 @@ public class BlockAlfglassPane extends BlockModPane { } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.TRANSLUCENT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 13cde90b3..3fc04a984 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; public class BlockBifrostPane extends BlockModPane { @@ -20,7 +20,7 @@ public class BlockBifrostPane extends BlockModPane { } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.TRANSLUCENT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 20c8e69ff..4584cb39d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.decor.panes; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; public class BlockManaglassPane extends BlockModPane { @@ -20,8 +20,8 @@ public class BlockManaglassPane extends BlockModPane { } @Override - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.TRANSLUCENT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; } } 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 6378311a0..0bf5cd1c0 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 @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import vazkii.botania.common.block.ModBlocks; 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 989d9b794..e040076ed 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 @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -50,8 +50,8 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.QUARTZ_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.QUARTZ_VARIANT); } @Override 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 bd2e90848..eb682412c 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 @@ -19,8 +19,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -79,7 +79,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index 4f04f2fec..5e7db0c1c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.quartz; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java index b69c8011d..4564045a2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index 4579fc93e..b03ccd33f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -14,7 +14,7 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java index 61ca05ff2..f22f0bd5c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index cc92807ef..9a52fd17f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index bfe85c8b9..a3b1fcb98 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index dca05ad12..897160d38 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -6,14 +6,14 @@ import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -41,8 +41,8 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, HALF, getVariantProperty()); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, HALF, getVariantProperty()); } @Override @@ -68,7 +68,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 71f07e238..2cdc8393d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -14,7 +14,7 @@ import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 37fea06e9..321640ed7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index 84fb8b514..c3f0e13e5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index b652ba4bc..f5c266e43 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index b6a4bae8f..2fe270a0e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -3,7 +3,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java index bdd7eeee3..9d7ef3f81 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index a79a0cb1c..8fbdc7f63 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java index 83856591d..995e15624 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java index 7e817c279..d9edef07a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 6a6572c62..7746176ce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -5,7 +5,7 @@ import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index f72d49be0..0294eddda 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java index 40c9823d5..3081d3c9c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java index b21932c25..2c9a93e62 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java index 32e30c0cf..62792a7bb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java @@ -2,7 +2,7 @@ package vazkii.botania.common.block.decor.stairs.bricks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java index 504227b83..4d4fee99d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java @@ -2,7 +2,7 @@ package vazkii.botania.common.block.decor.stairs.prismarine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 1d444ed83..d12e7d6f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.decor.walls; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -38,8 +38,8 @@ public class Block18StoneWall extends BlockModWall { } @Override - public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index bcf90ac43..a339d5969 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.decor.walls; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; @@ -38,8 +38,8 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index f81c6e2b6..b701481b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -14,13 +14,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -58,8 +58,8 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java index 23e2b0629..c796bf9a4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; 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 e90e62177..cba64a4fd 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -6,7 +6,7 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; 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 e8415b455..04f5dc9ad 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -18,7 +18,7 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 06b5abee8..baf4b2fb9 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -15,7 +15,7 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 102543050..67ab116ec 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -15,7 +15,7 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; 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 c9505a58d..63c7efe78 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -15,7 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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 2d22564c5..3b807b6d0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -11,13 +11,13 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -43,8 +43,8 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.CARDINALS); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } @Override 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 acc3a0b7e..a075c9da1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -22,7 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -53,8 +53,8 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 3c1749dd6..7e6942961 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; 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 92e4f5ac4..357a5102d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -15,7 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 4c4db6d01..f4508305d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -25,8 +25,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -56,8 +56,8 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.ENCHANTER_DIRECTION); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.ENCHANTER_DIRECTION); } @Override @@ -118,7 +118,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(par5EntityPlayer.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { enchanter.itemToEnchant = null; enchanter.sync(); - } else par5EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.invFull")); + } else par5EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.invFull")); } return true; 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 39b9388f5..d7a07bec6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; @@ -26,8 +26,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -58,8 +58,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.DRUM_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT); } @Override 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 c15939574..5e202001f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -14,14 +14,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -46,8 +46,8 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED); } @Override 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 f3c9b864f..96df44a6b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -17,7 +17,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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 649ce3d37..27c072651 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -29,8 +29,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -72,8 +72,8 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POOL_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT); } @Override 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 e85e3c9ce..5150ad079 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -14,17 +14,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -60,8 +60,8 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); } @Override @@ -78,8 +78,8 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { @Override @SideOnly(Side.CLIENT) - public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.TRANSLUCENT; + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; } @Override 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 977598d5e..895058364 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -12,13 +12,13 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -46,7 +46,7 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { + public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); } 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 a0c644139..303f32f9d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -15,7 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 405728b8a..e83065eb6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -19,7 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 4bc1ece83..13b3dad9a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -20,7 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 3b4b746f7..a4661e314 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -17,7 +17,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -30,8 +30,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -68,8 +68,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.SPREADER_VARIANT); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT); } @Override 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 9c16330eb..d75b4d35a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -16,7 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; 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 29319db02..e3ff05982 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -17,7 +17,7 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 38ad06b70..304a85757 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -12,12 +12,12 @@ package vazkii.botania.common.block.string; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -38,8 +38,8 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.FACING); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.FACING); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 115f2531b..77e3caa85 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.string; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; 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 db31fe196..2909d7255 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -11,9 +11,9 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -29,8 +29,8 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 1d577d783..2eb1e79c4 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -14,7 +14,7 @@ import java.util.Random; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 474edd332..7cc64aee0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -12,9 +12,9 @@ package vazkii.botania.common.block.string; import java.util.Random; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,8 +36,8 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); } @Override 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 b3c7dbfdf..0aceca2cd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; 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 a154da514..d35bea205 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 @@ -17,7 +17,7 @@ import net.minecraft.block.BlockSapling; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index b47cde68d..adce5d8be 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -17,7 +17,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; 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 4e8a74071..ed2f4fdfd 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 @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; 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 6d66d6ed4..0b0cd7fa4 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 @@ -18,7 +18,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 1d8b4e54f..bc31f17a6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -16,7 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; 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 e81f59b90..f770c2a4f 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 @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; 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 d0f281e9c..fac46cef6 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 @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 54bfb0a1f..7fe18834f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -21,7 +21,7 @@ import net.minecraft.entity.ai.EntityAIAttackOnCollide; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 9cda57a15..aee676a69 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -27,10 +27,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -251,7 +251,7 @@ public class SubTileHopperhock extends SubTileFunctional { super.renderHUD(mc, res); int color = getColor(); - String filter = StatCollector.translateToLocal("botaniamisc.filter" + filterType); + String filter = I18n.translateToLocal("botaniamisc.filter" + filterType); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2; 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 45de5761f..d1b597383 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 @@ -17,7 +17,7 @@ import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; 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 5f8593def..af439a2f7 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 @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; 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 67633c5a0..aae35865b 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 @@ -15,10 +15,10 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.state.pattern.BlockHelper; +import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import vazkii.botania.api.lexicon.LexiconEntry; @@ -99,7 +99,7 @@ public class SubTileMarimorphosis 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 != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockHelper.forBlock(Blocks.stone))) + if(block != null && block.isReplaceableOreGen(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 5395533d4..8ab4ab8ea 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 @@ -16,7 +16,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; 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 75f26b3e3..d805e3ef7 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 @@ -16,11 +16,11 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.block.state.pattern.BlockHelper; +import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.WeightedRandom; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; @@ -106,7 +106,7 @@ public class SubTileOrechid 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 != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockHelper.forBlock(source))) + if(block != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) possibleCoords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 941782a1c..8766b5118 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; 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 6695b9031..e05b74440 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 @@ -27,8 +27,8 @@ import net.minecraft.item.ItemRedstone; import net.minecraft.item.ItemReed; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index e7b936806..5810e4d93 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index fced33208..83c058289 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -21,7 +21,7 @@ import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index caf1e6214..c8286a70e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 1c7e21e12..e7c0e663a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index 48cc7fce7..f6b64197f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.signature.PassiveFlower; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 3250a30b0..98ee5699e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -17,7 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; 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 e002877df..bb241c779 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 @@ -13,8 +13,8 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; 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 030fd2855..ef7aea9af 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 @@ -17,7 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.WorldServer; import vazkii.botania.api.lexicon.LexiconEntry; 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 845363ab8..2695cf3cc 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 @@ -22,7 +22,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; 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 7269cfe06..c663c39de 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 @@ -13,7 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockCake; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; 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 2ca5e6a40..cd00067f5 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 @@ -20,7 +20,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; 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 bc6202ebf..09907ff9f 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 @@ -13,10 +13,10 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.entity.living.LivingSpawnEvent; 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 0fb2ae5aa..c4ebfedc5 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 @@ -18,7 +18,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; 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 18da4c96b..3c90cdfaa 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 @@ -22,7 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import org.lwjgl.opengl.GL11; 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 4be78e260..f85b501d4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -20,8 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; 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 1e0220538..91525f7ab 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -25,9 +25,9 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; @@ -356,9 +356,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0 && hasWater) { - String s = StatCollector.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.translateToLocal("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = StatCollector.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.translateToLocal("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index be3aa1f93..2e2e55017 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -19,7 +19,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; 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 39cd30cca..563118992 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -15,7 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; public class TileCamo extends TileMod { @@ -41,7 +41,7 @@ public class TileCamo extends TileMod { } @Override - public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) { + public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { super.onDataPacket(manager, packet); worldObj.markBlockRangeForRenderUpdate(pos, pos); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 955cc0958..60afb0be3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class TileCell extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index ec472e1f8..1631b535d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -20,7 +20,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -203,7 +203,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) { + public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { int lastPattern = pattern; super.onDataPacket(manager, packet); if(pattern != lastPattern) 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 8b814a1ff..df590199d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 fdaacca0b..9653f2997 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -17,8 +17,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -40,7 +40,7 @@ public class TileEnderEye extends TileMod { if(helm != null && helm.getItem() == Item.getItemFromBlock(Blocks.pumpkin)) continue; - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); + RayTraceResult pos = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); if(pos != null && pos.getBlockPos() != null && pos.getBlockPos().equals(getPos())) { looking = true; break; 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 c9dedbd36..080a4c093 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; public class TileFakeAir extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 8e13f1a58..4ff7e5dcf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; public class TileForestEye extends TileMod { 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 0e6ee69c1..5e561a69d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -18,7 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.util.StringUtils; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -165,7 +165,7 @@ public class TileHourglass extends TileSimpleInventory { if(!move) status = status.isEmpty() ? "stopped" : "lockedStopped"; if(!status.isEmpty()) - mc.fontRendererObj.drawStringWithShadow(StatCollector.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); + mc.fontRendererObj.drawStringWithShadow(I18n.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); } } 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 01cd9ffee..f31f4dd10 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 5d75f4826..0488ffaf0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -22,8 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; 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 d0f3e6dc0..5f2ff5538 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -14,9 +14,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLLog; @@ -54,11 +54,11 @@ public class TileMod extends TileEntity implements ITickable { public Packet getDescriptionPacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeCustomNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(pos, -999, nbttagcompound); + return new SPacketUpdateTileEntity(pos, -999, nbttagcompound); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { super.onDataPacket(net, packet); readCustomNBT(packet.getNbtCompound()); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 80e3ee2ec..a40db355a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -15,7 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index b22e90348..9e6d4afcb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.mana.IManaCollisionGhost; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 07fa91a26..e29d6438e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -15,7 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.PylonVariant; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index f8c4d1427..ad707de81 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -20,8 +20,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -391,9 +391,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0) { - String s = StatCollector.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.translateToLocal("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = StatCollector.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.translateToLocal("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } 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 173ec7e81..083a212b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.WeightedRandom; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; 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 7441440c0..8411ff47e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -23,7 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 b6d381e53..474d876d9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -19,8 +19,8 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index c09def4f8..3af518ea3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -17,7 +17,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index db37ffa14..db12fb038 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -24,10 +24,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.event.ServerChatEvent; import org.apache.commons.lang3.text.WordUtils; @@ -268,7 +268,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); - event.player.addChatMessage(new ChatComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); + event.player.addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); if(CorporeaHelper.lastRequestExtractions >= 50000) event.player.addStat(ModAchievements.superCorporeaRequest, 1); } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 071a2b821..4af8f4dea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -17,7 +17,7 @@ import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 56d5e4ba4..9e636f88b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.tile.corporea; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index b89ab3846..bf89b2dcb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; 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 11511d4e6..679eab29b 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 @@ -26,12 +26,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -351,7 +351,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(pos, -999, nbttagcompound)); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSoundAtEntity(player, "botania:ding", 0.11F, 1F); @@ -359,7 +359,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void renderHUD(Minecraft mc, ScaledResolution res) { ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); - String name = StatCollector.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index d11011894..64c744133 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.common.Optional; 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 bb9051089..ef6b52e02 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 @@ -24,9 +24,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -377,11 +380,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, writeCustomNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new S35PacketUpdateTileEntity(pos, -999, nbttagcompound)); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } worldObj.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); } else { - MovingObjectPosition pos = raytraceFromEntity(worldObj, player, true, 5); + RayTraceResult pos = raytraceFromEntity(worldObj, player, true, 5); if(pos != null && pos.hitVec != null && !worldObj.isRemote) { double x = pos.hitVec.xCoord - getPos().getX() - 0.5; double y = pos.hitVec.yCoord - getPos().getY() - 0.5; @@ -525,7 +528,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return null; } - public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) { + public static RayTraceResult raytraceFromEntity(World world, Entity player, boolean par3, double range) { float f = 1.0F; float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; @@ -534,7 +537,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (!world.isRemote && player instanceof EntityPlayer) d1 += 1.62D; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; - Vec3 vec3 = new Vec3(d0, d1, d2); + Vec3d vec3 = new Vec3d(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); @@ -544,12 +547,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, double d3 = range; if (player instanceof EntityPlayerMP) d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); - Vec3 vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); + Vec3d vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); return world.rayTraceBlocks(vec3, vec31, par3, !par3, par3); } public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = StatCollector.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 8a97198ea..c623e8151 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -82,7 +82,7 @@ public class TileTurntable extends TileMod { int color = 0xAA006600; char motion = backwards ? '<' : '>'; - String speed = EnumChatFormatting.BOLD + ""; + String speed = TextFormatting.BOLD + ""; for(int i = 0; i < this.speed; i++) speed = speed + motion; 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 cab389cff..679c05e4f 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 @@ -13,8 +13,8 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 8e01ea720..3262a3c5c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -11,7 +11,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; public class TileRedStringComparator extends TileRedString { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index d7d9f1aa4..72862756c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -15,10 +15,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.common.core.helper.InventoryHelper; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index a1adc3249..609579ef3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -12,7 +12,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class TileRedStringDispenser extends TileRedStringContainer { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index a18c5712b..2f2689b99 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -14,7 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class TileRedStringFertilizer extends TileRedString { 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 ace85b64e..b568a70ce 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 @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index cd1889174..253ffea0b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -15,7 +15,7 @@ import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockMushroom; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.subtile.ISubTileContainer; public class TileRedStringRelay extends TileRedString { 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 1a4e43cb1..2daa699ec 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; 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 1c9c48f50..6d82f70cd 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.lib.LibPotionNames; diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index e7a477b49..df4ce11a0 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -12,9 +12,9 @@ package vazkii.botania.common.core.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; @@ -35,13 +35,13 @@ public class CommandDownloadLatest extends CommandBase { @Override public void processCommand(ICommandSender var1, String[] var2) { if(!ENABLED) - var1.addChatMessage(new ChatComponentTranslation("botania.versioning.disabled").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); else if(var2.length == 1) if(VersionChecker.downloadedFile) - var1.addChatMessage(new ChatComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); else if(VersionChecker.startedDownload) - var1.addChatMessage(new ChatComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); else new ThreadDownloadMod("Botania " + var2[0] + ".jar"); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 6e6b3b2bc..165073ac3 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -14,9 +14,9 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.item.ItemLexicon; public class CommandOpen extends CommandBase { @@ -39,7 +39,7 @@ public class CommandOpen extends CommandBase { if(stack != null && stack.getItem() instanceof ItemLexicon) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); - } else sender.addChatMessage(new ChatComponentTranslation("botaniamisc.noLexicon").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); } } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index a5d135359..cabfc4850 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -14,8 +14,8 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.translation.I18n; public class CommandShare extends CommandBase { @@ -31,12 +31,12 @@ public class CommandShare extends CommandBase { @Override public void processCommand(ICommandSender sender, String[] args) { - String json = StatCollector.translateToLocal("botaniamisc.shareMsg"); + String json = I18n.translateToLocal("botaniamisc.shareMsg"); json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); - json = json.replaceAll("%entryname%", StatCollector.translateToLocal(args[0])); + json = json.replaceAll("%entryname%", I18n.translateToLocal(args[0])); - IChatComponent component = IChatComponent.Serializer.jsonToComponent(json); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(json); MinecraftServer.getServer().getConfigurationManager().sendChatMsg(component); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 6a0208e95..d2d465ca5 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -14,8 +14,8 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; @@ -49,7 +49,7 @@ public class CommandSkyblockSpread extends CommandBase { if(maxrange > maxAllowed) throw new CommandException("botaniamisc.skyblockRangeTooHigh"); if(maxrange < minAllowed) - throw new CommandException(StatCollector.translateToLocal("botaniamisc.skyblockRangeTooLow")); + throw new CommandException(I18n.translateToLocal("botaniamisc.skyblockRangeTooLow")); EntityPlayer player = getPlayer(sender, args[0]); if(player != null) { diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 7a6768bea..ee88d3984 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -11,7 +11,7 @@ package vazkii.botania.common.core.handler; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; import vazkii.botania.api.item.IFlowerlessBiome; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 9514216f3..87f351c40 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -17,10 +17,10 @@ import java.util.List; import java.util.Map; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -395,9 +395,9 @@ public final class ConfigHandler { if(changes.size() == 0) return; - player.addChatComponentMessage(new ChatComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new ChatStyle().setColor(TextFormatting.GOLD))); for(String change : changes) - player.addChatMessage(new ChatComponentText(change).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); + player.addChatMessage(new TextComponentString(change).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); } public void addMappingInt(int version, String key, int val) { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 5c1b46411..198302f20 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,7 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 0eb8f8009..21107a208 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.WeakHashMap; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.ManaNetworkEvent; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index cb5821ac6..11bbca7b4 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -26,10 +26,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; @@ -368,8 +368,8 @@ public class InventoryHelper { } @Override - public IChatComponent getDisplayName() { - return new ChatComponentText(getName()); + public ITextComponent getDisplayName() { + return new TextComponentString(getName()); } @Override diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java index 79c9e1b29..3663e69b0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 28426316e..23ac01dfc 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -11,7 +11,7 @@ package vazkii.botania.common.core.helper; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 56c9f1bc3..7fd86921d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -16,9 +16,9 @@ import java.math.RoundingMode; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; @@ -52,7 +52,7 @@ public class Vector3 z = vec.z; } - public Vector3(Vec3 vec) { + public Vector3(Vec3d vec) { x = vec.xCoord; y = vec.yCoord; z = vec.zCoord; @@ -233,8 +233,8 @@ public class Vector3 return this; } - public Vec3 toVec3D() { - return new Vec3(x, y, z); + public Vec3d toVec3D() { + return new Vec3d(x, y, z); } public double angle(Vector3 vec) { diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 8a3d48f02..f083cd983 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -22,9 +22,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -178,7 +178,7 @@ public class CommonProxy { } private int countWords(String s) { - String s1 = StatCollector.translateToLocal(s); + String s1 = I18n.translateToLocal(s); return s1.split(" ").length; } @@ -259,7 +259,7 @@ public class CommonProxy { ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).theItemInWorldManager.getBlockReachDistance() + reach)); } - public boolean openWikiPage(World world, Block block, MovingObjectPosition pos) { + public boolean openWikiPage(World world, Block block, RayTraceResult pos) { return false; } diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 9387e8142..24fa2bfd8 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -18,11 +18,11 @@ import java.io.InputStream; import java.net.URL; import net.minecraft.client.Minecraft; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.translation.I18n; public class ThreadDownloadMod extends Thread { @@ -46,7 +46,7 @@ public class ThreadDownloadMod extends Thread { @Override public void run() { try { - IChatComponent component = IChatComponent.Serializer.jsonToComponent(String.format(StatCollector.translateToLocal("botania.versioning.startingDownload"), fileName)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.translateToLocal("botania.versioning.startingDownload"), fileName)); if(Minecraft.getMinecraft().thePlayer != null) Minecraft.getMinecraft().thePlayer.addChatMessage(component); @@ -82,7 +82,7 @@ public class ThreadDownloadMod extends Thread { f.renameTo(f1); if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; @@ -101,6 +101,6 @@ public class ThreadDownloadMod extends Thread { private void sendError() { if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 0b8414317..7b21bfb4a 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -12,11 +12,11 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -47,10 +47,10 @@ public final class VersionChecker { int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); - player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - IChatComponent component = IChatComponent.Serializer.jsonToComponent(StatCollector.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); player.addChatComponentMessage(component); } } 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 8a13a5ce1..0d9871fdc 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -13,7 +13,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -38,7 +38,7 @@ public class HeadRecipe extends RecipeRuneAltar { if(stack.getItem() == Items.name_tag) { name = stack.getDisplayName(); - if(name.equals(StatCollector.translateToLocal("item.nameTag.name"))) + if(name.equals(I18n.translateToLocal("item.nameTag.name"))) return false; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index e8b11e951..52b169a78 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -16,9 +16,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; @@ -105,7 +105,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { motionZ = 0; } else if (liveTime == delay && player != null) { Vector3 playerLook = null; - MovingObjectPosition lookat = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); + RayTraceResult lookat = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); if(lookat == null) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); else playerLook = new Vector3(lookat.getBlockPos().getX() + 0.5, lookat.getBlockPos().getY() + 0.5, lookat.getBlockPos().getZ() + 0.5); @@ -131,7 +131,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { if(player != null) living.attackEntityFrom(DamageSource.causePlayerDamage(player), 20); else living.attackEntityFrom(DamageSource.generic, 20); - onImpact(new MovingObjectPosition(living)); + onImpact(new RayTraceResult(living)); return; } } @@ -152,7 +152,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } @Override - protected void onImpact(MovingObjectPosition pos) { + protected void onImpact(RayTraceResult pos) { EntityLivingBase thrower = getThrower(); if(pos.entityHit == null || pos.entityHit != thrower) { worldObj.createExplosion(this, posX, posY, posZ, 3F, false); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index ad8d4bee5..bca62ff86 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -20,10 +20,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 21efe684f..099bea0e9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -47,6 +47,8 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -143,7 +145,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(par3World.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!par3World.isRemote) - player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); return false; } @@ -154,7 +156,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!par3World.isRemote) - player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); return false; } } @@ -173,7 +175,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } if(!par3World.isRemote) - player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 16b253f9e..1e65cd933 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -14,12 +14,12 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.state.pattern.BlockHelper; +import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; public class EntityEnderAirBottle extends EntityThrowable { @@ -33,7 +33,7 @@ public class EntityEnderAirBottle extends EntityThrowable { } @Override - protected void onImpact(MovingObjectPosition pos) { + 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); @@ -55,7 +55,7 @@ public class EntityEnderAirBottle extends EntityThrowable { for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { Block block = worldObj.getBlockState(pos).getBlock(); - if(block != null && block.isReplaceableOreGen(worldObj, pos, BlockHelper.forBlock(Blocks.stone))) + if(block != null && block.isReplaceableOreGen(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 c984b088a..00b329bfe 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -15,9 +15,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; @@ -55,7 +55,7 @@ public class EntityFallingStar extends EntityThrowableCopy { continue; if(living.hurtTime == 0) { - onImpact(new MovingObjectPosition(living)); + onImpact(new RayTraceResult(living)); return; } } @@ -66,7 +66,7 @@ public class EntityFallingStar extends EntityThrowableCopy { } @Override - protected void onImpact(MovingObjectPosition pos) { + protected void onImpact(RayTraceResult pos) { EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && thrower != null && pos.entityHit != thrower && !pos.entityHit.isDead) { if(thrower instanceof EntityPlayer) diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 66c604564..a1e80a9bd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index dc1ff8eb2..abaaa0d95 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -12,8 +12,8 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityAmbientCreature; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class EntityFlyingCreature extends EntityAmbientCreature { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 646943a99..4bce3e3f7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index eafed541a..5abdafe60 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -22,9 +22,9 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; @@ -180,7 +180,7 @@ public class EntityMagicMissile extends EntityThrowable { } @Override - protected void onImpact(MovingObjectPosition pos) { + protected void onImpact(RayTraceResult pos) { switch (pos.typeOfHit) { case BLOCK: { Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 3956c1450..bbd6a5000 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -29,6 +29,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; @@ -149,12 +154,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(throwableShake > 0) --throwableShake; - Vec3 vec3 = new Vector3(posX, posY, posZ).toVec3D(); - Vec3 vec31 = new Vector3(posX + motionX, posY + motionY, posZ + motionZ).toVec3D(); - MovingObjectPosition movingobjectposition = clip(vec3, vec31); + Vec3d vec3 = new Vector3(posX, posY, posZ).toVec3D(); + Vec3d vec31 = new Vector3(posX + motionX, posY + motionY, posZ + motionZ).toVec3D(); + RayTraceResult RayTraceResult = clip(vec3, vec31); - if(movingobjectposition != null) - vec31 = new Vector3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord).toVec3D(); + if(RayTraceResult != null) + vec31 = new Vector3(RayTraceResult.hitVec.xCoord, RayTraceResult.hitVec.yCoord, RayTraceResult.hitVec.zCoord).toVec3D(); if(!worldObj.isRemote) { Entity entity = null; @@ -168,10 +173,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(entity1.canBeCollidedWith() && (entity1 != entitylivingbase || ticksInAir >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - if(movingobjectposition1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + if(RayTraceResult1 != null) { + double d1 = vec3.distanceTo(RayTraceResult1.hitVec); if (d1 < d0 || d0 == 0.0D) { entity = entity1; @@ -182,11 +187,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } if(entity != null) - movingobjectposition = new MovingObjectPosition(entity); + RayTraceResult = new RayTraceResult(entity); } - if(movingobjectposition != null) - onImpact(movingobjectposition); + if(RayTraceResult != null) + onImpact(RayTraceResult); posX += motionX; posY += motionY; @@ -213,7 +218,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { setPosition(posX, posY, posZ); } - public MovingObjectPosition clip(Vec3 par1Vec3, Vec3 par2Vec3) { + public RayTraceResult clip(Vec3d par1Vec3, Vec3d par2Vec3) { boolean par3 = false; boolean par4 = false; if (!Double.isNaN(par1Vec3.xCoord) && !Double.isNaN(par1Vec3.yCoord) && !Double.isNaN(par1Vec3.zCoord)) { @@ -229,10 +234,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { Block block = state.getBlock(); if (block != null && (!par4 || block == null || block.getCollisionBoundingBox(worldObj, pos, state) != null) && block != Blocks.air && block.canCollideCheck(state, par3)) { - MovingObjectPosition movingobjectposition = block.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); + RayTraceResult RayTraceResult = block.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); - if (movingobjectposition != null) - return movingobjectposition; + if (RayTraceResult != null) + return RayTraceResult; } int k1 = 200; @@ -292,23 +297,23 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { b0 = 4; else b0 = 5; - par1Vec3 = new Vec3(d0, par1Vec3.yCoord + (d7 * d3), par1Vec3.zCoord + (d8 * d3)); + par1Vec3 = new Vec3d(d0, par1Vec3.yCoord + (d7 * d3), par1Vec3.zCoord + (d8 * d3)); } else if (d4 < d5) { if (j > i1) b0 = 0; else b0 = 1; - par1Vec3 = new Vec3(par1Vec3.xCoord + (d6 * d4), d1, par1Vec3.zCoord + (d8 * d4)); + par1Vec3 = new Vec3d(par1Vec3.xCoord + (d6 * d4), d1, par1Vec3.zCoord + (d8 * d4)); } else { if (k > j1) b0 = 2; else b0 = 3; - par1Vec3 = new Vec3(par1Vec3.xCoord + (d6 * d5), par1Vec3.yCoord + (d7 * d5), d2); + par1Vec3 = new Vec3d(par1Vec3.xCoord + (d6 * d5), par1Vec3.yCoord + (d7 * d5), d2); } - Vec3 vec32 = new Vector3(par1Vec3.xCoord, par1Vec3.yCoord, par1Vec3.zCoord).toVec3D(); - vec32 = new Vec3(MathHelper.floor_double(par1Vec3.xCoord), vec32.yCoord, vec32.zCoord); + Vec3d vec32 = new Vector3(par1Vec3.xCoord, par1Vec3.yCoord, par1Vec3.zCoord).toVec3D(); + vec32 = new Vec3d(MathHelper.floor_double(par1Vec3.xCoord), vec32.yCoord, vec32.zCoord); l = ((int) vec32.xCoord); if (b0 == 5) { @@ -316,7 +321,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { vec32 = vec32.addVector(1, 0, 0); } - vec32 = new Vec3(vec32.xCoord, MathHelper.floor_double(par1Vec3.yCoord), vec32.zCoord); + vec32 = new Vec3d(vec32.xCoord, MathHelper.floor_double(par1Vec3.yCoord), vec32.zCoord); i1 = ((int) vec32.yCoord); if (b0 == 1) { @@ -324,7 +329,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { vec32 = vec32.addVector(0, 1, 0); } - vec32 = new Vec3(par1Vec3.xCoord, vec32.yCoord, MathHelper.floor_double(vec32.zCoord)); + vec32 = new Vec3d(par1Vec3.xCoord, vec32.yCoord, MathHelper.floor_double(vec32.zCoord)); j1 = ((int) vec32.zCoord); if (b0 == 3) { @@ -337,10 +342,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { Block block1 = state1.getBlock(); if ((!par4 || block1 == null || block1.getCollisionBoundingBox(worldObj, pos1, state) != null) && block1 != Blocks.air && block1.canCollideCheck(state, par3)) { - MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(worldObj, pos1, par1Vec3, par2Vec3); + RayTraceResult RayTraceResult1 = block1.collisionRayTrace(worldObj, pos1, par1Vec3, par2Vec3); - if (movingobjectposition1 != null) - return movingobjectposition1; + if (RayTraceResult1 != null) + return RayTraceResult1; } } @@ -571,13 +576,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - protected void onImpact(MovingObjectPosition movingobjectposition) { + protected void onImpact(RayTraceResult RayTraceResult) { boolean collided = false; boolean dead = false; - if(movingobjectposition.entityHit == null) { - TileEntity tile = worldObj.getTileEntity(movingobjectposition.getBlockPos()); - Block block = worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock(); + if(RayTraceResult.entityHit == null) { + TileEntity tile = worldObj.getTileEntity(RayTraceResult.getBlockPos()); + Block block = worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock(); if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) return; @@ -594,7 +599,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { onRecieverImpact((IManaReceiver) tile, tile.getPos()); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.getBlockPos()); + ((IManaTrigger) block).onBurstCollision(this, worldObj, RayTraceResult.getBlockPos()); boolean ghost = tile instanceof IManaCollisionGhost; dead = !ghost; @@ -607,10 +612,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { ILensEffect lens = getLensInstance(); if(lens != null) - dead = lens.collideBurst(this, movingobjectposition, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); + dead = lens.collideBurst(this, RayTraceResult, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); - if(collided && !hasAlreadyCollidedAt(movingobjectposition.getBlockPos())) - alreadyCollidedAt.add(getCollisionLocString(movingobjectposition.getBlockPos())); + if(collided && !hasAlreadyCollidedAt(RayTraceResult.getBlockPos())) + alreadyCollidedAt.add(getCollisionLocString(RayTraceResult.getBlockPos())); if(dead && !isDead) { if(!fake) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index ae701aef0..5bdac9e3b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -17,7 +17,7 @@ import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import java.util.Iterator; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 7373c13a0..29da2d202 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -17,7 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index f349b0cbc..3cf3d49be 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -26,8 +26,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index da3dd2626..16b838d4e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -24,7 +24,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; @@ -110,7 +110,7 @@ public class EntityThornChakram extends EntityThrowable { } @Override - protected void onImpact(MovingObjectPosition pos) { + protected void onImpact(RayTraceResult pos) { if(noClip) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index b37a61a40..f692b814a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -189,15 +189,15 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile ++this.ticksInAir; } - Vec3 vec3 = new Vec3(this.posX, this.posY, this.posZ); - Vec3 vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31); - vec3 = new Vec3(this.posX, this.posY, this.posZ); - vec31 = new Vec3(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3 = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult RayTraceResult = this.worldObj.rayTraceBlocks(vec3, vec31); + vec3 = new Vec3d(this.posX, this.posY, this.posZ); + vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - if (movingobjectposition != null) + if (RayTraceResult != null) { - vec31 = new Vec3(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + vec31 = new Vec3d(RayTraceResult.hitVec.xCoord, RayTraceResult.hitVec.yCoord, RayTraceResult.hitVec.zCoord); } if (!this.worldObj.isRemote) @@ -215,11 +215,11 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double)f, (double)f, (double)f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - if (movingobjectposition1 != null) + if (RayTraceResult1 != null) { - double d1 = vec3.squareDistanceTo(movingobjectposition1.hitVec); + double d1 = vec3.squareDistanceTo(RayTraceResult1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -232,19 +232,19 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + RayTraceResult = new RayTraceResult(entity); } } - if (movingobjectposition != null) + if (RayTraceResult != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && this.worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) + if (RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && this.worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) { - this.setPortal(movingobjectposition.getBlockPos()); + this.setPortal(RayTraceResult.getBlockPos()); } else { - this.onImpact(movingobjectposition); + this.onImpact(RayTraceResult); } } @@ -308,7 +308,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * Called when this EntityThrowable hits a block or entity. */ - protected abstract void onImpact(MovingObjectPosition p_70184_1_); + protected abstract void onImpact(RayTraceResult p_70184_1_); /** * (abstract) Protected helper method to write subclass entity data to NBT. diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index c0c94e9b9..27774b8d1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -16,10 +16,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; @@ -53,10 +53,10 @@ public class EntityThrownItem extends EntityItem { @Override public void onUpdate() { super.onUpdate(); - Vec3 vec3 = new Vec3(posX, posY, posZ); - Vec3 vec31 = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); + Vec3d vec3 = new Vec3d(posX, posY, posZ); + Vec3d vec31 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); - MovingObjectPosition movingobjectposition = worldObj.rayTraceBlocks(vec3, vec31); + RayTraceResult RayTraceResult = worldObj.rayTraceBlocks(vec3, vec31); if (!worldObj.isRemote) @@ -78,11 +78,11 @@ public class EntityThrownItem extends EntityItem { { float f = 1.0F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); - MovingObjectPosition movingobjectposition1 = axisalignedbb.calculateIntercept(vec3, vec31); + RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - if (movingobjectposition1 != null) + if (RayTraceResult1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + double d1 = vec3.distanceTo(RayTraceResult1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -95,20 +95,20 @@ public class EntityThrownItem extends EntityItem { if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); + RayTraceResult = new RayTraceResult(entity); } } - if (movingobjectposition != null) + if (RayTraceResult != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && worldObj.getBlockState(movingobjectposition.getBlockPos()).getBlock() == Blocks.portal) + if (RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) { - setPortal(movingobjectposition.getBlockPos()); + setPortal(RayTraceResult.getBlockPos()); } else { - if (movingobjectposition.entityHit != null) { - movingobjectposition.entityHit.attackEntityFrom(DamageSource.magic, 2.0F); + if (RayTraceResult.entityHit != null) { + RayTraceResult.entityHit.attackEntityFrom(DamageSource.magic, 2.0F); if (!worldObj.isRemote) { Entity item = getEntityItem().getItem().createEntity(worldObj, this, getEntityItem()); if (item == null) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 8ba380c0b..f0afbf1d1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -17,9 +17,9 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; @@ -40,7 +40,7 @@ public class EntityVineBall extends EntityThrowable { } @Override - protected void onImpact(MovingObjectPosition var1) { + protected void onImpact(RayTraceResult var1) { if(var1 != null) { EnumFacing dir = var1.sideHit; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 174d97e2d..f0b9ba893 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -3,8 +3,8 @@ package vazkii.botania.common.integration.buildcraft; import com.google.common.base.Predicates; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,7 +31,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern @Override public String getDescription() { - return StatCollector.translateToLocal(LibTriggerNames.TRIGGER_MANA_DETECTOR); + return I18n.translateToLocal(LibTriggerNames.TRIGGER_MANA_DETECTOR); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index e502c769e..a8111a9e8 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -3,7 +3,7 @@ package vazkii.botania.common.integration.buildcraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -44,7 +44,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal @Override public String getDescription() { - return StatCollector.translateToLocal(LibTriggerNames.TRIGGER_MANA_PREFIX + WordUtils.capitalizeFully(state.name())); + return I18n.translateToLocal(LibTriggerNames.TRIGGER_MANA_PREFIX + WordUtils.capitalizeFully(state.name())); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index a8e738a21..16c3f6397 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -3,7 +3,7 @@ package vazkii.botania.common.integration.buildcraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -28,7 +28,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE @Override public String getDescription() { - return StatCollector.translateToLocal(LibTriggerNames.TRIGGER_RUNE_ALTAR_CAN_CRAFT); + return I18n.translateToLocal(LibTriggerNames.TRIGGER_RUNE_ALTAR_CAN_CRAFT); } @Override diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index 42bc852df..e130c2589 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -17,7 +17,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index a143b341a..a9f4e1cac 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -16,7 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; @@ -44,8 +44,8 @@ public class ItemAncientWill extends ItemMod { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); + addStringToTooltip(I18n.translateToLocal("botaniamisc.craftToAddWill"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); } public void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 135f2779b..048e9d968 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -183,7 +183,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { int meta = getBlockMeta(par1ItemStack); ItemStack stack = new ItemStack(block, 1, meta); - return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + EnumChatFormatting.GREEN + stack.getDisplayName() + EnumChatFormatting.RESET + ")"); + return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + TextFormatting.GREEN + stack.getDisplayName() + TextFormatting.RESET + ")"); } @Override @@ -228,12 +228,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.air) { int count = getBlockCount(par1ItemStack); - par3List.add(count + " " + StatCollector.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + par3List.add(count + " " + I18n.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 5e6fd8dca..e5f8ee1a1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -18,7 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; @@ -83,7 +83,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); + list.add(I18n.translateToLocal("botaniamisc.lotusDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 70a4e2032..28b4212d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -198,7 +198,7 @@ public class ItemBottledMana extends ItemMod { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); + par3List.add(I18n.translateToLocal("botaniamisc.bottleTooltip")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 29fc6cf3b..8bcfbf9c3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -24,9 +24,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -109,9 +109,9 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) - list.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); + list.add(I18n.translateToLocal("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) - list.add(StatCollector.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); + list.add(I18n.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 8207a8f15..55e063463 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index d143cadfc..e0ae60ff1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCraftCrate; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index a9716cefb..48497bfed 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -167,7 +167,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(!particles) return; - Vec3 lookVec3 = player.getLookVec(); + Vec3d lookVec3 = player.getLookVec(); Vector3 centerVector = Vector3.fromEntityCenter(player).add(lookVec3.xCoord * 3, 1.3, lookVec3.zCoord * 3); float m = 0.1F; for(int i = 0; i < 4; i++) @@ -393,7 +393,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); - // todo 1.8.8 Tessellator.renderingWorldRenderer = false; + // todo 1.8.8 Tessellator.renderingVertexBuffer = false; double renderPosX, renderPosY, renderPosZ; @@ -481,20 +481,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.disableCull(); ItemCraftingHalo item = (ItemCraftingHalo) stack.getItem(); mc.renderEngine.bindTexture(item.getGlowResource()); - tess.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tess.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < segAngles; i++) { float ang = i + seg * segAngles + shift; double xp = Math.cos(ang * Math.PI / 180F) * s; double zp = Math.sin(ang * Math.PI / 180F) * s; - tess.getWorldRenderer().pos(xp * m, y, zp * m).tex(u, v).endVertex(); - tess.getWorldRenderer().pos(xp, y0, zp).tex(u, 0).endVertex(); + tess.getBuffer().pos(xp * m, y, zp * m).tex(u, v).endVertex(); + tess.getBuffer().pos(xp, y0, zp).tex(u, 0).endVertex(); xp = Math.cos((ang + 1) * Math.PI / 180F) * s; zp = Math.sin((ang + 1) * Math.PI / 180F) * s; - tess.getWorldRenderer().pos(xp, y0, zp).tex(0, 0).endVertex(); - tess.getWorldRenderer().pos(xp * m, y, zp * m).tex(0, v).endVertex(); + tess.getBuffer().pos(xp, y0, zp).tex(0, 0).endVertex(); + tess.getBuffer().pos(xp * m, y, zp * m).tex(0, v).endVertex(); } y0 = 0; tess.draw(); @@ -532,7 +532,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF); } else { ItemStack[] recipe = getCraftingItems(stack, slot); - String label = StatCollector.translateToLocal("botaniamisc.unsetRecipe"); + String label = I18n.translateToLocal("botaniamisc.unsetRecipe"); boolean setRecipe = false; if(recipe[9] == null) @@ -581,7 +581,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { int yoff = 110; if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) { - String warning = EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.cantCraft"); + String warning = TextFormatting.RED + I18n.translateToLocal("botaniamisc.cantCraft"); mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); yoff += 12; } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 57b6f76c0..ef8955bfc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -16,7 +16,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 0d4efb32e..418080ca4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index e7ddd6928..d994eaeeb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -18,9 +18,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 51762dce2..7ba0ba4ec 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -25,7 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index e0a0d8f9e..b5de598e5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -27,7 +27,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index c7d46fd6c..f05fc5b18 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -70,7 +70,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); + list.add(String.format(I18n.translateToLocal("botaniamisc.shardLevel"), I18n.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } @Override @@ -194,7 +194,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return false; } @@ -209,7 +209,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet entity.motionZ = 0; final int spawnTicks = 2; - final int placeTicks = net.minecraft.util.MathHelper.floor_double(targetDistance / speed); + final int placeTicks = net.minecraft.util.math.MathHelper.floor_double(targetDistance / speed); ItemStack lens = burst.getSourceLens(); @@ -221,9 +221,9 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(y != -1) spawnBurst(entity.worldObj, new BlockPos(x, y, z), lens); } else if(burst.getTicksExisted() == placeTicks) { - int x = net.minecraft.util.MathHelper.floor_double(entity.posX); + int x = net.minecraft.util.math.MathHelper.floor_double(entity.posX); int y = ItemNBTHelper.getInt(lens, TAG_Y_START, -1) + targetDistance; - int z = net.minecraft.util.MathHelper.floor_double(entity.posZ); + int z = net.minecraft.util.math.MathHelper.floor_double(entity.posZ); BlockPos pos = new BlockPos(x, y, z); if(entity.worldObj.isAirBlock(pos)) { diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 21a1e5944..28aaad58e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -22,6 +22,12 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -67,7 +73,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return true; } } else if(par3World.isRemote) { - MovingObjectPosition mop = new MovingObjectPosition(new Vec3(par8, par9, par10), side, pos); + RayTraceResult mop = new RayTraceResult(new Vec3d(par8, par9, par10), side, pos); return Botania.proxy.openWikiPage(par3World, block, mop); } } @@ -90,7 +96,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { - String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition()); + String edition = TextFormatting.GOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) par3List.add(edition); @@ -102,12 +108,12 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(String.format(StatCollector.translateToLocal(format), typesKnown.size()), par3List); + addStringToTooltip(String.format(I18n.translateToLocal(format), typesKnown.size()), par3List); for(KnowledgeType type : typesKnown) - addStringToTooltip(" \u2022 " + StatCollector.translateToLocal(type.getUnlocalizedName()), par3List); + addStringToTooltip(" \u2022 " + I18n.translateToLocal(type.getUnlocalizedName()), par3List); - } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); } private void addStringToTooltip(String s, List tooltip) { @@ -117,7 +123,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { public static String getEdition() { String version = LibMisc.BUILD; int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); - return build == 0 ? StatCollector.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); + return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } @Override @@ -127,7 +133,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { LexiconEntry entry = getEntryFromForce(par1ItemStack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); setForcedPage(par1ItemStack, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 26d28ed09..da95172d9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -21,8 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -183,7 +183,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); return; } @@ -196,13 +196,13 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { if(clip) { int pos = getClipPos(par1ItemStack); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasClip"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.hasClip"), par3List); for(int i = 0; i < CLIP_SLOTS; i++) { String name = ""; - EnumChatFormatting formatting = i == pos ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY; + TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); if(lensAt == null) - name = StatCollector.translateToLocal("botaniamisc.clipEmpty"); + name = I18n.translateToLocal("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); addStringToTooltip(formatting + " - " + name, par3List); } @@ -216,7 +216,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Override public String getItemStackDisplayName(ItemStack par1ItemStack) { ItemStack lens = getLens(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + EnumChatFormatting.GREEN + lens.getDisplayName() + EnumChatFormatting.RESET + ")"); + return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + TextFormatting.GREEN + lens.getDisplayName() + TextFormatting.RESET + ")"); } public static boolean hasClip(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 58259b6e3..8f34fa6f3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 2d7369f0d..3a7403a6a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -18,7 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; @@ -78,7 +78,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) - par3List.add(StatCollector.translateToLocal("botaniamisc.creative")); + par3List.add(I18n.translateToLocal("botaniamisc.creative")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index e56fb06ee..cdccc4f90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaCollector; diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 861dcd601..4426c8656 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -13,9 +13,9 @@ package vazkii.botania.common.item; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; @@ -28,18 +28,18 @@ public class ItemOpenBucket extends ItemMod { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); + RayTraceResult RayTraceResult = getRayTraceResultFromPlayer(par2World, par3EntityPlayer, true); - if(movingobjectposition == null) + if(RayTraceResult == null) return par1ItemStack; else { - if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - BlockPos pos = movingobjectposition.getBlockPos(); + if(RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + BlockPos pos = RayTraceResult.getBlockPos(); if(!par2World.isBlockModifiable(par3EntityPlayer, pos)) return par1ItemStack; - if(!par3EntityPlayer.canPlayerEdit(pos, movingobjectposition.sideHit, par1ItemStack)) + if(!par3EntityPlayer.canPlayerEdit(pos, RayTraceResult.sideHit, par1ItemStack)) return par1ItemStack; Material material = par2World.getBlockState(pos).getBlock().getMaterial(); diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 3632eb8ba..2cc32df91 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 6138ca16b..9869929ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -15,9 +15,9 @@ import java.util.List; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; @@ -56,7 +56,7 @@ public class ItemPinkinator extends ItemMod { @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); + p_77624_3_.add(I18n.translateToLocal("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index c4be8eb31..90da39a37 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 764208d33..1f5acc6ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -99,7 +99,7 @@ public class ItemSextant extends ItemMod { Botania.proxy.removeSextantMultiblock(); if(!par3EntityPlayer.isSneaking()) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); + RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); if(pos != null && pos.entityHit == null && pos.getBlockPos() != null) { if(!par2World.isRemote) { ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.getBlockPos().getX()); @@ -128,8 +128,8 @@ public class ItemSextant extends ItemMod { double mul = diffVec.y / lookVec.y; lookVec.multiply(mul).add(centerVec); - lookVec.x = net.minecraft.util.MathHelper.floor_double(lookVec.x); - lookVec.z = net.minecraft.util.MathHelper.floor_double(lookVec.z); + lookVec.x = net.minecraft.util.math.MathHelper.floor_double(lookVec.x); + lookVec.z = net.minecraft.util.math.MathHelper.floor_double(lookVec.z); return MathHelper.pointDistancePlane(source.x, source.z, lookVec.x, lookVec.z); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 2a8b94993..7f960af19 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -22,8 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -105,7 +105,7 @@ public class ItemSignalFlare extends ItemMod { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); - par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.translateToLocal("botaniamisc.flareColor"), I18n.translateToLocal("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 56a2b975f..87b9fa0ad 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index d2ceddd06..bf7b6e135 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -15,7 +15,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 1a773a781..607370b5e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -18,9 +18,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; @@ -75,7 +75,7 @@ public class ItemSpawnerMover extends ItemMod { public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { String id = getEntityId(stack); if (id != null) - infoList.add(StatCollector.translateToLocal("entity." + id + ".name")); + infoList.add(I18n.translateToLocal("entity." + id + ".name")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index c125c1d81..157090a5a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.relauncher.Side; @@ -42,8 +42,8 @@ public class ItemTemperanceStone extends ItemMod { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 870d8c65c..e2bc0b34d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -213,7 +213,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { - list.add(StatCollector.translateToLocal(getModeString(stack))); + list.add(I18n.translateToLocal(getModeString(stack))); } @Override @@ -268,8 +268,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(bound.getY() != -1) return bound; - MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + RayTraceResult pos = Minecraft.getMinecraft().objectMouseOver; + if(pos != null && pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 2713ecaed..36a648dfe 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index f6ef345a2..dea3a4aa5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { @@ -23,7 +23,7 @@ public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { @Override public String getItemStackDisplayName(ItemStack stack) { String flowerName = getUnlocalizedName(stack) + ".name"; - return String.format(StatCollector.translateToLocal("botaniamisc.floatingPrefix"), StatCollector.translateToLocal(flowerName)); + return String.format(I18n.translateToLocal("botaniamisc.floatingPrefix"), I18n.translateToLocal(flowerName)); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index b1c430e8b..46df2753f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { @@ -27,7 +27,7 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) - par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); + par3List.add(I18n.translateToLocal("botaniamisc.creativePool" + i)); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 28d715cf3..fc8a30c9a 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -19,10 +19,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; @@ -81,14 +81,14 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(ConfigHandler.referencesEnabled) { String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); - String refLocalized = StatCollector.translateToLocal(refUnlocalized); + String refLocalized = I18n.translateToLocal(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) - par3List.add(EnumChatFormatting.ITALIC + refLocalized); + par3List.add(TextFormatting.ITALIC + refLocalized); } String mod = BotaniaAPI.subTileMods.get(type); if(!mod.equals(LibMisc.MOD_ID)) - par3List.add(EnumChatFormatting.ITALIC + "[" + mod + "]"); + par3List.add(TextFormatting.ITALIC + "[" + mod + "]"); } public static String getType(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 0484dc766..767ecbbb2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -17,8 +17,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -60,7 +60,7 @@ public class ItemBlockTinyPotato extends ItemBlockMod { EntityPlayer player = (EntityPlayer) e; int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); if(ticks < NOT_MY_NAME.length) { - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + NOT_MY_NAME[ticks])); + player.addChatMessage(new TextComponentString(TextFormatting.RED + NOT_MY_NAME[ticks])); ItemNBTHelper.setInt(stack, TAG_TICKS, ticks + 1); } } 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 cc4aec2a0..6dc26feb7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -22,8 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; @@ -134,7 +134,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Override public String getItemStackDisplayName(ItemStack stack) { - return String.format(StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), StatCollector.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), EnumChatFormatting.BOLD + "" + getSwigsLeft(stack) + EnumChatFormatting.RESET); + return String.format(I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } @Override @@ -142,8 +142,8 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); + TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; + list.add(format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index a4ac14ecf..cf1fc426a 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -19,8 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -74,16 +74,16 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); return; } - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; + TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); - addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); + addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 13df83628..20a8cf819 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.client.lib.LibResources; @@ -72,13 +72,13 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements @Override public String getArmorSetName() { - return StatCollector.translateToLocal("botania.armorset.elementium.name"); + return I18n.translateToLocal("botania.armorset.elementium.name"); } @Override public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.elementium.desc"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.elementium.desc"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index b28481ff9..3703122e7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -21,8 +21,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import thaumcraft.api.items.IRunicArmor; @@ -158,7 +158,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(GuiScreen.isShiftKeyDown()) addInformationAfterShift(stack, player, list, adv); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); + else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); } public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { @@ -166,9 +166,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); for(int i = 0; i < stacks.length; i++) - addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); + addStringToTooltip((hasArmorSetItem(player, i) ? TextFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); if(hasPhantomInk(stack)) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list); + addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), list); } public void addStringToTooltip(String s, List tooltip) { @@ -218,15 +218,15 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } public String getArmorSetName() { - return StatCollector.translateToLocal("botania.armorset.manasteel.name"); + return I18n.translateToLocal("botania.armorset.manasteel.name"); } public String getArmorSetTitle(EntityPlayer player) { - return StatCollector.translateToLocal("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; + return I18n.translateToLocal("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; } public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manasteel.desc"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.manasteel.desc"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index d3079f326..c52c34485 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -95,13 +95,13 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Override public String getArmorSetName() { - return StatCollector.translateToLocal("botania.armorset.manaweave.name"); + return I18n.translateToLocal("botania.armorset.manaweave.name"); } @Override public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(ClientProxy.jingleTheBells) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list); + addStringToTooltip(I18n.translateToLocal("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); } @@ -110,8 +110,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc0"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc0"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc1"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 9d1fe1633..c3d9ddaa1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -18,7 +18,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorTerrasteel; @@ -95,14 +95,14 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public String getArmorSetName() { - return StatCollector.translateToLocal("botania.armorset.terrasteel.name"); + return I18n.translateToLocal("botania.armorset.terrasteel.name"); } @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc0"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc1"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc2"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc0"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc1"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc2"), list); } } 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 21edc3c0c..706de7b30 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 @@ -21,7 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -86,7 +86,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc super.addArmorSetDescription(stack, list); for(int i = 0; i < 6; i++) if(hasAncientWill(stack, i)) - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + i + ".desc"), list); + addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + i + ".desc"), list); } public static boolean hasAnyWill(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index acf038103..734272510 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -18,7 +18,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; @@ -85,24 +85,24 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); } public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); + addStringToTooltip(I18n.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) - addStringToTooltip(StatCollector.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), par3List); + addStringToTooltip(I18n.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), par3List); ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); if(hasPhantomInk(par1ItemStack)) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), par3List); } void addStringToTooltip(String s, List tooltip) { 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 c7312e803..9fead7df5 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 @@ -16,19 +16,19 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -70,7 +70,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.cosmeticBauble"), par3List); + addStringToTooltip(I18n.translateToLocal("botaniamisc.cosmeticBauble"), par3List); super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); } @@ -348,7 +348,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { // Adapted from RenderItem.renderModel(model, stack), added extra color param private void renderModel(IBakedModel model, ItemStack stack, int color) { Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + VertexBuffer worldrenderer = tessellator.getBuffer(); worldrenderer.begin(7, DefaultVertexFormats.ITEM); for (EnumFacing enumfacing : EnumFacing.values()) @@ -361,7 +361,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } // Copy of RenderItem.renderQuads - private void renderQuads(WorldRenderer renderer, List quads, int color, ItemStack stack) + private void renderQuads(VertexBuffer renderer, List quads, int color, ItemStack stack) { boolean flag = color == -1 && stack != null; int i = 0; 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 e17235e9c..6e3d81f7e 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 @@ -26,8 +26,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import net.minecraftforge.fml.common.registry.GameData; @@ -91,15 +91,15 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); return; } - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); + TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; + addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); } } 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 1e04a6824..f8504b2a7 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 @@ -23,7 +23,7 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; 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 6c48d4a49..971716bf2 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 @@ -36,7 +36,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -105,7 +105,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); + par3List.add(I18n.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); } @Override @@ -474,11 +474,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); - tes.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tes.getWorldRenderer().pos(-0.75, 0, -0.75).tex(0, 0).endVertex(); - tes.getWorldRenderer().pos(-0.75, 0, 0.75).tex(0, 1).endVertex(); - tes.getWorldRenderer().pos(0.75, 0, 0.75).tex(1, 1).endVertex(); - tes.getWorldRenderer().pos(0.75, 0, -0.75).tex(1, 0).endVertex(); + tes.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tes.getBuffer().pos(-0.75, 0, -0.75).tex(0, 0).endVertex(); + tes.getBuffer().pos(-0.75, 0, 0.75).tex(0, 1).endVertex(); + tes.getBuffer().pos(0.75, 0, 0.75).tex(1, 1).endVertex(); + tes.getBuffer().pos(0.75, 0, -0.75).tex(1, 0).endVertex(); tes.draw(); ShaderHelper.releaseShader(); 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 43fe0981d..7b4024cb1 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 @@ -18,7 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; @@ -48,7 +48,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { event.setCanceled(true); player.setHealth(player.getMaxHealth()); player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 6)); - player.addChatMessage(new ChatComponentTranslation("botaniamisc.savedByLaurel")); + player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); player.worldObj.playSoundAtEntity(player, "botania:goldenLaurel", 1F, 0.3F); PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); } 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 a179de7a7..14d78d753 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 @@ -26,8 +26,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.item.IBaubleRender; 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 62dea3589..28f06bee6 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 @@ -29,8 +29,8 @@ import net.minecraft.inventory.AnimalChest; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.village.MerchantRecipe; 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 32166c620..e368864aa 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,8 +16,8 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; 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 10bde87d3..3e51d6c10 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 @@ -25,8 +25,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; @@ -64,7 +64,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player) { Minecraft mc = Minecraft.getMinecraft(); - MovingObjectPosition pos = mc.objectMouseOver; + RayTraceResult pos = mc.objectMouseOver; if(pos == null || pos.getBlockPos() == null) return; IBlockState state = player.worldObj.getBlockState(pos.getBlockPos()); @@ -76,7 +76,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm if(block == Blocks.redstone_wire) { dispStack = new ItemStack(Items.redstone); - text = EnumChatFormatting.RED + "" + state.getValue(BlockRedstoneWire.POWER); + text = TextFormatting.RED + "" + state.getValue(BlockRedstoneWire.POWER); } else if(block == Blocks.unpowered_repeater || block == Blocks.powered_repeater) { dispStack = new ItemStack(Items.repeater); text = "" + state.getValue(BlockRedstoneRepeater.DELAY); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 157324ef5..ccb9f5f55 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -15,7 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.item.ISortableTool.ToolType; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -40,7 +40,7 @@ public class ItemSwapRing extends ItemBauble { ISortableTool tool = (ISortableTool) currentStack.getItem(); - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F); + RayTraceResult pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F); ToolType typeToFind = null; if(player.isSwingInProgress && pos != null && pos.getBlockPos() != null) { 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 b91483524..c0fe50569 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 @@ -21,7 +21,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 6fce77524..8bff2fb3a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -18,7 +18,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingHurtEvent; 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 b4a31e676..464e0ef85 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 @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.achievement.ICraftAchievement; @@ -45,7 +45,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); + RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 9649a30b8..562cdcf23 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; 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 5d3a9f95e..cf2853d8b 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 @@ -22,10 +22,10 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.ManaItemHandler; @@ -137,7 +137,7 @@ public final class ToolCommons { /** * @author mDiyo */ - public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) { + public static RayTraceResult raytraceFromEntity(World world, Entity player, boolean par3, double range) { float f = 1.0F; float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; @@ -146,7 +146,7 @@ public final class ToolCommons { if (player instanceof EntityPlayer) d1 += ((EntityPlayer) player).eyeHeight; double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; - Vec3 vec3 = new Vec3(d0, d1, d2); + Vec3d vec3 = new Vec3d(d0, d1, d2); float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.017453292F); @@ -154,7 +154,7 @@ public final class ToolCommons { float f7 = f4 * f5; float f8 = f3 * f5; double d3 = range; - Vec3 vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); + Vec3d vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); return world.rayTraceBlocks(vec3, vec31, par3); } 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 fe8e85f24..f74bd8cf2 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 @@ -10,7 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; 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 49b1a6aca..60ac85fbe 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 @@ -10,7 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; 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 c0d681bcc..caad5ca1c 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 @@ -11,8 +11,8 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.common.item.equipment.tool.ToolCommons; 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 796f89fe9..2e8feb521 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 @@ -6,8 +6,8 @@ import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -29,7 +29,7 @@ public class ItemElementiumShovel extends ItemManasteelShovel { if (!ToolCommons.isRightMaterial(mat, materialsShovel)) return false; - MovingObjectPosition block = ToolCommons.raytraceFromEntity(world, player, true, 10); + RayTraceResult block = ToolCommons.raytraceFromEntity(world, player, true, 10); if (block == null) return false; 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 d7aae0654..057effd9d 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 @@ -20,7 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 29c93f960..a58016129 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 @@ -20,7 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 5b2706a99..f2c107a74 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 @@ -24,7 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; 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 a59737cea..8ec2df15e 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 @@ -18,7 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 5f3a034f0..b1b428f0e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; 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 3d922372b..6cb6a89ac 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 @@ -24,9 +24,9 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; @@ -83,7 +83,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { - MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); + RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); if(raycast != null) { breakOtherBlock(player, stack, pos, pos, raycast.sideHit); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); 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 496b7d7fb..ae558a1c1 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 @@ -80,11 +80,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); - String rank = StatCollector.translateToLocal("botania.rank" + getLevel(par1ItemStack)); + String rankFormat = I18n.translateToLocal("botaniamisc.toolRank"); + String rank = I18n.translateToLocal("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); if(getMana(par1ItemStack) == Integer.MAX_VALUE) - par3List.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); + par3List.add(TextFormatting.RED + I18n.translateToLocal("botaniamisc.getALife")); } @Override @@ -121,7 +121,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { - MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); + RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); if(!player.worldObj.isRemote && raycast != null) { breakOtherBlock(player, stack, pos, pos, raycast.sideHit); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); 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 667dd0c03..cf95638e1 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 @@ -22,9 +22,9 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.stats.Achievement; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; @@ -96,7 +96,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return dead; } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index a15aa7d02..8936d241c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -20,8 +20,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; @@ -164,12 +164,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getStoredColor(par1ItemStack); if(storedColor != -1) - par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.color"), StatCollector.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.translateToLocal("botaniamisc.color"), I18n.translateToLocal("botania.color" + storedColor))); } public String getItemShortTermName(ItemStack stack) { - return StatCollector.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); + return I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); } @Override @@ -177,7 +177,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens ItemStack compositeLens = getCompositeLens(stack); if(compositeLens == null) return super.getItemStackDisplayName(stack); - return String.format(StatCollector.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); + return String.format(I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); } @Override @@ -194,7 +194,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; dead = getLens(stack.getItemDamage()).collideBurst(burst, entity, pos, isManaBlock, dead, stack); diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 96cf391c1..2f66541c9 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -12,7 +12,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.IManaSpreader; @@ -23,7 +23,7 @@ public class Lens { // NO-OP } - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return dead; } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index 1e1808d4f..e1f775b4d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -12,16 +12,16 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.Vector3; public class LensBounce extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!isManaBlock && pos.entityHit == null && pos.getBlockPos() != null) { BlockPos coords = burst.getBurstSourceBlockPos(); if(!coords.equals(pos.getBlockPos())) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 742da7a8f..833f1beca 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -16,7 +16,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index a78e785e8..dd1be21b7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -13,14 +13,14 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; public class LensExplosive extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) 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 25b1954e1..20c497463 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -14,9 +14,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.ModBlocks; @@ -25,7 +25,7 @@ import vazkii.botania.common.block.tile.TileIncensePlate; public class LensFire extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { EnumFacing dir = pos.sideHit; 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 18608b1c9..0666539e5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -16,15 +16,15 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.ItemNBTHelper; public class LensFirework extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 5a72e4947..a8746bbbf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -15,7 +15,7 @@ import java.awt.Color; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 5d23b7e6f..0813eef85 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -20,7 +20,7 @@ import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.item.ModItems; 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 65d2d9949..666ba78b1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -15,8 +15,8 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; @@ -24,7 +24,7 @@ import vazkii.botania.common.block.tile.TileManaFlame; public class LensLight extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 24a9f1c41..274bb7f0f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.core.helper.MathHelper; 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 54ffc4648..96d37b33d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -20,8 +20,8 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaBlock; @@ -32,7 +32,7 @@ import vazkii.botania.common.item.ModItems; public class LensMine extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { World world = entity.worldObj; BlockPos pos_ = pos.getBlockPos(); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 972ae6a21..77542c4b1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -19,10 +19,10 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; @@ -30,7 +30,7 @@ import vazkii.botania.common.Botania; public class LensPaint extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { int storedColor = ItemLens.getStoredColor(stack); if(!entity.worldObj.isRemote && !burst.isFake() && storedColor > -1 && storedColor < 17) { if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java b/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java index 1bcff6ec5..f193abff8 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPhantom.java @@ -12,13 +12,13 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; public class LensPhantom extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!isManaBlock) { dead = false; burst.setMinManaLoss(Math.max(0, burst.getMinManaLoss() - 4)); 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 7f7ecf35e..6b1c8a908 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -15,14 +15,14 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; public class LensPiston extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit.getOpposite()); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index a8793a440..7198da9ad 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -13,9 +13,9 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IRedirectable; import vazkii.botania.api.mana.IThrottledPacket; @@ -24,7 +24,7 @@ import vazkii.botania.common.core.helper.Vector3; public class LensRedirect extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.entityHit == null && coords.getY() != -1 && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index 0b30f2933..92797a2fa 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -12,14 +12,14 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; public class LensStorm extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index c0b47bc26..fc6777f48 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,8 +13,8 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; import vazkii.botania.common.block.ModBlocks; @@ -22,7 +22,7 @@ import vazkii.botania.common.block.ModBlocks; public class LensWarp extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(burst.isFake() || pos.getBlockPos() == null) return dead; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index 5b7b61e04..13fbe47de 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -15,14 +15,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.handler.ConfigHandler; public class LensWeight extends Lens { @Override - public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake() && pos.getBlockPos() != null) { int harvestLevel = ConfigHandler.harvestLevelWeight; 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 e46bdcbf0..e1a6087cb 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -20,7 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IDyablePool; 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 34b688555..45506b837 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -21,9 +21,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -62,7 +62,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve boolean ender = event.world.provider.getDimensionId() == 1; if(rightEvent && correctStack && ender) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); + RayTraceResult pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); if(pos == null) { if (event.entityPlayer.worldObj.isRemote) { event.entityPlayer.swingItem(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index e13f09c69..ca969ae47 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -13,7 +13,7 @@ package vazkii.botania.common.item.material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IPetalApothecary; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index ee21cb6cf..112f0378f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -22,7 +22,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.oredict.RecipeSorter; 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 54f61b200..8c4ed5b5d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -18,9 +18,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; @@ -69,12 +69,12 @@ public class ItemDice extends ItemRelic { world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); if(hasRelicAlready(player, relic)) { - player.addChatMessage(new ChatComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(TextFormatting.DARK_GREEN))); stack.stackSize--; return stack; } - player.addChatMessage(new ChatComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(TextFormatting.DARK_GREEN))); return relicStacks[relic].copy(); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index a0603d2c9..3a235b3c0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -115,7 +115,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf } @Override - public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return dead; } 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 16fd5940c..63c40da53 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -15,7 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -302,7 +302,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); - Tessellator.renderingWorldRenderer = false; + Tessellator.renderingVertexBuffer = false; GlStateManager.pushMatrix(); GlStateManager.enableBlend(); @@ -398,22 +398,22 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs MultiversePosition pos = getWarpPoint(stack, slot); FontRenderer font = Minecraft.getMinecraft().fontRenderer; - String s = StatCollector.translateToLocal("botania.sign" + slot); + String s = I18n.translateToLocal("botania.sign" + slot); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 55, 0xFFD409); if(pos.isValid()) { int dist = (int) vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(pos.x, pos.y, pos.z, player.posX, player.posY - 1.6, player.posZ); - s = dist == 1 ? StatCollector.translateToLocal("botaniamisc.blockAway") : String.format(StatCollector.translateToLocal("botaniamisc.blocksAway"), dist); + s = dist == 1 ? I18n.translateToLocal("botaniamisc.blockAway") : String.format(I18n.translateToLocal("botaniamisc.blocksAway"), dist); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 40, 0x9999FF); - s = StatCollector.translateToLocal("botaniamisc.clickToTeleport"); + s = I18n.translateToLocal("botaniamisc.clickToTeleport"); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); - s = StatCollector.translateToLocal("botaniamisc.clickToRemoveWarp"); + s = I18n.translateToLocal("botaniamisc.clickToRemoveWarp"); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 20, 0xFFFFFF); } else { - s = StatCollector.translateToLocal("botaniamisc.unboundWarp"); + s = I18n.translateToLocal("botaniamisc.unboundWarp"); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 40, 0xFFFFFF); - s = StatCollector.translateToLocal("botaniamisc.clickToAddWarp"); + s = I18n.translateToLocal("botaniamisc.clickToAddWarp"); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 5cff6a37c..944215674 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -15,7 +15,7 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; 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 629b7910d..55f0ee237 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,9 +24,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -84,7 +84,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC ItemStack heldItemStack = player.getCurrentEquippedItem(); BlockPos originCoords = getOriginPos(lokiRing); - MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); + RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); List cursors = getCursorList(lokiRing); int cursorCount = cursors.size(); @@ -171,7 +171,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if(getLokiRing(player) != stack) return null; - MovingObjectPosition lookPos = Minecraft.getMinecraft().objectMouseOver; + RayTraceResult lookPos = Minecraft.getMinecraft().objectMouseOver; if(lookPos != null && lookPos.getBlockPos() != null && !player.worldObj.isAirBlock(lookPos.getBlockPos()) && lookPos.entityHit == null) { List list = getCursorList(stack); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 05d69f75b..2d503d439 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -20,8 +20,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; import vazkii.botania.api.BotaniaAPI; @@ -56,23 +56,23 @@ public class ItemRelic extends ItemMod implements IRelic { public void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { if(!hasUUID(stack)) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list); + addStringToTooltip(I18n.translateToLocal("botaniamisc.relicUnbound"), list); } else { - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); if(!getSoulbindUUID(stack).equals(player.getUniqueID())) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); } if(stack.getItem() == ModItems.aesirRing) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.dropIkea"), list); + addStringToTooltip(I18n.translateToLocal("botaniamisc.dropIkea"), list); if(stack.getItem() == ModItems.dice) { addStringToTooltip("", list); String name = stack.getUnlocalizedName() + ".poem"; for(int i = 0; i < 4; i++) - addStringToTooltip(EnumChatFormatting.ITALIC + StatCollector.translateToLocal(name + i), list); + addStringToTooltip(TextFormatting.ITALIC + I18n.translateToLocal(name + i), list); } - } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); + } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); } public boolean shouldDamageWrongPlayer() { 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 51a6791f9..a72e76f57 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -14,7 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; 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 8be2a01ce..be45f5542 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -17,8 +17,8 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 92907bd98..80bc1631b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -17,7 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; 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 1dbfcf32e..495cae234 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -24,10 +24,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -349,7 +349,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra public String getItemStackDisplayName(ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + EnumChatFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + EnumChatFormatting.RESET + ")"); + return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + TextFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + TextFormatting.RESET + ")"); } public static String getBlockName(ItemStack stack) { @@ -394,7 +394,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra Block block = getBlock(stack); int meta = getBlockMeta(stack); - MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; + RayTraceResult pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null && pos.getBlockPos() != null) { BlockPos bPos = pos.getBlockPos(); Block targetBlock = null; 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 887cfc926..40b56e991 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -14,7 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; 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 ead1886b4..3a5e2c559 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 2795bf6d9..d93471b18 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -173,7 +173,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int ex = px + i - diff; int ez = pz + j - diff; - if(!axis.isVecInside(new Vec3(ex + 0.5, py + 1, ez + 0.5))) + if(!axis.isVecInside(new Vec3d(ex + 0.5, py + 1, ez + 0.5))) continue; BlockPos pos = new BlockPos(ex, py, ez); Block block = world.getBlockState(pos).getBlock(); 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 bd08bb9d5..cc5f9c69a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -14,10 +14,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; 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 28a98d654..baab6576e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -20,7 +20,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; @@ -64,7 +64,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); + RayTraceResult pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); if(pos != null && pos.getBlockPos() != null) { IBlockState state = p.worldObj.getBlockState(pos.getBlockPos()); @@ -130,15 +130,15 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } static class SmeltData { - public MovingObjectPosition pos; + public RayTraceResult pos; public int progress; - public SmeltData(MovingObjectPosition pos, int progress) { + public SmeltData(RayTraceResult pos, int progress) { this.pos = pos; this.progress = progress; } - public boolean equalPos(MovingObjectPosition pos) { + public boolean equalPos(RayTraceResult pos) { return pos.getBlockPos().equals(this.pos.getBlockPos()); } } 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 1504d1ba2..6bd7e1b9a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -25,7 +25,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 64fb8069f..615f12b59 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -18,7 +18,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; 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 9ded7b9af..e9ae0f18a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -29,9 +29,9 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.doesWaterVaporize()) { // Adapted from bucket code - MovingObjectPosition mop = getMovingObjectPositionFromPlayer(par3World, par2EntityPlayer, false); + RayTraceResult mop = getRayTraceResultFromPlayer(par3World, par2EntityPlayer, false); - if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + if (mop != null && mop.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { BlockPos hitPos = mop.getBlockPos(); if(!par3World.isBlockModifiable(par2EntityPlayer, hitPos)) return false; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 9714d0e79..f9b8a6f81 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -16,8 +16,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -51,7 +51,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj; boolean unicode = renderer.getUnicodeFlag(); renderer.setUnicodeFlag(true); - String s = EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName())); + String s = TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName())); renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 026cb8d22..23e6eb633 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -24,7 +24,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -90,7 +90,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.shapeless"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.shapeless"))); iconY += 20; } @@ -102,7 +102,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.oredict"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.oredict"))); } GlStateManager.disableBlend(); } 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 db08da15c..51405019e 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.internal.IGuiLexiconEntry; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index 35ff293a9..ee1d122bd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -14,7 +14,7 @@ import java.awt.Desktop; import java.net.URI; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.IGuiLexiconEntry; public class PageGuide extends PageText { @@ -27,7 +27,7 @@ public class PageGuide extends PageText { @Override public void onOpened(IGuiLexiconEntry gui) { - button = new GuiButton(101, gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, StatCollector.translateToLocal("botaniamisc.playVideo")); + button = new GuiButton(101, gui.getLeft() + 30, gui.getTop() + gui.getHeight() - 50, gui.getWidth() - 60, 20, I18n.translateToLocal("botaniamisc.playVideo")); gui.getButtonList().add(button); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 523955f04..b71f71168 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -22,9 +22,9 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -90,7 +90,7 @@ public class PageManaInfusionRecipe extends PageRecipe { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); int ratio = 10; @@ -102,8 +102,8 @@ public class PageManaInfusionRecipe extends PageRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(StatCollector.translateToLocal("botaniamisc.ratio"), ratio); - String dropString = StatCollector.translateToLocal("botaniamisc.drop") + " " + EnumChatFormatting.BOLD + "(?)"; + String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); + String dropString = I18n.translateToLocal("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; boolean hoveringOverDrop = false; @@ -132,8 +132,8 @@ public class PageManaInfusionRecipe extends PageRecipe { if(hoveringOverDrop) { String key = RenderHelper.getKeyDisplayString("key.drop"); - String tip0 = StatCollector.translateToLocal("botaniamisc.dropTip0").replaceAll("%key%", EnumChatFormatting.GREEN + key + EnumChatFormatting.WHITE); - String tip1 = StatCollector.translateToLocal("botaniamisc.dropTip1").replaceAll("%key%", EnumChatFormatting.GREEN + key + EnumChatFormatting.WHITE); + String tip0 = I18n.translateToLocal("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip1 = I18n.translateToLocal("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); RenderHelper.renderTooltip(mx, my, Arrays.asList(tip0, tip1)); } } 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 ac07018e7..0dd31a5a3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -22,10 +22,10 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; @@ -87,7 +87,7 @@ public class PageMultiblock extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); - String s = EnumChatFormatting.BOLD + StatCollector.translateToLocal(getUnlocalizedName()); + String s = TextFormatting.BOLD + I18n.translateToLocal(getUnlocalizedName()); font.setUnicodeFlag(true); font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000); font.setUnicodeFlag(unicode); @@ -104,12 +104,12 @@ public class PageMultiblock extends LexiconPage { GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { List mats = new ArrayList<>(); - mats.add(StatCollector.translateToLocal("botaniamisc.materialsRequired")); + mats.add(I18n.translateToLocal("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { String size = "" + stack.stackSize; if(size.length() < 2) size = "0" + size; - mats.add(" " + EnumChatFormatting.AQUA + size + " " + EnumChatFormatting.GRAY + stack.getDisplayName()); + mats.add(" " + TextFormatting.AQUA + size + " " + TextFormatting.GRAY + stack.getDisplayName()); } vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, mats); @@ -124,7 +124,7 @@ public class PageMultiblock extends LexiconPage { } String getButtonStr() { - return StatCollector.translateToLocal(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); + return I18n.translateToLocal(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 709286060..b3900db71 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -22,7 +22,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -110,7 +110,7 @@ public class PagePetalRecipe extends PageRecipe { boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String stopStr = StatCollector.translateToLocal("botaniamisc.shiftToStopSpin"); + String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); font.setUnicodeFlag(unicode); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 54aaef122..d0b14e9c2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -21,8 +21,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -70,7 +70,7 @@ public class PageRecipe extends LexiconPage { for(String s : tooltipData) { String s_ = s; if(!first) - s_ = EnumChatFormatting.GRAY + s; + s_ = TextFormatting.GRAY + s; parsedTooltip.add(s_); first = false; } @@ -80,12 +80,12 @@ public class PageRecipe extends LexiconPage { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } if(tooltipContainerStack != null) - vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); } tooltipStack = tooltipContainerStack = null; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 65b7a5a57..0c6e71fb5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -16,7 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; @@ -49,7 +49,7 @@ public class PageRuneRecipe extends PagePetalRecipe { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 110, 0x66000000); int ratio = 10; @@ -61,8 +61,8 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(StatCollector.translateToLocal("botaniamisc.ratio"), ratio); - String stopStr = StatCollector.translateToLocal("botaniamisc.shiftToStopSpin"); + String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); + String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index f04d63823..4350a091b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -23,10 +23,10 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -86,7 +86,7 @@ public class PageShedding extends PageEntity { for(String s : tooltipData) { String s_ = s; if(!first) - s_ = EnumChatFormatting.GRAY + s; + s_ = TextFormatting.GRAY + s; parsedTooltip.add(s_); first = false; } @@ -96,7 +96,7 @@ public class PageShedding extends PageEntity { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 70c80a625..43715dddf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -15,7 +15,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.core.handler.ConfigHandler; @@ -54,7 +54,7 @@ public class PageText extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String text = StatCollector.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); + String text = I18n.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
"); List> lines = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 75bd2a345..0e51d10b5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -15,10 +15,10 @@ import java.net.URI; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.ChatStyle; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; import net.minecraftforge.fml.relauncher.Side; @@ -37,9 +37,9 @@ public class PageTutorial extends PageText { @Override public void onOpened(IGuiLexiconEntry gui) { - buttonText = new GuiButton(101, gui.getLeft() + 20, gui.getTop() + gui.getHeight() - 40, 50, 20, StatCollector.translateToLocal("botaniamisc.tutorialText")); + buttonText = new GuiButton(101, gui.getLeft() + 20, gui.getTop() + gui.getHeight() - 40, 50, 20, I18n.translateToLocal("botaniamisc.tutorialText")); if(VIDEO_ENABLED) - buttonVideo = new GuiButton(101, gui.getLeft() + 75, gui.getTop() + gui.getHeight() - 40, 50, 20, StatCollector.translateToLocal("botaniamisc.tutorialVideo")); + buttonVideo = new GuiButton(101, gui.getLeft() + 75, gui.getTop() + gui.getHeight() - 40, 50, 20, I18n.translateToLocal("botaniamisc.tutorialVideo")); gui.getButtonList().add(buttonText); if(VIDEO_ENABLED) @@ -67,7 +67,7 @@ public class PageTutorial extends PageText { if(button == buttonText) { GuiLexicon.startTutorial(); Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon()); - Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); } else if(button == buttonVideo && Desktop.isDesktopSupported()) { try { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index c253dcb11..867a580f4 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -20,8 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -80,10 +80,10 @@ public final class SkyblockWorldEvents { } } } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { - MovingObjectPosition movingobjectposition = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); - if(movingobjectposition != null) { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - if(event.world.getBlockState(movingobjectposition.getBlockPos()).getBlock().getMaterial() == Material.water) { + RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); + if(RayTraceResult != null) { + if (RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if(event.world.getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) From 3bb203e3711479c26c5c0f261dae4e70f996dc4a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 11:07:42 -0500 Subject: [PATCH 440/935] More rename substitutions --- .../botania/client/core/handler/DebugHandler.java | 2 +- .../botania/client/core/handler/HUDHandler.java | 4 ++-- .../client/core/handler/LightningHandler.java | 2 +- .../client/core/handler/MultiblockRenderHandler.java | 11 ++++++++--- .../botania/client/gui/lexicon/GuiLexiconEntry.java | 4 ++-- .../nei/recipe/RecipeHandlerElvenTrade.java | 2 +- .../client/render/entity/RenderSnowballStack.java | 4 ++-- .../client/render/world/SkyblockRenderEvents.java | 2 +- src/main/java/vazkii/botania/common/Botania.java | 10 +++++----- .../vazkii/botania/common/block/BlockAltGrass.java | 2 ++ .../botania/common/block/BlockPistonRelay.java | 8 ++++---- .../subtile/functional/SubTileFallenKanade.java | 2 +- .../subtile/functional/SubTileRannuncarpus.java | 8 ++++---- .../block/tile/corporea/TileCorporeaIndex.java | 6 +++--- .../common/core/command/CommandDownloadLatest.java | 11 ++++++----- .../botania/common/core/command/CommandOpen.java | 12 +++++++----- .../botania/common/core/command/CommandShare.java | 8 ++++---- .../common/core/command/CommandSkyblockSpread.java | 5 +++-- .../botania/common/core/handler/ConfigHandler.java | 6 +++--- .../common/core/version/ThreadDownloadMod.java | 6 +++--- .../botania/common/core/version/VersionChecker.java | 4 ++-- .../botania/common/entity/EntityDoppleganger.java | 10 +++++++--- .../botania/common/entity/EntityPinkWither.java | 4 ++-- .../botania/common/entity/EntityPoolMinecart.java | 4 ++-- .../botania/common/entity/EntityThrowableCopy.java | 3 ++- .../botania/common/entity/EntityThrownItem.java | 2 +- .../vazkii/botania/common/item/ItemGrassSeeds.java | 4 ++-- .../vazkii/botania/common/item/ItemLaputaShard.java | 3 +++ .../java/vazkii/botania/common/item/ItemLexicon.java | 2 +- .../vazkii/botania/common/item/ItemManaMirror.java | 4 ++-- .../vazkii/botania/common/item/ItemOpenBucket.java | 2 +- .../vazkii/botania/common/item/ItemTwigWand.java | 7 +++++-- .../item/equipment/tool/terrasteel/ItemTerraAxe.java | 4 ++-- .../equipment/tool/terrasteel/ItemTerraPick.java | 4 ++++ .../vazkii/botania/common/item/lens/LensWarp.java | 4 ++-- .../common/item/material/ItemManaResource.java | 2 +- .../vazkii/botania/common/item/relic/ItemDice.java | 6 +++--- .../botania/common/item/relic/ItemFlugelEye.java | 4 ++-- .../vazkii/botania/common/item/rod/ItemWaterRod.java | 2 +- .../botania/common/lexicon/page/PageRecipe.java | 2 +- .../botania/common/lexicon/page/PageShedding.java | 2 +- .../botania/common/lexicon/page/PageTutorial.java | 4 ++-- .../vazkii/botania/common/lib/LibObfuscation.java | 2 +- .../botania/common/world/SkyblockWorldEvents.java | 6 +++--- 44 files changed, 116 insertions(+), 90 deletions(-) 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 d203e2399..168e0999a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -52,7 +52,7 @@ public final class DebugHandler { Entity ent = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id); if (ent != null) { World serverWorld = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id).worldObj; - event.left.add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimensionId(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); + event.left.add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimension(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 241327231..b2bd45bb9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -101,8 +101,8 @@ public final class HUDHandler { RayTraceResult pos = mc.objectMouseOver; if(pos != null) { - Block block = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null; - TileEntity tile = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; + Block block = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null; + TileEntity tile = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; if(equippedStack != null) { if(pos != null && equippedStack.getItem() == ModItems.twigWand) { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 707f53732..d24ab673f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -420,7 +420,7 @@ public class LightningHandler { if(mop == null) return prevresistance; - if(mop.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { Block block = world.getBlockState(mop.getBlockPos()).getBlock(); if(world.isAirBlock(mop.getBlockPos())) 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 d9e910cdf..2fbfad3e7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -19,6 +19,11 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -87,7 +92,7 @@ public final class MultiblockRenderHandler { Minecraft mc = Minecraft.getMinecraft(); if(mc.theWorld != null) - dimension = mc.theWorld.provider.getDimensionId(); + dimension = mc.theWorld.provider.getDimension(); } @SubscribeEvent @@ -109,7 +114,7 @@ public final class MultiblockRenderHandler { } private void renderPlayerLook(EntityPlayer player, RayTraceResult src) { - if(currentMultiblock != null && dimension == player.worldObj.provider.getDimensionId()) { + if(currentMultiblock != null && dimension == player.worldObj.provider.getDimension()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); GlStateManager.pushMatrix(); @@ -132,7 +137,7 @@ public final class MultiblockRenderHandler { if(!didAny) { setMultiblock(null); - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new Style().setColor(TextFormatting.GREEN))); } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index ae1b0ecc6..8bab0d91d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -20,7 +20,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; @@ -214,7 +214,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa tutorial.poll(); positionTutorialArrow(); if(tutorial.isEmpty()) { - mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new Style().setColor(TextFormatting.RED))); hasTutorialArrow = false; } } diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 820dfe6be..656c10817 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -8,7 +8,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; 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 016f932b1..b5f62d79d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -9,7 +9,7 @@ package vazkii.botania.client.render.entity; import com.google.common.base.Function; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.Entity; @@ -27,7 +27,7 @@ public class RenderSnowballStack extends RenderSnowball { } @Override - public ItemStack func_177082_d(T entity) { + public ItemStack getPotion(T entity) { return stackGetter.apply(entity); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 0b5145d8c..39890a948 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -22,7 +22,7 @@ public final class SkyblockRenderEvents { @SubscribeEvent public void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; - if(ConfigHandler.enableFancySkybox && world.provider.getDimensionId() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { + if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 1173eae98..ea1700be6 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -15,7 +15,7 @@ import net.minecraft.event.ClickEvent; import net.minecraft.event.HoverEvent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.common.MinecraftForge; @@ -87,14 +87,14 @@ public class Botania { EntityPlayer player = evt.player; ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.nag"); - message.setChatStyle(new ChatStyle().setColor(TextFormatting.RED)); + message.setChatStyle(new Style().setColor(TextFormatting.RED)); ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report"); - message2.setChatStyle(new ChatStyle().setColor(TextFormatting.YELLOW)); + message2.setChatStyle(new Style().setColor(TextFormatting.YELLOW)); ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues"); - url.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); - url.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); + url.getStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); + url.getStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); player.addChatComponentMessage(message); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index ead850123..04604f0dd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -24,6 +24,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index a883758bb..c89c24664 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -79,7 +79,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @Override public void breakBlock(World par1World, BlockPos pos, IBlockState state) { - mapCoords(par1World.provider.getDimensionId(), pos, 2); + mapCoords(par1World.provider.getDimension(), pos, 2); } static void mapCoords(int world, BlockPos pos, int time) { @@ -116,7 +116,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl return false; if(!player.isSneaking()) { - playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimensionId(), pos)); + playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimension(), pos)); world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); @@ -212,7 +212,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl world.spawnEntityInWorld(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); } checkedCoords.add(s); - newPos = new DimWithPos(world.provider.getDimensionId(), pos.offset(dir)); + newPos = new DimWithPos(world.provider.getDimension(), pos.offset(dir)); } if(mappedPositions.containsKey(s)) { @@ -230,7 +230,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { world.setBlockState(pos2, Blocks.air.getDefaultState()); world.setBlockState(pos2.offset(dir), srcState, 1 | 2); - mappedPositions.put(s, new DimWithPos(world.provider.getDimensionId(), pos2.offset(dir))); + mappedPositions.put(s, new DimWithPos(world.provider.getDimension(), pos2.offset(dir))); } } 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 fac46cef6..303b09ca0 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 @@ -31,7 +31,7 @@ public class SubTileFallenKanade extends SubTileFunctional { final int cost = 120; - if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimensionId() != 1) { + if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimension() != 1) { 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(Potion.regeneration) == null && mana >= cost ) { 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 e05b74440..89a663867 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 @@ -24,7 +24,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemRedstone; -import net.minecraft.item.ItemReed; +import net.minecraft.item.ItemBlockSpecial; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -92,7 +92,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { ItemStack stack = item.getEntityItem(); Item stackItem = stack.getItem(); - if(stackItem instanceof ItemBlock || stackItem instanceof ItemReed || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { + if(stackItem instanceof ItemBlock || stackItem instanceof ItemBlockSpecial || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { if(!scanned) { for(int i = -rangePlace; i < rangePlace + 1; i++) for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) @@ -116,8 +116,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords); if(stackItem instanceof ItemBlock) blockToPlace = ((ItemBlock) stackItem).block; - else if(stackItem instanceof ItemReed) - blockToPlace = ReflectionHelper.getPrivateValue(ItemReed.class, (ItemReed) stackItem, LibObfuscation.REED_ITEM); + else if(stackItem instanceof ItemBlockSpecial) + blockToPlace = ReflectionHelper.getPrivateValue(ItemBlockSpecial.class, (ItemBlockSpecial) stackItem, LibObfuscation.REED_ITEM); else if(stackItem instanceof ItemRedstone) blockToPlace = Blocks.redstone_wire; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index db12fb038..c4c23e7e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -26,7 +26,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.event.ServerChatEvent; @@ -209,7 +209,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static boolean isInRangeOfIndex(EntityPlayer player, TileCorporeaIndex index) { - return player.worldObj.provider.getDimensionId() == index.worldObj.provider.getDimensionId() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.posY + (player.worldObj.isRemote ? 0 : 1.6)) < 5; + return player.worldObj.provider.getDimension() == index.worldObj.provider.getDimension() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.posY + (player.worldObj.isRemote ? 0 : 1.6)) < 5; } public static void addPattern(String pattern, IRegexStacker stacker) { @@ -268,7 +268,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); - event.player.addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); + event.player.addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); if(CorporeaHelper.lastRequestExtractions >= 50000) event.player.addStat(ModAchievements.superCorporeaRequest, 1); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index df4ce11a0..a7976a1c5 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -12,8 +12,9 @@ package vazkii.botania.common.core.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; @@ -33,15 +34,15 @@ public class CommandDownloadLatest extends CommandBase { } @Override - public void processCommand(ICommandSender var1, String[] var2) { + public void execute(MinecraftServer server, ICommandSender var1, String[] var2) { if(!ENABLED) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setChatStyle(new Style().setColor(TextFormatting.RED))); else if(var2.length == 1) if(VersionChecker.downloadedFile) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new Style().setColor(TextFormatting.RED))); else if(VersionChecker.startedDownload) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new Style().setColor(TextFormatting.RED))); else new ThreadDownloadMod("Botania " + var2[0] + ".jar"); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 165073ac3..9814ed898 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -14,8 +14,10 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.item.ItemLexicon; @@ -32,14 +34,14 @@ public class CommandOpen extends CommandBase { } @Override - public void processCommand(ICommandSender sender, String[] args) { + public void execute(MinecraftServer server, ICommandSender sender, String[] args) { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() instanceof ItemLexicon) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); - } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new Style().setColor(TextFormatting.RED))); } } @@ -50,8 +52,8 @@ public class CommandOpen extends CommandBase { } @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return p_71519_1_ instanceof EntityPlayer; + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { + return sender instanceof EntityPlayer; } } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index cabfc4850..341cd346f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -30,14 +30,14 @@ public class CommandShare extends CommandBase { } @Override - public void processCommand(ICommandSender sender, String[] args) { + public void execute(MinecraftServer server, ICommandSender sender, String[] args) { String json = I18n.translateToLocal("botaniamisc.shareMsg"); json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); json = json.replaceAll("%entryname%", I18n.translateToLocal(args[0])); ITextComponent component = ITextComponent.Serializer.jsonToComponent(json); - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(component); + server.getPlayerList().sendChatMsg(component); } @@ -47,7 +47,7 @@ public class CommandShare extends CommandBase { } @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return p_71519_1_ instanceof EntityPlayer; + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { + return sender instanceof EntityPlayer; } } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index d2d465ca5..3243c24de 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -14,6 +14,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; @@ -37,7 +38,7 @@ public class CommandSkyblockSpread extends CommandBase { } @Override - public void processCommand(ICommandSender sender, String[] args) throws CommandException { + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { int maxAllowed = 1000000; int minAllowed = 250; int minDist = 100; @@ -51,7 +52,7 @@ public class CommandSkyblockSpread extends CommandBase { if(maxrange < minAllowed) throw new CommandException(I18n.translateToLocal("botaniamisc.skyblockRangeTooLow")); - EntityPlayer player = getPlayer(sender, args[0]); + EntityPlayer player = getPlayer(server, sender, args[0]); if(player != null) { BlockPos spawn = player.worldObj.getSpawnPoint(); int x, z; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 87f351c40..aa31b274e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -19,7 +19,7 @@ import java.util.Map; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; @@ -395,9 +395,9 @@ public final class ConfigHandler { if(changes.size() == 0) return; - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new ChatStyle().setColor(TextFormatting.GOLD))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new Style().setColor(TextFormatting.GOLD))); for(String change : changes) - player.addChatMessage(new TextComponentString(change).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatMessage(new TextComponentString(change).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); } public void addMappingInt(int version, String key, int val) { diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 24fa2bfd8..183154826 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -19,7 +19,7 @@ import java.net.URL; import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; @@ -82,7 +82,7 @@ public class ThreadDownloadMod extends Thread { f.renameTo(f1); if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new Style().setColor(TextFormatting.GREEN))); Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; @@ -101,6 +101,6 @@ public class ThreadDownloadMod extends Thread { private void sendError() { if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setChatStyle(new Style().setColor(TextFormatting.RED))); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 7b21bfb4a..4bd9d7884 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -13,7 +13,7 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; @@ -47,7 +47,7 @@ public final class VersionChecker { int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 099bea0e9..d4d18b8ce 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -47,7 +47,11 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; @@ -145,7 +149,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(par3World.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -156,7 +160,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new Style().setColor(TextFormatting.RED))); return false; } } @@ -175,7 +179,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setChatStyle(new Style().setColor(TextFormatting.RED))); return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 5bdac9e3b..3adc90cf7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.entity; -import net.minecraft.entity.ai.EntityAIArrowAttack; +import net.minecraft.entity.ai.EntityAIAttackRanged; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks; @@ -30,7 +30,7 @@ public class EntityPinkWither extends EntityWither { Iterator taskIter = this.tasks.taskEntries.iterator(); while (taskIter.hasNext()) { EntityAITasks.EntityAITaskEntry entry = taskIter.next(); - if (entry.action instanceof EntityAIArrowAttack) { + if (entry.action instanceof EntityAIAttackRanged) { taskIter.remove(); // Remove firing wither skulls } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 29da2d202..076e818b4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -60,8 +60,8 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public EnumMinecartType getMinecartType() { - return EnumMinecartType.RIDEABLE; + public EntityMinecart.Type getType() { + return Type.RIDEABLE; } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index f692b814a..808948c65 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; @@ -238,7 +239,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (RayTraceResult != null) { - if (RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.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()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 27774b8d1..f6c45f2ab 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 == RayTraceResult.MovingObjectType.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) + if (RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) { setPortal(RayTraceResult.getBlockPos()); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index b5de598e5..40064a4ea 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -161,7 +161,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return; if(event.phase == Phase.END) { - int dim = event.world.provider.getDimensionId(); + int dim = event.world.provider.getDimension(); if(blockSwappers.containsKey(dim)) { Set swappers = blockSwappers.get(dim); @@ -197,7 +197,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return swapper; // If a set for the dimension doesn't exist, create it. - int dim = world.provider.getDimensionId(); + int dim = world.provider.getDimension(); if(!blockSwappers.containsKey(dim)) blockSwappers.put(dim, new HashSet<>()); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index f05fc5b18..49a1f1aa1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -24,6 +24,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 28aaad58e..5dff0f3d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -133,7 +133,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { LexiconEntry entry = getEntryFromForce(par1ItemStack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(TextFormatting.RED))); + else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setChatStyle(new Style().setColor(TextFormatting.RED))); setForcedPage(par1ItemStack, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 8f34fa6f3..82e8befc1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -142,7 +142,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte ItemNBTHelper.setInt(stack, TAG_POS_X, pool == null ? 0 : pool.getPos().getX()); ItemNBTHelper.setInt(stack, TAG_POS_Y, pool == null ? -1 : pool.getPos().getY()); ItemNBTHelper.setInt(stack, TAG_POS_Z, pool == null ? 0 : pool.getPos().getZ()); - ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.getDimensionId()); + ItemNBTHelper.setInt(stack, TAG_DIM, pool == null ? 0 : pool.getWorld().provider.getDimension()); } public BlockPos getPoolCoords(ItemStack stack) { @@ -168,7 +168,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte int dim = getDimension(stack); World world = null; for(World w : server.worldServers) - if(w.provider.getDimensionId() == dim) { + if(w.provider.getDimension() == dim) { world = w; break; } diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 4426c8656..d986229d7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -33,7 +33,7 @@ public class ItemOpenBucket extends ItemMod { if(RayTraceResult == null) return par1ItemStack; else { - if(RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if(RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos pos = RayTraceResult.getBlockPos(); if(!par2World.isBlockModifiable(par3EntityPlayer, pos)) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index e2bc0b34d..15de9239a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -25,6 +25,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -131,7 +134,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return wanded; } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { BlockPistonRelay.DimWithPos bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); - BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimensionId(), pos); + BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimension(), pos); BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); @@ -269,7 +272,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return bound; RayTraceResult pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null && pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if(pos != null && pos.typeOfHit == RayTraceResult.Type.BLOCK) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); 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 6cb6a89ac..9841007be 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 @@ -116,7 +116,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker return; if(event.phase == Phase.END) { - int dim = event.world.provider.getDimensionId(); + int dim = event.world.provider.getDimension(); if(blockSwappers.containsKey(dim)) { Set swappers = blockSwappers.get(dim); @@ -157,7 +157,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker return swapper; // If the mapping for this dimension doesn't exist, create it. - int dim = world.provider.getDimensionId(); + int dim = world.provider.getDimension(); if(!blockSwappers.containsKey(dim)) blockSwappers.put(dim, new HashSet<>()); 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 ae558a1c1..c1fa35d9a 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 @@ -22,6 +22,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.oredict.RecipeSorter; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index fc6777f48..196b74e55 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -28,9 +28,9 @@ public class LensWarp extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - BlockPistonRelay.DimWithPos key = BlockPistonRelay.mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimensionId(), pos.getBlockPos())); + BlockPistonRelay.DimWithPos key = BlockPistonRelay.mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); if(key != null) { - if(key.dim == entity.worldObj.provider.getDimensionId()) { + if(key.dim == entity.worldObj.provider.getDimension()) { entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5); burst.setCollidedAt(key.blockPos); return false; 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 45506b837..a1d2c3e5d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -59,7 +59,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; - boolean ender = event.world.provider.getDimensionId() == 1; + boolean ender = event.world.provider.getDimension() == 1; if(rightEvent && correctStack && ender) { RayTraceResult pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); 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 8c4ed5b5d..0b10c8f4a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -19,7 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.api.item.IRelic; @@ -69,12 +69,12 @@ public class ItemDice extends ItemRelic { world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); if(hasRelicAlready(player, relic)) { - player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); stack.stackSize--; return stack; } - player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); return relicStacks[relic].copy(); } 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 63c40da53..03cdc8cc5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -52,7 +52,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs ItemNBTHelper.setInt(stack, TAG_X, pos.getX()); ItemNBTHelper.setInt(stack, TAG_Y, pos.getY()); ItemNBTHelper.setInt(stack, TAG_Z, pos.getZ()); - ItemNBTHelper.setInt(stack, TAG_DIMENSION, world.provider.getDimensionId()); + ItemNBTHelper.setInt(stack, TAG_DIMENSION, world.provider.getDimension()); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 5F); } } @@ -83,7 +83,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, player.posX, player.posY, player.posZ) * 10); - if(y > -1 && dim == world.provider.getDimensionId() && ManaItemHandler.requestManaExact(stack, player, cost, true)) { + 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); 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 e9ae0f18a..a3dfd80ab 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -31,7 +31,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { // Adapted from bucket code RayTraceResult mop = getRayTraceResultFromPlayer(par3World, par2EntityPlayer, false); - if (mop != null && mop.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos hitPos = mop.getBlockPos(); if(!par3World.isBlockModifiable(par2EntityPlayer, hitPos)) return false; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index d0b14e9c2..119d0f683 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -19,7 +19,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 4350a091b..570f337cc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -19,7 +19,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 0e51d10b5..436071738 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -16,7 +16,7 @@ import java.net.URI; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.ChatStyle; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -67,7 +67,7 @@ public class PageTutorial extends PageText { if(button == buttonText) { GuiLexicon.startTutorial(); Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon()); - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new Style().setColor(TextFormatting.GREEN))); } else if(button == buttonVideo && Desktop.isDesktopSupported()) { try { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c10625aca..bcd7a3dba 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -45,7 +45,7 @@ public final class LibObfuscation { // Entity public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "ab" }; - // ItemReed + // ItemBlockSpecial public static final String[] REED_ITEM = new String[] { "block", "field_150935_a", "a" }; // EntityAnimal diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 867a580f4..07aaaa406 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -54,7 +54,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.getDimensionId() == 0) + if(world.getBlockState(coords.down(4)).getBlock() != Blocks.bedrock && world.provider.getDimension() == 0) spawnPlayer(player, coords, false); } @@ -82,7 +82,7 @@ public final class SkyblockWorldEvents { } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); if(RayTraceResult != null) { - if (RayTraceResult.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) { + if (RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) { if(event.world.getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize; @@ -127,7 +127,7 @@ public final class SkyblockWorldEvents { if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); - pmp.setSpawnChunk(pos, true, player.worldObj.provider.getDimensionId()); + pmp.setSpawnChunk(pos, true, player.worldObj.provider.getDimension()); player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } From 58e06ae86b827779f6b97e97fb279c7c8bf1e572 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 12:30:10 -0500 Subject: [PATCH 441/935] Most of API --- .../java/vazkii/botania/api/BotaniaAPI.java | 9 +-- .../botania/api/sound/BotaniaSoundEvents.java | 58 +++++++++++++++++++ .../api/subtile/SubTileFunctional.java | 4 +- .../api/subtile/SubTileGenerating.java | 9 ++- 4 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index ebdf94c7d..d9e071786 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -29,6 +29,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -103,16 +104,16 @@ public final class BotaniaAPI { public static Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26); + public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_iron); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18); + public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_iron); public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java new file mode 100644 index 000000000..971f1794e --- /dev/null +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -0,0 +1,58 @@ +package vazkii.botania.api.sound; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; + +/** + * Use these to play Botania sounds. + * Do not access this class before Botania preinits! + */ +public final class BotaniaSoundEvents { + + public static final SoundEvent airRod = getRegisteredSoundEvent("botania:airRod"); + public static final SoundEvent agricarnation = getRegisteredSoundEvent("botania:agricarnation"); + public static final SoundEvent altarCraft = getRegisteredSoundEvent("botania:altarCraft"); + public static final SoundEvent babylonAttack = getRegisteredSoundEvent("botania:babylonAttack"); + public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("botania:babylonSpawn"); + public static final SoundEvent bellows = getRegisteredSoundEvent("botania:bellows"); + public static final SoundEvent bifrostRod = getRegisteredSoundEvent("botania:bifrostRod"); + public static final SoundEvent blackLotus = getRegisteredSoundEvent("botania:blackLotus"); + public static final SoundEvent dash = getRegisteredSoundEvent("botania:dash"); + public static final SoundEvent ding = getRegisteredSoundEvent("botania:ding"); + public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); + public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); + public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); + public static final SoundEvent enchanterBlock = getRegisteredSoundEvent("botania:enchanterBlock"); + public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); + public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); + public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); + public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("botania:gaiaTrap"); + public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("botania:goldenLaurel"); + public static final SoundEvent holyCloak = getRegisteredSoundEvent("botania:holyCloak"); + public static final SoundEvent laputaStart = getRegisteredSoundEvent("botania:laputaStart"); + public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("botania:lexiconOpen"); + public static final SoundEvent lexiconPage = getRegisteredSoundEvent("botania:lexiconPage"); + public static final SoundEvent lightRelay = getRegisteredSoundEvent("botania:lightRelay"); + public static final SoundEvent manaBlaster = getRegisteredSoundEvent("botania:manaBlaster"); + public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("botania:manaPoolCraft"); + public static final SoundEvent missile = getRegisteredSoundEvent("botania:missile"); + public static final SoundEvent orechid = getRegisteredSoundEvent("botania:orechid"); + public static final SoundEvent potionCreate = getRegisteredSoundEvent("botania:potionCreate"); + public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("botania:runeAltarCraft"); + public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("botania:runeAltarStart"); + public static final SoundEvent spreaderFire = getRegisteredSoundEvent("botania:spreaderFire"); + public static final SoundEvent starcaller = getRegisteredSoundEvent("botania:starcaller"); + public static final SoundEvent terraBlade = getRegisteredSoundEvent("botania:terraBlade"); + public static final SoundEvent terraformRod = getRegisteredSoundEvent("botania:terraformRod"); + public static final SoundEvent terraPickMode = getRegisteredSoundEvent("botania:terraPickMode"); + public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("botania:terrasteelCraft"); + public static final SoundEvent thermalily = getRegisteredSoundEvent("botania:thermalily"); + public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); + public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); + + private static SoundEvent getRegisteredSoundEvent(String name) { + return SoundEvent.soundEventRegistry.getObject(new ResourceLocation(name)); + } + + private BotaniaSoundEvents() {} +} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 0852ee814..2161a0e49 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -18,12 +18,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.api.sound.BotaniaSoundEvents; /** * The basic class for a Functional Flower. @@ -133,7 +135,7 @@ public class SubTileFunctional extends SubTileEntity { return false; knownMana = mana; - player.worldObj.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index d3a08e371..e20ce2820 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -23,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; @@ -30,6 +31,7 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; +import vazkii.botania.api.sound.BotaniaSoundEvents; /** * The basic class for a Generating Flower. @@ -99,8 +101,9 @@ public class SubTileGenerating extends SubTileEntity { int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { - supertile.getWorld().playAuxSFX(2001, supertile.getPos(), Block.getIdFromBlock(supertile.getBlockType())); - if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.UP)) + IBlockState state = supertile.getWorld().getBlockState(supertile.getPos()); + supertile.getWorld().playAuxSFX(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()); else supertile.getWorld().setBlockToAir(supertile.getPos()); } @@ -219,7 +222,7 @@ public class SubTileGenerating extends SubTileEntity { sync(); knownMana = mana; - player.worldObj.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } From 644d6553d1b7b7d17796d970c2877cc03e80c936 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 13:17:33 -0500 Subject: [PATCH 442/935] Large amounts of stuff in client --- .../core/handler/BoundTileRenderer.java | 18 +++++-- .../core/handler/ClientTickHandler.java | 14 ++---- .../handler/ContributorFancinessHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 41 +++++++++------- .../core/handler/MiscellaneousIcons.java | 14 +++--- .../client/core/handler/ModelHandler.java | 4 +- .../core/handler/MultiblockRenderHandler.java | 1 - .../core/handler/RedStringRenderer.java | 3 +- .../client/core/handler/RenderLexicon.java | 3 +- .../java/vazkii/botania/client/fx/FXWisp.java | 18 +++---- .../botania/client/gui/bag/GuiFlowerBag.java | 3 +- .../client/model/FloatingFlowerModel.java | 4 +- .../botania/client/model/LexiconModel.java | 15 +++--- .../botania/client/model/PlatformModel.java | 39 ++++++--------- .../client/model/SpecialFlowerModel.java | 10 ++-- .../common/core/helper/PlayerHelper.java | 48 +++++++++++++++++++ 16 files changed, 138 insertions(+), 99 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 22a1ccf07..5aa1470f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -14,6 +14,7 @@ import java.awt.Color; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -48,10 +49,16 @@ public final class BoundTileRenderer { // todo 1.8 Tessellator.renderingVertexBuffer = false; EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getCurrentEquippedItem(); int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); - if(stack != null && stack.getItem() instanceof ICoordBoundItem) { - BlockPos coords = ((ICoordBoundItem) stack.getItem()).getBinding(stack); + + if(player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { + BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); + if(coords != null) + renderBlockOutlineAt(coords, color); + } + + if(player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ICoordBoundItem) { + BlockPos coords = ((ICoordBoundItem) player.getHeldItemOffhand().getItem()).getBinding(player.getHeldItemOffhand()); if(coords != null) renderBlockOutlineAt(coords, color); } @@ -112,14 +119,15 @@ public final class BoundTileRenderer { GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); World world = Minecraft.getMinecraft().theWorld; - Block block = world.getBlockState(pos).getBlock(); + IBlockState state = world.getBlockState(pos); + Block block = state.getBlock(); drawWireframe : { if(block != null) { AxisAlignedBB axis; if(block instanceof IWireframeAABBProvider) axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos); - else axis = block.getSelectedBoundingBox(world, pos); + else axis = state.getSelectedBoundingBox(world, pos); if(axis == null) break drawWireframe; diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 7708a1f60..5a7577a76 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -10,13 +10,10 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; @@ -25,11 +22,12 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.item.ItemTwigWand; +import vazkii.botania.common.core.helper.PlayerHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; +import vazkii.botania.common.item.ModItems; public class ClientTickHandler { @@ -76,10 +74,8 @@ public class ClientTickHandler { EntityPlayer player = Minecraft.getMinecraft().thePlayer; if(player != null) { - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemTwigWand) { - List list = new ArrayList<>(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); - for(TileSignature sig : list) { + if(PlayerHelper.hasHeldItemClass(player, ModItems.twigWand)) { + for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld))) { if(!sig.remoteWorld) continue; 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 9a2dfb5b5..b3f163c1f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -180,7 +180,7 @@ public final class ContributorFancinessHandler implements LayerRenderer 0) { int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); int color = 0x00CC00 + (alpha << 24); - String disp = I18n.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem())); + String disp = I18n.translateToLocal(ItemTwigWand.getModeString(stack)); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; @@ -332,8 +336,9 @@ public final class HUDHandler { profiler.endSection(); } - private void drawLexiconHUD(ItemStack stack, Block block, RayTraceResult pos, ScaledResolution res) { + private void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); + Block block = state.getBlock(); Profiler profiler = mc.mcProfiler; profiler.startSection("lexicon"); @@ -348,7 +353,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, stack); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; @@ -361,7 +366,7 @@ public final class HUDHandler { if(!draw && pos.entityHit == null) { profiler.startSection("wikiLookup"); - if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { + if(!block.isAir(state, mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); String url = provider.getWikiURL(mc.theWorld, pos, mc.thePlayer); if(url != null && !url.isEmpty()) { 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 a30ba5339..0f620d535 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -99,19 +99,19 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { // Floating flowers - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); // Pylon item model - evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); // Platforms - evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); // Lexicon - evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); } @SubscribeEvent 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 aa59fedd5..e44406288 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -710,8 +710,8 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); // Ignore vanilla facing, variant in double flower - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); + ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); 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 2fbfad3e7..c0ff9d6fb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -99,7 +99,6 @@ public final class MultiblockRenderHandler { public void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { - mc.thePlayer.getCurrentEquippedItem(); renderPlayerLook(mc.thePlayer, mc.objectMouseOver); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 7a29e100d..4de67f6f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -58,7 +59,7 @@ public final class RedStringRenderer { public static void tick() { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - boolean hasWand = player != null && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == ModItems.twigWand; + boolean hasWand = player != null && PlayerHelper.hasHeldItem(player, ModItems.twigWand); if(sizeAlpha > 0F && !hasWand) sizeAlpha -= 0.1F; else if(sizeAlpha < 1F &&hasWand) diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index c12eeecbe..ba76b54d7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -21,6 +21,7 @@ import org.lwjgl.util.glu.Project; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; @@ -33,7 +34,7 @@ public class RenderLexicon { @SubscribeEvent public void renderItem(RenderHandEvent evt) { Minecraft mc = Minecraft.getMinecraft(); - if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || mc.thePlayer.getHeldItem() == null || mc.thePlayer.getHeldItem().getItem() != ModItems.lexicon) + if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) return; evt.setCanceled(true); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index df685a3aa..8a6d45513 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -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; - motionX = motionY = motionZ = 0; + xSpeed = ySpeed = zSpeed = 0; particleScale *= size; moteParticleScale = particleScale; particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); @@ -148,15 +148,15 @@ public class FXWisp extends EntityFX { prevPosZ = posZ; if (particleAge++ >= particleMaxAge) - setDead(); + setExpired(); - motionY -= 0.04D * particleGravity; - posX += motionX; - posY += motionY; - posZ += motionZ; - motionX *= 0.98000001907348633D; - motionY *= 0.98000001907348633D; - motionZ *= 0.98000001907348633D; + ySpeed -= 0.04D * particleGravity; + posX += xSpeed; + posY += ySpeed; + posZ += zSpeed; + xSpeed *= 0.98000001907348633D; + ySpeed *= 0.98000001907348633D; + zSpeed *= 0.98000001907348633D; } public void setGravity(float value) { diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 417623f03..88e3ab856 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -37,7 +36,7 @@ public class GuiFlowerBag extends GuiContainer { protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { String s = I18n.translateToLocal("item.botania:flowerBag.name"); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); - fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 48a3009ac..a6db60a7a 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -16,17 +16,15 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.ISmartBlockModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 5de57b240..94a039b7a 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -1,17 +1,15 @@ package vazkii.botania.client.model; import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; @@ -25,19 +23,18 @@ public class LexiconModel implements IPerspectiveAwareModel { private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON && ConfigHandler.lexicon3dModel) + if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND && ConfigHandler.lexicon3dModel) // todo 1.9 handedness return Pair.of(this, null); return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } - @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing face) { return ImmutableList.of(); } - @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index deb94a255..1995d7f6a 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -13,6 +13,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -25,7 +26,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockCamo; @@ -34,12 +34,12 @@ import vazkii.botania.common.block.tile.TileCamo; import java.util.List; -public class PlatformModel implements ISmartBlockModel { +public class PlatformModel implements IBakedModel { @Override - public IBakedModel handleBlockState(IBlockState state) { + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(state.getBlock() != ModBlocks.platform) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand); BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); @@ -47,14 +47,14 @@ public class PlatformModel implements ISmartBlockModel { BlockPos heldPos = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_POS); if (heldWorld == null || heldPos == null) { - return this; + return ImmutableList.of(); } Minecraft mc = Minecraft.getMinecraft(); if(heldState == null && layer == BlockRenderLayer.SOLID) { // No camo ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); - return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); + return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand); } else if(heldState != null) { if(heldState.getBlock().canRenderInLayer(layer)) { IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); @@ -62,27 +62,13 @@ public class PlatformModel implements ISmartBlockModel { // Steal camo's model IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(actual); - if(model instanceof ISmartBlockModel) { - // Their model can be smart too - IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); - model = ((ISmartBlockModel) model).handleBlockState(extended); - } - - return model; + // Their model can be smart too + IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); + return model.getQuads(extended, side, rand); } } - return this; // This smart model has no quads as seen below, so nothing actually renders - } - - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } - - @Override - public List getGeneralQuads() { - return ImmutableList.of(); + return ImmutableList.of(); // Nothing renders } @Override @@ -110,6 +96,11 @@ public class PlatformModel implements ISmartBlockModel { return ItemCameraTransforms.DEFAULT; } + @Override + public ItemOverrideList getOverrides() { + return ItemOverrideList.NONE; + } + private static class FakeBlockAccess implements IBlockAccess { private final IBlockAccess compose; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 93f49fb4a..d207fcc40 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -19,27 +19,23 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ICustomModelLoader; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ISmartBlockModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; @@ -51,7 +47,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -public class SpecialFlowerModel implements IModelCustomData { +public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); @@ -83,7 +79,7 @@ public class SpecialFlowerModel implements IModelCustomData } @Override - public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); } diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java new file mode 100644 index 000000000..e612d93d3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -0,0 +1,48 @@ +package vazkii.botania.common.core.helper; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public final class PlayerHelper { + + public static boolean hasAnyHeldItem(EntityPlayer player) { + return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; + } + + public static boolean hasHeldItem(EntityPlayer player, Item item) { + return (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item) + || (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item); + } + + public static boolean hasHeldItemClass(EntityPlayer player, Item template) { + return hasHeldItemClass(player, template.getClass()); + } + + public static boolean hasHeldItemClass(EntityPlayer player, Class template) { + return (player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass())) + || (player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass())); + } + + public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && item == main.getItem()) { + return main; + } else if(offhand != null && item == offhand.getItem()) { + return offhand; + } else return null; + } + + public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { + ItemStack main = player.getHeldItemMainhand(); + ItemStack offhand = player.getHeldItemOffhand(); + if(main != null && template.isAssignableFrom(main.getItem().getClass())) { + return main; + } else if(offhand != null && template.isAssignableFrom(offhand.getItem().getClass())) { + return offhand; + } else return null; + } + + private PlayerHelper() {} +} From 017829927f7d891fcab37609cc6f846f4407d51f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 13:26:42 -0500 Subject: [PATCH 443/935] Some blocks --- .../botania/common/block/corporea/BlockCorporeaIndex.java | 7 ++++--- .../vazkii/botania/common/block/decor/Block18Stone.java | 2 +- .../vazkii/botania/common/block/decor/BlockDirtPath.java | 6 +++--- .../botania/common/block/decor/BlockFloatingFlower.java | 7 ++++--- .../vazkii/botania/common/block/decor/BlockStarfield.java | 4 ++-- .../botania/common/block/decor/slabs/BlockLivingSlab.java | 2 +- .../botania/common/block/decor/slabs/BlockModSlab.java | 4 ++-- .../vazkii/botania/common/block/mana/BlockForestDrum.java | 4 ++-- 8 files changed, 19 insertions(+), 17 deletions(-) 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 2d475f2cc..14c37d95a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -17,6 +17,7 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; @@ -52,8 +53,8 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType() { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override @@ -67,7 +68,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) + public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) { float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); 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 3302d5e66..521710d4a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -85,7 +85,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 569ff3726..886756bf4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -80,7 +80,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @@ -118,9 +118,9 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public void onTickEnd(TickEvent.WorldTickEvent event) { if(event.world.isRemote || event.phase != TickEvent.Phase.END) return; - for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.movementSpeed).hasModifier(speedBoost))) { + for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).hasModifier(speedBoost))) { if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != this) { - player.getEntityAttribute(SharedMonsterAttributes.movementSpeed).removeModifier(speedBoost); + player.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).removeModifier(speedBoost); } } // todo 1.8 there's probably a better way to do this. } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 2f924f07d..86e322f54 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -26,6 +26,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -82,8 +83,8 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType() { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override @@ -117,7 +118,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); if (d0 > 2.5D) { 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 f9ac7c879..4403372b8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -60,12 +60,12 @@ public class BlockStarfield extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index d2b6f0ec1..ffd098970 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -7,7 +7,7 @@ public abstract class BlockLivingSlab extends BlockModSlab { IBlockState sourceState; public BlockLivingSlab(boolean full, IBlockState state) { - super(full, state.getBlock().getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); + super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); setStepSound(state.getBlock().stepSound); this.sourceState = state; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 897160d38..078226e48 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -68,7 +68,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @@ -107,7 +107,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public final Object getVariant(ItemStack stack) { + public final Comparable getTypeForItem(ItemStack stack) { return DummyEnum.SINGLETON; } 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 d7a07bec6..3b436078a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -87,12 +87,12 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } From cfbf2cc53864b9dd772d3ca67521ee27821a584e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 14:47:38 -0500 Subject: [PATCH 444/935] Entities --- .../java/vazkii/botania/common/Botania.java | 8 +- .../common/entity/EntityBabylonWeapon.java | 66 ++--- .../common/entity/EntityDoppleganger.java | 129 +++++----- .../common/entity/EntityEnderAirBottle.java | 6 +- .../common/entity/EntityFlameRing.java | 4 +- .../common/entity/EntityMagicLandmine.java | 9 +- .../common/entity/EntityManaBurst.java | 99 ++++---- .../common/entity/EntityPinkWither.java | 6 +- .../common/entity/EntityPoolMinecart.java | 10 +- .../common/entity/EntityThornChakram.java | 24 +- .../common/entity/EntityThrowableCopy.java | 226 ++++++++++-------- .../common/entity/EntityThrownItem.java | 2 +- .../botania/common/entity/EntityVineBall.java | 31 ++- .../botania/common/lexicon/page/PageBrew.java | 5 +- 14 files changed, 343 insertions(+), 282 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ea1700be6..671935ca4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -11,8 +11,8 @@ package vazkii.botania.common; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.event.ClickEvent; -import net.minecraft.event.HoverEvent; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.event.HoverEvent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; @@ -93,8 +93,8 @@ public class Botania { message2.setChatStyle(new Style().setColor(TextFormatting.YELLOW)); ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues"); - url.getStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); - url.getStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); + url.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); + url.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); player.addChatComponentMessage(message); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 52b169a78..23053701b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -16,11 +16,18 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import scala.tools.nsc.backend.icode.TypeKinds; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -35,6 +42,13 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { private static final String TAG_DELAY = "delay"; private static final String TAG_ROTATION = "rotation"; + private static final DataParameter CHARGING = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.BOOLEAN); + private static final DataParameter VARIETY = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.VARINT); + private static final DataParameter CHARGE_TICKS = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.VARINT); + private static final DataParameter LIVE_TICKS = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.VARINT); + private static final DataParameter DELAY = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.VARINT); + private static final DataParameter ROTATION = EntityDataManager.createKey(EntityBabylonWeapon.class, DataSerializers.FLOAT); + public EntityBabylonWeapon(World world) { super(world); } @@ -45,21 +59,15 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { @Override protected void entityInit() { + super.entityInit(); setSize(0F, 0F); - dataWatcher.addObject(20, (byte) 0); - dataWatcher.addObject(21, 0); - dataWatcher.addObject(22, 0); - dataWatcher.addObject(23, 0); - dataWatcher.addObject(24, 0); - dataWatcher.addObject(25, 0F); - - dataWatcher.setObjectWatched(20); - dataWatcher.setObjectWatched(21); - dataWatcher.setObjectWatched(22); - dataWatcher.setObjectWatched(23); - dataWatcher.setObjectWatched(24); - dataWatcher.setObjectWatched(25); + dataWatcher.register(CHARGING, false); + dataWatcher.register(VARIETY, 0); + dataWatcher.register(CHARGE_TICKS, 0); + dataWatcher.register(LIVE_TICKS, 0); + dataWatcher.register(DELAY, 0); + dataWatcher.register(ROTATION, 0F); } @Override @@ -72,8 +80,8 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { EntityPlayer player = (EntityPlayer) thrower; boolean charging = isCharging(); if(!worldObj.isRemote) { - ItemStack stack = player == null ? null : player.getCurrentEquippedItem(); - boolean newCharging = stack != null && stack.getItem() == ModItems.kingKey && ItemKingKey.isCharging(stack); + ItemStack stack = player == null ? null : PlayerHelper.getFirstHeldItem(player, ModItems.kingKey); + boolean newCharging = stack != null && ItemKingKey.isCharging(stack); if(charging != newCharging) { setCharging(newCharging); charging = newCharging; @@ -97,7 +105,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setChargeTicks(chargeTime + 1); if(worldObj.rand.nextInt(20) == 0) - worldObj.playSoundAtEntity(this, "botania:babylonSpawn", 0.1F, 1F + worldObj.rand.nextFloat() * 3F); + worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + worldObj.rand.nextFloat() * 3F); } else { if(liveTime < delay) { motionX = 0; @@ -116,7 +124,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { x = motionVec.x; y = motionVec.y; z = motionVec.z; - worldObj.playSoundAtEntity(this, "botania:babylonAttack", 2F, 0.1F + worldObj.rand.nextFloat() * 3F); + worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + worldObj.rand.nextFloat() * 3F); } setLiveTicks(liveTime + 1); @@ -183,51 +191,51 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } public boolean isCharging() { - return dataWatcher.getWatchableObjectByte(20) == 1; + return dataWatcher.get(CHARGING); } public void setCharging(boolean charging) { - dataWatcher.updateObject(20, (byte) (charging ? 1 : 0)); + dataWatcher.set(CHARGING, charging); } public int getVariety() { - return dataWatcher.getWatchableObjectInt(21); + return dataWatcher.get(VARIETY); } public void setVariety(int var) { - dataWatcher.updateObject(21, var); + dataWatcher.set(VARIETY, var); } public int getChargeTicks() { - return dataWatcher.getWatchableObjectInt(22); + return dataWatcher.get(CHARGE_TICKS); } public void setChargeTicks(int ticks) { - dataWatcher.updateObject(22, ticks); + dataWatcher.set(CHARGE_TICKS, ticks); } public int getLiveTicks() { - return dataWatcher.getWatchableObjectInt(23); + return dataWatcher.get(LIVE_TICKS); } public void setLiveTicks(int ticks) { - dataWatcher.updateObject(23, ticks); + dataWatcher.set(LIVE_TICKS, ticks); } public int getDelay() { - return dataWatcher.getWatchableObjectInt(24); + return dataWatcher.get(DELAY); } public void setDelay(int delay) { - dataWatcher.updateObject(24, delay); + dataWatcher.set(DELAY, delay); } public float getRotation() { - return dataWatcher.getWatchableObjectFloat(25); + return dataWatcher.get(ROTATION); } public void setRotation(float rot) { - dataWatcher.updateObject(25, rot); + dataWatcher.set(ROTATION, rot); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d4d18b8ce..240689371 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -38,10 +38,16 @@ import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -65,6 +71,7 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; @@ -81,16 +88,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { - public static final int SPAWN_TICKS = 160; + private static final int SPAWN_TICKS = 160; private static final float RANGE = 12F; private static final float MAX_HP = 800F; - public static final int MOB_SPAWN_START_TICKS = 20; - public static final int MOB_SPAWN_END_TICKS = 80; - public static final int MOB_SPAWN_BASE_TICKS = 800; - public static final int MOB_SPAWN_TICKS = MOB_SPAWN_BASE_TICKS + MOB_SPAWN_START_TICKS + MOB_SPAWN_END_TICKS; - public static final int MOB_SPAWN_WAVES = 10; - public static final int MOB_SPAWN_WAVE_TIME = MOB_SPAWN_BASE_TICKS / MOB_SPAWN_WAVES; + private static final int MOB_SPAWN_START_TICKS = 20; + private static final int MOB_SPAWN_END_TICKS = 80; + private static final int MOB_SPAWN_BASE_TICKS = 800; + private static final int MOB_SPAWN_TICKS = MOB_SPAWN_BASE_TICKS + MOB_SPAWN_START_TICKS + MOB_SPAWN_END_TICKS; + private static final int MOB_SPAWN_WAVES = 10; + private static final int MOB_SPAWN_WAVE_TIME = MOB_SPAWN_BASE_TICKS / MOB_SPAWN_WAVES; private static final String TAG_INVUL_TIME = "invulTime"; private static final String TAG_AGGRO = "aggro"; @@ -101,6 +108,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static final String TAG_HARD_MODE = "hardMode"; private static final String TAG_PLAYER_COUNT = "playerCount"; + private static final DataParameter INVUL_TIME = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); + private static final DataParameter DATA_MOB_SPAWN_TICKS = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); + private static final DataParameter PLAYER_COUNT = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); + private static final DataParameter TP_DELAY = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); + private static final DataParameter AGGRO = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); + private static final DataParameter HARD_MODE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); + private static final DataParameter SOURCE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BLOCK_POS); + private static final BlockPos[] PYLON_LOCATIONS = { new BlockPos(4, 1, 4), new BlockPos(4, 1, -4), @@ -203,9 +218,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi playerCount++; e.setPlayerCount(playerCount); - e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setBaseValue(MAX_HP * playerCount); + e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); - par3World.playSoundAtEntity(e, "mob.enderdragon.growl", 10F, 0.1F); + e.playSound(SoundEvents.entity_enderdragon_growl, 10F, 0.1F); par3World.spawnEntityInWorld(e); return true; } @@ -227,7 +242,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi yCheck: { for(int k = heightCheck + heightMin + 1; k >= -heightCheck; k--) { BlockPos pos = startPos.add(i, k, j); - boolean isAir = world.getBlockState(pos).getBlock().getCollisionBoundingBox(world, pos, world.getBlockState(pos)) == null; + boolean isAir = world.getBlockState(pos).getCollisionBoundingBox(world, pos) == null; if(isAir) air++; else { @@ -246,84 +261,72 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return true; } -// @Override todo 1.8 new AI -// protected boolean isAIEnabled() { -// return true; -// } - @Override protected void entityInit() { super.entityInit(); - dataWatcher.addObject(20, 0); // Invul Time - dataWatcher.addObject(21, (byte) 0); // Aggro - dataWatcher.addObject(22, 0); // TP Delay - dataWatcher.addObject(23, 0); // Source X - dataWatcher.addObject(24, 0); // Source Y - dataWatcher.addObject(25, 0); // Source Z - dataWatcher.addObject(26, 0); // Ticks spawning mobs - dataWatcher.addObject(27, (byte) 0); // Hard Mode - dataWatcher.addObject(28, 0); // Player count + dataWatcher.register(INVUL_TIME, 0); + dataWatcher.register(AGGRO, false); + dataWatcher.register(TP_DELAY, 0); + dataWatcher.register(SOURCE, BlockPos.ORIGIN); + dataWatcher.register(DATA_MOB_SPAWN_TICKS, 0); + dataWatcher.register(HARD_MODE, false); + dataWatcher.register(PLAYER_COUNT, 0); } public int getInvulTime() { - return dataWatcher.getWatchableObjectInt(20); + return dataWatcher.get(INVUL_TIME); } public boolean isAggored() { - return dataWatcher.getWatchableObjectByte(21) == 1; + return dataWatcher.get(AGGRO); } public int getTPDelay() { - return dataWatcher.getWatchableObjectInt(22); + return dataWatcher.get(TP_DELAY); } public BlockPos getSource() { - int x = dataWatcher.getWatchableObjectInt(23); - int y = dataWatcher.getWatchableObjectInt(24); - int z = dataWatcher.getWatchableObjectInt(25); - return new BlockPos(x, y, z); + return dataWatcher.get(SOURCE); } public int getMobSpawnTicks() { - return dataWatcher.getWatchableObjectInt(26); + return dataWatcher.get(DATA_MOB_SPAWN_TICKS); } public boolean isHardMode() { - return dataWatcher.getWatchableObjectByte(27) == 1; + return dataWatcher.get(HARD_MODE); } public int getPlayerCount() { - return dataWatcher.getWatchableObjectInt(28); + return dataWatcher.get(PLAYER_COUNT); } public void setInvulTime(int time) { - dataWatcher.updateObject(20, time); + dataWatcher.set(INVUL_TIME, time); } public void setAggroed(boolean aggored) { - dataWatcher.updateObject(21, (byte) (aggored ? 1 : 0)); + dataWatcher.set(AGGRO, aggored); } public void setTPDelay(int delay) { - dataWatcher.updateObject(22, delay); + dataWatcher.set(TP_DELAY, delay); } public void setSource(BlockPos pos) { - dataWatcher.updateObject(23, pos.getX()); - dataWatcher.updateObject(24, pos.getY()); - dataWatcher.updateObject(25, pos.getZ()); + dataWatcher.set(SOURCE, pos); } public void setMobSpawnTicks(int ticks) { - dataWatcher.updateObject(26, ticks); + dataWatcher.set(DATA_MOB_SPAWN_TICKS, ticks); } public void setHardMode(boolean hardMode) { - dataWatcher.updateObject(27, (byte) (hardMode ? 1 : 0)); + dataWatcher.set(HARD_MODE, hardMode); } public void setPlayerCount(int count) { - dataWatcher.updateObject(28, count); + dataWatcher.set(PLAYER_COUNT, count); } @Override @@ -373,7 +376,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean crit = false; if(e instanceof EntityPlayer) { EntityPlayer p = (EntityPlayer) e; - crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(Potion.blindness) && p.ridingEntity == null; + crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(MobEffects.blindness) && !p.isRiding(); } int cap = crit ? 60 : 40; @@ -418,23 +421,23 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void onDeath(DamageSource p_70645_1_) { super.onDeath(p_70645_1_); - EntityLivingBase entitylivingbase = func_94060_bK(); + EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayer) { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianKill, 1); if(!anyWithArmor) ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianNoArmor, 1); } - worldObj.playSoundAtEntity(this, "random.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); } @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); - getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.4); - getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(MAX_HP); - getEntityAttribute(SharedMonsterAttributes.knockbackResistance).setBaseValue(1.0); + getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.4); + getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP); + getEntityAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(1.0); } @Override @@ -504,19 +507,15 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public List getPlayersAround() { BlockPos source = getSource(); float range = 15F; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); - return players; + return worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); } @Override public void onLivingUpdate() { super.onLivingUpdate(); - if(ridingEntity != null) { - if(ridingEntity.riddenByEntity != null) - ridingEntity.riddenByEntity = null; - ridingEntity = null; - } + if(!getPassengers().isEmpty()) + this.dismountRidingEntity(); boolean peaceful = worldObj.getDifficulty() == EnumDifficulty.PEACEFUL; if(!worldObj.isRemote && peaceful) @@ -584,7 +583,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi List remove = new ArrayList<>(); Collection active = player.getActivePotionEffects(); for(PotionEffect effect : active) - if(effect.getDuration() < 200 && effect.getIsAmbient() && !GameData.getPotionRegistry().getObjectById(effect.getPotionID()).isBadEffect()) + if(effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) remove.add(effect); active.removeAll(remove); @@ -675,10 +674,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } case 1 : { entity = new EntitySkeleton(worldObj); - entity.setCurrentItemOrArmor(0, new ItemStack(Items.bow)); + entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.bow)); if(worldObj.rand.nextInt(8) == 0) { ((EntitySkeleton) entity).setSkeletonType(1); - entity.setCurrentItemOrArmor(0, new ItemStack(hard ? ModItems.elementiumSword : Items.stone_sword)); + entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.stone_sword)); } break; } @@ -767,7 +766,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi EntityMagicMissile missile = new EntityMagicMissile(this, true); missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); if(missile.getTarget()) { - worldObj.playSoundAtEntity(this, "botania:missile", 0.6F, 0.8F + (float) Math.random() * 0.2F); + this.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); worldObj.spawnEntityInWorld(missile); } } @@ -802,9 +801,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean flag1 = false; while(!flag1 && pos.getY() > 0) { - Block block = worldObj.getBlockState(pos.down()).getBlock(); + IBlockState state = worldObj.getBlockState(pos.down()); + Block block = state.getBlock(); - if(block.getMaterial().blocksMovement()) + if(block.getMaterial(state).blocksMovement()) flag1 = true; else { --posY; @@ -815,7 +815,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(flag1) { setPosition(posX, posY, posZ); - if(worldObj.getCollidingBoundingBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) + if(worldObj.getCubes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) flag = true; // Prevent out of bounds teleporting @@ -842,8 +842,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, f, f1, f2); } - worldObj.playSoundEffect(d3, d4, d5, "mob.endermen.portal", 1.0F, 1.0F); - playSound("mob.endermen.portal", 1.0F, 1.0F); + playSound(SoundEvents.entity_endermen_teleport, 1.0F, 1.0F); return true; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 1e65cd933..96ac1a874 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -54,8 +55,9 @@ public class EntityEnderAirBottle extends EntityThrowable { int rangeY = 4; for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { - Block block = worldObj.getBlockState(pos).getBlock(); - if(block != null && block.isReplaceableOreGen(worldObj, pos, BlockStateMatcher.forBlock(Blocks.stone))) + IBlockState state = worldObj.getBlockState(pos); + Block block = state.getBlock(); + 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/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index a1e80a9bd..9c5b34e9b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -15,7 +15,9 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -62,7 +64,7 @@ public class EntityFlameRing extends Entity { } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSoundAtEntity(this, "fire.fire", 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/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 4bce3e3f7..05641e3d9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -14,12 +14,15 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; public class EntityMagicLandmine extends Entity { @@ -49,7 +52,7 @@ public class EntityMagicLandmine extends Entity { Botania.proxy.wispFX(worldObj, posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); if(ticksExisted >= 55) { - worldObj.playSoundEffect(posX, posY, posZ, "botania:gaiaTrap", 0.3F, 1F); + worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); float m = 0.35F; g = 0.4F; @@ -60,8 +63,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(Potion.blindness.id, 25, 0)); - PotionEffect wither = new PotionEffect(Potion.wither.id, 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 bbd6a5000..c1a8b460c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -16,6 +16,7 @@ import java.util.List; import java.util.Random; import java.util.UUID; +import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -27,8 +28,10 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -74,15 +77,19 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final String TAG_SHOOTER_UUID_MOST = "shooterUUIDMost"; private static final String TAG_SHOOTER_UUID_LEAST = "shooterUUIDLeast"; + private static final DataParameter COLOR = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.VARINT); + private static final DataParameter MANA = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.VARINT); + private static final DataParameter START_MANA = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.VARINT); + private static final DataParameter MIN_MANA_LOSS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.VARINT); + private static final DataParameter MANA_LOSS_PER_TICK = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); + private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); + private static final DataParameter SOURCE_COORDS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.BLOCK_POS); + private static final DataParameter> SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.OPTIONAL_ITEM_STACK); + + boolean fake = false; - - final int dataWatcherEntries = 10; - final int dataWatcherStart = 32 - dataWatcherEntries; - List alreadyCollidedAt = new ArrayList<>(); - boolean fullManaLastTick = true; - UUID shooterIdentity = null; int _ticksExisted = 0; boolean scanBeam = false; @@ -91,16 +98,19 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public EntityManaBurst(World world) { super(world); setSize(0F, 0F); - for(int i = 0; i < dataWatcherEntries; i++) { - int j = dataWatcherStart + i; - if(i == 4 || i == 5) - dataWatcher.addObject(j, 0F); - else if(i == 9) - dataWatcher.addObject(j, new ItemStack(Blocks.stone, 0, 0)); - else dataWatcher.addObject(j, 0); + } - dataWatcher.setObjectWatched(j); - } + @Override + protected void entityInit() { + super.entityInit(); + dataWatcher.register(COLOR, 0); + dataWatcher.register(MANA, 0); + dataWatcher.register(START_MANA, 0); + dataWatcher.register(MIN_MANA_LOSS, 0); + dataWatcher.register(MANA_LOSS_PER_TICK, 0F); + dataWatcher.register(GRAVITY, 0F); + dataWatcher.register(SOURCE_COORDS, BlockPos.ORIGIN); + dataWatcher.register(SOURCE_LENS, Optional.absent()); } public EntityManaBurst(IManaSpreader spreader, boolean fake) { @@ -118,7 +128,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch + getInaccuracy()) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin((rotationPitch) / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } @@ -136,7 +146,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; - double my = MathHelper.sin((rotationPitch + getInaccuracy()) / 180.0F * (float) Math.PI) * f / 2D; + double my = MathHelper.sin((rotationPitch) / 180.0F * (float) Math.PI) * f / 2D; setMotion(mx, my, mz); } @@ -233,8 +243,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { IBlockState state = worldObj.getBlockState(pos); Block block = state.getBlock(); - if (block != null && (!par4 || block == null || block.getCollisionBoundingBox(worldObj, pos, state) != null) && block != Blocks.air && block.canCollideCheck(state, par3)) { - RayTraceResult RayTraceResult = block.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); + if (block != null && (!par4 || block == null || state.getCollisionBoundingBox(worldObj, pos) != null) && block != Blocks.air && block.canCollideCheck(state, par3)) { + RayTraceResult RayTraceResult = state.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); if (RayTraceResult != null) return RayTraceResult; @@ -341,8 +351,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { IBlockState state1 = worldObj.getBlockState(pos1); Block block1 = state1.getBlock(); - if ((!par4 || block1 == null || block1.getCollisionBoundingBox(worldObj, pos1, state) != null) && block1 != Blocks.air && block1.canCollideCheck(state, par3)) { - RayTraceResult RayTraceResult1 = block1.collisionRayTrace(worldObj, pos1, par1Vec3, par2Vec3); + if ((!par4 || block1 == null || block1.getCollisionBoundingBox(state1, worldObj, pos1) != null) && block1 != Blocks.air && block1.canCollideCheck(state, par3)) { + RayTraceResult RayTraceResult1 = block1.collisionRayTrace(state1, worldObj, pos1, par1Vec3, par2Vec3); if (RayTraceResult1 != null) return RayTraceResult1; @@ -685,90 +695,85 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public int getColor() { - return dataWatcher.getWatchableObjectInt(dataWatcherStart); + return dataWatcher.get(COLOR); } @Override public void setColor(int color) { - dataWatcher.updateObject(dataWatcherStart, color); + dataWatcher.set(COLOR, color); } @Override public int getMana() { - return dataWatcher.getWatchableObjectInt(dataWatcherStart + 1); + return dataWatcher.get(MANA); } @Override public void setMana(int mana) { - dataWatcher.updateObject(dataWatcherStart + 1, mana); + dataWatcher.set(MANA, mana); } @Override public int getStartingMana() { - return dataWatcher.getWatchableObjectInt(dataWatcherStart + 2); + return dataWatcher.get(START_MANA); } @Override public void setStartingMana(int mana) { - dataWatcher.updateObject(dataWatcherStart + 2, mana); + dataWatcher.set(START_MANA, mana); } @Override public int getMinManaLoss() { - return dataWatcher.getWatchableObjectInt(dataWatcherStart + 3); + return dataWatcher.get(MIN_MANA_LOSS); } @Override public void setMinManaLoss(int minManaLoss) { - dataWatcher.updateObject(dataWatcherStart + 3, minManaLoss); + dataWatcher.set(MIN_MANA_LOSS, minManaLoss); } @Override public float getManaLossPerTick() { - return dataWatcher.getWatchableObjectFloat(dataWatcherStart + 4); + return dataWatcher.get(MANA_LOSS_PER_TICK); } @Override public void setManaLossPerTick(float mana) { - dataWatcher.updateObject(dataWatcherStart + 4, mana); + dataWatcher.set(MANA_LOSS_PER_TICK, mana); } @Override public float getGravity() { - return dataWatcher.getWatchableObjectFloat(dataWatcherStart + 5); + return dataWatcher.get(GRAVITY); } @Override public void setGravity(float gravity) { - dataWatcher.updateObject(dataWatcherStart + 5, gravity); + dataWatcher.set(GRAVITY, gravity); } - final int coordsStart = dataWatcherStart + 6; - @Override public BlockPos getBurstSourceBlockPos() { - int x = dataWatcher.getWatchableObjectInt(coordsStart); - int y = dataWatcher.getWatchableObjectInt(coordsStart + 1); - int z = dataWatcher.getWatchableObjectInt(coordsStart + 2); - - return new BlockPos(x, y, z); + return dataWatcher.get(SOURCE_COORDS); } @Override public void setBurstSourceCoords(BlockPos pos) { - dataWatcher.updateObject(coordsStart, pos.getX()); - dataWatcher.updateObject(coordsStart + 1, pos.getY()); - dataWatcher.updateObject(coordsStart + 2, pos.getZ()); + dataWatcher.set(SOURCE_COORDS, pos); } @Override public ItemStack getSourceLens() { - return dataWatcher.getWatchableObjectItemStack(dataWatcherStart + 9); + Optional stack = dataWatcher.get(SOURCE_LENS); + if(!stack.isPresent()) + return new ItemStack(Blocks.stone, 0, 0); // todo 1.9 refact later + else return stack.get(); } @Override public void setSourceLens(ItemStack lens) { - dataWatcher.updateObject(dataWatcherStart + 9, lens == null ? new ItemStack(Blocks.stone, 0, 0) : lens); + dataWatcher.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); } @Override @@ -788,8 +793,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return null; } - final int motionStart = dataWatcherStart + 10; - @Override public void setMotion(double x, double y, double z) { motionX = x; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 3adc90cf7..74eeff225 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -16,6 +16,8 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -65,9 +67,9 @@ public class EntityPinkWither extends EntityWither { } @Override - protected boolean interact(EntityPlayer player) { + protected boolean processInteract(EntityPlayer player, EnumHand hand, ItemStack stack) { if(!player.isSneaking()) { - player.mountEntity(this); + player.startRiding(this); return true; } return false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 076e818b4..53a76583c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -16,6 +16,9 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; @@ -34,6 +37,7 @@ public class EntityPoolMinecart extends EntityMinecart { private static final int TRANSFER_RATE = 10000; private static final String TAG_MANA = "mana"; + private static final DataParameter MANA = EntityDataManager.createKey(EntityPoolMinecart.class, DataSerializers.VARINT); public EntityPoolMinecart(World p_i1712_1_) { super(p_i1712_1_); @@ -46,7 +50,7 @@ public class EntityPoolMinecart extends EntityMinecart { @Override protected void entityInit() { super.entityInit(); - dataWatcher.addObject(16, 0); + dataWatcher.register(MANA, 0); } @Override @@ -153,11 +157,11 @@ public class EntityPoolMinecart extends EntityMinecart { } public int getMana() { - return dataWatcher.getWatchableObjectInt(16); + return dataWatcher.get(MANA); } public void setMana(int mana) { - dataWatcher.updateObject(16, mana); + dataWatcher.set(MANA, mana); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 16b838d4e..ba122aa6b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -17,8 +17,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; @@ -32,6 +36,8 @@ import vazkii.botania.common.item.ModItems; public class EntityThornChakram extends EntityThrowable { + private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); + private static final DataParameter FLARE = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.BOOLEAN); private static final int MAX_BOUNCES = 16; boolean bounced = false; private ItemStack stack; @@ -47,11 +53,9 @@ public class EntityThornChakram extends EntityThrowable { @Override protected void entityInit() { - dataWatcher.addObject(30, 0); - dataWatcher.addObject(31, (byte) 0); - - dataWatcher.setObjectWatched(30); - dataWatcher.setObjectWatched(31); + super.entityInit(); + dataWatcher.register(BOUNCES, 0); + dataWatcher.register(FLARE, false); } @Override @@ -128,7 +132,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(Potion.poison.id, 60, 0)); + ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.poison, 60, 0)); } else if (pos.getBlockPos() != null) { int bounces = getTimesBounced(); if(bounces < MAX_BOUNCES) { @@ -151,19 +155,19 @@ public class EntityThornChakram extends EntityThrowable { } public int getTimesBounced() { - return dataWatcher.getWatchableObjectInt(30); + return dataWatcher.get(BOUNCES); } public void setTimesBounced(int times) { - dataWatcher.updateObject(30, times); + dataWatcher.set(BOUNCES, times); } public boolean isFire() { - return dataWatcher.getWatchableObjectByte(31) != 0; + return dataWatcher.get(FLARE); } public void setFire(boolean fire) { - dataWatcher.updateObject(31, (byte) (fire ? 1 : 0)); + dataWatcher.set(FLARE, fire); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 808948c65..7a57bcba4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -21,7 +21,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; @@ -32,9 +36,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; // And we all know how much mods like deflecting EntityThrowables public abstract class EntityThrowableCopy extends Entity implements IProjectile { - private int xTile = -1; - private int yTile = -1; - private int zTile = -1; + private int xTile; + private int yTile; + private int zTile; private Block inTile; protected boolean inGround; public int throwableShake; @@ -43,13 +47,30 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile private String throwerName; private int ticksInGround; private int ticksInAir; + public Entity field_184539_c; + private int field_184540_av; public EntityThrowableCopy(World worldIn) { super(worldIn); + this.xTile = -1; + this.yTile = -1; + this.zTile = -1; this.setSize(0.25F, 0.25F); } + public EntityThrowableCopy(World worldIn, double x, double y, double z) + { + this(worldIn); + this.setPosition(x, y, z); + } + + public EntityThrowableCopy(World worldIn, EntityLivingBase throwerIn) + { + this(worldIn, throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight() - 0.10000000149011612D, throwerIn.posZ); + this.thrower = throwerIn; + } + protected void entityInit() { } @@ -72,39 +93,19 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile return distance < d0 * d0; } - public EntityThrowableCopy(World worldIn, EntityLivingBase throwerIn) + public void func_184538_a(Entity p_184538_1_, float p_184538_2_, float p_184538_3_, float p_184538_4_, float p_184538_5_, float p_184538_6_) { - super(worldIn); - this.thrower = throwerIn; - this.setSize(0.25F, 0.25F); - this.setLocationAndAngles(throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight(), throwerIn.posZ, throwerIn.rotationYaw, throwerIn.rotationPitch); - this.posX -= (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); - this.posY -= 0.10000000149011612D; - this.posZ -= (double)(MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * 0.16F); - this.setPosition(this.posX, this.posY, this.posZ); - float f = 0.4F; - this.motionX = (double)(-MathHelper.sin(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * f); - this.motionZ = (double)(MathHelper.cos(this.rotationYaw / 180.0F * (float)Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float)Math.PI) * f); - this.motionY = (double)(-MathHelper.sin((this.rotationPitch + this.getInaccuracy()) / 180.0F * (float)Math.PI) * f); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, this.getVelocity(), 1.0F); - } + float f = -MathHelper.sin(p_184538_3_ * 0.017453292F) * MathHelper.cos(p_184538_2_ * 0.017453292F); + float f1 = -MathHelper.sin((p_184538_2_ + p_184538_4_) * 0.017453292F); + float f2 = MathHelper.cos(p_184538_3_ * 0.017453292F) * MathHelper.cos(p_184538_2_ * 0.017453292F); + this.setThrowableHeading((double)f, (double)f1, (double)f2, p_184538_5_, p_184538_6_); + this.motionX += p_184538_1_.motionX; + this.motionZ += p_184538_1_.motionZ; - public EntityThrowableCopy(World worldIn, double x, double y, double z) - { - super(worldIn); - this.ticksInGround = 0; - this.setSize(0.25F, 0.25F); - this.setPosition(x, y, z); - } - - protected float getVelocity() - { - return 1.5F; - } - - protected float getInaccuracy() - { - return 0.0F; + if (!p_184538_1_.onGround) + { + this.motionY += p_184538_1_.motionY; + } } /** @@ -126,13 +127,13 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.motionY = y; this.motionZ = z; float f1 = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f1) * (180D / Math.PI)); this.ticksInGround = 0; } /** - * Sets the velocity to the args. Args: x, y, z + * Updates the velocity of the entity to a new value. */ @SideOnly(Side.CLIENT) public void setVelocity(double x, double y, double z) @@ -144,8 +145,8 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(x * x + z * z); - this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); + this.prevRotationPitch = this.rotationPitch = (float)(MathHelper.atan2(y, (double)f) * (180D / Math.PI)); } } @@ -190,37 +191,46 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile ++this.ticksInAir; } - Vec3d vec3 = new Vec3d(this.posX, this.posY, this.posZ); - Vec3d vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - RayTraceResult RayTraceResult = this.worldObj.rayTraceBlocks(vec3, vec31); - vec3 = new Vec3d(this.posX, this.posY, this.posZ); - vec31 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3d vec3d = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult raytraceresult = this.worldObj.rayTraceBlocks(vec3d, vec3d1); + vec3d = new Vec3d(this.posX, this.posY, this.posZ); + vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - if (RayTraceResult != null) + if (raytraceresult != null) { - vec31 = new Vec3d(RayTraceResult.hitVec.xCoord, RayTraceResult.hitVec.yCoord, RayTraceResult.hitVec.zCoord); + vec3d1 = new Vec3d(raytraceresult.hitVec.xCoord, raytraceresult.hitVec.yCoord, raytraceresult.hitVec.zCoord); } - if (!this.worldObj.isRemote) + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expandXyz(1.0D)); + double d0 = 0.0D; + boolean flag = false; + + for (int i = 0; i < list.size(); ++i) { - Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - EntityLivingBase entitylivingbase = this.getThrower(); + Entity entity1 = (Entity)list.get(i); - for (int j = 0; j < list.size(); ++j) + if (entity1.canBeCollidedWith()) { - Entity entity1 = list.get(j); - - if (entity1.canBeCollidedWith() && (entity1 != entitylivingbase || this.ticksInAir >= 5)) + if (entity1 == this.field_184539_c) { - float f = 0.3F; - AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand((double)f, (double)f, (double)f); - RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); + flag = true; + } + else if (this.ticksExisted < 2 && this.field_184539_c == null) + { + this.field_184539_c = entity1; + flag = true; + } + else + { + flag = false; + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expandXyz(0.30000001192092896D); + RayTraceResult raytraceresult1 = axisalignedbb.calculateIntercept(vec3d, vec3d1); - if (RayTraceResult1 != null) + if (raytraceresult1 != null) { - double d1 = vec3.squareDistanceTo(RayTraceResult1.hitVec); + double d1 = vec3d.squareDistanceTo(raytraceresult1.hitVec); if (d1 < d0 || d0 == 0.0D) { @@ -230,32 +240,44 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } } } + } - if (entity != null) + if (this.field_184539_c != null) + { + if (flag) { - RayTraceResult = new RayTraceResult(entity); + this.field_184540_av = 2; + } + else if (this.field_184540_av-- <= 0) + { + this.field_184539_c = null; } } - if (RayTraceResult != null) + if (entity != null) { - if (RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.portal) + raytraceresult = new RayTraceResult(entity); + } + + if (raytraceresult != null) + { + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.portal) { - this.setPortal(RayTraceResult.getBlockPos()); + this.setPortal(raytraceresult.getBlockPos()); } else { - this.onImpact(RayTraceResult); + this.onImpact(raytraceresult); } } this.posX += this.motionX; this.posY += this.motionY; this.posZ += this.motionZ; - float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI)); - for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f1) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f) * (180D / Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -277,24 +299,24 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f2 = 0.99F; - float f3 = this.getGravityVelocity(); + float f1 = 0.99F; + float f2 = this.getGravityVelocity(); if (this.isInWater()) { - for (int i = 0; i < 4; ++i) + for (int j = 0; j < 4; ++j) { - float f4 = 0.25F; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f4, this.posY - this.motionY * (double)f4, this.posZ - this.motionZ * (double)f4, this.motionX, this.motionY, this.motionZ, new int[0]); + float f3 = 0.25F; + this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ, new int[0]); } - f2 = 0.8F; + f1 = 0.8F; } - this.motionX *= (double)f2; - this.motionY *= (double)f2; - this.motionZ *= (double)f2; - this.motionY -= (double)f3; + this.motionX *= (double)f1; + this.motionY *= (double)f1; + this.motionZ *= (double)f1; + this.motionY -= (double)f2; this.setPosition(this.posX, this.posY, this.posZ); } @@ -309,53 +331,53 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * Called when this EntityThrowable hits a block or entity. */ - protected abstract void onImpact(RayTraceResult p_70184_1_); + protected abstract void onImpact(RayTraceResult result); /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(NBTTagCompound tagCompound) + public void writeEntityToNBT(NBTTagCompound compound) { - tagCompound.setShort("xTile", (short)this.xTile); - tagCompound.setShort("yTile", (short)this.yTile); - tagCompound.setShort("zTile", (short)this.zTile); - ResourceLocation resourcelocation = Block.blockRegistry.getNameForObject(this.inTile); - tagCompound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); - tagCompound.setByte("shake", (byte)this.throwableShake); - tagCompound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); + compound.setInteger("xTile", this.xTile); + compound.setInteger("yTile", this.yTile); + compound.setInteger("zTile", this.zTile); + ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile); + compound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString()); + compound.setByte("shake", (byte)this.throwableShake); + compound.setByte("inGround", (byte)(this.inGround ? 1 : 0)); - if ((this.throwerName == null || this.throwerName.length() == 0) && this.thrower instanceof EntityPlayer) + if ((this.throwerName == null || this.throwerName.isEmpty()) && this.thrower instanceof EntityPlayer) { this.throwerName = this.thrower.getName(); } - tagCompound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); + compound.setString("ownerName", this.throwerName == null ? "" : this.throwerName); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(NBTTagCompound tagCompund) + public void readEntityFromNBT(NBTTagCompound compound) { - this.xTile = tagCompund.getShort("xTile"); - this.yTile = tagCompund.getShort("yTile"); - this.zTile = tagCompund.getShort("zTile"); + this.xTile = compound.getInteger("xTile"); + this.yTile = compound.getInteger("yTile"); + this.zTile = compound.getInteger("zTile"); - if (tagCompund.hasKey("inTile", 8)) + if (compound.hasKey("inTile", 8)) { - this.inTile = Block.getBlockFromName(tagCompund.getString("inTile")); + this.inTile = Block.getBlockFromName(compound.getString("inTile")); } else { - this.inTile = Block.getBlockById(tagCompund.getByte("inTile") & 255); + this.inTile = Block.getBlockById(compound.getByte("inTile") & 255); } - this.throwableShake = tagCompund.getByte("shake") & 255; - this.inGround = tagCompund.getByte("inGround") == 1; + this.throwableShake = compound.getByte("shake") & 255; + this.inGround = compound.getByte("inGround") == 1; this.thrower = null; - this.throwerName = tagCompund.getString("ownerName"); + this.throwerName = compound.getString("ownerName"); - if (this.throwerName != null && this.throwerName.length() == 0) + if (this.throwerName != null && this.throwerName.isEmpty()) { this.throwerName = null; } @@ -365,7 +387,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile public EntityLivingBase getThrower() { - if (this.thrower == null && this.throwerName != null && this.throwerName.length() > 0) + if (this.thrower == null && this.throwerName != null && !this.throwerName.isEmpty()) { this.thrower = this.worldObj.getPlayerEntityByName(this.throwerName); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index f6c45f2ab..c25ace9a3 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 == 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 f0afbf1d1..d4fd6c3f1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -17,6 +17,9 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -27,16 +30,23 @@ import java.util.Map; public class EntityVineBall extends EntityThrowable { + private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityVineBall.class, DataSerializers.FLOAT); + private final boolean gravity; + public EntityVineBall(World par1World) { super(par1World); - dataWatcher.addObject(30, 0F); - dataWatcher.setObjectWatched(30); + gravity = false; } public EntityVineBall(EntityPlayer player, boolean gravity) { super(player.worldObj, player); - dataWatcher.addObject(30, gravity ? 0.03F : 0F); - dataWatcher.setObjectWatched(30); + this.gravity = gravity; + } + + @Override + protected void entityInit() { + super.entityInit(); + dataWatcher.register(GRAVITY, gravity ? 0.03F : 0F); } @Override @@ -50,11 +60,12 @@ public class EntityVineBall extends EntityThrowable { if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { - Block block = worldObj.getBlockState(pos).getBlock(); - if(block.isAir(worldObj, pos)) { - IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); - worldObj.setBlockState(pos, state, 1 | 2); - worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); + IBlockState state = worldObj.getBlockState(pos); + Block block = state.getBlock(); + 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)); pos = pos.down(); } else break; } @@ -67,7 +78,7 @@ public class EntityVineBall extends EntityThrowable { @Override protected float getGravityVelocity() { - return dataWatcher.getWatchableObjectFloat(30); + return dataWatcher.get(GRAVITY); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index f9b8a6f81..c3de72cad 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -25,6 +25,7 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -56,8 +57,8 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); - ItemStack book = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); - if(book != null && book.getItem() instanceof ILexicon && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { + ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, ILexicon.class); + if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.vial, 1, 1))); } else renderItemAtLinePos(gui, 0, -1, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); From 1c608d4636ab9203c4059eff52e245b600924809 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 16:51:21 -0500 Subject: [PATCH 445/935] A lot of items. Rods, and lenses. --- .../botania/api/sound/BotaniaSoundEvents.java | 3 + .../botania/common/entity/EntityVineBall.java | 5 +- .../botania/common/item/ItemBaubleBox.java | 7 +- .../common/item/ItemBlackHoleTalisman.java | 25 ++-- .../botania/common/item/ItemBlackLotus.java | 3 +- .../botania/common/item/ItemBottledMana.java | 127 ++++++++++-------- .../botania/common/item/ItemCacophonium.java | 28 ++-- .../common/item/ItemCorporeaSpark.java | 10 +- .../botania/common/item/ItemCraftPattern.java | 11 +- .../botania/common/item/ItemCraftingHalo.java | 14 +- .../botania/common/item/ItemEnderHand.java | 16 ++- .../botania/common/item/ItemFertilizer.java | 6 +- .../botania/common/item/ItemFlowerBag.java | 15 ++- .../botania/common/item/ItemGaiaHead.java | 109 +++++++-------- .../botania/common/item/ItemGrassHorn.java | 18 ++- .../botania/common/item/ItemGrassSeeds.java | 11 +- .../botania/common/item/ItemManaCookie.java | 4 +- .../botania/common/item/ItemManaGun.java | 14 +- .../botania/common/item/ItemManaMirror.java | 15 ++- .../common/item/ItemObedienceStick.java | 10 +- .../botania/common/item/ItemOpenBucket.java | 21 +-- .../common/item/ItemOvergrowthSeed.java | 9 +- .../botania/common/item/ItemPinkinator.java | 12 +- .../botania/common/item/ItemPoolMinecart.java | 8 +- .../botania/common/item/ItemSextant.java | 27 ++-- .../botania/common/item/ItemSignalFlare.java | 17 ++- .../botania/common/item/ItemSlingshot.java | 26 ++-- .../vazkii/botania/common/item/ItemSpark.java | 8 +- .../botania/common/item/ItemSpawnerMover.java | 13 +- .../common/item/ItemTemperanceStone.java | 16 ++- .../botania/common/item/ItemThornChakram.java | 23 ++-- .../botania/common/item/ItemVineBall.java | 15 ++- .../vazkii/botania/common/item/ItemVirus.java | 25 ++-- .../botania/common/item/ItemWorldSeed.java | 14 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- .../tool/manasteel/ItemManasteelSword.java | 5 +- .../botania/common/item/lens/LensFire.java | 2 +- .../botania/common/item/lens/LensLight.java | 2 +- .../botania/common/item/lens/LensMine.java | 2 +- .../botania/common/item/lens/LensPiston.java | 3 +- .../common/item/lens/LensRedirect.java | 2 +- .../botania/common/item/lens/LensWeight.java | 2 +- .../common/item/material/ItemPetal.java | 11 +- .../common/item/record/ItemModRecord.java | 6 +- .../common/item/record/ItemRecordGaia1.java | 3 +- .../common/item/record/ItemRecordGaia2.java | 3 +- .../common/item/rod/ItemCobbleRod.java | 6 +- .../botania/common/item/rod/ItemDirtRod.java | 15 ++- .../common/item/rod/ItemDiviningRod.java | 14 +- .../common/item/rod/ItemExchangeRod.java | 25 ++-- .../botania/common/item/rod/ItemFireRod.java | 10 +- .../common/item/rod/ItemGravityRod.java | 24 ++-- .../common/item/rod/ItemMissileRod.java | 17 ++- .../common/item/rod/ItemRainbowRod.java | 17 ++- .../common/item/rod/ItemSkyDirtRod.java | 11 +- .../botania/common/item/rod/ItemSmeltRod.java | 23 +++- .../common/item/rod/ItemTerraformRod.java | 22 +-- .../common/item/rod/ItemTornadoRod.java | 28 ++-- .../botania/common/item/rod/ItemWaterRod.java | 16 ++- 59 files changed, 568 insertions(+), 388 deletions(-) diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 971f1794e..80e62e223 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -50,6 +50,9 @@ public final class BotaniaSoundEvents { public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); + public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("botania:music.gaia1"); + public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); + private static SoundEvent getRegisteredSoundEvent(String name) { return SoundEvent.soundEventRegistry.getObject(new ResourceLocation(name)); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index d4fd6c3f1..18ec609c7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockVine; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.network.datasync.DataParameter; @@ -38,8 +39,8 @@ public class EntityVineBall extends EntityThrowable { gravity = false; } - public EntityVineBall(EntityPlayer player, boolean gravity) { - super(player.worldObj, player); + public EntityVineBall(EntityLivingBase thrower, boolean gravity) { + super(thrower.worldObj, thrower); this.gravity = gravity; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 925627a2a..160c90f7c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -14,6 +14,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -31,9 +34,9 @@ public class ItemBaubleBox extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 048e9d968..aeff364ec 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 31, 2015, 11:04:12 PM (GMT)] */ package vazkii.botania.common.item; @@ -19,12 +19,18 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -54,18 +60,19 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) { int dmg = par1ItemStack.getItemDamage(); par1ItemStack.setItemDamage(~dmg & 1); - par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); + par3EntityPlayer.playSound(SoundEvents.entity_experience_orb_pickup, 0.3F, 0.1F); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + 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); boolean set = setBlock(par1ItemStack, state.getBlock(), state.getBlock().getMetaFromState(state)); @@ -109,15 +116,15 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { ItemStack stack = new ItemStack(bBlock, 1, bmeta); ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack)); - Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, pos, side, par8, par9, par10); + Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); set = true; } } } } - par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); - return set; + par2EntityPlayer.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); + return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index e5f8ee1a1..8f9f3f06c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -22,6 +22,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; @@ -78,7 +79,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { Botania.proxy.wispFX(item.worldObj, item.posX, tile.getPos().getY() + 0.5F, item.posZ, r, g, b, s, mx, my, mz); } - item.worldObj.playSoundAtEntity(item, "botania:blackLotus", 0.5F, t2 ? 0.1F : 1F); + item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 28b4212d2..2ac342592 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -20,13 +20,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; @@ -42,75 +49,77 @@ public class ItemBottledMana extends ItemMod { setMaxDamage(6); } - public void effect(EntityPlayer player, int id) { + public void effect(EntityLivingBase living, int id) { switch(id) { case 0 : { // Random motion - player.motionX = (Math.random() - 0.5) * 3; - player.motionZ = (Math.random() - 0.5) * 3; + living.motionX = (Math.random() - 0.5) * 3; + living.motionZ = (Math.random() - 0.5) * 3; break; } case 1 : { // Water - if(!player.worldObj.isRemote && !player.worldObj.provider.doesWaterVaporize()) - player.worldObj.setBlockState(new BlockPos(player), Blocks.flowing_water.getDefaultState()); + if(!living.worldObj.isRemote && !living.worldObj.provider.doesWaterVaporize()) + living.worldObj.setBlockState(new BlockPos(living), Blocks.flowing_water.getDefaultState()); break; } case 2 : { // Set on Fire - if(!player.worldObj.isRemote) - player.setFire(4); + if(!living.worldObj.isRemote) + living.setFire(4); break; } case 3 : { // Mini Explosion - if(!player.worldObj.isRemote) - player.worldObj.createExplosion(null, player.posX, player.posY, player.posZ, 0.25F, false); + if(!living.worldObj.isRemote) + living.worldObj.createExplosion(null, living.posX, living.posY, living.posZ, 0.25F, false); break; } case 4 : { // Mega Jump - if(!player.worldObj.provider.doesWaterVaporize()) { - if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); - player.motionY = 6; + if(!living.worldObj.provider.doesWaterVaporize()) { + if(!living.worldObj.isRemote) + living.addPotionEffect(new PotionEffect(MobEffects.resistance, 300, 5)); + living.motionY = 6; } break; } case 5 : { // Randomly set HP - if(!player.worldObj.isRemote) - player.setHealth(player.worldObj.rand.nextInt(19) + 1); + if(!living.worldObj.isRemote) + living.setHealth(living.worldObj.rand.nextInt(19) + 1); break; } case 6 : { // Lots O' Hearts - if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.absorption.id, 20 * 60 * 2, 9)); + if(!living.worldObj.isRemote) + living.addPotionEffect(new PotionEffect(MobEffects.absorption, 20 * 60 * 2, 9)); break; } case 7 : { // All your inventory is belong to us - if(!player.worldObj.isRemote) + if(!living.worldObj.isRemote && living instanceof EntityPlayer) { + EntityPlayer player = ((EntityPlayer) living); for(int i = 0; i < player.inventory.getSizeInventory(); i++) if(i != player.inventory.currentItem) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null) - player.dropPlayerItemWithRandomChoice(stackAt, true); + player.entityDropItem(stackAt, 0); player.inventory.setInventorySlotContents(i, null); } + } break; } case 8 : { // Break your neck - player.rotationPitch = (float) Math.random() * 360F; - player.rotationYaw = (float) Math.random() * 180F; + living.rotationPitch = (float) Math.random() * 360F; + living.rotationYaw = (float) Math.random() * 180F; break; } case 9 : { // Highest Possible - int x = MathHelper.floor_double(player.posX); - MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); + int x = MathHelper.floor_double(living.posX); + MathHelper.floor_double(living.posY); + int z = MathHelper.floor_double(living.posZ); for(int i = 256; i > 0; i--) { - Block block = player.worldObj.getBlockState(new BlockPos(x, i, z)).getBlock(); - if(!block.isAir(player.worldObj, new BlockPos(x, i, z))) { - if(player instanceof EntityPlayerMP) { - EntityPlayerMP mp = (EntityPlayerMP) player; - mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); + Block block = living.worldObj.getBlockState(new BlockPos(x, i, z)).getBlock(); + 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); } break; } @@ -119,55 +128,55 @@ public class ItemBottledMana extends ItemMod { break; } case 10 : { // HYPERSPEEEEEED - if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60, 200)); + if(!living.worldObj.isRemote) + living.addPotionEffect(new PotionEffect(MobEffects.moveSpeed, 60, 200)); break; } case 11 : { // Night Vision - if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 6000, 0)); + if(!living.worldObj.isRemote) + living.addPotionEffect(new PotionEffect(MobEffects.nightVision, 6000, 0)); break; } case 12 : { // Flare - if(!player.worldObj.isRemote) { - EntitySignalFlare flare = new EntitySignalFlare(player.worldObj); - flare.setPosition(player.posX, player.posY, player.posZ); - flare.setColor(player.worldObj.rand.nextInt(16)); - player.worldObj.playSoundAtEntity(player, "random.explode", 40F, (1.0F + (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + if(!living.worldObj.isRemote) { + 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); - player.worldObj.spawnEntityInWorld(flare); + living.worldObj.spawnEntityInWorld(flare); int range = 5; - List entities = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + 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 != player && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) - entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); + if(entity != living && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) + entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 50, 5)); } break; } case 13 : { // Pixie Friend - if(!player.worldObj.isRemote) { - EntityPixie pixie = new EntityPixie(player.worldObj); - pixie.setPosition(player.posX, player.posY + 1.5, player.posZ); - player.worldObj.spawnEntityInWorld(pixie); + if(!living.worldObj.isRemote) { + EntityPixie pixie = new EntityPixie(living.worldObj); + pixie.setPosition(living.posX, living.posY + 1.5, living.posZ); + living.worldObj.spawnEntityInWorld(pixie); } break; } case 14 : { // Nausea + Blindness :3 - if(!player.worldObj.isRemote) { - player.addPotionEffect(new PotionEffect(Potion.confusion.id, 160, 3)); - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 160, 0)); + if(!living.worldObj.isRemote) { + living.addPotionEffect(new PotionEffect(MobEffects.confusion, 160, 3)); + living.addPotionEffect(new PotionEffect(MobEffects.blindness, 160, 0)); } break; } case 15 : { // Drop own Head - if(!player.worldObj.isRemote) { - player.attackEntityFrom(DamageSource.magic, player.getHealth() - 1); + if(!living.worldObj.isRemote && living instanceof EntityPlayer) { + living.attackEntityFrom(DamageSource.magic, living.getHealth() - 1); ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", player.getName()); - player.dropPlayerItemWithRandomChoice(stack, true); + ItemNBTHelper.setString(stack, "SkullOwner", living.getName()); + living.entityDropItem(stack, 0); } break; } @@ -179,7 +188,7 @@ public class ItemBottledMana extends ItemMod { getSeed(par1ItemStack); } - public void randomEffect(EntityPlayer player, ItemStack stack) { + public void randomEffect(EntityLivingBase player, ItemStack stack) { effect(player, new Random(getSeed(stack)).nextInt(16)); } @@ -202,14 +211,14 @@ public class ItemBottledMana extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - randomEffect(par3EntityPlayer, par1ItemStack); + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + randomEffect(living, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 8bcfbf9c3..805d47f81 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -24,6 +24,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; @@ -49,7 +55,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) { + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; String sound = null; @@ -71,7 +77,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { player.inventory.setInventorySlotContents(player.inventory.currentItem, stack.copy()); if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } @@ -84,7 +90,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { boolean can = isDOIT(stack); if(!can) { String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); @@ -99,11 +105,11 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); ((TileCacophonium) world.getTileEntity(pos)).stack = stack.copy(); stack.stackSize--; - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override @@ -125,14 +131,14 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) - par3EntityPlayer.setItemInUse(par1ItemStack, 72000); - return par1ItemStack; + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + public void onUsingTick(ItemStack stack, EntityLivingBase player, int count) { if(count % (isDOIT(stack) ? 20 : 6) == 0) playSound(player.worldObj, stack, player.posX, player.posY, player.posZ, 0.9F); } @@ -146,8 +152,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { if(doit) sound = "botania:doit"; - if(sound != null && !sound.isEmpty()) - world.playSoundEffect(x, y, z, sound, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + 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); } private static boolean isDOIT(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 55e063463..8dc631252 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -40,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); if(tile != null && (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { @@ -51,11 +53,11 @@ public class ItemCorporeaSpark extends ItemMod { spark.setMaster(true); spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.spawnEntityInWorld(spark); - world.markBlockForUpdate(pos); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 0); } - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index e0ae60ff1..58cad146e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -32,14 +34,15 @@ public class ItemCraftPattern extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof TileCraftCrate && !world.isRemote) { + if(tile != null && tile instanceof TileCraftCrate) { TileCraftCrate crate = (TileCraftCrate) tile; crate.pattern = stack.getItemDamage(); - world.markBlockForUpdate(pos); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 48497bfed..15e00cd63 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -32,6 +32,11 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; @@ -48,6 +53,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper.GenericInventory; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; @@ -82,7 +88,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int segment = getSegmentLookedAt(stack, player); ItemStack itemForPos = getItemForSlot(stack, segment); @@ -94,7 +100,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { else tryCraft(player, stack, segment, true, getFakeInv(player), true); } - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } public static IInventory getFakeInv(EntityPlayer player) { @@ -384,8 +390,8 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @SubscribeEvent public void onRenderWorldLast(RenderWorldLastEvent event) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemCraftingHalo) + ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemCraftingHalo.class); + if(stack != null) render(stack, player, event.partialTicks); } diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index f6ef375a5..decaf4f03 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -13,7 +13,12 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; @@ -34,21 +39,22 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); - world.playSoundAtEntity(player, "mob.endermen.portal", 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 stack; + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer iplayer, EntityLivingBase entity) { + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer iplayer, EntityLivingBase entity, EnumHand hand) { 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); - iplayer.worldObj.playSoundAtEntity(iplayer, "mob.endermen.portal", 1F, 1F); + entity.playSound(SoundEvents.entity_endermen_teleport, 1F, 1F); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index ef8955bfc..a9f424c44 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -16,6 +16,8 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -32,7 +34,7 @@ public class ItemFertilizer extends ItemMod { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { final int range = 3; if(!par3World.isRemote) { List validCoords = new ArrayList<>(); @@ -65,6 +67,6 @@ public class ItemFertilizer extends ItemMod { } } - return true; + return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 418080ca4..7c26cd8ac 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -18,6 +18,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -90,13 +93,13 @@ public class ItemFlowerBag extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, 0, 0, 0); - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); if(tile != null) { if(!world.isRemote) { @@ -107,7 +110,7 @@ public class ItemFlowerBag extends ItemMod { inv = new InvWrapper(((IInventory) tile)); if(inv == null) - return true; + return EnumActionResult.SUCCESS; ItemStack[] stacks = loadStacks(stack); ItemStack[] newStacks = new ItemStack[stacks.length]; @@ -132,9 +135,9 @@ public class ItemFlowerBag extends ItemMod { } } - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } public static ItemStack[] loadStacks(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index d994eaeeb..b010b3c4d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -18,6 +18,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; @@ -33,82 +35,62 @@ public class ItemGaiaHead extends ItemMod { // Copied from vanila skull itemBlock. Relevant edits are indicated. @Override - public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos) && side != EnumFacing.DOWN) - { - side = EnumFacing.UP; - pos = pos.down(); - } - if (side == EnumFacing.DOWN) - { - return false; - } - else - { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + if (facing == EnumFacing.DOWN) { + return EnumActionResult.FAIL; + } else { + if (worldIn.getBlockState(pos).getBlock().isReplaceable(worldIn, pos)) { + facing = EnumFacing.UP; + pos = pos.down(); + } IBlockState iblockstate = worldIn.getBlockState(pos); Block block = iblockstate.getBlock(); boolean flag = block.isReplaceable(worldIn, pos); - if (!flag) - { - if (!worldIn.isSideSolid(pos, side, true)) - { - return false; + if (!flag) { + if (!worldIn.getBlockState(pos).getMaterial().isSolid() && !worldIn.isSideSolid(pos, facing, true)) { + return EnumActionResult.FAIL; } - pos = pos.offset(side); + pos = pos.offset(facing); } - if (!playerIn.canPlayerEdit(pos, side, stack)) - { - return false; - } - else if (!Blocks.skull.canPlaceBlockAt(worldIn, pos)) - { - return false; - } - else - { - if (!worldIn.isRemote) - { - if (!Blocks.skull.canPlaceBlockOnSide(worldIn, pos, side)) return false; - worldIn.setBlockState(pos, ModBlocks.gaiaHead.getDefaultState().withProperty(BlockSkull.FACING, side), 3); // Botania: skull -> gaia Head + if (playerIn.canPlayerEdit(pos, facing, stack) && Blocks.skull.canPlaceBlockAt(worldIn, pos)) { + if (worldIn.isRemote) { + return EnumActionResult.SUCCESS; + } else { + worldIn.setBlockState(pos, ModBlocks.gaiaHead.getDefaultState().withProperty(BlockSkull.FACING, facing), 11); // Botania - skull -> gaia head int i = 0; - if (side == EnumFacing.UP) - { - i = MathHelper.floor_double((double)(playerIn.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15; + if (facing == EnumFacing.UP) { + i = MathHelper.floor_double((double) (playerIn.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15; } TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileEntitySkull) - { - TileEntitySkull tileentityskull = (TileEntitySkull)tileentity; + if (tileentity instanceof TileEntitySkull) { + TileEntitySkull tileentityskull = (TileEntitySkull) tileentity; - if (stack.getMetadata() == 3) // Botania: Don't retrieve skins - { -// GameProfile gameprofile = null; -// -// if (stack.hasTagCompound()) -// { -// NBTTagCompound nbttagcompound = stack.getTagCompound(); -// -// if (nbttagcompound.hasKey("SkullOwner", 10)) -// { -// gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); -// } -// else if (nbttagcompound.hasKey("SkullOwner", 8) && nbttagcompound.getString("SkullOwner").length() > 0) -// { -// gameprofile = new GameProfile((UUID)null, nbttagcompound.getString("SkullOwner")); -// } -// } -// -// tileentityskull.setPlayerProfile(gameprofile); - } - else + if (stack.getMetadata() == 3) // Botania - do not retrieve skins { + /*GameProfile gameprofile = null; + + if (stack.hasTagCompound()) + { + NBTTagCompound nbttagcompound = stack.getTagCompound(); + + if (nbttagcompound.hasKey("SkullOwner", 10)) + { + gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); + } + else if (nbttagcompound.hasKey("SkullOwner", 8) && !nbttagcompound.getString("SkullOwner").isEmpty()) + { + gameprofile = new GameProfile((UUID)null, nbttagcompound.getString("SkullOwner")); + } + } + + tileentityskull.setPlayerProfile(gameprofile);*/ + } else { tileentityskull.setType(stack.getMetadata()); } @@ -117,12 +99,11 @@ public class ItemGaiaHead extends ItemMod { } --stack.stackSize; + return EnumActionResult.SUCCESS; } - - return true; + } else { + return EnumActionResult.FAIL; } - } } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 7ba0ba4ec..3697d80e9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -19,12 +19,18 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.item.IGrassHornExcempt; @@ -71,18 +77,18 @@ public class ItemGrassHorn extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int time) { + public void onUsingTick(ItemStack stack, EntityLivingBase player, int time) { if(time != getMaxItemUseDuration(stack) && time % 5 == 0) breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); if(!player.worldObj.isRemote) - player.worldObj.playSoundAtEntity(player, "note.bassattack", 1F, 0.001F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.block_note_basedrum, SoundCategory.BLOCKS, 1F, 0.001F); } public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { @@ -97,7 +103,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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, pos)) || stackDmg == 1 && block.isLeaves(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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, pos)) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.snow_layer) coords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 40064a4ea..7a7da993a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -27,6 +27,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -76,7 +78,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + 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)) { @@ -149,9 +151,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } par1ItemStack.stackSize--; + return EnumActionResult.SUCCESS; } - return true; + return EnumActionResult.PASS; } @SubscribeEvent @@ -327,8 +330,6 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); - Block aboveBlock = world.getBlockState(pos.up()).getBlock(); - // Valid blocks to spread to are either dirt or grass, and do not // have blocks which block grass growth. @@ -338,7 +339,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return (block == Blocks.dirt || block == Blocks.grass) && (block != Blocks.dirt || state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT) - && (aboveBlock.getLightOpacity(world, pos.up()) <= 1); + && (world.getBlockState(pos.up()).getLightOpacity(world, pos.up()) <= 1); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index f19f57a88..dafc64901 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -11,10 +11,12 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; @@ -26,7 +28,7 @@ public class ItemManaCookie extends ItemFood { public ItemManaCookie() { super(0, 0.1F, false); - setPotionEffect(Potion.saturation.id, 1, 0, 1F); + setPotionEffect(new PotionEffect(MobEffects.saturation, 1, 0), 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); 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 da95172d9..aa5e60fa4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -17,10 +17,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -68,9 +72,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int effCd = COOLDOWN; - PotionEffect effect = par3EntityPlayer.getActivePotionEffect(Potion.digSpeed); + PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.digSpeed); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; @@ -78,7 +82,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { rotatePos(par1ItemStack); par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); if(par2World.isRemote) - par3EntityPlayer.swingItem(); + par3EntityPlayer.swingArm(hand); ItemStack lens = getLens(par1ItemStack); ItemsRemainingRenderHandler.set(lens, -2); par1ItemStack.setItemDamage(effCd); @@ -92,7 +96,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { par3EntityPlayer.addStat(ModAchievements.desuGun, 1); par2World.spawnEntityInWorld(burst); } else { - par3EntityPlayer.swingItem(); + par3EntityPlayer.swingArm(hand); par3EntityPlayer.motionX -= burst.motionX * 0.1; par3EntityPlayer.motionY -= burst.motionY * 0.3; par3EntityPlayer.motionZ -= burst.motionZ * 0.1; @@ -102,7 +106,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 82e8befc1..b05b7836c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -17,12 +17,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -83,17 +88,17 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { TileEntity tile = par3World.getTileEntity(pos); if(tile != null && tile instanceof IManaPool) { bindPool(par1ItemStack, tile); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); - return true; + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } /*public int getMana(ItemStack stack) { @@ -157,7 +162,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } public IManaPool getManaPool(ItemStack stack) { - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server == null) return fallbackPool; diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index cdccc4f90..e607e4120 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -34,7 +36,7 @@ public class ItemObedienceStick extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tileAt = world.getTileEntity(pos); if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { boolean pool = tileAt instanceof IManaPool; @@ -60,9 +62,11 @@ public class ItemObedienceStick extends ItemMod { } if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); + return EnumActionResult.SUCCESS; } - return false; + + return EnumActionResult.PASS; } public static abstract class Actuator { diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index d986229d7..eac6546e7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -13,6 +13,9 @@ package vazkii.botania.common.item; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.RayTraceResult; @@ -27,22 +30,22 @@ public class ItemOpenBucket extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - RayTraceResult RayTraceResult = getRayTraceResultFromPlayer(par2World, par3EntityPlayer, true); + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + RayTraceResult RayTraceResult = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); if(RayTraceResult == null) - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); else { - if(RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) { + if(RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { BlockPos pos = RayTraceResult.getBlockPos(); if(!par2World.isBlockModifiable(par3EntityPlayer, pos)) - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); if(!par3EntityPlayer.canPlayerEdit(pos, RayTraceResult.sideHit, par1ItemStack)) - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); - Material material = par2World.getBlockState(pos).getBlock().getMaterial(); + 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) { @@ -51,11 +54,11 @@ public class ItemOpenBucket extends ItemMod { for(int x = 0; x < 5; x++) par2World.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 2cc32df91..001944730 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -14,6 +14,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -28,7 +31,7 @@ public class ItemOvergrowthSeed extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { IBlockState state = world.getBlockState(pos); ItemStack blockStack = new ItemStack(state.getBlock()); int[] ids = OreDictionary.getOreIDs(blockStack); @@ -39,10 +42,10 @@ public class ItemOvergrowthSeed extends ItemMod { world.setBlockState(pos, ModBlocks.enchantedSoil.getDefaultState()); stack.stackSize--; - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 9869929ff..ecfdb936c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -14,7 +14,11 @@ import java.util.List; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.text.translation.I18n; @@ -32,7 +36,7 @@ public class ItemPinkinator extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int range = 16; List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) @@ -42,16 +46,16 @@ 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); - world.playSoundAtEntity(wither, "random.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); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.stackSize--; - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return stack; + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 90da39a37..2b4f78f9b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -38,7 +40,7 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { if(!p_77648_3_.isRemote) { EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); @@ -50,10 +52,10 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin } --p_77648_1_.stackSize; - return true; + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 1f5acc6ce..b03407acb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -11,7 +11,11 @@ package vazkii.botania.common.item; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; @@ -59,18 +63,19 @@ public class ItemSextant extends ItemMod { } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - if(getMaxItemUseDuration(stack) - count < 10) + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + if(getMaxItemUseDuration(stack) - count < 10 + || !(living instanceof EntityPlayer)) return; int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); if(y != -1) { - World world = player.worldObj; + World world = living.worldObj; Vector3 source = new Vector3(x, y, z); - double radius = calculateRadius(stack, player); + double radius = calculateRadius(stack, ((EntityPlayer) living)); if(count % 10 == 0) for(int i = 0; i < 360; i++) { @@ -83,8 +88,10 @@ public class ItemSextant extends ItemMod { } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int time) { - double radius = calculateRadius(stack, player); + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase living, int time) { + if(!(living instanceof EntityPlayer)) return; + + double radius = calculateRadius(stack, ((EntityPlayer) living)); if(radius > 1) { int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); @@ -95,7 +102,7 @@ public class ItemSextant extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { Botania.proxy.removeSextantMultiblock(); if(!par3EntityPlayer.isSneaking()) { @@ -108,10 +115,10 @@ public class ItemSextant extends ItemMod { } } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + par3EntityPlayer.setActiveHand(hand); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } public static double calculateRadius(ItemStack stack, EntityPlayer player) { @@ -136,7 +143,7 @@ public class ItemSextant extends ItemMod { @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { - ItemStack onUse = player.getItemInUse(); + ItemStack onUse = player.getActiveItemStack(); int time = player.getItemInUseCount(); if(onUse == stack && stack.getItem().getMaxItemUseDuration(stack) - time >= 10) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 7f960af19..1658087fb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -16,12 +16,18 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -48,15 +54,15 @@ public class ItemSignalFlare extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 0) { if(par2World.isRemote) - par3EntityPlayer.swingItem(); + par3EntityPlayer.swingArm(hand); else { EntitySignalFlare flare = new EntitySignalFlare(par2World); flare.setPosition(par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ); flare.setColor(getColor(par1ItemStack)); - par2World.playSoundAtEntity(par3EntityPlayer, "random.explode", 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); @@ -65,7 +71,7 @@ public class ItemSignalFlare extends ItemMod { 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) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) { - entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); + entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 50, 5)); stunned++; } @@ -73,9 +79,10 @@ public class ItemSignalFlare extends ItemMod { par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); } par1ItemStack.damageItem(200, par3EntityPlayer); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 9c1fa8f78..e64bb9f17 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -10,9 +10,13 @@ */ package vazkii.botania.common.item; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; @@ -25,21 +29,21 @@ public class ItemSlingshot extends ItemMod { } @Override - public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) { + public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityLivingBase living, int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; - if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) { + if(!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || ((EntityPlayer) living).inventory.hasItem(ModItems.vineBall)) { float f = j / 20.0F; f = (f * f + f * 2.0F) / 3.0F; if(f < 1F) return; - if(!par3EntityPlayer.capabilities.isCreativeMode) - par3EntityPlayer.inventory.consumeInventoryItem(ModItems.vineBall); + if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) + ((EntityPlayer) living).inventory.consumeInventoryItem(ModItems.vineBall); if(!par2World.isRemote) { - EntityVineBall ball = new EntityVineBall(par3EntityPlayer, false); + EntityVineBall ball = new EntityVineBall(living, false); ball.motionX *= 1.6; ball.motionY *= 1.6; ball.motionZ *= 1.6; @@ -49,7 +53,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { return par1ItemStack; } @@ -64,11 +68,13 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index bf7b6e135..133238d5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -15,6 +15,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -33,7 +35,7 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); if(tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; @@ -46,10 +48,10 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving attach.attachSpark(spark); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 607370b5e..bf3c8848b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -18,6 +18,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; @@ -86,7 +89,7 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xOffset, float yOffset, float zOffset) { + 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)) { TileEntity te = world.getTileEntity(pos); @@ -103,10 +106,10 @@ public class ItemSpawnerMover extends ItemMod { float blue = (float) Math.random(); Botania.proxy.wispFX(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); } - return true; - } else return false; + return EnumActionResult.SUCCESS; + } else return EnumActionResult.PASS; } else { - return getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, pos, side, xOffset, yOffset, zOffset); + return getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, pos, side, xOffset, yOffset, zOffset) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } } @@ -128,7 +131,7 @@ public class ItemSpawnerMover extends ItemMod { 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.playSoundEffect((double) ((float) pos.getX() + 0.5F), (double) ((float) pos.getY() + 0.5F), (double) ((float) pos.getZ() + 0.5F), Blocks.mob_spawner.stepSound.getPlaceSound(), (Blocks.mob_spawner.stepSound.getVolume() + 1.0F) / 2.0F, Blocks.mob_spawner.stepSound.getFrequency() * 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); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 157090a5a..7a5843db9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -13,8 +13,13 @@ package vazkii.botania.common.item; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; @@ -30,12 +35,11 @@ public class ItemTemperanceStone extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); - par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); - - return par1ItemStack; + 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); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 74de38345..8956e606b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -13,10 +13,15 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -43,21 +48,21 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - --p_77659_1_.stackSize; + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + --stack.stackSize; - p_77659_2_.playSoundAtEntity(p_77659_3_, "random.bow", 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(!p_77659_2_.isRemote) { - ItemStack stack = p_77659_1_.copy(); + if(!world.isRemote) { + ItemStack copy = stack.copy(); stack.stackSize = 1; - EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_, stack); - c.setFire(p_77659_1_.getItemDamage() != 0); - p_77659_2_.spawnEntityInWorld(c); + EntityThornChakram c = new EntityThornChakram(world, player, copy); + c.setFire(stack.getItemDamage() != 0); + world.spawnEntityInWorld(c); } - return p_77659_1_; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 0c871586e..5fcfb96db 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -2,16 +2,21 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 26, 2014, 7:50:37 PM (GMT)] */ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; @@ -23,16 +28,16 @@ public class ItemVineBall extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par3EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (par2World.rand.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) par2World.spawnEntityInWorld(new EntityVineBall(par3EntityPlayer, true)); - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 04a13bb31..f889efd44 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -15,15 +15,18 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.BaseAttributeMap; import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.entity.passive.HorseArmorType; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.common.lib.LibItemNames; @@ -44,19 +47,19 @@ public class ItemVirus extends ItemMod { } @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) { + public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase, EnumHand hand) { if(par3EntityLivingBase instanceof EntityHorse) { EntityHorse horse = (EntityHorse) par3EntityLivingBase; - if(horse.getHorseType() != 3 && horse.getHorseType() != 4 && horse.isTame()) { - horse.setHorseType(3 + par1ItemStack.getItemDamage()); - BaseAttributeMap attributes = horse.getAttributeMap(); - IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.movementSpeed); - IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.maxHealth); + if(horse.getType() != HorseArmorType.ZOMBIE && horse.getType() != HorseArmorType.SKELETON && horse.isTame()) { + horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseArmorType.ZOMBIE : HorseArmorType.SKELETON); + AbstractAttributeMap attributes = horse.getAttributeMap(); + IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED); + IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH); health.applyModifier(new AttributeModifier("Ermergerd Virus D:", health.getBaseValue(), 0)); 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)); - par2EntityPlayer.worldObj.playSound(par3EntityLivingBase.posX + 0.5D, par3EntityLivingBase.posY + 0.5D, par3EntityLivingBase.posZ + 0.5D, "mob.zombie.remedy", 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F, false); + par3EntityLivingBase.playSound(SoundEvents.entity_zombie_villager_cure, 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F); par1ItemStack.stackSize--; return true; @@ -68,12 +71,12 @@ public class ItemVirus extends ItemMod { @SubscribeEvent public void onLivingHurt(LivingHurtEvent event) { EntityLivingBase entity = event.entityLiving; - if(entity.ridingEntity != null && entity.ridingEntity instanceof EntityLivingBase) - entity = (EntityLivingBase) entity.ridingEntity; + if(entity.isRiding() && entity.getRidingEntity() instanceof EntityLivingBase) + entity = (EntityLivingBase) entity.getRidingEntity(); if(entity instanceof EntityHorse && event.source == DamageSource.fall) { EntityHorse horse = (EntityHorse) entity; - if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame()) + if((horse.getType() == HorseArmorType.ZOMBIE || horse.getType() == HorseArmorType.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 36a648dfe..a07252519 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -11,7 +11,12 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; @@ -25,7 +30,7 @@ public class ItemWorldSeed extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { BlockPos coords = world.getSpawnPoint(); if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { @@ -33,17 +38,18 @@ public class ItemWorldSeed extends ItemMod { player.rotationYaw = 0F; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCollidingBoundingBoxes(player, player.getEntityBoundingBox()).isEmpty()) + while(!world.getCubes(player, player.getEntityBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); - world.playSoundAtEntity(player, "mob.endermen.portal", 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); stack.stackSize--; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return stack; + return ActionResult.newResult(EnumActionResult.PASS, stack); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index fc8a30c9a..a82c66b87 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -55,7 +55,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr tile.onBlockAdded(world, pos, newState); tile.onBlockPlacedBy(world, pos, newState, player, stack); if(!world.isRemote) - world.markBlockForUpdate(pos); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index b1b428f0e..979beed8d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -62,8 +63,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { - if(usesMana(stack) && block.getBlockHardness(world, pos) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + if(usesMana(stack) && state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; 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 20c497463..b482b7ddf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -41,7 +41,7 @@ public class LensFire extends Lens { TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos.getBlockPos()); plate.ignite(); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(plate); - } else if(blockAt_.isAir(entity.worldObj, pos_)) + } else if(blockAt_.isAir(entity.worldObj.getBlockState(pos_), entity.worldObj, pos_)) entity.worldObj.setBlockState(pos_, Blocks.fire.getDefaultState()); } 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 666ba78b1..70ed490bf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -34,7 +34,7 @@ public class LensLight extends Lens { if(blockAt == ModBlocks.manaFlame) entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.air.getDefaultState()); - else if(blockAt_.isAir(entity.worldObj, pos_) || blockAt_.isReplaceable(entity.worldObj, pos_)) { + 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 96d37b33d..23c870b23 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -52,7 +52,7 @@ public class LensMine extends Lens { TileEntity tile = world.getTileEntity(pos_); IBlockState state = world.getBlockState(pos_); - float hardness = block.getBlockHardness(world, pos_); + float hardness = state.getBlockHardness(world, pos_); int neededHarvestLevel = block.getHarvestLevel(state); int mana = burst.getMana(); 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 6b1c8a908..3c53a44c2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.lens; +import net.minecraft.block.material.EnumPushReaction; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; @@ -31,7 +32,7 @@ public class LensPiston extends Lens { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); - if(state.getBlock().getMobilityFlag() == 0 && state.getBlock() != Blocks.obsidian && state.getBlock().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/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 7198da9ad..bef17eb3e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -34,7 +34,7 @@ public class LensRedirect extends Lens { Vector3 tileVec = Vector3.fromTileEntityCenter(tile); Vector3 sourceVec = new Vector3(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getBlock().getCollisionBoundingBox(entity.worldObj, coords, entity.worldObj.getBlockState(coords)); + AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getCollisionBoundingBox(entity.worldObj, coords); if(axis == null) axis = new AxisAlignedBB(coords, coords.add(1, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index 13fbe47de..f735e5663 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -31,7 +31,7 @@ public class LensWeight extends Lens { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); int neededHarvestLevel = block.getHarvestLevel(state); - if(blockBelow.isAir(entity.worldObj, pos.getBlockPos().down()) && block.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), entity.worldObj.getBlockState(pos.getBlockPos()), null)) { + if(blockBelow.isAir(entity.worldObj.getBlockState(pos.getBlockPos().down()), entity.worldObj, pos.getBlockPos().down()) && state.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), entity.worldObj.getBlockState(pos.getBlockPos()), null)) { EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, state); entity.worldObj.spawnEntityInWorld(falling); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index ca969ae47..846f04417 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item.material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -29,17 +31,16 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, par1ItemStack.getItemDamage()); - stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); + stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { if(!par2EntityPlayer.capabilities.isCreativeMode) par1ItemStack.stackSize--; - - return true; } - return false; + + return EnumActionResult.SUCCESS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index ba4f0daec..65f84b9a7 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -14,6 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -22,8 +24,8 @@ public class ItemModRecord extends ItemRecord { private final String file; - public ItemModRecord(String record, String name) { - super("botania:" + record); + public ItemModRecord(String record, SoundEvent sound, String name) { + super("botania:" + record, sound); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); file = "botania:music." + record; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java index c1c5d4b9b..758dc699b 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.record; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.lib.LibItemNames; public class ItemRecordGaia1 extends ItemModRecord { public ItemRecordGaia1() { - super("gaia1", LibItemNames.RECORD_GAIA1); + super("gaia1", BotaniaSoundEvents.gaiaMusic1, LibItemNames.RECORD_GAIA1); } } diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java index 2f1f1f6ca..c01774a79 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.record; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.lib.LibItemNames; public class ItemRecordGaia2 extends ItemModRecord { public ItemRecordGaia2() { - super("gaia2", LibItemNames.RECORD_GAIA2); + super("gaia2", BotaniaSoundEvents.gaiaMusic2, LibItemNames.RECORD_GAIA2); } } 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 a72e76f57..6f1e29ddd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -14,6 +14,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -33,8 +35,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { - return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, pos, side, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); + 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); } @Override 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 be45f5542..3e2e835aa 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -17,6 +17,8 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -45,27 +47,30 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { - return place(par1ItemStack, par2EntityPlayer, par3World, pos, side, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); + 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); } - public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { + 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) { if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, false)) { int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, side, par8, par9, par10); + stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, true); 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(), r, g, b, 1F, 5); + return EnumActionResult.SUCCESS; } } + + return EnumActionResult.FAIL; } - return true; + return EnumActionResult.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 80bc1631b..29cb4bdc8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -17,6 +17,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -26,6 +30,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; @@ -43,17 +48,18 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer p) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer p, EnumHand hand) { if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; long seedxor = world.rand.nextLong(); doHighlight(world, new BlockPos(p), range, seedxor); - p.swingItem(); - } else world.playSoundAtEntity(p, "botania:divinationRod", 1F, 1F); + p.swingArm(hand); + } else world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.divinationRod, SoundCategory.PLAYERS, 1F, 1F); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return stack; + return ActionResult.newResult(EnumActionResult.PASS, stack); } public void doHighlight(World world, BlockPos pos, int range, long seedxor) { 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 495cae234..2c83192b9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -20,10 +20,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; @@ -69,7 +72,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState wstate = par3World.getBlockState(pos); if(par2EntityPlayer.isSneaking()) { @@ -79,10 +82,10 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra Item item = Item.getItemFromBlock(wstate.getBlock()); boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); - par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); + par2EntityPlayer.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); displayRemainderCounter(par2EntityPlayer, par1ItemStack); - return set; + return EnumActionResult.SUCCESS; } } } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { @@ -96,17 +99,17 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, pos.getZ()); setTargetBlock(par1ItemStack, wstate.getBlock(), wstate.getBlock().getMetaFromState(wstate)); if(par3World.isRemote) - par2EntityPlayer.swingItem(); + par2EntityPlayer.swingArm(hand); } } - return false; + return EnumActionResult.SUCCESS; } @SubscribeEvent public void onLeftClick(PlayerInteractEvent event) { if(event.action == Action.LEFT_CLICK_BLOCK) { - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); + ItemStack stack = event.entityPlayer.getHeldItemMainhand(); if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, false)) { if(exchange(event.world, event.entityPlayer, event.pos, stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, true); @@ -189,15 +192,15 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra // Check to see if the block is visible on any side: for(EnumFacing dir : EnumFacing.VALUES) { BlockPos adjPos = pos_.offset(dir); - Block adjBlock = world.getBlockState(adjPos).getBlock(); - + IBlockState adjState = world.getBlockState(adjPos); + // If the side of the adjacent block facing this block is // _not_ solid, then this block is considered "visible" // and should be replaced. // If there is a rendering-specific way to check for this, // that should be placed in preference to this. - if(!adjBlock.isSideSolid(world, adjPos, dir.getOpposite())) { + if(!adjState.isSideSolid(world, adjPos, dir.getOpposite())) { coordsList.add(pos_); break; } @@ -216,7 +219,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(placeStack != null) { IBlockState stateAt = world.getBlockState(pos); Block blockAt = stateAt.getBlock(); - if(!blockAt.isAir(world, pos) && blockAt.getPlayerRelativeBlockHardness(player, world, pos) > 0 && stateAt != state) { + if(!blockAt.isAir(world.getBlockState(pos), world, pos) && stateAt.getPlayerRelativeBlockHardness(player, world, pos) > 0 && stateAt != state) { if(!world.isRemote) { if(!player.capabilities.isCreativeMode) { List drops = blockAt.getDrops(world, pos, stateAt, 0); @@ -387,7 +390,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @Override @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { - ItemStack holding = player.getCurrentEquippedItem(); + ItemStack holding = player.getHeldItemMainhand(); if(holding != stack || !canExchange(stack)) return null; 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 40b56e991..68e4abb0b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -12,8 +12,12 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -42,7 +46,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); @@ -50,10 +54,10 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield par1ItemStack.setItemDamage(COOLDOWN); ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); - par3World.playSoundAtEntity(player, "mob.blaze.breathe", 1F, 1F); + par3World.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_blaze_ambient, SoundCategory.PLAYERS, 1F, 1F); } - return true; + return EnumActionResult.SUCCESS; } @Override 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 3a5e2c559..654daccec 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -17,9 +17,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -77,14 +81,14 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setInt(stack, TAG_TICKS_COOLDOWN, ticksCooldown); EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote) + if(player.getHeldItemMainhand() == stack && player.swingProgress == check && !world.isRemote) leftClick(player); } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); @@ -134,7 +138,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item != null) { if(BotaniaAPI.isEntityBlacklistedFromGravityRod(item.getClass())) - return stack; + return ActionResult.newResult(EnumActionResult.FAIL, stack); if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { if(item instanceof EntityItem) @@ -143,8 +147,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item instanceof EntityLivingBase) { EntityLivingBase targetEntity = (EntityLivingBase)item; targetEntity.fallDistance = 0.0F; - if(targetEntity.getActivePotionEffect(Potion.moveSlowdown) == null) - targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true, true)); + if(targetEntity.getActivePotionEffect(MobEffects.moveSlowdown) == null) + targetEntity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 2, 3, true, true)); } Vector3 target3 = Vector3.fromEntityCenter(player); @@ -169,12 +173,12 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setInt(stack, TAG_TARGET, item.getEntityId()); ItemNBTHelper.setDouble(stack, TAG_DIST, length); } - } - if(item != null) ItemNBTHelper.setInt(stack, TAG_TICKS_TILL_EXPIRE, 5); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } } - return stack; + return ActionResult.newResult(EnumActionResult.PASS, stack); } public static void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) { @@ -195,7 +199,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } public static void leftClick(EntityPlayer player) { - ItemStack stack = player.getHeldItem(); + ItemStack stack = player.getHeldItemMainhand(); if(stack != null && stack.getItem() == ModItems.gravityRod) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index b388fcd17..1935b39bf 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -15,6 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; @@ -22,6 +25,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.entity.EntityMagicMissile; @@ -52,7 +56,10 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + if(!(living instanceof EntityPlayer)) return; + EntityPlayer player = ((EntityPlayer) living); + if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { if(spawnMissile(player.worldObj, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, true); @@ -70,7 +77,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi missile.setPosition(x, y, z); if(missile.getTarget()) { if(!world.isRemote) { - world.playSoundEffect(x, y, z, "botania:missile", 0.6F, 0.8F + (float) Math.random() * 0.2F); + missile.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); world.spawnEntityInWorld(missile); } @@ -80,9 +87,9 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d93471b18..fa502806e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -18,12 +18,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; @@ -48,7 +53,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par2World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); @@ -67,14 +72,14 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi int time = prof ? (int) (TIME * 1.6) : TIME; BlockPos playerPos = new BlockPos((int) x, (int) y, (int) z); - while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlockState(playerPos).getBlock().isAir(par2World, playerPos) || par2World.getBlockState(playerPos).getBlock() == place) { + while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlockState(playerPos).getBlock().isAir(par2World.getBlockState(playerPos), par2World, playerPos) || par2World.getBlockState(playerPos).getBlock() == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) for(int j = -2; j < 1; j++) { BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); - if(par2World.getBlockState(pos_).getBlock().isAir(par2World, pos_) || par2World.getBlockState(pos_).getBlock() == place) { + if(par2World.getBlockState(pos_).getBlock().isAir(par2World.getBlockState(pos_), par2World, pos_) || par2World.getBlockState(pos_).getBlock() == place) { par2World.setBlockState(pos_, place.getDefaultState()); TileBifrost tile = (TileBifrost) par2World.getTileEntity(pos_); if(tile != null) { @@ -97,13 +102,13 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } if(count > 0) { - par2World.playSoundAtEntity(par3EntityPlayer, "botania:bifrostRod", 0.5F, 0.25F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false); par1ItemStack.setItemDamage(TIME); } } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override @@ -177,7 +182,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi continue; BlockPos pos = new BlockPos(ex, py, ez); Block block = world.getBlockState(pos).getBlock(); - if(block.isAir(world, pos)) { + if(block.isAir(world.getBlockState(pos), world, pos)) { world.setBlockState(pos, ModBlocks.bifrost.getDefaultState()); TileBifrost tileBifrost = (TileBifrost) world.getTileEntity(pos); tileBifrost.ticks = 10; 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 cc5f9c69a..69aac8d90 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -14,6 +14,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -31,7 +34,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); @@ -45,7 +48,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { if(entities == 0) { ItemStack stackToPlace = new ItemStack(Blocks.dirt); - stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), EnumFacing.DOWN, 0F, 0F, 0F); + stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), hand, EnumFacing.DOWN, 0F, 0F, 0F); if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true); @@ -55,9 +58,9 @@ public class ItemSkyDirtRod extends ItemDirtRod { } } if(world.isRemote) - player.swingItem(); + player.swingArm(hand); - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } } 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 baab6576e..6281f6ec6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -15,11 +15,17 @@ import java.util.WeakHashMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -54,13 +60,16 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public void onUsingTick(ItemStack stack, EntityPlayer p, int time) { + public void onUsingTick(ItemStack stack, EntityLivingBase living, int time) { + if(!(living instanceof EntityPlayer)) return; + EntityPlayer p = ((EntityPlayer) living); + if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; @@ -84,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.playSoundAtEntity(p, "fire.ignite", 0.6F, 1F); - p.worldObj.playSoundAtEntity(p, "fire.fire", 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); @@ -113,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.playSoundAtEntity(p, "fire.fire", (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 6bd7e1b9a..2ebf87e9a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -18,13 +18,19 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -87,15 +93,15 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - if(count != getMaxItemUseDuration(stack) && count % 10 == 0) - terraform(stack, player.worldObj, player); + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + if(count != getMaxItemUseDuration(stack) && count % 10 == 0 && living instanceof EntityPlayer) + terraform(stack, living.worldObj, ((EntityPlayer) living)); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } public void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { @@ -133,7 +139,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { BlockPos pos_ = pos.offset(dir); Block block_ = par2World.getBlockState(pos_).getBlock(); - if(block_.isAir(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_); hasAir = true; } @@ -162,7 +168,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(!blocks.isEmpty()) { for(int i = 0; i < 10; i++) - par2World.playSoundAtEntity(par3EntityPlayer, "step.sand", 1F, 0.4F); + par2World.playSound(null, 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, xCenter - range + range * 2 * Math.random(), yCenter + 2 + (Math.random() - 0.5) * 2, zCenter - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 615f12b59..3eafd7d2c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -18,6 +18,10 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -26,6 +30,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModPotions; @@ -54,7 +59,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean holding) { if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; - player.getCurrentEquippedItem(); boolean damaged = par1ItemStack.getItemDamage() > 0; if(damaged && !isFlying(par1ItemStack)) @@ -63,13 +67,13 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi int max = FALL_MULTIPLIER * FLY_TIME; if(par1ItemStack.getItemDamage() >= max) { setFlying(par1ItemStack, false); - player.stopUsingItem(); + player.resetActiveHand(); } else if(isFlying(par1ItemStack)) { if(holding) { player.fallDistance = 0F; player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player) ? 1.6 : 1.25; - player.worldObj.playSoundAtEntity(player, "botania:airRod", 0.1F, 0.25F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++) Botania.proxy.wispFX(player.worldObj, player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } @@ -85,22 +89,18 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int meta = par1ItemStack.getItemDamage(); if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, false)) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + par3EntityPlayer.setActiveHand(hand); if(meta == 0) { - setFlying(par1ItemStack, true); ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, true); + setFlying(par1ItemStack, true); } + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - return par1ItemStack; - } - - @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } @Override @@ -148,8 +148,8 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi Botania.proxy.wispFX(p.worldObj, p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); if(!world.isRemote) { - p.worldObj.playSoundAtEntity(p, "botania:dash", 1F, 1F); - p.addPotionEffect(new PotionEffect(ModPotions.featherfeet.id, 100, 0)); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + p.addPotionEffect(new PotionEffect(ModPotions.featherfeet, 100, 0)); tile.recieveMana(-COST); } } 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 a3dfd80ab..9c8713ebf 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -25,28 +27,30 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + 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 = getRayTraceResultFromPlayer(par3World, par2EntityPlayer, false); + RayTraceResult mop = getMovingObjectPositionFromPlayer(par3World, par2EntityPlayer, false); if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos hitPos = mop.getBlockPos(); if(!par3World.isBlockModifiable(par2EntityPlayer, hitPos)) - return false; + return EnumActionResult.FAIL; 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(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; } } } + return EnumActionResult.FAIL; } - return true; + + return EnumActionResult.PASS; } @Override From 3dd877e69a59feeb64dad5980a3992c5600d1e51 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 18:59:23 -0500 Subject: [PATCH 446/935] Color handling --- .../client/core/handler/ColorHandler.java | 74 +++++++++++++++++++ .../client/core/proxy/ClientProxy.java | 2 + .../botania/common/block/BlockCamo.java | 13 ---- .../common/block/BlockModDoubleFlower.java | 5 -- .../common/block/BlockSpecialFlower.java | 11 --- .../common/block/decor/BlockManaBeacon.java | 10 --- .../common/block/decor/BlockPetalBlock.java | 10 --- .../common/block/decor/BlockUnstable.java | 10 --- .../botania/common/item/IColorable.java | 7 ++ .../botania/common/item/Item16Colors.java | 2 +- .../botania/common/item/ItemManaGun.java | 2 +- .../botania/common/item/ItemManaMirror.java | 2 +- .../botania/common/item/ItemManaTablet.java | 2 +- .../botania/common/item/ItemSignalFlare.java | 2 +- .../botania/common/item/ItemSpellCloth.java | 2 +- .../block/ItemBlockWithMetaNameAndColor.java | 10 ++- .../common/item/brew/ItemBrewBase.java | 3 +- .../common/item/brew/ItemIncenseStick.java | 3 +- .../equipment/bauble/ItemBloodPendant.java | 3 +- .../item/equipment/tool/ItemEnderDagger.java | 3 +- .../tool/terrasteel/ItemTerraPick.java | 3 +- .../botania/common/item/lens/ItemLens.java | 3 +- .../item/material/ItemManaResource.java | 3 +- 23 files changed, 109 insertions(+), 76 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/core/handler/ColorHandler.java create mode 100644 src/main/java/vazkii/botania/common/item/IColorable.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java new file mode 100644 index 000000000..e5fc5ba02 --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -0,0 +1,74 @@ +package vazkii.botania.client.core.handler; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.color.BlockColors; +import net.minecraft.client.renderer.color.IBlockColor; +import net.minecraft.client.renderer.color.IItemColor; +import net.minecraft.client.renderer.color.ItemColors; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.BlockCamo; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileCamo; +import vazkii.botania.common.item.IColorable; +import vazkii.botania.common.item.ModItems; + +public final class ColorHandler { + + public static void init() { + BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); + + // 16 colors + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + } + }, + ModBlocks.specialFlower, ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock); + + // Platforms + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + } + return 0xFFFFFF; + } + }, ModBlocks.platform); + + ItemColors items = Minecraft.getMinecraft().getItemColors(); + + items.registerItemColorHandler(new IItemColor() { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + Item item = stack.getItem(); + if (item instanceof IColorable) { + return ((IColorable) item).getColorFromItemStack(stack, tintIndex); + } else { + return 0xFFFFFF; + } + } + }, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, + ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, + ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock)); + } + + private ColorHandler() {} + +} 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 374a999dd..8858f7dd9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -48,6 +48,7 @@ import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.ColorHandler; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; @@ -180,6 +181,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); + ColorHandler.init(); initRenderers(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index c1fbeeee3..cd8a008e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -89,19 +89,6 @@ public abstract class BlockCamo extends BlockMod { return false; } - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess par1World, BlockPos pos, int pass) { - TileEntity tile = par1World.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState state = camo.camoState; - if(state != null) - return state.getBlock() instanceof BlockCamo ? 0xFFFFFF : state.getBlock().getRenderColor(state); - } - return 0xFFFFFF; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index f3552909b..616cb97a3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -193,11 +193,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return ImmutableList.of(); } - @Override - public int colorMultiplier(IBlockAccess blockAccess, BlockPos pos, int pass) { - return 16777215; - } - @Override public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { for(int i = 0; i < COUNT; ++i) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 27615dff9..87ef5f93b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -286,17 +286,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR) - .getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return getRenderColor(world.getBlockState(pos)); - } - @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); 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 e726e8a10..42b8083d6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -98,16 +98,6 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { - return getRenderColor(par1iBlockAccess.getBlockState(pos)); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; 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 f34d18c53..a252b6d8e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -78,16 +78,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return super.setUnlocalizedName(par1Str); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return getRenderColor(world.getBlockState(pos)); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); 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 758a58edb..d65911cb1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -110,16 +110,6 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { - return getRenderColor(par1iBlockAccess.getBlockState(pos)); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; diff --git a/src/main/java/vazkii/botania/common/item/IColorable.java b/src/main/java/vazkii/botania/common/item/IColorable.java new file mode 100644 index 000000000..b2f40d2d3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/IColorable.java @@ -0,0 +1,7 @@ +package vazkii.botania.common.item; + +import net.minecraft.item.ItemStack; + +public interface IColorable { + int getColorFromItemStack(ItemStack stack, int tintIndex); +} diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index fd422919c..9108fbcb3 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -17,7 +17,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class Item16Colors extends ItemMod { +public class Item16Colors extends ItemMod implements IColorable { public Item16Colors(String name) { super(); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index aa5e60fa4..f4b6e802a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -47,7 +47,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemManaGun extends ItemMod implements IManaUsingItem { +public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { private static final String TAG_LENS = "lens"; private static final String TAG_CLIP = "clip"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index b05b7836c..c984f36ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { +public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_BACKLOG = "manaBacklog"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 3a7403a6a..a9aa9b347 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -26,7 +26,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { +public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay, IColorable { private static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 1658087fb..5bbd08d1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -36,7 +36,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; -public class ItemSignalFlare extends ItemMod { +public class ItemSignalFlare extends ItemMod implements IColorable { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index dc95b05e8..1e6a2ef68 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemSpellCloth extends ItemMod { +public class ItemSpellCloth extends ItemMod implements IColorable { public ItemSpellCloth() { setMaxDamage(35); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java index 093dc909e..d9debbd76 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java @@ -1,19 +1,21 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.item.IColorable; -public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName { +public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName implements IColorable { public ItemBlockWithMetaNameAndColor(Block block) { super(block); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) - { - return this.block.getRenderColor(this.block.getStateFromMeta(stack.getMetadata())); + public int getColorFromItemStack(ItemStack stack, int renderPass) { + return Minecraft.getMinecraft().getBlockColors() + .colorMultiplier(this.block.getStateFromMeta(stack.getMetadata()), null, null, renderPass); } } 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 6dc26feb7..92c349ef5 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -33,9 +33,10 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; -public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement { +public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement, IColorable { private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index cf1fc426a..b337a4cce 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -28,10 +28,11 @@ import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { +public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer, IColorable { private static final String TAG_BREW_KEY = "brewKey"; public static final int TIME_MULTIPLIER = 60; 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 6e3d81f7e..52cf31808 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 @@ -44,10 +44,11 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; -public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { +public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender, IColorable { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 9ed324536..1c7496269 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -21,10 +21,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; -public class ItemEnderDagger extends ItemManasteelSword { +public class ItemEnderDagger extends ItemManasteelSword implements IColorable { public ItemEnderDagger() { super(BotaniaAPI.manasteelToolMaterial, LibItemNames.ENDER_DAGGER); 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 c1fa35d9a..5c48202a2 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 @@ -37,6 +37,7 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -48,7 +49,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { +public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker, IColorable { private static final String TAG_ENABLED = "enabled"; private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 8936d241c..c615afc9d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -35,11 +35,12 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { +public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt, IColorable { public static final int SUBTYPES = 22; 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 a1d2c3e5d..636472e9f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -36,6 +36,7 @@ import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; @@ -43,7 +44,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { +public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement, IColorable { final int types = 24; From 38522825981654dc728bf7ebaac2ef8dde071125 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 19:03:35 -0500 Subject: [PATCH 447/935] Missed two --- .../client/core/handler/ColorHandler.java | 37 ++++++++++++++++++- .../botania/common/block/mana/BlockPool.java | 11 ------ .../common/block/mana/BlockSpreader.java | 9 ----- 3 files changed, 36 insertions(+), 21 deletions(-) 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 e5fc5ba02..f8151fbdb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -15,12 +15,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; +import java.awt.*; + public final class ColorHandler { public static void init() { @@ -36,6 +40,36 @@ public final class ColorHandler { }, ModBlocks.specialFlower, ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock); + // Pool + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } else { + return 16777215; + } + } + }, + ModBlocks.pool + ); + + // Spreader + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) + return 0xFFFFFF; + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); + } + }, + ModBlocks.spreader + ); + // Platforms blocks.registerBlockColorHandler( new IBlockColor() { @@ -66,7 +100,8 @@ public final class ColorHandler { } }, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, - ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock)); + ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), + Item.getItemFromBlock(ModBlocks.unstableBlock), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader)); } private ColorHandler() {} 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 27c072651..0944e063b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -185,17 +185,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return 2; } - @Override - @SideOnly(Side.CLIENT) - public int getRenderColor(IBlockState state) { - if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); - } else { - return 16777215; - } - } - @Override public boolean hasComparatorInputOverride() { return true; 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 a4661e314..03a9ab72b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -144,15 +144,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; } - @Override - @SideOnly(Side.CLIENT) - public int getRenderColor(IBlockState state) { - if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) - return super.getRenderColor(state); - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); - } - @Override public int getRenderType() { return 2; From 663c797cf3aadccc588f99aa31cc346e9d50de2a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 20:01:50 -0500 Subject: [PATCH 448/935] More items --- .../item/block/ItemBlockTinyPotato.java | 4 +- .../common/item/brew/ItemBrewBase.java | 34 +++++++++-------- .../common/item/brew/ItemIncenseStick.java | 7 ++-- .../armor/manasteel/ItemManasteelArmor.java | 7 ++-- .../armor/manasteel/ItemManasteelBoots.java | 3 +- .../armor/manasteel/ItemManasteelChest.java | 3 +- .../armor/manasteel/ItemManasteelHelm.java | 3 +- .../armor/manasteel/ItemManasteelLegs.java | 3 +- .../armor/manaweave/ItemManaweaveArmor.java | 3 +- .../armor/manaweave/ItemManaweaveBoots.java | 3 +- .../armor/manaweave/ItemManaweaveChest.java | 3 +- .../armor/manaweave/ItemManaweaveHelm.java | 3 +- .../armor/manaweave/ItemManaweaveLegs.java | 3 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 7 ++-- .../armor/terrasteel/ItemTerrasteelBoots.java | 3 +- .../armor/terrasteel/ItemTerrasteelChest.java | 3 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 12 +++--- .../armor/terrasteel/ItemTerrasteelLegs.java | 3 +- .../item/equipment/bauble/ItemBauble.java | 15 +++++--- .../equipment/bauble/ItemBaubleCosmetic.java | 6 +-- .../equipment/bauble/ItemBloodPendant.java | 16 ++++---- .../item/equipment/bauble/ItemDivaCharm.java | 9 +++-- .../equipment/bauble/ItemGoldenLaurel.java | 12 ++++-- .../item/equipment/bauble/ItemHolyCloak.java | 7 +++- .../item/equipment/bauble/ItemIcePendant.java | 3 +- .../item/equipment/bauble/ItemItemFinder.java | 3 +- .../equipment/bauble/ItemKnockbackBelt.java | 2 +- .../equipment/bauble/ItemLavaPendant.java | 3 +- .../item/equipment/bauble/ItemMiningRing.java | 11 +++--- .../item/equipment/bauble/ItemMonocle.java | 5 ++- .../bauble/ItemSuperLavaPendant.java | 3 +- .../item/equipment/bauble/ItemSwapRing.java | 21 +++++----- .../equipment/bauble/ItemUnholyCloak.java | 4 +- .../item/equipment/bauble/ItemWaterRing.java | 9 +++-- .../item/equipment/tool/ItemGlassPick.java | 2 +- .../item/equipment/tool/ItemStarSword.java | 9 +++-- .../item/equipment/tool/ToolCommons.java | 13 ++++--- .../equipment/tool/bow/ItemCrystalBow.java | 5 ++- .../tool/elementium/ItemElementiumAxe.java | 5 ++- .../tool/elementium/ItemElementiumShears.java | 21 ++++++---- .../tool/manasteel/ItemManasteelAxe.java | 13 ++++--- .../tool/manasteel/ItemManasteelPick.java | 13 ++++--- .../tool/manasteel/ItemManasteelShears.java | 10 +++-- .../tool/manasteel/ItemManasteelShovel.java | 26 +++++++------ .../tool/terrasteel/ItemTerraAxe.java | 7 ++-- .../tool/terrasteel/ItemTerraPick.java | 14 ++++--- .../tool/terrasteel/ItemTerraSword.java | 12 ++++-- .../botania/common/item/material/ItemDye.java | 12 +++--- .../item/material/ItemManaResource.java | 24 +++++++----- .../common/item/relic/ItemAesirRing.java | 2 +- .../botania/common/item/relic/ItemDice.java | 15 +++++--- .../common/item/relic/ItemFlugelEye.java | 38 ++++++++++++------- .../common/item/relic/ItemInfiniteFruit.java | 22 +++++++---- 53 files changed, 300 insertions(+), 199 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 767ecbbb2..804964af2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -24,9 +24,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemBlockTinyPotato extends ItemBlockMod { - private static final List TYPOS = Arrays.asList(new String[] { - "vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski" - }); + private static final List TYPOS = Arrays.asList("vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski"); private static final String NOT_MY_NAME[] = { "Six letter word just to get me along", 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 92c349ef5..f0f18a0c7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -14,14 +14,20 @@ import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -70,29 +76,28 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); - return p_77659_1_; + public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + p_77659_3_.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { - PotionEffect newEffect = new PotionEffect(effect.getPotionID(), effect.getDuration(), effect.getAmplifier(), true, true); - Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - if(potion.isInstant()) - potion.affectEntity(player, player, player, newEffect.getAmplifier(), 1F); - else player.addPotionEffect(newEffect); + PotionEffect newEffect = new PotionEffect(effect.getPotion(), effect.getDuration(), effect.getAmplifier(), true, true); + if(effect.getPotion().isInstant()) + effect.getPotion().affectEntity(living, living, living, newEffect.getAmplifier(), 1F); + else living.addPotionEffect(newEffect); } if(world.rand.nextBoolean()) - world.playSoundAtEntity(player, "random.burp", 1F, 1F); + world.playSound(null, living.posX, living.posY, living.posZ, SoundEvents.entity_player_burp, SoundCategory.PLAYERS, 1F, 1F); int swigs = getSwigsLeft(stack); - if(!player.capabilities.isCreativeMode) { + if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) { if(swigs == 1) { - if(!player.inventory.addItemStackToInventory(baseItem.copy())) + if(!((EntityPlayer) living).inventory.addItemStackToInventory(baseItem.copy())) return baseItem.copy(); else { ItemStack copy = stack.copy(); @@ -142,9 +147,8 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - list.add(format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); + TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; + list.add(format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(effect, 1F) + ")")); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index b337a4cce..bb6662de6 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -81,10 +81,9 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); - addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); + TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; + PotionEffect longEffect = new PotionEffect(effect.getPotion(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); + addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(longEffect, 1F) + ")"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 3703122e7..e21dd5944 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -17,6 +17,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -50,13 +51,13 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; protected ModelBiped[] models = null; - public int type; + public EntityEquipmentSlot type; - public ItemManasteelArmor(int type, String name) { + public ItemManasteelArmor(EntityEquipmentSlot type, String name) { this(type, name, BotaniaAPI.manasteelArmorMaterial); } - public ItemManasteelArmor(int type, String name, ArmorMaterial mat) { + public ItemManasteelArmor(EntityEquipmentSlot type, String name, ArmorMaterial mat) { super(mat, 0, type); this.type = type; setCreativeTab(BotaniaCreativeTab.INSTANCE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java index 3711be8e8..f23a2c8b9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelBoots.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManasteelBoots extends ItemManasteelArmor { public ItemManasteelBoots() { - super(3, LibItemNames.MANASTEEL_BOOTS); + super(EntityEquipmentSlot.FEET, LibItemNames.MANASTEEL_BOOTS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java index 000ef254f..3af2b5ef0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelChest.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManasteelChest extends ItemManasteelArmor { public ItemManasteelChest() { - super(1, LibItemNames.MANASTEEL_CHEST); + super(EntityEquipmentSlot.CHEST, LibItemNames.MANASTEEL_CHEST); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java index e06815638..1ba8171d8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.common.lib.LibItemNames; @@ -22,7 +23,7 @@ public class ItemManasteelHelm extends ItemManasteelArmor implements IManaDiscou } public ItemManasteelHelm(String name) { - super(0, name); + super(EntityEquipmentSlot.HEAD, name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java index 0538d979d..96ed84e08 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelLegs.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManasteelLegs extends ItemManasteelArmor { public ItemManasteelLegs() { - super(2, LibItemNames.MANASTEEL_LEGS); + super(EntityEquipmentSlot.LEGS, LibItemNames.MANASTEEL_LEGS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index c52c34485..986935f89 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -32,7 +33,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { - public ItemManaweaveArmor(int type, String name) { + public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java index 35d18e0eb..89fc43681 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManaweaveBoots extends ItemManaweaveArmor { public ItemManaweaveBoots() { - super(3, LibItemNames.MANAWEAVE_BOOTS); + super(EntityEquipmentSlot.FEET, LibItemNames.MANAWEAVE_BOOTS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java index 98f4391f2..5f1287db7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManaweaveChest extends ItemManaweaveArmor { public ItemManaweaveChest() { - super(1, LibItemNames.MANAWEAVE_CHEST); + super(EntityEquipmentSlot.CHEST, LibItemNames.MANAWEAVE_CHEST); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index 06ab5cd4a..a0d7cdd3a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -26,7 +27,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou private static final int MANA_PER_DAMAGE = 30; public ItemManaweaveHelm() { - super(0, LibItemNames.MANAWEAVE_HELM); + super(EntityEquipmentSlot.HEAD, LibItemNames.MANAWEAVE_HELM); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java index 63d61d161..3030ff90a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemManaweaveLegs extends ItemManaweaveArmor { public ItemManaweaveLegs() { - super(2, LibItemNames.MANAWEAVE_LEGS); + super(EntityEquipmentSlot.LEGS, LibItemNames.MANAWEAVE_LEGS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index c3d9ddaa1..ce39c4c58 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -17,6 +17,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; @@ -33,7 +34,7 @@ import com.google.common.collect.Multimap; public class ItemTerrasteelArmor extends ItemManasteelArmor { - public ItemTerrasteelArmor(int type, String name) { + public ItemTerrasteelArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.terrasteelArmorMaterial); } @@ -55,10 +56,10 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public Multimap getAttributeModifiers(ItemStack stack) { + public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); - multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); return multimap; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java index 5ff5aedda..27344b340 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemTerrasteelBoots extends ItemTerrasteelArmor { public ItemTerrasteelBoots() { - super(3, LibItemNames.TERRASTEEL_BOOTS); + super(EntityEquipmentSlot.FEET, LibItemNames.TERRASTEEL_BOOTS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java index 4f4a7b6a3..8a786a92a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemTerrasteelChest extends ItemTerrasteelArmor { public ItemTerrasteelChest() { - super(1, LibItemNames.TERRASTEEL_CHEST); + super(EntityEquipmentSlot.CHEST, LibItemNames.TERRASTEEL_CHEST); } } 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 706de7b30..791cd74a2 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 @@ -18,6 +18,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -47,7 +49,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } public ItemTerrasteelHelm(String name) { - super(0, name); + super(EntityEquipmentSlot.HEAD, name); } @Override @@ -122,7 +124,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(Potion.blindness) && player.ridingEntity == null; + 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 +135,17 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc boolean karil = hasAncientWill(stack, 5); if(ahrim) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 20, 1)); + event.entityLiving.addPotionEffect(new PotionEffect(MobEffects.weakness, 20, 1)); if(dharok) event.ammount *= 1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F; if(guthan) player.heal(event.ammount * 0.25F); if(torag) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 60, 1)); + event.entityLiving.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 60, 1)); if(verac) event.source.setDamageBypassesArmor(); if(karil) - event.entityLiving.addPotionEffect(new PotionEffect(Potion.wither.id, 60, 1)); + event.entityLiving.addPotionEffect(new PotionEffect(MobEffects.wither, 60, 1)); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java index 536819909..9f81f930a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import net.minecraft.inventory.EntityEquipmentSlot; import vazkii.botania.common.lib.LibItemNames; public class ItemTerrasteelLegs extends ItemTerrasteelArmor { public ItemTerrasteelLegs() { - super(2, LibItemNames.TERRASTEEL_LEGS); + super(EntityEquipmentSlot.LEGS, LibItemNames.TERRASTEEL_LEGS); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 734272510..69f1ad390 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -18,11 +18,16 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; @@ -51,9 +56,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); if(canEquip(par1ItemStack, par3EntityPlayer)) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer); @@ -69,7 +74,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt if(stackInSlot != null) { ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); - return stackInSlot.copy(); + return ActionResult.newResult(EnumActionResult.SUCCESS, stackInSlot.copy()); } break; } @@ -77,7 +82,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } @Override @@ -131,7 +136,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void onEquipped(ItemStack stack, EntityLivingBase player) { if(player != null) { if(!player.worldObj.isRemote) - player.worldObj.playSoundAtEntity(player, "botania:equipBauble", 0.1F, 1.3F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); if(player instanceof EntityPlayer) ((EntityPlayer) player).addStat(ModAchievements.baubleWear, 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 9fead7df5..77659dcfb 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 @@ -313,7 +313,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public void renderIcon(int i) { GlStateManager.pushMatrix(); renderStack.setItemDamage(i); - Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 GlStateManager.popMatrix(); } @@ -331,12 +331,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); - model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON); + model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false); // todo 1.9 GlStateManager.translate(-0.5F, -0.1F, -0.4F); this.renderModel(model, renderStack, 0xFF00004C); - GlStateManager.cullFace(1029); + GlStateManager.cullFace(GlStateManager.CullFace.BACK); GlStateManager.popMatrix(); GlStateManager.disableRescaleNormal(); GlStateManager.disableBlend(); 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 52cf31808..b2a836b1c 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 @@ -22,6 +22,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -98,8 +100,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { - Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); - TextFormatting format = potion.isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; + TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); } } @@ -118,10 +119,10 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; boolean doRand = cost < 1; if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { - PotionEffect currentEffect = player.getActivePotionEffect(GameData.getPotionRegistry().getObjectById(effect.getPotionID())); - boolean nightVision = effect.getPotionID() == Potion.nightVision.id; + PotionEffect currentEffect = player.getActivePotionEffect(effect.getPotion()); + boolean nightVision = effect.getPotion() == MobEffects.nightVision; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { - PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); + PotionEffect applyEffect = new PotionEffect(effect.getPotion(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); } @@ -147,8 +148,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - FMLControlledNamespacedRegistry potionRegistry = GameData.getPotionRegistry(); - if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || potionRegistry.getObjectById(brew.getPotionEffects(stack).get(0).getPotionID()).isInstant()) + if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || brew.getPotionEffects(stack).get(0).getPotion().isInstant()) return null; ItemStack brewStack = new ItemStack(this); @@ -171,7 +171,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(2) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); 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 f8504b2a7..d9ccbc580 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 @@ -22,7 +22,9 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -30,6 +32,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.lib.LibItemNames; @@ -68,7 +71,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble event.entityLiving.isDead = false; ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.worldObj.playSoundAtEntity(player, "botania:divaCharm", 1F, 1F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.divaCharm, SoundCategory.PLAYERS, 1F, 1F); double x = event.entityLiving.posX; double y = event.entityLiving.posY; @@ -97,13 +100,13 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getCurrentArmor(3) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); 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); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 } } 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 7b4024cb1..576dda31d 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 @@ -15,14 +15,18 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; @@ -47,9 +51,9 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { if(amulet != null && amulet.getItem() == this) { event.setCanceled(true); player.setHealth(player.getMaxHealth()); - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 6)); + player.addPotionEffect(new PotionEffect(MobEffects.resistance, 300, 6)); player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); - player.worldObj.playSoundAtEntity(player, "botania:goldenLaurel", 1F, 0.3F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F); PlayerHandler.getPlayerBaubles(player).setInventorySlotContents(0, null); } } @@ -64,7 +68,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getCurrentArmor(3) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(-90F, 0F, 1F, 0F); @@ -73,7 +77,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { if(armor) { GlStateManager.scale(1.1F, 1.1F, 1.1F); } - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 2fd863be5..58276a565 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -15,12 +15,15 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -79,7 +82,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.source.isMagicDamage()) { event.setCanceled(true); - player.worldObj.playSoundAtEntity(player, "botania:holyCloak", 1F, 1F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { double x = player.posX + Math.random() * player.width * 2 - player.width; double y = player.posY + Math.random() * player.height; @@ -129,7 +132,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(getRenderTexture()); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(2) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); float s = 0.1F; 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 14d78d753..0e4cfee9a 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 @@ -25,6 +25,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -105,7 +106,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(2) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); 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 28f06bee6..fb8a6c84d 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 @@ -26,6 +26,7 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.AnimalChest; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -227,7 +228,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - boolean armor = player.getCurrentArmor(3) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(90F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 8ab9fb440..b5faaf4c0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -45,7 +45,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend @Override void fillModifiers(Multimap attributes, ItemStack stack) { - attributes.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); + attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); } @Override 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 7ed81f2fa..33dbcbc5a 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 @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; @@ -47,7 +48,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(2) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); 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 458c93f6a..99a06545b 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -36,10 +37,10 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { if(!hasMana) onUnequipped(stack, player); else { - if(player.getActivePotionEffect(Potion.digSpeed) != null) - player.removePotionEffect(Potion.digSpeed.id); + if(player.getActivePotionEffect(MobEffects.digSpeed) != null) + player.removePotionEffect(MobEffects.digSpeed); - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, Integer.MAX_VALUE, 1, true, true)); + player.addPotionEffect(new PotionEffect(MobEffects.digSpeed, Integer.MAX_VALUE, 1, true, true)); } if(player.swingProgress == 0.25F) @@ -49,9 +50,9 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - PotionEffect effect = player.getActivePotionEffect(Potion.digSpeed); + PotionEffect effect = player.getActivePotionEffect(MobEffects.digSpeed); if(effect != null && effect.getAmplifier() == 1) - player.removePotionEffect(Potion.digSpeed.id); + player.removePotionEffect(MobEffects.digSpeed); } @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 3e51d6c10..25b2fb141 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 @@ -23,6 +23,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -51,13 +52,13 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getCurrentArmor(3) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); 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); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 } } 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 f97263d92..e9d61b3ed 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 @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; @@ -58,7 +59,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(2) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index ccb9f5f55..cf28ab067 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -34,7 +35,7 @@ public class ItemSwapRing extends ItemBauble { return; EntityPlayer player = (EntityPlayer) entity; - ItemStack currentStack = player.getCurrentEquippedItem(); + ItemStack currentStack = player.getHeldItemMainhand(); if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool)) return; @@ -44,17 +45,15 @@ public class ItemSwapRing extends ItemBauble { ToolType typeToFind = null; if(player.isSwingInProgress && pos != null && pos.getBlockPos() != null) { - Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); - if(block != null) { - Material mat = block.getMaterial(); - if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsPick)) - typeToFind = ToolType.PICK; - else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsShovel)) - typeToFind = ToolType.SHOVEL; - else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsAxe)) - typeToFind = ToolType.AXE; - } + Material mat = state.getMaterial(); + if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsPick)) + typeToFind = ToolType.PICK; + else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsShovel)) + typeToFind = ToolType.SHOVEL; + else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsAxe)) + typeToFind = ToolType.AXE; } if(typeToFind == null) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 8bff2fb3a..b967f1dad 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -18,10 +18,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; @@ -45,7 +47,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); } - player.worldObj.playSoundAtEntity(player, "botania:unholyCloak", 1F, 1F); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 90; i++) { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; 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 45eae3e24..394437e8f 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -50,9 +51,9 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(changeZ) player.motionZ = motionZ; - PotionEffect effect = player.getActivePotionEffect(Potion.nightVision); + PotionEffect effect = player.getActivePotionEffect(MobEffects.nightVision); if(effect == null) { - PotionEffect neweffect = new PotionEffect(Potion.nightVision.id, Integer.MAX_VALUE, -42, true, true); + PotionEffect neweffect = new PotionEffect(MobEffects.nightVision, Integer.MAX_VALUE, -42, true, true); player.addPotionEffect(neweffect); } @@ -66,9 +67,9 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - PotionEffect effect = player.getActivePotionEffect(Potion.nightVision); + PotionEffect effect = player.getActivePotionEffect(MobEffects.nightVision); if(effect != null && effect.getAmplifier() == -42) - player.removePotionEffect(Potion.nightVision.id); + player.removePotionEffect(MobEffects.nightVision); } @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 6b25744d4..b82994d25 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 @@ -33,7 +33,7 @@ public class ItemGlassPick extends ItemManasteelPick { @SubscribeEvent public void onBlockDrops(HarvestDropsEvent event) { - if(event.harvester != null && event.state != null && event.drops.isEmpty() && event.harvester.getCurrentEquippedItem() != null && event.harvester.getCurrentEquippedItem().getItem() == this && event.state.getBlock().getMaterial() == Material.glass && event.state.getBlock().canSilkHarvest(event.world, event.pos, event.state, event.harvester)) + if(event.harvester != null && event.state != null && event.drops.isEmpty() && event.harvester.getHeldItemMainhand() != null && event.harvester.getHeldItemMainhand().getItem() == this && event.state.getMaterial() == Material.glass && event.state.getBlock().canSilkHarvest(event.world, event.pos, event.state, event.harvester)) event.drops.add(new ItemStack(event.state.getBlock(), 1, event.state.getBlock().getMetaFromState(event.state))); } 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 464e0ef85..638da98d9 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 @@ -12,14 +12,17 @@ package vazkii.botania.common.item.equipment.tool; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.Vector3; @@ -41,10 +44,10 @@ 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(Potion.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { + if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); @@ -60,7 +63,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme par2World.spawnEntityInWorld(star); ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F); + par2World.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } 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 cf2853d8b..ea6399298 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 @@ -18,6 +18,7 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; @@ -52,7 +53,7 @@ public final class ToolCommons { * Pos is the actual block coordinate, posStart and posEnd are deltas from pos */ public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { - float blockHardness = block == null ? 1F : block.getBlockHardness(world, pos); + float blockHardness = block == null ? 1F : block.getBlockHardness(world.getBlockState(pos), world, pos); for (BlockPos iterPos : BlockPos.getAllInBox(pos.add(posStart), pos.add(posEnd))) { if (iterPos.equals(pos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it @@ -83,8 +84,8 @@ public final class ToolCommons { if(block != null && blk != block) return; - Material mat = world.getBlockState(pos).getBlock().getMaterial(); - if(!world.isRemote && blk != null && !blk.isAir(world, pos) && blk.getPlayerRelativeBlockHardness(player, world, pos) > 0) { + Material mat = world.getBlockState(pos).getMaterial(); + if(!world.isRemote && blk != null && !blk.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) { if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) { return; } @@ -93,11 +94,11 @@ public final class ToolCommons { IBlockState localState = world.getBlockState(pos); blk.onBlockHarvested(world, pos, localState, player); - if(blk.removedByPlayer(world, pos, player, true)) { + if(blk.removedByPlayer(state, world, pos, player, true)) { blk.onBlockDestroyedByPlayer(world, pos, state); if(!dispose || !ItemElementiumPick.isDisposable(blk)) - blk.harvestBlock(world, player, pos, state, world.getTileEntity(pos)); + blk.harvestBlock(world, player, pos, state, world.getTileEntity(pos), stack); } damageItem(stack, 1, player, 80); @@ -130,7 +131,7 @@ public final class ToolCommons { if(item == ModItems.terraPick) modifier = ItemTerraPick.getLevel(stack); - int efficiency = EnchantmentHelper.getEnchantmentLevel(Enchantment.efficiency.effectId, 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 f74bd8cf2..b881ec77b 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 @@ -15,6 +15,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameData; @@ -43,13 +44,13 @@ public class ItemCrystalBow extends ItemLivingwoodBow { @Override boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_); + int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, p_77615_1_); return ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity + 1), false); } @Override void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) { - arrow.canBePickedUp = 2; + arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false); } 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 8863e4769..cd41cdf8e 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 @@ -10,6 +10,7 @@ import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -37,10 +38,10 @@ public class ItemElementiumAxe extends ItemManasteelAxe { @SubscribeEvent public void onEntityDrops(LivingDropsEvent event) { if(event.recentlyHit && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { - ItemStack weapon = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem(); + ItemStack weapon = ((EntityPlayer) event.source.getEntity()).getHeldItemMainhand(); if(weapon != null && weapon.getItem() == this) { Random rand = event.entity.worldObj.rand; - int looting = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, weapon); + int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, weapon); if(event.entityLiving instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton)event.entityLiving).getSkeletonType())); 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 caad5ca1c..a0fd643f9 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 @@ -7,10 +7,15 @@ import com.google.common.base.Predicates; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -36,24 +41,24 @@ public class ItemElementiumShears extends ItemManasteelShears { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - if(player.worldObj.isRemote) + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + if(living.worldObj.isRemote) return; if(count != getMaxItemUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IShearable.class)); + List sheep = living.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range), Predicates.instanceOf(IShearable.class)); if(sheep.size() > 0) { 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(Enchantment.fortune.effectId, stack)); + List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, stack)); Random rand = new Random(); for(ItemStack drop : drops) { @@ -63,7 +68,7 @@ public class ItemElementiumShears extends ItemManasteelShears { ent.motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F; } - ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, living, MANA_PER_DAMAGE); break; } } 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 057effd9d..b25f44235 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import java.util.regex.Pattern; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +21,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -69,8 +72,8 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { - if (block.getBlockHardness(world, pos) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; @@ -81,11 +84,11 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, pos, side, sx, sy, sz); + EnumActionResult did = stackAt.getItem().onItemUse(stackAt, player, world, pos, hand, side, sx, sy, sz); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); @@ -94,7 +97,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } } - return false; + return EnumActionResult.PASS; } 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 a58016129..5d7392fa3 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import java.util.regex.Pattern; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +21,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -69,19 +72,19 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { - if(block.getBlockHardness(world, pos) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + if(state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDmg()); return true; } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, pos, side, sx, sy, sz); + EnumActionResult did = stackAt.getItem().onItemUse(stackAt, player, world, pos, hand, side, sx, sy, sz); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); @@ -90,7 +93,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } } - return false; + return EnumActionResult.PASS; } public int getManaPerDmg() { 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 f2c107a74..e11d6acc7 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 @@ -20,10 +20,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -63,14 +65,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) { + public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity.worldObj.isRemote) return false; 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(Enchantment.fortune.effectId, itemstack)); + List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -98,7 +100,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(Enchantment.fortune.effectId, itemstack)); + List drops = target.onSheared(itemstack, player.worldObj, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -113,7 +115,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } ToolCommons.damageItem(itemstack, 1, player, MANA_PER_DAMAGE); - player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1); + player.addStat(StatList.getBlockStats(block), 1); } } 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 8ec2df15e..343f247a6 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +19,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -67,43 +71,43 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLivingBase entity) { - if (block.getBlockHardness(world, pos) != 0F) + public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); return true; } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) - return false; + return EnumActionResult.PASS; else { UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, pos); if(MinecraftForge.EVENT_BUS.post(event)) - return false; + return EnumActionResult.FAIL; if(event.getResult() == Result.ALLOW) { ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); - return true; + return EnumActionResult.SUCCESS; } Block block = p_77648_3_.getBlockState(pos).getBlock(); - if(side != EnumFacing.DOWN && p_77648_3_.getBlockState(pos.up()).getBlock().isAir(p_77648_3_, pos.up()) && (block == Blocks.grass || block == Blocks.dirt)) { + 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_.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block1.stepSound.getStepSound(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getFrequency() * 0.8F); + 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) - return true; + return EnumActionResult.SUCCESS; else { p_77648_3_.setBlockState(pos, block1.getDefaultState()); ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } } 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 9841007be..935954c38 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 @@ -23,6 +23,7 @@ import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -289,8 +290,8 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker cand.coordinates, origin, null, ToolCommons.materialsAxe, - EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, truncator) > 0, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, truncator), + EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, truncator) > 0, + EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, truncator), 0F, false, treatLeavesSpecial); remainingSwaps--; @@ -303,7 +304,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker Block block = world.getBlockState(adj).getBlock(); boolean isWood = block.isWood(world, adj); - boolean isLeaf = block.isLeaves(world, adj); + boolean isLeaf = block.isLeaves(world.getBlockState(adj), world, adj); // If it's not wood or a leaf, we aren't interested. if(!isWood && !isLeaf) 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 5c48202a2..a2654a8ff 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 @@ -34,6 +34,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; @@ -93,22 +94,23 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { getMana(par1ItemStack); int level = getLevel(par1ItemStack); if(level != 0) { setEnabled(par1ItemStack, !isEnabled(par1ItemStack)); if(!par2World.isRemote) - par2World.playSoundAtEntity(par3EntityPlayer, "botania:terraPickMode", 0.5F, 0.4F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float sx, float sy, float sz) { - return player.isSneaking() && super.onItemUse(stack, player, world, pos, side, sx, sy, sz); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { + return player.isSneaking() ? super.onItemUse(stack, player, world, pos, hand, side, sx, sy, sz) + : EnumActionResult.PASS; } @Override @@ -147,7 +149,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return; World world = player.worldObj; - Material mat = world.getBlockState(pos).getBlock().getMaterial(); + Material mat = world.getBlockState(pos).getMaterial(); if(!ToolCommons.isRightMaterial(mat, MATERIALS)) return; 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 cf95638e1..91f91f025 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 @@ -16,20 +16,24 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.MobEffects; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.stats.Achievement; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILensEffect; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -54,14 +58,14 @@ 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(Potion.digSpeed); + PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { + if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { EntityManaBurst burst = getBurst(player, par1ItemStack); par2World.spawnEntityInWorld(burst); ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F); + par2World.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } @@ -108,7 +112,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (living.getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) + if(living instanceof EntityPlayer && (living.getName().equals(attacker) || FMLCommonHandler.instance().getMinecraftServerInstance() != null && !FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) continue; if(living.hurtTime == 0) { 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 e1a6087cb..0845fab1a 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -20,6 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -34,14 +36,14 @@ public class ItemDye extends Item16Colors { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + 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); par1ItemStack.stackSize--; - return true; + return EnumActionResult.SUCCESS; } TileEntity tile = par3World.getTileEntity(pos); @@ -50,15 +52,15 @@ public class ItemDye extends Item16Colors { if(color != dyable.getColor()) { dyable.setColor(color); par1ItemStack.stackSize--; - return true; + return EnumActionResult.SUCCESS; } } - return false; + return EnumActionResult.PASS; } @Override - public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_) { + public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_, EnumHand hand) { if(p_111207_3_ instanceof EntitySheep) { EntitySheep entitysheep = (EntitySheep)p_111207_3_; EnumDyeColor i = EnumDyeColor.byMetadata(p_111207_1_.getItemDamage()); 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 636472e9f..bc79da0a3 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -17,10 +17,15 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -81,40 +86,41 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(stack.stackSize == 0) event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); - event.world.playSoundAtEntity(event.entityPlayer, "random.pop", 0.5F, 1F); + event.world.playSound(null, event.pos, SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); } } } } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, pos, par1ItemStack.getItemDamage() == 14); + return 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); - return true; + return EnumActionResult.SUCCESS; } - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, side, par8, par9, par10); + return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 15) { if(!par2EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; - par3World.playSoundAtEntity(par2EntityPlayer, "random.bow", 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) par3World.spawnEntityInWorld(new EntityEnderAirBottle(par3World, par2EntityPlayer)); - else par2EntityPlayer.swingItem(); + else par2EntityPlayer.swingArm(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 112f0378f..b513b7731 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -122,7 +122,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe void fillModifiers(Multimap attributes, ItemStack stack) { - attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } @Override 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 0b10c8f4a..1f7864f7f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -15,9 +15,14 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; @@ -48,7 +53,7 @@ public class ItemDice extends ItemRelic { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); int side = SIDES_FOR_MOON_PHASES[moonPhase]; @@ -66,19 +71,19 @@ public class ItemDice extends ItemRelic { relic = possible.get(world.rand.nextInt(possible.size())); } - world.playSoundAtEntity(player, "random.bow", 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).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); stack.stackSize--; - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); - return relicStacks[relic].copy(); + return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); } - return stack; + return ActionResult.newResult(EnumActionResult.FAIL, stack); } @Override 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 03cdc8cc5..e46dd547b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -11,10 +11,16 @@ package vazkii.botania.common.item.relic; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -38,10 +44,10 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs private static final String TAG_DIMENSION = "dim"; @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { if(world.isRemote) { - player.swingItem(); + player.swingArm(hand); for(int i = 0; i < 10; i++) { float x1 = (float) (pos.getX() + Math.random()); float y1 = pos.getY() + 1; @@ -53,29 +59,33 @@ 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.playSoundAtEntity(player, "mob.endermen.portal", 1F, 5F); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 5F); } } - return true; + return EnumActionResult.SUCCESS; } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - float x = (float) (player.posX - Math.random() * player.width); - float y = (float) (player.posY - 1.6 + Math.random()); - float z = (float) (player.posZ - Math.random() * player.width); - Botania.proxy.wispFX(player.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + float x = (float) (living.posX - Math.random() * living.width); + float y = (float) (living.posY - 1.6 + Math.random()); + float z = (float) (living.posZ - Math.random() * living.width); + Botania.proxy.wispFX(living.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer player) { + public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { + if(!(living instanceof EntityPlayer)) + return stack; + + EntityPlayer player = ((EntityPlayer) living); int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); @@ -101,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.playSoundAtEntity(entity, "mob.endermen.portal", 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/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index b3c98677a..407c19d97 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -10,9 +10,13 @@ */ package vazkii.botania.common.item.relic; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -37,16 +41,20 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); - return p_77659_1_; + public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) { + p_77659_3_.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); + } + return ActionResult.newResult(EnumActionResult.PASS, p_77659_1_); } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { - super.onUsingTick(stack, player, count); - + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { + super.onUsingTick(stack, living, count); + if(!(living instanceof EntityPlayer)) + return; + EntityPlayer player = ((EntityPlayer) living); if(ManaItemHandler.requestManaExact(stack, player, 500, true)) { if(count % 5 == 0) player.getFoodStats().addStats(1, 1F); From c23b9dcaee642f418d17969b97fb059da9c01f13 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 20:20:23 -0500 Subject: [PATCH 449/935] Some blocks --- .../vazkii/botania/common/block/BlockAltar.java | 4 ++-- .../vazkii/botania/common/block/BlockAvatar.java | 4 ++-- .../vazkii/botania/common/block/BlockBifrost.java | 2 +- .../botania/common/block/BlockBifrostPerm.java | 2 +- .../vazkii/botania/common/block/BlockCamo.java | 6 +++--- .../vazkii/botania/common/block/BlockCocoon.java | 4 ++-- .../vazkii/botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/BlockForestEye.java | 4 ++-- .../botania/common/block/BlockHourglass.java | 4 ++-- .../botania/common/block/BlockIncensePlate.java | 4 ++-- .../botania/common/block/BlockLightLauncher.java | 4 ++-- .../botania/common/block/BlockLightRelay.java | 4 ++-- .../botania/common/block/BlockPistonRelay.java | 2 +- .../vazkii/botania/common/block/BlockPylon.java | 4 ++-- .../botania/common/block/BlockSparkChanger.java | 4 ++-- .../botania/common/block/BlockTeruTeruBozu.java | 4 ++-- .../botania/common/block/BlockTinyPlanet.java | 4 ++-- .../block/corporea/BlockCorporeaCrystalCube.java | 13 ++++++------- .../common/block/corporea/BlockCorporeaIndex.java | 6 +++--- .../block/corporea/BlockCorporeaInterceptor.java | 4 ++-- .../block/corporea/BlockCorporeaRetainer.java | 4 ++-- .../common/block/decor/BlockBuriedPetals.java | 7 ++++--- .../common/block/decor/BlockCustomBrick.java | 2 +- .../botania/common/block/decor/BlockDirtPath.java | 10 +++++----- .../common/block/decor/BlockEndStoneBrick.java | 2 +- .../common/block/decor/BlockFloatingFlower.java | 14 +++++++------- .../common/block/decor/BlockManaBeacon.java | 4 ++-- .../common/block/decor/BlockManaFlame.java | 15 ++++++++------- .../common/block/decor/BlockManaGlass.java | 14 +++++--------- .../common/block/decor/BlockModMushroom.java | 11 ++++++----- .../botania/common/block/decor/BlockPavement.java | 2 +- .../common/block/decor/BlockPrismarine.java | 2 +- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 12 +++++++----- .../botania/common/block/decor/BlockUnstable.java | 6 +++--- .../common/block/decor/panes/BlockModPane.java | 3 ++- .../block/decor/quartz/BlockSpecialQuartz.java | 5 ----- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../common/block/decor/walls/BlockModWall.java | 2 +- .../block/dispenser/BehaviourPoolMinecart.java | 2 +- .../common/block/dispenser/BehaviourSeeds.java | 2 +- .../botania/common/block/mana/BlockBellows.java | 4 ++-- .../botania/common/block/mana/BlockBrewery.java | 4 ++-- .../botania/common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPool.java | 4 ++-- .../botania/common/block/mana/BlockPrism.java | 4 ++-- .../botania/common/block/mana/BlockPump.java | 4 ++-- .../botania/common/block/mana/BlockRuneAltar.java | 4 ++-- .../common/block/mana/BlockSpawnerClaw.java | 4 ++-- .../botania/common/block/mana/BlockSpreader.java | 4 ++-- .../common/block/mana/BlockTerraPlate.java | 4 ++-- 51 files changed, 121 insertions(+), 125 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 2417664f0..d7b2a30ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -249,12 +249,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 2a3b401e5..000d3c793 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -148,12 +148,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index bda653b4e..d65c60037 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -50,7 +50,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 7f22761ab..010de0893 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -41,7 +41,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index cd8a008e6..0a88ef3ff 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -33,7 +33,7 @@ public abstract class BlockCamo extends BlockMod { } public static boolean isValidBlock(Block block) { - return block.isOpaqueCube() || block.getRenderType() == 3; + return block.isOpaqueCube(IBlockState state) || block.getRenderType() == 3; } @Override @@ -80,12 +80,12 @@ public abstract class BlockCamo extends BlockMod { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 1116ec502..82c788822 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -43,12 +43,12 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 89d10ea66..ddad5a95b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -87,7 +87,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 4a4cf96cc..71fc50581 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -35,12 +35,12 @@ public class BlockForestEye extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 6071ab996..b7548abdb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -166,12 +166,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 8b5d1735a..3f4d41579 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -126,12 +126,12 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 72ffa1d31..e1238c8f0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -63,12 +63,12 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 7cd3355c9..2cd0b48cb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -135,12 +135,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index c89c24664..096a4414e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -73,7 +73,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 447509ca8..cac93375f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -92,12 +92,12 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 70d304354..e6a66da51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -65,12 +65,12 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 18f1b8b27..ba90f25fc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -97,12 +97,12 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 02441306c..1496e3dcc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -36,12 +36,12 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } 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 7e5de67f5..242d63cad 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -19,6 +19,7 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -81,9 +82,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { - ItemStack stack = player.getCurrentEquippedItem(); - + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) world.getTileEntity(pos); cube.setRequestTarget(stack); @@ -93,12 +92,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @@ -113,12 +112,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } 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 14c37d95a..294fe5109 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -43,17 +43,17 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public EnumBlockRenderType getRenderType() { + public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } 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 eae0b703e..9fecddb29 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -59,12 +59,12 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } 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 bc127f9cf..6469e3680 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -69,12 +69,12 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileCorporeaRetainer) world.getTileEntity(pos)).hasPendingRequest() ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 7ee50d87f..de6820c3f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,7 +37,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -65,7 +66,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public int getRenderType() { - return -1; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } } 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 b71e76da7..74aaf4017 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -85,7 +85,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 886756bf4..750a958b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -64,7 +64,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { if(!world.isRemote && entity instanceof EntityPlayerMP) { EntityLivingBase living = ((EntityLivingBase) entity); - IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + IAttributeInstance attr = living.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED); if(!attr.hasModifier(speedBoost)) { attr.applyModifier(speedBoost); } @@ -90,22 +90,22 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return new AxisAlignedBB(pos, pos.add(1, 1, 1)); } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } 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 c1061b71d..88948cc17 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -85,7 +85,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 86e322f54..fb7075aae 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -27,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -83,7 +84,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public EnumBlockRenderType getRenderType() { + public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @@ -153,7 +154,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -173,7 +174,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; @@ -195,18 +196,17 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { if(stack != null) { IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(pos); IslandType type = null; 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 42b8083d6..d33717f79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -84,12 +84,12 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } 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 d094ad4fa..5688bbb79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -20,6 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -58,17 +60,17 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return -1; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @@ -78,14 +80,13 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return null; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + 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)) { - ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { if(!world.isRemote) stack.stackSize--; 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 1830655c6..d87f70bac 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -40,19 +41,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } - public boolean shouldSideBeRendered1(IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(world, pos, side); - } - @Override - public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(world, pos, side.getOpposite()); + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } @Override 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 65ed116a4..580509a61 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -83,10 +83,11 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public boolean canPlaceBlockAt(World p_149718_1_, BlockPos pos) { + public boolean canPlaceBlockAt(World world, BlockPos pos) { if(pos.getY() >= 0 && pos.getY() < 256) { - Block block = p_149718_1_.getBlockState(pos.down()).getBlock(); - return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockState(pos.down()).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(p_149718_1_, pos.down(), EnumFacing.UP, this); + 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 false; @@ -112,7 +113,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } @@ -122,7 +123,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; 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 6d806751f..73f83127d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -103,7 +103,7 @@ public class BlockPavement extends BlockMod { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 998adc9ea..44c7333a4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -87,7 +87,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 22faa10ac..b8d24793a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -37,7 +37,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } 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 05a0dbd7d..0c03ea4e4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -21,6 +21,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -93,7 +95,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); @@ -133,18 +135,18 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override 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 d65911cb1..a78838f75 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -85,17 +85,17 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int color = getRenderColor(state); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); 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 0bf5cd1c0..9e28aee39 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -43,7 +44,7 @@ public class BlockModPane extends BlockPane { } @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; } 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 e040076ed..a14741554 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 @@ -116,11 +116,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return new ItemStack(this, 1, damageDropped(state)); } - @Override - public int getRenderType() { - return 3; - } - @Override @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { 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 eb682412c..ba9c1993f 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 @@ -79,7 +79,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index b701481b3..04e8cf9e7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -73,7 +73,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) { + public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } 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 04f5dc9ad..1c1046a19 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.getBlock().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; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index baf4b2fb9..a8c83de7c 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -33,7 +33,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); - if(world.getBlockState(pos).getBlock().isAir(world, pos) && block.canPlaceBlockAt(world, pos)) { + if(world.getBlockState(pos).getBlock().isAir(world.getBlockState(pos), world, pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState()); par2ItemStack.stackSize--; return par2ItemStack; 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 3b807b6d0..c5e130030 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -73,12 +73,12 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 a075c9da1..4b7dcf76f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -147,12 +147,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 f4508305d..952bd34d4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -95,7 +95,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } 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 0944e063b..8cb69cb5f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -171,12 +171,12 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 5150ad079..40c28d027 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -88,12 +88,12 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 895058364..21909928b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -88,12 +88,12 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 e83065eb6..f2f1050d7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -50,12 +50,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 13b3dad9a..7490bead3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -48,12 +48,12 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 03a9ab72b..fa76ebccc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -135,12 +135,12 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } 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 d75b4d35a..e03660b9f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -70,12 +70,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean isFullCube() { + public boolean isFullCube(IBlockState state) { return false; } @Override - public boolean isOpaqueCube() { + public boolean isOpaqueCube(IBlockState state) { return false; } From fe16702db46f314b01c6a822abf301c038987041 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 20:26:53 -0500 Subject: [PATCH 450/935] Brews and potions --- .../java/vazkii/botania/api/brew/Brew.java | 16 ++----- .../botania/api/brew/PotionEffectShim.java | 26 ---------- .../vazkii/botania/common/brew/BrewMod.java | 4 +- .../botania/common/brew/BrewModPotion.java | 6 +-- .../vazkii/botania/common/brew/ModBrews.java | 48 ++++++++++--------- .../botania/common/brew/potion/PotionMod.java | 5 +- .../common/item/brew/ItemIncenseStick.java | 2 +- 7 files changed, 37 insertions(+), 70 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/brew/PotionEffectShim.java diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 6a590e4da..e4c73611a 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -28,7 +28,7 @@ public class Brew { private final String name; private final int color; private final int cost; - private final List effects; + private final List effects; boolean canInfuseBloodPendant = true; boolean canInfuseIncense = true; @@ -39,7 +39,7 @@ public class Brew { * @param cost The cost, in Mana for this brew. * @param effects A list of effects to apply to the player when they drink it. */ - public Brew(String key, String name, int color, int cost, PotionEffectShim... effects) { + public Brew(String key, String name, int color, int cost, PotionEffect... effects) { this.key = key; this.name = name; this.color = color; @@ -116,23 +116,13 @@ public class Brew { return getManaCost(); } - /** - * Get the PotionEffectShim's that this brew has. - */ - public List getPotionEffectsShim(ItemStack stack) { - return effects; - } - /** * Gets the list of vanilla PotionEffects for the ItemStack passed in. * Note that for the lexicon, this passes in a botania Managlass * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { - List ret = new ArrayList<>(); - for(PotionEffectShim s : getPotionEffectsShim(stack)) - ret.add(s.toVanilla()); - return ret; + return effects; } } diff --git a/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java b/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java deleted file mode 100644 index 6235cad3c..000000000 --- a/src/main/java/vazkii/botania/api/brew/PotionEffectShim.java +++ /dev/null @@ -1,26 +0,0 @@ -package vazkii.botania.api.brew; - -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraftforge.fml.common.registry.GameData; - -// Version of PotionEffect that doesn't use number ID's -// See https://github.com/MinecraftForge/MinecraftForge/issues/2374 -// todo 1.9 remove? -public class PotionEffectShim { - - public final Potion potion; - public final int duration; - public final int amplifier; - - public PotionEffectShim(Potion potion, int duration, int amplifier) { - this.potion = potion; - this.duration = duration; - this.amplifier = amplifier; - } - - public PotionEffect toVanilla() { - return new PotionEffect(GameData.getPotionRegistry().getId(potion), duration, amplifier, true, true); - } - -} diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index 107dd0a8f..765c957c1 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.brew; +import net.minecraft.potion.PotionEffect; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; -import vazkii.botania.api.brew.PotionEffectShim; public class BrewMod extends Brew { - public BrewMod(String key, int color, int cost, PotionEffectShim... effects) { + public BrewMod(String key, int color, int cost, PotionEffect... effects) { super(key, key, color, cost, effects); BotaniaAPI.registerBrew(this); } diff --git a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java index e87683198..1a6f4dda8 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java +++ b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java @@ -11,13 +11,11 @@ package vazkii.botania.common.brew; import net.minecraft.potion.PotionEffect; -import net.minecraftforge.fml.common.registry.GameData; -import vazkii.botania.api.brew.PotionEffectShim; public class BrewModPotion extends BrewMod { - public BrewModPotion(String key, int cost, PotionEffectShim... effects) { - super(key, effects[0].potion.getLiquidColor(), cost, effects); + public BrewModPotion(String key, int cost, PotionEffect... effects) { + super(key, effects[0].getPotion().getLiquidColor(), cost, effects); } } diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 92937149d..d0b3e803a 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -10,10 +10,12 @@ */ package vazkii.botania.common.brew; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.brew.Brew; -import vazkii.botania.api.brew.PotionEffectShim; import vazkii.botania.common.lib.LibBrewNames; public class ModBrews { @@ -43,34 +45,34 @@ public class ModBrews { public static Brew warpWard; public static void init() { - speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffectShim(Potion.moveSpeed, 1800, 1)); - strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffectShim(Potion.damageBoost, 1800, 1)); - haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffectShim(Potion.digSpeed, 1800, 1)); - healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffectShim(Potion.heal, 1, 1)); - jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffectShim(Potion.jump, 1800, 1)); - regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffectShim(Potion.regeneration, 500, 1)); - regenWeak = new BrewMod(LibBrewNames.REGEN_WEAK, 0xFD6488, 9000, new PotionEffectShim(Potion.regeneration, 2400, 0)); - resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffectShim(Potion.resistance, 1800, 1)); - fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffectShim(Potion.fireResistance, 9600, 0)); - waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffectShim(Potion.waterBreathing, 9600, 0)); - invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffectShim(Potion.invisibility, 9600, 0)); - nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffectShim(Potion.nightVision, 9600, 0)); - absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffectShim(Potion.absorption, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); + 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(); - overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffectShim(Potion.damageBoost, 1800, 3), new PotionEffectShim(Potion.moveSpeed, 1800, 2), new PotionEffectShim(Potion.weakness, 3600, 2), new PotionEffectShim(Potion.hunger, 200, 2)); - soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffectShim(ModPotions.soulCross, 1800, 0)); - featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffectShim(ModPotions.featherfeet, 1800, 0)); - emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffectShim(ModPotions.emptiness, 7200, 0)); - bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffectShim(ModPotions.bloodthrst, 7200, 0)); - allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffectShim(ModPotions.allure, 4800, 0)); - clear = new BrewModPotion(LibBrewNames.CLEAR, 4000, new PotionEffectShim(ModPotions.clear, 0, 0)); + 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)); + 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)); + bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffect(ModPotions.bloodthrst, 7200, 0)); + allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffect(ModPotions.allure, 4800, 0)); + clear = new BrewModPotion(LibBrewNames.CLEAR, 4000, new PotionEffect(ModPotions.clear, 0, 0)); } public static void initTC() { - Potion warpWardPotion = Potion.getPotionFromResourceLocation("minecraft:warp_ward"); + Potion warpWardPotion = GameData.getPotionRegistry().getObject(new ResourceLocation("minecraft:warp_ward")); // thaumcraft 5 is registering its potions under the Minecraft namespace if(warpWardPotion != null) - warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffectShim(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable(); + warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffect(warpWardPotion, 12000, 0)).setNotBloodPendantInfusable(); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index c97056859..eea524fec 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -14,6 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,7 +25,8 @@ public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); public PotionMod(String name, boolean badEffect, int color, int iconIndex) { - super(new ResourceLocation("botania", name), badEffect, color); + super(badEffect, color); + // todo 1.9 register setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index bb6662de6..2e0b95b3f 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -107,7 +107,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - if(!brew.canInfuseIncense() || brew.getPotionEffectsShim(stack).size() != 1 || brew.getPotionEffectsShim(stack).get(0).potion.isInstant()) + if(!brew.canInfuseIncense() || brew.getPotionEffects(stack).size() != 1 || brew.getPotionEffects(stack).get(0).getPotion().isInstant()) return null; ItemStack brewStack = new ItemStack(this); From a268149d731a2ee2394012fc2ec14b4f55c90582 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 20:42:43 -0500 Subject: [PATCH 451/935] Misc rendering --- .../core/handler/MiscellaneousIcons.java | 11 ---- .../handler/SubTileRadiusRenderHandler.java | 5 +- .../client/core/proxy/ClientProxy.java | 5 +- .../vazkii/botania/client/fx/FXSparkle.java | 50 ++++++++++--------- .../java/vazkii/botania/client/fx/FXWisp.java | 7 ++- .../render/entity/RenderPinkWither.java | 3 -- .../render/entity/RenderPoolMinecart.java | 2 +- .../client/render/entity/RenderSparkBase.java | 2 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 29 ++--------- .../render/tile/RenderTileSkullOverride.java | 2 +- .../botania/common/network/GuiHandler.java | 3 +- .../common/world/WorldTypeSkyblock.java | 7 ++- 13 files changed, 49 insertions(+), 79 deletions(-) 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 0f620d535..d3d6eff2f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -9,28 +9,17 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; -import net.minecraft.util.EnumFacing; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; -import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 5f81a4ef8..8597ec6db 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -29,6 +29,7 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -44,8 +45,8 @@ public final class SubTileRadiusRenderHandler { return; BlockPos bPos = pos.getBlockPos(); - ItemStack stackHeld = mc.thePlayer.getCurrentEquippedItem(); - if(stackHeld != null && stackHeld.getItem() == ModItems.twigWand && ItemTwigWand.getBindMode(stackHeld)) { + ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand); + if(stackHeld != null && ItemTwigWand.getBindMode(stackHeld)) { BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); if(coords.getY() != -1) { bPos = coords; 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 8858f7dd9..f481e62e7 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -458,10 +458,7 @@ public class ClientProxy extends CommonProxy { return; FXWisp wisp = new FXWisp(world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); - wisp.motionX = motionx; - wisp.motionY = motiony; - wisp.motionZ = motionz; - + wisp.setSpeed(motionx, motiony, motionz); Minecraft.getMinecraft().effectRenderer.addEffect(wisp); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 8c62d430c..d546fb2f6 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -47,6 +47,8 @@ public class FXSparkle extends EntityFX { float f4; float f5; + public boolean noClip = false; + public FXSparkle(World world, double x, double y, double z, float size, float red, float green, float blue, int m) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); @@ -55,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; - motionX = motionY = motionZ = 0; + xSpeed = ySpeed = zSpeed = 0; particleScale *= size; particleMaxAge = 3 * m; multiplier = m; @@ -135,30 +137,30 @@ public class FXSparkle extends EntityFX { prevPosZ = posZ; if (particleAge++ >= particleMaxAge) - setDead(); + setExpired(); - motionY -= 0.04D * particleGravity; + ySpeed -= 0.04D * particleGravity; if (!noClip && !fake) pushOutOfBlocks(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); - posX += motionX; - posY += motionY; - posZ += motionZ; + posX += xSpeed; + posY += ySpeed; + posZ += zSpeed; if (slowdown) { - motionX *= 0.908000001907348633D; - motionY *= 0.908000001907348633D; - motionZ *= 0.908000001907348633D; + xSpeed *= 0.908000001907348633D; + ySpeed *= 0.908000001907348633D; + zSpeed *= 0.908000001907348633D; if (onGround) { - motionX *= 0.69999998807907104D; - motionZ *= 0.69999998807907104D; + xSpeed *= 0.69999998807907104D; + zSpeed *= 0.69999998807907104D; } } if(fake && particleAge > 1) - setDead(); + setExpired(); } public void setGravity(float value) { @@ -218,33 +220,33 @@ public class FXSparkle extends EntityFX { float var26 = (rand.nextFloat() - rand.nextFloat()) * 0.1F; if (var22 == 0) { - motionX = -var25; - motionY=motionZ=var26; + xSpeed = -var25; + ySpeed=zSpeed=var26; } if (var22 == 1) { - motionX = var25; - motionY=motionZ=var26; + xSpeed = var25; + ySpeed=zSpeed=var26; } if (var22 == 2) { - motionY = -var25; - motionX=motionZ=var26; + ySpeed = -var25; + xSpeed=zSpeed=var26; } if (var22 == 3) { - motionY = var25; - motionX=motionZ=var26; + ySpeed = var25; + xSpeed=zSpeed=var26; } if (var22 == 4) { - motionZ = -var25; - motionY=motionX=var26; + zSpeed = -var25; + ySpeed=xSpeed=var26; } if (var22 == 5) { - motionZ = var25; - motionY=motionX=var26; + zSpeed = var25; + ySpeed=xSpeed=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 8a6d45513..b91b62055 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -59,7 +59,6 @@ public class FXWisp extends EntityFX { this.depthTest = depthTest; moteHalfLife = particleMaxAge / 2; - noClip = true; setSize(0.01F, 0.01F); Entity renderentity = FMLClientHandler.instance().getClient().getRenderViewEntity(); @@ -163,6 +162,12 @@ public class FXWisp extends EntityFX { particleGravity = value; } + public void setSpeed(float mx, float my, float mz) { + xSpeed = mx; + ySpeed = my; + zSpeed = mz; + } + boolean depthTest = true; public boolean distanceLimit = true; float moteParticleScale; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 3b576dfc5..f27354fb2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -12,7 +12,6 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; -import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; @@ -21,8 +20,6 @@ public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); - int idk = -1; - public RenderPinkWither(RenderManager p_i46130_1_) { super(p_i46130_1_); } 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 d53b1a780..330bbfbef 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_180560_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { + protected void func_188319_a(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/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 002d79922..4506d8b60 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -49,7 +49,7 @@ public class RenderSparkBase extends RenderEntity { double time = ClientTickHandler.ticksInGame + par9; time += new Random(par1Entity.getEntityId()).nextInt(); - float a = 0.1F + (1 - par1Entity.getDataWatcher().getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY)) * 0.8F; + float a = 0.1F + (1 - par1Entity.getDataManager().get(EntitySpark.INVSIBILITY)) * 0.8F; GlStateManager.color(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a); 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 26b49fb02..603f35be9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -76,7 +76,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { float s = 0.6F; GlStateManager.scale(s, s, s); GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); 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 faddab3d9..ed7e331ad 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.render.tile; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -30,12 +27,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.Event; import net.minecraftforge.common.property.IExtendedBlockState; @@ -139,25 +134,6 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer, IBakedModel> modelCache = CacheBuilder.newBuilder().maximumSize(15).expireAfterWrite(100, TimeUnit.MILLISECONDS).build(new CacheLoader, IBakedModel>() - { - public IBakedModel load(Pair key) throws Exception - { - IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(key.getLeft().getClean()); - if(model instanceof ISmartBlockModel) - { - model = ((ISmartBlockModel)model).handleBlockState(key.getLeft().withProperty(Properties.AnimationProperty, key.getRight())); - } - return model; - } - }); - - private static IBakedModel getModel(IExtendedBlockState state, IModelState modelState) - { - return modelCache.getUnchecked(Pair.of(state, modelState)); - } - private void renderAnimatedModel(TileCorporeaCrystalCube te, double x, double y, double z, float partialTick) { // From FastTESR.renderTileEntityAt Tessellator tessellator = Tessellator.getInstance(); @@ -197,11 +173,12 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer> pair = te.asm().apply(time); // handleEvents(te, time, pair.getRight()); - IBakedModel model = getModel(exState, pair.getLeft()); + IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); + exState = exState.withProperty(Properties.AnimationProperty, pair.getLeft()); worldRenderer.setTranslation(x - pos.getX(), y - pos.getY(), z - pos.getZ()); - blockRenderer.getBlockModelRenderer().renderModel(world, model, state, pos, worldRenderer, false); + blockRenderer.getBlockModelRenderer().renderModel(world, model, exState, pos, worldRenderer, false); } } // End inline AnimationTESR.renderTileEntityFast diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 09deb6be8..f2a0b440b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -74,6 +74,6 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { ShaderHelper.releaseShader(); GlStateManager.popMatrix(); - } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress); + } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress, 0); // todo 1.9 last parameter } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index 6095f038e..c78926396 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -42,8 +42,7 @@ public class GuiHandler implements IGuiHandler { public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch(ID) { case LibGuiIDs.LEXICON : - GuiLexicon lex = GuiLexicon.currentOpenLexicon; - return lex; + return GuiLexicon.currentOpenLexicon; case LibGuiIDs.CRAFTING_HALO : return new GuiCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 34e7049bf..cf930c995 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -10,8 +10,11 @@ */ package vazkii.botania.common.world; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraft.world.WorldType; +import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; @@ -36,7 +39,7 @@ public class WorldTypeSkyblock extends WorldType { } @Override - public int getSpawnFuzz() { + public int getSpawnFuzz(WorldServer world, MinecraftServer server) { return 2; } @@ -46,7 +49,7 @@ public class WorldTypeSkyblock extends WorldType { } @Override - public IChunkProvider getChunkGenerator(World world, String generatorOptions) { + public IChunkGenerator getChunkGenerator(World world, String generatorOptions) { return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); } From 5cc6879ecb9740f172a964bfab91bd5966a6bfba Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 18 Mar 2016 23:08:49 -0500 Subject: [PATCH 452/935] Lots of blocks --- .../botania/api/subtile/SubTileEntity.java | 3 +- .../botania/common/block/BlockAlfPortal.java | 7 +-- .../botania/common/block/BlockAltGrass.java | 21 +++++---- .../botania/common/block/BlockAltar.java | 28 ++++++----- .../botania/common/block/BlockAvatar.java | 44 +++++++++-------- .../botania/common/block/BlockBifrost.java | 16 +++---- .../common/block/BlockBifrostPerm.java | 18 +++---- .../botania/common/block/BlockCamo.java | 19 ++++---- .../botania/common/block/BlockCell.java | 3 +- .../botania/common/block/BlockCocoon.java | 23 +++++---- .../common/block/BlockEnchantedSoil.java | 5 +- .../botania/common/block/BlockEnderEye.java | 7 +-- .../botania/common/block/BlockFakeAir.java | 23 +++++---- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../block/BlockFloatingSpecialFlower.java | 24 +++++----- .../botania/common/block/BlockForestEye.java | 17 +++++-- .../botania/common/block/BlockGaiaHead.java | 12 ++--- .../botania/common/block/BlockGhostRail.java | 13 +++-- .../botania/common/block/BlockHourglass.java | 33 +++++++------ .../common/block/BlockIncensePlate.java | 16 +++---- .../common/block/BlockLightLauncher.java | 11 ++++- .../botania/common/block/BlockLightRelay.java | 22 ++++++--- .../botania/common/block/BlockLivingrock.java | 7 +-- .../botania/common/block/BlockLivingwood.java | 15 +++--- .../botania/common/block/BlockManaBomb.java | 3 +- .../common/block/BlockModDoubleFlower.java | 15 +++--- .../common/block/BlockModDoubleFlower1.java | 4 +- .../common/block/BlockModDoubleFlower2.java | 4 +- .../botania/common/block/BlockModFlower.java | 16 +++++-- .../botania/common/block/BlockOpenCrate.java | 7 +-- .../common/block/BlockPistonRelay.java | 19 +++++--- .../botania/common/block/BlockPlatform.java | 11 +++-- .../botania/common/block/BlockPylon.java | 19 ++++++-- .../botania/common/block/BlockRoot.java | 3 +- .../botania/common/block/BlockSolidVines.java | 5 +- .../common/block/BlockSparkChanger.java | 23 +++++---- .../common/block/BlockSpecialFlower.java | 47 +++++++++++-------- .../botania/common/block/BlockStorage.java | 3 +- .../common/block/BlockTeruTeruBozu.java | 23 ++++++--- .../botania/common/block/BlockTinyPlanet.java | 13 ++++- .../corporea/BlockCorporeaCrystalCube.java | 23 ++++----- .../block/corporea/BlockCorporeaFunnel.java | 3 +- .../block/corporea/BlockCorporeaIndex.java | 3 +- .../corporea/BlockCorporeaInterceptor.java | 3 +- .../block/corporea/BlockCorporeaRetainer.java | 3 +- .../common/block/decor/Block18Stone.java | 3 +- .../common/block/decor/BlockBlaze.java | 3 +- .../common/block/decor/BlockBuriedPetals.java | 9 +++- .../common/block/decor/BlockCustomBrick.java | 3 +- .../common/block/decor/BlockDirtPath.java | 20 ++++---- .../block/decor/BlockEndStoneBrick.java | 3 +- .../block/decor/BlockFloatingFlower.java | 13 +++-- .../common/block/decor/BlockManaBeacon.java | 12 ++++- .../common/block/decor/BlockManaFlame.java | 15 ++++-- .../common/block/decor/BlockManaGlass.java | 3 +- .../common/block/decor/BlockModMushroom.java | 11 ++++- .../common/block/decor/BlockPavement.java | 3 +- .../common/block/decor/BlockPetalBlock.java | 3 +- .../common/block/decor/BlockPrismarine.java | 3 +- .../common/block/decor/BlockReeds.java | 3 +- .../common/block/decor/BlockSeaLamp.java | 6 ++- .../common/block/decor/BlockShimmerrock.java | 3 +- .../block/decor/BlockShimmerwoodPlanks.java | 3 +- .../common/block/decor/BlockStarfield.java | 13 ++++- .../common/block/decor/BlockThatch.java | 3 +- .../common/block/decor/BlockTinyPotato.java | 11 ++++- .../common/block/decor/BlockUnstable.java | 18 +++++-- .../decor/biomestone/BlockBiomeStone.java | 5 +- .../block/decor/panes/BlockModPane.java | 3 +- .../block/decor/slabs/BlockEndStoneSlab.java | 3 +- .../decor/slabs/BlockEnderBrickSlab.java | 3 +- .../block/decor/slabs/BlockLivingSlab.java | 2 +- .../block/decor/slabs/BlockReedSlab.java | 3 +- .../block/decor/slabs/BlockThatchSlab.java | 3 +- .../slabs/bricks/BlockCustomBrickSlab.java | 3 +- .../living/BlockLivingrockBrickSlab.java | 3 +- .../slabs/living/BlockLivingrockSlab.java | 3 +- .../slabs/living/BlockShimmerrockSlab.java | 3 +- .../living/BlockShimmerwoodPlankSlab.java | 3 +- .../slabs/prismarine/BlockPrismarineSlab.java | 3 +- .../decor/walls/BlockPrismarineWall.java | 3 +- .../block/decor/walls/BlockReedWall.java | 3 +- .../walls/living/BlockDreamwoodWall.java | 3 +- .../walls/living/BlockLivingrockWall.java | 3 +- .../walls/living/BlockLivingwoodWall.java | 3 +- .../block/mana/BlockAlchemyCatalyst.java | 4 +- .../common/block/mana/BlockBellows.java | 21 +++++++-- .../common/block/mana/BlockBrewery.java | 30 +++++++----- .../common/block/mana/BlockDistributor.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../common/block/mana/BlockManaDetector.java | 2 +- .../common/block/mana/BlockManaVoid.java | 2 +- .../botania/common/block/mana/BlockPool.java | 26 +++++----- .../botania/common/block/mana/BlockPrism.java | 2 +- .../botania/common/block/mana/BlockPump.java | 2 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 2 +- .../common/block/mana/BlockSpreader.java | 19 ++++---- .../common/block/mana/BlockTerraPlate.java | 2 +- .../common/block/mana/BlockTurntable.java | 2 +- .../common/block/string/BlockRedString.java | 5 +- .../string/BlockRedStringComparator.java | 4 +- .../string/BlockRedStringInterceptor.java | 4 +- .../functional/SubTileAgricarnation.java | 10 ++-- .../subtile/functional/SubTileBubbell.java | 5 +- .../functional/SubTileFallenKanade.java | 5 +- .../functional/SubTileHeiseiDream.java | 10 ++-- .../subtile/functional/SubTileHyacidus.java | 5 +- .../functional/SubTileJadedAmaranthus.java | 5 +- .../subtile/functional/SubTileLoonuim.java | 11 +++-- .../functional/SubTileMarimorphosis.java | 5 +- .../subtile/functional/SubTileMedumone.java | 3 +- .../subtile/functional/SubTileOrechid.java | 12 +++-- .../functional/SubTileRannuncarpus.java | 5 +- .../functional/SubTileSpectranthemum.java | 2 + .../generating/SubTileDandelifeon.java | 6 ++- .../subtile/generating/SubTileDaybloom.java | 2 +- .../subtile/generating/SubTileEndoflame.java | 4 +- .../generating/SubTileEntropinnyum.java | 5 +- .../generating/SubTileGourmaryllis.java | 3 +- .../generating/SubTileHydroangeas.java | 10 ++-- .../subtile/generating/SubTileKekimurus.java | 4 +- .../subtile/generating/SubTileMunchdew.java | 10 ++-- .../subtile/generating/SubTileNarslimmus.java | 3 +- .../subtile/generating/SubTileThermalily.java | 4 +- .../common/block/tile/TileSpecialFlower.java | 5 +- .../common/world/SkyblockWorldEvents.java | 2 +- 128 files changed, 684 insertions(+), 446 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 040f3c63e..d15e5fbe4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -126,7 +127,7 @@ public class SubTileEntity { /** * Called when a player right clicks this sub tile. */ - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } /** * Called when this sub tile is added to the world. diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 388f985e3..853c7ee2e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -35,7 +36,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable public BlockAlfPortal() { super(Material.wood); setHardness(10F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); } @@ -82,8 +83,8 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == this && world.getBlockState(pos).getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 04604f0dd..ec648f938 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -45,7 +46,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public BlockAltGrass() { super(Material.grass); setHardness(0.6F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.ALT_GRASS); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); setTickRandomly(true); @@ -109,37 +110,37 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override - public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } @Override - public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random r) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) return; AltGrassVariant variant = state.getValue(BotaniaStateProps.ALTGRASS_VARIANT); switch(variant) { - case DRY: // Dry + case DRY: break; - case GOLDEN: // Golden + case GOLDEN: break; - case VIVID: // Vivid + case VIVID: break; - case SCORCHED: // Scorched + case SCORCHED: if(r.nextInt(80) == 0) world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); break; - case INFUSED: // Infused + case INFUSED: if(r.nextInt(100) == 0) Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); break; - case MUTATED: // Mutated + case MUTATED: if(r.nextInt(100) == 0) { if(r.nextInt(100) > 25) Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index d7b2a30ed..a7f813a7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -26,6 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; @@ -53,24 +56,26 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltar extends BlockMod implements ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); + + private final Random random = new Random(); protected BlockAltar() { super(Material.rock); setHardness(3.5F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.ALTAR); - float f = 1F / 16F * 2F; - setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); - - random = new Random(); - setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); @@ -134,14 +139,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { TileAltar tile = (TileAltar) world.getTileEntity(pos); return (tile != null && tile.hasLava) ? 15 : 0; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { @@ -307,12 +311,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileAltar altar = (TileAltar) par1World.getTileEntity(pos); return altar.hasWater ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 000d3c793..1a66c6cad 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,6 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -41,13 +45,25 @@ public class BlockAvatar extends BlockMod implements ILexiconable { protected BlockAvatar() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.AVATAR); - setBlockBounds(EnumFacing.Axis.Z); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); random = new Random(); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + float f = 1F / 16F; + float w = f * 9; + float l = f * 6; + float ws = (1F - w) / 2; + float ls = (1F - l) / 2; + + if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.Z) + setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); + else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -67,10 +83,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stackOnPlayer, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); - ItemStack stackOnPlayer = player.getCurrentEquippedItem(); if(stackOnAvatar != null) { ItemStack copyStack = stackOnAvatar.copy(); avatar.getItemHandler().setStackInSlot(0, null); @@ -87,23 +102,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return false; } - @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); - } - - public void setBlockBounds(EnumFacing.Axis horiz) { - float f = 1F / 16F; - float w = f * 9; - float l = f * 6; - float ws = (1F - w) / 2; - float ls = (1F - l) / 2; - - if(horiz == EnumFacing.Axis.Z) - setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); - else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); - } - @Override public void breakBlock(World par1World, BlockPos pos, IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); @@ -158,8 +156,8 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index d65c60037..2619b42ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +41,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { setLightOpacity(0); setLightLevel(1F); setBlockUnbreakable(); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); MinecraftForge.EVENT_BUS.register(this); } @@ -55,19 +56,14 @@ public class BlockBifrost extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.rainbowRod); } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - Block block = p_149646_1_.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); - } - @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block != this && super.shouldSideBeRendered(state, world, pos, side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 010de0893..12488bcda 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -36,7 +37,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { setLightOpacity(0); setHardness(0.3F); setLightLevel(1F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setTickRandomly(true); } @@ -45,19 +46,14 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - Block block = p_149646_1_.getBlockState(pos).getBlock(); - - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, pos, side); + @Override + public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + Block block = world.getBlockState(pos).getBlock(); + return block != this && super.shouldSideBeRendered(state, world, pos, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); - } - - @Override - public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { if(rand.nextBoolean()) Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 0a88ef3ff..4340fbcba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -32,23 +34,22 @@ public abstract class BlockCamo extends BlockMod { super(par2Material); } - public static boolean isValidBlock(Block block) { - return block.isOpaqueCube(IBlockState state) || block.getRenderType() == 3; + public static boolean isValidBlock(IBlockState state) { + return state.isOpaqueCube() || state.getRenderType() == EnumBlockRenderType.MODEL; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - ItemStack currentStack = par5EntityPlayer.getCurrentEquippedItem(); if(currentStack == null) currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); boolean doChange = true; - Block block = null; + IBlockState testState = null; checkChange : { if(currentStack.getItem() != Item.getItemFromBlock(Block.getBlockFromName("air"))) { if(Item.getIdFromItem(currentStack.getItem()) == 0) { @@ -56,21 +57,21 @@ public abstract class BlockCamo extends BlockMod { break checkChange; } - block = Block.getBlockFromItem(currentStack.getItem()); - if(block == null || !isValidBlock(block) || block instanceof BlockCamo || block.getMaterial() == Material.air) + testState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); + if(testState == null || !isValidBlock(testState) || testState.getBlock() instanceof BlockCamo || testState.getMaterial() == Material.air) doChange = false; } } if(doChange && currentStack.getItem() != null) { IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(block instanceof BlockDirectional) { + if(testState.getBlock() instanceof BlockDirectional) { if (BlockDirectional.FACING.getAllowedValues().contains(par6.getOpposite())) { changeState = changeState.withProperty(BlockDirectional.FACING, par6.getOpposite()); } } camo.camoState = changeState; - par1World.markBlockForUpdate(pos); + par1World.notifyBlockUpdate(pos, state, state, 8); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index c10e620fb..63d378f47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -32,7 +33,7 @@ public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { super(Material.gourd); setUnlocalizedName(LibBlockNames.CELL_BLOCK); - setStepSound(soundTypeCloth); + setSoundType(SoundType.CLOTH); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 82c788822..2ff704596 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -13,12 +13,16 @@ package vazkii.botania.common.block; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -31,15 +35,19 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(3.0F); setResistance(50.0F); - setStepSound(soundTypeCloth); + setSoundType(SoundType.CLOTH); setUnlocalizedName(LibBlockNames.COCOON); - float f = 3F / 16F; - float f1 = 14F / 16F; - setBlockBounds(f, 0F, f, 1F - f, f1, 1F - f); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -53,14 +61,13 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + 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); - ItemStack item = player.getCurrentEquippedItem(); if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.emerald) { if(!player.capabilities.isCreativeMode) item.stackSize--; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 2f851babe..fbf629b1c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -34,7 +35,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { super(Material.grass); setHardness(0.6F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); } @@ -49,7 +50,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 7df77efa4..b106619cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -33,7 +34,7 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -54,12 +55,12 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index ddad5a95b..089db2146 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -21,6 +21,7 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -32,16 +33,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockMod { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); + public BlockFakeAir() { super(Material.air); setUnlocalizedName(LibBlockNames.FAKE_AIR); - setBlockBounds(0, 0, 0, 0, 0, 0); setTickRandomly(true); } @Override - public int getRenderType() { - return -1; + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.INVISIBLE; } @Override @@ -82,7 +89,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean isBlockNormalCube() { + public boolean isBlockNormalCube(IBlockState state) { return false; } @@ -92,7 +99,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean canEntityDestroy(IBlockAccess world, BlockPos pos, Entity e) { + public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity e) { return false; } @@ -102,7 +109,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, BlockPos pos) { + public boolean canBeReplacedByLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } @@ -117,12 +124,12 @@ public class BlockFakeAir extends BlockMod { } @Override - public AxisAlignedBB getCollisionBoundingBox(World par1World, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World par1World, BlockPos pos) { return null; } @Override - public boolean isAir(IBlockAccess world, BlockPos pos) { + public boolean isAir(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 9c515defc..19238fb77 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -40,7 +41,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { super(Material.gourd); setUnlocalizedName(LibBlockNames.FEL_PUMPKIN); setHardness(1F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index e82713dd6..af6140032 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -26,6 +26,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -83,7 +84,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; if(currentLight == -1) @@ -92,32 +93,32 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return getWeakPower(world, pos, state, side); + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { // NO-OP } @@ -131,9 +132,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; - IBlockState state = world.getBlockState(pos); return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); } @@ -177,8 +177,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 71fc50581..6346bf141 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -25,15 +28,21 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); - setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.FOREST_EYE); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean isFullCube(IBlockState state) { return false; @@ -45,12 +54,12 @@ public class BlockForestEye extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileForestEye eye = (TileForestEye) par1World.getTileEntity(pos); return Math.min(15, Math.max(0, eye.entities - 1)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index a453786a2..8c4e228f4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -17,11 +17,13 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; @@ -45,9 +47,8 @@ public class BlockGaiaHead extends BlockSkull { } @Override - @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, BlockPos pos) { - return ModItems.gaiaHead; + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(ModItems.gaiaHead); } @Override @@ -71,11 +72,6 @@ public class BlockGaiaHead extends BlockSkull { return ModItems.gaiaHead; } - @Override - public int getDamageValue(World p_149643_1_, BlockPos pos) { - return 0; - } - @Override public int damageDropped(IBlockState state) { return 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 6f5733f81..e54dbe951 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -68,12 +68,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { @SubscribeEvent public void onMinecartUpdate(MinecartUpdateEvent event) { - int x = MathHelper.floor_double(event.entity.posX); - int y = MathHelper.floor_double(event.entity.posY); - int z = MathHelper.floor_double(event.entity.posZ); BlockPos entPos = new BlockPos(event.entity); - Block block = event.entity.worldObj.getBlockState(entPos).getBlock(); - boolean air = block.isAir(event.entity.worldObj, entPos); + IBlockState state = event.entity.worldObj.getBlockState(entPos); + Block block = state.getBlock(); + boolean air = block.isAir(state, event.entity.worldObj, entPos); int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(block == this) @@ -86,8 +84,9 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); if(floatTicks > 0) { - Block blockBelow = event.entity.worldObj.getBlockState(entPos.down()).getBlock(); - boolean airBelow = blockBelow.isAir(event.entity.worldObj, entPos.down()); + IBlockState stateBelow = event.entity.worldObj.getBlockState(entPos.down()); + Block blockBelow = stateBelow.getBlock(); + boolean airBelow = blockBelow.isAir(stateBelow, event.entity.worldObj, entPos.down()); if(air && airBelow || !air && !airBelow) event.entity.noClip = true; event.entity.motionY = 0.2; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index b7548abdb..ca27e1bfb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,6 +23,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.EnumFacing; @@ -43,23 +47,23 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1.15, 0.75); + + private final Random random = new Random(); protected BlockHourglass() { super(Material.iron); setUnlocalizedName(LibBlockNames.HOURGLASS); setHardness(2.0F); - setStepSound(soundTypeMetal); - - float f = 1F / 16F; - float w = 8F * f; - float d = (1F - w) / 2; - setBlockBounds(d, 0F, d, 1F - d, 1.15F, 1F - d); - - random = new Random(); + setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -76,10 +80,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float xs, float ys, float zs) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); - ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -107,12 +110,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -176,8 +179,8 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 3f4d41579..bb7c76563 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -18,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -36,7 +38,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { super(Material.wood); setUnlocalizedName(LibBlockNames.INCENSE_PLATE); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setBlockBounds(EnumFacing.Axis.Z); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -60,9 +62,8 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); - ItemStack stack = player.getCurrentEquippedItem(); ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); boolean did = false; @@ -100,20 +101,15 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } - @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); - } - public void setBlockBounds(EnumFacing.Axis axis) { float f = 1F / 16F; float w = 12 * f; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index e1238c8f0..df289f973 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,15 +39,21 @@ import vazkii.botania.common.lib.LibMisc; 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); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); - setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, 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 2cd0b48cb..e649e75ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -40,14 +42,20 @@ import net.minecraftforge.fml.common.registry.GameRegistry; 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); float f = 5F / 16F; - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setUnlocalizedName(LibBlockNames.LIGHT_RELAY); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); @@ -103,13 +111,13 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { ((TileLightRelay) world.getTileEntity(pos)).mountEntity(player); return true; } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World p_149668_1_, BlockPos pos) { return null; } @@ -124,12 +132,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing s) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing s) { return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR && state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @@ -145,8 +153,8 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 586658368..1a5ab7550 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.LIVING_ROCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } @@ -84,8 +85,8 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(state)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 6b7e510e8..3474b39c2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -42,7 +43,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { public BlockLivingwood(String name) { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(name); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } @@ -92,13 +93,13 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(state)); } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } @Override @@ -108,8 +109,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public boolean canSustainLeaves(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; + public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.getValue(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 c9f59bbbb..d38383186 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -33,7 +34,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl public BlockManaBomb() { super(Material.wood); setHardness(12.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.MANA_BOMB); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 616cb97a3..e54bd9ae9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.SoundType; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -55,11 +56,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I public BlockModDoubleFlower(boolean second) { this.second = second; this.setHardness(0.0F); - this.setStepSound(soundTypeGrass); + this.setSoundType(SoundType.PLANT); offset = second ? 8 : 0; setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); setHardness(0F); - setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -101,8 +101,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te) { - if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + if(p_149636_1_.isRemote || stack == null || stack.getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) harvestBlockCopy(p_149636_1_, p_149636_2_, pos, state); } @@ -200,7 +200,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; @@ -227,12 +227,11 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } } - return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); + return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(FACING, EnumFacing.SOUTH); } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - IBlockState state = world.getBlockState(pos); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { state = state.getBlock().getActualState(state, world, pos); PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 8650f2058..2b4b94d2b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -12,7 +12,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); setDefaultState(blockState.getBaseState() - .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(FACING, EnumFacing.SOUTH) .withProperty(VARIANT, EnumPlantType.SUNFLOWER) .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); @@ -20,7 +20,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index d5e8865f2..c824224e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -13,7 +13,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); setDefaultState(blockState.getBaseState() - .withProperty(field_181084_N, EnumFacing.SOUTH) + .withProperty(FACING, EnumFacing.SOUTH) .withProperty(VARIANT, EnumPlantType.SUNFLOWER) .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); @@ -21,7 +21,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, field_181084_N, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index d578cc5c7..704251eb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -17,6 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; import net.minecraft.block.IGrowable; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -26,6 +27,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -44,9 +46,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { - public int originalLight; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); - public static final String ALT_DIR = "alt"; + public int originalLight; protected BlockModFlower() { this(LibBlockNames.FLOWER); @@ -56,13 +58,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup super(); setUnlocalizedName(name); setHardness(0F); - setStepSound(soundTypeGrass); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, getTypeProperty(), BotaniaStateProps.COLOR); @@ -119,7 +125,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index a1a2d1787..e4fe6011d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; @@ -56,7 +57,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, public BlockOpenCrate() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.OPEN_CRATE); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) @@ -118,12 +119,12 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(pos); return crate.getSignal(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 096a4414e..43481c00f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -21,6 +21,8 @@ import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; import net.minecraft.block.BlockPistonMoving; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.EnumPushReaction; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -32,14 +34,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -62,7 +67,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl setUnlocalizedName(LibBlockNames.PISTON_RELAY); setHardness(2F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); MinecraftForge.EVENT_BUS.register(this); } @@ -104,7 +109,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } static IBlockState getStateAt(DimWithPos key) { - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server == null) return null; return server.worldServerForDimension(key.dim).getBlockState(key.blockPos); @@ -117,7 +122,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(!player.isSneaking()) { playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimension(), pos)); - world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 0.5F, 1F); + world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); @@ -196,7 +201,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl boolean sticky = BlockPistonExtension.EnumPistonType.STICKY == state.getValue(BlockPistonMoving.TYPE); EnumFacing dir = state.getValue(BlockPistonMoving.FACING); - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server != null && getTimeInCoords(s) == 0) { DimWithPos newPos; @@ -223,10 +228,10 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl IBlockState srcState = world.getBlockState(pos2); TileEntity tile = world.getTileEntity(pos2); - Material mat = srcState.getBlock().getMaterial(); + Material mat = srcState.getMaterial(); - if(!sticky && tile == null && mat.getMaterialMobility() == 0 && srcState.getBlock().getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(world, pos2)) { - Material destMat = world.getBlockState(pos2.offset(dir)).getBlock().getMaterial(); + 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.offset(dir), srcState, 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 6d2582d01..9d4f18502 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -50,7 +51,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable super(Material.wood); setHardness(2.0F); setResistance(5.0F); - setStepSound(Block.soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.PLATFORM); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.HELD_STATE, null) @@ -119,16 +120,16 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); } @Override - public float getBlockHardness(World par1World, BlockPos pos) { + public float getBlockHardness(IBlockState state, World par1World, BlockPos pos) { PlatformVariant variant = par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); - return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(par1World, pos); + return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, par1World, pos); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index cac93375f..e9b1a2f76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,7 +22,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; @@ -39,18 +43,23 @@ import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875); + public BlockPylon() { super(Material.iron); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.PYLON); setLightLevel(0.5F); - float f = 1F / 16F * 2F; - setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); @@ -102,8 +111,8 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index b231986ac..e504ad123 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +31,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { super(Material.plants); setHardness(1.2F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.ROOT); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 630e0e9a0..7b7471878 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockVine; +import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -34,7 +35,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setCreativeTab(null); } @@ -70,7 +71,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.vine); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e6a66da51..e4cc332b0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -36,17 +39,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockSparkChanger extends BlockMod implements ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); + + private final Random random = new Random(); public BlockSparkChanger() { super(Material.rock); - setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.SPARK_CHANGER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); - random = new Random(); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -92,10 +100,9 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack pstack, EnumFacing s, float xs, float ys, float zs) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack cstack = changer.getItemHandler().getStackInSlot(0); - ItemStack pstack = player.getCurrentEquippedItem(); if(cstack != null) { changer.getItemHandler().setStackInSlot(0, null); world.updateComparatorOutputLevel(pos, this); @@ -157,12 +164,12 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack stack = changer.getItemHandler().getStackInSlot(0); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 87ef5f93b..860cf3458 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -32,6 +33,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -64,7 +67,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { static { - BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { + BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( // Misc LibBlockNames.SUBTILE_PUREDAISY, LibBlockNames.SUBTILE_MANASTAR, @@ -110,24 +113,29 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I LibBlockNames.SUBTILE_VINCULOTUS, LibBlockNames.SUBTILE_SPECTRANTHEMUM, LibBlockNames.SUBTILE_BUBBELL, - LibBlockNames.SUBTILE_SOLEGNOLIA - })); + LibBlockNames.SUBTILE_SOLEGNOLIA)); } + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); + protected BlockSpecialFlower() { super(); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); @@ -159,35 +167,35 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; - return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); + return LightHelper.getPackedColor(state.getValue(BotaniaStateProps.COLOR), currentLight); } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride(); } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side); } @Override - public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return getWeakPower(world, pos, state, side); + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @@ -217,14 +225,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } @Override - protected boolean canPlaceBlockOn(Block block) { - return super.canPlaceBlockOn(block) || block == ModBlocks.redStringRelay || block == Blocks.mycelium; + 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; } @Override @@ -287,8 +295,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { if(stack != null && stack.getItem() == ModItems.dye) { EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); @@ -296,7 +303,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); } - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } @Override @@ -305,7 +312,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean addLandingEffects(net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { + public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); if (d0 > 2.5D) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index e0b43127d..08a495375 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.STORAGE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index ba90f25fc..4179dc91a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -19,8 +19,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -30,11 +34,17 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setUnlocalizedName(LibBlockNames.TERU_TERU_BOZU); float f = 0.25F; - setBlockBounds(f, 0.01F, f, 1F - f, 0.99F, 1F - f); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -51,8 +61,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { if(!player.capabilities.isCreativeMode) stack.stackSize--; @@ -87,12 +96,12 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return world.isRaining() ? 15 : 0; } @@ -107,8 +116,8 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 1496e3dcc..a8c2078ea 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -25,16 +28,22 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(20F); setResistance(100F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); float size = 3F / 16F; - setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.TINY_PLANET); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean isFullCube(IBlockState state) { return false; 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 242d63cad..2c49d1be2 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -10,33 +10,25 @@ */ package vazkii.botania.common.block.corporea; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; 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.EntityDiggingFX; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; @@ -44,12 +36,12 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { + 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); setHardness(5.5F); - setStepSound(soundTypeMetal); - float f = (1F - 10F / 16F) / 2F; - setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); + setSoundType(SoundType.METAL); setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); } @@ -81,6 +73,11 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @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(stack != null) { 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 21b851b4c..fe0507be0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -31,7 +32,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab public BlockCorporeaFunnel() { super(Material.iron, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 294fe5109..09ea37dea 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; 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; @@ -39,7 +40,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl public BlockCorporeaIndex() { super(Material.iron, LibBlockNames.CORPOREA_INDEX); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); } @Override 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 9fecddb29..1ede7a9b6 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.corporea; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -34,7 +35,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi public BlockCorporeaInterceptor() { super(Material.iron, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); - setStepSound(soundTypeMetal); + 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 6469e3680..30d267ab5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -36,7 +37,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr public BlockCorporeaRetainer() { super(Material.iron); setHardness(5.5F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 521710d4a..fa9dacfc5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.STONE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } 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 d3b46d862..ab64386b5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -33,7 +34,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { super(Material.iron); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setLightLevel(1F); setUnlocalizedName(LibBlockNames.BLAZE_BLOCK); GameRegistry.registerFuelHandler(this); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index de6820c3f..6597d5401 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -29,12 +30,18 @@ import net.minecraftforge.fml.common.Optional; public class BlockBuriedPetals extends BlockModFlower { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.1, 1); + public BlockBuriedPetals() { super(LibBlockNames.BURIED_PETALS); - setBlockBounds(0F, 0F, 0F, 1F, 0.1F, 1F); setLightLevel(0.25F); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { 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 74aaf4017..4a423b4df 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(5.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.CUSTOM_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } 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 750a958b6..516a8c18f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -46,10 +47,9 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public BlockDirtPath() { super(Material.ground); - setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); setLightOpacity(255); setHardness(0.6F); - setStepSound(soundTypeGravel); + setSoundType(SoundType.GROUND); setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; MinecraftForge.EVENT_BUS.register(this); @@ -72,11 +72,12 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos) { - Block blockAbove = world.getBlockState(pos.up()).getBlock(); - if(!blockAbove.isAir(world, pos.up())) - setBlockBounds(0F, 0F, 0F, 1F, 1, 1F); - else setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + IBlockState stateAbove = world.getBlockState(pos.up()); + Block blockAbove = stateAbove.getBlock(); + if(!blockAbove.isAir(stateAbove, world, pos.up())) + return FULL_BLOCK_AABB; + else return new AxisAlignedBB(0F, 0F, 0F, 1F, 15F / 16F, 1F); } @Override @@ -84,11 +85,6 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { return side == EnumFacing.DOWN; } - @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { - setBlockBoundsBasedOnState(world, pos); - } - @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return new AxisAlignedBB(pos, pos.add(1, 1, 1)); 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 88948cc17..b6c327dc2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -39,7 +40,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.END_STONE_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } 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 fb7075aae..7a8416211 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -28,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -65,6 +67,8 @@ import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfusionStabiliser { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1, 0.1, 0.1, 0.9, 0.9, 0.9); + public BlockFloatingFlower() { this(LibBlockNames.MINI_ISLAND); } @@ -73,16 +77,19 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu super(Material.ground); setUnlocalizedName(name); setHardness(0.5F); - setStepSound(soundTypeGravel); + setSoundType(SoundType.GROUND); setLightLevel(1F); - float f = 0.1F; - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.ISLAND_TYPE, IslandType.GRASS) .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; 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 d33717f79..0078670c7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,6 +23,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -37,13 +39,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry; 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); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); float size = 3F / 16F; - setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.MANA_BEACON); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -66,6 +69,11 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) 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 5688bbb79..98e87c52b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import com.google.common.collect.ImmutableList; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -39,15 +40,21 @@ import net.minecraftforge.fml.common.Optional; 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); setUnlocalizedName(LibBlockNames.MANA_FLAME); float f = 0.25F; - setStepSound(soundTypeCloth); - setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); + setSoundType(SoundType.CLOTH); setLightLevel(1F); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public boolean registerInCreative() { return false; @@ -55,7 +62,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } @@ -87,7 +94,7 @@ 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.hasItem(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))) 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 d87f70bac..c9b21c715 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +36,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass(String name) { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(name); } 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 580509a61..fa4942d29 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -16,6 +16,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; +import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -24,6 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -46,14 +48,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); public int originalLight; public BlockModMushroom() { setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); - setStepSound(soundTypeGrass); - setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); + setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); @@ -77,6 +79,11 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading 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 73f83127d..79369f89e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockPavement extends BlockMod { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PAVEMENT); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } 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 a252b6d8e..028787441 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,7 +39,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { super(Material.plants); setHardness(0.4F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.PETAL_BLOCK); 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 44c7333a4..ac111c0b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -41,7 +42,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PRISMARINE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } 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 8d9e2969d..eac050269 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -35,7 +36,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { public BlockReeds() { super(Material.wood); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.REED_BLOCK); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); 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 6476ca833..b10bf9923 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -29,7 +31,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { public BlockSeaLamp() { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.SEA_LAMP); } @@ -38,7 +40,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, BlockPos pos) { + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } 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 3ef87d3d3..bc7450207 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,7 +28,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.SHIMMERROCK); } 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 38da29c13..955a672ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { public BlockShimmerwoodPlanks() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); } 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 4403372b8..c65e5bee3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -10,14 +10,17 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,14 +32,20 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(5F); setResistance(2000F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.STARFIELD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); - setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override 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 7144d1625..41831e680 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,7 +27,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { public BlockThatch() { super(Material.grass); setHardness(1.0F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); setUnlocalizedName(LibBlockNames.THATCH); } 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 0c03ea4e4..c7bcd46a8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -41,12 +42,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry; 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); setHardness(0.25F); setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; - setBlockBounds(f, 0, f, 1F - f, f, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) ); @@ -83,6 +85,11 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); @@ -100,7 +107,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + minX + Math.random() * (maxX - minX), pos.getY() + maxY, pos.getZ() + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); } return true; } 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 a78838f75..dcff7bda0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -15,17 +15,22 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -39,12 +44,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry; 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); setHardness(5.0F); setResistance(10.0F); - setStepSound(soundTypeMetal); - setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -67,6 +73,11 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) @@ -95,8 +106,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override + @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { - int color = getRenderColor(state); + int color = Minecraft.getMinecraft().getBlockColors().colorMultiplier(state, par1World, pos, 0); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); 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 a7895a6a2..bdb0845fb 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.biomestone; import java.util.List; 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.creativetab.CreativeTabs; @@ -35,7 +36,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { super(Material.rock); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } @@ -62,7 +63,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 9e28aee39..da331ba99 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -32,7 +33,7 @@ public class BlockModPane extends BlockPane { setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); useNeighborBrightness = true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index 9a52fd17f..976fa1633 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -26,7 +27,7 @@ public class BlockEndStoneSlab extends BlockLivingSlab { super(full, ModBlocks.endStoneBrick.getDefaultState()); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index a3b1fcb98..eb8c67b32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -28,7 +29,7 @@ public class BlockEnderBrickSlab extends BlockLivingSlab { super(full, ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); setHardness(1.5F); setResistance(10F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index ffd098970..f731a6b84 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -8,7 +8,7 @@ public abstract class BlockLivingSlab extends BlockModSlab { public BlockLivingSlab(boolean full, IBlockState state) { super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); - setStepSound(state.getBlock().stepSound); + setSoundType(state.getBlock().getSoundType()); this.sourceState = state; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 321640ed7..a4fefc680 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -25,7 +26,7 @@ public class BlockReedSlab extends BlockLivingSlab { public BlockReedSlab(boolean full) { super(full, ModBlocks.reedBlock.getDefaultState()); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index c3f0e13e5..08a3ed40b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -25,7 +26,7 @@ public class BlockThatchSlab extends BlockLivingSlab { public BlockThatchSlab(boolean full) { super(full, ModBlocks.thatch.getDefaultState()); setHardness(1.0F); - setStepSound(soundTypeGrass); + setSoundType(SoundType.PLANT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index f5c266e43..ae85fbdb3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -33,7 +34,7 @@ public class BlockCustomBrickSlab extends BlockLivingSlab { super(full, ModBlocks.customBrick.getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, variant)); setHardness(2.0F); setResistance(5.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java index f6dcffa08..0799f944a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockBrickSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.block.ModBlocks; @@ -13,7 +14,7 @@ public class BlockLivingrockBrickSlab extends BlockLivingSlab { super(full, ModBlocks.livingrock.getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK)); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java index 0bc39aa7a..d51909370 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockLivingrockSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -11,7 +12,7 @@ public class BlockLivingrockSlab extends BlockLivingSlab { super(full, ModBlocks.livingrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java index c3530b308..c78dc76dc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerrockSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -21,7 +22,7 @@ public class BlockShimmerrockSlab extends BlockLivingSlab { super(full, ModBlocks.shimmerrock.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java index 97172da14..1b1816f24 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/living/BlockShimmerwoodPlankSlab.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor.slabs.living; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; @@ -21,7 +22,7 @@ public class BlockShimmerwoodPlankSlab extends BlockLivingSlab { super(full, ModBlocks.shimmerwoodPlanks.getDefaultState()); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index 2fe270a0e..2cc57b012 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -1,6 +1,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -23,7 +24,7 @@ public class BlockPrismarineSlab extends BlockLivingSlab { super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java index c796bf9a4..7067dc353 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.SoundType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -24,7 +25,7 @@ public class BlockPrismarineWall extends BlockModWall { super(ModBlocks.prismarine, 0); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java index 508389fd8..3caebc96b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; public class BlockReedWall extends BlockModWall { @@ -17,7 +18,7 @@ public class BlockReedWall extends BlockModWall { public BlockReedWall() { super(ModBlocks.reedBlock, 0); setHardness(1.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java index 6006e41a3..8555956dc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -18,7 +19,7 @@ public class BlockDreamwoodWall extends BlockModWall { public BlockDreamwoodWall() { super(ModBlocks.dreamwood, 0); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java index 603eebc83..4f44d3db0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -19,7 +20,7 @@ public class BlockLivingrockWall extends BlockModWall { super(ModBlocks.livingrock, 0); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java index b958d4ff7..bc2ff754a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.decor.walls.living; +import net.minecraft.block.SoundType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -18,7 +19,7 @@ public class BlockLivingwoodWall extends BlockModWall { public BlockLivingwoodWall() { super(ModBlocks.livingwood, 0); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); } } 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 63c7efe78..8961018ec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.mana; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; @@ -37,7 +37,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(Block.soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } 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 c5e130030..5884f56d6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -17,8 +18,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,14 +36,15 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.BELLOWS); float f = (1F - 10 / 16F) / 2F; - setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -60,13 +66,18 @@ public class BlockBellows extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing()), 2); } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(EntityDoppleganger.isTruePlayer(player)) ((TileBellows) world.getTileEntity(pos)).interact(); return true; @@ -83,8 +94,8 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override 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 4b7dcf76f..058bedc8a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,8 +23,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -37,18 +42,17 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); + + private final Random random = new Random(); public BlockBrewery() { super(Material.rock); float f = 6F / 16F; - setBlockBounds(f, 0.05F, f, 1F - f, 0.95F, 1F - f); setUnlocalizedName(LibBlockNames.BREWERY); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); - - random = new Random(); + setSoundType(SoundType.STONE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -68,7 +72,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { @@ -85,7 +94,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } } } else { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null) return brew.addItem(par5EntityPlayer, stack); } @@ -131,19 +139,19 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); return brew.signal; } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override 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 357a5102d..036c941de 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -30,7 +30,7 @@ public class BlockDistributor extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } 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 952bd34d4..323e990aa 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -49,7 +49,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, setHardness(3.0F); setResistance(5.0F); setLightLevel(1.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); random = new Random(); 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 3b436078a..53a02be2c 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 setBlockBounds(f * 3, 0F, f * 3, 1F - f * 3, 1F - f * 2, 1F - f * 3); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.FOREST_DRUM); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } 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 5e202001f..1d80e00cc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -40,7 +40,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(Block.soundTypeStone); + setSoundType(Block.SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_DETECTOR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 96df44a6b..7ab95499c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -36,7 +36,7 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla super(Material.rock); setHardness(2.0F); setResistance(2000F); - setStepSound(Block.soundTypeStone); + setSoundType(Block.SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_VOID); } 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 8cb69cb5f..b988b2b46 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.mana; -import java.awt.*; import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -29,13 +29,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -44,7 +43,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -56,15 +54,16 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); + boolean lastFragile = false; public BlockPool() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.POOL); - setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); @@ -89,6 +88,11 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -166,7 +170,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @@ -181,17 +185,17 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TilePool pool = (TilePool) par1World.getTileEntity(pos); int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); if(pool.getCurrentMana() > 0) 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 40c28d027..eddccd1ab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -47,7 +47,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { public BlockPrism() { super(Material.glass); setHardness(0.3F); - setStepSound(soundTypeGlass); + setSoundType(SoundType.GLASS); setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; 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 21909928b..df0763cc6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -39,7 +39,7 @@ public class BlockPump extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PUMP); setBlockBounds(EnumFacing.Axis.X); setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); 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 303f32f9d..e7a8a7685 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -32,7 +32,7 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RF_GENERATOR); } 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 f2f1050d7..233346149 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -41,7 +41,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable setBlockBounds(0F, 0F, 0F, 1F, 0.75F, 1F); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RUNE_ALTAR); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); 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 fa76ebccc..ba33dd12c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,12 +10,12 @@ */ package vazkii.botania.common.block.mana; -import java.awt.*; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -30,12 +30,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -44,12 +44,10 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -61,7 +59,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex public BlockSpreader() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.SPREADER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); random = new Random(); @@ -104,7 +102,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); par1World.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); @@ -145,19 +143,18 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public int getRenderType() { - return 2; + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return false; TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getItemHandler().getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); 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 e03660b9f..fb879b0ac 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -38,7 +38,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(3F); setResistance(10F); - setStepSound(soundTypeMetal); + setSoundType(SoundType.METAL); setUnlocalizedName(LibBlockNames.TERRA_PLATE); 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 e3ff05982..53ba88a3a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -34,7 +34,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe public BlockTurntable() { super(Material.wood); setHardness(2.0F); - setStepSound(soundTypeWood); + setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.TURNTABLE); } 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 304a85757..6ecc66a8f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.string; import net.minecraft.block.BlockPistonBase; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -33,7 +34,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setStepSound(soundTypeStone); + setSoundType(SoundType.STONE); setUnlocalizedName(name); } @@ -44,7 +45,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { @Override public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(par1World, pos, par5EntityLivingBase); + EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 77e3caa85..b45d41f08 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -27,12 +27,12 @@ public class BlockRedStringComparator extends BlockRedString { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileRedStringComparator) world.getTileEntity(pos)).getComparatorValue(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 7cc64aee0..d33859781 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -66,12 +66,12 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } 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 d35bea205..90541b8c0 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 @@ -16,9 +16,12 @@ import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockSapling; import net.minecraft.block.IGrowable; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; @@ -50,7 +53,7 @@ public class SubTileAgricarnation extends SubTileFunctional { supertile.getWorld().scheduleUpdate(pos, block, 1); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playAuxSFX(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); - supertile.getWorld().playSoundEffect(x, y, z, "botania:agricarnation", 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, x, y, z, BotaniaSoundEvents.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); break; } @@ -64,11 +67,12 @@ public class SubTileAgricarnation extends SubTileFunctional { } boolean isPlant(BlockPos pos) { - Block block = supertile.getWorld().getBlockState(pos).getBlock(); + 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)) return false; - Material mat = block.getMaterial(); + 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); } 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 ed2f4fdfd..f7d0eabe2 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -48,8 +49,8 @@ public class SubTileBubbell extends SubTileFunctional { for(int j = -range; j < range + 1; j++) for(int k = -range; k < range + 1; k++) if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - Block block = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)).getBlock(); - if(block.getMaterial() == Material.water) { + IBlockState state = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)); + if(state.getMaterial() == Material.water) { supertile.getWorld().setBlockState(supertile.getPos().add(i, j, k), ModBlocks.fakeAir.getDefaultState(), 2); TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.getPos().add(i, j, k)); air.setFlower(supertile); 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 303b09ca0..566ceb94f 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -34,8 +35,8 @@ public class SubTileFallenKanade extends SubTileFunctional { if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimension() != 1) { 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(Potion.regeneration) == null && mana >= cost ) { - player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60, 2)); + if(player.getActivePotionEffect(MobEffects.regeneration) == null && mana >= cost ) { + player.addPotionEffect(new PotionEffect(MobEffects.regeneration, 60, 2)); mana -= cost; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 7fe18834f..e52fef7e0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -17,7 +17,7 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIAttackMelee; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; @@ -70,8 +70,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { if(entry.action instanceof EntityAINearestAttackableTarget) { messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); did = true; - } else if(entry.action instanceof EntityAIAttackOnCollide) { - messWithAttackOnCollideAI((EntityAIAttackOnCollide) entry.action); + } else if(entry.action instanceof EntityAIAttackMelee) { + messWithAttackOnCollideAI((EntityAIAttackMelee) entry.action); did = true; } @@ -89,8 +89,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); } - private static void messWithAttackOnCollideAI(EntityAIAttackOnCollide aiEntry) { - ReflectionHelper.setPrivateValue(EntityAIAttackOnCollide.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); + private static void messWithAttackOnCollideAI(EntityAIAttackMelee aiEntry) { + ReflectionHelper.setPrivateValue(EntityAIAttackMelee.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); } @Override 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 d1b597383..141eb95df 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 @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -38,8 +39,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(Potion.poison) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { - entity.addPotionEffect(new PotionEffect(Potion.poison.id, 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 af439a2f7..251fc8271 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 @@ -43,8 +43,9 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { ); for(int i = 0; i < RANGE * 2; i++) { - Block blockAbove = supertile.getWorld().getBlockState(pos.up()).getBlock(); - if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { + IBlockState stateAbove = supertile.getWorld().getBlockState(pos.up()); + Block blockAbove = stateAbove.getBlock(); + if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && stateAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.up())) { EnumDyeColor color = EnumDyeColor.byMetadata(supertile.getWorld().rand.nextInt(16)); IBlockState state = ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color); if(ConfigHandler.blockBreakParticles) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 589873b60..823124279 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -14,7 +14,9 @@ import java.util.Random; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ChestGenHooks; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.WorldServer; +import net.minecraft.world.storage.loot.LootContext; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -29,12 +31,12 @@ public class SubTileLoonuim extends SubTileFunctional { @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal == 0 && ticksExisted % 200 == 0 && mana >= COST) { + if(!supertile.getWorld().isRemote && redstoneSignal == 0 && ticksExisted % 200 == 0 && mana >= COST) { Random rand = supertile.getWorld().rand; ItemStack stack; do { - stack = ChestGenHooks.getOneItem(ChestGenHooks.DUNGEON_CHEST, rand); + stack = supertile.getWorld().getLootTableManager().getLootTableFromLocation(new ResourceLocation("minecraft", "chests/simple_dungeon")).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()).get(0); } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; @@ -43,8 +45,7 @@ public class SubTileLoonuim extends SubTileFunctional { entity.motionY = 0; entity.motionZ = 0; - if(!supertile.getWorld().isRemote) - supertile.getWorld().spawnEntityInWorld(entity); + supertile.getWorld().spawnEntityInWorld(entity); 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 aae35865b..337005591 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 @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -98,8 +99,8 @@ public class SubTileMarimorphosis extends SubTileFunctional { for(int j = -rangeY; j < rangeY; j++) 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 != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.stone))) + IBlockState state = supertile.getWorld().getBlockState(pos); + 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 8ab4ab8ea..35a95b406 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 @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; @@ -35,7 +36,7 @@ public class SubTileMedumone extends SubTileFunctional { for(EntityLivingBase entity : entities) if(!(entity instanceof EntityPlayer)) { - entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 100)); + entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 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 d805e3ef7..9a9638238 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 @@ -11,20 +11,22 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.WeightedRandom; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; @@ -58,7 +60,7 @@ public class SubTileOrechid extends SubTileFunctional { supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playAuxSFX(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:orechid", 2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.orechid, SoundCategory.BLOCKS, 2F, 1F); mana -= cost; sync(); @@ -68,7 +70,7 @@ public class SubTileOrechid extends SubTileFunctional { } public ItemStack getOreToPut() { - Collection values = new ArrayList<>(); + List values = new ArrayList<>(); Map map = getOreMap(); for(String s : map.keySet()) values.add(new StringRandomItem(map.get(s), s)); @@ -105,8 +107,8 @@ public class SubTileOrechid extends SubTileFunctional { for(int j = -RANGE_Y; j < RANGE_Y; j++) 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 != null && block.isReplaceableOreGen(supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) possibleCoords.add(pos); } 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 89a663867..d05adf47d 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 @@ -98,9 +98,10 @@ public class SubTileRannuncarpus extends SubTileFunctional { for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) for(int l = -rangePlace; l < rangePlace + 1; l++) { BlockPos pos_ = pos.add(i, j, l); - Block blockAbove = supertile.getWorld().getBlockState(pos_.up()).getBlock(); + IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); + Block blockAbove = stateAbove.getBlock(); - if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) + if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) validPositions.add(pos_.up()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 3533761f6..6bd02d808 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,6 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index e7c0e663a..36d5559f7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -159,7 +160,8 @@ public class SubTileDandelifeon extends SubTileGenerating { void setBlockForGeneration(BlockPos pos, int gen, int prevGen) { World world = supertile.getWorld(); - Block blockAt = world.getBlockState(pos).getBlock(); + IBlockState stateAt = world.getBlockState(pos); + Block blockAt = stateAt.getBlock(); TileEntity tile = world.getTileEntity(pos); if(gen == -2) { int val = prevGen * MANA_PER_GEN; @@ -169,7 +171,7 @@ public class SubTileDandelifeon extends SubTileGenerating { if(gen < 0 || gen > MAX_GENERATIONS) world.setBlockToAir(pos); else ((TileCell) tile).setGeneration(supertile, gen); - } else if(gen >= 0 && blockAt.isAir(supertile.getWorld(), pos)) { + } else if(gen >= 0 && blockAt.isAir(stateAt, supertile.getWorld(), pos)) { world.setBlockState(pos, ModBlocks.cellBlock.getDefaultState()); tile = world.getTileEntity(pos); ((TileCell) tile).setGeneration(supertile, gen); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index f6b64197f..b16b6fddd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 98ee5699e..997fb8ddc 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -17,9 +17,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; @@ -65,7 +67,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(!supertile.getWorld().isRemote) { stack.stackSize--; - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:endoflame", 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); if(stack.stackSize == 0) item.setDead(); 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 bb241c779..e032701aa 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.init.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; @@ -33,11 +34,11 @@ public class SubTileEntropinnyum extends SubTileGenerating { if(mana == 0) { List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityTNTPrimed tnt : tnts) { - if(tnt.fuse == 1 && !tnt.isDead && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getBlock().getMaterial().isLiquid()) { + 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.setDead(); mana += getMaxMana(); - supertile.getWorld().playSoundEffect(tnt.posX, tnt.posY, tnt.posZ, "random.explode", 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F); 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 ef7aea9af..d5f9e01dd 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -68,7 +69,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { int val = ((ItemFood) stack.getItem()).getHealAmount(stack); storedMana = val * val * 64; cooldown = val * 10; - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.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 2695cf3cc..c2155846b 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 @@ -20,8 +20,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -65,13 +67,13 @@ 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).getBlock().getMaterial() == search && (getBlockToSearchBelow() == null || supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) && (prop == null || supertile.getWorld().getBlockState(pos).getValue(prop) == 0)) { + 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) supertile.getWorld().setBlockToAir(pos); else { int waterAround = 0; for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) - if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock().getMaterial() == search) + if(supertile.getWorld().getBlockState(pos.offset(dir)).getMaterial() == search) waterAround++; if(waterAround < 2) @@ -112,7 +114,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void playSound() { - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.drink", 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() { @@ -179,7 +181,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getIntRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } 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 c663c39de..6014fd2d6 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 @@ -13,6 +13,8 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockCake; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -43,7 +45,7 @@ public class SubTileKekimurus extends SubTileGenerating { else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state.withProperty(BlockCake.BITES, nextSlicesEaten))); - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "random.eat", 1F, 0.5F + (float) Math.random() * 0.5F); + 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 cd00067f5..bb870b563 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,14 +62,16 @@ 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); - Block block = supertile.getWorld().getBlockState(pos_).getBlock(); - if(block.getMaterial() == Material.leaves) { + if(supertile.getWorld().getBlockState(pos).getMaterial()== Material.leaves) { boolean exposed = false; - for(EnumFacing dir : EnumFacing.VALUES) - if(supertile.getWorld().getBlockState(pos_.offset(dir)).getBlock().isAir(supertile.getWorld(), pos_.offset(dir))) { + for(EnumFacing dir : EnumFacing.VALUES) { + IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); + if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { exposed = true; break; } + } + if(exposed) coords.add(pos_); 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 09907ff9f..321673dc4 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.init.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; @@ -46,7 +47,7 @@ public class SubTileNarslimmus extends SubTileGenerating { int mana = 820 * mul; if(!slime.worldObj.isRemote) { slime.setDead(); - slime.worldObj.playSoundAtEntity(slime, "mob.slime." + (size > 1 ? "big" : "small"), 1F, 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/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 1871bb3bf..672470373 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 @@ -11,7 +11,9 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.material.Material; +import net.minecraft.util.SoundCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; @@ -44,7 +46,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorld().playSoundEffect(supertile.getPos().getX(), supertile.getPos().getY(), supertile.getPos().getZ(), "botania:thermalily", 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); } @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 8411ff47e..aa116fbb5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -23,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -143,8 +144,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil subTile.onBlockPlacedBy(world, pos, state, entity, stack); } - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { - return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { + return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } public void onBlockAdded(World world, BlockPos pos, IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 07aaaa406..a0456a23e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -82,7 +82,7 @@ public final class SkyblockWorldEvents { } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); if(RayTraceResult != null) { - if (RayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) { + if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { if(event.world.getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize; From 268a8afda5ed4bd52a83da28a11368f830467f73 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 19 Mar 2016 09:59:45 -0500 Subject: [PATCH 453/935] Most TE's --- .../common/block/tile/TileAlfPortal.java | 2 +- .../botania/common/block/tile/TileAltar.java | 11 ++-- .../common/block/tile/TileBrewery.java | 5 +- .../common/block/tile/TileEnchanter.java | 51 +++++++++---------- .../common/block/tile/TileEnderEye.java | 3 +- .../common/block/tile/TileIncensePlate.java | 11 ++-- .../common/block/tile/TileLightRelay.java | 4 +- .../common/block/tile/TileOpenCrate.java | 5 +- .../common/block/tile/TilePlatform.java | 2 +- .../botania/common/block/tile/TilePylon.java | 2 - .../common/block/tile/TileRuneAltar.java | 6 ++- .../common/block/tile/TileSpawnerClaw.java | 3 +- .../common/block/tile/TileTerraPlate.java | 4 +- .../common/block/tile/TileTinyPotato.java | 4 +- .../tile/corporea/TileCorporeaIndex.java | 10 ++-- .../common/block/tile/mana/TileBellows.java | 4 +- .../common/block/tile/mana/TilePool.java | 6 ++- .../common/block/tile/mana/TileSpreader.java | 12 +++-- .../block/tile/string/TileRedString.java | 9 +++- .../tile/string/TileRedStringComparator.java | 11 ++-- .../tile/string/TileRedStringContainer.java | 8 --- .../tile/string/TileRedStringInterceptor.java | 7 ++- 22 files changed, 99 insertions(+), 81 deletions(-) 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 f85b501d4..93754dd87 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -358,7 +358,7 @@ public class TileAlfPortal extends TileMod { IBlockState stateat = worldObj.getBlockState(pos_); Block blockat = stateat.getBlock(); - if(state.getBlock() == Blocks.air ? blockat.isAir(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 91525f7ab..b423d9244 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -22,9 +22,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.text.translation.I18n; @@ -37,6 +39,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; @@ -113,7 +116,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { stackToPut.stackSize = 1; itemHandler.setStackInSlot(i, stackToPut); didChange = true; - worldObj.playSoundAtEntity(item, "game.neutral.swim.splash", 0.1F, 1F); + worldObj.playSound(null, pos, SoundEvents.entity_generic_splash, SoundCategory.BLOCKS, 0.1F, 10F); break; } } @@ -195,7 +198,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { if(didAny) { if(inv instanceof TileAltar) - player.worldObj.playSoundAtEntity(player, "game.neutral.swim.splash", 0.1F, 1F); + 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(); @@ -204,7 +207,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } public void craftingFanciness() { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:altarCraft", 1F, 1F); + worldObj.playSound(null, pos, BotaniaSoundEvents.altarCraft, SoundCategory.BLOCKS, 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -243,7 +246,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { float green = color.getGreen() / 255F; float blue = color.getBlue() / 255F; if(Math.random() >= 0.75F) - worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "game.neutral.swim.splash", 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); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2e2e55017..4b7be32d8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -17,8 +17,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; @@ -26,6 +28,7 @@ import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -158,7 +161,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } public void craftingFanciness() { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); + worldObj.playSound(null, pos, BotaniaSoundEvents.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F); for(int i = 0; i < 25; i++) { Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); float r = color.getRed() / 255F; 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 df590199d..bde2d746f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -20,6 +20,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentData; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -30,6 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -43,6 +46,7 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -121,7 +125,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(enchants != null && enchants.tagCount() > 0) { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short id = enchant.getShort("id"); - if(isEnchantmentValid(id)) { + if(isEnchantmentValid(Enchantment.getEnchantmentByID(id))) { advanceStage(); return; } @@ -151,7 +155,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { float blue = (float) Math.random(); Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 10F); + worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { @@ -170,9 +174,10 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { NBTTagCompound enchant = enchants.getCompoundTagAt(0); short enchantId = enchant.getShort("id"); short enchantLvl = enchant.getShort("lvl"); - if(!hasEnchantAlready(enchantId) && isEnchantmentValid(enchantId)) { - this.enchants.add(new EnchantmentData(enchantId, enchantLvl)); - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:ding", 1F, 1F); + Enchantment ench = Enchantment.getEnchantmentByID(enchantId); + if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { + this.enchants.add(new EnchantmentData(ench, enchantLvl)); + worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); addedEnch = true; break; } @@ -201,8 +206,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(manaRequired == -1) { manaRequired = 0; for(EnchantmentData data : enchants) { - Enchantment ench = Enchantment.getEnchantmentById(data.enchant); - manaRequired += (int) (5000F * ((15 - Math.min(15, ench.getWeight())) * 1.05F) * ((3F + data.level * data.level) * 0.25F) * (0.9F + enchants.size() * 0.05F)); + 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)); } } else if(mana >= manaRequired) { manaRequired = 0; @@ -229,8 +233,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { case 3 : { // Enchant if(stageTicks >= 100) { for(EnchantmentData data : enchants) - if(EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0) - itemToEnchant.addEnchantment(Enchantment.getEnchantmentById(data.enchant), data.level); + if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) + itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); enchants.clear(); manaRequired = -1; @@ -268,7 +272,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void craftingFanciness() { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterEnchant", 1F, 1F); + worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -321,7 +325,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { String enchStr = ""; for(EnchantmentData data : enchants) - enchStr = enchStr + data.enchant + ":" + data.level + ","; + enchStr = enchStr + Enchantment.enchantmentRegistry.getNameForObject(data.enchantmentobj) + ":" + data.enchantmentLevel + ","; cmp.setString(TAG_ENCHANTS, enchStr.isEmpty() ? enchStr : enchStr.substring(0, enchStr.length() - 1)); } @@ -342,28 +346,29 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { String[] enchTokens = enchStr.split(","); for(String token : enchTokens) { String[] entryTokens = token.split(":"); - int id = Integer.parseInt(entryTokens[0]); + Enchantment ench = Enchantment.getEnchantmentByLocation(entryTokens[0]); + if(ench == null) + ench = Enchantment.getEnchantmentByID(Integer.parseInt(entryTokens[0])); int lvl = Integer.parseInt(entryTokens[1]); - enchants.add(new EnchantmentData(id, lvl)); + enchants.add(new EnchantmentData(ench, lvl)); } } } - private boolean hasEnchantAlready(int enchant) { + private boolean hasEnchantAlready(Enchantment enchant) { for(EnchantmentData data : enchants) - if(data.enchant == enchant) + if(data.enchantmentobj == enchant) return true; return false; } - public boolean isEnchantmentValid(short id) { - Enchantment ench = Enchantment.getEnchantmentById(id); + public boolean isEnchantmentValid(Enchantment ench) { if(!ench.canApply(itemToEnchant) || !ench.type.canEnchantItem(itemToEnchant.getItem())) return false; for(EnchantmentData data : enchants) { - Enchantment otherEnch = Enchantment.getEnchantmentById(data.enchant); + Enchantment otherEnch = data.enchantmentobj; if(!otherEnch.canApplyTogether(ench) || !ench.canApplyTogether(otherEnch)) return false; } @@ -427,14 +432,4 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } } - private static class EnchantmentData { - - public int enchant, level; - - public EnchantmentData(int enchant, int level) { - this.enchant = enchant; - this.level = level; - } - } - } 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 9653f2997..bc7b7a90b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; @@ -36,7 +37,7 @@ public class TileEnderEye extends TileMod { boolean looking = false; for(EntityPlayer player : players) { - ItemStack helm = player.getCurrentArmor(3); + ItemStack helm = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if(helm != null && helm.getItem() == Item.getItemFromBlock(Blocks.pumpkin)) continue; 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 f31f4dd10..cc8838bfb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -14,10 +14,13 @@ import java.awt.Color; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; @@ -49,16 +52,16 @@ public class TileIncensePlate extends TileSimpleInventory { if(!worldObj.isRemote) { 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(GameData.getPotionRegistry().getObjectById(effect.getPotionID())); - boolean nightVision = effect.getPotionID() == Potion.nightVision.getId(); + PotionEffect currentEffect = player.getActivePotionEffect(effect.getPotion()); + boolean nightVision = effect.getPotion() == MobEffects.nightVision; if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { - PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); + PotionEffect applyEffect = new PotionEffect(effect.getPotion(), nightVision ? 285 : 80, effect.getAmplifier(), true, true); player.addPotionEffect(applyEffect); } } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.1, pos.getZ() + 0.5, "fire.fire", 0.1F, 1F); + 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/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 0488ffaf0..a28d25aae 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -53,7 +53,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, bindPos); worldObj.spawnEntityInWorld(mover); - e.mountEntity(mover); + e.startRiding(mover); if(!(e instanceof EntityItem)) { worldObj.playSoundAtEntity(mover, "botania:lightRelay", 0.2F, (float) Math.random() * 0.3F + 0.7F); if(e instanceof EntityPlayer) @@ -206,7 +206,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { public void onUpdate() { super.onUpdate(); - if(riddenByEntity == null && !worldObj.isRemote) { + if(getPassengers().isEmpty() && !worldObj.isRemote) { setDead(); return; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index a40db355a..6e4f5a79d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -61,8 +61,9 @@ public class TileOpenCrate extends TileSimpleInventory { } public boolean canEject() { - Block blockBelow = worldObj.getBlockState(pos.down()).getBlock(); - return blockBelow.isAir(worldObj, pos.down()) || blockBelow.getCollisionBoundingBox(worldObj, pos.down(), worldObj.getBlockState(pos.down())) == null; + IBlockState stateBelow = worldObj.getBlockState(pos.down()); + Block blockBelow = stateBelow.getBlock(); + return blockBelow.isAir(stateBelow, worldObj, pos.down()) || stateBelow.getCollisionBoundingBox(worldObj, pos.down()) == null; } public void eject(ItemStack stack, boolean redstone) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index 9e6d4afcb..43e71212f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -53,7 +53,7 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost { void swap(TilePlatform tile, boolean empty) { tile.camoState = empty ? null : camoState; - worldObj.markBlockForUpdate(tile.getPos()); + worldObj.notifyBlockUpdate(tile.getPos(), worldObj.getBlockState(tile.getPos()), worldObj.getBlockState(tile.getPos()), 8); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index e29d6438e..aba3c92c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -30,8 +30,6 @@ public class TilePylon extends TileEntity implements ITickable { BlockPos centerPos; int ticks = 0; - - @Override public void update() { ++ticks; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index ad707de81..b203f6892 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.translation.I18n; @@ -30,6 +31,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; @@ -165,7 +167,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } if(manaToGet != this.manaToGet) { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:runeAltarStart", 1F, 1F); + worldObj.playSound(null, pos, BotaniaSoundEvents.runeAltarStart, SoundCategory.BLOCKS, 1, 1); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } @@ -253,7 +255,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } public void craftingFanciness() { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:runeAltarCraft", 1F, 1F); + worldObj.playSound(null, pos, BotaniaSoundEvents.runeAltarCraft, SoundCategory.BLOCKS, 1, 1); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); 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 083a212b7..f7bfb3397 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.WeightedSpawnerEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.WeightedRandom; import vazkii.botania.api.mana.IManaReceiver; @@ -130,7 +131,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) - logic.setRandomEntity((MobSpawnerBaseLogic.WeightedRandomMinecart)WeightedRandom.getRandomItem(logic.getSpawnerWorld().rand, potentialEntitySpawns)); + logic.func_184993_a((WeightedSpawnerEntity)WeightedRandom.getRandomItem(logic.getSpawnerWorld().rand, potentialEntitySpawns)); logic.func_98267_a(1); } 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 474d876d9..bee8d80f3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -19,6 +19,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -28,6 +29,7 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; @@ -94,7 +96,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { if(otherItem != item) otherItem.setDead(); else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4)); - item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); + worldObj.playSound(null, item.posX, item.posY, item.posZ, BotaniaSoundEvents.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); mana = 0; worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 579752e6e..b452a5323 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,6 +11,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; +import vazkii.botania.api.sound.BotaniaSoundEvents; public class TileTinyPotato extends TileMod { @@ -25,7 +27,7 @@ public class TileTinyPotato extends TileMod { jump(); if(name.equalsIgnoreCase("shia labeouf") && !worldObj.isRemote && nextDoIt == 0) { nextDoIt = 40; - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:doit", 1F, 1F); + worldObj.playSound(null, pos, BotaniaSoundEvents.doit, SoundCategory.BLOCKS, 1F, 1F); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index c4c23e7e6..7855936a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -239,9 +239,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ @SubscribeEvent(priority = EventPriority.HIGHEST) public void onChatMessage(ServerChatEvent event) { - List nearbyIndexes = getNearbyIndexes(event.player); + List nearbyIndexes = getNearbyIndexes(event.getPlayer()); if(!nearbyIndexes.isEmpty()) { - String msg = event.message.toLowerCase().trim(); + String msg = event.getMessage().toLowerCase().trim(); for(TileCorporeaIndex index : nearbyIndexes) { if(index.worldObj.isRemote) continue; @@ -261,16 +261,16 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } if(name.equals("this")) { - ItemStack stack = event.player.getCurrentEquippedItem(); + ItemStack stack = event.getPlayer().getHeldItemMainhand(); if(stack != null) name = stack.getDisplayName().toLowerCase().trim(); } index.doCorporeaRequest(name, count, spark); - event.player.addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); if(CorporeaHelper.lastRequestExtractions >= 50000) - event.player.addStat(ModAchievements.superCorporeaRequest, 1); + event.getPlayer().addStat(ModAchievements.superCorporeaRequest, 1); } } 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 6da67e769..7cddaf175 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 @@ -17,7 +17,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; @@ -56,7 +58,7 @@ public class TileBellows extends TileMod { if(movePos < max && active && moving >= 0F) { if(moving == 0F) - worldObj.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "botania:bellows", 0.1F, 3F); + worldObj.playSound(null, pos, BotaniaSoundEvents.bellows, SoundCategory.BLOCKS, 0.1F, 3F); if(tile instanceof TileEntityFurnace) { TileEntityFurnace furnace = (TileEntityFurnace) tile; 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 679eab29b..472251228 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 @@ -27,6 +27,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -48,6 +49,7 @@ import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; @@ -193,7 +195,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc public void craftingFanciness() { if(soundTicks == 0) { - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:manaPoolCraft", 0.4F, 4F); + worldObj.playSound(null, pos, BotaniaSoundEvents.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); soundTicks = 6; } @@ -354,7 +356,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - worldObj.playSoundAtEntity(player, "botania:ding", 0.11F, 1F); + worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); } public void renderHUD(Minecraft mc, ScaledResolution res) { 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 ef6b52e02..6aed8b5b5 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 @@ -29,7 +29,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -48,6 +51,7 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IRedirectable; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandBindable; @@ -382,7 +386,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - worldObj.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); + worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1); } else { RayTraceResult pos = raytraceFromEntity(worldObj, player, true, 5); if(pos != null && pos.hitVec != null && !worldObj.isRemote) { @@ -437,7 +441,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, worldObj.spawnEntityInWorld(burst); burst.ping(); if(!ConfigHandler.silentSpreaders) - worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:spreaderFire", 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); + worldObj.playSound(null, pos, BotaniaSoundEvents.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); } } } @@ -546,7 +550,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, float f8 = f3 * f5; double d3 = range; if (player instanceof EntityPlayerMP) - d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance(); + d3 = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); Vec3d vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); return world.rayTraceBlocks(vec3, vec31, par3, !par3, par3); } @@ -672,7 +676,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - AxisAlignedBB axis = player.worldObj.getBlockState(pos).getBlock().getCollisionBoundingBox(player.worldObj, pos, player.worldObj.getBlockState(pos)); + AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos); if(axis == null) axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); 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 679c05e4f..8ff8a8853 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -83,9 +84,13 @@ public abstract class TileRedString extends TileMod implements ITileBound { return binding == null ? null : worldObj.getTileEntity(binding); } - public Block getBlockAtBinding() { + public IBlockState getStateAtBinding() { BlockPos binding = getBinding(); - return binding == null ? Blocks.air : worldObj.getBlockState(binding).getBlock(); + return binding == null ? Blocks.air.getDefaultState() : worldObj.getBlockState(binding); + } + + public Block getBlockAtBinding() { + return getStateAtBinding().getBlock(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 3262a3c5c..ee7e22aa1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -23,12 +24,11 @@ public class TileRedStringComparator extends TileRedString { super.updateEntity(); BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); - Block block = getBlockAtBinding(); + IBlockState state = getStateAtBinding(); int origVal = comparatorValue; - if(block.hasComparatorInputOverride()) { - int val = block.getComparatorInputOverride(worldObj, binding); - comparatorValue = val; + if(state.hasComparatorInputOverride()) { + comparatorValue = state.getComparatorInputOverride(worldObj, binding); } else comparatorValue = 0; if(origVal != comparatorValue) @@ -41,8 +41,7 @@ public class TileRedStringComparator extends TileRedString { @Override public boolean acceptBlock(BlockPos pos) { - Block block = worldObj.getBlockState(pos).getBlock(); - return block.hasComparatorInputOverride(); + return worldObj.getBlockState(pos).hasComparatorInputOverride(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 72862756c..4fc7bf570 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -10,19 +10,11 @@ */ package vazkii.botania.common.block.tile.string; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.EnumFacing; -import net.minecraft.util.text.ITextComponent; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; -import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lib.LibBlockNames; import java.util.Arrays; 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 b568a70ce..fc8c12c2b 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 @@ -15,6 +15,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -68,8 +71,8 @@ public class TileRedStringInterceptor extends TileRedString { interceptors.removeAll(remove); if(did) { if(world.isRemote) - player.swingItem(); - else world.playSoundEffect(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, "random.click", 0.3F, 0.6F); + player.swingArm(EnumHand.MAIN_HAND); // todo 1.9 + else world.playSound(null, pos, SoundEvents.block_dispenser_dispense, SoundCategory.BLOCKS, 0.3F, 0.6F); } } From 0af2d25a715eb68d0e0d055b7484c18ebd2f1491 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 19 Mar 2016 11:38:16 -0500 Subject: [PATCH 454/935] Misc fixes, fix baked models --- .../api/item/IManaProficiencyArmor.java | 11 +- .../client/core/handler/RenderLexicon.java | 7 +- .../client/gui/lexicon/GuiLexicon.java | 3 +- .../gui/lexicon/button/GuiButtonLexicon.java | 3 +- .../client/model/FloatingFlowerModel.java | 107 ++++++------- .../botania/client/model/ModelPool.java | 58 ------- .../botania/client/model/ModelPylon.java | 32 ++-- .../client/model/ModelSpawnerClaw.java | 82 ---------- .../botania/client/model/PylonItemModel.java | 143 ++++++------------ .../client/model/SpecialFlowerModel.java | 75 ++++----- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/mana/BlockDistributor.java | 6 +- .../common/block/mana/BlockEnchanter.java | 5 +- .../botania/common/block/mana/BlockPrism.java | 19 ++- .../common/block/mana/BlockRFGenerator.java | 1 + .../common/block/mana/BlockRuneAltar.java | 22 ++- .../common/block/mana/BlockTerraPlate.java | 18 ++- .../functional/SubTileTangleberrie.java | 3 +- .../common/block/tile/TileLightRelay.java | 32 ++-- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/command/CommandOpen.java | 5 +- .../common/core/handler/ChestGenHandler.java | 4 +- .../common/core/handler/PixieHandler.java | 21 ++- .../botania/common/core/helper/Vector3.java | 10 +- .../common/core/proxy/CommonProxy.java | 4 +- .../common/core/version/VersionChecker.java | 3 +- .../common/entity/EntityCorporeaSpark.java | 73 ++++----- .../common/entity/EntityFallingStar.java | 7 +- .../botania/common/entity/EntityPixie.java | 19 ++- .../common/entity/EntitySignalFlare.java | 15 +- .../botania/common/entity/EntitySpark.java | 32 ++-- .../botania/common/item/ItemTwigWand.java | 21 +-- .../armor/elementium/ItemElementiumArmor.java | 3 +- .../armor/manaweave/ItemManaweaveHelm.java | 2 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../common/item/relic/ItemOdinRing.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageRecipe.java | 5 +- 40 files changed, 346 insertions(+), 525 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelPool.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index 595e800db..bce037fa3 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,16 +24,18 @@ import net.minecraft.item.ItemStack; */ public interface IManaProficiencyArmor { - public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player); + public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player); public final static class Helper { public static boolean hasProficiency(EntityPlayer player) { - for(int i = 0; i < 4; i++) { - ItemStack armor = player.getCurrentArmor(i); + for(EntityEquipmentSlot e: EntityEquipmentSlot.values()) { + if(e.getSlotType() != EntityEquipmentSlot.Type.ARMOR) + continue; + ItemStack armor = player.getItemStackFromSlot(e); if(armor != null) { Item item = armor.getItem(); - if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, i, player)) + if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player)) return true; } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index ba76b54d7..375108bcf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -9,6 +9,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.math.MathHelper; @@ -158,8 +160,9 @@ public class RenderLexicon { String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; - if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null) - title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); + ItemStack stack = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, Item.class); + if(stack != null) + title = stack.getDisplayName(); if(title.equals(origTitle) && bevo) title = I18n.translateToLocal("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 72273aa97..414b44484 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -43,6 +43,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.BotaniaTutorialStartEvent; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -576,7 +577,7 @@ public class GuiLexicon extends GuiScreen { if(par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("botania:way"))); + mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.way, 1.0F)); konamiIndex = 0; } } else konamiIndex = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index 56e717a22..896e9f488 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -14,6 +14,7 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.sound.BotaniaSoundEvents; public class GuiButtonLexicon extends GuiButton { @@ -23,7 +24,7 @@ public class GuiButtonLexicon extends GuiButton { @Override public void playPressSound(SoundHandler p_146113_1_) { - p_146113_1_.playSound(PositionedSoundRecord.create(new ResourceLocation("botania:lexiconPage"), 1.0F)); + p_146113_1_.playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.lexiconPage, 1.0F)); } } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index a6db60a7a..fb4f96672 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -16,6 +16,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverride; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -23,8 +25,10 @@ import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; @@ -43,7 +47,7 @@ import javax.vecmath.Vector4f; import java.util.List; import java.util.stream.Collectors; -public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { +public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadListener { public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; @@ -81,26 +85,9 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } @Override - public IBakedModel handleItemState(ItemStack stack) { - // Items always have GRASS island - IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; - String identifier; - - if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { - // Magic flower - identifier = ItemBlockFloatingSpecialFlower.getType(stack); - } else { - // Mundane flower - identifier = MUNDANE_PREFIX + stack.getItemDamage(); - } - - return getModel(islandType, identifier); - } - - @Override - public IBakedModel handleBlockState(IBlockState state) { + public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); IExtendedBlockState realState = ((IExtendedBlockState) state); IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); String identifier; @@ -113,7 +100,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I identifier = MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata(); } - return getModel(islandType, identifier); + return getModel(islandType, identifier).getQuads(state, face, rand); } // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. @@ -141,41 +128,16 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } } - // Dummy results @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); + public ItemOverrideList getOverrides() { + return ItemHandler.INSTANCE; } - @Override - public List getGeneralQuads() { - return ImmutableList.of(); - } - - @Override - public boolean isAmbientOcclusion() { - return false; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return null; - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; - } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } private static class CompositeBakedModel implements IBakedModel { @@ -190,18 +152,18 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Add flower quads, scaled and translated - for(BakedQuad quad : flower.getGeneralQuads()) { + for(BakedQuad quad : flower.getQuads(null, null, 0)) { genBuilder.add(transform(quad, transform)); } for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + genBuilder.addAll(flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add island quads - genBuilder.addAll(island.getGeneralQuads()); + genBuilder.addAll(island.getQuads(null, null, 0)); for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(island.getFaceQuads(e)); + genBuilder.addAll(island.getQuads(null, e, 0)); } genQuads = genBuilder.build(); @@ -209,15 +171,10 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I // Forward all to flower model @Override - public List getGeneralQuads() { + public List getQuads(IBlockState state, EnumFacing face, long rand) { return genQuads; } - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } - @Override public boolean isAmbientOcclusion() { return base.isAmbientOcclusion(); @@ -242,6 +199,30 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I public ItemCameraTransforms getItemCameraTransforms() { return base.getItemCameraTransforms(); } + + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + } + + private static class ItemHandler extends ItemOverrideList { + private static final ItemHandler INSTANCE = new ItemHandler(); + private ItemHandler() { super(ImmutableList.of()); } + + @Override + public IBakedModel handleItemState(IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + // Items always have GRASS island + IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; + String identifier; + + if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) { + // Magic flower + identifier = ItemBlockFloatingSpecialFlower.getType(stack); + } else { + // Mundane flower + identifier = MUNDANE_PREFIX + stack.getItemDamage(); + } + + return FloatingFlowerModel.INSTANCE.getModel(islandType, identifier); + } } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPool.java b/src/main/java/vazkii/botania/client/model/ModelPool.java deleted file mode 100644 index 1cc52537a..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelPool.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 25, 2014, 1:53:32 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelPool extends ModelBase { - - ModelRenderer base; - ModelRenderer side1; - ModelRenderer side2; - ModelRenderer side3; - ModelRenderer side4; - - public ModelPool() { - textureWidth = 64; - textureHeight = 32; - - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 1, 16); - base.setRotationPoint(-8F, 23F, -8F); - base.setTextureSize(64, 32); - side1 = new ModelRenderer(this, 0, 0); - side1.addBox(0F, 0F, 0F, 16, 7, 1); - side1.setRotationPoint(-8F, 16F, 7F); - side1.setTextureSize(64, 32); - side2 = new ModelRenderer(this, 0, 0); - side2.addBox(0F, 0F, 0F, 16, 7, 1); - side2.setRotationPoint(-8F, 16F, -8F); - side2.setTextureSize(64, 32); - side3 = new ModelRenderer(this, 0, 0); - side3.addBox(0F, 0F, 0F, 1, 7, 14); - side3.setRotationPoint(-8F, 16F, -7F); - side3.setTextureSize(64, 32); - side4 = new ModelRenderer(this, 0, 0); - side4.addBox(0F, 0F, 0F, 1, 7, 14); - side4.setRotationPoint(7F, 16F, -7F); - side4.setTextureSize(64, 32); - } - - public void render() { - float f = 1F / 16F; - base.render(f); - side1.render(f); - side2.render(f); - side3.render(f); - side4.render(f); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 5df6b1195..d597f7335 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -18,12 +18,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.crash.CrashReport; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; @@ -31,21 +32,20 @@ import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; -import java.io.IOException; import java.util.List; public class ModelPylon implements IPylonModel { private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - private IFlexibleBakedModel manaCrystal; - private IFlexibleBakedModel manaRingsAndPanes; - private IFlexibleBakedModel manaGems; - private IFlexibleBakedModel naturaCrystal; - private IFlexibleBakedModel naturaRingsAndPanes; - private IFlexibleBakedModel naturaGems; - private IFlexibleBakedModel gaiaCrystal; - private IFlexibleBakedModel gaiaRingsAndPanes; - private IFlexibleBakedModel gaiaGems; + private IBakedModel manaCrystal; + private IBakedModel manaRingsAndPanes; + private IBakedModel manaGems; + private IBakedModel naturaCrystal; + private IBakedModel naturaRingsAndPanes; + private IBakedModel naturaGems; + private IBakedModel gaiaCrystal; + private IBakedModel gaiaRingsAndPanes; + private IBakedModel gaiaGems; public ModelPylon() { try { @@ -74,7 +74,7 @@ public class ModelPylon implements IPylonModel { manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - } catch(IOException e) { + } catch(Exception e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } } @@ -128,16 +128,16 @@ public class ModelPylon implements IPylonModel { GlStateManager.enableLighting(); } - private void renderModel(IFlexibleBakedModel model) { + private void renderModel(IBakedModel model) { renderModel(model, -1); } - private void renderModel(IFlexibleBakedModel model, int color) { + private void renderModel(IBakedModel model, int color) { Tessellator tessellator = Tessellator.getInstance(); VertexBuffer worldrenderer = tessellator.getBuffer(); - worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); + worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); - this.renderQuads(worldrenderer, model.getGeneralQuads(), color); + this.renderQuads(worldrenderer, model.getQuads(null, null, 0), color); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java b/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java deleted file mode 100644 index 4504ef8c6..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelSpawnerClaw.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 23, 2014, 5:46:38 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelSpawnerClaw extends ModelBase { - ModelRenderer Plate; - ModelRenderer Claw1; - ModelRenderer Claw2; - ModelRenderer Claw3; - ModelRenderer Claw4; - ModelRenderer Claw5; - ModelRenderer Claw6; - ModelRenderer Claw7; - ModelRenderer Claw8; - - public ModelSpawnerClaw() { - textureWidth = 64; - textureHeight = 32; - - Plate = new ModelRenderer(this, 0, 0); - Plate.addBox(0F, 0F, 0F, 12, 1, 12); - Plate.setRotationPoint(-6F, 23F, -6F); - Plate.setTextureSize(64, 32); - Claw1 = new ModelRenderer(this, 0, 14); - Claw1.addBox(0F, 0F, 0F, 2, 1, 3); - Claw1.setRotationPoint(-1F, 23F, 6F); - Claw1.setTextureSize(64, 32); - Claw2 = new ModelRenderer(this, 11, 14); - Claw2.addBox(0F, 0F, 0F, 2, 1, 3); - Claw2.setRotationPoint(-1F, 23F, -9F); - Claw2.setTextureSize(64, 32); - Claw3 = new ModelRenderer(this, 0, 19); - Claw3.addBox(0F, 0F, 0F, 3, 1, 2); - Claw3.setRotationPoint(-9F, 23F, -1F); - Claw3.setTextureSize(64, 32); - Claw4 = new ModelRenderer(this, 11, 19); - Claw4.addBox(0F, 0F, 0F, 3, 1, 2); - Claw4.setRotationPoint(6F, 23F, -1F); - Claw4.setTextureSize(64, 32); - Claw5 = new ModelRenderer(this, 23, 16); - Claw5.addBox(0F, 0F, 0F, 2, 5, 1); - Claw5.setRotationPoint(-1F, 24F, 8F); - Claw5.setTextureSize(64, 32); - Claw6 = new ModelRenderer(this, 30, 16); - Claw6.addBox(0F, 0F, 0F, 1, 5, 2); - Claw6.setRotationPoint(8F, 24F, -1F); - Claw6.setTextureSize(64, 32); - Claw7 = new ModelRenderer(this, 37, 16); - Claw7.addBox(0F, 0F, 0F, 2, 5, 1); - Claw7.setRotationPoint(-1F, 24F, -9F); - Claw7.setTextureSize(64, 32); - Claw8 = new ModelRenderer(this, 44, 16); - Claw8.addBox(0F, 0F, 0F, 1, 5, 2); - Claw8.setRotationPoint(-9F, 24F, -1F); - Claw8.setTextureSize(64, 32); - } - - public void render() { - float f5 = 1F / 16F; - Plate.render(f5); - Claw1.render(f5); - Claw2.render(f5); - Claw3.render(f5); - Claw4.render(f5); - Claw5.render(f5); - Claw6.render(f5); - Claw7.render(f5); - Claw8.render(f5); - } - -} diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index b44ae3974..8d8539aca 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -11,20 +11,21 @@ package vazkii.botania.client.model; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; @@ -38,37 +39,38 @@ import javax.vecmath.Vector3f; import java.io.IOException; import java.util.List; -public class PylonItemModel implements ISmartItemModel { +public class PylonItemModel implements IBakedModel { private IBakedModel mana; private IBakedModel natura; private IBakedModel gaia; private boolean cached = false; + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Override + public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + if(!cached) { + cacheModels(); + } - @Override - public IBakedModel handleItemState(ItemStack stack) { - if(!cached) { - cacheModels(); + switch(stack.getItemDamage()) { + case 2: + return gaia; + case 1: + return natura; + case 0: + return mana; + default: + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + } } - - switch(stack.getItemDamage()) { - case 2: - return gaia; - case 1: - return natura; - case 0: - return mana; - default: - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - } - } + }; private void cacheModels() { // Load the OBJ OBJModel model = null; try { model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); - } catch(IOException e) { + } catch(Exception e) { FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); @@ -98,102 +100,47 @@ public class PylonItemModel implements ISmartItemModel { cached = true; } - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return ImmutableList.of(); - } + @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } @Override - public List getGeneralQuads() { - return ImmutableList.of(); - } - - @Override - public boolean isAmbientOcclusion() { - return false; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return null; - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + public ItemOverrideList getOverrides() { + return itemHandler; } // Wrapper to transform the model before rendering it, so it looks right in the inventory private class PerspectiveWrapper implements IPerspectiveAwareModel { - private final IFlexibleBakedModel parent; + private final IBakedModel parent; public PerspectiveWrapper(IBakedModel pylonModel) { - this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); + this.parent = pylonModel; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { switch(cameraTransformType) { - case FIRST_PERSON: - return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); + // todo 1.9 case FIRST_PERSON: + // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); - case THIRD_PERSON: - return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); + // case THIRD_PERSON: + // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); } } - @Override - public VertexFormat getFormat() { - return Attributes.DEFAULT_BAKED_FORMAT; - } - - @Override - public List getFaceQuads(EnumFacing p_177551_1_) { - return parent.getFaceQuads(p_177551_1_); - } - - @Override - public List getGeneralQuads() { - return parent.getGeneralQuads(); - } - - @Override - public boolean isAmbientOcclusion() { - return parent.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() { - return parent.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() { - return parent.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return parent.getParticleTexture(); - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return parent.getItemCameraTransforms(); - } + @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return parent.getQuads(state, face, rand); } + @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return parent.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } + @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index d207fcc40..df5c455ab 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -19,15 +19,18 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; @@ -36,6 +39,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; @@ -145,7 +149,7 @@ public class SpecialFlowerModel implements IModelCustomData { } } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel, ISmartBlockModel, ISmartItemModel { + public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel { private final ImmutableMap transforms; private final ImmutableMap, ModelResourceLocation> blockModels; @@ -217,37 +221,48 @@ public class SpecialFlowerModel implements IModelCustomData { private ImmutableList buildQuads(Optional side) { ImmutableList.Builder builder = ImmutableList.builder(); + for(IBakedModel model : bakedBlockModels.values()) { - if(side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } + builder.addAll(model.getQuads(null, side.orNull(), 0)); } for(IBakedModel model : bakedItemModels.values()) { - if(side.isPresent()) { - builder.addAll(model.getFaceQuads(side.get())); - } else { - builder.addAll(model.getGeneralQuads()); - } + builder.addAll(model.getQuads(null, side.orNull(), 0)); } return builder.build(); } @Override - public List getFaceQuads(EnumFacing side) { + public List getQuads(IBlockState state, EnumFacing face, long rand) { + if(state.getBlock() != ModBlocks.specialFlower) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); refreshBakedModels(); - return quads.get(Optional.of(side)); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); + IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(ret == null) + ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + return ret.getQuads(state, face, rand); } @Override - public List getGeneralQuads() { - refreshBakedModels(); - return quads.get(Optional.absent()); + public ItemOverrideList getOverrides() { + return itemHandler; } + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Override + public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + refreshBakedModels(); + IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + if(item == null) { + item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + } + + return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + } + }; + @Override public boolean isAmbientOcclusion() { refreshBakedModels(); @@ -278,35 +293,9 @@ public class SpecialFlowerModel implements IModelCustomData { } @Override - public IBakedModel handleBlockState(IBlockState state) { - if(state.getBlock() != ModBlocks.specialFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - refreshBakedModels(); - IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; - } - - @Override - public VertexFormat getFormat() { - return vertexFormat; - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); } - - @Override - public IBakedModel handleItemState(ItemStack stack) { - refreshBakedModels(); - IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); - if(item == null) { - item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); - } - - return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; - } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 6597d5401..74ef06b7c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -49,7 +49,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); int hex = color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; 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 036c941de..077a15d1a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -34,11 +35,6 @@ public class BlockDistributor extends BlockMod implements ILexiconable { setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } - @Override - public int getRenderType() { - return 3; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; 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 323e990aa..c3f49a7d4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -25,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.EnumFacing; @@ -100,9 +102,8 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; 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 eddccd1ab..5f82b2be3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,10 +22,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -42,7 +45,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); + + private final Random random = new Random(); public BlockPrism() { super(Material.glass); @@ -51,12 +56,15 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { setLightLevel(1.0F); setUnlocalizedName(LibBlockNames.PRISM); float f = 0.25F; - setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.POWERED, false) .withProperty(BotaniaStateProps.HAS_LENS, false) ); - random = new Random(); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -83,7 +91,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return null; } @@ -98,14 +106,13 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing side, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TilePrism)) return false; TilePrism prism = (TilePrism) tile; ItemStack lens = prism.getItemHandler().getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; if(lens == null && isHeldItemLens) { 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 e7a8a7685..1c1fa7f72 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; 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 233346149..43368594c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import java.util.Random; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -19,8 +20,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,19 +38,22 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { - Random random; + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); + + private final Random random = new Random(); public BlockRuneAltar() { super(Material.rock); - setBlockBounds(0F, 0F, 0F, 1F, 0.75F, 1F); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.RUNE_ALTAR); - BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); + } - random = new Random(); + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override @@ -60,9 +67,8 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) @@ -133,12 +139,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); return altar.signal; } 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 fb879b0ac..bbd0f13f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -10,12 +10,15 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -33,9 +36,10 @@ import vazkii.botania.common.lib.LibObfuscation; 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); - setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); @@ -46,8 +50,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World worldObj, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { - ItemStack stack = player.getCurrentEquippedItem(); + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + + @Override + public boolean onBlockActivated(World worldObj, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { if(stack != null && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -100,12 +108,12 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World par1World, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(pos); int val = (int) ((double) plate.getCurrentMana() / (double) TileTerraPlate.MAX_MANA * 15.0); if(plate.getCurrentMana() > 0) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 5810e4d93..11c98158a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.subtile.functional; import java.util.List; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,7 +41,7 @@ public class SubTileTangleberrie extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); for(EntityLivingBase entity : entities) { - if(entity instanceof EntityPlayer || entity instanceof IBossDisplayData) + if(entity instanceof EntityPlayer || !entity.isNonBoss()) continue; double x2 = entity.posX; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index a28d25aae..34e48f92c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,12 +21,16 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; @@ -48,14 +52,14 @@ public class TileLightRelay extends TileMod implements IWandBindable { int ticksElapsed = 0; public void mountEntity(Entity e) { - if(e.ridingEntity != null || worldObj.isRemote || bindPos.getY() == -1 || !isValidBinding()) + if(e.isRiding() || worldObj.isRemote || bindPos.getY() == -1 || !isValidBinding()) return; EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, bindPos); worldObj.spawnEntityInWorld(mover); e.startRiding(mover); if(!(e instanceof EntityItem)) { - worldObj.playSoundAtEntity(mover, "botania:lightRelay", 0.2F, (float) Math.random() * 0.3F + 0.7F); + mover.playSound(BotaniaSoundEvents.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); if(e instanceof EntityPlayer) ((EntityPlayer) e).addStat(ModAchievements.luminizerRide, 1); } @@ -178,6 +182,8 @@ public class TileLightRelay extends TileMod implements IWandBindable { private static final String TAG_EXIT_X = "exitX"; private static final String TAG_EXIT_Y = "exitY"; private static final String TAG_EXIT_Z = "exitZ"; + private static final DataParameter EXIT_POS = EntityDataManager.createKey(EntityPlayerMover.class, DataSerializers.BLOCK_POS); + public EntityPlayerMover(World world) { super(world); @@ -193,13 +199,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { protected void entityInit() { setSize(0F, 0F); noClip = true; - - dataWatcher.addObject(20, 0); - dataWatcher.addObject(21, 0); - dataWatcher.addObject(22, 0); - dataWatcher.setObjectWatched(20); - dataWatcher.setObjectWatched(21); - dataWatcher.setObjectWatched(22); + dataWatcher.register(EXIT_POS, BlockPos.ORIGIN); } @Override @@ -211,9 +211,9 @@ public class TileLightRelay extends TileMod implements IWandBindable { return; } - boolean isItem = riddenByEntity instanceof EntityItem; + boolean isItem = getRidingEntity() instanceof EntityItem; if(!isItem && ticksExisted % 30 == 0) - worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.05F, (float) Math.random() * 0.3F + 0.7F); + playSound(BotaniaSoundEvents.lightRelay, 0.05F, (float) Math.random() * 0.3F + 0.7F); BlockPos pos = new BlockPos(this); BlockPos exitPos = getExitPos(); @@ -283,17 +283,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getExitPos() { - return new BlockPos( - dataWatcher.getWatchableObjectInt(20), - dataWatcher.getWatchableObjectInt(21), - dataWatcher.getWatchableObjectInt(22) - ); + return dataWatcher.get(EXIT_POS); } public void setExit(BlockPos pos) { - dataWatcher.updateObject(20, pos.getX()); - dataWatcher.updateObject(21, pos.getY()); - dataWatcher.updateObject(22, pos.getZ()); + dataWatcher.set(EXIT_POS, pos); } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2787ae62c..c2b7cc223 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -52,7 +52,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllReleventItems(List list) { + public void displayAllRelevantItems(List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 9814ed898..31d4a778f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -19,6 +19,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; public class CommandOpen extends CommandBase { @@ -37,8 +38,8 @@ public class CommandOpen extends CommandBase { public void execute(MinecraftServer server, ICommandSender sender, String[] args) { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof ItemLexicon) { + ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class); + if(stack != null) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new Style().setColor(TextFormatting.RED))); diff --git a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java index b5b1315d9..4675c1958 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java @@ -12,12 +12,12 @@ package vazkii.botania.common.core.handler; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; import vazkii.botania.common.item.ModItems; public final class ChestGenHandler { public static void init() { + /* todo loot tables String c = ChestGenHooks.BONUS_CHEST; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.lexicon), 1, 1, 7)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 1)); @@ -48,7 +48,7 @@ public final class ChestGenHandler { ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); c = ChestGenHooks.VILLAGE_BLACKSMITH; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); + ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6));*/ } } 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 770ae47d9..d317622a6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -2,12 +2,14 @@ package vazkii.botania.common.core.handler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.IPixieSpawner; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; @@ -21,7 +23,7 @@ public class PixieHandler { public void onDamageTaken(LivingHurtEvent event) { if(!event.entityLiving.worldObj.isRemote && event.entityLiving instanceof EntityPlayer && event.source.getEntity() != null && event.source.getEntity() instanceof EntityLivingBase) { EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack stack = player.getCurrentEquippedItem(); + ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); float chance = getChance(stack); for (ItemStack element : player.inventory.armorInventory) @@ -36,11 +38,11 @@ public class PixieHandler { pixie.setPosition(player.posX, player.posY + 2, player.posZ); if(((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { - int[] potions = new int[] { - Potion.blindness.id, - Potion.wither.id, - Potion.moveSlowdown.id, - Potion.weakness.id + Potion[] potions = { + MobEffects.blindness, + MobEffects.wither, + MobEffects.moveSlowdown, + MobEffects.weakness }; pixie.setApplyPotionEffect(new PotionEffect(potions[event.entity.worldObj.rand.nextInt(potions.length)], 40, 0)); } @@ -58,12 +60,7 @@ public class PixieHandler { float getChance(ItemStack stack) { if(stack == null) return 0F; - - Item item = stack.getItem(); - if(item instanceof IPixieSpawner) - return ((IPixieSpawner) item).getPixieChance(stack); - - return 0F; + else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); } } diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 7fd86921d..2e1f6e7fb 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -13,6 +13,7 @@ package vazkii.botania.common.core.helper; import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; +import java.util.Objects; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; @@ -71,7 +72,7 @@ public class Vector3 } public static Vector3 fromEntityCenter(Entity e) { - return new Vector3(e.posX, e.posY - /*e.yOffset todo 1.8 */ 0 + e.height / 2, e.posZ); + return new Vector3(e.posX, e.posY - e.getYOffset() + e.height / 2, e.posZ); } public static Vector3 fromTileEntity(TileEntity e) { @@ -253,12 +254,10 @@ public class Vector3 return x == 0 ? y == 0 || z == 0 : y == 0 && z == 0; } - @SideOnly(Side.CLIENT) public Vector3f vector3f() { return new Vector3f((float)x, (float)y, (float)z); } - @SideOnly(Side.CLIENT) public Vector4f vector4f() { return new Vector4f((float)x, (float)y, (float)z, 1); } @@ -305,4 +304,9 @@ public class Vector3 Vector3 v = (Vector3)o; return x == v.x && y == v.y && z == v.z; } + + @Override + public int hashCode() { + return Objects.hash(x, y, z); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f083cd983..8972fac73 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -256,7 +256,7 @@ public class CommonProxy { public void setExtraReach(EntityLivingBase entity, float reach) { if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).theItemInWorldManager.getBlockReachDistance() + reach)); + ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); } public boolean openWikiPage(World world, Block block, RayTraceResult pos) { @@ -276,7 +276,7 @@ public class CommonProxy { } public long getWorldElapsedTicks() { - return MinecraftServer.getServer().worldServers[0].getTotalWorldTime(); + return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); } public void setSparkleFXNoClip(boolean noclip) { diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 4bd9d7884..265c4a6aa 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -36,7 +37,7 @@ public final class VersionChecker { public void init() { new ThreadVersionChecker(); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index bca62ff86..fcb16afbb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -13,13 +13,19 @@ package vazkii.botania.common.entity; import java.util.ArrayList; import java.util.List; +import com.google.common.base.Optional; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -38,12 +44,18 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final String TAG_NETWORK = "network"; private static final String TAG_INVIS = "invis"; - ICorporeaSpark master; - List connections = new ArrayList<>(); - List connectionsClient = new ArrayList<>(); - List relatives = new ArrayList<>(); - boolean firstUpdateClient = true; - boolean firstUpdateServer = true; + private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); + private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + private static final DataParameter> DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); + + private ICorporeaSpark master; + private List connections = new ArrayList<>(); + private List connectionsClient = new ArrayList<>(); + private List relatives = new ArrayList<>(); + private boolean firstUpdateClient = true; + private boolean firstUpdateServer = true; public EntityCorporeaSpark(World world) { super(world); @@ -53,17 +65,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.addObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, 0); - dataWatcher.addObject(28, 0); - dataWatcher.addObject(29, 0); - dataWatcher.addObject(30, 0); - dataWatcher.addObject(31, new ItemStack(Blocks.stone, 0, 0)); - - dataWatcher.setObjectWatched(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.setObjectWatched(28); - dataWatcher.setObjectWatched(29); - dataWatcher.setObjectWatched(30); - dataWatcher.setObjectWatched(31); + dataWatcher.register(INVISIBILITY, 0); + dataWatcher.register(MASTER, false); + dataWatcher.register(NETWORK, 0); + dataWatcher.register(ITEM_DISPLAY_TICKS, 0); + dataWatcher.register(DISPLAY_STACK, Optional.absent()); } @Override @@ -222,42 +228,41 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public void setMaster(boolean master) { - dataWatcher.updateObject(28, master ? 1 : 0); + dataWatcher.set(MASTER, master); } @Override public boolean isMaster() { - return dataWatcher.getWatchableObjectInt(28) == 1; + return dataWatcher.get(MASTER); } public void setNetwork(EnumDyeColor network) { - dataWatcher.updateObject(29, network.getMetadata()); + dataWatcher.set(NETWORK, network.getMetadata()); } @Override public EnumDyeColor getNetwork() { - return EnumDyeColor.byMetadata(dataWatcher.getWatchableObjectInt(29)); + return EnumDyeColor.byMetadata(dataWatcher.get(NETWORK)); } public int getItemDisplayTicks() { - return dataWatcher.getWatchableObjectInt(30); + return dataWatcher.get(ITEM_DISPLAY_TICKS); } public void setItemDisplayTicks(int ticks) { - dataWatcher.updateObject(30, ticks); + dataWatcher.set(ITEM_DISPLAY_TICKS, ticks); } - public ItemStack getDisplayedItem() { - return dataWatcher.getWatchableObjectItemStack(31); + public Optional getDisplayedItem() { + return dataWatcher.get(DISPLAY_STACK); } public void setDisplayedItem(ItemStack stack) { - dataWatcher.updateObject(31, stack); + dataWatcher.set(DISPLAY_STACK, Optional.fromNullable(stack)); } @Override - public boolean interactFirst(EntityPlayer player) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { if(stack != null) { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { @@ -265,7 +270,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(isMaster()) restartNetwork(); if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } else { displayRelatives(new ArrayList<>(), master); @@ -282,7 +287,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { stack.stackSize--; if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); } } } @@ -292,8 +297,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); + int invis = dataWatcher.get(INVISIBILITY); + dataWatcher.set(INVISIBILITY, ~invis & 1); return true; } @@ -304,14 +309,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { protected void readEntityFromNBT(NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); - dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); + dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); - cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY)); + cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 00b329bfe..c7b74eddd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -13,6 +13,7 @@ package vazkii.botania.common.entity; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -75,9 +76,9 @@ public class EntityFallingStar extends EntityThrowableCopy { } if (pos.getBlockPos() != null) { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.getBlockPos())) - worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(worldObj.getBlockState(pos.getBlockPos()))); + IBlockState state = worldObj.getBlockState(pos.getBlockPos()); + if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, worldObj, pos.getBlockPos())) + worldObj.playAuxSFX(2001, pos.getBlockPos(), Block.getStateId(state)); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 0fe541d27..2ee61d8cf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -13,6 +13,9 @@ package vazkii.botania.common.entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -20,9 +23,11 @@ import vazkii.botania.common.Botania; public class EntityPixie extends EntityFlyingCreature { - EntityLivingBase summoner = null; - float damage = 0; - PotionEffect effect = null; + private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); + + private EntityLivingBase summoner = null; + private float damage = 0; + private PotionEffect effect = null; public EntityPixie(World world) { super(world); @@ -32,21 +37,21 @@ public class EntityPixie extends EntityFlyingCreature { @Override protected void entityInit() { super.entityInit(); - dataWatcher.addObject(20, 0); + dataWatcher.register(TYPE, 0); } @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); - getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(2.0); + getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2.0); } public void setType(int type) { - dataWatcher.updateObject(20, type); + dataWatcher.set(TYPE, type); } public int getType() { - return dataWatcher.getWatchableObjectInt(20); + return dataWatcher.get(TYPE); } public void setProps(EntityLivingBase target, EntityLivingBase summoner, int type, float damage) { diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index f82c867d0..5326e95d0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -11,25 +11,28 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; + private static final DataParameter COLOR = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); public EntitySignalFlare(World par1World) { super(par1World); setSize(0F, 0F); - dataWatcher.addObject(30, 0); - dataWatcher.setObjectWatched(30); } @Override protected void entityInit() { - // NO-OP + dataWatcher.register(COLOR, 0); } @Override @@ -40,7 +43,7 @@ public class EntitySignalFlare extends Entity { if(!isDead) { if(ticksExisted % 10 == 0) - playSound("creeper.primed", 1F, 1F); + playSound(SoundEvents.entity_creeper_primed, 1F, 1F); int color = getColor(); if(color < 16 && color >= 0) { @@ -71,11 +74,11 @@ public class EntitySignalFlare extends Entity { } public void setColor(int color) { - dataWatcher.updateObject(30, color); + dataWatcher.set(COLOR, color); } public int getColor() { - return dataWatcher.getWatchableObjectInt(30); + return dataWatcher.get(COLOR); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 3cf3d49be..a14e79347 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -25,7 +25,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -45,7 +49,8 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; private static final String TAG_UPGRADE = "upgrade"; private static final String TAG_INVIS = "invis"; - public static final int INVISIBILITY_DATA_WATCHER_KEY = 27; + private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); + private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -60,10 +65,8 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.addObject(INVISIBILITY_DATA_WATCHER_KEY, 0); - dataWatcher.addObject(28, 0); - dataWatcher.setObjectWatched(INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.setObjectWatched(28); + dataWatcher.register(INVISIBILITY, 0); + dataWatcher.register(UPGRADE, 0); } @Override @@ -250,8 +253,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - public boolean interactFirst(EntityPlayer player) { - ItemStack stack = player.getCurrentEquippedItem(); + public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { if(stack != null) { SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { @@ -265,7 +267,7 @@ public class EntitySpark extends Entity implements ISparkEntity { removeTransferants = 2; } else setDead(); if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } else { List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); @@ -278,7 +280,7 @@ public class EntitySpark extends Entity implements ISparkEntity { setUpgrade(SparkUpgradeType.values()[newUpgrade]); stack.stackSize--; if(player.worldObj.isRemote) - player.swingItem(); + player.swingArm(hand); return true; } } @@ -288,8 +290,8 @@ public class EntitySpark extends Entity implements ISparkEntity { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY); - dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); + int invis = dataWatcher.get(INVISIBILITY); + dataWatcher.set(INVISIBILITY, ~invis & 1); return true; } @@ -299,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); - dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, cmp.getInteger(TAG_INVIS)); + dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.setInteger(TAG_INVIS, dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY)); + cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); } @Override @@ -367,12 +369,12 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public SparkUpgradeType getUpgrade() { - return SparkUpgradeType.values()[dataWatcher.getWatchableObjectInt(28)]; + return SparkUpgradeType.values()[dataWatcher.get(UPGRADE)]; } @Override public void setUpgrade(SparkUpgradeType upgrade) { - dataWatcher.updateObject(28, upgrade.ordinal()); + dataWatcher.set(UPGRADE, upgrade.ordinal()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 15de9239a..02009115f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; @@ -61,7 +62,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + 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(); BlockPos boundTile = getBoundTile(par1ItemStack); @@ -82,7 +83,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } else if(par2EntityPlayer.isSneaking()) { block.rotateBlock(par3World, pos, side); if(par3World.isRemote) - par2EntityPlayer.swingItem(); + par2EntityPlayer.swingArm(hand); } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { @@ -95,7 +96,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null && !par3World.isRemote) { par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 0.6F); + par3World.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -121,14 +122,14 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { else setBoundTile(par1ItemStack, pos); if(par3World.isRemote) - par2EntityPlayer.swingItem(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 0.1F, 1F); + par2EntityPlayer.swingArm(hand); + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); wanded = true; } else { wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, pos, side); if(wanded && par3World.isRemote) - par2EntityPlayer.swingItem(); + par2EntityPlayer.swingArm(hand); } return wanded; @@ -140,7 +141,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { BlockPistonRelay.mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); + par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); } return false; @@ -180,13 +181,13 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && player.isSneaking()) { setBindMode(stack, !getBindMode(stack)); - world.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); } - return stack; + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 20a8cf819..43b9938c2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -2,6 +2,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import java.util.List; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; @@ -18,7 +19,7 @@ import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { - public ItemElementiumArmor(int type, String name) { + public ItemElementiumArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.elementiumArmorMaterial); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index a0d7cdd3a..325b6989e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -36,7 +36,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou } @Override - public boolean shouldGiveProficiency(ItemStack stack, int slot, EntityPlayer player) { + public boolean shouldGiveProficiency(ItemStack stack, EntityEquipmentSlot slot, EntityPlayer player) { return hasArmorSet(player); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index ce39c4c58..f0c0c2394 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -52,14 +52,14 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); return multimap; } 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 971716bf2..1c0564804 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 @@ -36,6 +36,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -46,6 +47,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -175,7 +177,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(!wasSprting && isSprinting && cooldown == 0) { p.motionX += look.x; p.motionZ += look.z; - p.worldObj.playSoundAtEntity(p, "botania:dash", 1F, 1F); + p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) @@ -312,7 +314,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(armor != null && armor.getItem() == this) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); - return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItem(ModItems.flugelEye)) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); + return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); } return false; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 6e2a4f20e..93ddca992 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -102,7 +102,7 @@ public class ItemOdinRing extends ItemRelicBauble { void fillModifiers(Multimap attributes, ItemStack stack) { - attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 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 2c83192b9..89ade3110 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -78,7 +78,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(par2EntityPlayer.isSneaking()) { TileEntity tile = par3World.getTileEntity(pos); if(tile == null) { - if(BlockCamo.isValidBlock(wstate.getBlock())) { + if(BlockCamo.isValidBlock(wstate)) { Item item = Item.getItemFromBlock(wstate.getBlock()); boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); 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 51405019e..90ade66e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -89,7 +89,7 @@ public class PageEntity extends LexiconPage{ GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; - Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + Minecraft.getMinecraft().getRenderManager().doRenderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false); GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); GlStateManager.disableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 119d0f683..ec96d14f6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -35,6 +35,7 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.PlayerHelper; public class PageRecipe extends LexiconPage { @@ -160,9 +161,9 @@ public class PageRecipe extends LexiconPage { tooltipStack = stack; EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack); - ItemStack book = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); + ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, ILexicon.class); - if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && book.getItem() instanceof ILexicon && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { + if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { tooltipEntry = true; if(!mouseDownLastTick && mouseDown && GuiScreen.isShiftKeyDown()) { From d37518c9f4cf7bb71fba7e4dc5878bc98cc740a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 19 Mar 2016 15:58:12 -0500 Subject: [PATCH 455/935] Compiles. Update JEI. --- build.gradle | 2 +- .../java/buildcraft/api/core/StackKey.java | 5 +- .../vazkii/botania/api/boss/IBotaniaBoss.java | 9 +- .../multiblock/component/AnyComponent.java | 5 +- .../botania/api/wiki/SimpleWikiProvider.java | 10 +- .../core/handler/BaubleRenderHandler.java | 8 +- .../client/core/handler/BossBarHandler.java | 4 +- .../client/core/proxy/ClientProxy.java | 18 ++- .../vazkii/botania/client/fx/FXSparkle.java | 4 +- .../integration/jei/JEIBotaniaPlugin.java | 19 +-- .../jei/brewery/BreweryRecipeWrapper.java | 4 - .../elventrade/ElvenTradeRecipeWrapper.java | 4 - .../jei/manapool/ManaPoolRecipeWrapper.java | 4 - .../PetalApothecaryRecipeWrapper.java | 4 - .../jei/puredaisy/PureDaisyRecipeWrapper.java | 4 - .../runicaltar/RunicAltarRecipeWrapper.java | 4 - .../model/armor/ModelArmorElementium.java | 75 +++++++---- .../model/armor/ModelArmorManasteel.java | 75 +++++++---- .../model/armor/ModelArmorManaweave.java | 75 +++++++---- .../model/armor/ModelArmorTerrasteel.java | 75 +++++++---- .../render/entity/RenderCorporeaSpark.java | 5 + .../render/entity/RenderPinkWither.java | 4 +- .../client/render/entity/RenderSpark.java | 5 + .../client/render/entity/RenderSparkBase.java | 16 ++- .../render/tile/RenderTileFloatingFlower.java | 5 +- .../botania/common/block/BlockAvatar.java | 18 ++- .../common/block/BlockIncensePlate.java | 21 ++-- .../common/block/BlockLightLauncher.java | 2 +- .../common/block/BlockModDoubleFlower.java | 8 +- .../botania/common/block/BlockSolidVines.java | 15 ++- .../common/block/mana/BlockForestDrum.java | 16 ++- .../common/block/mana/BlockManaDetector.java | 11 +- .../common/block/mana/BlockManaVoid.java | 4 +- .../botania/common/block/mana/BlockPool.java | 26 ++-- .../botania/common/block/mana/BlockPump.java | 25 ++-- .../common/block/mana/BlockSpawnerClaw.java | 11 +- .../common/block/mana/BlockTurntable.java | 1 + .../common/block/subtile/SubTileManastar.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 4 +- .../generating/SubTileHydroangeas.java | 2 +- .../common/block/tile/TileSparkChanger.java | 2 +- .../tile/corporea/TileCorporeaFunnel.java | 2 +- .../corporea/TileCorporeaInterceptor.java | 4 +- .../block/tile/mana/TileDistributor.java | 2 +- .../common/block/tile/mana/TilePool.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 4 +- .../common/core/helper/PlayerHelper.java | 57 +++++++++ .../common/entity/EntityCorporeaSpark.java | 2 +- .../common/entity/EntityDoppleganger.java | 11 ++ .../common/entity/EntityFlyingCreature.java | 3 +- .../common/entity/EntityMagicMissile.java | 17 ++- .../common/entity/EntityPoolMinecart.java | 2 +- .../botania/common/entity/EntitySpark.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 15 +-- .../botania/common/item/ItemLexicon.java | 21 ++-- .../botania/common/item/ItemManaGun.java | 9 +- .../botania/common/item/ItemRegenIvy.java | 3 +- .../botania/common/item/ItemSignalFlare.java | 3 +- .../botania/common/item/ItemSlingshot.java | 11 +- .../botania/common/item/ItemTwigWand.java | 7 +- .../armor/elementium/ItemElementiumArmor.java | 10 +- .../armor/elementium/ItemElementiumBoots.java | 3 +- .../armor/elementium/ItemElementiumChest.java | 3 +- .../armor/elementium/ItemElementiumHelm.java | 3 +- .../armor/elementium/ItemElementiumLegs.java | 3 +- .../armor/manasteel/ItemManasteelArmor.java | 25 ++-- .../armor/manaweave/ItemManaweaveArmor.java | 10 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 10 +- .../equipment/bauble/ItemBaubleCosmetic.java | 8 +- .../item/equipment/bauble/ItemItemFinder.java | 29 +++-- .../equipment/tool/bow/ItemCrystalBow.java | 43 ++----- .../equipment/tool/bow/ItemLivingwoodBow.java | 119 ++++++++---------- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/elementium/ItemElementiumShovel.java | 7 +- .../tool/terrasteel/ItemTerraPick.java | 5 +- .../ItemElementiumHelmRevealing.java | 3 +- .../ItemManasteelHelmRevealing.java | 3 +- .../ItemTerrasteelHelmRevealing.java | 3 +- .../item/material/ItemManaResource.java | 4 +- .../common/item/relic/ItemKingKey.java | 33 ++--- .../common/item/relic/ItemLokiRing.java | 14 ++- .../common/item/rod/ItemTerraformRod.java | 2 +- .../vazkii/botania/common/lib/LibMisc.java | 6 +- .../botania/common/lib/LibObfuscation.java | 3 + .../common/world/SkyblockWorldEvents.java | 4 +- 85 files changed, 660 insertions(+), 483 deletions(-) diff --git a/build.gradle b/build.gradle index 70d69630a..b3cfa995a 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { //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.8.9:2.25.7.145" + deobfCompile "mezz.jei:jei_1.9:3.0.2.164" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 13a8e8989..97ee4b8b4 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -9,6 +9,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; /** This class is used whenever stacks needs to be stored as keys. */ @@ -80,7 +81,7 @@ public final class StackKey { } } if (fluidStack != null) { - if (fluidStack.getFluid().getID() != k.fluidStack.getFluid().getID() || fluidStack.amount != k.fluidStack.amount || !objectsEqual( + if (fluidStack.getFluid() != k.fluidStack.getFluid() || fluidStack.amount != k.fluidStack.amount || !objectsEqual( fluidStack.tag, k.fluidStack.tag)) { return false; } @@ -98,7 +99,7 @@ public final class StackKey { } result = 31 * result + 7; if (fluidStack != null) { - result = 31 * result + fluidStack.getFluid().getID(); + result = 31 * result + FluidRegistry.getFluidID(fluidStack.getFluid()); result = 31 * result + fluidStack.amount; result = 31 * result + objectHashCode(fluidStack.tag); } diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 8f4ec621f..dd6d0ddd3 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -13,8 +13,9 @@ package vazkii.botania.api.boss; import java.awt.Rectangle; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.boss.IBossDisplayData; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * Alternatively, you can check if botania is loaded and use the vanilla one * if that's not the case. */ -public interface IBotaniaBoss extends IBossDisplayData { +public interface IBotaniaBoss { /** * The ResourceLocation to bind for this boss's boss bar. @@ -56,4 +57,8 @@ public interface IBotaniaBoss extends IBossDisplayData { */ @SideOnly(Side.CLIENT) public void bossBarRenderCallback(ScaledResolution res, int x, int y); + + public BossInfo getBossInfo(); + + public EntityLivingBase getEntity(); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 4a7896655..99ef62906 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.lexicon.multiblock.component; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -26,8 +25,8 @@ public class AnyComponent extends MultiblockComponent { @Override public boolean matches(World world, BlockPos pos) { - Block block = world.getBlockState(pos).getBlock(); - return !block.isAir(world, pos) && block.getCollisionBoundingBox(world, pos, world.getBlockState(pos)) != null; + IBlockState state = world.getBlockState(pos); + return !state.getBlock().isAir(state, world, pos) && state.getCollisionBoundingBox(world, pos) != null; } } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index b32d11258..f57a6858a 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -49,15 +50,12 @@ public class SimpleWikiProvider implements IWikiProvider { @Override public String getBlockName(World world, RayTraceResult pos, EntityPlayer player) { BlockPos bPos = pos.getBlockPos(); + IBlockState state = world.getBlockState(bPos); - Block block = world.getBlockState(bPos).getBlock(); - if(block == null) - return null; - - ItemStack stack = block.getPickBlock(pos, world, bPos, player); + ItemStack stack = state.getBlock().getPickBlock(state, pos, world, bPos, player); if(stack == null || stack.getItem() == null) - stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); + stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state)); if(stack.getItem() == null) return null; 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 cf181ad70..429411b66 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -17,6 +17,8 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -37,7 +39,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(Potion.invisibility) != null) + if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.invisibility) != null) return; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); @@ -108,7 +110,7 @@ public final class BaubleRenderHandler implements LayerRenderer { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(player); - boolean armor = player.getCurrentArmor(1) != null; + boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null; GlStateManager.rotate(90, 0, 1, 0); GlStateManager.rotate(90, 1, 0, 0); @@ -124,7 +126,7 @@ public final class BaubleRenderHandler implements LayerRenderer { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 GlStateManager.popMatrix(); if(renderedOne) diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 533d162f5..1f8ce4b2c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -48,13 +48,13 @@ public final class BossBarHandler { Minecraft mc = Minecraft.getMinecraft(); Rectangle bgRect = currentBoss.getBossBarTextureRect(); Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); - String name = currentBoss.getDisplayName().getFormattedText(); + String name = currentBoss.getEntity().getDisplayName().getFormattedText(); int c = res.getScaledWidth() / 2; int x = c - bgRect.width / 2; int y = 20; int xf = x + (bgRect.width - fgRect.width) / 2; int yf = y + (bgRect.height - fgRect.height) / 2; - int fw = (int) ((double) fgRect.width * (currentBoss.getHealth() / currentBoss.getMaxHealth())); + int fw = (int) ((double) fgRect.width * (currentBoss.getEntity().getHealth() / currentBoss.getEntity().getMaxHealth())); int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; GlStateManager.color(1F, 1F, 1F, 1F); 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 f481e62e7..7be9d04f6 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -13,6 +13,8 @@ package vazkii.botania.client.core.proxy; import java.awt.Desktop; import java.io.File; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.URI; import java.time.LocalDateTime; import java.time.Month; @@ -276,13 +278,17 @@ public class ClientProxy extends CommonProxy { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); RenderPlayer render; - render = skinMap.get("default"); - render.addLayer(new ContributorFancinessHandler()); - render.addLayer(new BaubleRenderHandler()); + try { // todo 1.9 get Forge to AT this back -.- + Method m = ReflectionHelper.findMethod(RenderPlayer.class, null, LibObfuscation.ADD_LAYER); - render = skinMap.get("slim"); - render.addLayer(new ContributorFancinessHandler()); - render.addLayer(new BaubleRenderHandler()); + render = skinMap.get("default"); + m.invoke(render, new ContributorFancinessHandler()); + m.invoke(render, new BaubleRenderHandler()); + + render = skinMap.get("slim"); + m.invoke(render, new ContributorFancinessHandler()); + m.invoke(render, new BaubleRenderHandler()); + } catch (ReflectiveOperationException ignored) {} } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index d546fb2f6..066af2248 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -153,10 +153,10 @@ public class FXSparkle extends EntityFX { ySpeed *= 0.908000001907348633D; zSpeed *= 0.908000001907348633D; - if (onGround) { + /*if (onGround) { todo 1.9 xSpeed *= 0.69999998807907104D; zSpeed *= 0.69999998807907104D; - } + }*/ } if(fake && particleAge > 1) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 54cbdd871..b8445120f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -13,7 +13,6 @@ import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; -import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; @@ -34,17 +33,10 @@ public class JEIBotaniaPlugin implements IModPlugin { private IJeiHelpers jeiHelpers; - @Override - public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { - this.jeiHelpers = jeiHelpers; - } - - @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) { - } - @Override public void register(IModRegistry registry) { + jeiHelpers = registry.getJeiHelpers(); + registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), @@ -72,11 +64,6 @@ public class JEIBotaniaPlugin implements IModPlugin { } @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { - } - - @Override - public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { - } + public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {} } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 456510d80..91fa03c3c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -63,10 +63,6 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { return ImmutableList.of(); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index b61fe5abd..913fc69a6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -60,10 +60,6 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { return ImmutableList.of(); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index 8f1dc2c86..63c33004d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -70,10 +70,6 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { return ImmutableList.of(); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index c2e508e4b..2f54919a7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -59,10 +59,6 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { return ImmutableList.of(); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 8e1c869f9..e69084467 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -69,10 +69,6 @@ public class PureDaisyRecipeWrapper implements IRecipeWrapper { return fluidOutputs; } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index e1ad0c9e1..5bc608dab 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -65,10 +65,6 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { return ImmutableList.of(); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 6719ea833..20f00a5a0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -15,8 +15,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHandSide; public class ModelArmorElementium extends ModelBiped { @@ -51,9 +53,9 @@ public class ModelArmorElementium extends ModelBiped { public ModelRenderer wing1_3; public ModelRenderer wing2_3; - int slot; + private final EntityEquipmentSlot slot; - public ModelArmorElementium(int slot) { + public ModelArmorElementium(EntityEquipmentSlot slot) { this.slot = slot; textureWidth = 64; @@ -211,21 +213,21 @@ public class ModelArmorElementium extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 3; // 1.8: now reversed. Yay mojang. - body.showModel = slot == 2; - armR.showModel = slot == 2; - armL.showModel = slot == 2; - legR.showModel = slot == 1; - legL.showModel = slot == 1; - bootL.showModel = slot == 0; - bootR.showModel = slot == 0; + helm.showModel = slot == EntityEquipmentSlot.HEAD; + body.showModel = slot == EntityEquipmentSlot.CHEST; + armR.showModel = slot == EntityEquipmentSlot.CHEST; + armL.showModel = slot == EntityEquipmentSlot.CHEST; + legR.showModel = slot == EntityEquipmentSlot.LEGS; + legL.showModel = slot == EntityEquipmentSlot.LEGS; + bootL.showModel = slot == EntityEquipmentSlot.FEET; + bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 1) { + if(slot == EntityEquipmentSlot.LEGS) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -239,23 +241,46 @@ public class ModelArmorElementium extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null ? living.isSneaking() : false; - isChild = living != null ? living.isChild() : false; - if(living != null && living instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) living; + isSneak = living != null && living.isSneaking(); + isChild = living != null && living.isChild(); + if(living != null) { + ModelBiped.ArmPose mainPose = ArmPose.EMPTY; + ModelBiped.ArmPose offPose = ArmPose.EMPTY; - ItemStack itemstack = player.inventory.getCurrentItem(); - heldItemRight = itemstack != null ? 1 : 0; + // Copy from RenderPlayer.setModelVisibilities + if(living.getHeldItemMainhand() != null) { + mainPose = ArmPose.ITEM; + if (living.getItemInUseCount() > 0) { + EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - aimedBow = false; - if (itemstack != null && player.getItemInUseCount() > 0) { - EnumAction enumaction = itemstack.getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) - heldItemRight = 3; - else if (enumaction == EnumAction.BOW) - aimedBow = true; + if (enumaction == EnumAction.BLOCK) { + mainPose = ModelBiped.ArmPose.BLOCK; + } else if (enumaction == EnumAction.BOW) { + mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; + } + } } + + if (living.getHeldItemOffhand() != null) { + offPose = ModelBiped.ArmPose.ITEM; + + if (living.getItemInUseCount() > 0) { + EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); + + if (enumaction1 == EnumAction.BLOCK) { + offPose = ModelBiped.ArmPose.BLOCK; + } + } + } + + if(living.getPrimaryHand() == EnumHandSide.RIGHT) { + rightArmPose = mainPose; + leftArmPose = offPose; + } else { + rightArmPose = offPose; + leftArmPose = mainPose; + } + // End copy RenderPlayer.setModelVisibilities } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index a914e7d16..2df491c96 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -15,8 +15,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHandSide; public class ModelArmorManasteel extends ModelBiped { @@ -41,9 +43,9 @@ public class ModelArmorManasteel extends ModelBiped { public ModelRenderer legR; public ModelRenderer legL; - int slot; + private final EntityEquipmentSlot slot; - public ModelArmorManasteel(int slot) { + public ModelArmorManasteel(EntityEquipmentSlot slot) { this.slot = slot; textureWidth = 64; @@ -141,21 +143,21 @@ public class ModelArmorManasteel extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. - body.showModel = slot == 2; - armR.showModel = slot == 2; - armL.showModel = slot == 2; - legR.showModel = slot == 1; - legL.showModel = slot == 1; - bootL.showModel = slot == 0; - bootR.showModel = slot == 0; + helm.showModel = slot == EntityEquipmentSlot.HEAD; + body.showModel = slot == EntityEquipmentSlot.CHEST; + armR.showModel = slot == EntityEquipmentSlot.CHEST; + armL.showModel = slot == EntityEquipmentSlot.CHEST; + legR.showModel = slot == EntityEquipmentSlot.LEGS; + legL.showModel = slot == EntityEquipmentSlot.LEGS; + bootL.showModel = slot == EntityEquipmentSlot.FEET; + bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 1) { + if(slot == EntityEquipmentSlot.LEGS) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -169,23 +171,46 @@ public class ModelArmorManasteel extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null ? living.isSneaking() : false; - isChild = living != null ? living.isChild() : false; - if(living != null && living instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) living; + isSneak = living != null && living.isSneaking(); + isChild = living != null && living.isChild(); + if(living != null) { + ModelBiped.ArmPose mainPose = ArmPose.EMPTY; + ModelBiped.ArmPose offPose = ArmPose.EMPTY; - ItemStack itemstack = player.inventory.getCurrentItem(); - heldItemRight = itemstack != null ? 1 : 0; + // Copy from RenderPlayer.setModelVisibilities + if(living.getHeldItemMainhand() != null) { + mainPose = ArmPose.ITEM; + if (living.getItemInUseCount() > 0) { + EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - aimedBow = false; - if (itemstack != null && player.getItemInUseCount() > 0) { - EnumAction enumaction = itemstack.getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) - heldItemRight = 3; - else if(enumaction == EnumAction.BOW) - aimedBow = true; + if (enumaction == EnumAction.BLOCK) { + mainPose = ModelBiped.ArmPose.BLOCK; + } else if (enumaction == EnumAction.BOW) { + mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; + } + } } + + if (living.getHeldItemOffhand() != null) { + offPose = ModelBiped.ArmPose.ITEM; + + if (living.getItemInUseCount() > 0) { + EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); + + if (enumaction1 == EnumAction.BLOCK) { + offPose = ModelBiped.ArmPose.BLOCK; + } + } + } + + if(living.getPrimaryHand() == EnumHandSide.RIGHT) { + rightArmPose = mainPose; + leftArmPose = offPose; + } else { + rightArmPose = offPose; + leftArmPose = mainPose; + } + // End copy RenderPlayer.setModelVisibilities } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index d9dd63093..05b314fb9 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -15,8 +15,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHandSide; public class ModelArmorManaweave extends ModelBiped { @@ -41,9 +43,9 @@ public class ModelArmorManaweave extends ModelBiped { public ModelRenderer skirtR; public ModelRenderer skirtL; - int slot; + private final EntityEquipmentSlot slot; - public ModelArmorManaweave(int slot) { + public ModelArmorManaweave(EntityEquipmentSlot slot) { this.slot = slot; textureWidth = 64; @@ -141,21 +143,21 @@ public class ModelArmorManaweave extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. - body.showModel = slot == 2; - armR.showModel = slot == 2; - armL.showModel = slot == 2; - legR.showModel = slot == 1; - legL.showModel = slot == 1; - bootL.showModel = slot == 0; - bootR.showModel = slot == 0; + helm.showModel = slot == EntityEquipmentSlot.HEAD; + body.showModel = slot == EntityEquipmentSlot.CHEST; + armR.showModel = slot == EntityEquipmentSlot.CHEST; + armL.showModel = slot == EntityEquipmentSlot.CHEST; + legR.showModel = slot == EntityEquipmentSlot.LEGS; + legL.showModel = slot == EntityEquipmentSlot.LEGS; + bootL.showModel = slot == EntityEquipmentSlot.FEET; + bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armR; bipedLeftArm = armL; - if(slot == 1) { + if(slot == EntityEquipmentSlot.LEGS) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -169,23 +171,46 @@ public class ModelArmorManaweave extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null ? living.isSneaking() : false; - isChild = living != null ? living.isChild() : false; - if(living != null && living instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) living; + isSneak = living != null && living.isSneaking(); + isChild = living != null && living.isChild(); + if(living != null) { + ModelBiped.ArmPose mainPose = ArmPose.EMPTY; + ModelBiped.ArmPose offPose = ArmPose.EMPTY; - ItemStack itemstack = player.inventory.getCurrentItem(); - heldItemRight = itemstack != null ? 1 : 0; + // Copy from RenderPlayer.setModelVisibilities + if(living.getHeldItemMainhand() != null) { + mainPose = ArmPose.ITEM; + if (living.getItemInUseCount() > 0) { + EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - aimedBow = false; - if (itemstack != null && player.getItemInUseCount() > 0) { - EnumAction enumaction = itemstack.getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) - heldItemRight = 3; - else if (enumaction == EnumAction.BOW) - aimedBow = true; + if (enumaction == EnumAction.BLOCK) { + mainPose = ModelBiped.ArmPose.BLOCK; + } else if (enumaction == EnumAction.BOW) { + mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; + } + } } + + if (living.getHeldItemOffhand() != null) { + offPose = ModelBiped.ArmPose.ITEM; + + if (living.getItemInUseCount() > 0) { + EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); + + if (enumaction1 == EnumAction.BLOCK) { + offPose = ModelBiped.ArmPose.BLOCK; + } + } + } + + if(living.getPrimaryHand() == EnumHandSide.RIGHT) { + rightArmPose = mainPose; + leftArmPose = offPose; + } else { + rightArmPose = offPose; + leftArmPose = mainPose; + } + // End copy RenderPlayer.setModelVisibilities } } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index fe10a5622..976802f26 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -15,8 +15,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHandSide; public class ModelArmorTerrasteel extends ModelBiped { @@ -54,9 +56,9 @@ public class ModelArmorTerrasteel extends ModelBiped { public ModelRenderer bootL2; public ModelRenderer bootLbranch; - int slot; + private final EntityEquipmentSlot slot; - public ModelArmorTerrasteel(int slot) { + public ModelArmorTerrasteel(EntityEquipmentSlot slot) { this.slot = slot; textureWidth = 64; @@ -232,21 +234,21 @@ public class ModelArmorTerrasteel extends ModelBiped { @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - helm.showModel = slot == 3; // 1.8: now reversed. yay mojang. - body.showModel = slot == 2; - armr.showModel = slot == 2; - armL.showModel = slot == 2; - legR.showModel = slot == 1; - legL.showModel = slot == 1; - bootL.showModel = slot == 0; - bootR.showModel = slot == 0; + helm.showModel = slot == EntityEquipmentSlot.HEAD; + body.showModel = slot == EntityEquipmentSlot.CHEST; + armr.showModel = slot == EntityEquipmentSlot.CHEST; + armL.showModel = slot == EntityEquipmentSlot.CHEST; + legR.showModel = slot == EntityEquipmentSlot.LEGS; + legL.showModel = slot == EntityEquipmentSlot.LEGS; + bootL.showModel = slot == EntityEquipmentSlot.FEET; + bootR.showModel = slot == EntityEquipmentSlot.FEET; bipedHeadwear.showModel = false; bipedHead = helm; bipedBody = body; bipedRightArm = armr; bipedLeftArm = armL; - if(slot == 1) { + if(slot == EntityEquipmentSlot.LEGS) { bipedRightLeg = legR; bipedLeftLeg = legL; } else { @@ -260,23 +262,46 @@ public class ModelArmorTerrasteel extends ModelBiped { public void prepareForRender(Entity entity) { EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null ? living.isSneaking() : false; - isChild = living != null ? living.isChild() : false; - if(living != null && living instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) living; + isSneak = living != null && living.isSneaking(); + isChild = living != null && living.isChild(); + if(living != null) { + ModelBiped.ArmPose mainPose = ArmPose.EMPTY; + ModelBiped.ArmPose offPose = ArmPose.EMPTY; - ItemStack itemstack = player.inventory.getCurrentItem(); - heldItemRight = itemstack != null ? 1 : 0; + // Copy from RenderPlayer.setModelVisibilities + if(living.getHeldItemMainhand() != null) { + mainPose = ArmPose.ITEM; + if (living.getItemInUseCount() > 0) { + EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - aimedBow = false; - if (itemstack != null && player.getItemInUseCount() > 0) { - EnumAction enumaction = itemstack.getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) - heldItemRight = 3; - else if (enumaction == EnumAction.BOW) - aimedBow = true; + if (enumaction == EnumAction.BLOCK) { + mainPose = ModelBiped.ArmPose.BLOCK; + } else if (enumaction == EnumAction.BOW) { + mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; + } + } } + + if (living.getHeldItemOffhand() != null) { + offPose = ModelBiped.ArmPose.ITEM; + + if (living.getItemInUseCount() > 0) { + EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); + + if (enumaction1 == EnumAction.BLOCK) { + offPose = ModelBiped.ArmPose.BLOCK; + } + } + } + + if(living.getPrimaryHand() == EnumHandSide.RIGHT) { + rightArmPose = mainPose; + leftArmPose = offPose; + } else { + rightArmPose = offPose; + leftArmPose = mainPose; + } + // End copy RenderPlayer.setModelVisibilities } } 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 786c5dd22..5c62a6441 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.EnumDyeColor; +import net.minecraft.network.datasync.DataParameter; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -25,6 +26,10 @@ public class RenderCorporeaSpark extends RenderSparkBase { super(p_i46185_1_); } + protected DataParameter getInvisibilityParam() { + return EntityCorporeaSpark.INVISIBILITY; + } + @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { return entity.isMaster() ? MiscellaneousIcons.INSTANCE.corporeaWorldIconMaster : MiscellaneousIcons.INSTANCE.corporeaWorldIcon; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index f27354fb2..8e230cd98 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -27,10 +27,10 @@ public class RenderPinkWither extends RenderWither { @Override public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { + /*if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { todo 1.9 BossStatus.statusBarTime = -1; BossStatus.hasColorModifier = false; - } + }*/ } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index b3018ff48..4adc42fc7 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,6 +12,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.network.datasync.DataParameter; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; @@ -21,6 +22,10 @@ public class RenderSpark extends RenderSparkBase { super(renderManager); } + protected DataParameter getInvisibilityParam() { + return EntitySpark.INVISIBILITY; + } + @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade().ordinal() - 1; 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 4506d8b60..f4359c54e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -14,29 +14,31 @@ import java.util.Random; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderEntity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; +import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.entity.EntitySpark; -public class RenderSparkBase extends RenderEntity { +public abstract class RenderSparkBase extends Render { public RenderSparkBase(RenderManager p_i46185_1_) { super(p_i46185_1_); } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - T tEntity = (T) par1Entity; + public void doRender(T tEntity, double par2, double par4, double par6, float par8, float par9) { TextureAtlasSprite iicon = getBaseIcon(tEntity); GlStateManager.pushMatrix(); @@ -47,15 +49,15 @@ public class RenderSparkBase extends RenderEntity { GlStateManager.alphaFunc(GL11.GL_GREATER, 0.05F); double time = ClientTickHandler.ticksInGame + par9; - time += new Random(par1Entity.getEntityId()).nextInt(); + time += new Random(tEntity.getEntityId()).nextInt(); - float a = 0.1F + (1 - par1Entity.getDataManager().get(EntitySpark.INVSIBILITY)) * 0.8F; + float a = 0.1F + (1 - tEntity.getDataManager().get(getInvisibilityParam())) * 0.8F; GlStateManager.color(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a); float scale = 0.75F + 0.1F * (float) Math.sin(time / 10); GlStateManager.scale(scale, scale, scale); - bindEntityTexture(par1Entity); + bindEntityTexture(tEntity); Tessellator tessellator = Tessellator.getInstance(); GlStateManager.pushMatrix(); @@ -80,6 +82,8 @@ public class RenderSparkBase extends RenderEntity { GlStateManager.popMatrix(); } + protected abstract DataParameter getInvisibilityParam(); + protected TextureAtlasSprite getBaseIcon(T entity) { return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index aee0739c2..dbf2c2208 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,7 +16,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -52,9 +51,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { IBlockState state = tile.getWorld().getBlockState(tile.getPos()); state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos()); - IBakedModel ibakedmodel = FloatingFlowerModel.INSTANCE.handleBlockState(state); - - brd.getBlockModelRenderer().renderModelBrightness(ibakedmodel, state, 1.0F, true); + brd.getBlockModelRenderer().renderModelBrightness(FloatingFlowerModel.INSTANCE, state, 1.0F, true); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 1a66c6cad..249f29f4b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -40,7 +40,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAvatar extends BlockMod implements ILexiconable { - Random random; + private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); + private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(.21875, 0, .3125, 1-.21875, 17/16.0, 1-.3125); + + private final Random random = new Random(); protected BlockAvatar() { super(Material.wood); @@ -48,20 +51,13 @@ public class BlockAvatar extends BlockMod implements ILexiconable { setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.AVATAR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); - random = new Random(); } @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - float f = 1F / 16F; - float w = f * 9; - float l = f * 6; - float ws = (1F - w) / 2; - float ls = (1F - l) / 2; - - if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.Z) - setBlockBounds(ws, 0F, ls, 1F - ws, 1F + f, 1F - ls); - else setBlockBounds(ls, 0F, ws, 1F - ls, 1F + f, 1F - ws); + if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) + return X_AABB; + else return Z_AABB; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index bb7c76563..abac456a2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -20,6 +20,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -34,12 +35,14 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockIncensePlate extends BlockMod implements ILexiconable { + private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0.375, 0, 0.125, 0.625, 1/16.0, 0.875); + 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); setUnlocalizedName(LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setSoundType(SoundType.WOOD); - setBlockBounds(EnumFacing.Axis.Z); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -110,15 +113,13 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } - public void setBlockBounds(EnumFacing.Axis axis) { - float f = 1F / 16F; - float w = 12 * f; - float l = 4 * f; - float xs = (1F - w) / 2; - float zs = (1F - l) / 2; - if(axis == EnumFacing.Axis.Z) - setBlockBounds(xs, 0F, zs, 1F - xs, f, 1f - zs); - else setBlockBounds(zs, 0F, xs, 1F - zs, f, 1f - xs); + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { + return X_AABB; + } else { + return Z_AABB; + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index df289f973..bba9a2f8e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -98,7 +98,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { public void pickUpEntities(World world, BlockPos pos) { List relays = new ArrayList<>(); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile instanceof TileLightRelay) { TileLightRelay relay = (TileLightRelay) tile; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index e54bd9ae9..82cd5536b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -21,6 +21,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -107,11 +108,12 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } // This is how I get around encapsulation + // todo 1.9 is this necessary? public void harvestBlockCopy(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state) { - player.triggerAchievement(StatList.mineBlockStatArray[getIdFromBlock(this)]); + player.addStat(StatList.getBlockStats(this)); player.addExhaustion(0.025F); - if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player)) + if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0) { java.util.ArrayList items = new java.util.ArrayList<>(); ItemStack itemstack = this.createStackedBlock(state); @@ -130,7 +132,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I else { harvesters.set(player); - int i = EnchantmentHelper.getFortuneModifier(player); + int i = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); this.dropBlockAsItem(worldIn, pos, state, i); harvesters.set(null); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 7b7471878..bcb25de25 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -32,6 +32,11 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSolidVines extends BlockVine implements ILexiconable { + protected static final AxisAlignedBB LADDER_EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D); + protected static final AxisAlignedBB LADDER_WEST_AABB = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); + protected static final AxisAlignedBB LADDER_SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D); + protected static final AxisAlignedBB LADDER_NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); + public BlockSolidVines() { setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); @@ -40,18 +45,18 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(World w, BlockPos pos, IBlockState state) { - setBlockBoundsBasedOnState(w, pos); + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + AxisAlignedBB bounds = getBoundingBox(state, world, pos); if(state.getValue(EAST)) { - return new AxisAlignedBB(pos.add(maxX, minY, minZ), pos.add(maxX, maxY, maxZ)); + return new AxisAlignedBB(pos.add(bounds.maxX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); } if(state.getValue(SOUTH)) { - return new AxisAlignedBB(pos.add(minX, minY, maxZ), pos.add(maxX, maxY, maxZ)); + return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.maxZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); } - return new AxisAlignedBB(pos.add(minX, minY, minZ), pos.add(maxX, maxY, maxZ)); + return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); } @Override 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 53a02be2c..e464657b3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -24,11 +25,14 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import vazkii.botania.api.internal.IManaBurst; @@ -46,17 +50,21 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { + 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); - float f = 1F / 16F; - setBlockBounds(f * 3, 0F, f * 3, 1F - f * 3, 1F - f * 2, 1F - f * 3); - setHardness(2.0F); setSoundType(SoundType.WOOD); setUnlocalizedName(LibBlockNames.FOREST_DRUM); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; + } + @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT); @@ -164,7 +172,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(!world.isRemote) for(int i = 0; i < 10; i++) - world.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "note.bd", 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 1d80e00cc..0ffb3c193 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -40,7 +41,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { super(Material.rock); setHardness(2.0F); setResistance(10.0F); - setSoundType(Block.SoundType.STONE); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_DETECTOR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -61,19 +62,19 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { } @Override - public boolean canProvidePower() { + public boolean canProvidePower(IBlockState state) { return true; } @Override - public int getWeakPower(IBlockAccess par1iBlockAccess, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockState state, IBlockAccess par1iBlockAccess, BlockPos pos, EnumFacing side) { return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) - super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); } @Override 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 7ab95499c..48b3dbce2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.block.mana; -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.renderer.texture.TextureAtlasSprite; @@ -36,7 +36,7 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla super(Material.rock); setHardness(2.0F); setResistance(2000F); - setSoundType(Block.SoundType.STONE); + setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.MANA_VOID); } 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 b988b2b46..21f9c025a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -153,20 +153,20 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } } + private static final AxisAlignedBB BOTTOM_AABB = new AxisAlignedBB(0, 0, 0, 1, 1/16.0, 1); + private static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0, 0, 15/16.0, 1, 0.5, 1); + private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.7, 1/16.0); + private static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0, 0, 0, 1/16.0, 0.5, 1); + private static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(15/16.0, 0, 0, 1, 0.5, 1); + + @Override - public void addCollisionBoxesToList(World p_149743_1_, BlockPos pos, IBlockState state, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { - float f = 1F / 16F; - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); - setBlockBounds(0.0F, 0.0F, 0.0F, f, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, f); - super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); - setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); - setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, pos, state, p_149743_5_, p_149743_6_, p_149743_7_); - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); + public void addCollisionBoxToList(IBlockState state, World p_149743_1_, BlockPos pos, AxisAlignedBB entityBox, List boxes, Entity entity) { + addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); + addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); + addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); + addCollisionBoxToList(pos, entityBox, boxes, WEST_AABB); + addCollisionBoxToList(pos, entityBox, boxes, EAST_AABB); } @Override 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 df0763cc6..640cf8384 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -18,6 +19,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -35,13 +37,15 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockPump extends BlockMod implements ILexiconable { + private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); + private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1); + public BlockPump() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); setUnlocalizedName(LibBlockNames.PUMP); - setBlockBounds(EnumFacing.Axis.X); setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -74,16 +78,11 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - EnumFacing facing = w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS); - setBlockBounds(facing.getAxis()); - } - - public void setBlockBounds(EnumFacing.Axis axis) { - if (axis == EnumFacing.Axis.X) { - setBlockBounds(0F, 0F, 0.25F, 1F, 0.5F, 0.75F); - } else if (axis == EnumFacing.Axis.Z) { - setBlockBounds(0.25F, 0F, 0F, 0.75F, 0.5F, 1F); + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { + return X_AABB; + } else { + return Z_AABB; } } @@ -98,12 +97,12 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public boolean hasComparatorInputOverride() { + public boolean hasComparatorInputOverride(IBlockState state) { return true; } @Override - public int getComparatorInputOverride(World world, BlockPos pos) { + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TilePump) world.getTileEntity(pos)).comparator; } 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 7490bead3..5d81e1dfb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -20,7 +20,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,14 +33,17 @@ import vazkii.botania.common.lib.LibBlockNames; 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); setHardness(3.0F); setUnlocalizedName(LibBlockNames.SPAWNER_CLAW); + } - float f = 1F / 8F; - float f1 = 1F / 16F; - setBlockBounds(f, 0F, f, 1F - f, f1, 1F - f); + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + return AABB; } @Override 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 53ba88a3a..d5af0c5c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index d7e3597aa..ccbc8772c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -28,7 +28,7 @@ public class SubTileManastar extends SubTileEntity { super.onUpdate(); int mana = 0; - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = supertile.getWorld().getTileEntity(supertile.getPos().offset(dir)); if(tile instanceof IManaPool) mana += ((IManaPool) tile).getCurrentMana(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index aee676a69..d63ae702e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -185,14 +185,14 @@ public class SubTileHopperhock extends SubTileFunctional { Block chest = supertile.getWorld().getBlockState(pos).getBlock(); if(tileEntity instanceof TileEntityChest) - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) + for(EnumFacing dir : EnumFacing.HORIZONTALS) if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) { filter.addAll(getFilterForInventory(pos.offset(dir), false)); break; } } - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1)); List frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb); for(EntityItemFrame frame : frames) { 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 c2155846b..cbf18dc50 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 @@ -72,7 +72,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { supertile.getWorld().setBlockToAir(pos); else { int waterAround = 0; - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) + for(EnumFacing dir : EnumFacing.HORIZONTALS) if(supertile.getWorld().getBlockState(pos.offset(dir)).getMaterial() == search) waterAround++; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index f53bdf9e9..982a6faf2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -32,7 +32,7 @@ public class TileSparkChanger extends TileSimpleInventory { ItemStack changeStack = itemHandler.getStackInSlot(0); List attachables = new ArrayList<>(); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 3af518ea3..e7a83e622 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -50,7 +50,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq 1, 2, 4, 8, 16, 32, 48, 64 }; - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { EnumFacing orientation = frame.facingDirection; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 4af8f4dea..6ccd0c4c3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -57,7 +57,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor worldObj.scheduleUpdate(getPos(), getBlockType(), 2); TileEntity requestor = source.getSparkInventory().world.getTileEntity(source.getSparkInventory().pos); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileCorporeaRetainer) ((TileCorporeaRetainer) tile).setPendingRequest(requestor.getPos(), request, count); @@ -85,7 +85,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor public List getFilter() { List filter = new ArrayList<>(); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { EnumFacing orientation = frame.facingDirection; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 4c056e423..ae1f0054b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -30,7 +30,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { if (worldObj.isRemote) return; validPools.clear(); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { IManaReceiver receiver = (IManaReceiver) tileAt; 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 472251228..0c75f7291 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 @@ -249,7 +249,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc int bellowCount = 0; if(outputting) - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileBellows && ((TileBellows) tile).getLinkedTile() == this) bellowCount++; diff --git a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java index e032a903c..13933902c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java @@ -23,7 +23,7 @@ public final class SpawnerChangingHandler { @SubscribeEvent public void onInteract(PlayerInteractEvent event) { - if(event.entityPlayer == null || event.entityPlayer.capabilities == null || event.world == null) + /*if(event.entityPlayer == null || event.entityPlayer.capabilities == null || event.world == null) todo 1.9 return; // Cauldron breaks stuff if(event.entityPlayer.capabilities.isCreativeMode && !event.world.isRemote && event.action == Action.RIGHT_CLICK_BLOCK && !event.entityPlayer.isSneaking()) { @@ -37,7 +37,7 @@ public final class SpawnerChangingHandler { event.setCanceled(true); } } - } + }*/ } } diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index e612d93d3..febe67b72 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -3,27 +3,36 @@ package vazkii.botania.common.core.helper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; + +import java.util.function.Predicate; +import java.util.stream.IntStream; public final class PlayerHelper { + // Checks if either of the player's hands has an item. public static boolean hasAnyHeldItem(EntityPlayer player) { return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; } + // Checks main hand, then off hand for this item. public static boolean hasHeldItem(EntityPlayer player, Item item) { return (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item) || (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item); } + // Checks main hand, then off hand for this item class. public static boolean hasHeldItemClass(EntityPlayer player, Item template) { return hasHeldItemClass(player, template.getClass()); } + // Checks main hand, then off hand for this item class. public static boolean hasHeldItemClass(EntityPlayer player, Class template) { return (player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass())) || (player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass())); } + // Checks main hand, then off hand for this item. Null otherwise. public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { ItemStack main = player.getHeldItemMainhand(); ItemStack offhand = player.getHeldItemOffhand(); @@ -34,6 +43,7 @@ public final class PlayerHelper { } else return null; } + // Checks main hand, then off hand for this item class. Null otherwise. public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { ItemStack main = player.getHeldItemMainhand(); ItemStack offhand = player.getHeldItemOffhand(); @@ -44,5 +54,52 @@ public final class PlayerHelper { } else return null; } + public static ItemStack getAmmo(EntityPlayer player, Predicate ammoFunc) { + // Mainly from ItemBow.findAmmo + if (ammoFunc.test(player.getHeldItem(EnumHand.OFF_HAND))) + { + return player.getHeldItem(EnumHand.OFF_HAND); + } + else if (ammoFunc.test(player.getHeldItem(EnumHand.MAIN_HAND))) + { + return player.getHeldItem(EnumHand.MAIN_HAND); + } + else + { + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) + { + ItemStack itemstack = player.inventory.getStackInSlot(i); + + if (ammoFunc.test(itemstack)) + { + return itemstack; + } + } + + return null; + } + } + + public static boolean hasAmmo(EntityPlayer player, Predicate ammoFunc) { + return getAmmo(player, ammoFunc) != null; + } + + public static void consumeAmmo(EntityPlayer player, Predicate ammoFunc) { + ItemStack ammo = getAmmo(player, ammoFunc); + if(ammo != null) { + ammo.stackSize--; + if(ammo.stackSize == 0) + player.inventory.deleteStack(ammo); + } + } + + public static boolean hasItem(EntityPlayer player, Predicate itemFunc) { + for (int i = 0; i < player.inventory.getSizeInventory(); i++) { + if (itemFunc.test(player.inventory.getStackInSlot(i))) + return true; + } + return false; + } + private PlayerHelper() {} } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index fcb16afbb..a4aa8299d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -46,7 +46,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); - private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); + public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter> DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 240689371..d77a93001 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -59,6 +59,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.BossInfo; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -896,6 +897,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi GlStateManager.popMatrix(); } + @Override + public BossInfo getBossInfo() { + return null; // todo 1.9 + } + + @Override + public EntityLivingBase getEntity() { + return this; + } + @Override @SideOnly(Side.CLIENT) public int getBossBarShaderProgram(boolean background) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index abaaa0d95..fdced8825 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -11,6 +11,7 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntityAmbientCreature; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -28,7 +29,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - protected void updateFallState(double y, boolean onGround, Block block, BlockPos pos) { + protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 5abdafe60..f120f24ea 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -22,6 +22,9 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.math.RayTraceResult; @@ -34,6 +37,8 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; public class EntityMagicMissile extends EntityThrowable { private static final String TAG_TIME = "time"; + private static final DataParameter EVIL = EntityDataManager.createKey(EntityMagicMissile.class, DataSerializers.BOOLEAN); + private static final DataParameter TARGET = EntityDataManager.createKey(EntityMagicMissile.class, DataSerializers.VARINT); double lockX, lockY = -1, lockZ; int time = 0; @@ -51,24 +56,24 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void entityInit() { - dataWatcher.addObject(25, (byte) 0); - dataWatcher.addObject(26, 0); + dataWatcher.register(EVIL, false); + dataWatcher.register(TARGET, 0); } public void setEvil(boolean evil) { - dataWatcher.updateObject(25, (byte) (evil ? 1 : 0)); + dataWatcher.set(EVIL, evil); } public boolean isEvil() { - return dataWatcher.getWatchableObjectByte(25) == 1; + return dataWatcher.get(EVIL); } public void setTarget(EntityLivingBase e) { - dataWatcher.updateObject(26, e == null ? -1 : e.getEntityId()); + dataWatcher.set(TARGET, e == null ? -1 : e.getEntityId()); } public EntityLivingBase getTargetEntity() { - int id = dataWatcher.getWatchableObjectInt(26); + int id = dataWatcher.get(TARGET); Entity e = worldObj.getEntityByID(id); if(e != null && e instanceof EntityLivingBase) return (EntityLivingBase) e; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 53a76583c..6c5fd201d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -88,7 +88,7 @@ public class EntityPoolMinecart extends EntityMinecart { public void moveMinecartOnRail(BlockPos pos) { super.moveMinecartOnRail(pos); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + for(EnumFacing dir : EnumFacing.HORIZONTALS) { BlockPos posP = pos.offset(dir); Block block = worldObj.getBlockState(posP).getBlock(); if(block == ModBlocks.pump) { diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index a14e79347..45793d568 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -49,7 +49,7 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; private static final String TAG_UPGRADE = "upgrade"; private static final String TAG_INVIS = "invis"; - private static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); + public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 49a1f1aa1..2f174b9af 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -34,6 +34,7 @@ import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -77,16 +78,16 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { - par3World.playSound(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false); + par3World.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F); spawnBurstFirst(par3World, pos, par1ItemStack); par1ItemStack.stackSize--; if(par1ItemStack.getItemDamage() == 19) par2EntityPlayer.addStat(ModAchievements.l20ShardUse, 1); } - return true; + return EnumActionResult.SUCCESS; } public void spawnBurstFirst(World world, BlockPos pos, ItemStack lens) { @@ -122,10 +123,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet BlockPos pos_ = pos.add(-range + i, -BASE_RANGE + j, -range + k); if(inRange(pos_, pos, range, heightscale, pointy)) { - Block block = world.getBlockState(pos_).getBlock(); - if(!block.isAir(world, pos_) && !block.isReplaceable(world, pos_) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, pos_)) && block.getBlockHardness(world, pos_) != -1) { + IBlockState state = world.getBlockState(pos_); + Block block = state.getBlock(); + if(!block.isAir(state, world, pos_) && !block.isReplaceable(world, pos_) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, pos_)) && state.getBlockHardness(world, pos_) != -1) { int id = Block.getIdFromBlock(block); - IBlockState state = world.getBlockState(pos_); TileEntity tile = world.getTileEntity(pos_); if(tile != null) { @@ -244,7 +245,7 @@ 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.createAndLoadEntity(tilecmp); + tile = TileEntity.createTileEntity(null, tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); entity.worldObj.playAuxSFX(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 5dff0f3d6..3f0a773e4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -25,6 +25,7 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; @@ -35,10 +36,12 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.relic.ItemDice; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; @@ -58,7 +61,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking()) { Block block = par3World.getBlockState(pos).getBlock(); @@ -70,16 +73,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { Botania.proxy.setLexiconStack(par1ItemStack); openBook(par2EntityPlayer, par1ItemStack, par3World, false); - return true; + return EnumActionResult.SUCCESS; } } else if(par3World.isRemote) { RayTraceResult mop = new RayTraceResult(new Vec3d(par8, par9, par10), side, pos); - return Botania.proxy.openWikiPage(par3World, block, mop); + return Botania.proxy.openWikiPage(par3World, block, mop) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } } } - return false; + return EnumActionResult.PASS; } @Override @@ -127,7 +130,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { String force = getForcedPage(par1ItemStack); if(force != null && !force.isEmpty()) { LexiconEntry entry = getEntryFromForce(par1ItemStack); @@ -140,7 +143,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { openBook(par3EntityPlayer, par1ItemStack, par2World, skipSound); skipSound = false; - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } public static void openBook(EntityPlayer player, ItemStack stack, World world, boolean skipSound) { @@ -151,7 +154,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(!l.isKnowledgeUnlocked(stack, BotaniaAPI.relicKnowledge) && l.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) for(ItemStack rstack : ItemDice.relicStacks) { Item item = rstack.getItem(); - if(player.inventory.hasItem(item)) { + if(PlayerHelper.hasItem(player, s -> s != null && s.getItem() == item)) { l.unlockKnowledge(stack, BotaniaAPI.relicKnowledge); break; } @@ -161,7 +164,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { player.addStat(ModAchievements.lexiconUse, 1); player.openGui(Botania.instance, LibGuiIDs.LEXICON, world, 0, 0, 0); if(!world.isRemote && !skipSound) - world.playSoundAtEntity(player, "botania:lexiconOpen", 0.5F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); } @Override @@ -170,7 +173,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; if(ticks == 1) - onItemRightClick(stack, world, (EntityPlayer) entity); + onItemRightClick(stack, world, (EntityPlayer) entity, EnumHand.MAIN_HAND); setQueueTicks(stack, ticks - 1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index f4b6e802a..4a0de1135 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -18,6 +18,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -25,6 +26,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -34,6 +36,7 @@ import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.common.achievement.ModAchievements; @@ -80,7 +83,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) { rotatePos(par1ItemStack); - par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 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); @@ -90,7 +93,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true); if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) { if(!par2World.isRemote) { - par2World.playSoundAtEntity(par3EntityPlayer, "botania:manaBlaster", 0.6F, 1F); + par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); par3EntityPlayer.addStat(ModAchievements.manaBlasterShoot, 1); if(isSugoiKawaiiDesuNe(par1ItemStack)) par3EntityPlayer.addStat(ModAchievements.desuGun, 1); @@ -103,7 +106,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { } par1ItemStack.setItemDamage(effCd); } else if(!par2World.isRemote) - par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 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/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index 4db5c55ca..a0a84b808 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.mana.ManaItemHandler; @@ -33,7 +34,7 @@ public class ItemRegenIvy extends ItemMod { setUnlocalizedName(LibItemNames.REGEN_IVY); GameRegistry.addRecipe(new RegenIvyRecipe()); RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent(priority = EventPriority.LOWEST) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 5bbd08d1c..5654a168d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -31,6 +31,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; @@ -70,7 +71,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { int range = 5; 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) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) { + if(entity != par3EntityPlayer && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) { entity.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 50, 5)); stunned++; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index e64bb9f17..5046e62f1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -18,11 +18,16 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import java.util.function.Predicate; + public class ItemSlingshot extends ItemMod { + private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; + public ItemSlingshot() { setMaxStackSize(1); setUnlocalizedName(LibItemNames.SLINGSHOT); @@ -32,7 +37,7 @@ public class ItemSlingshot extends ItemMod { public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityLivingBase living, int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; - if(!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || ((EntityPlayer) living).inventory.hasItem(ModItems.vineBall)) { + if(!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo(((EntityPlayer) living), AMMO_FUNC)) { float f = j / 20.0F; f = (f * f + f * 2.0F) / 3.0F; @@ -40,7 +45,7 @@ public class ItemSlingshot extends ItemMod { return; if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) - ((EntityPlayer) living).inventory.consumeInventoryItem(ModItems.vineBall); + PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); if(!par2World.isRemote) { EntityVineBall ball = new EntityVineBall(living, false); @@ -69,7 +74,7 @@ public class ItemSlingshot extends ItemMod { @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) { + if(par3EntityPlayer.capabilities.isCreativeMode || PlayerHelper.hasAmmo(par3EntityPlayer, AMMO_FUNC)) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 02009115f..d1d68fcbf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -78,7 +78,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { setBoundTile(par1ItemStack, UNBOUND_POS); } - return true; + return EnumActionResult.SUCCESS; } else setBoundTile(par1ItemStack, UNBOUND_POS); } else if(par2EntityPlayer.isSneaking()) { block.rotateBlock(par3World, pos, side); @@ -132,7 +132,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { par2EntityPlayer.swingArm(hand); } - return wanded; + return wanded ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { BlockPistonRelay.DimWithPos bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimension(), pos); @@ -142,9 +142,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { BlockPistonRelay.WorldData.get(par3World).markDirty(); par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + return EnumActionResult.SUCCESS; } - return false; + return EnumActionResult.PASS; } public static void doParticleBeam(World world, Vector3 orig, Vector3 end) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 43b9938c2..78e19b126 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -25,14 +25,14 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements @Override @SideOnly(Side.CLIENT) - public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { - models[slot] = new ModelArmorElementium(slot); - return models[slot]; + public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { + models.put(slot, new ModelArmorElementium(slot)); + return models.get(slot); } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : slot == 2 ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { + return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java index d37f6b7ed..a0f96b086 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java @@ -1,12 +1,13 @@ package vazkii.botania.common.item.equipment.armor.elementium; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumBoots extends ItemElementiumArmor { public ItemElementiumBoots() { - super(3, LibItemNames.ELEMENTIUM_BOOTS); + super(EntityEquipmentSlot.FEET, LibItemNames.ELEMENTIUM_BOOTS); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java index 2994a3ca2..ff707c5a5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java @@ -1,12 +1,13 @@ package vazkii.botania.common.item.equipment.armor.elementium; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumChest extends ItemElementiumArmor { public ItemElementiumChest() { - super(1, LibItemNames.ELEMENTIUM_CHEST); + super(EntityEquipmentSlot.CHEST, LibItemNames.ELEMENTIUM_CHEST); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java index ef357ddb8..e1f510730 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -1,6 +1,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.common.lib.LibItemNames; @@ -12,7 +13,7 @@ public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDisc } public ItemElementiumHelm(String name) { - super(0, name); + super(EntityEquipmentSlot.HEAD, name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java index d221f4e7f..31f244b9e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java @@ -1,12 +1,13 @@ package vazkii.botania.common.item.equipment.armor.elementium; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumLegs extends ItemElementiumArmor { public ItemElementiumLegs() { - super(2, LibItemNames.ELEMENTIUM_LEGS); + super(EntityEquipmentSlot.LEGS, LibItemNames.ELEMENTIUM_LEGS); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index e21dd5944..2961c8a28 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -10,7 +10,9 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; +import java.util.EnumMap; import java.util.List; +import java.util.Map; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; @@ -50,7 +52,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; - protected ModelBiped[] models = null; + protected Map models = null; public EntityEquipmentSlot type; public ItemManasteelArmor(EntityEquipmentSlot type, String name) { @@ -105,19 +107,18 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public final String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + public final String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return hasPhantomInk(stack) ? LibResources.MODEL_INVISIBLE_ARMOR : getArmorTextureAfterInk(stack, slot); } - public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : slot == 2 ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { + return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; } @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot, ModelBiped original) { + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped original) { if(ConfigHandler.enableArmorModels) { - armorSlot--; // 1.8: mojang is dumb and made armorSlot 1-4 instead of 0-3. ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); if(model == null) model = provideArmorModelForSlot(itemStack, armorSlot); @@ -132,17 +133,17 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @SideOnly(Side.CLIENT) - public ModelBiped getArmorModelForSlot(EntityLivingBase entity, ItemStack stack, int slot) { + public ModelBiped getArmorModelForSlot(EntityLivingBase entity, ItemStack stack, EntityEquipmentSlot slot) { if(models == null) - models = new ModelBiped[4]; + models = new EnumMap<>(EntityEquipmentSlot.class); - return models[slot]; + return models.get(slot); } @SideOnly(Side.CLIENT) - public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { - models[slot] = new ModelArmorManasteel(slot); - return models[slot]; + public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { + models.put(slot, new ModelArmorManasteel(slot)); + return models.get(slot); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 986935f89..ca567a7e3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -39,14 +39,14 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Override @SideOnly(Side.CLIENT) - public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { - models[slot] = new ModelArmorManaweave(slot); - return models[slot]; + public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { + models.put(slot, new ModelArmorManaweave(slot)); + return models.get(slot); } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { + return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index f0c0c2394..d5cc5ed6c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -40,14 +40,14 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override @SideOnly(Side.CLIENT) - public ModelBiped provideArmorModelForSlot(ItemStack stack, int slot) { - models[slot] = new ModelArmorTerrasteel(slot); - return models[slot]; + public ModelBiped provideArmorModelForSlot(ItemStack stack, EntityEquipmentSlot slot) { + models.put(slot, new ModelArmorTerrasteel(slot)); + return models.get(slot); } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : slot == 2 ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0; + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { + return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : slot == EntityEquipmentSlot.CHEST ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0; } @Override 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 77659dcfb..71ff75573 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 @@ -353,10 +353,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { for (EnumFacing enumfacing : EnumFacing.values()) { - this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color, stack); + this.renderQuads(worldrenderer, model.getQuads(null, enumfacing, 0), color, stack); } - this.renderQuads(worldrenderer, model.getGeneralQuads(), color, stack); + this.renderQuads(worldrenderer, model.getQuads(null, null, 0), color, stack); tessellator.draw(); } @@ -368,12 +368,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { for (int j = quads.size(); i < j; ++i) { - BakedQuad bakedquad = (BakedQuad)quads.get(i); + BakedQuad bakedquad = quads.get(i); int k = color; if (flag && bakedquad.hasTintIndex()) { - k = stack.getItem().getColorFromItemStack(stack, bakedquad.getTintIndex()); + k = Minecraft.getMinecraft().getItemColors().getColorFromItemstack(stack, bakedquad.getTintIndex()); if (EntityRenderer.anaglyphEnable) { 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 fb8a6c84d..d5a7ae48e 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 @@ -108,9 +108,20 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } public void tickServer(ItemStack stack, EntityPlayer player) { - ItemStack pstack = player.getCurrentEquippedItem(); StringBuilder positionsBuilder = new StringBuilder(); + scanForStack(player.getHeldItemMainhand(), player, positionsBuilder); + scanForStack(player.getHeldItemOffhand(), player, positionsBuilder); + + String current = ItemNBTHelper.getString(stack, TAG_POSITIONS, ""); + String positions = positionsBuilder.toString(); + if(!current.equals(positions)) { + ItemNBTHelper.setString(stack, TAG_POSITIONS, positions); + PacketHandler.INSTANCE.sendToAll(new PacketSyncBauble(player, 0)); + } + } + + private void scanForStack(ItemStack pstack, EntityPlayer player, StringBuilder positionsBuilder) { if(pstack != null || player.isSneaking()) { int range = 24; @@ -155,7 +166,10 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) e; - ItemStack estack = living.getEquipmentInSlot(0); + ItemStack estack = living.getHeldItemMainhand(); + if(pstack != null && estack != null && equalStacks(estack, pstack)) + positionsBuilder.append(living.getEntityId()).append(";"); + estack = living.getHeldItemOffhand(); if(pstack != null && estack != null && equalStacks(estack, pstack)) positionsBuilder.append(living.getEntityId()).append(";"); } @@ -188,20 +202,13 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } } } - - String current = ItemNBTHelper.getString(stack, TAG_POSITIONS, ""); - String positions = positionsBuilder.toString(); - if(!current.equals(positions)) { - ItemNBTHelper.setString(stack, TAG_POSITIONS, positions); - PacketHandler.INSTANCE.sendToAll(new PacketSyncBauble(player, 0)); - } } - boolean equalStacks(ItemStack stack1, ItemStack stack2) { + private boolean equalStacks(ItemStack stack1, ItemStack stack2) { return stack1.isItemEqual(stack2) && ItemStack.areItemStackTagsEqual(stack1, stack2); } - boolean scanInventory(IItemHandler inv, ItemStack pstack) { + private boolean scanInventory(IItemHandler inv, ItemStack pstack) { if(pstack == null) return false; 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 b881ec77b..449f00fcc 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 @@ -10,17 +10,12 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; @@ -43,40 +38,16 @@ public class ItemCrystalBow extends ItemLivingwoodBow { } @Override - boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, p_77615_1_); - return ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity + 1), false); + boolean canFire(ItemStack stack, EntityPlayer player) { + int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack); + return ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false); } @Override - void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) { + void onFire(ItemStack stack, EntityLivingBase living, boolean infinity, EntityArrow arrow) { arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; - ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false); - } - - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - String name = GameData.getItemRegistry().getNameForObject(this).toString(); - - if (useRemaining == 0) { - return new ModelResourceLocation(name, "inventory"); - } - - int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); - - if(j >= 18) - return new ModelResourceLocation(name + "_pulling_5", "inventory"); - if(j >= 15) - return new ModelResourceLocation(name + "_pulling_4", "inventory"); - if(j >= 12) - return new ModelResourceLocation(name + "_pulling_3", "inventory"); - if(j > 9) - return new ModelResourceLocation(name + "_pulling_2", "inventory"); - if(j > 6) - return new ModelResourceLocation(name + "_pulling_1", "inventory"); - - return new ModelResourceLocation(name, "inventory"); + if(living instanceof EntityPlayer) + ManaItemHandler.requestManaExactForTool(stack, ((EntityPlayer) living), ARROW_COST / (infinity ? 2 : 1), false); } } 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 60ac85fbe..4fd78cf7a 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 @@ -10,34 +10,42 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Enchantments; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; +import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.ArrowLooseEvent; -import net.minecraftforge.event.entity.player.ArrowNockEvent; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.function.Predicate; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { + private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() instanceof ItemArrow; public static final int MANA_PER_DAMAGE = 40; public ItemLivingwoodBow() { @@ -45,11 +53,11 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } public ItemLivingwoodBow(String name) { - super(); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); setMaxDamage(500); setFull3D(); + addPropertyOverride(new ResourceLocation("minecraft:pull"), (stack, worldIn, entityIn) -> (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F); } @Override @@ -64,30 +72,36 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); - MinecraftForge.EVENT_BUS.post(event); - if(event.isCanceled()) - return event.result; + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + // Copy from superclass with our own check + boolean flag = canFire(stack, player); + ActionResult ret = ForgeEventFactory.onArrowNock(stack, world, player, hand, flag); + if (ret != null) return ret; - if(canFire(p_77659_1_, p_77659_2_, p_77659_3_, 0)) - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); - - return p_77659_1_; + if (!player.capabilities.isCreativeMode) + { + return !flag ? new ActionResult<>(EnumActionResult.FAIL, stack) : new ActionResult<>(EnumActionResult.PASS, stack); + } + else + { + player.setActiveHand(hand); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); + } } @Override - public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int j = (int) ((getMaxItemUseDuration(p_77615_1_) - p_77615_4_) * chargeVelocityMultiplier()); + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase shooter, int useTicks) { + int j = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); - ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j); - MinecraftForge.EVENT_BUS.post(event); - if(event.isCanceled()) - return; - j = event.charge; + if(shooter instanceof EntityPlayer) { + ArrowLooseEvent event = new ArrowLooseEvent(((EntityPlayer) shooter), stack, world, j, true); + if(MinecraftForge.EVENT_BUS.post(event)) + return; + j = event.getCharge(); + } - boolean flag = canFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_); - boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0; + boolean flag = !(shooter instanceof EntityPlayer) || canFire(stack, ((EntityPlayer) shooter)); + boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack) > 0; if(flag) { float f = j / 20.0F; @@ -99,31 +113,32 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(f > 1.0F) f = 1.0F; - EntityArrow entityarrow = makeArrow(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, f); + ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : new ItemStack(Items.arrow); + EntityArrow entityarrow = ((ItemArrow) (ammo == null ? Items.arrow : ammo.getItem())).createArrow(world, ammo, shooter); if(f == 1.0F) entityarrow.setIsCritical(true); - int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, p_77615_1_); + int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.power, stack); if(k > 0) entityarrow.setDamage(entityarrow.getDamage() + k * 0.5D + 0.5D); - int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, p_77615_1_); + int l = EnchantmentHelper.getEnchantmentLevel(Enchantments.punch, stack); if(l > 0) entityarrow.setKnockbackStrength(l); - if(EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, p_77615_1_) > 0) + if(EnchantmentHelper.getEnchantmentLevel(Enchantments.flame, stack) > 0) entityarrow.setFire(100); - ToolCommons.damageItem(p_77615_1_, 1, p_77615_3_, MANA_PER_DAMAGE); - p_77615_2_.playSoundAtEntity(p_77615_3_, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + 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); - onFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, infinity, entityarrow); + onFire(stack, shooter, infinity, entityarrow); - if(!p_77615_2_.isRemote) - p_77615_2_.spawnEntityInWorld(entityarrow); + if(!world.isRemote) + world.spawnEntityInWorld(entityarrow); } } @@ -135,18 +150,15 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } - EntityArrow makeArrow(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, float f) { - return new EntityArrow(p_77615_2_, p_77615_3_, f * 2.0F); + boolean canFire(ItemStack stack, EntityPlayer player) { + return player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantments.infinity, stack) > 0 || PlayerHelper.hasAmmo(player, AMMO_FUNC); } - boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - return p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0 || p_77615_3_.inventory.hasItem(Items.arrow); - } - - void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) { + void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(infinity) - arrow.canBePickedUp = 2; - else p_77615_3_.inventory.consumeInventoryItem(Items.arrow); + arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; + else if(living instanceof EntityPlayer) + PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); } @Override @@ -165,25 +177,4 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } - @Override - @SideOnly(Side.CLIENT) - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { - String name = GameData.getItemRegistry().getNameForObject(this).toString(); - - if (useRemaining == 0) { - return new ModelResourceLocation(name, "inventory"); - } - - int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); - - if(j >= 18) - return new ModelResourceLocation(name + "_pulling_3", "inventory"); - if(j > 13) - return new ModelResourceLocation(name + "_pulling_2", "inventory"); - if(j > 0) - return new ModelResourceLocation(name + "_pulling_1", "inventory"); - - return new ModelResourceLocation(name, "inventory"); - } - } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 0ae64d402..594755f5a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -22,7 +22,7 @@ public class ItemElementiumPick extends ItemManasteelPick { @SubscribeEvent public void onHarvestDrops(HarvestDropsEvent event) { if(event.harvester != null) { - ItemStack stack = event.harvester.getCurrentEquippedItem(); + ItemStack stack = event.harvester.getHeldItemMainhand(); if(stack != null && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { for(int i = 0; i < event.drops.size(); i++) { ItemStack drop = event.drops.get(i); 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 2e8feb521..cbf06d74b 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 @@ -5,6 +5,7 @@ import net.minecraft.block.BlockFalling; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -25,7 +26,7 @@ public class ItemElementiumShovel extends ItemManasteelShovel { @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { World world = player.worldObj; - Material mat = world.getBlockState(pos).getBlock().getMaterial(); + Material mat = world.getBlockState(pos).getMaterial(); if (!ToolCommons.isRightMaterial(mat, materialsShovel)) return false; @@ -33,8 +34,8 @@ public class ItemElementiumShovel extends ItemManasteelShovel { if (block == null) return false; - int fortune = EnchantmentHelper.getFortuneModifier(player); - boolean silk = EnchantmentHelper.getSilkTouchModifier(player); + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, 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/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index a2654a8ff..73f21fc4c 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 @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -156,8 +157,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(world.isAirBlock(pos)) return; - int fortune = EnchantmentHelper.getFortuneModifier(player); - boolean silk = EnchantmentHelper.getSilkTouchModifier(player); + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, 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/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 43d0e47a7..a5c671608 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; @@ -40,7 +41,7 @@ public class ItemElementiumHelmRevealing extends ItemElementiumHelm implements I } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : LibResources.MODEL_ELEMENTIUM_2; } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index 45af183af..a8d7d3f42 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -46,7 +47,7 @@ public class ItemManasteelHelmRevealing extends ItemManasteelHelm implements IGo } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : LibResources.MODEL_MANASTEEL_2; } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index 82c70a5fa..50550aee9 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; @@ -40,7 +41,7 @@ public class ItemTerrasteelHelmRevealing extends ItemTerrasteelHelm implements I } @Override - public String getArmorTextureAfterInk(ItemStack stack, int slot) { + public String getArmorTextureAfterInk(ItemStack stack, EntityEquipmentSlot slot) { return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : LibResources.MODEL_TERRASTEEL_2; } 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 bc79da0a3..9f9066cb6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -62,7 +62,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { - boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; + /*boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; todo 1.9 ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; boolean ender = event.world.provider.getDimension() == 1; @@ -89,7 +89,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve event.world.playSound(null, event.pos, SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); } } - } + }*/ } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 944215674..07ae78c30 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -12,13 +12,18 @@ package vazkii.botania.common.item.relic; import java.util.Random; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -36,14 +41,14 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + par3EntityPlayer.setActiveHand(hand); setCharging(par1ItemStack, true); - return par1ItemStack; + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int time) { + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase living, int time) { int spawned = getWeaponsSpawned(stack); if(spawned == 20) { setCharging(stack, false); @@ -52,19 +57,19 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { int spawned = getWeaponsSpawned(stack); - if(count != getMaxItemUseDuration(stack) && spawned < 20 && !player.worldObj.isRemote && ManaItemHandler.requestManaExact(stack, player, 150, true)) { - Vector3 look = new Vector3(player.getLookVec()); + if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, ((EntityPlayer) living), 150, true))) { + Vector3 look = new Vector3(living.getLookVec()); look.y = 0; look.normalize().negate().multiply(2); int div = spawned / 5; int mod = spawned % 5; - Vector3 pl = look.copy().add(Vector3.fromEntityCenter(player)).add(0, 1.6, div * 0.1); + Vector3 pl = look.copy().add(Vector3.fromEntityCenter(living)).add(0, 1.6, div * 0.1); - Random rand = player.worldObj.rand; + Random rand = living.worldObj.rand; Vector3 axis = look.copy().normalize().crossProduct(new Vector3(-1, 0, -1)).normalize(); Vector3 axis1 = axis.copy(); @@ -76,17 +81,17 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { Vector3 end = pl.copy().add(axis1); - EntityBabylonWeapon weapon = new EntityBabylonWeapon(player.worldObj, player); + EntityBabylonWeapon weapon = new EntityBabylonWeapon(living.worldObj, living); weapon.posX = end.x; weapon.posY = end.y; weapon.posZ = end.z; - weapon.rotationYaw = player.rotationYaw; + weapon.rotationYaw = living.rotationYaw; weapon.setVariety(rand.nextInt(WEAPON_TYPES)); weapon.setDelay(spawned); - weapon.setRotation(MathHelper.wrapAngleTo180_float(-player.rotationYaw + 180)); + weapon.setRotation(MathHelper.wrapAngleTo180_float(-living.rotationYaw + 180)); - player.worldObj.spawnEntityInWorld(weapon); - player.worldObj.playSoundAtEntity(weapon, "botania:babylonSpawn", 1F, 1F + player.worldObj.rand.nextFloat() * 3F); + living.worldObj.spawnEntityInWorld(weapon); + weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.worldObj.rand.nextFloat() * 3F); setWeaponsSpawned(stack, spawned + 1); } } 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 55f0ee237..c3064e8b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -15,12 +15,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -67,7 +69,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { - EntityPlayer player = event.entityPlayer; + /*EntityPlayer player = event.entityPlayer; todo 1.9 ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) return; @@ -132,7 +134,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } } - } + }*/ } public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { @@ -143,15 +145,15 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC List cursors = getCursorList(lokiRing); ISequentialBreaker breaker = (ISequentialBreaker) item; World world = player.worldObj; - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, stack) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); for(int i = 0; i < cursors.size(); i++) { BlockPos coords = cursors.get(i); - Block block = world.getBlockState(coords).getBlock(); + IBlockState state = world.getBlockState(coords); breaker.breakOtherBlock(player, stack, coords, coords, side); - ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, block, new Material[] { block.getMaterial() }, silk, fortune, block.getBlockHardness(world, coords), dispose); + ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[] { state.getMaterial() }, silk, fortune, state.getBlockHardness(world, coords), dispose); } } 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 2ebf87e9a..52db2797d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -136,7 +136,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP boolean hasAir = false; List airBlocks = new ArrayList<>(); - for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { + 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) { diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 597fdb274..25dc59f0d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.lib; -import net.minecraft.util.EnumFacing; - public final class LibMisc { // Mod Constants @@ -20,7 +18,7 @@ public final class LibMisc { public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft"; - public static final String MC_VERSIONS = "[1.8.8,1.8.9]"; + public static final String MC_VERSIONS = "[1.9]"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; @@ -33,8 +31,6 @@ public final class LibMisc { // IMC Keys public static final String BLACKLIST_ITEM = "blackListItem"; - public static final EnumFacing[] CARDINAL_DIRECTIONS = EnumFacing.HORIZONTALS; - public static final int[] CONTROL_CODE_COLORS = new int[] { 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, 0xAA0000, 0xAA00AA, 0xFFAA00, 0xAAAAAA, diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index bcd7a3dba..faa32f183 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -110,4 +110,7 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; + // RenderPlayer + public static final String[] ADD_LAYER = { "addLayer", "", "" }; + } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index a0456a23e..b432083fa 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -66,7 +66,7 @@ public final class SkyblockWorldEvents { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { - if(WorldTypeSkyblock.isWorldSkyblock(event.world)) { + /*if(WorldTypeSkyblock.isWorldSkyblock(event.world)) { todo 1.9 ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); if(event.action == Action.RIGHT_CLICK_BLOCK && equipped == null && event.entityPlayer.isSneaking()) { Block block = event.world.getBlockState(event.pos).getBlock(); @@ -93,7 +93,7 @@ public final class SkyblockWorldEvents { } } } - } + }*/ } @SubscribeEvent From 3e79893a359511f0372593e011a935bb6ea40c7c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 21:34:19 -0500 Subject: [PATCH 456/935] Barely runs --- build.properties | 2 +- .../botania/api/state/BotaniaStateProps.java | 8 +++--- .../client/core/handler/ModelHandler.java | 28 +++++++++---------- .../client/core/proxy/ClientProxy.java | 20 +++++-------- .../client/model/FloatingFlowerModel.java | 2 +- .../botania/client/model/ModelPylon.java | 2 +- .../botania/client/model/PylonItemModel.java | 4 +-- .../client/model/SpecialFlowerModel.java | 4 +-- .../tile/RenderTileCorporeaCrystalCube.java | 8 ++++-- .../block/decor/slabs/BlockModSlab.java | 3 +- .../corporea/TileCorporeaCrystalCube.java | 13 ++++----- .../common/block/tile/mana/TilePump.java | 23 ++++++++------- .../equipment/tool/bow/ItemLivingwoodBow.java | 6 ++-- .../tool/manasteel/ItemManasteelAxe.java | 13 +++++++-- 14 files changed, 71 insertions(+), 65 deletions(-) diff --git a/build.properties b/build.properties index 518e2b4a1..d2ba7e27e 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1767-1.9 +forge_version=12.16.0.1797-1.9 mc_version=1.9 dir_repo=./ build_number=300 diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 7e5d9c2ae..1324e9c7d 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -76,7 +76,7 @@ public final class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("fswall_variant", FutureStoneVariant.class, new Predicate() { @Override public boolean apply(FutureStoneVariant variant) { // Just the four kinds (no polished, chiseled, etc.) @@ -100,7 +100,7 @@ public final class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("bswall_variant", BiomeStoneVariant.class, new Predicate() { @Override public boolean apply(BiomeStoneVariant input) { return input.getName().contains("cobble"); @@ -132,7 +132,7 @@ public final class BotaniaStateProps { public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower (white to gray) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("df_variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { return input.ordinal() >= 0 && input.ordinal() <= 7; @@ -140,7 +140,7 @@ public final class BotaniaStateProps { }); // (silver to black) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("df_variant", EnumDyeColor.class, new Predicate() { @Override public boolean apply(EnumDyeColor input) { return input.ordinal() >= 8 && input.ordinal() <= 15; 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 e44406288..f7902ff14 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -137,7 +137,7 @@ public final class ModelHandler { // todo reorganize, alphabetize public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); - OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(FloatingFlowerModel.INSTANCE); /** Subtile block models **/ @@ -814,19 +814,19 @@ public final class ModelHandler { 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 = GameData.getBlockRegistry().getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); - String variant = "inventory_" + color.getName(); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); - } +// item = Item.getItemFromBlock(ModBlocks.doubleFlower1); +// for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { +// String name = GameData.getBlockRegistry().getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); +// String variant = "inventory_" + color.getName(); +// ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); +// } } private static void registerPavement() { 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 7be9d04f6..ffd83db19 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -183,14 +183,13 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); - ColorHandler.init(); initRenderers(); } @Override public void init(FMLInitializationEvent event) { super.init(event); - + ColorHandler.init(); initAuxiliaryRender(); ModChallenges.init(); @@ -277,18 +276,13 @@ public class ClientProxy extends CommonProxy { private void initAuxiliaryRender() { Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); RenderPlayer render; + render = skinMap.get("default"); + render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); - try { // todo 1.9 get Forge to AT this back -.- - Method m = ReflectionHelper.findMethod(RenderPlayer.class, null, LibObfuscation.ADD_LAYER); - - render = skinMap.get("default"); - m.invoke(render, new ContributorFancinessHandler()); - m.invoke(render, new BaubleRenderHandler()); - - render = skinMap.get("slim"); - m.invoke(render, new ContributorFancinessHandler()); - m.invoke(render, new BaubleRenderHandler()); - } catch (ReflectiveOperationException ignored) {} + render = skinMap.get("slim"); + render.addLayer(new ContributorFancinessHandler()); + render.addLayer(new BaubleRenderHandler()); } @Override diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index fb4f96672..6d21631a4 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -29,7 +29,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index d597f7335..cb937a9ce 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -50,7 +50,7 @@ public class ModelPylon implements IPylonModel { public ModelPylon() { try { // Load the OBJ - OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + OBJModel model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); // Apply the texture and flip the v's of the model IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 8d8539aca..8df6069ff 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fml.common.FMLLog; @@ -69,7 +69,7 @@ public class PylonItemModel implements IBakedModel { // Load the OBJ OBJModel model = null; try { - model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); } catch(Exception e) { FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index df5c455ab..e8ea291a9 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -34,9 +34,9 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; -import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; 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 ed7e331ad..b007618a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -30,9 +30,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.Event; +import net.minecraftforge.common.animation.Event; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; @@ -170,7 +170,9 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer> pair = te.asm().apply(time); + // todo 1.9 + if (true) return; + Pair> pair = null; // handleEvents(te, time, pair.getRight()); IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 078226e48..3b0c317d0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -1,5 +1,6 @@ package vazkii.botania.common.block.decor.slabs; +import java.util.Locale; import java.util.Random; import net.minecraft.block.BlockSlab; @@ -120,7 +121,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { SINGLETON { @Override public String getName() { - return name(); + return name().toLowerCase(Locale.ROOT); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 7971d600e..08e40de72 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.IAnimationProvider; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; @@ -27,7 +26,7 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; -public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider { +public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; @@ -39,13 +38,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor int ticks = 0; public int compValue = 0; - private final IAnimationStateMachine asm; + //private final IAnimationStateMachine asm; public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); } else { - asm = null; + //asm = null; } } @@ -166,9 +165,9 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor onUpdateCount(); } } - +/* todo 1.9 @Override public IAnimationStateMachine asm() { return asm; - } + }*/ } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index a03c7f089..de4e37d56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -16,15 +16,14 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.client.model.animation.IAnimationProvider; -import net.minecraftforge.client.model.animation.TimeValues; +import net.minecraftforge.common.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -public class TilePump extends TileMod implements IAnimationProvider { +public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -39,15 +38,15 @@ public class TilePump extends TileMod implements IAnimationProvider { int lastComparator = 0; private final TimeValues.VariableValue move; - private final IAnimationStateMachine asm; + //private final IAnimationStateMachine asm; public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - move = new TimeValues.VariableValue(0); - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + move = new TimeValues.VariableValue(0); //todo 1.9 + //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; - asm = null; + //asm = null; } } @@ -114,7 +113,7 @@ public class TilePump extends TileMod implements IAnimationProvider { active = cmp.getBoolean(TAG_ACTIVE); if(worldObj != null && worldObj.isRemote) if(prevActive != active) - asm.transition(active ? "moving" : "default"); + ;//asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { @@ -126,8 +125,8 @@ public class TilePump extends TileMod implements IAnimationProvider { } } - @Override - public IAnimationStateMachine asm() { - return asm; - } +// @Override +// public IAnimationStateMachine asm() { +// return asm; +// } } 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 4fd78cf7a..1b722a0c3 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 @@ -113,8 +113,10 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(f > 1.0F) f = 1.0F; - ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : new ItemStack(Items.arrow); - EntityArrow entityarrow = ((ItemArrow) (ammo == null ? Items.arrow : ammo.getItem())).createArrow(world, ammo, shooter); + ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : null; + if(ammo == null) + ammo = new ItemStack(Items.arrow); + EntityArrow entityarrow = ((ItemArrow) ammo.getItem()).createArrow(world, ammo, shooter); if(f == 1.0F) entityarrow.setIsCritical(true); 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 b25f44235..87911b83f 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 @@ -10,8 +10,10 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; +import java.util.Set; import java.util.regex.Pattern; +import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -21,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -38,7 +41,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { +public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); @@ -49,11 +52,17 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } public ItemManasteelAxe(ToolMaterial mat, String name) { - super(mat); + super(mat, ImmutableSet.of()); + // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); } + @Override + public Set getToolClasses(ItemStack stack) { + return ImmutableSet.of("axe"); + } + @Override public Item setUnlocalizedName(String par1Str) { GameRegistry.registerItem(this, par1Str); From 365bed04c050f3e8b46b3053c7572a18550cb103 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 22:10:38 -0500 Subject: [PATCH 457/935] Flowers not working --- .../core/handler/MiscellaneousIcons.java | 3 ++ .../client/model/SpecialFlowerModel.java | 33 +++---------------- 2 files changed, 7 insertions(+), 29 deletions(-) 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 d3d6eff2f..674ee39b7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -87,6 +87,9 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { + + System.out.println(evt.getModelRegistry().getObject(new ModelResourceLocation("botania:daybloom", "normal"))); + // Floating flowers evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index e8ea291a9..c5374bf39 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -85,7 +85,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) - return new SpecialFlowerBakedModel(blockModels, itemModels, format, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + return new SpecialFlowerBakedModel(blockModels, itemModels, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); } @Override @@ -154,24 +154,20 @@ public class SpecialFlowerModel implements IModelCustomData { private final ImmutableMap transforms; private final ImmutableMap, ModelResourceLocation> blockModels; private final ImmutableMap, ModelResourceLocation> itemModels; - private final VertexFormat vertexFormat; private IBakedModel baseModel; private ImmutableMap bakedBlockModels; private ImmutableMap bakedItemModels; - private ImmutableMap, ImmutableList> quads; public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, - ImmutableMap, ModelResourceLocation> itemModels, - VertexFormat format, ImmutableMap cameraTransforms) { + ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { this.blockModels = blockModels; this.itemModels = itemModels; - this.vertexFormat = format; this.transforms = cameraTransforms; } private void refreshBakedModels() { - if(baseModel == null) { + //if(baseModel == null) { // If not done already, steal all the real baked models and cache them ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); baseModel = getBlockModel(manager, Optional.absent()); @@ -193,14 +189,7 @@ public class SpecialFlowerModel implements IModelCustomData { } bakedItemModels = builder2.build(); - - ImmutableMap.Builder, ImmutableList> quadBuilder = ImmutableMap.builder(); - quadBuilder.put(Optional.absent(), buildQuads(Optional.absent())); - for(EnumFacing side : EnumFacing.values()) { - quadBuilder.put(Optional.of(side), buildQuads(Optional.of(side))); - } - quads = quadBuilder.build(); - } + //} } private IBakedModel getBlockModel(ModelManager manager, Optional opt) { @@ -219,20 +208,6 @@ public class SpecialFlowerModel implements IModelCustomData { return manager.getModel(loc); } - private ImmutableList buildQuads(Optional side) { - ImmutableList.Builder builder = ImmutableList.builder(); - - for(IBakedModel model : bakedBlockModels.values()) { - builder.addAll(model.getQuads(null, side.orNull(), 0)); - } - - for(IBakedModel model : bakedItemModels.values()) { - builder.addAll(model.getQuads(null, side.orNull(), 0)); - } - - return builder.build(); - } - @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) From 400f6583adbf6e786423768fe72b20594b5f2b96 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 23:10:22 -0500 Subject: [PATCH 458/935] Fix item models --- .../client/core/handler/MiscellaneousIcons.java | 9 +++------ .../assets/botania/models/item/aesirRing.json | 2 +- .../assets/botania/models/item/ancientWill0.json | 2 +- .../assets/botania/models/item/ancientWill1.json | 2 +- .../assets/botania/models/item/ancientWill2.json | 2 +- .../assets/botania/models/item/ancientWill3.json | 2 +- .../assets/botania/models/item/ancientWill4.json | 2 +- .../assets/botania/models/item/ancientWill5.json | 2 +- .../assets/botania/models/item/auraRing.json | 2 +- .../botania/models/item/auraRingGreater.json | 2 +- .../botania/models/item/autocraftingHalo.json | 2 +- .../assets/botania/models/item/baubleBox.json | 2 +- .../botania/models/item/blackHoleTalisman0.json | 2 +- .../botania/models/item/blackHoleTalisman1.json | 2 +- .../assets/botania/models/item/blackLotus.json | 2 +- .../assets/botania/models/item/bloodPendant.json | 2 +- .../assets/botania/models/item/cacophonium.json | 2 +- .../assets/botania/models/item/clip.json | 2 +- .../assets/botania/models/item/cobbleRod.json | 2 +- .../botania/models/item/corporeaSpark0.json | 2 +- .../botania/models/item/corporeaSpark1.json | 2 +- .../assets/botania/models/item/cosmetic0.json | 2 +- .../assets/botania/models/item/cosmetic1.json | 2 +- .../assets/botania/models/item/cosmetic10.json | 2 +- .../assets/botania/models/item/cosmetic11.json | 2 +- .../assets/botania/models/item/cosmetic12.json | 2 +- .../assets/botania/models/item/cosmetic13.json | 2 +- .../assets/botania/models/item/cosmetic14.json | 2 +- .../assets/botania/models/item/cosmetic15.json | 2 +- .../assets/botania/models/item/cosmetic16.json | 2 +- .../assets/botania/models/item/cosmetic17.json | 2 +- .../assets/botania/models/item/cosmetic18.json | 2 +- .../assets/botania/models/item/cosmetic19.json | 2 +- .../assets/botania/models/item/cosmetic2.json | 2 +- .../assets/botania/models/item/cosmetic20.json | 2 +- .../assets/botania/models/item/cosmetic21.json | 2 +- .../assets/botania/models/item/cosmetic22.json | 2 +- .../assets/botania/models/item/cosmetic23.json | 2 +- .../assets/botania/models/item/cosmetic24.json | 2 +- .../assets/botania/models/item/cosmetic25.json | 2 +- .../assets/botania/models/item/cosmetic26.json | 2 +- .../assets/botania/models/item/cosmetic27.json | 2 +- .../assets/botania/models/item/cosmetic28.json | 2 +- .../assets/botania/models/item/cosmetic29.json | 2 +- .../assets/botania/models/item/cosmetic3.json | 2 +- .../assets/botania/models/item/cosmetic30.json | 2 +- .../assets/botania/models/item/cosmetic31.json | 2 +- .../assets/botania/models/item/cosmetic4.json | 2 +- .../assets/botania/models/item/cosmetic5.json | 2 +- .../assets/botania/models/item/cosmetic6.json | 2 +- .../assets/botania/models/item/cosmetic7.json | 2 +- .../assets/botania/models/item/cosmetic8.json | 2 +- .../assets/botania/models/item/cosmetic9.json | 2 +- .../assets/botania/models/item/craftPattern0.json | 2 +- .../assets/botania/models/item/craftPattern1.json | 2 +- .../assets/botania/models/item/craftPattern2.json | 2 +- .../assets/botania/models/item/craftPattern3.json | 2 +- .../assets/botania/models/item/craftPattern4.json | 2 +- .../assets/botania/models/item/craftPattern5.json | 2 +- .../assets/botania/models/item/craftPattern6.json | 2 +- .../assets/botania/models/item/craftPattern7.json | 2 +- .../assets/botania/models/item/craftPattern8.json | 2 +- .../assets/botania/models/item/craftingHalo.json | 2 +- .../assets/botania/models/item/crystalBow.json | 2 +- .../botania/models/item/crystalBow_pulling_1.json | 2 +- .../botania/models/item/crystalBow_pulling_2.json | 2 +- .../botania/models/item/crystalBow_pulling_3.json | 2 +- .../botania/models/item/crystalBow_pulling_4.json | 2 +- .../botania/models/item/crystalBow_pulling_5.json | 2 +- .../assets/botania/models/item/dammitReddit.json | 2 +- .../assets/botania/models/item/desuGun.json | 2 +- .../assets/botania/models/item/desuGunClip.json | 2 +- .../assets/botania/models/item/dice.json | 2 +- .../assets/botania/models/item/dirtRod.json | 2 +- .../assets/botania/models/item/divaCharm.json | 2 +- .../assets/botania/models/item/diviningRod.json | 2 +- .../assets/botania/models/item/dragonstone.json | 2 +- .../assets/botania/models/item/dreamwoodTwig.json | 2 +- .../resources/assets/botania/models/item/dye.json | 2 +- .../assets/botania/models/item/elementium.json | 2 +- .../assets/botania/models/item/elementiumAxe.json | 2 +- .../botania/models/item/elementiumBoots.json | 2 +- .../botania/models/item/elementiumChest.json | 2 +- .../botania/models/item/elementiumHelm.json | 2 +- .../botania/models/item/elementiumHelmReveal.json | 2 +- .../botania/models/item/elementiumLegs.json | 2 +- .../botania/models/item/elementiumNugget.json | 2 +- .../botania/models/item/elementiumPick.json | 2 +- .../botania/models/item/elementiumShears.json | 2 +- .../botania/models/item/elementiumShovel.json | 2 +- .../botania/models/item/elementiumSword.json | 2 +- .../assets/botania/models/item/elucidator.json | 2 +- .../botania/models/item/enderAirBottle.json | 2 +- .../assets/botania/models/item/enderDagger.json | 2 +- .../assets/botania/models/item/enderHand.json | 2 +- .../assets/botania/models/item/exchangeRod.json | 2 +- .../assets/botania/models/item/fertilizer.json | 2 +- .../assets/botania/models/item/fireRod.json | 2 +- .../assets/botania/models/item/flask.json | 2 +- .../assets/botania/models/item/flask1_0.json | 2 +- .../assets/botania/models/item/flask1_1.json | 2 +- .../assets/botania/models/item/flask1_2.json | 2 +- .../assets/botania/models/item/flask1_3.json | 2 +- .../assets/botania/models/item/flask1_4.json | 2 +- .../assets/botania/models/item/flask1_5.json | 2 +- .../assets/botania/models/item/flightTiara.json | 2 +- .../assets/botania/models/item/flowerBag.json | 2 +- .../assets/botania/models/item/flugelEye.json | 2 +- .../assets/botania/models/item/gaiaIngot.json | 2 +- .../assets/botania/models/item/glassPick.json | 2 +- .../assets/botania/models/item/goldenLaurel.json | 2 +- .../assets/botania/models/item/grassHorn0.json | 2 +- .../assets/botania/models/item/grassHorn1.json | 2 +- .../assets/botania/models/item/grassHorn2.json | 2 +- .../assets/botania/models/item/grassSeeds0.json | 2 +- .../assets/botania/models/item/grassSeeds1.json | 2 +- .../assets/botania/models/item/grassSeeds2.json | 2 +- .../assets/botania/models/item/grassSeeds3.json | 2 +- .../assets/botania/models/item/grassSeeds4.json | 2 +- .../assets/botania/models/item/grassSeeds5.json | 2 +- .../assets/botania/models/item/grassSeeds6.json | 2 +- .../assets/botania/models/item/grassSeeds7.json | 2 +- .../assets/botania/models/item/grassSeeds8.json | 2 +- .../assets/botania/models/item/gravityRod.json | 2 +- .../assets/botania/models/item/holyCloak.json | 2 +- .../assets/botania/models/item/icePendant.json | 2 +- .../assets/botania/models/item/incenseStick.json | 2 +- .../assets/botania/models/item/infiniteFruit.json | 2 +- .../botania/models/item/infiniteFruitBoot.json | 2 +- .../assets/botania/models/item/itemFinder.json | 2 +- .../assets/botania/models/item/keepIvy.json | 2 +- .../assets/botania/models/item/kingKey.json | 2 +- .../assets/botania/models/item/knockbackBelt.json | 2 +- .../assets/botania/models/item/laputaShard.json | 2 +- .../assets/botania/models/item/lavaPendant.json | 2 +- .../assets/botania/models/item/lensBounce.json | 2 +- .../assets/botania/models/item/lensDamage.json | 2 +- .../botania/models/item/lensEfficiency.json | 2 +- .../assets/botania/models/item/lensExplosive.json | 2 +- .../assets/botania/models/item/lensFire.json | 2 +- .../assets/botania/models/item/lensFirework.json | 2 +- .../assets/botania/models/item/lensFlare.json | 2 +- .../assets/botania/models/item/lensGravity.json | 2 +- .../assets/botania/models/item/lensInfluence.json | 2 +- .../assets/botania/models/item/lensLight.json | 2 +- .../assets/botania/models/item/lensMagnet.json | 2 +- .../assets/botania/models/item/lensMine.json | 2 +- .../assets/botania/models/item/lensNormal.json | 2 +- .../assets/botania/models/item/lensPaint.json | 2 +- .../assets/botania/models/item/lensPhantom.json | 2 +- .../assets/botania/models/item/lensPiston.json | 2 +- .../assets/botania/models/item/lensPower.json | 2 +- .../assets/botania/models/item/lensRedirect.json | 2 +- .../assets/botania/models/item/lensSpeed.json | 2 +- .../assets/botania/models/item/lensTime.json | 2 +- .../assets/botania/models/item/lensWarp.json | 2 +- .../assets/botania/models/item/lensWeight.json | 2 +- .../botania/models/item/lexicon_default.json | 2 +- .../assets/botania/models/item/lifeEssence.json | 2 +- .../assets/botania/models/item/livingwoodBow.json | 2 +- .../models/item/livingwoodBow_pulling_1.json | 2 +- .../models/item/livingwoodBow_pulling_2.json | 2 +- .../models/item/livingwoodBow_pulling_3.json | 2 +- .../botania/models/item/livingwoodTwig.json | 2 +- .../assets/botania/models/item/lokiRing.json | 2 +- .../botania/models/item/magnetRingGreaterOff.json | 2 +- .../botania/models/item/magnetRingGreaterOn.json | 2 +- .../assets/botania/models/item/magnetRingOff.json | 2 +- .../assets/botania/models/item/magnetRingOn.json | 2 +- .../assets/botania/models/item/manaBottle0.json | 2 +- .../assets/botania/models/item/manaBottle1.json | 2 +- .../assets/botania/models/item/manaBottle2.json | 2 +- .../assets/botania/models/item/manaBottle3.json | 2 +- .../assets/botania/models/item/manaBottle4.json | 2 +- .../assets/botania/models/item/manaBottle5.json | 2 +- .../assets/botania/models/item/manaCookie.json | 2 +- .../assets/botania/models/item/manaDiamond.json | 2 +- .../assets/botania/models/item/manaGun.json | 2 +- .../assets/botania/models/item/manaGunClip.json | 2 +- .../assets/botania/models/item/manaInkwell.json | 2 +- .../assets/botania/models/item/manaMirror.json | 2 +- .../assets/botania/models/item/manaPearl.json | 2 +- .../assets/botania/models/item/manaPowder.json | 2 +- .../assets/botania/models/item/manaRing.json | 2 +- .../botania/models/item/manaRingGreater.json | 2 +- .../assets/botania/models/item/manaString.json | 2 +- .../assets/botania/models/item/manaTablet.json | 2 +- .../assets/botania/models/item/manasteel.json | 2 +- .../assets/botania/models/item/manasteelAxe.json | 2 +- .../botania/models/item/manasteelBoots.json | 2 +- .../botania/models/item/manasteelChest.json | 2 +- .../assets/botania/models/item/manasteelHelm.json | 2 +- .../botania/models/item/manasteelHelmReveal.json | 2 +- .../assets/botania/models/item/manasteelLegs.json | 2 +- .../botania/models/item/manasteelNugget.json | 2 +- .../assets/botania/models/item/manasteelPick.json | 2 +- .../botania/models/item/manasteelShears.json | 2 +- .../botania/models/item/manasteelShovel.json | 2 +- .../botania/models/item/manasteelSword.json | 2 +- .../botania/models/item/manaweaveBoots.json | 2 +- .../models/item/manaweaveBootsHoliday.json | 2 +- .../botania/models/item/manaweaveChest.json | 2 +- .../models/item/manaweaveChestHoliday.json | 2 +- .../botania/models/item/manaweaveCloth.json | 2 +- .../assets/botania/models/item/manaweaveHelm.json | 2 +- .../botania/models/item/manaweaveHelmHoliday.json | 2 +- .../assets/botania/models/item/manaweaveLegs.json | 2 +- .../botania/models/item/manaweaveLegsHoliday.json | 2 +- .../assets/botania/models/item/miningRing.json | 2 +- .../assets/botania/models/item/missileRod.json | 2 +- .../assets/botania/models/item/monocle.json | 2 +- .../botania/models/item/obedienceStick.json | 2 +- .../assets/botania/models/item/odinRing.json | 2 +- .../assets/botania/models/item/openBucket.json | 2 +- .../botania/models/item/overgrowthSeed.json | 2 +- .../assets/botania/models/item/pebble.json | 2 +- .../botania/models/item/pestleAndMortar.json | 2 +- .../assets/botania/models/item/petal.json | 2 +- .../assets/botania/models/item/phantomInk.json | 2 +- .../assets/botania/models/item/pinkinator.json | 2 +- .../assets/botania/models/item/pixieDust.json | 2 +- .../assets/botania/models/item/pixieRing.json | 2 +- .../assets/botania/models/item/placeholder.json | 2 +- .../assets/botania/models/item/poolMinecart.json | 2 +- .../botania/models/item/prismarineShard.json | 2 +- .../assets/botania/models/item/quartz0.json | 2 +- .../assets/botania/models/item/quartz1.json | 2 +- .../assets/botania/models/item/quartz2.json | 2 +- .../assets/botania/models/item/quartz3.json | 2 +- .../assets/botania/models/item/quartz4.json | 2 +- .../assets/botania/models/item/quartz5.json | 2 +- .../assets/botania/models/item/quartz6.json | 2 +- .../assets/botania/models/item/rainbowRod.json | 2 +- .../assets/botania/models/item/reachRing.json | 2 +- .../assets/botania/models/item/recordGaia1.json | 2 +- .../assets/botania/models/item/recordGaia2.json | 2 +- .../assets/botania/models/item/redString.json | 2 +- .../assets/botania/models/item/redstoneRoot.json | 2 +- .../assets/botania/models/item/regenIvy.json | 2 +- .../assets/botania/models/item/root.json | 2 +- .../assets/botania/models/item/rune_air.json | 2 +- .../assets/botania/models/item/rune_autumn.json | 2 +- .../assets/botania/models/item/rune_earth.json | 2 +- .../assets/botania/models/item/rune_envy.json | 2 +- .../assets/botania/models/item/rune_fire.json | 2 +- .../assets/botania/models/item/rune_gluttony.json | 2 +- .../assets/botania/models/item/rune_greed.json | 2 +- .../assets/botania/models/item/rune_lust.json | 2 +- .../assets/botania/models/item/rune_mana.json | 2 +- .../assets/botania/models/item/rune_pride.json | 2 +- .../assets/botania/models/item/rune_sloth.json | 2 +- .../assets/botania/models/item/rune_spring.json | 2 +- .../assets/botania/models/item/rune_summer.json | 2 +- .../assets/botania/models/item/rune_water.json | 2 +- .../assets/botania/models/item/rune_winter.json | 2 +- .../assets/botania/models/item/rune_wrath.json | 2 +- .../assets/botania/models/item/sextant.json | 2 +- .../assets/botania/models/item/signalFlare.json | 2 +- .../assets/botania/models/item/skyDirtRod.json | 2 +- .../assets/botania/models/item/slimeBottle0.json | 2 +- .../assets/botania/models/item/slimeBottle1.json | 2 +- .../assets/botania/models/item/slingshot.json | 2 +- .../assets/botania/models/item/smeltRod.json | 2 +- .../assets/botania/models/item/spark.json | 2 +- .../assets/botania/models/item/sparkUpgrade0.json | 2 +- .../assets/botania/models/item/sparkUpgrade1.json | 2 +- .../assets/botania/models/item/sparkUpgrade2.json | 2 +- .../assets/botania/models/item/sparkUpgrade3.json | 2 +- .../assets/botania/models/item/spawnerMover.json | 2 +- .../botania/models/item/spawnerMoverFull.json | 2 +- .../assets/botania/models/item/speedUpBelt.json | 2 +- .../assets/botania/models/item/spellCloth.json | 2 +- .../assets/botania/models/item/standard_item.json | 15 --------------- .../assets/botania/models/item/standard_tool.json | 15 --------------- .../assets/botania/models/item/starSword.json | 2 +- .../botania/models/item/superLavaPendant.json | 2 +- .../botania/models/item/superTravelBelt.json | 2 +- .../assets/botania/models/item/swapRing.json | 2 +- .../botania/models/item/temperanceStone0.json | 2 +- .../botania/models/item/temperanceStone1.json | 2 +- .../assets/botania/models/item/terraAxe0.json | 2 +- .../assets/botania/models/item/terraAxe1.json | 2 +- .../assets/botania/models/item/terraPick.json | 2 +- .../botania/models/item/terraPickEnabled.json | 2 +- .../botania/models/item/terraPickTipped.json | 2 +- .../models/item/terraPickTippedEnabled.json | 2 +- .../assets/botania/models/item/terraSword.json | 2 +- .../assets/botania/models/item/terraformRod.json | 2 +- .../assets/botania/models/item/terrasteel.json | 2 +- .../botania/models/item/terrasteelBoots.json | 2 +- .../botania/models/item/terrasteelChest.json | 2 +- .../botania/models/item/terrasteelHelm.json | 2 +- .../botania/models/item/terrasteelHelmReveal.json | 2 +- .../botania/models/item/terrasteelLegs.json | 2 +- .../botania/models/item/terrasteelNugget.json | 2 +- .../assets/botania/models/item/thorRing.json | 2 +- .../assets/botania/models/item/thornChakram0.json | 2 +- .../assets/botania/models/item/thornChakram1.json | 2 +- .../assets/botania/models/item/thunderSword.json | 2 +- .../assets/botania/models/item/tinyPlanet.json | 2 +- .../assets/botania/models/item/tornadoRod.json | 2 +- .../botania/models/item/tornadoRod_flying.json | 2 +- .../assets/botania/models/item/totalBiscuit.json | 2 +- .../assets/botania/models/item/travelBelt.json | 2 +- .../assets/botania/models/item/twigWand.json | 2 +- .../assets/botania/models/item/twigWand_bind.json | 2 +- .../assets/botania/models/item/unholyCloak.json | 2 +- .../assets/botania/models/item/vial.json | 2 +- .../assets/botania/models/item/vial1_0.json | 2 +- .../assets/botania/models/item/vial1_1.json | 2 +- .../assets/botania/models/item/vial1_2.json | 2 +- .../assets/botania/models/item/vial1_3.json | 2 +- .../assets/botania/models/item/vineBall.json | 2 +- .../assets/botania/models/item/virus0.json | 2 +- .../assets/botania/models/item/virus1.json | 2 +- .../assets/botania/models/item/vuvuzela.json | 2 +- .../assets/botania/models/item/waterRing.json | 2 +- .../assets/botania/models/item/waterRod.json | 2 +- .../assets/botania/models/item/worldSeed.json | 2 +- 319 files changed, 319 insertions(+), 352 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/item/standard_item.json delete mode 100644 src/main/resources/assets/botania/models/item/standard_tool.json 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 674ee39b7..170a4286b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -87,14 +87,11 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { - - System.out.println(evt.getModelRegistry().getObject(new ModelResourceLocation("botania:daybloom", "normal"))); - - // Floating flowers - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + // Floating flowers todo 1.9 + /*evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE);*/ // Pylon item model evt.getModelRegistry().putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); diff --git a/src/main/resources/assets/botania/models/item/aesirRing.json b/src/main/resources/assets/botania/models/item/aesirRing.json index 9e7de648c..37830baf7 100644 --- a/src/main/resources/assets/botania/models/item/aesirRing.json +++ b/src/main/resources/assets/botania/models/item/aesirRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/aesirRing" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill0.json b/src/main/resources/assets/botania/models/item/ancientWill0.json index 4dd285d60..8617367b9 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill0.json +++ b/src/main/resources/assets/botania/models/item/ancientWill0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill0" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill1.json b/src/main/resources/assets/botania/models/item/ancientWill1.json index 02874c8ac..03d79a318 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill1.json +++ b/src/main/resources/assets/botania/models/item/ancientWill1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill1" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill2.json b/src/main/resources/assets/botania/models/item/ancientWill2.json index 13bf9704c..2b671db8b 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill2.json +++ b/src/main/resources/assets/botania/models/item/ancientWill2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill2" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill3.json b/src/main/resources/assets/botania/models/item/ancientWill3.json index 42b1f4b7c..7cf9afaaa 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill3.json +++ b/src/main/resources/assets/botania/models/item/ancientWill3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill3" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill4.json b/src/main/resources/assets/botania/models/item/ancientWill4.json index c84a8c87b..118f3951f 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill4.json +++ b/src/main/resources/assets/botania/models/item/ancientWill4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill4" } diff --git a/src/main/resources/assets/botania/models/item/ancientWill5.json b/src/main/resources/assets/botania/models/item/ancientWill5.json index 1c279ec47..62aef6264 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill5.json +++ b/src/main/resources/assets/botania/models/item/ancientWill5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/ancientWill5" } diff --git a/src/main/resources/assets/botania/models/item/auraRing.json b/src/main/resources/assets/botania/models/item/auraRing.json index ccc958d23..2f617e0f8 100644 --- a/src/main/resources/assets/botania/models/item/auraRing.json +++ b/src/main/resources/assets/botania/models/item/auraRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/auraRing" } diff --git a/src/main/resources/assets/botania/models/item/auraRingGreater.json b/src/main/resources/assets/botania/models/item/auraRingGreater.json index 1215d4ffa..0d64d8dcc 100644 --- a/src/main/resources/assets/botania/models/item/auraRingGreater.json +++ b/src/main/resources/assets/botania/models/item/auraRingGreater.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/auraRingGreater" } diff --git a/src/main/resources/assets/botania/models/item/autocraftingHalo.json b/src/main/resources/assets/botania/models/item/autocraftingHalo.json index b03d9d979..14b837d15 100644 --- a/src/main/resources/assets/botania/models/item/autocraftingHalo.json +++ b/src/main/resources/assets/botania/models/item/autocraftingHalo.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/autocraftingHalo" } diff --git a/src/main/resources/assets/botania/models/item/baubleBox.json b/src/main/resources/assets/botania/models/item/baubleBox.json index 42bb781a5..1e3b1ba76 100644 --- a/src/main/resources/assets/botania/models/item/baubleBox.json +++ b/src/main/resources/assets/botania/models/item/baubleBox.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/baubleBox" } diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json index ee4eb3ffe..b089c2d16 100644 --- a/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json +++ b/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/blackHoleTalisman0" } diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json index d15a97712..946207626 100644 --- a/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json +++ b/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/blackHoleTalisman1" } diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus.json index 0fdd68e10..6a3582c0b 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus.json +++ b/src/main/resources/assets/botania/models/item/blackLotus.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/blackLotus" diff --git a/src/main/resources/assets/botania/models/item/bloodPendant.json b/src/main/resources/assets/botania/models/item/bloodPendant.json index 5a9531414..2337a14c1 100644 --- a/src/main/resources/assets/botania/models/item/bloodPendant.json +++ b/src/main/resources/assets/botania/models/item/bloodPendant.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/bloodPendant0", "layer1": "botania:items/bloodPendant1" diff --git a/src/main/resources/assets/botania/models/item/cacophonium.json b/src/main/resources/assets/botania/models/item/cacophonium.json index ba68f4a7b..69c801cc9 100644 --- a/src/main/resources/assets/botania/models/item/cacophonium.json +++ b/src/main/resources/assets/botania/models/item/cacophonium.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cacophonium" } diff --git a/src/main/resources/assets/botania/models/item/clip.json b/src/main/resources/assets/botania/models/item/clip.json index f19848b8b..2c3dcb79b 100644 --- a/src/main/resources/assets/botania/models/item/clip.json +++ b/src/main/resources/assets/botania/models/item/clip.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/clip" } diff --git a/src/main/resources/assets/botania/models/item/cobbleRod.json b/src/main/resources/assets/botania/models/item/cobbleRod.json index 9a2f5d672..ea5426796 100644 --- a/src/main/resources/assets/botania/models/item/cobbleRod.json +++ b/src/main/resources/assets/botania/models/item/cobbleRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/cobbleRod" } diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark0.json b/src/main/resources/assets/botania/models/item/corporeaSpark0.json index 6c73c74a6..879f117b2 100644 --- a/src/main/resources/assets/botania/models/item/corporeaSpark0.json +++ b/src/main/resources/assets/botania/models/item/corporeaSpark0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/corporeaSpark0" } diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark1.json b/src/main/resources/assets/botania/models/item/corporeaSpark1.json index df14fff6c..609037769 100644 --- a/src/main/resources/assets/botania/models/item/corporeaSpark1.json +++ b/src/main/resources/assets/botania/models/item/corporeaSpark1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/corporeaSpark2" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic0.json b/src/main/resources/assets/botania/models/item/cosmetic0.json index c21767177..05319e567 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic0.json +++ b/src/main/resources/assets/botania/models/item/cosmetic0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic0" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic1.json b/src/main/resources/assets/botania/models/item/cosmetic1.json index 86461ba47..353718385 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic1.json +++ b/src/main/resources/assets/botania/models/item/cosmetic1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic1" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic10.json b/src/main/resources/assets/botania/models/item/cosmetic10.json index e2bd52a37..8424e5f24 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic10.json +++ b/src/main/resources/assets/botania/models/item/cosmetic10.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic10" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic11.json b/src/main/resources/assets/botania/models/item/cosmetic11.json index 9c091a21c..9baf07d99 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic11.json +++ b/src/main/resources/assets/botania/models/item/cosmetic11.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic11" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic12.json b/src/main/resources/assets/botania/models/item/cosmetic12.json index fe4fa6bc6..adb31cc16 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic12.json +++ b/src/main/resources/assets/botania/models/item/cosmetic12.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic12" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic13.json b/src/main/resources/assets/botania/models/item/cosmetic13.json index be7fbcbdf..6d791a5f1 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic13.json +++ b/src/main/resources/assets/botania/models/item/cosmetic13.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic13" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic14.json b/src/main/resources/assets/botania/models/item/cosmetic14.json index ed958d7c7..848e34ee2 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic14.json +++ b/src/main/resources/assets/botania/models/item/cosmetic14.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic14" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic15.json b/src/main/resources/assets/botania/models/item/cosmetic15.json index 0430c2229..f78360c75 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic15.json +++ b/src/main/resources/assets/botania/models/item/cosmetic15.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic15" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic16.json b/src/main/resources/assets/botania/models/item/cosmetic16.json index 5c0a0496a..3888367d5 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic16.json +++ b/src/main/resources/assets/botania/models/item/cosmetic16.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic16" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic17.json b/src/main/resources/assets/botania/models/item/cosmetic17.json index 153cf8a26..a68202b04 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic17.json +++ b/src/main/resources/assets/botania/models/item/cosmetic17.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic17" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic18.json b/src/main/resources/assets/botania/models/item/cosmetic18.json index fbfa8eba3..ee361c66b 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic18.json +++ b/src/main/resources/assets/botania/models/item/cosmetic18.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic18" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic19.json b/src/main/resources/assets/botania/models/item/cosmetic19.json index 81ee5c402..2453f46fc 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic19.json +++ b/src/main/resources/assets/botania/models/item/cosmetic19.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic19" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic2.json b/src/main/resources/assets/botania/models/item/cosmetic2.json index 711621f63..b4b8ed169 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic2.json +++ b/src/main/resources/assets/botania/models/item/cosmetic2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic2" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic20.json b/src/main/resources/assets/botania/models/item/cosmetic20.json index 435ff9a12..b25f5fef0 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic20.json +++ b/src/main/resources/assets/botania/models/item/cosmetic20.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic20" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic21.json b/src/main/resources/assets/botania/models/item/cosmetic21.json index a1b4a1be5..7a9fd9b7b 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic21.json +++ b/src/main/resources/assets/botania/models/item/cosmetic21.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic21" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic22.json b/src/main/resources/assets/botania/models/item/cosmetic22.json index 91fc7d1ee..2c37a5f6b 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic22.json +++ b/src/main/resources/assets/botania/models/item/cosmetic22.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic22" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic23.json b/src/main/resources/assets/botania/models/item/cosmetic23.json index 791973a85..1457a1004 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic23.json +++ b/src/main/resources/assets/botania/models/item/cosmetic23.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic23" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic24.json b/src/main/resources/assets/botania/models/item/cosmetic24.json index 58b15d875..d1b40906c 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic24.json +++ b/src/main/resources/assets/botania/models/item/cosmetic24.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic24" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic25.json b/src/main/resources/assets/botania/models/item/cosmetic25.json index 3bb2b429d..100e5ed66 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic25.json +++ b/src/main/resources/assets/botania/models/item/cosmetic25.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic25" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic26.json b/src/main/resources/assets/botania/models/item/cosmetic26.json index c4c675625..df663990d 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic26.json +++ b/src/main/resources/assets/botania/models/item/cosmetic26.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic26" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic27.json b/src/main/resources/assets/botania/models/item/cosmetic27.json index b7ee3c3f8..c8efaf7ea 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic27.json +++ b/src/main/resources/assets/botania/models/item/cosmetic27.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic27" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic28.json b/src/main/resources/assets/botania/models/item/cosmetic28.json index ccdae76cb..422c93dc4 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic28.json +++ b/src/main/resources/assets/botania/models/item/cosmetic28.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic28" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic29.json b/src/main/resources/assets/botania/models/item/cosmetic29.json index c3026116a..f155bc45c 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic29.json +++ b/src/main/resources/assets/botania/models/item/cosmetic29.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic29" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic3.json b/src/main/resources/assets/botania/models/item/cosmetic3.json index cb4be742f..25ac4b137 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic3.json +++ b/src/main/resources/assets/botania/models/item/cosmetic3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic3" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic30.json b/src/main/resources/assets/botania/models/item/cosmetic30.json index 7520cffd7..95cc7e0b0 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic30.json +++ b/src/main/resources/assets/botania/models/item/cosmetic30.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic30" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic31.json b/src/main/resources/assets/botania/models/item/cosmetic31.json index 299fdec7b..d49c6cd54 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic31.json +++ b/src/main/resources/assets/botania/models/item/cosmetic31.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic31" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic4.json b/src/main/resources/assets/botania/models/item/cosmetic4.json index 38646a52b..4db1110ee 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic4.json +++ b/src/main/resources/assets/botania/models/item/cosmetic4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic4" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic5.json b/src/main/resources/assets/botania/models/item/cosmetic5.json index 4e3050457..d9a9f659e 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic5.json +++ b/src/main/resources/assets/botania/models/item/cosmetic5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic5" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic6.json b/src/main/resources/assets/botania/models/item/cosmetic6.json index 0fb7e4e1f..ccefd13d8 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic6.json +++ b/src/main/resources/assets/botania/models/item/cosmetic6.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic6" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic7.json b/src/main/resources/assets/botania/models/item/cosmetic7.json index 13765b50d..9ff1bb095 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic7.json +++ b/src/main/resources/assets/botania/models/item/cosmetic7.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic7" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic8.json b/src/main/resources/assets/botania/models/item/cosmetic8.json index cb8561530..7a26eab2e 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic8.json +++ b/src/main/resources/assets/botania/models/item/cosmetic8.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic8" } diff --git a/src/main/resources/assets/botania/models/item/cosmetic9.json b/src/main/resources/assets/botania/models/item/cosmetic9.json index bd7367371..a7219ce06 100644 --- a/src/main/resources/assets/botania/models/item/cosmetic9.json +++ b/src/main/resources/assets/botania/models/item/cosmetic9.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/cosmetic9" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern0.json b/src/main/resources/assets/botania/models/item/craftPattern0.json index 0165bface..d26639414 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern0.json +++ b/src/main/resources/assets/botania/models/item/craftPattern0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern0" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern1.json b/src/main/resources/assets/botania/models/item/craftPattern1.json index a6bd5c7df..1e82f5781 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern1.json +++ b/src/main/resources/assets/botania/models/item/craftPattern1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern1" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern2.json b/src/main/resources/assets/botania/models/item/craftPattern2.json index 584762ee1..4481706af 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern2.json +++ b/src/main/resources/assets/botania/models/item/craftPattern2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern2" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern3.json b/src/main/resources/assets/botania/models/item/craftPattern3.json index c59caed4a..d784cfb24 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern3.json +++ b/src/main/resources/assets/botania/models/item/craftPattern3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern3" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern4.json b/src/main/resources/assets/botania/models/item/craftPattern4.json index 520c567b7..ff3d3db91 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern4.json +++ b/src/main/resources/assets/botania/models/item/craftPattern4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern4" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern5.json b/src/main/resources/assets/botania/models/item/craftPattern5.json index cf605973d..ec69319d2 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern5.json +++ b/src/main/resources/assets/botania/models/item/craftPattern5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern5" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern6.json b/src/main/resources/assets/botania/models/item/craftPattern6.json index 50d49ee7a..7ed12fe2c 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern6.json +++ b/src/main/resources/assets/botania/models/item/craftPattern6.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern6" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern7.json b/src/main/resources/assets/botania/models/item/craftPattern7.json index 8bdfc0d45..5b6be2d6f 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern7.json +++ b/src/main/resources/assets/botania/models/item/craftPattern7.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern7" } diff --git a/src/main/resources/assets/botania/models/item/craftPattern8.json b/src/main/resources/assets/botania/models/item/craftPattern8.json index e40bcb68b..9561616e3 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern8.json +++ b/src/main/resources/assets/botania/models/item/craftPattern8.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftPattern8" } diff --git a/src/main/resources/assets/botania/models/item/craftingHalo.json b/src/main/resources/assets/botania/models/item/craftingHalo.json index 6a15c3bf6..967f53d58 100644 --- a/src/main/resources/assets/botania/models/item/craftingHalo.json +++ b/src/main/resources/assets/botania/models/item/craftingHalo.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/craftingHalo" } diff --git a/src/main/resources/assets/botania/models/item/crystalBow.json b/src/main/resources/assets/botania/models/item/crystalBow.json index e76376fa3..5a74c461d 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow.json +++ b/src/main/resources/assets/botania/models/item/crystalBow.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow0" }, diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json index 2e13b0c39..49eb6a52d 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow1" }, diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json index 2b2289c0e..b9d9be952 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow2" }, diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json index dcc6f9644..d3bd453a3 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow3" }, diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json index 860caf32f..f147d6408 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow4" }, diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json index 35e5b8261..6e987537e 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/crystalBow5" }, diff --git a/src/main/resources/assets/botania/models/item/dammitReddit.json b/src/main/resources/assets/botania/models/item/dammitReddit.json index 99039e501..816e1b861 100644 --- a/src/main/resources/assets/botania/models/item/dammitReddit.json +++ b/src/main/resources/assets/botania/models/item/dammitReddit.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/dammitReddit" } diff --git a/src/main/resources/assets/botania/models/item/desuGun.json b/src/main/resources/assets/botania/models/item/desuGun.json index 758cff51a..91bbace8f 100644 --- a/src/main/resources/assets/botania/models/item/desuGun.json +++ b/src/main/resources/assets/botania/models/item/desuGun.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/desuGun0", "layer1": "botania:items/desuGun1" diff --git a/src/main/resources/assets/botania/models/item/desuGunClip.json b/src/main/resources/assets/botania/models/item/desuGunClip.json index 8c966f328..7574143b7 100644 --- a/src/main/resources/assets/botania/models/item/desuGunClip.json +++ b/src/main/resources/assets/botania/models/item/desuGunClip.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/desuGun2", "layer1": "botania:items/desuGun1" diff --git a/src/main/resources/assets/botania/models/item/dice.json b/src/main/resources/assets/botania/models/item/dice.json index cb70446e0..3c615ae98 100644 --- a/src/main/resources/assets/botania/models/item/dice.json +++ b/src/main/resources/assets/botania/models/item/dice.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/dice" } diff --git a/src/main/resources/assets/botania/models/item/dirtRod.json b/src/main/resources/assets/botania/models/item/dirtRod.json index 7040c9163..034a169d2 100644 --- a/src/main/resources/assets/botania/models/item/dirtRod.json +++ b/src/main/resources/assets/botania/models/item/dirtRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/dirtRod" } diff --git a/src/main/resources/assets/botania/models/item/divaCharm.json b/src/main/resources/assets/botania/models/item/divaCharm.json index c20e146c3..e2d73329d 100644 --- a/src/main/resources/assets/botania/models/item/divaCharm.json +++ b/src/main/resources/assets/botania/models/item/divaCharm.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/divaCharm" } diff --git a/src/main/resources/assets/botania/models/item/diviningRod.json b/src/main/resources/assets/botania/models/item/diviningRod.json index b349ab832..44661ba77 100644 --- a/src/main/resources/assets/botania/models/item/diviningRod.json +++ b/src/main/resources/assets/botania/models/item/diviningRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/diviningRod" } diff --git a/src/main/resources/assets/botania/models/item/dragonstone.json b/src/main/resources/assets/botania/models/item/dragonstone.json index fe4171316..0e9f6ca20 100644 --- a/src/main/resources/assets/botania/models/item/dragonstone.json +++ b/src/main/resources/assets/botania/models/item/dragonstone.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/dragonstone" diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json index ad4cc65c0..6e8f6e582 100644 --- a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/dreamwoodTwig.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/dreamwoodTwig" diff --git a/src/main/resources/assets/botania/models/item/dye.json b/src/main/resources/assets/botania/models/item/dye.json index fc07382cb..40752703b 100644 --- a/src/main/resources/assets/botania/models/item/dye.json +++ b/src/main/resources/assets/botania/models/item/dye.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/dye" } diff --git a/src/main/resources/assets/botania/models/item/elementium.json b/src/main/resources/assets/botania/models/item/elementium.json index 20557e911..cb7932dd9 100644 --- a/src/main/resources/assets/botania/models/item/elementium.json +++ b/src/main/resources/assets/botania/models/item/elementium.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementium" diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/elementiumAxe.json index fde365304..dff087e23 100644 --- a/src/main/resources/assets/botania/models/item/elementiumAxe.json +++ b/src/main/resources/assets/botania/models/item/elementiumAxe.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elementiumAxe" diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumBoots.json index 3b3eac354..2e191683e 100644 --- a/src/main/resources/assets/botania/models/item/elementiumBoots.json +++ b/src/main/resources/assets/botania/models/item/elementiumBoots.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumBoots" diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumChest.json index abd22195e..4d9c37adc 100644 --- a/src/main/resources/assets/botania/models/item/elementiumChest.json +++ b/src/main/resources/assets/botania/models/item/elementiumChest.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumChest" diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumHelm.json index d599aa5b3..85fa4d453 100644 --- a/src/main/resources/assets/botania/models/item/elementiumHelm.json +++ b/src/main/resources/assets/botania/models/item/elementiumHelm.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumHelm" diff --git a/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json b/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json index d30c83b55..4a9cc954a 100644 --- a/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json +++ b/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumHelmReveal" } diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumLegs.json index 4f5b4eda4..40e24a6cf 100644 --- a/src/main/resources/assets/botania/models/item/elementiumLegs.json +++ b/src/main/resources/assets/botania/models/item/elementiumLegs.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumLegs" diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json index 4083a6e44..55a651884 100644 --- a/src/main/resources/assets/botania/models/item/elementiumNugget.json +++ b/src/main/resources/assets/botania/models/item/elementiumNugget.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/elementiumNugget" diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumPick.json index 4c71badcf..49405a587 100644 --- a/src/main/resources/assets/botania/models/item/elementiumPick.json +++ b/src/main/resources/assets/botania/models/item/elementiumPick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elementiumPick" diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json index c7c41a82c..d7b2f9a53 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elementiumShears" diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumShovel.json index cda4564a9..eca40c561 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShovel.json +++ b/src/main/resources/assets/botania/models/item/elementiumShovel.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elementiumShovel" diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumSword.json index e5f75013b..117839d5b 100644 --- a/src/main/resources/assets/botania/models/item/elementiumSword.json +++ b/src/main/resources/assets/botania/models/item/elementiumSword.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elementiumSword" diff --git a/src/main/resources/assets/botania/models/item/elucidator.json b/src/main/resources/assets/botania/models/item/elucidator.json index c79526c8f..5c3f73668 100644 --- a/src/main/resources/assets/botania/models/item/elucidator.json +++ b/src/main/resources/assets/botania/models/item/elucidator.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/elucidator" } diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderAirBottle.json index ba6b1497e..f20925d88 100644 --- a/src/main/resources/assets/botania/models/item/enderAirBottle.json +++ b/src/main/resources/assets/botania/models/item/enderAirBottle.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/enderAirBottle" diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json index c80b02fd6..602e83a3a 100644 --- a/src/main/resources/assets/botania/models/item/enderDagger.json +++ b/src/main/resources/assets/botania/models/item/enderDagger.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/enderDagger0", "layer1": "botania:items/enderDagger1" diff --git a/src/main/resources/assets/botania/models/item/enderHand.json b/src/main/resources/assets/botania/models/item/enderHand.json index 910b8b5ee..a559e70ca 100644 --- a/src/main/resources/assets/botania/models/item/enderHand.json +++ b/src/main/resources/assets/botania/models/item/enderHand.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/enderHand" } diff --git a/src/main/resources/assets/botania/models/item/exchangeRod.json b/src/main/resources/assets/botania/models/item/exchangeRod.json index 8260f0300..e96848b86 100644 --- a/src/main/resources/assets/botania/models/item/exchangeRod.json +++ b/src/main/resources/assets/botania/models/item/exchangeRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/exchangeRod" } diff --git a/src/main/resources/assets/botania/models/item/fertilizer.json b/src/main/resources/assets/botania/models/item/fertilizer.json index b127789a4..7091df8f2 100644 --- a/src/main/resources/assets/botania/models/item/fertilizer.json +++ b/src/main/resources/assets/botania/models/item/fertilizer.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/fertilizer" } diff --git a/src/main/resources/assets/botania/models/item/fireRod.json b/src/main/resources/assets/botania/models/item/fireRod.json index 221c33214..29197907c 100644 --- a/src/main/resources/assets/botania/models/item/fireRod.json +++ b/src/main/resources/assets/botania/models/item/fireRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/fireRod" } diff --git a/src/main/resources/assets/botania/models/item/flask.json b/src/main/resources/assets/botania/models/item/flask.json index c928472fa..f0aae6e37 100644 --- a/src/main/resources/assets/botania/models/item/flask.json +++ b/src/main/resources/assets/botania/models/item/flask.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0" } diff --git a/src/main/resources/assets/botania/models/item/flask1_0.json b/src/main/resources/assets/botania/models/item/flask1_0.json index 0a1e36b81..b0f86a4c0 100644 --- a/src/main/resources/assets/botania/models/item/flask1_0.json +++ b/src/main/resources/assets/botania/models/item/flask1_0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_0" diff --git a/src/main/resources/assets/botania/models/item/flask1_1.json b/src/main/resources/assets/botania/models/item/flask1_1.json index 1bb57f645..28bde93e6 100644 --- a/src/main/resources/assets/botania/models/item/flask1_1.json +++ b/src/main/resources/assets/botania/models/item/flask1_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_1" diff --git a/src/main/resources/assets/botania/models/item/flask1_2.json b/src/main/resources/assets/botania/models/item/flask1_2.json index 2b9e5bd7b..f73c37e2b 100644 --- a/src/main/resources/assets/botania/models/item/flask1_2.json +++ b/src/main/resources/assets/botania/models/item/flask1_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_2" diff --git a/src/main/resources/assets/botania/models/item/flask1_3.json b/src/main/resources/assets/botania/models/item/flask1_3.json index f12b33a32..89e0e1bbf 100644 --- a/src/main/resources/assets/botania/models/item/flask1_3.json +++ b/src/main/resources/assets/botania/models/item/flask1_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_3" diff --git a/src/main/resources/assets/botania/models/item/flask1_4.json b/src/main/resources/assets/botania/models/item/flask1_4.json index 7d206c59a..376f77b3f 100644 --- a/src/main/resources/assets/botania/models/item/flask1_4.json +++ b/src/main/resources/assets/botania/models/item/flask1_4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_4" diff --git a/src/main/resources/assets/botania/models/item/flask1_5.json b/src/main/resources/assets/botania/models/item/flask1_5.json index 02f2c4061..947e2636e 100644 --- a/src/main/resources/assets/botania/models/item/flask1_5.json +++ b/src/main/resources/assets/botania/models/item/flask1_5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flask0", "layer1": "botania:items/flask1_5" diff --git a/src/main/resources/assets/botania/models/item/flightTiara.json b/src/main/resources/assets/botania/models/item/flightTiara.json index 8b234b549..bcf6b570f 100644 --- a/src/main/resources/assets/botania/models/item/flightTiara.json +++ b/src/main/resources/assets/botania/models/item/flightTiara.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flightTiara0" } diff --git a/src/main/resources/assets/botania/models/item/flowerBag.json b/src/main/resources/assets/botania/models/item/flowerBag.json index 6e2f4268d..1a4958f59 100644 --- a/src/main/resources/assets/botania/models/item/flowerBag.json +++ b/src/main/resources/assets/botania/models/item/flowerBag.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flowerBag" } diff --git a/src/main/resources/assets/botania/models/item/flugelEye.json b/src/main/resources/assets/botania/models/item/flugelEye.json index 95fa6d467..5bcb64fdb 100644 --- a/src/main/resources/assets/botania/models/item/flugelEye.json +++ b/src/main/resources/assets/botania/models/item/flugelEye.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/flugelEye" } diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaIngot.json index 03650aabd..e472b6ee8 100644 --- a/src/main/resources/assets/botania/models/item/gaiaIngot.json +++ b/src/main/resources/assets/botania/models/item/gaiaIngot.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/gaiaIngot" diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/glassPick.json index ae9b40053..285214c5c 100644 --- a/src/main/resources/assets/botania/models/item/glassPick.json +++ b/src/main/resources/assets/botania/models/item/glassPick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/glassPick" diff --git a/src/main/resources/assets/botania/models/item/goldenLaurel.json b/src/main/resources/assets/botania/models/item/goldenLaurel.json index d2f97da5b..8c78ef8f7 100644 --- a/src/main/resources/assets/botania/models/item/goldenLaurel.json +++ b/src/main/resources/assets/botania/models/item/goldenLaurel.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/goldenLaurel" } diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grassHorn0.json index cfa93bea9..0109ba579 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn0.json +++ b/src/main/resources/assets/botania/models/item/grassHorn0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn0" } diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grassHorn1.json index 14eb11e09..179d15288 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn1.json +++ b/src/main/resources/assets/botania/models/item/grassHorn1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn1" } diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grassHorn2.json index f6ffb7eef..e77f4e412 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn2.json +++ b/src/main/resources/assets/botania/models/item/grassHorn2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn2" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds0.json b/src/main/resources/assets/botania/models/item/grassSeeds0.json index f99477000..a454907f0 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds0.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds0" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds1.json b/src/main/resources/assets/botania/models/item/grassSeeds1.json index 2f70b43b4..5f76f84ff 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds1.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds1" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds2.json b/src/main/resources/assets/botania/models/item/grassSeeds2.json index acd7540ae..3e72c6b9d 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds2.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds2" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds3.json b/src/main/resources/assets/botania/models/item/grassSeeds3.json index 25c399102..0901fc3be 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds3.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds3" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds4.json b/src/main/resources/assets/botania/models/item/grassSeeds4.json index 4f89d6d7e..c693d2a93 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds4.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds4" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds5.json b/src/main/resources/assets/botania/models/item/grassSeeds5.json index 8d96bf305..97aeedc91 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds5.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds5" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds6.json b/src/main/resources/assets/botania/models/item/grassSeeds6.json index 7e059fa2b..4a87d5137 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds6.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds6.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds6" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds7.json b/src/main/resources/assets/botania/models/item/grassSeeds7.json index b509746a3..4dc850cad 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds7.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds7.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds7" } diff --git a/src/main/resources/assets/botania/models/item/grassSeeds8.json b/src/main/resources/assets/botania/models/item/grassSeeds8.json index 1cac2f89a..30fdcd1e6 100644 --- a/src/main/resources/assets/botania/models/item/grassSeeds8.json +++ b/src/main/resources/assets/botania/models/item/grassSeeds8.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassSeeds8" } diff --git a/src/main/resources/assets/botania/models/item/gravityRod.json b/src/main/resources/assets/botania/models/item/gravityRod.json index bc58a0f6e..26a8afbee 100644 --- a/src/main/resources/assets/botania/models/item/gravityRod.json +++ b/src/main/resources/assets/botania/models/item/gravityRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/gravityRod" } diff --git a/src/main/resources/assets/botania/models/item/holyCloak.json b/src/main/resources/assets/botania/models/item/holyCloak.json index 1b8163e5f..5aa4b4f2b 100644 --- a/src/main/resources/assets/botania/models/item/holyCloak.json +++ b/src/main/resources/assets/botania/models/item/holyCloak.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/holyCloak" } diff --git a/src/main/resources/assets/botania/models/item/icePendant.json b/src/main/resources/assets/botania/models/item/icePendant.json index dbb2f45b9..a725f8243 100644 --- a/src/main/resources/assets/botania/models/item/icePendant.json +++ b/src/main/resources/assets/botania/models/item/icePendant.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/icePendant" } diff --git a/src/main/resources/assets/botania/models/item/incenseStick.json b/src/main/resources/assets/botania/models/item/incenseStick.json index ab0ea3d09..5bcb467d2 100644 --- a/src/main/resources/assets/botania/models/item/incenseStick.json +++ b/src/main/resources/assets/botania/models/item/incenseStick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/incenseStick0", "layer1": "botania:items/incenseStick1" diff --git a/src/main/resources/assets/botania/models/item/infiniteFruit.json b/src/main/resources/assets/botania/models/item/infiniteFruit.json index 8d6fdd76d..d0bd03eee 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruit.json +++ b/src/main/resources/assets/botania/models/item/infiniteFruit.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/infiniteFruit" } diff --git a/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json b/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json index 4e957b4fe..f1d1d4dea 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json +++ b/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/dasBoot" } diff --git a/src/main/resources/assets/botania/models/item/itemFinder.json b/src/main/resources/assets/botania/models/item/itemFinder.json index bf6ab538d..cd2c87773 100644 --- a/src/main/resources/assets/botania/models/item/itemFinder.json +++ b/src/main/resources/assets/botania/models/item/itemFinder.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/itemFinder" } diff --git a/src/main/resources/assets/botania/models/item/keepIvy.json b/src/main/resources/assets/botania/models/item/keepIvy.json index dade275c4..dcd6a0e49 100644 --- a/src/main/resources/assets/botania/models/item/keepIvy.json +++ b/src/main/resources/assets/botania/models/item/keepIvy.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/keepIvy" } diff --git a/src/main/resources/assets/botania/models/item/kingKey.json b/src/main/resources/assets/botania/models/item/kingKey.json index f543ff9f7..bf3fea763 100644 --- a/src/main/resources/assets/botania/models/item/kingKey.json +++ b/src/main/resources/assets/botania/models/item/kingKey.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/kingKey" } diff --git a/src/main/resources/assets/botania/models/item/knockbackBelt.json b/src/main/resources/assets/botania/models/item/knockbackBelt.json index 50c0779a7..f40761906 100644 --- a/src/main/resources/assets/botania/models/item/knockbackBelt.json +++ b/src/main/resources/assets/botania/models/item/knockbackBelt.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/knockbackBelt" } diff --git a/src/main/resources/assets/botania/models/item/laputaShard.json b/src/main/resources/assets/botania/models/item/laputaShard.json index d71b4eaf7..b82a58265 100644 --- a/src/main/resources/assets/botania/models/item/laputaShard.json +++ b/src/main/resources/assets/botania/models/item/laputaShard.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/laputaShard" } diff --git a/src/main/resources/assets/botania/models/item/lavaPendant.json b/src/main/resources/assets/botania/models/item/lavaPendant.json index 3d1b8e25a..a07c427fb 100644 --- a/src/main/resources/assets/botania/models/item/lavaPendant.json +++ b/src/main/resources/assets/botania/models/item/lavaPendant.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lavaPendant" } diff --git a/src/main/resources/assets/botania/models/item/lensBounce.json b/src/main/resources/assets/botania/models/item/lensBounce.json index ed9ae6661..64c3af30c 100644 --- a/src/main/resources/assets/botania/models/item/lensBounce.json +++ b/src/main/resources/assets/botania/models/item/lensBounce.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensBounce" diff --git a/src/main/resources/assets/botania/models/item/lensDamage.json b/src/main/resources/assets/botania/models/item/lensDamage.json index 9c80b203c..55e010a1a 100644 --- a/src/main/resources/assets/botania/models/item/lensDamage.json +++ b/src/main/resources/assets/botania/models/item/lensDamage.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensDamage" diff --git a/src/main/resources/assets/botania/models/item/lensEfficiency.json b/src/main/resources/assets/botania/models/item/lensEfficiency.json index 05a0e9289..b95924877 100644 --- a/src/main/resources/assets/botania/models/item/lensEfficiency.json +++ b/src/main/resources/assets/botania/models/item/lensEfficiency.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensEfficiency" diff --git a/src/main/resources/assets/botania/models/item/lensExplosive.json b/src/main/resources/assets/botania/models/item/lensExplosive.json index c3f3f92fe..82dc3af79 100644 --- a/src/main/resources/assets/botania/models/item/lensExplosive.json +++ b/src/main/resources/assets/botania/models/item/lensExplosive.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensExplosive" diff --git a/src/main/resources/assets/botania/models/item/lensFire.json b/src/main/resources/assets/botania/models/item/lensFire.json index 9ceb71a00..20a6415bb 100644 --- a/src/main/resources/assets/botania/models/item/lensFire.json +++ b/src/main/resources/assets/botania/models/item/lensFire.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensFire" diff --git a/src/main/resources/assets/botania/models/item/lensFirework.json b/src/main/resources/assets/botania/models/item/lensFirework.json index 27e65fcfc..4d6dbb636 100644 --- a/src/main/resources/assets/botania/models/item/lensFirework.json +++ b/src/main/resources/assets/botania/models/item/lensFirework.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensFirework" diff --git a/src/main/resources/assets/botania/models/item/lensFlare.json b/src/main/resources/assets/botania/models/item/lensFlare.json index ede00f6d5..732067903 100644 --- a/src/main/resources/assets/botania/models/item/lensFlare.json +++ b/src/main/resources/assets/botania/models/item/lensFlare.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensFlare" diff --git a/src/main/resources/assets/botania/models/item/lensGravity.json b/src/main/resources/assets/botania/models/item/lensGravity.json index b9992069b..1ff6583dd 100644 --- a/src/main/resources/assets/botania/models/item/lensGravity.json +++ b/src/main/resources/assets/botania/models/item/lensGravity.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensGravity" diff --git a/src/main/resources/assets/botania/models/item/lensInfluence.json b/src/main/resources/assets/botania/models/item/lensInfluence.json index ce2d0179b..351e65427 100644 --- a/src/main/resources/assets/botania/models/item/lensInfluence.json +++ b/src/main/resources/assets/botania/models/item/lensInfluence.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensInfluence" diff --git a/src/main/resources/assets/botania/models/item/lensLight.json b/src/main/resources/assets/botania/models/item/lensLight.json index a562f7de0..ff4d53799 100644 --- a/src/main/resources/assets/botania/models/item/lensLight.json +++ b/src/main/resources/assets/botania/models/item/lensLight.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensLight" diff --git a/src/main/resources/assets/botania/models/item/lensMagnet.json b/src/main/resources/assets/botania/models/item/lensMagnet.json index 8ac4bf04e..481e3b44f 100644 --- a/src/main/resources/assets/botania/models/item/lensMagnet.json +++ b/src/main/resources/assets/botania/models/item/lensMagnet.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensMagnet" diff --git a/src/main/resources/assets/botania/models/item/lensMine.json b/src/main/resources/assets/botania/models/item/lensMine.json index de6d48b65..496ee9d37 100644 --- a/src/main/resources/assets/botania/models/item/lensMine.json +++ b/src/main/resources/assets/botania/models/item/lensMine.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensMine" diff --git a/src/main/resources/assets/botania/models/item/lensNormal.json b/src/main/resources/assets/botania/models/item/lensNormal.json index b7268d5a2..cba49b27e 100644 --- a/src/main/resources/assets/botania/models/item/lensNormal.json +++ b/src/main/resources/assets/botania/models/item/lensNormal.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensNormal" diff --git a/src/main/resources/assets/botania/models/item/lensPaint.json b/src/main/resources/assets/botania/models/item/lensPaint.json index bae6b2002..6555d1415 100644 --- a/src/main/resources/assets/botania/models/item/lensPaint.json +++ b/src/main/resources/assets/botania/models/item/lensPaint.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensPaint" diff --git a/src/main/resources/assets/botania/models/item/lensPhantom.json b/src/main/resources/assets/botania/models/item/lensPhantom.json index 370f8095e..8338d9f01 100644 --- a/src/main/resources/assets/botania/models/item/lensPhantom.json +++ b/src/main/resources/assets/botania/models/item/lensPhantom.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensPhantom" diff --git a/src/main/resources/assets/botania/models/item/lensPiston.json b/src/main/resources/assets/botania/models/item/lensPiston.json index 2a0995932..e2c8e8cd1 100644 --- a/src/main/resources/assets/botania/models/item/lensPiston.json +++ b/src/main/resources/assets/botania/models/item/lensPiston.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensPiston" diff --git a/src/main/resources/assets/botania/models/item/lensPower.json b/src/main/resources/assets/botania/models/item/lensPower.json index 885049b94..19f14c990 100644 --- a/src/main/resources/assets/botania/models/item/lensPower.json +++ b/src/main/resources/assets/botania/models/item/lensPower.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensPower" diff --git a/src/main/resources/assets/botania/models/item/lensRedirect.json b/src/main/resources/assets/botania/models/item/lensRedirect.json index 2680ada51..8093c7c14 100644 --- a/src/main/resources/assets/botania/models/item/lensRedirect.json +++ b/src/main/resources/assets/botania/models/item/lensRedirect.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensRedirect" diff --git a/src/main/resources/assets/botania/models/item/lensSpeed.json b/src/main/resources/assets/botania/models/item/lensSpeed.json index 311ec4308..ba122d36a 100644 --- a/src/main/resources/assets/botania/models/item/lensSpeed.json +++ b/src/main/resources/assets/botania/models/item/lensSpeed.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensSpeed" diff --git a/src/main/resources/assets/botania/models/item/lensTime.json b/src/main/resources/assets/botania/models/item/lensTime.json index 63d78ca3b..2dfb1d0a3 100644 --- a/src/main/resources/assets/botania/models/item/lensTime.json +++ b/src/main/resources/assets/botania/models/item/lensTime.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensTime" diff --git a/src/main/resources/assets/botania/models/item/lensWarp.json b/src/main/resources/assets/botania/models/item/lensWarp.json index 4f3806e50..0cd2f394d 100644 --- a/src/main/resources/assets/botania/models/item/lensWarp.json +++ b/src/main/resources/assets/botania/models/item/lensWarp.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensWarp" diff --git a/src/main/resources/assets/botania/models/item/lensWeight.json b/src/main/resources/assets/botania/models/item/lensWeight.json index 1889ddcde..1a3322955 100644 --- a/src/main/resources/assets/botania/models/item/lensWeight.json +++ b/src/main/resources/assets/botania/models/item/lensWeight.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lensInside", "layer1": "botania:items/lensWeight" diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon_default.json index 37c3bc24d..464dc1a78 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_default.json +++ b/src/main/resources/assets/botania/models/item/lexicon_default.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lexicon" } diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeEssence.json index 25cdc3ac4..3c6b80c69 100644 --- a/src/main/resources/assets/botania/models/item/lifeEssence.json +++ b/src/main/resources/assets/botania/models/item/lifeEssence.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lifeEssence" diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow.json b/src/main/resources/assets/botania/models/item/livingwoodBow.json index 3219461c7..0dff3ae2f 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/livingwoodBow0" }, diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json index 498e2a420..413983fac 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/livingwoodBow1" }, diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json index 97ac582f0..96960440e 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/livingwoodBow2" }, diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json index 46781e351..28768bf44 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/livingwoodBow3" }, diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json index 82e629f29..871523258 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/livingwoodTwig.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/livingwoodTwig" diff --git a/src/main/resources/assets/botania/models/item/lokiRing.json b/src/main/resources/assets/botania/models/item/lokiRing.json index e8c375fc2..1181e275c 100644 --- a/src/main/resources/assets/botania/models/item/lokiRing.json +++ b/src/main/resources/assets/botania/models/item/lokiRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/lokiRing" } diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json index 3154c59b4..cc984190c 100644 --- a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/magnetRingGreater1" } diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json index 5c07378f9..996663ee9 100644 --- a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/magnetRingGreater0" } diff --git a/src/main/resources/assets/botania/models/item/magnetRingOff.json b/src/main/resources/assets/botania/models/item/magnetRingOff.json index abaf8684e..bce27d21e 100644 --- a/src/main/resources/assets/botania/models/item/magnetRingOff.json +++ b/src/main/resources/assets/botania/models/item/magnetRingOff.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/magnetRing1" } diff --git a/src/main/resources/assets/botania/models/item/magnetRingOn.json b/src/main/resources/assets/botania/models/item/magnetRingOn.json index 4ab9474f1..306838b7c 100644 --- a/src/main/resources/assets/botania/models/item/magnetRingOn.json +++ b/src/main/resources/assets/botania/models/item/magnetRingOn.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/magnetRing0" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle0.json b/src/main/resources/assets/botania/models/item/manaBottle0.json index 591c4eb77..51e07ede8 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle0.json +++ b/src/main/resources/assets/botania/models/item/manaBottle0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle0" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle1.json b/src/main/resources/assets/botania/models/item/manaBottle1.json index df30474b6..16a31af33 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle1.json +++ b/src/main/resources/assets/botania/models/item/manaBottle1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle1" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle2.json b/src/main/resources/assets/botania/models/item/manaBottle2.json index a420a7b1c..b0b032bc1 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle2.json +++ b/src/main/resources/assets/botania/models/item/manaBottle2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle2" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle3.json b/src/main/resources/assets/botania/models/item/manaBottle3.json index af1ea0344..1e495be31 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle3.json +++ b/src/main/resources/assets/botania/models/item/manaBottle3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle3" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle4.json b/src/main/resources/assets/botania/models/item/manaBottle4.json index e62c80cc6..3ac1bcda8 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle4.json +++ b/src/main/resources/assets/botania/models/item/manaBottle4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle4" } diff --git a/src/main/resources/assets/botania/models/item/manaBottle5.json b/src/main/resources/assets/botania/models/item/manaBottle5.json index 46bba123e..c85cb48e1 100644 --- a/src/main/resources/assets/botania/models/item/manaBottle5.json +++ b/src/main/resources/assets/botania/models/item/manaBottle5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaBottle5" } diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manaCookie.json index aa65e47b5..f1fd19778 100644 --- a/src/main/resources/assets/botania/models/item/manaCookie.json +++ b/src/main/resources/assets/botania/models/item/manaCookie.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaCookie" } diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manaDiamond.json index ec6de6840..9b03388db 100644 --- a/src/main/resources/assets/botania/models/item/manaDiamond.json +++ b/src/main/resources/assets/botania/models/item/manaDiamond.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaDiamond" diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 44099c226..88646562e 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manaGun0", "layer1": "botania:items/manaGun1" diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json index f3fa9caed..4758d1c14 100644 --- a/src/main/resources/assets/botania/models/item/manaGunClip.json +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manaGun2", "layer1": "botania:items/manaGun1" diff --git a/src/main/resources/assets/botania/models/item/manaInkwell.json b/src/main/resources/assets/botania/models/item/manaInkwell.json index cca65a137..6c75018c4 100644 --- a/src/main/resources/assets/botania/models/item/manaInkwell.json +++ b/src/main/resources/assets/botania/models/item/manaInkwell.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaInkwell" } diff --git a/src/main/resources/assets/botania/models/item/manaMirror.json b/src/main/resources/assets/botania/models/item/manaMirror.json index 0171429d3..71df4d562 100644 --- a/src/main/resources/assets/botania/models/item/manaMirror.json +++ b/src/main/resources/assets/botania/models/item/manaMirror.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaMirror0", "layer1": "botania:items/manaMirror1" diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manaPearl.json index d52005f58..5d231a549 100644 --- a/src/main/resources/assets/botania/models/item/manaPearl.json +++ b/src/main/resources/assets/botania/models/item/manaPearl.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaPearl" diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manaPowder.json index b22f30d7c..d5a884e32 100644 --- a/src/main/resources/assets/botania/models/item/manaPowder.json +++ b/src/main/resources/assets/botania/models/item/manaPowder.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaPowder" diff --git a/src/main/resources/assets/botania/models/item/manaRing.json b/src/main/resources/assets/botania/models/item/manaRing.json index 24b46391b..d1351432a 100644 --- a/src/main/resources/assets/botania/models/item/manaRing.json +++ b/src/main/resources/assets/botania/models/item/manaRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaRing" } diff --git a/src/main/resources/assets/botania/models/item/manaRingGreater.json b/src/main/resources/assets/botania/models/item/manaRingGreater.json index b9890f29a..906e35a9a 100644 --- a/src/main/resources/assets/botania/models/item/manaRingGreater.json +++ b/src/main/resources/assets/botania/models/item/manaRingGreater.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaRingGreater" } diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manaString.json index aafad4fca..6357d8e4b 100644 --- a/src/main/resources/assets/botania/models/item/manaString.json +++ b/src/main/resources/assets/botania/models/item/manaString.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaString" diff --git a/src/main/resources/assets/botania/models/item/manaTablet.json b/src/main/resources/assets/botania/models/item/manaTablet.json index 755e2fd7e..513ff9acb 100644 --- a/src/main/resources/assets/botania/models/item/manaTablet.json +++ b/src/main/resources/assets/botania/models/item/manaTablet.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaTablet0", "layer1": "botania:items/manaTablet1" diff --git a/src/main/resources/assets/botania/models/item/manasteel.json b/src/main/resources/assets/botania/models/item/manasteel.json index c6bc8b4a3..3858eb0d8 100644 --- a/src/main/resources/assets/botania/models/item/manasteel.json +++ b/src/main/resources/assets/botania/models/item/manasteel.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteel" diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelAxe.json index 3618e4037..4755fed67 100644 --- a/src/main/resources/assets/botania/models/item/manasteelAxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelAxe.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manasteelAxe" diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json index c48a7313f..f1b52078f 100644 --- a/src/main/resources/assets/botania/models/item/manasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/manasteelBoots.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelBoots" diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json index 50c29c8b6..fe9b46a8a 100644 --- a/src/main/resources/assets/botania/models/item/manasteelChest.json +++ b/src/main/resources/assets/botania/models/item/manasteelChest.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelChest" diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json index fd7b58c68..8126b821d 100644 --- a/src/main/resources/assets/botania/models/item/manasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/manasteelHelm.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelHelm" diff --git a/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json index fcd9996a5..39aac7ede 100644 --- a/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json +++ b/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelHelmReveal" } diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json index f9a1e7d53..02ec3aea7 100644 --- a/src/main/resources/assets/botania/models/item/manasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/manasteelLegs.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelLegs" diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json index 29c5a61d6..599cd8ed8 100644 --- a/src/main/resources/assets/botania/models/item/manasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/manasteelNugget.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manasteelNugget" diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/manasteelPick.json index 66e17bb4c..2f8fad6ab 100644 --- a/src/main/resources/assets/botania/models/item/manasteelPick.json +++ b/src/main/resources/assets/botania/models/item/manasteelPick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manasteelPick" diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json index bd49d11d8..e4b8a0cc6 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShears.json +++ b/src/main/resources/assets/botania/models/item/manasteelShears.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manasteelShears" diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json index 979e63daf..0f2ce4744 100644 --- a/src/main/resources/assets/botania/models/item/manasteelShovel.json +++ b/src/main/resources/assets/botania/models/item/manasteelShovel.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manasteelShovel" diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json index 8bbcfee9c..fff8c9a03 100644 --- a/src/main/resources/assets/botania/models/item/manasteelSword.json +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/manasteelSword" diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json index 818be5b7e..855af3490 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveBoots" diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json index 20cdebbb7..666436bb9 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveBootsHoliday" diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json index 4e5a0a1bf..7628e9d37 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveChest" diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json index 6bde05c69..8accb14c4 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveChestHoliday" diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json index 1fd6ddc37..f164e0f2d 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveCloth.json +++ b/src/main/resources/assets/botania/models/item/manaweaveCloth.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveCloth" diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json index e3ec41e5e..7853b7e07 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveHelm" diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json index 8ca9c66fb..cadc02bea 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveHelmHoliday" diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json index fde3761e3..014fc8fbb 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveLegs" diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json index b2f6bb10b..167ca6e37 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaweaveLegsHoliday" diff --git a/src/main/resources/assets/botania/models/item/miningRing.json b/src/main/resources/assets/botania/models/item/miningRing.json index 243994e8f..09dcc9045 100644 --- a/src/main/resources/assets/botania/models/item/miningRing.json +++ b/src/main/resources/assets/botania/models/item/miningRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/miningRing" } diff --git a/src/main/resources/assets/botania/models/item/missileRod.json b/src/main/resources/assets/botania/models/item/missileRod.json index 7fa6c9a32..8ca598a28 100644 --- a/src/main/resources/assets/botania/models/item/missileRod.json +++ b/src/main/resources/assets/botania/models/item/missileRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/missileRod" } diff --git a/src/main/resources/assets/botania/models/item/monocle.json b/src/main/resources/assets/botania/models/item/monocle.json index 13eccda05..ae2ad5129 100644 --- a/src/main/resources/assets/botania/models/item/monocle.json +++ b/src/main/resources/assets/botania/models/item/monocle.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/monocle" } diff --git a/src/main/resources/assets/botania/models/item/obedienceStick.json b/src/main/resources/assets/botania/models/item/obedienceStick.json index bf67175e8..07f94f48c 100644 --- a/src/main/resources/assets/botania/models/item/obedienceStick.json +++ b/src/main/resources/assets/botania/models/item/obedienceStick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/obedienceStick" } diff --git a/src/main/resources/assets/botania/models/item/odinRing.json b/src/main/resources/assets/botania/models/item/odinRing.json index cc33926c8..6546b3462 100644 --- a/src/main/resources/assets/botania/models/item/odinRing.json +++ b/src/main/resources/assets/botania/models/item/odinRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/odinRing" } diff --git a/src/main/resources/assets/botania/models/item/openBucket.json b/src/main/resources/assets/botania/models/item/openBucket.json index ccc57c213..18bf286ec 100644 --- a/src/main/resources/assets/botania/models/item/openBucket.json +++ b/src/main/resources/assets/botania/models/item/openBucket.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/openBucket" } diff --git a/src/main/resources/assets/botania/models/item/overgrowthSeed.json b/src/main/resources/assets/botania/models/item/overgrowthSeed.json index fa0a275d7..5662c5e99 100644 --- a/src/main/resources/assets/botania/models/item/overgrowthSeed.json +++ b/src/main/resources/assets/botania/models/item/overgrowthSeed.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/overgrowthSeed" } diff --git a/src/main/resources/assets/botania/models/item/pebble.json b/src/main/resources/assets/botania/models/item/pebble.json index 709f876ae..1dbbd6148 100644 --- a/src/main/resources/assets/botania/models/item/pebble.json +++ b/src/main/resources/assets/botania/models/item/pebble.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/pebble" diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json index 0ac7b0451..e692d812f 100644 --- a/src/main/resources/assets/botania/models/item/pestleAndMortar.json +++ b/src/main/resources/assets/botania/models/item/pestleAndMortar.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/pestleAndMortar" diff --git a/src/main/resources/assets/botania/models/item/petal.json b/src/main/resources/assets/botania/models/item/petal.json index 923c5d36e..904509bdb 100644 --- a/src/main/resources/assets/botania/models/item/petal.json +++ b/src/main/resources/assets/botania/models/item/petal.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/petal" } diff --git a/src/main/resources/assets/botania/models/item/phantomInk.json b/src/main/resources/assets/botania/models/item/phantomInk.json index cb1e66715..838272c72 100644 --- a/src/main/resources/assets/botania/models/item/phantomInk.json +++ b/src/main/resources/assets/botania/models/item/phantomInk.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/phantomInk" } diff --git a/src/main/resources/assets/botania/models/item/pinkinator.json b/src/main/resources/assets/botania/models/item/pinkinator.json index 7a6d38ccc..6356262b1 100644 --- a/src/main/resources/assets/botania/models/item/pinkinator.json +++ b/src/main/resources/assets/botania/models/item/pinkinator.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/pinkinator" } diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixieDust.json index e89d13f8a..fa6b8aacf 100644 --- a/src/main/resources/assets/botania/models/item/pixieDust.json +++ b/src/main/resources/assets/botania/models/item/pixieDust.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/pixieDust" diff --git a/src/main/resources/assets/botania/models/item/pixieRing.json b/src/main/resources/assets/botania/models/item/pixieRing.json index 1033fe8bf..4141216bd 100644 --- a/src/main/resources/assets/botania/models/item/pixieRing.json +++ b/src/main/resources/assets/botania/models/item/pixieRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/pixieRing" } diff --git a/src/main/resources/assets/botania/models/item/placeholder.json b/src/main/resources/assets/botania/models/item/placeholder.json index 49f092321..ae62a9935 100644 --- a/src/main/resources/assets/botania/models/item/placeholder.json +++ b/src/main/resources/assets/botania/models/item/placeholder.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/placeholder" diff --git a/src/main/resources/assets/botania/models/item/poolMinecart.json b/src/main/resources/assets/botania/models/item/poolMinecart.json index 1eacc84b0..1907d578b 100644 --- a/src/main/resources/assets/botania/models/item/poolMinecart.json +++ b/src/main/resources/assets/botania/models/item/poolMinecart.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/poolMinecart" } diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json index d87bab9a4..7e2137c98 100644 --- a/src/main/resources/assets/botania/models/item/prismarineShard.json +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/prismarineShard" diff --git a/src/main/resources/assets/botania/models/item/quartz0.json b/src/main/resources/assets/botania/models/item/quartz0.json index 7ab7d7462..689b6cdf9 100644 --- a/src/main/resources/assets/botania/models/item/quartz0.json +++ b/src/main/resources/assets/botania/models/item/quartz0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz0" } diff --git a/src/main/resources/assets/botania/models/item/quartz1.json b/src/main/resources/assets/botania/models/item/quartz1.json index 988ddd9e9..e59a6acca 100644 --- a/src/main/resources/assets/botania/models/item/quartz1.json +++ b/src/main/resources/assets/botania/models/item/quartz1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz1" } diff --git a/src/main/resources/assets/botania/models/item/quartz2.json b/src/main/resources/assets/botania/models/item/quartz2.json index bef9392e6..30d9c075a 100644 --- a/src/main/resources/assets/botania/models/item/quartz2.json +++ b/src/main/resources/assets/botania/models/item/quartz2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz2" } diff --git a/src/main/resources/assets/botania/models/item/quartz3.json b/src/main/resources/assets/botania/models/item/quartz3.json index 1083fca56..6fbe138e6 100644 --- a/src/main/resources/assets/botania/models/item/quartz3.json +++ b/src/main/resources/assets/botania/models/item/quartz3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz3" } diff --git a/src/main/resources/assets/botania/models/item/quartz4.json b/src/main/resources/assets/botania/models/item/quartz4.json index 0ddeca304..16b58d8df 100644 --- a/src/main/resources/assets/botania/models/item/quartz4.json +++ b/src/main/resources/assets/botania/models/item/quartz4.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz4" } diff --git a/src/main/resources/assets/botania/models/item/quartz5.json b/src/main/resources/assets/botania/models/item/quartz5.json index 106269ccf..2d3885d12 100644 --- a/src/main/resources/assets/botania/models/item/quartz5.json +++ b/src/main/resources/assets/botania/models/item/quartz5.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz5" } diff --git a/src/main/resources/assets/botania/models/item/quartz6.json b/src/main/resources/assets/botania/models/item/quartz6.json index 6709d39c2..4fbc29335 100644 --- a/src/main/resources/assets/botania/models/item/quartz6.json +++ b/src/main/resources/assets/botania/models/item/quartz6.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/quartz6" } diff --git a/src/main/resources/assets/botania/models/item/rainbowRod.json b/src/main/resources/assets/botania/models/item/rainbowRod.json index 69e12c3b2..f8a0496d1 100644 --- a/src/main/resources/assets/botania/models/item/rainbowRod.json +++ b/src/main/resources/assets/botania/models/item/rainbowRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/rainbowRod" } diff --git a/src/main/resources/assets/botania/models/item/reachRing.json b/src/main/resources/assets/botania/models/item/reachRing.json index 912bf2073..b8c7b2ed6 100644 --- a/src/main/resources/assets/botania/models/item/reachRing.json +++ b/src/main/resources/assets/botania/models/item/reachRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/reachRing" } diff --git a/src/main/resources/assets/botania/models/item/recordGaia1.json b/src/main/resources/assets/botania/models/item/recordGaia1.json index ba31e34b6..bb47b70fd 100644 --- a/src/main/resources/assets/botania/models/item/recordGaia1.json +++ b/src/main/resources/assets/botania/models/item/recordGaia1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/recordGaia1" } diff --git a/src/main/resources/assets/botania/models/item/recordGaia2.json b/src/main/resources/assets/botania/models/item/recordGaia2.json index 0f4886ddc..2da70f384 100644 --- a/src/main/resources/assets/botania/models/item/recordGaia2.json +++ b/src/main/resources/assets/botania/models/item/recordGaia2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/recordGaia2" } diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redString.json index 6a4dce193..4bc444d96 100644 --- a/src/main/resources/assets/botania/models/item/redString.json +++ b/src/main/resources/assets/botania/models/item/redString.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/redString" diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json index 02a8b6173..1175a4924 100644 --- a/src/main/resources/assets/botania/models/item/redstoneRoot.json +++ b/src/main/resources/assets/botania/models/item/redstoneRoot.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/redstoneRoot" diff --git a/src/main/resources/assets/botania/models/item/regenIvy.json b/src/main/resources/assets/botania/models/item/regenIvy.json index 55bbd12b0..4c7da101e 100644 --- a/src/main/resources/assets/botania/models/item/regenIvy.json +++ b/src/main/resources/assets/botania/models/item/regenIvy.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/regenIvy" } diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/root.json index 0d2f7b73d..ebc9bfdbd 100644 --- a/src/main/resources/assets/botania/models/item/root.json +++ b/src/main/resources/assets/botania/models/item/root.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/root" diff --git a/src/main/resources/assets/botania/models/item/rune_air.json b/src/main/resources/assets/botania/models/item/rune_air.json index 59f04d8fa..84049de34 100644 --- a/src/main/resources/assets/botania/models/item/rune_air.json +++ b/src/main/resources/assets/botania/models/item/rune_air.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune3" } diff --git a/src/main/resources/assets/botania/models/item/rune_autumn.json b/src/main/resources/assets/botania/models/item/rune_autumn.json index 260c1f1d5..01ee53686 100644 --- a/src/main/resources/assets/botania/models/item/rune_autumn.json +++ b/src/main/resources/assets/botania/models/item/rune_autumn.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune6" } diff --git a/src/main/resources/assets/botania/models/item/rune_earth.json b/src/main/resources/assets/botania/models/item/rune_earth.json index 49567785b..829284378 100644 --- a/src/main/resources/assets/botania/models/item/rune_earth.json +++ b/src/main/resources/assets/botania/models/item/rune_earth.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune2" } diff --git a/src/main/resources/assets/botania/models/item/rune_envy.json b/src/main/resources/assets/botania/models/item/rune_envy.json index 0f461b690..14f751599 100644 --- a/src/main/resources/assets/botania/models/item/rune_envy.json +++ b/src/main/resources/assets/botania/models/item/rune_envy.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune14" } diff --git a/src/main/resources/assets/botania/models/item/rune_fire.json b/src/main/resources/assets/botania/models/item/rune_fire.json index eda46b5d4..0f17c0315 100644 --- a/src/main/resources/assets/botania/models/item/rune_fire.json +++ b/src/main/resources/assets/botania/models/item/rune_fire.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune1" } diff --git a/src/main/resources/assets/botania/models/item/rune_gluttony.json b/src/main/resources/assets/botania/models/item/rune_gluttony.json index f5a41cfa5..066d90e9d 100644 --- a/src/main/resources/assets/botania/models/item/rune_gluttony.json +++ b/src/main/resources/assets/botania/models/item/rune_gluttony.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune10" } diff --git a/src/main/resources/assets/botania/models/item/rune_greed.json b/src/main/resources/assets/botania/models/item/rune_greed.json index 77df19feb..eba98cb79 100644 --- a/src/main/resources/assets/botania/models/item/rune_greed.json +++ b/src/main/resources/assets/botania/models/item/rune_greed.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune11" } diff --git a/src/main/resources/assets/botania/models/item/rune_lust.json b/src/main/resources/assets/botania/models/item/rune_lust.json index ef7a6fd9e..fb0e11c60 100644 --- a/src/main/resources/assets/botania/models/item/rune_lust.json +++ b/src/main/resources/assets/botania/models/item/rune_lust.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune9" } diff --git a/src/main/resources/assets/botania/models/item/rune_mana.json b/src/main/resources/assets/botania/models/item/rune_mana.json index 53aa5fb54..c887f9008 100644 --- a/src/main/resources/assets/botania/models/item/rune_mana.json +++ b/src/main/resources/assets/botania/models/item/rune_mana.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune8" } diff --git a/src/main/resources/assets/botania/models/item/rune_pride.json b/src/main/resources/assets/botania/models/item/rune_pride.json index 69ca1debd..15fabfbb4 100644 --- a/src/main/resources/assets/botania/models/item/rune_pride.json +++ b/src/main/resources/assets/botania/models/item/rune_pride.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune15" } diff --git a/src/main/resources/assets/botania/models/item/rune_sloth.json b/src/main/resources/assets/botania/models/item/rune_sloth.json index e348dc95c..425cdfe55 100644 --- a/src/main/resources/assets/botania/models/item/rune_sloth.json +++ b/src/main/resources/assets/botania/models/item/rune_sloth.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune12" } diff --git a/src/main/resources/assets/botania/models/item/rune_spring.json b/src/main/resources/assets/botania/models/item/rune_spring.json index ff835b969..d289ef03b 100644 --- a/src/main/resources/assets/botania/models/item/rune_spring.json +++ b/src/main/resources/assets/botania/models/item/rune_spring.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune4" } diff --git a/src/main/resources/assets/botania/models/item/rune_summer.json b/src/main/resources/assets/botania/models/item/rune_summer.json index f63d15445..c6ff6952c 100644 --- a/src/main/resources/assets/botania/models/item/rune_summer.json +++ b/src/main/resources/assets/botania/models/item/rune_summer.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune5" } diff --git a/src/main/resources/assets/botania/models/item/rune_water.json b/src/main/resources/assets/botania/models/item/rune_water.json index 539a67aa7..de54127f6 100644 --- a/src/main/resources/assets/botania/models/item/rune_water.json +++ b/src/main/resources/assets/botania/models/item/rune_water.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune0" } diff --git a/src/main/resources/assets/botania/models/item/rune_winter.json b/src/main/resources/assets/botania/models/item/rune_winter.json index 82a977e8e..e2ec110a8 100644 --- a/src/main/resources/assets/botania/models/item/rune_winter.json +++ b/src/main/resources/assets/botania/models/item/rune_winter.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune7" } diff --git a/src/main/resources/assets/botania/models/item/rune_wrath.json b/src/main/resources/assets/botania/models/item/rune_wrath.json index 0c7bfb747..85d9b7e80 100644 --- a/src/main/resources/assets/botania/models/item/rune_wrath.json +++ b/src/main/resources/assets/botania/models/item/rune_wrath.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/rune13" } diff --git a/src/main/resources/assets/botania/models/item/sextant.json b/src/main/resources/assets/botania/models/item/sextant.json index 600fa8958..80c3d2644 100644 --- a/src/main/resources/assets/botania/models/item/sextant.json +++ b/src/main/resources/assets/botania/models/item/sextant.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/sextant" } diff --git a/src/main/resources/assets/botania/models/item/signalFlare.json b/src/main/resources/assets/botania/models/item/signalFlare.json index 0f955129e..44625efaa 100644 --- a/src/main/resources/assets/botania/models/item/signalFlare.json +++ b/src/main/resources/assets/botania/models/item/signalFlare.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/signalFlare0", "layer1": "botania:items/signalFlare1" diff --git a/src/main/resources/assets/botania/models/item/skyDirtRod.json b/src/main/resources/assets/botania/models/item/skyDirtRod.json index 6a9523f1b..93d2949b7 100644 --- a/src/main/resources/assets/botania/models/item/skyDirtRod.json +++ b/src/main/resources/assets/botania/models/item/skyDirtRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/skyDirtRod" } diff --git a/src/main/resources/assets/botania/models/item/slimeBottle0.json b/src/main/resources/assets/botania/models/item/slimeBottle0.json index 3add9af7e..db61916b9 100644 --- a/src/main/resources/assets/botania/models/item/slimeBottle0.json +++ b/src/main/resources/assets/botania/models/item/slimeBottle0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/slimeBottle0" } diff --git a/src/main/resources/assets/botania/models/item/slimeBottle1.json b/src/main/resources/assets/botania/models/item/slimeBottle1.json index 67d70d424..c766d6ad6 100644 --- a/src/main/resources/assets/botania/models/item/slimeBottle1.json +++ b/src/main/resources/assets/botania/models/item/slimeBottle1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/slimeBottle1" } diff --git a/src/main/resources/assets/botania/models/item/slingshot.json b/src/main/resources/assets/botania/models/item/slingshot.json index 210997e61..144ddf3f8 100644 --- a/src/main/resources/assets/botania/models/item/slingshot.json +++ b/src/main/resources/assets/botania/models/item/slingshot.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/slingshot" } diff --git a/src/main/resources/assets/botania/models/item/smeltRod.json b/src/main/resources/assets/botania/models/item/smeltRod.json index 9396ba58b..bf321e92b 100644 --- a/src/main/resources/assets/botania/models/item/smeltRod.json +++ b/src/main/resources/assets/botania/models/item/smeltRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/smeltRod" } diff --git a/src/main/resources/assets/botania/models/item/spark.json b/src/main/resources/assets/botania/models/item/spark.json index dda2c13a6..677a38a9c 100644 --- a/src/main/resources/assets/botania/models/item/spark.json +++ b/src/main/resources/assets/botania/models/item/spark.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/spark0" } diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json index ff348f4e6..6564ebf2d 100644 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/sparkUpgrade0" } diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json index 2ab5c2453..98185bd84 100644 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/sparkUpgrade1" } diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json index a03ecf536..7d7a36eb8 100644 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/sparkUpgrade2" } diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json index 4e675445d..d7a18e778 100644 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json +++ b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/sparkUpgrade3" } diff --git a/src/main/resources/assets/botania/models/item/spawnerMover.json b/src/main/resources/assets/botania/models/item/spawnerMover.json index 3d95661df..faeaa3bbc 100644 --- a/src/main/resources/assets/botania/models/item/spawnerMover.json +++ b/src/main/resources/assets/botania/models/item/spawnerMover.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/spawnerMover0" } diff --git a/src/main/resources/assets/botania/models/item/spawnerMoverFull.json b/src/main/resources/assets/botania/models/item/spawnerMoverFull.json index 048f272b8..8d8221966 100644 --- a/src/main/resources/assets/botania/models/item/spawnerMoverFull.json +++ b/src/main/resources/assets/botania/models/item/spawnerMoverFull.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/spawnerMover1" } diff --git a/src/main/resources/assets/botania/models/item/speedUpBelt.json b/src/main/resources/assets/botania/models/item/speedUpBelt.json index 39105b839..c8e9e9637 100644 --- a/src/main/resources/assets/botania/models/item/speedUpBelt.json +++ b/src/main/resources/assets/botania/models/item/speedUpBelt.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/speedUpBelt" } diff --git a/src/main/resources/assets/botania/models/item/spellCloth.json b/src/main/resources/assets/botania/models/item/spellCloth.json index ea28ea1a6..860658c5d 100644 --- a/src/main/resources/assets/botania/models/item/spellCloth.json +++ b/src/main/resources/assets/botania/models/item/spellCloth.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/spellCloth" } diff --git a/src/main/resources/assets/botania/models/item/standard_item.json b/src/main/resources/assets/botania/models/item/standard_item.json deleted file mode 100644 index 25cf45f1e..000000000 --- a/src/main/resources/assets/botania/models/item/standard_item.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "builtin/generated", - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/standard_tool.json b/src/main/resources/assets/botania/models/item/standard_tool.json deleted file mode 100644 index 835adad2c..000000000 --- a/src/main/resources/assets/botania/models/item/standard_tool.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "builtin/generated", - "display": { - "thirdperson": { - "rotation": [ 0, 90, -35 ], - "translation": [ 0, 1.25, -3.5 ], - "scale": [ 0.85, 0.85, 0.85 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/starSword.json index bd9e12c03..979f81d5f 100644 --- a/src/main/resources/assets/botania/models/item/starSword.json +++ b/src/main/resources/assets/botania/models/item/starSword.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/starSword" diff --git a/src/main/resources/assets/botania/models/item/superLavaPendant.json b/src/main/resources/assets/botania/models/item/superLavaPendant.json index 2e3f9e1d8..32e5ab6d5 100644 --- a/src/main/resources/assets/botania/models/item/superLavaPendant.json +++ b/src/main/resources/assets/botania/models/item/superLavaPendant.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/superLavaPendant" } diff --git a/src/main/resources/assets/botania/models/item/superTravelBelt.json b/src/main/resources/assets/botania/models/item/superTravelBelt.json index f0c5f2f11..afbe1998d 100644 --- a/src/main/resources/assets/botania/models/item/superTravelBelt.json +++ b/src/main/resources/assets/botania/models/item/superTravelBelt.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/superTravelBelt" } diff --git a/src/main/resources/assets/botania/models/item/swapRing.json b/src/main/resources/assets/botania/models/item/swapRing.json index 003e659aa..f7d6a66ed 100644 --- a/src/main/resources/assets/botania/models/item/swapRing.json +++ b/src/main/resources/assets/botania/models/item/swapRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/swapRing" } diff --git a/src/main/resources/assets/botania/models/item/temperanceStone0.json b/src/main/resources/assets/botania/models/item/temperanceStone0.json index 06d6f09bc..bee4e34c7 100644 --- a/src/main/resources/assets/botania/models/item/temperanceStone0.json +++ b/src/main/resources/assets/botania/models/item/temperanceStone0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/temperanceStone0" } diff --git a/src/main/resources/assets/botania/models/item/temperanceStone1.json b/src/main/resources/assets/botania/models/item/temperanceStone1.json index e830bf4e8..6021f8300 100644 --- a/src/main/resources/assets/botania/models/item/temperanceStone1.json +++ b/src/main/resources/assets/botania/models/item/temperanceStone1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/temperanceStone1" } diff --git a/src/main/resources/assets/botania/models/item/terraAxe0.json b/src/main/resources/assets/botania/models/item/terraAxe0.json index 0038b73e4..0b2851f9f 100644 --- a/src/main/resources/assets/botania/models/item/terraAxe0.json +++ b/src/main/resources/assets/botania/models/item/terraAxe0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraAxe0" } diff --git a/src/main/resources/assets/botania/models/item/terraAxe1.json b/src/main/resources/assets/botania/models/item/terraAxe1.json index f6589ce28..81ffdb72b 100644 --- a/src/main/resources/assets/botania/models/item/terraAxe1.json +++ b/src/main/resources/assets/botania/models/item/terraAxe1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraAxe1" } diff --git a/src/main/resources/assets/botania/models/item/terraPick.json b/src/main/resources/assets/botania/models/item/terraPick.json index a2efe8103..e2296f53d 100644 --- a/src/main/resources/assets/botania/models/item/terraPick.json +++ b/src/main/resources/assets/botania/models/item/terraPick.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraPick0" } diff --git a/src/main/resources/assets/botania/models/item/terraPickEnabled.json b/src/main/resources/assets/botania/models/item/terraPickEnabled.json index 98c33756b..c93049bb0 100644 --- a/src/main/resources/assets/botania/models/item/terraPickEnabled.json +++ b/src/main/resources/assets/botania/models/item/terraPickEnabled.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraPick0", "layer1": "botania:items/terraPick1" diff --git a/src/main/resources/assets/botania/models/item/terraPickTipped.json b/src/main/resources/assets/botania/models/item/terraPickTipped.json index 7315b0fc5..54c6b5284 100644 --- a/src/main/resources/assets/botania/models/item/terraPickTipped.json +++ b/src/main/resources/assets/botania/models/item/terraPickTipped.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraPick2" } diff --git a/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json b/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json index d1685cfcb..38fcdc28c 100644 --- a/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json +++ b/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraPick2", "layer1": "botania:items/terraPick1" diff --git a/src/main/resources/assets/botania/models/item/terraSword.json b/src/main/resources/assets/botania/models/item/terraSword.json index a536065e0..fb892a284 100644 --- a/src/main/resources/assets/botania/models/item/terraSword.json +++ b/src/main/resources/assets/botania/models/item/terraSword.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraSword" } diff --git a/src/main/resources/assets/botania/models/item/terraformRod.json b/src/main/resources/assets/botania/models/item/terraformRod.json index aad978d77..42f5509c9 100644 --- a/src/main/resources/assets/botania/models/item/terraformRod.json +++ b/src/main/resources/assets/botania/models/item/terraformRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraformRod" } diff --git a/src/main/resources/assets/botania/models/item/terrasteel.json b/src/main/resources/assets/botania/models/item/terrasteel.json index 33d20773a..7612428d5 100644 --- a/src/main/resources/assets/botania/models/item/terrasteel.json +++ b/src/main/resources/assets/botania/models/item/terrasteel.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteel" diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json index 4de87776d..b9e2743a7 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelBoots.json +++ b/src/main/resources/assets/botania/models/item/terrasteelBoots.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelBoots" diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json index c09a12720..6b959f638 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelChest.json +++ b/src/main/resources/assets/botania/models/item/terrasteelChest.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelChest" diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json index ceadee6f3..97514ddb9 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelHelm.json +++ b/src/main/resources/assets/botania/models/item/terrasteelHelm.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelHelm" diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json index 8d6750450..98f1522f9 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json +++ b/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelHelmReveal" } diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json index 80ab18f37..2f6ea5c2f 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelLegs.json +++ b/src/main/resources/assets/botania/models/item/terrasteelLegs.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelLegs" diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json index 548329dc1..e5657aafc 100644 --- a/src/main/resources/assets/botania/models/item/terrasteelNugget.json +++ b/src/main/resources/assets/botania/models/item/terrasteelNugget.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/terrasteelNugget" diff --git a/src/main/resources/assets/botania/models/item/thorRing.json b/src/main/resources/assets/botania/models/item/thorRing.json index 31f651ca3..63da9fbb6 100644 --- a/src/main/resources/assets/botania/models/item/thorRing.json +++ b/src/main/resources/assets/botania/models/item/thorRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/thorRing" } diff --git a/src/main/resources/assets/botania/models/item/thornChakram0.json b/src/main/resources/assets/botania/models/item/thornChakram0.json index e228cdba3..d28678238 100644 --- a/src/main/resources/assets/botania/models/item/thornChakram0.json +++ b/src/main/resources/assets/botania/models/item/thornChakram0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/thornChakram0" } diff --git a/src/main/resources/assets/botania/models/item/thornChakram1.json b/src/main/resources/assets/botania/models/item/thornChakram1.json index 6a10d6713..699b33dc0 100644 --- a/src/main/resources/assets/botania/models/item/thornChakram1.json +++ b/src/main/resources/assets/botania/models/item/thornChakram1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/thornChakram1" } diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thunderSword.json index aee5fd5ab..ea13075e1 100644 --- a/src/main/resources/assets/botania/models/item/thunderSword.json +++ b/src/main/resources/assets/botania/models/item/thunderSword.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/thunderSword" diff --git a/src/main/resources/assets/botania/models/item/tinyPlanet.json b/src/main/resources/assets/botania/models/item/tinyPlanet.json index 7d15efe2b..6816f4f5f 100644 --- a/src/main/resources/assets/botania/models/item/tinyPlanet.json +++ b/src/main/resources/assets/botania/models/item/tinyPlanet.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/tinyPlanet" } diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadoRod.json index f9762ee7d..2a298dc68 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod.json +++ b/src/main/resources/assets/botania/models/item/tornadoRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/tornadoRod0" } diff --git a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json index 5a15f3a97..8a2a698de 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json +++ b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/tornadoRod1" } diff --git a/src/main/resources/assets/botania/models/item/totalBiscuit.json b/src/main/resources/assets/botania/models/item/totalBiscuit.json index 67c022d0e..57428e745 100644 --- a/src/main/resources/assets/botania/models/item/totalBiscuit.json +++ b/src/main/resources/assets/botania/models/item/totalBiscuit.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/totalBiscuit" } diff --git a/src/main/resources/assets/botania/models/item/travelBelt.json b/src/main/resources/assets/botania/models/item/travelBelt.json index 8d5af6d86..e9e94cf11 100644 --- a/src/main/resources/assets/botania/models/item/travelBelt.json +++ b/src/main/resources/assets/botania/models/item/travelBelt.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/travelBelt" } diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json index 84641c01f..f0b2b89d7 100644 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", diff --git a/src/main/resources/assets/botania/models/item/twigWand_bind.json b/src/main/resources/assets/botania/models/item/twigWand_bind.json index c46913af5..f7dd52606 100644 --- a/src/main/resources/assets/botania/models/item/twigWand_bind.json +++ b/src/main/resources/assets/botania/models/item/twigWand_bind.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", diff --git a/src/main/resources/assets/botania/models/item/unholyCloak.json b/src/main/resources/assets/botania/models/item/unholyCloak.json index a65a1145d..3bfd0b2ed 100644 --- a/src/main/resources/assets/botania/models/item/unholyCloak.json +++ b/src/main/resources/assets/botania/models/item/unholyCloak.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/unholyCloak" } diff --git a/src/main/resources/assets/botania/models/item/vial.json b/src/main/resources/assets/botania/models/item/vial.json index 2759bc178..1f7b030a7 100644 --- a/src/main/resources/assets/botania/models/item/vial.json +++ b/src/main/resources/assets/botania/models/item/vial.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vial0" } diff --git a/src/main/resources/assets/botania/models/item/vial1_0.json b/src/main/resources/assets/botania/models/item/vial1_0.json index c5f4e920e..90c9f9b14 100644 --- a/src/main/resources/assets/botania/models/item/vial1_0.json +++ b/src/main/resources/assets/botania/models/item/vial1_0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vial0", "layer1": "botania:items/vial1_0" diff --git a/src/main/resources/assets/botania/models/item/vial1_1.json b/src/main/resources/assets/botania/models/item/vial1_1.json index 4a46d049f..8eff522d0 100644 --- a/src/main/resources/assets/botania/models/item/vial1_1.json +++ b/src/main/resources/assets/botania/models/item/vial1_1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vial0", "layer1": "botania:items/vial1_1" diff --git a/src/main/resources/assets/botania/models/item/vial1_2.json b/src/main/resources/assets/botania/models/item/vial1_2.json index 4e87695c1..fc3850bca 100644 --- a/src/main/resources/assets/botania/models/item/vial1_2.json +++ b/src/main/resources/assets/botania/models/item/vial1_2.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vial0", "layer1": "botania:items/vial1_2" diff --git a/src/main/resources/assets/botania/models/item/vial1_3.json b/src/main/resources/assets/botania/models/item/vial1_3.json index b3d9ee9db..fec47a669 100644 --- a/src/main/resources/assets/botania/models/item/vial1_3.json +++ b/src/main/resources/assets/botania/models/item/vial1_3.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vial0", "layer1": "botania:items/vial1_3" diff --git a/src/main/resources/assets/botania/models/item/vineBall.json b/src/main/resources/assets/botania/models/item/vineBall.json index dfea69fba..744ca6f8c 100644 --- a/src/main/resources/assets/botania/models/item/vineBall.json +++ b/src/main/resources/assets/botania/models/item/vineBall.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vineBall" } diff --git a/src/main/resources/assets/botania/models/item/virus0.json b/src/main/resources/assets/botania/models/item/virus0.json index a7da91f14..039a4e305 100644 --- a/src/main/resources/assets/botania/models/item/virus0.json +++ b/src/main/resources/assets/botania/models/item/virus0.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/virus0" } diff --git a/src/main/resources/assets/botania/models/item/virus1.json b/src/main/resources/assets/botania/models/item/virus1.json index 3c632a483..15359f35e 100644 --- a/src/main/resources/assets/botania/models/item/virus1.json +++ b/src/main/resources/assets/botania/models/item/virus1.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/virus1" } diff --git a/src/main/resources/assets/botania/models/item/vuvuzela.json b/src/main/resources/assets/botania/models/item/vuvuzela.json index c9bdc160e..365e71f56 100644 --- a/src/main/resources/assets/botania/models/item/vuvuzela.json +++ b/src/main/resources/assets/botania/models/item/vuvuzela.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/vuvuzela" } diff --git a/src/main/resources/assets/botania/models/item/waterRing.json b/src/main/resources/assets/botania/models/item/waterRing.json index 211c95ee8..778f5dc47 100644 --- a/src/main/resources/assets/botania/models/item/waterRing.json +++ b/src/main/resources/assets/botania/models/item/waterRing.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/waterRing" } diff --git a/src/main/resources/assets/botania/models/item/waterRod.json b/src/main/resources/assets/botania/models/item/waterRod.json index ec8544bc3..641897bbe 100644 --- a/src/main/resources/assets/botania/models/item/waterRod.json +++ b/src/main/resources/assets/botania/models/item/waterRod.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_tool", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/waterRod" } diff --git a/src/main/resources/assets/botania/models/item/worldSeed.json b/src/main/resources/assets/botania/models/item/worldSeed.json index 1088eae34..9e64b0c64 100644 --- a/src/main/resources/assets/botania/models/item/worldSeed.json +++ b/src/main/resources/assets/botania/models/item/worldSeed.json @@ -1,5 +1,5 @@ { - "parent": "botania:item/standard_item", + "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/worldSeed" } From 0ba32450cfa30b964d709b786627f5a0c618a8ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 23:31:08 -0500 Subject: [PATCH 459/935] Fix stairs --- .../botania/blockstates/biomeStoneA0Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA10Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA11Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA12Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA13Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA14Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA15Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA1Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA2Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA3Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA4Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA5Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA6Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA7Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA8Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneA9Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB0Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB1Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB2Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB3Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB4Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB5Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB6Stairs.json | 15 +-------------- .../botania/blockstates/biomeStoneB7Stairs.json | 15 +-------------- .../botania/blockstates/customBrick0Stairs.json | 15 +-------------- .../botania/blockstates/customBrick1Stairs.json | 15 +-------------- .../botania/blockstates/customBrick2Stairs.json | 15 +-------------- .../botania/blockstates/customBrick3Stairs.json | 15 +-------------- .../botania/blockstates/dreamwood0Stairs.json | 15 +-------------- .../botania/blockstates/dreamwood1Stairs.json | 15 +-------------- .../botania/blockstates/endStoneBrick0Stairs.json | 15 +-------------- .../botania/blockstates/endStoneBrick2Stairs.json | 15 +-------------- .../botania/blockstates/livingrock0Stairs.json | 15 +-------------- .../botania/blockstates/livingrock1Stairs.json | 15 +-------------- .../botania/blockstates/livingwood0Stairs.json | 15 +-------------- .../botania/blockstates/livingwood1Stairs.json | 15 +-------------- .../botania/blockstates/pavement0Stairs.json | 15 +-------------- .../botania/blockstates/pavement1Stairs.json | 15 +-------------- .../botania/blockstates/pavement2Stairs.json | 15 +-------------- .../botania/blockstates/pavement3Stairs.json | 15 +-------------- .../botania/blockstates/pavement4Stairs.json | 15 +-------------- .../botania/blockstates/pavement5Stairs.json | 15 +-------------- .../botania/blockstates/prismarine0Stairs.json | 15 +-------------- .../botania/blockstates/prismarine1Stairs.json | 15 +-------------- .../botania/blockstates/prismarine2Stairs.json | 15 +-------------- .../botania/blockstates/quartzStairsBlaze.json | 15 +-------------- .../botania/blockstates/quartzStairsDark.json | 15 +-------------- .../botania/blockstates/quartzStairsElf.json | 15 +-------------- .../botania/blockstates/quartzStairsLavender.json | 15 +-------------- .../botania/blockstates/quartzStairsMana.json | 15 +-------------- .../botania/blockstates/quartzStairsRed.json | 15 +-------------- .../botania/blockstates/quartzStairsSunny.json | 15 +-------------- .../botania/blockstates/reedBlock0Stairs.json | 15 +-------------- .../botania/blockstates/shimmerrock0Stairs.json | 15 +-------------- .../blockstates/shimmerwoodPlanks0Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone0Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone10Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone11Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone1Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone2Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone3Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone8Stairs.json | 15 +-------------- .../assets/botania/blockstates/stone9Stairs.json | 15 +-------------- .../assets/botania/blockstates/thatch0Stairs.json | 15 +-------------- 64 files changed, 64 insertions(+), 896 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json index 0d08236d3..d137ed804 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json index 1c7bca419..a440df4e9 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json index 721f4564e..4184d500c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json index d2b0fa184..be0409f30 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json index feb1105eb..6768651f4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json index 663d23369..85662667d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json index 6c76e119f..605b898a9 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json index 6a87bdc04..03d203e1b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json index 15f60bbf1..d8e98719d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json index 2edb11337..6949961ed 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json index 12b63afe4..937646fbe 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json index 1d833491c..29015ed6c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json index abdc37660..5fbeb19e5 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json index 03ce79ed2..42a749323 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json index d09b9368d..41d4f74c2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json index 3932c8886..f7a36ef8f 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json index bb014aa1d..20fce2f16 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json index ac7e9f0fd..ae5372d46 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json index 955551485..749ab9b2e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json index abfc2f07e..8451d31db 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json index 942aa3f6e..c966c7696 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json index c6a647035..26ed567f8 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json index 4ae4695fb..3bd7cfc9d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json index 8ea7a37ea..7b3888e51 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json index c1c21d3ef..856dd00d7 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json index b2b69d58a..ccb0e45af 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json index 0aeb15fbc..e9899ac4c 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json index 0aaf3e289..35e9dac47 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json index 3ba4ff866..4ae3e3fb2 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json index a7da1db8c..b2539d356 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json index ba92aa5ca..fca23a687 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json index e61c67872..c8b59f555 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json index 968cdfb8e..400dfbcf9 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json index 1d33819f2..5216b92e8 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json index 9670c00c2..6909c9a17 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json index e8009ef35..268eeb73f 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json index 9858124f5..b7c401e34 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json index d1d9c77a5..38a03352e 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json index 2ee4d6af4..b59738076 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json index 6401fe3f4..996db23eb 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json index e0c85e718..92c9f6456 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json index b9bf7186d..398d19dd2 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json index c416da64d..f061f4b24 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json index a89d30cfa..859c76bcf 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json index 7fc8005ff..b0968daf9 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json index ad0c0f86d..8b7c9ce6c 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json index c60d760f0..97b3d951d 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json index acebecc27..a53598533 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json index 11968f807..041a8d56d 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json index 38967450f..f71b5157e 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json index 9fb425f8c..976003691 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json index 16e139894..3685bc69a 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index b9d64984b..c1866bb9b 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json index bdde808f3..0a5482fd8 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json index 88b6e9550..66f8a33f3 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone0Stairs.json b/src/main/resources/assets/botania/blockstates/stone0Stairs.json index d7dbb8d16..413cbac87 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone10Stairs.json b/src/main/resources/assets/botania/blockstates/stone10Stairs.json index db791072b..2a7efb79e 100644 --- a/src/main/resources/assets/botania/blockstates/stone10Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone10Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone11Stairs.json b/src/main/resources/assets/botania/blockstates/stone11Stairs.json index b1c8c95f3..a6f3d0c94 100644 --- a/src/main/resources/assets/botania/blockstates/stone11Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone11Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone1Stairs.json b/src/main/resources/assets/botania/blockstates/stone1Stairs.json index a64c19749..05fdc2907 100644 --- a/src/main/resources/assets/botania/blockstates/stone1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone1Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone2Stairs.json b/src/main/resources/assets/botania/blockstates/stone2Stairs.json index 4ef18ccb4..6867aae2c 100644 --- a/src/main/resources/assets/botania/blockstates/stone2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone2Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone3Stairs.json b/src/main/resources/assets/botania/blockstates/stone3Stairs.json index 84d11a672..e7bd194ac 100644 --- a/src/main/resources/assets/botania/blockstates/stone3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone3Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone8Stairs.json b/src/main/resources/assets/botania/blockstates/stone8Stairs.json index c399ad4ee..088ad9b58 100644 --- a/src/main/resources/assets/botania/blockstates/stone8Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone8Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone9Stairs.json b/src/main/resources/assets/botania/blockstates/stone9Stairs.json index a29c9d1d7..f1cc951ef 100644 --- a/src/main/resources/assets/botania/blockstates/stone9Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone9Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json index ee3e5ca74..e31a27404 100644 --- a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json @@ -48,19 +48,6 @@ "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "inventory": [{ - "model": "minecraft:stairs", - "uvlock": true, - "transform": { - "thirdperson": { - "rotation": [ {"x": 10}, {"y": -45}, {"z": 170} ], - "translation": [ 0, 0.09375, -0.171875 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": { "y": 180 } - } - } - }] + "inventory": [{ "model": "minecraft:stairs" }] } } From 1b79575648180d3e0d5c08972a699f46a9c0d8ca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 23 Mar 2016 23:47:06 -0500 Subject: [PATCH 460/935] Fix other models --- .../client/core/handler/ColorHandler.java | 2 +- .../botania/common/block/BlockBifrostPerm.java | 6 ++++-- .../assets/botania/blockstates/incensePlate.json | 8 +------- .../assets/botania/blockstates/pool.json | 7 +------ .../assets/botania/blockstates/spawnerClaw.json | 16 +--------------- .../assets/botania/blockstates/starfield.json | 8 +------- .../assets/botania/blockstates/tinyPotato.json | 8 +------- 7 files changed, 10 insertions(+), 45 deletions(-) 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 f8151fbdb..99eafa7a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -98,7 +98,7 @@ public final class ColorHandler { return 0xFFFFFF; } } - }, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, + }, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader)); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 12488bcda..64eabf358 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -48,8 +48,10 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); - return block != this && super.shouldSideBeRendered(state, world, pos, side); + if (world.getBlockState(pos.offset(side)).getBlock() == this) { + return false; + } + return super.shouldSideBeRendered(state, world, pos, side); } @Override diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 16318c0ad..1a9af84eb 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -14,12 +14,6 @@ "west": { "y": 90 }, "east": { "y": 270 } }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.35, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 8e7938fd3..5c62b19bc 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -2,12 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania:pool_tinted", - "transform": { - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875], - "rotation": [{"x": 10}, {"y": -45}, {"z": 0}] - } - } + "transform": "forge:default-block" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index da87704b7..91fa6cd6d 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -9,20 +9,6 @@ }, "variants": { "normal": [{}], - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.25, 0 ] - }, - "gui": { - "translation": [ 0, 0.25, 0 ] - }, - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875 ], - "rotation": [{ "x": 10 }, { "y": -45 }, { "z": 170 }], - "scale": [ 0.375, 0.375, 0.375 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index 927faa6b9..ffec0652f 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -14,12 +14,6 @@ "true": {}, "false": {} }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.125, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index fbf298eca..91f7e87d5 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -14,12 +14,6 @@ "west": { "y": 270 }, "east": { "y": 90 } }, - "inventory": [{ - "transform": { - "firstperson": { - "translation": [ 0, 0.25, 0 ] - } - } - }] + "inventory": [{}] } } \ No newline at end of file From 5b9a5bf4804cae5d4c07dad0a3d62cdb981c9f04 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 00:02:36 -0500 Subject: [PATCH 461/935] Update most reflection names --- .../botania/common/lib/LibObfuscation.java | 62 ++++++++----------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index faa32f183..0b0318ee4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -18,8 +18,8 @@ public final class LibObfuscation { public static final String[] RENDERPOSZ = { "renderPosZ", "field_78723_d", "q" }; // EntityItem - public static final String[] AGE = { "age", "field_70292_b", "c" }; - public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "d" }; + public static final String[] AGE = { "age", "field_70292_b", "d" }; + public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "e" }; // EffectRenderer public static final String[] PARTICLE_TEXTURES = new String[] { "particleTextures", "field_110737_b", "b" }; @@ -29,69 +29,64 @@ public final class LibObfuscation { public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; - // EntityAIAttackOnCollide + // EntityAIAttackMelee todo 1.9 public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; // EntityAIAvoidEntity - public static final String[] TARGET_ENTITY_CLASS = new String[] { "field_181064_i", "i" }; + public static final String[] TARGET_ENTITY_CLASS = new String[] { "classToAvoid", "field_181064_i", "i" }; // EntityCreeper - public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "c" }; - - // ThreadDownloadImageData - public static final String[] TEXTURE_UPLOADED = new String[] { "textureUploaded", "field_110559_g", "n" }; - public static final String[] BUFFERED_IMAGE = new String[] { "bufferedImage", "field_110560_d", "l" }; + public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "bw" }; // Entity - public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "ab" }; + public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "Y" }; // ItemBlockSpecial public static final String[] REED_ITEM = new String[] { "block", "field_150935_a", "a" }; // EntityAnimal - public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bk" }; + public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bv" }; - // EntityPlayer - public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "g" }; - public static final String[] ITEM_IN_USE_COUNT = new String[] { "itemInUseCount", "field_71072_f", "h" }; + // EntityLivingBase + public static final String[] ITEM_IN_USE_COUNT = new String[] { "activeItemStackUseCount", "field_184628_bn", "bn" }; // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "br" }; - public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bC" }; + public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bC" }; + public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bR" }; // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "i" }; // MobSpawnerBaseLogic - public static final String[] IS_ACTIVATED = new String[] { "isActivated" ,"func_98279_f", "g" }; - public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "m" }; - public static final String[] SPAWN_COUNT = new String[] { "spawnCount", "field_98294_i", "i" }; - public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" }; - public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" }; - public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "c" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" see MCP name github issue + public static final String[] IS_ACTIVATED = new String[] { "isActivated" ,"func_98279_f", "h" }; + public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "l" }; + public static final String[] SPAWN_COUNT = new String[] { "spawnCount", "field_98294_i", "h" }; + public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "j" }; + public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "g" }; + public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "f" }; + public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "b" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" see MCP name github issue public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; - public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "f" }; - public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "e" }; - public static final String[] GET_ENTITY_TO_SPAWN = new String[] { "getEntityNameToSpawn", "func_98276_e", "f" }; - public static final String[] SPAWN_NEW_ENTITY = new String[] { "spawnNewEntity", "func_180613_a", "a" }; + public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "e" }; + public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "d" }; + public static final String[] GET_ENTITY_TO_SPAWN = new String[] { "getEntityNameToSpawn", "func_98276_e", "g" }; + public static final String[] SPAWN_NEW_ENTITY = new String[] { "spawnNewEntity", "func_180613_a", "a" }; // todo 1.9 // GuiIngame - public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "r" }; + public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "q" }; // EntityThrowable - public static final String[] THROWER = new String[] { "thrower", "field_70192_c", "g" }; + public static final String[] THROWER = new String[] { "thrower", "field_70192_c", "h" }; // GuiContainer public static final String[] THE_SLOT = new String[] { "theSlot", "field_147006_u", "u" }; // GuiChat public static final String[] INPUT_FIELD = new String[] { "inputField", "field_146415_a", "a" }; - public static final String[] COMPLETE_FLAG = new String[] { "waitingOnAutocomplete", "field_146414_r", "r" }; + public static final String[] COMPLETE_FLAG = new String[] { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9 // Entityliving - public static final String[] GET_LIVING_SOUND = new String[] { "getLivingSound", "func_70639_aQ", "z" }; + public static final String[] GET_LIVING_SOUND = new String[] { "getAmbientSound", "func_184639_G", "G" }; // RenderGlobal public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "p" }; @@ -106,11 +101,8 @@ public final class LibObfuscation { public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" }; public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" }; - // ItemRenderer + // ItemRenderer todo 1.9 dual wielding public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; - // RenderPlayer - public static final String[] ADD_LAYER = { "addLayer", "", "" }; - } From ec419edfe332696d7a30c2a26b4a9321a60e3f68 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 09:13:15 -0500 Subject: [PATCH 462/935] Fix sounds --- .../common/core/handler/ModSounds.java | 65 ++++++++++++++ .../common/core/proxy/CommonProxy.java | 4 +- .../botania/common/lib/LibObfuscation.java | 3 + .../resources/assets/botania/lang/en_US.lang | 41 +++++++++ src/main/resources/assets/botania/sounds.json | 84 +++++++++---------- 5 files changed, 153 insertions(+), 44 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/handler/ModSounds.java diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java new file mode 100644 index 000000000..5f4bbc715 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -0,0 +1,65 @@ +package vazkii.botania.common.core.handler; + +import net.minecraft.util.SoundEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public final class ModSounds { + + public static void init() { + try { + Method m = ReflectionHelper.findMethod(SoundEvent.class, null, LibObfuscation.REGISTER_SOUND, String.class); + m.invoke(null, "botania:airRod"); + m.invoke(null, "botania:agricarnation"); + m.invoke(null, "botania:altarCraft"); + m.invoke(null, "botania:babylonAttack"); + m.invoke(null, "botania:babylonSpawn"); + m.invoke(null, "botania:bellows"); + m.invoke(null, "botania:bifrostRod"); + m.invoke(null, "botania:blackLotus"); + m.invoke(null, "botania:dash"); + m.invoke(null, "botania:ding"); + m.invoke(null, "botania:divaCharm"); + m.invoke(null, "botania:divinationRod"); + m.invoke(null, "botania:doit"); + m.invoke(null, "botania:enchanterBlock"); + m.invoke(null, "botania:enchanterEnchant"); + m.invoke(null, "botania:endoflame"); + m.invoke(null, "botania:equipBauble"); + m.invoke(null, "botania:gaiaTrap"); + m.invoke(null, "botania:goldenLaurel"); + m.invoke(null, "botania:holyCloak"); + m.invoke(null, "botania:laputaStart"); + m.invoke(null, "botania:lexiconOpen"); + m.invoke(null, "botania:lexiconPage"); + m.invoke(null, "botania:lightRelay"); + m.invoke(null, "botania:manaBlaster"); + m.invoke(null, "botania:manaPoolCraft"); + m.invoke(null, "botania:missile"); + m.invoke(null, "botania:orechid"); + m.invoke(null, "botania:potionCreate"); + m.invoke(null, "botania:runeAltarCraft"); + m.invoke(null, "botania:runeAltarStart"); + m.invoke(null, "botania:spreaderFire"); + m.invoke(null, "botania:starcaller"); + m.invoke(null, "botania:terraBlade"); + m.invoke(null, "botania:terraformRod"); + m.invoke(null, "botania:terraPickMode"); + m.invoke(null, "botania:terrasteelCraft"); + m.invoke(null, "botania:thermalily"); + m.invoke(null, "botania:unholyCloak"); + m.invoke(null, "botania:way"); + m.invoke(null, "botania:music.gaia1"); + m.invoke(null, "botania:music.gaia2"); + } catch (IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); + } + } + + private ModSounds() {} + +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 8972fac73..935bdb6b6 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -21,7 +21,6 @@ import net.minecraft.entity.item.EntityPainting; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; @@ -44,7 +43,6 @@ import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.command.CommandDownloadLatest; import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; import vazkii.botania.common.core.command.CommandSkyblockSpread; @@ -56,6 +54,7 @@ import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.SpawnerChangingHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModBrewRecipes; @@ -103,6 +102,7 @@ public class CommonProxy { ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); + ModSounds.init(); ModBlocks.init(); ModItems.init(); ModEntities.init(); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 0b0318ee4..77d7d7a1b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -105,4 +105,7 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; + // SoundEvent + public static final String[] REGISTER_SOUND = { "registerSound", "func_187502_a", "a" }; + } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1f085bb27..77e13aaa7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3858,3 +3858,44 @@ botania.page.banners1=Showcase of the various banners botania.entry.preventingDecay=Preventing Decay botania.tagline.preventingDecay=Preventing passive flowers' decay botania.page.preventingDecay0=no + +botania.subtitle.airRod=Rod of the Skies whooshes +botania.subtitle.agricarnation=Agricarnation glimmers +botania.subtitle.altarCraft=Petal Apothecary finishes +botania.subtitle.babylonAttack=Key of King's Law unleashed +botania.subtitle.babylonSpawn=Key of King's Law activated +botania.subtitle.bellows=Manatide Bellows hisses +botania.subtitle.bifrostRod=Rod of the Bifrost hums +botania.subtitle.blackLotus=Black Lotus dissolves +botania.subtitle.dash=Player dashes forward +botania.subtitle.ding=Wand of the Forest dings +botania.subtitle.divaCharm=todo +botania.subtitle.divinationRod=todo +botania.subtitle.doit=JUST DO IT!! +botania.subtitle.enchanterBlock=todo +botania.subtitle.enchanterEnchant=Mana Enchanter finishes +botania.subtitle.endoflame=Endoflame ignites item +botania.subtitle.equipBauble=Bauble is equipped +botania.subtitle.gaiaTrap=todo +botania.subtitle.goldenLaurel=todo +botania.subtitle.holyCloak=todo +botania.subtitle.laputaStart=Laputa Shard triggers +botania.subtitle.lexiconOpen=Lexica Botania opens +botania.subtitle.lexiconPage=Lexica Botania page turns +botania.subtitle.lightRelay=Luminizer whooshes +botania.subtitle.manaBlaster=Mana Blaster fires +botania.subtitle.manaPoolCraft=Mana Pool infuses +botania.subtitle.missile=todo +botania.subtitle.orechid=todo +botania.subtitle.potionCreate=Brewery finishes +botania.subtitle.runeAltarCraft=Runic Altar finishes +botania.subtitle.runeAltarStart=Runic Altar starts +botania.subtitle.spreaderFire=Spreader shoots mana +botania.subtitle.starcaller=todo +botania.subtitle.terraBlade=todo +botania.subtitle.terraformRod=todo +botania.subtitle.terraPickMode=Terrasteel Pick powers up +botania.subtitle.terrasteelCraft=Terrasteel finishes +botania.subtitle.thermalily=todo +botania.subtitle.unholyCloak=todo +botania.subtitle.way=todo \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 3f9bc9775..1cd03c641 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,45 +1,45 @@ { - "airRod": { "category": "player", "sounds":["airRod"] }, - "agricarnation": { "category": "block", "sounds":["agricarnation"] }, - "altarCraft": { "category": "block", "sounds":["altarCraft"] }, - "babylonAttack": { "category": "player", "sounds":["babylonAttack"] }, - "babylonSpawn": { "category": "player", "sounds":["babylonSpawn"] }, - "bellows": { "category": "block", "sounds":["bellows"] }, - "bifrostRod": { "category": "player", "sounds":["bifrostRod"] }, - "blackLotus": { "category": "block", "sounds":["blackLotus"] }, - "dash": { "category": "player", "sounds":["dash"] }, - "ding": { "category": "block", "sounds":["ding"] }, - "divaCharm": { "category": "player", "sounds":["divaCharm"] }, - "divinationRod": { "category": "player", "sounds":["divinationRod"] }, - "doit": { "category": "block", "sounds":["doit"] }, - "enchanterBlock": { "category": "block", "sounds":["enchanterBlock"] }, - "enchanterEnchant": { "category": "block", "sounds":["enchanterEnchant"] }, - "endoflame": { "category": "block", "sounds":["endoflame"] }, - "equipBauble": { "category": "player", "sounds":["equipBauble"] }, - "gaiaTrap": { "category": "hostile", "sounds":["gaiaTrap"] }, - "goldenLaurel": { "category": "player", "sounds":["goldenLaurel"] }, - "holyCloak": { "category": "player", "sounds":["holyCloak"] }, - "laputaStart": { "category": "player", "sounds":["laputaStart"] }, - "lexiconOpen": { "category": "master", "sounds":["lexiconOpen"] }, - "lexiconPage": { "category": "master", "sounds":["lexiconPage"] }, - "lightRelay": { "category": "block", "sounds":["lightRelay"] }, - "manaBlaster": { "category": "player", "sounds":["manaBlaster"] }, - "manaPoolCraft": { "category": "block", "sounds":["manaPoolCraft"] }, - "missile": { "category": "player", "sounds":["missile"] }, - "orechid": { "category": "block", "sounds":["orechid"] }, - "potionCreate": { "category": "block", "sounds":["potionCreate"] }, - "runeAltarCraft": { "category": "block", "sounds":["runeAltarCraft"] }, - "runeAltarStart": { "category": "block", "sounds":["runeAltarStart"] }, - "spreaderFire": { "category": "block", "sounds":["spreaderFire"] }, - "starcaller": { "category": "player", "sounds":["starcaller"] }, - "terraBlade": { "category": "player", "sounds":["terraBlade"] }, - "terraformRod": { "category": "player", "sounds":["terraformRod"] }, - "terraPickMode": { "category": "player", "sounds":["terraPickMode"] }, - "terrasteelCraft": { "category": "block", "sounds":["terrasteelCraft"] }, - "thermalily": { "category": "block", "sounds":["thermalily"] }, - "unholyCloak": { "category": "player", "sounds":["unholyCloak"] }, - "way": { "category": "master", "sounds":["way"] }, + "airRod": { "category": "player", "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, + "agricarnation": { "category": "block", "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, + "altarCraft": { "category": "block", "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, + "babylonAttack": { "category": "player", "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, + "babylonSpawn": { "category": "player", "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, + "bellows": { "category": "block", "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, + "bifrostRod": { "category": "player", "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, + "blackLotus": { "category": "block", "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, + "dash": { "category": "player", "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, + "ding": { "category": "block", "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, + "divaCharm": { "category": "player", "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, + "divinationRod": { "category": "player", "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, + "doit": { "category": "block", "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, + "enchanterBlock": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterBlock" }, + "enchanterEnchant": { "category": "block", "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, + "endoflame": { "category": "block", "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, + "equipBauble": { "category": "player", "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, + "gaiaTrap": { "category": "hostile", "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, + "goldenLaurel": { "category": "player", "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, + "holyCloak": { "category": "player", "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, + "laputaStart": { "category": "player", "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, + "lexiconOpen": { "category": "master", "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, + "lexiconPage": { "category": "master", "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, + "lightRelay": { "category": "block", "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, + "manaBlaster": { "category": "player", "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, + "manaPoolCraft": { "category": "block", "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, + "missile": { "category": "player", "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, + "orechid": { "category": "block", "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, + "potionCreate": { "category": "block", "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, + "runeAltarCraft": { "category": "block", "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, + "runeAltarStart": { "category": "block", "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, + "spreaderFire": { "category": "block", "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, + "starcaller": { "category": "player", "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, + "terraBlade": { "category": "player", "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, + "terraformRod": { "category": "player", "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, + "terraPickMode": { "category": "player", "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, + "terrasteelCraft": { "category": "block", "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, + "thermalily": { "category": "block", "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, + "unholyCloak": { "category": "player", "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, + "way": { "category": "master", "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, - "music.gaia1": { "category": "record", "sounds":[{"name": "music/EndureEmptiness", "stream": true}] }, - "music.gaia2": { "category": "record", "sounds":[{"name": "music/FightForQuiescence", "stream": true}] } + "music.gaia1": { "category": "record", "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, + "music.gaia2": { "category": "record", "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } } \ No newline at end of file From 1b87160ef62c6d20b131cffa0cd53bbbf8c7bf09 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 09:45:56 -0500 Subject: [PATCH 463/935] Register the potions --- src/main/java/vazkii/botania/common/brew/potion/PotionMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index eea524fec..2d55a594c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -26,7 +26,7 @@ public class PotionMod extends Potion { public PotionMod(String name, boolean badEffect, int color, int iconIndex) { super(badEffect, color); - // todo 1.9 register + GameData.getPotionRegistry().register(-1, new ResourceLocation("botania", name), this); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } From 674ba5c19dce9429a299d8618e700fcf60c31b36 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 12:30:14 -0500 Subject: [PATCH 464/935] Fix somde models --- .../core/handler/MiscellaneousIcons.java | 1 + .../client/model/SpecialFlowerModel.java | 1 + .../common/block/decor/BlockManaGlass.java | 2 +- .../botania/blockstates/biomeStoneA0Wall.json | 34 +++++++++---------- .../botania/blockstates/doubleFlower1.json | 32 ++++++++--------- .../botania/blockstates/doubleFlower2.json | 32 ++++++++--------- .../botania/blockstates/stone0Wall.json | 18 +++++----- 7 files changed, 61 insertions(+), 59 deletions(-) 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 170a4286b..2ed55b467 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -87,6 +87,7 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { + FMLLog.info("The baked model for botania:jadedAmaranthus#normal is: " + evt.getModelRegistry().getObject(new ModelResourceLocation("botania:jadedAmaranthus", "normal"))); // Floating flowers todo 1.9 /*evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index c5374bf39..5a1b5f584 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -74,6 +74,7 @@ public class SpecialFlowerModel implements IModelCustomData { // Force island models to be loaded and baked. See FloatingFlowerModel. builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values()); + FMLLog.info("Collected special flower dependencies: %s", builder.build()); return builder.build(); } 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 c9b21c715..2bf35ebad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -48,7 +48,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); + Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json index e06c39112..9250e596c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -6,23 +6,23 @@ "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,variant=forest_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=plains_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=mountain_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=fungal_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=swamp_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=desert_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=taiga_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=mesa_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=forest_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=plains_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=mountain_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=fungal_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=swamp_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=desert_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=taiga_cobble,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,bswall_variant=mesa_cobble,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,variant=forest_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=plains_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=mountain_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=fungal_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=swamp_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=desert_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=taiga_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=mesa_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=forest_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=plains_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=mountain_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=fungal_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=swamp_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=desert_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=taiga_cobble,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,bswall_variant=mesa_cobble,west=true": { "model": null }, "north": { "true": { "submodel": "botania:wall_connect" }, @@ -44,7 +44,7 @@ "true": {}, "false": {} }, - "variant": { + "bswall_variant": { "forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } }, "plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } }, "mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } }, diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleFlower1.json index 7d171908a..1d25e07a5 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower1.json +++ b/src/main/resources/assets/botania/blockstates/doubleFlower1.json @@ -4,22 +4,22 @@ "model": "minecraft:cross" }, "variants": { - "half=lower,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], - "half=upper,variant=white": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], - "half=lower,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], - "half=upper,variant=orange": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], - "half=lower,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], - "half=upper,variant=magenta": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], - "half=lower,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], - "half=upper,variant=light_blue": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], - "half=lower,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], - "half=upper,variant=yellow": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], - "half=lower,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], - "half=upper,variant=lime": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], - "half=lower,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], - "half=upper,variant=pink": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], - "half=lower,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], - "half=upper,variant=gray": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], + "df_variant=white,half=lower": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], + "df_variant=white,half=upper": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], + "df_variant=orange,half=lower": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], + "df_variant=orange,half=upper": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], + "df_variant=magenta,half=lower": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], + "df_variant=magenta,half=upper": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], + "df_variant=light_blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], + "df_variant=light_blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], + "df_variant=yellow,half=lower": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], + "df_variant=yellow,half=upper": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], + "df_variant=lime,half=lower": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], + "df_variant=lime,half=upper": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], + "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], + "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], + "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], + "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], "inventory_white": [{ "model": "builtin/generated", diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleFlower2.json index 4bd2b54f4..b4c5d0df9 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower2.json +++ b/src/main/resources/assets/botania/blockstates/doubleFlower2.json @@ -4,22 +4,22 @@ "model": "minecraft:cross" }, "variants": { - "half=lower,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], - "half=upper,variant=silver": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], - "half=lower,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], - "half=upper,variant=cyan": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], - "half=lower,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], - "half=upper,variant=purple": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], - "half=lower,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], - "half=upper,variant=blue": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], - "half=lower,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], - "half=upper,variant=brown": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], - "half=lower,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], - "half=upper,variant=green": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], - "half=lower,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], - "half=upper,variant=red": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], - "half=lower,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], - "half=upper,variant=black": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], + "df_variant=silver,half=lower": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], + "df_variant=silver,half=upper": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], + "df_variant=cyan,half=lower": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], + "df_variant=cyan,half=upper": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], + "df_variant=purple,half=lower": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], + "df_variant=purple,half=upper": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], + "df_variant=blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], + "df_variant=blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], + "df_variant=brown,half=lower": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], + "df_variant=brown,half=upper": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], + "df_variant=green,half=lower": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], + "df_variant=green,half=upper": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], + "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], + "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], + "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], + "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], "inventory_silver": [{ "model": "builtin/generated", diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json index c77f3f3f8..19456ecf3 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -6,15 +6,15 @@ "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,variant=andesite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=basalt,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=diorite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,variant=granite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,fswall_variant=andesite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,fswall_variant=basalt,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,fswall_variant=diorite,west=false": { "model": null }, + "east=false,north=true,south=true,up=false,fswall_variant=granite,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,variant=andesite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=basalt,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=diorite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,variant=granite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,fswall_variant=andesite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,fswall_variant=basalt,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,fswall_variant=diorite,west=true": { "model": null }, + "east=true,north=false,south=false,up=false,fswall_variant=granite,west=true": { "model": null }, "north": { "true": { "submodel": "botania:wall_connect" }, @@ -36,7 +36,7 @@ "true": {}, "false": {} }, - "variant": { + "fswall_variant": { "andesite": { "textures": { "wall": "botania:blocks/stone0" } }, "basalt": { "textures": { "wall": "botania:blocks/stone1" } }, "diorite": { "textures": { "wall": "botania:blocks/stone2" } }, From ab618923dff46c2ded90fc17ac7bdcedadc35a2c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 13:01:07 -0500 Subject: [PATCH 465/935] Fix some methodhandles --- .../client/core/handler/ModelHandler.java | 26 +++++----- .../common/block/tile/TileSpawnerClaw.java | 51 +++++++++++++------ .../common/core/handler/MethodHandles.java | 15 +++--- .../botania/common/lib/LibObfuscation.java | 1 + 4 files changed, 55 insertions(+), 38 deletions(-) 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 f7902ff14..f2071bc05 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -814,19 +814,19 @@ public final class ModelHandler { 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 = GameData.getBlockRegistry().getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); -// String variant = "inventory_" + color.getName(); -// ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); -// } + item = Item.getItemFromBlock(ModBlocks.doubleFlower1); + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { + String name = GameData.getBlockRegistry().getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String variant = "inventory_" + color.getName(); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); + } } private static void registerPavement() { 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 f7bfb3397..378dadd23 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -16,12 +16,16 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.WeightedSpawnerEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.WeightedRandom; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.storage.AnvilChunkLoader; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; @@ -72,32 +76,47 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { int spawnCount = ((int) MethodHandles.spawnCount_getter.invokeExact(logic)); int spawnRange = ((int) MethodHandles.spawnRange_getter.invokeExact(logic)); int maxNearbyEntities = ((int) MethodHandles.maxNearbyEntities_getter.invokeExact(logic)); + WeightedSpawnerEntity randomEntity = ((WeightedSpawnerEntity) MethodHandles.randomEntity_getter.invokeExact(logic)); + BlockPos blockpos = logic.getSpawnerPosition(); for(int i = 0; i < spawnCount; ++i) { - Entity entity = EntityList.createEntityByName(((String) MethodHandles.getEntityNameToSpawn.invokeExact(logic)), logic.getSpawnerWorld()); + NBTTagCompound nbttagcompound = randomEntity.getNbt(); + NBTTagList nbttaglist = nbttagcompound.getTagList("Pos", 6); + World world = logic.getSpawnerWorld(); + int j = nbttaglist.tagCount(); + double d0 = j >= 1 ? nbttaglist.getDoubleAt(0) : (double)blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)spawnRange + 0.5D; + double d1 = j >= 2 ? nbttaglist.getDoubleAt(1) : (double)(blockpos.getY() + world.rand.nextInt(3) - 1); + double d2 = j >= 3 ? nbttaglist.getDoubleAt(2) : (double)blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)spawnRange + 0.5D; + Entity entity = AnvilChunkLoader.readWorldEntityPos(nbttagcompound, world, d0, d1, d2, false); if (entity == null) - return; - - int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), new AxisAlignedBB(logic.getSpawnerPosition(), logic.getSpawnerPosition().add(1, 1, 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); - - if (j >= maxNearbyEntities) { - resetTimer(logic); + { + return; + } + + int k = world.getEntitiesWithinAABB(entity.getClass(), (new AxisAlignedBB((double)blockpos.getX(), (double)blockpos.getY(), (double)blockpos.getZ(), (double)(blockpos.getX() + 1), (double)(blockpos.getY() + 1), (double)(blockpos.getZ() + 1))).expandXyz((double)spawnRange)).size(); + + if (k >= maxNearbyEntities) + { + this.resetTimer(logic); return; } - double d2 = logic.getSpawnerPosition().getX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; - double d3 = logic.getSpawnerPosition().getY() + logic.getSpawnerWorld().rand.nextInt(3) - 1; - double d4 = logic.getSpawnerPosition().getZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; - entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); + entity.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, world.rand.nextFloat() * 360.0F, 0.0F); - if(entityliving == null || entityliving.getCanSpawnHere()) { - // Must accept return value so methodhandle dynamically binds correctly - Entity e = ((Entity) MethodHandles.spawnNewEntity.invokeExact(logic, entity, true)); - this.getWorld().playAuxSFX(2004, logic.getSpawnerPosition(), 0); + if (entityliving == null || entityliving.getCanSpawnHere()) + { + if (randomEntity.getNbt().getSize() == 1 && randomEntity.getNbt().hasKey("id", 8) && entity instanceof EntityLiving) + { + ((EntityLiving)entity).onInitialSpawn(world.getDifficultyForLocation(new BlockPos(entity)), null); + } - if(entityliving != null) { + AnvilChunkLoader.spawnEntity(entity, world); + world.playAuxSFX(2004, blockpos, 0); + + if (entityliving != null) + { entityliving.spawnExplosionParticle(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index fd433f44a..db5a15dbd 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -23,7 +23,7 @@ public final class MethodHandles { spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, maxSpawnDelay_getter, minSpawnDelay_getter, spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, - getEntityNameToSpawn, isActivated, spawnNewEntity; // MobSpawnerBaseLogic + randomEntity_getter, isActivated; // MobSpawnerBaseLogic static { try { @@ -76,19 +76,16 @@ public final class MethodHandles { f.setAccessible(true); potentialSpawns_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(MobSpawnerBaseLogic.class, LibObfuscation.RANDOM_ENTITY); + f.setAccessible(true); + randomEntity_getter = publicLookup().unreflectGetter(f); + Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); m.setAccessible(true); isActivated = publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.SPAWN_NEW_ENTITY, Entity.class, boolean.class); - m.setAccessible(true); - spawnNewEntity = publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.GET_ENTITY_TO_SPAWN); - m.setAccessible(true); - getEntityNameToSpawn = publicLookup().unreflect(m); } catch (Throwable t) { FMLLog.severe("[Botania]: Couldn't initialize methodhandles! Things will be broken!"); + t.printStackTrace(); throw Throwables.propagate(t); } } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 77d7d7a1b..aec6566c9 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -70,6 +70,7 @@ public final class LibObfuscation { public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "e" }; public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "d" }; public static final String[] GET_ENTITY_TO_SPAWN = new String[] { "getEntityNameToSpawn", "func_98276_e", "g" }; + public static final String[] RANDOM_ENTITY = new String[] { "randomEntity", "field_98282_f", "c" }; public static final String[] SPAWN_NEW_ENTITY = new String[] { "spawnNewEntity", "func_180613_a", "a" }; // todo 1.9 // GuiIngame From ecb0f8a4be1a50e12f38e44eaea3a6258a79e077 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 13:47:58 -0500 Subject: [PATCH 466/935] Fix bow models --- .../core/handler/ClientMethodHandles.java | 19 +++--- .../client/core/handler/RenderLexicon.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 1 + .../equipment/tool/bow/ItemLivingwoodBow.java | 16 ++++- .../botania/models/item/crystalBow.json | 66 ++++++++++++++++--- .../models/item/crystalBow_pulling_1.json | 26 +++++--- .../models/item/crystalBow_pulling_2.json | 26 +++++--- .../models/item/crystalBow_pulling_3.json | 26 +++++--- .../models/item/crystalBow_pulling_4.json | 26 +++++--- .../models/item/crystalBow_pulling_5.json | 26 +++++--- .../botania/models/item/livingwoodBow.json | 52 ++++++++++++--- .../models/item/livingwoodBow_pulling_1.json | 26 +++++--- .../models/item/livingwoodBow_pulling_2.json | 26 +++++--- .../models/item/livingwoodBow_pulling_3.json | 26 +++++--- 14 files changed, 271 insertions(+), 97 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index a17739293..0d9cd4357 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -19,8 +19,8 @@ public final class ClientMethodHandles { renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager farPlaneDistance_getter, hurtCameraEffect, setupViewBobbing, getFOVModifier, - enableLightmap, disableLightmap, // EntityRenderer - prevEquippedProgress_getter, equippedProgress_getter; // ItemRenderer + enableLightmap, disableLightmap; // EntityRenderer + //prevEquippedProgress_getter, equippedProgress_getter; // ItemRenderer static { try { @@ -60,15 +60,16 @@ public final class ClientMethodHandles { m.setAccessible(true); getFOVModifier = MethodHandles.publicLookup().unreflect(m); - f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.PREV_EQUIPPED_PROGRESS); - f.setAccessible(true); - prevEquippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); - - f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.EQUIPPED_PROGRESS); - f.setAccessible(true); - equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); +// f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.PREV_EQUIPPED_PROGRESS); +// f.setAccessible(true); +// prevEquippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); +// +// f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.EQUIPPED_PROGRESS); +// f.setAccessible(true); +// equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); + e.printStackTrace(); throw Throwables.propagate(e); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 375108bcf..44bdf3b38 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -36,7 +36,7 @@ public class RenderLexicon { @SubscribeEvent public void renderItem(RenderHandEvent evt) { Minecraft mc = Minecraft.getMinecraft(); - if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) + if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) return; evt.setCanceled(true); @@ -102,8 +102,8 @@ public class RenderLexicon { private void renderItemInFirstPerson() throws Throwable { // Cherry picked from ItemRenderer.renderItemInFirstPerson - float prevEquippedProgress = ((float) ClientMethodHandles.prevEquippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); - float equippedProgress = ((float) ClientMethodHandles.equippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); + float prevEquippedProgress = 0;//((float) ClientMethodHandles.prevEquippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); + float equippedProgress = 0;//((float) ClientMethodHandles.equippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); float f = 1.0F - (prevEquippedProgress + (equippedProgress - prevEquippedProgress) * ClientTickHandler.partialTicks); EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; float f1 = player.getSwingProgress(ClientTickHandler.partialTicks); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 15e00cd63..dec001766 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -408,6 +408,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { renderPosY = (double) ClientMethodHandles.renderPosY_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); renderPosZ = (double) ClientMethodHandles.renderPosZ_getter.invokeExact(Minecraft.getMinecraft().getRenderManager()); } catch (Throwable t) { + t.printStackTrace(); return; } 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 1b722a0c3..8597e6094 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 @@ -18,6 +18,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; @@ -57,7 +58,20 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { setUnlocalizedName(name); setMaxDamage(500); setFull3D(); - addPropertyOverride(new ResourceLocation("minecraft:pull"), (stack, worldIn, entityIn) -> (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F); + addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + if (entityIn == null) + { + return 0.0F; + } + else + { + ItemStack itemstack = entityIn.getActiveItemStack(); + return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (float)(stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; + } + } + }); } @Override diff --git a/src/main/resources/assets/botania/models/item/crystalBow.json b/src/main/resources/assets/botania/models/item/crystalBow.json index 5a74c461d..42a50a9a6 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow.json +++ b/src/main/resources/assets/botania/models/item/crystalBow.json @@ -4,15 +4,61 @@ "layer0": "botania:items/crystalBow0" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } - } -} \ No newline at end of file + }, + "overrides": [ + { + "predicate": { + "minecraft:pulling": 1 + }, + "model": "botania:item/crystalBow_pulling_1" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.35 + }, + "model": "botania:item/crystalBow_pulling_2" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.65 + }, + "model": "botania:item/crystalBow_pulling_3" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.8 + }, + "model": "botania:item/crystalBow_pulling_4" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.9 + }, + "model": "botania:item/crystalBow_pulling_5" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json index 49eb6a52d..3cad87cf2 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json @@ -4,15 +4,25 @@ "layer0": "botania:items/crystalBow1" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json index b9d9be952..205e705b4 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json @@ -4,15 +4,25 @@ "layer0": "botania:items/crystalBow2" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json index d3bd453a3..835460709 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json @@ -4,15 +4,25 @@ "layer0": "botania:items/crystalBow3" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json index f147d6408..6430d9d58 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json @@ -4,15 +4,25 @@ "layer0": "botania:items/crystalBow4" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json index 6e987537e..ed9d6503b 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json @@ -4,15 +4,25 @@ "layer0": "botania:items/crystalBow5" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow.json b/src/main/resources/assets/botania/models/item/livingwoodBow.json index 0dff3ae2f..179a3ab2b 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow.json @@ -4,15 +4,47 @@ "layer0": "botania:items/livingwoodBow0" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } - } -} \ No newline at end of file + }, + "overrides": [ + { + "predicate": { + "minecraft:pulling": 1 + }, + "model": "botania:item/livingwoodBow_pulling_1" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.65 + }, + "model": "botania:item/livingwoodBow_pulling_2" + }, + { + "predicate": { + "minecraft:pulling": 1, + "minecraft:pull": 0.9 + }, + "model": "botania:item/livingwoodBow_pulling_3" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json index 413983fac..6d29694b9 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json @@ -4,15 +4,25 @@ "layer0": "botania:items/livingwoodBow1" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json index 96960440e..c1baf4768 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json @@ -4,15 +4,25 @@ "layer0": "botania:items/livingwoodBow2" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json index 28768bf44..162be4377 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json @@ -4,15 +4,25 @@ "layer0": "botania:items/livingwoodBow3" }, "display": { - "thirdperson": { - "rotation": [ 5, 80, -45 ], - "translation": [ 0.75, 0, 0.25 ], - "scale": [ 1, 1, 1 ] + "thirdperson_righthand": { + "rotation": [ -80, 260, -40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] + "thirdperson_lefthand": { + "rotation": [ -80, -280, 40 ], + "translation": [ -1, -2, 2.5 ], + "scale": [ 0.9, 0.9, 0.9 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, -25 ], + "translation": [ 1.13, 3.2, 1.13], + "scale": [ 0.68, 0.68, 0.68 ] } } } \ No newline at end of file From 4771ec5bdbf53ac3d106794469d75e7b3147cd8b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 24 Mar 2016 14:41:10 -0500 Subject: [PATCH 467/935] Some item overrides, fix bow firing --- .../client/core/handler/ModelHandler.java | 50 +++---------------- .../botania/common/item/ItemTwigWand.java | 8 +++ .../armor/manaweave/ItemManaweaveArmor.java | 10 ++++ .../equipment/tool/bow/ItemLivingwoodBow.java | 1 + .../botania/models/item/manaweaveBoots.json | 11 ++-- .../models/item/manaweaveBootsHoliday.json | 3 +- .../botania/models/item/manaweaveChest.json | 11 ++-- .../models/item/manaweaveChestHoliday.json | 3 +- .../botania/models/item/manaweaveHelm.json | 11 ++-- .../models/item/manaweaveHelmHoliday.json | 3 +- .../botania/models/item/manaweaveLegs.json | 11 ++-- .../models/item/manaweaveLegsHoliday.json | 3 +- .../assets/botania/models/item/twigWand.json | 8 ++- 13 files changed, 68 insertions(+), 65 deletions(-) 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 f2071bc05..02b752f27 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -233,14 +233,6 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"))); - ModelLoader.registerItemVariants(twigWand, - new ModelResourceLocation("botania:twigWand", "inventory"), - new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, MesherWrapper.of(stack -> { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - })); - ModelLoader.registerItemVariants(manaCookie, new ModelResourceLocation("botania:manaCookie", "inventory"), new ModelResourceLocation("botania:totalBiscuit", "inventory")); @@ -249,42 +241,6 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:totalBiscuit", "inventory") : new ModelResourceLocation("botania:manaCookie", "inventory"))); - ModelLoader.registerItemVariants(manaweaveBoots, - new ModelResourceLocation("botania:manaweaveBoots", "inventory"), - new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveBoots, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveChest, - new ModelResourceLocation("botania:manaweaveChest", "inventory"), - new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveChest, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveHelm, - new ModelResourceLocation("botania:manaweaveHelm", "inventory"), - new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveHelm, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"))); - - ModelLoader.registerItemVariants(manaweaveLegs, - new ModelResourceLocation("botania:manaweaveLegs", "inventory"), - new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - - ModelLoader.setCustomMeshDefinition(manaweaveLegs, MesherWrapper.of(stack -> - ClientProxy.jingleTheBells - ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"))); - ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); @@ -469,6 +425,7 @@ public final class ModelHandler { } private static void registerStandardItems() { + registerItemModel(twigWand); registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); @@ -486,6 +443,11 @@ public final class ModelHandler { registerItemModel(manasteelAxe); registerItemModel(manasteelShears); + registerItemModel(manaweaveHelm); + registerItemModel(manaweaveChest); + registerItemModel(manaweaveLegs); + registerItemModel(manaweaveBoots); + registerItemModel(elementiumHelm); registerItemModel(elementiumHelmRevealing); registerItemModel(elementiumChest); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index d1d68fcbf..3dceeab72 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -17,10 +17,12 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -59,6 +61,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { public ItemTwigWand() { super(LibItemNames.TWIG_WAND); setMaxStackSize(1); + addPropertyOverride(new ResourceLocation("botania", "bindmode"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return getBindMode(stack) ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index ca567a7e3..d54a88faf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,12 +13,16 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -35,6 +39,12 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); + addPropertyOverride(new ResourceLocation("botania", "holiday"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return ClientProxy.jingleTheBells ? 1 : 0; + } + }); } @Override 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 8597e6094..a88860db8 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 @@ -131,6 +131,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(ammo == null) 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); if(f == 1.0F) entityarrow.setIsCritical(true); diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveBoots.json index 855af3490..21f61818a 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBoots.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveBoots" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveBootsHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json index 666436bb9..dbbcfb782 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveBootsHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweaveChest.json index 7628e9d37..42f9e20cf 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChest.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveChest" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveChestHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json index 8accb14c4..96a9d8450 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveChestHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweaveHelm.json index 7853b7e07..3f8ecc2ed 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelm.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveHelm" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveHelmHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json index cadc02bea..3fad87e44 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveHelmHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweaveLegs.json index 014fc8fbb..506d1733f 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegs.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveLegs" - } + }, + "overrides": [{ + "predicate": { + "botania:holiday": 1 + }, + "model": "botania:item/manaweaveLegsHoliday" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json index 167ca6e37..e16a174b8 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/manaweaveLegsHoliday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json index f0b2b89d7..a513a38f4 100644 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -4,5 +4,11 @@ "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", "layer2": "botania:items/twigWand2" - } + }, + "overrides": [{ + "predicate": { + "botania:bindmode": 1 + }, + "model": "botania:item/twigWand_bind" + }] } \ No newline at end of file From c8531fde6721088b72dd435cfa1edad460c796ae Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 00:30:45 -0500 Subject: [PATCH 468/935] Update forge, some more model overrides --- build.properties | 2 +- .../client/core/handler/DebugHandler.java | 34 +++++----- .../client/core/handler/HUDHandler.java | 38 ++++++------ .../client/core/handler/LightningHandler.java | 2 +- .../core/handler/MiscellaneousIcons.java | 62 +++++++++---------- .../client/core/handler/ModelHandler.java | 53 ++-------------- .../core/handler/MultiblockRenderHandler.java | 6 +- .../client/core/handler/TooltipHandler.java | 18 +++--- .../client/model/FloatingFlowerModel.java | 2 +- .../botania/common/block/BlockFelPumpkin.java | 8 +-- .../botania/common/block/BlockGhostRail.java | 34 +++++----- .../common/block/BlockPistonRelay.java | 4 +- .../string/BlockRedStringInterceptor.java | 4 +- .../subtile/functional/SubTileVinculotus.java | 16 ++--- .../subtile/generating/SubTileNarslimmus.java | 4 +- .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 6 +- .../common/brew/potion/PotionEmptiness.java | 6 +- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../common/brew/potion/PotionSoulCross.java | 4 +- .../core/handler/BiomeDecorationHandler.java | 54 ++++++++-------- .../common/core/handler/ConfigHandler.java | 8 +-- .../common/core/handler/PixieHandler.java | 8 +-- .../common/core/handler/SheddingHandler.java | 10 +-- .../corporea/WrappedDeepStorage.java | 4 +- .../botania/common/item/ItemCraftingHalo.java | 3 +- .../botania/common/item/ItemFlowerBag.java | 8 +-- .../botania/common/item/ItemKeepIvy.java | 6 +- .../botania/common/item/ItemSpawnerMover.java | 9 +++ .../vazkii/botania/common/item/ItemVirus.java | 4 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 14 ++--- .../item/equipment/bauble/ItemDivaCharm.java | 26 ++++---- .../equipment/bauble/ItemFlightTiara.java | 12 ++-- .../equipment/bauble/ItemGoldenLaurel.java | 4 +- .../item/equipment/bauble/ItemHolyCloak.java | 6 +- .../item/equipment/bauble/ItemMagnetRing.java | 12 +++- .../item/equipment/bauble/ItemTravelBelt.java | 8 +-- .../equipment/bauble/ItemUnholyCloak.java | 4 +- .../item/equipment/tool/ItemGlassPick.java | 4 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 1 - .../tool/elementium/ItemElementiumAxe.java | 24 +++---- .../tool/elementium/ItemElementiumPick.java | 12 ++-- .../tool/manasteel/ItemManasteelSword.java | 8 +++ .../common/item/relic/ItemAesirRing.java | 16 ++--- .../common/item/relic/ItemOdinRing.java | 6 +- .../common/item/rod/ItemExchangeRod.java | 10 +-- .../common/world/SkyblockWorldEvents.java | 32 +++++----- .../models/item/crystalBow_pulling_1.json | 24 +------ .../models/item/crystalBow_pulling_2.json | 24 +------ .../models/item/crystalBow_pulling_3.json | 24 +------ .../models/item/crystalBow_pulling_4.json | 24 +------ .../models/item/crystalBow_pulling_5.json | 24 +------ .../models/item/livingwoodBow_pulling_1.json | 24 +------ .../models/item/livingwoodBow_pulling_2.json | 24 +------ .../models/item/livingwoodBow_pulling_3.json | 24 +------ .../botania/models/item/magnetRing.json | 12 ++++ .../models/item/magnetRingGreater.json | 12 ++++ .../models/item/magnetRingGreaterOff.json | 6 -- .../botania/models/item/magnetRingOff.json | 6 -- .../botania/models/item/manasteelSword.json | 8 ++- .../botania/models/item/spawnerMover.json | 8 ++- 61 files changed, 347 insertions(+), 517 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/magnetRing.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreater.json delete mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json delete mode 100644 src/main/resources/assets/botania/models/item/magnetRingOff.json diff --git a/build.properties b/build.properties index d2ba7e27e..0c7265eeb 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1797-1.9 +forge_version=12.16.0.1811-1.9 mc_version=1.9 dir_repo=./ build_number=300 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 168e0999a..bf911b667 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -39,40 +39,40 @@ public final class DebugHandler { public void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { - event.left.add(null); + event.getLeft().add(null); String version = LibMisc.VERSION; if(version.contains("GRADLE")) version = "N/A"; - event.left.add(PREFIX + "pS: " + ParticleRenderDispatcher.sparkleFxCount + ", pFS: " + ParticleRenderDispatcher.fakeSparkleFxCount + ", pW: " + ParticleRenderDispatcher.wispFxCount + ", pDIW: " + ParticleRenderDispatcher.depthIgnoringWispFxCount + ", pLB: " + ParticleRenderDispatcher.lightningCount); - event.left.add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); + event.getLeft().add(PREFIX + "pS: " + ParticleRenderDispatcher.sparkleFxCount + ", pFS: " + ParticleRenderDispatcher.fakeSparkleFxCount + ", pW: " + ParticleRenderDispatcher.wispFxCount + ", pDIW: " + ParticleRenderDispatcher.depthIgnoringWispFxCount + ", pLB: " + ParticleRenderDispatcher.lightningCount); + event.getLeft().add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); if (Minecraft.getMinecraft().isSingleplayer()) { UUID id = Minecraft.getMinecraft().thePlayer.getUniqueID(); Entity ent = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id); if (ent != null) { World serverWorld = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id).worldObj; - event.left.add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimension(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); + event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimension(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } if(GuiScreen.isCtrlKeyDown() && GuiScreen.isShiftKeyDown()) { - event.left.add(PREFIX + "Config Context"); - event.left.add(" shaders.enabled: " + ConfigHandler.useShaders); - event.left.add(" shaders.secondaryUnit: " + ConfigHandler.glSecondaryTextureUnit); + event.getLeft().add(PREFIX + "Config Context"); + event.getLeft().add(" shaders.enabled: " + ConfigHandler.useShaders); + event.getLeft().add(" shaders.secondaryUnit: " + ConfigHandler.glSecondaryTextureUnit); ContextCapabilities caps = GLContext.getCapabilities(); - event.left.add(PREFIX + "OpenGL Context"); - event.left.add(" GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION)); - event.left.add(" GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER)); - event.left.add(" GL_SHADING_LANGUAGE_VERSION: " + GL11.glGetString(GL20.GL_SHADING_LANGUAGE_VERSION)); - event.left.add(" GL_MAX_TEXTURE_IMAGE_UNITS_ARB: " + GL11.glGetInteger(ARBFragmentShader.GL_MAX_TEXTURE_IMAGE_UNITS_ARB)); - event.left.add(" GL_ARB_multitexture: " + caps.GL_ARB_multitexture); - event.left.add(" GL_ARB_texture_non_power_of_two: " + caps.GL_ARB_texture_non_power_of_two); - event.left.add(" OpenGL13: " + caps.OpenGL13); + event.getLeft().add(PREFIX + "OpenGL Context"); + event.getLeft().add(" GL_VERSION: " + GL11.glGetString(GL11.GL_VERSION)); + event.getLeft().add(" GL_RENDERER: " + GL11.glGetString(GL11.GL_RENDERER)); + event.getLeft().add(" GL_SHADING_LANGUAGE_VERSION: " + GL11.glGetString(GL20.GL_SHADING_LANGUAGE_VERSION)); + event.getLeft().add(" GL_MAX_TEXTURE_IMAGE_UNITS_ARB: " + GL11.glGetInteger(ARBFragmentShader.GL_MAX_TEXTURE_IMAGE_UNITS_ARB)); + 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) - event.left.add(PREFIX + "SHIFT+CMD for context"); - else event.left.add(PREFIX + "SHIFT+CTRL for context"); + 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/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 98257d229..53c73042e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -80,12 +80,12 @@ public final class HUDHandler { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; - if(event.type == ElementType.HEALTH) { + if(event.getType() == ElementType.HEALTH) { profiler.startSection("botania-hud"); ItemStack amulet = PlayerHandler.getPlayerBaubles(mc.thePlayer).getStackInSlot(0); if(amulet != null && amulet.getItem() == ModItems.flightTiara) { profiler.startSection("flugelTiara"); - ItemFlightTiara.renderHUD(event.resolution, mc.thePlayer, amulet); + ItemFlightTiara.renderHUD(event.getResolution(), mc.thePlayer, amulet); profiler.endSection(); } profiler.endSection(); @@ -99,7 +99,7 @@ public final class HUDHandler { ItemStack main = mc.thePlayer.getHeldItemMainhand(); ItemStack offhand = mc.thePlayer.getHeldItemOffhand(); - if(event.type == ElementType.ALL) { + if(event.getType() == ElementType.ALL) { profiler.startSection("botania-hud"); RayTraceResult pos = mc.objectMouseOver; @@ -110,61 +110,61 @@ public final class HUDHandler { if(PlayerHelper.hasAnyHeldItem(mc.thePlayer)) { if(pos != null && PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.twigWand)) { - renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand), event.resolution); + renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand), event.getResolution()); if(block instanceof IWandHUD) { profiler.startSection("wandItem"); - ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.getBlockPos()); + ((IWandHUD) block).renderHUD(mc, event.getResolution(), mc.theWorld, pos.getBlockPos()); profiler.endSection(); } } else if(block != null && PlayerHelper.hasHeldItemClass(mc.thePlayer, ILexicon.class)) - drawLexiconHUD(PlayerHelper.getFirstHeldItemClass(mc.thePlayer, ILexicon.class), state, pos, event.resolution); + drawLexiconHUD(PlayerHelper.getFirstHeldItemClass(mc.thePlayer, ILexicon.class), state, pos, event.getResolution()); if(tile != null && tile instanceof TilePool && mc.thePlayer.getHeldItemMainhand() != null) - renderPoolRecipeHUD(event.resolution, (TilePool) tile, mc.thePlayer.getHeldItemMainhand()); + renderPoolRecipeHUD(event.getResolution(), (TilePool) tile, mc.thePlayer.getHeldItemMainhand()); } if(tile != null && tile instanceof TileAltar) - ((TileAltar) tile).renderHUD(mc, event.resolution); + ((TileAltar) tile).renderHUD(mc, event.getResolution()); else if(tile != null && tile instanceof TileRuneAltar) - ((TileRuneAltar) tile).renderHUD(mc, event.resolution); + ((TileRuneAltar) tile).renderHUD(mc, event.getResolution()); if(tile != null && tile instanceof TileCorporeaCrystalCube) - renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile); + renderCrystalCubeHUD(event.getResolution(), (TileCorporeaCrystalCube) tile); } if(!TileCorporeaIndex.getInputHandler().getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { profiler.startSection("nearIndex"); - renderNearIndexDisplay(event.resolution); + renderNearIndexDisplay(event.getResolution()); profiler.endSection(); } if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { profiler.startSection("multiblockRightClick"); String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor"); - mc.fontRendererObj.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); + mc.fontRendererObj.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF); profiler.endSection(); } if(main != null && main.getItem() instanceof ItemCraftingHalo) { profiler.startSection("craftingHalo"); - ItemCraftingHalo.renderHUD(event.resolution, mc.thePlayer, main); + ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, main); profiler.endSection(); } if(main != null && main.getItem() instanceof ItemSextant) { profiler.startSection("sextant"); - ItemSextant.renderHUD(event.resolution, mc.thePlayer, main); + ItemSextant.renderHUD(event.getResolution(), mc.thePlayer, main); profiler.endSection(); } /*if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) { profiler.startSection("flugelEye"); - ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack); + ItemFlugelEye.renderHUD(event.getResolution(), mc.thePlayer, equippedStack); profiler.endSection(); }*/ if(Botania.proxy.isClientPlayerWearingMonocle()) { profiler.startSection("monocle"); - ItemMonocle.renderHUD(event.resolution, mc.thePlayer); + ItemMonocle.renderHUD(event.getResolution(), mc.thePlayer); profiler.endSection(); } @@ -206,12 +206,12 @@ public final class HUDHandler { } if(anyRequest) - renderManaInvBar(event.resolution, creative, totalMana, totalMaxMana); + renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana); profiler.endStartSection("bossBar"); - BossBarHandler.render(event.resolution); + BossBarHandler.render(event.getResolution()); profiler.endStartSection("itemsRemaining"); - ItemsRemainingRenderHandler.render(event.resolution, event.partialTicks); + ItemsRemainingRenderHandler.render(event.getResolution(), event.getPartialTicks()); profiler.endSection(); profiler.endSection(); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index d24ab673f..9294efe3e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -68,7 +68,7 @@ public class LightningHandler { RedStringRenderer.renderAll(); profiler.endStartSection("lightning"); - float frame = event.partialTicks; + float frame = event.getPartialTicks(); Entity entity = Minecraft.getMinecraft().thePlayer; TextureManager render = Minecraft.getMinecraft().renderEngine; 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 2ed55b467..76ec1ce5d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -106,59 +106,59 @@ public class MiscellaneousIcons { @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); - lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); - lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); - alchemyCatalystOverlay = IconHelper.forName(evt.map, "alchemyCatalyst3", "blocks"); - enchanterOverlay = IconHelper.forName(evt.map, "enchanterOverlay", "blocks"); - manaVoidOverlay = IconHelper.forName(evt.map, "manaVoid1", "blocks"); - manaWater = IconHelper.forName(evt.map, "manaWater", "blocks"); - terraPlateOverlay = IconHelper.forName(evt.map, "terraPlateOverlay", "blocks"); - corporeaWorldIcon = IconHelper.forName(evt.map, "corporeaSpark1", "items"); - corporeaWorldIconMaster = IconHelper.forName(evt.map, "corporeaSpark3", "items"); - corporeaIconStar = IconHelper.forName(evt.map, "corporeaSparkStar", "items"); - sparkWorldIcon = IconHelper.forName(evt.map, "spark1", "items"); + alfPortalTex = IconHelper.forName(evt.getMap(), "alfheimPortalInside", "blocks"); + lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); + lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); + alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); + enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); + manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); + manaWater = IconHelper.forName(evt.getMap(), "manaWater", "blocks"); + terraPlateOverlay = IconHelper.forName(evt.getMap(), "terraPlateOverlay", "blocks"); + corporeaWorldIcon = IconHelper.forName(evt.getMap(), "corporeaSpark1", "items"); + corporeaWorldIconMaster = IconHelper.forName(evt.getMap(), "corporeaSpark3", "items"); + corporeaIconStar = IconHelper.forName(evt.getMap(), "corporeaSparkStar", "items"); + sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark1", "items"); sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { - sparkUpgradeIcons[i] = IconHelper.forName(evt.map, "sparkUpgradeL" + i, "items"); + sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "sparkUpgradeL" + i, "items"); } - tailIcon = IconHelper.forName(evt.map, "tail", "items"); - phiFlowerIcon = IconHelper.forName(evt.map, "phiFlower", "items"); - goldfishIcon = IconHelper.forName(evt.map, "goldfish", "items"); - nerfBatIcon = IconHelper.forName(evt.map, "nerfBat", "items"); + tailIcon = IconHelper.forName(evt.getMap(), "tail", "items"); + phiFlowerIcon = IconHelper.forName(evt.getMap(), "phiFlower", "items"); + goldfishIcon = IconHelper.forName(evt.getMap(), "goldfish", "items"); + nerfBatIcon = IconHelper.forName(evt.getMap(), "nerfBat", "items"); kingKeyWeaponIcons = new TextureAtlasSprite[ItemKingKey.WEAPON_TYPES]; for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) - kingKeyWeaponIcons[i] = IconHelper.forName(evt.map, "gateWeapon" + i, "items"); + kingKeyWeaponIcons[i] = IconHelper.forName(evt.getMap(), "gateWeapon" + i, "items"); - manaDetectorIcon = IconHelper.forName(evt.map, "triggers/manaDetector", "items"); - runeAltarTriggerIcon = IconHelper.forName(evt.map, "triggers/runeAltarCanCraft", "items"); + manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); + runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { - manaLevelTriggerIcons.put(s, IconHelper.forName(evt.map, "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); + manaLevelTriggerIcons.put(s, IconHelper.forName(evt.getMap(), "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); } tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; for (int i = 0; i < tiaraWingIcons.length; i++) { - tiaraWingIcons[i] = IconHelper.forName(evt.map, "flightTiara" + (i + 1), "items"); + tiaraWingIcons[i] = IconHelper.forName(evt.getMap(), "flightTiara" + (i + 1), "items"); } - terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items"); + terrasteelHelmWillIcon = IconHelper.forName(evt.getMap(), "willFlame", "items"); - bloodPendantChain = IconHelper.forName(evt.map, "bloodPendant2", "items"); - bloodPendantGem = IconHelper.forName(evt.map, "bloodPendant3", "items"); - snowflakePendantGem = IconHelper.forName(evt.map, "icePendantGem", "items"); - itemFinderGem = IconHelper.forName(evt.map, "itemFinderGem", "items"); - pyroclastGem = IconHelper.forName(evt.map, "lavaPendantGem", "items"); - crimsonGem = IconHelper.forName(evt.map, "superLavaPendantGem", "items"); + bloodPendantChain = IconHelper.forName(evt.getMap(), "bloodPendant2", "items"); + bloodPendantGem = IconHelper.forName(evt.getMap(), "bloodPendant3", "items"); + snowflakePendantGem = IconHelper.forName(evt.getMap(), "icePendantGem", "items"); + itemFinderGem = IconHelper.forName(evt.getMap(), "itemFinderGem", "items"); + pyroclastGem = IconHelper.forName(evt.getMap(), "lavaPendantGem", "items"); + crimsonGem = IconHelper.forName(evt.getMap(), "superLavaPendantGem", "items"); } @SubscribeEvent public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.entityPlayer.worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) - || !evt.entityPlayer.isSneaking()) + if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) + || !evt.getEntityPlayer().isSneaking()) return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); 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 02b752f27..c33a8bf64 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -165,7 +165,6 @@ public final class ModelHandler { registerTESRItems(); registerManaResources(); registerRunes(); - registerBows(); registerLens(); registerBrews(); @@ -199,21 +198,8 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); - ModelLoader.registerItemVariants(magnetRing, - new ModelResourceLocation("botania:magnetRingOn", "inventory"), - new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, MesherWrapper.of(stack -> - ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory"))); - - ModelLoader.registerItemVariants(magnetRingGreater, - new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), - new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, MesherWrapper.of(stack -> - ItemMagnetRing.getCooldown(stack) <= 0 - ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"))); + registerItemModel(magnetRing); + registerItemModel(magnetRingGreater); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), @@ -241,18 +227,8 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:totalBiscuit", "inventory") : new ModelResourceLocation("botania:manaCookie", "inventory"))); - ModelLoader.registerItemVariants(manasteelSword, - new ModelResourceLocation("botania:manasteelSword", "inventory"), - new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, MesherWrapper.of(stack -> - "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) - ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"))); - - ModelLoader.registerItemVariants(spawnerMover, - new ModelResourceLocation("botania:spawnerMover", "inventory"), - new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, MesherWrapper.of(stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"))); + registerItemModel(manasteelSword); + registerItemModel(spawnerMover); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), @@ -469,6 +445,8 @@ public final class ModelHandler { registerItemModel(starSword); registerItemModel(thunderSword); + registerItemModel(crystalBow); + registerItemModel(livingwoodBow); registerItemModel(glassPick); registerItemModel(flowerBag); @@ -594,9 +572,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.hourglass); // todo json maybe? ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - registerItemModel(ModBlocks.pump); // todo await animation api - //ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class); - registerItemModel(ModBlocks.teruTeruBozu); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } @@ -616,22 +591,6 @@ public final class ModelHandler { } } - private static void registerBows() { - ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow", "inventory")); - ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_1", "inventory")); - ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_2", "inventory")); - ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_3", "inventory")); - registerItemModel(livingwoodBow); - - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow", "inventory")); - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_1", "inventory")); - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_2", "inventory")); - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_3", "inventory")); - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_4", "inventory")); - ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_5", "inventory")); - registerItemModel(crystalBow); - } - private static void registerLens() { int counter = 0; for (String s : LibItemNames.LENS_NAMES) { 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 c0ff9d6fb..c838006e7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -105,9 +105,9 @@ public final class MultiblockRenderHandler { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { - if(currentMultiblock != null && anchor == null && event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer == Minecraft.getMinecraft().thePlayer) { - anchor = event.pos; - angle = event.entityPlayer.getHorizontalFacing(); + if(currentMultiblock != null && anchor == null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { + anchor = event.getPos(); + angle = event.getEntityPlayer().getHorizontalFacing(); event.setCanceled(true); } } 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 7644460d3..a58b4df3f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -24,16 +24,16 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onTooltipEvent(ItemTooltipEvent event) { - if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.dirt) && event.itemStack.getItemDamage() == 1) { - event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt0")); - event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt1")); - } else if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.mob_spawner) && event.entityPlayer.capabilities.isCreativeMode) - event.toolTip.add(I18n.translateToLocal("botaniamisc.spawnerTip")); + 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) + event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip")); - if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemRegenIvy.TAG_REGEN, false)) - event.toolTip.add(I18n.translateToLocal("botaniamisc.hasIvy")); - if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemKeepIvy.TAG_KEEP, false)) - event.toolTip.add(I18n.translateToLocal("botaniamisc.hasKeepIvy")); + if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) + event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasIvy")); + if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) + event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasKeepIvy")); } } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 6d21631a4..7a1347f59 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -51,7 +51,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; - private static Table CACHE = HashBasedTable.create(); + private static final Table CACHE = HashBasedTable.create(); protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 19238fb77..80d51f0ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -86,10 +86,10 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { @SubscribeEvent public void onDrops(LivingDropsEvent event) { - if(event.entity instanceof EntityBlaze && event.entity.getEntityData().getBoolean(TAG_FEL_SPAWNED)) - if(event.drops.isEmpty()) - event.drops.add(new EntityItem(event.entity.worldObj, event.entity.posX, event.entity.posY, event.entity.posZ, new ItemStack(Items.blaze_powder, 6))); - else for(EntityItem item : event.drops) { + 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))); + 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)); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index e54dbe951..f2cfdcd40 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -68,33 +68,33 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { @SubscribeEvent public void onMinecartUpdate(MinecartUpdateEvent event) { - BlockPos entPos = new BlockPos(event.entity); - IBlockState state = event.entity.worldObj.getBlockState(entPos); + BlockPos entPos = new BlockPos(event.getEntity()); + IBlockState state = event.getEntity().worldObj.getBlockState(entPos); Block block = state.getBlock(); - boolean air = block.isAir(state, event.entity.worldObj, entPos); - int floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); + boolean air = block.isAir(state, event.getEntity().worldObj, entPos); + int floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); if(block == this) - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 20); + event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 20); else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, 0); + event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0); if(floatTicks > 0) - event.entity.worldObj.playAuxSFX(2003, entPos, 0); + event.getEntity().worldObj.playAuxSFX(2003, entPos, 0); } - floatTicks = event.entity.getEntityData().getInteger(TAG_FLOAT_TICKS); + floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); if(floatTicks > 0) { - IBlockState stateBelow = event.entity.worldObj.getBlockState(entPos.down()); + IBlockState stateBelow = event.getEntity().worldObj.getBlockState(entPos.down()); Block blockBelow = stateBelow.getBlock(); - boolean airBelow = blockBelow.isAir(stateBelow, event.entity.worldObj, entPos.down()); + boolean airBelow = blockBelow.isAir(stateBelow, event.getEntity().worldObj, entPos.down()); if(air && airBelow || !air && !airBelow) - event.entity.noClip = true; - event.entity.motionY = 0.2; - event.entity.motionX *= 1.4; - event.entity.motionZ *= 1.4; - event.entity.getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); - event.entity.worldObj.playAuxSFX(2000, entPos, 0); - } else event.entity.noClip = false; + event.getEntity().noClip = true; + event.getEntity().motionY = 0.2; + 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); + } else event.getEntity().noClip = false; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 43481c00f..5e2912bb0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -135,12 +135,12 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void onWorldLoad(WorldEvent.Load event) { - WorldData.get(event.world); + WorldData.get(event.getWorld()); } @SubscribeEvent public void onWorldUnload(WorldEvent.Unload event) { - WorldData.get(event.world).markDirty(); + WorldData.get(event.getWorld()).markDirty(); } public static class WorldData extends WorldSavedData { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index d33859781..08c5d6af3 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -61,8 +61,8 @@ public class BlockRedStringInterceptor extends BlockRedString { @SubscribeEvent public void onInteract(PlayerInteractEvent event) { - if(event.action == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.entityPlayer, event.world, event.pos); + if(event.getAction() == Action.RIGHT_CLICK_BLOCK) + TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 11e3cf6a7..cef4b8324 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -74,35 +74,35 @@ public class SubTileVinculotus extends SubTileFunctional { @SubscribeEvent public void onEndermanTeleport(EnderTeleportEvent event) { - if(event.entity.worldObj.isRemote) + if(event.getEntityLiving().worldObj.isRemote) return; int cost = 50; - if(event.entity instanceof EntityEnderman) { + if(event.getEntityLiving() instanceof EntityEnderman) { List possibleFlowers = new ArrayList<>(); for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; double x = flower.supertile.getPos().getX() + 0.5; double y = flower.supertile.getPos().getY() + 1.5; double z = flower.supertile.getPos().getZ() + 0.5; - if(MathHelper.pointDistanceSpace(x, y, z, event.targetX, event.targetY, event.targetZ) < RANGE) + if(MathHelper.pointDistanceSpace(x, y, z, event.getTargetX(), event.getTargetY(), event.getTargetZ()) < RANGE) possibleFlowers.add(flower); } if(!possibleFlowers.isEmpty()) { - SubTileVinculotus flower = possibleFlowers.get(event.entity.worldObj.rand.nextInt(possibleFlowers.size())); + SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().worldObj.rand.nextInt(possibleFlowers.size())); double x = flower.supertile.getPos().getX() + 0.5; double y = flower.supertile.getPos().getY() + 1.5; double z = flower.supertile.getPos().getZ() + 0.5; - event.targetX = x + Math.random() * 3 - 1; - event.targetY = y; - event.targetZ = z + Math.random() * 3 - 1; + event.setTargetX(x + Math.random() * 3 - 1); + event.setTargetY(y); + event.setTargetZ(z + Math.random() * 3 - 1); flower.mana -= cost; flower.sync(); } 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 321673dc4..673f60ce2 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 @@ -90,8 +90,8 @@ public class SubTileNarslimmus extends SubTileGenerating { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.entityLiving instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.entityLiving.worldObj, MathHelper.floor_double(event.x), MathHelper.floor_double(event.z))) - event.entityLiving.getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); + if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().worldObj, MathHelper.floor_double(event.getX()), MathHelper.floor_double(event.getZ()))) + event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); } public static boolean isSlimeChunk(World world, int x, int z) { 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 41bea1849..442dc4355 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -27,7 +27,7 @@ public class PotionAllure extends PotionMod { @SubscribeEvent public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.entityLiving; + EntityLivingBase e = event.getEntityLiving(); if(e instanceof EntityPlayer && hasEffect(e)) { EntityFishHook hook = ((EntityPlayer) e).fishEntity; if(hook != null) 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 2daa699ec..2181c99b2 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -33,9 +33,9 @@ public class PotionBloodthirst extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); - for(EntityPlayer player : event.world.playerEntities) { + if(event.getResult() != Result.ALLOW && event.getEntityLiving() instanceof IMob) { + AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); + for(EntityPlayer player : event.getWorld().playerEntities) { if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness) && player.getEntityBoundingBox().intersectsWith(aabb)) { event.setResult(Result.ALLOW); return; 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 6d82f70cd..a16133b51 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -32,9 +32,9 @@ public class PotionEmptiness extends PotionMod { @SubscribeEvent public void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { - AxisAlignedBB aabb = new AxisAlignedBB(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE); - for(EntityPlayer player : event.world.playerEntities) { + if(event.getResult() != Result.ALLOW && event.getEntityLiving() instanceof IMob) { + AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, event.getX() + RANGE, event.getY() + RANGE, event.getZ() + RANGE); + for(EntityPlayer player : event.getWorld().playerEntities) { if(hasEffect(player) && player.getEntityBoundingBox().intersectsWith(aabb)) { event.setResult(Result.DENY); return; 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 11eb1e2d0..9caa07f88 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -25,7 +25,7 @@ public class PotionFeatherfeet extends PotionMod { @SubscribeEvent public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.entityLiving; + EntityLivingBase e = event.getEntityLiving(); if(hasEffect(e)) e.fallDistance = 2.5F; } 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 8706bf491..eae7e3ad2 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -26,11 +26,11 @@ public class PotionSoulCross extends PotionMod { @SubscribeEvent public void onEntityKill(LivingDeathEvent event) { - Entity e = event.source.getEntity(); + Entity e = event.getSource().getEntity(); if(e != null && e instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) e; if(hasEffect(living)) - living.heal(event.entityLiving.getMaxHealth() / 20); + living.heal(event.getEntityLiving().getMaxHealth() / 20); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index ee88d3984..3108f5794 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -30,42 +30,42 @@ public class BiomeDecorationHandler { @SubscribeEvent(priority = EventPriority.LOWEST) public void onWorldDecoration(DecorateBiomeEvent.Decorate event) { - if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.type == EventType.FLOWERS) { + if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.getType() == EventType.FLOWERS) { boolean flowers = true; - if(event.world.provider instanceof IFlowerlessWorld) - flowers = ((IFlowerlessWorld) event.world.provider).generateFlowers(event.world); - else if(event.world.getBiomeGenForCoords(event.pos) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.world.getBiomeGenForCoords(event.pos)).canGenerateFlowers(event.world, event.pos.getX(), event.pos.getZ()); + if(event.getWorld().provider instanceof IFlowerlessWorld) + flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld()); + else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); if(!flowers) return; int dist = Math.min(8, Math.max(1, ConfigHandler.flowerPatchSize)); for(int i = 0; i < ConfigHandler.flowerQuantity; i++) { - if(event.rand.nextInt(ConfigHandler.flowerPatchChance) == 0) { - int x = event.pos.getX() + event.rand.nextInt(16) + 8; - int z = event.pos.getZ() + event.rand.nextInt(16) + 8; - int y = event.world.getTopSolidOrLiquidBlock(event.pos).getY(); + if(event.getRand().nextInt(ConfigHandler.flowerPatchChance) == 0) { + int x = event.getPos().getX() + event.getRand().nextInt(16) + 8; + int z = event.getPos().getZ() + event.getRand().nextInt(16) + 8; + int y = event.getWorld().getTopSolidOrLiquidBlock(event.getPos()).getY(); - EnumDyeColor color = EnumDyeColor.byMetadata(event.rand.nextInt(16)); - boolean primus = event.rand.nextInt(380) == 0; + EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16)); + boolean primus = event.getRand().nextInt(380) == 0; for(int j = 0; j < ConfigHandler.flowerDensity * ConfigHandler.flowerPatchChance; j++) { - int x1 = x + event.rand.nextInt(dist * 2) - dist; - int y1 = y + event.rand.nextInt(4) - event.rand.nextInt(4); - int z1 = z + event.rand.nextInt(dist * 2) - dist; + int x1 = x + event.getRand().nextInt(dist * 2) - dist; + int y1 = y + event.getRand().nextInt(4) - event.getRand().nextInt(4); + int z1 = z + event.getRand().nextInt(dist * 2) - dist; BlockPos pos2 = new BlockPos(x1, y1, z1); - if(event.world.isAirBlock(pos2) && (!event.world.provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.world, pos2)) { + if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) { if(primus) { - event.world.setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2); - TileSpecialFlower flower = (TileSpecialFlower) event.world.getTileEntity(pos2); - flower.setSubTile(event.rand.nextBoolean() ? LibBlockNames.SUBTILE_NIGHTSHADE_PRIME : LibBlockNames.SUBTILE_DAYBLOOM_PRIME); + event.getWorld().setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2); + TileSpecialFlower flower = (TileSpecialFlower) event.getWorld().getTileEntity(pos2); + flower.setSubTile(event.getRand().nextBoolean() ? LibBlockNames.SUBTILE_NIGHTSHADE_PRIME : LibBlockNames.SUBTILE_DAYBLOOM_PRIME); SubTileDaybloom subtile = (SubTileDaybloom) flower.getSubTile(); subtile.setPrimusPosition(); } else { - event.world.setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); - if(event.rand.nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.world, pos2, event.world.getBlockState(pos2), false)) - BlockModFlower.placeDoubleFlower(event.world, pos2, color, 0); + event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); + if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false)) + BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0); } } } @@ -73,13 +73,13 @@ public class BiomeDecorationHandler { } for(int i = 0; i < ConfigHandler.mushroomQuantity; i++) { - int x = event.pos.getX() + event.rand.nextInt(16) + 8; - int z = event.pos.getZ() + event.rand.nextInt(16) + 8; - int y = event.rand.nextInt(26) + 4; + int x = event.getPos().getX() + event.getRand().nextInt(16) + 8; + int z = event.getPos().getZ() + event.getRand().nextInt(16) + 8; + int y = event.getRand().nextInt(26) + 4; BlockPos pos3 = new BlockPos(x, y, z); - EnumDyeColor color = EnumDyeColor.byMetadata(event.rand.nextInt(16)); - if(event.world.isAirBlock(pos3) && ModBlocks.mushroom.canPlaceBlockAt(event.world, pos3)) - event.world.setBlockState(pos3, ModBlocks.mushroom.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); + EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16)); + if(event.getWorld().isAirBlock(pos3) && ModBlocks.mushroom.canPlaceBlockAt(event.getWorld(), pos3)) + event.getWorld().setBlockState(pos3, ModBlocks.mushroom.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); } } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index aa31b274e..cd80212ad 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -287,7 +287,7 @@ public final class ConfigHandler { public static int loadPropInt(String propName, String desc, int default_) { Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); - prop.comment = desc; + prop.setComment(desc); if(adaptor != null) adaptor.adaptPropertyInt(prop, prop.getInt(default_)); @@ -297,7 +297,7 @@ public final class ConfigHandler { public static double loadPropDouble(String propName, String desc, double default_) { Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); - prop.comment = desc; + prop.setComment(desc); if(adaptor != null) adaptor.adaptPropertyDouble(prop, prop.getDouble(default_)); @@ -307,7 +307,7 @@ public final class ConfigHandler { public static boolean loadPropBool(String propName, String desc, boolean default_) { Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); - prop.comment = desc; + prop.setComment(desc); if(adaptor != null) adaptor.adaptPropertyBool(prop, prop.getBoolean(default_)); @@ -444,7 +444,7 @@ public final class ConfigHandler { @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { - if(eventArgs.modID.equals(LibMisc.MOD_ID)) + if(eventArgs.getModID().equals(LibMisc.MOD_ID)) load(); } 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 d317622a6..7b37a4f33 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -21,8 +21,8 @@ public class PixieHandler { @SubscribeEvent public void onDamageTaken(LivingHurtEvent event) { - if(!event.entityLiving.worldObj.isRemote && event.entityLiving instanceof EntityPlayer && event.source.getEntity() != null && event.source.getEntity() instanceof EntityLivingBase) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(!event.getEntityLiving().worldObj.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); float chance = getChance(stack); @@ -44,14 +44,14 @@ public class PixieHandler { MobEffects.moveSlowdown, MobEffects.weakness }; - pixie.setApplyPotionEffect(new PotionEffect(potions[event.entity.worldObj.rand.nextInt(potions.length)], 40, 0)); + pixie.setApplyPotionEffect(new PotionEffect(potions[event.getEntityLiving().worldObj.rand.nextInt(potions.length)], 40, 0)); } float dmg = 4; if(stack != null && stack.getItem() == ModItems.elementiumSword) dmg += 2; - pixie.setProps((EntityLivingBase) event.source.getEntity(), player, 0, dmg); + pixie.setProps((EntityLivingBase) event.getSource().getEntity(), player, 0, dmg); player.worldObj.spawnEntityInWorld(pixie); } } 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 b87d97ed0..0ea5d6552 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -42,14 +42,14 @@ public final class SheddingHandler { @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { - if(event.entity.worldObj.isRemote) + if(event.getEntityLiving().worldObj.isRemote) return; - ShedPattern pattern = getShedPattern(event.entity); + ShedPattern pattern = getShedPattern(event.getEntityLiving()); if(pattern != null) { - if(event.entity.worldObj.rand.nextInt(pattern.getRate()) == 0) - event.entity.entityDropItem(pattern.getItemStack(), 0.0F); + if(event.getEntityLiving().worldObj.rand.nextInt(pattern.getRate()) == 0) + event.getEntityLiving().entityDropItem(pattern.getItemStack(), 0.0F); } } @@ -116,7 +116,7 @@ public final class SheddingHandler { } Property prop = config.get("Shedding", key + ".item", itemName); - prop.comment = "Configuration of Shedding for "+key; + prop.setComment("Configuration of Shedding for "+key); itemName = prop.getString(); rate = config.get("Shedding", key + ".rate", rate).getInt(); metadata = config.get("Shedding", key + ".metadata", metadata).getInt(); diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 9ce510c9b..2dfdf27b3 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -113,8 +113,8 @@ public class WrappedDeepStorage extends WrappedInventoryBase { * @return wrapped inventory or null if it has incompatible type. */ public static IWrappedInventory wrap(InvWithLocation inv, ICorporeaSpark spark) { - if(isDeepStorageNeeded() && inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).inv instanceof IDeepStorageUnit) { - return new WrappedDeepStorage(((IDeepStorageUnit) ((InvWrapper) inv.handler).inv), spark); + if(isDeepStorageNeeded() && inv.handler instanceof InvWrapper && ((InvWrapper) inv.handler).getInv() instanceof IDeepStorageUnit) { + return new WrappedDeepStorage(((IDeepStorageUnit) ((InvWrapper) inv.handler).getInv()), spark); } else return null; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index dec001766..0d032a606 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -79,7 +79,6 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public ItemCraftingHalo() { this(LibItemNames.CRAFTING_HALO); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); } public ItemCraftingHalo(String name) { @@ -392,7 +391,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { EntityPlayer player = Minecraft.getMinecraft().thePlayer; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemCraftingHalo.class); if(stack != null) - render(stack, player, event.partialTicks); + render(stack, player, event.getPartialTicks()); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 7c26cd8ac..98bab499d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -51,17 +51,17 @@ public class ItemFlowerBag extends ItemMod { @SubscribeEvent public void onPickupItem(EntityItemPickupEvent event) { - ItemStack stack = event.item.getEntityItem(); + ItemStack stack = event.getItem().getEntityItem(); if(stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.stackSize > 0) { int color = stack.getItemDamage(); if(color > 15) return; - for(int i = 0; i < event.entityPlayer.inventory.getSizeInventory(); i++) { - if(i == event.entityPlayer.inventory.currentItem) + for(int i = 0; i < event.getEntityPlayer().inventory.getSizeInventory(); i++) { + if(i == event.getEntityPlayer().inventory.currentItem) continue; // prevent item deletion - ItemStack invStack = event.entityPlayer.inventory.getStackInSlot(i); + ItemStack invStack = event.getEntityPlayer().inventory.getStackInSlot(i); if(invStack != null && invStack.getItem() == this) { ItemStack[] bagInv = loadStacks(invStack); ItemStack stackAt = bagInv[color]; diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 2682d08fc..42ea56175 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -47,14 +47,14 @@ public class ItemKeepIvy extends ItemMod { @SubscribeEvent public void onPlayerDrops(PlayerDropsEvent event) { List keeps = new ArrayList<>(); - for(EntityItem item : event.drops) { + for(EntityItem item : event.getDrops()) { ItemStack stack = item.getEntityItem(); if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) keeps.add(item); } if(keeps.size() > 0) { - event.drops.removeAll(keeps); + event.getDrops().removeAll(keeps); NBTTagCompound cmp = new NBTTagCompound(); @@ -69,7 +69,7 @@ public class ItemKeepIvy extends ItemMod { i++; } - NBTTagCompound data = event.entityPlayer.getEntityData(); + NBTTagCompound data = event.getEntityPlayer().getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index bf3c8848b..060baab70 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -13,13 +13,16 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -40,6 +43,12 @@ public class ItemSpawnerMover extends ItemMod { public ItemSpawnerMover() { setUnlocalizedName(LibItemNames.SPAWNER_MOVER); setMaxStackSize(1); + addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return hasData(stack) ? 1 : 0; + } + }); } public static NBTTagCompound getSpawnerTag(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index f889efd44..38f1b7678 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -70,11 +70,11 @@ public class ItemVirus extends ItemMod { @SubscribeEvent public void onLivingHurt(LivingHurtEvent event) { - EntityLivingBase entity = event.entityLiving; + EntityLivingBase entity = event.getEntityLiving(); if(entity.isRiding() && entity.getRidingEntity() instanceof EntityLivingBase) entity = (EntityLivingBase) entity.getRidingEntity(); - if(entity instanceof EntityHorse && event.source == DamageSource.fall) { + if(entity instanceof EntityHorse && event.getSource() == DamageSource.fall) { EntityHorse horse = (EntityHorse) entity; if((horse.getType() == HorseArmorType.ZOMBIE || horse.getType() == HorseArmorType.SKELETON) && horse.isTame()) event.setCanceled(true); 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 791cd74a2..9fe906779 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 @@ -120,7 +120,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @SubscribeEvent public void onEntityAttacked(LivingHurtEvent event) { - Entity attacker = event.source.getEntity(); + Entity attacker = event.getSource().getEntity(); if(attacker instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) attacker; if(hasArmorSet(player)) { @@ -135,17 +135,17 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc boolean karil = hasAncientWill(stack, 5); if(ahrim) - event.entityLiving.addPotionEffect(new PotionEffect(MobEffects.weakness, 20, 1)); + event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.weakness, 20, 1)); if(dharok) - event.ammount *= 1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F; + event.setAmount(event.getAmount() * (1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F)); if(guthan) - player.heal(event.ammount * 0.25F); + player.heal(event.getAmount() * 0.25F); if(torag) - event.entityLiving.addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 60, 1)); + event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.moveSlowdown, 60, 1)); if(verac) - event.source.setDamageBypassesArmor(); + event.getSource().setDamageBypassesArmor(); if(karil) - event.entityLiving.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/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index d9ccbc580..2ba4292c8 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 @@ -53,32 +53,32 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { - EntityPlayer player = (EntityPlayer) event.source.getEntity(); + if(event.getSource().getEntity() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().worldObj.isRemote && Math.random() < 0.6F) { + EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { final int cost = 250; if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.getEntityLiving().posX - range, event.getEntityLiving().posY - range, event.getEntityLiving().posZ - range, event.getEntityLiving().posX + range, event.getEntityLiving().posY + range, event.getEntityLiving().posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, ((List) mobs))) { - if(event.entityLiving instanceof EntityCreeper) - ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); - event.entityLiving.heal(event.entityLiving.getMaxHealth()); - if(event.entityLiving.isDead) - event.entityLiving.isDead = false; + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.getEntityLiving(), ((List) mobs))) { + if(event.getEntityLiving() instanceof EntityCreeper) + ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.getEntityLiving(), 2, LibObfuscation.TIME_SINCE_IGNITED); + event.getEntityLiving().heal(event.getEntityLiving().getMaxHealth()); + if(event.getEntityLiving().isDead) + event.getEntityLiving().isDead = false; ManaItemHandler.requestManaExact(amulet, player, cost, true); player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.divaCharm, SoundCategory.PLAYERS, 1F, 1F); - double x = event.entityLiving.posX; - double y = event.entityLiving.posY; - double z = event.entityLiving.posZ; + double x = event.getEntityLiving().posX; + double y = event.getEntityLiving().posY; + double z = event.getEntityLiving().posZ; for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * event.entityLiving.height, z + Math.random() * event.entityLiving.width, 1F, 1F, 0.25F, 1F, 3); + Botania.proxy.sparkleFX(event.getEntityLiving().worldObj, x + Math.random() * event.getEntityLiving().width, y + Math.random() * event.getEntityLiving().height, z + Math.random() * event.getEntityLiving().width, 1F, 1F, 0.25F, 1F, 3); } } } 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 1c0564804..8c1fe59c5 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 @@ -210,8 +210,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @SubscribeEvent public void updatePlayerFlyStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); @@ -222,9 +222,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(!player.worldObj.isRemote) ManaItemHandler.requestManaExact(tiara, player, getCost(tiara, left), true); else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { - double x = event.entityLiving.posX - 0.5; - double y = event.entityLiving.posY - 0.5; - double z = event.entityLiving.posZ - 0.5; + double x = event.getEntityLiving().posX - 0.5; + double y = event.getEntityLiving().posY - 0.5; + double z = event.getEntityLiving().posZ - 0.5; player.getGameProfile().getName(); float r = 1F; @@ -280,7 +280,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } for(int i = 0; i < 2; i++) - Botania.proxy.sparkleFX(event.entityLiving.worldObj, x + Math.random() * event.entityLiving.width, y + Math.random() * 0.4, z + Math.random() * event.entityLiving.width, r, g, b, 2F * (float) Math.random(), 20); + Botania.proxy.sparkleFX(event.getEntityLiving().worldObj, x + Math.random() * event.getEntityLiving().width, y + Math.random() * 0.4, z + Math.random() * event.getEntityLiving().width, r, g, b, 2F * (float) Math.random(), 20); } } } else { 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 576dda31d..0ba6e4442 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 @@ -44,8 +44,8 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onPlayerDeath(LivingDeathEvent event) { - if(event.entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entity; + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 58276a565..828b69f17 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -55,8 +55,8 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { @SubscribeEvent public void onPlayerDamage(LivingHurtEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack belt = baubles.getStackInSlot(3); if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { @@ -80,7 +80,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { - if(!event.source.isMagicDamage()) { + if(!event.getSource().isMagicDamage()) { event.setCanceled(true); player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { 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 e368864aa..f17ee16a6 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 @@ -15,10 +15,12 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; @@ -52,16 +54,22 @@ public class ItemMagnetRing extends ItemBauble { public ItemMagnetRing(String name, int range) { super(name); this.range = range; + addPropertyOverride(new ResourceLocation("botania", "on"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return ItemMagnetRing.getCooldown(stack) <= 0 ? 1 : 0; + } + }); } @SubscribeEvent public void onTossItem(ItemTossEvent event) { - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.player); + InventoryBaubles inv = PlayerHandler.getPlayerBaubles(event.getPlayer()); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack != null && stack.getItem() instanceof ItemMagnetRing) { setCooldown(stack, 100); - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.player, i); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.getPlayer(), i); } } } 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 69c0c4dcb..bc280391f 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 @@ -70,8 +70,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs @SubscribeEvent public void updatePlayerStepStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); String s = playerStr(player); ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); @@ -119,8 +119,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs @SubscribeEvent public void onPlayerJump(LivingJumpEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index b967f1dad..063486d9c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -38,13 +38,13 @@ public class ItemUnholyCloak extends ItemHolyCloak { @Override public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { - if(!event.source.isUnblockable()) { + if(!event.getSource().isUnblockable()) { int range = 6; List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IMob.class)); for(IMob mob : ((List) mobs)) if(mob instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) mob; - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); + entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.getAmount()); } player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); 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 b82994d25..6b19405ba 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 @@ -33,8 +33,8 @@ public class ItemGlassPick extends ItemManasteelPick { @SubscribeEvent public void onBlockDrops(HarvestDropsEvent event) { - if(event.harvester != null && event.state != null && event.drops.isEmpty() && event.harvester.getHeldItemMainhand() != null && event.harvester.getHeldItemMainhand().getItem() == this && event.state.getMaterial() == Material.glass && event.state.getBlock().canSilkHarvest(event.world, event.pos, event.state, event.harvester)) - event.drops.add(new ItemStack(event.state.getBlock(), 1, event.state.getBlock().getMetaFromState(event.state))); + 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()))); } @Override 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 a88860db8..0f67d076e 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 @@ -57,7 +57,6 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); setMaxDamage(500); - setFull3D(); addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { @Override public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { 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 cd41cdf8e..4de05f3af 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 @@ -37,32 +37,32 @@ public class ItemElementiumAxe extends ItemManasteelAxe { @SubscribeEvent public void onEntityDrops(LivingDropsEvent event) { - if(event.recentlyHit && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { - ItemStack weapon = ((EntityPlayer) event.source.getEntity()).getHeldItemMainhand(); + if(event.isRecentlyHit() && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityPlayer) { + ItemStack weapon = ((EntityPlayer) event.getSource().getEntity()).getHeldItemMainhand(); if(weapon != null && weapon.getItem() == this) { - Random rand = event.entity.worldObj.rand; + Random rand = event.getEntityLiving().worldObj.rand; int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, weapon); - if(event.entityLiving instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.skull, 1, ((EntitySkeleton)event.entityLiving).getSkeletonType())); - else if(event.entityLiving instanceof EntityZombie && !(event.entityLiving instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) + if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) + 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)); - else if(event.entityLiving instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) + else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.skull, 1, 4)); - else if(event.entityLiving instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { + else if(event.getEntityLiving() instanceof EntityPlayer && rand.nextInt(11) <= 1 + looting) { ItemStack stack = new ItemStack(Items.skull, 1, 3); - ItemNBTHelper.setString(stack, "SkullOwner", event.entityLiving.getName()); + ItemNBTHelper.setString(stack, "SkullOwner", event.getEntityLiving().getName()); addDrop(event, stack); - } else if(event.entityLiving instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) + } else if(event.getEntityLiving() instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting) addDrop(event, new ItemStack(ModItems.gaiaHead)); } } } private void addDrop(LivingDropsEvent event, ItemStack drop) { - EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop); + EntityItem entityitem = new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, drop); entityitem.setPickupDelay(10); - event.drops.add(entityitem); + event.getDrops().add(entityitem); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 594755f5a..30444395e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -21,16 +21,16 @@ public class ItemElementiumPick extends ItemManasteelPick { @SubscribeEvent public void onHarvestDrops(HarvestDropsEvent event) { - if(event.harvester != null) { - ItemStack stack = event.harvester.getHeldItemMainhand(); + if(event.getHarvester() != null) { + ItemStack stack = event.getHarvester().getHeldItemMainhand(); if(stack != null && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { - for(int i = 0; i < event.drops.size(); i++) { - ItemStack drop = event.drops.get(i); + for(int i = 0; i < event.getDrops().size(); i++) { + ItemStack drop = event.getDrops().get(i); if(drop != null) { Block block = Block.getBlockFromItem(drop.getItem()); if(block != null){ - if(isDisposable(block) || (isSemiDisposable(block) && !event.harvester.isSneaking())) - event.drops.remove(i); + if(isDisposable(block) || (isSemiDisposable(block) && !event.getHarvester().isSneaking())) + event.getDrops().remove(i); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 979beed8d..71e9add70 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -15,9 +15,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -42,6 +44,12 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); + addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index b513b7731..94998a50a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -56,19 +56,19 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe @SubscribeEvent public void onDropped(ItemTossEvent event) { - if(event.entityItem != null && event.entityItem.getEntityItem() != null && !event.entityItem.worldObj.isRemote) { - ItemStack stack = event.entityItem.getEntityItem(); + if(event.getEntityItem() != null && event.getEntityItem().getEntityItem() != null && !event.getEntityItem().worldObj.isRemote) { + ItemStack stack = event.getEntityItem().getEntityItem(); if(stack.getItem() != null && stack.getItem() == this) { - event.entityItem.setDead(); + event.getEntityItem().setDead(); UUID user = getSoulbindUUID(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); bindToUUID(user, stack1); - EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1); - entity.motionX = event.entityItem.motionX; - entity.motionY = event.entityItem.motionY; - entity.motionZ = event.entityItem.motionZ; + EntityItem entity = new EntityItem(event.getEntityItem().worldObj, event.getEntityItem().posX, event.getEntityItem().posY, event.getEntityItem().posZ, stack1); + entity.motionX = event.getEntityItem().motionX; + entity.motionY = event.getEntityItem().motionY; + entity.motionZ = event.getEntityItem().motionZ; try { MethodHandles.itemAge_setter.invokeExact(entity, MethodHandles.itemAge_getter.invokeExact(entity)); @@ -76,7 +76,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe int pickupDelay = 0; try { - pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(event.entityItem); + pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(event.getEntityItem()); } catch (Throwable ignored) {} entity.setPickupDelay(pickupDelay); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 93ddca992..30e075bae 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -63,9 +63,9 @@ public class ItemOdinRing extends ItemRelicBauble { @SubscribeEvent public void onPlayerAttacked(LivingAttackEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - if(getOdinRing(player) != null && damageNegations.contains(event.source.damageType)) + if(event.getEntityLiving() instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); + if(getOdinRing(player) != null && damageNegations.contains(event.getSource().damageType)) event.setCanceled(true); } } 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 89ade3110..89dd8f644 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -108,11 +108,11 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @SubscribeEvent public void onLeftClick(PlayerInteractEvent event) { - if(event.action == Action.LEFT_CLICK_BLOCK) { - ItemStack stack = event.entityPlayer.getHeldItemMainhand(); - if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, false)) { - if(exchange(event.world, event.entityPlayer, event.pos, stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) - ManaItemHandler.requestManaExactForTool(stack, event.entityPlayer, COST, true); + if(event.getAction() == Action.LEFT_CLICK_BLOCK) { + ItemStack stack = event.getEntityPlayer().getHeldItemMainhand(); + if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { + if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) + ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); } } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index b432083fa..7b830be89 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; +import net.minecraftforge.event.world.BlockEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; @@ -43,8 +43,8 @@ public final class SkyblockWorldEvents { @SubscribeEvent public void onPlayerUpdate(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer && !event.entity.worldObj.isRemote) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().worldObj.isRemote) { + EntityPlayer player = (EntityPlayer) event.getEntityLiving(); NBTTagCompound data = player.getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); @@ -66,24 +66,24 @@ public final class SkyblockWorldEvents { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { - /*if(WorldTypeSkyblock.isWorldSkyblock(event.world)) { todo 1.9 + /*if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { todo 1.9 ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); if(event.action == Action.RIGHT_CLICK_BLOCK && equipped == null && event.entityPlayer.isSneaking()) { - Block block = event.world.getBlockState(event.pos).getBlock(); + Block block = event.getWorld().getBlockState(event.pos).getBlock(); if(block == Blocks.grass || block == Blocks.dirt) { - if(event.world.isRemote) + if(event.getWorld().isRemote) event.entityPlayer.swingItem(); else { - event.world.playSoundEffect(event.pos.getX() + 0.5, event.pos.getY() + 0.5, event.pos.getZ() + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getFrequency() + (float) (Math.random() * 0.2 - 0.1)); + event.getWorld().playSoundEffect(event.pos.getX() + 0.5, event.pos.getY() + 0.5, event.pos.getZ() + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getFrequency() + (float) (Math.random() * 0.2 - 0.1)); if(Math.random() < 0.8) event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } } - } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.world.isRemote) { - RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, true, 4.5F); + } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.getWorld().isRemote) { + RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.entityPlayer, true, 4.5F); if(RayTraceResult != null) { if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { - if(event.world.getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { + if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) @@ -97,18 +97,18 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onDrops(HarvestDropsEvent event) { - if(WorldTypeSkyblock.isWorldSkyblock(event.world) && event.state.getBlock() == Blocks.tallgrass) { + public void onDrops(BlockEvent.HarvestDropsEvent event) { + if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.tallgrass) { ItemStack stackToRemove = null; - for(ItemStack stack : event.drops) - if(stack.getItem() == Items.wheat_seeds && event.world.rand.nextInt(4) == 0) { + for(ItemStack stack : event.getDrops()) + if(stack.getItem() == Items.wheat_seeds && event.getWorld().rand.nextInt(4) == 0) { stackToRemove = stack; break; } if(stackToRemove != null) { - event.drops.remove(stackToRemove); - event.drops.add(new ItemStack(event.world.rand.nextBoolean() ? Items.pumpkin_seeds : Items.melon_seeds)); + event.getDrops().remove(stackToRemove); + event.getDrops().add(new ItemStack(event.getWorld().rand.nextBoolean() ? Items.pumpkin_seeds : Items.melon_seeds)); } } } diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json index 3cad87cf2..d907d7b2e 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/crystalBow", "textures": { "layer0": "botania:items/crystalBow1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json index 205e705b4..87aa0174f 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/crystalBow", "textures": { "layer0": "botania:items/crystalBow2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json index 835460709..cbc3df1f5 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/crystalBow", "textures": { "layer0": "botania:items/crystalBow3" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json index 6430d9d58..9ffa86873 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/crystalBow", "textures": { "layer0": "botania:items/crystalBow4" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json index ed9d6503b..b4d560244 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/crystalBow", "textures": { "layer0": "botania:items/crystalBow5" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json index 6d29694b9..3dd9b8449 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/livingwoodBow", "textures": { "layer0": "botania:items/livingwoodBow1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json index c1baf4768..9b67919b4 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/livingwoodBow", "textures": { "layer0": "botania:items/livingwoodBow2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json index 162be4377..ffa377cbb 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json @@ -1,28 +1,6 @@ { - "parent": "minecraft:item/generated", + "parent": "botania:item/livingwoodBow", "textures": { "layer0": "botania:items/livingwoodBow3" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRing.json b/src/main/resources/assets/botania/models/item/magnetRing.json new file mode 100644 index 000000000..273320918 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRing.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/magnetRing1" + }, + "overrides": [{ + "predicate": { + "botania:on": 1 + }, + "model": "botania:item/magnetRingOn" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreater.json b/src/main/resources/assets/botania/models/item/magnetRingGreater.json new file mode 100644 index 000000000..f84549423 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingGreater.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/magnetRingGreater1" + }, + "overrides": [{ + "predicate": { + "botania:on": 1 + }, + "model": "botania:item/magnetRingGreaterOn" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json deleted file mode 100644 index cc984190c..000000000 --- a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/magnetRingGreater1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOff.json b/src/main/resources/assets/botania/models/item/magnetRingOff.json deleted file mode 100644 index bce27d21e..000000000 --- a/src/main/resources/assets/botania/models/item/magnetRingOff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/magnetRing1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelSword.json index fff8c9a03..2279051fb 100644 --- a/src/main/resources/assets/botania/models/item/manasteelSword.json +++ b/src/main/resources/assets/botania/models/item/manasteelSword.json @@ -3,5 +3,11 @@ "textures": { "layer0": "botania:items/manasteelSword" - } + }, + "overrides": [{ + "predicate": { + "botania:elucidator": 1 + }, + "model": "botania:item/elucidator" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnerMover.json b/src/main/resources/assets/botania/models/item/spawnerMover.json index faeaa3bbc..daaca965c 100644 --- a/src/main/resources/assets/botania/models/item/spawnerMover.json +++ b/src/main/resources/assets/botania/models/item/spawnerMover.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/spawnerMover0" - } + }, + "overrides": [{ + "predicate": { + "botania:full": 1 + }, + "model": "botania:item/spawnerMoverFull" + }] } \ No newline at end of file From bcd00dbba3a6546718fc9778fe1947f845f85997 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 12:05:19 -0500 Subject: [PATCH 469/935] Update JEI, more overrides --- build.gradle | 2 +- .../client/core/handler/ModelHandler.java | 48 ++++--------------- .../botania/common/item/ItemManaGun.java | 15 ++++++ .../tool/terrasteel/ItemTerraPick.java | 14 ++++++ .../common/item/rod/ItemTornadoRod.java | 8 ++++ .../assets/botania/models/item/manaGun.json | 23 ++++++++- .../assets/botania/models/item/terraPick.json | 23 ++++++++- .../botania/models/item/tornadoRod.json | 8 +++- 8 files changed, 97 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index b3cfa995a..e3e40f7c8 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { //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.0.2.164" + deobfCompile "mezz.jei:jei_1.9:3.1.0.170" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" 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 c33a8bf64..33fee280b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -198,27 +198,6 @@ public final class ModelHandler { ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); - registerItemModel(magnetRing); - registerItemModel(magnetRingGreater); - - ModelLoader.registerItemVariants(manaGun, - new ModelResourceLocation("botania:manaGun", "inventory"), - new ModelResourceLocation("botania:manaGunClip", "inventory"), - new ModelResourceLocation("botania:desuGun", "inventory"), - new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, MesherWrapper.of(stack -> { - String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; - return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); - })); - - ModelLoader.registerItemVariants(tornadoRod, - new ModelResourceLocation("botania:tornadoRod", "inventory"), - new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, MesherWrapper.of(stack -> - ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) - ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") - : new ModelResourceLocation("botania:tornadoRod", "inventory"))); - ModelLoader.registerItemVariants(manaCookie, new ModelResourceLocation("botania:manaCookie", "inventory"), new ModelResourceLocation("botania:totalBiscuit", "inventory")); @@ -226,25 +205,6 @@ public final class ModelHandler { stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? new ModelResourceLocation("botania:totalBiscuit", "inventory") : new ModelResourceLocation("botania:manaCookie", "inventory"))); - - registerItemModel(manasteelSword); - registerItemModel(spawnerMover); - - ModelLoader.registerItemVariants(terraPick, - new ModelResourceLocation("botania:terraPick", "inventory"), - new ModelResourceLocation("botania:terraPickEnabled", "inventory"), - new ModelResourceLocation("botania:terraPickTipped", "inventory"), - new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, MesherWrapper.of(stack -> { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; - } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); - })); } private static void registerSubtiles() { @@ -401,6 +361,14 @@ public final class ModelHandler { } private static void registerStandardItems() { + registerItemModel(manasteelSword); + registerItemModel(spawnerMover); + registerItemModel(terraPick); + registerItemModel(magnetRing); + registerItemModel(magnetRingGreater); + registerItemModel(manaGun); + registerItemModel(tornadoRod); + registerItemModel(twigWand); registerItemModel(pestleAndMortar); registerItemModel(blackLotus); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 4a0de1135..c91d862a4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -16,9 +16,11 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -26,6 +28,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; @@ -72,6 +75,18 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); + addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + return hasClip(itemStack) ? 1 : 0; + } + }); + addPropertyOverride(new ResourceLocation("botania", "desu"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; + } + }); } @Override 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 73f21fc4c..17170fbcd 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 @@ -17,8 +17,10 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -74,6 +76,18 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); GameRegistry.addRecipe(new TerraPickTippingRecipe()); RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, Category.SHAPELESS, ""); + addPropertyOverride(new ResourceLocation("botania", "tipped"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + return isTipped(itemStack) ? 1 : 0; + } + }); + addPropertyOverride(new ResourceLocation("botania", "enabled"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + return isEnabled(itemStack) ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 3eafd7d2c..05cee2fca 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -13,8 +13,10 @@ package vazkii.botania.common.item.rod; import java.util.List; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; @@ -53,6 +55,12 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxDamage(MAX_DAMAGE); setUnlocalizedName(LibItemNames.TORNADO_ROD); setMaxStackSize(1); + addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + return isFlying(itemStack) ? 1 : 0; + } + }); } @Override diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 88646562e..fa04ed4ee 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -3,5 +3,26 @@ "textures": { "layer0": "botania:items/manaGun0", "layer1": "botania:items/manaGun1" - } + }, + "overrides": [ + { + "predicate": { + "botania:clip": 1 + }, + "model": "botania:item/manaGunClip" + }, + { + "predicate": { + "botania:desu": 1 + }, + "model": "botania:item/desuGun" + }, + { + "predicate": { + "botania:desu": 1, + "botania:clip": 1 + }, + "model": "botania:item/desuGunClip" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPick.json b/src/main/resources/assets/botania/models/item/terraPick.json index e2296f53d..ba3f22a7e 100644 --- a/src/main/resources/assets/botania/models/item/terraPick.json +++ b/src/main/resources/assets/botania/models/item/terraPick.json @@ -2,5 +2,26 @@ "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/terraPick0" - } + }, + "overrides": [ + { + "predicate": { + "botania:enabled": 1 + }, + "model": "botania:item/terraPickEnabled" + }, + { + "predicate": { + "botania:tipped": 1 + }, + "model": "botania:item/terraPickTipped" + }, + { + "predicate": { + "botania:tipped": 1, + "botania:enabled": 1 + }, + "model": "botania:item/terraPickTippedEnabled" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadoRod.json index 2a298dc68..7c58a9f61 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod.json +++ b/src/main/resources/assets/botania/models/item/tornadoRod.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/tornadoRod0" - } + }, + "overrides": [{ + "predicate": { + "botania:flying": 1 + }, + "model": "botania:item/tornadoRod_flying" + }] } From 9bc724d6fd78b78da9933dddefff2584e3fed808 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 12:45:48 -0500 Subject: [PATCH 470/935] Fix flower models --- .../client/model/SpecialFlowerModel.java | 29 +++++++++++-------- .../botania/blockstates/specialFlower.json | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 5a1b5f584..a7173fc71 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -34,6 +35,9 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; @@ -168,15 +172,14 @@ public class SpecialFlowerModel implements IModelCustomData { } private void refreshBakedModels() { - //if(baseModel == null) { - // If not done already, steal all the real baked models and cache them - ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); - baseModel = getBlockModel(manager, Optional.absent()); + if(baseModel == null) { + // If not done already, bake and cache all models + baseModel = getBlockModel(Optional.absent()); ImmutableMap.Builder builder = ImmutableMap.builder(); for(Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { if(e.getKey().isPresent()) { - builder.put(e.getKey().get(), getBlockModel(manager, e.getKey())); + builder.put(e.getKey().get(), getBlockModel(e.getKey())); } } @@ -185,28 +188,30 @@ public class SpecialFlowerModel implements IModelCustomData { ImmutableMap.Builder builder2 = ImmutableMap.builder(); for(Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { if(e.getKey().isPresent()) { - builder2.put(e.getKey().get(), getItemModel(manager, e.getKey())); + builder2.put(e.getKey().get(), getItemModel(e.getKey())); } } bakedItemModels = builder2.build(); - //} + } } - private IBakedModel getBlockModel(ModelManager manager, Optional opt) { + private IBakedModel getBlockModel(Optional opt) { ModelResourceLocation loc = blockModels.get(opt); if(loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } - return manager.getModel(loc); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); + return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } - private IBakedModel getItemModel(ModelManager manager, Optional opt) { + private IBakedModel getItemModel(Optional opt) { ModelResourceLocation loc = itemModels.get(opt); if(loc == null) { loc = new ModelResourceLocation("builtin/missing", "missing"); } - return manager.getModel(loc); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); + return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } @Override @@ -265,7 +270,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + return baseModel.getItemCameraTransforms(); } @Override diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialFlower.json index 8ed1128f1..a2f835615 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialFlower.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania_special:specialFlower", - "transform": "forge:default-block" + "transform": "forge:default-item" }, "variants": { "normal": [{ From d411fac65cd42d5b374ce483815c3805b19c59ad Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 13:35:12 -0500 Subject: [PATCH 471/935] Half fix floating flowers --- .../client/core/handler/MiscellaneousIcons.java | 4 ++-- .../client/model/FloatingFlowerModel.java | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) 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 76ec1ce5d..9fe1ed0e2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -89,10 +89,10 @@ public class MiscellaneousIcons { public void onModelBake(ModelBakeEvent evt) { FMLLog.info("The baked model for botania:jadedAmaranthus#normal is: " + evt.getModelRegistry().getObject(new ModelResourceLocation("botania:jadedAmaranthus", "normal"))); // Floating flowers todo 1.9 - /*evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE);*/ + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); // Pylon item model evt.getModelRegistry().putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 7a1347f59..8d1eb5fb7 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.model; +import com.google.common.base.Predicates; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; @@ -19,6 +20,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverride; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; +import net.minecraft.client.renderer.block.model.MultipartBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; @@ -29,6 +31,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; @@ -110,14 +114,22 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL if(CACHE.contains(islandType, identifier)) { return CACHE.get(islandType, identifier); } else { - IBakedModel islandModel = modelManager.getModel(BotaniaAPIClient.getRegisteredIslandTypeModels().get(islandType)); + IBakedModel islandModel; + try { + islandModel = ModelLoaderRegistry.getModel(BotaniaAPIClient.getRegisteredIslandTypeModels().get(islandType)).bake(TRSRTransformation.identity(), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); + } catch (Exception e) { + islandModel = modelManager.getMissingModel(); + } + IBakedModel flowerModel; if(identifier.startsWith(MUNDANE_PREFIX)) { int meta = Integer.parseInt(identifier.substring(identifier.indexOf(MUNDANE_PREFIX) + MUNDANE_PREFIX.length())); flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta)); } else { - flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(ItemBlockSpecialFlower.ofType(identifier)); + ItemStack stack = ItemBlockSpecialFlower.ofType(identifier); + IBakedModel specialFlowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); + flowerModel = specialFlowerModel.getOverrides().handleItemState(specialFlowerModel, stack, null, null); } // Enhance! From b6d607b553531b0df82cb606370aab8e367bdce9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Mar 2016 14:07:27 -0500 Subject: [PATCH 472/935] Bow tweaks --- .../item/equipment/tool/bow/ItemCrystalBow.java | 6 ++++++ .../item/equipment/tool/bow/ItemLivingwoodBow.java | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) 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 449f00fcc..1f9a88ca6 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 @@ -15,6 +15,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; @@ -50,4 +51,9 @@ public class ItemCrystalBow extends ItemLivingwoodBow { ManaItemHandler.requestManaExactForTool(stack, ((EntityPlayer) living), ARROW_COST / (infinity ? 2 : 1), false); } + @Override + protected ItemStack getAmmo(EntityPlayer player) { + 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 0f67d076e..96034757a 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 @@ -14,6 +14,7 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; @@ -126,8 +127,8 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(f > 1.0F) f = 1.0F; - ItemStack ammo = shooter instanceof EntityPlayer ? PlayerHelper.getAmmo(((EntityPlayer) shooter), AMMO_FUNC) : null; - if(ammo == null) + ItemStack ammo = shooter instanceof EntityPlayer ? getAmmo(((EntityPlayer) shooter)) : null; + if(ammo == null || !(ammo.getItem() instanceof ItemArrow)) 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); @@ -173,8 +174,9 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(infinity) arrow.canBePickedUp = EntityArrow.PickupStatus.CREATIVE_ONLY; - else if(living instanceof EntityPlayer) - PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); + else if(living instanceof EntityPlayerMP) + if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) + PlayerHelper.consumeAmmo(((EntityPlayerMP) living), AMMO_FUNC); } @Override @@ -193,4 +195,8 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } + protected ItemStack getAmmo(EntityPlayer player) { + return PlayerHelper.getAmmo(player, AMMO_FUNC); + } + } From f5b435bf2472a5c13e1d9cb33bdc6692b6bea033 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Mar 2016 23:26:06 -0500 Subject: [PATCH 473/935] Model cleanup --- .../core/handler/MiscellaneousIcons.java | 7 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/RedStringRenderer.java | 1 - .../handler/SubTileRadiusRenderHandler.java | 1 - .../botania/client/model/LexiconModel.java | 4 +- .../botania/client/model/PylonItemModel.java | 146 ------------------ .../client/model/SpecialFlowerModel.java | 1 - 7 files changed, 4 insertions(+), 158 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/PylonItemModel.java 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 9fe1ed0e2..6bb019a71 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -27,7 +27,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; -import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -87,16 +86,12 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { - FMLLog.info("The baked model for botania:jadedAmaranthus#normal is: " + evt.getModelRegistry().getObject(new ModelResourceLocation("botania:jadedAmaranthus", "normal"))); - // Floating flowers todo 1.9 + // Floating flowers evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); - // Pylon item model - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); - // Platforms evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); 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 33fee280b..8475c55cd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -334,7 +334,6 @@ public final class ModelHandler { // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); @@ -342,6 +341,7 @@ public final class ModelHandler { registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); // Blocks which share models with their item, and have only one variant to switch over + registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 4de67f6f2..87acf70b4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -44,7 +44,6 @@ public final class RedStringRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 0F, 0F, sizeAlpha); - // todo 1.8 Tessellator.renderingVertexBuffer = false; TileRedString tile; while((tile = redStringTiles.poll()) != null) renderTile(tile); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 8597ec6db..73933b5be 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -70,7 +70,6 @@ public final class SubTileRadiusRenderHandler { GlStateManager.disableLighting(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - // todo 1.8 Tessellator.renderingVertexBuffer = false; if(descriptor.isCircle()) renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 94a039b7a..b8d6320b9 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -25,8 +25,8 @@ public class LexiconModel implements IPerspectiveAwareModel { @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND && ConfigHandler.lexicon3dModel) // todo 1.9 handedness - return Pair.of(this, null); + /*if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND && ConfigHandler.lexicon3dModel) + return Pair.of(this, null); todo 1.9 */ return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java deleted file mode 100644 index 8df6069ff..000000000 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

- * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.client.model; - -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IPerspectiveAwareModel; -import net.minecraftforge.common.model.TRSRTransformation; -import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.client.model.obj.OBJModel; -import net.minecraftforge.fml.common.FMLLog; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.Level; - -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import java.io.IOException; -import java.util.List; - -public class PylonItemModel implements IBakedModel { - - private IBakedModel mana; - private IBakedModel natura; - private IBakedModel gaia; - private boolean cached = false; - private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { - @Override - public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { - if(!cached) { - cacheModels(); - } - - switch(stack.getItemDamage()) { - case 2: - return gaia; - case 1: - return natura; - case 0: - return mana; - default: - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - } - } - }; - - private void cacheModels() { - // Load the OBJ - OBJModel model = null; - try { - model = ((OBJModel) OBJLoader.INSTANCE.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); - } catch(Exception e) { - FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); - mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - cached = true; - return; - } - - // Apply the texture and flip the v's of the model - IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); - IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); - IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); - - // All groups are off by default - // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group - - final Function textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - - ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", - "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", - "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); - - mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - // Natura model is just the crystal - natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); - cached = true; - } - - @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return ImmutableList.of(); } - @Override public boolean isAmbientOcclusion() { return false; } - @Override public boolean isGui3d() { return true; } - @Override public boolean isBuiltInRenderer() { return false; } - @Override public TextureAtlasSprite getParticleTexture() { return null; } - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - - @Override - public ItemOverrideList getOverrides() { - return itemHandler; - } - - // Wrapper to transform the model before rendering it, so it looks right in the inventory - private class PerspectiveWrapper implements IPerspectiveAwareModel { - - private final IBakedModel parent; - - public PerspectiveWrapper(IBakedModel pylonModel) { - this.parent = pylonModel; - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - switch(cameraTransformType) { - // todo 1.9 case FIRST_PERSON: - // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); - case GUI: - return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); - // case THIRD_PERSON: - // return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); - default: - return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); - } - } - - @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return parent.getQuads(state, face, rand); } - @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } - @Override public boolean isGui3d() { return parent.isGui3d(); } - @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } - @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } - @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } - } -} diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index a7173fc71..94c28280d 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -78,7 +78,6 @@ public class SpecialFlowerModel implements IModelCustomData { // Force island models to be loaded and baked. See FloatingFlowerModel. builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values()); - FMLLog.info("Collected special flower dependencies: %s", builder.build()); return builder.build(); } From 79c8e3d695f63db787d10cd0a360561c64b1ed17 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 31 Mar 2016 01:09:46 -0500 Subject: [PATCH 474/935] various miscellaneous fixes --- .../core/handler/BoundTileRenderer.java | 2 -- .../client/render/tile/RenderTileAvatar.java | 5 ++-- .../client/render/tile/RenderTileCocoon.java | 2 +- .../render/tile/RenderTileSkullOverride.java | 2 +- .../botania/common/block/BlockBifrost.java | 2 +- .../string/BlockRedStringInterceptor.java | 3 ++- .../functional/SubTilePollidisiac.java | 1 - .../common/block/tile/TileBrewery.java | 10 ------- .../common/block/tile/TileRuneAltar.java | 10 ------- .../tile/string/TileRedStringInterceptor.java | 4 +-- .../botania/common/item/ItemCraftingHalo.java | 26 ++++++++++++------- .../common/item/lens/LensFirework.java | 2 +- .../botania/common/lib/LibObfuscation.java | 2 -- .../botania/blockstates/miniIsland.json | 3 ++- 14 files changed, 30 insertions(+), 44 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 5aa1470f2..a12d5af0b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -46,8 +46,6 @@ public final class BoundTileRenderer { GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - // todo 1.8 Tessellator.renderingVertexBuffer = false; - EntityPlayer player = Minecraft.getMinecraft().thePlayer; int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); 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 603f35be9..32448f85d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -75,8 +75,9 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.6F; GlStateManager.scale(s, s, s); - GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + GlStateManager.translate(-0.5F, 2F, -0.25F); + GlStateManager.rotate(-70, 1, 0, 0); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); GlStateManager.popMatrix(); IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); 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 89316b504..5b84ea59e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -47,7 +47,7 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer { GlStateManager.translate(d0, d1, d2 + 1); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.5F, 0, 0F); - GlStateManager.rotate(rot, 1F, 0F, 0F); // todo 1.8 fixme looks a little weird compared to 1.7 + GlStateManager.rotate(rot, 1F, 0F, 0F); GlStateManager.translate(-0.5F, 0, 0F); IBlockState state = cocoon.getWorld().getBlockState(cocoon.getPos()); IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index f2a0b440b..927cf3381 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -74,6 +74,6 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { ShaderHelper.releaseShader(); GlStateManager.popMatrix(); - } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress, 0); // todo 1.9 last parameter + } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress, 0); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 2619b42ec..459e5ed34 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -62,7 +62,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - Block block = world.getBlockState(pos).getBlock(); + Block block = world.getBlockState(pos.offset(side)).getBlock(); return block != this && super.shouldSideBeRendered(state, world, pos, side); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 08c5d6af3..57eea369b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -14,6 +14,7 @@ import java.util.Random; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -62,7 +63,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @SubscribeEvent public void onInteract(PlayerInteractEvent event) { if(event.getAction() == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos()); + TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), EnumHand.MAIN_HAND); // todo 1.9 } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 8766b5118..ec450c987 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -65,7 +65,6 @@ public class SubTilePollidisiac extends SubTileFunctional { mana -= manaCost; ReflectionHelper.setPrivateValue(EntityAnimal.class, animal, 1200, LibObfuscation.IN_LOVE); - // todo 1.8 new AI animal.setTarget(null); supertile.getWorld().setEntityState(animal, (byte)18); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 4b7be32d8..13d2f31a5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -197,16 +197,6 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { return INFINITE_EXTENT_AABB; } - /*@Override todo 1.8 - public int[] getSlotsForFace(EnumFacing var1) { - int accessibleSlot = -1; - for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) - accessibleSlot = i; - - return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - }*/ - @Override protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index b203f6892..35932601f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -298,16 +298,6 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver return INFINITE_EXTENT_AABB; } - /*@Override todo 1.8 - public int[] getSlotsForFace(EnumFacing var1) { - int accessibleSlot = -1; - for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) - accessibleSlot = i; - - return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - }*/ - @Override protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { 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 fc8c12c2b..49ec4f171 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 @@ -41,7 +41,7 @@ public class TileRedStringInterceptor extends TileRedString { return !tileEntityInvalid && worldObj.getTileEntity(pos) == this; } - public static void onInteract(EntityPlayer player, World world, BlockPos pos) { + public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { List remove = new ArrayList<>(); boolean did = false; @@ -71,7 +71,7 @@ public class TileRedStringInterceptor extends TileRedString { interceptors.removeAll(remove); if(did) { if(world.isRemote) - player.swingArm(EnumHand.MAIN_HAND); // todo 1.9 + player.swingArm(hand); else world.playSound(null, pos, SoundEvents.block_dispenser_dispense, SoundCategory.BLOCKS, 0.3F, 0.6F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 0d032a606..5516f1df5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -110,11 +110,19 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @Override public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { + if (!(entity instanceof EntityLivingBase)) + return; + EntityLivingBase living = ((EntityLivingBase) entity); + boolean eqLastTick = wasEquipped(stack); + + if (!equipped && living.getHeldItemOffhand() == stack) + equipped = true; + if(eqLastTick != equipped) setEquipped(stack, equipped); - if(!equipped && entity instanceof EntityLivingBase) { + if(!equipped) { int angles = 360; int segAngles = angles / SEGMENTS; float shift = segAngles / 2; @@ -398,7 +406,6 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); - // todo 1.8.8 Tessellator.renderingVertexBuffer = false; double renderPosX, renderPosY, renderPosZ; @@ -451,19 +458,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + float scale = seg == 0 ? 0.75F : 0.6F; + GlStateManager.scale(scale, scale, scale); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); if(slotStack.getItem() instanceof ItemBlock) { - float scale = seg == 0 ? 0.75F : 0.6F; - GlStateManager.scale(scale, scale, scale); - GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine - IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItemDamage()); + IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItem().getMetadata(slotStack.getMetadata())); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); } else { - GlStateManager.scale(0.75F, 0.75F, 0.75F); - GlStateManager.rotate(90F, 0F, 1F, 0F); + + //GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } } 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 0666539e5..9c9721f08 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -61,7 +61,7 @@ public class LensFirework extends Lens { ItemNBTHelper.setCompound(stack, "Explosion", explosion); NBTTagCompound fireworks = new NBTTagCompound(); - fireworks.setInteger("Flight", (int) (Math.random() * 3 + 2)); // todo 1.8 this bugged in 1.7 to always be 0 (cast before multiplication). is that intended now? + fireworks.setInteger("Flight", (int) (Math.random() * 3 + 2)); NBTTagList explosions = new NBTTagList(); explosions.appendTag(explosion); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index aec6566c9..f5cf00611 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -69,9 +69,7 @@ public final class LibObfuscation { public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "e" }; public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "d" }; - public static final String[] GET_ENTITY_TO_SPAWN = new String[] { "getEntityNameToSpawn", "func_98276_e", "g" }; public static final String[] RANDOM_ENTITY = new String[] { "randomEntity", "field_98282_f", "c" }; - public static final String[] SPAWN_NEW_ENTITY = new String[] { "spawnNewEntity", "func_180613_a", "a" }; // todo 1.9 // GuiIngame public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "q" }; diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..9a8553523 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,7 +1,8 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland" + "model": "botania:miniIsland", + "transform": "forge:default-block" }, "variants": { "variant": { From 5f3172bd5d523ae9e03acd36050cc91cd109bc5a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 1 Apr 2016 16:51:30 -0500 Subject: [PATCH 475/935] Cleanup, fix soulscribe holding --- build.properties | 2 +- .../java/vazkii/botania/common/item/ItemCraftingHalo.java | 4 +--- .../resources/assets/botania/models/item/enderDagger.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index 0c7265eeb..2e46a4718 100644 --- a/build.properties +++ b/build.properties @@ -5,5 +5,5 @@ dir_output=../Build Output/Botania/ forge_version=12.16.0.1811-1.9 mc_version=1.9 dir_repo=./ -build_number=300 +build_number=300-ALPHA mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 5516f1df5..cafdea64a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -464,13 +464,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); if(slotStack.getItem() instanceof ItemBlock) { - GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine - + GlStateManager.translate(0, -0.5, 0.5F); IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItem().getMetadata(slotStack.getMetadata())); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); } else { - //GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json index 602e83a3a..013865926 100644 --- a/src/main/resources/assets/botania/models/item/enderDagger.json +++ b/src/main/resources/assets/botania/models/item/enderDagger.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/enderDagger0", "layer1": "botania:items/enderDagger1" From 5ceceec6bbb66656648a137e5e711cc3db925790 Mon Sep 17 00:00:00 2001 From: Wire Segal Date: Sun, 3 Apr 2016 18:01:24 -0400 Subject: [PATCH 476/935] Various minor fixes * Fix Lexicon crashing with invalid version format Closes #192 * Fix crashing on damage taken Closes #196 * Fix attributes being too present/wrong values Closes #194 --- .../vazkii/botania/common/core/handler/PixieHandler.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 2 +- .../equipment/armor/terrasteel/ItemTerrasteelArmor.java | 8 +++++--- .../item/equipment/tool/manasteel/ItemManasteelAxe.java | 3 ++- .../item/equipment/tool/terrasteel/ItemTerraAxe.java | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) 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 7b37a4f33..5fd862300 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -58,7 +58,7 @@ public class PixieHandler { } float getChance(ItemStack stack) { - if(stack == null) + if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3f0a773e4..36afced6c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -125,7 +125,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { public static String getEdition() { String version = LibMisc.BUILD; - int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); + int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version.replace("[^\\d]", "")); return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index d5cc5ed6c..7da465c69 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -57,9 +57,11 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + Multimap multimap = super.getAttributeModifiers(slot, stack); + UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); + if (slot == this.armorType) { + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + } return multimap; } 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 87911b83f..9e5eb0ce6 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 @@ -53,9 +53,10 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta public ItemManasteelAxe(ToolMaterial mat, String name) { super(mat, ImmutableSet.of()); - // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); + this.damageVsEntity = 8f; + this.attackSpeed = -3.1f; } @Override 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 935954c38..e56249902 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 @@ -76,6 +76,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); MinecraftForge.EVENT_BUS.register(this); + this.attackSpeed = -3f; } public boolean shouldBreak(EntityPlayer player) { From 69db133091a1bb0a749178ce37980d8e38ebfde6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 18:47:31 -0500 Subject: [PATCH 477/935] Update forge --- build.gradle | 4 +- build.properties | 2 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 2 +- .../client/gui/lexicon/GuiLexiconEntry.java | 2 +- .../java/vazkii/botania/common/Botania.java | 8 +- .../botania/common/block/BlockAlfPortal.java | 3 +- .../botania/common/block/BlockAltGrass.java | 13 +-- .../botania/common/block/BlockAltar.java | 14 +-- .../botania/common/block/BlockAvatar.java | 3 +- .../botania/common/block/BlockBifrost.java | 3 +- .../common/block/BlockBifrostPerm.java | 3 +- .../common/block/BlockCacophonium.java | 3 +- .../botania/common/block/BlockCamo.java | 4 +- .../botania/common/block/BlockCell.java | 3 +- .../botania/common/block/BlockCocoon.java | 3 +- .../botania/common/block/BlockDreamwood.java | 4 +- .../common/block/BlockEnchantedSoil.java | 3 +- .../botania/common/block/BlockEnderEye.java | 3 +- .../botania/common/block/BlockFakeAir.java | 13 +-- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../block/BlockFloatingSpecialFlower.java | 4 +- .../botania/common/block/BlockForestEye.java | 3 +- .../botania/common/block/BlockGaiaHead.java | 9 +- .../botania/common/block/BlockGhostRail.java | 12 +-- .../botania/common/block/BlockHourglass.java | 3 +- .../common/block/BlockIncensePlate.java | 3 +- .../common/block/BlockLightLauncher.java | 5 +- .../botania/common/block/BlockLightRelay.java | 18 +--- .../botania/common/block/BlockLivingrock.java | 13 +-- .../botania/common/block/BlockLivingwood.java | 17 +--- .../botania/common/block/BlockManaBomb.java | 3 +- .../vazkii/botania/common/block/BlockMod.java | 20 ++-- .../common/block/BlockModDoubleFlower.java | 14 ++- .../botania/common/block/BlockModFlower.java | 15 +-- .../botania/common/block/BlockOpenCrate.java | 13 +-- .../common/block/BlockPistonRelay.java | 3 +- .../botania/common/block/BlockPlatform.java | 12 +-- .../botania/common/block/BlockPylon.java | 13 +-- .../botania/common/block/BlockRoot.java | 3 +- .../botania/common/block/BlockSolidVines.java | 9 +- .../common/block/BlockSparkChanger.java | 3 +- .../common/block/BlockSpecialFlower.java | 10 +- .../botania/common/block/BlockStorage.java | 13 +-- .../common/block/BlockTeruTeruBozu.java | 12 +-- .../botania/common/block/BlockTinyPlanet.java | 4 +- .../block/corporea/BlockCorporeaBase.java | 7 +- .../block/corporea/BlockCorporeaRetainer.java | 3 +- .../common/block/decor/Block18Stone.java | 13 +-- .../common/block/decor/BlockBlaze.java | 3 +- .../common/block/decor/BlockCustomBrick.java | 13 +-- .../common/block/decor/BlockDirtPath.java | 3 +- .../block/decor/BlockEndStoneBrick.java | 13 +-- .../block/decor/BlockFloatingFlower.java | 17 +--- .../common/block/decor/BlockManaBeacon.java | 14 +-- .../common/block/decor/BlockManaFlame.java | 4 +- .../common/block/decor/BlockManaGlass.java | 3 +- .../common/block/decor/BlockModMushroom.java | 12 +-- .../common/block/decor/BlockPavement.java | 13 +-- .../common/block/decor/BlockPetalBlock.java | 13 +-- .../common/block/decor/BlockPrismarine.java | 13 +-- .../common/block/decor/BlockReeds.java | 10 +- .../common/block/decor/BlockSeaLamp.java | 7 +- .../common/block/decor/BlockShimmerrock.java | 3 +- .../block/decor/BlockShimmerwoodPlanks.java | 3 +- .../common/block/decor/BlockStarfield.java | 3 +- .../common/block/decor/BlockThatch.java | 3 +- .../common/block/decor/BlockTinyPotato.java | 15 +-- .../common/block/decor/BlockUnstable.java | 13 +-- .../decor/biomestone/BlockBiomeStone.java | 13 +-- .../block/decor/panes/BlockModPane.java | 16 ++-- .../decor/quartz/BlockSpecialQuartz.java | 13 +-- .../block/decor/stairs/BlockModStairs.java | 11 +-- .../block/decor/walls/Block18StoneWall.java | 5 +- .../decor/walls/BlockBiomeStoneWall.java | 5 +- .../block/decor/walls/BlockModWall.java | 18 ++-- .../block/mana/BlockAlchemyCatalyst.java | 3 +- .../common/block/mana/BlockBellows.java | 5 +- .../common/block/mana/BlockBrewery.java | 4 +- .../common/block/mana/BlockDistributor.java | 3 +- .../common/block/mana/BlockEnchanter.java | 6 +- .../common/block/mana/BlockForestDrum.java | 13 +-- .../common/block/mana/BlockManaDetector.java | 3 +- .../common/block/mana/BlockManaVoid.java | 3 +- .../botania/common/block/mana/BlockPool.java | 17 +--- .../botania/common/block/mana/BlockPrism.java | 4 +- .../botania/common/block/mana/BlockPump.java | 3 +- .../common/block/mana/BlockRFGenerator.java | 3 +- .../common/block/mana/BlockRuneAltar.java | 3 +- .../common/block/mana/BlockSpawnerClaw.java | 3 +- .../common/block/mana/BlockSpreader.java | 16 +--- .../common/block/mana/BlockTerraPlate.java | 5 +- .../common/block/mana/BlockTurntable.java | 3 +- .../common/block/string/BlockRedString.java | 3 +- .../common/block/tile/TileLightRelay.java | 6 +- .../tile/corporea/TileCorporeaIndex.java | 2 +- .../botania/common/brew/potion/PotionMod.java | 3 +- .../core/command/CommandDownloadLatest.java | 6 +- .../common/core/command/CommandOpen.java | 2 +- .../common/core/handler/ConfigHandler.java | 4 +- .../common/core/handler/ModSounds.java | 96 ++++++++++--------- .../core/version/ThreadDownloadMod.java | 4 +- .../common/core/version/VersionChecker.java | 2 +- .../common/entity/EntityBabylonWeapon.java | 36 +++---- .../common/entity/EntityCorporeaSpark.java | 34 +++---- .../common/entity/EntityDoppleganger.java | 50 +++++----- .../common/entity/EntityMagicMissile.java | 12 +-- .../common/entity/EntityManaBurst.java | 48 +++++----- .../botania/common/entity/EntityPixie.java | 6 +- .../common/entity/EntityPoolMinecart.java | 6 +- .../common/entity/EntitySignalFlare.java | 6 +- .../botania/common/entity/EntitySpark.java | 16 ++-- .../common/entity/EntityThornChakram.java | 12 +-- .../botania/common/entity/EntityVineBall.java | 4 +- .../botania/common/item/Item16Colors.java | 3 +- .../botania/common/item/ItemAncientWill.java | 2 +- .../botania/common/item/ItemBaubleBox.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 2 +- .../botania/common/item/ItemBlackLotus.java | 2 +- .../botania/common/item/ItemBottledMana.java | 2 +- .../botania/common/item/ItemCacophonium.java | 2 +- .../vazkii/botania/common/item/ItemClip.java | 2 +- .../common/item/ItemCorporeaSpark.java | 2 +- .../botania/common/item/ItemCraftPattern.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 4 +- .../botania/common/item/ItemEnderHand.java | 2 +- .../botania/common/item/ItemFertilizer.java | 3 +- .../botania/common/item/ItemFlowerBag.java | 2 +- .../botania/common/item/ItemGaiaHead.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 3 +- .../botania/common/item/ItemGrassSeeds.java | 3 +- .../botania/common/item/ItemKeepIvy.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 2 +- .../botania/common/item/ItemLexicon.java | 5 +- .../botania/common/item/ItemManaCookie.java | 9 +- .../botania/common/item/ItemManaGun.java | 3 +- .../botania/common/item/ItemManaMirror.java | 3 +- .../botania/common/item/ItemManaTablet.java | 3 +- .../vazkii/botania/common/item/ItemMod.java | 16 ++-- .../common/item/ItemObedienceStick.java | 2 +- .../botania/common/item/ItemOpenBucket.java | 2 +- .../common/item/ItemOvergrowthSeed.java | 2 +- .../botania/common/item/ItemPhantomInk.java | 2 +- .../botania/common/item/ItemPinkinator.java | 2 +- .../botania/common/item/ItemPoolMinecart.java | 2 +- .../botania/common/item/ItemRegenIvy.java | 2 +- .../botania/common/item/ItemSextant.java | 2 +- .../botania/common/item/ItemSignalFlare.java | 3 +- .../botania/common/item/ItemSlimeBottle.java | 2 +- .../botania/common/item/ItemSlingshot.java | 2 +- .../vazkii/botania/common/item/ItemSpark.java | 2 +- .../botania/common/item/ItemSparkUpgrade.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../botania/common/item/ItemSpellCloth.java | 2 +- .../common/item/ItemTemperanceStone.java | 2 +- .../botania/common/item/ItemThornChakram.java | 2 +- .../botania/common/item/ItemVineBall.java | 2 +- .../vazkii/botania/common/item/ItemVirus.java | 2 +- .../botania/common/item/ItemWaterBowl.java | 2 +- .../botania/common/item/ItemWorldSeed.java | 4 +- .../common/item/brew/ItemBrewBase.java | 12 +-- .../common/item/brew/ItemIncenseStick.java | 2 +- .../botania/common/item/brew/ItemVial.java | 2 +- .../armor/manasteel/ItemManasteelArmor.java | 9 +- .../item/equipment/bauble/ItemBauble.java | 3 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 8 +- .../tool/manasteel/ItemManasteelAxe.java | 9 +- .../tool/manasteel/ItemManasteelPick.java | 9 +- .../tool/manasteel/ItemManasteelShears.java | 9 +- .../tool/manasteel/ItemManasteelShovel.java | 9 +- .../tool/manasteel/ItemManasteelSword.java | 8 +- .../thaumcraft/ItemManaInkwell.java | 2 +- .../botania/common/item/lens/ItemLens.java | 3 +- .../item/material/ItemManaResource.java | 3 +- .../item/material/ItemPestleAndMortar.java | 3 +- .../common/item/material/ItemQuartz.java | 2 +- .../common/item/material/ItemRune.java | 3 +- .../common/item/record/ItemModRecord.java | 8 +- .../common/item/relic/ItemAesirRing.java | 4 +- .../botania/common/item/relic/ItemDice.java | 4 +- .../common/item/relic/ItemKingKey.java | 2 +- .../common/item/relic/ItemOdinRing.java | 4 +- .../botania/common/item/relic/ItemRelic.java | 2 +- .../common/item/relic/ItemRelicBauble.java | 7 +- .../common/item/rod/ItemCobbleRod.java | 2 +- .../botania/common/item/rod/ItemDirtRod.java | 3 +- .../common/item/rod/ItemDiviningRod.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 2 +- .../botania/common/item/rod/ItemFireRod.java | 2 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemMissileRod.java | 3 +- .../common/item/rod/ItemRainbowRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 2 +- .../common/item/rod/ItemTerraformRod.java | 3 +- .../common/item/rod/ItemTornadoRod.java | 2 +- .../botania/common/item/rod/ItemWaterRod.java | 3 +- .../common/lexicon/page/PageTutorial.java | 2 +- 197 files changed, 524 insertions(+), 830 deletions(-) diff --git a/build.gradle b/build.gradle index e3e40f7c8..dbc016c70 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20160318" + mappings = "snapshot_20160402" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -68,7 +68,7 @@ dependencies { //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.1.0.170" + deobfCompile "mezz.jei:jei_1.9:3.2.3.176" //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 2e46a4718..ef8b75489 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1811-1.9 +forge_version=12.16.0.1833-1.9 mc_version=1.9 dir_repo=./ build_number=300-ALPHA 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 8475c55cd..a240c8775 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -947,7 +947,7 @@ public final class ModelHandler { } private static void registerItemModel(Item i,int meta) { - ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + ResourceLocation loc = i.getRegistryName(); ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); } 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 c838006e7..d15a9f959 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -136,7 +136,7 @@ public final class MultiblockRenderHandler { if(!didAny) { setMultiblock(null); - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new Style().setColor(TextFormatting.GREEN))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN))); } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 8bab0d91d..743fd7d46 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -214,7 +214,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa tutorial.poll(); positionTutorialArrow(); if(tutorial.isEmpty()) { - mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new Style().setColor(TextFormatting.RED))); + mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setStyle(new Style().setColor(TextFormatting.RED))); hasTutorialArrow = false; } } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 671935ca4..1035ec2ed 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -87,14 +87,14 @@ public class Botania { EntityPlayer player = evt.player; ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.nag"); - message.setChatStyle(new Style().setColor(TextFormatting.RED)); + message.setStyle(new Style().setColor(TextFormatting.RED)); ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report"); - message2.setChatStyle(new Style().setColor(TextFormatting.YELLOW)); + message2.setStyle(new Style().setColor(TextFormatting.YELLOW)); ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues"); - url.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); - url.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); + url.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); + url.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); player.addChatComponentMessage(message); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 853c7ee2e..c5fca7b7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -34,10 +34,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { public BlockAlfPortal() { - super(Material.wood); + super(Material.wood, LibBlockNames.ALF_PORTAL); setHardness(10F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.ALF_PORTAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index ec648f938..d97f0ac35 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -44,10 +44,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockAltGrass extends BlockMod implements ILexiconable { public BlockAltGrass() { - super(Material.grass); + super(Material.grass, LibBlockNames.ALT_GRASS); setHardness(0.6F); setSoundType(SoundType.PLANT); - setUnlocalizedName(LibBlockNames.ALT_GRASS); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); setTickRandomly(true); } @@ -73,14 +72,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - @Override - protected boolean shouldRegisterInNameSet() { - return false; + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a7f813a7a..13d8b974d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -61,11 +61,9 @@ public class BlockAltar extends BlockMod implements ILexiconable { private final Random random = new Random(); protected BlockAltar() { - super(Material.rock); + super(Material.rock, LibBlockNames.ALTAR); setHardness(3.5F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.ALTAR); - setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); @@ -113,14 +111,8 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 249f29f4b..268a082a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -46,10 +46,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable { private final Random random = new Random(); protected BlockAvatar() { - super(Material.wood); + super(Material.wood, LibBlockNames.AVATAR); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.AVATAR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 459e5ed34..716f28442 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -36,8 +36,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { - super(Material.glass); - setUnlocalizedName(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 64eabf358..62c9045d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -32,8 +32,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { - super(Material.glass); - setUnlocalizedName(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 d303f65d0..d3da585e3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -31,8 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { - super(Material.wood); - setUnlocalizedName(LibBlockNames.CACOPHONIUM); + super(Material.wood, LibBlockNames.CACOPHONIUM); setHardness(0.8F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 4340fbcba..7c322d072 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -30,8 +30,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockCamo extends BlockMod { - protected BlockCamo(Material par2Material) { - super(par2Material); + protected BlockCamo(Material par2Material, String name) { + super(par2Material, name); } public static boolean isValidBlock(IBlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 63d378f47..367fffef4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -31,8 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { - super(Material.gourd); - setUnlocalizedName(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 2ff704596..cb7a49247 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -38,11 +38,10 @@ 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); + super(Material.cloth, LibBlockNames.COCOON); setHardness(3.0F); setResistance(50.0F); setSoundType(SoundType.CLOTH); - setUnlocalizedName(LibBlockNames.COCOON); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 479a3d1c6..f7ec45a20 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -17,8 +17,8 @@ public class BlockDreamwood extends BlockLivingwood { } @Override - void register(String name) { - GameRegistry.registerBlock(this, ItemBlockDreamwood.class, name); + public void registerItemForm() { + GameRegistry.register(new ItemBlockDreamwood(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index fbf629b1c..b98c13e05 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -33,10 +33,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { - super(Material.grass); + super(Material.grass, LibBlockNames.ENCHANTED_SOIL); setHardness(0.6F); setSoundType(SoundType.PLANT); - setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index b106619cf..cb44bd880 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -31,11 +31,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { - super(Material.iron); + super(Material.iron, LibBlockNames.ENDER_EYE_BLOCK); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 089db2146..e1e2dc10b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -36,8 +36,7 @@ public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); public BlockFakeAir() { - super(Material.air); - setUnlocalizedName(LibBlockNames.FAKE_AIR); + super(Material.air, LibBlockNames.FAKE_AIR); setTickRandomly(true); } @@ -52,15 +51,7 @@ public class BlockFakeAir extends BlockMod { } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, null, par1Str); - return super.setUnlocalizedName(par1Str); - } + public void registerItemForm() {} @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 80d51f0ed..94ca71afc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -38,8 +38,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; public BlockFelPumpkin() { - super(Material.gourd); - setUnlocalizedName(LibBlockNames.FEL_PUMPKIN); + super(Material.gourd, LibBlockNames.FEL_PUMPKIN); setHardness(1F); setSoundType(SoundType.WOOD); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index af6140032..ddac026ba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -192,8 +192,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - protected void register(String name) { - GameRegistry.registerBlock(this, ItemBlockFloatingSpecialFlower.class, name); + public void registerItemForm() { + GameRegistry.register(new ItemBlockFloatingSpecialFlower(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 6346bf141..42130f47b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -31,11 +31,10 @@ 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); + super(Material.iron, LibBlockNames.FOREST_EYE); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.FOREST_EYE); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 8c4e228f4..490eb1b81 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.math.RayTraceResult; @@ -32,20 +33,16 @@ import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibMisc; public class BlockGaiaHead extends BlockSkull { public BlockGaiaHead() { + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); setUnlocalizedName(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, null, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.gaiaHead); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index f2cfdcd40..bdf022d47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -18,6 +18,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -32,6 +33,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockGhostRail extends BlockRailBase implements ILexiconable { @@ -40,8 +42,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { public BlockGhostRail() { super(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); - MinecraftForge.EVENT_BUS.register(this); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.GHOST_RAIL); + MinecraftForge.EVENT_BUS.register(this); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @@ -60,12 +64,6 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @SubscribeEvent public void onMinecartUpdate(MinecartUpdateEvent event) { BlockPos entPos = new BlockPos(event.getEntity()); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index ca27e1bfb..851691205 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -52,8 +52,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, private final Random random = new Random(); protected BlockHourglass() { - super(Material.iron); - setUnlocalizedName(LibBlockNames.HOURGLASS); + super(Material.iron, LibBlockNames.HOURGLASS); setHardness(2.0F); setSoundType(SoundType.METAL); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index abac456a2..7752e0823 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -39,8 +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); - setUnlocalizedName(LibBlockNames.INCENSE_PLATE); + super(Material.wood, LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setSoundType(SoundType.WOOD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index bba9a2f8e..33079b69a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -42,10 +42,9 @@ 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); + super(Material.wood, LibBlockNames.LIGHT_LAUNCHER); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @@ -96,7 +95,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } - public void pickUpEntities(World world, BlockPos pos) { + private void pickUpEntities(World world, BlockPos pos) { List relays = new ArrayList<>(); for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = world.getTileEntity(pos.offset(dir)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index e649e75ec..f41e42ff8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -45,9 +45,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); - float f = 5F / 16F; - setUnlocalizedName(LibBlockNames.LIGHT_RELAY); + super(Material.glass, LibBlockNames.LIGHT_RELAY); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } @@ -80,13 +78,8 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public Block setUnlocalizedName(String par1Str) { - register(par1Str); - return super.setUnlocalizedName(par1Str); - } - - void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override @@ -100,11 +93,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT ? 0 : 1; } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 1a5ab7550..5925ae9a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -36,11 +36,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { public BlockLivingrock() { - super(Material.rock); + super(Material.rock, LibBlockNames.LIVING_ROCK); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.LIVING_ROCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } @@ -62,20 +61,14 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.values()[meta]); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 3474b39c2..23aa16c90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -41,10 +41,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } public BlockLivingwood(String name) { - super(Material.wood); + super(Material.wood, name); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(name); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } @@ -66,24 +65,14 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.values()[meta]); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - register(par1Str); - return super.setUnlocalizedName(par1Str); - } - - void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index d38383186..b79373b76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -32,10 +32,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable, ICraftAchievement { public BlockManaBomb() { - super(Material.wood); + super(Material.wood, LibBlockNames.MANA_BOMB); setHardness(12.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.MANA_BOMB); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 7d6325e4e..57c37c502 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -12,31 +12,29 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockMod extends Block { - public int originalLight; + protected int originalLight; - public BlockMod(Material par2Material) { + public BlockMod(Material par2Material, String name) { super(par2Material); + setUnlocalizedName(name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + registerItemForm(); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } - @Override - public Block setUnlocalizedName(String par1Str) { - if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - protected boolean shouldRegisterInNameSet() { - return true; + public void registerItemForm() { + GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 82cd5536b..82211babc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -28,6 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; @@ -43,6 +44,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; @@ -59,7 +61,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I this.setHardness(0.0F); this.setSoundType(SoundType.PLANT); offset = second ? 8 : 0; - setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1)); + String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + setUnlocalizedName(name); setHardness(0F); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); @@ -74,13 +79,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public abstract IBlockState getStateFromMeta(int meta); - @Override - public Block setUnlocalizedName(String par1Str) { - if(!par1Str.equals("doublePlant")) - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return null; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 704251eb1..69f008b19 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -27,6 +27,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -43,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { @@ -55,8 +57,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } protected BlockModFlower(String name) { - super(); setUnlocalizedName(name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + registerItemForm(); setHardness(0F); setSoundType(SoundType.PLANT); setTickRandomly(false); @@ -64,6 +67,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -107,12 +114,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup par3List.add(new ItemStack(par1, 1, i)); } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index e4fe6011d..68d059758 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -55,10 +55,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, Random random; public BlockOpenCrate() { - super(Material.wood); + super(Material.wood, LibBlockNames.OPEN_CRATE); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.OPEN_CRATE); setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); @@ -96,14 +95,8 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 5e2912bb0..9612332e4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -63,8 +63,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private static final TObjectIntHashMap coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1); public BlockPistonRelay() { - super(Material.gourd); - setUnlocalizedName(LibBlockNames.PISTON_RELAY); + super(Material.gourd, LibBlockNames.PISTON_RELAY); setHardness(2F); setResistance(10F); setSoundType(SoundType.METAL); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 9d4f18502..3a9676e62 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -48,11 +48,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { public BlockPlatform() { - super(Material.wood); + super(Material.wood, LibBlockNames.PLATFORM); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.PLATFORM); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.HELD_STATE, null) .withProperty(BotaniaStateProps.HELD_WORLD, null) @@ -97,10 +96,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable return true; } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } @Override public int damageDropped(IBlockState state) { @@ -108,9 +103,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index e9b1a2f76..5a6589464 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -46,10 +46,9 @@ 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); + super(Material.iron, LibBlockNames.PYLON); setHardness(5.5F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.PYLON); setLightLevel(0.5F); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); @@ -79,14 +78,8 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index e504ad123..edf03c04a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -29,10 +29,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { - super(Material.plants); + super(Material.plants, LibBlockNames.ROOT); setHardness(1.2F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.ROOT); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index bcb25de25..ae0534cf5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -19,6 +19,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -29,6 +30,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockSolidVines extends BlockVine implements ILexiconable { @@ -38,6 +40,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { protected static final AxisAlignedBB LADDER_NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); public BlockSolidVines() { + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); @@ -64,12 +67,6 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { // NO-OP } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, null, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return false; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e4cc332b0..d835e5b3f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -44,11 +44,10 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { private final Random random = new Random(); public BlockSparkChanger() { - super(Material.rock); + super(Material.rock, LibBlockNames.SPARK_CHANGER); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.SPARK_CHANGER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 860cf3458..ee92bebe9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -34,6 +34,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -63,6 +64,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { @@ -120,6 +122,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I protected BlockSpecialFlower() { super(); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); + GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); @@ -204,12 +208,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return BlockRenderLayer.CUTOUT; } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 08a495375..7419af45c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -36,11 +36,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockStorage extends BlockMod implements ILexiconable { public BlockStorage() { - super(Material.iron); + super(Material.iron, LibBlockNames.STORAGE); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.STORAGE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } @@ -69,9 +68,8 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockStorage.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockStorage(this), getRegistryName()); } @Override @@ -79,11 +77,6 @@ public class BlockStorage extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beaconPos) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 4179dc91a..b55479ccc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -37,9 +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); - setUnlocalizedName(LibBlockNames.TERU_TERU_BOZU); - float f = 0.25F; + super(Material.cloth, LibBlockNames.TERU_TERU_BOZU); } @Override @@ -70,15 +68,15 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return false; } - public boolean isSunflower(ItemStack stack) { + private boolean isSunflower(ItemStack stack) { return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0; } - public boolean isBlueOrchid(ItemStack stack) { + private boolean isBlueOrchid(ItemStack stack) { return stack.getItem() == Item.getItemFromBlock(Blocks.red_flower) && stack.getItemDamage() == 1; } - public boolean removeRain(World world) { + private boolean removeRain(World world) { if(world.isRaining()) { world.getWorldInfo().setRaining(false); return true; @@ -86,7 +84,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return false; } - public boolean startRain(World world) { + private boolean startRain(World world) { if(!world.isRaining()) { if(world.rand.nextInt(10) == 0) world.getWorldInfo().setRaining(true); diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index a8c2078ea..da2af91e9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -31,12 +31,10 @@ 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); + super(Material.rock, LibBlockNames.TINY_PLANET); setHardness(20F); setResistance(100F); setSoundType(SoundType.STONE); - float size = 3F / 16F; - setUnlocalizedName(LibBlockNames.TINY_PLANET); } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index e55750ede..956cee0a0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -29,13 +29,10 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { - Random random; + private final Random random = new Random(); public BlockCorporeaBase(Material material, String name) { - super(material); - setUnlocalizedName(name); - - random = new Random(); + super(material, name); } @Override 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 30d267ab5..26dfe65bd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -35,10 +35,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { - super(Material.iron); + super(Material.iron, LibBlockNames.CORPOREA_RETAINER); setHardness(5.5F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 fa9dacfc5..4080171ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class Block18Stone extends BlockMod implements ILexiconable { public Block18Stone() { - super(Material.rock); + super(Material.rock, LibBlockNames.STONE); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.STONE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } @@ -69,20 +68,14 @@ public class Block18Stone extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 ab64386b5..02b111f23 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -31,12 +31,11 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { public BlockBlaze() { - super(Material.iron); + super(Material.iron, LibBlockNames.BLAZE_BLOCK); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); setLightLevel(1F); - setUnlocalizedName(LibBlockNames.BLAZE_BLOCK); GameRegistry.registerFuelHandler(this); } 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 4a423b4df..08fbf25e0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockCustomBrick extends BlockMod implements ILexiconable { public BlockCustomBrick() { - super(Material.rock); + super(Material.rock, LibBlockNames.CUSTOM_BRICK); setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.CUSTOM_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } @@ -63,20 +62,14 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 516a8c18f..04e35b154 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -46,11 +46,10 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.55, 2).setSaved(false); public BlockDirtPath() { - super(Material.ground); + super(Material.ground, LibBlockNames.DIRT_PATH); setLightOpacity(255); setHardness(0.6F); setSoundType(SoundType.GROUND); - setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; MinecraftForge.EVENT_BUS.register(this); } 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 b6c327dc2..b2037424e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { public BlockEndStoneBrick() { - super(Material.rock); + super(Material.rock, LibBlockNames.END_STONE_BRICK); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.END_STONE_BRICK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } @@ -69,20 +68,14 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 7a8416211..0b8c91d08 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -74,8 +74,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } public BlockFloatingFlower(String name) { - super(Material.ground); - setUnlocalizedName(name); + super(Material.ground, name); setHardness(0.5F); setSoundType(SoundType.GROUND); setLightLevel(1F); @@ -166,18 +165,8 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - register(par1Str); - return super.setUnlocalizedName(par1Str); - } - - protected void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 0078670c7..df2386428 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -42,12 +42,10 @@ 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); + super(Material.iron, LibBlockNames.MANA_BEACON); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); - float size = 3F / 16F; - setUnlocalizedName(LibBlockNames.MANA_BEACON); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -81,14 +79,8 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - @Override - protected boolean shouldRegisterInNameSet() { - return false; + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } @Override 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 98e87c52b..c36174362 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -43,9 +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); - setUnlocalizedName(LibBlockNames.MANA_FLAME); - float f = 0.25F; + super(Material.cloth, LibBlockNames.MANA_FLAME); setSoundType(SoundType.CLOTH); setLightLevel(1F); } 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 2bf35ebad..189bdf11b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -34,11 +34,10 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } public BlockManaGlass(String name) { - super(Material.glass); + super(Material.glass, name); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); - setUnlocalizedName(name); } @Override 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 fa4942d29..686f84db5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -25,6 +25,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -44,14 +45,17 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); - public int originalLight; + private int originalLight; public BlockModMushroom() { + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); @@ -106,12 +110,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis par3List.add(new ItemStack(par1, 1, i)); } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); 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 79369f89e..5d46d6150 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -36,11 +36,10 @@ public class BlockPavement extends BlockMod { public static final int TYPES = 6; public BlockPavement() { - super(Material.rock); + super(Material.rock, LibBlockNames.PAVEMENT); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.PAVEMENT); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } @@ -81,20 +80,14 @@ public class BlockPavement extends BlockMod { return getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 028787441..a3a73c7eb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -37,10 +37,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { - super(Material.plants); + super(Material.plants, LibBlockNames.PETAL_BLOCK); setHardness(0.4F); setSoundType(SoundType.PLANT); - setUnlocalizedName(LibBlockNames.PETAL_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -69,14 +68,8 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } @Override 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 ac111c0b3..e78ba8455 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -39,11 +39,10 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { private static final int TYPES = 3; public BlockPrismarine() { - super(Material.rock); + super(Material.rock, LibBlockNames.PRISMARINE); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.PRISMARINE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } @@ -65,20 +64,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 eac050269..cdf4ae7f9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -19,6 +19,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -30,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @@ -37,6 +39,8 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { super(Material.wood); setHardness(1.0F); setSoundType(SoundType.WOOD); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.REED_BLOCK)); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.REED_BLOCK); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); @@ -74,12 +78,6 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; 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 b10bf9923..603cf3bcc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -28,16 +28,15 @@ import net.minecraftforge.fml.common.Optional; public class BlockSeaLamp extends BlockMod implements ILexiconable { + private int coloredLight = -1; + public BlockSeaLamp() { - super(Material.glass); + super(Material.glass, LibBlockNames.SEA_LAMP); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); - setUnlocalizedName(LibBlockNames.SEA_LAMP); } - int coloredLight = -1; - @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { 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 bc7450207..00f029673 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -25,11 +25,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockShimmerrock extends BlockMod implements ILexiconable { public BlockShimmerrock() { - super(Material.rock); + super(Material.rock, LibBlockNames.SHIMMERROCK); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.SHIMMERROCK); } @Override 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 955a672ad..5a4580e90 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -25,10 +25,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { public BlockShimmerwoodPlanks() { - super(Material.wood); + super(Material.wood, LibBlockNames.SHIMMERWOOD_PLANKS); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); } @Override 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 c65e5bee3..e47176e31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -35,11 +35,10 @@ 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); + super(Material.iron, LibBlockNames.STARFIELD); setHardness(5F); setResistance(2000F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.STARFIELD); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 41831e680..113f9c092 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -25,10 +25,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockThatch extends BlockMod implements ILexiconable { public BlockThatch() { - super(Material.grass); + super(Material.grass, LibBlockNames.THATCH); setHardness(1.0F); setSoundType(SoundType.PLANT); - setUnlocalizedName(LibBlockNames.THATCH); } @Override 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 c7bcd46a8..5331a515d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -45,10 +45,8 @@ 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); + super(Material.cloth, LibBlockNames.TINY_POTATO); setHardness(0.25F); - setUnlocalizedName(LibBlockNames.TINY_POTATO); - float f = 1F / 16F * 6F; setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) ); @@ -91,16 +89,9 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName()); } - - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = par1World.getTileEntity(pos); 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 dcff7bda0..7a0cd1fb1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -47,11 +47,10 @@ 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); + super(Material.iron, LibBlockNames.UNSTABLE_BLOCK); setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); - setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @@ -85,14 +84,8 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - @Override - protected boolean shouldRegisterInNameSet() { - return false; + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } @Override 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 bdb0845fb..016a8c21e 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 @@ -33,11 +33,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBiomeStone extends BlockMod implements ILexiconable { public BlockBiomeStone(String name) { - super(Material.rock); + super(Material.rock, name); setHardness(1.5F); setResistance(10F); setSoundType(SoundType.STONE); - setUnlocalizedName(name); } @Override @@ -46,20 +45,14 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 da331ba99..e59ad616b 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 @@ -15,6 +15,7 @@ import net.minecraft.block.BlockPane; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; @@ -22,15 +23,20 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockModPane extends BlockPane { - Block source; + private final Block source; public BlockModPane(Block source) { super(Material.glass, false); this.source = source; - setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); + // Backward compat don't kill me + String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setSoundType(SoundType.GLASS); @@ -38,12 +44,6 @@ public class BlockModPane extends BlockPane { useNeighborBrightness = true; } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; 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 a14741554..b2c49e8c3 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 @@ -41,11 +41,10 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public final String type; public BlockSpecialQuartz(String type) { - super(Material.rock); + super(Material.rock, "quartzType" + type); this.type = type; setHardness(0.8F); setResistance(10F); - setUnlocalizedName("quartzType" + type); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } @@ -68,14 +67,8 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - - @Override - protected boolean shouldRegisterInNameSet() { - return false; + public void registerItemForm() { + GameRegistry.register(new ItemBlockSpecialQuartz(this), getRegistryName()); } public String[] getNames() { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 7746176ce..ee0072f3b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -1,10 +1,10 @@ package vazkii.botania.common.block.decor.stairs; -import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -13,22 +13,19 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class BlockModStairs extends BlockStairs implements ILexiconable { public BlockModStairs(IBlockState state, String name) { super(state); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index d12e7d6f0..06a90d1a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -25,6 +26,7 @@ import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -57,7 +59,8 @@ public class Block18StoneWall extends BlockModWall { @Override public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index a339d5969..3f85ebb4d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -25,6 +26,7 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; @@ -57,7 +59,8 @@ public class BlockBiomeStoneWall extends BlockModWall { @Override public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 04e8cf9e7..e23061e06 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -28,15 +29,19 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public abstract class BlockModWall extends BlockWall implements ILexiconable { - Block block; + private final Block block; public BlockModWall(Block block, int meta) { super(block); this.block = block; - setUnlocalizedName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); + // For backward compat don't kill me + String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; + register(name); + setUnlocalizedName(name); setDefaultState(blockState.getBaseState() .withProperty(UP, false) .withProperty(NORTH, false) @@ -77,14 +82,9 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return true; } - @Override - public Block setUnlocalizedName(String par1Str) { - register(par1Str); - return super.setUnlocalizedName(par1Str); - } - public void register(String name) { - GameRegistry.registerBlock(this, ItemBlockMod.class, name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } @Override 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 8961018ec..4a269f1f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -34,11 +34,10 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } public BlockAlchemyCatalyst(String name) { - super(Material.rock); + super(Material.rock, name); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(name); } @Override 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 5884f56d6..1fe8d4a6c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -39,12 +39,9 @@ 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); + super(Material.wood, LibBlockNames.BELLOWS); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.BELLOWS); - - float f = (1F - 10 / 16F) / 2F; 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 058bedc8a..bf4cc9350 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -47,9 +47,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private final Random random = new Random(); public BlockBrewery() { - super(Material.rock); - float f = 6F / 16F; - setUnlocalizedName(LibBlockNames.BREWERY); + super(Material.rock, LibBlockNames.BREWERY); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); 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 077a15d1a..7e967a0ff 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -28,11 +28,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { - super(Material.rock); + super(Material.rock, LibBlockNames.DISTRIBUTOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.DISTRIBUTOR); } @Override 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 c3f49a7d4..166d9d117 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -44,17 +44,15 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { - Random random; + private final Random random = new Random(); public BlockEnchanter() { - super(Material.rock); + super(Material.rock, LibBlockNames.ENCHANTER); setHardness(3.0F); setResistance(5.0F); setLightLevel(1.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.ENCHANTER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); - random = new Random(); } @Override 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 e464657b3..6923d9252 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -53,10 +53,9 @@ 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); + super(Material.wood, LibBlockNames.FOREST_DRUM); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.FOREST_DRUM); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } @@ -84,14 +83,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 0ffb3c193..3d3836874 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -38,11 +38,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaDetector extends BlockMod implements ILexiconable { public BlockManaDetector() { - super(Material.rock); + super(Material.rock, LibBlockNames.MANA_DETECTOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.MANA_DETECTOR); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } 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 48b3dbce2..b9c92fa0b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -33,11 +33,10 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { - super(Material.rock); + super(Material.rock, LibBlockNames.MANA_VOID); setHardness(2.0F); setResistance(2000F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.MANA_VOID); } @Override 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 21f9c025a..83bf2a955 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -56,17 +56,14 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); - boolean lastFragile = false; + private boolean lastFragile = false; public BlockPool() { - super(Material.rock); + super(Material.rock, LibBlockNames.POOL); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.POOL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); - BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } @@ -94,14 +91,8 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockPool.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockPool(this), getRegistryName()); } @Override 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 5f82b2be3..c83e4b32a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -50,12 +50,10 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { private final Random random = new Random(); public BlockPrism() { - super(Material.glass); + super(Material.glass, LibBlockNames.PRISM); setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); - setUnlocalizedName(LibBlockNames.PRISM); - float f = 0.25F; setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.POWERED, false) .withProperty(BotaniaStateProps.HAS_LENS, false) 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 640cf8384..7ce8fc048 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -41,11 +41,10 @@ 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); + super(Material.rock, LibBlockNames.PUMP); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.PUMP); setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } 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 1c1fa7f72..020eb5405 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -30,11 +30,10 @@ import net.minecraftforge.fml.common.Optional; public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { - super(Material.rock); + super(Material.rock, LibBlockNames.RF_GENERATOR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.RF_GENERATOR); } @Override 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 43368594c..4b137e010 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -43,11 +43,10 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable private final Random random = new Random(); public BlockRuneAltar() { - super(Material.rock); + super(Material.rock, LibBlockNames.RUNE_ALTAR); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(LibBlockNames.RUNE_ALTAR); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } 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 5d81e1dfb..bba2bb083 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -36,9 +36,8 @@ 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); + super(Material.iron, LibBlockNames.SPAWNER_CLAW); setHardness(3.0F); - setUnlocalizedName(LibBlockNames.SPAWNER_CLAW); } @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 ba33dd12c..115555b8e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -54,15 +54,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { - Random random; + private final Random random = new Random(); public BlockSpreader() { - super(Material.wood); + super(Material.wood, LibBlockNames.SPREADER); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.SPREADER); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); - random = new Random(); } @Override @@ -84,14 +82,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - protected boolean shouldRegisterInNameSet() { - return false; - } - - @Override - public Block setUnlocalizedName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str); - return super.setUnlocalizedName(par1Str); + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } @Override 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 bbd0f13f2..04aab93a7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -39,13 +39,10 @@ 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); + super(Material.iron, LibBlockNames.TERRA_PLATE); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - - setUnlocalizedName(LibBlockNames.TERRA_PLATE); - BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } 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 d5af0c5c1..3a41515af 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -33,10 +33,9 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { - super(Material.wood); + super(Material.wood, LibBlockNames.TURNTABLE); setHardness(2.0F); setSoundType(SoundType.WOOD); - setUnlocalizedName(LibBlockNames.TURNTABLE); } @Override 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 6ecc66a8f..298388a57 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -31,11 +31,10 @@ import vazkii.botania.common.lexicon.LexiconData; public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { - super(Material.rock); + super(Material.rock, name); setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 34e48f92c..a7c555c28 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -199,7 +199,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { protected void entityInit() { setSize(0F, 0F); noClip = true; - dataWatcher.register(EXIT_POS, BlockPos.ORIGIN); + dataManager.register(EXIT_POS, BlockPos.ORIGIN); } @Override @@ -283,11 +283,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getExitPos() { - return dataWatcher.get(EXIT_POS); + return dataManager.get(EXIT_POS); } public void setExit(BlockPos pos) { - dataWatcher.set(EXIT_POS, pos); + dataManager.set(EXIT_POS, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 7855936a8..8f6e80363 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -268,7 +268,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); - event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); if(CorporeaHelper.lastRequestExtractions >= 50000) event.getPlayer().addStat(ModAchievements.superCorporeaRequest, 1); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 2d55a594c..2c6bdb883 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -19,6 +19,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibMisc; public class PotionMod extends Potion { @@ -26,7 +27,7 @@ public class PotionMod extends Potion { public PotionMod(String name, boolean badEffect, int color, int iconIndex) { super(badEffect, color); - GameData.getPotionRegistry().register(-1, new ResourceLocation("botania", name), this); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index a7976a1c5..91992a069 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -36,13 +36,13 @@ public class CommandDownloadLatest extends CommandBase { @Override public void execute(MinecraftServer server, ICommandSender var1, String[] var2) { if(!ENABLED) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setChatStyle(new Style().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED))); else if(var2.length == 1) if(VersionChecker.downloadedFile) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new Style().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setStyle(new Style().setColor(TextFormatting.RED))); else if(VersionChecker.startedDownload) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new Style().setColor(TextFormatting.RED))); + var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setStyle(new Style().setColor(TextFormatting.RED))); else new ThreadDownloadMod("Botania " + var2[0] + ".jar"); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 31d4a778f..cc655838f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -42,7 +42,7 @@ public class CommandOpen extends CommandBase { if(stack != null) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); - } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new Style().setColor(TextFormatting.RED))); + } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setStyle(new Style().setColor(TextFormatting.RED))); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index cd80212ad..dde676629 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -395,9 +395,9 @@ public final class ConfigHandler { if(changes.size() == 0) return; - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new Style().setColor(TextFormatting.GOLD))); + player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setStyle(new Style().setColor(TextFormatting.GOLD))); for(String change : changes) - player.addChatMessage(new TextComponentString(change).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatMessage(new TextComponentString(change).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); } public void addMappingInt(int version, String key, int val) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 5f4bbc715..1fb1eaea6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -1,7 +1,9 @@ package vazkii.botania.common.core.handler; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.lib.LibObfuscation; @@ -11,52 +13,54 @@ import java.lang.reflect.Method; public final class ModSounds { public static void init() { - try { - Method m = ReflectionHelper.findMethod(SoundEvent.class, null, LibObfuscation.REGISTER_SOUND, String.class); - m.invoke(null, "botania:airRod"); - m.invoke(null, "botania:agricarnation"); - m.invoke(null, "botania:altarCraft"); - m.invoke(null, "botania:babylonAttack"); - m.invoke(null, "botania:babylonSpawn"); - m.invoke(null, "botania:bellows"); - m.invoke(null, "botania:bifrostRod"); - m.invoke(null, "botania:blackLotus"); - m.invoke(null, "botania:dash"); - m.invoke(null, "botania:ding"); - m.invoke(null, "botania:divaCharm"); - m.invoke(null, "botania:divinationRod"); - m.invoke(null, "botania:doit"); - m.invoke(null, "botania:enchanterBlock"); - m.invoke(null, "botania:enchanterEnchant"); - m.invoke(null, "botania:endoflame"); - m.invoke(null, "botania:equipBauble"); - m.invoke(null, "botania:gaiaTrap"); - m.invoke(null, "botania:goldenLaurel"); - m.invoke(null, "botania:holyCloak"); - m.invoke(null, "botania:laputaStart"); - m.invoke(null, "botania:lexiconOpen"); - m.invoke(null, "botania:lexiconPage"); - m.invoke(null, "botania:lightRelay"); - m.invoke(null, "botania:manaBlaster"); - m.invoke(null, "botania:manaPoolCraft"); - m.invoke(null, "botania:missile"); - m.invoke(null, "botania:orechid"); - m.invoke(null, "botania:potionCreate"); - m.invoke(null, "botania:runeAltarCraft"); - m.invoke(null, "botania:runeAltarStart"); - m.invoke(null, "botania:spreaderFire"); - m.invoke(null, "botania:starcaller"); - m.invoke(null, "botania:terraBlade"); - m.invoke(null, "botania:terraformRod"); - m.invoke(null, "botania:terraPickMode"); - m.invoke(null, "botania:terrasteelCraft"); - m.invoke(null, "botania:thermalily"); - m.invoke(null, "botania:unholyCloak"); - m.invoke(null, "botania:way"); - m.invoke(null, "botania:music.gaia1"); - m.invoke(null, "botania:music.gaia2"); - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); + String[] sounds = { + "botania:airRod", + "botania:agricarnation", + "botania:altarCraft", + "botania:babylonAttack", + "botania:babylonSpawn", + "botania:bellows", + "botania:bifrostRod", + "botania:blackLotus", + "botania:dash", + "botania:ding", + "botania:divaCharm", + "botania:divinationRod", + "botania:doit", + "botania:enchanterBlock", + "botania:enchanterEnchant", + "botania:endoflame", + "botania:equipBauble", + "botania:gaiaTrap", + "botania:goldenLaurel", + "botania:holyCloak", + "botania:laputaStart", + "botania:lexiconOpen", + "botania:lexiconPage", + "botania:lightRelay", + "botania:manaBlaster", + "botania:manaPoolCraft", + "botania:missile", + "botania:orechid", + "botania:potionCreate", + "botania:runeAltarCraft", + "botania:runeAltarStart", + "botania:spreaderFire", + "botania:starcaller", + "botania:terraBlade", + "botania:terraformRod", + "botania:terraPickMode", + "botania:terrasteelCraft", + "botania:thermalily", + "botania:unholyCloak", + "botania:way", + "botania:music.gaia1", + "botania:music.gaia2" + }; + + for (String s : sounds) { + ResourceLocation loc = new ResourceLocation(s); + GameRegistry.register(new SoundEvent(loc), loc); } } diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 183154826..027baa949 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -82,7 +82,7 @@ public class ThreadDownloadMod extends Thread { f.renameTo(f1); if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new Style().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN))); Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; @@ -101,6 +101,6 @@ public class ThreadDownloadMod extends Thread { private void sendError() { if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setChatStyle(new Style().setColor(TextFormatting.RED))); + Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED))); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 265c4a6aa..4c3dce299 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -48,7 +48,7 @@ public final class VersionChecker { int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 23053701b..d3cae814f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -62,12 +62,12 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { super.entityInit(); setSize(0F, 0F); - dataWatcher.register(CHARGING, false); - dataWatcher.register(VARIETY, 0); - dataWatcher.register(CHARGE_TICKS, 0); - dataWatcher.register(LIVE_TICKS, 0); - dataWatcher.register(DELAY, 0); - dataWatcher.register(ROTATION, 0F); + dataManager.register(CHARGING, false); + dataManager.register(VARIETY, 0); + dataManager.register(CHARGE_TICKS, 0); + dataManager.register(LIVE_TICKS, 0); + dataManager.register(DELAY, 0); + dataManager.register(ROTATION, 0F); } @Override @@ -191,51 +191,51 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } public boolean isCharging() { - return dataWatcher.get(CHARGING); + return dataManager.get(CHARGING); } public void setCharging(boolean charging) { - dataWatcher.set(CHARGING, charging); + dataManager.set(CHARGING, charging); } public int getVariety() { - return dataWatcher.get(VARIETY); + return dataManager.get(VARIETY); } public void setVariety(int var) { - dataWatcher.set(VARIETY, var); + dataManager.set(VARIETY, var); } public int getChargeTicks() { - return dataWatcher.get(CHARGE_TICKS); + return dataManager.get(CHARGE_TICKS); } public void setChargeTicks(int ticks) { - dataWatcher.set(CHARGE_TICKS, ticks); + dataManager.set(CHARGE_TICKS, ticks); } public int getLiveTicks() { - return dataWatcher.get(LIVE_TICKS); + return dataManager.get(LIVE_TICKS); } public void setLiveTicks(int ticks) { - dataWatcher.set(LIVE_TICKS, ticks); + dataManager.set(LIVE_TICKS, ticks); } public int getDelay() { - return dataWatcher.get(DELAY); + return dataManager.get(DELAY); } public void setDelay(int delay) { - dataWatcher.set(DELAY, delay); + dataManager.set(DELAY, delay); } public float getRotation() { - return dataWatcher.get(ROTATION); + return dataManager.get(ROTATION); } public void setRotation(float rot) { - dataWatcher.set(ROTATION, rot); + dataManager.set(ROTATION, rot); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index a4aa8299d..a30f31894 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -65,11 +65,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.register(INVISIBILITY, 0); - dataWatcher.register(MASTER, false); - dataWatcher.register(NETWORK, 0); - dataWatcher.register(ITEM_DISPLAY_TICKS, 0); - dataWatcher.register(DISPLAY_STACK, Optional.absent()); + dataManager.register(INVISIBILITY, 0); + dataManager.register(MASTER, false); + dataManager.register(NETWORK, 0); + dataManager.register(ITEM_DISPLAY_TICKS, 0); + dataManager.register(DISPLAY_STACK, Optional.absent()); } @Override @@ -228,37 +228,37 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public void setMaster(boolean master) { - dataWatcher.set(MASTER, master); + dataManager.set(MASTER, master); } @Override public boolean isMaster() { - return dataWatcher.get(MASTER); + return dataManager.get(MASTER); } public void setNetwork(EnumDyeColor network) { - dataWatcher.set(NETWORK, network.getMetadata()); + dataManager.set(NETWORK, network.getMetadata()); } @Override public EnumDyeColor getNetwork() { - return EnumDyeColor.byMetadata(dataWatcher.get(NETWORK)); + return EnumDyeColor.byMetadata(dataManager.get(NETWORK)); } public int getItemDisplayTicks() { - return dataWatcher.get(ITEM_DISPLAY_TICKS); + return dataManager.get(ITEM_DISPLAY_TICKS); } public void setItemDisplayTicks(int ticks) { - dataWatcher.set(ITEM_DISPLAY_TICKS, ticks); + dataManager.set(ITEM_DISPLAY_TICKS, ticks); } public Optional getDisplayedItem() { - return dataWatcher.get(DISPLAY_STACK); + return dataManager.get(DISPLAY_STACK); } public void setDisplayedItem(ItemStack stack) { - dataWatcher.set(DISPLAY_STACK, Optional.fromNullable(stack)); + dataManager.set(DISPLAY_STACK, Optional.fromNullable(stack)); } @Override @@ -297,8 +297,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.get(INVISIBILITY); - dataWatcher.set(INVISIBILITY, ~invis & 1); + int invis = dataManager.get(INVISIBILITY); + dataManager.set(INVISIBILITY, ~invis & 1); return true; } @@ -309,14 +309,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { protected void readEntityFromNBT(NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); - dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); - cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d77a93001..f3622c3ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -165,7 +165,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(par3World.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -176,7 +176,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); return false; } } @@ -195,7 +195,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -265,69 +265,69 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(INVUL_TIME, 0); - dataWatcher.register(AGGRO, false); - dataWatcher.register(TP_DELAY, 0); - dataWatcher.register(SOURCE, BlockPos.ORIGIN); - dataWatcher.register(DATA_MOB_SPAWN_TICKS, 0); - dataWatcher.register(HARD_MODE, false); - dataWatcher.register(PLAYER_COUNT, 0); + dataManager.register(INVUL_TIME, 0); + dataManager.register(AGGRO, false); + dataManager.register(TP_DELAY, 0); + dataManager.register(SOURCE, BlockPos.ORIGIN); + dataManager.register(DATA_MOB_SPAWN_TICKS, 0); + dataManager.register(HARD_MODE, false); + dataManager.register(PLAYER_COUNT, 0); } public int getInvulTime() { - return dataWatcher.get(INVUL_TIME); + return dataManager.get(INVUL_TIME); } public boolean isAggored() { - return dataWatcher.get(AGGRO); + return dataManager.get(AGGRO); } public int getTPDelay() { - return dataWatcher.get(TP_DELAY); + return dataManager.get(TP_DELAY); } public BlockPos getSource() { - return dataWatcher.get(SOURCE); + return dataManager.get(SOURCE); } public int getMobSpawnTicks() { - return dataWatcher.get(DATA_MOB_SPAWN_TICKS); + return dataManager.get(DATA_MOB_SPAWN_TICKS); } public boolean isHardMode() { - return dataWatcher.get(HARD_MODE); + return dataManager.get(HARD_MODE); } public int getPlayerCount() { - return dataWatcher.get(PLAYER_COUNT); + return dataManager.get(PLAYER_COUNT); } public void setInvulTime(int time) { - dataWatcher.set(INVUL_TIME, time); + dataManager.set(INVUL_TIME, time); } public void setAggroed(boolean aggored) { - dataWatcher.set(AGGRO, aggored); + dataManager.set(AGGRO, aggored); } public void setTPDelay(int delay) { - dataWatcher.set(TP_DELAY, delay); + dataManager.set(TP_DELAY, delay); } public void setSource(BlockPos pos) { - dataWatcher.set(SOURCE, pos); + dataManager.set(SOURCE, pos); } public void setMobSpawnTicks(int ticks) { - dataWatcher.set(DATA_MOB_SPAWN_TICKS, ticks); + dataManager.set(DATA_MOB_SPAWN_TICKS, ticks); } public void setHardMode(boolean hardMode) { - dataWatcher.set(HARD_MODE, hardMode); + dataManager.set(HARD_MODE, hardMode); } public void setPlayerCount(int count) { - dataWatcher.set(PLAYER_COUNT, count); + dataManager.set(PLAYER_COUNT, count); } @Override @@ -816,7 +816,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(flag1) { setPosition(posX, posY, posZ); - if(worldObj.getCubes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) + if(worldObj.getCollisionBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) flag = true; // Prevent out of bounds teleporting diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index f120f24ea..9c2922e97 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -56,24 +56,24 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void entityInit() { - dataWatcher.register(EVIL, false); - dataWatcher.register(TARGET, 0); + dataManager.register(EVIL, false); + dataManager.register(TARGET, 0); } public void setEvil(boolean evil) { - dataWatcher.set(EVIL, evil); + dataManager.set(EVIL, evil); } public boolean isEvil() { - return dataWatcher.get(EVIL); + return dataManager.get(EVIL); } public void setTarget(EntityLivingBase e) { - dataWatcher.set(TARGET, e == null ? -1 : e.getEntityId()); + dataManager.set(TARGET, e == null ? -1 : e.getEntityId()); } public EntityLivingBase getTargetEntity() { - int id = dataWatcher.get(TARGET); + int id = dataManager.get(TARGET); Entity e = worldObj.getEntityByID(id); if(e != null && e instanceof EntityLivingBase) return (EntityLivingBase) e; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c1a8b460c..b490268ce 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -103,14 +103,14 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(COLOR, 0); - dataWatcher.register(MANA, 0); - dataWatcher.register(START_MANA, 0); - dataWatcher.register(MIN_MANA_LOSS, 0); - dataWatcher.register(MANA_LOSS_PER_TICK, 0F); - dataWatcher.register(GRAVITY, 0F); - dataWatcher.register(SOURCE_COORDS, BlockPos.ORIGIN); - dataWatcher.register(SOURCE_LENS, Optional.absent()); + dataManager.register(COLOR, 0); + dataManager.register(MANA, 0); + dataManager.register(START_MANA, 0); + dataManager.register(MIN_MANA_LOSS, 0); + dataManager.register(MANA_LOSS_PER_TICK, 0F); + dataManager.register(GRAVITY, 0F); + dataManager.register(SOURCE_COORDS, BlockPos.ORIGIN); + dataManager.register(SOURCE_LENS, Optional.absent()); } public EntityManaBurst(IManaSpreader spreader, boolean fake) { @@ -695,77 +695,77 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public int getColor() { - return dataWatcher.get(COLOR); + return dataManager.get(COLOR); } @Override public void setColor(int color) { - dataWatcher.set(COLOR, color); + dataManager.set(COLOR, color); } @Override public int getMana() { - return dataWatcher.get(MANA); + return dataManager.get(MANA); } @Override public void setMana(int mana) { - dataWatcher.set(MANA, mana); + dataManager.set(MANA, mana); } @Override public int getStartingMana() { - return dataWatcher.get(START_MANA); + return dataManager.get(START_MANA); } @Override public void setStartingMana(int mana) { - dataWatcher.set(START_MANA, mana); + dataManager.set(START_MANA, mana); } @Override public int getMinManaLoss() { - return dataWatcher.get(MIN_MANA_LOSS); + return dataManager.get(MIN_MANA_LOSS); } @Override public void setMinManaLoss(int minManaLoss) { - dataWatcher.set(MIN_MANA_LOSS, minManaLoss); + dataManager.set(MIN_MANA_LOSS, minManaLoss); } @Override public float getManaLossPerTick() { - return dataWatcher.get(MANA_LOSS_PER_TICK); + return dataManager.get(MANA_LOSS_PER_TICK); } @Override public void setManaLossPerTick(float mana) { - dataWatcher.set(MANA_LOSS_PER_TICK, mana); + dataManager.set(MANA_LOSS_PER_TICK, mana); } @Override public float getGravity() { - return dataWatcher.get(GRAVITY); + return dataManager.get(GRAVITY); } @Override public void setGravity(float gravity) { - dataWatcher.set(GRAVITY, gravity); + dataManager.set(GRAVITY, gravity); } @Override public BlockPos getBurstSourceBlockPos() { - return dataWatcher.get(SOURCE_COORDS); + return dataManager.get(SOURCE_COORDS); } @Override public void setBurstSourceCoords(BlockPos pos) { - dataWatcher.set(SOURCE_COORDS, pos); + dataManager.set(SOURCE_COORDS, pos); } @Override public ItemStack getSourceLens() { - Optional stack = dataWatcher.get(SOURCE_LENS); + Optional stack = dataManager.get(SOURCE_LENS); if(!stack.isPresent()) return new ItemStack(Blocks.stone, 0, 0); // todo 1.9 refact later else return stack.get(); @@ -773,7 +773,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public void setSourceLens(ItemStack lens) { - dataWatcher.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); + dataManager.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 2ee61d8cf..77088c978 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -37,7 +37,7 @@ public class EntityPixie extends EntityFlyingCreature { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(TYPE, 0); + dataManager.register(TYPE, 0); } @Override @@ -47,11 +47,11 @@ public class EntityPixie extends EntityFlyingCreature { } public void setType(int type) { - dataWatcher.set(TYPE, type); + dataManager.set(TYPE, type); } public int getType() { - return dataWatcher.get(TYPE); + return dataManager.get(TYPE); } public void setProps(EntityLivingBase target, EntityLivingBase summoner, int type, float damage) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 6c5fd201d..ea621a786 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -50,7 +50,7 @@ public class EntityPoolMinecart extends EntityMinecart { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(MANA, 0); + dataManager.register(MANA, 0); } @Override @@ -157,11 +157,11 @@ public class EntityPoolMinecart extends EntityMinecart { } public int getMana() { - return dataWatcher.get(MANA); + return dataManager.get(MANA); } public void setMana(int mana) { - dataWatcher.set(MANA, mana); + dataManager.set(MANA, mana); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 5326e95d0..7d21973b8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -32,7 +32,7 @@ public class EntitySignalFlare extends Entity { @Override protected void entityInit() { - dataWatcher.register(COLOR, 0); + dataManager.register(COLOR, 0); } @Override @@ -74,11 +74,11 @@ public class EntitySignalFlare extends Entity { } public void setColor(int color) { - dataWatcher.set(COLOR, color); + dataManager.set(COLOR, color); } public int getColor() { - return dataWatcher.get(COLOR); + return dataManager.get(COLOR); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 45793d568..65d6a3692 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -65,8 +65,8 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.register(INVISIBILITY, 0); - dataWatcher.register(UPGRADE, 0); + dataManager.register(INVISIBILITY, 0); + dataManager.register(UPGRADE, 0); } @Override @@ -290,8 +290,8 @@ public class EntitySpark extends Entity implements ISparkEntity { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.get(INVISIBILITY); - dataWatcher.set(INVISIBILITY, ~invis & 1); + int invis = dataManager.get(INVISIBILITY); + dataManager.set(INVISIBILITY, ~invis & 1); return true; } @@ -301,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); - dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } @Override @@ -369,12 +369,12 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public SparkUpgradeType getUpgrade() { - return SparkUpgradeType.values()[dataWatcher.get(UPGRADE)]; + return SparkUpgradeType.values()[dataManager.get(UPGRADE)]; } @Override public void setUpgrade(SparkUpgradeType upgrade) { - dataWatcher.set(UPGRADE, upgrade.ordinal()); + dataManager.set(UPGRADE, upgrade.ordinal()); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index ba122aa6b..d40591a99 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -54,8 +54,8 @@ public class EntityThornChakram extends EntityThrowable { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(BOUNCES, 0); - dataWatcher.register(FLARE, false); + dataManager.register(BOUNCES, 0); + dataManager.register(FLARE, false); } @Override @@ -155,19 +155,19 @@ public class EntityThornChakram extends EntityThrowable { } public int getTimesBounced() { - return dataWatcher.get(BOUNCES); + return dataManager.get(BOUNCES); } public void setTimesBounced(int times) { - dataWatcher.set(BOUNCES, times); + dataManager.set(BOUNCES, times); } public boolean isFire() { - return dataWatcher.get(FLARE); + return dataManager.get(FLARE); } public void setFire(boolean fire) { - dataWatcher.set(FLARE, fire); + dataManager.set(FLARE, fire); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 18ec609c7..b63f5850c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -47,7 +47,7 @@ public class EntityVineBall extends EntityThrowable { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(GRAVITY, gravity ? 0.03F : 0F); + dataManager.register(GRAVITY, gravity ? 0.03F : 0F); } @Override @@ -79,7 +79,7 @@ public class EntityVineBall extends EntityThrowable { @Override protected float getGravityVelocity() { - return dataWatcher.get(GRAVITY); + return dataManager.get(GRAVITY); } } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 9108fbcb3..2c8331bbe 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -20,9 +20,8 @@ import net.minecraft.item.ItemStack; public class Item16Colors extends ItemMod implements IColorable { public Item16Colors(String name) { - super(); + super(name); setHasSubtypes(true); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index a9f4e1cac..54896d24a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -28,7 +28,7 @@ public class ItemAncientWill extends ItemMod { private static final int SUBTYPES = 6; public ItemAncientWill() { - setUnlocalizedName(LibItemNames.ANCIENT_WILL); + super(LibItemNames.ANCIENT_WILL); setHasSubtypes(true); setMaxStackSize(1); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 160c90f7c..7fa64f914 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -29,7 +29,7 @@ public class ItemBaubleBox extends ItemMod { private static final String TAG_SLOT = "Slot"; public ItemBaubleBox() { - setUnlocalizedName(LibItemNames.BAUBLE_BOX); + super(LibItemNames.BAUBLE_BOX); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index aeff364ec..397d09761 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -51,7 +51,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { private static final String TAG_BLOCK_COUNT = "blockCount"; public ItemBlackHoleTalisman() { - setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN); + super(LibItemNames.BLACK_HOLE_TALISMAN); setMaxStackSize(1); setHasSubtypes(true); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 8f9f3f06c..8b0612321 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -32,7 +32,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER_T2 = 100000; public ItemBlackLotus() { - setUnlocalizedName(LibItemNames.BLACK_LOTUS); + super(LibItemNames.BLACK_LOTUS); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 2ac342592..144d961ad 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -44,7 +44,7 @@ public class ItemBottledMana extends ItemMod { private static final String TAG_SEED = "randomSeed"; public ItemBottledMana() { - setUnlocalizedName(LibItemNames.MANA_BOTTLE); + super(LibItemNames.MANA_BOTTLE); setMaxStackSize(1); setMaxDamage(6); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 805d47f81..5c9f6fca3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -50,8 +50,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { private static final String TAG_HAS_SOUND = "hasSound"; public ItemCacophonium() { + super(LibItemNames.CACOPHONIUM); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.CACOPHONIUM); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemClip.java b/src/main/java/vazkii/botania/common/item/ItemClip.java index 6f3ac2b50..b8f0e34b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemClip.java +++ b/src/main/java/vazkii/botania/common/item/ItemClip.java @@ -15,8 +15,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemClip extends ItemMod { public ItemClip() { + super(LibItemNames.CLIP); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.CLIP); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 8dc631252..2e80f6afc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { public ItemCorporeaSpark() { - setUnlocalizedName(LibItemNames.CORPOREA_SPARK); + super(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 58cad146e..3d41b027d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -28,8 +28,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCraftPattern extends ItemMod { public ItemCraftPattern() { + super(LibItemNames.CRAFT_PATTERN); setHasSubtypes(true); - setUnlocalizedName(LibItemNames.CRAFT_PATTERN); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index cafdea64a..8659bf70d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -82,7 +82,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } public ItemCraftingHalo(String name) { - setUnlocalizedName(name); + super(name); setMaxStackSize(1); } @@ -264,7 +264,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { // Screw the way minecraft handles rotation // Really... private static float getCheckingAngle(EntityLivingBase player, float base) { - float yaw = MathHelper.wrapAngleTo180_float(player.rotationYaw) + 90F; + float yaw = MathHelper.wrapDegrees(player.rotationYaw) + 90F; int angles = 360; int segAngles = angles / SEGMENTS; float shift = segAngles / 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index decaf4f03..0c4a4a433 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -34,8 +34,8 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv private static final int COST_OTHER = 5000; public ItemEnderHand() { + super(LibItemNames.ENDER_HAND); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.ENDER_HAND); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index a9f424c44..6bd46d54f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -29,8 +29,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemFertilizer extends ItemMod { public ItemFertilizer() { - super(); - setUnlocalizedName(LibItemNames.FERTILIZER); + super(LibItemNames.FERTILIZER); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 98bab499d..f26384d0f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -44,7 +44,7 @@ public class ItemFlowerBag extends ItemMod { private static final String TAG_SLOT = "Slot"; public ItemFlowerBag() { - setUnlocalizedName(LibItemNames.FLOWER_BAG); + super(LibItemNames.FLOWER_BAG); setMaxStackSize(1); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index b010b3c4d..4f3642b37 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { - setUnlocalizedName(LibItemNames.GAIA_HEAD); + super(LibItemNames.GAIA_HEAD); } // Copied from vanila skull itemBlock. Relevant edits are indicated. diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 3697d80e9..68c8112b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -45,9 +45,8 @@ public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; public ItemGrassHorn() { - super(); + super(LibItemNames.GRASS_HORN); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.GRASS_HORN); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 7a7da993a..497623552 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -60,8 +60,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private static final int SUBTYPES = 9; public ItemGrassSeeds() { - super(); - setUnlocalizedName(LibItemNames.GRASS_SEEDS); + super(LibItemNames.GRASS_SEEDS); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 42ea56175..cdb694c12 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -38,7 +38,7 @@ public class ItemKeepIvy extends ItemMod { private static final String TAG_DROP_PREFIX = "dropPrefix"; public ItemKeepIvy() { - setUnlocalizedName(LibItemNames.KEEP_IVY); + super(LibItemNames.KEEP_IVY); GameRegistry.addRecipe(new KeepIvyRecipe()); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 2f174b9af..ddd30b2c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -61,7 +61,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet private static final int BASE_OFFSET = 42; public ItemLaputaShard() { - setUnlocalizedName(LibItemNames.LAPUTA_SHARD); + super(LibItemNames.LAPUTA_SHARD); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3f0a773e4..853c3df8f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -55,9 +55,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { boolean skipSound = false; public ItemLexicon() { - super(); + super(LibItemNames.LEXICON); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.LEXICON); } @Override @@ -136,7 +135,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { LexiconEntry entry = getEntryFromForce(par1ItemStack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setChatStyle(new Style().setColor(TextFormatting.RED))); + else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); setForcedPage(par1ItemStack, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index dafc64901..3f8a2130b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -17,12 +17,14 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManaCookie extends ItemFood { @@ -30,6 +32,7 @@ public class ItemManaCookie extends ItemFood { super(0, 0.1F, false); 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); } @@ -39,12 +42,6 @@ public class ItemManaCookie extends ItemFood { p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index c91d862a4..e43d954da 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -63,11 +63,10 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { private static final int COOLDOWN = 30; public ItemManaGun() { - super(); + super(LibItemNames.MANA_GUN); setMaxDamage(COOLDOWN); setMaxStackSize(1); setNoRepair(); - setUnlocalizedName(LibItemNames.MANA_GUN); GameRegistry.addRecipe(new ManaGunLensRecipe()); GameRegistry.addRecipe(new ManaGunRemoveLensRecipe()); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index c984f36ff..f4b101dc8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -46,10 +46,9 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte private static final DummyPool fallbackPool = new DummyPool(); public ItemManaMirror() { - super(); + super(LibItemNames.MANA_MIRROR); setMaxStackSize(1); setMaxDamage(1000); - setUnlocalizedName(LibItemNames.MANA_MIRROR); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index a9aa9b347..be2f91a37 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -35,10 +35,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP private static final String TAG_ONE_USE = "oneUse"; public ItemManaTablet() { - super(); + super(LibItemNames.MANA_TABLET); setMaxStackSize(1); setMaxDamage(1000); - setUnlocalizedName(LibItemNames.MANA_TABLET); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 0617b8b95..6d93f2150 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -12,21 +12,23 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; -public class ItemMod extends Item { +public abstract class ItemMod extends Item { - public ItemMod() { - super(); + public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + if(shouldRegister()) + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + protected boolean shouldRegister() { + return true; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index e607e4120..5962bdd18 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -31,8 +31,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { + super(LibItemNames.OBEDIENCE_STICK); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.OBEDIENCE_STICK); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index eac6546e7..ea78c18c7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -25,8 +25,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { + super(LibItemNames.OPEN_BUCKET); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.OPEN_BUCKET); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 001944730..5178d647f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { - setUnlocalizedName(LibItemNames.OVERGROWTH_SEED); + super(LibItemNames.OVERGROWTH_SEED); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index c125c2f0b..94e1c922e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemPhantomInk extends ItemMod { public ItemPhantomInk() { - setUnlocalizedName(LibItemNames.PHANTOM_INK); + super(LibItemNames.PHANTOM_INK); GameRegistry.addRecipe(new PhantomInkRecipe()); RecipeSorter.register("botania:phantomInk", PhantomInkRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index ecfdb936c..bb1d66beb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemPinkinator extends ItemMod { public ItemPinkinator() { - setUnlocalizedName(LibItemNames.PINKINATOR); + super(LibItemNames.PINKINATOR); setMaxStackSize(1); setFull3D(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 2b4f78f9b..584c901cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Optional; public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { public ItemPoolMinecart() { + super(LibItemNames.POOL_MINECART); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.POOL_MINECART); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index a0a84b808..6ec98a4a4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -31,7 +31,7 @@ public class ItemRegenIvy extends ItemMod { private static final int MANA_PER_DAMAGE = 200; public ItemRegenIvy() { - setUnlocalizedName(LibItemNames.REGEN_IVY); + super(LibItemNames.REGEN_IVY); GameRegistry.addRecipe(new RegenIvyRecipe()); RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index b03407acb..b915d78d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -48,7 +48,7 @@ public class ItemSextant extends ItemMod { private static final String TAG_SOURCE_Z = "sourceZ"; public ItemSextant() { - setUnlocalizedName(LibItemNames.SEXTANT); + super(LibItemNames.SEXTANT); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 5654a168d..efae288ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -42,11 +42,10 @@ public class ItemSignalFlare extends ItemMod implements IColorable { private static final String TAG_COLOR = "color"; public ItemSignalFlare() { - super(); + super(LibItemNames.SIGNAL_FLARE); setMaxStackSize(1); setNoRepair(); setMaxDamage(200); - setUnlocalizedName(LibItemNames.SIGNAL_FLARE); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 87b9fa0ad..701a30e08 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -20,7 +20,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSlimeBottle extends ItemMod { public ItemSlimeBottle() { - setUnlocalizedName(LibItemNames.SLIME_BOTTLE); + super(LibItemNames.SLIME_BOTTLE); setMaxStackSize(1); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 5046e62f1..de172706e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -29,8 +29,8 @@ public class ItemSlingshot extends ItemMod { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; public ItemSlingshot() { + super(LibItemNames.SLINGSHOT); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.SLINGSHOT); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 133238d5b..51f8f2138 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { public ItemSpark() { - setUnlocalizedName(LibItemNames.SPARK); + super(LibItemNames.SPARK); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 95169e6f2..4dca48283 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -22,7 +22,7 @@ public class ItemSparkUpgrade extends ItemMod { public static final int VARIANTS = 4; public ItemSparkUpgrade() { - setUnlocalizedName(LibItemNames.SPARK_UPGRADE); + super(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 060baab70..1c5d2b768 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -41,7 +41,7 @@ public class ItemSpawnerMover extends ItemMod { private static final String TAG_PLACE_DELAY = "placeDelay"; public ItemSpawnerMover() { - setUnlocalizedName(LibItemNames.SPAWNER_MOVER); + super(LibItemNames.SPAWNER_MOVER); setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 1e6a2ef68..d6ccf77bc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -24,10 +24,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSpellCloth extends ItemMod implements IColorable { public ItemSpellCloth() { + super(LibItemNames.SPELL_CLOTH); setMaxDamage(35); setMaxStackSize(1); setNoRepair(); - setUnlocalizedName(LibItemNames.SPELL_CLOTH); GameRegistry.addRecipe(new SpellClothRecipe()); RecipeSorter.register("botania:spellCloth", SpellClothRecipe.class, Category.SHAPELESS, ""); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 7a5843db9..adf4b3f00 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTemperanceStone extends ItemMod { public ItemTemperanceStone() { - setUnlocalizedName(LibItemNames.TEMPERANCE_STONE); + super(LibItemNames.TEMPERANCE_STONE); setMaxStackSize(1); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 8956e606b..ec15d7238 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ItemThornChakram() { - setUnlocalizedName(LibItemNames.THORN_CHAKRAM); + super(LibItemNames.THORN_CHAKRAM); setMaxStackSize(6); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 5fcfb96db..f295efd5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemVineBall extends ItemMod { public ItemVineBall() { - setUnlocalizedName(LibItemNames.VINE_BALL); + super(LibItemNames.VINE_BALL); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 38f1b7678..45ff70d9e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -41,7 +41,7 @@ public class ItemVirus extends ItemMod { private static final int SUBTYPES = 2; public ItemVirus() { - setUnlocalizedName(LibItemNames.VIRUS); + super(LibItemNames.VIRUS); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index a7ac12b04..6c3cae147 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -22,8 +22,8 @@ public class ItemWaterBowl extends ItemMod implements IFluidContainerItem { private static final FluidStack STACK = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); public ItemWaterBowl() { + super(LibItemNames.WATER_BOWL); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.WATER_BOWL); } // Needed for rendering water dynamic model diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index a07252519..fef032232 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -26,7 +26,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { - setUnlocalizedName(LibItemNames.WORLD_SEED); + super(LibItemNames.WORLD_SEED); } @Override @@ -38,7 +38,7 @@ public class ItemWorldSeed extends ItemMod { player.rotationYaw = 0F; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCubes(player, player.getEntityBoundingBox()).isEmpty()) + 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); 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 f0f18a0c7..8d37749ee 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -47,13 +47,14 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; - String name; - String texName; - int swigs; - int drinkSpeed; - ItemStack baseItem; + private String name; + private String texName; + private int swigs; + private int drinkSpeed; + private ItemStack baseItem; public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { + super(name); this.name = name; this.texName = texName; this.swigs = swigs; @@ -61,7 +62,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup this.baseItem = baseItem; setMaxStackSize(1); setMaxDamage(swigs); - setUnlocalizedName(name); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 2e0b95b3f..c3bd5b015 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -38,7 +38,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain public static final int TIME_MULTIPLIER = 60; public ItemIncenseStick() { - setUnlocalizedName(LibItemNames.INCENSE_STICK); + super(LibItemNames.INCENSE_STICK); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index e257763e7..e20cf889c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -28,8 +28,8 @@ public class ItemVial extends ItemMod implements IBrewContainer { } public ItemVial(String name) { + super(name); setHasSubtypes(true); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 2961c8a28..a615a193b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -44,6 +45,7 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibMisc; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { @@ -63,15 +65,10 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan super(mat, 0, type); this.type = type; setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 69f1ad390..41612d15a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -50,9 +50,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt private static final String TAG_PHANTOM_INK = "phantomInk"; public ItemBauble(String name) { - super(); + super(name); setMaxStackSize(1); - setUnlocalizedName(name); } @Override 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 96034757a..3d3942ec7 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 @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; @@ -56,6 +57,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { public ItemLivingwoodBow(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { @@ -74,12 +76,6 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { }); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); 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 87911b83f..c83aa3051 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 @@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -40,6 +41,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { @@ -55,6 +57,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta super(mat, ImmutableSet.of()); // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } @@ -63,12 +66,6 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta return ImmutableSet.of("axe"); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); 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 5d7392fa3..f7a3fc7a9 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 @@ -23,6 +23,7 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -37,6 +38,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { @@ -51,15 +53,10 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS public ItemManasteelPick(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); 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 e11d6acc7..f3f63c38d 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 @@ -26,6 +26,7 @@ import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -38,6 +39,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { @@ -50,15 +52,10 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { public ItemManasteelShears(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); 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 343f247a6..3b4e73db2 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 @@ -21,6 +21,7 @@ import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -38,6 +39,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { @@ -50,15 +52,10 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS public ItemManasteelShovel(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 71e9add70..44091405a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { @@ -43,6 +44,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { public ItemManasteelSword(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { @Override @@ -52,12 +54,6 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { }); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index fb8ab01cd..151db0c80 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -34,7 +34,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools private static final String TAG_MANA = "mana"; public ItemManaInkwell() { - setUnlocalizedName(LibItemNames.MANA_INKWELL); + super(LibItemNames.MANA_INKWELL); setMaxDamage(USES); setMaxStackSize(1); setNoRepair(); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index c615afc9d..d8f3396f5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -134,8 +134,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens private static final String TAG_COMPOSITE_LENS = "compositeLens"; public ItemLens() { - super(); - setUnlocalizedName(LibItemNames.LENS); + super(LibItemNames.LENS); setMaxStackSize(1); setHasSubtypes(true); 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 9f9066cb6..193523236 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -54,8 +54,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 24; public ItemManaResource() { - super(); - setUnlocalizedName(LibItemNames.MANA_RESOURCE); + super(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 125964056..a5d7c844b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -16,10 +16,9 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemPestleAndMortar extends ItemMod { public ItemPestleAndMortar() { - super(); + super(LibItemNames.PESTLE_AND_MORTAR); setMaxStackSize(1); setContainerItem(this); - setUnlocalizedName(LibItemNames.PESTLE_AND_MORTAR); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 2bbab22f0..8bcf87739 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -25,7 +25,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; public ItemQuartz() { - setUnlocalizedName(LibItemNames.QUARTZ); + super(LibItemNames.QUARTZ); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index d7c658ff6..3810f9bf8 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -29,9 +29,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { public ItemRune() { - super(); + super(LibItemNames.RUNE); setHasSubtypes(true); - setUnlocalizedName(LibItemNames.RUNE); } @Override diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 65f84b9a7..ca9be465e 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -19,6 +19,7 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemModRecord extends ItemRecord { @@ -27,16 +28,11 @@ public class ItemModRecord extends ItemRecord { public ItemModRecord(String record, SoundEvent sound, String name) { super("botania:" + record, sound); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); file = "botania:music." + record; } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 94998a50a..2798ede3d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -45,7 +45,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { - Multimap attributes = HashMultimap.create(); + private final Multimap attributes = HashMultimap.create(); public ItemAesirRing() { super(LibItemNames.AESIR_RING); @@ -121,7 +121,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe } - void fillModifiers(Multimap attributes, ItemStack stack) { + private void fillModifiers(Multimap attributes, ItemStack stack) { attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } 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 1f7864f7f..d1b74727e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -74,12 +74,12 @@ public class ItemDice extends ItemRelic { 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).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); stack.stackSize--; return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 07ae78c30..5e915bcd3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -88,7 +88,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { weapon.rotationYaw = living.rotationYaw; weapon.setVariety(rand.nextInt(WEAPON_TYPES)); weapon.setDelay(spawned); - weapon.setRotation(MathHelper.wrapAngleTo180_float(-living.rotationYaw + 180)); + weapon.setRotation(MathHelper.wrapDegrees(-living.rotationYaw + 180)); living.worldObj.spawnEntityInWorld(weapon); weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.worldObj.rand.nextFloat() * 3F); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 30e075bae..48cbaeb33 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -35,9 +35,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { - public static List damageNegations = new ArrayList<>(); + private static List damageNegations = new ArrayList<>(); - Multimap attributes = HashMultimap.create(); + private Multimap attributes = HashMultimap.create(); public ItemOdinRing() { super(LibItemNames.ODIN_RING); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 2d503d439..45d9d8aab 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -38,7 +38,7 @@ public class ItemRelic extends ItemMod implements IRelic { Achievement achievement; public ItemRelic(String name) { - setUnlocalizedName(name); + super(name); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index e3b13ca4b..837a1f3b6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -28,8 +28,11 @@ import vazkii.botania.common.item.equipment.bauble.ItemBauble; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; - private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff. If we had traits this would mixed in. - @Override public Item setUnlocalizedName(String ignored) { return this; } // Don't register to the game + private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff + @Override + protected boolean shouldRegister() { + return false; + } }; public ItemRelicBauble(String name) { 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 6f1e29ddd..7fe9cf87e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -30,8 +30,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv static final int COST = 150; public ItemCobbleRod() { + super(LibItemNames.COBBLE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.COBBLE_ROD); } @Override 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 3e2e835aa..8eef228fb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -41,9 +41,8 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev } public ItemDirtRod(String name) { - super(); + super(name); setMaxStackSize(1); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 29cb4bdc8..a5535ba44 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -43,8 +43,8 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW static final int COST = 3000; public ItemDiviningRod() { + super(LibItemNames.DIVINING_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.DIVINING_ROD); } @Override 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 89dd8f644..dfb95d677 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -66,8 +66,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra private static final String TAG_EXTRA_RANGE = "extraRange"; public ItemExchangeRod() { + super(LibItemNames.EXCHANGE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.EXCHANGE_ROD); MinecraftForge.EVENT_BUS.register(this); } 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 68e4abb0b..3f67f2712 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -40,7 +40,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield private static final int COOLDOWN = 1200; public ItemFireRod() { - setUnlocalizedName(LibItemNames.FIRE_ROD); + super(LibItemNames.FIRE_ROD); setMaxStackSize(1); setMaxDamage(COOLDOWN); } 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 654daccec..0cc783720 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -51,8 +51,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { private static final String TAG_DIST = "dist"; public ItemGravityRod() { + super(LibItemNames.GRAVITY_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.GRAVITY_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 1935b39bf..daf71277c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -40,9 +40,8 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final int COST_AVATAR = 40; public ItemMissileRod() { - super(); + super(LibItemNames.MISSILE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.MISSILE_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index fa502806e..3109a87a5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -47,8 +47,8 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final int TIME = 600; public ItemRainbowRod() { + super(LibItemNames.RAINBOW_ROD); setMaxDamage(TIME); - setUnlocalizedName(LibItemNames.RAINBOW_ROD); setMaxStackSize(1); } 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 6281f6ec6..b5450412c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -45,7 +45,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { public static Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { - setUnlocalizedName(LibItemNames.SMELT_ROD); + super(LibItemNames.SMELT_ROD); setMaxStackSize(1); } 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 52db2797d..0d7838c94 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -77,9 +77,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP ); public ItemTerraformRod() { - super(); + super(LibItemNames.TERRAFORM_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.TERRAFORM_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 05cee2fca..d9d3b9d90 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -52,8 +52,8 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final String TAG_FLYING = "flying"; public ItemTornadoRod() { + super(LibItemNames.TORNADO_ROD); setMaxDamage(MAX_DAMAGE); - setUnlocalizedName(LibItemNames.TORNADO_ROD); setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { @Override 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 9c8713ebf..15bc3c3d3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -21,9 +21,8 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; public ItemWaterRod() { - super(); + super(LibItemNames.WATER_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.WATER_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 436071738..afa78b145 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -67,7 +67,7 @@ public class PageTutorial extends PageText { if(button == buttonText) { GuiLexicon.startTutorial(); Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon()); - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new Style().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN))); } else if(button == buttonVideo && Desktop.isDesktopSupported()) { try { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); From 62b39ee682027744b057e3583aeebe9788873fc5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 19:00:20 -0500 Subject: [PATCH 478/935] Fix crash serverside. Closes #197 --- src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java | 3 +++ src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java index 00a0fc499..7db5de0e9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.lexicon; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.PersistentVariableHelper; @@ -20,6 +22,7 @@ public class DLexiconEntry extends BLexiconEntry { } @Override + @SideOnly(Side.CLIENT) public boolean isVisible() { return !PersistentVariableHelper.dog; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index c3de72cad..007515fb8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -42,6 +42,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { } @Override + @SideOnly(Side.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { int width = gui.getWidth() - 30; int height = gui.getHeight(); From 1d901ec9aca1564e9c5a48fa999a7b66e58d5b11 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 19:39:05 -0500 Subject: [PATCH 479/935] Fix panes. Closes #204 --- .../botania/blockstates/bifrostPermPane.json | 33 ++++++++++--------- .../botania/blockstates/elfGlassPane.json | 32 +++++++++--------- .../botania/blockstates/manaGlassPane.json | 32 +++++++++--------- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json index 5d35ff02d..3d16698ae 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -1,28 +1,29 @@ { "forge_marker": 1, "defaults": { + "model": "minecraft:pane_post", "textures": { "edge": "botania:blocks/bifrostPermPane", "pane": "botania:blocks/bifrost" } }, "variants": { - "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, - "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, - "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, - "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, - "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, - "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, - "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, - "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, - "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, - "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, - "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, - "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, - "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, - "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, - "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "north": { + "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, + "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } + }, + "south": { + "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, + "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } + }, + "west": { + "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, + "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } + }, + "east": { + "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, + "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } + }, "inventory": [{ "transform": "forge:default-item", "model": "builtin/generated", diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index 8ef285391..1e8bc3c69 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -7,22 +7,22 @@ } }, "variants": { - "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, - "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, - "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, - "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, - "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, - "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, - "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, - "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, - "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, - "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, - "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, - "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, - "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, - "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, - "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "north": { + "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, + "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } + }, + "south": { + "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, + "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } + }, + "west": { + "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, + "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } + }, + "east": { + "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, + "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } + }, "inventory": [{ "transform": "forge:default-item", "model": "builtin/generated", diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index 8a3af453d..9ad4ae68f 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -7,22 +7,22 @@ } }, "variants": { - "east=false,north=false,south=false,west=false": { "model": "minecraft:pane_nsew" }, - "east=false,north=true,south=false,west=false": { "model": "minecraft:pane_n" }, - "east=true,north=false,south=false,west=false": { "model": "minecraft:pane_n", "y": 90 }, - "east=false,north=false,south=true,west=false": { "model": "minecraft:pane_n", "y": 180 }, - "east=false,north=false,south=false,west=true": { "model": "minecraft:pane_n", "y": 270 }, - "east=true,north=true,south=false,west=false": { "model": "minecraft:pane_ne" }, - "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, - "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, - "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, - "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, - "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, - "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, - "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, - "east=true,north=true,south=false,west=true": { "model": "minecraft:pane_nse", "y": 270 }, - "east=true,north=true,south=true,west=true": { "model": "minecraft:pane_nsew" }, + "north": { + "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, + "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } + }, + "south": { + "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, + "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } + }, + "west": { + "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, + "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } + }, + "east": { + "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, + "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } + }, "inventory": [{ "transform": "forge:default-item", "model": "builtin/generated", From 97495a913d487893beea23649e6fc9d40858d6a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 19:59:58 -0500 Subject: [PATCH 480/935] Cleanup walls --- .../botania/blockstates/biomeStoneA0Wall.json | 45 ++++++------------ .../botania/blockstates/dreamwood0Wall.json | 16 +++---- .../botania/blockstates/livingrock0Wall.json | 16 +++---- .../botania/blockstates/livingwood0Wall.json | 16 +++---- .../botania/blockstates/prismarine0Wall.json | 16 +++---- .../botania/blockstates/reedBlock0Wall.json | 16 +++---- .../botania/blockstates/stone0Wall.json | 29 ++++-------- .../botania/models/block/wall_connect.json | 19 -------- .../models/block/wall_connect_bottom_top.json | 20 -------- .../block/wall_inventory_bottom_top.json | 46 +++++++++++++++++++ .../models/block/wall_post_bottom_top.json | 19 ++++---- .../models/block/wall_side_bottom_top.json | 19 ++++++++ 12 files changed, 127 insertions(+), 150 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/wall_connect.json delete mode 100644 src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json create mode 100644 src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json create mode 100644 src/main/resources/assets/botania/models/block/wall_side_bottom_top.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json index 9250e596c..87e51eb6d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -1,47 +1,28 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,bswall_variant=forest_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=plains_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=mountain_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=fungal_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=swamp_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=desert_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=taiga_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=mesa_cobble,west=false": { "model": null }, - - "east=true,north=false,south=false,up=false,bswall_variant=forest_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=plains_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=mountain_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=fungal_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=swamp_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=desert_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=taiga_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=mesa_cobble,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "bswall_variant": { @@ -56,35 +37,35 @@ }, "inventory_forest_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone8" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_plains_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone9" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_mountain_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone10" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_fungal_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone11" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_swamp_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone12" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_desert_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone13" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_taiga_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone14" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_mesa_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone15" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json index 31863d217..d5c3c9bad 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/dreamwood0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json index 6da2b10a5..c4cf2c3e0 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/livingrock0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json index a7dc154f6..c6f6b57b1 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/livingwood0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json index 05ddceaee..544b635d1 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/prismarine0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json index c6c6dfa19..11f39c16a 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "botania:wall_post_bottom_top", "uvlock": true, "transform": "forge:default-block", "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect_bottom_top" }, + "true": { "submodel": "botania:wall_side_bottom_top" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 180 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 270 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 90 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "botania:wall_post_bottom_top" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect_bottom_top" }, "south": { "model": "botania:wall_connect_bottom_top", "y": 180 }} + "model": "botania:wall_inventory_bottom_top" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json index 19456ecf3..29e8e8174 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -1,39 +1,28 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,fswall_variant=andesite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=basalt,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=diorite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=granite,west=false": { "model": null }, - - "east=true,north=false,south=false,up=false,fswall_variant=andesite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=basalt,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=diorite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=granite,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "fswall_variant": { @@ -44,19 +33,19 @@ }, "inventory_andesite": [{ "textures": { "wall": "botania:blocks/stone0" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_basalt": [{ "textures": { "wall": "botania:blocks/stone1" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_diorite": [{ "textures": { "wall": "botania:blocks/stone2" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_granite": [{ "textures": { "wall": "botania:blocks/stone3" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect.json b/src/main/resources/assets/botania/models/block/wall_connect.json deleted file mode 100644 index 281d9a7b5..000000000 --- a/src/main/resources/assets/botania/models/block/wall_connect.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "__comment": "Stolen from the Forge example/debug code", - "textures": { - "particle": "#wall" - }, - "elements": [ - { "from": [ 5, 0, 0 ], - "to": [ 11, 13, 8 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall" }, - "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#wall", "cullface": "north" }, - "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" }, - "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" } - }, - "__comment": "North wall" - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json deleted file mode 100644 index 3252c7e70..000000000 --- a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "__comment": "Stolen from the Forge example/debug code", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 5, 0, 0 ], - "to": [ 11, 13, 8 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#top" }, - "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, - "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" }, - "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" } - }, - "__comment": "North wall" - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json new file mode 100644 index 000000000..f22935748 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json @@ -0,0 +1,46 @@ +{ + "__comment": "Copy of minecraft:wall_inventory with separate bottom and top textures", + "parent": "block/block", + "display": { + "gui": { + "rotation": [ 30, 135, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "fixed": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + }, + "ambientocclusion": false, + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + } + }, + { + "from": [ 5, 0, 0 ], + "to": [ 11, 13, 16 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 16 ], "texture": "#top" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json index c060e1ff3..c90838654 100644 --- a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json +++ b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json @@ -1,19 +1,20 @@ { + "__comment": "Copy of minecraft:wall_post with separate top and bottom textures", "textures": { "particle": "#side" }, "elements": [ - { "from": [ 4, 0, 4 ], + { + "from": [ 4, 0, 4 ], "to": [ 12, 16, 12 ], "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } - }, - "__comment": "Center post" + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#top", "cullface": "up" }, + "north": { "texture": "#side" }, + "south": { "texture": "#side" }, + "west": { "texture": "#side" }, + "east": { "texture": "#side" } + } } ] } diff --git a/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json new file mode 100644 index 000000000..80594c7c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json @@ -0,0 +1,19 @@ +{ + "__comment": "Copy of minecraft:wall_side with separate top and bottom textures", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 14, 8 ], + "faces": { + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#top" }, + "north": { "texture": "#side", "cullface": "north" }, + "west": { "texture": "#side" }, + "east": { "texture": "#side" } + } + } + ] +} From 43395f94413bbdeb68534635cedb51d21d26eeb6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 20:08:58 -0500 Subject: [PATCH 481/935] Fix walls appearing in vanilla creative tab. Closes #190 --- .../botania/common/block/decor/walls/BlockModWall.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index e23061e06..1781e4267 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -26,6 +26,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -33,11 +34,8 @@ import vazkii.botania.common.lib.LibMisc; public abstract class BlockModWall extends BlockWall implements ILexiconable { - private final Block block; - public BlockModWall(Block block, int meta) { super(block); - this.block = block; // For backward compat don't kill me String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; register(name); @@ -50,6 +48,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { .withProperty(EAST, false) .withProperty(VARIANT, EnumType.NORMAL) ); + setCreativeTab(BotaniaCreativeTab.INSTANCE); } @Override From af19c7cecea8424b5221c5eae644160fd94e8b74 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 20:23:05 -0500 Subject: [PATCH 482/935] Update kekimurus for extra slice of cake in 1.8 --- .../common/block/subtile/generating/SubTileKekimurus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6014fd2d6..856eba1a9 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 @@ -40,7 +40,7 @@ public class SubTileKekimurus extends SubTileGenerating { Block block = state.getBlock(); if(block instanceof BlockCake) { int nextSlicesEaten = state.getValue(BlockCake.BITES) + 1; - if(nextSlicesEaten == 6) + if(nextSlicesEaten == 7) supertile.getWorld().setBlockToAir(pos); else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); From 7536ebe4c6b755212cbcfe925ea15548de1cc275 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Sun, 3 Apr 2016 21:38:42 -0400 Subject: [PATCH 483/935] Fix erratic colorization of bursts and flashes closes #198 --- .../botania/common/block/tile/TileManaFlame.java | 14 +++++++++++--- .../botania/common/entity/EntityManaBurst.java | 12 ++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 63a3c625b..925039c88 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -37,9 +37,17 @@ public class TileManaFlame extends TileMod { if(worldObj.isRemote && Math.random() < c) { float v = 0.1F; - float r = (float) (color >> 16 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; - float g = (float) (color >> 8 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; - float b = (float) (color & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; + float r = (float) (color >> 16 & 0xFF) / 0xFF; + float g = (float) (color >> 8 & 0xFF) / 0xFF; + float b = (float) (color & 0xFF) / 0xFF; + + double luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b; // Standard relative luminance calculation + + if (luminance < v) { + r += (float) (Math.random() - 0.5) * 0.25; + g += (float) (Math.random() - 0.5) * 0.25; + b += (float) (Math.random() - 0.5) * 0.25; + } float w = 0.15F; float h = 0.05F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index b490268ce..7d71b2701 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -545,6 +545,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float og = g; float ob = b; + double luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b; // Standard relative luminance calculation + double savedPosX = posX; double savedPosY = posY; double savedPosZ = posZ; @@ -557,9 +559,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { double distance = 0.095; do { - r = or + ((float) Math.random() - 0.5F) * 0.25F; - g = og + ((float) Math.random() - 0.5F) * 0.25F; - b = ob + ((float) Math.random() - 0.5F) * 0.25F; + if (luminance < 0.1) { + r = or + ((float) Math.random() - 0.5F) * 0.25F; + g = og + ((float) Math.random() - 0.5F) * 0.25F; + b = ob + ((float) Math.random() - 0.5F) * 0.25F; + } size = osize + ((float) Math.random() - 0.5F) * 0.065F + (float) Math.sin(new Random(entityUniqueID.getMostSignificantBits()).nextInt(9001)) * 0.4F; Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F); @@ -573,7 +577,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { break; } while(Math.abs(diffVec.mag()) > distance); - Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.1F * size, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); + Botania.proxy.wispFX(worldObj, posX, posY, posZ, or, og, ob, 0.1F * size, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); posX = savedPosX; posY = savedPosY; From 63a5bdee1c3475faa969a1e925bbe8d90e73af5c Mon Sep 17 00:00:00 2001 From: yrsegal Date: Sun, 3 Apr 2016 21:51:42 -0400 Subject: [PATCH 484/935] Fix invalid color combination --- .../vazkii/botania/common/block/tile/TileManaFlame.java | 6 +++--- .../java/vazkii/botania/common/entity/EntityManaBurst.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 925039c88..4834ca383 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -44,9 +44,9 @@ public class TileManaFlame extends TileMod { double luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b; // Standard relative luminance calculation if (luminance < v) { - r += (float) (Math.random() - 0.5) * 0.25; - g += (float) (Math.random() - 0.5) * 0.25; - b += (float) (Math.random() - 0.5) * 0.25; + r += (float) Math.random() * 0.125F; + g += (float) Math.random() * 0.125F; + b += (float) Math.random() * 0.125F; } float w = 0.15F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 7d71b2701..6a61173cc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -560,9 +560,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { do { if (luminance < 0.1) { - r = or + ((float) Math.random() - 0.5F) * 0.25F; - g = og + ((float) Math.random() - 0.5F) * 0.25F; - b = ob + ((float) Math.random() - 0.5F) * 0.25F; + r = or + (float) Math.random() * 0.125F; + g = og + (float) Math.random() * 0.125F; + b = ob + (float) Math.random() * 0.125F; } size = osize + ((float) Math.random() - 0.5F) * 0.065F + (float) Math.sin(new Random(entityUniqueID.getMostSignificantBits()).nextInt(9001)) * 0.4F; Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F); From 08550cc442e7b7f67146d02752037ba12b78c4b8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 21:23:04 -0500 Subject: [PATCH 485/935] Cleanup --- .../client/challenge/ModChallenges.java | 7 +- .../client/core/handler/BossBarHandler.java | 6 +- .../core/handler/BoundTileRenderer.java | 21 +-- .../handler/ContributorFancinessHandler.java | 4 +- .../handler/CorporeaAutoCompleteHandler.java | 8 +- .../client/core/handler/LightningHandler.java | 37 ++-- .../core/handler/MultiblockBlockAccess.java | 15 +- .../core/handler/MultiblockRenderHandler.java | 5 +- .../handler/PersistentVariableHelper.java | 11 +- .../core/handler/RedStringRenderer.java | 2 +- .../handler/SubTileRadiusRenderHandler.java | 4 +- .../client/core/helper/FontHelper.java | 10 +- .../client/core/helper/RenderHelper.java | 6 +- .../client/core/helper/ShaderHelper.java | 42 +---- .../client/core/proxy/ClientProxy.java | 6 - .../vazkii/botania/client/fx/FXSparkle.java | 22 +-- .../java/vazkii/botania/client/fx/FXWisp.java | 25 ++- .../integration/nei/NEIBotaniaConfig.java | 64 ------- .../client/integration/nei/NEIGuiHooks.java | 26 --- .../integration/nei/NEIInputHandler.java | 105 ----------- .../nei/recipe/RecipeHandlerBrewery.java | 142 -------------- .../nei/recipe/RecipeHandlerElvenTrade.java | 172 ----------------- .../recipe/RecipeHandlerFloatingFlowers.java | 83 --------- .../recipe/RecipeHandlerLexicaBotania.java | 173 ------------------ .../nei/recipe/RecipeHandlerManaPool.java | 159 ---------------- .../recipe/RecipeHandlerPetalApothecary.java | 145 --------------- .../nei/recipe/RecipeHandlerPureDaisy.java | 140 -------------- .../nei/recipe/RecipeHandlerRunicAltar.java | 59 ------ .../common/block/tile/TileManaFlame.java | 5 +- .../core/handler/InternalMethodHandler.java | 3 +- .../common/core/proxy/CommonProxy.java | 6 - 31 files changed, 88 insertions(+), 1425 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java delete mode 100644 src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 955727633..cdade0e93 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,8 +26,8 @@ import vazkii.botania.common.lib.LibBlockNames; public final class ModChallenges { - public static final EnumMap> challenges = new EnumMap<>(EnumChallengeLevel.class); - public static final HashMap challengeLookup = new HashMap<>(); + public static final Map> challenges = new EnumMap<>(EnumChallengeLevel.class); + public static final Map challengeLookup = new HashMap<>(); public static void init() { for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) @@ -56,7 +57,7 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.rune)); } - public static void addChallenge(EnumChallengeLevel level, String name, ItemStack icon) { + private static void addChallenge(EnumChallengeLevel level, String name, ItemStack icon) { Challenge c = new Challenge("botania.challenge." + name, icon, level); challenges.get(level).add(c); challengeLookup.put(c.unlocalizedName, c); diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 1f8ce4b2c..31f9dd46c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -33,7 +33,7 @@ import vazkii.botania.common.core.helper.MathHelper; public final class BossBarHandler { public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); - static IBotaniaBoss currentBoss; + private static IBotaniaBoss currentBoss; private static final BarCallback barUniformCallback = new BarCallback(); @@ -73,7 +73,7 @@ public final class BossBarHandler { currentBoss = null; } - public static void drawBar(int x, int y, int u, int v, int w, int h, boolean bg) { + private static void drawBar(int x, int y, int u, int v, int w, int h, boolean bg) { boolean useShader = currentBoss instanceof IBotaniaBossWithShader; if(useShader) { IBotaniaBossWithShader shader = (IBotaniaBossWithShader) currentBoss; @@ -90,7 +90,7 @@ public final class BossBarHandler { ShaderHelper.releaseShader(); } - static class BarCallback implements ShaderCallback { + private static class BarCallback implements ShaderCallback { int x, y; ShaderCallback callback; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index a12d5af0b..26d0481be 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -22,11 +22,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.wrapper.CombinedInvWrapper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -61,18 +66,12 @@ public final class BoundTileRenderer { renderBlockOutlineAt(coords, color); } - IInventory mainInv = player.inventory; - IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); + IItemHandlerModifiable mainInv = ((IItemHandlerModifiable) player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP)); + IItemHandlerModifiable baublesInv = BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player); + IItemHandler joined = baublesInv != null ? new CombinedInvWrapper(mainInv, baublesInv) : mainInv; - int invSize = mainInv.getSizeInventory(); - int size = invSize; - if(baublesInv != null) - size += baublesInv.getSizeInventory(); - - for(int i = 0; i < size; i++) { - boolean useBaubles = i >= invSize; - IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + for(int i = 0; i < joined.getSlots(); i++) { + ItemStack stackInSlot = joined.getStackInSlot(i); if(stackInSlot != null && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); 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 b3f163c1f..f3d41fd58 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -42,7 +42,7 @@ public final class ContributorFancinessHandler implements LayerRenderer flowerMap = null; private volatile static boolean startedLoading = false; - private static boolean phi = true; + private static final boolean phi = true; @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) { @@ -185,7 +185,7 @@ public final class ContributorFancinessHandler implements LayerRenderer completions = new ArrayList<>(); - int position; + private boolean isAutoCompleted = false; + private String originalString = ""; + private List completions = new ArrayList<>(); + private int position; static TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 9294efe3e..5cdc4ca7b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -49,10 +49,6 @@ public class LightningHandler { private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); - static double interpPosX; - static double interpPosY; - static double interpPosZ; - private static Vector3 getRelativeViewVector(Vector3 pos) { Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); @@ -72,9 +68,9 @@ public class LightningHandler { Entity entity = Minecraft.getMinecraft().thePlayer; TextureManager render = Minecraft.getMinecraft().renderEngine; - interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame; - interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame; - interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame; + double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame; + double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame; + double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame; GlStateManager.pushMatrix(); GlStateManager.translate(-interpPosX, -interpPosY, -interpPosZ); @@ -222,23 +218,14 @@ public class LightningHandler { Vector3 offsetvec; } - public class SegmentSorter implements Comparator { + private static final Comparator SEGMENT_SORTER = (o1, o2) -> { + int comp = Integer.valueOf(o1.splitno).compareTo(o2.splitno); + if(comp == 0) + return Integer.valueOf(o1.segmentno).compareTo(o2.segmentno); + else return comp; + }; - @Override - public int compare(Segment o1, Segment o2) { - int comp = Integer.valueOf(o1.splitno).compareTo(o2.splitno); - if(comp == 0) - return Integer.valueOf(o1.segmentno).compareTo(o2.segmentno); - else return comp; - } - } - - public class SegmentLightSorter implements Comparator { - @Override - public int compare(Segment o1, Segment o2) { - return Float.compare(o2.light, o1.light); - } - } + private static final Comparator SEGMENT_LIGHT_SORTER = (o1, o2) -> Float.compare(o2.light, o1.light); public class Segment { public Segment(BoltPoint start, BoltPoint end, float light, int segmentnumber, int splitnumber) { @@ -433,7 +420,7 @@ public class LightningHandler { private void calculateCollisionAndDiffs() { HashMap lastactivesegment = new HashMap<>(); - Collections.sort(segments, new SegmentSorter()); + Collections.sort(segments, SEGMENT_SORTER); int lastsplitcalc = 0; int lastactiveseg = 0;// unterminated @@ -477,7 +464,7 @@ public class LightningHandler { calculateCollisionAndDiffs(); - Collections.sort(segments, new SegmentLightSorter()); + Collections.sort(segments, SEGMENT_LIGHT_SORTER); boltlist.add(this); } 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 b2793e6b3..2a4f1ad2f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -27,10 +27,10 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; */ public class MultiblockBlockAccess implements IBlockAccess { - protected IBlockAccess originalBlockAccess; - protected boolean hasBlockAccess = false; + private IBlockAccess originalBlockAccess; + private boolean hasBlockAccess = false; + private BlockPos anchorPos; protected Multiblock multiblock; - protected BlockPos anchorPos; @Override public IBlockState getBlockState(BlockPos pos) { @@ -88,9 +88,7 @@ public class MultiblockBlockAccess implements IBlockAccess { @Override public boolean extendedLevelsInChunkCache() { - if(hasBlockAccess) - return originalBlockAccess.extendedLevelsInChunkCache(); - return false; + return hasBlockAccess && originalBlockAccess.extendedLevelsInChunkCache(); } @Override @@ -113,8 +111,7 @@ public class MultiblockBlockAccess implements IBlockAccess { /** * Returns the multiblock component for the coordinates, adjusted based on the anchor */ - protected MultiblockComponent getComponent(BlockPos pos) { - MultiblockComponent comp = multiblock.getComponentForLocation(pos.add(new BlockPos(-anchorPos.getX(), -anchorPos.getY(), -anchorPos.getZ()))); - return comp; + private MultiblockComponent getComponent(BlockPos pos) { + return multiblock.getComponentForLocation(pos.add(new BlockPos(-anchorPos.getX(), -anchorPos.getY(), -anchorPos.getZ()))); } } 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 d15a9f959..191383988 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -41,14 +41,13 @@ import vazkii.botania.common.block.ModBlocks; public final class MultiblockRenderHandler { - public static boolean rendering = false; - private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); + private static int dimension; + public static boolean rendering = false; public static MultiblockSet currentMultiblock; public static BlockPos anchor; public static EnumFacing angle; - public static int dimension; static { // todo 1.8.8 temporary shim, because cannot renderBlockBrightness directly, see MinecraftForge issue 2353 diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index a341a024e..a1ba97d21 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -128,24 +128,23 @@ public final class PersistentVariableHelper { cacheFile = f; } - public static File getCacheFile() throws IOException { + private static File getCacheFile() throws IOException { if(!cacheFile.exists()) cacheFile.createNewFile(); return cacheFile; } - public static NBTTagCompound getCacheCompound() throws IOException { + private static NBTTagCompound getCacheCompound() throws IOException { return getCacheCompound(getCacheFile()); } - public static NBTTagCompound getCacheCompound(File cache) throws IOException { + private static NBTTagCompound getCacheCompound(File cache) throws IOException { if(cache == null) throw new RuntimeException("No cache file!"); try { - NBTTagCompound cmp = CompressedStreamTools.readCompressed(new FileInputStream(cache)); - return cmp; + return CompressedStreamTools.readCompressed(new FileInputStream(cache)); } catch(IOException e) { NBTTagCompound cmp = new NBTTagCompound(); CompressedStreamTools.writeCompressed(cmp, new FileOutputStream(cache)); @@ -153,7 +152,7 @@ public final class PersistentVariableHelper { } } - public static void injectNBTToFile(NBTTagCompound cmp, File f) { + private static void injectNBTToFile(NBTTagCompound cmp, File f) { try { CompressedStreamTools.writeCompressed(cmp, new FileOutputStream(f)); } catch(IOException e) { diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 87acf70b4..0173440c7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -32,7 +32,7 @@ import vazkii.botania.common.item.ModItems; public final class RedStringRenderer { public static final Queue redStringTiles = new ArrayDeque<>(); - static float sizeAlpha = 0F; + private static float sizeAlpha = 0F; public static void renderAll() { if(!redStringTiles.isEmpty()) { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 73933b5be..12cfd6677 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -81,7 +81,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - public void renderRectangle(AxisAlignedBB aabb) { + private void renderRectangle(AxisAlignedBB aabb) { double renderPosX, renderPosY, renderPosZ; try { @@ -126,7 +126,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - public void renderCircle(BlockPos center, double radius) { + private void renderCircle(BlockPos center, double radius) { double renderPosX, renderPosY, renderPosZ; try { diff --git a/src/main/java/vazkii/botania/client/core/helper/FontHelper.java b/src/main/java/vazkii/botania/client/core/helper/FontHelper.java index e1f5ed5c0..49ce8994d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/FontHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/FontHelper.java @@ -12,12 +12,12 @@ package vazkii.botania.client.core.helper; public final class FontHelper { - public static boolean isFormatColor(char par0) { - return par0 >= 48 && par0 <= 57 || par0 >= 97 && par0 <= 102 || par0 >= 65 && par0 <= 70; + private static boolean isFormatColor(char par0) { + return par0 >= '0' && par0 <= '9' || par0 >= 'a' && par0 <= 'f' || par0 >= 'A' && par0 <= 'F'; } - public static boolean isFormatSpecial(char par0) { - return par0 >= 107 && par0 <= 111 || par0 >= 75 && par0 <= 79 || par0 == 114 || par0 == 82; + private static boolean isFormatSpecial(char par0) { + return par0 >= 'k' && par0 <= 'o' || par0 >= 'K' && par0 <= 'O' || par0 == 'r' || par0 == 'R'; } public static String getFormatFromString(String par0Str) { @@ -25,7 +25,7 @@ public final class FontHelper { int i = -1; int j = par0Str.length(); - while ((i = par0Str.indexOf(167, i + 1)) != -1) { + while ((i = par0Str.indexOf('w', i + 1)) != -1) { if (i < j - 1) { char c0 = par0Str.charAt(i + 1); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 1f12241ac..47a1724aa 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -132,10 +132,10 @@ public final class RenderHelper { public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) { Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tessellator.getBuffer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex(); + tessellator.getBuffer().pos(par1, par2 + par6, z).tex((par3) * f, (par4 + par6) * f1).endVertex(); tessellator.getBuffer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex(); - tessellator.getBuffer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex(); - tessellator.getBuffer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex(); + tessellator.getBuffer().pos(par1 + par5, par2, z).tex((par3 + par5) * f, (par4) * f1).endVertex(); + tessellator.getBuffer().pos(par1, par2, z).tex((par3) * f, (par4) * f1).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index a1e20449c..fa48b075d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -149,52 +149,14 @@ public final class ShaderHelper { } private static String readFileAsString(String filename) throws Exception { - StringBuilder source = new StringBuilder(); InputStream in = ShaderHelper.class.getResourceAsStream(filename); - Exception exception = null; - BufferedReader reader; if(in == null) return ""; - try { - reader = new BufferedReader(new InputStreamReader(in, "UTF-8")); - - Exception innerExc= null; - try { - String line; - while((line = reader.readLine()) != null) - source.append(line).append('\n'); - } catch(Exception exc) { - exception = exc; - } finally { - try { - reader.close(); - } catch(Exception exc) { - if(innerExc == null) - innerExc = exc; - else exc.printStackTrace(); - } - } - - if(innerExc != null) - throw innerExc; - } catch(Exception exc) { - exception = exc; - } finally { - try { - in.close(); - } catch(Exception exc) { - if(exception == null) - exception = exc; - else exc.printStackTrace(); - } - - if(exception != null) - throw exception; + try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) { + return reader.lines().reduce("", (s1, s2) -> s1 + "\n" + s2); } - - return source.toString(); } } 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 ffd83db19..f71f13654 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -285,12 +285,6 @@ public class ClientProxy extends CommonProxy { render.addLayer(new BaubleRenderHandler()); } - @Override - @Optional.Method(modid = "NotEnoughItems") - public void registerNEIStuff() { - // todo 1.8.8 restore when nei updates NEIGuiHooks.init(); - } - @Override public void setEntryToOpen(LexiconEntry entry) { GuiLexicon.currentOpenLexicon = new GuiLexiconEntry(entry, new GuiLexiconIndex(entry.category)); diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 066af2248..24c18b64c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -36,16 +36,16 @@ public class FXSparkle extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - public static Queue queuedRenders = new ArrayDeque<>(); - public static Queue queuedCorruptRenders = new ArrayDeque<>(); + private static Queue queuedRenders = new ArrayDeque<>(); + private static Queue queuedCorruptRenders = new ArrayDeque<>(); // Queue values - float f; - float f1; - float f2; - float f3; - float f4; - float f5; + private float f; + private float f1; + private float f2; + private float f3; + private float f4; + private float f5; public boolean noClip = false; @@ -167,7 +167,7 @@ public class FXSparkle extends EntityFX { particleGravity = value; } - protected boolean pushOutOfBlocks(double par1, double par3, double par5) { + private boolean pushOutOfBlocks(double par1, double par3, double par5) { int var7 = MathHelper.floor_double(par1); int var8 = MathHelper.floor_double(par3); int var9 = MathHelper.floor_double(par5); @@ -255,8 +255,8 @@ public class FXSparkle extends EntityFX { public boolean corrupt = false; public boolean fake = false; - public int multiplier = 2; - public boolean shrink = true; + private int multiplier = 2; + private boolean shrink = true; public int particle = 16; public boolean tinkle = false; public boolean slowdown = true; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index b91b62055..e5a4ac533 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -34,16 +34,16 @@ public class FXWisp extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); - public static Queue queuedRenders = new ArrayDeque<>(); - public static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); + private static Queue queuedRenders = new ArrayDeque<>(); + private static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); // Queue values - float f; - float f1; - float f2; - float f3; - float f4; - float f5; + private float f; + private float f1; + private float f2; + private float f3; + private float f4; + private float f5; public FXWisp(World world, double d, double d1, double d2, float size, float red, float green, float blue, boolean distanceLimit, boolean depthTest, float maxAgeMul) { super(world, d, d1, d2, 0.0D, 0.0D, 0.0D); @@ -108,8 +108,7 @@ public class FXWisp extends EntityFX { ParticleRenderDispatcher.wispFxCount++; else ParticleRenderDispatcher.depthIgnoringWispFxCount++; - float agescale = 0; - agescale = (float)particleAge / (float) moteHalfLife; + float agescale = (float)particleAge / (float) moteHalfLife; if (agescale > 1F) agescale = 2 - agescale; @@ -168,10 +167,10 @@ public class FXWisp extends EntityFX { zSpeed = mz; } - boolean depthTest = true; + private boolean depthTest = true; public boolean distanceLimit = true; - float moteParticleScale; - int moteHalfLife; + private float moteParticleScale; + private int moteHalfLife; public boolean tinkle = false; public int blendmode = 1; } diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java b/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java deleted file mode 100644 index 2265a28c8..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIBotaniaConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -/* -package vazkii.botania.client.integration.nei; - -import org.lwjgl.input.Keyboard; - -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerBrewery; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerElvenTrade; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerFloatingFlowers; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerLexicaBotania; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerPetalApothecary; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerPureDaisy; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerRunicAltar; -import vazkii.botania.common.lib.LibMisc; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.guihook.GuiContainerManager; - -public class NEIBotaniaConfig implements IConfigureNEI { - - public static final String CORPOREA_KEY = "gui.botania_corporea_request"; - - @Override - public String getName() { - return LibMisc.MOD_NAME; - } - - @Override - public String getVersion() { - return LibMisc.VERSION; - } - - @Override - public void loadConfig() { - API.registerRecipeHandler(new RecipeHandlerFloatingFlowers()); - API.registerUsageHandler(new RecipeHandlerFloatingFlowers()); - - API.registerRecipeHandler(new RecipeHandlerPetalApothecary()); - API.registerUsageHandler(new RecipeHandlerPetalApothecary()); - - API.registerRecipeHandler(new RecipeHandlerRunicAltar()); - API.registerUsageHandler(new RecipeHandlerRunicAltar()); - - API.registerRecipeHandler(new RecipeHandlerManaPool()); - API.registerUsageHandler(new RecipeHandlerManaPool()); - - API.registerRecipeHandler(new RecipeHandlerElvenTrade()); - API.registerUsageHandler(new RecipeHandlerElvenTrade()); - - API.registerRecipeHandler(new RecipeHandlerBrewery()); - API.registerUsageHandler(new RecipeHandlerBrewery()); - - API.registerRecipeHandler(new RecipeHandlerPureDaisy()); - API.registerUsageHandler(new RecipeHandlerPureDaisy()); - - API.registerRecipeHandler(new RecipeHandlerLexicaBotania()); - API.registerUsageHandler(new RecipeHandlerLexicaBotania()); - - API.addKeyBind(CORPOREA_KEY, Keyboard.KEY_C); - GuiContainerManager.addInputHandler(new NEIInputHandler()); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java deleted file mode 100644 index 3d23c8b5f..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Dec 15, 2014, 6:09:38 PM (GMT)] - *//* - -package vazkii.botania.client.integration.nei; - -import vazkii.botania.client.gui.crafting.GuiCraftingHalo; -import codechicken.nei.api.API; -import codechicken.nei.recipe.DefaultOverlayHandler; - -public class NEIGuiHooks { - - public static void init() { - API.registerGuiOverlay(GuiCraftingHalo.class, "crafting"); - API.registerGuiOverlayHandler(GuiCraftingHalo.class, new DefaultOverlayHandler(), "crafting"); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java deleted file mode 100644 index 7fc6be072..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [25/12/2015, 02:22:32 (GMT)] - *//* - -package vazkii.botania.client.integration.nei; - -import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.MathHelper; -import codechicken.nei.LayoutManager; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; - -public class NEIInputHandler implements IContainerInputHandler { - - @Override - public boolean keyTyped(GuiContainer gui, char c, int i) { - Minecraft mc = Minecraft.getMinecraft(); - if(TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty()) - return false; - - int bind = NEIClientConfig.getKeyBinding(NEIBotaniaConfig.CORPOREA_KEY); - - if(i == bind) { - LayoutManager layoutManager = LayoutManager.instance(); - if(layoutManager != null && LayoutManager.itemPanel != null && !NEIClientConfig.isHidden()) { - ItemStack stack = GuiContainerManager.getStackMouseOver(gui); - if(stack != null && stack.getItem() != null) { - int count = 1; - int max = stack.getMaxStackSize(); - if(gui.isShiftKeyDown()) { - count = max; - if(gui.isCtrlKeyDown()) - count /= 4; - } else if(gui.isCtrlKeyDown()) - count = max / 2; - - if(count > 0) { - String name = CorporeaHelper.stripControlCodes(stack.getDisplayName()); - String full = count + " " + name; - - mc.ingameGUI.getChatGUI().addToSentMessages(full); - mc.thePlayer.sendChatMessage(full); - return true; - } - } - } - } - - return false; - } - - @Override - public boolean lastKeyTyped(GuiContainer arg0, char arg1, int arg2) { - return false; - } - - @Override - public boolean mouseClicked(GuiContainer arg0, int arg1, int arg2, int arg3) { - return false; - } - - @Override - public boolean mouseScrolled(GuiContainer arg0, int arg1, int arg2, int arg3) { - return false; - } - - @Override - public void onKeyTyped(GuiContainer arg0, char arg1, int arg2) { - // NO-OP - } - - @Override - public void onMouseClicked(GuiContainer arg0, int arg1, int arg2, int arg3) { - } - - @Override - public void onMouseDragged(GuiContainer arg0, int arg1, int arg2, int arg3, long arg4) { - // NO-OP - } - - @Override - public void onMouseScrolled(GuiContainer arg0, int arg1, int arg2, int arg3) { - // NO-OP - } - - @Override - public void onMouseUp(GuiContainer arg0, int arg1, int arg2, int arg3) { - // NO-OP - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java deleted file mode 100644 index ef5ed3bf6..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java +++ /dev/null @@ -1,142 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.api.brew.IBrewItem; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.item.ModItems; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerBrewery extends TemplateRecipeHandler { - - public class CachedBreweryRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - public int mana; - - public CachedBreweryRecipe(RecipeBrew recipe, ItemStack vial) { - if(recipe == null) - return; - - setIngredients(recipe.getInputs()); - ItemStack toVial; - if (vial == null) - toVial = new ItemStack(ModItems.vial); - else - toVial = vial.copy(); - toVial.stackSize = 1; - inputs.add(new PositionedStack(toVial, 39, 42)); - - output = new PositionedStack(recipe.getOutput(toVial), 87, 42); - } - - public CachedBreweryRecipe(RecipeBrew recipe) { - this(recipe, null); - } - - public void setIngredients(List inputs) { - int left = 96 - inputs.size() * 18 / 2; - - int i = 0; - for (Object o : inputs) { - if (o instanceof String) - this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), left + i * 18, 6)); - else - this.inputs.add(new PositionedStack(o, left + i * 18, 6)); - - i++; - } - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.brewery"); - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BREWERY; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(87, 25, 15, 14), "botania.brewery")); - } - - @Override - public void drawBackground(int recipe) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("botania.brewery")) - for(RecipeBrew recipe : BotaniaAPI.brewRecipes) - arecipes.add(new CachedBreweryRecipe(recipe)); - else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - if(result.getItem() instanceof IBrewItem) - for(RecipeBrew recipe : BotaniaAPI.brewRecipes) { - if(recipe == null) - continue; - - if(((IBrewItem) result.getItem()).getBrew(result) == recipe.getBrew()) - arecipes.add(new CachedBreweryRecipe(recipe)); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - if(ingredient.getItem() instanceof IBrewContainer) { - for(RecipeBrew recipe : BotaniaAPI.brewRecipes) { - if(recipe == null) - continue; - - if(recipe.getOutput(ingredient) != null) - arecipes.add(new CachedBreweryRecipe(recipe, ingredient)); - } - } else for(RecipeBrew recipe : BotaniaAPI.brewRecipes) { - if(recipe == null) - continue; - - CachedBreweryRecipe crecipe = new CachedBreweryRecipe(recipe); - if(crecipe.contains(crecipe.inputs, ingredient)) - arecipes.add(crecipe); - } - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java deleted file mode 100644 index 656c10817..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ /dev/null @@ -1,172 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.BlockAlfPortal; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { - - public class CachedElvenTradeRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - - public CachedElvenTradeRecipe(RecipeElvenTrade recipe) { - if(recipe == null) - return; - - setIngredients(recipe.getInputs()); - output = new PositionedStack(recipe.getOutput(), 107, 46); - } - - public void setIngredients(List inputs) { - int i = 0; - for(Object o : inputs) { - if(o instanceof String) - this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), 60 + i * 18, 6)); - else this.inputs.add(new PositionedStack(o, 60 + i * 18, 6)); - - i++; - } - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.elvenTrade"); - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BLANK; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(35, 30, 48, 48), "botania.elvenTrade")); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.7F); - GuiDraw.changeTexture(LibResources.GUI_ELVEN_TRADE_OVERLAY); - GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80); - GlStateManager.disableBlend(); - GuiDraw.changeTexture(TextureMap.locationBlocksTexture); - renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48, 240); // todo 1.8 - } - - private static boolean hasElvenKnowledge() { - */ -/*EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if (player != null) { - for (ItemStack stack : player.inventory.mainInventory) { - if (stack != null && stack.getItem() instanceof ILexicon) { - ILexicon lexicon = (ILexicon) stack.getItem(); - if (lexicon.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) { - return true; - } - } - } - } - return false;*//* - - return true; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("botania.elvenTrade") && hasElvenKnowledge()) { - if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { - if(recipe == null) - continue; - - arecipes.add(new CachedElvenTradeRecipe(recipe)); - } - } - } else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { - if(recipe == null) - continue; - - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result)) - arecipes.add(new CachedElvenTradeRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { - if(recipe == null) - continue; - - CachedElvenTradeRecipe crecipe = new CachedElvenTradeRecipe(recipe); - if(crecipe.contains(crecipe.inputs, ingredient)) - arecipes.add(crecipe); - } - } - } - - public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { - Tessellator tessellator = Tessellator.getInstance(); - tessellator.getBuffer().startDrawingQuads(); - tessellator.getBuffer().setBrightness(brightness); - tessellator.getBuffer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getBuffer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getBuffer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getBuffer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); - tessellator.draw(); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java deleted file mode 100644 index c4d4582d9..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java +++ /dev/null @@ -1,83 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; -import vazkii.botania.common.block.BlockFloatingSpecialFlower; -import vazkii.botania.common.block.BlockSpecialFlower; -import vazkii.botania.common.block.ModBlocks; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { - - public class CachedFloatingFlowerRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - - public CachedFloatingFlowerRecipe(ItemStack floatingFlower, ItemStack specialFlower, ItemStack output) { - inputs.add(new PositionedStack(floatingFlower, 25, 6)); - inputs.add(new PositionedStack(specialFlower, 43, 6)); - this.output = new PositionedStack(output, 119, 24); - this.output.setMaxSize(1); - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.floatingFlowers"); - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting")); - } - - @Override - public String getGuiTexture() { - return "textures/gui/container/crafting_table.png"; - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - if(Block.getBlockFromItem(result.getItem()) instanceof BlockFloatingSpecialFlower) { - ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE); - ItemStack specialFlower = new ItemStack(ModBlocks.specialFlower); - specialFlower.setTagCompound((NBTTagCompound) result.getTagCompound().copy()); - - arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, specialFlower, result.copy())); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - if(Block.getBlockFromItem(ingredient.getItem()) instanceof BlockSpecialFlower) { - ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE); - ItemStack result = new ItemStack(ModBlocks.floatingSpecialFlower); - result.setTagCompound((NBTTagCompound) ingredient.getTagCompound().copy()); - - arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, ingredient.copy(), result)); - } - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java deleted file mode 100644 index 552564ea8..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ /dev/null @@ -1,173 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [12/12/2015, 23:25:47 (GMT)] - *//* - -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.KnowledgeType; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool.CachedManaPoolRecipe; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageRecipe; -import vazkii.botania.common.lexicon.page.PageText; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; - -public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { - - public class CachedLexicaBotaniaRecipe extends CachedRecipe { - - public LexiconEntry entry; - public PositionedStack item; - public List otherStacks = new ArrayList(); - - public CachedLexicaBotaniaRecipe(ItemStack stack, LexiconEntry entry) { - otherStacks.add(new PositionedStack(new ItemStack(ModItems.lexicon), 51, 5)); - item = new PositionedStack(stack, 91, 5); - this.entry = entry; - } - - @Override - public List getIngredients() { - return otherStacks; - } - - @Override - public PositionedStack getResult() { - return item; - } - - @Override - public List getOtherStacks() { - return otherStacks; - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) { - return ingredient.getItem() == ModItems.lexicon; - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.lexica"); - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BLANK; - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(50, 4, 18, 18), "botania.lexica")); - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - - FontRenderer font = Minecraft.getMinecraft().fontRenderer; - CachedLexicaBotaniaRecipe recipeObj = ((CachedLexicaBotaniaRecipe) arecipes.get(recipe)); - - String s = TextFormatting.UNDERLINE + I18n.translateToLocal(recipeObj.entry.getUnlocalizedName()); - font.drawString(s, 82 - font.getStringWidth(s) / 2, 30, 4210752); - - KnowledgeType type = recipeObj.entry.getKnowledgeType(); - s = type.color + I18n.translateToLocal(type.getUnlocalizedName()).replaceAll("\\&.", ""); - font.drawString(s, 82 - font.getStringWidth(s) / 2, 42, 4210752); - - s = "\"" + I18n.translateToLocal(recipeObj.entry.getTagline()) + "\""; - PageText.renderText(5, 42, 160, 200, s); - - String key = LexiconRecipeMappings.stackToString(recipeObj.item.item); - String quickInfo = "botania.nei.quickInfo:" + key; - String quickInfoLocal = I18n.translateToLocal(quickInfo); - - if(GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips) - s = "name: " + key; - else if(quickInfo.equals(quickInfoLocal)) - s = I18n.translateToLocal("botania.nei.lexicaNoInfo"); - else { - s = I18n.translateToLocal("botania.nei.lexicaSeparator"); - font.drawString(s, 82 - font.getStringWidth(s) / 2, 80, 4210752); - s = quickInfoLocal; - } - - PageText.renderText(5, 80, 160, 200, s); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("botania.lexica")) { - for(LexiconEntry entry : BotaniaAPI.getAllEntries()) { - List stacks = entry.getDisplayedRecipes(); - for(ItemStack stack : stacks) - arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry)); - } - } else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for(LexiconEntry entry : BotaniaAPI.getAllEntries()) { - List stacks = entry.getDisplayedRecipes(); - for(ItemStack stack : stacks) { - String key1 = LexiconRecipeMappings.stackToString(stack); - String key2 = LexiconRecipeMappings.stackToString(result); - if(key1.equals(key2)) - arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - // NO-OP - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java deleted file mode 100644 index 731f3489b..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ /dev/null @@ -1,159 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.mana.TilePool; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerManaPool extends TemplateRecipeHandler { - - public class CachedManaPoolRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - public List otherStacks = new ArrayList(); - public int mana; - - public CachedManaPoolRecipe(RecipeManaInfusion recipe) { - if(recipe == null) - return; - inputs.add(new PositionedStack(new ItemStack(ModBlocks.pool, 1, recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0), 71, 37)); - - if(recipe.getInput() instanceof String) - inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 37)); - else inputs.add(new PositionedStack(recipe.getInput(), 42, 37)); - - if(recipe.isAlchemy()) - otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.alchemyCatalyst), 10, 37)); - else if (recipe.isConjuration()) - otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.conjurationCatalyst), 10, 37)); - - output = new PositionedStack(recipe.getOutput(), 101, 37); - mana = recipe.getManaToConsume(); - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - @Override - public List getOtherStacks() { - return otherStacks; - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) { - if(ingredients == inputs) { - boolean skippedPool = false; - - for(PositionedStack stack : ingredients) { - if(!skippedPool) { - skippedPool = true; - continue; - } - - if(stack.contains(ingredient)) - return true; - } - } - - return super.contains(ingredients, ingredient); - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.manaPool"); - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BLANK; - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(70, 36, 18, 18), "botania.manaPool")); - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); - GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY); - GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50); - HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, ((CachedManaPoolRecipe) arecipes.get(recipe)).mana, TilePool.MAX_MANA / 10); - RenderTilePool.forceMana = true; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("botania.manaPool")) { - for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe == null) - continue; - - arecipes.add(new CachedManaPoolRecipe(recipe)); - } - } else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe == null) - continue; - - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result)) - arecipes.add(new CachedManaPoolRecipe(recipe)); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe == null) - continue; - - CachedManaPoolRecipe crecipe = new CachedManaPoolRecipe(recipe); - if(crecipe.contains(crecipe.getIngredients(), ingredient) || crecipe.contains(crecipe.getOtherStacks(), ingredient)) - arecipes.add(crecipe); - } - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java deleted file mode 100644 index f8ea4b984..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java +++ /dev/null @@ -1,145 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.ModBlocks; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { - - public class CachedPetalApothecaryRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - - public CachedPetalApothecaryRecipe(RecipePetals recipe, boolean addCenterItem) { - setIngredients(recipe.getInputs()); - output = new PositionedStack(recipe.getOutput(), 111, 21); - if(addCenterItem) - inputs.add(new PositionedStack(new ItemStack(ModBlocks.altar), 73, 55)); - } - - public CachedPetalApothecaryRecipe(RecipePetals recipe) { - this(recipe, true); - } - - public void setIngredients(List inputs) { - float degreePerInput = 360F / inputs.size(); - float currentDegree = -90F; - - for(Object o : inputs) { - int posX = (int) Math.round(73 + Math.cos(currentDegree * Math.PI / 180D) * 32); - int posY = (int) Math.round(55 + Math.sin(currentDegree * Math.PI / 180D) * 32); - - if(o instanceof String) - this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), posX, posY)); - else this.inputs.add(new PositionedStack(o, posX, posY)); - currentDegree += degreePerInput; - } - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.petalApothecary"); - } - - public String getRecipeID() { - return "botania.petalApothecary"; - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BLANK; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(72, 54, 18, 18), getRecipeID())); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); - GuiDraw.changeTexture(LibResources.GUI_PETAL_OVERLAY); - GuiDraw.drawTexturedModalRect(45, 10, 38, 7, 92, 92); - } - - public List getRecipes() { - return BotaniaAPI.petalRecipes; - } - - public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) { - return new CachedPetalApothecaryRecipe(recipe); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals(getRecipeID())) { - for(RecipePetals recipe : getRecipes()) - if(recipe.getOutput().getItem() != Items.skull) - arecipes.add(getCachedRecipe(recipe)); - } else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for(RecipePetals recipe : getRecipes()){ - if(recipe == null) - continue; - - if(recipe.getOutput().getTagCompound() != null && NEIServerUtils.areStacksSameType(recipe.getOutput(), result) || recipe.getOutput().getTagCompound() == null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result) && recipe.getOutput().getItem() != Items.skull) - arecipes.add(getCachedRecipe(recipe)); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - for(RecipePetals recipe : getRecipes()) { - if(recipe == null) - continue; - - CachedPetalApothecaryRecipe crecipe = getCachedRecipe(recipe); - if(crecipe.contains(crecipe.inputs, ingredient) && recipe.getOutput().getItem() != Items.skull) - arecipes.add(crecipe); - } - } - - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java deleted file mode 100644 index 4eeb2d4ef..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java +++ /dev/null @@ -1,140 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipePureDaisy; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { - - public class CachedPureDaisyRecipe extends CachedRecipe { - - public List inputs = new ArrayList(); - public PositionedStack output; - public List otherStacks = new ArrayList(); - - public CachedPureDaisyRecipe(RecipePureDaisy recipe) { - if(recipe == null) - return; - inputs.add(new PositionedStack(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), 71, 23)); - - if(recipe.getInput() instanceof String) - inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 23)); - else inputs.add(new PositionedStack(new ItemStack((Block) recipe.getInput()), 42, 23)); - - output = new PositionedStack(new ItemStack(recipe.getOutputState().getBlock()), 101, 23); // todo 1.8 getOutput -> getOutputState - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, inputs); - } - - @Override - public PositionedStack getResult() { - return output; - } - - @Override - public List getOtherStacks() { - return otherStacks; - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) { - if(ingredients == inputs) { - for(PositionedStack stack : ingredients) - if(stack.contains(ingredient)) - return true; - } - - return super.contains(ingredients, ingredient); - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.pureDaisy"); - } - - @Override - public String getGuiTexture() { - return LibResources.GUI_NEI_BLANK; - } - - @Override - public int recipiesPerPage() { - return 2; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(70, 22, 18, 18), "botania.pureDaisy")); - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.5F); - GuiDraw.changeTexture(LibResources.GUI_PURE_DAISY_OVERLAY); - GuiDraw.drawTexturedModalRect(45, 10, 0, 0, 65, 44); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("botania.pureDaisy")) { - for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) { - if(recipe == null) - continue; - - arecipes.add(new CachedPureDaisyRecipe(recipe)); - } - } else super.loadCraftingRecipes(outputId, results); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) { - if(recipe == null) - continue; - - if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(recipe.getOutputState().getBlock()), result)) // todo 1.8 getOutput -> getOutputState - arecipes.add(new CachedPureDaisyRecipe(recipe)); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) { - if(recipe == null) - continue; - - CachedPureDaisyRecipe crecipe = new CachedPureDaisyRecipe(recipe); - if(crecipe.contains(crecipe.getIngredients(), ingredient) || crecipe.contains(crecipe.getOtherStacks(), ingredient)) - arecipes.add(crecipe); - } - } - -} -*/ diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java deleted file mode 100644 index 8f5a68d71..000000000 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java +++ /dev/null @@ -1,59 +0,0 @@ -/* -package vazkii.botania.client.integration.nei.recipe; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.mana.TilePool; -import codechicken.nei.PositionedStack; - -public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary { - - public class CachedRunicAltarRecipe extends CachedPetalApothecaryRecipe { - - public int manaUsage; - - public CachedRunicAltarRecipe(RecipeRuneAltar recipe) { - super(recipe, false); - if(recipe == null) - return; - manaUsage = recipe.getManaUsage(); - inputs.add(new PositionedStack(new ItemStack(ModBlocks.runeAltar), 73, 55)); - } - - } - - @Override - public String getRecipeName() { - return I18n.translateToLocal("botania.nei.runicAltar"); - } - - @Override - public String getRecipeID() { - return "botania.runicAltar"; - } - - @Override - public void drawBackground(int recipe) { - super.drawBackground(recipe); - HUDHandler.renderManaBar(32, 113, 0x0000FF, 0.75F, ((CachedRunicAltarRecipe) arecipes.get(recipe)).manaUsage, TilePool.MAX_MANA / 10); - } - - @Override - public List getRecipes() { - return BotaniaAPI.runeAltarRecipes; - } - - @Override - public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) { - return new CachedRunicAltarRecipe((RecipeRuneAltar) recipe); - } - -} -*/ diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 925039c88..777fd9db4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -18,9 +18,8 @@ public class TileManaFlame extends TileMod { private static final String TAG_COLOR = "color"; - int color = 0x20FF20; - - int lightColor = -1; + private int color = 0x20FF20; + private int lightColor = -1; public void setColor(int color) { this.color = color; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 198302f20..25ea24ebb 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -190,7 +190,8 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { - return new InvWrapper(getBaublesInventory(player)); + IInventory inv = getBaublesInventory(player); + return inv == null ? null : new InvWrapper(inv); } @Override diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 935bdb6b6..f72954d77 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -163,8 +163,6 @@ public class CommonProxy { ConfigHandler.loadPostInit(); LexiconData.postInit(); - registerNEIStuff(); - int words = 0; for(LexiconEntry entry : BotaniaAPI.getAllEntries()) for(LexiconPage page : entry.pages) { @@ -226,10 +224,6 @@ public class CommonProxy { event.registerServerCommand(new CommandSkyblockSpread()); } - public void registerNEIStuff() { - // NO-OP - } - public void setEntryToOpen(LexiconEntry entry) { // NO-OP } From eec7c8ba59ca90f437a87f09fdfd7743f7988850 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 21:25:55 -0500 Subject: [PATCH 486/935] Fix missing center model for panes. Closes #208 --- src/main/resources/assets/botania/blockstates/elfGlassPane.json | 1 + src/main/resources/assets/botania/blockstates/manaGlassPane.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index 1e8bc3c69..f89c7ffe7 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -1,6 +1,7 @@ { "forge_marker": 1, "defaults": { + "model": "minecraft:pane_post", "textures": { "edge": "botania:blocks/elfGlassPane", "pane": "botania:blocks/elfGlass" diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index 9ad4ae68f..d302a6427 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -1,6 +1,7 @@ { "forge_marker": 1, "defaults": { + "model": "minecraft:pane_post", "textures": { "edge": "botania:blocks/manaGlassPane", "pane": "botania:blocks/manaGlass" From 53ce019cf52706dc850933b7058bd8479795dbb5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 23:07:02 -0500 Subject: [PATCH 487/935] Various misc cleanups --- .../client/core/proxy/ClientProxy.java | 1 - .../java/vazkii/botania/client/fx/FXWisp.java | 16 +++---- .../common/block/BlockModDoubleFlower.java | 42 +++---------------- .../botania/common/block/tile/TileCocoon.java | 3 +- .../common/entity/EntityDoppleganger.java | 27 ++++++------ 5 files changed, 31 insertions(+), 58 deletions(-) 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 f71f13654..130249d3f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -69,7 +69,6 @@ import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; -// todo 1.8.8 restore when nei updates import vazkii.botania.client.integration.nei.NEIGuiHooks; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; import vazkii.botania.client.render.entity.RenderDoppleganger; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index e5a4ac533..e7889398d 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -84,7 +84,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -92,7 +92,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GlStateManager.disableDepth(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); @@ -118,11 +118,13 @@ public class FXWisp extends EntityFX { float f11 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX); float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); - // todo 1.8.8 setbrightness call? - tessellator.getBuffer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); - tessellator.getBuffer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + int combined = 15 << 20 | 15 << 4; + int k3 = combined >> 16 & 0xFFFF; + int l3 = combined & 0xFFFF; + tessellator.getBuffer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); + tessellator.getBuffer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).lightmap(k3, l3).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 82211babc..4dce7062c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -95,45 +95,13 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { - return true; + public boolean canHarvestBlock(IBlockAccess world, BlockPos pos, EntityPlayer player) { + return false; } @Override - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { - if(p_149636_1_.isRemote || stack == null || stack.getItem() != Items.shears || state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.LOWER) - harvestBlockCopy(p_149636_1_, p_149636_2_, pos, state); - } - - // This is how I get around encapsulation - // todo 1.9 is this necessary? - public void harvestBlockCopy(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state) { - player.addStat(StatList.getBlockStats(this)); - player.addExhaustion(0.025F); - - if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0) - { - java.util.ArrayList items = new java.util.ArrayList<>(); - ItemStack itemstack = this.createStackedBlock(state); - - if (itemstack != null) - { - items.add(itemstack); - } - - net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, worldIn, pos, worldIn.getBlockState(pos), 0, 1.0f, true, player); - for (ItemStack stack : items) - { - spawnAsEntity(worldIn, pos, stack); - } - } - else - { - harvesters.set(player); - int i = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); - this.dropBlockAsItem(worldIn, pos, state, i); - harvesters.set(null); - } + public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, IBlockState state) { + return true; } @Override @@ -162,7 +130,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); - + 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/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 80d48a254..c9d18f52d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -23,6 +23,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.registry.VillagerRegistry; public class TileCocoon extends TileMod { @@ -53,7 +54,7 @@ public class TileCocoon extends TileMod { if(Math.random() < villagerChance) { EntityVillager villager = new EntityVillager(worldObj); - // todo 1.8 village registry incomplete. VillagerRegistry.applyRandomTrade(villager, worldObj.rand); + VillagerRegistry.setRandomProfession(villager, worldObj.rand); entity = villager; } else { float specialChance = 0.05F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index f3622c3ef..09a1d215e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -60,6 +60,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.BossInfo; +import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -127,14 +128,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", "ThaumicTinkerer:magnet"); - boolean spawnLandmines = false; - boolean spawnPixies = false; - boolean anyWithArmor = false; + private boolean spawnLandmines = false; + private boolean spawnPixies = false; + private boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList<>(); + private List playersWhoAttacked = new ArrayList<>(); private static boolean isPlayingMusic = false; + private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setDarkenSky(true); + public EntityDoppleganger(World par1World) { super(par1World); setSize(0.6F, 1.8F); @@ -505,7 +508,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi super.setDead(); } - public List getPlayersAround() { + private List getPlayersAround() { BlockPos source = getSource(); float range = 15F; return worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); @@ -762,7 +765,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } - void spawnMissile() { + private void spawnMissile() { if(!worldObj.isRemote) { EntityMagicMissile missile = new EntityMagicMissile(this, true); missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); @@ -773,7 +776,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } - public static boolean isCheatyBlock(World world, BlockPos pos) { + private static boolean isCheatyBlock(World world, BlockPos pos) { Block block = world.getBlockState(pos).getBlock(); String name = Block.blockRegistry.getNameForObject(block).toString(); return CHEATY_BLOCKS.contains(name); @@ -781,14 +784,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi // EntityEnderman code below ============================================================================ - protected boolean teleportRandomly() { + private boolean teleportRandomly() { double d0 = posX + (rand.nextDouble() - 0.5D) * 64.0D; double d1 = posY + (rand.nextInt(64) - 32); double d2 = posZ + (rand.nextDouble() - 0.5D) * 64.0D; return teleportTo(d0, d1, d2); } - protected boolean teleportTo(double par1, double par3, double par5) { + private boolean teleportTo(double par1, double par3, double par5) { double d3 = posX; double d4 = posY; double d5 = posZ; @@ -899,7 +902,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public BossInfo getBossInfo() { - return null; // todo 1.9 + return bossInfo; } @Override @@ -934,7 +937,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return background ? null : shaderCallback; } - public static class BeaconComponent extends MultiblockComponent { + private static class BeaconComponent extends MultiblockComponent { public BeaconComponent(BlockPos relPos) { super(relPos, Blocks.iron_block.getDefaultState()); @@ -947,7 +950,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } - public static class BeaconBeamComponent extends MultiblockComponent { + private static class BeaconBeamComponent extends MultiblockComponent { public BeaconBeamComponent(BlockPos relPos) { super(relPos, Blocks.beacon.getDefaultState()); From ea6484211ba3bef1c27bda926ea1d1bb693e4f04 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Apr 2016 23:26:20 -0500 Subject: [PATCH 488/935] API cleanups --- .../java/vazkii/botania/api/BotaniaAPI.java | 90 +++++++++---------- .../vazkii/botania/api/boss/IBotaniaBoss.java | 4 +- .../api/boss/IBotaniaBossWithShader.java | 2 - .../java/vazkii/botania/api/brew/Brew.java | 11 +-- .../botania/api/corporea/CorporeaHelper.java | 30 +++---- .../ICorporeaAutoCompleteController.java | 3 - .../api/corporea/ICorporeaInterceptor.java | 5 +- .../botania/api/corporea/ICorporeaSpark.java | 4 +- .../api/corporea/IWrappedInventory.java | 5 +- .../api/internal/DummyManaNetwork.java | 4 +- .../api/internal/DummyMethodHandler.java | 7 +- .../botania/api/internal/DummyPage.java | 2 +- .../api/internal/IGuiLexiconEntry.java | 4 +- .../api/internal/IInternalMethodHandler.java | 11 ++- .../botania/api/internal/IManaBurst.java | 4 +- .../botania/api/internal/IManaNetwork.java | 4 +- .../api/internal/VanillaPacketDispatcher.java | 4 +- .../botania/api/item/IBaubleRender.java | 3 - .../botania/api/item/IFloatingFlower.java | 5 +- .../botania/api/item/IGrassHornExcempt.java | 26 ------ .../java/vazkii/botania/api/item/IRelic.java | 4 +- .../botania/api/item/ISequentialBreaker.java | 2 +- .../IWireframeCoordinateListProvider.java | 8 +- .../api/item/TinyPotatoRenderEvent.java | 2 - .../lexicon/BotaniaTutorialStartEvent.java | 4 +- .../botania/api/lexicon/LexiconCategory.java | 4 +- .../botania/api/lexicon/LexiconEntry.java | 12 +-- .../botania/api/lexicon/LexiconPage.java | 6 +- .../api/lexicon/LexiconRecipeMappings.java | 6 +- .../multiblock/IMultiblockRenderHook.java | 6 +- .../api/lexicon/multiblock/Multiblock.java | 10 ++- .../java/vazkii/botania/api/mana/ILens.java | 2 - .../vazkii/botania/api/mana/IPingable.java | 4 +- .../botania/api/mana/TileSignature.java | 2 +- .../botania/api/mana/spark/SparkHelper.java | 4 +- .../api/recipe/ElvenPortalUpdateEvent.java | 4 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 9 +- .../botania/api/recipe/RecipeElvenTrade.java | 8 +- .../api/recipe/RecipeManaInfusion.java | 4 +- .../botania/api/recipe/RecipePetals.java | 9 +- .../botania/api/recipe/RecipePureDaisy.java | 10 +-- .../botania/api/state/BotaniaStateProps.java | 26 +++++- .../botania/api/state/PropertyObject.java | 1 - .../botania/api/subtile/SubTileEntity.java | 10 +-- .../api/subtile/SubTileFunctional.java | 6 +- .../api/subtile/SubTileGenerating.java | 8 +- .../api/subtile/signature/BasicSignature.java | 8 +- .../api/subtile/signature/PassiveFlower.java | 6 +- .../subtile/signature/SubTileSignature.java | 4 +- .../botania/api/wand/ICoordBoundItem.java | 2 - .../vazkii/botania/api/wand/ITileBound.java | 2 - .../botania/api/wand/IWandBindable.java | 2 +- .../vazkii/botania/api/wand/IWandable.java | 2 +- .../botania/api/wiki/SimpleWikiProvider.java | 2 - .../vazkii/botania/api/wiki/WikiHooks.java | 6 +- .../botania/common/item/ItemGrassHorn.java | 3 +- .../common/item/relic/ItemLokiRing.java | 5 +- .../botania/common/item/relic/ItemRelic.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 5 +- 59 files changed, 204 insertions(+), 244 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index d9e071786..93e756cd0 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,22 +10,16 @@ */ package vazkii.botania.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.base.Preconditions; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockStainedGlass; import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -40,6 +34,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; @@ -63,59 +58,62 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.SimpleWikiProvider; import vazkii.botania.api.wiki.WikiHooks; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - -import net.minecraftforge.fml.common.Loader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public final class BotaniaAPI { - private static List categories = new ArrayList<>(); - private static List allEntries = new ArrayList<>(); + private static final List categories = new ArrayList<>(); + private static final List allEntries = new ArrayList<>(); - public static Map knowledgeTypes = new HashMap<>(); + public static final Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap<>(); + public static final Map brewMap = new LinkedHashMap<>(); - public static List disposableBlocks = new ArrayList<>(); - public static List semiDisposableBlocks = new ArrayList<>(); + public static final List disposableBlocks = new ArrayList<>(); + public static final List semiDisposableBlocks = new ArrayList<>(); - public static List petalRecipes = new ArrayList<>(); - public static List pureDaisyRecipes = new ArrayList<>(); - public static List manaInfusionRecipes = new ArrayList<>(); - public static List runeAltarRecipes = new ArrayList<>(); - public static List elvenTradeRecipes = new ArrayList<>(); - public static List brewRecipes = new ArrayList<>(); - public static List miniFlowerRecipes = new ArrayList<>(); + public static final List petalRecipes = new ArrayList<>(); + public static final List pureDaisyRecipes = new ArrayList<>(); + public static final List manaInfusionRecipes = new ArrayList<>(); + public static final List runeAltarRecipes = new ArrayList<>(); + public static final List elvenTradeRecipes = new ArrayList<>(); + public static final List brewRecipes = new ArrayList<>(); + public static final List miniFlowerRecipes = new ArrayList<>(); - private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); - public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); - public static Map subTileMods = new HashMap<>(); - public static BiMap miniFlowers = HashBiMap. create(); + private static final BiMap> subTiles = HashBiMap.> create(); + private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); + public static final Set subtilesForCreativeMenu = new LinkedHashSet<>(); + public static final Map subTileMods = new HashMap<>(); + public static final BiMap miniFlowers = HashBiMap. create(); - public static Map oreWeights = new HashMap<>(); - public static Map oreWeightsNether = new HashMap<>(); - public static Map seeds = new HashMap<>(); + public static final Map oreWeights = new HashMap<>(); + public static final Map oreWeightsNether = new HashMap<>(); + public static final Map seeds = new HashMap<>(); - public static Set looniumBlacklist = new LinkedHashSet<>(); - public static Map> paintableBlocks = new LinkedHashMap<>(); - public static Set magnetBlacklist = new LinkedHashSet<>(); - public static Set> gravityRodBlacklist = new LinkedHashSet<>(); + public static final Set looniumBlacklist = new LinkedHashSet<>(); + public static final Map> paintableBlocks = new LinkedHashMap<>(); + public static final Set magnetBlacklist = new LinkedHashSet<>(); + public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); - public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); + 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 ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); - public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 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 ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_iron); - public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); + public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_iron); + public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_iron); + public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_iron); - public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); + public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); public static KnowledgeType basicKnowledge; public static KnowledgeType elvenKnowledge; diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index dd6d0ddd3..071d580ff 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.boss; -import java.awt.Rectangle; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -19,6 +17,8 @@ import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.awt.*; + /** * An extension of IBossDisplayData. This counts as a botania boss and as a normal * minecraft boss since it has IBossDisplayData. Instead of using the typical diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index 038b287c4..c7a425412 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -11,8 +11,6 @@ package vazkii.botania.api.boss; import vazkii.botania.api.internal.ShaderCallback; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * A Botania boss whose HP bar makes use of shaders. Shaders diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index e4c73611a..2e5a26142 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -10,15 +10,12 @@ */ package vazkii.botania.api.brew; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import java.util.List; + /** * The class for a Brew definition, each one is a singleton. */ @@ -29,8 +26,8 @@ public class Brew { private final int color; private final int cost; private final List effects; - boolean canInfuseBloodPendant = true; - boolean canInfuseIncense = true; + private boolean canInfuseBloodPendant = true; + private boolean canInfuseIncense = true; /** * @param name The unlocalized name of this potion. diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 918149113..5bb7808ac 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -9,6 +9,18 @@ * File Created @ [Feb 14, 2015, 3:28:54 PM (GMT)] */ package vazkii.botania.api.corporea; + +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import vazkii.botania.api.BotaniaAPI; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,20 +28,6 @@ import java.util.Map; import java.util.WeakHashMap; import java.util.regex.Pattern; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; -import net.minecraft.entity.Entity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.api.BotaniaAPI; - public final class CorporeaHelper { private static final List empty = ImmutableList.of(); @@ -38,9 +36,7 @@ public final class CorporeaHelper { private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); - public static final String[] WILDCARD_STRINGS = new String[] { - "...", "~", "+", "?" , "*" - }; + public static final String[] WILDCARD_STRINGS = { "...", "~", "+", "?" , "*" }; /** * How many items were matched in the last request. If java had "out" params like C# this wouldn't be needed :V diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index c1b909d5b..1017006c6 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.corporea; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - /** * An interface for systems which may control if the item auto complete system should be active */ diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java index 41756abd5..c7d7f4609 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java @@ -10,11 +10,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import java.util.List; + /** * A TileEntity that implements this will be able to intercept corporea * requests case there is a Corporea Spark on top. diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index cd3197a30..f44048595 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; +import java.util.List; + /** * An interface for a Corporea Spark. Includes functions for handling * connections. diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java index c2ff6ac14..96f863af3 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -9,11 +9,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import java.util.List; + /** * This interface wraps IInventory corporea works with in order to provide * compatibility with different storage mods. diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index e6cf022b3..e1425597a 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,14 +10,14 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; +import java.util.List; + public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 37694a2fd..c7e3eceb8 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -22,11 +20,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; @@ -40,6 +37,8 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.List; + public class DummyMethodHandler implements IInternalMethodHandler { @Override diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 961ea6029..6b8d7be91 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -10,9 +10,9 @@ */ package vazkii.botania.api.internal; -import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.lexicon.LexiconPage; /** * A dummy page. It does absolutely nothing and is only diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index b0d4d6ef4..f7703eea1 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import vazkii.botania.api.lexicon.LexiconEntry; +import java.util.List; + /** * Internal interface for the Lexicon Entry GUI. This contains * everything that can be accessed from it. It's safe to cast diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 565e386cf..0448c8f5b 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -21,11 +19,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; @@ -38,8 +37,8 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * Any methods that refer to internal methods in Botania are here. diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 622001909..42745a74d 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.internal; -import java.util.UUID; - import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import java.util.UUID; + /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. */ diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index 54813ef97..7f1488fea 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; +import java.util.List; + /** * A basic interface for a world's Mana Network. * @see IInternalMethodHandler#getManaNetworkInstance() diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 647b4bd31..87d64a61a 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; + public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 38de54964..f890c256a 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -14,9 +14,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - /** * A Bauble Item that implements this will be have hooks to render something on * the player while its equipped. diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index 78502de4f..e51cf5034 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; + import java.util.HashMap; public interface IFloatingFlower { @@ -35,6 +36,8 @@ public interface IFloatingFlower { public static final IslandType INFUSED = new IslandType("INFUSED"); public static final IslandType MUTATED = new IslandType("MUTATED"); + private final String typeName; + /** * Instantiates and registers a new floating flower island type * Note that you need to register the model for this island type, see BotaniaAPIClient @@ -46,8 +49,6 @@ public interface IFloatingFlower { registry.put(name, this); } - public final String typeName; - public static IslandType ofType(String typeStr) { IslandType type = registry.get(typeStr); return type == null ? GRASS : type; diff --git a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java deleted file mode 100644 index 4b54fc0e9..000000000 --- a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 29, 2014, 4:52:04 PM (GMT)] - */ -package vazkii.botania.api.item; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * A BlockBush can implement this to check if it can be broken - * by a Horn/Drum of the Wild or not. - * @Deprecated Use IHornHarvestable instead - */ -@Deprecated -public interface IGrassHornExcempt { - - public boolean canUproot(World world, BlockPos pos); - -} diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index c8d72b877..39e7528a3 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.item; -import java.util.UUID; - import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import java.util.UUID; + /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index 7c088c4dd..6d7969468 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -12,8 +12,8 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * An item that implements this can break multiple blocks at once diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index c28d4ae66..efa39d191 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -10,13 +10,11 @@ */ package vazkii.botania.api.item; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * An item that implements this will allow for various wireframes to be drawn @@ -27,7 +25,7 @@ public interface IWireframeCoordinateListProvider { /** * Returns a list of BlockPos for the wireframes to draw. - * Can be null. + * Will not be null. */ public List getWireframesToDraw(EntityPlayer player, ItemStack stack); diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 11b8db411..440004a12 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -12,8 +12,6 @@ package vazkii.botania.api.item; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. diff --git a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java index a739f8f15..73ec1c9b0 100644 --- a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java +++ b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.lexicon; -import java.util.Queue; - import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.Queue; + /** * Fired when the Lexica Botania's tutorial is started. You can add your * own entries to the tutorial here. Please use this responsibly. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index ec30651b7..8d46f8246 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.lexicon; +import net.minecraft.util.ResourceLocation; + import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ResourceLocation; - public class LexiconCategory implements Comparable { private static int count = 0; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index f31fbcb46..6e2afd1fd 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -10,16 +10,16 @@ */ package vazkii.botania.api.lexicon; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPI; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.BotaniaAPI; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - public class LexiconEntry implements Comparable { public final String unlocalizedName; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 7c70491d4..a19fd9dc7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.lexicon; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; -import vazkii.botania.api.internal.IGuiLexiconEntry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; + +import java.util.List; public abstract class LexiconPage { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index fc13ea829..4f525effe 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.lexicon; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaItem; +import java.util.HashMap; +import java.util.Map; + /** * This class contains mappings for which entry and page correspond to each * craftable ItemStack. Use the map method to map an ItemStack to a page in diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 494f98f12..4f8605cc3 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -10,14 +10,14 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import java.util.HashMap; +import java.util.Map; + /** * A hook for rendering blocks in the multiblock display. */ diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 09f594ab2..dad7dd155 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -10,14 +10,18 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.*; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * This class describes a Mutiblock object. It's used to display a * multiblock in the lexicon and to show the player in a ghost-like diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 6104a2118..7b7405ec3 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -11,8 +11,6 @@ package vazkii.botania.api.mana; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Have an Item implement this to be counted as a lens for the mana spreader. diff --git a/src/main/java/vazkii/botania/api/mana/IPingable.java b/src/main/java/vazkii/botania/api/mana/IPingable.java index 1605b428e..c8532bc23 100644 --- a/src/main/java/vazkii/botania/api/mana/IPingable.java +++ b/src/main/java/vazkii/botania/api/mana/IPingable.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.mana; -import java.util.UUID; - import vazkii.botania.api.internal.IManaBurst; +import java.util.UUID; + /** * This describes an interface of a Mana Sender block that should be able to pingbackable * by a burst to tell it that the burst is still alive. diff --git a/src/main/java/vazkii/botania/api/mana/TileSignature.java b/src/main/java/vazkii/botania/api/mana/TileSignature.java index 8f5b98759..a63309048 100644 --- a/src/main/java/vazkii/botania/api/mana/TileSignature.java +++ b/src/main/java/vazkii/botania/api/mana/TileSignature.java @@ -14,7 +14,7 @@ public class TileSignature { @Override public int hashCode() { - return Boolean.hashCode(remoteWorld) ^ tile.hashCode(); + return Boolean.hashCode(remoteWorld) ^ System.identityHashCode(tile); } @Override diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 58fa96278..82bcd0214 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.mana.spark; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import java.util.List; + public final class SparkHelper { public static final int SPARK_SCAN_RANGE = 12; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index ba90e0b1c..605243ab6 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.recipe; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.List; + /** * An event fired when an Elven Portal TE updates. The portal's * relevant AABB and other stuff is passed in for convenience. This diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index bedf6f061..d07da21b4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -10,18 +10,17 @@ */ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; +import java.util.ArrayList; +import java.util.List; + public class RecipeBrew { private final Brew brew; @@ -89,7 +88,7 @@ public class RecipeBrew { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index b1dbc324c..04e96274d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -1,12 +1,12 @@ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public class RecipeElvenTrade { private final ItemStack output; @@ -80,7 +80,7 @@ public class RecipeElvenTrade { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index b782f43e2..0f659de48 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.recipe; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.List; + public class RecipeManaInfusion { private final ItemStack output; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 9f1848a9b..7f0072791 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -10,15 +10,14 @@ */ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public class RecipePetals { private final ItemStack output; @@ -83,7 +82,7 @@ public class RecipePetals { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 43d2f3b6f..51aea7e31 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -10,10 +10,6 @@ */ package vazkii.botania.api.recipe; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -23,6 +19,10 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class RecipePureDaisy { public static final int DEFAULT_TIME = 150; @@ -57,7 +57,7 @@ public class RecipePureDaisy { return isOreDict(stack, oredict); } - public boolean isOreDict(ItemStack stack, String entry) { + private boolean isOreDict(ItemStack stack, String entry) { if(stack == null || stack.getItem() == null) return false; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 1324e9c7d..a5775dc68 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -17,13 +17,31 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.enums.*; - -import javax.annotation.Nullable; +import vazkii.botania.api.state.enums.AlfPortalState; +import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.AltarVariant; +import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.api.state.enums.CrateVariant; +import vazkii.botania.api.state.enums.CustomBrickVariant; +import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.EndBrickVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; +import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.LuminizerVariant; +import vazkii.botania.api.state.enums.PlatformVariant; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.api.state.enums.PylonVariant; +import vazkii.botania.api.state.enums.QuartzVariant; +import vazkii.botania.api.state.enums.SpreaderVariant; +import vazkii.botania.api.state.enums.StorageVariant; /** * Holds all Botania block state properties. Use these to set botania blockstates diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 328b4dbd7..8dd5ac757 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -13,7 +13,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraftforge.common.property.IUnlistedProperty; -import javax.annotation.Nullable; import java.util.Objects; // Generic base class for unlisted properties diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index d15e5fbe4..05e310e80 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -21,16 +19,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 2161a0e49..9220a9ae4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -10,23 +10,23 @@ */ package vazkii.botania.api.subtile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.sound.BotaniaSoundEvents; +import java.awt.*; + /** * The basic class for a Functional Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index e20ce2820..e7b377d04 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.awt.Color; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -23,9 +20,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -33,6 +30,9 @@ import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.sound.BotaniaSoundEvents; +import java.awt.*; +import java.util.List; + /** * The basic class for a Generating Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 913d98933..957c46999 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -10,19 +10,17 @@ */ package vazkii.botania.api.subtile.signature; -import net.minecraft.item.ItemStack; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; +import java.util.List; + /** * A basic (and fallback) implementation of SubTileSignature. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java b/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java index 008fa83b6..73dea37f3 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.subtile.signature; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * This annotation used for detecting whether a SubTileEntity * is a passive flower without having to instantiate it. This diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 11833c014..9db646582 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.subtile.signature; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import java.util.List; + /** * A singleton instance for a SubTileEntity, this is called for a few methods. */ diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index fe32afbb4..8d3321f44 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -2,8 +2,6 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * The item equivalent of ITileBound, renders when the diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 5cde38c06..6468870cd 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -11,8 +11,6 @@ package vazkii.botania.api.wand; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Any TileEntity that implements this is technically bound diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index 4df323f75..49506f91c 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -12,8 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * A TileEntity that implements this can be bound to another block diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 5663d0a85..13997803e 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -12,8 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index f57a6858a..b8baba53e 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -10,14 +10,12 @@ */ package vazkii.botania.api.wiki; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; - import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 479e66e6e..3d22f4cde 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.wiki; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameData; +import java.util.HashMap; +import java.util.Map; + public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s"); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 68c8112b5..60b8f98aa 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; @@ -102,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) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, pos)) || 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); } 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 c3064e8b7..363ad190d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.relic; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -171,7 +172,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { if(getLokiRing(player) != stack) - return null; + return ImmutableList.of(); RayTraceResult lookPos = Minecraft.getMinecraft().objectMouseOver; @@ -190,7 +191,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC return list; } - return null; + return ImmutableList.of(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 45d9d8aab..24dfbea09 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -35,7 +35,7 @@ public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND_NAME = "soulbind"; private static final String TAG_SOULBIND_UUID = "soulbindUUID"; - Achievement achievement; + private Achievement achievement; public ItemRelic(String name) { super(name); 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 dfb95d677..49cddcfe3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.rod; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -392,7 +393,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { ItemStack holding = player.getHeldItemMainhand(); if(holding != stack || !canExchange(stack)) - return null; + return ImmutableList.of(); Block block = getBlock(stack); int meta = getBlockMeta(stack); @@ -423,7 +424,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } } - return null; + return ImmutableList.of(); } } From 529c41407fd55c839d6cc3d38cad8e7dffaa75a9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 09:30:52 -0500 Subject: [PATCH 489/935] Allow mana guns to be dual wielded --- .../java/vazkii/botania/common/item/ItemManaGun.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index e43d954da..8e625e20c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -103,6 +103,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { ItemStack lens = getLens(par1ItemStack); ItemsRemainingRenderHandler.set(lens, -2); par1ItemStack.setItemDamage(effCd); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } else if(par1ItemStack.getItemDamage() == 0) { EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true); if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) { @@ -121,9 +122,10 @@ 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); + return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN @@ -140,7 +142,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN - public boolean isSugoiKawaiiDesuNe(ItemStack stack) { + private boolean isSugoiKawaiiDesuNe(ItemStack stack) { return stack.getDisplayName().equalsIgnoreCase("desu gun"); } @@ -169,7 +171,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return getLens(itemStack); } - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { + private EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { EntityManaBurst burst = new EntityManaBurst(player); int maxMana = 120; @@ -279,8 +281,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { public static ItemStack getLensAtPos(ItemStack stack, int pos) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_LENS + pos, true); if(cmp != null) { - ItemStack lens = ItemStack.loadItemStackFromNBT(cmp); - return lens; + return ItemStack.loadItemStackFromNBT(cmp); } return null; } From 32fb1bcf6d90e07dcbdc9c42275317dadd62a253 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 09:47:02 -0500 Subject: [PATCH 490/935] Fix contributor renders. Closes #200 --- .../core/handler/ContributorFancinessHandler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 f3d41fd58..bb3c33d4a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -42,7 +42,7 @@ public final class ContributorFancinessHandler implements LayerRenderer flowerMap = null; private volatile static boolean startedLoading = false; - private static final boolean phi = true; + public static final boolean phi = false; @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) { @@ -120,7 +120,7 @@ public final class ContributorFancinessHandler implements LayerRenderer Date: Mon, 4 Apr 2016 13:09:02 -0500 Subject: [PATCH 491/935] Fix ugly multiblock rendering --- .../handler/ContributorFancinessHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 71 ++++++++++++++++++- .../client/core/helper/ShaderHelper.java | 3 +- 3 files changed, 73 insertions(+), 3 deletions(-) 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 bb3c33d4a..431b21bdf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -181,7 +181,7 @@ public final class ContributorFancinessHandler implements LayerRenderer> 16 & 255) / 255.0F; + float f1 = (float)(i >> 8 & 255) / 255.0F; + float f2 = (float)(i & 255) / 255.0F; + + if (!p_178266_4_) + { + GlStateManager.color(brightness, brightness, brightness, 1.0F); + } + + renderModelBrightnessColor(p_178266_2_, model, brightness, f, f1, f2, alpha); + } + + // Copy of BlockModelRenderer.renderModelBrightnessColor + alpha arg + private static void renderModelBrightnessColor(IBlockState p_187495_1_, IBakedModel p_187495_2_, float p_187495_3_, float p_187495_4_, float p_187495_5_, float p_187495_6_, float alpha) { + for (EnumFacing enumfacing : EnumFacing.values()) + { + renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, enumfacing, 0L), alpha); + } + + renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, (EnumFacing)null, 0L), alpha); + } + + // Copy of BlockModelRenderer.renderModelBrightnessColorQuads + alpha arg + private static void renderModelBrightnessColorQuads(float brightness, float red, float green, float blue, List listQuads, float alpha) + { + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer vertexbuffer = tessellator.getBuffer(); + int i = 0; + + for (int j = listQuads.size(); i < j; ++i) + { + BakedQuad bakedquad = (BakedQuad)listQuads.get(i); + vertexbuffer.begin(7, DefaultVertexFormats.ITEM); + vertexbuffer.addVertexData(bakedquad.getVertexData()); + + // Botania - alpha + int a = ((int) (255 * alpha)); + int r = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? red : 1))); + int g = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? green : 1))); + int b = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? blue : 1))); + int argb = a << 24 | r << 16 | g << 8 | b; + vertexbuffer.putColor4(argb); + + Vec3i vec3i = bakedquad.getFace().getDirectionVec(); + vertexbuffer.putNormal((float)vec3i.getX(), (float)vec3i.getY(), (float)vec3i.getZ()); + tessellator.draw(); + } + } } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index fa48b075d..86a48662d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.helper; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.stream.Collectors; import net.minecraft.client.renderer.OpenGlHelper; @@ -155,7 +156,7 @@ public final class ShaderHelper { return ""; try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) { - return reader.lines().reduce("", (s1, s2) -> s1 + "\n" + s2); + return reader.lines().collect(Collectors.joining("\n")); } } From f011be357162ea021c6f28d2dc7615634ae70119 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 13:32:36 -0500 Subject: [PATCH 492/935] Switch last commit to shaders. Thanks PaleoCrafter! --- .../multiblock/IMultiblockRenderHook.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 92 +++++-------------- .../client/core/helper/ShaderHelper.java | 2 + .../gui/lexicon/button/GuiButtonCategory.java | 12 +-- .../botania/client/lib/LibResources.java | 2 + .../assets/botania/shader/alpha.frag | 9 ++ .../assets/botania/shader/alpha.vert | 9 ++ 7 files changed, 51 insertions(+), 77 deletions(-) create mode 100644 src/main/resources/assets/botania/shader/alpha.frag create mode 100644 src/main/resources/assets/botania/shader/alpha.vert diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 4f8605cc3..c94a90932 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -25,7 +25,7 @@ public interface IMultiblockRenderHook { public static Map renderHooks = new HashMap<>(); - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha); + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp); public boolean needsTranslate(IBlockState state); 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 60c9ef710..0dfbfe317 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -37,13 +37,16 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import java.util.List; @@ -62,7 +65,7 @@ public final class MultiblockRenderHandler { // todo 1.8.8 temporary shim, because cannot renderBlockBrightness directly, see MinecraftForge issue 2353 IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { // Steal itemstack model since it has the proper group visibilities configured ItemStack stack = new ItemStack(ModBlocks.pylon, 1, state.getBlock().getMetaFromState(state)); IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); @@ -80,7 +83,7 @@ public final class MultiblockRenderHandler { // TODO also a temporary shim for same reason as above IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() { @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { GlStateManager.translate(-0.5F, -0.5F, 0.5F); IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState()); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false); @@ -135,9 +138,18 @@ public final class MultiblockRenderHandler { blockAccess.update(player.worldObj, mb, anchorPos); - for(MultiblockComponent comp : mb.getComponents()) + ShaderHelper.useShader(ShaderHelper.alpha, shader -> { + int alpha = ARBShaderObjects.glGetUniformLocationARB(shader, "alpha"); + ARBShaderObjects.glUniform1fARB(alpha, 0.4F); + }); + + for(MultiblockComponent comp : mb.getComponents()) { if(renderComponentInWorld(player.worldObj, mb, comp, anchorPos)) didAny = true; + } + + ShaderHelper.releaseShader(); + rendering = false; GL11.glPopAttrib(); GlStateManager.popMatrix(); @@ -168,7 +180,7 @@ public final class MultiblockRenderHandler { GlStateManager.pushMatrix(); GlStateManager.translate(-renderPosX, -renderPosY, -renderPosZ); GlStateManager.disableDepth(); - doRenderComponent(mb, comp, pos_, 0.4F); + doRenderComponent(mb, comp, pos_); GlStateManager.popMatrix(); return true; } @@ -178,11 +190,11 @@ public final class MultiblockRenderHandler { blockAccess.update(null, mb, mb.offPos); for(MultiblockComponent comp : mb.getComponents()) { BlockPos pos = comp.getRelativePosition(); - doRenderComponent(mb, comp, pos.add(mb.offPos), 1); + doRenderComponent(mb, comp, pos.add(mb.offPos)); } } - private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos, float alpha) { + private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -191,81 +203,21 @@ public final class MultiblockRenderHandler { if(state == null) return; if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) { - GlStateManager.color(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, 1F); IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(state.getBlock()); if(renderHook.needsTranslate(state)) { GlStateManager.translate(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } - renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp, alpha); + renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp); } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? - GlStateManager.color(1, 1, 1, alpha); - renderModelBrightness(brd.getModelForState(state), state, 1, true, alpha); // todo 1.9 make this a shader so we don't have to copypasta 3 methods? + GlStateManager.color(1, 1, 1, 1); + brd.renderBlockBrightness(state, 1.0F); } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); GlStateManager.popMatrix(); } - - // Copy of BlockModelRenderer.renderModelBrightness + alpha arg - private static void renderModelBrightness(IBakedModel model, IBlockState p_178266_2_, float brightness, boolean p_178266_4_, float alpha) - { - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); - int i = Minecraft.getMinecraft().getBlockColors().colorMultiplier(p_178266_2_, null, null, 0); - - if (EntityRenderer.anaglyphEnable) - { - i = TextureUtil.anaglyphColor(i); - } - - float f = (float)(i >> 16 & 255) / 255.0F; - float f1 = (float)(i >> 8 & 255) / 255.0F; - float f2 = (float)(i & 255) / 255.0F; - - if (!p_178266_4_) - { - GlStateManager.color(brightness, brightness, brightness, 1.0F); - } - - renderModelBrightnessColor(p_178266_2_, model, brightness, f, f1, f2, alpha); - } - - // Copy of BlockModelRenderer.renderModelBrightnessColor + alpha arg - private static void renderModelBrightnessColor(IBlockState p_187495_1_, IBakedModel p_187495_2_, float p_187495_3_, float p_187495_4_, float p_187495_5_, float p_187495_6_, float alpha) { - for (EnumFacing enumfacing : EnumFacing.values()) - { - renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, enumfacing, 0L), alpha); - } - - renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, (EnumFacing)null, 0L), alpha); - } - - // Copy of BlockModelRenderer.renderModelBrightnessColorQuads + alpha arg - private static void renderModelBrightnessColorQuads(float brightness, float red, float green, float blue, List listQuads, float alpha) - { - Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexbuffer = tessellator.getBuffer(); - int i = 0; - - for (int j = listQuads.size(); i < j; ++i) - { - BakedQuad bakedquad = (BakedQuad)listQuads.get(i); - vertexbuffer.begin(7, DefaultVertexFormats.ITEM); - vertexbuffer.addVertexData(bakedquad.getVertexData()); - - // Botania - alpha - int a = ((int) (255 * alpha)); - int r = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? red : 1))); - int g = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? green : 1))); - int b = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? blue : 1))); - int argb = a << 24 | r << 16 | g << 8 | b; - vertexbuffer.putColor4(argb); - - Vec3i vec3i = bakedquad.getFace().getDirectionVec(); - vertexbuffer.putNormal((float)vec3i.getX(), (float)vec3i.getY(), (float)vec3i.getZ()); - tessellator.draw(); - } - } } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 86a48662d..ede7054e8 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -44,6 +44,7 @@ public final class ShaderHelper { public static int filmGrain = 0; public static int gold = 0; public static int categoryButton = 0; + public static int alpha = 0; public static void initShaders() { if(!useShaders()) @@ -59,6 +60,7 @@ public final class ShaderHelper { filmGrain = createProgram(null, LibResources.SHADER_FILM_GRAIN_FRAG); gold = createProgram(null, LibResources.SHADER_GOLD_FRAG); categoryButton = createProgram(null, LibResources.SHADER_CATEGORY_BUTTON_FRAG); + alpha = createProgram(LibResources.SHADER_ALPHA_VERT, LibResources.SHADER_ALPHA_FRAG); } public static void useShader(int shader, ShaderCallback callback) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index f0993c978..d70e46644 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -34,13 +34,13 @@ public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); private static final ResourceLocation stencilResource = new ResourceLocation(LibResources.GUI_STENCIL); - static boolean boundStencil = false; + private static boolean boundStencil = false; GuiLexicon gui; - LexiconCategory category; - ResourceLocation resource = null; - float ticksHovered = 0F; - float time = 12F; + private LexiconCategory category; + private ResourceLocation resource = null; + private float ticksHovered = 0F; + private float time = 12F; private ShaderCallback shaderCallback = shader -> { TextureManager r = Minecraft.getMinecraft().renderEngine; @@ -125,7 +125,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { gui.categoryHighlight = I18n.translateToLocal(getTooltipText()); } - String getTooltipText() { + private String getTooltipText() { if(category == null) return "botaniamisc.lexiconIndex"; return category.getUnlocalizedName(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 584d12181..4342933f4 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -166,5 +166,7 @@ public final class LibResources { public static final String SHADER_FILM_GRAIN_FRAG = PREFIX_SHADER + "film_grain.frag"; public static final String SHADER_GOLD_FRAG = PREFIX_SHADER + "gold.frag"; public static final String SHADER_CATEGORY_BUTTON_FRAG = PREFIX_SHADER + "category_button.frag"; + public static final String SHADER_ALPHA_FRAG = PREFIX_SHADER + "alpha.frag"; + public static final String SHADER_ALPHA_VERT = PREFIX_SHADER + "alpha.vert"; } diff --git a/src/main/resources/assets/botania/shader/alpha.frag b/src/main/resources/assets/botania/shader/alpha.frag new file mode 100644 index 000000000..ec9a86279 --- /dev/null +++ b/src/main/resources/assets/botania/shader/alpha.frag @@ -0,0 +1,9 @@ +#version 120 + +uniform float alpha; // Passed in by callback +uniform sampler2D tex; +uniform int time; // Passed in, see ShaderHelper.java + +void main() { + gl_FragColor = texture2D(tex, vec2(gl_TexCoord[0])) * gl_Color * vec4(1.0, 1.0, 1.0, alpha); +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/shader/alpha.vert b/src/main/resources/assets/botania/shader/alpha.vert new file mode 100644 index 000000000..f76947aa8 --- /dev/null +++ b/src/main/resources/assets/botania/shader/alpha.vert @@ -0,0 +1,9 @@ +#version 120 + +uniform int time; // Passed in, see ShaderHelper.java + +void main() { + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_FrontColor = gl_Color; +} \ No newline at end of file From ae57ace7e8ff38803a8d3c9d311e9e22b817e2cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 21:03:12 -0500 Subject: [PATCH 493/935] Fix spreader item model, misc fixes, update forge to 1841 so all interact events are back --- build.properties | 2 +- .../vazkii/botania/api/wiki/WikiHooks.java | 2 +- .../client/core/handler/ModelHandler.java | 24 +++++----- .../core/handler/MultiblockRenderHandler.java | 8 +--- .../block/decor/slabs/BlockModSlab.java | 6 ++- .../string/BlockRedStringInterceptor.java | 6 +-- .../vazkii/botania/common/brew/ModBrews.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 43 ----------------- .../common/core/proxy/CommonProxy.java | 2 - .../botania/common/item/ItemLaputaShard.java | 2 +- .../item/material/ItemManaResource.java | 48 ++++++++----------- .../common/item/relic/ItemLokiRing.java | 19 ++++---- .../common/item/rod/ItemExchangeRod.java | 13 ++--- .../common/world/SkyblockWorldEvents.java | 32 ++++++------- .../assets/botania/blockstates/spreader.json | 7 +-- 15 files changed, 77 insertions(+), 139 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java diff --git a/build.properties b/build.properties index ef8b75489..1ddffd5c0 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1833-1.9 +forge_version=12.16.0.1841-1.9 mc_version=1.9 dir_repo=./ build_number=300-ALPHA diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 3d22f4cde..4f1523824 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -24,7 +24,7 @@ public class WikiHooks { private static final Map modWikis = new HashMap<>(); public static IWikiProvider getWikiFor(Block block) { - ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); + ResourceLocation mod = Block.blockRegistry.getNameForObject(block); return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); } 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 a240c8775..c0b78ba38 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -685,7 +685,7 @@ public final class ModelHandler { private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.mushroom).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } @@ -693,26 +693,26 @@ public final class ModelHandler { private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); + String name = Block.blockRegistry.getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); + String name = Block.blockRegistry.getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); + String name = Block.blockRegistry.getNameForObject(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 = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower2).toString(); String variant = "inventory_" + color.getName(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } @@ -720,7 +720,7 @@ public final class ModelHandler { private static void registerPavement() { Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); - String name = GameData.getBlockRegistry().getNameForObject(ModFluffBlocks.pavement).toString(); + String name = Block.blockRegistry.getNameForObject(ModFluffBlocks.pavement).toString(); for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { String variant = "color=" + e.getName(); @@ -870,7 +870,7 @@ public final class ModelHandler { private static void registerAltars() { Item item = Item.getItemFromBlock(ModBlocks.altar); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); + String name = Block.blockRegistry.getNameForObject(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)); @@ -882,7 +882,7 @@ public final class ModelHandler { if (b == null) // Dark quartz disabled continue; Item item = Item.getItemFromBlock(b); - String name = GameData.getBlockRegistry().getNameForObject(b).toString(); + String name = Block.blockRegistry.getNameForObject(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")); @@ -891,7 +891,7 @@ public final class ModelHandler { private static void registerLuminizers() { Item item = Item.getItemFromBlock(ModBlocks.lightRelay); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.lightRelay).toString(); for (LuminizerVariant v : LuminizerVariant.values()) { ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); } @@ -899,7 +899,7 @@ public final class ModelHandler { private static void registerPools() { Item item = Item.getItemFromBlock(ModBlocks.pool); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.pool).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.pool).toString(); for (PoolVariant v : PoolVariant.values()) { if (v == PoolVariant.CREATIVE) { // Special case to have mana water layer @@ -913,7 +913,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 = GameData.getBlockRegistry().getNameForObject(b).toString(); + String baseName = Block.blockRegistry.getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } @@ -923,7 +923,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 = GameData.getItemRegistry().getNameForObject(item).toString(); + String loc = Item.itemRegistry.getNameForObject(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/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 0dfbfe317..30f9dbdc7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -35,12 +35,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -49,8 +47,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; -import java.util.List; - public final class MultiblockRenderHandler { private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); @@ -115,8 +111,8 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - if(currentMultiblock != null && anchor == null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 3b0c317d0..fc7d93abd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -12,6 +12,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.RayTraceResult; @@ -22,6 +23,7 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { @@ -89,7 +91,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } public void register() { - GameRegistry.registerBlock(this, isDouble() ? null : ItemBlockModSlab.class, name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + if (!isDouble()) + GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 57eea369b..0bd09610f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -21,7 +21,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; @@ -61,9 +60,8 @@ public class BlockRedStringInterceptor extends BlockRedString { } @SubscribeEvent - public void onInteract(PlayerInteractEvent event) { - if(event.getAction() == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), EnumHand.MAIN_HAND); // todo 1.9 + public void onInteract(PlayerInteractEvent.RightClickBlock event) { + TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), event.getHand()); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index d0b3e803a..531325ef0 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -69,7 +69,7 @@ public class ModBrews { } public static void initTC() { - Potion warpWardPotion = GameData.getPotionRegistry().getObject(new ResourceLocation("minecraft:warp_ward")); + Potion warpWardPotion = Potion.potionRegistry.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/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java deleted file mode 100644 index 13933902c..000000000 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 30, 2014, 12:37:24 PM (GMT)] - */ -package vazkii.botania.common.core.handler; - -import net.minecraft.entity.EntityList; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -public final class SpawnerChangingHandler { - - @SubscribeEvent - public void onInteract(PlayerInteractEvent event) { - /*if(event.entityPlayer == null || event.entityPlayer.capabilities == null || event.world == null) todo 1.9 - return; // Cauldron breaks stuff - - if(event.entityPlayer.capabilities.isCreativeMode && !event.world.isRemote && event.action == Action.RIGHT_CLICK_BLOCK && !event.entityPlayer.isSneaking()) { - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); - if(stack != null && stack.getItem() == Items.spawn_egg) { - TileEntity tile = event.world.getTileEntity(event.pos); - if(tile instanceof TileEntityMobSpawner) { - TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; - spawner.getSpawnerBaseLogic().setEntityName(EntityList.getStringFromID(stack.getItemDamage())); - event.world.markBlockForUpdate(event.pos); - event.setCanceled(true); - } - } - }*/ - } - -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f72954d77..4e62edf08 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -55,7 +55,6 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.handler.SpawnerChangingHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModBrewRecipes; import vazkii.botania.common.crafting.ModCraftingRecipes; @@ -137,7 +136,6 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); MinecraftForge.EVENT_BUS.register(new PixieHandler()); MinecraftForge.EVENT_BUS.register(new SheddingHandler()); - MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ddd30b2c4..97405017c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -137,7 +137,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet world.playAuxSFX(2001, pos_, Block.getStateId(state)); ItemStack copyLens = new ItemStack(this, 1, lens.getItemDamage()); - ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, GameData.getBlockRegistry().getNameForObject(block).toString()); + ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(copyLens, TAG_META, block.getMetaFromState(state)); NBTTagCompound cmp = new NBTTagCompound(); if(tile != null) 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 193523236..5d3e1c78b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -28,11 +28,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; @@ -43,7 +41,6 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -60,35 +57,32 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; todo 1.9 - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + ItemStack stack = event.getItemStack(); boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; - boolean ender = event.world.provider.getDimension() == 1; + boolean ender = event.getWorld().provider.getDimension() == 1; - if(rightEvent && correctStack && ender) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); - if(pos == null) { - if (event.entityPlayer.worldObj.isRemote) { - event.entityPlayer.swingItem(); + if(correctStack && ender) { + if (event.getWorld().isRemote) { + event.getEntityPlayer().swingArm(event.getHand()); + } else { + ItemStack stack1 = new ItemStack(this, 1, 15); + event.getEntityPlayer().addStat(ModAchievements.enderAirMake, 1); + + if(!event.getEntityPlayer().inventory.addItemStackToInventory(stack1)) { + event.getEntityPlayer().dropPlayerItemWithRandomChoice(stack1, true); } else { - ItemStack stack1 = new ItemStack(this, 1, 15); - event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); - - if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) { - event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); - } else { - event.entityPlayer.openContainer.detectAndSendChanges(); - } - - stack.stackSize--; - if(stack.stackSize == 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); - - event.world.playSound(null, event.pos, SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); + event.getEntityPlayer().openContainer.detectAndSendChanges(); } + + stack.stackSize--; + 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.setCanceled(true); } - }*/ + } } @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 363ad190d..44387d9b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item.relic; import java.util.ArrayList; import java.util.List; +import baubles.common.network.PacketHandler; +import baubles.common.network.PacketSyncBauble; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -33,7 +35,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaUsingItem; @@ -45,8 +46,6 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -69,8 +68,8 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*EntityPlayer player = event.entityPlayer; todo 1.9 + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) return; @@ -85,7 +84,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } - ItemStack heldItemStack = player.getCurrentEquippedItem(); + ItemStack heldItemStack = event.getItemStack(); BlockPos originCoords = getOriginPos(lokiRing); RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); List cursors = getCursorList(lokiRing); @@ -93,7 +92,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); - if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { + if(heldItemStack == null && player.isSneaking()) { if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) { setOriginPos(lokiRing, lookPos.getBlockPos()); setCursorList(lokiRing, null); @@ -123,19 +122,19 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } } - } else if(heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { + } else if(heldItemStack != null && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { for(BlockPos cursor : cursors) { BlockPos pos = lookPos.getBlockPos().add(cursor); Item item = heldItemStack.getItem(); if(!player.worldObj.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); + item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); if(heldItemStack.stackSize == 0) { event.setCanceled(true); return; } } } - }*/ + } } public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { 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 49cddcfe3..4f9c2c25f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -35,7 +35,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -108,13 +107,11 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @SubscribeEvent - public void onLeftClick(PlayerInteractEvent event) { - if(event.getAction() == Action.LEFT_CLICK_BLOCK) { - ItemStack stack = event.getEntityPlayer().getHeldItemMainhand(); - if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { - if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) - ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); - } + public void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { + ItemStack stack = event.getItemStack(); + if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { + if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) + ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 7b830be89..3dcd23805 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -20,18 +20,18 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.tool.ToolCommons; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.item.equipment.tool.ToolCommons; public final class SkyblockWorldEvents { @@ -65,35 +65,35 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { todo 1.9 - ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); - if(event.action == Action.RIGHT_CLICK_BLOCK && equipped == null && event.entityPlayer.isSneaking()) { - Block block = event.getWorld().getBlockState(event.pos).getBlock(); + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { + 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(event.getWorld().isRemote) - event.entityPlayer.swingItem(); + event.getEntityPlayer().swingArm(event.getHand()); else { - event.getWorld().playSoundEffect(event.pos.getX() + 0.5, event.pos.getY() + 0.5, event.pos.getZ() + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getFrequency() + (float) (Math.random() * 0.2 - 0.1)); + event.getWorld().playSound(null, event.getPos(), block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); if(Math.random() < 0.8) - event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); + event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } } - } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.getWorld().isRemote) { - RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.entityPlayer, true, 4.5F); + } 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()).getBlock().getMaterial() == Material.water) { + if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, new ItemStack(ModItems.waterBowl)); - else event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.waterBowl), false); + event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, new ItemStack(ModItems.waterBowl)); + else event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.waterBowl), false); } } } } - }*/ + } } @SubscribeEvent diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index f8564bf6e..a5efbf935 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -2,12 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania:spreader", - "transform": { - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875], - "rotation": [{"x": 10}, {"y": -45}, {"z": 170}] - } - } + "transform": "forge:default-block" }, "variants": { "variant": { From fb0a414443a3117f41f3e9c4e30f5ac503eb29df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Apr 2016 08:51:10 -0500 Subject: [PATCH 494/935] Rename build to fix stupid issues --- build.properties | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 1ddffd5c0..6e87d4b74 100644 --- a/build.properties +++ b/build.properties @@ -5,5 +5,5 @@ dir_output=../Build Output/Botania/ forge_version=12.16.0.1841-1.9 mc_version=1.9 dir_repo=./ -build_number=300-ALPHA +build_number=300 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index e85ed4b9e..853c3df8f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -124,7 +124,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { public static String getEdition() { String version = LibMisc.BUILD; - int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version.replace("[^\\d]", "")); + int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } From 796d231867dc91c611027c3ce12c17de80433557 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Apr 2016 13:20:37 -0500 Subject: [PATCH 495/935] Fix wall digging textures --- .../assets/botania/blockstates/biomeStoneA0Wall.json | 4 ++++ .../resources/assets/botania/blockstates/dreamwood0Wall.json | 3 ++- .../resources/assets/botania/blockstates/livingrock0Wall.json | 3 ++- .../resources/assets/botania/blockstates/livingwood0Wall.json | 3 ++- .../resources/assets/botania/blockstates/prismarine0Wall.json | 3 ++- .../resources/assets/botania/blockstates/reedBlock0Wall.json | 3 ++- src/main/resources/assets/botania/blockstates/stone0Wall.json | 4 ++++ 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json index 87e51eb6d..5e6ffa42d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -1,6 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "#wall" + }, "uvlock": true, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json index d5c3c9bad..7ba7ff648 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", "uvlock": true, "transform": "forge:default-block", - "textures": { "wall": "botania:blocks/dreamwood0" } + "textures": { "particle": "#wall", "wall": "botania:blocks/dreamwood0" } }, "variants": { "north": { diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json index c4cf2c3e0..aa60e4087 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", "uvlock": true, "transform": "forge:default-block", - "textures": { "wall": "botania:blocks/livingrock0" } + "textures": { "particle": "#wall", "wall": "botania:blocks/livingrock0" } }, "variants": { "north": { diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json index c6f6b57b1..84cd1fa66 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", "uvlock": true, "transform": "forge:default-block", - "textures": { "wall": "botania:blocks/livingwood0" } + "textures": { "particle": "#wall", "wall": "botania:blocks/livingwood0" } }, "variants": { "north": { diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json index 544b635d1..94f6ccc2a 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", "uvlock": true, "transform": "forge:default-block", - "textures": { "wall": "botania:blocks/prismarine0" } + "textures": { "particle": "#wall", "wall": "botania:blocks/prismarine0" } }, "variants": { "north": { diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json index 11f39c16a..1359e060d 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", "uvlock": true, "transform": "forge:default-block", - "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } + "textures": { "particle": "#side", "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } }, "variants": { "north": { diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json index 29e8e8174..320bb94e1 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -1,6 +1,10 @@ { "forge_marker": 1, "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "#wall" + }, "uvlock": true, "transform": "forge:default-block" }, From 8a6189cbd22f50771baebdefad9b26e294237fb7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Apr 2016 09:42:04 -0500 Subject: [PATCH 496/935] Fix mana tablet rendering --- .../client/core/handler/BaubleRenderHandler.java | 10 ++++++---- .../client/core/handler/MultiblockRenderHandler.java | 2 +- src/main/java/vazkii/botania/client/fx/FXSparkle.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) 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 429411b66..4ba31213b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -112,12 +112,14 @@ public final class BaubleRenderHandler implements LayerRenderer { Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null; GlStateManager.rotate(90, 0, 1, 0); - GlStateManager.rotate(90, 1, 0, 0); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(0, -0.6, 0); + GlStateManager.scale(0.55, 0.55, 0.55); if (renderedOne) - GlStateManager.translate(0F, armor ? 0.20F : 0.18F, -0.25F); + GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F); else - GlStateManager.translate(0F, armor ? -0.39F : -0.35F, -0.25F); + GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F); GlStateManager.scale(0.75F, 0.75F, 0.75F); @@ -126,7 +128,7 @@ public final class BaubleRenderHandler implements LayerRenderer { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); // todo 1.9 GlStateManager.popMatrix(); if(renderedOne) 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 30f9dbdc7..350a60d02 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -208,7 +208,7 @@ public final class MultiblockRenderHandler { } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); - GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? + GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); GlStateManager.color(1, 1, 1, 1); brd.renderBlockBrightness(state, 1.0F); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 24c18b64c..7868001cc 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -153,10 +153,10 @@ public class FXSparkle extends EntityFX { ySpeed *= 0.908000001907348633D; zSpeed *= 0.908000001907348633D; - /*if (onGround) { todo 1.9 + if (isCollided) { xSpeed *= 0.69999998807907104D; zSpeed *= 0.69999998807907104D; - }*/ + } } if(fake && particleAge > 1) From 1f11359b233845330a7ecafd53c4044d97c3bf43 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 6 Apr 2016 18:14:07 -0400 Subject: [PATCH 497/935] Fix munchdew not working Closes #220 --- .../common/block/subtile/generating/SubTileMunchdew.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb870b563..65b44e0cc 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)); From 39a44642e4524abc8c2060e32a507a950446559e Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 6 Apr 2016 18:43:58 -0400 Subject: [PATCH 498/935] Fix the Rod of the Terra Firma not working Closes #191 --- .../common/item/rod/ItemTerraformRod.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) 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 0d7838c94..ff7d70095 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; @@ -27,12 +23,8 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.item.IBlockProvider; @@ -45,7 +37,9 @@ import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.List; public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockProvider, ICraftAchievement{ @@ -107,7 +101,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; int xCenter = (int) par3EntityPlayer.posX; - int yCenter = (int) par3EntityPlayer.posY; + int yCenter = (int) par3EntityPlayer.posY - 1; int zCenter = (int) par3EntityPlayer.posZ; if(yCenter < par2World.getSeaLevel()) // Not below sea level @@ -127,7 +121,11 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP BlockPos pos = new BlockPos(xCenter + i, yStart + k, zCenter + j); IBlockState state = par2World.getBlockState(pos); - if (Item.getItemFromBlock(state.getBlock()) == null) + --k; + + if(state.getBlock() == Blocks.air) + continue; + else if(Item.getItemFromBlock(state.getBlock()) == null) break; int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); for(int id : ids) @@ -154,7 +152,6 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } break; } - --k; } } From fa8c12d6fc218063f6ae42379a15595f73e0dfbc Mon Sep 17 00:00:00 2001 From: yrsegal Date: Thu, 7 Apr 2016 21:50:28 -0400 Subject: [PATCH 499/935] Catalysts can accept any catalyst BlockState. This constitutes a major, but not breaking, API update. All catalyst methods previously in RecipeManaInfusion have been deprecated. --- .../java/vazkii/botania/api/BotaniaAPI.java | 6 +- .../java/vazkii/botania/api/package-info.java | 2 +- .../api/recipe/RecipeManaInfusion.java | 64 +++++++++++++++---- .../botania/api/recipe/RecipeMiniFlower.java | 2 +- .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MiscellaneousIcons.java | 2 + .../jei/manapool/ManaPoolRecipeWrapper.java | 13 ++-- .../botania/common/block/ModBlocks.java | 4 ++ .../block/mana/BlockConjurationCatalyst.java | 10 +++ .../common/block/tile/mana/TilePool.java | 11 +--- .../lexicon/page/PageManaInfusionRecipe.java | 11 ++-- 11 files changed, 89 insertions(+), 38 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 93e756cd0..294dbba87 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -473,7 +473,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaAlchemyRecipe(ItemStack output, Object input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setAlchemy(true); + recipe.setCatalyst(RecipeManaInfusion.alchemyState); return recipe; } @@ -484,7 +484,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Object input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setConjuration(true); + recipe.setCatalyst(RecipeManaInfusion.conjurationState); return recipe; } @@ -503,7 +503,7 @@ public final class BotaniaAPI { /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. - * @inputs The items used in the recipe, no more than 6. + * @param inputs The items used in the recipe, no more than 6. */ public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) { Preconditions.checkArgument(inputs.length <= 6); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index f82edd722..de410da59 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "77", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "78", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 0f659de48..b31c947f4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,9 +10,11 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; import java.util.List; public class RecipeManaInfusion { @@ -20,8 +22,10 @@ public class RecipeManaInfusion { private final ItemStack output; private final Object input; private final int mana; - boolean isAlchemy = false; - boolean isConjuration = false; + private @Nullable IBlockState catalystState; + + public static IBlockState alchemyState; + public static IBlockState conjurationState; public RecipeManaInfusion(ItemStack output, Object input, int mana) { this.output = output; @@ -54,20 +58,12 @@ public class RecipeManaInfusion { return false; } - public void setAlchemy(boolean alchemy) { - isAlchemy = alchemy; + public IBlockState getCatalyst() { + return catalystState; } - public boolean isAlchemy() { - return isAlchemy; - } - - public void setConjuration(boolean conjuration) { - isConjuration = conjuration; - } - - public boolean isConjuration() { - return isConjuration; + public void setCatalyst(IBlockState catalyst) { + catalystState = catalyst; } public Object getInput() { @@ -81,5 +77,45 @@ public class RecipeManaInfusion { public int getManaToConsume() { return mana; } + + + + /** + * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead + */ + @Deprecated + public void setAlchemy(boolean alchemy) { + if (alchemy) + catalystState = alchemyState; + else + catalystState = null; + } + + /** + * @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead + */ + @Deprecated + public boolean isAlchemy() { + return catalystState != null && catalystState.equals(alchemyState); + } + + /** + * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead + */ + @Deprecated + public void setConjuration(boolean conjuration) { + if (conjuration) + catalystState = conjurationState; + else + catalystState = null; + } + + /** + * @deprecated Use {@link RecipeManaInfusion#getCatalyst()} instead + */ + @Deprecated + public boolean isConjuration() { + return catalystState != null && catalystState.equals(conjurationState); + } } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index e4f165ae4..351b9639a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -17,7 +17,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion { public RecipeMiniFlower(String flower, String mini, int mana) { super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), BotaniaAPI.internalHandler.getSubTileAsStack(mini), mana); - setAlchemy(true); + setCatalyst(RecipeManaInfusion.alchemyState); } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 53c73042e..c54159528 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -278,7 +278,7 @@ public final class HUDHandler { profiler.startSection("poolRecipe"); for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { if(recipe.matches(stack)) { - if((!recipe.isAlchemy() || tile.alchemy) && (!recipe.isConjuration() || tile.conjuration)) { + if(recipe.getCatalyst() == null || tile.getWorld().getBlockState(tile.getPos().down()).equals(recipe.getCatalyst())) { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; 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 6bb019a71..68c47d51a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -50,6 +50,7 @@ public class MiscellaneousIcons { lightRelayWorldIcon, lightRelayWorldIconRed, alchemyCatalystOverlay, + conjurationCatalystOverlay, enchanterOverlay, manaVoidOverlay, manaWater, @@ -105,6 +106,7 @@ public class MiscellaneousIcons { lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); + conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); manaVoidOverlay = IconHelper.forName(evt.getMap(), "manaVoid1", "blocks"); manaWater = IconHelper.forName(evt.getMap(), "manaWater", "blocks"); diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index 63c33004d..bbf50d856 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -10,8 +10,10 @@ package vazkii.botania.client.integration.jei.manapool; import com.google.common.collect.ImmutableList; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -31,7 +33,7 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { private final int mana; public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder builder = ImmutableList.builder(); if(recipe.getInput() instanceof ItemStack) { builder.add(recipe.getInput()); @@ -39,10 +41,11 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { builder.add(OreDictionary.getOres(((String) recipe.getInput()))); } - if(recipe.isAlchemy()) { - builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); - } else if(recipe.isConjuration()) { - builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); + if(recipe.getCatalyst() != null) { + Block block = recipe.getCatalyst().getBlock(); + if (Item.getItemFromBlock(block) != null) { + builder.add(new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst()))); + } } input = builder.build(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index b0aed942b..14879b9da 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.lib.LibResources; @@ -409,6 +410,9 @@ public final class ModBlocks { BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); + RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); + RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); + initTileEntities(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 7e6942961..d5f030960 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -10,11 +10,15 @@ */ package vazkii.botania.common.block.mana; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -28,4 +32,10 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.conjurationCatalyst; } + + @Override + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getIcon(World world, BlockPos pos) { + return MiscellaneousIcons.INSTANCE.conjurationCatalystOverlay; + } } 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 0c75f7291..1bbdf303e 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 @@ -84,9 +84,6 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc private static final String TAG_OUTPUT_KEY = "outputKey"; boolean outputting = false; - public boolean alchemy = false; - public boolean conjuration = false; - boolean catalystsRegistered = false; public EnumDyeColor color = EnumDyeColor.WHITE; int mana; @@ -160,11 +157,11 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc age = ((int) MethodHandles.itemAge_getter.invokeExact(item)); } catch (Throwable throwable) { return false; } - if(age > 100 && age < 130 || !catalystsRegistered) + if(age > 100 && age < 130) return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration)) { + if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()).equals(recipe.getCatalyst()))) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana); @@ -232,10 +229,6 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc sendPacket = false; } - alchemy = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.alchemyCatalyst; - conjuration = worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.conjurationCatalyst; - catalystsRegistered = true; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); for(EntityItem item : items) { if(item.isDead) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b71f71168..1ca856100 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -83,10 +84,12 @@ public class PageManaInfusionRecipe extends PageRecipe { renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); - if(recipe.isAlchemy()) - renderItemAtGridPos(gui, 1, 2, new ItemStack(ModBlocks.alchemyCatalyst), false); - else if(recipe.isConjuration()) - renderItemAtGridPos(gui, 1, 2, new ItemStack(ModBlocks.conjurationCatalyst), false); + if(recipe.getCatalyst() != null) { + Block block = recipe.getCatalyst().getBlock(); + if (Item.getItemFromBlock(block) != null) { + renderItemAtGridPos(gui, 1, 2, new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst())), false); + } + } GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); From be09676053be284f7ff697d047ccd34bb55b4305 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Apr 2016 12:37:13 -0500 Subject: [PATCH 500/935] Use == --- .../botania/api/recipe/RecipeManaInfusion.java | 16 ++++------------ .../botania/client/core/handler/HUDHandler.java | 2 +- .../botania/common/block/tile/mana/TilePool.java | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index b31c947f4..be05608c6 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -78,17 +78,12 @@ public class RecipeManaInfusion { return mana; } - - /** * @deprecated Use {@link RecipeManaInfusion#setCatalyst(IBlockState)} instead */ @Deprecated public void setAlchemy(boolean alchemy) { - if (alchemy) - catalystState = alchemyState; - else - catalystState = null; + catalystState = alchemy ? alchemyState : null; } /** @@ -96,7 +91,7 @@ public class RecipeManaInfusion { */ @Deprecated public boolean isAlchemy() { - return catalystState != null && catalystState.equals(alchemyState); + return catalystState == alchemyState; } /** @@ -104,10 +99,7 @@ public class RecipeManaInfusion { */ @Deprecated public void setConjuration(boolean conjuration) { - if (conjuration) - catalystState = conjurationState; - else - catalystState = null; + catalystState = conjuration ? conjurationState : null; } /** @@ -115,7 +107,7 @@ public class RecipeManaInfusion { */ @Deprecated public boolean isConjuration() { - return catalystState != null && catalystState.equals(conjurationState); + return catalystState == conjurationState; } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c54159528..622018b04 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -278,7 +278,7 @@ public final class HUDHandler { profiler.startSection("poolRecipe"); for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { if(recipe.matches(stack)) { - if(recipe.getCatalyst() == null || tile.getWorld().getBlockState(tile.getPos().down()).equals(recipe.getCatalyst())) { + if(recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; 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 1bbdf303e..f0d5c3f97 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 @@ -161,7 +161,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()).equals(recipe.getCatalyst()))) { + if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()) == recipe.getCatalyst())) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana); From 4a9c269a672bdeb15f93916980cf142530ae50f9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Apr 2016 13:24:44 -0500 Subject: [PATCH 501/935] Clean up terra firma rod code --- .../common/item/rod/ItemTerraformRod.java | 81 ++++++++----------- 1 file changed, 34 insertions(+), 47 deletions(-) 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 ff7d70095..91f981258 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -104,56 +104,43 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int yCenter = (int) par3EntityPlayer.posY - 1; int zCenter = (int) par3EntityPlayer.posZ; - if(yCenter < par2World.getSeaLevel()) // Not below sea level - return; + BlockPos startCenter = new BlockPos(par3EntityPlayer).down(); - int yStart = yCenter + range; + if(startCenter.getY() < par2World.getSeaLevel()) // Not below sea level + return; List blocks = new ArrayList<>(); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) { - int k = 0; - while(true) { - if(yStart + k < 0) - break; + 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) + continue; + else if(Item.getItemFromBlock(state.getBlock()) == null) + continue; + int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); + for(int id : ids) + if(validBlocks.contains(OreDictionary.getOreName(id))) { + List airBlocks = new ArrayList<>(); - BlockPos pos = new BlockPos(xCenter + i, yStart + k, zCenter + j); - IBlockState state = par2World.getBlockState(pos); - - --k; - - if(state.getBlock() == Blocks.air) - continue; - else if(Item.getItemFromBlock(state.getBlock()) == null) - break; - int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); - for(int id : ids) - if(validBlocks.contains(OreDictionary.getOreName(id))) { - boolean hasAir = false; - List airBlocks = new ArrayList<>(); - - 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) { - airBlocks.add(pos_); - hasAir = true; - } - } - - if(hasAir) { - if(pos.getY() > yCenter) - 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)); - } - } - break; + 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) { + airBlocks.add(pos_); } + } + + if(!airBlocks.isEmpty()) { + if(pos.getY() > yCenter) + 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)); + } + } + break; } - } + } int cost = COST_PER * blocks.size(); @@ -164,7 +151,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(!blocks.isEmpty()) { for(int i = 0; i < 10; i++) - par2World.playSound(null, 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, xCenter - range + range * 2 * Math.random(), yCenter + 2 + (Math.random() - 0.5) * 2, zCenter - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); } @@ -176,11 +163,11 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP return true; } - class CoordsWithBlock extends BlockPos { + private class CoordsWithBlock extends BlockPos { - final Block block; + private final Block block; - public CoordsWithBlock(BlockPos pos, Block block) { + private CoordsWithBlock(BlockPos pos, Block block) { super(pos.getX(), pos.getY(), pos.getZ()); this.block = block; } From 7c61b1b9d3ea23a8b11661e9c1a1682904ab9cb7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 20:26:04 -0500 Subject: [PATCH 502/935] Misc cleanup, fix hud catalyst, test gpg sign --- .../vazkii/botania/client/core/handler/HUDHandler.java | 2 +- .../botania/common/item/rod/ItemTerraformRod.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 622018b04..2449bc6b2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -278,7 +278,7 @@ public final class HUDHandler { profiler.startSection("poolRecipe"); for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { if(recipe.matches(stack)) { - if(recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) { + if(recipe.getCatalyst() == null || recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; 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 91f981258..9f501cebb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -97,13 +97,9 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - public void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + private void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; - int xCenter = (int) par3EntityPlayer.posX; - int yCenter = (int) par3EntityPlayer.posY - 1; - int zCenter = (int) par3EntityPlayer.posZ; - BlockPos startCenter = new BlockPos(par3EntityPlayer).down(); if(startCenter.getY() < par2World.getSeaLevel()) // Not below sea level @@ -131,7 +127,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } if(!airBlocks.isEmpty()) { - if(pos.getY() > yCenter) + if(pos.getY() > startCenter.getY()) blocks.add(new CoordsWithBlock(pos, Blocks.air)); else for(BlockPos coords : airBlocks) { if(par2World.getBlockState(coords.down()).getBlock() != Blocks.air) @@ -153,7 +149,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP 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); for(int i = 0; i < 120; i++) - Botania.proxy.sparkleFX(par2World, xCenter - range + range * 2 * Math.random(), yCenter + 2 + (Math.random() - 0.5) * 2, zCenter - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); + 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); } } } From 533a287bd3adf3989a9e4a92fe9d48f8125ebdc4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 21:03:51 -0500 Subject: [PATCH 503/935] Allow vanilla flowers to be ground directly into powder. Closes #215 --- .../common/crafting/ModCraftingRecipes.java | 21 +++++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 4 +++- .../resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 556404873..2399aac5c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -15,8 +15,11 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -47,6 +50,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeLexicon; public static List recipesPetals; public static List recipesDyes; + public static List recipesDyesVanilla; public static List recipesPetalBlocks; public static IRecipe recipePestleAndMortar; public static List recipesTwigWand; @@ -348,6 +352,23 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.dye, 1, i), LibOreDict.PETAL[i], LibOreDict.PESTLE_AND_MORTAR); 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())); + recipesDyesVanilla = BotaniaAPI.getLatestAddedRecipes(14); + // Petal Block Recipes for(int i = 0; i < 16; i++) addOreDictRecipe(new ItemStack(ModBlocks.petalBlock, 1, i), diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 9cb42dd10..71a460782 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -329,7 +329,9 @@ public final class LexiconData { .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCraftingRecipes.recipePestleAndMortar), - new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), new PageText("6"), + new PageCraftingRecipe("5", ModCraftingRecipes.recipesDyes), + new PageCraftingRecipe("5.5", ModCraftingRecipes.recipesDyesVanilla), + new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble), diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 7871d90fd..1f220c9d6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2023,6 +2023,7 @@ botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that botania.page.flowers3=Plucking Petals off Flowers. botania.page.flowers4=Crafting the &1Pestle and Mortar&0. botania.page.flowers5=Grinding Petals into Powder. +botania.page.flowers5.5=Grinding mundane flowers into Powder. botania.page.flowers6=Right clicking the &1Floral Powder&0 in any &1Wool&0 or &1Carpet&0 changes its color to the color of the powder.
By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertilizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vicinity, if you ever run low on them. botania.page.flowers7=Making fertilizer (any powder colors work) botania.page.flowers8=Using typical flower substances also works From 5cdf48393acbf6233cbe36f4fc05b5f521015033 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 21:25:41 -0500 Subject: [PATCH 504/935] Fix top half of double flowers not sparkling with correct color. Also disable random offsetting because it's broken --- .../common/block/BlockModDoubleFlower.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 4dce7062c..aba9fba8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -35,6 +35,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -53,14 +55,12 @@ import java.util.Random; public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; - final int offset; - final boolean second; + private final boolean second; public BlockModDoubleFlower(boolean second) { this.second = second; this.setHardness(0.0F); this.setSoundType(SoundType.PLANT); - offset = second ? 8 : 0; String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); @@ -168,14 +168,23 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + @SideOnly(Side.CLIENT) + public Block.EnumOffsetType getOffsetType() + { + return Block.EnumOffsetType.NONE; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random par5Random) { + state = getActualState(state, world, pos); int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); } From 209970b60c3563f9e0920c01978cf9d086218006 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 21:37:41 -0500 Subject: [PATCH 505/935] Fix bauble box gui. Closes #185 --- .../java/vazkii/botania/client/gui/box/GuiBaubleBox.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index d875c5f3d..634cb86cf 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -36,14 +36,12 @@ public class GuiBaubleBox extends InventoryEffectRenderer { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(texture); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; - drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); for(int i1 = 0; i1 < 4; ++i1) { Slot slot = inventorySlots.inventorySlots.get(i1); if(slot.getHasStack() && slot.getSlotStackLimit() == 1) - drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); + drawTexturedModalRect(guiLeft+slot.xDisplayPosition, guiTop+slot.yDisplayPosition, 200, 0, 16, 16); } GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - p_146976_2_, guiTop + 45 - 30 - p_146976_3_, mc.thePlayer); From d97b2ceb1df61f5092bff7c0963db3edf4e89310 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 9 Apr 2016 22:43:50 -0500 Subject: [PATCH 506/935] Fix pool's north wall being slightly taller, Fix pump item model --- .../client/core/handler/ModelHandler.java | 1 + .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/tile/mana/TilePump.java | 26 +++++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) 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 c0b78ba38..914955f39 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -309,6 +309,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.manaVoid); registerItemModel(ModBlocks.prism); registerItemModel(ModBlocks.pistonRelay); + registerItemModel(ModBlocks.pump); registerItemModel(ModBlocks.redStringComparator); registerItemModel(ModBlocks.redStringContainer); registerItemModel(ModBlocks.redStringDispenser); 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 83bf2a955..a1eb184c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -146,7 +146,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon private static final AxisAlignedBB BOTTOM_AABB = new AxisAlignedBB(0, 0, 0, 1, 1/16.0, 1); private static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0, 0, 15/16.0, 1, 0.5, 1); - private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.7, 1/16.0); + private static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1/16.0); private static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0, 0, 0, 1/16.0, 0.5, 1); private static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(15/16.0, 0, 0, 1, 0.5, 1); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index de4e37d56..de355de06 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -15,8 +15,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.animation.TimeValues; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; @@ -35,21 +38,34 @@ public class TilePump extends TileMod { public int comparator; public boolean hasRedstone = false; - int lastComparator = 0; + private int lastComparator = 0; private final TimeValues.VariableValue move; - //private final IAnimationStateMachine asm; + private final IAnimationStateMachine asm; public TilePump() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - move = new TimeValues.VariableValue(0); //todo 1.9 - //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); + move = new TimeValues.VariableValue(0); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/pump.json"), ImmutableMap.of("move", move)); } else { move = null; - //asm = null; + asm = null; } } + @Override + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); + } + + @Override + public T getCapability(Capability cap, EnumFacing side) { + if (cap == CapabilityAnimation.ANIMATION_CAPABILITY) { + return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); + } + return super.getCapability(cap, side); + } + @Override public void updateEntity() { hasRedstone = false; From 50eeb06bf64636d4256a2900fecaee1cc60cae27 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 19:43:18 -0500 Subject: [PATCH 507/935] Remove useless line. Make horse drop all items when being virused, closes #189 --- src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java | 1 - src/main/java/vazkii/botania/common/item/ItemVirus.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 4e62edf08..410140425 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -75,7 +75,6 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; -//import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; todo 1.8 //import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 45ff70d9e..83cd35278 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -51,6 +51,7 @@ public class ItemVirus extends ItemMod { if(par3EntityLivingBase instanceof EntityHorse) { EntityHorse horse = (EntityHorse) par3EntityLivingBase; if(horse.getType() != HorseArmorType.ZOMBIE && horse.getType() != HorseArmorType.SKELETON && horse.isTame()) { + horse.dropChestItems(); horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseArmorType.ZOMBIE : HorseArmorType.SKELETON); AbstractAttributeMap attributes = horse.getAttributeMap(); IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED); From 70cc32a839c1eadfb09ff95b9862b7721f18360b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 20:18:41 -0500 Subject: [PATCH 508/935] Add RenderFull NBT tag override to pools. Closes #228 --- .../client/core/handler/ModelHandler.java | 34 +++++++++++-------- .../lexicon/page/PageManaInfusionRecipe.java | 14 +++++--- .../assets/botania/blockstates/pool.json | 14 +++++++- 3 files changed, 42 insertions(+), 20 deletions(-) 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 914955f39..eb302fc8c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -28,6 +28,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -113,6 +114,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.ItemTwigWand; @@ -158,7 +160,6 @@ public final class ModelHandler { registerAltars(); registerQuartzBlocks(); registerLuminizers(); - registerPools(); /** Normal Items **/ registerStandardItems(); @@ -172,6 +173,24 @@ public final class ModelHandler { // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper // See https://github.com/MinecraftForge/ForgeGradle/issues/314. + ModelLoader.registerItemVariants(Item.getItemFromBlock(ModBlocks.pool), + new ModelResourceLocation("botania:pool", "variant=default"), + new ModelResourceLocation("botania:pool", "variant=diluted"), + new ModelResourceLocation("botania:pool", "variant=creative"), + new ModelResourceLocation("botania:pool", "variant=fabulous"), + new ModelResourceLocation("botania:pool", "default_full"), + new ModelResourceLocation("botania:pool", "diluted_full"), + new ModelResourceLocation("botania:pool", "creative_full"), + new ModelResourceLocation("botania:pool", "fabulous_full")); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(ModBlocks.pool), MesherWrapper.of(stack -> { + int meta = stack.getMetadata(); + if (meta < 0 || meta > 3) + meta = 0; + PoolVariant v = PoolVariant.values()[meta]; + boolean renderFull = v == PoolVariant.CREATIVE || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); + return new ModelResourceLocation("botania:pool", renderFull ? v.getName() + "_full" : "variant=" + v.getName()); + })); + ModelLoader.registerItemVariants(elementiumShears, new ModelResourceLocation("botania:elementiumShears", "inventory"), new ModelResourceLocation("botania:dammitReddit", "inventory")); @@ -898,19 +917,6 @@ public final class ModelHandler { } } - private static void registerPools() { - Item item = Item.getItemFromBlock(ModBlocks.pool); - String name = Block.blockRegistry.getNameForObject(ModBlocks.pool).toString(); - for (PoolVariant v : PoolVariant.values()) { - if (v == PoolVariant.CREATIVE) { - // Special case to have mana water layer - ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "inventory_creative")); - } else { - ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "variant=" + v.getName())); - } - } - } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 1ca856100..b4d34adc5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -42,18 +42,22 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); - List recipes; - int ticksElapsed = 0; - int recipeAt = 0; + private List recipes; + private int ticksElapsed = 0; + private int recipeAt = 0; + private final ItemStack renderStack; public PageManaInfusionRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; + renderStack = new ItemStack(ModBlocks.pool, 1, 0); + ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); } public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) { @@ -79,8 +83,8 @@ public class PageManaInfusionRecipe extends PageRecipe { renderItemAtGridPos(gui, 1, 1, (ItemStack) input, false); - RenderTilePool.forceMana = true; - renderItemAtGridPos(gui, 2, 1, new ItemStack(ModBlocks.pool, 1, recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0), false); + renderStack.setItemDamage(recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0); + renderItemAtGridPos(gui, 2, 1, renderStack, false); renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 5c62b19bc..2cf104169 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -11,9 +11,21 @@ "creative": { "textures": { "all": "botania:model/infinitePool" } }, "fabulous": { "textures": { "all": "botania:model/pool" } } }, - "inventory_creative": [{ + "default_full": [{ + "model": "botania:pool_filled", + "textures": { "all": "botania:model/pool", "liquid": "botania:blocks/manaWater" } + }], + "diluted_full": [{ + "model": "botania:pool_filled", + "textures": { "all": "botania:model/dilutedPool", "liquid": "botania:blocks/manaWater" } + }], + "creative_full": [{ "model": "botania:pool_filled", "textures": { "all": "botania:model/infinitePool", "liquid": "botania:blocks/manaWater" } + }], + "fabulous_full": [{ + "model": "botania:pool_filled", + "textures": { "all": "botania:model/pool", "liquid": "botania:blocks/manaWater" } }] } } \ No newline at end of file From 07f3099071fa78af461ca844ad38988e0dffc54c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 20:55:11 -0500 Subject: [PATCH 509/935] Force relay tweaks, hopefully resolves #232 --- .../common/block/BlockPistonRelay.java | 62 ++++++++++--------- .../botania/common/item/ItemTwigWand.java | 8 +-- .../botania/common/item/lens/LensWarp.java | 2 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 9612332e4..f2a24dcf7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Random; import java.util.Set; +import java.util.UUID; import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; @@ -55,12 +56,15 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { - public static final Map playerPositions = new HashMap<>(); - public static final Map mappedPositions = new HashMap<>(); + // Currently active binding attempts + public final Map playerPositions = new HashMap<>(); - private static final Set removeThese = new HashSet<>(); - private static final Set checkedCoords = new HashSet<>(); - private static final TObjectIntHashMap coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1); + // Bindings + public final Map mappedPositions = new HashMap<>(); + + private final Set removeQueue = new HashSet<>(); + private final Set checkedCoords = new HashSet<>(); + private final TObjectIntHashMap coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1); public BlockPistonRelay() { super(Material.gourd, LibBlockNames.PISTON_RELAY); @@ -83,50 +87,49 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @Override public void breakBlock(World par1World, BlockPos pos, IBlockState state) { - mapCoords(par1World.provider.getDimension(), pos, 2); + if(!par1World.isRemote) + mapCoords(par1World.provider.getDimension(), pos, 2); } - static void mapCoords(int world, BlockPos pos, int time) { + private void mapCoords(int world, BlockPos pos, int time) { coordsToCheck.put(new DimWithPos(world, pos), time); } - static void decrCoords(DimWithPos key) { + private void decrCoords(DimWithPos key) { int time = getTimeInCoords(key); if(time <= 0) - removeThese.add(key); + removeQueue.add(key); else coordsToCheck.adjustValue(key, -1); } - static int getTimeInCoords(DimWithPos key) { + private int getTimeInCoords(DimWithPos key) { return coordsToCheck.get(key); } - static Block getBlockAt(DimWithPos key) { - IBlockState state = getStateAt(key); - return state == null ? null : state.getBlock(); + private Block getBlockAt(DimWithPos key) { + return getStateAt(key).getBlock(); } - static IBlockState getStateAt(DimWithPos key) { + private IBlockState getStateAt(DimWithPos key) { MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if(server == null) - return null; + return Blocks.air.getDefaultState(); return server.worldServerForDimension(key.dim).getBlockState(key.blockPos); } @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { - if(player == null) + if(player == null || world.isRemote) return false; if(!player.isSneaking()) { - playerPositions.put(player.getName(), new DimWithPos(world.provider.getDimension(), pos)); + playerPositions.put(player.getUniqueID(), new DimWithPos(world.provider.getDimension(), pos)); world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); - if(!world.isRemote) - world.playAuxSFX(2001, pos, Block.getIdFromBlock(this)); + world.playAuxSFX(2001, pos, Block.getStateId(getDefaultState())); } return true; @@ -134,12 +137,14 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void onWorldLoad(WorldEvent.Load event) { - WorldData.get(event.getWorld()); + if(!event.getWorld().isRemote) + WorldData.get(event.getWorld()); } @SubscribeEvent public void onWorldUnload(WorldEvent.Unload event) { - WorldData.get(event.getWorld()).markDirty(); + if(!event.getWorld().isRemote) + WorldData.get(event.getWorld()).markDirty(); } public static class WorldData extends WorldSavedData { @@ -152,7 +157,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @Override public void readFromNBT(NBTTagCompound nbttagcompound) { - mappedPositions.clear(); + ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.clear(); Collection tags = nbttagcompound.getKeySet(); for(String key : tags) { @@ -160,15 +165,15 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(tag instanceof NBTTagString) { String value = ((NBTTagString) tag).getString(); - mappedPositions.put(DimWithPos.fromString(key), DimWithPos.fromString(value)); + ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.put(DimWithPos.fromString(key), DimWithPos.fromString(value)); } } } @Override public void writeToNBT(NBTTagCompound nbttagcompound) { - for(DimWithPos s : mappedPositions.keySet()) - nbttagcompound.setString(s.toString(), mappedPositions.get(s).toString()); + for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet()) + nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString()); } public static WorldData get(World world) { @@ -248,12 +253,11 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } } - for(DimWithPos s : removeThese) { + for(DimWithPos s : removeQueue) { coordsToCheck.remove(s); - if(checkedCoords.contains(s)) - checkedCoords.remove(s); + checkedCoords.remove(s); } - removeThese.clear(); + removeQueue.clear(); } public void save(World world) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 3dceeab72..563571d60 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -141,12 +141,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } return wanded ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getName()) && !par3World.isRemote) { - BlockPistonRelay.DimWithPos bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getName()); + } else if(((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.containsKey(par2EntityPlayer.getUniqueID()) && !par3World.isRemote) { + BlockPistonRelay.DimWithPos bindPos = ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.get(par2EntityPlayer.getUniqueID()); BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimension(), pos); - BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getName()); - BlockPistonRelay.mappedPositions.put(bindPos, currentPos); + ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.remove(par2EntityPlayer.getUniqueID()); + ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 196b74e55..c3840b7be 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -28,7 +28,7 @@ public class LensWarp extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - BlockPistonRelay.DimWithPos key = BlockPistonRelay.mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); + BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); if(key != null) { if(key.dim == entity.worldObj.provider.getDimension()) { entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5); From cee7a965a5623df5e2abb704bd79a955a7f8e8ff Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 21:17:42 -0500 Subject: [PATCH 510/935] Tweak horse inv dropping --- .../vazkii/botania/common/item/ItemVirus.java | 25 ++++++++++++++++++- .../botania/common/lib/LibObfuscation.java | 3 +++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 83cd35278..30e741ffd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -22,6 +24,7 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.HorseArmorType; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -29,6 +32,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -51,8 +57,25 @@ public class ItemVirus extends ItemMod { if(par3EntityLivingBase instanceof EntityHorse) { EntityHorse horse = (EntityHorse) par3EntityLivingBase; if(horse.getType() != HorseArmorType.ZOMBIE && horse.getType() != HorseArmorType.SKELETON && horse.isTame()) { - horse.dropChestItems(); + IItemHandler inv = horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + ItemStack saddle = inv.getStackInSlot(0); + + for (int i = 1; i < inv.getSlots(); i++) + if(inv.getStackInSlot(i) != null) + horse.entityDropItem(inv.getStackInSlot(i), 0); + horse.entityDropItem(new ItemStack(Blocks.chest), 0); + horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseArmorType.ZOMBIE : HorseArmorType.SKELETON); + + // Reinit the horse chest to the right new size + Method m = ReflectionHelper.findMethod(EntityHorse.class, horse, LibObfuscation.INIT_HORSE_CHEST); + try { + m.invoke(horse); + } catch (IllegalAccessException | InvocationTargetException ignored) {} + + // Put the saddle back + horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).insertItem(0, saddle, false); + AbstractAttributeMap attributes = horse.getAttributeMap(); IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED); IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index f5cf00611..70beb7b3c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -12,6 +12,9 @@ package vazkii.botania.common.lib; public final class LibObfuscation { + // EntityHorse + public static final String[] INIT_HORSE_CHEST = { "initHorseChest", "func_110226_cD", "dJ" }; + // RenderManager public static final String[] RENDERPOSX = { "renderPosX", "field_78725_b", "o" }; public static final String[] RENDERPOSY = { "renderPosY", "field_78726_c", "p" }; From e73feae688880b8a420c8450cd2bf819f292025f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 21:44:30 -0500 Subject: [PATCH 511/935] Tweak horse inv dropping again --- .../vazkii/botania/common/item/ItemVirus.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 30e741ffd..579f9c961 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -55,6 +55,8 @@ public class ItemVirus extends ItemMod { @Override public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase, EnumHand hand) { if(par3EntityLivingBase instanceof EntityHorse) { + if(par2EntityPlayer.worldObj.isRemote) + return true; EntityHorse horse = (EntityHorse) par3EntityLivingBase; if(horse.getType() != HorseArmorType.ZOMBIE && horse.getType() != HorseArmorType.SKELETON && horse.isTame()) { IItemHandler inv = horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); @@ -63,7 +65,8 @@ public class ItemVirus extends ItemMod { for (int i = 1; i < inv.getSlots(); i++) if(inv.getStackInSlot(i) != null) horse.entityDropItem(inv.getStackInSlot(i), 0); - horse.entityDropItem(new ItemStack(Blocks.chest), 0); + if (horse.isChested()) + horse.entityDropItem(new ItemStack(Blocks.chest), 0); horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseArmorType.ZOMBIE : HorseArmorType.SKELETON); @@ -81,9 +84,10 @@ public class ItemVirus extends ItemMod { IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH); health.applyModifier(new AttributeModifier("Ermergerd Virus D:", health.getBaseValue(), 0)); movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0)); - IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.getPrivateValue(EntityHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH)); + 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)); - par3EntityLivingBase.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--; return true; @@ -113,12 +117,8 @@ public class ItemVirus extends ItemMod { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } } From effd07129c11721fcfdd6cca26fc2b37aabb74f4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 22:47:24 -0500 Subject: [PATCH 512/935] A round of FindBugs, and fix red interceptor not working at all --- .../java/vazkii/botania/api/BotaniaAPI.java | 8 +++---- .../handler/ContributorFancinessHandler.java | 11 ++++++---- .../client/core/handler/LightningHandler.java | 4 ++-- .../client/gui/lexicon/GuiLexicon.java | 11 +++++----- .../client/gui/lexicon/GuiLexiconHistory.java | 2 +- .../render/entity/RenderDoppleganger.java | 8 +++---- .../common/achievement/AchievementMod.java | 2 +- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../subtile/functional/SubTileVinculotus.java | 2 +- .../common/block/tile/TileEnchanter.java | 7 +++--- .../common/block/tile/mana/TileSpreader.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 22 +++++++++---------- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/SheddingHandler.java | 5 +++-- .../botania/common/core/helper/Quat.java | 4 ++-- .../botania/common/core/helper/Vector3.java | 6 ++--- .../core/version/ThreadDownloadMod.java | 12 ++++------ .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemIcePendant.java | 4 ++-- .../item/equipment/bauble/ItemTravelBelt.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 6 +++++ .../botania/common/item/rod/ItemSmeltRod.java | 2 +- .../common/item/rod/ItemTerraformRod.java | 2 +- .../common/lexicon/page/PageGuide.java | 4 +++- 24 files changed, 71 insertions(+), 61 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 294dbba87..2ceb01551 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -115,11 +115,11 @@ public final class BotaniaAPI { public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); - public static KnowledgeType basicKnowledge; - public static KnowledgeType elvenKnowledge; + public static final KnowledgeType basicKnowledge; + public static final KnowledgeType elvenKnowledge; // This is here for completeness sake, but you shouldn't use it - public static KnowledgeType relicKnowledge; + public static final KnowledgeType relicKnowledge; // All of these categories are initialized during botania's PreInit stage. public static LexiconCategory categoryBasics; @@ -133,7 +133,7 @@ public final class BotaniaAPI { public static LexiconCategory categoryAlfhomancy; public static LexiconCategory categoryMisc; - public static Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); + public static final Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); static { registerSubTile("", DummySubTile.class); 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 431b21bdf..4e3dfb1dd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -10,7 +10,9 @@ */ package vazkii.botania.client.core.handler; +import java.io.IOException; import java.io.InputStreamReader; +import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -199,11 +201,12 @@ public final class ContributorFancinessHandler implements LayerRenderer boltlist = new ConcurrentLinkedQueue<>(); + public static final ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); public float speed = 1.5F; public static final int fadetime = 20; @@ -205,7 +205,7 @@ public class LightningHandler { public int colorOuter; public int colorInner; - public class BoltPoint { + public static class BoltPoint { public BoltPoint(Vector3 basepoint, Vector3 offsetvec) { point = basepoint.copy().add(offsetvec); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 414b44484..529833325 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -20,6 +20,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Queue; import net.minecraft.client.Minecraft; @@ -73,7 +74,7 @@ public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); public static ItemStack stackUsed; - public static HashMap notes = new HashMap<>(); + public static final Map notes = new HashMap<>(); private static final String TAG_TYPE = "type"; @@ -82,11 +83,11 @@ public class GuiLexicon extends GuiScreen { public static final int BOOKMARK_START = 1337; public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; - public static List bookmarks = new ArrayList<>(); - public static List bookmarkKeys = new ArrayList<>(); - boolean bookmarksNeedPopulation = false; + public static final List bookmarks = new ArrayList<>(); + public static final List bookmarkKeys = new ArrayList<>(); + private boolean bookmarksNeedPopulation = false; - public static Queue tutorial = new ArrayDeque<>(); + public static final Queue tutorial = new ArrayDeque<>(); public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 5e72ae706..f0e4ce30a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; public class GuiLexiconHistory extends GuiLexiconIndex { - public static List history = new ArrayList<>(); + public static final List history = new ArrayList<>(); public GuiLexiconHistory() { super(null); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 733d0b5fd..5c68469d0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -25,13 +25,13 @@ import vazkii.botania.common.entity.EntityDoppleganger; public class RenderDoppleganger extends RenderBiped { - public static float DEFAULT_GRAIN_INTENSITY = 0.05F; - public static float DEFAULT_DISFIGURATION = 0.025F; + public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; + public static final float DEFAULT_DISFIGURATION = 0.025F; public static float grainIntensity = DEFAULT_GRAIN_INTENSITY; public static float disfiguration = DEFAULT_DISFIGURATION; - public static ShaderCallback callback = shader -> { + public static final ShaderCallback callback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); @@ -41,7 +41,7 @@ public class RenderDoppleganger extends RenderBiped { ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); }; - public static ShaderCallback defaultCallback = shader -> { + public static final ShaderCallback defaultCallback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 1c09a65f8..5f88fa1d3 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -21,7 +21,7 @@ import vazkii.botania.api.item.IRelic; public class AchievementMod extends Achievement { - public static List achievements = new ArrayList<>(); + public static final List achievements = new ArrayList<>(); public AchievementMod(String name, int x, int y, ItemStack icon, Achievement parent) { super("achievement.botania:" + name, "botania:" + name, x, y, icon, parent); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 28d0a0af6..afd5bfb44 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index cef4b8324..1969fe51c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; private static final int RANGE = 64; 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 bde2d746f..023e8fba2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import com.google.common.base.Predicates; import net.minecraft.block.state.IBlockState; @@ -323,9 +324,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { itemToEnchant.writeToNBT(itemCmp); cmp.setTag(TAG_ITEM, itemCmp); - String enchStr = ""; - for(EnchantmentData data : enchants) - enchStr = enchStr + Enchantment.enchantmentRegistry.getNameForObject(data.enchantmentobj) + ":" + data.enchantmentLevel + ","; + String enchStr = enchants.stream() + .map(e -> Enchantment.enchantmentRegistry.getNameForObject(e.enchantmentobj) + ":" + e.enchantmentLevel) + .collect(Collectors.joining(",")); cmp.setString(TAG_ENCHANTS, enchStr.isEmpty() ? enchStr : enchStr.substring(0, enchStr.length() - 1)); } 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 6aed8b5b5..adc3abbfb 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 @@ -315,7 +315,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, long least = cmp.getLong(TAG_UUID_LEAST); UUID identity = getIdentifierUnsafe(); if(identity == null || most != identity.getMostSignificantBits() || least != identity.getLeastSignificantBits()) - identity = new UUID(most, least); + this.identity = new UUID(most, least); } else getIdentifier(); mana = cmp.getInteger(TAG_MANA); 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 49ec4f171..30fc3fe6d 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 @@ -11,7 +11,9 @@ package vazkii.botania.common.block.tile.string; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -24,12 +26,12 @@ import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString { - public static List interceptors = new ArrayList<>(); + private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; @Override public void updateEntity() { - if(!interceptors.contains(this)) - interceptors.add(this); + super.updateEntity(); + interceptors.get().add(this); } @Override @@ -37,19 +39,17 @@ public class TileRedStringInterceptor extends TileRedString { return worldObj.getTileEntity(pos) != null; } - public boolean removeFromList() { - return !tileEntityInvalid && worldObj.getTileEntity(pos) == this; + private boolean saneState() { + return !isInvalid() && worldObj.getTileEntity(pos) == this; } public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { List remove = new ArrayList<>(); boolean did = false; - // CMEs are amazing - List interceptorsCopy = new ArrayList<>(interceptors); - - for(TileRedStringInterceptor inter : interceptorsCopy) { - if(!inter.removeFromList()) { + + for(TileRedStringInterceptor inter : interceptors.get()) { + if(!inter.saneState()) { remove.add(inter); continue; } @@ -68,7 +68,7 @@ public class TileRedStringInterceptor extends TileRedString { } } - interceptors.removeAll(remove); + interceptors.get().removeAll(remove); if(did) { if(world.isRemote) player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index c2b7cc223..30c8f982d 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { - public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); + public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); List list; public BotaniaCreativeTab() { 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 0ea5d6552..c3b612e51 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -11,6 +11,7 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; +import java.util.List; import java.util.Map.Entry; import net.minecraft.entity.Entity; @@ -37,8 +38,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static ArrayList patterns = new ArrayList<>(); - public static ArrayList defaultPatterns = new ArrayList<>(); + public static final List patterns = new ArrayList<>(); + public static final List defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index 7ae3c753c..765d50912 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -108,8 +108,8 @@ public class Quat { public String toString() { StringBuilder stringbuilder = new StringBuilder(); Formatter formatter = new Formatter(stringbuilder, Locale.US); - formatter.format("Quaternion:\n"); - formatter.format(" < %f %f %f %f >\n", s, x, y, z); + formatter.format("Quaternion:%n"); + formatter.format(" < %f %f %f %f >%n", s, x, y, z); formatter.close(); return stringbuilder.toString(); } diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 2e1f6e7fb..69e43ee7f 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -30,9 +30,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class Vector3 { - public static Vector3 zero = new Vector3(); - public static Vector3 one = new Vector3(1, 1, 1); - public static Vector3 center = new Vector3(0.5, 0.5, 0.5); + public static final Vector3 zero = new Vector3(); + public static final Vector3 one = new Vector3(1, 1, 1); + public static final Vector3 center = new Vector3(0.5, 0.5, 0.5); public double x; public double y; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 027baa949..6a8885d80 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -12,9 +12,11 @@ package vazkii.botania.common.core.version; import java.awt.Desktop; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URL; import net.minecraft.client.Minecraft; @@ -58,7 +60,7 @@ public class ThreadDownloadMod extends Thread { try { url.openStream().close(); // Add to DL Counter - } catch(IOException e) { } + } catch(IOException ignored) {} url = new URL(base + "files/" + file); webReader = url.openStream(); @@ -87,15 +89,9 @@ public class ThreadDownloadMod extends Thread { Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; - finalize(); - } catch(Throwable e) { + } catch (IOException e) { e.printStackTrace(); sendError(); - try { - finalize(); - } catch(Throwable e1) { - e1.printStackTrace(); - } } } 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 8c1fe59c5..c66429ff5 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 @@ -79,7 +79,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final String TAG_DASH_COOLDOWN = "dashCooldown"; private static final String TAG_IS_SPRINTING = "isSprinting"; - public static List playersWithFlight = new ArrayList(); + public static final List playersWithFlight = new ArrayList(); private static final int COST = 35; private static final int COST_OVERKILL = COST * 3; private static final int MAX_FLY_TIME = 1200; 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 0e4cfee9a..1320e7cc1 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 @@ -39,7 +39,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - public static Map> playerIceBlocks = new HashMap<>(); + public static final Map> playerIceBlocks = new HashMap<>(); public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); @@ -121,7 +121,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } } - class IceRemover { + private static class IceRemover { int time = 30; final BlockPos coords; 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 bc280391f..c85b6f0ce 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 @@ -45,7 +45,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs private static final int COST = 1; private static final int COST_INTERVAL = 10; - public static List playersWithStepup = new ArrayList<>(); + public static final List playersWithStepup = new ArrayList<>(); final float speed; final float jump; 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 e56249902..214180b19 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 @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.PriorityQueue; import java.util.Set; @@ -386,6 +387,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker SwapCandidate cand = (SwapCandidate) other; return coordinates.equals(cand.coordinates) && range == cand.range; } + + @Override + public int hashCode() { + return Objects.hash(coordinates, range); + } } } 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 b5450412c..0b1e9ebab 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -42,7 +42,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int COST = 300; private static final int COST_PER_TICK = COST / TIME; - public static Map playerData = new WeakHashMap<>(); + public static final Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { super(LibItemNames.SMELT_ROD); 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 9f501cebb..feb212989 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -159,7 +159,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP return true; } - private class CoordsWithBlock extends BlockPos { + private static class CoordsWithBlock extends BlockPos { private final Block block; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index ee1d122bd..3cbfa4baf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -11,7 +11,9 @@ package vazkii.botania.common.lexicon.page; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.translation.I18n; @@ -43,7 +45,7 @@ public class PageGuide extends PageText { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); if(Math.random() < 0.01) Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=dQw4w9WgXcQ")); - } catch(Exception e) { } + } catch(IOException | URISyntaxException ignored) { } } } From 69cbecb5215103f0f0ea4cca4242c5160e343a37 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Apr 2016 23:21:23 -0500 Subject: [PATCH 513/935] More cleanup, Full pool for JEI handlers --- .../java/vazkii/botania/api/BotaniaAPI.java | 4 +- .../client/gui/crafting/GuiCraftingHalo.java | 4 +- .../client/gui/lexicon/GuiLexicon.java | 6 +- .../jei/manapool/ManaPoolRecipeCategory.java | 5 +- .../botania/client/model/ModelPump.java | 71 ------------------- .../client/model/SpecialFlowerModel.java | 6 +- .../client/render/tile/RenderTilePool.java | 2 +- .../client/render/tile/RenderTilePump.java | 58 --------------- .../botania/common/block/ModBanners.java | 2 +- .../block/decor/panes/BlockModPane.java | 7 +- .../common/core/handler/ConfigHandler.java | 15 ++-- .../crafting/recipe/LensDyeingRecipe.java | 4 +- .../item/equipment/bauble/ItemMagnetRing.java | 2 +- 13 files changed, 29 insertions(+), 157 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelPump.java delete mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 2ceb01551..4d2e5e0ae 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -86,11 +86,11 @@ public final class BotaniaAPI { public static final List brewRecipes = new ArrayList<>(); public static final List miniFlowerRecipes = new ArrayList<>(); - private static final BiMap> subTiles = HashBiMap.> create(); + private static final BiMap> subTiles = HashBiMap.create(); private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); public static final Set subtilesForCreativeMenu = new LinkedHashSet<>(); public static final Map subTileMods = new HashMap<>(); - public static final BiMap miniFlowers = HashBiMap. create(); + public static final BiMap miniFlowers = HashBiMap.create(); public static final Map oreWeights = new HashMap<>(); public static final Map oreWeightsNether = new HashMap<>(); diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index 693d65910..ac9ede0a1 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -28,8 +28,8 @@ public class GuiCraftingHalo extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752); - fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.format("container.crafting"), 28, 6, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 529833325..db868bbab 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -13,6 +13,8 @@ package vazkii.botania.client.gui.lexicon; import java.awt.Desktop; import java.io.IOException; import java.net.URI; +import java.time.LocalDateTime; +import java.time.Month; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -181,7 +183,9 @@ public class GuiLexicon extends GuiScreen { button.visible = false; } - if(Calendar.getInstance().get(Calendar.MONTH) == Calendar.NOVEMBER && Calendar.getInstance().get(Calendar.DATE) == 22) + LocalDateTime now = LocalDateTime.now(); + + if(now.getMonth() == Month.NOVEMBER && now.getDayOfMonth() == 22) buttonList.add(new GuiButtonDoot(-99, left + 100, top + 12)); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index d12bac0e0..46ae06e2b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.helper.ItemNBTHelper; import javax.annotation.Nonnull; import java.util.Collection; @@ -28,12 +29,14 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { private final IDrawable background; private final String localizedName; private final IDrawable overlay; + private final ItemStack renderStack = new ItemStack(ModBlocks.pool); public ManaPoolRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); localizedName = I18n.translateToLocal("botania.nei.manaPool"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); + ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); } @Nonnull @@ -92,7 +95,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { } recipeLayout.getItemStacks().init(index, true, 70, 12); - recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0)); + recipeLayout.getItemStacks().set(index, renderStack); index++; recipeLayout.getItemStacks().init(index, false, 99, 12); diff --git a/src/main/java/vazkii/botania/client/model/ModelPump.java b/src/main/java/vazkii/botania/client/model/ModelPump.java deleted file mode 100644 index 3f5e9dd97..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelPump.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import java.util.ArrayList; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelPump extends ModelBase{ - - private ArrayList parts = new ArrayList<>(); - - private ArrayList innerRing = new ArrayList<>(); - private ArrayList outerRing = new ArrayList<>(); - - public ModelPump() { - textureWidth = 64; - textureHeight = 32; - - ModelRenderer main = new ModelRenderer(this, 0, 0); - main.addBox(-2.0F, -2.0F, -7.0F, 4, 4, 14); - main.setRotationPoint(0.0F, 4.0F, 0.0F); - - for(float r = 0; r <= Math.PI * 2; r += Math.PI) { - ModelRenderer side = new ModelRenderer(this, 22, 0); - - side.addBox(-4.0F, -4.0F, 7.0F, 8, 8, 1); - side.setRotationPoint(0.0F, 0.0F, 0.0F); - side.rotateAngleY = r; - main.addChild(side); - } - - for(float r = 0; r <= Math.PI * 2; r += Math.PI / 2) { - ModelRenderer innerPlate = new ModelRenderer(this, 0, 18); - ModelRenderer outerPlate = new ModelRenderer(this, 22, 18); - - innerPlate.addBox(-3.0F, -3.0F, -7.0F, 5, 1, 6); - innerPlate.setRotationPoint(0.0F, 4.0F, 0.0F); - innerPlate.rotateAngleZ = r; - innerRing.add(innerPlate); - parts.add(innerPlate); - - - outerPlate.addBox(-4.0F, -4.0F, 3.0F, 7, 1, 4); - outerPlate.setRotationPoint(0.0F, 4.0F, 0.0F); - outerPlate.rotateAngleZ = r; - outerRing.add(outerPlate); - parts.add(outerPlate); - } - - parts.add(main); - - } - - public void render(float ringPos) { - for(ModelRenderer iRing : innerRing) - iRing.rotationPointZ = ringPos; - - for(ModelRenderer part : parts) - part.render(1F / 16F); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 94c28280d..fcc20e30f 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -58,7 +58,7 @@ import java.util.Map; public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile - public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); + public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.of(), ImmutableMap.of()); private final ImmutableMap, ModelResourceLocation> blockModels; private final ImmutableMap, ModelResourceLocation> itemModels; @@ -105,7 +105,7 @@ public class SpecialFlowerModel implements IModelCustomData { for(String key : customData.keySet()) { if("base".equals(key)) { - blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); + blockBuilder.put(Optional.absent(), getLocation(customData.get(key))); } } @@ -173,7 +173,7 @@ public class SpecialFlowerModel implements IModelCustomData { private void refreshBakedModels() { if(baseModel == null) { // If not done already, bake and cache all models - baseModel = getBlockModel(Optional.absent()); + baseModel = getBlockModel(Optional.absent()); ImmutableMap.Builder builder = ImmutableMap.builder(); for(Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 904b7dfc5..5314c993e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -78,7 +78,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; - int blue = (color & 0xFF) >> 0; + int blue = (color & 0xFF); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); GlStateManager.translate(0.5F, 1.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java deleted file mode 100644 index 750893908..000000000 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 18, 2015, 3:15:38 PM (GMT)] - */ -package vazkii.botania.client.render.tile; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; - -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelPump; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.mana.TilePump; - -public class RenderTilePump extends TileEntitySpecialRenderer { - - private static final float[] ROTATIONS = new float[] { - 180F, 0F, 90F, 270F - }; - - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_PUMP); - private static final ModelPump model = new ModelPump(); - - @Override - public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) { - if(!pump.getWorld().isBlockLoaded(pump.getPos(), false) - || pump.getWorld().getBlockState(pump.getPos()).getBlock() != ModBlocks.pump) - return; - - GlStateManager.pushMatrix(); - GlStateManager.enableRescaleNormal(); - GlStateManager.color(1F, 1F, 1F, 1F); - GlStateManager.translate(d0, d1, d2); - - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - EnumFacing facing = pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; - - GlStateManager.translate(0.5F, 0.5F, 0.5F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F); - model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f))); - GlStateManager.color(1F, 1F, 1F); - GlStateManager.scale(1F, -1F, -1F); - GlStateManager.enableRescaleNormal(); - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index 228845af9..f82033fdd 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -43,6 +43,6 @@ public final class ModBanners { public static void addPattern(Class> clazz, String name, String id, ItemStack craftingItem) { name = "botania_" + name; id = "bt_" + id; - EnumHelper.addEnum(clazz, name.toUpperCase(), new Class[] { String.class, String.class, ItemStack.class }, new Object[] { name, id, craftingItem }); + EnumHelper.addEnum(clazz, name.toUpperCase(), new Class[] { String.class, String.class, ItemStack.class }, name, id, craftingItem); } } 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 e59ad616b..873a128f2 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,11 +27,8 @@ import vazkii.botania.common.lib.LibMisc; public class BlockModPane extends BlockPane { - private final Block source; - public BlockModPane(Block source) { super(Material.glass, false); - this.source = source; // Backward compat don't kill me String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); @@ -44,10 +41,10 @@ public class BlockModPane extends BlockPane { useNeighborBrightness = true; } - @Override + /*@Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; - } + }*/ @Override public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index dde676629..89f9e93b5 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -371,8 +371,7 @@ public final class ConfigHandler { AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { - ArrayList list = new ArrayList<>(); - adaptableValues.put(key, list); + adaptableValues.put(key, new ArrayList<>()); } List list = adaptableValues.get(key); @@ -401,27 +400,27 @@ public final class ConfigHandler { } public void addMappingInt(int version, String key, int val) { - this.addMapping(version, key, val); + this.addMapping(version, key, val); } public void addMappingDouble(int version, String key, double val) { - this.addMapping(version, key, val); + this.addMapping(version, key, val); } public void addMappingBool(int version, String key, boolean val) { - this.addMapping(version, key, val); + this.addMapping(version, key, val); } public void adaptPropertyInt(Property prop, int val) { - this.adaptProperty(prop, val); + this.adaptProperty(prop, val); } public void adaptPropertyDouble(Property prop, double val) { - this.adaptProperty(prop, val); + this.adaptProperty(prop, val); } public void adaptPropertyBool(Property prop, boolean val) { - this.adaptProperty(prop, val); + this.adaptProperty(prop, val); } public static class AdaptableValue { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index dd675825a..1322728e2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -25,9 +25,7 @@ import vazkii.botania.common.lib.LibOreDict; public class LensDyeingRecipe implements IRecipe { - private static final List DYES = Arrays.asList(new String[] { - "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL - }); + private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); @Override public boolean matches(InventoryCrafting var1, World var2) { 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 f17ee16a6..fdecfd1aa 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 @@ -44,7 +44,7 @@ public class ItemMagnetRing extends ItemBauble { private static final List BLACKLIST = Arrays.asList(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); - int range; + final int range; public ItemMagnetRing() { this(LibItemNames.MAGNET_RING, 6); From b3ee6dcf7a2aabf4952803b7bdef8076dea31480 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Apr 2016 00:51:09 -0500 Subject: [PATCH 514/935] More cleanup, brews now average their potion colors instead picking the first --- .../integration/jei/JEIBotaniaPlugin.java | 10 ++++----- .../jei/brewery/BreweryRecipeCategory.java | 4 ++-- .../elventrade/ElvenTradeRecipeCategory.java | 4 ++-- .../jei/manapool/ManaPoolRecipeCategory.java | 5 +++-- .../PetalApothecaryRecipeCategory.java | 5 +++-- .../PetalApothecaryRecipeWrapper.java | 2 +- .../puredaisy/PureDaisyRecipeCategory.java | 5 +++-- .../runicaltar/RunicAltarRecipeCategory.java | 5 +++-- .../botania/client/lib/LibResources.java | 21 ------------------- .../botania/common/brew/BrewModPotion.java | 5 ++++- 10 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index b8445120f..818e72c4c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -28,14 +28,14 @@ import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory; import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; +import javax.annotation.Nonnull; + @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { - private IJeiHelpers jeiHelpers; - @Override - public void register(IModRegistry registry) { - jeiHelpers = registry.getJeiHelpers(); + public void register(@Nonnull IModRegistry registry) { + IJeiHelpers jeiHelpers = registry.getJeiHelpers(); registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), @@ -64,6 +64,6 @@ public class JEIBotaniaPlugin implements IModPlugin { } @Override - public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {} + public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime) {} } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index be8d303b0..c572d9383 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -53,11 +53,11 @@ public class BreweryRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { } @SuppressWarnings("unchecked") 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 526c2118a..4c1b7ec8b 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 @@ -60,7 +60,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); overlay.draw(minecraft, 0, 4); @@ -69,7 +69,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 46ae06e2b..536b363d9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -58,7 +58,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); overlay.draw(minecraft, 48, 0); @@ -67,9 +67,10 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof ManaPoolRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index d818385f5..cb155d1b7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -57,7 +57,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); overlay.draw(minecraft); @@ -66,9 +66,10 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 2f54919a7..476f73ccf 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -26,7 +26,7 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { private final ItemStack output; public PetalApothecaryRecipeWrapper(RecipePetals recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { if(o instanceof ItemStack) { builder.add(o); diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 0cb9438ad..86c145688 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -56,7 +56,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); overlay.draw(minecraft, 48, 0); @@ -65,9 +65,10 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof PureDaisyRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index bb81031f7..914c8b02b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -56,7 +56,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { } @Override - public void drawExtras(Minecraft minecraft) { + public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); overlay.draw(minecraft); @@ -65,9 +65,10 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(Minecraft minecraft) { + public void drawAnimations(@Nonnull Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof RunicAltarRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 4342933f4..74d0d2e02 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -65,18 +65,12 @@ public final class LibResources { public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png"; public static final String ENTRY_BANNERS = PREFIX_ENTRIES + "banners.png"; - public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; - public static final String MODEL_ALTAR_META = PREFIX_MODEL + "altarMeta%d.png"; - public static final String MODEL_ALTAR_MOSSY = PREFIX_MODEL + "altarMossy.png"; public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; public static final String MODEL_SPREADER_REDSTONE = PREFIX_MODEL + "spreaderRedstone.png"; public static final String MODEL_SPREADER_DREAMWOOD = PREFIX_MODEL + "spreaderDreamwood.png"; public static final String MODEL_SPREADER_HALLOWEEN = PREFIX_MODEL + "spreader_halloween.png"; public static final String MODEL_SPREADER_REDSTONE_HALLOWEEN = PREFIX_MODEL + "spreaderRedstone_halloween.png"; public static final String MODEL_SPREADER_DREAMWOOD_HALLOWEEN = PREFIX_MODEL + "spreaderDreamwood_halloween.png"; - public static final String MODEL_POOL = PREFIX_MODEL + "pool.png"; - public static final String MODEL_INFINITE_POOL = PREFIX_MODEL + "infinitePool.png"; - public static final String MODEL_DILUTED_POOL = PREFIX_MODEL + "dilutedPool.png"; public static final String MODEL_PYLON_OLD = PREFIX_MODEL + "pylonOld.png"; public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; public static final String MODEL_PYLON_GREEN_OLD = PREFIX_MODEL + "pylonOld1.png"; @@ -104,7 +98,6 @@ public final class LibResources { public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png"; public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tinyPotato_halloween.png"; - public static final String MODEL_SPAWNER_CLAW = PREFIX_MODEL + "spawnerClaw.png"; public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png"; public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "superTravelBelt.png"; @@ -114,20 +107,8 @@ public final class LibResources { public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; - public static final String MODEL_PUMP = PREFIX_MODEL + "pump.png"; - public static final String MODEL_MINI_ISLAND = PREFIX_MODEL + "miniIsland.png"; - public static final String MODEL_MINI_ISLAND_PODZOL = PREFIX_MODEL + "miniIslandPodzol.png"; - public static final String MODEL_MINI_ISLAND_MYCEL = PREFIX_MODEL + "miniIslandMycelium.png"; - public static final String MODEL_MINI_ISLAND_SNOW = PREFIX_MODEL + "miniIslandSnow.png"; - public static final String MODEL_MINI_ISLAND_DRY = PREFIX_MODEL + "miniIslandDry.png"; - public static final String MODEL_MINI_ISLAND_GOLDEN = PREFIX_MODEL + "miniIslandGolden.png"; - public static final String MODEL_MINI_ISLAND_VIVID = PREFIX_MODEL + "miniIslandVivid.png"; - public static final String MODEL_MINI_ISLAND_SCORCHED = PREFIX_MODEL + "miniIslandScorched.png"; - public static final String MODEL_MINI_ISLAND_INFUSED = PREFIX_MODEL + "miniIslandInfused.png"; - public static final String MODEL_MINI_ISLAND_MUTATED = PREFIX_MODEL + "miniIslandMutated.png"; public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png"; - public static final String MODEL_INCENSE_PLATE = PREFIX_MODEL + "incensePlate.png"; public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png"; public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png"; public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png"; @@ -151,8 +132,6 @@ public final class LibResources { public static final String MISC_RAINBOW = PREFIX_MISC + "rainbow.png"; public static final String MISC_PLANET = PREFIX_MISC + "planet"; - public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; - public static final String CATEGORY_INDEX = PREFIX_CATEGORIES + "index.png"; public static final String SHADER_PYLON_GLOW_FRAG = PREFIX_SHADER + "pylon_glow.frag"; diff --git a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java index 1a6f4dda8..746004b99 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java +++ b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java @@ -11,11 +11,14 @@ package vazkii.botania.common.brew; import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.PotionUtils; + +import java.util.Arrays; public class BrewModPotion extends BrewMod { public BrewModPotion(String key, int cost, PotionEffect... effects) { - super(key, effects[0].getPotion().getLiquidColor(), cost, effects); + super(key, PotionUtils.getPotionColorFromEffectList(Arrays.asList(effects)), cost, effects); } } From 649dffcf710027eda4273a0fe1b0451d40aa2a52 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Apr 2016 01:32:49 -0500 Subject: [PATCH 515/935] Moar cleanups! --- .../botania/api/internal/IManaBurst.java | 50 ++-- .../vazkii/botania/client/fx/FXSparkle.java | 6 +- .../java/vazkii/botania/client/fx/FXWisp.java | 6 +- .../subtile/functional/SubTileHopperhock.java | 5 +- .../tile/corporea/TileCorporeaFunnel.java | 10 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../core/handler/CommonTickHandler.java | 21 -- .../core/handler/ManaNetworkHandler.java | 4 +- .../common/core/handler/PixieHandler.java | 15 +- .../common/core/handler/SheddingHandler.java | 10 +- .../common/core/helper/InventoryHelper.java | 156 +++------- .../common/core/helper/InventoryHelper2.java | 72 ----- .../common/core/helper/ObfuscationHelper.java | 23 -- .../common/core/version/AdaptorNotifier.java | 2 +- .../core/version/ThreadDownloadMod.java | 10 +- .../common/entity/EntityBabylonWeapon.java | 2 +- .../common/entity/EntityCorporeaSpark.java | 6 +- .../common/entity/EntityDoppleganger.java | 13 +- .../common/entity/EntityManaBurst.java | 281 +++--------------- .../botania/common/item/ItemCraftingHalo.java | 5 +- 20 files changed, 156 insertions(+), 545 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java delete mode 100644 src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 42745a74d..099e402d7 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -20,54 +20,54 @@ import java.util.UUID; */ public interface IManaBurst { - public boolean isFake(); + boolean isFake(); - public void setMotion(double x, double y, double z); + void setMotion(double x, double y, double z); - public int getColor(); + int getColor(); - public void setColor(int color); + void setColor(int color); - public int getMana(); + int getMana(); - public void setMana(int mana); + void setMana(int mana); - public int getStartingMana(); + int getStartingMana(); - public void setStartingMana(int mana); + void setStartingMana(int mana); - public int getMinManaLoss(); + int getMinManaLoss(); - public void setMinManaLoss(int minManaLoss); + void setMinManaLoss(int minManaLoss); - public float getManaLossPerTick(); + float getManaLossPerTick(); - public void setManaLossPerTick(float mana); + void setManaLossPerTick(float mana); - public float getGravity(); + float getGravity(); - public void setGravity(float gravity); + void setGravity(float gravity); - public BlockPos getBurstSourceBlockPos(); + BlockPos getBurstSourceBlockPos(); - public void setBurstSourceCoords(BlockPos pos); + void setBurstSourceCoords(BlockPos pos); - public ItemStack getSourceLens(); + ItemStack getSourceLens(); - public void setSourceLens(ItemStack lens); + void setSourceLens(ItemStack lens); - public boolean hasAlreadyCollidedAt(BlockPos pos); + boolean hasAlreadyCollidedAt(BlockPos pos); - public void setCollidedAt(BlockPos pos); + void setCollidedAt(BlockPos pos); - public int getTicksExisted(); + int getTicksExisted(); - public void setFake(boolean fake); + void setFake(boolean fake); - public void setShooterUUID(UUID uuid); + void setShooterUUID(UUID uuid); - public UUID getShooterUIID(); + UUID getShooterUUID(); - public void ping(); + void ping(); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 7868001cc..1ae98921c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -14,6 +14,7 @@ import java.util.ArrayDeque; import java.util.Queue; import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -25,12 +26,13 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.ObfuscationHelper; +import vazkii.botania.common.lib.LibObfuscation; public class FXSparkle extends EntityFX { @@ -73,7 +75,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 ? ObfuscationHelper.getParticleTexture() : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index e7889398d..d9fcb832c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -14,6 +14,7 @@ import java.util.ArrayDeque; import java.util.Queue; import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -23,12 +24,13 @@ import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.ObfuscationHelper; import net.minecraftforge.fml.client.FMLClientHandler; +import vazkii.botania.common.lib.LibObfuscation; public class FXWisp extends EntityFX { @@ -81,7 +83,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 ? ObfuscationHelper.getParticleTexture() : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); if(!queuedRenders.isEmpty()) { tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index d63ae702e..7e1aa667d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -42,9 +42,8 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.core.helper.InventoryHelper2; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; public class SubTileHopperhock extends SubTileFunctional { @@ -94,7 +93,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - InvWithLocation inv = InventoryHelper2.getInventoryWithLocation(supertile.getWorld(), pos_, dir); + InvWithLocation inv = InventoryHelper.getInventoryWithLocation(supertile.getWorld(), pos_, dir); if(inv != null) { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index e7a83e622..0bb4eab47 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -25,8 +25,6 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.core.helper.InventoryHelper2; -import vazkii.botania.common.lib.LibMisc; public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { @@ -99,16 +97,16 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq private IItemHandler getInv() { TileEntity te = worldObj.getTileEntity(pos.down()); - IItemHandler ret = InventoryHelper2.getInventory(worldObj, pos.down(), EnumFacing.UP); + IItemHandler ret = InventoryHelper.getInventory(worldObj, pos.down(), EnumFacing.UP); if(ret == null) - ret = InventoryHelper2.getInventory(worldObj, pos.down(), null); + ret = InventoryHelper.getInventory(worldObj, pos.down(), null); if(ret != null && !(te instanceof TileCorporeaFunnel)) return ret; te = worldObj.getTileEntity(pos.down(2)); - ret = InventoryHelper2.getInventory(worldObj, pos.down(2), EnumFacing.UP); + ret = InventoryHelper.getInventory(worldObj, pos.down(2), EnumFacing.UP); if(ret == null) - ret = InventoryHelper2.getInventory(worldObj, pos.down(2), null); + ret = InventoryHelper.getInventory(worldObj, pos.down(2), null); if(ret != null && !(te instanceof TileCorporeaFunnel)) return ret; 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 adc3abbfb..6226fb28c 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 @@ -225,7 +225,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, IManaBurst found = null; UUID identity = getIdentifier(); for(IManaBurst burst : ((List) bursts)) - if(burst != null && identity.equals(burst.getShooterUIID())) { + if(burst != null && identity.equals(burst.getShooterUUID())) { found = burst; break; } @@ -777,7 +777,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return identity; } - public UUID getIdentifierUnsafe() { + private UUID getIdentifierUnsafe() { return identity; } diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 806840428..4a87dcfe1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -23,27 +23,6 @@ public final class CommonTickHandler { @SubscribeEvent public void onTick(WorldTickEvent event) { if(event.phase == Phase.END) { - /*List entities = new ArrayList(event.world.loadedEntityList); - for(Entity entity : entities) - if(entity instanceof EntityItem) - TerrasteelCraftingHandler.onEntityUpdate((EntityItem) entity);*/ - - CorporeaHelper.clearCache(); - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onTick(ClientTickEvent event) { - if(event.phase == Phase.END) { - /*World world = Minecraft.getMinecraft().theWorld; - if(world != null) { - List entities = new ArrayList(world.loadedEntityList); - for(Entity entity : entities) - if(entity instanceof EntityItem) - TerrasteelCraftingHandler.onEntityUpdate((EntityItem) entity); - }*/ - CorporeaHelper.clearCache(); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 21107a208..23ae8fc87 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -30,8 +30,8 @@ public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); - public WeakHashMap> manaPools = new WeakHashMap<>(); - public WeakHashMap> manaCollectors = new WeakHashMap<>(); + private final WeakHashMap> manaPools = new WeakHashMap<>(); + private final WeakHashMap> manaCollectors = new WeakHashMap<>(); @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { 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 5fd862300..f43c566f9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -19,6 +19,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PixieHandler { + private static final Potion[] potions = { + MobEffects.blindness, + MobEffects.wither, + MobEffects.moveSlowdown, + MobEffects.weakness + }; + @SubscribeEvent public void onDamageTaken(LivingHurtEvent event) { if(!event.getEntityLiving().worldObj.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { @@ -38,12 +45,6 @@ public class PixieHandler { pixie.setPosition(player.posX, player.posY + 2, player.posZ); if(((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { - Potion[] potions = { - MobEffects.blindness, - MobEffects.wither, - MobEffects.moveSlowdown, - MobEffects.weakness - }; pixie.setApplyPotionEffect(new PotionEffect(potions[event.getEntityLiving().worldObj.rand.nextInt(potions.length)], 40, 0)); } @@ -57,7 +58,7 @@ public class PixieHandler { } } - float getChance(ItemStack stack) { + private float getChance(ItemStack stack) { if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); 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 c3b612e51..2fad5bb81 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -38,8 +38,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static final List patterns = new ArrayList<>(); - public static final List defaultPatterns = new ArrayList<>(); + private static final List patterns = new ArrayList<>(); + private static final List defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { @@ -54,7 +54,7 @@ public final class SheddingHandler { } } - public static ShedPattern getShedPattern(Entity entity) { + private static ShedPattern getShedPattern(Entity entity) { for(ShedPattern pattern : patterns) if(pattern.EntityClass.isInstance(entity)) return pattern; @@ -103,7 +103,7 @@ public final class SheddingHandler { } } - public static void loadFromConfig(Configuration config, String key, ShedPattern defaultPattern) { + private static void loadFromConfig(Configuration config, String key, ShedPattern defaultPattern) { String itemName = ""; int metadata = 0; int rate = -1; @@ -127,7 +127,7 @@ public final class SheddingHandler { patterns.add(new ShedPattern(EntityList.stringToClassMapping.get(key), new ItemStack(Item.itemRegistry.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); } - public static class ShedPattern { + private static class ShedPattern { private final Class EntityClass; private final ItemStack itemStack; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 11bbca7b4..008368a56 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -12,6 +12,7 @@ package vazkii.botania.common.core.helper; import java.util.Arrays; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -32,94 +33,18 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.VanillaDoubleChestItemHandler; +import vazkii.botania.api.corporea.InvWithLocation; //From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { - public static void tryInsertStack(IInventory targetInventory, int slot, ItemStack stack, boolean canMerge) { - if(targetInventory.isItemValidForSlot(slot, stack)) { - ItemStack targetStack = targetInventory.getStackInSlot(slot); - if(targetStack == null) { - int space = targetInventory.getInventoryStackLimit(); - int mergeAmount = Math.min(space, stack.stackSize); - - ItemStack copy = stack.copy(); - copy.stackSize = mergeAmount; - targetInventory.setInventorySlotContents(slot, copy); - stack.stackSize -= mergeAmount; - } else if(canMerge) { - if(targetInventory.isItemValidForSlot(slot, stack) && areMergeCandidates(stack, targetStack)) { - int space = Math.min(targetInventory.getInventoryStackLimit(), targetStack.getMaxStackSize()) - targetStack.stackSize; - int mergeAmount = Math.min(space, stack.stackSize); - - ItemStack copy = targetStack.copy(); - copy.stackSize += mergeAmount; - targetInventory.setInventorySlotContents(slot, copy); - stack.stackSize -= mergeAmount; - } - } - } - } - protected static boolean areMergeCandidates(ItemStack source, ItemStack target) { return source.isItemEqual(target) && ItemStack.areItemStackTagsEqual(source, target) && target.stackSize < target.getMaxStackSize(); } - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack) { - insertItemIntoInventory(inventory, stack, null, -1); - } - - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot) { - insertItemIntoInventory(inventory, stack, side, intoSlot, true); - } - - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot, boolean doMove) { - insertItemIntoInventory(inventory, stack, side, intoSlot, doMove, true); - } - - public static void insertItemIntoInventory(IInventory inventory, ItemStack stack, EnumFacing side, int intoSlot, boolean doMove, boolean canStack) { - if(stack == null) return; - - IInventory targetInventory = inventory; - - if(!doMove) { - targetInventory = new GenericInventory("temporary.inventory", false, targetInventory.getSizeInventory()); - ((GenericInventory)targetInventory).copyFrom(inventory); - } - - int i = 0; - int[] attemptSlots; - - if(inventory instanceof ISidedInventory && side != null) { - attemptSlots = ((ISidedInventory)inventory).getSlotsForFace(side); - if(attemptSlots == null) - attemptSlots = new int[0]; - } else { - attemptSlots = new int[inventory.getSizeInventory()]; - for(int a = 0; a < inventory.getSizeInventory(); a++) - attemptSlots[a] = a; - } - if(intoSlot > -1) { - Set x = new HashSet<>(); - for(int attemptedSlot : attemptSlots) - x.add(attemptedSlot); - - if(x.contains(intoSlot)) - attemptSlots = new int[] { intoSlot }; - else attemptSlots = new int[0]; - } - while(stack.stackSize > 0 && i < attemptSlots.length) { - if(side != null && inventory instanceof ISidedInventory) - if(!((ISidedInventory)inventory).canInsertItem(attemptSlots[i], stack, side)) { - i++; - continue; - } - - tryInsertStack(targetInventory, attemptSlots[i], stack, canStack); - i++; - } - } - public static int testInventoryInsertion(IInventory inventory, ItemStack item, EnumFacing side) { if(item == null || item.stackSize == 0) return 0; @@ -167,38 +92,6 @@ public class InventoryHelper { return 0; } - public static IInventory getInventory(World world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(pos); - if(tileEntity instanceof TileEntityChest) { - Block chestBlock = world.getBlockState(pos).getBlock(); - if(world.getBlockState(pos.west()).getBlock() == chestBlock) - return new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) tileEntity); - if(world.getBlockState(pos.east()).getBlock() == chestBlock) - return new InventoryLargeChest("Large chest", (ILockableContainer) tileEntity, (ILockableContainer) world.getTileEntity(pos.east())); - if(world.getBlockState(pos.north()).getBlock() == chestBlock) - return new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) tileEntity); - if(world.getBlockState(pos.south()).getBlock() == chestBlock) - return new InventoryLargeChest("Large chest", (ILockableContainer) tileEntity, (ILockableContainer) world.getTileEntity(pos.south())); - } - return tileEntity instanceof IInventory ? (IInventory)tileEntity : null; - } - - public static IInventory getInventory(World world, BlockPos pos, EnumFacing direction) { - if(direction != null) { - pos = pos.offset(direction); - } - return getInventory(world, pos); - - } - - public static IInventory getInventory(IInventory inventory) { - if(inventory instanceof TileEntityChest) { - TileEntity te = (TileEntity)inventory; - return getInventory(te.getWorld(), te.getPos()); - } - return inventory; - } - public static int[] buildSlotsForLinearInventory(IInventory inv) { int[] slots = new int[inv.getSizeInventory()]; for (int i = 0; i < slots.length; i++) @@ -207,6 +100,45 @@ public class InventoryHelper { return slots; } + public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { + IItemHandler ret = getInventory(world, pos, side); + if(ret == null) + return null; + else return new InvWithLocation(ret, world, pos); + } + + public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { + TileEntity te = world.getTileEntity(pos); + + if(te == null) + return null; + IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? + te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + if(te instanceof TileEntityChest) + ret = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + + + return ret; + } + + public static Iterable toIterable(IItemHandler itemHandler) { + return () -> new Iterator() { + int index = 0; + + @Override + public boolean hasNext() { + return index < itemHandler.getSlots(); + } + + @Override + public ItemStack next() { + return itemHandler.getStackInSlot(index++); + } + }; + } + public static class GenericInventory implements IInventory { protected String inventoryTitle; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java deleted file mode 100644 index 3663e69b0..000000000 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ /dev/null @@ -1,72 +0,0 @@ -package vazkii.botania.common.core.helper; - -import net.minecraft.block.Block; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryLargeChest; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.ILockableContainer; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; -import vazkii.botania.api.corporea.InvWithLocation; - -import java.util.Iterator; - -public final class InventoryHelper2 { - - public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { - IItemHandler ret = getInventory(world, pos, side); - if(ret == null) - return null; - else return new InvWithLocation(ret, world, pos); - } - - public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { - TileEntity te = world.getTileEntity(pos); - - if(te == null) - return null; - IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? - te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; - if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) - ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - if(te instanceof TileEntityChest) { - Block chestBlock = world.getBlockState(pos).getBlock(); - if(world.getBlockState(pos.west()).getBlock() == chestBlock) - ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) te)); - if(world.getBlockState(pos.east()).getBlock() == chestBlock) - ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.east()))); - if(world.getBlockState(pos.north()).getBlock() == chestBlock) - ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) te)); - if(world.getBlockState(pos.south()).getBlock() == chestBlock) - ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); - } - - return ret; - } - - public static Iterable toIterable(IItemHandler itemHandler) { - return () -> new Iterator() { - int index = 0; - - @Override - public boolean hasNext() { - return index < itemHandler.getSlots(); - } - - @Override - public ItemStack next() { - return itemHandler.getStackInSlot(index++); - } - }; - } - - private InventoryHelper2() {} - -} diff --git a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java b/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java deleted file mode 100644 index 888c94623..000000000 --- a/src/main/java/vazkii/botania/common/core/helper/ObfuscationHelper.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 17, 2014, 4:52:37 PM (GMT)] - */ -package vazkii.botania.common.core.helper; - -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; - -public class ObfuscationHelper { - - public static ResourceLocation getParticleTexture() { - return ReflectionHelper.getPrivateValue(EffectRenderer.class, null, LibObfuscation.PARTICLE_TEXTURES); - } -} diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index e96dca7cd..98a7acae9 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; public final class AdaptorNotifier { - boolean triedToWarnPlayer; + private boolean triedToWarnPlayer; @SubscribeEvent public void onTick(ClientTickEvent event) { diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 6a8885d80..686caa565 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -28,14 +28,14 @@ import net.minecraft.util.text.translation.I18n; public class ThreadDownloadMod extends Thread { - String fileName; + private String fileName; - byte[] buffer = new byte[10240]; + private byte[] buffer = new byte[10240]; - int totalBytesDownloaded; - int bytesJustDownloaded; + private int totalBytesDownloaded; + private int bytesJustDownloaded; - InputStream webReader; + private InputStream webReader; public ThreadDownloadMod(String fileName) { setName("Botania Download File Thread"); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index d3cae814f..dc751cf18 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -112,7 +112,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { motionY = 0; motionZ = 0; } else if (liveTime == delay && player != null) { - Vector3 playerLook = null; + Vector3 playerLook; RayTraceResult lookat = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); if(lookat == null) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index a30f31894..0799c58e4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -17,9 +17,7 @@ import com.google.common.base.Optional; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -33,7 +31,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.common.core.helper.InventoryHelper2; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @@ -195,7 +193,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper2.getInventoryWithLocation(worldObj, new BlockPos(x, y, z), EnumFacing.UP); + return InventoryHelper.getInventoryWithLocation(worldObj, new BlockPos(x, y, z), EnumFacing.UP); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 09a1d215e..73e47ddb6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -49,7 +49,6 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.*; @@ -65,7 +64,6 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.fml.common.registry.GameData; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBossWithShader; @@ -281,7 +279,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return dataManager.get(INVUL_TIME); } - public boolean isAggored() { + public boolean isAggroed() { return dataManager.get(AGGRO); } @@ -337,7 +335,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public void writeEntityToNBT(NBTTagCompound par1nbtTagCompound) { super.writeEntityToNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_INVUL_TIME, getInvulTime()); - par1nbtTagCompound.setBoolean(TAG_AGGRO, isAggored()); + par1nbtTagCompound.setBoolean(TAG_AGGRO, isAggroed()); par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, getMobSpawnTicks()); BlockPos source = getSource(); @@ -376,7 +374,6 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(!playersWhoAttacked.contains(player.getUniqueID())) playersWhoAttacked.add(player.getUniqueID()); - float dmg = par2; boolean crit = false; if(e instanceof EntityPlayer) { EntityPlayer p = (EntityPlayer) e; @@ -384,7 +381,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } int cap = crit ? 60 : 40; - return super.attackEntityFrom(par1DamageSource, Math.min(cap, dmg) * (isHardMode() ? 0.6F : 1F)); + return super.attackEntityFrom(par1DamageSource, Math.min(cap, par2) * (isHardMode() ? 0.6F : 1F)); } return false; } @@ -415,7 +412,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi motionY = 0.5; motionZ = -motionVector.z; setTPDelay(4); - spawnPixies = isAggored(); + spawnPixies = isAggroed(); } setAggroed(true); @@ -651,7 +648,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } motionY = 0; } else { - if(isAggored()) { + if(isAggroed()) { boolean dying = getHealth() / getMaxHealth() < 0.2; if(dying && mobTicks > 0) { motionX = 0; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 6a61173cc..c33425b99 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -12,8 +12,11 @@ package vazkii.botania.common.entity; import java.awt.Color; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Random; +import java.util.Set; import java.util.UUID; import com.google.common.base.Optional; @@ -86,9 +89,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final DataParameter SOURCE_COORDS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.BLOCK_POS); private static final DataParameter> SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.OPTIONAL_ITEM_STACK); - + float accumulatedManaLoss = 0; boolean fake = false; - List alreadyCollidedAt = new ArrayList<>(); + Set alreadyCollidedAt = new HashSet<>(); boolean fullManaLastTick = true; UUID shooterIdentity = null; int _ticksExisted = 0; @@ -150,225 +153,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { setMotion(mx, my, mz); } - float accumulatedManaLoss = 0; - - private int ticksInAir; - - // Hacked code copied from super.onUpdate, to use Vector3 rather than the world vector pool - public void superUpdate() { - lastTickPosX = posX; - lastTickPosY = posY; - lastTickPosZ = posZ; - onEntityUpdate(); - - if(throwableShake > 0) - --throwableShake; - - Vec3d vec3 = new Vector3(posX, posY, posZ).toVec3D(); - Vec3d vec31 = new Vector3(posX + motionX, posY + motionY, posZ + motionZ).toVec3D(); - RayTraceResult RayTraceResult = clip(vec3, vec31); - - if(RayTraceResult != null) - vec31 = new Vector3(RayTraceResult.hitVec.xCoord, RayTraceResult.hitVec.yCoord, RayTraceResult.hitVec.zCoord).toVec3D(); - - if(!worldObj.isRemote) { - Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - EntityLivingBase entitylivingbase = getThrower(); - - for(int j = 0; j < list.size(); ++j) { - Entity entity1 = (Entity) list.get(j); - - if(entity1.canBeCollidedWith() && (entity1 != entitylivingbase || ticksInAir >= 5)) { - float f = 0.3F; - AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); - RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - - if(RayTraceResult1 != null) { - double d1 = vec3.distanceTo(RayTraceResult1.hitVec); - - if (d1 < d0 || d0 == 0.0D) { - entity = entity1; - d0 = d1; - } - } - } - } - - if(entity != null) - RayTraceResult = new RayTraceResult(entity); - } - - if(RayTraceResult != null) - onImpact(RayTraceResult); - - posX += motionX; - posY += motionY; - posZ += motionZ; - float f1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - rotationYaw = (float)(Math.atan2(motionX, motionZ) * 180.0D / Math.PI); - - for(rotationPitch = (float)(Math.atan2(motionY, f1) * 180.0D / Math.PI); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F); - - while(rotationPitch - prevRotationPitch >= 180.0F) - prevRotationPitch += 360.0F; - - while(rotationYaw - prevRotationYaw < -180.0F) - prevRotationYaw -= 360.0F; - - while(rotationYaw - prevRotationYaw >= 180.0F) - prevRotationYaw += 360.0F; - - rotationPitch = prevRotationPitch + (rotationPitch - prevRotationPitch) * 0.2F; - rotationYaw = prevRotationYaw + (rotationYaw - prevRotationYaw) * 0.2F; - float f3 = getGravityVelocity(); - - motionY -= f3; - setPosition(posX, posY, posZ); - } - - public RayTraceResult clip(Vec3d par1Vec3, Vec3d par2Vec3) { - boolean par3 = false; - boolean par4 = false; - if (!Double.isNaN(par1Vec3.xCoord) && !Double.isNaN(par1Vec3.yCoord) && !Double.isNaN(par1Vec3.zCoord)) { - if (!Double.isNaN(par2Vec3.xCoord) && !Double.isNaN(par2Vec3.yCoord) && !Double.isNaN(par2Vec3.zCoord)) { - int i = MathHelper.floor_double(par2Vec3.xCoord); - int j = MathHelper.floor_double(par2Vec3.yCoord); - int k = MathHelper.floor_double(par2Vec3.zCoord); - int l = MathHelper.floor_double(par1Vec3.xCoord); - int i1 = MathHelper.floor_double(par1Vec3.yCoord); - int j1 = MathHelper.floor_double(par1Vec3.zCoord); - BlockPos pos = new BlockPos(l, i1, j1); - IBlockState state = worldObj.getBlockState(pos); - Block block = state.getBlock(); - - if (block != null && (!par4 || block == null || state.getCollisionBoundingBox(worldObj, pos) != null) && block != Blocks.air && block.canCollideCheck(state, par3)) { - RayTraceResult RayTraceResult = state.collisionRayTrace(worldObj, pos, par1Vec3, par2Vec3); - - if (RayTraceResult != null) - return RayTraceResult; - } - - int k1 = 200; - - while (k1-- >= 0) { - if (Double.isNaN(par1Vec3.xCoord) || Double.isNaN(par1Vec3.yCoord) || Double.isNaN(par1Vec3.zCoord)) - return null; - - if (l == i && i1 == j && j1 == k) - return null; - - boolean flag2 = true; - boolean flag3 = true; - boolean flag4 = true; - double d0 = 999.0D; - double d1 = 999.0D; - double d2 = 999.0D; - - if (i > l) - d0 = l + 1.0D; - else if (i < l) - d0 = l + 0.0D; - else flag2 = false; - - if (j > i1) - d1 = i1 + 1.0D; - else if (j < i1) - d1 = i1 + 0.0D; - else flag3 = false; - - if (k > j1) - d2 = j1 + 1.0D; - else if (k < j1) - d2 = j1 + 0.0D; - else flag4 = false; - - double d3 = 999.0D; - double d4 = 999.0D; - double d5 = 999.0D; - double d6 = par2Vec3.xCoord - par1Vec3.xCoord; - double d7 = par2Vec3.yCoord - par1Vec3.yCoord; - double d8 = par2Vec3.zCoord - par1Vec3.zCoord; - - if (flag2) - d3 = (d0 - par1Vec3.xCoord) / d6; - - if (flag3) - d4 = (d1 - par1Vec3.yCoord) / d7; - - if (flag4) - d5 = (d2 - par1Vec3.zCoord) / d8; - - byte b0; - - if (d3 < d4 && d3 < d5) { - if (i > l) - b0 = 4; - else b0 = 5; - - par1Vec3 = new Vec3d(d0, par1Vec3.yCoord + (d7 * d3), par1Vec3.zCoord + (d8 * d3)); - } else if (d4 < d5) { - if (j > i1) - b0 = 0; - else b0 = 1; - - par1Vec3 = new Vec3d(par1Vec3.xCoord + (d6 * d4), d1, par1Vec3.zCoord + (d8 * d4)); - } else { - if (k > j1) - b0 = 2; - else b0 = 3; - - par1Vec3 = new Vec3d(par1Vec3.xCoord + (d6 * d5), par1Vec3.yCoord + (d7 * d5), d2); - } - - Vec3d vec32 = new Vector3(par1Vec3.xCoord, par1Vec3.yCoord, par1Vec3.zCoord).toVec3D(); - vec32 = new Vec3d(MathHelper.floor_double(par1Vec3.xCoord), vec32.yCoord, vec32.zCoord); - l = ((int) vec32.xCoord); - - if (b0 == 5) { - --l; - vec32 = vec32.addVector(1, 0, 0); - } - - vec32 = new Vec3d(vec32.xCoord, MathHelper.floor_double(par1Vec3.yCoord), vec32.zCoord); - i1 = ((int) vec32.yCoord); - - if (b0 == 1) { - --i1; - vec32 = vec32.addVector(0, 1, 0); - } - - vec32 = new Vec3d(par1Vec3.xCoord, vec32.yCoord, MathHelper.floor_double(vec32.zCoord)); - j1 = ((int) vec32.zCoord); - - if (b0 == 3) { - --j1; - vec32 = vec32.addVector(0, 0, 1); - } - - BlockPos pos1 = new BlockPos(l, i1, j1); - IBlockState state1 = worldObj.getBlockState(pos1); - Block block1 = state1.getBlock(); - - if ((!par4 || block1 == null || block1.getCollisionBoundingBox(state1, worldObj, pos1) != null) && block1 != Blocks.air && block1.canCollideCheck(state, par3)) { - RayTraceResult RayTraceResult1 = block1.collisionRayTrace(state1, worldObj, pos1, par1Vec3, par2Vec3); - - if (RayTraceResult1 != null) - return RayTraceResult1; - } - } - - return null; - } - else return null; - } else return null; - } - @Override public void onUpdate() { setTicksExisted(getTicksExisted() + 1); - superUpdate(); + super.onUpdate(); + // superUpdate(); todo 1.9 removed a ton of what appears to just be copied superclass code + // todo 1.9 if shit breaks revert this :P if(!fake && !isDead) ping(); @@ -418,8 +208,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return false; } - public TileEntity collidedTile = null; - public boolean noParticles = false; + private TileEntity collidedTile = null; + private boolean noParticles = false; public TileEntity getCollidedTile(boolean noParticles) { this.noParticles = noParticles; @@ -459,7 +249,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { par1nbtTagCompound.setDouble(TAG_LAST_MOTION_Y, motionY); par1nbtTagCompound.setDouble(TAG_LAST_MOTION_Z, motionZ); - UUID identity = getShooterUIID(); + UUID identity = getShooterUUID(); boolean hasShooter = identity != null; par1nbtTagCompound.setBoolean(TAG_HAS_SHOOTER, hasShooter); if(hasShooter) { @@ -501,7 +291,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(hasShooter) { long most = par1nbtTagCompound.getLong(TAG_SHOOTER_UUID_MOST); long least = par1nbtTagCompound.getLong(TAG_SHOOTER_UUID_LEAST); - UUID identity = getShooterUIID(); + UUID identity = getShooterUUID(); if(identity == null || most != identity.getMostSignificantBits() || least != identity.getLeastSignificantBits()) shooterIdentity = new UUID(most, least); } @@ -629,7 +419,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { dead = lens.collideBurst(this, RayTraceResult, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); if(collided && !hasAlreadyCollidedAt(RayTraceResult.getBlockPos())) - alreadyCollidedAt.add(getCollisionLocString(RayTraceResult.getBlockPos())); + alreadyCollidedAt.add(RayTraceResult.getBlockPos()); if(dead && !isDead) { if(!fake) { @@ -652,7 +442,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } } - protected void onRecieverImpact(IManaReceiver tile, BlockPos pos) { + private void onRecieverImpact(IManaReceiver tile, BlockPos pos) { int mana = getMana(); if(tile instanceof IManaCollector) mana *= ((IManaCollector) tile).getManaYieldMultiplier(this); @@ -674,7 +464,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } else setDeathTicksForFakeParticle(); } - public TileEntity getShooter() { + private TileEntity getShooter() { return worldObj.getTileEntity(getBurstSourceBlockPos()); } @@ -789,7 +579,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { _ticksExisted = ticks; } - public ILensEffect getLensInstance() { + private ILensEffect getLensInstance() { ItemStack lens = getSourceLens(); if(lens != null && lens.getItem() instanceof ILensEffect) return (ILensEffect) lens.getItem(); @@ -806,17 +596,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public boolean hasAlreadyCollidedAt(BlockPos pos) { - return alreadyCollidedAt.contains(getCollisionLocString(pos)); + return alreadyCollidedAt.contains(pos); } @Override public void setCollidedAt(BlockPos pos) { if(!hasAlreadyCollidedAt(pos)) - alreadyCollidedAt.add(getCollisionLocString(pos)); - } - - private String getCollisionLocString(BlockPos pos) { - return pos.getX() + ":" + pos.getY() + ":" + pos.getZ(); + alreadyCollidedAt.add(pos.toImmutable()); } @Override @@ -825,7 +611,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - public UUID getShooterUIID() { + public UUID getShooterUUID() { return shooterIdentity; } @@ -833,20 +619,21 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public void ping() { TileEntity tile = getShooter(); if(tile != null && tile instanceof IPingable) - ((IPingable) tile).pingback(this, getShooterUIID()); + ((IPingable) tile).pingback(this, getShooterUUID()); } - public boolean shouldDoFakeParticles() { - if(ConfigHandler.staticWandBeam) + protected boolean shouldDoFakeParticles() { + if (ConfigHandler.staticWandBeam) return true; TileEntity tile = getShooter(); - if(tile != null && tile instanceof IManaSpreader) - return getMana() != getStartingMana() && fullManaLastTick || Math.abs(((IManaSpreader) tile).getBurstParticleTick() - getTicksExisted()) < 4; - return false; + return tile != null + && tile instanceof IManaSpreader + && (getMana() != getStartingMana() && fullManaLastTick + || Math.abs(((IManaSpreader) tile).getBurstParticleTick() - getTicksExisted()) < 4); } - public void incrementFakeParticleTick() { + private void incrementFakeParticleTick() { TileEntity tile = getShooter(); if(tile != null && tile instanceof IManaSpreader) { IManaSpreader spreader = (IManaSpreader) tile; @@ -856,7 +643,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } } - public void setDeathTicksForFakeParticle() { + private void setDeathTicksForFakeParticle() { BlockPos coords = getBurstSourceBlockPos(); TileEntity tile = worldObj.getTileEntity(coords); if(tile != null && tile instanceof IManaSpreader) @@ -890,6 +677,18 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { return world.getBlockState(coords) == this.state; } + + @Override + public int hashCode() { + return Objects.hash(coords, state); + } + + @Override + public boolean equals(Object o) { + return o instanceof PositionProperties + && ((PositionProperties) o).state == state + && ((PositionProperties) o).coords.equals(coords); + } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 8659bf70d..893d1b932 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -41,6 +41,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; @@ -208,9 +209,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(container == stackAt) consume = false; else { - InventoryHelper.insertItemIntoInventory(inv, container); - if(container.stackSize != 0 && player != null) - player.dropPlayerItemWithRandomChoice(container, false); + ItemHandlerHelper.giveItemToPlayer(player, container); } } From 7a36e543ad9bc4e6b00835d3e608a93bad65ef10 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Apr 2016 12:28:58 -0500 Subject: [PATCH 516/935] Experiemntally convert mana network to using sets --- .../api/internal/DummyManaNetwork.java | 10 ++-- .../botania/api/internal/IManaNetwork.java | 15 +++--- .../core/handler/ManaNetworkHandler.java | 51 +++++++------------ 3 files changed, 33 insertions(+), 43 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index e1425597a..111cd93af 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -11,12 +11,14 @@ package vazkii.botania.api.internal; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; import java.util.List; +import java.util.Set; public class DummyManaNetwork implements IManaNetwork { @@ -38,13 +40,13 @@ public class DummyManaNetwork implements IManaNetwork { } @Override - public List getAllCollectorsInWorld(World world) { - return ImmutableList.of(); + public Set getAllCollectorsInWorld(World world) { + return ImmutableSet.of(); } @Override - public List getAllPoolsInWorld(World world) { - return ImmutableList.of(); + public Set getAllPoolsInWorld(World world) { + return ImmutableSet.of(); } } diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index 7f1488fea..2a44e7a15 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -16,6 +16,7 @@ import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; import java.util.List; +import java.util.Set; /** * A basic interface for a world's Mana Network. @@ -52,16 +53,16 @@ public interface IManaNetwork { public TileEntity getClosestPool(BlockPos pos, World world, int limit); /** - * Gets the list of all Mana Collectors (eg. Mana Spreader) in the dimension - * passed in. Note that this is the actual list and not a copy, make sure to - * clone the list if you intend to change it in any way. + * Gets the set of all Mana Collectors (eg. Mana Spreader) in the dimension + * passed in. Note that this is the actual set and not a copy, make sure to + * clone the set if you intend to change it in any way. */ - public List getAllCollectorsInWorld(World world); + public Set getAllCollectorsInWorld(World world); /** - * Gets the list of all Mana Pools in the dimension passed in. Note that this - * is the actual list and not a copy, make sure to clone the list if you intend + * Gets the set of all Mana Pools in the dimension passed in. Note that this + * is the actual set and not a copy, make sure to clone the set if you intend * to change it in any way. */ - public List getAllPoolsInWorld(World world); + public Set getAllPoolsInWorld(World world); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 23ae8fc87..e61b7d533 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -11,8 +11,10 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.WeakHashMap; import net.minecraft.tileentity.TileEntity; @@ -30,12 +32,12 @@ public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); - private final WeakHashMap> manaPools = new WeakHashMap<>(); - private final WeakHashMap> manaCollectors = new WeakHashMap<>(); + private final WeakHashMap> manaPools = new WeakHashMap<>(); + private final WeakHashMap> manaCollectors = new WeakHashMap<>(); @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { - Map> map = event.type == ManaBlockType.COLLECTOR ? manaCollectors : manaPools; + Map> map = event.type == ManaBlockType.COLLECTOR ? manaCollectors : manaPools; if(event.action == Action.ADD) add(map, event.tile); else remove(map, event.tile); @@ -69,19 +71,12 @@ public final class ManaNetworkHandler implements IManaNetwork { return isIn(tile, manaPools); } - private synchronized boolean isIn(TileEntity tile, Map> map) { - List list = map.get(tile.getWorld()); - if(list == null) - return false; - - for(TileSignature sig : list) - if(sig.tile == tile) - return true; - - return false; + private synchronized boolean isIn(TileEntity tile, Map> map) { + Set set = map.get(tile.getWorld()); + return set != null && set.contains(new TileSignature(tile, tile.getWorld().isRemote)); } - private synchronized TileEntity getClosest(List tiles, BlockPos pos, boolean remoteCheck, int limit) { + private synchronized TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { float closest = Float.MAX_VALUE; TileEntity closestTile = null; @@ -105,46 +100,38 @@ public final class ManaNetworkHandler implements IManaNetwork { return closestTile; } - private synchronized void remove(Map> map, TileEntity tile) { + private synchronized void remove(Map> map, TileEntity tile) { World world = tile.getWorld(); if(!map.containsKey(world)) return; - List sigs = map.get(world); - for(TileSignature sig : sigs) - if(sig.tile.equals(tile)) { - sigs.remove(sig); - break; - } + map.get(world).remove(new TileSignature(tile, tile.getWorld().isRemote)); } - private synchronized void add(Map> map, TileEntity tile) { + private synchronized void add(Map> map, TileEntity tile) { World world = tile.getWorld(); - List tiles; + Set tiles; if(!map.containsKey(world)) - map.put(world, new ArrayList<>()); + map.put(world, new HashSet<>()); - tiles = map.get(world); - - if(!tiles.contains(tile)) - tiles.add(new TileSignature(tile, tile.getWorld().isRemote)); + map.get(world).add(new TileSignature(tile, tile.getWorld().isRemote)); } @Override - public List getAllCollectorsInWorld(World world) { + public Set getAllCollectorsInWorld(World world) { return getAllInWorld(manaCollectors, world); } @Override - public List getAllPoolsInWorld(World world) { + public Set getAllPoolsInWorld(World world) { return getAllInWorld(manaPools, world); } - private List getAllInWorld(Map> map, World world) { + private Set getAllInWorld(Map> map, World world) { if(!map.containsKey(world)) - return new ArrayList<>(); + return new HashSet<>(); return map.get(world); } From a6c26319460a780e3176e9066c1c6c8a9cc22a2d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Apr 2016 13:47:18 -0500 Subject: [PATCH 517/935] Cleanup prev commit --- .../botania/api/mana/TileSignature.java | 12 +++++- .../core/handler/ClientTickHandler.java | 4 +- .../core/handler/ManaNetworkHandler.java | 42 +++++-------------- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/TileSignature.java b/src/main/java/vazkii/botania/api/mana/TileSignature.java index a63309048..06261a919 100644 --- a/src/main/java/vazkii/botania/api/mana/TileSignature.java +++ b/src/main/java/vazkii/botania/api/mana/TileSignature.java @@ -4,14 +4,22 @@ import net.minecraft.tileentity.TileEntity; public class TileSignature { - public final TileEntity tile; - public final boolean remoteWorld; + private final TileEntity tile; + private final boolean remoteWorld; public TileSignature(TileEntity tile, boolean remoteWorld) { this.tile = tile; this.remoteWorld = remoteWorld; } + public TileEntity getTile() { + return tile; + } + + public boolean isRemote() { + return remoteWorld; + } + @Override public int hashCode() { return Boolean.hashCode(remoteWorld) ^ System.identityHashCode(tile); diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 5a7577a76..e5e7dc5fd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -76,10 +76,10 @@ public class ClientTickHandler { if(player != null) { if(PlayerHelper.hasHeldItemClass(player, ModItems.twigWand)) { for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld))) { - if(!sig.remoteWorld) + if(!sig.isRemote()) continue; - TileEntity tile = sig.tile; + TileEntity tile = sig.getTile(); if(tile instanceof IManaCollector) ((IManaCollector) tile).onClientDisplayTick(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index e61b7d533..52b9e8c8b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -11,11 +11,13 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import java.util.function.BinaryOperator; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -77,27 +79,13 @@ public final class ManaNetworkHandler implements IManaNetwork { } private synchronized TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { - float closest = Float.MAX_VALUE; - TileEntity closestTile = null; - - for(TileSignature sig : tiles) { - if(sig.remoteWorld != remoteCheck) - continue; - - TileEntity tile = sig.tile; - if(tile.isInvalid()) - continue; - float distance = MathHelper.pointDistanceSpace(tile.getPos(), pos); - if(distance > limit) - continue; - - if(distance < closest) { - closest = distance; - closestTile = tile; - } - } - - return closestTile; + return tiles.stream() + .filter(ts -> ts.isRemote() == remoteCheck) + .map(TileSignature::getTile) + .filter(t -> !t.isInvalid()) + .filter(t -> t.getPos().distanceSq(pos) <= limit * limit) + .reduce(BinaryOperator.minBy(Comparator.comparing(t -> t.getPos().distanceSq(pos), Double::compare))) + .orElse(null); } private synchronized void remove(Map> map, TileEntity tile) { @@ -111,11 +99,7 @@ public final class ManaNetworkHandler implements IManaNetwork { private synchronized void add(Map> map, TileEntity tile) { World world = tile.getWorld(); - - Set tiles; - if(!map.containsKey(world)) - map.put(world, new HashSet<>()); - + map.putIfAbsent(world, new HashSet<>()); map.get(world).add(new TileSignature(tile, tile.getWorld().isRemote)); } @@ -130,11 +114,7 @@ public final class ManaNetworkHandler implements IManaNetwork { } private Set getAllInWorld(Map> map, World world) { - if(!map.containsKey(world)) - return new HashSet<>(); - - return map.get(world); + return map.getOrDefault(world, new HashSet<>()); } - } From 26831d3e9888944b0b57a986489203035fd4622c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Apr 2016 09:48:29 -0500 Subject: [PATCH 518/935] Tweaks to heisei dream inner workings --- .../block/subtile/functional/SubTileHeiseiDream.java | 6 ------ .../java/vazkii/botania/common/lib/LibObfuscation.java | 7 ------- 2 files changed, 13 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index e52fef7e0..7022ad86f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -71,7 +71,6 @@ public class SubTileHeiseiDream extends SubTileFunctional { messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); did = true; } else if(entry.action instanceof EntityAIAttackMelee) { - messWithAttackOnCollideAI((EntityAIAttackMelee) entry.action); did = true; } @@ -86,11 +85,6 @@ public class SubTileHeiseiDream extends SubTileFunctional { private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Entity.class, LibObfuscation.TARGET_CLASS); ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Predicates.equalTo(target), LibObfuscation.TARGET_ENTITY_SELECTOR); // todo 1.8 will this leak `target`? - ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); - } - - private static void messWithAttackOnCollideAI(EntityAIAttackMelee aiEntry) { - ReflectionHelper.setPrivateValue(EntityAIAttackMelee.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 70beb7b3c..568396bcd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -29,12 +29,8 @@ public final class LibObfuscation { // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; - public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; - // EntityAIAttackMelee todo 1.9 - public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; - // EntityAIAvoidEntity public static final String[] TARGET_ENTITY_CLASS = new String[] { "classToAvoid", "field_181064_i", "i" }; @@ -107,7 +103,4 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; - // SoundEvent - public static final String[] REGISTER_SOUND = { "registerSound", "func_187502_a", "a" }; - } From 86b6962f94a1638a76cf96310dc6a009d1d5b435 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Apr 2016 09:57:17 -0500 Subject: [PATCH 519/935] Minor optimization in MathHelper, cleanup for rel --- .../botania/common/core/helper/MathHelper.java | 2 +- .../botania/common/item/rod/ItemGravityRod.java | 15 ++------------- .../vazkii/botania/common/lib/LibObfuscation.java | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 23ac01dfc..be297b5b1 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -21,7 +21,7 @@ public final class MathHelper { } public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { - return (float) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2) + Math.pow(z1 - z2, 2)); + return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); } // Backwards compatibility 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 0cc783720..4c33f70fb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -33,6 +33,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityThrownItem; import vazkii.botania.common.item.ItemMod; @@ -168,7 +169,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { Botania.proxy.wispFX(world, item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); } - setEntityMotionFromVector(item, target3, 0.3333333F); + MathHelper.setEntityMotionFromVector(item, target3, 0.3333333F); ItemNBTHelper.setInt(stack, TAG_TARGET, item.getEntityId()); ItemNBTHelper.setDouble(stack, TAG_DIST, length); @@ -181,18 +182,6 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { return ActionResult.newResult(EnumActionResult.PASS, stack); } - public static void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) { - Vector3 entityVector = Vector3.fromEntityCenter(entity); - Vector3 finalVector = originalPosVector.copy().subtract(entityVector); - - if(finalVector.mag() > 1) - finalVector.normalize(); - - entity.motionX = finalVector.x * modifier; - entity.motionY = finalVector.y * modifier; - entity.motionZ = finalVector.z * modifier; - } - @Override public boolean usesMana(ItemStack stack) { return true; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 568396bcd..91b4e94f8 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -64,7 +64,7 @@ public final class LibObfuscation { public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "j" }; public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "g" }; public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "f" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "b" }; // Todo 1.8 new name makes no sense -> "minecartToSpawn" see MCP name github issue + public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "b" }; public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "e" }; public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "d" }; From 2c75af23597941777fd5d106e70dfc788f335b15 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Apr 2016 10:09:30 -0500 Subject: [PATCH 520/935] Build 301 --- build.properties | 4 ++-- web/versions.ini | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 6e87d4b74..4588d7f79 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat Mar 12 17:00:04 CST 2016 +#Wed Apr 13 10:09:00 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ forge_version=12.16.0.1841-1.9 mc_version=1.9 dir_repo=./ -build_number=300 +build_number=302 mod_name=Botania diff --git a/web/versions.ini b/web/versions.ini index 377b53a06..98a9afd3d 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -248,4 +248,6 @@ r1.8-247=1.7.10 r1.8-248=1.7.10 r1.8-249=1.7.10 r1.8-299=1.8.9 -r1.8-299=1.8.9 \ No newline at end of file +r1.8-299=1.8.9 +r1.8-300=1.9 +r1.8-301=1.9 \ No newline at end of file From f219836f812526c40ffd4d4f12c8a0e70bc0d851 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Apr 2016 16:20:38 -0500 Subject: [PATCH 521/935] update canBlockRenderInLayer --- src/main/java/vazkii/botania/client/model/PlatformModel.java | 2 +- src/main/java/vazkii/botania/common/block/BlockPlatform.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 1995d7f6a..6607ef1a0 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -56,7 +56,7 @@ public class PlatformModel implements IBakedModel { ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand); } else if(heldState != null) { - if(heldState.getBlock().canRenderInLayer(layer)) { + if(heldState.getBlock().canRenderInLayer(heldState, layer)) { IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); // Steal camo's model diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 3a9676e62..a7eb67109 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -92,7 +92,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public boolean canRenderInLayer(BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { return true; } From be9fba512ba2494a2eb1709da10c4b3e78828530 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Apr 2016 17:30:26 -0500 Subject: [PATCH 522/935] Fix stair json weirdness --- .../vazkii/botania/api/boss/IBotaniaBoss.java | 10 ++++-- .../common/entity/EntityDoppleganger.java | 10 +++--- .../blockstates/biomeStoneA0Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA10Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA11Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA12Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA13Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA14Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA15Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA1Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA2Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA3Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA4Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA5Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA6Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA7Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA8Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneA9Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB0Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB1Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB2Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB3Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB4Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB5Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB6Stairs.json | 32 +++++++++---------- .../blockstates/biomeStoneB7Stairs.json | 32 +++++++++---------- .../blockstates/customBrick0Stairs.json | 32 +++++++++---------- .../blockstates/customBrick1Stairs.json | 32 +++++++++---------- .../blockstates/customBrick2Stairs.json | 32 +++++++++---------- .../blockstates/customBrick3Stairs.json | 32 +++++++++---------- .../botania/blockstates/dreamwood0Stairs.json | 32 +++++++++---------- .../botania/blockstates/dreamwood1Stairs.json | 32 +++++++++---------- .../blockstates/endStoneBrick0Stairs.json | 32 +++++++++---------- .../blockstates/endStoneBrick2Stairs.json | 32 +++++++++---------- .../blockstates/livingrock0Stairs.json | 32 +++++++++---------- .../blockstates/livingrock1Stairs.json | 32 +++++++++---------- .../blockstates/livingwood0Stairs.json | 32 +++++++++---------- .../blockstates/livingwood1Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement0Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement1Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement2Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement3Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement4Stairs.json | 32 +++++++++---------- .../botania/blockstates/pavement5Stairs.json | 32 +++++++++---------- .../blockstates/prismarine0Stairs.json | 32 +++++++++---------- .../blockstates/prismarine1Stairs.json | 32 +++++++++---------- .../blockstates/prismarine2Stairs.json | 32 +++++++++---------- .../blockstates/quartzStairsBlaze.json | 32 +++++++++---------- .../botania/blockstates/quartzStairsDark.json | 32 +++++++++---------- .../botania/blockstates/quartzStairsElf.json | 32 +++++++++---------- .../blockstates/quartzStairsLavender.json | 32 +++++++++---------- .../botania/blockstates/quartzStairsMana.json | 32 +++++++++---------- .../botania/blockstates/quartzStairsRed.json | 32 +++++++++---------- .../blockstates/quartzStairsSunny.json | 32 +++++++++---------- .../botania/blockstates/reedBlock0Stairs.json | 32 +++++++++---------- .../blockstates/shimmerrock0Stairs.json | 32 +++++++++---------- .../blockstates/shimmerwoodPlanks0Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone0Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone10Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone11Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone1Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone2Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone3Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone8Stairs.json | 32 +++++++++---------- .../botania/blockstates/stone9Stairs.json | 32 +++++++++---------- .../botania/blockstates/thatch0Stairs.json | 32 +++++++++---------- 66 files changed, 1038 insertions(+), 1030 deletions(-) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 071d580ff..b05ff8e62 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -18,6 +18,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.awt.*; +import java.util.UUID; /** * An extension of IBossDisplayData. This counts as a botania boss and as a normal @@ -52,13 +53,18 @@ public interface IBotaniaBoss { public Rectangle getBossBarHPTextureRect(); /** - * A callback for when this boss's boss bar renders, you can do aditional rendering + * A callback for when this boss's boss bar renders, you can do additional rendering * here if needed. */ @SideOnly(Side.CLIENT) public void bossBarRenderCallback(ScaledResolution res, int x, int y); - public BossInfo getBossInfo(); + /** + * Get the UUID of the {@link BossInfo} instance tracking this boss + * @return The uuid. Note that this is NOT the entity's UUID! + * todo 1.9 is this needed? + */ + public UUID getBossInfoUuid(); public EntityLivingBase getEntity(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 73e47ddb6..b64f8c74a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -134,7 +134,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static boolean isPlayingMusic = false; - private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setDarkenSky(true); + private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setCreateFog(true); public EntityDoppleganger(World par1World) { super(par1World); @@ -515,6 +515,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public void onLivingUpdate() { super.onLivingUpdate(); + bossInfo.setPercent(getHealth() / getMaxHealth()); + if(!getPassengers().isEmpty()) this.dismountRidingEntity(); @@ -549,7 +551,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi BlockPos source = getSource(); boolean hard = isHardMode(); - float range = RANGE + 3F; + float range; List players = getPlayersAround(); int playerCount = getPlayerCount(); @@ -898,8 +900,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } @Override - public BossInfo getBossInfo() { - return bossInfo; + public UUID getBossInfoUuid() { + return bossInfo.getUniqueId(); } @Override diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json index d137ed804..9a15160a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json index a440df4e9..aa00113cd 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json index 4184d500c..f4117bfd2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json index be0409f30..b22add585 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json index 6768651f4..9ee2e8e62 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json index 85662667d..d5dfc9022 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json index 605b898a9..4189ab1ee 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json index 03d203e1b..37765c64b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json index d8e98719d..81f5f0f57 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json index 6949961ed..35f8f419c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json index 937646fbe..2d60a490d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json index 29015ed6c..c0822d7a1 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json index 5fbeb19e5..4d308e084 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json index 42a749323..7eba5c4bf 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json index 41d4f74c2..c56da5648 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json index f7a36ef8f..1fd93b694 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json index 20fce2f16..9578c7a8c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json index ae5372d46..ae1584afa 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json index 749ab9b2e..79b4742c8 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json index 8451d31db..67e682c24 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json index c966c7696..a39d7f922 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json index 26ed567f8..9b923bb32 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json index 3bd7cfc9d..f56a3e8cd 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json index 7b3888e51..35db19b06 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json index 856dd00d7..fafef7906 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json index ccb0e45af..7466a8295 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json index e9899ac4c..ed0357faf 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json index 35e9dac47..e26504eb7 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json index 4ae3e3fb2..08f651f19 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json index b2539d356..e82735595 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json index fca23a687..0bcdf53a6 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json index c8b59f555..46823a572 100644 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json index 400dfbcf9..49d331cc2 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json index 5216b92e8..3fea9800c 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json index 6909c9a17..d896e6345 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json index 268eeb73f..ab1065d66 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json index b7c401e34..e05796a94 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json index 38a03352e..1da93233b 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json index b59738076..b752020a1 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json index 996db23eb..6af3bf1a0 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement3Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json index 92c9f6456..4d368cd34 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement4Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json index 398d19dd2..2915a047a 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json +++ b/src/main/resources/assets/botania/blockstates/pavement5Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json index f061f4b24..7859d57bc 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json index 859c76bcf..577d100d9 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json index b0968daf9..edfc32a39 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json index 8b7c9ce6c..b564a6eac 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json index 97b3d951d..65e4d1198 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json index a53598533..24392d84a 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json index 041a8d56d..5667235f1 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json index f71b5157e..39e65c11f 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json index 976003691..52ae466ee 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json index 3685bc69a..78a3f481b 100644 --- a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json +++ b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json index c1866bb9b..46e4d5454 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json index 0a5482fd8..133a6f436 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json index 66f8a33f3..5094807bc 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone0Stairs.json b/src/main/resources/assets/botania/blockstates/stone0Stairs.json index 413cbac87..c584e6e60 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone10Stairs.json b/src/main/resources/assets/botania/blockstates/stone10Stairs.json index 2a7efb79e..a882c36e3 100644 --- a/src/main/resources/assets/botania/blockstates/stone10Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone10Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone11Stairs.json b/src/main/resources/assets/botania/blockstates/stone11Stairs.json index a6f3d0c94..a7b9b1660 100644 --- a/src/main/resources/assets/botania/blockstates/stone11Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone11Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone1Stairs.json b/src/main/resources/assets/botania/blockstates/stone1Stairs.json index 05fdc2907..6d0dccf35 100644 --- a/src/main/resources/assets/botania/blockstates/stone1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone1Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone2Stairs.json b/src/main/resources/assets/botania/blockstates/stone2Stairs.json index 6867aae2c..ef6a5e14f 100644 --- a/src/main/resources/assets/botania/blockstates/stone2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone2Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone3Stairs.json b/src/main/resources/assets/botania/blockstates/stone3Stairs.json index e7bd194ac..796df4563 100644 --- a/src/main/resources/assets/botania/blockstates/stone3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone3Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone8Stairs.json b/src/main/resources/assets/botania/blockstates/stone8Stairs.json index 088ad9b58..0dde759af 100644 --- a/src/main/resources/assets/botania/blockstates/stone8Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone8Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/stone9Stairs.json b/src/main/resources/assets/botania/blockstates/stone9Stairs.json index f1cc951ef..88dc97a8b 100644 --- a/src/main/resources/assets/botania/blockstates/stone9Stairs.json +++ b/src/main/resources/assets/botania/blockstates/stone9Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } diff --git a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json index e31a27404..a0db9e291 100644 --- a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json @@ -32,22 +32,22 @@ "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, "inventory": [{ "model": "minecraft:stairs" }] } } From 45dda5f19cf3c349544912abd775f19e8d9f1892 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 00:23:29 -0500 Subject: [PATCH 523/935] Fix vine balls and tweak slightly --- .../client/core/handler/ColorHandler.java | 11 +++++ .../botania/common/block/BlockSolidVines.java | 17 +------ .../botania/common/entity/EntityVineBall.java | 49 +++++++++++-------- .../botania/common/item/ItemVineBall.java | 7 ++- 4 files changed, 45 insertions(+), 39 deletions(-) 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 99eafa7a5..2e55b40ac 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -1,5 +1,6 @@ package vazkii.botania.client.core.handler; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -8,12 +9,17 @@ import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; +import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.common.registry.IForgeRegistry; +import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; +import net.minecraftforge.fml.common.registry.RegistryDelegate; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.SpreaderVariant; @@ -24,11 +30,16 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; import java.awt.*; +import java.util.Map; public final class ColorHandler { public static void init() { BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); + Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); + + // Steal vine colorer + blocks.registerBlockColorHandler(map.get(Blocks.vine.delegate), ModBlocks.solidVines); // 16 colors blocks.registerBlockColorHandler( diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index ae0534cf5..5e34f05e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -34,11 +34,6 @@ import vazkii.botania.common.lib.LibMisc; public class BlockSolidVines extends BlockVine implements ILexiconable { - protected static final AxisAlignedBB LADDER_EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D); - protected static final AxisAlignedBB LADDER_WEST_AABB = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - protected static final AxisAlignedBB LADDER_SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D); - protected static final AxisAlignedBB LADDER_NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D); - public BlockSolidVines() { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); setUnlocalizedName(LibBlockNames.SOLID_VINE); @@ -49,17 +44,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { - AxisAlignedBB bounds = getBoundingBox(state, world, pos); - - if(state.getValue(EAST)) { - return new AxisAlignedBB(pos.add(bounds.maxX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); - } - - if(state.getValue(SOUTH)) { - return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.maxZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); - } - - return new AxisAlignedBB(pos.add(bounds.minX, bounds.minY, bounds.minZ), pos.add(bounds.maxX, bounds.maxY, bounds.maxZ)); + return getBoundingBox(state, world, pos); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index b63f5850c..8cc27330e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -18,63 +18,70 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.Item; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; import java.util.Map; public class EntityVineBall extends EntityThrowable { private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityVineBall.class, DataSerializers.FLOAT); - private final boolean gravity; + private static final Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, + EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); public EntityVineBall(World par1World) { super(par1World); - gravity = false; } public EntityVineBall(EntityLivingBase thrower, boolean gravity) { super(thrower.worldObj, thrower); - this.gravity = gravity; + dataManager.set(GRAVITY, gravity ? 0.03F : 0F); } @Override protected void entityInit() { super.entityInit(); - dataManager.register(GRAVITY, gravity ? 0.03F : 0F); + dataManager.register(GRAVITY, 0F); } @Override protected void onImpact(RayTraceResult var1) { - if(var1 != null) { - EnumFacing dir = var1.sideHit; - Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, - EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); + if(worldObj.isRemote) { + for(int j = 0; j < 16; j++) { + this.worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, this.posX, this.posY, this.posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall)); + } + } else { + if(var1 != null) { + EnumFacing dir = var1.sideHit; - if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { - BlockPos pos = var1.getBlockPos().offset(dir); - while(pos.getY() > 0) { - IBlockState state = worldObj.getBlockState(pos); - Block block = state.getBlock(); - 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)); - pos = pos.down(); - } else break; + if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { + BlockPos pos = var1.getBlockPos().offset(dir); + while(pos.getY() > 0) { + IBlockState state = worldObj.getBlockState(pos); + Block block = state.getBlock(); + 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)); + pos = pos.down(); + } else break; + } } + } + setDead(); } - - setDead(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index f295efd5b..4bc5aff5e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -34,8 +34,11 @@ public class ItemVineBall extends ItemMod { 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) - par2World.spawnEntityInWorld(new EntityVineBall(par3EntityPlayer, true)); + if(!par2World.isRemote) { + EntityVineBall ball = new EntityVineBall(par3EntityPlayer, true); + ball.setHeadingFromThrower(par3EntityPlayer, par3EntityPlayer.rotationPitch, par3EntityPlayer.rotationYaw, 0.0F, 1.5F, 1.0F); + par2World.spawnEntityInWorld(ball); + } return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } From d33590f7cad919595cd7c02e6c66aab6b956fec0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 21:38:56 -0500 Subject: [PATCH 524/935] Fix bounding box issue causing bindings to fail. Closes #234 --- .../vazkii/botania/common/block/tile/mana/TileSpreader.java | 2 +- src/main/java/vazkii/botania/common/item/lens/LensRedirect.java | 2 +- version/1.9.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 version/1.9.txt 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 6226fb28c..aa3666dc6 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 @@ -676,7 +676,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos); + AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos).offset(pos); if(axis == null) axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index bef17eb3e..c739430ba 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -34,7 +34,7 @@ public class LensRedirect extends Lens { Vector3 tileVec = Vector3.fromTileEntityCenter(tile); Vector3 sourceVec = new Vector3(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getCollisionBoundingBox(entity.worldObj, coords); + AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getCollisionBoundingBox(entity.worldObj, coords).offset(coords); if(axis == null) axis = new AxisAlignedBB(coords, coords.add(1, 1, 1)); diff --git a/version/1.9.txt b/version/1.9.txt new file mode 100644 index 000000000..0e6a396d1 --- /dev/null +++ b/version/1.9.txt @@ -0,0 +1 @@ +r1.8-301 \ No newline at end of file From 9e82e5357ae85d12bab2d68ac4c00af74c425f4a Mon Sep 17 00:00:00 2001 From: Wire Segal Date: Thu, 14 Apr 2016 22:59:36 -0400 Subject: [PATCH 525/935] Armor keeps enchantments when crafted (#213) * Armor keeps enchantments when crafted Closes #209 * Copy runic shielding as well --- .../common/crafting/ModCraftingRecipes.java | 21 ++++----- .../crafting/recipe/ArmorUpgradeRecipe.java | 44 +++++++++++++++++++ 2 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 2399aac5c..7a63e18e1 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -38,6 +38,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; @@ -714,39 +715,39 @@ public final class ModCraftingRecipes { recipeGrassHorn = BotaniaAPI.getLatestAddedRecipe(); // Terrasteel Armor Recipes - addOreDictRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), + GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, 'S', LibOreDict.TERRA_STEEL, 'R', LibOreDict.RUNE[4], - 'A', new ItemStack(ModItems.manasteelHelmRevealing)); - addOreDictRecipe(new ItemStack(ModItems.terrasteelHelm), + 'A', new ItemStack(ModItems.manasteelHelmRevealing))); + GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelm), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, 'S', LibOreDict.TERRA_STEEL, 'R', LibOreDict.RUNE[4], - 'A', new ItemStack(ModItems.manasteelHelm)); + 'A', new ItemStack(ModItems.manasteelHelm))); recipeTerrasteelHelm = BotaniaAPI.getLatestAddedRecipe(); - addOreDictRecipe(new ItemStack(ModItems.terrasteelChest), + GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelChest), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, 'S', LibOreDict.TERRA_STEEL, 'R', LibOreDict.RUNE[5], - 'A', new ItemStack(ModItems.manasteelChest)); + 'A', new ItemStack(ModItems.manasteelChest))); recipeTerrasteelChest = BotaniaAPI.getLatestAddedRecipe(); - addOreDictRecipe(new ItemStack(ModItems.terrasteelLegs), + GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelLegs), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, 'S', LibOreDict.TERRA_STEEL, 'R', LibOreDict.RUNE[6], - 'A', new ItemStack(ModItems.manasteelLegs)); + 'A', new ItemStack(ModItems.manasteelLegs))); recipeTerrasteelLegs = BotaniaAPI.getLatestAddedRecipe(); - addOreDictRecipe(new ItemStack(ModItems.terrasteelBoots), + GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelBoots), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, 'S', LibOreDict.TERRA_STEEL, 'R', LibOreDict.RUNE[7], - 'A', new ItemStack(ModItems.manasteelBoots)); + 'A', new ItemStack(ModItems.manasteelBoots))); recipeTerrasteelBoots = BotaniaAPI.getLatestAddedRecipe(); // Terra Blade Recipe diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java new file mode 100644 index 000000000..afa92801a --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -0,0 +1,44 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 4, 2016, 7:49:08 PM (EST)] + */ +package vazkii.botania.common.crafting.recipe; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.oredict.ShapedOreRecipe; +import vazkii.botania.common.core.helper.ItemNBTHelper; + +public class ArmorUpgradeRecipe extends ShapedOreRecipe { + + public ArmorUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + ItemStack out = output.copy(); + for (int i = 0; i < var1.getSizeInventory(); i++) { + ItemStack stack = var1.getStackInSlot(i); + if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { + NBTTagList list = ItemNBTHelper.getList(stack, "ench", 10, true); + if (list != null) { + ItemNBTHelper.setList(out, "ench", list); + return out; + } + byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); + if (runicHardening != 0) + ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening); + } + } + return out; + } +} From a4279647fa2c6603412354054ed99a62bb8ff12d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:02:40 -0500 Subject: [PATCH 526/935] Tweak previous pr --- .../common/crafting/recipe/ArmorUpgradeRecipe.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index afa92801a..62e40e375 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.crafting.recipe; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -29,14 +30,11 @@ public class ArmorUpgradeRecipe extends ShapedOreRecipe { for (int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { - NBTTagList list = ItemNBTHelper.getList(stack, "ench", 10, true); - if (list != null) { - ItemNBTHelper.setList(out, "ench", list); - return out; - } + EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out); byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); if (runicHardening != 0) ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening); + break; } } return out; From 391eea0416e173016ef15d06b68aa961d8e0c9e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:05:09 -0500 Subject: [PATCH 527/935] Minor optimization in jaded ama, closes #186 kinda maybe --- .../subtile/functional/SubTileJadedAmaranthus.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 251fc8271..f9dd0dad1 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 @@ -41,16 +41,18 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { supertile.getPos().getY() + RANGE, supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1) ); + + BlockPos up = pos.up(); for(int i = 0; i < RANGE * 2; i++) { - IBlockState stateAbove = supertile.getWorld().getBlockState(pos.up()); + IBlockState stateAbove = supertile.getWorld().getBlockState(up); Block blockAbove = stateAbove.getBlock(); - if((supertile.getWorld().isAirBlock(pos.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos.up())) && stateAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorld(), pos.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, pos.up(), Block.getStateId(state)); - supertile.getWorld().setBlockState(pos.up(), state, 1 | 2); + supertile.getWorld().playAuxSFX(2001, up, Block.getStateId(state)); + supertile.getWorld().setBlockState(up, state, 1 | 2); mana -= COST; sync(); From b9fcf9bd539de69c0172785e53194f8a4e08b48d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:18:37 -0500 Subject: [PATCH 528/935] Modernize ice pendant. Now acts like frost walker VIII and doesn't require player to be touching ground --- .../item/equipment/bauble/ItemIcePendant.java | 81 ++----------------- 1 file changed, 6 insertions(+), 75 deletions(-) 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 1320e7cc1..4c8473fab 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 @@ -10,26 +10,17 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.enchantment.EnchantmentFrostWalker; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -39,8 +30,6 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - public static final Map> playerIceBlocks = new HashMap<>(); - public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); } @@ -53,54 +42,14 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { super.onWornTick(stack, entity); - - if(entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; - - if(!player.worldObj.isRemote) - tickIceRemovers(player); - - if(!player.isSneaking() && !player.isInsideOfMaterial(Material.water) && !player.worldObj.isRemote) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY - (player.isInWater() ? 0 : 1)); - int z = MathHelper.floor_double(player.posZ); - - int range = 3; - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) { - int x1 = x + i; - int z1 = z + j; - - addIceBlock(player, new BlockPos(x1, y, z1)); - } - } + if(!entity.worldObj.isRemote) { + boolean lastOnGround = entity.onGround; + entity.onGround = true; + EnchantmentFrostWalker.freezeNearby(entity, entity.worldObj, new BlockPos(entity), 8); + entity.onGround = lastOnGround; } } - private void addIceBlock(EntityPlayer player, BlockPos coords) { - String user = player.getName(); - if(!playerIceBlocks.containsKey(user)) - playerIceBlocks.put(user, new ArrayList<>()); - - List ice = playerIceBlocks.get(user); - if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL) == 0) { - player.worldObj.setBlockState(coords, Blocks.ice.getDefaultState()); - - if(!player.worldObj.isRemote) - ice.add(new IceRemover(coords)); - } - } - - private void tickIceRemovers(EntityPlayer player) { - String user = player.getName(); - if(!playerIceBlocks.containsKey(user)) - return; - - List removers = playerIceBlocks.get(user); - for(IceRemover ice : new ArrayList<>(removers)) - ice.tick(player.worldObj, removers); - } - @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { @@ -121,22 +70,4 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } } - private static class IceRemover { - - int time = 30; - final BlockPos coords; - - public IceRemover(BlockPos coords) { - this.coords = coords; - } - - public void tick(World world, List list) { - if(world.getBlockState(coords).getBlock() == Blocks.ice) { - if(time-- == 0) - world.setBlockState(coords, Blocks.water.getDefaultState(), 1 | 2); - else return; - list.remove(this); - } - } - } } From a7820178527e763229f310083c072ccfbb7688a7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:21:55 -0500 Subject: [PATCH 529/935] Remove old remappers --- .../java/vazkii/botania/common/Botania.java | 4 -- .../common/core/handler/AliasHandler.java | 65 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/handler/AliasHandler.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 1035ec2ed..cfb5f1ecd 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -131,8 +131,4 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - /*@EventHandler - public void missingMappings(FMLMissingMappingsEvent event) { - AliasHandler.onMissingMappings(event); - }*/ } diff --git a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java b/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java deleted file mode 100644 index 68dcab4df..000000000 --- a/src/main/java/vazkii/botania/common/core/handler/AliasHandler.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2014, 6:24:12 PM (GMT)] - */ -package vazkii.botania.common.core.handler; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.lib.LibResources; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import net.minecraftforge.fml.common.registry.GameRegistry.Type; - -public final class AliasHandler { - - public static void onMissingMappings(FMLMissingMappingsEvent event) { - List mappings = event.get(); - for(MissingMapping mapping : mappings) { - String name = mapping.name.substring(LibResources.PREFIX_MOD.length() * 2); - - if(mapping.type == Type.ITEM) - remapItem(mapping, getItem(name)); - else remapBlock(mapping, getBlock(name)); - } - } - - private static void remapItem(MissingMapping mapping, Item item) { - if(item != null) - mapping.remap(item); - } - - private static void remapBlock(MissingMapping mapping, Block block) { - if(block != null) - mapping.remap(block); - } - - private static Item getItem(String name) { - for(ResourceLocation o : Item.itemRegistry.getKeys()) { - Item i = Item.itemRegistry.getObject(o); - if(i.getUnlocalizedName().substring("item.".length()).equals(name)) - return i; - } - - return null; - } - - private static Block getBlock(String name) { - for(ResourceLocation o : Block.blockRegistry.getKeys()) { - Block b = Block.blockRegistry.getObject(o); - if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) - return b; - } - - return null; - } -} From 8c3d1bde1410fc30a41ed7cf87690dd1d74f8ca7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:37:26 -0500 Subject: [PATCH 530/935] Tweak equip sounds, boost thundercaller's attack speed --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 4 ++-- .../item/equipment/tool/ItemThunderSword.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 4d2e5e0ae..37e221b2c 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -108,10 +108,10 @@ public final class BotaniaAPI { 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_iron); + 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_iron); + 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"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 562cdcf23..ecf9a9b24 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -15,10 +15,14 @@ import java.util.List; import java.util.Random; import com.google.common.base.Predicate; +import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -83,5 +87,16 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev return ModAchievements.terrasteelWeaponCraft; } + @Override + public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { + Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + + if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + multimap.removeAll(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName()); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.5, 0)); + } + + return multimap; + } } From f01b8a1fa95b1025793bfd649d9b39178f6dccc8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:39:26 -0500 Subject: [PATCH 531/935] Prevent paint lens from painting blocks illegal colors --- src/main/java/vazkii/botania/common/item/lens/LensPaint.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 77542c4b1..be05676d9 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -71,7 +71,8 @@ public class LensPaint extends Lens { EnumDyeColor placeColor = EnumDyeColor.byMetadata(storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor); IBlockState stateThere = entity.worldObj.getBlockState(coords); - if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor) { + if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor + && BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) { entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); int hex = placeColor.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; From 9f60ac59fa37ce8b1162a1c98300498984e0b967 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:42:46 -0500 Subject: [PATCH 532/935] Remove old flugel code. This is what git is for :P --- .../common/item/relic/ItemFlugelEye.java | 310 ------------------ 1 file changed, 310 deletions(-) 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 e46dd547b..be573e054 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -137,314 +137,4 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs return true; } - /* - // Code from the older iteration of this item: - - private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_CYAN); - - private static final int SEGMENTS = 12; - private static final MultiversePosition FALLBACK_POSITION = new MultiversePosition(0, -1, 0, 0); - - private static final String TAG_EQUIPPED = "equipped"; - private static final String TAG_ROTATION_BASE = "rotationBase"; - private static final String TAG_WARP_PREFIX = "warp"; - private static final String TAG_POS_X = "posX"; - private static final String TAG_POS_Y = "posY"; - private static final String TAG_POS_Z = "posZ"; - private static final String TAG_DIMENSION = "dim"; - private static final String TAG_FIRST_TICK = "firstTick"; - - IIcon[] signs; - - public ItemFlugelEye() { - super(LibItemNames.FLUGEL_EYE); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - signs = new IIcon[12]; - for(int i = 0; i < 12; i++) - signs[i] = IconHelper.forName(par1IconRegister, "sign" + i); - } - - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(isRightPlayer(player, stack)) { - int segment = getSegmentLookedAt(stack, player); - MultiversePosition pos = getWarpPoint(stack, segment); - if(pos.isValid()) { - if(pos.dim == world.provider.dimensionId && player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(pos.x, pos.y, pos.z, player.rotationYaw, player.rotationPitch); - world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); - } - } else setWarpPoint(stack, segment, player.posX, player.posY, player.posZ, world.provider.dimensionId); - } - - return stack; - } - - @Override - public boolean onEntitySwing(EntityLivingBase player, ItemStack stack) { - if(player.isSneaking() && player instanceof EntityPlayer && isRightPlayer((EntityPlayer) player, stack)) { - int segment = getSegmentLookedAt(stack, player); - MultiversePosition pos = getWarpPoint(stack, segment); - if(pos.isValid()) { - setWarpPoint(stack, segment, 0, -1, 0, 0); - return true; - } - } - - return false; - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { - super.onUpdate(stack, world, entity, pos, equipped); - boolean eqLastTick = wasEquipped(stack); - boolean firstTick = isFirstTick(stack); - if(eqLastTick != equipped) - setEquipped(stack, equipped); - - if((!equipped || firstTick) && entity instanceof EntityLivingBase) { - int angles = 360; - int segAngles = angles / SEGMENTS; - float shift = segAngles / 2; - setRotationBase(stack, getCheckingAngle((EntityLivingBase) entity) - shift); - if(firstTick) - tickFirst(stack); - } - } - - private static int getSegmentLookedAt(ItemStack stack, EntityLivingBase player) { - float yaw = getCheckingAngle(player, getRotationBase(stack)); - - int angles = 360; - int segAngles = angles / SEGMENTS; - for(int seg = 0; seg < SEGMENTS; seg++) { - float calcAngle = (float) seg * segAngles; - if(yaw >= calcAngle && yaw < calcAngle + segAngles) - return seg; - } - return 0; - } - - private static float getCheckingAngle(EntityLivingBase player) { - return getCheckingAngle(player, 0F); - } - - // Screw the way minecraft handles rotation - // Really... - private static float getCheckingAngle(EntityLivingBase player, float base) { - float yaw = MathHelper.wrapAngleTo180_float(player.rotationYaw) + 90F; - int angles = 360; - int segAngles = angles / SEGMENTS; - float shift = segAngles / 2; - - if(yaw < 0) - yaw = 180F + (180F + yaw); - yaw -= 360F - base; - float angle = 360F - yaw + shift; - - if(angle < 0) - angle = 360F + angle; - - return angle; - } - - public static boolean isFirstTick(ItemStack stack) { - return ItemNBTHelper.getBoolean(stack, TAG_FIRST_TICK, true); - } - - public static void tickFirst(ItemStack stack) { - ItemNBTHelper.setBoolean(stack, TAG_FIRST_TICK, false); - } - - public static boolean wasEquipped(ItemStack stack) { - return ItemNBTHelper.getBoolean(stack, TAG_EQUIPPED, false); - } - - public static void setEquipped(ItemStack stack, boolean equipped) { - ItemNBTHelper.setBoolean(stack, TAG_EQUIPPED, equipped); - } - - public static float getRotationBase(ItemStack stack) { - return ItemNBTHelper.getFloat(stack, TAG_ROTATION_BASE, 0F); - } - - public static void setRotationBase(ItemStack stack, float rotation) { - ItemNBTHelper.setFloat(stack, TAG_ROTATION_BASE, rotation); - } - - public static void setWarpPoint(ItemStack stack, int warp, double x, double y, double z, int dim) { - NBTTagCompound cmp = new NBTTagCompound(); - cmp.setDouble(TAG_POS_X, x); - cmp.setDouble(TAG_POS_Y, y); - cmp.setDouble(TAG_POS_Z, z); - cmp.setInteger(TAG_DIMENSION, dim); - ItemNBTHelper.setCompound(stack, TAG_WARP_PREFIX + warp, cmp); - } - - public static MultiversePosition getWarpPoint(ItemStack stack, int warp) { - NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_WARP_PREFIX + warp, true); - if(cmp == null) - return FALLBACK_POSITION; - - double x = cmp.getDouble(TAG_POS_X); - double y = cmp.getDouble(TAG_POS_Y); - double z = cmp.getDouble(TAG_POS_Z); - int dim = cmp.getInteger(TAG_DIMENSION); - return new MultiversePosition(x, y, z, dim); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onRenderWorldLast(RenderWorldLastEvent event) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() == this) - render(stack, player, event.partialTicks); - } - - @SideOnly(Side.CLIENT) - public void render(ItemStack stack, EntityPlayer player, float partialTicks) { - Minecraft mc = Minecraft.getMinecraft(); - Tessellator tess = Tessellator.getInstance(); - Tessellator.renderingVertexBuffer = false; - - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - float alpha = ((float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.2F) * 0.5F + 0.5F) * 0.4F + 0.3F; - - double posX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks; - double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks; - double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks; - - GlStateManager.translate(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ); - - float base = getRotationBase(stack); - int angles = 360; - int segAngles = angles / SEGMENTS; - float shift = base - segAngles / 2; - - float u = 1F; - float v = 0.25F; - - float s = 3F; - float m = 0.8F; - float y = v * s * 2; - float y0 = 0; - - int segmentLookedAt = getSegmentLookedAt(stack, player); - - for(int seg = 0; seg < SEGMENTS; seg++) { - boolean inside = false; - float rotationAngle = (seg + 0.5F) * segAngles + shift; - if(segmentLookedAt == seg) - inside = true; - - GlStateManager.pushMatrix(); - GlStateManager.rotate(rotationAngle, 0F, 1F, 0F); - GlStateManager.translate(s * m, -0.75F, 0F); - - mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); - GlStateManager.scale(0.75F, 0.75F, 0.75F); - GlStateManager.translate(0F, 0F, 0.5F); - IIcon icon = signs[seg]; - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.color(1F, 1F, 1F, getWarpPoint(stack, seg).isValid() ? 1F : 0.2F); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - - GlStateManager.color(1F, 1F, 1F); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(180F, 1F, 0F, 0F); - float a = alpha; - if(inside) { - a += 0.3F; - y0 = -y; - } - - if(seg % 2 == 0) - GlStateManager.color(0.6F, 0.6F, 0.6F, a); - else GlStateManager.color(1F, 1F, 1F, a); - - mc.renderEngine.bindTexture(glowTexture); - tess.startDrawingQuads(); - for(int i = 0; i < segAngles; i++) { - float ang = i + seg * segAngles + shift; - double xp = Math.cos(ang * Math.PI / 180F) * s; - double zp = Math.sin(ang * Math.PI / 180F) * s; - - tess.addVertexWithUV(xp * m, y, zp * m, u, v); - tess.addVertexWithUV(xp, y0, zp, u, 0); - - xp = Math.cos((ang + 1) * Math.PI / 180F) * s; - zp = Math.sin((ang + 1) * Math.PI / 180F) * s; - - tess.addVertexWithUV(xp, y0, zp, 0, 0); - tess.addVertexWithUV(xp * m, y, zp * m, 0, v); - } - y0 = 0; - tess.draw(); - - GlStateManager.popMatrix(); - } - GlStateManager.popMatrix(); - } - - @SideOnly(Side.CLIENT) - public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { - Minecraft.getMinecraft(); - int slot = getSegmentLookedAt(stack, player); - MultiversePosition pos = getWarpPoint(stack, slot); - - FontRenderer font = Minecraft.getMinecraft().fontRenderer; - String s = I18n.translateToLocal("botania.sign" + slot); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 55, 0xFFD409); - - if(pos.isValid()) { - int dist = (int) vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(pos.x, pos.y, pos.z, player.posX, player.posY - 1.6, player.posZ); - - s = dist == 1 ? I18n.translateToLocal("botaniamisc.blockAway") : String.format(I18n.translateToLocal("botaniamisc.blocksAway"), dist); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 40, 0x9999FF); - s = I18n.translateToLocal("botaniamisc.clickToTeleport"); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.clickToRemoveWarp"); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 20, 0xFFFFFF); - } else { - s = I18n.translateToLocal("botaniamisc.unboundWarp"); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 40, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.clickToAddWarp"); - font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); - } - } - - private static class MultiversePosition { - - public final double x, y, z; - public final int dim; - - public MultiversePosition(double x, double y, double z, int dim) { - this.x = x; - this.y = y; - this.z = z; - this.dim = dim; - } - - boolean isValid() { - return y > 0; - } - - } - */ - } From 3f85ca5805e80d9e148070bf23a3722af0753a2b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:45:31 -0500 Subject: [PATCH 533/935] Remove isFull3D as it's no longer used for anything --- src/main/java/vazkii/botania/common/item/ItemGrassHorn.java | 4 ---- src/main/java/vazkii/botania/common/item/ItemManaGun.java | 5 ----- src/main/java/vazkii/botania/common/item/ItemManaMirror.java | 5 ----- .../java/vazkii/botania/common/item/ItemSignalFlare.java | 5 ----- src/main/java/vazkii/botania/common/item/ItemTwigWand.java | 5 ----- .../java/vazkii/botania/common/item/relic/ItemKingKey.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemCobbleRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemDirtRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemExchangeRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemFireRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemMissileRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemRainbowRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemSmeltRod.java | 5 ----- .../vazkii/botania/common/item/rod/ItemTerraformRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemTornadoRod.java | 5 ----- .../java/vazkii/botania/common/item/rod/ItemWaterRod.java | 5 ----- 16 files changed, 79 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 60b8f98aa..257823617 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -128,8 +128,4 @@ public class ItemGrassHorn extends ItemMod { } } - @Override - public boolean isFull3D() { - return true; - } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 8e625e20c..950652c69 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -315,11 +315,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return null; } - @Override - public boolean isFull3D() { - return true; - } - @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par1ItemStack.isItemDamaged()) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index f4b101dc8..8939fb426 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -64,11 +64,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return 1000 - (int) (mana / TilePool.MAX_MANA * 1000); } - @Override - public boolean isFull3D() { - return true; - } - @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par2World.isRemote) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index efae288ef..30675befb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -48,11 +48,6 @@ public class ItemSignalFlare extends ItemMod implements IColorable { setMaxDamage(200); } - @Override - public boolean isFull3D() { - return true; - } - @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 0) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 563571d60..1589439e0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -199,11 +199,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - @Override - public boolean isFull3D() { - return true; - } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0 || par2 == 3) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 5e915bcd3..514580aa1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -123,11 +123,6 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { ItemNBTHelper.setInt(stack, TAG_WEAPONS_SPAWNED, count); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 7fe9cf87e..41fd970b7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -39,11 +39,6 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 8eef228fb..0c36c6a86 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -72,11 +72,6 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev return EnumActionResult.PASS; } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 4f9c2c25f..253b0a639 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -330,11 +330,6 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra ItemsRemainingRenderHandler.set(new ItemStack(block, 1, meta), count); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { 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 3f67f2712..98f9a4723 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -66,11 +66,6 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) par3Entity) ? 2 : 1)); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index daf71277c..b814af160 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -91,11 +91,6 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 3109a87a5..850b624d3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -127,11 +127,6 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 0b1e9ebab..6921de109 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -128,11 +128,6 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 feb212989..a66c9c1ed 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -154,11 +154,6 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } } - @Override - public boolean isFull3D() { - return true; - } - private static class CoordsWithBlock extends BlockPos { private final Block block; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index d9d3b9d90..501c7675a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -129,11 +129,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi ItemNBTHelper.setBoolean(stack, TAG_FLYING, flying); } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; 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 15bc3c3d3..12bd6435a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -52,11 +52,6 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { return EnumActionResult.PASS; } - @Override - public boolean isFull3D() { - return true; - } - @Override public boolean usesMana(ItemStack stack) { return true; From 0a396b0d823117ebf19d3f36fcf8d9effaba5d90 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 22:49:49 -0500 Subject: [PATCH 534/935] Full optimize imports --- .../api/internal/DummyManaNetwork.java | 2 - .../botania/api/internal/IManaNetwork.java | 1 - .../vazkii/botania/api/wiki/WikiHooks.java | 1 - .../client/challenge/ModChallenges.java | 12 ++--- .../core/handler/BaubleRenderHandler.java | 6 +-- .../client/core/handler/BossBarHandler.java | 6 +-- .../core/handler/BotaniaPlayerController.java | 2 +- .../core/handler/BoundTileRenderer.java | 11 ++--- .../core/handler/ClientMethodHandles.java | 1 - .../core/handler/ClientTickHandler.java | 8 ++-- .../client/core/handler/ColorHandler.java | 5 --- .../handler/ContributorFancinessHandler.java | 18 ++++---- .../handler/CorporeaAutoCompleteHandler.java | 20 ++++----- .../client/core/handler/DebugHandler.java | 4 +- .../client/core/handler/HUDHandler.java | 18 ++++---- .../handler/ItemsRemainingRenderHandler.java | 8 ++-- .../client/core/handler/LightningHandler.java | 24 +++++----- .../core/handler/MiscellaneousIcons.java | 4 +- .../client/core/handler/ModelHandler.java | 28 +++--------- .../core/handler/MultiblockBlockAccess.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 15 ++----- .../handler/PersistentVariableHelper.java | 14 +++--- .../core/handler/RedStringRenderer.java | 12 +++-- .../client/core/handler/RenderLexicon.java | 6 +-- .../handler/SubTileRadiusRenderHandler.java | 8 ++-- .../TooltipAdditionDisplayHandler.java | 12 +++-- .../client/core/handler/TooltipHandler.java | 4 +- .../client/core/helper/RenderHelper.java | 8 ++-- .../client/core/helper/ShaderHelper.java | 14 +++--- .../client/core/proxy/ClientProxy.java | 37 +++++++-------- .../botania/client/core/proxy/GuiFactory.java | 6 +-- .../vazkii/botania/client/fx/FXSparkle.java | 10 ++--- .../java/vazkii/botania/client/fx/FXWisp.java | 10 ++--- .../client/fx/ParticleRenderDispatcher.java | 1 - .../client/gui/GuiAchievementsHacky.java | 2 +- .../botania/client/gui/GuiBotaniaConfig.java | 2 +- .../botania/client/gui/bag/GuiFlowerBag.java | 5 +-- .../client/gui/bag/InventoryFlowerBag.java | 2 +- .../client/gui/box/ContainerBaubleBox.java | 10 ++--- .../botania/client/gui/box/GuiBaubleBox.java | 1 - .../client/gui/box/InventoryBaubleBox.java | 2 +- .../botania/client/gui/box/SlotAnyBauble.java | 2 +- .../client/gui/lexicon/GuiLexicon.java | 33 +++++++------- .../gui/lexicon/GuiLexiconChallenge.java | 1 - .../gui/lexicon/GuiLexiconChallengesList.java | 6 +-- .../client/gui/lexicon/GuiLexiconEntry.java | 14 +++--- .../client/gui/lexicon/GuiLexiconHistory.java | 6 +-- .../client/gui/lexicon/GuiLexiconIndex.java | 12 +++-- .../lexicon/button/GuiButtonAchievement.java | 7 ++- .../gui/lexicon/button/GuiButtonBack.java | 8 ++-- .../button/GuiButtonBackWithShift.java | 6 +-- .../gui/lexicon/button/GuiButtonBookmark.java | 6 +-- .../gui/lexicon/button/GuiButtonCategory.java | 2 - .../button/GuiButtonChallengeIcon.java | 7 ++- .../button/GuiButtonChallengeInfo.java | 6 +-- .../lexicon/button/GuiButtonChallenges.java | 7 ++- .../gui/lexicon/button/GuiButtonDoot.java | 7 ++- .../gui/lexicon/button/GuiButtonHistory.java | 6 +-- .../lexicon/button/GuiButtonInvisible.java | 4 +- .../gui/lexicon/button/GuiButtonLexicon.java | 1 - .../gui/lexicon/button/GuiButtonNotes.java | 7 ++- .../gui/lexicon/button/GuiButtonOptions.java | 7 ++- .../gui/lexicon/button/GuiButtonPage.java | 6 +-- .../gui/lexicon/button/GuiButtonShare.java | 8 ++-- .../button/GuiButtonUpdateWarning.java | 7 ++- .../lexicon/button/GuiButtonViewOnline.java | 8 ++-- .../integration/jei/JEIBotaniaPlugin.java | 1 - .../jei/brewery/BreweryRecipeWrapper.java | 1 - .../elventrade/ElvenTradeRecipeWrapper.java | 1 - .../jei/manapool/ManaPoolRecipeWrapper.java | 1 - .../PetalApothecaryRecipeWrapper.java | 1 - .../jei/puredaisy/PureDaisyRecipeWrapper.java | 1 - .../runicaltar/RunicAltarRecipeWrapper.java | 1 - .../client/model/FloatingFlowerModel.java | 7 +-- .../botania/client/model/LexiconModel.java | 5 +-- .../botania/client/model/ModelBellows.java | 1 - .../botania/client/model/ModelBrewery.java | 2 - .../botania/client/model/ModelHourglass.java | 5 +-- .../client/model/ModelSpinningCubes.java | 2 - .../botania/client/model/PlatformModel.java | 8 ++-- .../client/model/SpecialFlowerModel.java | 7 ++- .../model/armor/ModelArmorElementium.java | 2 - .../model/armor/ModelArmorManasteel.java | 2 - .../model/armor/ModelArmorManaweave.java | 2 - .../model/armor/ModelArmorTerrasteel.java | 2 - .../render/entity/RenderBabylonWeapon.java | 6 +-- .../render/entity/RenderCorporeaSpark.java | 3 -- .../render/entity/RenderDoppleganger.java | 2 - .../client/render/entity/RenderManaStorm.java | 1 - .../client/render/entity/RenderPixie.java | 2 - .../client/render/entity/RenderSparkBase.java | 9 +--- .../render/entity/RenderThornChakram.java | 2 - .../render/tile/RenderTileAlfPortal.java | 2 - .../client/render/tile/RenderTileAltar.java | 2 - .../client/render/tile/RenderTileAvatar.java | 2 - .../client/render/tile/RenderTileBellows.java | 1 - .../client/render/tile/RenderTileBrewery.java | 1 - .../client/render/tile/RenderTileCocoon.java | 4 +- .../tile/RenderTileCorporeaCrystalCube.java | 7 +-- .../render/tile/RenderTileCorporeaIndex.java | 1 - .../render/tile/RenderTileEnchanter.java | 2 - .../render/tile/RenderTileFloatingFlower.java | 6 +-- .../render/tile/RenderTileHourglass.java | 6 +-- .../render/tile/RenderTileIncensePlate.java | 1 - .../render/tile/RenderTileLightRelay.java | 2 - .../client/render/tile/RenderTilePool.java | 12 +++-- .../client/render/tile/RenderTilePrism.java | 4 +- .../client/render/tile/RenderTilePylon.java | 6 +-- .../render/tile/RenderTileRuneAltar.java | 1 - .../render/tile/RenderTileSkullOverride.java | 4 +- .../render/tile/RenderTileSparkChanger.java | 1 - .../render/tile/RenderTileSpreader.java | 7 ++- .../render/tile/RenderTileStarfield.java | 15 ++++--- .../render/tile/RenderTileTerraPlate.java | 2 - .../render/tile/RenderTileTeruTeruBozu.java | 6 +-- .../render/tile/RenderTileTinyPotato.java | 2 +- .../render/world/SkyblockRenderEvents.java | 2 +- .../render/world/SkyblockSkyRenderer.java | 10 ++--- .../java/vazkii/botania/common/Botania.java | 26 +++++------ .../common/achievement/AchievementMod.java | 6 +-- .../botania/common/block/BlockAlfPortal.java | 2 +- .../botania/common/block/BlockAltGrass.java | 16 +++---- .../botania/common/block/BlockAltar.java | 13 +++--- .../botania/common/block/BlockAvatar.java | 8 ++-- .../botania/common/block/BlockBifrost.java | 8 ++-- .../common/block/BlockBifrostPerm.java | 9 ++-- .../common/block/BlockCacophonium.java | 6 +-- .../botania/common/block/BlockCamo.java | 5 +-- .../botania/common/block/BlockCell.java | 6 +-- .../botania/common/block/BlockCocoon.java | 8 ++-- .../botania/common/block/BlockDreamwood.java | 2 +- .../common/block/BlockEnchantedSoil.java | 6 +-- .../botania/common/block/BlockEnderEye.java | 4 +- .../botania/common/block/BlockFakeAir.java | 7 ++- .../botania/common/block/BlockFelPumpkin.java | 6 +-- .../block/BlockFloatingSpecialFlower.java | 14 +++--- .../botania/common/block/BlockGaiaHead.java | 15 +++---- .../botania/common/block/BlockGhostRail.java | 5 +-- .../botania/common/block/BlockHourglass.java | 6 +-- .../common/block/BlockIncensePlate.java | 4 +- .../common/block/BlockLightLauncher.java | 9 ++-- .../botania/common/block/BlockLightRelay.java | 11 +++-- .../botania/common/block/BlockLivingrock.java | 7 ++- .../botania/common/block/BlockLivingwood.java | 7 ++- .../vazkii/botania/common/block/BlockMod.java | 2 +- .../common/block/BlockModDoubleFlower.java | 6 +-- .../botania/common/block/BlockModFlower.java | 10 ++--- .../botania/common/block/BlockOpenCrate.java | 19 ++++---- .../common/block/BlockPistonRelay.java | 26 +++++------ .../botania/common/block/BlockPlatform.java | 11 +++-- .../botania/common/block/BlockPylon.java | 9 ++-- .../botania/common/block/BlockRoot.java | 4 +- .../botania/common/block/BlockSolidVines.java | 7 ++- .../common/block/BlockSparkChanger.java | 6 +-- .../common/block/BlockSpecialFlower.java | 19 ++++---- .../botania/common/block/BlockStorage.java | 7 ++- .../common/block/BlockTeruTeruBozu.java | 2 +- .../botania/common/block/ModBanners.java | 1 - .../botania/common/block/ModBlocks.java | 4 +- .../block/corporea/BlockCorporeaBase.java | 4 +- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../block/corporea/BlockCorporeaIndex.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 6 +-- .../common/block/decor/Block18Stone.java | 7 ++- .../common/block/decor/BlockBlaze.java | 4 +- .../common/block/decor/BlockBuriedPetals.java | 6 +-- .../common/block/decor/BlockCustomBrick.java | 7 ++- .../common/block/decor/BlockDirtPath.java | 2 +- .../block/decor/BlockEndStoneBrick.java | 7 ++- .../block/decor/BlockFloatingFlower.java | 10 ++--- .../common/block/decor/BlockManaBeacon.java | 7 ++- .../common/block/decor/BlockManaFlame.java | 8 ++-- .../common/block/decor/BlockManaGlass.java | 4 +- .../common/block/decor/BlockModMushroom.java | 12 ++--- .../common/block/decor/BlockPavement.java | 7 ++- .../common/block/decor/BlockPetalBlock.java | 8 ++-- .../common/block/decor/BlockPrismarine.java | 7 ++- .../common/block/decor/BlockReeds.java | 5 +-- .../common/block/decor/BlockSeaLamp.java | 2 +- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/BlockStarfield.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 13 +++--- .../common/block/decor/BlockUnstable.java | 11 +++-- .../decor/biomestone/BlockBiomeStone.java | 7 ++- .../block/decor/panes/BlockModPane.java | 5 +-- .../decor/quartz/BlockSpecialQuartz.java | 13 +++--- .../decor/quartz/BlockSpecialQuartzSlab.java | 4 +- .../block/decor/slabs/BlockModSlab.java | 10 ++--- .../block/decor/stairs/BlockModStairs.java | 2 +- .../block/decor/walls/BlockModWall.java | 6 +-- .../dispenser/BehaviourPoolMinecart.java | 2 +- .../block/dispenser/BehaviourSeeds.java | 2 +- .../common/block/dispenser/BehaviourWand.java | 2 +- .../common/block/mana/BlockBellows.java | 2 +- .../common/block/mana/BlockBrewery.java | 6 +-- .../common/block/mana/BlockEnchanter.java | 6 +-- .../common/block/mana/BlockForestDrum.java | 13 +++--- .../common/block/mana/BlockManaDetector.java | 7 ++- .../botania/common/block/mana/BlockPool.java | 11 +++-- .../botania/common/block/mana/BlockPrism.java | 8 ++-- .../botania/common/block/mana/BlockPump.java | 2 +- .../common/block/mana/BlockRFGenerator.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 6 +-- .../common/block/mana/BlockSpawnerClaw.java | 4 +- .../common/block/mana/BlockSpreader.java | 11 +++-- .../common/block/mana/BlockTerraPlate.java | 4 +- .../common/block/mana/BlockTurntable.java | 2 +- .../common/block/string/BlockRedString.java | 3 +- .../string/BlockRedStringComparator.java | 2 +- .../block/string/BlockRedStringDispenser.java | 2 +- .../string/BlockRedStringFertilizer.java | 6 +-- .../string/BlockRedStringInterceptor.java | 9 ++-- .../common/block/subtile/SubTileManastar.java | 1 - .../subtile/functional/SubTileBellethorn.java | 6 +-- .../subtile/functional/SubTileBubbell.java | 1 - .../subtile/functional/SubTileClayconia.java | 6 +-- .../subtile/functional/SubTileDaffomill.java | 6 +-- .../functional/SubTileFallenKanade.java | 5 +-- .../functional/SubTileHeiseiDream.java | 8 ++-- .../subtile/functional/SubTileHopperhock.java | 16 +++---- .../subtile/functional/SubTileHyacidus.java | 5 +-- .../subtile/functional/SubTileLoonuim.java | 4 +- .../functional/SubTileMarimorphosis.java | 8 ++-- .../subtile/functional/SubTileMedumone.java | 5 +-- .../subtile/functional/SubTileOrechid.java | 10 ++--- .../functional/SubTileOrechidIgnem.java | 4 +- .../functional/SubTilePollidisiac.java | 6 +-- .../functional/SubTileRannuncarpus.java | 16 +++---- .../subtile/functional/SubTileSolegnolia.java | 8 ++-- .../functional/SubTileSpectranthemum.java | 11 ++--- .../functional/SubTileTangleberrie.java | 4 +- .../subtile/functional/SubTileTigerseye.java | 8 ++-- .../subtile/functional/SubTileVinculotus.java | 14 +++--- .../subtile/generating/SubTileArcaneRose.java | 4 +- .../generating/SubTileDandelifeon.java | 6 +-- .../subtile/generating/SubTileDaybloom.java | 4 +- .../subtile/generating/SubTileEndoflame.java | 6 +-- .../generating/SubTileEntropinnyum.java | 6 +-- .../generating/SubTileGourmaryllis.java | 6 +-- .../generating/SubTileHydroangeas.java | 11 +++-- .../subtile/generating/SubTileMunchdew.java | 10 ++--- .../subtile/generating/SubTileNarslimmus.java | 10 ++--- .../subtile/generating/SubTileRafflowsia.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 10 ++--- .../common/block/tile/TileAlfPortal.java | 7 ++- .../botania/common/block/tile/TileAltar.java | 14 +++--- .../common/block/tile/TileBrewery.java | 7 ++- .../common/block/tile/TileCraftCrate.java | 4 +- .../common/block/tile/TileEnchanter.java | 15 +++---- .../common/block/tile/TileEnderEye.java | 4 +- .../common/block/tile/TileFloatingFlower.java | 2 +- .../common/block/tile/TileHourglass.java | 3 +- .../common/block/tile/TileIncensePlate.java | 8 ++-- .../common/block/tile/TileLightRelay.java | 12 ++--- .../botania/common/block/tile/TileMod.java | 3 +- .../common/block/tile/TileOpenCrate.java | 3 +- .../common/block/tile/TilePlatform.java | 2 +- .../botania/common/block/tile/TilePylon.java | 6 +-- .../common/block/tile/TileRuneAltar.java | 8 ++-- .../common/block/tile/TileSparkChanger.java | 9 ++-- .../common/block/tile/TileSpawnerClaw.java | 7 ++- .../common/block/tile/TileSpecialFlower.java | 8 ++-- .../common/block/tile/TileTerraPlate.java | 4 +- .../corporea/TileCorporeaCrystalCube.java | 8 +--- .../tile/corporea/TileCorporeaFunnel.java | 8 ++-- .../tile/corporea/TileCorporeaIndex.java | 45 +++++++++---------- .../corporea/TileCorporeaInterceptor.java | 10 ++--- .../tile/corporea/TileCorporeaRetainer.java | 1 - .../block/tile/mana/TileDistributor.java | 7 ++- .../common/block/tile/mana/TilePool.java | 17 +++---- .../common/block/tile/mana/TilePump.java | 3 +- .../block/tile/mana/TileRFGenerator.java | 7 ++- .../common/block/tile/mana/TileSpreader.java | 12 ++--- .../common/block/tile/mana/TileTurntable.java | 4 +- .../block/tile/string/TileRedString.java | 2 +- .../tile/string/TileRedStringComparator.java | 3 +- .../tile/string/TileRedStringContainer.java | 2 +- .../tile/string/TileRedStringFertilizer.java | 4 +- .../tile/string/TileRedStringInterceptor.java | 10 ++--- .../vazkii/botania/common/brew/ModBrews.java | 1 - .../common/brew/potion/PotionAllure.java | 2 +- .../common/brew/potion/PotionBloodthirst.java | 6 +-- .../common/brew/potion/PotionEmptiness.java | 4 +- .../common/brew/potion/PotionFeatherfeet.java | 2 +- .../botania/common/brew/potion/PotionMod.java | 3 +- .../common/brew/potion/PotionSoulCross.java | 2 +- .../common/core/BotaniaCreativeTab.java | 4 +- .../core/command/CommandDownloadLatest.java | 2 +- .../common/core/command/CommandOpen.java | 1 - .../core/handler/BiomeDecorationHandler.java | 6 +-- .../common/core/handler/ChestGenHandler.java | 4 -- .../core/handler/CommonTickHandler.java | 5 +-- .../common/core/handler/ConfigHandler.java | 28 ++++++------ .../common/core/handler/IMCHandler.java | 6 +-- .../core/handler/InternalMethodHandler.java | 19 ++++---- .../core/handler/ManaNetworkHandler.java | 19 ++++---- .../common/core/handler/MethodHandles.java | 1 - .../common/core/handler/ModSounds.java | 6 --- .../common/core/handler/PixieHandler.java | 7 ++- .../common/core/handler/SheddingHandler.java | 10 ++--- .../common/core/helper/InventoryHelper.java | 17 +++---- .../common/core/helper/PlayerHelper.java | 1 - .../botania/common/core/helper/Vector3.java | 14 +++--- .../common/core/proxy/CommonProxy.java | 25 +++++------ .../common/core/version/AdaptorNotifier.java | 2 +- .../core/version/ThreadDownloadMod.java | 18 ++++---- .../core/version/ThreadVersionChecker.java | 4 +- .../common/core/version/VersionChecker.java | 9 ++-- .../common/crafting/ModCraftingRecipes.java | 14 +++--- .../common/crafting/ModElvenTradeRecipes.java | 6 +-- .../crafting/ModManaAlchemyRecipes.java | 6 +-- .../crafting/ModManaConjurationRecipes.java | 6 +-- .../crafting/ModManaInfusionRecipes.java | 6 +-- .../common/crafting/ModPetalRecipes.java | 4 +- .../common/crafting/ModRuneRecipes.java | 6 +-- .../crafting/recipe/AesirRingRecipe.java | 4 +- .../crafting/recipe/ArmorUpgradeRecipe.java | 1 - .../common/crafting/recipe/HeadRecipe.java | 1 - .../crafting/recipe/LensDyeingRecipe.java | 6 +-- .../common/entity/EntityBabylonWeapon.java | 7 ++- .../common/entity/EntityCorporeaSpark.java | 8 ++-- .../common/entity/EntityDoppleganger.java | 26 +++++------ .../common/entity/EntityEnderAirBottle.java | 6 +-- .../common/entity/EntityFallingStar.java | 6 +-- .../common/entity/EntityFlameRing.java | 6 +-- .../common/entity/EntityMagicLandmine.java | 7 ++- .../common/entity/EntityMagicMissile.java | 8 ++-- .../common/entity/EntityManaBurst.java | 25 +++++------ .../common/entity/EntityPoolMinecart.java | 3 +- .../botania/common/entity/EntitySpark.java | 24 +++++----- .../common/entity/EntityThornChakram.java | 1 - .../common/entity/EntityThrowableCopy.java | 9 ++-- .../common/entity/EntityThrownItem.java | 6 +-- .../botania/common/entity/EntityVineBall.java | 3 +- .../botania/common/entity/ModEntities.java | 2 +- .../buildcraft/StatementAPIPlugin.java | 16 +++---- .../integration/buildcraft/StatementBase.java | 2 +- .../buildcraft/TriggerManaDetector.java | 6 +-- .../buildcraft/TriggerManaLevel.java | 8 ++-- .../buildcraft/TriggerRuneAltarCanCraft.java | 6 +-- .../corporea/WrappedDeepStorage.java | 12 +++-- .../corporea/WrappedIInventory.java | 8 ++-- .../corporea/WrappedInventoryBase.java | 8 ++-- .../corporea/WrappedStorageDrawers.java | 9 ++-- .../botania/common/item/Item16Colors.java | 4 +- .../botania/common/item/ItemAncientWill.java | 6 +-- .../common/item/ItemBlackHoleTalisman.java | 17 ++++--- .../botania/common/item/ItemBlackLotus.java | 4 +- .../botania/common/item/ItemBottledMana.java | 13 +++--- .../botania/common/item/ItemCacophonium.java | 8 ++-- .../common/item/ItemCorporeaSpark.java | 7 ++- .../botania/common/item/ItemCraftPattern.java | 6 +-- .../botania/common/item/ItemCraftingHalo.java | 16 +++---- .../botania/common/item/ItemFertilizer.java | 8 ++-- .../botania/common/item/ItemFlowerBag.java | 5 +-- .../botania/common/item/ItemGaiaHead.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 10 ++--- .../botania/common/item/ItemGrassSeeds.java | 28 ++++++------ .../botania/common/item/ItemKeepIvy.java | 13 +++--- .../botania/common/item/ItemLaputaShard.java | 11 +++-- .../botania/common/item/ItemLexicon.java | 12 +++-- .../botania/common/item/ItemManaCookie.java | 4 +- .../botania/common/item/ItemManaGun.java | 13 +++--- .../botania/common/item/ItemManaMirror.java | 6 +-- .../botania/common/item/ItemManaTablet.java | 6 +-- .../vazkii/botania/common/item/ItemMod.java | 2 +- .../common/item/ItemObedienceStick.java | 2 +- .../botania/common/item/ItemOpenBucket.java | 2 +- .../common/item/ItemOvergrowthSeed.java | 3 +- .../botania/common/item/ItemPhantomInk.java | 2 +- .../botania/common/item/ItemPinkinator.java | 6 +-- .../botania/common/item/ItemPoolMinecart.java | 8 ++-- .../botania/common/item/ItemRegenIvy.java | 11 +++-- .../botania/common/item/ItemSextant.java | 20 ++++----- .../botania/common/item/ItemSignalFlare.java | 6 +-- .../vazkii/botania/common/item/ItemSpark.java | 2 +- .../botania/common/item/ItemSparkUpgrade.java | 4 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../botania/common/item/ItemSpellCloth.java | 10 ++--- .../common/item/ItemTemperanceStone.java | 6 +-- .../botania/common/item/ItemThornChakram.java | 3 +- .../botania/common/item/ItemTwigWand.java | 13 ++++-- .../vazkii/botania/common/item/ItemVirus.java | 18 ++++---- .../common/item/block/ItemBlockPool.java | 4 +- .../item/block/ItemBlockSpecialFlower.java | 6 +-- .../item/block/ItemBlockTinyPotato.java | 6 +-- .../common/item/brew/ItemBrewBase.java | 7 ++- .../common/item/brew/ItemIncenseStick.java | 7 ++- .../botania/common/item/brew/ItemVial.java | 4 +- .../armor/elementium/ItemElementiumArmor.java | 10 ++--- .../armor/manasteel/ItemManasteelArmor.java | 17 ++++--- .../armor/manaweave/ItemManaweaveArmor.java | 8 ++-- .../armor/terrasteel/ItemTerrasteelArmor.java | 12 +++-- .../armor/terrasteel/ItemTerrasteelHelm.java | 12 +++-- .../item/equipment/bauble/ItemAuraRing.java | 2 +- .../item/equipment/bauble/ItemBauble.java | 20 ++++----- .../equipment/bauble/ItemBaubleCosmetic.java | 12 +++-- .../equipment/bauble/ItemBaubleModifier.java | 5 +-- .../equipment/bauble/ItemBloodPendant.java | 13 ++---- .../item/equipment/bauble/ItemDivaCharm.java | 17 ++++--- .../equipment/bauble/ItemFlightTiara.java | 29 ++++++------ .../equipment/bauble/ItemGoldenLaurel.java | 12 +++-- .../item/equipment/bauble/ItemHolyCloak.java | 13 +++--- .../item/equipment/bauble/ItemIcePendant.java | 3 +- .../item/equipment/bauble/ItemItemFinder.java | 26 +++++------ .../equipment/bauble/ItemKnockbackBelt.java | 11 ++--- .../equipment/bauble/ItemLavaPendant.java | 3 +- .../item/equipment/bauble/ItemMagnetRing.java | 16 +++---- .../item/equipment/bauble/ItemManaRing.java | 6 +-- .../item/equipment/bauble/ItemMiningRing.java | 3 +- .../item/equipment/bauble/ItemMonocle.java | 11 +++-- .../item/equipment/bauble/ItemPixieRing.java | 2 +- .../item/equipment/bauble/ItemReachRing.java | 2 +- .../bauble/ItemSuperLavaPendant.java | 5 +-- .../item/equipment/bauble/ItemSwapRing.java | 3 +- .../item/equipment/bauble/ItemTinyPlanet.java | 7 ++- .../item/equipment/bauble/ItemTravelBelt.java | 19 ++++---- .../equipment/bauble/ItemUnholyCloak.java | 8 ++-- .../item/equipment/bauble/ItemWaterRing.java | 3 +- .../item/equipment/tool/ItemEnderDagger.java | 4 +- .../item/equipment/tool/ItemGlassPick.java | 2 +- .../item/equipment/tool/ItemStarSword.java | 1 - .../item/equipment/tool/ItemThunderSword.java | 10 ++--- .../item/equipment/tool/ToolCommons.java | 1 - .../equipment/tool/bow/ItemLivingwoodBow.java | 3 +- .../tool/elementium/ItemElementiumAxe.java | 9 ++-- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 7 ++- .../tool/manasteel/ItemManasteelAxe.java | 13 +++--- .../tool/manasteel/ItemManasteelPick.java | 10 ++--- .../tool/manasteel/ItemManasteelShears.java | 12 ++--- .../tool/manasteel/ItemManasteelShovel.java | 7 ++- .../tool/manasteel/ItemManasteelSword.java | 4 +- .../tool/terrasteel/ItemTerraAxe.java | 43 +++++++++--------- .../tool/terrasteel/ItemTerraPick.java | 20 +++++---- .../tool/terrasteel/ItemTerraSword.java | 8 ++-- .../ItemElementiumHelmRevealing.java | 2 +- .../thaumcraft/ItemManaInkwell.java | 6 +-- .../ItemManasteelHelmRevealing.java | 4 +- .../ItemTerrasteelHelmRevealing.java | 2 +- .../botania/common/item/lens/ItemLens.java | 8 ++-- .../botania/common/item/lens/LensBounce.java | 2 +- .../botania/common/item/lens/LensDamage.java | 6 +-- .../botania/common/item/lens/LensFire.java | 2 +- .../botania/common/item/lens/LensFlare.java | 4 +- .../common/item/lens/LensInfluence.java | 4 +- .../botania/common/item/lens/LensMine.java | 6 +-- .../botania/common/item/lens/LensPaint.java | 8 ++-- .../botania/common/item/lens/LensWarp.java | 1 - .../botania/common/item/material/ItemDye.java | 2 +- .../common/item/material/ItemManaPetal.java | 1 - .../item/material/ItemManaResource.java | 15 +++---- .../common/item/material/ItemPetal.java | 3 +- .../common/item/material/ItemQuartz.java | 4 +- .../common/item/material/ItemRune.java | 5 +-- .../common/item/record/ItemModRecord.java | 4 +- .../common/item/relic/ItemAesirRing.java | 16 +++---- .../botania/common/item/relic/ItemDice.java | 8 ++-- .../common/item/relic/ItemFlugelEye.java | 2 +- .../common/item/relic/ItemInfiniteFruit.java | 2 +- .../common/item/relic/ItemKingKey.java | 4 +- .../common/item/relic/ItemLokiRing.java | 22 +++++---- .../common/item/relic/ItemOdinRing.java | 18 ++++---- .../botania/common/item/relic/ItemRelic.java | 6 +-- .../common/item/relic/ItemRelicBauble.java | 7 ++- .../common/item/relic/ItemThorRing.java | 6 +-- .../common/item/rod/ItemCobbleRod.java | 2 +- .../botania/common/item/rod/ItemDirtRod.java | 2 +- .../common/item/rod/ItemDiviningRod.java | 6 +-- .../common/item/rod/ItemExchangeRod.java | 16 +++---- .../botania/common/item/rod/ItemFireRod.java | 4 +- .../common/item/rod/ItemGravityRod.java | 9 ++-- .../common/item/rod/ItemRainbowRod.java | 10 +++-- .../common/item/rod/ItemSkyDirtRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 6 +-- .../common/item/rod/ItemTerraformRod.java | 6 ++- .../common/item/rod/ItemTornadoRod.java | 6 +-- .../botania/common/item/rod/ItemWaterRod.java | 2 +- .../botania/common/lexicon/LexiconData.java | 7 ++- .../botania/common/lexicon/RLexiconEntry.java | 4 +- .../botania/common/lexicon/page/PageBrew.java | 10 ++--- .../lexicon/page/PageCraftingRecipe.java | 17 +++---- .../common/lexicon/page/PageElvenRecipe.java | 15 +++---- .../common/lexicon/page/PageEntity.java | 9 ++-- .../common/lexicon/page/PageGuide.java | 10 ++--- .../common/lexicon/page/PageImage.java | 8 ++-- .../common/lexicon/page/PageLoreText.java | 2 - .../lexicon/page/PageManaInfusionRecipe.java | 19 ++++---- .../common/lexicon/page/PageMultiblock.java | 14 +++--- .../common/lexicon/page/PagePetalRecipe.java | 15 +++---- .../common/lexicon/page/PageRecipe.java | 16 +++---- .../common/lexicon/page/PageRuneRecipe.java | 10 ++--- .../common/lexicon/page/PageShedding.java | 19 ++++---- .../common/lexicon/page/PageTerrasteel.java | 12 +++-- .../botania/common/lexicon/page/PageText.java | 12 +++-- .../common/lexicon/page/PageTutorial.java | 12 ++--- .../botania/common/network/GuiHandler.java | 2 +- .../common/world/SkyblockWorldEvents.java | 6 +-- .../common/world/WorldTypeSkyblock.java | 1 - 499 files changed, 1625 insertions(+), 2058 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 111cd93af..899801be5 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,14 +10,12 @@ */ package vazkii.botania.api.internal; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; -import java.util.List; import java.util.Set; public class DummyManaNetwork implements IManaNetwork { diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index 2a44e7a15..95e169c90 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -15,7 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; -import java.util.List; import java.util.Set; /** diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 4f1523824..241459fb2 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -12,7 +12,6 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameData; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index cdade0e93..92c14f44a 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.challenge; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -24,6 +18,12 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public final class ModChallenges { public static final Map> challenges = new EnumMap<>(EnumChallengeLevel.class); 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 d797fb257..0146ccd63 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -10,6 +10,8 @@ */ package vazkii.botania.client.core.handler; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -21,8 +23,6 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; - import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; @@ -32,8 +32,6 @@ import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; public final class BaubleRenderHandler implements LayerRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 31f9dd46c..f0f5a786c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -10,18 +10,14 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Rectangle; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; @@ -30,6 +26,8 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.MathHelper; +import java.awt.*; + public final class BossBarHandler { public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index eb18ab149..89bc0e915 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -13,9 +13,9 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; -import vazkii.botania.api.item.IExtendedPlayerController; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.item.IExtendedPlayerController; @SideOnly(Side.CLIENT) public class BotaniaPlayerController extends PlayerControllerMP implements IExtendedPlayerController { diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 26d0481be..e421c3501 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -20,26 +17,26 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.CombinedInvWrapper; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.awt.*; +import java.util.List; public final class BoundTileRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index 0d9cd4357..dcf425788 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -2,7 +2,6 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index e5e7dc5fd..78a8d6e28 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -15,6 +15,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.client.core.handler.LightningHandler.LightningBolt; @@ -23,10 +27,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import vazkii.botania.common.item.ModItems; public class ClientTickHandler { 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 2e55b40ac..0a1dcc21c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -3,21 +3,16 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.init.Blocks; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.common.registry.IForgeRegistry; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.state.BotaniaStateProps; 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 4e3dfb1dd..d44d66275 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -10,14 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -28,7 +20,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.subtile.signature.SubTileSignature; @@ -37,7 +29,13 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import net.minecraftforge.fml.common.FMLLog; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; public final class ContributorFancinessHandler implements LayerRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 75ac1f28b..4f1a7512f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; @@ -24,15 +18,19 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextComponentString; - -import org.lwjgl.input.Keyboard; - -import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import org.lwjgl.input.Keyboard; +import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.common.lib.LibObfuscation; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; public class CorporeaAutoCompleteHandler { 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 bf911b667..d7eea4652 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -16,18 +16,16 @@ import net.minecraft.entity.Entity; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ContextCapabilities; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GLContext; - import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.UUID; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 2449bc6b2..bcd8a37a5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -10,8 +10,7 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - +import baubles.common.lib.PlayerHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -28,15 +27,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; - +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; @@ -66,10 +66,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.awt.*; public final class HUDHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 018f6d094..74521d8ee 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.regex.Pattern; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -19,11 +17,11 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + +import java.util.regex.Pattern; public final class ItemsRemainingRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index c93031e6a..ab34ca55f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -10,15 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Random; -import java.util.concurrent.ConcurrentLinkedQueue; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; @@ -29,20 +20,27 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.LightningHandler.LightningBolt.Segment; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Random; +import java.util.concurrent.ConcurrentLinkedQueue; public class LightningHandler { 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 68c47d51a..729ac7a73 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -10,9 +10,9 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; @@ -33,12 +33,10 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; import javax.imageio.ImageIO; -import javax.vecmath.Matrix4f; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.nio.IntBuffer; -import java.util.List; import java.util.Map; public class MiscellaneousIcons { 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 eb302fc8c..c24999b03 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import net.minecraft.block.Block; @@ -17,30 +16,22 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; -import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; 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.GameData; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.enums.PlatformVariant; -import vazkii.botania.api.state.enums.SpreaderVariant; -import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.AltarVariant; @@ -54,12 +45,14 @@ import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; +import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; +import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -114,26 +107,19 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ItemManaGun; -import vazkii.botania.common.item.ItemSpawnerMover; -import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; -import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; -import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.relic.ItemInfiniteFruit; -import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import static vazkii.botania.common.item.ModItems.*; - import java.util.List; import java.util.Locale; +import static vazkii.botania.common.item.ModItems.*; + public final class ModelHandler { // todo reorganize, alphabetize 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 2a4f1ad2f..1f15f88c2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -13,8 +13,8 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; 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; 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 350a60d02..19ae88e8b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -13,21 +13,14 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; @@ -35,15 +28,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index a1ba97d21..ed308d773 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -10,13 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.Set; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.client.challenge.Challenge; @@ -24,6 +17,13 @@ import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibMisc; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.Set; + public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 0173440c7..7bfb610df 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -10,25 +10,23 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayDeque; -import java.util.Queue; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; - +import net.minecraft.util.math.BlockPos; import org.lwjgl.opengl.GL11; - import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import java.util.ArrayDeque; +import java.util.Queue; +import java.util.Random; + public final class RedStringRenderer { public static final Queue redStringTiles = new ArrayDeque<>(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 44bdf3b38..3442f22e5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -11,10 +11,10 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.fml.common.FMLLog; diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 12cfd6677..9a0f1e342 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -22,9 +20,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; @@ -32,7 +29,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.awt.*; public final class SubTileRadiusRenderHandler { 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 557b2fd07..b81e59652 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -26,10 +22,9 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; @@ -40,7 +35,10 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.awt.*; +import java.util.ArrayList; +import java.util.List; public final class TooltipAdditionDisplayHandler { 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 a58b4df3f..c92e01265 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -14,11 +14,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ItemRegenIvy; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class TooltipHandler { diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 47a1724aa..e944aa073 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.core.helper; -import java.util.List; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -21,13 +18,14 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; +import java.util.List; +import java.util.Random; + public final class RenderHelper { public static void renderTooltip(int x, int y, List tooltipData) { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index ede7054e8..ec768f65c 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -10,24 +10,22 @@ */ package vazkii.botania.client.core.helper; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.stream.Collectors; - import net.minecraft.client.renderer.OpenGlHelper; - +import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import net.minecraftforge.fml.common.FMLLog; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.stream.Collectors; public final class ShaderHelper { 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 130249d3f..44dd512e0 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -10,16 +10,6 @@ */ package vazkii.botania.client.core.proxy; -import java.awt.Desktop; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URI; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.PlayerControllerMP; @@ -31,13 +21,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -56,10 +53,10 @@ import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; -import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; @@ -153,14 +150,14 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.Map; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 0794847af..66ea8640d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -10,12 +10,12 @@ */ package vazkii.botania.client.core.proxy; -import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import vazkii.botania.client.gui.GuiBotaniaConfig; import net.minecraftforge.fml.client.IModGuiFactory; +import vazkii.botania.client.gui.GuiBotaniaConfig; + +import java.util.Set; public class GuiFactory implements IModGuiFactory { diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 1ae98921c..dfb97066b 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.fx; -import java.util.ArrayDeque; -import java.util.Queue; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; @@ -21,19 +18,20 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibObfuscation; +import java.util.ArrayDeque; +import java.util.Queue; + public class FXSparkle extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index d9fcb832c..0f5588fe9 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.fx; -import java.util.ArrayDeque; -import java.util.Queue; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; @@ -23,15 +20,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; - +import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import net.minecraftforge.fml.client.FMLClientHandler; import vazkii.botania.common.lib.LibObfuscation; +import java.util.ArrayDeque; +import java.util.Queue; + public class FXWisp extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index a4743cb10..a0458839a 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -15,7 +15,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; - import org.lwjgl.opengl.GL11; public final class ParticleRenderDispatcher { diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 587e5ac1c..571e3ffb2 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; -import vazkii.botania.common.achievement.ModAchievements; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.achievement.ModAchievements; public class GuiAchievementsHacky extends GuiAchievements { diff --git a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java index 77c2fe04c..38f88a519 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java @@ -13,9 +13,9 @@ package vazkii.botania.client.gui; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.client.config.GuiConfig; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.client.config.GuiConfig; public class GuiBotaniaConfig extends GuiConfig { diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 88e3ab856..786cf33a2 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.gui.bag; -import java.util.List; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -20,10 +18,11 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; +import java.util.List; + public class GuiFlowerBag extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG); diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 94136aaa9..b1c1d8dd3 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui.bag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import vazkii.botania.common.item.ItemFlowerBag; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 5e19c7e5a..71ce59f79 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -10,6 +10,11 @@ */ package vazkii.botania.client.gui.box; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.container.SlotBauble; +import baubles.common.lib.PlayerHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -17,11 +22,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.container.SlotBauble; -import baubles.common.lib.PlayerHandler; public class ContainerBaubleBox extends Container { diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 634cb86cf..a52620a79 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.lib.LibResources; public class GuiBaubleBox extends InventoryEffectRenderer { diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 150450054..1e15381e2 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -13,8 +13,8 @@ package vazkii.botania.client.gui.box; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import vazkii.botania.common.item.ItemBaubleBox; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java index e19453b9b..1999311b5 100644 --- a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java +++ b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java @@ -10,10 +10,10 @@ */ package vazkii.botania.client.gui.box; +import baubles.api.IBauble; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaItem; -import baubles.api.IBauble; public class SlotAnyBauble extends Slot { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index db868bbab..6ce5f3c9f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -10,21 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; @@ -34,14 +19,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.BotaniaTutorialStartEvent; import vazkii.botania.api.lexicon.LexiconCategory; @@ -71,6 +54,20 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibMisc; +import java.awt.*; +import java.io.IOException; +import java.net.URI; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; + public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index 3f2827a34..ed081b42f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index a21b9bf9e..4c02437f8 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.io.IOException; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; @@ -23,6 +20,9 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonChallengeIcon; +import java.io.IOException; +import java.util.List; + public class GuiLexiconChallengesList extends GuiLexicon implements IParented { GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 743fd7d46..b66d25db9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -10,22 +10,15 @@ */ package vazkii.botania.client.gui.lexicon; -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import org.lwjgl.input.Mouse; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.IAddonEntry; @@ -37,6 +30,11 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.client.gui.lexicon.button.GuiButtonShare; import vazkii.botania.client.gui.lexicon.button.GuiButtonViewOnline; +import java.awt.*; +import java.io.IOException; +import java.net.URI; +import java.util.List; + public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { private static final String TAG_ENTRY = "entry"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index f0e4ce30a..a244362de 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.gui.lexicon; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; +import java.util.ArrayList; +import java.util.List; + public class GuiLexiconHistory extends GuiLexiconIndex { public static final List history = new ArrayList<>(); 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 a541c4357..a478190ce 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -24,9 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import org.lwjgl.input.Mouse; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconCategory; @@ -37,6 +30,11 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.common.lexicon.DLexiconEntry; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class GuiLexiconIndex extends GuiLexicon implements IParented { private static final String TAG_CATEGORY = "category"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 1978d8c9f..428ad7af5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonAchievement extends GuiButtonLexicon { public GuiButtonAchievement(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index ee28128cc..a96dc9ece 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -10,17 +10,15 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.Collections; +import java.util.List; + public class GuiButtonBack extends GuiButtonLexicon { public GuiButtonBack(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 729e2018f..451274db3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -10,12 +10,12 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.List; - import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import java.util.Arrays; +import java.util.List; + public class GuiButtonBackWithShift extends GuiButtonBack { public GuiButtonBackWithShift(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 2838e6043..a79da6ca7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -1,14 +1,14 @@ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonBookmark extends GuiButtonLexicon { GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index d70e46644..139217d65 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -16,11 +16,9 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; - import org.lwjgl.opengl.ARBMultitexture; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 59b1b7adb..f7a7d6b71 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.challenge.Challenge; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallengeIcon extends GuiButtonLexicon { public Challenge challenge; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 6841c33c0..f78072a7e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallengeInfo extends GuiButtonLexicon { GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index f184b52f5..2476d2c79 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallenges extends GuiButtonLexicon { public GuiButtonChallenges(int id, int x, int y) { 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 6f13a0903..0cb3b4abf 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 @@ -10,19 +10,18 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + // Ssssshhhhhhh // I should've done this last year public class GuiButtonDoot extends GuiButtonLexicon { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 63fca3691..bde63829b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -10,15 +10,15 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonHistory extends GuiButtonLexicon { GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index c54106407..65a5b4dec 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -14,11 +14,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; - +import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.FontHelper; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index 896e9f488..01aec5bfc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -13,7 +13,6 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.ResourceLocation; import vazkii.botania.api.sound.BotaniaSoundEvents; public class GuiButtonLexicon extends GuiButton { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 2cc57e516..036e173da 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonNotes extends GuiButtonLexicon { GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 8b6f4684d..2f5abee27 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonOptions extends GuiButtonLexicon { public GuiButtonOptions(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 7f0e67f73..a18e2cc5a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -10,16 +10,14 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.Collections; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.Collections; + public class GuiButtonPage extends GuiButtonLexicon { boolean right; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 03a8531a3..2d427d6fc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -10,18 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.Collections; +import java.util.List; + public class GuiButtonShare extends GuiButtonLexicon { public GuiButtonShare(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 374358e6a..a76ce006c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -10,19 +10,18 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonUpdateWarning extends GuiButtonLexicon { public GuiButtonUpdateWarning(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index b2e9f1cf1..95578bbfb 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -10,18 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.util.Collections; +import java.util.List; + public class GuiButtonViewOnline extends GuiButtonLexicon { public GuiButtonViewOnline(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 818e72c4c..2219f3df5 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.integration.jei; -import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 91fa03c3c..9604a1b5c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -18,7 +18,6 @@ import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 913fc69a6..52bf709ac 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -17,7 +17,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeElvenTrade; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index bbf50d856..4ffd3f699 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -19,7 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 476f73ccf..82a8925c1 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -17,7 +17,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePetals; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index e69084467..560245cb8 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -19,7 +19,6 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePureDaisy; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class PureDaisyRecipeWrapper implements IRecipeWrapper { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 5bc608dab..12deaf4e3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -20,7 +20,6 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; public class RunicAltarRecipeWrapper implements IRecipeWrapper { diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8d1eb5fb7..bd9e7b02a 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.model; -import com.google.common.base.Predicates; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; @@ -16,27 +15,25 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverride; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelManager; -import net.minecraft.client.renderer.block.model.MultipartBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPIClient; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index b8d6320b9..61d90496c 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -4,15 +4,14 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; -import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; import java.util.List; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 15976ddc6..dcc3d67d2 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -12,7 +12,6 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - import net.minecraft.client.renderer.GlStateManager; public class ModelBellows extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 47af8b4cd..d43d1fc62 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -12,9 +12,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - import net.minecraft.client.renderer.GlStateManager; - import vazkii.botania.client.render.tile.RenderTileBrewery; public class ModelBrewery extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index 2deba7bdf..c51b5bc13 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -10,14 +10,13 @@ */ package vazkii.botania.client.model; -import java.awt.Color; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; +import java.awt.*; + public class ModelHourglass extends ModelBase { public ModelRenderer ring; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index a01e38f16..2a68fef4a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -14,9 +14,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; public class ModelSpinningCubes extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 6607ef1a0..f61bed8ff 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -12,16 +12,16 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +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; diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index fcc20e30f..029c9a444 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -18,15 +18,14 @@ import com.google.gson.JsonParser; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.block.model.ModelManager; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -35,11 +34,11 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelCustomData; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLLog; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 20f00a5a0..8645a3608 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -14,10 +14,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHandSide; public class ModelArmorElementium extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 2df491c96..c01443cb1 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -14,10 +14,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHandSide; public class ModelArmorManasteel extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 05b314fb9..dbf0424f0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -14,10 +14,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHandSide; public class ModelArmorManaweave extends ModelBiped { diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 976802f26..fc937b160 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -14,10 +14,8 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHandSide; public class ModelArmorTerrasteel extends ModelBiped { 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 08caabb98..b2d173441 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.entity; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -22,15 +20,15 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; +import java.util.Random; + public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); 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 5c62a6441..6df87330e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -13,9 +13,6 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.item.EnumDyeColor; - - import net.minecraft.network.datasync.DataParameter; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 5c68469d0..9e6d08480 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -15,9 +15,7 @@ import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.ARBShaderObjects; - import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index bb781be4f..d9fcb9934 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 19c073a4c..9d47dc3b5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -15,10 +15,8 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; 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 f4359c54e..0334c9d8a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -10,12 +10,9 @@ */ package vazkii.botania.client.render.entity; -import java.util.Random; - import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderEntity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -23,13 +20,11 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.entity.EntitySpark; + +import java.util.Random; public abstract class RenderSparkBase extends Render { 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 3629f158f..795d2c8ff 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -18,9 +18,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.common.entity.EntityThornChakram; // Basically a bit of an extension of RenderSnowball 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 5c7bcae97..5e3a5c8de 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -17,9 +17,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 554207319..7ad3be112 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -20,11 +20,9 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; 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 32448f85d..3f8042106 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -19,9 +19,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 82021906d..c7aadb1b2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -14,7 +14,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; 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 9fb32c5b8..9209c4a70 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -17,7 +17,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; 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 5b84ea59e..235f27776 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -13,13 +13,11 @@ package vazkii.botania.client.render.tile; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCocoon; import vazkii.botania.common.block.tile.TileCocoon; 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 b007618a6..b01b6eafe 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -17,17 +17,16 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; - import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.animation.Animation; @@ -37,15 +36,11 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; -import java.util.concurrent.TimeUnit; - public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { ModelCrystalCube model = new ModelCrystalCube(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 00612b80d..245c8c536 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -15,7 +15,6 @@ import net.minecraft.client.model.ModelEnderCrystal; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index e2ca919a5..38a6e3356 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -20,9 +20,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 59c55d8ff..ba17a6c3c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.awt.*; -import java.util.Random; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -20,10 +17,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; +import java.util.Random; + public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index b88d16f33..4ded315cc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -10,21 +10,19 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; +import java.util.Random; + public class RenderTileHourglass extends TileEntitySpecialRenderer { ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 38797a4c4..7e3e7c1ae 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; - import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index a980e08ca..d035ccc05 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -17,9 +17,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 5314c993e..ab1fae042 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -10,32 +10,30 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.item.EnumDyeColor; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import java.awt.*; +import java.util.Random; + public class RenderTilePool extends TileEntitySpecialRenderer { // Overrides for when we call this TESR without an actual pool 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 d5a9febdb..8a9932b9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -16,12 +16,12 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; - import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; -//import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TilePrism; +//import vazkii.botania.client.render.item.RenderLens; + public class RenderTilePrism extends TileEntitySpecialRenderer { @Override 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 5a3065893..5f49f06a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -10,17 +10,13 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -34,6 +30,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.Random; + public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); 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 6dd0f5ca7..ea4340052 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 927cf3381..dd9984519 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -10,20 +10,18 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; - import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.model.ModelSkullOverride; import vazkii.botania.client.render.entity.RenderDoppleganger; import vazkii.botania.common.block.tile.TileGaiaHead; -import com.mojang.authlib.GameProfile; - public class RenderTileSkullOverride extends TileEntitySkullRenderer { public static final ModelSkullOverride modelSkull = new ModelSkullOverride(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 1d58ed85a..1782cbd19 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; - import vazkii.botania.common.block.tile.TileSparkChanger; public class RenderTileSparkChanger extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 8dd4bbbc2..c0c57686b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.util.Random; - import net.minecraft.block.BlockCarpet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -24,7 +21,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; @@ -33,6 +29,9 @@ import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; +import java.awt.*; +import java.util.Random; + public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index b43e9894a..9932f00c4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -10,18 +10,21 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.nio.FloatBuffer; -import java.util.Random; - import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ActiveRenderInfo; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; - import vazkii.botania.common.block.tile.TileStarfield; +import java.awt.*; +import java.nio.FloatBuffer; +import java.util.Random; + // This is copied from the vanilla end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntitySpecialRenderer { 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 96ed91fe6..55e2c352b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -18,9 +18,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 037f567b5..f0b6423fd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -10,21 +10,19 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; +import java.util.Random; + public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f4e941c53..1875f1211 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -24,8 +24,8 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.TinyPotatoRenderEvent; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 39890a948..639dbfd6e 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -13,9 +13,9 @@ package vazkii.botania.client.render.world; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.world.WorldTypeSkyblock; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SkyblockRenderEvents { diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 12ee5b389..834c616f7 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.world; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; @@ -19,17 +17,17 @@ import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.IRenderHandler; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.Random; public class SkyblockSkyRenderer extends IRenderHandler { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index cfb5f1ecd..17669e471 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -11,23 +11,14 @@ package vazkii.botania.common; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.text.event.ClickEvent; -import net.minecraft.util.text.event.HoverEvent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.event.ClickEvent; +import net.minecraft.util.text.event.HoverEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import vazkii.botania.common.core.handler.IMCHandler; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.integration.coloredlights.ILightHelper; -import vazkii.botania.common.integration.coloredlights.LightHelperColored; -import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; -import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -41,6 +32,15 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.integration.coloredlights.ILightHelper; +import vazkii.botania.common.integration.coloredlights.LightHelperColored; +import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; +import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS) public class Botania { diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 5f88fa1d3..22c740eec 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -10,15 +10,15 @@ */ package vazkii.botania.common.achievement; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import vazkii.botania.api.item.IRelic; +import java.util.ArrayList; +import java.util.List; + public class AchievementMod extends Achievement { public static final List achievements = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index c5fca7b7a..18bc0e654 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -17,8 +17,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index d97f0ac35..b94e54196 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -24,22 +20,26 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassVariant; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; +import java.util.Random; public class BlockAltGrass extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 13d8b974d..a960db66c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -27,17 +23,18 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -52,7 +49,9 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; +import java.util.Random; public class BlockAltar extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 268a082a5..8aa9b4ade 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -23,21 +21,23 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockAvatar extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 716f28442..fc8a7347a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -19,9 +17,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -33,6 +31,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 62c9045d2..175797327 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -10,17 +10,14 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -29,6 +26,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d3da585e3..dab8219cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -28,6 +25,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.List; + public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 7c322d072..d0fa7d677 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -19,14 +19,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockCamo extends BlockMod { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 367fffef4..876608650 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,6 +25,9 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.List; + public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index cb7a49247..45d9c465c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -21,10 +18,10 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -33,6 +30,9 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.List; + 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); diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index f7ec45a20..03e0cb7c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -4,11 +4,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockDreamwood extends BlockLivingwood { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index b98c13e05..ab0739669 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -19,8 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; @@ -30,6 +28,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index cb44bd880..7dced8a07 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -17,13 +17,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index e1e2dc10b..0554263b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -27,10 +24,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; +import java.util.List; +import java.util.Random; + public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 94ca71afc..b2898c3c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -21,17 +21,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import vazkii.botania.api.state.BotaniaStateProps; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BlockFelPumpkin extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index ddac026ba..632483c33 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -26,18 +22,20 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -45,7 +43,6 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; @@ -53,7 +50,10 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 490eb1b81..cdb2ebe47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -10,31 +10,28 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibMisc; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class BlockGaiaHead extends BlockSkull { public BlockGaiaHead() { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index bdf022d47..d70e13fc5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -20,10 +20,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -31,8 +32,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class BlockGhostRail extends BlockRailBase implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 851691205..e68d4b9b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,11 +22,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -45,6 +43,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1.15, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 7752e0823..d7d6951fe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -19,16 +19,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 33079b69a..aa8f11037 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -24,9 +21,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -35,7 +32,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.List; public class BlockLightLauncher extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index f41e42ff8..a11022792 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -23,12 +19,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -38,7 +35,9 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; +import java.util.Random; public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 5925ae9a5..50d310335 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -31,7 +29,8 @@ import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockLivingrock extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 23aa16c90..445b39579 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -25,6 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +30,8 @@ import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockLivingwood extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 57c37c502..442e9e876 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -13,11 +13,11 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class BlockMod extends Block { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index aba9fba8b..f0769c3a3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -18,19 +18,15 @@ import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Enchantments; -import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 69f008b19..8178c982e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -32,9 +29,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.state.BotaniaStateProps; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -43,9 +41,11 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.List; +import java.util.Random; + public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 68d059758..a9dce4157 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -10,21 +10,14 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -32,9 +25,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -48,7 +43,9 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; +import java.util.Random; public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index f2a24dcf7..993f2692b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; @@ -35,24 +27,32 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.Type; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.Type; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index a7eb67109..b010855b3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -24,15 +21,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -43,7 +41,8 @@ import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 5a6589464..43a2e15a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -27,6 +24,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -37,8 +36,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index edf03c04a..ad840d144 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -26,6 +24,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 5e34f05e6..00713f5c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -25,13 +22,15 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.Random; + public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index d835e5b3f..48866e0a3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -22,10 +20,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -37,6 +35,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockSparkChanger extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index ee92bebe9..acf05da63 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; @@ -33,13 +28,13 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -47,12 +42,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; @@ -63,9 +59,12 @@ import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { static { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 7419af45c..78626cf61 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -31,7 +29,8 @@ import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockStorage extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index b55479ccc..966e2e790 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -20,10 +20,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index f82033fdd..be48a7a24 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -14,7 +14,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityBanner; import net.minecraftforge.common.util.EnumHelper; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; public final class ModBanners { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 14879b9da..10a446f13 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -16,6 +16,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -176,8 +178,6 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.registry.GameRegistry; public final class ModBlocks { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 956cee0a0..4c24792b8 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.corporea; -import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -27,6 +25,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; +import java.util.Random; + public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { private final Random random = new Random(); 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 2c49d1be2..b22db5845 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -17,10 +17,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; 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 09ea37dea..6161d407e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -19,8 +19,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; 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 1ede7a9b6..c8d4ec155 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -10,16 +10,14 @@ */ package vazkii.botania.common.block.corporea; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -30,6 +28,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaInterceptor() { 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 4080171ff..241b86a8b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +30,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class Block18Stone extends BlockMod implements ILexiconable { 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 02b111f23..f94c797f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -19,14 +19,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.IFuelHandler; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.IFuelHandler; -import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 74ef06b7c..8aa5b2d83 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.Random; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -20,13 +18,15 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; + +import java.util.Random; public class BlockBuriedPetals extends BlockModFlower { 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 08fbf25e0..67cbe11f9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +30,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockCustomBrick extends BlockMod implements ILexiconable { 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 04e35b154..1088f52e2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -22,9 +22,9 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; 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 b2037424e..6f4e6c4ee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +30,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { 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 0b8c91d08..795fed648 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -28,27 +28,29 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; @@ -58,8 +60,6 @@ import vazkii.botania.common.item.IFloatingFlowerVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import java.util.List; import java.util.Random; 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 df2386428..6cedd0eba 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -27,6 +24,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -35,7 +33,8 @@ import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockManaBeacon extends BlockMod implements ILexiconable { 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 c36174362..dd4e2ab4c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -22,12 +20,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -36,7 +35,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; -import net.minecraftforge.fml.common.Optional; + +import java.util.List; public class BlockManaFlame extends BlockMod implements ILexiconable { 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 189bdf11b..88df54d21 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -16,9 +16,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 686f84db5..c73ae2d33 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; @@ -25,12 +22,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; @@ -43,10 +42,11 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.List; +import java.util.Random; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { 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 5d46d6150..ee5b95dc6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -25,11 +22,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockPavement extends BlockMod { 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 a3a73c7eb..60c7f09a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -23,8 +20,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +29,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockPetalBlock extends BlockMod implements ILexiconable { 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 e78ba8455..0bf75b7c9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,7 +30,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockPrismarine extends BlockMod implements ILexiconable { 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 cdf4ae7f9..313a6231b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -19,10 +18,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -30,7 +30,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { 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 603cf3bcc..c24e6e739 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -18,13 +18,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; public class BlockSeaLamp extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index b8d24793a..1b058664c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -25,7 +26,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { 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 e47176e31..0d1567078 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -17,9 +17,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 5331a515d..11a25a437 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -22,13 +18,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -38,7 +35,9 @@ import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.List; public class BlockTinyPotato extends BlockMod implements ILexiconable { 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 7a0cd1fb1..9e2aa8f59 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.awt.Color; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -29,6 +24,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -40,7 +36,10 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.awt.*; +import java.util.List; +import java.util.Random; public class BlockUnstable extends BlockMod implements ILexiconable { 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 016a8c21e..ddd890811 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor.biomestone; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -23,12 +20,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class BlockBiomeStone extends BlockMod implements ILexiconable { 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 873a128f2..88720489e 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 @@ -14,15 +14,14 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class BlockModPane extends BlockPane { 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 b2c49e8c3..c7a4ef0c2 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.decor.quartz; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -21,9 +18,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -32,9 +32,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { 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 ba9c1993f..bf469ada8 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 @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor.quartz; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; @@ -27,6 +25,8 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Random; + public class BlockSpecialQuartzSlab extends BlockModSlab { Block source; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index fc7d93abd..6532e0d40 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -1,8 +1,5 @@ package vazkii.botania.common.block.decor.slabs; -import java.util.Locale; -import java.util.Random; - import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -12,19 +9,22 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.Locale; +import java.util.Random; + public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index ee0072f3b..db9ed0a3a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class BlockModStairs extends BlockStairs implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 1781e4267..637f5f578 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor.walls; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; @@ -24,14 +22,16 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.List; + public abstract class BlockModWall extends BlockWall implements ILexiconable { public BlockModWall(Block block, int meta) { 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 1c1046a19..f272cfdbd 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -18,8 +18,8 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index a8c83de7c..8697138d0 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -15,8 +15,8 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BehaviourSeeds extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 67ab116ec..4ce0c19be 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -15,8 +15,8 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; 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 1fe8d4a6c..5a1043cab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -19,10 +19,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; 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 bf4cc9350..c15fcf258 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,10 +22,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -40,6 +38,8 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); 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 166d9d117..77f7ea6a2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -26,10 +24,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,6 +40,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { private final Random random = new Random(); 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 6923d9252..658fe2b09 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -28,13 +23,14 @@ import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -46,7 +42,10 @@ import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { 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 3d3836874..bba4b6587 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -21,9 +18,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -35,6 +32,8 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.List; + public class BlockManaDetector extends BlockMod implements ILexiconable { public BlockManaDetector() { 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 a1eb184c1..86c4ef569 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -30,11 +26,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -50,7 +47,9 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.List; public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { 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 c83e4b32a..2340855d4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -22,11 +20,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -43,6 +41,8 @@ import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); 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 7ce8fc048..b15793ecf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -19,9 +19,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; 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 020eb5405..018474663 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -19,13 +19,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.Optional; public class BlockRFGenerator extends BlockMod implements ILexiconable { 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 4b137e010..476aa88bb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -20,10 +18,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -36,6 +34,8 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); 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 bba2bb083..a9734e0d8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -31,6 +29,8 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import java.util.List; + 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); 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 115555b8e..4262449e0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -31,11 +27,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -50,7 +47,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; +import java.util.Random; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { 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 04aab93a7..1440c90c4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -17,13 +17,12 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -32,7 +31,6 @@ import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibObfuscation; public class BlockTerraPlate extends BlockMod implements ILexiconable { 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 3a41515af..6c4a71175 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -18,8 +18,8 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; 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 298388a57..db5ee5d08 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -18,14 +18,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; public abstract class BlockRedString extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index b45d41f08..23c71fc2a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -11,8 +11,8 @@ package vazkii.botania.common.block.string; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; 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 2909d7255..e3909d0f5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -13,8 +13,8 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 2eb1e79c4..71c8425f1 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -10,18 +10,18 @@ */ package vazkii.botania.common.block.string; -import java.util.Random; - import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Random; + public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { public BlockRedStringFertilizer() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 0bd09610f..82ae2c818 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -10,22 +10,21 @@ */ package vazkii.botania.common.block.string; -import java.util.Random; - import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.Random; public class BlockRedStringInterceptor extends BlockRedString { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index ccbc8772c..15dcacc29 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -17,7 +17,6 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends SubTileEntity { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index adce5d8be..dc17c6d33 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -10,20 +10,20 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import com.google.common.base.Predicate; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileBellethorn extends SubTileFunctional { public static final int RANGE = 6; 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 f7d0eabe2..ea70ba873 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 @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; 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 0b0cd7fa4..062cc46f7 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -25,6 +22,9 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; + public class SubTileClayconia extends SubTileFunctional { private static final int COST = 80; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index bc31f17a6..2629891e6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -10,14 +10,12 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -25,6 +23,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileDaffomill extends SubTileFunctional { private static final String TAG_ORIENTATION = "orientation"; 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 566ceb94f..70e083721 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 @@ -10,11 +10,8 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -22,6 +19,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileFallenKanade extends SubTileFunctional { private static final int RANGE = 2; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 7022ad86f..0e7560f6f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -22,12 +19,15 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; import net.minecraft.entity.monster.IMob; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.ArrayList; +import java.util.List; public class SubTileHeiseiDream extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 7e1aa667d..58c52d7fd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -27,15 +21,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; - import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; @@ -45,6 +37,12 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.WeakHashMap; + public class SubTileHopperhock extends SubTileFunctional { private static final String TAG_FILTER_TYPE = "filterType"; 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 141eb95df..1df4ca0fa 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 @@ -10,13 +10,10 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -24,6 +21,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileHyacidus extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 823124279..011d4b2c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.Random; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -23,6 +21,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Random; + public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; 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 337005591..393b43721 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 @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -29,6 +25,10 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class SubTileMarimorphosis extends SubTileFunctional { private static final int COST = 12; 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 35a95b406..9094c76d9 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 @@ -10,12 +10,9 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -23,6 +20,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileMedumone extends SubTileFunctional { private static final int RANGE = 6; 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 9a9638238..8e9027e9b 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 @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -21,8 +17,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.WeightedRandom; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -33,6 +29,10 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class SubTileOrechid extends SubTileFunctional { private static final int COST = 17500; 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 104b060d3..f9b18e2ac 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 @@ -10,14 +10,14 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Map; + public class SubTileOrechidIgnem extends SubTileOrechid { private static final int COST = 20000; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index ec450c987..d96a04095 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.List; public class SubTilePollidisiac extends SubTileFunctional { 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 d05adf47d..3b39ee175 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -23,29 +20,30 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemRedstone; import net.minecraft.item.ItemBlockSpecial; +import net.minecraft.item.ItemRedstone; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; - +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.ArrayList; +import java.util.List; public class SubTileRannuncarpus extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index afd5bfb44..c88a4b356 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.Collections; -import java.util.Set; -import java.util.WeakHashMap; - import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -21,6 +17,10 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Collections; +import java.util.Set; +import java.util.WeakHashMap; + public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 6bd02d808..ab717c2c8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -10,17 +10,18 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -28,8 +29,8 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class SubTileSpectranthemum extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 11c98158a..acb47e1df 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -23,6 +21,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileTangleberrie extends SubTileFunctional { @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 83c058289..043573f9f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.EntityLiving; import net.minecraft.entity.ai.EntityAIAvoidEntity; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; @@ -22,12 +19,15 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.ArrayList; +import java.util.List; public class SubTileTigerseye extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 1969fe51c..2e1f8855a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -10,21 +10,21 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; - import net.minecraft.entity.monster.EntityEnderman; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.WeakHashMap; public class SubTileVinculotus extends SubTileFunctional { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index c8286a70e..cbb8a88c0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -20,6 +18,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.ExperienceHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileArcaneRose extends SubTileGenerating { private static final int RANGE = 1; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 36d5559f7..99764bb30 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; @@ -25,6 +22,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; + public class SubTileDandelifeon extends SubTileGenerating { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index b16b6fddd..ed783f822 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; @@ -19,6 +17,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.signature.PassiveFlower; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + @PassiveFlower public class SubTileDaybloom extends SubTilePassiveGenerating { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 997fb8ddc..13254e612 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -10,16 +10,14 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -28,6 +26,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileEndoflame extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; 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 e032701aa..28351511c 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 @@ -10,19 +10,19 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.SoundEvents; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileEntropinnyum extends SubTileGenerating { private static final int RANGE = 12; 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 d5f9e01dd..86e883a36 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 @@ -10,16 +10,14 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.WorldServer; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -27,6 +25,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileGourmaryllis extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; 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 cbf18dc50..c424e5474 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 @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; @@ -23,9 +19,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import vazkii.botania.api.lexicon.LexiconEntry; @@ -34,7 +30,10 @@ import vazkii.botania.api.subtile.signature.PassiveFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; @PassiveFlower public class SubTileHydroangeas extends SubTilePassiveGenerating { 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 65b44e0cc..1508131eb 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 @@ -10,18 +10,14 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -30,6 +26,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class SubTileMunchdew extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; 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 673f60ce2..0147072e6 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 @@ -10,23 +10,23 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.SoundEvents; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.entity.living.LivingSpawnEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.List; public class SubTileNarslimmus extends SubTileGenerating { 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 c4ebfedc5..c4f9d5a18 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 @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -28,6 +26,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileRafflowsia extends SubTileGenerating { private static final String TAG_LAST_FLOWER = "lastFlower"; 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 3c90cdfaa..cd266719b 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.awt.Color; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -22,17 +19,18 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.AxisAlignedBB; - import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.awt.*; +import java.util.List; + public class SubTileSpectrolus extends SubTileGenerating { private static final String TAG_NEXT_COLOR = "nextColor"; 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 93754dd87..e20b6edd0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -10,9 +10,7 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.base.Function; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -42,7 +40,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; -import com.google.common.base.Function; +import java.util.ArrayList; +import java.util.List; public class TileAlfPortal extends TileMod { 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 b423d9244..96be41a6f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -26,14 +21,12 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.text.translation.I18n; - import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; @@ -46,6 +39,11 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + public class TileAltar extends TileSimpleInventory implements IPetalApothecary { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 13d2f31a5..e9a65575b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -10,14 +10,10 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; @@ -34,6 +30,9 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import java.awt.*; +import java.util.List; + // This is mostly copypasta from TileRuneAltar public class TileBrewery extends TileSimpleInventory implements IManaReceiver { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 1631b535d..02090196d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -24,6 +22,8 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; +import java.util.List; + public class TileCraftCrate extends TileOpenCrate { public static final boolean[][] PATTERNS = new boolean[][] { 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 023e8fba2..ba3a89227 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import com.google.common.base.Predicates; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -32,11 +26,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -53,6 +46,12 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_STAGE = "stage"; 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 bc7b7a90b..c1801e4ae 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.EntityEquipmentSlot; @@ -24,6 +22,8 @@ import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; +import java.util.List; + public class TileEnderEye extends TileMod { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 3a9019327..7209e4cb9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -13,9 +13,9 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.api.item.IFloatingFlower; public class TileFloatingFlower extends TileMod implements IFloatingFlower { 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 5e561a69d..afdd1d71e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -18,9 +18,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.translation.I18n; import net.minecraft.util.StringUtils; - +import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; 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 cc8838bfb..f2ddc23cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -30,6 +25,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; +import java.awt.*; +import java.util.List; + public class TileIncensePlate extends TileSimpleInventory { private static final String TAG_TIME_LEFT = "timeLeft"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index a7c555c28..7424e74fe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityEnderPearl; @@ -25,10 +21,10 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; @@ -40,6 +36,10 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + public class TileLightRelay extends TileMod implements IWandBindable { private static final int MAX_DIST = 20; 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 5f2ff5538..560d19e70 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -16,10 +16,9 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLLog; public class TileMod extends TileEntity implements ITickable { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 6e4f5a79d..3c80fc84b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -15,13 +15,12 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.lib.LibBlockNames; public class TileOpenCrate extends TileSimpleInventory { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index 43e71212f..b10287cae 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -12,8 +12,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.mana.IManaCollisionGhost; public class TilePlatform extends TileCamo implements IManaCollisionGhost { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index aba3c92c0..e58461414 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.block.tile; -import java.util.Random; - import net.minecraft.block.Block; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; @@ -24,6 +22,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; +import java.util.Random; + public class TilePylon extends TileEntity implements ITickable { boolean activated = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 35932601f..96a9ac27b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -23,10 +20,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.translation.I18n; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; @@ -39,6 +34,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 982a6faf2..8f5954c67 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -22,7 +18,10 @@ import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public class TileSparkChanger extends TileSimpleInventory { 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 378dadd23..3cf62345f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,19 +10,16 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.WeightedRandom; import net.minecraft.util.WeightedSpawnerEntity; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.storage.AnvilChunkLoader; @@ -30,6 +27,8 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; +import java.util.List; + public class TileSpawnerClaw extends TileMod implements IManaReceiver { private static final String TAG_MANA = "mana"; 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 aa116fbb5..3e8271409 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - +import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -23,9 +21,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -35,6 +33,8 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; +import java.util.List; + public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; 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 bee8d80f3..2830010ed 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -35,6 +33,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; +import java.util.List; + public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 08e40de72..5f9f3017f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -10,15 +10,9 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.List; - -import com.google.common.collect.ImmutableMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.animation.Animation; -import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.corporea.CorporeaHelper; @@ -26,6 +20,8 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import java.util.List; + public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 0bb4eab47..84a9226ad 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.corporea.CorporeaHelper; @@ -26,6 +23,9 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; +import java.util.ArrayList; +import java.util.List; + public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { public void doRequest() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 8f6e80363..b542252a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -10,6 +10,27 @@ */ package vazkii.botania.common.block.tile.corporea; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.text.WordUtils; +import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; +import vazkii.botania.api.corporea.ICorporeaRequestor; +import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.helper.MathHelper; + import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -20,30 +41,6 @@ import java.util.WeakHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.event.ServerChatEvent; - -import org.apache.commons.lang3.text.WordUtils; - -import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; -import vazkii.botania.api.corporea.ICorporeaRequestor; -import vazkii.botania.api.corporea.ICorporeaSpark; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 6ccd0c4c3..82e544f19 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -10,21 +10,19 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.List; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 9e636f88b..21ef1715b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile.corporea; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index ae1f0054b..4b746c8bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -10,16 +10,15 @@ */ package vazkii.botania.common.block.tile.mana; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.List; public class TileDistributor extends TileMod implements IManaReceiver { 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 f0d5c3f97..b52aec2cd 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.mana; -import java.awt.Color; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -27,16 +24,14 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; - import net.minecraft.world.World; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IDyablePool; @@ -59,13 +54,15 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; + +import java.awt.*; +import java.util.List; public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index de355de06..567ea0a3b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -12,11 +12,10 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.collect.ImmutableMap; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.animation.TimeValues; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.model.animation.CapabilityAnimation; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 64c744133..4972253eb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -10,17 +10,16 @@ */ package vazkii.botania.common.block.tile.mana; +import cofh.api.energy.IEnergyConnection; +import cofh.api.energy.IEnergyReceiver; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.ModAPIManager; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyReceiver; import java.util.EnumMap; import java.util.Map; 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 aa3666dc6..0357c2e35 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.mana; -import java.util.List; -import java.util.UUID; - import com.google.common.base.Predicates; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -26,7 +23,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -34,9 +33,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; @@ -65,6 +62,9 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import java.util.List; +import java.util.UUID; + public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { private static final int MAX_MANA = 1000; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index c623e8151..fcbaa3536 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -17,11 +17,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; - +import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; 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 8ff8a8853..ac391d660 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 @@ -14,9 +14,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index ee7e22aa1..349f4b9f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -10,10 +10,9 @@ */ package vazkii.botania.common.block.tile.string; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; public class TileRedStringComparator extends TileRedString { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 4fc7bf570..3d379d6d7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -11,8 +11,8 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 2f2689b99..9d2b7baf3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.tile.string; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.Random; + public class TileRedStringFertilizer extends TileRedString { public boolean canGrow(World p_149851_1_, boolean p_149851_5_) { 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 30fc3fe6d..837995ac8 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 @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.tile.string; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -24,6 +19,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class TileRedStringInterceptor extends TileRedString { private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 531325ef0..f90080c94 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -14,7 +14,6 @@ import net.minecraft.init.MobEffects; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; 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 442dc4355..04e478003 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -15,8 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibPotionNames; public class PotionAllure extends PotionMod { 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 2181c99b2..68965940a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -10,17 +10,15 @@ */ package vazkii.botania.common.brew.potion; -import java.util.List; - import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.lib.LibPotionNames; public class PotionBloodthirst extends PotionMod { 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 a16133b51..57498630d 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -10,16 +10,14 @@ */ package vazkii.botania.common.brew.potion; -import java.util.List; - import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibPotionNames; public class PotionEmptiness extends PotionMod { 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 9caa07f88..bc3338f81 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -13,8 +13,8 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibPotionNames; public class PotionFeatherfeet extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 2c6bdb883..a54969417 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -14,11 +14,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.client.lib.LibResources; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; public class PotionMod extends Potion { 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 eae7e3ad2..17ebabd27 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -14,8 +14,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.lib.LibPotionNames; public class PotionSoulCross extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 30c8f982d..7fb00336f 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -25,6 +23,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import java.util.List; + public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index 91992a069..934a1f9d9 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -13,8 +13,8 @@ package vazkii.botania.common.core.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index cc655838f..9b66ff962 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -17,7 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 3108f5794..537534b15 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -14,6 +14,9 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.item.IFlowerlessBiome; import vazkii.botania.api.item.IFlowerlessWorld; import vazkii.botania.api.state.BotaniaStateProps; @@ -22,9 +25,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class BiomeDecorationHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java index 4675c1958..100d6ac4b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.core.handler; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import vazkii.botania.common.item.ModItems; - public final class ChestGenHandler { public static void init() { diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 4a87dcfe1..2bb5c6e91 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -10,13 +10,10 @@ */ package vazkii.botania.common.core.handler; -import vazkii.botania.api.corporea.CorporeaHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.corporea.CorporeaHelper; public final class CommonTickHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 89f9e93b5..537c4497c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -10,27 +10,25 @@ */ package vazkii.botania.common.core.handler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibMisc; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; -import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.client.event.ConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - public final class ConfigHandler { public static Configuration config; diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index ed67b1d4e..c8f289e8b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,12 +1,10 @@ package vazkii.botania.common.core.handler; +import com.google.common.collect.ImmutableList; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; -import com.google.common.collect.ImmutableList; - -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; - public final class IMCHandler { public static void processMessages(ImmutableList messageList) { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 25ea24ebb..6a9d2b055 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -10,9 +10,10 @@ */ package vazkii.botania.common.core.handler; -import java.util.ArrayList; -import java.util.List; - +import baubles.common.lib.PlayerHandler; +import baubles.common.network.PacketHandler; +import baubles.common.network.PacketSyncBauble; +import buildcraft.api.transport.IPipeTile; import net.minecraft.block.Block; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -24,11 +25,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.fml.common.Optional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.BotaniaAPIClient; @@ -70,11 +71,9 @@ import vazkii.botania.common.lexicon.page.PageMultiblock; import vazkii.botania.common.lexicon.page.PagePetalRecipe; import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageText; -import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; -import buildcraft.api.transport.IPipeTile; -import net.minecraftforge.fml.common.Optional; + +import java.util.ArrayList; +import java.util.List; public class InternalMethodHandler extends DummyMethodHandler { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 52b9e8c8b..cea02357c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -10,25 +10,22 @@ */ package vazkii.botania.common.core.handler; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import java.util.function.BinaryOperator; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.api.mana.TileSignature; -import vazkii.botania.common.core.helper.MathHelper; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.Comparator; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.function.BinaryOperator; public final class ManaNetworkHandler implements IManaNetwork { diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index db5a15dbd..9f76d1f96 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -1,7 +1,6 @@ package vazkii.botania.common.core.handler; import com.google.common.base.Throwables; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraftforge.fml.common.FMLLog; diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 1fb1eaea6..4d09365f1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -2,13 +2,7 @@ package vazkii.botania.common.core.handler; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import vazkii.botania.common.lib.LibObfuscation; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; public final class ModSounds { 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 f43c566f9..4a4b8dcbf 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -1,21 +1,20 @@ package vazkii.botania.common.core.handler; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PixieHandler { 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 2fad5bb81..47b75694e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.core.handler; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -32,9 +28,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; public final class SheddingHandler { diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 008368a56..9e0378252 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -10,34 +10,29 @@ */ package vazkii.botania.common.core.helper; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.ILockableContainer; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.VanillaDoubleChestItemHandler; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + //From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index febe67b72..51ab904cf 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import java.util.function.Predicate; -import java.util.stream.IntStream; public final class PlayerHelper { diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 69e43ee7f..e79c53dd9 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -10,23 +10,21 @@ */ package vazkii.botania.common.core.helper; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; -import java.util.Objects; - import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; +import java.util.Objects; public class Vector3 { diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 410140425..1ac892490 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -26,9 +26,16 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; - +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.logging.log4j.Level; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; @@ -52,9 +59,9 @@ import vazkii.botania.common.core.handler.CommonTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; -import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModBrewRecipes; import vazkii.botania.common.crafting.ModCraftingRecipes; @@ -75,7 +82,6 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; -//import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; @@ -83,15 +89,8 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; + +//import vazkii.botania.common.block.ModBanners; public class CommonProxy { diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 98a7acae9..8bb8af6e6 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -12,9 +12,9 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import vazkii.botania.common.core.handler.ConfigHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; +import vazkii.botania.common.core.handler.ConfigHandler; public final class AdaptorNotifier { diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 686caa565..a0de3966f 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -10,22 +10,20 @@ */ package vazkii.botania.common.core.version; -import java.awt.Desktop; +import net.minecraft.client.Minecraft; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; + +import java.awt.*; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; -import net.minecraft.client.Minecraft; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.translation.I18n; - public class ThreadDownloadMod extends Thread { private String fileName; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index f626e8b78..7a7a6565e 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.core.version; +import net.minecraftforge.common.MinecraftForge; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; -import net.minecraftforge.common.MinecraftForge; - public class ThreadVersionChecker extends Thread { private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"; diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 4c3dce299..3b4f6feaa 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -12,17 +12,16 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import vazkii.botania.common.lib.LibMisc; public final class VersionChecker { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 7a63e18e1..7dd2d6b57 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -25,12 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - import org.apache.logging.log4j.Level; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.Botania; @@ -43,8 +39,10 @@ import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public final class ModCraftingRecipes { diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index 93a6d4716..149bab7f7 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -1,8 +1,5 @@ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -12,6 +9,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; +import java.util.ArrayList; +import java.util.List; + public class ModElvenTradeRecipes { public static RecipeElvenTrade dreamwoodRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 14ba92411..c494ee84c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -23,6 +20,9 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public final class ModManaAlchemyRecipes { public static RecipeManaInfusion leatherRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index 998f28901..a27c46d44 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,6 +17,9 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import java.util.ArrayList; +import java.util.List; + public class ModManaConjurationRecipes { public static RecipeManaInfusion redstoneRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index dabccd38c..192f0ec40 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -24,6 +21,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public final class ModManaInfusionRecipes { public static List manasteelRecipes; diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 696dbd6e8..452ca0506 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.Arrays; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; @@ -23,6 +21,8 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import java.util.Arrays; + public final class ModPetalRecipes { public static final String white = LibOreDict.PETAL[0], orange = LibOreDict.PETAL[1], magenta = LibOreDict.PETAL[2], lightBlue = LibOreDict.PETAL[3], yellow = LibOreDict.PETAL[4], lime = LibOreDict.PETAL[5], pink = LibOreDict.PETAL[6], gray = LibOreDict.PETAL[7], lightGray = LibOreDict.PETAL[8], cyan = LibOreDict.PETAL[9], purple = LibOreDict.PETAL[10], blue = LibOreDict.PETAL[11], brown = LibOreDict.PETAL[12], green = LibOreDict.PETAL[13], red = LibOreDict.PETAL[14], black = LibOreDict.PETAL[15]; diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index cd5413d21..7f8717dc4 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -23,6 +20,9 @@ import vazkii.botania.common.crafting.recipe.HeadRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; +import java.util.ArrayList; +import java.util.List; + public final class ModRuneRecipes { public static RecipeRuneAltar recipeWaterRune; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 4f1926d61..c4d0ddaa0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import java.util.UUID; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -20,6 +18,8 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import java.util.UUID; + public class AesirRingRecipe implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index 62e40e375..98a9a70d5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -14,7 +14,6 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.ShapedOreRecipe; import vazkii.botania.common.core.helper.ItemNBTHelper; 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 0d9871fdc..ffff5355a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -11,7 +11,6 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 1322728e2..d2ff1897f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import java.util.Arrays; -import java.util.List; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -23,6 +20,9 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; +import java.util.Arrays; +import java.util.List; + public class LensDyeingRecipe implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index dc751cf18..12e5aefee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,12 +17,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import scala.tools.nsc.backend.icode.TypeKinds; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.PlayerHelper; @@ -33,6 +30,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; +import java.util.List; + public class EntityBabylonWeapon extends EntityThrowableCopy { private static final String TAG_CHARGING = "charging"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 0799c58e4..00ceb941d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Optional; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; @@ -23,10 +20,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -34,6 +31,9 @@ import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final int SCAN_RANGE = 8; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index b64f8c74a..4280e8aba 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.entity; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.UUID; -import java.util.regex.Pattern; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -51,7 +43,9 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; -import net.minecraft.util.*; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -63,9 +57,9 @@ import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.ARBShaderObjects; - import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -83,8 +77,14 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.UUID; +import java.util.regex.Pattern; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 96ac1a874..ec2c697ce 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -23,6 +20,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.List; + public class EntityEnderAirBottle extends EntityThrowable { public EntityEnderAirBottle(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index c7b74eddd..f9190a3ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.List; + public class EntityFallingStar extends EntityThrowableCopy { public EntityFallingStar(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 9c5b34e9b..08fc0fb3e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -11,19 +11,19 @@ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; +import java.util.List; + public class EntityFlameRing extends Entity { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 05641e3d9..e4cec2e49 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -10,21 +10,20 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import java.util.List; + public class EntityMagicLandmine extends Entity { public EntityDoppleganger summoner; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 9c2922e97..965073c9b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; @@ -25,14 +23,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.List; public class EntityMagicMissile extends EntityThrowable { diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c33425b99..a91676203 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -10,22 +10,12 @@ */ package vazkii.botania.common.entity; -import java.awt.Color; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; @@ -35,12 +25,12 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -57,8 +47,15 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.Set; +import java.util.UUID; public class EntityManaBurst extends EntityThrowable implements IManaBurst { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index ea621a786..b5ab13848 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -20,9 +20,9 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; @@ -31,7 +31,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; public class EntityPoolMinecart extends EntityMinecart { diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 65d6a3692..7829e694c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -10,17 +10,7 @@ */ package vazkii.botania.common.entity; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; - +import baubles.common.lib.PlayerHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -42,7 +32,17 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import baubles.common.lib.PlayerHandler; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; public class EntitySpark extends Entity implements ISparkEntity { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index d40591a99..b702eb1b9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -23,7 +23,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 7a57bcba4..5db46e24f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; -import java.util.UUID; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -20,7 +17,8 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -31,6 +29,9 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; +import java.util.UUID; + // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable // And we all know how much mods like deflecting EntityThrowables diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index c25ace9a3..900d78a09 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -10,20 +10,20 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; +import java.util.List; + public class EntityThrownItem extends EntityItem { public EntityThrownItem(World par1World) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 8cc27330e..9333f5059 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -16,15 +16,14 @@ import net.minecraft.block.BlockVine; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.Item; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index ba4492dd3..7fb8fc032 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.entity; +import net.minecraftforge.fml.common.registry.EntityRegistry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; -import net.minecraftforge.fml.common.registry.EntityRegistry; public final class ModEntities { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index a5e3e53b0..28364aa84 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -1,18 +1,18 @@ package vazkii.botania.common.integration.buildcraft; -import java.util.ArrayList; -import java.util.Collection; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import vazkii.botania.api.mana.IManaBlock; -import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.common.block.tile.TileRuneAltar; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.statements.StatementManager; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import vazkii.botania.api.mana.IManaBlock; +import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.block.tile.TileRuneAltar; + +import java.util.ArrayList; +import java.util.Collection; public class StatementAPIPlugin implements ITriggerProvider { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index 4dff6ecdc..461410606 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -1,8 +1,8 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index f0b9ba893..17a162eb9 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,5 +1,8 @@ package vazkii.botania.common.integration.buildcraft; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerInternal; import com.google.common.base.Predicates; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; @@ -12,9 +15,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibTriggerNames; -import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.statements.ITriggerInternal; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index a8111a9e8..1f6bd7d50 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,21 +1,19 @@ package vazkii.botania.common.integration.buildcraft; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerExternal; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.text.WordUtils; - import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.lib.LibTriggerNames; -import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.statements.ITriggerExternal; public class TriggerManaLevel extends StatementBase implements ITriggerExternal { public enum State { diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index 16c3f6397..c61ffa787 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,5 +1,8 @@ package vazkii.botania.common.integration.buildcraft; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.ITriggerExternal; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -9,9 +12,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; -import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.statements.ITriggerExternal; public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerExternal { diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 2dfdf27b3..010b7894d 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -9,22 +9,20 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.tileentity.TileEntity; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.items.wrapper.InvWrapper; import org.apache.logging.log4j.Level; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.ArrayList; +import java.util.List; + /** * Wrapper for StorageDrawers compatibility. * diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 475df17bc..710ccd8c9 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -9,17 +9,15 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.ArrayList; +import java.util.List; + public class WrappedIInventory extends WrappedInventoryBase{ private InvWithLocation inv; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index 9ff62e35e..5b11f17d0 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -9,15 +9,15 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import net.minecraft.item.ItemStack; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public abstract class WrappedInventoryBase implements IWrappedInventory { protected ICorporeaSpark spark; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index e130c2589..f9dedec9b 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -9,21 +9,18 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.List; - import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.common.entity.EntityCorporeaSpark; + +import java.util.ArrayList; +import java.util.List; /** * Wrapper for StorageDrawers compatibility. diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 2c8331bbe..56c5a665d 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.List; + public class Item16Colors extends ItemMod implements IColorable { public Item16Colors(String name) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 54896d24a..ec8416134 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -10,18 +10,18 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class ItemAncientWill extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 397d09761..97acc13b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -26,12 +23,18 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; @@ -40,9 +43,9 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.Arrays; +import java.util.List; public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 8b0612321..769ad9129 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +24,8 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER = 8000; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 144d961ad..4def829c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -24,10 +21,11 @@ import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -39,6 +37,9 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; +import java.util.Random; + public class ItemBottledMana extends ItemMod { private static final String TAG_SEED = "randomSeed"; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 5c9f6fca3..5200188a9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -26,14 +24,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; @@ -41,7 +40,8 @@ import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; + +import java.util.List; public class ItemCacophonium extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 2e80f6afc..e49e1026b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -10,24 +10,23 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemCorporeaSpark extends ItemMod { public ItemCorporeaSpark() { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 3d41b027d..a37306976 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -10,21 +10,21 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemCraftPattern extends ItemMod { public ItemCraftPattern() { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 893d1b932..6c095dba4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -31,7 +31,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; @@ -40,10 +43,12 @@ import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; @@ -58,11 +63,6 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 6bd46d54f..7212d1368 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -10,22 +10,22 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.List; + public class ItemFertilizer extends ItemMod { public ItemFertilizer() { diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index f26384d0f..8d2680a58 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -20,23 +20,22 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemFlowerBag extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 4f3642b37..d177da91b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -19,9 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 257823617..7f8eceb3d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; @@ -39,6 +34,11 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 497623552..a22f8c693 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -10,15 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; @@ -28,20 +19,29 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index cdb694c12..7b558b071 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -10,24 +10,23 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.ArrayList; +import java.util.List; public class ItemKeepIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 97405017c..0eddd8e47 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; @@ -23,12 +21,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; @@ -41,6 +42,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { private static final String TAG_BLOCK = "_block"; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 853c3df8f..e7cb097c2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; @@ -21,7 +18,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; @@ -47,6 +48,9 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import java.util.ArrayList; +import java.util.List; + public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 3f8a2130b..f9d6ed665 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -12,18 +12,16 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class ItemManaCookie extends ItemFood { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 950652c69..65d8a32ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.awt.Color; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; @@ -23,7 +20,6 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -33,6 +29,9 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.mana.BurstProperties; @@ -49,9 +48,9 @@ import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.List; public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 8939fb426..941f6a90d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -10,18 +10,16 @@ */ package vazkii.botania.common.item; -import java.awt.Color; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.mana.IManaItem; @@ -33,6 +31,8 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import java.awt.*; + public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index be2f91a37..9994af1e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,6 +23,9 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import java.awt.*; +import java.util.List; + public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay, IColorable { private static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 6d93f2150..87d3674c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -13,9 +13,9 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public abstract class ItemMod extends Item { diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 5962bdd18..6c7dd602e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -14,9 +14,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaPool; diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index ea78c18c7..fce42cb6d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 5178d647f..3f916c4bb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -14,11 +14,10 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index 94e1c922e..4daf6ff4a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.item; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemPhantomInk extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index bb1d66beb..0fac54030 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -19,14 +17,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemPinkinator extends ItemMod { public ItemPinkinator() { diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 584c901cf..79b523fe7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import com.mojang.authlib.GameProfile; import mods.railcraft.api.core.items.IMinecartItem; import net.minecraft.block.BlockRailBase; import net.minecraft.entity.item.EntityMinecart; @@ -18,19 +19,16 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; -import com.mojang.authlib.GameProfile; - -import net.minecraftforge.fml.common.Optional; - @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index 6ec98a4a4..c71203ed3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -12,18 +12,17 @@ package vazkii.botania.common.item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.RegenIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemRegenIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index b915d78d6..25676a7e3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -10,24 +10,24 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -35,8 +35,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import java.util.EnumMap; import java.util.Map; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 30675befb..96b76e6ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -21,9 +19,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -37,6 +33,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemSignalFlare extends ItemMod implements IColorable { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 51f8f2138..813fbf613 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -16,9 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 4dca48283..c93a03362 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemSparkUpgrade extends ItemMod { public static final int VARIANTS = 4; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 1c5d2b768..33e9e5a63 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -21,11 +21,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index d6ccf77bc..f15474530 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -10,16 +10,16 @@ */ package vazkii.botania.common.item; -import java.awt.Color; - import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; public class ItemSpellCloth extends ItemMod implements IColorable { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index adf4b3f00..f42723dc9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; @@ -22,9 +20,11 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibItemNames; + +import java.util.List; public class ItemTemperanceStone extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index ec15d7238..62b94d177 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -9,7 +9,6 @@ * File Created @ [Jan 25, 2015, 6:42:47 PM (GMT)] */ package vazkii.botania.common.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +27,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ItemThornChakram() { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 1589439e0..98b57cad2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import java.awt.Color; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +23,12 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; @@ -48,6 +50,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import java.awt.*; +import java.util.List; + public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { private static final String TAG_COLOR1 = "color1"; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 579f9c961..7024d0469 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -10,16 +10,11 @@ */ package vazkii.botania.common.item; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.HorseArmorType; @@ -32,15 +27,18 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.List; public class ItemVirus extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 46df2753f..0bf5fc125 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.block; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import java.util.List; + public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public ItemBlockPool(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index a82c66b87..8d27b816d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.block; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -19,9 +17,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -36,6 +34,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import java.util.List; + public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 804964af2..44193b07a 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.block; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +19,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.common.core.helper.ItemNBTHelper; +import java.util.Arrays; +import java.util.List; + public class ItemBlockTinyPotato extends ItemBlockMod { private static final List TYPOS = Arrays.asList("vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski"); 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 8d37749ee..231bc226b 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.brew; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -31,7 +28,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; @@ -42,6 +38,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; +import java.awt.*; +import java.util.List; + public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement, IColorable { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index c3bd5b015..eeb14f653 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.brew; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,7 +18,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -32,6 +28,9 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.awt.*; +import java.util.List; + public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer, IColorable { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index e20cf889c..0c0f4e145 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.brew; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,6 +19,8 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemVial extends ItemMod implements IBrewContainer { public ItemVial() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 78e19b126..e5843862c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -1,14 +1,12 @@ package vazkii.botania.common.item.equipment.armor.elementium; -import java.util.List; - -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.client.lib.LibResources; @@ -17,6 +15,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import java.util.List; + public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { public ItemElementiumArmor(EntityEquipmentSlot type, String name) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index a615a193b..c55bd270a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -10,17 +10,12 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; @@ -29,6 +24,10 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; @@ -41,12 +40,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibMisc; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index d54a88faf..f0c965944 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; -import java.util.List; - import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +21,8 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -32,8 +32,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 7da465c69..283965a0b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -10,9 +10,7 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; -import java.util.List; -import java.util.UUID; - +import com.google.common.collect.Multimap; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -20,17 +18,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorTerrasteel; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.List; +import java.util.UUID; public class ItemTerrasteelArmor extends ItemManasteelArmor { 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 9fe906779..cbbcaa862 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 @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -21,12 +19,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingHurtEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaDiscountArmor; @@ -36,9 +35,8 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java index 6365a3bcc..9aaed4af5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemAuraRing extends ItemBauble implements IManaGivingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 41612d15a..7d5e9b343 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -10,9 +10,10 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; -import java.util.UUID; - +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +25,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; @@ -32,13 +36,9 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; +import java.util.UUID; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { 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 71ff75573..d1774fd2f 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 @@ -10,36 +10,34 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index d920e453e..5e45e0070 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -10,13 +10,12 @@ */ package vazkii.botania.common.item.equipment.bauble; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - public abstract class ItemBaubleModifier extends ItemBauble { Multimap attributes = HashMultimap.create(); 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 b2a836b1c..31b4c6923 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 @@ -10,9 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.awt.Color; -import java.util.List; - +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -26,15 +24,10 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - -import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; -import net.minecraftforge.fml.common.registry.GameData; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -48,7 +41,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; + +import java.awt.*; +import java.util.List; public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender, IColorable { 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 2ba4292c8..b9a164120 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 @@ -10,8 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -28,7 +28,10 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -37,12 +40,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { 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 c66429ff5..5ff023514 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 @@ -10,14 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; - +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; @@ -40,9 +34,11 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; @@ -61,12 +57,13 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.List; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { 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 0ba6e4442..ddc3acfd7 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 @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -18,22 +20,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; - -import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.lib.LibItemNames; public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 828b69f17..6b2fac040 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -10,6 +10,9 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; @@ -21,19 +24,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemHolyCloak extends ItemBauble implements IBaubleRender { 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 4c8473fab..24f6ba4df 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -21,12 +22,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { 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 d5a7ae48e..1965f93a2 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 @@ -10,9 +10,10 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; +import baubles.common.network.PacketHandler; +import baubles.common.network.PacketSyncBauble; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -24,21 +25,21 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.AnimalChest; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.village.MerchantRecipe; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.PlayerInvWrapper; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -46,14 +47,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class ItemItemFinder extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index b5faaf4c0..ea59157e8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; +import com.google.common.collect.Multimap; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; @@ -18,16 +20,11 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; - -import com.google.common.collect.Multimap; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRender { 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 33dbcbc5a..61e60a0b4 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -19,12 +20,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemLavaPendant extends ItemBauble implements IBaubleRender { 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 fdecfd1aa..1a1151869 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 @@ -10,19 +10,20 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.Arrays; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +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.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.IManaItem; @@ -33,10 +34,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.Arrays; +import java.util.List; public class ItemMagnetRing extends ItemBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 7e3fcc38c..84a21c19f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -10,8 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - +import baubles.api.BaubleType; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,7 +20,8 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; + +import java.util.List; public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { 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 99a06545b..9a4de094f 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 @@ -10,16 +10,15 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemMiningRing extends ItemBauble implements IManaUsingItem { 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 25b2fb141..ba686ff42 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 @@ -10,6 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneComparator; import net.minecraft.block.BlockRedstoneRepeater; @@ -26,17 +28,14 @@ import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.math.RayTraceResult; - +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java index d3055c7d3..fcc90e45c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemPixieRing extends ItemBauble implements IPixieSpawner { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index 6d9fa50a9..69ee17884 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemReachRing extends ItemBauble { 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 e9d61b3ed..94cd2826b 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -20,14 +21,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import baubles.api.BaubleType; -import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index cf28ab067..cc66e59f2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -10,7 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.block.Block; +import baubles.api.BaubleType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -21,7 +21,6 @@ import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.item.ISortableTool.ToolType; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemSwapRing extends ItemBauble { 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 c0fe50569..99badc042 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 @@ -10,8 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - +import baubles.api.BaubleType; import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -23,14 +22,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; - import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; + +import java.util.List; public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { 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 c85b6f0ce..a91a00b2d 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 @@ -10,9 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; @@ -23,18 +22,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; - +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 063486d9c..b86371d64 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -10,24 +10,24 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemUnholyCloak extends ItemHolyCloak { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_UNHOLY_CLOAK); 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 394437e8f..ec3e16ec9 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 @@ -10,17 +10,16 @@ */ package vazkii.botania.common.item.equipment.bauble; +import baubles.api.BaubleType; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; public class ItemWaterRing extends ItemBauble implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 1c7496269..88cdff01a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import java.awt.Color; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityEnderman; @@ -25,6 +23,8 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import java.awt.*; + public class ItemEnderDagger extends ItemManasteelSword implements IColorable { public ItemEnderDagger() { 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 6b19405ba..7638ed66d 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 @@ -17,9 +17,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemGlassPick extends ItemManasteelPick { 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 638da98d9..2c2154bdd 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 @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; import net.minecraft.util.SoundCategory; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index ecf9a9b24..79f1914e7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; @@ -26,8 +22,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; @@ -37,6 +33,10 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class ItemThunderSword extends ItemManasteelSword implements ICraftAchievement { private static final String TAG_LIGHTNING_SEED = "lightningSeed"; 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 ea6399298..1d347de73 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.tool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; 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 3d3942ec7..f9af5eb2b 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 @@ -20,7 +20,6 @@ import net.minecraft.init.Enchantments; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; @@ -33,6 +32,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; @@ -41,7 +41,6 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; 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 4de05f3af..785f61dd2 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 @@ -1,8 +1,5 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.Random; - -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; @@ -15,15 +12,15 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.common.lib.LibObfuscation; + +import java.util.Random; public class ItemElementiumAxe extends ItemManasteelAxe { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 30444395e..0b008d15c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -4,13 +4,13 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumPick extends ItemManasteelPick { 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 a0fd643f9..183d640a5 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 @@ -1,10 +1,6 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicates; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -24,6 +20,9 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; +import java.util.Random; + public class ItemElementiumShears extends ItemManasteelShears { public ItemElementiumShears() { 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 4a0042d33..5635aa691 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 @@ -10,26 +10,21 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.Set; -import java.util.regex.Pattern; - import com.google.common.collect.ImmutableSet; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -40,9 +35,11 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.Set; +import java.util.regex.Pattern; + public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); 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 f7a3fc7a9..ad883277a 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 @@ -10,23 +10,20 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.regex.Pattern; - -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -37,9 +34,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; +import java.util.regex.Pattern; + public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { private static final Pattern TORCH_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)torch)|(?:(?:[a-z-_.:]|^)Torch))(?:[A-Z-_.:]|$)"); 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 f3f63c38d..d048c10b3 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 @@ -10,18 +10,13 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; -import net.minecraft.item.Item; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; @@ -30,7 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; @@ -38,9 +33,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibObfuscation; + +import java.util.List; +import java.util.Random; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { 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 3b4e73db2..8f0ea96de 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 @@ -16,18 +16,19 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import net.minecraftforge.fml.common.eventhandler.Event.Result; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; @@ -37,8 +38,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 44091405a..a755a6fb5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -10,18 +10,17 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -30,7 +29,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { 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 214180b19..dd446987b 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 @@ -10,6 +10,27 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import net.minecraft.block.Block; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Enchantments; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.ISequentialBreaker; +import vazkii.botania.common.item.ItemTemperanceStone; +import vazkii.botania.common.item.equipment.tool.ToolCommons; +import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; +import vazkii.botania.common.item.relic.ItemLokiRing; +import vazkii.botania.common.lib.LibItemNames; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -20,28 +41,6 @@ import java.util.Objects; import java.util.PriorityQueue; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Enchantments; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.item.ISequentialBreaker; -import vazkii.botania.common.item.ItemTemperanceStone; -import vazkii.botania.common.item.equipment.tool.ToolCommons; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; -import vazkii.botania.common.item.relic.ItemLokiRing; -import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; - public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { 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 17170fbcd..001ed0312 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 @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import java.awt.Color; -import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; @@ -24,13 +21,20 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -49,9 +53,9 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.List; public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker, IColorable { 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 91f91f025..faf213db0 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 @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,13 +17,11 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.MobEffects; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; import net.minecraft.stats.Achievement; +import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -43,6 +39,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, ICraftAchievement { private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index a5c671608..eb87351fd 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -13,13 +13,13 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.Optional; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 151db0c80..47ea9c972 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.item.interaction.thaumcraft; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import thaumcraft.api.items.IScribeTools; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.Optional; + +import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index a8d7d3f42..c6b522c6c 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import thaumcraft.api.items.IGoggles; @@ -22,8 +24,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index 50550aee9..bd47d39fb 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -13,13 +13,13 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.Optional; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index d8f3396f5..c153b5674 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -22,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; @@ -38,7 +36,9 @@ import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.registry.GameRegistry; + +import java.awt.*; +import java.util.List; public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt, IColorable { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index e1f775b4d..6f6ef2aa7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -12,8 +12,8 @@ package vazkii.botania.common.item.lens; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.Vector3; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 833f1beca..627c91680 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -10,16 +10,16 @@ */ package vazkii.botania.common.item.lens; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; +import java.util.List; + public class LensDamage extends Lens { @Override 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 b482b7ddf..88684a616 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -14,8 +14,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index a8746bbbf..8809624db 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.awt.Color; - import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,6 +17,8 @@ import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; +import java.awt.*; + public class LensFlare extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 0813eef85..0549d384c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; @@ -24,6 +22,8 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.item.ModItems; +import java.util.List; + public class LensInfluence extends Lens { @Override 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 23c870b23..6a509c81b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -29,6 +26,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class LensMine extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index be05676d9..f33f71bd5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -10,23 +10,23 @@ */ package vazkii.botania.common.item.lens; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; +import java.util.ArrayList; +import java.util.List; + public class LensPaint extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index c3840b7be..272be6d4c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; 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 0845fab1a..9f66bda8d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -21,9 +21,9 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IDyablePool; import vazkii.botania.common.item.Item16Colors; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java index c1382d334..58444864c 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.material; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; 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 5d3e1c78b..cffed3124 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,27 +10,26 @@ */ package vazkii.botania.common.item.material; -import java.awt.Color; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; @@ -42,9 +41,9 @@ import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.List; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement, IColorable { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 846f04417..21ae57708 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -11,12 +11,11 @@ package vazkii.botania.common.item.material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 8bcf87739..956585d51 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.material; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,6 +18,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 3810f9bf8..af6a59c0b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -10,12 +10,9 @@ */ package vazkii.botania.common.item.material; -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -26,6 +23,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { public ItemRune() { diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index ca9be465e..ce048f17d 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -10,15 +10,13 @@ */ package vazkii.botania.common.item.record; -import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.lib.LibMisc; public class ItemModRecord extends ItemRecord { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 2798ede3d..20db4643b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - +import baubles.api.BaubleType; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -25,6 +25,8 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; @@ -35,13 +37,9 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; +import java.util.List; +import java.util.UUID; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { 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 d1b74727e..800d75247 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -23,14 +20,17 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.List; + public class ItemDice extends ItemRelic { private static final int[] SIDES_FOR_MOON_PHASES = new int[] { 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 be573e054..8adc3c990 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -19,10 +19,10 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 407c19d97..9f1ca3d0e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -18,11 +18,11 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 514580aa1..d807be644 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.Random; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -29,6 +27,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; +import java.util.Random; + public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; 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 44387d9b7..812b1838a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -10,17 +10,15 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; import com.google.common.collect.ImmutableList; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,12 +27,15 @@ import net.minecraft.init.Enchantments; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaUsingItem; @@ -43,12 +44,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 48cbaeb33..d333d37ea 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -10,9 +10,11 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.List; - +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -21,17 +23,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import java.util.ArrayList; +import java.util.List; public class ItemOdinRing extends ItemRelicBauble { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 24dfbea09..955783261 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +27,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; +import java.util.List; +import java.util.UUID; + public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND_NAME = "soulbind"; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 837a1f3b6..928bf0e10 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -10,14 +10,10 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; @@ -25,6 +21,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; +import java.util.List; +import java.util.UUID; + public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 78dd94da2..ac6c5949b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.relic; +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; public class ItemThorRing extends ItemRelicBauble { 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 41fd970b7..38ee836df 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -15,9 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; 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 0c36c6a86..7d04460ae 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -18,10 +18,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index a5535ba44..37d50435e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.Random; - import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,9 +18,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.item.IAvatarTile; @@ -36,6 +34,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.util.Random; + public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIVINING); 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 253b0a639..8e3b129c0 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -27,14 +24,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -46,9 +46,9 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { 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 98f9a4723..eefba895e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -16,11 +16,11 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; 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 4c33f70fb..376070993 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -10,23 +10,18 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; @@ -39,7 +34,9 @@ import vazkii.botania.common.entity.EntityThrownItem; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibObfuscation; + +import java.util.ArrayList; +import java.util.List; public class ItemGravityRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 850b624d3..8e82976c5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -10,14 +10,16 @@ */ package vazkii.botania.common.item.rod; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -38,6 +40,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_RAINBOW); 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 69aac8d90..6d3362880 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -16,10 +16,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.ManaItemHandler; 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 6921de109..363f7f3c6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.Map; -import java.util.WeakHashMap; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -36,6 +33,9 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import java.util.Map; +import java.util.WeakHashMap; + public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int TIME = 10; 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 a66c9c1ed..122f2abcc 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -23,7 +23,11 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 501c7675a..b93c66833 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,9 +21,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; @@ -40,6 +38,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_TORNADO); 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 12bd6435a..5f53d0211 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -5,9 +5,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 71a460782..95538e4e3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.lexicon; -import java.util.ArrayList; -import java.util.List; - -import baubles.common.Config; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -55,6 +51,9 @@ import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibLexicon; +import java.util.ArrayList; +import java.util.List; + public final class LexiconData { public static LexiconEntry welcome; diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index ec966710f..9d05978ad 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -13,10 +13,10 @@ package vazkii.botania.common.lexicon; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.stats.Achievement; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.LexiconCategory; public class RLexiconEntry extends BLexiconEntry { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 007515fb8..ee5a9e967 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -10,14 +10,13 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -27,8 +26,9 @@ import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class PageBrew extends PageRecipe implements ITwoNamedPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 23e6eb633..dc95e77e3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -25,19 +20,21 @@ import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PageCraftingRecipe extends PageRecipe { 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 29ab0746c..6f6a22df7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -1,10 +1,5 @@ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -13,18 +8,20 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PageElvenRecipe extends PageRecipe { 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 90ade66e7..8d57ee8ec 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.lang.reflect.Constructor; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -20,11 +18,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; - -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; + +import java.lang.reflect.Constructor; public class PageEntity extends LexiconPage{ diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index 3cbfa4baf..bfe14bd15 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -10,15 +10,15 @@ */ package vazkii.botania.common.lexicon.page; -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.internal.IGuiLexiconEntry; +import java.awt.*; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + public class PageGuide extends PageText { GuiButton button; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 8f51fa9de..1abcf4474 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -15,13 +15,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; public class PageImage extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index 37c9f0dc7..8540ce8cb 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -14,9 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index b4d34adc5..68a1da7ff 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -23,13 +18,13 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -37,13 +32,15 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.core.helper.ItemNBTHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); 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 0dd31a5a3..5359f4c19 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -22,21 +19,22 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class PageMultiblock extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index b3900db71..e984a6a95 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -23,10 +18,10 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; - import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -35,8 +30,10 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PagePetalRecipe extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index ec96d14f6..014df8180 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -23,20 +18,23 @@ import net.minecraft.client.renderer.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.core.helper.PlayerHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class PageRecipe extends LexiconPage { int relativeMouseX, relativeMouseY; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 0c6e71fb5..d1bf9f1ad 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -10,23 +10,21 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class PageRuneRecipe extends PagePetalRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 570f337cc..b41eb874d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -23,21 +18,23 @@ import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.lib.LibResources; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PageShedding extends PageEntity { 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 5a14d194b..51bf6a699 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -20,17 +17,18 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.ArrayList; +import java.util.List; public class PageTerrasteel extends PageRecipe { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 43715dddf..ccad3c5d8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -10,20 +10,18 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.base.Joiner; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.core.handler.ConfigHandler; -import com.google.common.base.Joiner; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; public class PageText extends LexiconPage { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index afa78b145..921e8625d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.lexicon.page; -import java.awt.Desktop; -import java.net.URI; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.client.gui.lexicon.GuiLexicon; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.client.gui.lexicon.GuiLexicon; + +import java.awt.*; +import java.net.URI; public class PageTutorial extends PageText { diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index c78926396..7f65011e4 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -12,6 +12,7 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.IGuiHandler; import vazkii.botania.client.gui.bag.ContainerFlowerBag; import vazkii.botania.client.gui.bag.GuiFlowerBag; import vazkii.botania.client.gui.box.ContainerBaubleBox; @@ -20,7 +21,6 @@ import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibGuiIDs; -import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 3dcd23805..a9ce3ce25 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.world; -import java.awt.Color; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -27,12 +25,14 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.ToolCommons; +import java.awt.*; + public final class SkyblockWorldEvents { private static final String TAG_MADE_ISLAND = "Botania-MadeIsland"; diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index cf930c995..7634db73e 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; public class WorldTypeSkyblock extends WorldType { From b479284760678a2b14c6972191d7dcc20d18c056 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Apr 2016 23:00:55 -0500 Subject: [PATCH 535/935] Fix throwables --- .../java/vazkii/botania/common/item/ItemThornChakram.java | 1 + .../botania/common/item/material/ItemManaResource.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 62b94d177..99c098581 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -58,6 +58,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { ItemStack copy = stack.copy(); stack.stackSize = 1; EntityThornChakram c = new EntityThornChakram(world, player, copy); + c.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); c.setFire(stack.getItemDamage() != 0); world.spawnEntityInWorld(c); } 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 cffed3124..6f4da278f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -106,8 +106,11 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve 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) + if(!par3World.isRemote) { + EntityEnderAirBottle b = new EntityEnderAirBottle(par3World, par2EntityPlayer); + b.setHeadingFromThrower(par2EntityPlayer, par2EntityPlayer.rotationPitch, par2EntityPlayer.rotationYaw, 0F, 1.5F, 1F); par3World.spawnEntityInWorld(new EntityEnderAirBottle(par3World, par2EntityPlayer)); + } else par2EntityPlayer.swingArm(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } From 0ad2a4f2182c57a954c5c8aa072a7b2b8cf31757 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Apr 2016 10:16:46 -0500 Subject: [PATCH 536/935] Fix boss bar rendering, music still not playing --- build.properties | 2 +- .../vazkii/botania/api/boss/IBotaniaBoss.java | 18 ++--- .../api/internal/DummyMethodHandler.java | 5 -- .../api/internal/IInternalMethodHandler.java | 2 - .../client/core/handler/BossBarHandler.java | 77 ++++++++++--------- .../client/core/handler/HUDHandler.java | 2 - .../client/core/proxy/ClientProxy.java | 13 ++++ .../render/entity/RenderDoppleganger.java | 2 - .../core/handler/InternalMethodHandler.java | 5 -- .../common/core/proxy/CommonProxy.java | 9 +++ .../common/entity/EntityDoppleganger.java | 36 +++++++-- .../resources/assets/botania/lang/en_US.lang | 2 +- 12 files changed, 99 insertions(+), 74 deletions(-) diff --git a/build.properties b/build.properties index 4588d7f79..909aa18bd 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Wed Apr 13 10:09:00 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1841-1.9 +forge_version=12.16.0.1865-1.9 mc_version=1.9 dir_repo=./ build_number=302 diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index b05ff8e62..2826ca3c4 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -21,12 +21,7 @@ import java.awt.*; import java.util.UUID; /** - * An extension of IBossDisplayData. This counts as a botania boss and as a normal - * minecraft boss since it has IBossDisplayData. Instead of using the typical - * BossStatus.setBossStatus(entity, true) to set the health bar in the render use - * BotaniaAPI.internalMethodHandler.setBossStatus(entity);

- * Alternatively, you can check if botania is loaded and use the vanilla one - * if that's not the case. + * A Botania boss, that is subject to special rendering. */ public interface IBotaniaBoss { @@ -55,16 +50,17 @@ public interface IBotaniaBoss { /** * A callback for when this boss's boss bar renders, you can do additional rendering * here if needed. + * @return How tall your auxiliary renders were */ @SideOnly(Side.CLIENT) - public void bossBarRenderCallback(ScaledResolution res, int x, int y); + public int bossBarRenderCallback(ScaledResolution res, int x, int y); /** - * Get the UUID of the {@link BossInfo} instance tracking this boss - * @return The uuid. Note that this is NOT the entity's UUID! - * todo 1.9 is this needed? + * Get the serverside UUID of the {@link net.minecraft.world.BossInfoServer} instance tracking this boss + * Note that this is NOT the entity's UUID, nor is it the clientside UUID of the BossInfoServer instance! + * You will most likely need to sync this yourself using the datawatcher + * @return The uuid. */ public UUID getBossInfoUuid(); - public EntityLivingBase getEntity(); } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index c7e3eceb8..74b0ef857 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -200,11 +200,6 @@ public class DummyMethodHandler implements IInternalMethodHandler { return null; } - @Override - public void setBossStatus(IBotaniaBoss status) { - // NO-OP - } - @Override public boolean isBuildcraftPipe(TileEntity tile) { return false; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 0448c8f5b..6224b7f5b 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -117,8 +117,6 @@ public interface IInternalMethodHandler { public ResourceLocation getDefaultBossBarTexture(); - public void setBossStatus(IBotaniaBoss status); - public boolean isBuildcraftPipe(TileEntity tile); public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m); diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index f0f5a786c..6e396f647 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -16,6 +16,9 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.api.boss.IBotaniaBoss; @@ -27,51 +30,51 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.MathHelper; import java.awt.*; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; public final class BossBarHandler { + // Only access on the client thread! + public static final Set bosses = new HashSet<>(); public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); - private static IBotaniaBoss currentBoss; - private static final BarCallback barUniformCallback = new BarCallback(); - public static void setCurrentBoss(IBotaniaBoss status) { - currentBoss = status; + @SubscribeEvent + public void onBarRender(RenderGameOverlayEvent.BossInfo evt) { + UUID infoUuid = evt.getBossInfo().getUniqueId(); + for(IBotaniaBoss currentBoss : bosses) { + if(currentBoss.getBossInfoUuid().equals(infoUuid)) { + evt.setCanceled(true); + + Minecraft mc = Minecraft.getMinecraft(); + Rectangle bgRect = currentBoss.getBossBarTextureRect(); + Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); + String name = evt.getBossInfo().getName().getFormattedText(); + int c = evt.getResolution().getScaledWidth() / 2; + int x = evt.getX(); + int y = evt.getY(); + int xf = x + (bgRect.width - fgRect.width) / 2; + int yf = y + (bgRect.height - fgRect.height) / 2; + int fw = (int) ((double) fgRect.width * (evt.getBossInfo().getPercent())); + int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; + + GlStateManager.color(1F, 1F, 1F, 1F); + int auxHeight = currentBoss.bossBarRenderCallback(evt.getResolution(), x, y); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + mc.renderEngine.bindTexture(currentBoss.getBossBarTexture()); + drawBar(currentBoss, x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true); + drawBar(currentBoss, xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false); + mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C); + GlStateManager.enableBlend(); + evt.setIncrement(Math.max(bgRect.height, fgRect.height) + auxHeight + mc.fontRendererObj.FONT_HEIGHT); + } + } } - public static void render(ScaledResolution res) { - if(currentBoss == null) - return; - - Minecraft mc = Minecraft.getMinecraft(); - Rectangle bgRect = currentBoss.getBossBarTextureRect(); - Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); - String name = currentBoss.getEntity().getDisplayName().getFormattedText(); - int c = res.getScaledWidth() / 2; - int x = c - bgRect.width / 2; - int y = 20; - int xf = x + (bgRect.width - fgRect.width) / 2; - int yf = y + (bgRect.height - fgRect.height) / 2; - int fw = (int) ((double) fgRect.width * (currentBoss.getEntity().getHealth() / currentBoss.getEntity().getMaxHealth())); - int tx = c - mc.fontRendererObj.getStringWidth(name) / 2; - - GlStateManager.color(1F, 1F, 1F, 1F); - currentBoss.bossBarRenderCallback(res, x, y); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.renderEngine.bindTexture(currentBoss.getBossBarTexture()); - drawBar(x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true); - drawBar(xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false); - mc.fontRendererObj.drawStringWithShadow(name, tx, y - 10, 0xA2018C); - GlStateManager.enableBlend(); - - Entity e = (Entity) currentBoss; - EntityPlayer p = mc.thePlayer; - if(e.isDead || !p.worldObj.loadedEntityList.contains(e) || MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, p.posX, p.posY, p.posZ) > 32) - currentBoss = null; - } - - private static void drawBar(int x, int y, int u, int v, int w, int h, boolean bg) { + private static void drawBar(IBotaniaBoss currentBoss, int x, int y, int u, int v, int w, int h, boolean bg) { boolean useShader = currentBoss instanceof IBotaniaBossWithShader; if(useShader) { IBotaniaBossWithShader shader = (IBotaniaBossWithShader) currentBoss; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index bcd8a37a5..eb1e4b90a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -206,8 +206,6 @@ public final class HUDHandler { if(anyRequest) renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana); - profiler.endStartSection("bossBar"); - BossBarHandler.render(event.getResolution()); profiler.endStartSection("itemsRemaining"); ItemsRemainingRenderHandler.render(event.getResolution(), event.getPartialTicks()); profiler.endSection(); 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 44dd512e0..a18c7dd8e 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -35,6 +35,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -44,6 +45,7 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.BaubleRenderHandler; +import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -201,6 +203,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); MinecraftForge.EVENT_BUS.register(new RenderLexicon()); + MinecraftForge.EVENT_BUS.register(new BossBarHandler()); if(ConfigHandler.useAdaptativeConfig) MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); @@ -472,5 +475,15 @@ public class ClientProxy extends CommonProxy { public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { LightningHandler.spawnLightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); } + + @Override + public void addBoss(IBotaniaBoss boss) { + BossBarHandler.bosses.add(boss); + } + + @Override + public void removeBoss(IBotaniaBoss boss) { + BossBarHandler.bosses.remove(boss); + } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 9e6d08480..1c2a9c2e1 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -55,8 +55,6 @@ public class RenderDoppleganger extends RenderBiped { @Override public void doRender(EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { - BossBarHandler.setCurrentBoss(dopple); - int invulTime = dopple.getInvulTime(); if(invulTime > 0) { grainIntensity = invulTime > 20 ? 1F : invulTime * 0.05F; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 6a9d2b055..54079f1c3 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -223,11 +223,6 @@ public class InternalMethodHandler extends DummyMethodHandler { return BossBarHandler.defaultBossBar; } - @Override - public void setBossStatus(IBotaniaBoss status) { - BossBarHandler.setCurrentBoss(status); - } - @Override public boolean shouldForceCheck() { return ConfigHandler.flowerForceCheck; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 1ac892490..f46b8c7d0 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -37,6 +37,7 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.logging.log4j.Level; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -321,4 +322,12 @@ public class CommonProxy { // NO-OP } + public void addBoss(IBotaniaBoss boss) { + // NO-OP + } + + public void removeBoss(IBotaniaBoss boss) { + // NO-OP + } + } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4280e8aba..39139745d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.entity; +import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -28,6 +29,7 @@ import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.MobEffects; @@ -115,6 +117,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static final DataParameter AGGRO = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); private static final DataParameter HARD_MODE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); private static final DataParameter SOURCE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BLOCK_POS); + private static final DataParameter> BOSSINFO_ID = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.OPTIONAL_UNIQUE_ID); private static final BlockPos[] PYLON_LOCATIONS = { new BlockPos(4, 1, 4), @@ -144,6 +147,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, Float.MAX_VALUE)); isImmuneToFire = true; experienceValue = 825; + Botania.proxy.addBoss(this); } public static MultiblockSet makeMultiblockSet() { @@ -273,6 +277,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi dataManager.register(DATA_MOB_SPAWN_TICKS, 0); dataManager.register(HARD_MODE, false); dataManager.register(PLAYER_COUNT, 0); + dataManager.register(BOSSINFO_ID, Optional.absent()); } public int getInvulTime() { @@ -499,6 +504,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public void setDead() { + Botania.proxy.removeBoss(this); BlockPos source = getSource(); Botania.proxy.playRecordClientSided(worldObj, source, null); isPlayingMusic = false; @@ -515,7 +521,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public void onLivingUpdate() { super.onLivingUpdate(); - bossInfo.setPercent(getHealth() / getMaxHealth()); + if (!worldObj.isRemote) { + dataManager.set(BOSSINFO_ID, Optional.of(bossInfo.getUniqueId())); + bossInfo.setPercent(getHealth() / getMaxHealth()); + } if(!getPassengers().isEmpty()) this.dismountRidingEntity(); @@ -764,6 +773,20 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } + @Override + public void setBossVisibleTo(EntityPlayerMP player) + { + super.setBossVisibleTo(player); + this.bossInfo.addPlayer(player); + } + + @Override + public void setBossNonVisibleTo(EntityPlayerMP player) + { + super.setBossNonVisibleTo(player); + this.bossInfo.removePlayer(player); + } + private void spawnMissile() { if(!worldObj.isRemote) { EntityMagicMissile missile = new EntityMagicMissile(this, true); @@ -879,7 +902,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override @SideOnly(Side.CLIENT) - public void bossBarRenderCallback(ScaledResolution res, int x, int y) { + public int bossBarRenderCallback(ScaledResolution res, int x, int y) { GlStateManager.pushMatrix(); int px = x + 160; int py = y + 12; @@ -897,16 +920,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi mc.fontRendererObj.drawStringWithShadow("" + getPlayerCount(), px + 15, py + 4, 0xFFFFFF); mc.fontRendererObj.setUnicodeFlag(unicode); GlStateManager.popMatrix(); + + return 5; } @Override public UUID getBossInfoUuid() { - return bossInfo.getUniqueId(); - } - - @Override - public EntityLivingBase getEntity() { - return this; + return dataManager.get(BOSSINFO_ID).or(new UUID(0, 0)); } @Override diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1f220c9d6..6e0e3e27e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3892,7 +3892,7 @@ botania.subtitle.potionCreate=Brewery finishes botania.subtitle.runeAltarCraft=Runic Altar finishes botania.subtitle.runeAltarStart=Runic Altar starts botania.subtitle.spreaderFire=Spreader shoots mana -botania.subtitle.starcaller=todo +botania.subtitle.starcaller=Stars descend from the sky botania.subtitle.terraBlade=todo botania.subtitle.terraformRod=todo botania.subtitle.terraPickMode=Terrasteel Pick powers up From 910dfc25db83fff4c735fd3deee8ab5d8135bb10 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Apr 2016 10:17:39 -0500 Subject: [PATCH 537/935] Fix derp --- .../vazkii/botania/common/item/material/ItemManaResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f4da278f..a6f22093f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -109,7 +109,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(!par3World.isRemote) { EntityEnderAirBottle b = new EntityEnderAirBottle(par3World, par2EntityPlayer); b.setHeadingFromThrower(par2EntityPlayer, par2EntityPlayer.rotationPitch, par2EntityPlayer.rotationYaw, 0F, 1.5F, 1F); - par3World.spawnEntityInWorld(new EntityEnderAirBottle(par3World, par2EntityPlayer)); + par3World.spawnEntityInWorld(b); } else par2EntityPlayer.swingArm(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); From 9309355af20cab707b0924655ec7f09dd8c46f56 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Apr 2016 19:24:36 -0500 Subject: [PATCH 538/935] Upload remapping code for troubleshooting --- .../client/core/handler/DebugHandler.java | 8 ++ .../client/core/handler/ModelHandler.java | 14 +-- .../java/vazkii/botania/common/Botania.java | 11 ++- .../botania/common/block/ModBlocks.java | 7 -- .../botania/common/block/ModFluffBlocks.java | 36 -------- .../common/block/decor/BlockPrismarine.java | 91 ------------------- .../common/block/decor/BlockSeaLamp.java | 51 ----------- .../prismarine/BlockDarkPrismarineSlab.java | 23 ----- .../prismarine/BlockPrismarineBrickSlab.java | 23 ----- .../slabs/prismarine/BlockPrismarineSlab.java | 45 --------- .../prismarine/BlockDarkPrismarineStairs.java | 12 --- .../BlockPrismarineBrickStairs.java | 12 --- .../prismarine/BlockPrismarineStairs.java | 29 ------ .../decor/walls/BlockPrismarineWall.java | 36 -------- .../common/core/BotaniaCreativeTab.java | 10 -- .../vazkii/botania/common/core/Remapper.java | 63 +++++++++++++ .../common/crafting/ModCraftingRecipes.java | 14 --- 17 files changed, 83 insertions(+), 402 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java create mode 100644 src/main/java/vazkii/botania/common/core/Remapper.java 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..263bb4eeb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -10,9 +10,11 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -71,6 +73,12 @@ public final class DebugHandler { } else if(Minecraft.isRunningOnMac) event.getLeft().add(PREFIX + "SHIFT+CMD for context"); else event.getLeft().add(PREFIX + "SHIFT+CTRL for context"); + + RayTraceResult ray = Minecraft.getMinecraft().objectMouseOver; + if(ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK && ray.getBlockPos() != null) { + IBlockState state = world.getBlockState(ray.getBlockPos()); + event.getRight().add("META: " + state.getBlock().getMetaFromState(state)); + } } } 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 c24999b03..ccabfaf30 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -325,7 +325,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.runeAltar); - registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); @@ -359,7 +358,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); @@ -624,7 +622,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -642,7 +639,7 @@ public final class ModelHandler { } List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, @@ -668,7 +665,7 @@ public final class ModelHandler { } List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, @@ -774,7 +771,6 @@ public final class ModelHandler { } registerItemModel(ModFluffBlocks.blazeQuartzStairs); - registerItemModel(ModFluffBlocks.darkPrismarineStairs); if (ConfigHandler.darkQuartzEnabled) registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); @@ -789,8 +785,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingwoodPlankStairs); registerItemModel(ModFluffBlocks.manaQuartzStairs); registerItemModel(ModFluffBlocks.netherBrickStairs); - registerItemModel(ModFluffBlocks.prismarineStairs); - registerItemModel(ModFluffBlocks.prismarineBrickStairs); registerItemModel(ModFluffBlocks.redQuartzStairs); registerItemModel(ModFluffBlocks.reedStairs); registerItemModel(ModFluffBlocks.shimmerrockStairs); @@ -831,9 +825,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dreamwoodSlab); registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); - registerItemModel(ModFluffBlocks.prismarineSlab); - registerItemModel(ModFluffBlocks.prismarineBrickSlab); - registerItemModel(ModFluffBlocks.darkPrismarineSlab); registerItemModel(ModFluffBlocks.dirtPathSlab); registerItemModel(ModFluffBlocks.shimmerrockSlab); registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); @@ -864,7 +855,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); - registerItemModel(ModFluffBlocks.prismarineWall); registerItemModel(ModFluffBlocks.reedWall); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 17669e471..b25c0994d 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; @@ -34,6 +35,8 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import vazkii.botania.client.core.handler.DebugHandler; +import vazkii.botania.common.core.Remapper; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; @@ -54,6 +57,7 @@ public class Botania { public static boolean etFuturumLoaded = false; public static boolean rfApiLoaded = false; public static boolean storageDrawersLoaded = false; + public static boolean quarkLoaded = false; public static ILightHelper lightHelper; @@ -73,7 +77,7 @@ public class Botania { coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); - + quarkLoaded = Loader.isModLoaded("Quark"); storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); @@ -131,4 +135,9 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } + @EventHandler + public void remap(FMLMissingMappingsEvent event) { + Remapper.process(event.getAll()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 10a446f13..723691abd 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -41,9 +41,7 @@ import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; -import vazkii.botania.common.block.decor.BlockPrismarine; import vazkii.botania.common.block.decor.BlockReeds; -import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShimmerrock; import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; @@ -212,8 +210,6 @@ public final class ModBlocks { public static Block bifrost; public static Block solidVines; public static Block buriedPetals; - public static Block prismarine; - public static Block seaLamp; public static Block floatingFlower; public static Block tinyPotato; public static Block spawnerClaw; @@ -304,8 +300,6 @@ public final class ModBlocks { bifrost = new BlockBifrost(); solidVines = new BlockSolidVines(); buriedPetals = new BlockBuriedPetals(); - prismarine = new BlockPrismarine(); - seaLamp = new BlockSeaLamp(); floatingFlower = new BlockFloatingFlower(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); @@ -378,7 +372,6 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i)); } - OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 8be2ffa55..dc1f59518 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -48,9 +48,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; @@ -70,12 +67,8 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs; import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; -import vazkii.botania.common.block.decor.walls.BlockPrismarineWall; import vazkii.botania.common.block.decor.walls.BlockReedWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -110,17 +103,6 @@ public final class ModFluffBlocks { public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; - public static Block prismarineStairs; - public static Block prismarineSlab; - public static Block prismarineSlabFull; - public static Block prismarineWall; - public static Block prismarineBrickStairs; - public static Block prismarineBrickSlab; - public static Block prismarineBrickSlabFull; - public static Block darkPrismarineStairs; - public static Block darkPrismarineSlab; - public static Block darkPrismarineSlabFull; - public static Block reedStairs; public static Block reedSlab; public static Block reedSlabFull; @@ -234,17 +216,6 @@ public final class ModFluffBlocks { dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - prismarineStairs = new BlockPrismarineStairs(); - prismarineSlab = new BlockPrismarineSlab(false); - prismarineSlabFull = new BlockPrismarineSlab(true); - prismarineWall = new BlockPrismarineWall(); - prismarineBrickStairs = new BlockPrismarineBrickStairs(); - prismarineBrickSlab = new BlockPrismarineBrickSlab(false); - prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); - darkPrismarineStairs = new BlockDarkPrismarineStairs(); - darkPrismarineSlab = new BlockDarkPrismarineSlab(false); - darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); - reedStairs = new BlockReedStairs(); reedSlab = new BlockReedSlab(false); reedSlabFull = new BlockReedSlab(true); @@ -405,13 +376,6 @@ public final class ModFluffBlocks { ((BlockModSlab) thatchSlab).register(); ((BlockModSlab) thatchSlabFull).register(); - ((BlockModSlab) prismarineSlab).register(); - ((BlockModSlab) prismarineSlabFull).register(); - ((BlockModSlab) prismarineBrickSlab).register(); - ((BlockModSlab) prismarineBrickSlabFull).register(); - ((BlockModSlab) darkPrismarineSlab).register(); - ((BlockModSlab) darkPrismarineSlabFull).register(); - ((BlockModSlab) netherBrickSlab).register(); ((BlockModSlab) netherBrickSlabFull).register(); ((BlockModSlab) soulBrickSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java deleted file mode 100644 index 0bf75b7c9..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 28, 2014, 8:25:39 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import java.util.List; - -public class BlockPrismarine extends BlockMod implements ILexiconable { - - private static final int TYPES = 3; - - public BlockPrismarine() { - super(Material.rock, LibBlockNames.PRISMARINE); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); - } - - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= PrismarineVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); - } - - @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java deleted file mode 100644 index c24e6e739..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 28, 2014, 9:24:43 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockSeaLamp extends BlockMod implements ILexiconable { - - private int coloredLight = -1; - - public BlockSeaLamp() { - super(Material.glass, LibBlockNames.SEA_LAMP); - setHardness(0.3F); - setSoundType(SoundType.GLASS); - setLightLevel(1.0F); - } - - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java deleted file mode 100644 index b89bc6f21..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { - - public BlockDarkPrismarineSlab(boolean full) { - super(full, PrismarineVariant.DARK_PRISMARINE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java deleted file mode 100644 index 23fe690a0..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { - - public BlockPrismarineBrickSlab(boolean full) { - super(full, PrismarineVariant.PRISMARINE_BRICKS); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java deleted file mode 100644 index 2cc57b012..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ /dev/null @@ -1,45 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineSlab extends BlockLivingSlab { - - public BlockPrismarineSlab(boolean full) { - this(full, PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineSlab(boolean full, PrismarineVariant variant) { - super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java deleted file mode 100644 index db71c7774..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { - - public BlockDarkPrismarineStairs() { - super(PrismarineVariant.DARK_PRISMARINE); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java deleted file mode 100644 index 4babc82fa..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockPrismarineBrickStairs extends BlockPrismarineStairs { - - public BlockPrismarineBrickStairs() { - super(PrismarineVariant.PRISMARINE_BRICKS); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java deleted file mode 100644 index 4d4fee99d..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ /dev/null @@ -1,29 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineStairs extends BlockLivingStairs { - - public BlockPrismarineStairs() { - this(PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineStairs(PrismarineVariant variant) { - super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java deleted file mode 100644 index 7067dc353..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:30:00 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineWall extends BlockModWall { - - public BlockPrismarineWall() { - super(ModBlocks.prismarine, 0); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7fb00336f..cfea900d0 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -303,16 +303,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); - addBlock(ModBlocks.prismarine); - addBlock(ModBlocks.seaLamp); - addBlock(ModFluffBlocks.prismarineStairs); - addBlock(ModFluffBlocks.prismarineSlab); - addBlock(ModFluffBlocks.prismarineWall); - addBlock(ModFluffBlocks.prismarineBrickStairs); - addBlock(ModFluffBlocks.prismarineBrickSlab); - addBlock(ModFluffBlocks.darkPrismarineStairs); - addBlock(ModFluffBlocks.darkPrismarineSlab); - addBlock(ModBlocks.blazeBlock); addBlock(ModBlocks.reedBlock); diff --git a/src/main/java/vazkii/botania/common/core/Remapper.java b/src/main/java/vazkii/botania/common/core/Remapper.java new file mode 100644 index 000000000..b82f12a5c --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/Remapper.java @@ -0,0 +1,63 @@ +package vazkii.botania.common.core; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.Botania; + +import java.util.List; +import java.util.stream.Collectors; + +public final class Remapper { + + public static void process(List mappings) { + boolean quark = Botania.quarkLoaded; + List items = mappings.stream().filter(m -> m.type == GameRegistry.Type.ITEM).collect(Collectors.toList()); + List blocks = mappings.stream().filter(m -> m.type == GameRegistry.Type.BLOCK).collect(Collectors.toList()); + + for(FMLMissingMappingsEvent.MissingMapping m : blocks) { + switch (m.name) { + // Prismarine + case "botania:prismarine": m.remap(getBlock("minecraft:prismarine")); break; + case "botania:seaLamp": m.remap(getBlock("minecraft:sea_lantern")); break; + case "botania:prismarine0Stairs": if (quark) m.remap(getBlock("quark:prismarine_stairs")); else m.warn(); break; + case "botania:prismarine0Slab": if (quark) m.remap(getBlock("quark:prismarine_slab")); else m.warn(); break; + case "botania:prismarine0Wall": if (quark) m.remap(getBlock("quark:prismarine_rough_wall")); else m.warn(); break; + case "botania:prismarine1Stairs": if (quark) m.remap(getBlock("quark:prismarine_bricks_stairs")); else m.warn(); break; + case "botania:prismarine1Slab": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab")); else m.warn(); break; + case "botania:prismarine2Stairs": if (quark) m.remap(getBlock("quark:prismarine_dark_stairs")); else m.warn(); break; + case "botania:prismarine2Slab": if (quark) m.remap(getBlock("quark:prismarine_dark_slab")); else m.warn(); break; + + // + } + } + + for(FMLMissingMappingsEvent.MissingMapping m : items) { + switch (m.name) { + // Prismarine + case "botania:prismarine": m.remap(getItem("minecraft:prismarine")); break; + case "botania:seaLamp": m.remap(getItem("minecraft:sea_lantern")); break; + case "botania:prismarine0Stairs": if (quark) m.remap(getItem("quark:prismarine_stairs")); else m.warn(); break; + case "botania:prismarine0Slab": if (quark) m.remap(getItem("quark:prismarine_slab")); else m.warn(); break; + case "botania:prismarine0Wall": if (quark) m.remap(getItem("quark:prismarine_rough_wall")); else m.warn(); break; + case "botania:prismarine1Stairs": if (quark) m.remap(getItem("quark:prismarine_bricks_stairs")); else m.warn(); break; + case "botania:prismarine1Slab": if (quark) m.remap(getItem("quark:prismarine_bricks_slab")); else m.warn(); break; + case "botania:prismarine2Stairs": if (quark) m.remap(getItem("quark:prismarine_dark_stairs")); else m.warn(); break; + case "botania:prismarine2Slab": if (quark) m.remap(getItem("quark:prismarine_dark_slab")); else m.warn(); break; + } + } + } + + private static Block getBlock(String name) { + return Block.blockRegistry.getObject(new ResourceLocation(name)); + } + + private static Item getItem(String name) { + return Item.itemRegistry.getObject(new ResourceLocation(name)); + } + + private Remapper() {} + +} diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 7dd2d6b57..b95f4eb51 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -325,12 +325,6 @@ public final class ModCraftingRecipes { // The future is now (botania -> vanilla recipes for future added items and blocks) addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10)); - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); - - addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp)); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); @@ -2181,12 +2175,6 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab); addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab); addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab); - addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); - addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); - addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); - addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); - addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); - addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab); addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab); addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab); @@ -2202,8 +2190,6 @@ public final class ModCraftingRecipes { addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0); addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0); addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0); - addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); - addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0); for(int i = 0; i < 8; i++) addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); From 905a3727086e44d5d6df1e2468317fb798f97c70 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Apr 2016 20:06:44 -0500 Subject: [PATCH 539/935] Add remap for full slabs --- src/main/java/vazkii/botania/common/core/Remapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/core/Remapper.java b/src/main/java/vazkii/botania/common/core/Remapper.java index b82f12a5c..50b147248 100644 --- a/src/main/java/vazkii/botania/common/core/Remapper.java +++ b/src/main/java/vazkii/botania/common/core/Remapper.java @@ -24,11 +24,14 @@ public final class Remapper { case "botania:seaLamp": m.remap(getBlock("minecraft:sea_lantern")); break; case "botania:prismarine0Stairs": if (quark) m.remap(getBlock("quark:prismarine_stairs")); else m.warn(); break; case "botania:prismarine0Slab": if (quark) m.remap(getBlock("quark:prismarine_slab")); else m.warn(); break; + case "botania:prismarine0SlabFull": if (quark) m.remap(getBlock("quark:prismarine_slab_double")); else m.warn(); break; case "botania:prismarine0Wall": if (quark) m.remap(getBlock("quark:prismarine_rough_wall")); else m.warn(); break; case "botania:prismarine1Stairs": if (quark) m.remap(getBlock("quark:prismarine_bricks_stairs")); else m.warn(); break; case "botania:prismarine1Slab": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab")); else m.warn(); break; + case "botania:prismarine1SlabFull": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab_double")); else m.warn(); break; case "botania:prismarine2Stairs": if (quark) m.remap(getBlock("quark:prismarine_dark_stairs")); else m.warn(); break; case "botania:prismarine2Slab": if (quark) m.remap(getBlock("quark:prismarine_dark_slab")); else m.warn(); break; + case "botania:prismarine2SlabFull": if (quark) m.remap(getBlock("quark:prismarine_dark_slab_double")); else m.warn(); break; // } From b7fead0e4d1b8ce402e632ce4bc738ea944f63bb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Apr 2016 17:34:17 -0500 Subject: [PATCH 540/935] Initial stuff --- .../botania/client/model/ManaGunModel.java | 47 +++++ .../botania/common/item/ItemManaGun.java | 11 + .../assets/botania/models/item/manaGun.json | 191 +++++++++++++++--- .../botania/models/item/manaGunOld.json | 28 +++ .../botania/textures/items/manaBlaster.png | Bin 0 -> 22452 bytes .../textures/items/manaBlasterColor.png | Bin 0 -> 18289 bytes .../textures/items/manaBlasterGlass.png | Bin 0 -> 20910 bytes .../textures/items/manaBlasterLensClip.png | Bin 0 -> 21643 bytes 8 files changed, 250 insertions(+), 27 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/ManaGunModel.java create mode 100644 src/main/resources/assets/botania/models/item/manaGunOld.json create mode 100644 src/main/resources/assets/botania/textures/items/manaBlaster.png create mode 100644 src/main/resources/assets/botania/textures/items/manaBlasterColor.png create mode 100644 src/main/resources/assets/botania/textures/items/manaBlasterGlass.png create mode 100644 src/main/resources/assets/botania/textures/items/manaBlasterLensClip.png diff --git a/src/main/java/vazkii/botania/client/model/ManaGunModel.java b/src/main/java/vazkii/botania/client/model/ManaGunModel.java new file mode 100644 index 000000000..50ce901ba --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ManaGunModel.java @@ -0,0 +1,47 @@ +package vazkii.botania.client.model; + +import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import vazkii.botania.common.item.ItemManaGun; + +import java.util.List; + +public class ManaGunModel implements IBakedModel { + + private final ItemHandler itemHandler = new ItemHandler(); + + @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return null; } + @Override public boolean isAmbientOcclusion() { return true; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + + @Override + public ItemOverrideList getOverrides() { + return itemHandler; + } + + private class ItemHandler extends ItemOverrideList { + private ItemHandler() { + super(ImmutableList.of()); + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { + boolean hasClip = ItemManaGun.hasClip(stack); + if (hasClip) { + List lenses = ItemManaGun.getAllLens(stack); + } + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 65d8a32ef..63da4edd6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -50,6 +50,7 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; import java.awt.*; +import java.util.ArrayList; import java.util.List; public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @@ -314,6 +315,16 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return null; } + public static List getAllLens(ItemStack stack) { + List ret = new ArrayList<>(); + + for (int i = 0; i < 6; i++) { + ret.add(getLensAtPos(stack, i)); + } + + return ret; + } + @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par1ItemStack.isItemDamaged()) diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index fa04ed4ee..16e586c2d 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -1,28 +1,165 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/manaGun0", - "layer1": "botania:items/manaGun1" - }, - "overrides": [ - { - "predicate": { - "botania:clip": 1 - }, - "model": "botania:item/manaGunClip" - }, - { - "predicate": { - "botania:desu": 1 - }, - "model": "botania:item/desuGun" - }, - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" - } - ] +{ + "__comment": "", + "textures": { + "layer0": "botania:items/manaBlaster", + "layer1": "botania:items/manaBlasterColor", + "layer2": "botania:items/manaBlasterGlass", + "layer3": "botania:items/manaBlasterLensClip" + }, + "elements": [ + { + "name": "Barrel1", + "from": [ -10.0, 5.0, 5.5 ], + "to": [ -3.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, + "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, + "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, + "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel2", + "from": [ -3.0, 5.0, 5.5 ], + "to": [ 7.0, 9.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, + "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, + "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } + } + }, + { + "name": "Barrel3", + "from": [ 7.0, 5.0, 5.5 ], + "to": [ 10.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } + } + }, + { + "name": "Barrel4", + "from": [ 10.0, 12.0, 5.5 ], + "to": [ 18.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel5", + "from": [ 10.0, 9.0, 5.5 ], + "to": [ 18.0, 11.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } + } + }, + { + "name": "Strap", + "from": [ 14.0, -5.0, 6.5 ], + "to": [ 19.0, 9.0, 9.5 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, + "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, + "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } + } + }, + { + "name": "Magazine", + "from": [ 12.5, -6.0, 7.0 ], + "to": [ 18.5, -5.0, 9.0 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, + "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, + "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, + "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } + } + }, + { + "name": "Trigger Guard1", + "from": [ 10.0, 6.0, 7.0 ], + "to": [ 16.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, + "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } + } + }, + { + "name": "Trigger", + "from": [ 13.0, 7.0, 7.5 ], + "to": [ 16.0, 9.0, 8.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } + } + }, + { + "name": "Trigger Guard2", + "from": [ 10.0, 7.0, 7.0 ], + "to": [ 11.0, 9.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, + "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } + } + }, + { + "name": "Colorizer", + "from": [ 9.5, 11.0, 6.0 ], + "to": [ 17.5, 12.0, 10.0 ], + "faces": { + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ] }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ] } + } + }, + { + "name": "Glass", + "from": [ -3.5, 9.5, 6.0 ], + "to": [ 7.5, 13.5, 10.0 ], + "faces": { + "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, + "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, + "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, + "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, + "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } + } + }, + { + "name": "Clip", + "from": [ -4.5, 2.0, 5.0 ], + "to": [ 8.5, 8.0, 11.0 ], + "faces": { + "north": { "texture": "layer3", "uv": [ 0.01, 6.51, 6.5, 9.49 ] }, + "east": { "texture": "layer3", "uv": [ 6.01, 0.0, 9.0, 3.0 ] }, + "south": { "texture": "layer3", "uv": [ 6.5, 6.5, 0.01, 9.5 ] }, + "west": { "texture": "layer3", "uv": [ 6.0, 3.0, 9.0, 6.0 ] }, + "up": { "texture": "layer3", "uv": [ 0.0, 0.01, 3.0, 6.5 ], "rotation": 90 }, + "down": { "texture": "layer3", "uv": [ 3.0, 0.01, 6.0, 6.5 ], "rotation": 90 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunOld.json b/src/main/resources/assets/botania/models/item/manaGunOld.json new file mode 100644 index 000000000..fa04ed4ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGunOld.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/manaGun0", + "layer1": "botania:items/manaGun1" + }, + "overrides": [ + { + "predicate": { + "botania:clip": 1 + }, + "model": "botania:item/manaGunClip" + }, + { + "predicate": { + "botania:desu": 1 + }, + "model": "botania:item/desuGun" + }, + { + "predicate": { + "botania:desu": 1, + "botania:clip": 1 + }, + "model": "botania:item/desuGunClip" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/manaBlaster.png b/src/main/resources/assets/botania/textures/items/manaBlaster.png new file mode 100644 index 0000000000000000000000000000000000000000..828aace99d901227284cfe3a78e87457a59c4ca7 GIT binary patch literal 22452 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/manaBlasterColor.png b/src/main/resources/assets/botania/textures/items/manaBlasterColor.png new file mode 100644 index 0000000000000000000000000000000000000000..fb072d114bda94c429f47f3b148111e8f8813b4d GIT binary patch literal 18289 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 Hmah39tdHC* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/manaBlasterLensClip.png b/src/main/resources/assets/botania/textures/items/manaBlasterLensClip.png new file mode 100644 index 0000000000000000000000000000000000000000..427aa933a542aeda36eb8af64675d3975fed4df1 GIT binary patch literal 21643 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 VH*Q^PCEw}fXzOB=Z{@%Ge*hrVS3Lj# literal 0 HcmV?d00001 From dd300ea32f2124394bd4f4ddd6e5dec2872b60d7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 00:31:47 -0500 Subject: [PATCH 541/935] Convert gaia guardian to loot tables and fix gg music --- .../client/core/proxy/ClientProxy.java | 4 +- .../botania/common/core/loot/BindUuid.java | 46 +++++ .../common/core/loot/EnableRelics.java | 35 ++++ .../botania/common/core/loot/LootHandler.java | 21 ++ .../common/core/loot/TrueGuardianKiller.java | 36 ++++ .../common/core/proxy/CommonProxy.java | 2 + .../common/entity/EntityDoppleganger.java | 84 ++++---- .../botania/loot_tables/gaia_guardian.json | 31 +++ .../botania/loot_tables/gaia_guardian_2.json | 179 ++++++++++++++++++ 9 files changed, 390 insertions(+), 48 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/loot/BindUuid.java create mode 100644 src/main/java/vazkii/botania/common/core/loot/EnableRelics.java create mode 100644 src/main/java/vazkii/botania/common/core/loot/LootHandler.java create mode 100644 src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java create mode 100644 src/main/resources/assets/botania/loot_tables/gaia_guardian.json create mode 100644 src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json 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 a18c7dd8e..8f9a73795 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -365,9 +365,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, 1005, pos, 0); + world.playAuxSFXAtEntity(null, 1010, pos, 0); else { - world.playAuxSFXAtEntity(null, 1005, pos, Item.getIdFromItem(record)); + world.playAuxSFXAtEntity(null, 1010, pos, Item.getIdFromItem(record)); mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal()); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java new file mode 100644 index 000000000..b1c10835d --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -0,0 +1,46 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import net.minecraft.world.storage.loot.functions.LootFunction; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.relic.ItemRelic; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class BindUuid extends LootFunction { + + protected BindUuid(LootCondition[] conditionsIn) { + super(conditionsIn); + } + + @Override + public ItemStack apply(ItemStack stack, Random rand, LootContext context) { + if (context.getKillerPlayer() != null) { + ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); + } + + return stack; + } + + public static class Serializer extends LootFunction.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); + } + + @Override + public void serialize(JsonObject object, BindUuid functionClazz, JsonSerializationContext serializationContext) {} + + @Override + public BindUuid deserialize(JsonObject object, JsonDeserializationContext deserializationContext, LootCondition[] conditionsIn) { + return new BindUuid(conditionsIn); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java new file mode 100644 index 000000000..590465737 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -0,0 +1,35 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class EnableRelics implements LootCondition { + + @Override + public boolean testCondition(Random rand, LootContext context) { + return ConfigHandler.relicsEnabled; + } + + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "enable_relics"), EnableRelics.class); + } + + @Override + public void serialize(JsonObject json, EnableRelics value, JsonSerializationContext context) {} + + @Override + public EnableRelics deserialize(JsonObject json, JsonDeserializationContext context) { + return new EnableRelics(); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java new file mode 100644 index 000000000..b7ad5a5ba --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -0,0 +1,21 @@ +package vazkii.botania.common.core.loot; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootTableList; +import net.minecraft.world.storage.loot.conditions.LootConditionManager; +import net.minecraft.world.storage.loot.functions.LootFunctionManager; +import vazkii.botania.common.lib.LibMisc; + +public final class LootHandler { + + public static void init() { + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian")); + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_2")); + LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); + LootConditionManager.registerCondition(new EnableRelics.Serializer()); + LootFunctionManager.registerFunction(new BindUuid.Serializer()); + } + + private LootHandler() {} + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java new file mode 100644 index 000000000..91bd2f138 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -0,0 +1,36 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class TrueGuardianKiller implements LootCondition { + + @Override + public boolean testCondition(Random rand, LootContext context) { + return context.getLootedEntity() instanceof EntityDoppleganger + && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; + } + + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "true_guardian_killer"), TrueGuardianKiller.class); + } + + @Override + public void serialize(JsonObject json, TrueGuardianKiller value, JsonSerializationContext context) {} + + @Override + public TrueGuardianKiller deserialize(JsonObject json, JsonDeserializationContext context) { + return new TrueGuardianKiller(); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f46b8c7d0..504e34340 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -59,6 +59,7 @@ import vazkii.botania.common.core.handler.ChestGenHandler; import vazkii.botania.common.core.handler.CommonTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; +import vazkii.botania.common.core.loot.LootHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.PixieHandler; @@ -112,6 +113,7 @@ public class CommonProxy { ModBanners.init(); ChestGenHandler.init(); + LootHandler.init(); if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 39139745d..bf7e0cd4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -58,6 +59,9 @@ import net.minecraft.world.BossInfo; import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -79,12 +83,14 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; +import vazkii.botania.common.lib.LibMisc; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.regex.Pattern; @@ -134,6 +140,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private boolean anyWithArmor = false; private List playersWhoAttacked = new ArrayList<>(); + public EntityPlayer trueKiller = null; private static boolean isPlayingMusic = false; @@ -452,54 +459,39 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } @Override - protected void dropFewItems(boolean par1, int par2) { - if(par1) { - for(int pl = 0; pl < playersWhoAttacked.size(); pl++) { - boolean hard = isHardMode(); - entityDropItem(new ItemStack(ModItems.manaResource, pl == 0 ? hard ? 16 : 8 : hard ? 10 : 6, 5), 1F); - boolean droppedRecord = false; + public ResourceLocation getLootTable() { + return new ResourceLocation(LibMisc.MOD_ID, isHardMode() ? "gaia_guardian_2" : "gaia_guardian"); + } - if(hard) { - entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); - if(ConfigHandler.relicsEnabled) { - ItemStack dice = new ItemStack(ModItems.dice); - ((ItemRelic) ModItems.dice).bindToUUID(playersWhoAttacked.get(pl), dice); - entityDropItem(dice, 1F); - } - - if(Math.random() < 0.25) - entityDropItem(new ItemStack(ModItems.overgrowthSeed, rand.nextInt(3) + 1), 1F); - if(Math.random() < 0.5) { - boolean voidLotus = Math.random() < 0.3F; - entityDropItem(new ItemStack(ModItems.blackLotus, voidLotus ? 1 : rand.nextInt(3) + 1, voidLotus ? 1 : 0), 1F); - } - if(Math.random() < 0.9) - entityDropItem(new ItemStack(ModItems.manaResource, 16 + rand.nextInt(12)), 1F); - if(Math.random() < 0.7) - entityDropItem(new ItemStack(ModItems.manaResource, 8 + rand.nextInt(6), 1), 1F); - if(Math.random() < 0.5) - entityDropItem(new ItemStack(ModItems.manaResource, 4 + rand.nextInt(3), 2), 1F); - - int runes = rand.nextInt(6) + 1; - for(int i = 0; i < runes; i++) - if(Math.random() < 0.3) - entityDropItem(new ItemStack(ModItems.rune, 2 + rand.nextInt(3), rand.nextInt(16)), 1F); - - if(Math.random() < 0.2) - entityDropItem(new ItemStack(ModItems.pinkinator), 1F); - if(Math.random() < 0.3) { - int i = Item.getIdFromItem(Items.record_13); - int j = Item.getIdFromItem(Items.record_wait); - int k = i + rand.nextInt(j - i + 1); - entityDropItem(new ItemStack(Item.getItemById(k)), 1F); - droppedRecord = true; - } - } - - if(!droppedRecord && Math.random() < 0.2) - entityDropItem(new ItemStack(hard ? ModItems.recordGaia2 : ModItems.recordGaia1), 1F); - } + @Override + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + { + // Save true killer, they get extra loot + if ("player".equals(source.getDamageType()) + && source.getEntity() instanceof EntityPlayer) { + this.trueKiller = ((EntityPlayer) source.getEntity()); } + + // Drop equipment and clear it so multiple calls to super don't do it again + super.dropEquipment(wasRecentlyHit, lootingModifier); + + for (EntityEquipmentSlot e : EntityEquipmentSlot.values()) { + this.setItemStackToSlot(e, null); + } + + // Generate loot table for every single attacking player + for (UUID u : playersWhoAttacked) { + EntityPlayer player = worldObj.getPlayerEntityByUUID(u); + if (player == null) + continue; + + EntityPlayer saveLastAttacker = this.attackingPlayer; + attackingPlayer = player; + super.dropLoot(wasRecentlyHit, lootingModifier, DamageSource.causePlayerDamage(player)); + attackingPlayer = saveLastAttacker; + } + + trueKiller = null; } @Override diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json new file mode 100644 index 000000000..e71ed2c84 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json @@ -0,0 +1,31 @@ +{ + "pools": [ + { + "__comment": "Life essence", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 5 }, + { "function": "set_count", "count": 6 }, + { + "function": "set_count", + "count": 8, + "conditions": [{ "condition": "botania:true_guardian_killer" }] + } + ] + }] + }, + { + "__comment": "Music disc", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.2 } + ], + "rolls": 1, + "entries": [{ "type": "item", "name": "botania:recordGaia1" }] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json new file mode 100644 index 000000000..d0ce27d4a --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -0,0 +1,179 @@ +{ + "pools": [ + { + "__comment": "Life essence", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 5 }, + { "function": "set_count", "count": 10 }, + { + "function": "set_count", + "count": 16, + "conditions": [{ "condition": "botania:true_guardian_killer" }] + } + ] + }] + }, + { + "__comment": "Black Lotuses", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus", + "weight": 15, + "quality": 5, + "functions": [ + { "function": "set_count", "count": 1 }, + { "function": "set_data", "data": 1 } + ] + }, + { + "type": "item", + "name": "botania:blackLotus", + "weight": 35, + "functions": [ + { "function": "set_count", "count": { "min": 1, "max": 3 } }, + { "function": "set_data", "data": 0 } + ] + }, + { "type": "empty", "weight": 50 } + ] + }, + { + "__comment": "Ancient wills", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:ancientWill", + "functions": [{ "function": "set_data", "data": { "min": 0, "max": 5 } }] + }] + }, + { + "__comment": "Overgrowth seeds", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.25 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:overgrowthSeed", + "functions": [{ "function": "set_count", "count": { "min": 1, "max": 3 } }] + }] + }, + { + "__comment": "Manasteel", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.9 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [{ "function": "set_count", "count": { "min": 16, "max": 27 } }] + }] + }, + { + "__comment": "Mana pearl", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.7 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 1 }, + { "function": "set_count", "count": { "min": 8, "max": 13 } } + ] + }] + }, + { + "__comment": "Mana diamond", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.5 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 2 }, + { "function": "set_count", "count": { "min": 4, "max": 6 } } + ] + }] + }, + { + "__comment": "Runes", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": { "min": 1, "max": 6 }, + "entries": [{ + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune", + "functions": [ + { "function": "set_data", "data": { "min": 0, "max": 15 } }, + { "function": "set_count", "count": { "min": 2, "max": 4 } } + ] + }] + }, + { + "__comment": "Pinkinator", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.2 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:pinkinator" + }] + }, + { + "__comment": "Music discs", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [ + { + "weight": 14, + "type": "item", + "name": "botania:recordGaia2" + }, + { + "weight": 15, + "type": "item", + "name": "minecraft:record_13" + }, + { + "weight": 15, + "type": "item", + "name": "minecraft:record_wait" + }, + { "type": "empty", "weight": 56 } + ] + }, + { + "__comment": "Relics", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "botania:enable_relics" } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:dice", + "functions": [{ "function": "botania:bind_uuid" }] + }] + } + ] +} \ No newline at end of file From 5bf1c26ffb39d87e47b02ea57c62994834f8521b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 00:35:09 -0500 Subject: [PATCH 542/935] Make some conditionals smarter --- .../botania/loot_tables/gaia_guardian_2.json | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index d0ce27d4a..6333c1071 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -20,14 +20,17 @@ }, { "__comment": "Black Lotuses", - "conditions": [{ "condition": "killed_by_player" }], + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.5 } + ], "rolls": 1, "entries": [ { "type": "item", "name": "botania:blackLotus", - "weight": 15, - "quality": 5, + "weight": 3, + "quality": 1, "functions": [ { "function": "set_count", "count": 1 }, { "function": "set_data", "data": 1 } @@ -36,13 +39,12 @@ { "type": "item", "name": "botania:blackLotus", - "weight": 35, + "weight": 7, "functions": [ { "function": "set_count", "count": { "min": 1, "max": 3 } }, { "function": "set_data", "data": 0 } ] - }, - { "type": "empty", "weight": 50 } + } ] }, { @@ -141,7 +143,10 @@ }, { "__comment": "Music discs", - "conditions": [{ "condition": "killed_by_player" }], + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.44 } + ], "rolls": 1, "entries": [ { @@ -158,8 +163,7 @@ "weight": 15, "type": "item", "name": "minecraft:record_wait" - }, - { "type": "empty", "weight": 56 } + } ] }, { From de0ba4ada9ca740e9b99d81f2558f4887d0b6405 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 12:00:49 -0500 Subject: [PATCH 543/935] Revert "Upload remapping code for troubleshooting" This reverts commit 9309355af20cab707b0924655ec7f09dd8c46f56. --- .../client/core/handler/DebugHandler.java | 8 -- .../client/core/handler/ModelHandler.java | 14 ++- .../java/vazkii/botania/common/Botania.java | 11 +-- .../botania/common/block/ModBlocks.java | 7 ++ .../botania/common/block/ModFluffBlocks.java | 36 ++++++++ .../common/block/decor/BlockPrismarine.java | 91 +++++++++++++++++++ .../common/block/decor/BlockSeaLamp.java | 51 +++++++++++ .../prismarine/BlockDarkPrismarineSlab.java | 23 +++++ .../prismarine/BlockPrismarineBrickSlab.java | 23 +++++ .../slabs/prismarine/BlockPrismarineSlab.java | 45 +++++++++ .../prismarine/BlockDarkPrismarineStairs.java | 12 +++ .../BlockPrismarineBrickStairs.java | 12 +++ .../prismarine/BlockPrismarineStairs.java | 29 ++++++ .../decor/walls/BlockPrismarineWall.java | 36 ++++++++ .../common/core/BotaniaCreativeTab.java | 10 ++ .../vazkii/botania/common/core/Remapper.java | 66 -------------- .../common/crafting/ModCraftingRecipes.java | 14 +++ 17 files changed, 402 insertions(+), 86 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java create mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java delete mode 100644 src/main/java/vazkii/botania/common/core/Remapper.java 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 263bb4eeb..d7eea4652 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -10,11 +10,9 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -73,12 +71,6 @@ public final class DebugHandler { } else if(Minecraft.isRunningOnMac) event.getLeft().add(PREFIX + "SHIFT+CMD for context"); else event.getLeft().add(PREFIX + "SHIFT+CTRL for context"); - - RayTraceResult ray = Minecraft.getMinecraft().objectMouseOver; - if(ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK && ray.getBlockPos() != null) { - IBlockState state = world.getBlockState(ray.getBlockPos()); - event.getRight().add("META: " + state.getBlock().getMetaFromState(state)); - } } } 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 ccabfaf30..c24999b03 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -325,6 +325,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.runeAltar); + registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); @@ -358,6 +359,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); @@ -622,6 +624,7 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -639,7 +642,7 @@ public final class ModelHandler { } List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, @@ -665,7 +668,7 @@ public final class ModelHandler { } List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, @@ -771,6 +774,7 @@ public final class ModelHandler { } registerItemModel(ModFluffBlocks.blazeQuartzStairs); + registerItemModel(ModFluffBlocks.darkPrismarineStairs); if (ConfigHandler.darkQuartzEnabled) registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); @@ -785,6 +789,8 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingwoodPlankStairs); registerItemModel(ModFluffBlocks.manaQuartzStairs); registerItemModel(ModFluffBlocks.netherBrickStairs); + registerItemModel(ModFluffBlocks.prismarineStairs); + registerItemModel(ModFluffBlocks.prismarineBrickStairs); registerItemModel(ModFluffBlocks.redQuartzStairs); registerItemModel(ModFluffBlocks.reedStairs); registerItemModel(ModFluffBlocks.shimmerrockStairs); @@ -825,6 +831,9 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dreamwoodSlab); registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); + registerItemModel(ModFluffBlocks.prismarineSlab); + registerItemModel(ModFluffBlocks.prismarineBrickSlab); + registerItemModel(ModFluffBlocks.darkPrismarineSlab); registerItemModel(ModFluffBlocks.dirtPathSlab); registerItemModel(ModFluffBlocks.shimmerrockSlab); registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); @@ -855,6 +864,7 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); + registerItemModel(ModFluffBlocks.prismarineWall); registerItemModel(ModFluffBlocks.reedWall); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index b25c0994d..17669e471 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -27,7 +27,6 @@ import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; @@ -35,8 +34,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import vazkii.botania.client.core.handler.DebugHandler; -import vazkii.botania.common.core.Remapper; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; @@ -57,7 +54,6 @@ public class Botania { public static boolean etFuturumLoaded = false; public static boolean rfApiLoaded = false; public static boolean storageDrawersLoaded = false; - public static boolean quarkLoaded = false; public static ILightHelper lightHelper; @@ -77,7 +73,7 @@ public class Botania { coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); - quarkLoaded = Loader.isModLoaded("Quark"); + storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); @@ -135,9 +131,4 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } - @EventHandler - public void remap(FMLMissingMappingsEvent event) { - Remapper.process(event.getAll()); - } - } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 723691abd..10a446f13 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -41,7 +41,9 @@ import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; +import vazkii.botania.common.block.decor.BlockPrismarine; import vazkii.botania.common.block.decor.BlockReeds; +import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShimmerrock; import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; @@ -210,6 +212,8 @@ public final class ModBlocks { public static Block bifrost; public static Block solidVines; public static Block buriedPetals; + public static Block prismarine; + public static Block seaLamp; public static Block floatingFlower; public static Block tinyPotato; public static Block spawnerClaw; @@ -300,6 +304,8 @@ public final class ModBlocks { bifrost = new BlockBifrost(); solidVines = new BlockSolidVines(); buriedPetals = new BlockBuriedPetals(); + prismarine = new BlockPrismarine(); + seaLamp = new BlockSeaLamp(); floatingFlower = new BlockFloatingFlower(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); @@ -372,6 +378,7 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i)); } + OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index dc1f59518..8be2ffa55 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -48,6 +48,9 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; +import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; @@ -67,8 +70,12 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs; +import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs; import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; +import vazkii.botania.common.block.decor.walls.BlockPrismarineWall; import vazkii.botania.common.block.decor.walls.BlockReedWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -103,6 +110,17 @@ public final class ModFluffBlocks { public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; + public static Block prismarineStairs; + public static Block prismarineSlab; + public static Block prismarineSlabFull; + public static Block prismarineWall; + public static Block prismarineBrickStairs; + public static Block prismarineBrickSlab; + public static Block prismarineBrickSlabFull; + public static Block darkPrismarineStairs; + public static Block darkPrismarineSlab; + public static Block darkPrismarineSlabFull; + public static Block reedStairs; public static Block reedSlab; public static Block reedSlabFull; @@ -216,6 +234,17 @@ public final class ModFluffBlocks { dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); + prismarineStairs = new BlockPrismarineStairs(); + prismarineSlab = new BlockPrismarineSlab(false); + prismarineSlabFull = new BlockPrismarineSlab(true); + prismarineWall = new BlockPrismarineWall(); + prismarineBrickStairs = new BlockPrismarineBrickStairs(); + prismarineBrickSlab = new BlockPrismarineBrickSlab(false); + prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); + darkPrismarineStairs = new BlockDarkPrismarineStairs(); + darkPrismarineSlab = new BlockDarkPrismarineSlab(false); + darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); + reedStairs = new BlockReedStairs(); reedSlab = new BlockReedSlab(false); reedSlabFull = new BlockReedSlab(true); @@ -376,6 +405,13 @@ public final class ModFluffBlocks { ((BlockModSlab) thatchSlab).register(); ((BlockModSlab) thatchSlabFull).register(); + ((BlockModSlab) prismarineSlab).register(); + ((BlockModSlab) prismarineSlabFull).register(); + ((BlockModSlab) prismarineBrickSlab).register(); + ((BlockModSlab) prismarineBrickSlabFull).register(); + ((BlockModSlab) darkPrismarineSlab).register(); + ((BlockModSlab) darkPrismarineSlabFull).register(); + ((BlockModSlab) netherBrickSlab).register(); ((BlockModSlab) netherBrickSlabFull).register(); ((BlockModSlab) soulBrickSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java new file mode 100644 index 000000000..0bf75b7c9 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -0,0 +1,91 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jun 28, 2014, 8:25:39 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +import java.util.List; + +public class BlockPrismarine extends BlockMod implements ILexiconable { + + private static final int TYPES = 3; + + public BlockPrismarine() { + super(Material.rock, LibBlockNames.PRISMARINE); + setHardness(2.0F); + setResistance(10.0F); + setSoundType(SoundType.STONE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); + } + + @Override + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= PrismarineVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + + @Override + public void registerItemForm() { + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } + + @Override + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for(int i = 0; i < TYPES; i++) + par3List.add(new ItemStack(par1, 1, i)); + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java new file mode 100644 index 000000000..c24e6e739 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -0,0 +1,51 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jun 28, 2014, 9:24:43 PM (GMT)] + */ +package vazkii.botania.common.block.decor; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockSeaLamp extends BlockMod implements ILexiconable { + + private int coloredLight = -1; + + public BlockSeaLamp() { + super(Material.glass, LibBlockNames.SEA_LAMP); + setHardness(0.3F); + setSoundType(SoundType.GLASS); + setLightLevel(1.0F); + } + + @Override + @Optional.Method(modid = "easycoloredlights") + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java new file mode 100644 index 000000000..b89bc6f21 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java @@ -0,0 +1,23 @@ +package vazkii.botania.common.block.decor.slabs.prismarine; + +import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.common.block.ModFluffBlocks; + +public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { + + public BlockDarkPrismarineSlab(boolean full) { + super(full, PrismarineVariant.DARK_PRISMARINE); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.darkPrismarineSlab; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java new file mode 100644 index 000000000..23fe690a0 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java @@ -0,0 +1,23 @@ +package vazkii.botania.common.block.decor.slabs.prismarine; + +import net.minecraft.block.BlockSlab; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.common.block.ModFluffBlocks; + +public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { + + public BlockPrismarineBrickSlab(boolean full) { + super(full, PrismarineVariant.PRISMARINE_BRICKS); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.prismarineBrickSlab; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java new file mode 100644 index 000000000..2cc57b012 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -0,0 +1,45 @@ +package vazkii.botania.common.block.decor.slabs.prismarine; + +import net.minecraft.block.BlockSlab; +import net.minecraft.block.SoundType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockPrismarineSlab extends BlockLivingSlab { + + public BlockPrismarineSlab(boolean full) { + this(full, PrismarineVariant.PRISMARINE); + } + + public BlockPrismarineSlab(boolean full, PrismarineVariant variant) { + super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); + setHardness(2.0F); + setResistance(10.0F); + setSoundType(SoundType.STONE); + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.prismarineSlabFull; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.prismarineSlab; + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java new file mode 100644 index 000000000..db71c7774 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java @@ -0,0 +1,12 @@ +package vazkii.botania.common.block.decor.stairs.prismarine; + + +import vazkii.botania.api.state.enums.PrismarineVariant; + +public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { + + public BlockDarkPrismarineStairs() { + super(PrismarineVariant.DARK_PRISMARINE); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java new file mode 100644 index 000000000..4babc82fa --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java @@ -0,0 +1,12 @@ +package vazkii.botania.common.block.decor.stairs.prismarine; + + +import vazkii.botania.api.state.enums.PrismarineVariant; + +public class BlockPrismarineBrickStairs extends BlockPrismarineStairs { + + public BlockPrismarineBrickStairs() { + super(PrismarineVariant.PRISMARINE_BRICKS); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java new file mode 100644 index 000000000..4d4fee99d --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java @@ -0,0 +1,29 @@ +package vazkii.botania.common.block.decor.stairs.prismarine; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockPrismarineStairs extends BlockLivingStairs { + + public BlockPrismarineStairs() { + this(PrismarineVariant.PRISMARINE); + } + + public BlockPrismarineStairs(PrismarineVariant variant) { + super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java new file mode 100644 index 000000000..7067dc353 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -0,0 +1,36 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 18, 2015, 8:30:00 PM (GMT)] + */ +package vazkii.botania.common.block.decor.walls; + +import net.minecraft.block.SoundType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lexicon.LexiconData; + +public class BlockPrismarineWall extends BlockModWall { + + public BlockPrismarineWall() { + super(ModBlocks.prismarine, 0); + setHardness(2.0F); + setResistance(10.0F); + setSoundType(SoundType.STONE); + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.prismarine; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index cfea900d0..7fb00336f 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -303,6 +303,16 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); + addBlock(ModBlocks.prismarine); + addBlock(ModBlocks.seaLamp); + addBlock(ModFluffBlocks.prismarineStairs); + addBlock(ModFluffBlocks.prismarineSlab); + addBlock(ModFluffBlocks.prismarineWall); + addBlock(ModFluffBlocks.prismarineBrickStairs); + addBlock(ModFluffBlocks.prismarineBrickSlab); + addBlock(ModFluffBlocks.darkPrismarineStairs); + addBlock(ModFluffBlocks.darkPrismarineSlab); + addBlock(ModBlocks.blazeBlock); addBlock(ModBlocks.reedBlock); diff --git a/src/main/java/vazkii/botania/common/core/Remapper.java b/src/main/java/vazkii/botania/common/core/Remapper.java deleted file mode 100644 index 50b147248..000000000 --- a/src/main/java/vazkii/botania/common/core/Remapper.java +++ /dev/null @@ -1,66 +0,0 @@ -package vazkii.botania.common.core; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.common.Botania; - -import java.util.List; -import java.util.stream.Collectors; - -public final class Remapper { - - public static void process(List mappings) { - boolean quark = Botania.quarkLoaded; - List items = mappings.stream().filter(m -> m.type == GameRegistry.Type.ITEM).collect(Collectors.toList()); - List blocks = mappings.stream().filter(m -> m.type == GameRegistry.Type.BLOCK).collect(Collectors.toList()); - - for(FMLMissingMappingsEvent.MissingMapping m : blocks) { - switch (m.name) { - // Prismarine - case "botania:prismarine": m.remap(getBlock("minecraft:prismarine")); break; - case "botania:seaLamp": m.remap(getBlock("minecraft:sea_lantern")); break; - case "botania:prismarine0Stairs": if (quark) m.remap(getBlock("quark:prismarine_stairs")); else m.warn(); break; - case "botania:prismarine0Slab": if (quark) m.remap(getBlock("quark:prismarine_slab")); else m.warn(); break; - case "botania:prismarine0SlabFull": if (quark) m.remap(getBlock("quark:prismarine_slab_double")); else m.warn(); break; - case "botania:prismarine0Wall": if (quark) m.remap(getBlock("quark:prismarine_rough_wall")); else m.warn(); break; - case "botania:prismarine1Stairs": if (quark) m.remap(getBlock("quark:prismarine_bricks_stairs")); else m.warn(); break; - case "botania:prismarine1Slab": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab")); else m.warn(); break; - case "botania:prismarine1SlabFull": if (quark) m.remap(getBlock("quark:prismarine_bricks_slab_double")); else m.warn(); break; - case "botania:prismarine2Stairs": if (quark) m.remap(getBlock("quark:prismarine_dark_stairs")); else m.warn(); break; - case "botania:prismarine2Slab": if (quark) m.remap(getBlock("quark:prismarine_dark_slab")); else m.warn(); break; - case "botania:prismarine2SlabFull": if (quark) m.remap(getBlock("quark:prismarine_dark_slab_double")); else m.warn(); break; - - // - } - } - - for(FMLMissingMappingsEvent.MissingMapping m : items) { - switch (m.name) { - // Prismarine - case "botania:prismarine": m.remap(getItem("minecraft:prismarine")); break; - case "botania:seaLamp": m.remap(getItem("minecraft:sea_lantern")); break; - case "botania:prismarine0Stairs": if (quark) m.remap(getItem("quark:prismarine_stairs")); else m.warn(); break; - case "botania:prismarine0Slab": if (quark) m.remap(getItem("quark:prismarine_slab")); else m.warn(); break; - case "botania:prismarine0Wall": if (quark) m.remap(getItem("quark:prismarine_rough_wall")); else m.warn(); break; - case "botania:prismarine1Stairs": if (quark) m.remap(getItem("quark:prismarine_bricks_stairs")); else m.warn(); break; - case "botania:prismarine1Slab": if (quark) m.remap(getItem("quark:prismarine_bricks_slab")); else m.warn(); break; - case "botania:prismarine2Stairs": if (quark) m.remap(getItem("quark:prismarine_dark_stairs")); else m.warn(); break; - case "botania:prismarine2Slab": if (quark) m.remap(getItem("quark:prismarine_dark_slab")); else m.warn(); break; - } - } - } - - private static Block getBlock(String name) { - return Block.blockRegistry.getObject(new ResourceLocation(name)); - } - - private static Item getItem(String name) { - return Item.itemRegistry.getObject(new ResourceLocation(name)); - } - - private Remapper() {} - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index b95f4eb51..7dd2d6b57 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -325,6 +325,12 @@ public final class ModCraftingRecipes { // The future is now (botania -> vanilla recipes for future added items and blocks) addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10)); + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); + addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); + + addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp)); + addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); @@ -2175,6 +2181,12 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab); addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab); addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab); + addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); + addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); + addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); + addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); + addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); + addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab); addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab); addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab); @@ -2190,6 +2202,8 @@ public final class ModCraftingRecipes { addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0); addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0); addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0); + addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); + addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0); for(int i = 0; i < 8; i++) addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); From 55262cd4e57f811ba21eb488d36c9f4da3b21ec8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 20:03:31 -0500 Subject: [PATCH 544/935] Update nag message, add migration recipes for everything --- .../java/vazkii/botania/common/Botania.java | 6 +- .../common/core/proxy/CommonProxy.java | 2 + .../common/crafting/ModCraftingRecipes.java | 16 -- .../common/crafting/ModMigrationRecipes.java | 144 ++++++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 5 +- 5 files changed, 152 insertions(+), 21 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 17669e471..69e897c3c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -54,6 +54,7 @@ public class Botania { public static boolean etFuturumLoaded = false; public static boolean rfApiLoaded = false; public static boolean storageDrawersLoaded = false; + public static boolean quarkLoaded = false; public static ILightHelper lightHelper; @@ -73,6 +74,7 @@ public class Botania { coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); + quarkLoaded = Loader.isModLoaded("Quark"); storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); @@ -86,13 +88,13 @@ public class Botania { public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) { EntityPlayer player = evt.player; - ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.nag"); + ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.warnRemove"); message.setStyle(new Style().setColor(TextFormatting.RED)); ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report"); message2.setStyle(new Style().setColor(TextFormatting.YELLOW)); - ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues"); + ITextComponent url = new TextComponentString(" https://github.com/williewillus/Botania/issues"); url.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); url.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 504e34340..b92c50fcb 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -71,6 +71,7 @@ import vazkii.botania.common.crafting.ModElvenTradeRecipes; import vazkii.botania.common.crafting.ModManaAlchemyRecipes; import vazkii.botania.common.crafting.ModManaConjurationRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; +import vazkii.botania.common.crafting.ModMigrationRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModPureDaisyRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; @@ -121,6 +122,7 @@ public class CommonProxy { public void init(FMLInitializationEvent event) { ModCraftingRecipes.init(); + ModMigrationRecipes.init(); ModPetalRecipes.init(); ModPureDaisyRecipes.init(); ModRuneRecipes.init(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 7dd2d6b57..09f2b406f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -322,22 +322,6 @@ public final class ModCraftingRecipes { public static void init() { int recipeListSize = CraftingManager.getInstance().getRecipeList().size(); - // The future is now (botania -> vanilla recipes for future added items and blocks) - addShapelessOreDictRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(ModItems.manaResource, 1, 10)); - - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 0), new ItemStack(ModBlocks.prismarine, 1, 0)); - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 1), new ItemStack(ModBlocks.prismarine, 1, 1)); - addShapelessOreDictRecipe(new ItemStack(Blocks.prismarine, 1, 2), new ItemStack(ModBlocks.prismarine, 1, 2)); - - addShapelessOreDictRecipe(new ItemStack(Blocks.sea_lantern), new ItemStack(ModBlocks.seaLamp)); - - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE.ordinal())); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_GRANITE.ordinal())); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE.ordinal())); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 4), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_DIORITE.ordinal())); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE.ordinal())); - addShapelessOreDictRecipe(new ItemStack(Blocks.stone, 1, 6), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_ANDESITE.ordinal())); - // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); recipeLexicon = BotaniaAPI.getLatestAddedRecipe(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java new file mode 100644 index 000000000..853dd8f83 --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -0,0 +1,144 @@ +package vazkii.botania.common.crafting; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.api.state.enums.FutureStoneVariant; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.item.ModItems; + +/** + * Migration recipes for things that will be removed in the future + */ +public final class ModMigrationRecipes { + + public static void init() { + 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)); + + // Prismarine -> quark + if (quark) { + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_rough_wall")), new ItemStack(ModFluffBlocks.prismarineWall)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_stairs")), new ItemStack(ModFluffBlocks.prismarineStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab)); + } + + // 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)); + + // End stuff -> quark + if (quark) { + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_stairs")), new ItemStack(ModFluffBlocks.endStoneStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_slab")), new ItemStack(ModFluffBlocks.endStoneSlab)); + // todo End stone chiseled brick? (not in quark) + } + + // 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())); + + if (quark) { + // Andesite rough stairs and slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[0])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[0])); + // Andesite bricks, brick stairs, brick slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4])); + // todo Andesite chiseled brick? (not in quark) + // Andesite wall + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal())); + } + + if (quark) { + // Basalt normal + polished -> quark + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt")), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_BASALT.ordinal())); + // Basalt rough stairs and slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[1])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[1])); + // Basalt bricks, brick stairs, brick slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5])); + // todo Basalt chiseled brick? (not in quark) + // Basalt wall + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal())); + } + + // 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())); + + if (quark) { + // Diorite rough stairs and slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[2])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[2])); + // Diorite bricks, brick stairs, brick slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6])); + // todo Diorite chiseled brick? (not in quark) + // Diorite wall + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal())); + } + + // 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())); + + if (quark) { + // Granite rough stairs and slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[3])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[3])); + // Granite bricks, brick stairs, brick slab + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal())); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7])); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7])); + // todo Granite chiseled brick? (not in quark) + // Granite wall + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal())); + } + + // Thatch + if (quark) { + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch")), new ItemStack(ModBlocks.thatch)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_slab")), new ItemStack(ModFluffBlocks.thatchSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_stairs")), new ItemStack(ModFluffBlocks.thatchStairs)); + } + + // Reeds + if (quark) { + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block")), new ItemStack(ModBlocks.reedBlock)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_slab")), new ItemStack(ModFluffBlocks.reedSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_stairs")), new ItemStack(ModFluffBlocks.reedStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_wall")), new ItemStack(ModFluffBlocks.reedWall)); + } + } + + private static Block findQuarkBlock(String name) { + return Block.blockRegistry.getObject(new ResourceLocation("Quark", name)); + } + + private ModMigrationRecipes() {} + +} diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 6e0e3e27e..885c76b8b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -6,9 +6,8 @@ generator.botania-skyblock.info=Not recommended for botania newcomers # Something that is not localized, translators, do NOT change this line. botaniamisc.noloc=botaniamisc.noloc -# todo 1.8 remove when merging into master -botaniamisc.unofficial.nag=WARNING !!!!! This port of Botania is UNOFFICIAL! Do NOT report bugs to Vazkii!!! -botaniamisc.unofficial.report=Report issues to the porter HERE: +botaniamisc.unofficial.warnRemove=[Botania] Warning: Some decorative blocks are being removed, please migrate to either the vanilla or Quark versions. +botaniamisc.unofficial.report=[Botania] This port is unofficial! Report issues to the porter HERE: botaniamisc.nextPage=Next Page botaniamisc.prevPage=Previous Page From a838427df8114ee7a4910bcc24759f3bd66c7884 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 20:32:17 -0500 Subject: [PATCH 545/935] Finalized migration mechanisms --- .../botania/common/block/ModBlocks.java | 4 - .../common/core/BotaniaCreativeTab.java | 18 --- .../common/crafting/ModCraftingRecipes.java | 105 +++--------------- .../common/crafting/ModMigrationRecipes.java | 4 +- .../botania/common/lexicon/LexiconData.java | 17 +-- 5 files changed, 19 insertions(+), 129 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 10a446f13..26f9174d4 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -378,12 +378,8 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i)); } - OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(prismarine, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); - for(int i = 0; i < 16; i++) - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[i], new ItemStack(ModFluffBlocks.stone, 1, i)); - // Vanilla OreDict entries OreDictionary.registerOre("dirt", Blocks.dirt); OreDictionary.registerOre("grass", Blocks.grass); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7fb00336f..4d207fa4e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -303,26 +303,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); - addBlock(ModBlocks.prismarine); - addBlock(ModBlocks.seaLamp); - addBlock(ModFluffBlocks.prismarineStairs); - addBlock(ModFluffBlocks.prismarineSlab); - addBlock(ModFluffBlocks.prismarineWall); - addBlock(ModFluffBlocks.prismarineBrickStairs); - addBlock(ModFluffBlocks.prismarineBrickSlab); - addBlock(ModFluffBlocks.darkPrismarineStairs); - addBlock(ModFluffBlocks.darkPrismarineSlab); - addBlock(ModBlocks.blazeBlock); - addBlock(ModBlocks.reedBlock); - addBlock(ModFluffBlocks.reedStairs); - addBlock(ModFluffBlocks.reedSlab); - addBlock(ModFluffBlocks.reedWall); - addBlock(ModBlocks.thatch); - addBlock(ModFluffBlocks.thatchStairs); - addBlock(ModFluffBlocks.thatchSlab); - addBlock(ModBlocks.customBrick); addBlock(ModFluffBlocks.netherBrickStairs); addBlock(ModFluffBlocks.netherBrickSlab); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 09f2b406f..533dcdbc8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -188,8 +188,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeSpawnerClaw; public static IRecipe recipeCraftCrate; public static IRecipe recipePlaceholder; - public static IRecipe recipeReedBlock; - public static IRecipe recipeThatch; public static IRecipe recipeNetherBrick; public static IRecipe recipeSoulBrick; public static IRecipe recipeSnowBrick; @@ -247,10 +245,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeCorporeaIndex; public static IRecipe recipeCorporeaFunnel; public static IRecipe recipeCorporeaInterceptor; - public static IRecipe recipeEndStoneBricks; - public static IRecipe recipeEndStoneChiseledBricks; - public static IRecipe recipeEnderBricks; - public static IRecipe recipePillarEnderBricks; public static IRecipe recipeLivingwoodBow; public static IRecipe recipeCrystalBow; public static List recipesCosmeticItems; @@ -264,7 +258,6 @@ public final class ModCraftingRecipes { public static List recipesPetalsDouble; public static IRecipe recipeKeepIvy; public static IRecipe recipeBlackHoleTalisman; - public static List recipe18StoneBrick; public static List recipe18StoneChisel; public static IRecipe recipeBlazeBlock; public static List recipesAltarMeta; @@ -1249,18 +1242,6 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "craftingTableWood", LibOreDict.LIVING_ROCK); recipePlaceholder = BotaniaAPI.getLatestAddedRecipe(); - // Reed Block Recipe - GameRegistry.addRecipe(new ItemStack(ModBlocks.reedBlock), - "rrr", "rrr", "rrr", - 'r', new ItemStack(Items.reeds)); - recipeReedBlock = BotaniaAPI.getLatestAddedRecipe(); - - // Thatch Recipe - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.thatch), - "ww", "ww", - 'w', "cropWheat")); - recipeThatch = BotaniaAPI.getLatestAddedRecipe(); - // Nether Brick Recipe GameRegistry.addRecipe(new ItemStack(ModBlocks.customBrick, 4, 0), " B ", "BSB", " B ", @@ -1682,30 +1663,6 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModBlocks.corporeaInterceptor), "blockRedstone", new ItemStack(ModItems.corporeaSpark)); recipeCorporeaInterceptor = BotaniaAPI.getLatestAddedRecipe(); - // End Stone Brick Recipes - if(ConfigHandler.enderStuff19Enabled) { - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4), - "SS", "SS", - 'S', new ItemStack(Blocks.end_stone)); - recipeEndStoneBricks = BotaniaAPI.getLatestAddedRecipe(); - - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 1, 1), - "S", "S", - 'S', new ItemStack(ModFluffBlocks.endStoneSlab)); - recipeEndStoneChiseledBricks = BotaniaAPI.getLatestAddedRecipe(); - - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 4, 2), - " B ", "BPB", " B ", - 'B', new ItemStack(ModBlocks.endStoneBrick), - 'P', new ItemStack(Items.ender_pearl)); - recipeEnderBricks = BotaniaAPI.getLatestAddedRecipe(); - - GameRegistry.addRecipe(new ItemStack(ModBlocks.endStoneBrick, 2, 3), - "B", "B", - 'B', new ItemStack(ModBlocks.endStoneBrick, 1, 2)); - recipePillarEnderBricks = BotaniaAPI.getLatestAddedRecipe(); - } - // Livingwood Bow Recipe addOreDictRecipe(new ItemStack(ModItems.livingwoodBow), " TS", "T S", " TS", @@ -1788,19 +1745,23 @@ public final class ModCraftingRecipes { 'A', LibOreDict.ENDER_AIR_BOTTLE); recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); - // 1.8 Stone Recipes - recipe18StoneBrick = new ArrayList<>(); - recipe18StoneChisel = new ArrayList<>(); - for(int i = 0; i < 4; i++) { - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8), - "SS", "SS", - 'S', LibOreDict.STONE_18_VARIANTS[i]); - recipe18StoneBrick.add(BotaniaAPI.getLatestAddedRecipe()); + // 1.8 Stone Chiseling + // todo remove when Quark adds these? + 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), + }; - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), - "SS", "SS", - 'S', new ItemStack(ModFluffBlocks.stone, 1, i + 8)); - recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); + for(int i = 0; i < 4; i++) { + addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), + "SS", "SS", + 'S', quarkBlocks[i]); + recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); + } } // Blaze Light Recipe @@ -2165,20 +2126,10 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.livingrock, 1, ModFluffBlocks.livingrockBrickStairs, ModFluffBlocks.livingrockBrickSlab); addStairsAndSlabs(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodStairs, ModFluffBlocks.dreamwoodSlab); addStairsAndSlabs(ModBlocks.dreamwood, 1, ModFluffBlocks.dreamwoodPlankStairs, ModFluffBlocks.dreamwoodPlankSlab); - addStairsAndSlabs(Blocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); - addStairsAndSlabs(Blocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); - addStairsAndSlabs(Blocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); - addStairsAndSlabs(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineStairs, ModFluffBlocks.prismarineSlab); - addStairsAndSlabs(ModBlocks.prismarine, 1, ModFluffBlocks.prismarineBrickStairs, ModFluffBlocks.prismarineBrickSlab); - addStairsAndSlabs(ModBlocks.prismarine, 2, ModFluffBlocks.darkPrismarineStairs, ModFluffBlocks.darkPrismarineSlab); - addStairsAndSlabs(ModBlocks.reedBlock, 0, ModFluffBlocks.reedStairs, ModFluffBlocks.reedSlab); - addStairsAndSlabs(ModBlocks.thatch, 0, ModFluffBlocks.thatchStairs, ModFluffBlocks.thatchSlab); addStairsAndSlabs(ModBlocks.customBrick, 0, ModFluffBlocks.netherBrickStairs, ModFluffBlocks.netherBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 1, ModFluffBlocks.soulBrickStairs, ModFluffBlocks.soulBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab); - addStairsAndSlabs(ModBlocks.endStoneBrick, 0, ModFluffBlocks.endStoneStairs, ModFluffBlocks.endStoneSlab); - addStairsAndSlabs(ModBlocks.endStoneBrick, 2, ModFluffBlocks.enderBrickStairs, ModFluffBlocks.enderBrickSlab); addStairsAndSlabs(ModBlocks.shimmerrock, 0, ModFluffBlocks.shimmerrockStairs, ModFluffBlocks.shimmerrockSlab); addStairsAndSlabs(ModBlocks.shimmerwoodPlanks, 0, ModFluffBlocks.shimmerwoodPlankStairs, ModFluffBlocks.shimmerwoodPlankSlab); @@ -2186,17 +2137,9 @@ public final class ModCraftingRecipes { addWall(ModBlocks.livingrock, 0, ModFluffBlocks.livingrockWall, 0); addWall(ModBlocks.livingwood, 0, ModFluffBlocks.livingwoodWall, 0); addWall(ModBlocks.dreamwood, 0, ModFluffBlocks.dreamwoodWall, 0); - addWall(Blocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); - addWall(ModBlocks.prismarine, 0, ModFluffBlocks.prismarineWall, 0); - addWall(ModBlocks.reedBlock, 0, ModFluffBlocks.reedWall, 0); for(int i = 0; i < 8; i++) addWall(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneWall, i); - addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[0], ModFluffBlocks.stoneWall, 0); // Andesite - addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stoneWall, 1); // Basalt - addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[2], ModFluffBlocks.stoneWall, 2); // Diorite - addWallWithOreDict(LibOreDict.STONE_18_VARIANTS[3], ModFluffBlocks.stoneWall, 3); // Granite - // Pane Recipes addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane); addPane(ModBlocks.elfGlass, ModFluffBlocks.alfglassPane); @@ -2212,27 +2155,11 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); } - // Andesite Basalt Diorite Granite Stair/Slab - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[0], Blocks.stone, 5, ModFluffBlocks.stoneStairs[0], ModFluffBlocks.stoneSlabs[0]); - - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[1], ModFluffBlocks.stone, 1, ModFluffBlocks.stoneStairs[1], ModFluffBlocks.stoneSlabs[1]); - - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[2], Blocks.stone, 3, ModFluffBlocks.stoneStairs[2], ModFluffBlocks.stoneSlabs[2]); - - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[3], Blocks.stone, 1, ModFluffBlocks.stoneStairs[3], ModFluffBlocks.stoneSlabs[3]); - - // Andesite Basalt Diorite Granite Bricks Stair/Slab - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[8], ModFluffBlocks.stone, 8, ModFluffBlocks.stoneStairs[4], ModFluffBlocks.stoneSlabs[4]); - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[9], ModFluffBlocks.stone, 9, ModFluffBlocks.stoneStairs[5], ModFluffBlocks.stoneSlabs[5]); - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[10], ModFluffBlocks.stone, 10, ModFluffBlocks.stoneStairs[6], ModFluffBlocks.stoneSlabs[6]); - addStairsAndSlabsWithOredict(LibOreDict.STONE_18_VARIANTS[11], ModFluffBlocks.stone, 11, ModFluffBlocks.stoneStairs[7], ModFluffBlocks.stoneSlabs[7]); - // Pavement Stairsm & Stairs for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]); // Misc Recipes - GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock)); GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch)); if(Botania.gardenOfGlassLoaded) diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 853dd8f83..4429ddc7d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -34,8 +34,8 @@ public final class ModMigrationRecipes { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab)); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs)); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("dark_prismarine_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs)); + GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab)); } // End stuff -> vanilla diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 95538e4e3..acf56a7c9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1112,15 +1112,6 @@ public final class LexiconData { corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); - if (ConfigHandler.enderStuff19Enabled) { - endStoneDecor = new BLexiconEntry(LibLexicon.ENDER_END_STONE_DECOR, categoryEnder); - endStoneDecor.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeEndStoneBricks), - new PageCraftingRecipe("2", ModCraftingRecipes.recipeEndStoneChiseledBricks), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeEnderBricks), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePillarEnderBricks)); - } - spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); @@ -1354,8 +1345,6 @@ public final class LexiconData { new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"), - new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock), - new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch), new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), @@ -1376,8 +1365,6 @@ public final class LexiconData { new PageCraftingRecipe("14", ModCraftingRecipes.recipesLavenderQuartz), new PageCraftingRecipe("15", ModCraftingRecipes.recipeRedQuartz), new PageCraftingRecipe("23", ModCraftingRecipes.recipeSunnyQuartz), new PageText("16"), - new PageCraftingRecipe("17", ModCraftingRecipes.recipeReedBlock), - new PageCraftingRecipe("18", ModCraftingRecipes.recipeThatch), new PageCraftingRecipe("19", ModCraftingRecipes.recipeRoofTile), new PageCraftingRecipe("20", ModCraftingRecipes.recipeNetherBrick), new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), @@ -1428,9 +1415,7 @@ public final class LexiconData { if (ConfigHandler.stones18Enabled) { stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); stoneAlchemy.setLexiconPages(new PageText("0"), - new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes), - new PageCraftingRecipe("2", ModCraftingRecipes.recipe18StoneBrick), - new PageCraftingRecipe("3", ModCraftingRecipes.recipe18StoneChisel)); + new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes)); } blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); From 5d5109d6d1f0568b9a38884fe01f2bc68b2a1b62 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 20:41:51 -0500 Subject: [PATCH 546/935] Fix some items not being colored. Closes #240 --- .../java/vazkii/botania/client/core/handler/ColorHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a1dcc21c..49f5ff7af 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -104,7 +104,7 @@ public final class ColorHandler { return 0xFFFFFF; } } - }, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, + }, ModItems.manaResource, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader)); From d34e3453fefc3f14b7bd83406012b17f23189a54 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 20:49:27 -0500 Subject: [PATCH 547/935] Fix bow not being able to fire, Closes #238 --- .../common/item/equipment/tool/bow/ItemLivingwoodBow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f9af5eb2b..b7fc02440 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 @@ -87,9 +87,9 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { ActionResult ret = ForgeEventFactory.onArrowNock(stack, world, player, hand, flag); if (ret != null) return ret; - if (!player.capabilities.isCreativeMode) + if (!player.capabilities.isCreativeMode && !flag) { - return !flag ? new ActionResult<>(EnumActionResult.FAIL, stack) : new ActionResult<>(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.FAIL, stack); } else { From b32f834a73b42397a84a2fea3ae7c022682de74d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 20:53:12 -0500 Subject: [PATCH 548/935] Go back to meta for now, should close #183 --- .../botania/common/block/tile/mana/TileSpreader.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 0357c2e35..08012084c 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 @@ -449,16 +449,19 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public boolean isRedstone() { - return worldObj == null ? staticRedstone : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.REDSTONE; + updateContainingBlockInfo(); + return worldObj == null ? staticRedstone : getBlockMetadata() == SpreaderVariant.REDSTONE.ordinal(); } public boolean isDreamwood() { - SpreaderVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT); - return worldObj == null ? staticDreamwood : variant == SpreaderVariant.ELVEN || variant == SpreaderVariant.GAIA; + updateContainingBlockInfo(); + int variant = getBlockMetadata(); + return worldObj == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal() || variant == SpreaderVariant.GAIA.ordinal(); } public boolean isULTRA_SPREADER() { - return worldObj == null ? staticUltra : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT) == SpreaderVariant.GAIA; + updateContainingBlockInfo(); + return worldObj == null ? staticUltra : getBlockMetadata() == SpreaderVariant.GAIA.ordinal(); } public void checkForReceiver() { From af5e9f7751abf86ab040e2882698a4e61c16066b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Apr 2016 21:28:27 -0500 Subject: [PATCH 549/935] Fix grisaia crash. Closes #242 --- .../vazkii/botania/common/item/relic/ItemInfiniteFruit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 9f1ca3d0e..d4042cd99 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -61,7 +61,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { if(count == 5) if(player.canEat(false)) - ReflectionHelper.setPrivateValue(EntityPlayer.class, player, 20, LibObfuscation.ITEM_IN_USE_COUNT); + ReflectionHelper.setPrivateValue(EntityLivingBase.class, player, 20, LibObfuscation.ITEM_IN_USE_COUNT); } } From b0906224776047278e2ba3ecbd43d7fdbe8f913d Mon Sep 17 00:00:00 2001 From: Wire Segal Date: Sun, 17 Apr 2016 23:07:41 -0400 Subject: [PATCH 550/935] Add a ManaUpgradeRecipe. (#218) third pr for recipes, yay --- .../common/crafting/ModCraftingRecipes.java | 13 +++--- .../crafting/recipe/ManaUpgradeRecipe.java | 44 +++++++++++++++++++ .../recipe/ShapelessManaUpgradeRecipe.java | 28 ++++++++++++ 3 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java create mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 533dcdbc8..af3d54972 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -28,13 +28,14 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.logging.log4j.Level; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; +import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe; +import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; @@ -741,10 +742,10 @@ public final class ModCraftingRecipes { recipeTinyPlanet = BotaniaAPI.getLatestAddedRecipe(); // Mana Band Recipe - addOreDictRecipe(new ItemStack(ModItems.manaRing), + GameRegistry.addRecipe(new ManaUpgradeRecipe(new ItemStack(ModItems.manaRing), "TI ", "I I", " I ", 'T', new ItemStack(ModItems.manaTablet, 1, Short.MAX_VALUE), - 'I', LibOreDict.MANA_STEEL); + 'I', LibOreDict.MANA_STEEL)); recipeManaRing = BotaniaAPI.getLatestAddedRecipe(); // Aura Band Recipe @@ -755,7 +756,7 @@ public final class ModCraftingRecipes { recipeAuraRing = BotaniaAPI.getLatestAddedRecipe(); // Greater Mana Band Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.manaRingGreater), LibOreDict.TERRA_STEEL, new ItemStack(ModItems.manaRing)); + GameRegistry.addRecipe(new ShapelessManaUpgradeRecipe(new ItemStack(ModItems.manaRingGreater), LibOreDict.TERRA_STEEL, new ItemStack(ModItems.manaRing, 1, Short.MAX_VALUE))); recipeGreaterManaRing = BotaniaAPI.getLatestAddedRecipe(); // Greater Aura Band Recipe @@ -873,11 +874,11 @@ public final class ModCraftingRecipes { recipeMagnetRing = BotaniaAPI.getLatestAddedRecipe(); // Terra Shatterer Recipe - addOreDictRecipe(new ItemStack(ModItems.terraPick), + GameRegistry.addRecipe(new ManaUpgradeRecipe(new ItemStack(ModItems.terraPick), "ITI", "ILI", " L ", 'T', new ItemStack(ModItems.manaTablet, 1, Short.MAX_VALUE), 'I', LibOreDict.TERRA_STEEL, - 'L', LibOreDict.LIVINGWOOD_TWIG); + 'L', LibOreDict.LIVINGWOOD_TWIG)); recipeTerraPick = BotaniaAPI.getLatestAddedRecipe(); // Charm of the Diva Recipe diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java new file mode 100644 index 000000000..b34cbd3bd --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -0,0 +1,44 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 4, 2016, 1:16:22 PM (EST)] + */ +package vazkii.botania.common.crafting.recipe; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import vazkii.botania.api.mana.IManaItem; + +public class ManaUpgradeRecipe extends ShapedOreRecipe { + public ManaUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } + + public static ItemStack output(ItemStack output, InventoryCrafting var1) { + ItemStack out = output.copy(); + if (!(out.getItem() instanceof IManaItem)) + return out; + IManaItem outItem = (IManaItem) out.getItem(); + for (int i = 0; i < var1.getSizeInventory(); i++) { + ItemStack stack = var1.getStackInSlot(i); + if (stack != null) { + if (stack.getItem() instanceof IManaItem) { + IManaItem item = (IManaItem) stack.getItem(); + outItem.addMana(out, item.getMana(stack)); + } + } + } + return out; + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + return output(output, var1); + } +} diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java new file mode 100644 index 000000000..7be988dcd --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -0,0 +1,28 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 4, 2016, 1:20:34 PM (EST)] + */ +package vazkii.botania.common.crafting.recipe; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import vazkii.botania.api.mana.IManaItem; + +public class ShapelessManaUpgradeRecipe extends ShapelessOreRecipe { + public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { + super(output, inputs); + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + return ManaUpgradeRecipe.output(output, var1); + } +} From 2ad607bff33e04f8d6d12ed0e224e41b7f3d0694 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Apr 2016 19:39:24 -0500 Subject: [PATCH 551/935] Show all buffs on first row --- .../java/vazkii/botania/common/brew/potion/PotionAllure.java | 1 + .../vazkii/botania/common/brew/potion/PotionBloodthirst.java | 1 + .../java/vazkii/botania/common/brew/potion/PotionEmptiness.java | 1 + .../vazkii/botania/common/brew/potion/PotionFeatherfeet.java | 1 + .../java/vazkii/botania/common/brew/potion/PotionSoulCross.java | 1 + 5 files changed, 5 insertions(+) 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 04e478003..f0da28fd7 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -23,6 +23,7 @@ public class PotionAllure extends PotionMod { public PotionAllure() { super(LibPotionNames.ALLURE, false, 0x0034E4, 5); MinecraftForge.EVENT_BUS.register(this); + setShowOnFirstRow(); } @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 68965940a..c8729d169 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -27,6 +27,7 @@ public class PotionBloodthirst extends PotionMod { public PotionBloodthirst() { super(LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); MinecraftForge.EVENT_BUS.register(this); + setShowOnFirstRow(); } @SubscribeEvent 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 57498630d..8756d10b0 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -26,6 +26,7 @@ public class PotionEmptiness extends PotionMod { public PotionEmptiness() { super(LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); MinecraftForge.EVENT_BUS.register(this); + setShowOnFirstRow(); } @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 bc3338f81..be80b2f60 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -21,6 +21,7 @@ public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); MinecraftForge.EVENT_BUS.register(this); + setShowOnFirstRow(); } @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 17ebabd27..7f16cd878 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -22,6 +22,7 @@ public class PotionSoulCross extends PotionMod { public PotionSoulCross() { super(LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); MinecraftForge.EVENT_BUS.register(this); + setShowOnFirstRow(); } @SubscribeEvent From be155e0abb3166487d9089f9232e2c2885e2bbf1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Apr 2016 19:47:48 -0500 Subject: [PATCH 552/935] Tweak lexicon hud, closes #241 --- .../java/vazkii/botania/client/core/handler/HUDHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index eb1e4b90a..9c265d5ee 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -384,8 +384,8 @@ public final class HUDHandler { mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), sx, sy); GlStateManager.disableLighting(); - font.drawStringWithShadow(drawStr, sx + 10, sy + 8, 0xFFFFFFFF); - font.drawStringWithShadow(secondLine, sx + 10, sy + 18, 0xFFAAAAAA); + font.drawStringWithShadow(drawStr, sx + 20, sy + 4, 0xFFFFFFFF); + font.drawStringWithShadow(secondLine, sx + 20, sy + 14, 0xFFAAAAAA); if(!mc.thePlayer.isSneaking()) { GlStateManager.scale(0.5F, 0.5F, 1F); From 16f628984492769d15eb4d15ca0ce96e07a1316b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Apr 2016 16:02:02 -0500 Subject: [PATCH 553/935] Fix dupe dropping with psi. Closes #250 --- .../common/block/BlockCacophonium.java | 19 +++++++++++--- .../block/BlockFloatingSpecialFlower.java | 24 +++++++++++++++--- .../common/block/BlockSpecialFlower.java | 25 ++++++++++++++++--- .../common/block/decor/BlockTinyPotato.java | 19 +++++++++++--- 4 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index dab8219cf..4d83eab05 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -76,9 +76,22 @@ public class BlockCacophonium extends BlockMod { } @Override - public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, pos, state, 0); + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + // Copy of super.removedByPlayer but don't set to air yet + // This is so getDrops below will have a TE to work with + onBlockHarvested(world, pos, state, player); + return true; + } else { + return super.removedByPlayer(state, world, pos, player, willHarvest); + } + } + + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + super.harvestBlock(world, player, pos, state, te, stack); + // Now delete the block and TE + world.setBlockToAir(pos); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 632483c33..12d889143 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -138,13 +138,29 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, pos, state, 0); - ((TileSpecialFlower) par1World.getTileEntity(pos)).onBlockHarvested(par1World, pos, state, par6EntityPlayer); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + // Copy of super.removedByPlayer but don't set to air yet + // This is so getDrops below will have a TE to work with + onBlockHarvested(world, pos, state, player); + return true; + } else { + return super.removedByPlayer(state, world, pos, player, willHarvest); } } + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + super.harvestBlock(world, player, pos, state, te, stack); + // Now delete the block and TE + world.setBlockToAir(pos); + } + @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index acf05da63..53ba12318 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -233,13 +233,29 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, pos, state, 0); - ((TileSpecialFlower) par1World.getTileEntity(pos)).onBlockHarvested(par1World, pos, state, par6EntityPlayer); + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + ((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + // Copy of super.removedByPlayer but don't set to air yet + // This is so getDrops below will have a TE to work with + onBlockHarvested(world, pos, state, player); + return true; + } else { + return super.removedByPlayer(state, world, pos, player, willHarvest); } } + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + super.harvestBlock(world, player, pos, state, te, stack); + // Now delete the block and TE + world.setBlockToAir(pos); + } + @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); @@ -298,6 +314,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); if(newColor != oldColor) world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2); + return true; } return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); 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 11a25a437..832e318b1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -110,9 +110,22 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, pos, state, 0); + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + // Copy of super.removedByPlayer but don't set to air yet + // This is so getDrops below will have a TE to work with + onBlockHarvested(world, pos, state, player); + return true; + } else { + return super.removedByPlayer(state, world, pos, player, willHarvest); + } + } + + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + super.harvestBlock(world, player, pos, state, te, stack); + // Now delete the block and TE + world.setBlockToAir(pos); } @Override From 5d1829a00e8ad8e704c0c33d87b002647a956b1d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Apr 2016 18:44:32 -0500 Subject: [PATCH 554/935] Camo block now respects directional blocks. Closes #110 --- build.properties | 8 ++-- .../botania/common/block/BlockCamo.java | 41 +++++++------------ version/1.9.txt | 2 +- web/versions.ini | 3 +- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/build.properties b/build.properties index 909aa18bd..c1aa7139e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Apr 13 10:09:00 CDT 2016 +#Sat Apr 23 16:25:06 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1865-1.9 -mc_version=1.9 dir_repo=./ -build_number=302 +mc_version=1.9 +forge_version=12.16.0.1865-1.9 +build_number=303 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index d0fa7d677..3d3b0b3f3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,6 +26,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCamo; +import java.util.ArrayList; +import java.util.List; + public abstract class BlockCamo extends BlockMod { protected BlockCamo(Material par2Material, String name) { @@ -36,37 +40,20 @@ public abstract class BlockCamo extends BlockMod { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing par6, float par7, float par8, float par9) { + @SuppressWarnings("unchecked") + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity tile = par1World.getTileEntity(pos); - if(tile instanceof TileCamo) { + if(par1World.isRemote) + return true; + + if(currentStack != null + && Block.getBlockFromItem(currentStack.getItem()) != null + && tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; + IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(par1World, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), par5EntityPlayer); - if(currentStack == null) - currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); - - boolean doChange = true; - IBlockState testState = null; - checkChange : { - if(currentStack.getItem() != Item.getItemFromBlock(Block.getBlockFromName("air"))) { - if(Item.getIdFromItem(currentStack.getItem()) == 0) { - doChange = false; - break checkChange; - } - - testState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(testState == null || !isValidBlock(testState) || testState.getBlock() instanceof BlockCamo || testState.getMaterial() == Material.air) - doChange = false; - } - } - - if(doChange && currentStack.getItem() != null) { - IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateFromMeta(currentStack.getItemDamage()); - if(testState.getBlock() instanceof BlockDirectional) { - if (BlockDirectional.FACING.getAllowedValues().contains(par6.getOpposite())) { - changeState = changeState.withProperty(BlockDirectional.FACING, par6.getOpposite()); - } - } + if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.air) { camo.camoState = changeState; par1World.notifyBlockUpdate(pos, state, state, 8); diff --git a/version/1.9.txt b/version/1.9.txt index 0e6a396d1..91aa6a95e 100644 --- a/version/1.9.txt +++ b/version/1.9.txt @@ -1 +1 @@ -r1.8-301 \ No newline at end of file +r1.8-302 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 98a9afd3d..ac21559e6 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -250,4 +250,5 @@ r1.8-249=1.7.10 r1.8-299=1.8.9 r1.8-299=1.8.9 r1.8-300=1.9 -r1.8-301=1.9 \ No newline at end of file +r1.8-301=1.9 +r1.8-302=1.9 \ No newline at end of file From 6d350451fc4d9c2b2b821bdb86bf2e83f82369dc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Apr 2016 21:05:11 -0500 Subject: [PATCH 555/935] Some sound subtitles --- src/main/resources/assets/botania/lang/en_US.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 885c76b8b..a9d5048e1 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3871,7 +3871,7 @@ botania.subtitle.dash=Player dashes forward botania.subtitle.ding=Wand of the Forest dings botania.subtitle.divaCharm=todo botania.subtitle.divinationRod=todo -botania.subtitle.doit=JUST DO IT!! +botania.subtitle.doit=DO IT!! botania.subtitle.enchanterBlock=todo botania.subtitle.enchanterEnchant=Mana Enchanter finishes botania.subtitle.endoflame=Endoflame ignites item @@ -3885,17 +3885,17 @@ botania.subtitle.lexiconPage=Lexica Botania page turns botania.subtitle.lightRelay=Luminizer whooshes botania.subtitle.manaBlaster=Mana Blaster fires botania.subtitle.manaPoolCraft=Mana Pool infuses -botania.subtitle.missile=todo -botania.subtitle.orechid=todo +botania.subtitle.missile=Magic Missile is fired +botania.subtitle.orechid=Stone transforms into ore botania.subtitle.potionCreate=Brewery finishes botania.subtitle.runeAltarCraft=Runic Altar finishes botania.subtitle.runeAltarStart=Runic Altar starts botania.subtitle.spreaderFire=Spreader shoots mana botania.subtitle.starcaller=Stars descend from the sky botania.subtitle.terraBlade=todo -botania.subtitle.terraformRod=todo +botania.subtitle.terraformRod=Land is terrraformed botania.subtitle.terraPickMode=Terrasteel Pick powers up botania.subtitle.terrasteelCraft=Terrasteel finishes -botania.subtitle.thermalily=todo +botania.subtitle.thermalily=Thermalily consumes lava botania.subtitle.unholyCloak=todo -botania.subtitle.way=todo \ No newline at end of file +botania.subtitle.way=And his name is.... JOHN CENA!!! \ No newline at end of file From f8d18ae76925b6c951aba282ddf2af2ac56adf7d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Apr 2016 22:03:27 -0500 Subject: [PATCH 556/935] All other sound subtitles --- .../botania/api/sound/BotaniaSoundEvents.java | 3 ++- .../common/block/tile/TileEnchanter.java | 2 +- .../botania/common/core/handler/ModSounds.java | 3 ++- .../botania/common/item/ItemTwigWand.java | 2 +- .../resources/assets/botania/lang/en_US.lang | 17 +++++++++-------- src/main/resources/assets/botania/sounds.json | 3 ++- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 80e62e223..655d492fe 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -22,7 +22,8 @@ public final class BotaniaSoundEvents { public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); - public static final SoundEvent enchanterBlock = getRegisteredSoundEvent("botania:enchanterBlock"); + public static final SoundEvent enchanterFade = getRegisteredSoundEvent("botania:enchanterForm"); + public static final SoundEvent enchanterForm = getRegisteredSoundEvent("botania:enchanterFade"); public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); 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 ba3a89227..4aa7ea7ad 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -155,7 +155,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { float blue = (float) Math.random(); Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } - worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 10F); + worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 4d09365f1..311be693d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -21,7 +21,8 @@ public final class ModSounds { "botania:divaCharm", "botania:divinationRod", "botania:doit", - "botania:enchanterBlock", + "botania:enchanterForm", + "botania:enchanterFade", "botania:enchanterEnchant", "botania:endoflame", "botania:equipBauble", diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 98b57cad2..5f836e7dd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -109,7 +109,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null && !par3World.isRemote) { par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSound(null, pos, BotaniaSoundEvents.enchanterBlock, SoundCategory.BLOCKS, 0.5F, 0.6F); + par3World.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a9d5048e1..08ff8eece 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3869,16 +3869,17 @@ botania.subtitle.bifrostRod=Rod of the Bifrost hums botania.subtitle.blackLotus=Black Lotus dissolves botania.subtitle.dash=Player dashes forward botania.subtitle.ding=Wand of the Forest dings -botania.subtitle.divaCharm=todo -botania.subtitle.divinationRod=todo +botania.subtitle.divaCharm=Charm of the Diva echoes +botania.subtitle.divinationRod=Rod of the Plentiful Mantle hums botania.subtitle.doit=DO IT!! -botania.subtitle.enchanterBlock=todo +botania.subtitle.enchanterForm=Mana Enchanter forms +botania.subtitle.enchanterFade=Mana Enchanter fades botania.subtitle.enchanterEnchant=Mana Enchanter finishes botania.subtitle.endoflame=Endoflame ignites item botania.subtitle.equipBauble=Bauble is equipped -botania.subtitle.gaiaTrap=todo -botania.subtitle.goldenLaurel=todo -botania.subtitle.holyCloak=todo +botania.subtitle.gaiaTrap=Gaia Guardian's spell swooshes +botania.subtitle.goldenLaurel=Golden Laurel restores your life +botania.subtitle.holyCloak=Cloak of Virtue activates botania.subtitle.laputaStart=Laputa Shard triggers botania.subtitle.lexiconOpen=Lexica Botania opens botania.subtitle.lexiconPage=Lexica Botania page turns @@ -3892,10 +3893,10 @@ botania.subtitle.runeAltarCraft=Runic Altar finishes botania.subtitle.runeAltarStart=Runic Altar starts botania.subtitle.spreaderFire=Spreader shoots mana botania.subtitle.starcaller=Stars descend from the sky -botania.subtitle.terraBlade=todo +botania.subtitle.terraBlade=Terrasteel Sword actives botania.subtitle.terraformRod=Land is terrraformed botania.subtitle.terraPickMode=Terrasteel Pick powers up botania.subtitle.terrasteelCraft=Terrasteel finishes botania.subtitle.thermalily=Thermalily consumes lava -botania.subtitle.unholyCloak=todo +botania.subtitle.unholyCloak=Cloak of Sin activates botania.subtitle.way=And his name is.... JOHN CENA!!! \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 1cd03c641..0423aaf1e 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -12,7 +12,8 @@ "divaCharm": { "category": "player", "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, "divinationRod": { "category": "player", "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, "doit": { "category": "block", "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, - "enchanterBlock": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterBlock" }, + "enchanterFade": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, + "enchanterForm": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, "enchanterEnchant": { "category": "block", "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, "endoflame": { "category": "block", "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, "equipBauble": { "category": "player", "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, From 543b5a195871600d8b833d52f5c424ce3b56f498 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Apr 2016 17:20:18 -0500 Subject: [PATCH 557/935] Guard against null item stacks in OD -.-. Closes #254 --- .../botania/common/block/subtile/functional/SubTileOrechid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8e9027e9b..b0cc72b91 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 @@ -54,7 +54,7 @@ public class SubTileOrechid extends SubTileFunctional { BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getOreToPut(); - if(stack != null) { + if(stack != null && stack.getItem() != null) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); From fca4e2bfa87b610cb11880a904e20a85785a0efe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Apr 2016 17:23:00 -0500 Subject: [PATCH 558/935] Properly check kekimurus. Closes #255 --- .../common/block/subtile/generating/SubTileKekimurus.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 856eba1a9..d3fe88954 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 @@ -29,6 +29,9 @@ public class SubTileKekimurus extends SubTileGenerating { public void onUpdate() { super.onUpdate(); + if (supertile.getWorld().isRemote) + return; + int mana = 1800; if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 80 == 0) { @@ -40,11 +43,11 @@ public class SubTileKekimurus extends SubTileGenerating { Block block = state.getBlock(); if(block instanceof BlockCake) { int nextSlicesEaten = state.getValue(BlockCake.BITES) + 1; - if(nextSlicesEaten == 7) + if(nextSlicesEaten > 6) supertile.getWorld().setBlockToAir(pos); else supertile.getWorld().setBlockState(pos, state.withProperty(BlockCake.BITES, nextSlicesEaten), 1 | 2); - supertile.getWorld().playAuxSFX(2001, pos, Block.getStateId(state.withProperty(BlockCake.BITES, nextSlicesEaten))); + 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); this.mana += mana; sync(); From dc35d395cfbbb71757936b54f7db97b9ca9be933 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Apr 2016 19:24:30 -0500 Subject: [PATCH 559/935] Some balance changes --- .../botania/common/entity/EntityFallingStar.java | 7 +++++-- .../item/equipment/tool/ItemEnderDagger.java | 15 +++++++++++++++ .../common/item/equipment/tool/ItemGlassPick.java | 3 ++- .../common/item/equipment/tool/ItemStarSword.java | 15 +++++++++++++-- .../item/equipment/tool/ItemThunderSword.java | 3 ++- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index f9190a3ef..d21fe7ee5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -68,11 +68,14 @@ public class EntityFallingStar extends EntityThrowableCopy { @Override protected void onImpact(RayTraceResult pos) { + if (worldObj.isRemote) + return; + EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && thrower != null && pos.entityHit != thrower && !pos.entityHit.isDead) { if(thrower instanceof EntityPlayer) - pos.entityHit.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) thrower), 10); - else pos.entityHit.attackEntityFrom(DamageSource.generic, 10); + pos.entityHit.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) thrower), Math.random() < 0.25 ? 10 : 5); + else pos.entityHit.attackEntityFrom(DamageSource.generic, Math.random() < 0.25 ? 10 : 5); } if (pos.getBlockPos() != null) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 88cdff01a..657945793 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -10,10 +10,14 @@ */ package vazkii.botania.common.item.equipment.tool; +import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; @@ -64,4 +68,15 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return false; } + @Override + public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { + Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); + + if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.25, 0)); + } + + return multimap; + } + } 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 7638ed66d..b067fd1a6 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 @@ -24,11 +24,12 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemGlassPick extends ItemManasteelPick { private static final int MANA_PER_DAMAGE = 160; - private static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("MANASTEEL_GLASS", 0, 125, 4.8F, 1F, 10); + private static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("MANASTEEL_GLASS", 0, 125, 4.8F, 0F, 10); public ItemGlassPick() { super(MATERIAL, LibItemNames.GLASS_PICK); MinecraftForge.EVENT_BUS.register(this); + attackSpeed = -1; } @SubscribeEvent 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 2c2154bdd..68ec6ba62 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 @@ -46,11 +46,11 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme PotionEffect haste = player.getActivePotionEffect(MobEffects.digSpeed); 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) { + if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !par2World.isRemote) { RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); - Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); + Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); posVec.add(motVec); motVec.normalize().negate().multiply(1.5); @@ -61,6 +61,17 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme star.motionZ = motVec.z; par2World.spawnEntityInWorld(star); + if (!par2World.isRaining() + && Math.abs(par2World.getWorldTime() - 18000) < 1800 + && Math.random() < 0.125) { + EntityFallingStar bonusStar = new EntityFallingStar(par2World, player); + bonusStar.setPosition(posVec.x, posVec.y, posVec.z); + bonusStar.motionX = motVec.x + Math.random() - 0.5; + bonusStar.motionY = motVec.y + Math.random() - 0.5; + bonusStar.motionZ = motVec.z + Math.random() - 0.5; + par2World.spawnEntityInWorld(bonusStar); + } + ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); par2World.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 79f1914e7..515840725 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -57,7 +57,8 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; - for(int i = 0; i < 4; i++) { + int hops = entity.worldObj.isThundering() ? 10 : 4; + for(int i = 0; i < hops; i++) { List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; From abf5d9672b5829e427c99cdb90e1a938b97f9dd4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 28 Apr 2016 23:34:40 -0500 Subject: [PATCH 560/935] Make some items use new cooldowns, closes #261 --- .../vazkii/botania/common/item/ItemSignalFlare.java | 9 ++++----- .../vazkii/botania/common/item/rod/ItemFireRod.java | 11 ++++++----- .../botania/common/item/rod/ItemRainbowRod.java | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 96b76e6ba..4e2366186 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -43,12 +43,11 @@ public class ItemSignalFlare extends ItemMod implements IColorable { super(LibItemNames.SIGNAL_FLARE); setMaxStackSize(1); setNoRepair(); - setMaxDamage(200); } @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(par1ItemStack.getItemDamage() == 0) { + if(!par3EntityPlayer.getCooldownTracker().hasCooldown(this)) { if(par2World.isRemote) par3EntityPlayer.swingArm(hand); else { @@ -71,7 +70,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { if(stunned >= 100) par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); } - par1ItemStack.damageItem(200, par3EntityPlayer); + par3EntityPlayer.getCooldownTracker().setCooldown(this, 200); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -80,8 +79,8 @@ public class ItemSignalFlare extends ItemMod implements IColorable { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + if(par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override 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 eefba895e..2df39bc4f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -42,17 +42,17 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield public ItemFireRod() { super(LibItemNames.FIRE_ROD); setMaxStackSize(1); - setMaxDamage(COOLDOWN); } @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + if(!par3World.isRemote && !player.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); - par1ItemStack.setItemDamage(COOLDOWN); + 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); } @@ -62,8 +62,9 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged() && par3Entity instanceof EntityPlayer) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) par3Entity) ? 2 : 1)); + // Keep for backward compat + if(par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 8e82976c5..d7e242e2a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -52,13 +52,12 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi public ItemRainbowRod() { super(LibItemNames.RAINBOW_ROD); - setMaxDamage(TIME); setMaxStackSize(1); } @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par2World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { + if(!par2World.isRemote && !par3EntityPlayer.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); @@ -108,7 +107,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if(count > 0) { par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false); - par1ItemStack.setItemDamage(TIME); + par3EntityPlayer.getCooldownTracker().setCooldown(this, TIME); } } @@ -127,8 +126,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + // Kept for backward compat + if (par1ItemStack.getItemDamage() > 0) + par1ItemStack.setItemDamage(0); } @Override From 45df392cce957730e949daeaf433c92d7573ac9e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 28 Apr 2016 23:37:20 -0500 Subject: [PATCH 561/935] Close #259 --- .../vazkii/botania/common/entity/EntityDoppleganger.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index bf7e0cd4f..4e6adf921 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -765,6 +765,12 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } + @Override + public boolean isNonBoss() + { + return false; + } + @Override public void setBossVisibleTo(EntityPlayerMP player) { From b6827ca04ef7057ac24d777f24843b4d8238181e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Apr 2016 08:15:54 -0500 Subject: [PATCH 562/935] Remove new cooldown from signal flare, remove redundant check from fire/rainbowrod --- .../java/vazkii/botania/common/item/ItemSignalFlare.java | 9 +++++---- .../java/vazkii/botania/common/item/rod/ItemFireRod.java | 2 +- .../vazkii/botania/common/item/rod/ItemRainbowRod.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 4e2366186..96b76e6ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -43,11 +43,12 @@ public class ItemSignalFlare extends ItemMod implements IColorable { super(LibItemNames.SIGNAL_FLARE); setMaxStackSize(1); setNoRepair(); + setMaxDamage(200); } @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par3EntityPlayer.getCooldownTracker().hasCooldown(this)) { + if(par1ItemStack.getItemDamage() == 0) { if(par2World.isRemote) par3EntityPlayer.swingArm(hand); else { @@ -70,7 +71,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { if(stunned >= 100) par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); } - par3EntityPlayer.getCooldownTracker().setCooldown(this, 200); + par1ItemStack.damageItem(200, par3EntityPlayer); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -79,8 +80,8 @@ public class ItemSignalFlare extends ItemMod implements IColorable { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.getItemDamage() > 0) - par1ItemStack.setItemDamage(0); + if(par1ItemStack.isItemDamaged()) + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } @Override 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 2df39bc4f..e6e431822 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -46,7 +46,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!par3World.isRemote && !player.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + if(!par3World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d7e242e2a..3d3696ff4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -57,7 +57,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par2World.isRemote && !par3EntityPlayer.getCooldownTracker().hasCooldown(this) && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { + if(!par2World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); From 4a6bf0ed0db27935c6a93b7424b9c5d4995fea40 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Apr 2016 13:26:05 -0500 Subject: [PATCH 563/935] Fix incorrect horn sound. Closes #257 --- src/main/java/vazkii/botania/common/item/ItemGrassHorn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 7f8eceb3d..761a9da94 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_basedrum, 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) { From 95427b1c9dcba36b7539546f867134dd6d8f8cae Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Apr 2016 14:03:09 -0500 Subject: [PATCH 564/935] Fix missing texture on fungal apothecary --- .../model/altar/fungal/gobletBase2_sides.png | Bin 153 -> 181 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_sides.png index 7839301c6714268d51bad7db74488a79207930a1..5b7dbe26b367355aa89a0399694e001de838839e 100644 GIT binary patch delta 172 zcmbQqxRp_{Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qM~qpj;D)bh(+(){?%L! z1`Mv}59Hc4El70aar^&2xkpJ!Wh pTYnt=KlznCQ1z!=8P+Wf460rh2K!^`+ktj4c)I$ztaD0e0sxd|F|_~y From e37255a9974068cdb6ae3bbdf0a6bff004a21f04 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 1 May 2016 11:42:40 -0500 Subject: [PATCH 565/935] Make platform disappear with managlass, and fix version checker --- src/main/java/vazkii/botania/client/model/PlatformModel.java | 5 +++++ .../botania/common/core/version/ThreadVersionChecker.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index f61bed8ff..00aa3478c 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -56,6 +56,11 @@ public class PlatformModel implements IBakedModel { ModelResourceLocation path = new ModelResourceLocation("botania:platform", "variant=" + state.getValue(BotaniaStateProps.PLATFORM_VARIANT).getName()); return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path).getQuads(state, side, rand); } else if(heldState != null) { + + // Some people used this to get an invisible block in the past, accommodate that. + if(heldState.getBlock() == ModBlocks.manaGlass) + return ImmutableList.of(); + if(heldState.getBlock().canRenderInLayer(heldState, layer)) { IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 7a7a6565e..1917d9d38 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -19,7 +19,7 @@ import java.net.URL; public class ThreadVersionChecker extends Thread { - private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"; + private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/" + MinecraftForge.MC_VERSION + ".txt"; public ThreadVersionChecker() { setName("Botania Version Checker Thread"); From a339397fcc50f98f6cf41c47cb3a28ff17580dde Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 1 May 2016 21:25:30 -0500 Subject: [PATCH 566/935] Some network boilerplate --- .../common/network/PacketBotaniaEffect.java | 78 +++++++++++++++++++ .../botania/common/network/PacketHandler.java | 45 +++++++++++ 2 files changed, 123 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java create mode 100644 src/main/java/vazkii/botania/common/network/PacketHandler.java diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java new file mode 100644 index 000000000..a34f5e296 --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -0,0 +1,78 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + +public class PacketBotaniaEffect implements IMessage { + + private EffectType type; + private double x; + private double y; + private double z; + private int[] args; + + + public PacketBotaniaEffect() {} + + public PacketBotaniaEffect(EffectType type, double x, double y, double z, int... args) { + this.type = type; + this.x = x; + this.y = y; + this.z = z; + this.args = args; + } + + @Override + public void fromBytes(ByteBuf buf) { + type = EffectType.values()[buf.readShort()]; + x = buf.readDouble(); + y = buf.readDouble(); + z = buf.readDouble(); + args = new int[type.argCount]; + + for (int i = 0; i < args.length; i++) { + args[i] = ByteBufUtils.readVarInt(buf, 3); + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(type.ordinal()); + buf.writeDouble(x); + buf.writeDouble(y); + buf.writeDouble(z); + + for (int i = 0; i < type.argCount; i++) { + ByteBufUtils.writeVarInt(buf, args[i], 3); + } + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketBotaniaEffect message, MessageContext ctx) { + Minecraft.getMinecraft().addScheduledTask(() -> { + + }); + + return null; + } + + } + + public enum EffectType { + ; + + private final int argCount; + + EffectType(int argCount) { + this.argCount = argCount; + } + + } + +} diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java new file mode 100644 index 000000000..c7934082a --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -0,0 +1,45 @@ +package vazkii.botania.common.network; + +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.management.PlayerManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraftforge.fml.relauncher.Side; +import vazkii.botania.common.lib.LibMisc; + +public final class PacketHandler { + + private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.MOD_ID); + + public static void init() { + HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT); + } + + /** + * Send message to all within 64 blocks that have this chunk loaded + */ + 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); + + for (EntityPlayer player : ws.playerEntities) { + EntityPlayerMP playerMP = ((EntityPlayerMP) player); + + if (playerMP.getDistanceSq(pos) < 64 * 64 + && chunk.containsPlayer(playerMP)) { + HANDLER.sendTo(toSend, playerMP); + } + } + + } + } + + private PacketHandler() {} + +} From 96a1db97a94043767a60c622e02336e2b4c29c8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 1 May 2016 22:03:58 -0500 Subject: [PATCH 567/935] Serverside TilePool --- .../common/block/tile/mana/TilePool.java | 82 +++++++++---------- .../common/core/proxy/CommonProxy.java | 2 + .../common/network/PacketBotaniaEffect.java | 36 +++++++- 3 files changed, 73 insertions(+), 47 deletions(-) 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 b52aec2cd..b6a21cafb 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 @@ -60,6 +60,8 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.awt.*; import java.util.List; @@ -80,25 +82,25 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc private static final String TAG_INPUT_KEY = "inputKey"; private static final String TAG_OUTPUT_KEY = "outputKey"; - boolean outputting = false; + private boolean outputting = false; public EnumDyeColor color = EnumDyeColor.WHITE; int mana; - int knownMana = -1; + private int knownMana = -1; public int manaCap = -1; - int soundTicks = 0; - boolean canAccept = true; - boolean canSpare = true; + private int soundTicks = 0; + private boolean canAccept = true; + private boolean canSpare = true; public boolean fragile = false; - public boolean isDoingTransfer = false; - public int ticksDoingTransfer = 0; + boolean isDoingTransfer = false; + int ticksDoingTransfer = 0; - String inputKey = ""; - String outputKey = ""; + private String inputKey = ""; + private String outputKey = ""; - int ticks = 0; - boolean sendPacket = false; + private int ticks = 0; + private boolean sendPacket = false; @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { @@ -135,7 +137,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc } public boolean collideEntityItem(EntityItem item) { - if(item.isDead) + if(worldObj.isRemote || item.isDead) return false; boolean didChange = false; @@ -163,18 +165,16 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(getCurrentMana() >= mana) { recieveMana(-mana); - if(!worldObj.isRemote) { - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); + stack.stackSize--; + if(stack.stackSize == 0) + item.setDead(); - ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - try { - MethodHandles.itemAge_setter.invokeExact(outputItem, 105); - } catch (Throwable ignored) {} - worldObj.spawnEntityInWorld(outputItem); - } + ItemStack output = recipe.getOutput().copy(); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + try { + MethodHandles.itemAge_setter.invokeExact(outputItem, 105); + } catch (Throwable ignored) {} + worldObj.spawnEntityInWorld(outputItem); craftingFanciness(); didChange = true; @@ -187,38 +187,37 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc return didChange; } - public void craftingFanciness() { + private void craftingFanciness() { if(soundTicks == 0) { worldObj.playSound(null, pos, BotaniaSoundEvents.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); soundTicks = 6; } - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - 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); - } + PacketHandler.sendToNearby(worldObj, getPos(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); } @Override public void updateEntity() { - boolean wasDoingTransfer = isDoingTransfer; - isDoingTransfer = false; if(manaCap == -1) manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid()) ManaNetworkEvent.addPool(this); - if(soundTicks > 0) - soundTicks--; - if(worldObj.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; Color color = new Color(0x00C6FF); if(Math.random() > particleChance) Botania.proxy.wispFX(worldObj, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + return; + } + + boolean wasDoingTransfer = isDoingTransfer; + isDoingTransfer = false; + + if(soundTicks > 0) { + soundTicks--; } if(sendPacket && ticks % 10 == 0) { @@ -252,8 +251,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc didSomething = true; int manaVal = Math.min(transfRate, Math.min(getCurrentMana(), mana.getMaxMana(stack) - mana.getMana(stack))); - if(!worldObj.isRemote) - mana.addMana(stack, manaVal); + mana.addMana(stack, manaVal); recieveMana(-manaVal); } } else { @@ -262,17 +260,15 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc didSomething = true; int manaVal = Math.min(transfRate, Math.min(manaCap - getCurrentMana(), mana.getMana(stack))); - if(!worldObj.isRemote) - mana.addMana(stack, -manaVal); + mana.addMana(stack, -manaVal); recieveMana(manaVal); } } if(didSomething) { - if(worldObj.isRemote && ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) { - Vector3 itemVec = Vector3.fromTileEntity(this).add(0.5, 0.5 + Math.random() * 0.3, 0.5); - Vector3 tileVec = Vector3.fromTileEntity(this).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - LightningHandler.spawnLightningBolt(worldObj, outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, worldObj.rand.nextLong(), 0x4400799c, 0x4400C6FF); + if(ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) { + PacketHandler.sendToNearby(worldObj, getPos(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); } isDoingTransfer = outputting; } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index b92c50fcb..22b9bc53d 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -90,6 +90,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; +import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; @@ -102,6 +103,7 @@ public class CommonProxy { ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); + PacketHandler.init(); ModSounds.init(); ModBlocks.init(); ModItems.init(); diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index a34f5e296..6017c5553 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -2,10 +2,16 @@ package vazkii.botania.common.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.helper.Vector3; public class PacketBotaniaEffect implements IMessage { @@ -15,7 +21,6 @@ public class PacketBotaniaEffect implements IMessage { private double z; private int[] args; - public PacketBotaniaEffect() {} public PacketBotaniaEffect(EffectType type, double x, double y, double z, int... args) { @@ -54,9 +59,31 @@ public class PacketBotaniaEffect implements IMessage { public static class Handler implements IMessageHandler { @Override - public IMessage onMessage(PacketBotaniaEffect message, MessageContext ctx) { + public IMessage onMessage(final PacketBotaniaEffect message, final MessageContext ctx) { Minecraft.getMinecraft().addScheduledTask(() -> { - + switch (message.type) { + case POOL_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, + red, green, blue, (float) Math.random(), 10); + } + break; + } + case POOL_CHARGE: { + if(ConfigHandler.chargingAnimationEnabled) { + boolean outputting = message.args[0] == 1; + BlockPos pos = new BlockPos(message.x, message.y, message.z); + Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); + Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); + LightningHandler.spawnLightningBolt(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, + outputting ? itemVec : tileVec, 80, Minecraft.getMinecraft().theWorld.rand.nextLong(), 0x4400799c, 0x4400C6FF); + } + break; + } + } }); return null; @@ -65,7 +92,8 @@ public class PacketBotaniaEffect implements IMessage { } public enum EffectType { - ; + POOL_CRAFT(0), + POOL_CHARGE(1); private final int argCount; From 93656a9d4335b428028cec2906181cbb765fbb09 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 1 May 2016 22:43:33 -0500 Subject: [PATCH 568/935] Fix+tweak paint lens particles --- .../common/core/proxy/CommonProxy.java | 2 -- .../botania/common/item/lens/LensPaint.java | 11 ++++------- .../common/network/PacketBotaniaEffect.java | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 22b9bc53d..f514a6b0a 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -94,8 +94,6 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; -//import vazkii.botania.common.block.ModBanners; - public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index f33f71bd5..eb078e490 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -23,6 +23,8 @@ import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.util.ArrayList; import java.util.List; @@ -74,13 +76,8 @@ public class LensPaint extends Lens { if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor && BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) { entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); - int hex = placeColor.getMapColor().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); - for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(entity.worldObj, coords.getX() + (float) Math.random(), coords.getY() + (float) Math.random(), coords.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.3F, 5); // todo 1.8 noop right now due to serversiding - + PacketHandler.sendToNearby(entity.worldObj, coords, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); } } } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 6017c5553..9def12676 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -2,7 +2,9 @@ package vazkii.botania.common.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; +import net.minecraft.item.EnumDyeColor; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -83,6 +85,20 @@ public class PacketBotaniaEffect implements IMessage { } break; } + case PAINT_LENS: { + EnumDyeColor placeColor = EnumDyeColor.byMetadata(message.args[0]); + int hex = placeColor.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); + for(int i = 0; i < 10; i++) { + BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[Minecraft.getMinecraft().theWorld.rand.nextInt(6)]); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, + pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), + r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); + } + break; + } } }); @@ -93,7 +109,8 @@ public class PacketBotaniaEffect implements IMessage { public enum EffectType { POOL_CRAFT(0), - POOL_CHARGE(1); + POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting + PAINT_LENS(1); // Arg: colour private final int argCount; From 725ae1cef13aa810c73d1dfe53dde2b21bf05937 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 08:34:30 -0500 Subject: [PATCH 569/935] Fix crystal cube, closes #253 --- .../tile/RenderTileCorporeaCrystalCube.java | 26 +++++++++++----- .../corporea/TileCorporeaCrystalCube.java | 30 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) 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 b01b6eafe..5eaae7487 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -32,6 +33,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.animation.Event; import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; @@ -43,8 +45,8 @@ import vazkii.botania.common.core.handler.MethodHandles; public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { - ModelCrystalCube model = new ModelCrystalCube(); - EntityItem entity = null; + private EntityItem entity = null; + private RenderEntityItem itemRenderer = null; @Override public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { @@ -53,6 +55,14 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer> pair = null; + Pair> pair = te.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null).apply(time); // handleEvents(te, time, pair.getRight()); IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 5f9f3017f..1b4e3fdc6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -10,9 +10,17 @@ */ package vazkii.botania.common.block.tile.corporea; +import com.google.common.collect.ImmutableMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.animation.Animation; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.model.animation.CapabilityAnimation; +import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.corporea.CorporeaHelper; @@ -34,13 +42,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor int ticks = 0; public int compValue = 0; - //private final IAnimationStateMachine asm; + private final IAnimationStateMachine asm; public TileCorporeaCrystalCube() { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - //asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); + asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of()); } else { - //asm = null; + asm = null; } } @@ -161,9 +169,17 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor onUpdateCount(); } } -/* todo 1.9 + @Override - public IAnimationStateMachine asm() { - return asm; - }*/ + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); + } + + @Override + public T getCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { + return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); + } else return super.getCapability(cap, side); + } + } From 8f4f63453ad52ed24468157eef92905e36a06741 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 19:20:31 -0500 Subject: [PATCH 570/935] Move nonfabulous pools into static renderer. Yay performance improvements! --- .../client/core/handler/ColorHandler.java | 2 +- .../client/core/handler/ModelHandler.java | 3 ++- .../client/render/tile/RenderTilePool.java | 17 +++++++-------- .../botania/common/block/mana/BlockPool.java | 21 ++++++++++++++++--- .../common/block/tile/mana/TilePool.java | 1 + 5 files changed, 29 insertions(+), 15 deletions(-) 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 49f5ff7af..5637d267c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -55,7 +55,7 @@ public final class ColorHandler { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { - return 16777215; + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } } }, 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 c24999b03..3730ef4a2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -608,7 +608,8 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); - // Ignore color in unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) + // Ignore color in pool, unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) + ModelLoader.setCustomStateMapper(ModBlocks.pool, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index ab1fae042..21d0e47f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -63,22 +63,19 @@ public class RenderTilePool 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); - int color; + if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; if(pool != null) time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); - } else { - color = pool == null ? EnumDyeColor.WHITE.getMapColor().colorValue : pool.getColor().getMapColor().colorValue; + int color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); + int red = (color & 0xFF0000) >> 16; + int green = (color & 0xFF00) >> 8; + int blue = (color & 0xFF); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); } - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); - int red = (color & 0xFF0000) >> 16; - int green = (color & 0xFF00) >> 8; - int blue = (color & 0xFF); - Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); - GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); GlStateManager.enableRescaleNormal(); 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 86c4ef569..342b68566 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -21,6 +21,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -62,13 +63,15 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)); + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT) + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT); + return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR); } @Override @@ -84,6 +87,16 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world.getTileEntity(pos); + if (te instanceof TilePool) { + return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); + } else { + return state.withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + } + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -176,7 +189,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) + return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; + else return EnumBlockRenderType.MODEL; } @Override 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 b6a21cafb..9f84b7608 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 @@ -440,6 +440,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void setColor(EnumDyeColor color) { this.color = color; + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 0b1011); } @Override From 3996c5d078e2b3ca9ec0f5881f07c691b1d2f969 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 19:24:13 -0500 Subject: [PATCH 571/935] Guard against null chunk in packethandler --- src/main/java/vazkii/botania/common/network/PacketHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index c7934082a..706771969 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -28,6 +28,9 @@ public final class PacketHandler { WorldServer ws = ((WorldServer) world); PlayerManager.PlayerInstance chunk = ws.getPlayerChunkMap().getEntry(pos.getX() >> 4, pos.getZ() >> 4); + if(chunk == null) + return; + for (EntityPlayer player : ws.playerEntities) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); From bb152907a7fa4a1f9fd50618b315efc4c4ee791c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 19:45:30 -0500 Subject: [PATCH 572/935] Fix TESR item transforms --- .../blockstates/corporeaCrystalCube.json | 1 + .../assets/botania/models/item/avatar.json | 34 ++++++++++++++++++- .../assets/botania/models/item/bellows.json | 34 ++++++++++++++++++- .../assets/botania/models/item/brewery.json | 34 ++++++++++++++++++- .../botania/models/item/corporeaIndex.json | 34 ++++++++++++++++++- .../assets/botania/models/item/gaiaHead.json | 34 ++++++++++++++++++- .../assets/botania/models/item/hourglass.json | 34 ++++++++++++++++++- .../botania/models/item/teruTeruBozu.json | 34 ++++++++++++++++++- 8 files changed, 232 insertions(+), 7 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json index 96f3e56d8..3f84657e0 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json +++ b/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json @@ -21,6 +21,7 @@ }, "inventory": [{ "model": "botania:crystalcube_base", + "transform": "forge:default-block", "submodel": { "cube": { "model": "botania:crystalcube_cube", diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/avatar.json index 7960c6d70..4b66e09de 100644 --- a/src/main/resources/assets/botania/models/item/avatar.json +++ b/src/main/resources/assets/botania/models/item/avatar.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/bellows.json index 7960c6d70..3326413b3 100644 --- a/src/main/resources/assets/botania/models/item/bellows.json +++ b/src/main/resources/assets/botania/models/item/bellows.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/brewery.json index 7960c6d70..3326413b3 100644 --- a/src/main/resources/assets/botania/models/item/brewery.json +++ b/src/main/resources/assets/botania/models/item/brewery.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaIndex.json b/src/main/resources/assets/botania/models/item/corporeaIndex.json index 7960c6d70..3326413b3 100644 --- a/src/main/resources/assets/botania/models/item/corporeaIndex.json +++ b/src/main/resources/assets/botania/models/item/corporeaIndex.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaHead.json b/src/main/resources/assets/botania/models/item/gaiaHead.json index 7960c6d70..b7da3301d 100644 --- a/src/main/resources/assets/botania/models/item/gaiaHead.json +++ b/src/main/resources/assets/botania/models/item/gaiaHead.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 3, -0.75, 0 ], + "scale": [ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hourglass.json b/src/main/resources/assets/botania/models/item/hourglass.json index 7960c6d70..3326413b3 100644 --- a/src/main/resources/assets/botania/models/item/hourglass.json +++ b/src/main/resources/assets/botania/models/item/hourglass.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 45, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/teruTeruBozu.json b/src/main/resources/assets/botania/models/item/teruTeruBozu.json index 7960c6d70..c3fec2d6f 100644 --- a/src/main/resources/assets/botania/models/item/teruTeruBozu.json +++ b/src/main/resources/assets/botania/models/item/teruTeruBozu.json @@ -1,3 +1,35 @@ { - "parent": "builtin/entity" + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.40, 0.40, 0.40 ] + } + } } \ No newline at end of file From 6889afc34eb26d2f2209227fd0e9b0c36c9d36bf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 19:59:08 -0500 Subject: [PATCH 573/935] Delete old models --- .../botania/client/model/ModelAltar.java | 88 ------------------- .../botania/client/model/ModelCocoon.java | 32 ------- .../client/model/ModelIncensePlate.java | 43 --------- .../botania/client/model/ModelMiniIsland.java | 84 ------------------ .../client/render/tile/RenderTileCocoon.java | 6 -- 5 files changed, 253 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelAltar.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelCocoon.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelIncensePlate.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelMiniIsland.java diff --git a/src/main/java/vazkii/botania/client/model/ModelAltar.java b/src/main/java/vazkii/botania/client/model/ModelAltar.java deleted file mode 100644 index b8827a24d..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelAltar.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 21, 2014, 7:56:15 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelAltar extends ModelBase { - - ModelRenderer gobletBase; - ModelRenderer gobletBase2; - ModelRenderer gobletBase3; - ModelRenderer gobletStand; - ModelRenderer kelkBase; - ModelRenderer kelkBase2; - ModelRenderer kelkWall1; - ModelRenderer kelkWall2; - ModelRenderer kelkWall3; - ModelRenderer kelkWall4; - - public ModelAltar() { - textureWidth = 256; - textureHeight = 128; - - gobletBase = new ModelRenderer(this, 0, 0); - gobletBase.addBox(0F, 0F, 0F, 16, 2, 16); - gobletBase.setRotationPoint(-8F, 22F, -8F); - gobletBase.setTextureSize(256, 128); - gobletBase2 = new ModelRenderer(this, 0, 18); - gobletBase2.addBox(0F, 0F, 0F, 14, 1, 14); - gobletBase2.setRotationPoint(-7F, 21F, -7F); - gobletBase2.setTextureSize(256, 128); - gobletStand = new ModelRenderer(this, 68, 0); - gobletStand.addBox(0F, 0F, 0F, 6, 8, 6); - gobletStand.setRotationPoint(-3F, 12F, -3F); - gobletStand.setTextureSize(256, 128); - gobletBase3 = new ModelRenderer(this, 0, 33); - gobletBase3.addBox(0F, 0F, 0F, 12, 1, 12); - gobletBase3.setRotationPoint(-6F, 20F, -6F); - gobletBase3.setTextureSize(256, 128); - kelkBase = new ModelRenderer(this, 72, 45); - kelkBase.addBox(0F, 0F, 0F, 8, 1, 8); - kelkBase.setRotationPoint(-4F, 11F, -4F); - kelkBase.setTextureSize(256, 128); - kelkBase2 = new ModelRenderer(this, 72, 34); - kelkBase2.addBox(0F, 0F, 0F, 10, 1, 10); - kelkBase2.setRotationPoint(-5F, 10F, -5F); - kelkBase2.setTextureSize(256, 128); - kelkWall1 = new ModelRenderer(this, 72, 18); - kelkWall1.addBox(0F, 0F, 0F, 1, 6, 10); - kelkWall1.setRotationPoint(5F, 4F, -5F); - kelkWall1.setTextureSize(256, 128); - kelkWall2 = new ModelRenderer(this, 72, 18); - kelkWall2.addBox(0F, 0F, 0F, 1, 6, 10); - kelkWall2.setRotationPoint(-6F, 4F, -5F); - kelkWall2.setTextureSize(256, 128); - kelkWall3 = new ModelRenderer(this, 94, 18); - kelkWall3.addBox(0F, 0F, 0F, 10, 6, 1); - kelkWall3.setRotationPoint(-5F, 4F, 5F); - kelkWall3.setTextureSize(256, 128); - kelkWall4 = new ModelRenderer(this, 94, 18); - kelkWall4.addBox(0F, 0F, 0F, 10, 6, 1); - kelkWall4.setRotationPoint(-5F, 4F, -6F); - kelkWall4.setTextureSize(256, 128); - } - - public void render() { - float f = 1F / 16F; - gobletBase.render(f); - gobletBase2.render(f); - gobletBase3.render(f); - gobletStand.render(f); - kelkBase.render(f); - kelkBase2.render(f); - kelkWall1.render(f); - kelkWall2.render(f); - kelkWall3.render(f); - kelkWall4.render(f); - } -} diff --git a/src/main/java/vazkii/botania/client/model/ModelCocoon.java b/src/main/java/vazkii/botania/client/model/ModelCocoon.java deleted file mode 100644 index 2fbc79c1b..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelCocoon.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelCocoon extends ModelBase { - - public ModelRenderer shape; - - public ModelCocoon() { - textureWidth = 64; - textureHeight = 32; - shape = new ModelRenderer(this, 0, 0); - shape.setRotationPoint(0.0F, 22.0F, 0.0F); - shape.addBox(-5.0F, -8.0F, -7.0F, 10, 10, 14, 0.0F); - } - - public void render() { - shape.render(1F / 16F); - } - -} diff --git a/src/main/java/vazkii/botania/client/model/ModelIncensePlate.java b/src/main/java/vazkii/botania/client/model/ModelIncensePlate.java deleted file mode 100644 index d7fa2eadb..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelIncensePlate.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 15, 2015, 4:17:37 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelIncensePlate extends ModelBase { - - ModelRenderer Plate; - ModelRenderer High; - - public ModelIncensePlate() { - textureWidth = 64; - textureHeight = 32; - - Plate = new ModelRenderer(this, 0, 0); - Plate.addBox(0F, 0F, 0F, 12, 1, 4); - Plate.setRotationPoint(-6F, 23F, -2F); - Plate.setTextureSize(64, 32); - Plate.mirror = true; - High = new ModelRenderer(this, 0, 6); - High.addBox(0F, 0F, 0F, 3, 1, 4); - High.setRotationPoint(-6F, 22F, -2F); - High.setTextureSize(64, 32); - High.mirror = true; - } - - public void render() { - float f5 = 1F / 16F; - Plate.render(f5); - High.render(f5); - } - -} diff --git a/src/main/java/vazkii/botania/client/model/ModelMiniIsland.java b/src/main/java/vazkii/botania/client/model/ModelMiniIsland.java deleted file mode 100644 index 4b9f2c19c..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelMiniIsland.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 8, 2014, 10:07:54 PM (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelMiniIsland extends ModelBase { - - ModelRenderer island; - - public ModelMiniIsland() { - textureWidth = 64; - textureHeight = 32; - - setTextureOffset("island.Shape0", 0, 0); - setTextureOffset("island.Shape1-1", 8, 0); - setTextureOffset("island.Shape1-2", 16, 0); - setTextureOffset("island.Shape1-3", 24, 0); - setTextureOffset("island.Shape1-4", 32, 0); - setTextureOffset("island.Shape2-1", 8, 6); - setTextureOffset("island.Shape2-2", 16, 6); - setTextureOffset("island.Shape2-3", 24, 6); - setTextureOffset("island.Shape2-4", 32, 6); - setTextureOffset("island.Shape2-5", 8, 11); - setTextureOffset("island.Shape2-6", 16, 11); - setTextureOffset("island.Shape2-7", 24, 11); - setTextureOffset("island.Shape2-8", 32, 11); - setTextureOffset("island.Shape3-1", 8, 16); - setTextureOffset("island.Shape3-2", 16, 16); - setTextureOffset("island.Shape3-3", 24, 16); - setTextureOffset("island.Shape3-4", 32, 16); - setTextureOffset("island.Shape3-5", 8, 20); - setTextureOffset("island.Shape3-6", 16, 20); - setTextureOffset("island.Shape3-7", 24, 20); - setTextureOffset("island.Shape3-8", 32, 20); - setTextureOffset("island.Shape4-1", 8, 24); - setTextureOffset("island.Shape4-2", 16, 24); - setTextureOffset("island.Shape4-3", 24, 24); - setTextureOffset("island.Shape4-4", 32, 24); - - island = new ModelRenderer(this, "island"); - island.setRotationPoint(0F, 16F, 0F); - // island.mirror = true; - island.addBox("Shape0", -1F, 0F, -1F, 2, 5, 2); - island.addBox("Shape1-1", -1F, 0F, -3F, 2, 4, 2); - island.addBox("Shape1-2", 1F, 0F, -1F, 2, 4, 2); - island.addBox("Shape1-3", -1F, 0F, 1F, 2, 4, 2); - island.addBox("Shape1-4", -3F, 0F, -1F, 2, 4, 2); - island.addBox("Shape2-1", -1F, 0F, -5F, 2, 3, 2); - island.addBox("Shape2-2", 3F, 0F, -1F, 2, 3, 2); - island.addBox("Shape2-3", -1F, 0F, 3F, 2, 3, 2); - island.addBox("Shape2-4", -5F, 0F, -1F, 2, 3, 2); - island.addBox("Shape2-5", 1F, 0F, -3F, 2, 3, 2); - island.addBox("Shape2-6", 1F, 0F, 1F, 2, 3, 2); - island.addBox("Shape2-7", -3F, 0F, 1F, 2, 3, 2); - island.addBox("Shape2-8", -3F, 0F, -3F, 2, 3, 2); - island.addBox("Shape3-1", 1F, 0F, -5F, 2, 2, 2); - island.addBox("Shape3-2", 3F, 0F, 1F, 2, 2, 2); - island.addBox("Shape3-3", -3F, 0F, 3F, 2, 2, 2); - island.addBox("Shape3-4", -5F, 0F, -3F, 2, 2, 2); - island.addBox("Shape3-5", 3F, 0F, -3F, 2, 2, 2); - island.addBox("Shape3-6", 1F, 0F, 3F, 2, 2, 2); - island.addBox("Shape3-7", -5F, 0F, 1F, 2, 2, 2); - island.addBox("Shape3-8", -3F, 0F, -5F, 2, 2, 2); - island.addBox("Shape4-1", 3F, 0F, -5F, 2, 1, 2); - island.addBox("Shape4-2", 3F, 0F, 3F, 2, 1, 2); - island.addBox("Shape4-3", -5F, 0F, 3F, 2, 1, 2); - island.addBox("Shape4-4", -5F, 0F, -5F, 2, 1, 2); - } - - public void render() { - island.render(1F / 16F); - } - -} 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 235f27776..5f67be847 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -16,17 +16,11 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelCocoon; import vazkii.botania.common.block.tile.TileCocoon; public class RenderTileCocoon extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_COCOON); - ModelCocoon model = new ModelCocoon(); - @Override public void renderTileEntityAt(TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { float rot = 0F; From d0e2f474bc285835d42571de15967e2141517df9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 20:14:46 -0500 Subject: [PATCH 574/935] Resync hourglass whenever it flips, hopefully helps with desyncs --- .../api/internal/VanillaPacketDispatcher.java | 27 ++++++++++++++----- .../common/block/tile/TileHourglass.java | 3 ++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 87d64a61a..cca21a014 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,24 +10,37 @@ */ 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.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) { - World world = tile.getWorld(); - List players = world.playerEntities; - for(Object player : players) - if(player instanceof EntityPlayerMP) { - EntityPlayerMP mp = (EntityPlayerMP) player; - if(pointDistancePlane(mp.posX, mp.posZ, tile.getPos().getX() + 0.5, tile.getPos().getZ() + 0.5) < 64) - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); + if(tile.getWorld() instanceof WorldServer) { + WorldServer ws = ((WorldServer) tile.getWorld()); + PlayerManager.PlayerInstance chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); + + if(chunk == null) + return; + + for (EntityPlayer player : ws.playerEntities) { + EntityPlayerMP playerMP = ((EntityPlayerMP) player); + + if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 + && chunk.containsPlayer(playerMP)) { + playerMP.playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); + } } + + } } public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { 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 afdd1d71e..285e3ed1b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -32,7 +32,7 @@ public class TileHourglass extends TileSimpleInventory { private static final String TAG_LOCK = "lock"; private static final String TAG_MOVE = "move"; - int time = 0; + private int time = 0; public float timeFraction = 0F; public boolean flip = false; public int flipTicks = 0; @@ -51,6 +51,7 @@ public class TileHourglass extends TileSimpleInventory { flipTicks = 4; if (!worldObj.isRemote) { worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); } } From 130c67e758f3fb850b5142acbf0d189fb1dd55e2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 22:05:35 -0500 Subject: [PATCH 575/935] Fully serverside gaia guardian, buff it a bit --- .../client/core/proxy/ClientProxy.java | 5 + .../common/core/proxy/CommonProxy.java | 5 + .../common/entity/EntityDoppleganger.java | 248 ++++++++---------- .../botania/common/item/ItemGrassSeeds.java | 2 +- .../item/material/ItemManaResource.java | 2 +- .../common/network/PacketBotaniaEffect.java | 18 +- .../botania/common/network/PacketHandler.java | 4 + 7 files changed, 147 insertions(+), 137 deletions(-) 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 8f9a73795..796dc20ca 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -305,6 +305,11 @@ public class ClientProxy extends CommonProxy { return entity == Minecraft.getMinecraft().thePlayer; } + @Override + public EntityPlayer getClientPlayer() { + return Minecraft.getMinecraft().thePlayer; + } + @Override public boolean isClientPlayerWearingMonocle() { return ItemMonocle.hasMonocle(Minecraft.getMinecraft().thePlayer); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f514a6b0a..bf43f34f5 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -18,6 +18,7 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityPainting; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; @@ -241,6 +242,10 @@ public class CommonProxy { return false; } + public EntityPlayer getClientPlayer() { + return null; + } + public boolean isClientPlayerWearingMonocle() { return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4e6adf921..944c17ff3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -15,7 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -36,7 +35,6 @@ import net.minecraft.init.Items; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -59,9 +57,6 @@ import net.minecraft.world.BossInfo; import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -82,22 +77,23 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Iterator; import java.util.List; -import java.util.Random; import java.util.UUID; import java.util.regex.Pattern; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { + public static final float ARENA_RANGE = 12F; private static final int SPAWN_TICKS = 160; - private static final float RANGE = 12F; private static final float MAX_HP = 800F; private static final int MOB_SPAWN_START_TICKS = 20; @@ -173,50 +169,35 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return mb.makeSet(); } - public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, BlockPos pos, boolean hard) { - if(par3World.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { - if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { - if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); + public static boolean spawn(EntityPlayer player, ItemStack stack, World world, BlockPos pos, boolean hard) { + if(world.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { + if(world.getDifficulty() == EnumDifficulty.PEACEFUL) { + player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); return false; } for(BlockPos coords : PYLON_LOCATIONS) { BlockPos pos_ = pos.add(coords); - IBlockState state = par3World.getBlockState(pos_); + IBlockState state = world.getBlockState(pos_); Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { - if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); return false; } } - if(!hasProperArena(par3World, pos)) { - for(int i = 0; i < 360; i += 8) { - float r = 1F; - float g = 0F; - float b = 1F; - float rad = i * (float) Math.PI / 180F; - double x = pos.getX() + 0.5 - Math.cos(rad) * RANGE; - double y = pos.getY() + 0.5; - double z = pos.getZ() + 0.5 - Math.sin(rad) * RANGE; + if(!hasProperArena(world, pos)) { + PacketHandler.sendTo((EntityPlayerMP) player, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); - Botania.proxy.sparkleFX(par3World, x, y, z, r, g, b, 5F, 120); - } - - if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); return false; } - par1ItemStack.stackSize--; + stack.stackSize--; - if(par3World.isRemote) - return true; - - EntityDoppleganger e = new EntityDoppleganger(par3World); + EntityDoppleganger e = new EntityDoppleganger(world); e.setPosition(pos.getX() + 0.5, pos.getY() + 3, pos.getZ() + 0.5); e.setInvulTime(SPAWN_TICKS); e.setHealth(1F); @@ -234,7 +215,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); e.playSound(SoundEvents.entity_enderdragon_growl, 10F, 0.1F); - par3World.spawnEntityInWorld(e); + world.spawnEntityInWorld(e); return true; } @@ -244,10 +225,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private static boolean hasProperArena(World world, BlockPos startPos) { int heightCheck = 3; int heightMin = 2; - int range = (int) Math.ceil(RANGE); + int range = (int) Math.ceil(ARENA_RANGE); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) { - if(Math.abs(i) == 4 && Math.abs(j) == 4 || vazkii.botania.common.core.helper.MathHelper.pointDistancePlane(i, j, 0, 0) > RANGE) + if(Math.abs(i) == 4 && Math.abs(j) == 4 || vazkii.botania.common.core.helper.MathHelper.pointDistancePlane(i, j, 0, 0) > ARENA_RANGE) continue; // Ignore pylons and out of circle int air = 0; @@ -513,70 +494,97 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public void onLivingUpdate() { super.onLivingUpdate(); - if (!worldObj.isRemote) { - dataManager.set(BOSSINFO_ID, Optional.of(bossInfo.getUniqueId())); - bossInfo.setPercent(getHealth() / getMaxHealth()); + BlockPos source = getSource(); + float range = ARENA_RANGE; + int invul = getInvulTime(); + + if (worldObj.isRemote) { + for(int i = 0; i < 360; i += 8) { + float r = 0.6F; + float g = 0F; + float b = 0.2F; + float m = 0.15F; + float mv = 0.35F; + + float rad = i * (float) Math.PI / 180F; + double x = source.getX() + 0.5 - Math.cos(rad) * range; + double y = source.getY() + 0.5; + double z = source.getZ() + 0.5 - Math.sin(rad) * range; + + Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); + } + + if(worldObj.isRemote && !isPlayingMusic && !isDead && !getPlayersAround().isEmpty()) { + Botania.proxy.playRecordClientSided(worldObj, source, (ItemRecord) (isHardMode() ? ModItems.recordGaia2 : ModItems.recordGaia1)); + isPlayingMusic = true; + } + + EntityPlayer player = Botania.proxy.getClientPlayer(); + + player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; + + if(invul > 10) { + Vector3 pos = Vector3.fromEntityCenter(this).subtract(new Vector3(0, 0.2, 0)); + for (BlockPos arr : PYLON_LOCATIONS) { + Vector3 pylonPos = new Vector3(source.getX() + arr.getX(), source.getY() + arr.getY(), source.getZ() + arr.getZ()); + double worldTime = ticksExisted; + worldTime /= 5; + + float rad = 0.75F + (float) Math.random() * 0.05F; + double xp = pylonPos.x + 0.5 + Math.cos(worldTime) * rad; + double zp = pylonPos.z + 0.5 + Math.sin(worldTime) * rad; + + Vector3 partPos = new Vector3(xp, pylonPos.y, zp); + Vector3 mot = pos.copy().sub(partPos).multiply(0.04); + + float r = 0.7F + (float) Math.random() * 0.3F; + float g = (float) Math.random() * 0.3F; + float b = 0.7F + (float) Math.random() * 0.3F; + + Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); + Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.4F, (float) mot.x, (float) mot.y, (float) mot.z); + } + } + + return; } + dataManager.set(BOSSINFO_ID, Optional.of(bossInfo.getUniqueId())); + bossInfo.setPercent(getHealth() / getMaxHealth()); + if(!getPassengers().isEmpty()) this.dismountRidingEntity(); - boolean peaceful = worldObj.getDifficulty() == EnumDifficulty.PEACEFUL; - if(!worldObj.isRemote && peaceful) + if(worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) setDead(); - if(!worldObj.isRemote) { - int radius = 1; - int posXInt = MathHelper.floor_double(posX); - int posYInt = MathHelper.floor_double(posY); - int posZInt = MathHelper.floor_double(posZ); - for(int i = -radius; i < radius + 1; i++) - for(int j = -radius; j < radius + 1; j++) - for(int k = -radius; k < radius + 1; k++) { - int xp = posXInt + i; - int yp = posYInt + j; - int zp = posZInt + k; - BlockPos posp = new BlockPos(xp, yp, zp); - if(isCheatyBlock(worldObj, posp)) { - Block block = worldObj.getBlockState(posp).getBlock(); - 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.spawnEntityInWorld(new EntityItem(worldObj, xp + 0.5, yp + 0.5, zp + 0.5, stack)); - } - worldObj.setBlockToAir(posp); + int radius = 1; + int posXInt = MathHelper.floor_double(posX); + int posYInt = MathHelper.floor_double(posY); + int posZInt = MathHelper.floor_double(posZ); + for(int i = -radius; i < radius + 1; i++) + for(int j = -radius; j < radius + 1; j++) + for(int k = -radius; k < radius + 1; k++) { + int xp = posXInt + i; + int yp = posYInt + j; + int zp = posZInt + k; + BlockPos posp = new BlockPos(xp, yp, zp); + if(isCheatyBlock(worldObj, posp)) { + Block block = worldObj.getBlockState(posp).getBlock(); + 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.spawnEntityInWorld(new EntityItem(worldObj, xp + 0.5, yp + 0.5, zp + 0.5, stack)); } + worldObj.setBlockToAir(posp); } - } + } - BlockPos source = getSource(); boolean hard = isHardMode(); - float range; List players = getPlayersAround(); int playerCount = getPlayerCount(); - if(worldObj.isRemote && !isPlayingMusic && !isDead && !players.isEmpty()) { - Botania.proxy.playRecordClientSided(worldObj, source, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1)); - isPlayingMusic = true; - } - - range = RANGE; - for(int i = 0; i < 360; i += 8) { - float r = 0.6F; - float g = 0F; - float b = 0.2F; - float m = 0.15F; - float mv = 0.35F; - - float rad = i * (float) Math.PI / 180F; - double x = source.getX() + 0.5 - Math.cos(rad) * range; - double y = source.getY() + 0.5; - double z = source.getZ() + 0.5 - Math.sin(rad) * range; - - Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); - } - if(players.isEmpty() && !worldObj.playerEntities.isEmpty()) setDead(); else { @@ -584,16 +592,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(player.inventory.armorInventory[0] != null || player.inventory.armorInventory[1] != null || player.inventory.armorInventory[2] != null || player.inventory.armorInventory[3] != null) anyWithArmor = true; - List remove = new ArrayList<>(); Collection active = player.getActivePotionEffects(); - for(PotionEffect effect : active) - if(effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) - remove.add(effect); + Iterator iter = active.iterator(); - active.removeAll(remove); + while (iter.hasNext()) { + PotionEffect effect = iter.next(); + if(effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) + iter.remove(); + } player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; - if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { Vector3 sourceVector = new Vector3(source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5); Vector3 playerVector = Vector3.fromEntityCenter(player); @@ -602,6 +610,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi player.motionX = motion.x; player.motionY = 0.2; player.motionZ = motion.z; + player.velocityChanged = true; } } } @@ -609,35 +618,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(isDead) return; - int invul = getInvulTime(); int mobTicks = getMobSpawnTicks(); boolean spawnMissiles = hard && ticksExisted % 15 < 4; - if(invul > 10) { - Vector3 pos = Vector3.fromEntityCenter(this).subtract(new Vector3(0, 0.2, 0)); - for(int i = 0; i < PYLON_LOCATIONS.length; i++) { - BlockPos arr = PYLON_LOCATIONS[i]; - - Vector3 pylonPos = new Vector3(source.getX() + arr.getX(), source.getY() + arr.getY(), source.getZ() + arr.getZ()); - double worldTime = ticksExisted; - worldTime /= 5; - - float rad = 0.75F + (float) Math.random() * 0.05F; - double xp = pylonPos.x + 0.5 + Math.cos(worldTime) * rad; - double zp = pylonPos.z + 0.5 + Math.sin(worldTime) * rad; - - Vector3 partPos = new Vector3(xp, pylonPos.y, zp); - Vector3 mot = pos.copy().sub(partPos).multiply(0.04); - - float r = 0.7F + (float) Math.random() * 0.3F; - float g = (float) Math.random() * 0.3F; - float b = 0.7F + (float) Math.random() * 0.3F; - - Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); - Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.4F, (float) mot.x, (float) mot.y, (float) mot.z); - } - } - if(invul > 0 && mobTicks == MOB_SPAWN_TICKS) { if(invul < SPAWN_TICKS) { if(invul > SPAWN_TICKS / 2 && worldObj.rand.nextInt(SPAWN_TICKS - invul + 1) == 0) @@ -645,10 +628,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi spawnExplosionParticle(); } - if(!worldObj.isRemote) { - setHealth(getHealth() + (getMaxHealth() - 1F) / SPAWN_TICKS); - setInvulTime(invul - 1); - } + setHealth(getHealth() + (getMaxHealth() - 1F) / SPAWN_TICKS); + setInvulTime(invul - 1); + motionY = 0; } else { if(isAggroed()) { @@ -664,7 +646,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi setInvulTime(invul + 1); } - if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobTicks > MOB_SPAWN_END_TICKS && mobTicks % MOB_SPAWN_WAVE_TIME == 0 && !worldObj.isRemote) { + if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobTicks > MOB_SPAWN_END_TICKS && mobTicks % MOB_SPAWN_WAVE_TIME == 0) { for(int pl = 0; pl < playerCount; pl++) for(int i = 0; i < 3 + worldObj.rand.nextInt(2); i++) { EntityLiving entity = null; @@ -697,6 +679,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } if(entity != null) { + if(!entity.isImmuneToFire()) + entity.addPotionEffect(new PotionEffect(MobEffects.fireResistance, 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); @@ -712,7 +696,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi setMobSpawnTicks(mobTicks - 1); setTPDelay(10); - } else if(getTPDelay() > 0 && !worldObj.isRemote) { + } else if(getTPDelay() > 0) { if(invul > 0) setInvulTime(invul - 1); @@ -786,13 +770,11 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } private void spawnMissile() { - if(!worldObj.isRemote) { - EntityMagicMissile missile = new EntityMagicMissile(this, true); - missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); - if(missile.getTarget()) { - this.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); - worldObj.spawnEntityInWorld(missile); - } + EntityMagicMissile missile = new EntityMagicMissile(this, true); + missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); + if(missile.getTarget()) { + this.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); + worldObj.spawnEntityInWorld(missile); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index a22f8c693..d62d851a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -270,7 +270,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { public boolean tick() { ++ticksExisted; - // Go through all blocks in the specified RANGE, and then + // Go through all blocks in the specified ARENA_RANGE, and then // try and spread around that block if it is our target block already for(int i = -RANGE; i <= RANGE; i++) { for(int j = -RANGE; j <= RANGE; j++) { 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 a6f22093f..2912e2b89 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -87,7 +87,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, pos, par1ItemStack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + 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); diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 9def12676..72e58fca7 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -3,7 +3,6 @@ package vazkii.botania.common.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.item.EnumDyeColor; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -14,6 +13,7 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.entity.EntityDoppleganger; public class PacketBotaniaEffect implements IMessage { @@ -99,6 +99,19 @@ public class PacketBotaniaEffect implements IMessage { } break; } + case ARENA_INDICATOR: { + for(int i = 0; i < 360; i += 8) { + float r = 1F; + float g = 0F; + float b = 1F; + float rad = i * (float) Math.PI / 180F; + double x = message.x + 0.5 - Math.cos(rad) * EntityDoppleganger.ARENA_RANGE; + double y = message.y + 0.5; + double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; + + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, x, y, z, r, g, b, 5F, 120); + } + } } }); @@ -110,7 +123,8 @@ public class PacketBotaniaEffect implements IMessage { public enum EffectType { POOL_CRAFT(0), POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting - PAINT_LENS(1); // Arg: colour + PAINT_LENS(1), // Arg: colour + ARENA_INDICATOR(0); private final int argCount; diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 706771969..0035991b5 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -43,6 +43,10 @@ public final class PacketHandler { } } + public static void sendTo(EntityPlayerMP playerMP, IMessage toSend) { + HANDLER.sendTo(toSend, playerMP); + } + private PacketHandler() {} } From 7a66a9756b731f1201a1d822263e512a4f0659be Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 May 2016 22:08:10 -0500 Subject: [PATCH 576/935] Revert stupid find replace hit --- src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index d62d851a2..a22f8c693 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -270,7 +270,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { public boolean tick() { ++ticksExisted; - // Go through all blocks in the specified ARENA_RANGE, and then + // Go through all blocks in the specified RANGE, and then // try and spread around that block if it is our target block already for(int i = -RANGE; i <= RANGE; i++) { for(int j = -RANGE; j <= RANGE; j++) { From f24409f33653a299badbef7169fafdf625066569 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 3 May 2016 11:31:59 -0500 Subject: [PATCH 577/935] Add workarounds for the silly forge light bug. Closes #221, probably closes #251 as well --- src/main/java/vazkii/botania/common/block/BlockAlfPortal.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 ++ .../botania/common/block/BlockFloatingSpecialFlower.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockLivingwood.java | 2 ++ .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 3 +++ .../vazkii/botania/common/block/decor/BlockBuriedPetals.java | 2 ++ .../vazkii/botania/common/block/decor/BlockFloatingFlower.java | 2 ++ .../java/vazkii/botania/common/block/decor/BlockManaFlame.java | 2 ++ .../vazkii/botania/common/block/decor/BlockModMushroom.java | 3 +++ .../java/vazkii/botania/common/block/decor/BlockSeaLamp.java | 3 +++ .../vazkii/botania/common/block/decor/BlockShinyFlower.java | 3 +++ 11 files changed, 27 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 18bc0e654..3c6607c23 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -83,6 +83,8 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a960db66c..9b966adac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -131,6 +131,8 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); return (tile != null && tile.hasLava) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 12d889143..5709ef7a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -85,6 +85,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + TileEntity tile = world.getTileEntity(pos); int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; if(currentLight == -1) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 445b39579..53777abf1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -87,6 +87,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 53ba12318..ba27cc36c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -171,6 +171,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 8aa5b2d83..8b0a19901 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -45,6 +45,8 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } 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 795fed648..b155cc2bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -161,6 +161,8 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } 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 dd4e2ab4c..b1e351e31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -61,6 +61,8 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } 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 c73ae2d33..5318d0c78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -119,6 +119,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } 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 c24e6e739..022e4a7ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -40,6 +40,9 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 1b058664c..9520a9050 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -38,6 +38,9 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } From a0d251fafd6f963f914c81cc4ebff0127a16dd32 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 3 May 2016 12:38:52 -0500 Subject: [PATCH 578/935] Update forge and close #245 --- build.properties | 2 +- .../botania/common/brew/potion/PotionMod.java | 47 +++++++++++++++---- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/build.properties b/build.properties index c1aa7139e..045eecac4 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9 -forge_version=12.16.0.1865-1.9 +forge_version=12.16.0.1882-1.9 build_number=303 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index a54969417..0eef0873e 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -11,8 +11,13 @@ package vazkii.botania.common.brew.potion; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -23,20 +28,13 @@ import vazkii.botania.common.lib.LibMisc; public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); + private final int iconIndex; public PotionMod(String name, boolean badEffect, int color, int iconIndex) { super(badEffect, color); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setPotionName("botania.potion." + name); - setIconIndex(iconIndex % 8, iconIndex / 8); - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(resource); - - return super.getStatusIconIndex(); + this.iconIndex = iconIndex; } public boolean hasEffect(EntityLivingBase entity) { @@ -47,4 +45,35 @@ public class PotionMod extends Potion { return entity.getActivePotionEffect(potion) != null; } + @Override + @SideOnly(Side.CLIENT) + public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) { + render(x + 6, y + 7, 1); + } + + @Override + @SideOnly(Side.CLIENT) + public void renderHUDEffect(int x, int y, PotionEffect effect, Minecraft mc, float alpha) { + render(x + 3, y + 3, alpha); + } + + @SideOnly(Side.CLIENT) + private void render(int x, int y, float alpha) { + Minecraft.getMinecraft().renderEngine.bindTexture(resource); + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer buf = tessellator.getBuffer(); + buf.begin(7, DefaultVertexFormats.POSITION_TEX); + GlStateManager.color(1, 1, 1, alpha); + + int textureX = iconIndex % 8 * 18; + int textureY = 198 + iconIndex / 8 * 18; + + buf.pos(x, y + 18, 0).tex(textureX * 0.00390625, (textureY + 18) * 0.00390625).endVertex(); + buf.pos(x + 18, y + 18, 0).tex((textureX + 18) * 0.00390625, (textureY + 18) * 0.00390625).endVertex(); + buf.pos(x + 18, y, 0).tex((textureX + 18) * 0.00390625, textureY * 0.00390625).endVertex(); + buf.pos(x, y, 0).tex(textureX * 0.00390625, textureY * 0.00390625).endVertex(); + + tessellator.draw(); + } + } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 25dc59f0d..832a0b601 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.16.0.1874,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9]"; // Network Contants From 2d412ac70f074dbbe31fbf16b47bf7c3724aac14 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 May 2016 18:38:09 -0500 Subject: [PATCH 579/935] Various cleanups, updated alt textures to 1.9 --- ...lternate_textures_futureazoo_1.8andbelow.zip} | Bin alt_resources/pack.mcmeta | 2 +- .../core/handler/MultiblockRenderHandler.java | 15 --------------- .../client/render/entity/RenderPinkWither.java | 12 +++--------- .../common/crafting/ModCraftingRecipes.java | 3 +-- .../common/crafting/ModManaAlchemyRecipes.java | 2 +- .../botania/common/entity/EntityPinkWither.java | 7 +++++++ 7 files changed, 13 insertions(+), 28 deletions(-) rename alt_resources/{alternate_textures_futureazoo.zip => alternate_textures_futureazoo_1.8andbelow.zip} (100%) diff --git a/alt_resources/alternate_textures_futureazoo.zip b/alt_resources/alternate_textures_futureazoo_1.8andbelow.zip similarity index 100% rename from alt_resources/alternate_textures_futureazoo.zip rename to alt_resources/alternate_textures_futureazoo_1.8andbelow.zip diff --git a/alt_resources/pack.mcmeta b/alt_resources/pack.mcmeta index d2be44e4a..6efa38a56 100644 --- a/alt_resources/pack.mcmeta +++ b/alt_resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 1, + "pack_format": 2, "description": "Alternate Botania textures by Futureazoo" } } \ No newline at end of file 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 19ae88e8b..e26a53584 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -66,21 +66,6 @@ public final class MultiblockRenderHandler { return true; } }); - - // TODO also a temporary shim for same reason as above - IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() { - @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { - GlStateManager.translate(-0.5F, -0.5F, 0.5F); - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState()); - Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false); - } - - @Override - public boolean needsTranslate(IBlockState state) { - return true; - } - }); } public static void setMultiblock(MultiblockSet set) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 8e230cd98..5dc0f46e0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -14,6 +14,9 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.lib.LibResources; public class RenderPinkWither extends RenderWither { @@ -24,15 +27,6 @@ public class RenderPinkWither extends RenderWither { super(p_i46130_1_); } - @Override - public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - /*if(BossStatus.bossName.equals(p_76986_1_.getDisplayName().getFormattedText())) { todo 1.9 - BossStatus.statusBarTime = -1; - BossStatus.hasColorModifier = false; - }*/ - } - @Override protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { return resource; diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index af3d54972..1330c4230 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1747,7 +1747,6 @@ public final class ModCraftingRecipes { recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); // 1.8 Stone Chiseling - // todo remove when Quark adds these? if (Botania.quarkLoaded) { recipe18StoneChisel = new ArrayList<>(); ItemStack[] quarkBlocks = { @@ -2223,7 +2222,7 @@ public final class ModCraftingRecipes { 'Q', od)); GameRegistry.addRecipe(new ItemStack(block, 1, meta), "Q", "Q", - 'Q', new ItemStack(slab)); // TODO this causes conflicts between the brick slab -> brick restoration recipe and the brick slab -> chiseled brick recipe + 'Q', new ItemStack(slab)); } private static void addWall(Block block, int blockMeta, Block wall, int wallMeta) { diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index c494ee84c..19c28020f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -133,7 +133,7 @@ public final class ModManaAlchemyRecipes { if(ConfigHandler.stones18Enabled) { stoneRecipes = new ArrayList<>(); - stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite todo 1.8.8 might want to un-OD this? + 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 diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 74eeff225..2b55f3f43 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -16,6 +16,7 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; @@ -80,6 +81,12 @@ public class EntityPinkWither extends EntityWither { // NO-OP } + @Override + public void setBossVisibleTo(EntityPlayerMP player) + { + // NO-OP + } + // COPYPASTA private double func_82214_u(int p_82214_1_) From 7dcd0281b890498187b62f03f6ee6c89933dd749 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 May 2016 18:58:15 -0500 Subject: [PATCH 580/935] Actually commit new zip --- .../alternate_textures_futureazoo.zip | Bin 0 -> 340061 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 alt_resources/alternate_textures_futureazoo.zip diff --git a/alt_resources/alternate_textures_futureazoo.zip b/alt_resources/alternate_textures_futureazoo.zip new file mode 100644 index 0000000000000000000000000000000000000000..243e513d99d23ac58b74680119152906ae350518 GIT binary patch literal 340061 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𝔪Mm{khv5$=N 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 z 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
  • int time - The amount of total ticks elapsed.
  • - *
  • int startX - The U coordinate passed in for the render of this bar's texture.
  • - *
  • int startY - The V coordinate passed in for the render of this bar's texture.
  • - */ -public interface IBotaniaBossWithShader extends IBotaniaBoss { - - /** - * The Shader Program to use for this boss bar. Return 0 case - * you don't want a shader to be used. You can use separate shaders - * for the background and foreground. - * @param background True if rendering the background of the boss bar, - * false if rendering the bar itself that shows the HP. - */ - public int getBossBarShaderProgram(boolean background); - - /** - * A callback for the shader, used to pass in uniforms. Return null for no callback. - */ - public ShaderCallback getBossBarShaderCallback(boolean background, int shader); - -} diff --git a/src/main/java/vazkii/botania/api/item/IDyablePool.java b/src/main/java/vazkii/botania/api/item/IDyablePool.java deleted file mode 100644 index c5137266d..000000000 --- a/src/main/java/vazkii/botania/api/item/IDyablePool.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 18, 2015, 12:20:44 AM (GMT)] - */ -package vazkii.botania.api.item; - - -import net.minecraft.item.EnumDyeColor; - -/** - * Used to define a Mana Pool that can be dyed through floral powder. - */ -public interface IDyablePool { - - public EnumDyeColor getColor(); - - public void setColor(EnumDyeColor color); - - -} diff --git a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java deleted file mode 100644 index 61aee3553..000000000 --- a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 30, 2015, 1:43:17 PM (GMT)] - */ -package vazkii.botania.api.item; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; - -/** - * An extension of IWireframeCoordinateListProvider that allows for - * rendering a single thicker wireframe. - */ -public interface IExtendedWireframeCoordinateListProvider extends IWireframeCoordinateListProvider { - - /** - * Gets the source wireframe to draw, this one will be drawn thicker. - */ - public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack); - -} diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index efa39d191..91786ad12 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -29,4 +29,12 @@ public interface IWireframeCoordinateListProvider { */ public List getWireframesToDraw(EntityPlayer player, ItemStack stack); + /** + * Gets a wireframe to draw thicker than the rest. + * This is useful to indicate the precedence of some position over the others. + * @return The position of a single wireframe to draw thicker than all the others. + */ + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack); + + } diff --git a/src/main/java/vazkii/botania/api/mana/IDirectioned.java b/src/main/java/vazkii/botania/api/mana/IDirectioned.java index ff856f774..49fc53ccd 100644 --- a/src/main/java/vazkii/botania/api/mana/IDirectioned.java +++ b/src/main/java/vazkii/botania/api/mana/IDirectioned.java @@ -17,8 +17,32 @@ package vazkii.botania.api.mana; */ public interface IDirectioned { + /** + * @return The X rotation, in degrees + */ public float getRotationX(); + /** + * @return The Y rotation, in degrees + */ public float getRotationY(); + /** + * Set the X rotation + * @param rot X rotation, in degrees + */ + public void setRotationX(float rot); + + /** + * Set the Y rotation + * @param rot Y rotation, in degrees + */ + public void setRotationY(float rot); + + /** + * This should be called after rotation setting is done to allow + * for the block to re-calculate. + */ + public void commitRedirection(); + } diff --git a/src/main/java/vazkii/botania/api/mana/IIdentifiable.java b/src/main/java/vazkii/botania/api/mana/IIdentifiable.java deleted file mode 100644 index 65f2edc02..000000000 --- a/src/main/java/vazkii/botania/api/mana/IIdentifiable.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 19, 2015, 10:05:24 PM (GMT)] - */ -package vazkii.botania.api.mana; - -import java.util.UUID; - -/** - * This interface marks a TileEntity that can be identified through - * an UUID. This UUID must presist between sessions. - */ -public interface IIdentifiable { - - public UUID getIdentifier(); - -} diff --git a/src/main/java/vazkii/botania/api/mana/IManaPool.java b/src/main/java/vazkii/botania/api/mana/IManaPool.java index df523a62c..e6df9ff7c 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaPool.java +++ b/src/main/java/vazkii/botania/api/mana/IManaPool.java @@ -10,6 +10,8 @@ */ package vazkii.botania.api.mana; +import net.minecraft.item.EnumDyeColor; + /** * Any TileEntity that implements this is considered a Mana Pool, * by which nearby functional flowers will pull mana from it.
    @@ -27,4 +29,15 @@ public interface IManaPool extends IManaReceiver { */ public boolean isOutputtingPower(); + /** + * @return The color of this pool. + */ + public EnumDyeColor getColor(); + + /** + * Sets the color of this pool. + * @param color The color to set. + */ + public void setColor(EnumDyeColor color); + } diff --git a/src/main/java/vazkii/botania/api/mana/IPingable.java b/src/main/java/vazkii/botania/api/mana/IPingable.java index c8532bc23..dec5fe57d 100644 --- a/src/main/java/vazkii/botania/api/mana/IPingable.java +++ b/src/main/java/vazkii/botania/api/mana/IPingable.java @@ -18,7 +18,7 @@ import java.util.UUID; * This describes an interface of a Mana Sender block that should be able to pingbackable * by a burst to tell it that the burst is still alive. */ -public interface IPingable extends IIdentifiable { +public interface IPingable { /** * Pings this object back, telling it that the burst passed in is still alive @@ -28,4 +28,9 @@ public interface IPingable extends IIdentifiable { */ public void pingback(IManaBurst burst, UUID expectedIdentity); + /** + * @return A unique and persistent identifier for this IPingable + */ + public UUID getIdentifier(); + } diff --git a/src/main/java/vazkii/botania/api/mana/IRedirectable.java b/src/main/java/vazkii/botania/api/mana/IRedirectable.java deleted file mode 100644 index 00a1b6aa7..000000000 --- a/src/main/java/vazkii/botania/api/mana/IRedirectable.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [15/11/2015, 19:28:18 (GMT)] - */ -package vazkii.botania.api.mana; - -/** - * This is an extension of IDirectioned for TileEntities - * that allow for their rotation to be public and modifiable outside. - * This is used in botania for the Redirective mana lens. - */ -public interface IRedirectable extends IDirectioned { - - public void setRotationX(float rot); - - public void setRotationY(float rot); - - /** - * This should be called after rotation setting is done to allow - * for the block to re-calculate. - */ - public void commitRedirection(); -} diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 6e396f647..8a78d6fe3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -11,23 +11,17 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.helper.MathHelper; import java.awt.*; import java.util.HashSet; @@ -75,13 +69,12 @@ public final class BossBarHandler { } private static void drawBar(IBotaniaBoss currentBoss, int x, int y, int u, int v, int w, int h, boolean bg) { - boolean useShader = currentBoss instanceof IBotaniaBossWithShader; - if(useShader) { - IBotaniaBossWithShader shader = (IBotaniaBossWithShader) currentBoss; - int program = shader.getBossBarShaderProgram(bg); - ShaderCallback callback = program == 0 ? null : shader.getBossBarShaderCallback(bg, program); - barUniformCallback.set(u, v, callback); + int program = currentBoss.getBossBarShaderProgram(bg); + boolean useShader = program > 0; + if(useShader) { + ShaderCallback callback = currentBoss.getBossBarShaderCallback(bg, program); + barUniformCallback.set(u, v, callback); ShaderHelper.useShader(program, barUniformCallback); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index e421c3501..752a28cf9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -30,7 +30,6 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.CombinedInvWrapper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; @@ -77,11 +76,9 @@ public final class BoundTileRenderer { for(BlockPos coords : coordsList) renderBlockOutlineAt(coords, color); - if(stackInSlot.getItem() instanceof IExtendedWireframeCoordinateListProvider) { - BlockPos coords = ((IExtendedWireframeCoordinateListProvider) stackInSlot.getItem()).getSourceWireframe(player, stackInSlot); - if(coords != null && coords.getY() > -1) - renderBlockOutlineAt(coords, color, 5F); - } + BlockPos coords = provider.getSourceWireframe(player, stackInSlot); + if(coords != null && coords.getY() > -1) + renderBlockOutlineAt(coords, color, 5F); } } 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 9f84b7608..1369dcab5 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 @@ -34,7 +34,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.item.IDyablePool; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IKeyLocked; import vazkii.botania.api.mana.IManaItem; @@ -48,7 +47,6 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; @@ -66,7 +64,7 @@ import vazkii.botania.common.network.PacketHandler; import java.awt.*; import java.util.List; -public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { +public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; 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 08012084c..db14e56b6 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 @@ -37,6 +37,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; +import vazkii.botania.api.mana.IDirectioned; import vazkii.botania.api.mana.IKeyLocked; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; @@ -45,7 +46,6 @@ import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.api.mana.IRedirectable; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.sound.BotaniaSoundEvents; @@ -65,7 +65,7 @@ import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; import java.util.List; import java.util.UUID; -public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { +public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IDirectioned, ITickable { private static final int MAX_MANA = 1000; private static final int ULTRA_MAX_MANA = 6400; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 944c17ff3..7fa1a3ead 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -61,7 +61,7 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.ARBShaderObjects; -import vazkii.botania.api.boss.IBotaniaBossWithShader; +import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -90,7 +90,7 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; -public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { +public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { public static final float ARENA_RANGE = 12F; private static final int SPAWN_TICKS = 160; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 941f6a90d..d0c10132c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; @@ -228,6 +229,14 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte return false; } + @Override + public EnumDyeColor getColor() { + return EnumDyeColor.WHITE; + } + + @Override + public void setColor(EnumDyeColor color) {} + } @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index c739430ba..2e36da093 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.IRedirectable; +import vazkii.botania.api.mana.IDirectioned; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.common.core.helper.Vector3; @@ -28,9 +28,9 @@ public class LensRedirect extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if(!entity.worldObj.isRemote && pos.entityHit == null && coords.getY() != -1 && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); - if(tile != null && tile instanceof IRedirectable) { + if(tile != null && tile instanceof IDirectioned) { if(!burst.isFake()) { - IRedirectable redir = (IRedirectable) tile; + IDirectioned redir = (IDirectioned) tile; Vector3 tileVec = Vector3.fromTileEntityCenter(tile); Vector3 sourceVec = new Vector3(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); 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 9f66bda8d..0f78c5b40 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -25,7 +25,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.item.IDyablePool; +import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; @@ -47,10 +47,10 @@ public class ItemDye extends Item16Colors { } TileEntity tile = par3World.getTileEntity(pos); - if(tile instanceof IDyablePool) { - IDyablePool dyable = (IDyablePool) tile; - if(color != dyable.getColor()) { - dyable.setColor(color); + if(tile instanceof IManaPool) { + IManaPool pool = (IManaPool) tile; + if(color != pool.getColor()) { + pool.setColor(color); par1ItemStack.stackSize--; return EnumActionResult.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 20db4643b..528f53fe0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -29,7 +29,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -41,7 +40,7 @@ import vazkii.botania.common.lib.LibItemNames; import java.util.List; import java.util.UUID; -public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { +public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, ICraftAchievement { private final Multimap attributes = HashMultimap.create(); @@ -101,7 +100,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe @Override public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack) { - return ((IExtendedWireframeCoordinateListProvider) ModItems.lokiRing).getSourceWireframe(player, stack); + return ((IWireframeCoordinateListProvider) ModItems.lokiRing).getSourceWireframe(player, stack); } @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 812b1838a..b51a0b508 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -36,8 +36,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.ISequentialBreaker; +import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -48,7 +48,7 @@ import vazkii.botania.common.lib.LibItemNames; import java.util.ArrayList; import java.util.List; -public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem { +public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; private static final String TAG_CURSOR_PREFIX = "cursor"; 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 8e3b129c0..c53eaf977 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -419,4 +419,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return ImmutableList.of(); } + @Override + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack) { + return null; + } + } From be1eb570effd2c192f99d7337d451a28f685a0e8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 23:50:00 -0500 Subject: [PATCH 589/935] More minor cleaning --- .../botania/api/item/IFlowerPlaceable.java | 12 +++-- .../functional/SubTileRannuncarpus.java | 51 +++++++------------ 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index f0e636c06..bfdf24789 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -9,7 +9,7 @@ * File Created @ [17/11/2015, 20:10:53 (GMT)] */ package vazkii.botania.api.item; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.subtile.SubTileEntity; @@ -20,9 +20,15 @@ import vazkii.botania.api.subtile.SubTileEntity; public interface IFlowerPlaceable { /** - * Gets the block to be placed, return null to not place anything. + * Gets the state to be placed, return null to not place anything. */ - public Block getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); + public IBlockState getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); + /** + * Called after the block is placed. + * @param stack The stack that was placed. + * @param flower The flower doing the placing. + * @param pos The position that was placed at. + */ public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, BlockPos pos); } 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 3b39ee175..81711c293 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 @@ -27,6 +27,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; @@ -65,7 +66,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { return; if(ticksExisted % 10 == 0) { - BlockData filter = getUnderlyingBlock(); + IBlockState filter = getUnderlyingBlock(); boolean scanned = false; List validPositions = new ArrayList<>(); @@ -99,7 +100,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); Block blockAbove = stateAbove.getBlock(); - if(filter.equals(supertile.getWorld(), pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) + if(filter == supertile.getWorld().getBlockState(pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) validPositions.add(pos_.up()); } @@ -110,21 +111,21 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(!validPositions.isEmpty() && !supertile.getWorld().isRemote) { BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); - Block blockToPlace = null; + IBlockState stateToPlace = null; if(stackItem instanceof IFlowerPlaceable) - blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords); + stateToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords); if(stackItem instanceof ItemBlock) - blockToPlace = ((ItemBlock) stackItem).block; + stateToPlace = ((ItemBlock) stackItem).block.getStateFromMeta(stackItem.getMetadata(stack.getItemDamage())); else if(stackItem instanceof ItemBlockSpecial) - blockToPlace = ReflectionHelper.getPrivateValue(ItemBlockSpecial.class, (ItemBlockSpecial) stackItem, LibObfuscation.REED_ITEM); + stateToPlace = ((Block) ReflectionHelper.getPrivateValue(ItemBlockSpecial.class, (ItemBlockSpecial) stackItem, LibObfuscation.REED_ITEM)).getDefaultState(); else if(stackItem instanceof ItemRedstone) - blockToPlace = Blocks.redstone_wire; + stateToPlace = Blocks.redstone_wire.getDefaultState(); - if(blockToPlace != null) { - if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords)) { - supertile.getWorld().setBlockState(coords, blockToPlace.getStateFromMeta(stack.getItemDamage()), 1 | 2); + 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(blockToPlace.getStateFromMeta(stack.getItemDamage()))); + supertile.getWorld().playAuxSFX(2001, coords, Block.getStateId(stateToPlace)); validPositions.remove(coords); TileEntity tile = supertile.getWorld().getTileEntity(coords); @@ -141,7 +142,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(!supertile.getWorld().isRemote) { stack.stackSize--; - if(stack.stackSize == 0) + if(stack.stackSize <= 0) item.setDead(); } @@ -156,8 +157,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { } } - public BlockData getUnderlyingBlock() { - return new BlockData(supertile.getWorld(), supertile.getPos().down(supertile instanceof IFloatingFlower ? 1 : 2)); + public IBlockState getUnderlyingBlock() { + return supertile.getWorld().getBlockState(supertile.getPos().down(supertile instanceof IFloatingFlower ? 1 : 2)); } @Override @@ -169,8 +170,8 @@ public class SubTileRannuncarpus extends SubTileFunctional { public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); - BlockData filter = getUnderlyingBlock(); - ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.state.getBlock()), 1, filter.state.getBlock().getMetaFromState(filter.state)); + IBlockState filter = getUnderlyingBlock(); + ItemStack recieverStack = new ItemStack(Item.getItemFromBlock(filter.getBlock()), 1, filter.getBlock().getMetaFromState(filter)); int color = getColor(); GlStateManager.enableBlend(); @@ -224,22 +225,4 @@ public class SubTileRannuncarpus extends SubTileFunctional { @Override public int getRangeY() { return RANGE_PLACE_Y_MINI; } } - static class BlockData { - - final IBlockState state; - - public BlockData(World world, BlockPos pos) { - state = world.getBlockState(pos); - } - - public boolean equals(BlockData data) { - return this.state == data.state; - } - - public boolean equals(World world, BlockPos pos) { - return equals(new BlockData(world, pos)); - } - - } - } From 4231dc839f7731c4a375f9ac2c35325f8957c933 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 7 May 2016 11:56:57 -0500 Subject: [PATCH 590/935] Add reverse petal block recipes --- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 6 ++++++ .../java/vazkii/botania/common/lexicon/LexiconData.java | 3 ++- src/main/resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1330c4230..d73ec0eee 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -52,6 +52,7 @@ public final class ModCraftingRecipes { public static List recipesDyes; public static List recipesDyesVanilla; public static List recipesPetalBlocks; + public static List recipesReversePetalBlocks; public static IRecipe recipePestleAndMortar; public static List recipesTwigWand; public static List recipesApothecary; @@ -353,6 +354,11 @@ public final class ModCraftingRecipes { 'P', LibOreDict.PETAL[i]); recipesPetalBlocks = BotaniaAPI.getLatestAddedRecipes(16); + // Reverse Petal Block + for(int i = 0; i < 16; i++) + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.petal, 9, i), new ItemStack(ModBlocks.petalBlock, 1, i)); + recipesReversePetalBlocks = BotaniaAPI.getLatestAddedRecipes(16); + // Pestle and Mortar Recipe addOreDictRecipe(new ItemStack(ModItems.pestleAndMortar), " S", "W ", "B ", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index acf56a7c9..321c6db5c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -334,7 +334,8 @@ public final class LexiconData { new PageCraftingRecipe("7", ModCraftingRecipes.recipeFertilizerPowder), new PageCraftingRecipe("8", ModCraftingRecipes.recipeFerilizerDye), new PageText("10"), new PageText("12"), new PageCraftingRecipe("11", ModCraftingRecipes.recipesPetalsDouble), - new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks)) + new PageCraftingRecipe("9", ModCraftingRecipes.recipesPetalBlocks), + new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks)) .setIcon(new ItemStack(ModBlocks.flower, 1, 6)); apothecary = new BLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 08ff8eece..f7f6719f9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2030,6 +2030,7 @@ botania.page.flowers10=There's also some taller variants of the typical &1Mystic botania.page.flowers12=Tall flower variants can be made manually by fertilizing a &1Mystical Flower&0 or a &1Buried Petal&0 with &1Bone Meal&0.
    If you find yourself running low on a particular color, try burying a petal of that color and using &1Bone Meal&0 on it. botania.page.flowers11=Prepare for trouble botania.page.flowers9=Petals can also be made into blocks +botania.page.flowers13=And the other way around # -- PETAL APOTHECARY botania.entry.apothecary=Petal Apothecary From 2f292ed3be9c7e06d9a572cc192f4a566a0c97b3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 7 May 2016 22:29:46 -0500 Subject: [PATCH 591/935] Fix #271 incense rendering --- .../render/tile/RenderTileIncensePlate.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 7e3e7c1ae..4ea0bd986 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -34,7 +34,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer Date: Sat, 7 May 2016 22:32:09 -0500 Subject: [PATCH 592/935] Fix #266 log spam --- src/main/resources/assets/botania/models/block/pylon.mtl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/models/block/pylon.mtl b/src/main/resources/assets/botania/models/block/pylon.mtl index 06fc90146..ad5f776b4 100644 --- a/src/main/resources/assets/botania/models/block/pylon.mtl +++ b/src/main/resources/assets/botania/models/block/pylon.mtl @@ -1,2 +1,2 @@ newmtl pylon -map_Kd botania:pylon \ No newline at end of file +map_Kd botania:model/pylon \ No newline at end of file From dc8104f68bb8a0b3c772330fc0162e05f1c7d5e5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 11:55:50 -0500 Subject: [PATCH 593/935] Preliminary work on new loot system --- build.properties | 2 +- .../common/core/handler/ChestGenHandler.java | 50 ------------------- .../botania/common/core/loot/LootHandler.java | 43 ++++++++++++++-- .../common/core/proxy/CommonProxy.java | 5 +- .../vazkii/botania/common/lib/LibMisc.java | 2 +- .../botania/loot_tables/gaia_guardian.json | 4 +- .../botania/loot_tables/gaia_guardian_2.json | 24 +++++---- .../inject/abandoned_mineshaft.json | 19 +++++++ .../loot_tables/inject/desert_pyramid.json | 19 +++++++ .../loot_tables/inject/jungle_temple.json | 19 +++++++ .../loot_tables/inject/simple_dungeon.json | 35 +++++++++++++ .../loot_tables/inject/spawn_bonus_chest.json | 19 +++++++ .../inject/stronghold_corridor.json | 25 ++++++++++ .../inject/village_blacksmith.json | 13 +++++ 14 files changed, 206 insertions(+), 73 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java create mode 100644 src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json create mode 100644 src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json diff --git a/build.properties b/build.properties index 7ef34dcbc..a7f6a5d65 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9 -forge_version=12.16.1.1888 +forge_version=12.16.1.1898 build_number=303 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java deleted file mode 100644 index 100d6ac4b..000000000 --- a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 15, 2014, 3:17:00 PM (GMT)] - */ -package vazkii.botania.common.core.handler; - -public final class ChestGenHandler { - - public static void init() { - /* todo loot tables - String c = ChestGenHooks.BONUS_CHEST; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.lexicon), 1, 1, 7)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 1)); - - c = ChestGenHooks.STRONGHOLD_CORRIDOR; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 1), 1, 1, 8)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 1), 1, 3, 2)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); - - c = ChestGenHooks.DUNGEON_CHEST; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 0), 1, 5, 9)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.lexicon), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaBottle), 1, 1, 5)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); - - c = ChestGenHooks.PYRAMID_DESERT_CHEST; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); - - c = ChestGenHooks.MINESHAFT_CORRIDOR; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); - - c = ChestGenHooks.PYRAMID_JUNGLE_CHEST; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.overgrowthSeed), 1, 1, 2)); - - c = ChestGenHooks.VILLAGE_BLACKSMITH; - ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6));*/ - } - -} diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index b7ad5a5ba..98995349d 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -1,21 +1,56 @@ package vazkii.botania.common.core.loot; +import com.google.common.collect.ImmutableList; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootEntry; +import net.minecraft.world.storage.loot.LootEntryTable; +import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.LootTableList; +import net.minecraft.world.storage.loot.RandomValueRange; +import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; +import net.minecraftforge.event.LootTableLoadEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibMisc; +import java.util.List; + public final class LootHandler { - public static void init() { - LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian")); - LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_2")); + private static final List TABLES = ImmutableList.of( + "gaia_guardian", "gaia_guardian_2", + "inject/abandoned_mineshaft", "inject/desert_pyramid", + "inject/jungle_temple", "inject/simple_dungeon", + "inject/spawn_bonus_chest", "inject/stronghold_corridor", + "inject/village_blacksmith" + ); + + public LootHandler() { + for (String s : TABLES) { + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, s)); + } + LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); LootConditionManager.registerCondition(new EnableRelics.Serializer()); LootFunctionManager.registerFunction(new BindUuid.Serializer()); } - private LootHandler() {} + @SubscribeEvent + public void lootLoad(LootTableLoadEvent evt) { + switch (evt.getName().toString()) { + case "minecraft:chests/spawn_bonus_chest": break; + case "minecraft:chests/stronghold_corridor": break; + case "minecraft:chests/simple_dungeon": break; + case "minecraft:chests/desert_pyramid": break; + case "minecraft:chests/abandoned_mineshaft": break; + case "minecraft:chests/jungle_temple": break; + case "minecraft:chests/village_blacksmith": break; + } + } + + private LootEntryTable getInjectEntry(String name) { + return new LootEntryTable(new ResourceLocation(LibMisc.MOD_ID, "inject/" + name), 1, 0, new LootCondition[0], "botania_inject"); + } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index bf43f34f5..40791a585 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -56,7 +56,6 @@ import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; import vazkii.botania.common.core.command.CommandSkyblockSpread; import vazkii.botania.common.core.handler.BiomeDecorationHandler; -import vazkii.botania.common.core.handler.ChestGenHandler; import vazkii.botania.common.core.handler.CommonTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; @@ -114,9 +113,6 @@ public class CommonProxy { ModMultiblocks.init(); ModBanners.init(); - ChestGenHandler.init(); - LootHandler.init(); - if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); } @@ -142,6 +138,7 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new SheddingHandler()); MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); + MinecraftForge.EVENT_BUS.register(new LootHandler()); if(Botania.gardenOfGlassLoaded) MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 832a0b601..8fbfd3f29 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.0.1874,];required-after:Baubles;after:Thaumcraft"; + 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]"; // Network Contants diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json index e71ed2c84..cfbe1b6a9 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json @@ -1,7 +1,7 @@ { "pools": [ { - "__comment": "Life essence", + "name": "life_essence", "conditions": [{ "condition": "killed_by_player" }], "rolls": 1, "entries": [{ @@ -19,7 +19,7 @@ }] }, { - "__comment": "Music disc", + "name": "music_disc", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.2 } diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index 6333c1071..98e512975 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -1,7 +1,7 @@ { "pools": [ { - "__comment": "Life essence", + "name": "life_essence", "conditions": [{ "condition": "killed_by_player" }], "rolls": 1, "entries": [{ @@ -19,7 +19,7 @@ }] }, { - "__comment": "Black Lotuses", + "name": "black_lotuses", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.5 } @@ -28,6 +28,7 @@ "entries": [ { "type": "item", + "entryName": "superBlackLotus", "name": "botania:blackLotus", "weight": 3, "quality": 1, @@ -38,6 +39,7 @@ }, { "type": "item", + "entryName": "normalBlackLotus", "name": "botania:blackLotus", "weight": 7, "functions": [ @@ -48,7 +50,7 @@ ] }, { - "__comment": "Ancient wills", + "name": "ancient_wills", "conditions": [{ "condition": "killed_by_player" }], "rolls": 1, "entries": [{ @@ -58,7 +60,7 @@ }] }, { - "__comment": "Overgrowth seeds", + "name": "overgrowth_seeds", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.25 } @@ -71,7 +73,7 @@ }] }, { - "__comment": "Manasteel", + "name": "manasteel", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.9 } @@ -84,7 +86,7 @@ }] }, { - "__comment": "Mana pearl", + "name": "mana_pearl", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.7 } @@ -100,7 +102,7 @@ }] }, { - "__comment": "Mana diamond", + "name": "mana_diamond", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.5 } @@ -116,7 +118,7 @@ }] }, { - "__comment": "Runes", + "name": "runes", "conditions": [{ "condition": "killed_by_player" }], "rolls": { "min": 1, "max": 6 }, "entries": [{ @@ -130,7 +132,7 @@ }] }, { - "__comment": "Pinkinator", + "name": "pinkinator", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.2 } @@ -142,7 +144,7 @@ }] }, { - "__comment": "Music discs", + "name": "music_discs", "conditions": [ { "condition": "killed_by_player" }, { "condition": "random_chance", "chance": 0.44 } @@ -167,7 +169,7 @@ ] }, { - "__comment": "Relics", + "name": "relics", "conditions": [ { "condition": "killed_by_player" }, { "condition": "botania:enable_relics" } diff --git a/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json b/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json new file mode 100644 index 000000000..8f144da13 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json @@ -0,0 +1,19 @@ +{ + "__comment": "This table is injected into minecraft:chests/abandoned_mineshaft", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus", + "weight": 6 + }, + { + "type": "item", + "name": "botania:overgrowthSeed", + "weight": 2 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json b/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json new file mode 100644 index 000000000..eba4a58e3 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json @@ -0,0 +1,19 @@ +{ + "__comment": "This table is injected into minecraft:chests/desert_pyramid", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus", + "weight": 6 + }, + { + "type": "item", + "name": "botania:overgrowthSeed", + "weight": 2 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json b/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json new file mode 100644 index 000000000..904bfe874 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json @@ -0,0 +1,19 @@ +{ + "__comment": "This table is injected into minecraft:chests/jungle_temple", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus", + "weight": 6 + }, + { + "type": "item", + "name": "botania:overgrowthSeed", + "weight": 2 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json b/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json new file mode 100644 index 000000000..b5763ed6b --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json @@ -0,0 +1,35 @@ +{ + "__comment": "This table is injected into minecraft:chests/simple_dungeon", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:manaResource", + "weight": 9, + "functions": [{ "function": "set_count", "count": { "min": 1, "max": 5 } }] + }, + { + "type": "item", + "name": "botania:lexicon", + "weight": 6 + }, + { + "type": "item", + "name": "botania:manaBottle", + "weight": 5 + }, + { + "type": "item", + "name": "botania:blackLotus", + "weight": 6 + }, + { + "type": "item", + "name": "botania:overgrowthSeed", + "weight": 2 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json b/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json new file mode 100644 index 000000000..ed91190c3 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json @@ -0,0 +1,19 @@ +{ + "__comment": "This table is injected into minecraft:chests/spawn_bonus_chest", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:lexicon", + "weight": 7 + }, + { + "type": "item", + "name": "botania:blackLotus", + "weight": 1 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json b/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json new file mode 100644 index 000000000..64f59ca43 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json @@ -0,0 +1,25 @@ +{ + "__comment": "This table is injected into minecraft:chests/stronghold_corridor", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:manaResource", + "weight": 10, + "functions": [{ "function": "set_count", "count": { "min": 1, "max": 3 } }] + }, + { + "type": "item", + "name": "botania:blackLotus", + "weight": 6 + }, + { + "type": "item", + "name": "botania:overgrowthSeed", + "weight": 2 + } + ] + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json b/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json new file mode 100644 index 000000000..dd71a90d8 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json @@ -0,0 +1,13 @@ +{ + "__comment": "This table is injected into minecraft:chests/village_blacksmith", + "pools": [{ + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus" + } + ] + }] +} \ No newline at end of file From c9445125192b21936e182ac4933be2d1765e151d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 19:11:18 -0500 Subject: [PATCH 594/935] Fix pump rendering, pool cart rendering. Made pool cart spawn particles --- .../client/render/tile/RenderTilePool.java | 12 +-- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TilePump.java | 7 +- .../common/entity/EntityPoolMinecart.java | 19 +++++ .../armatures/item/lexicon_firstperson.json | 77 ------------------- .../asms/item/lexicon_firstperson.json | 15 ---- 6 files changed, 28 insertions(+), 106 deletions(-) delete mode 100644 src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json delete mode 100644 src/main/resources/assets/botania/asms/item/lexicon_firstperson.json diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 21d0e47f2..0c20293d4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -38,7 +38,6 @@ public class RenderTilePool extends TileEntitySpecialRenderer { // Overrides for when we call this TESR without an actual pool public static PoolVariant forceVariant = PoolVariant.DEFAULT; - public static boolean forceMana = false; public static int forceManaNumber = -1; @Override @@ -63,16 +62,20 @@ public class RenderTilePool 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); + int color = 0xFFFFFF; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; if(pool != null) time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - int color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); + color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + } + + if (fab || forceManaNumber > -1) { int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; int blue = (color & 0xFF); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos())); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); } @@ -86,8 +89,6 @@ public class RenderTilePool extends TileEntitySpecialRenderer { cap = TilePool.MAX_MANA; float waterLevel = (float) mana / (float) cap * 0.4F; - if(forceMana) - waterLevel = 0.4F; float s = 1F / 16F; float v = 1F / 8F; @@ -138,7 +139,6 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); forceVariant = PoolVariant.DEFAULT; - forceMana = false; forceManaNumber = -1; } 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 1369dcab5..a270361d3 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 @@ -66,6 +66,7 @@ import java.util.List; public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { + public static final Color PARTICLE_COLOR = new Color(0x00C6FF); public static final int MAX_MANA = 1000000; public static final int MAX_MANA_DILLUTED = 10000; @@ -205,9 +206,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(worldObj.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; - Color color = new Color(0x00C6FF); if(Math.random() > particleChance) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); return; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 567ea0a3b..b6723deb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -128,7 +128,7 @@ public class TilePump extends TileMod { active = cmp.getBoolean(TAG_ACTIVE); if(worldObj != null && worldObj.isRemote) if(prevActive != active) - ;//asm.transition(active ? "moving" : "default"); + asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { @@ -139,9 +139,4 @@ public class TilePump extends TileMod { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } } - -// @Override -// public IAnimationStateMachine asm() { -// return asm; -// } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index b5ab13848..74c7b343a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -23,15 +23,19 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; +import java.awt.*; + public class EntityPoolMinecart extends EntityMinecart { private static final int TRANSFER_RATE = 10000; @@ -83,6 +87,21 @@ public class EntityPoolMinecart extends EntityMinecart { return 8; } + @Override + public void onUpdate() { + super.onUpdate(); + + if(worldObj.isRemote) { + double particleChance = 1F - (double) getMana() / (double) TilePool.MAX_MANA * 0.1; + Color color = TilePool.PARTICLE_COLOR; + double x = MathHelper.floor_double(posX); + double y = MathHelper.floor_double(posY); + double z = MathHelper.floor_double(posZ); + if(Math.random() > particleChance) + Botania.proxy.wispFX(worldObj, x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + } + } + @Override public void moveMinecartOnRail(BlockPos pos) { super.moveMinecartOnRail(pos); diff --git a/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json b/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json deleted file mode 100644 index faa380df5..000000000 --- a/src/main/resources/assets/botania/armatures/item/lexicon_firstperson.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "joints": { - "spine": { "1": [ 1.0 ] }, - "left_side": { "0": [ 1.0 ], "3": [ 1.0 ] }, - "right_side": { "2": [ 1.0 ], "6": [ 1.0 ] }, - "left_flip": { "4": [ 1.0 ] }, - "right_flip": { "5": [ 1.0 ] } - }, - "clips": { - "closed": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - }, - "open": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - }, - "opening": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - }, - "closing": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - }, - "flip_left": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - }, - "flip_right": { - "loop": false, - "joint_clips": { - "spine": [], - "left_side": [], - "right_side": [], - "left_flip": [], - "right_flip": [] - }, - "events": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json b/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json deleted file mode 100644 index 6e113890c..000000000 --- a/src/main/resources/assets/botania/asms/item/lexicon_firstperson.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parameters": {}, - "clips": { - "closed": "botania:item/lexicon_firstperson@closed", - "open": "botania:item/lexicon_firstperson@open" - }, - "states": [ "closed", "open", "opening", "closing" ], - "transitions": { - "closed": "opening", - "opening": "open", - "open": "closing", - "closing": "closed" - }, - "start_state": "closed" -} \ No newline at end of file From fb7fda6996677ac3e38651cd9ee5888ed6beb533 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 19:39:02 -0500 Subject: [PATCH 595/935] Update versionchecker links --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index f7f6719f9..8f5b2cd16 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -419,7 +419,7 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%version%"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! From 79e2ee7c0ab17ee9239958c0bfb4c8fa055ec07a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 19:54:09 -0500 Subject: [PATCH 596/935] Shim in loot table to suppress errors in public build --- .../resources/assets/botania/loot_tables/gaia_guardian_2.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index 98e512975..bcce6bebb 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -29,6 +29,7 @@ { "type": "item", "entryName": "superBlackLotus", + "EntryName": "superBlackLotus", "name": "botania:blackLotus", "weight": 3, "quality": 1, @@ -39,6 +40,7 @@ }, { "type": "item", + "EntryName": "normalBlackLotus", "entryName": "normalBlackLotus", "name": "botania:blackLotus", "weight": 7, From bf0712a75c79b14b08d37e07da6509c01e4f5fe3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 23:18:46 -0500 Subject: [PATCH 597/935] Build 302 --- build.gradle | 2 +- build.properties | 8 ++++---- .../vazkii/botania/common/block/tile/mana/TilePool.java | 5 +++-- .../vazkii/botania/common/entity/EntityDoppleganger.java | 3 ++- .../java/vazkii/botania/common/item/lens/LensPaint.java | 3 ++- .../botania/common/network/PacketBotaniaEffect.java | 4 +--- .../java/vazkii/botania/common/network/PacketHandler.java | 3 +-- version/1.9.txt | 2 +- web/versions.ini | 3 ++- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 2393f429b..55cd2fb12 100644 --- a/build.gradle +++ b/build.gradle @@ -225,7 +225,7 @@ curseforge { See https://github.com/williewillus/Botania/releases/tag/${version} """ releaseType = "beta" - addGameVersion '1.8.9' + addGameVersion '1.9' addGameVersion 'Java 8' relations { requiredLibrary 'baubles' diff --git a/build.properties b/build.properties index a7f6a5d65..ced3b5a8b 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat Apr 23 16:25:06 CDT 2016 +#Tue May 10 19:59:05 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.9 forge_version=12.16.1.1898 -build_number=303 +mc_version=1.9 +dir_repo=./ +build_number=304 mod_name=Botania 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 a270361d3..049e50ca6 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 @@ -58,6 +58,7 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -193,7 +194,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } PacketHandler.sendToNearby(worldObj, getPos(), - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); + new PacketBotaniaEffect(EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); } @Override @@ -266,7 +267,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(didSomething) { if(ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) { PacketHandler.sendToNearby(worldObj, getPos(), - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); + new PacketBotaniaEffect(EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); } isDoingTransfer = outputting; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 7fa1a3ead..4b50f9809 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -78,6 +78,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -189,7 +190,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(!hasProperArena(world, pos)) { PacketHandler.sendTo((EntityPlayerMP) player, - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); + new PacketBotaniaEffect(EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); return false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index eb078e490..c55ed02b0 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -23,6 +23,7 @@ import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; +import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -77,7 +78,7 @@ public class LensPaint extends Lens { && BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) { entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); PacketHandler.sendToNearby(entity.worldObj, coords, - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); + new PacketBotaniaEffect(EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); } } } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 72e58fca7..bd2d9854c 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -117,10 +117,9 @@ public class PacketBotaniaEffect implements IMessage { return null; } - } - public enum EffectType { + private enum EffectType { POOL_CRAFT(0), POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting PAINT_LENS(1), // Arg: colour @@ -131,7 +130,6 @@ public class PacketBotaniaEffect implements IMessage { EffectType(int argCount) { this.argCount = argCount; } - } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 0035991b5..93bf4b7f1 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -1,6 +1,5 @@ package vazkii.botania.common.network; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.management.PlayerManager; @@ -17,7 +16,7 @@ public final class PacketHandler { private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.MOD_ID); public static void init() { - HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT); + HANDLER.registerMessage(HandlerBotaniaEffect.class, PacketBotaniaEffect.class, 0, Side.CLIENT); } /** diff --git a/version/1.9.txt b/version/1.9.txt index 91aa6a95e..074a5a83d 100644 --- a/version/1.9.txt +++ b/version/1.9.txt @@ -1 +1 @@ -r1.8-302 \ No newline at end of file +r1.8-303 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index ac21559e6..201be5c13 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -251,4 +251,5 @@ r1.8-299=1.8.9 r1.8-299=1.8.9 r1.8-300=1.9 r1.8-301=1.9 -r1.8-302=1.9 \ No newline at end of file +r1.8-302=1.9 +r1.8-303=1.9 \ No newline at end of file From ae71a4756c9a2e33837f2760e9f93a95172c786a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 23:21:38 -0500 Subject: [PATCH 598/935] I messed that up >.>. Fix server crash on startup #272 --- .../common/block/tile/mana/TilePool.java | 6 +- .../common/entity/EntityDoppleganger.java | 3 +- .../botania/common/item/lens/LensPaint.java | 4 +- .../common/network/PacketBotaniaEffect.java | 94 ++++++++++--------- .../botania/common/network/PacketHandler.java | 2 +- 5 files changed, 54 insertions(+), 55 deletions(-) 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 049e50ca6..41c4cde84 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 @@ -55,10 +55,8 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -194,7 +192,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } PacketHandler.sendToNearby(worldObj, getPos(), - new PacketBotaniaEffect(EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); } @Override @@ -267,7 +265,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(didSomething) { if(ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) { PacketHandler.sendToNearby(worldObj, getPos(), - new PacketBotaniaEffect(EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); } isDoingTransfer = outputting; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4b50f9809..7fa1a3ead 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -78,7 +78,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -190,7 +189,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(!hasProperArena(world, pos)) { PacketHandler.sendTo((EntityPlayerMP) player, - new PacketBotaniaEffect(EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); return false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index c55ed02b0..4feebdb3e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -22,8 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.common.Botania; -import vazkii.botania.common.network.EffectType; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -78,7 +76,7 @@ public class LensPaint extends Lens { && BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) { entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); PacketHandler.sendToNearby(entity.worldObj, coords, - new PacketBotaniaEffect(EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); } } } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index bd2d9854c..d6512bf73 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -62,54 +62,58 @@ public class PacketBotaniaEffect implements IMessage { @Override public IMessage onMessage(final PacketBotaniaEffect message, final MessageContext ctx) { - Minecraft.getMinecraft().addScheduledTask(() -> { - switch (message.type) { - case POOL_CRAFT: { - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, - red, green, blue, (float) Math.random(), 10); + Minecraft.getMinecraft().addScheduledTask(new Runnable() { + // Use anon - lambda causes classloading issues + @Override + public void run() { + switch (message.type) { + case POOL_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, + red, green, blue, (float) Math.random(), 10); + } + break; } - break; - } - case POOL_CHARGE: { - if(ConfigHandler.chargingAnimationEnabled) { - boolean outputting = message.args[0] == 1; - BlockPos pos = new BlockPos(message.x, message.y, message.z); - Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); - Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - LightningHandler.spawnLightningBolt(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, - outputting ? itemVec : tileVec, 80, Minecraft.getMinecraft().theWorld.rand.nextLong(), 0x4400799c, 0x4400C6FF); + case POOL_CHARGE: { + if(ConfigHandler.chargingAnimationEnabled) { + boolean outputting = message.args[0] == 1; + BlockPos pos = new BlockPos(message.x, message.y, message.z); + Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); + Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); + LightningHandler.spawnLightningBolt(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, + outputting ? itemVec : tileVec, 80, Minecraft.getMinecraft().theWorld.rand.nextLong(), 0x4400799c, 0x4400C6FF); + } + break; } - break; - } - case PAINT_LENS: { - EnumDyeColor placeColor = EnumDyeColor.byMetadata(message.args[0]); - int hex = placeColor.getMapColor().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = (hex & 0xFF); - for(int i = 0; i < 10; i++) { - BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[Minecraft.getMinecraft().theWorld.rand.nextInt(6)]); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, - pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), - r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); + case PAINT_LENS: { + EnumDyeColor placeColor = EnumDyeColor.byMetadata(message.args[0]); + int hex = placeColor.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); + for(int i = 0; i < 10; i++) { + BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[Minecraft.getMinecraft().theWorld.rand.nextInt(6)]); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, + pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), + r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); + } + break; } - break; - } - case ARENA_INDICATOR: { - for(int i = 0; i < 360; i += 8) { - float r = 1F; - float g = 0F; - float b = 1F; - float rad = i * (float) Math.PI / 180F; - double x = message.x + 0.5 - Math.cos(rad) * EntityDoppleganger.ARENA_RANGE; - double y = message.y + 0.5; - double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; + case ARENA_INDICATOR: { + for(int i = 0; i < 360; i += 8) { + float r = 1F; + float g = 0F; + float b = 1F; + float rad = i * (float) Math.PI / 180F; + double x = message.x + 0.5 - Math.cos(rad) * EntityDoppleganger.ARENA_RANGE; + double y = message.y + 0.5; + double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, x, y, z, r, g, b, 5F, 120); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, x, y, z, r, g, b, 5F, 120); + } } } } @@ -119,7 +123,7 @@ public class PacketBotaniaEffect implements IMessage { } } - private enum EffectType { + public enum EffectType { POOL_CRAFT(0), POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting PAINT_LENS(1), // Arg: colour diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 93bf4b7f1..1601a3c79 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -16,7 +16,7 @@ public final class PacketHandler { private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.MOD_ID); public static void init() { - HANDLER.registerMessage(HandlerBotaniaEffect.class, PacketBotaniaEffect.class, 0, Side.CLIENT); + HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT); } /** From 6b55f97a44d0c0402d313fd5b5617dbcccd32d40 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 May 2016 23:24:27 -0500 Subject: [PATCH 599/935] Build 304 --- build.properties | 8 ++++---- version/1.9.txt | 2 +- web/versions.ini | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index ced3b5a8b..9c5002334 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Tue May 10 19:59:05 CDT 2016 +#Tue May 10 23:24:10 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.1.1898 -mc_version=1.9 dir_repo=./ -build_number=304 +mc_version=1.9 +forge_version=12.16.1.1898 +build_number=305 mod_name=Botania diff --git a/version/1.9.txt b/version/1.9.txt index 074a5a83d..e2fb72373 100644 --- a/version/1.9.txt +++ b/version/1.9.txt @@ -1 +1 @@ -r1.8-303 \ No newline at end of file +r1.8-304 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 201be5c13..b7df0dec5 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -252,4 +252,5 @@ r1.8-299=1.8.9 r1.8-300=1.9 r1.8-301=1.9 r1.8-302=1.9 -r1.8-303=1.9 \ No newline at end of file +r1.8-303=1.9 +r1.8-304=1.9 \ No newline at end of file From 6a5e37b632d578b1fa483526fea879776eea9636 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 11 May 2016 11:50:06 -0500 Subject: [PATCH 600/935] Update forge, fully fix loot generation --- build.properties | 2 +- .../botania/common/core/loot/LootHandler.java | 41 ++++++++++++++----- .../botania/loot_tables/gaia_guardian_2.json | 2 - .../inject/abandoned_mineshaft.json | 10 +++-- .../loot_tables/inject/desert_pyramid.json | 10 +++-- .../loot_tables/inject/jungle_temple.json | 10 +++-- .../loot_tables/inject/simple_dungeon.json | 14 ++++--- .../loot_tables/inject/spawn_bonus_chest.json | 10 +++-- .../inject/stronghold_corridor.json | 12 ++++-- .../inject/village_blacksmith.json | 9 +++- 10 files changed, 84 insertions(+), 36 deletions(-) diff --git a/build.properties b/build.properties index 9c5002334..1d7aedc52 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9 -forge_version=12.16.1.1898 +forge_version=12.16.1.1901 build_number=305 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 98995349d..45f7d8d30 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -1,6 +1,7 @@ package vazkii.botania.common.core.loot; import com.google.common.collect.ImmutableList; +import net.minecraft.entity.item.EntityMinecartChest; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootEntry; import net.minecraft.world.storage.loot.LootEntryTable; @@ -11,6 +12,7 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.event.LootTableLoadEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibMisc; @@ -38,19 +40,38 @@ public final class LootHandler { @SubscribeEvent public void lootLoad(LootTableLoadEvent evt) { - switch (evt.getName().toString()) { - case "minecraft:chests/spawn_bonus_chest": break; - case "minecraft:chests/stronghold_corridor": break; - case "minecraft:chests/simple_dungeon": break; - case "minecraft:chests/desert_pyramid": break; - case "minecraft:chests/abandoned_mineshaft": break; - case "minecraft:chests/jungle_temple": break; - case "minecraft:chests/village_blacksmith": break; + String prefix = "minecraft:chests/"; + String name = evt.getName().toString(); + + if (name.startsWith(prefix)) { + String file = name.substring(name.indexOf(prefix) + prefix.length()); + switch (file) { + case "abandoned_mineshaft": + case "desert_pyramid": + case "jungle_temple": + case "simple_dungeon": + case "spawn_bonus_chest": + case "stronghold_corridor": + case "village_blacksmith": evt.getTable().addPool(getInjectPool(file)); break; + default: break; + } } } - private LootEntryTable getInjectEntry(String name) { - return new LootEntryTable(new ResourceLocation(LibMisc.MOD_ID, "inject/" + name), 1, 0, new LootCondition[0], "botania_inject"); + @SubscribeEvent + public void lootTest(PlayerInteractEvent.EntityInteract evt) { + if (!evt.getWorld().isRemote && evt.getTarget() instanceof EntityMinecartChest) { + ((EntityMinecartChest) evt.getTarget()).clear(); + ((EntityMinecartChest) evt.getTarget()).setLootTable(new ResourceLocation("minecraft", "chests/village_blacksmith"), evt.getTarget().worldObj.rand.nextLong()); + } + } + + private LootPool getInjectPool(String entryName) { + return new LootPool(new LootEntry[] { getInjectEntry(entryName, 1) }, new LootCondition[0], new RandomValueRange(1), new RandomValueRange(0, 1), "botania_inject_pool"); + } + + private LootEntryTable getInjectEntry(String name, int weight) { + return new LootEntryTable(new ResourceLocation(LibMisc.MOD_ID, "inject/" + name), weight, 0, new LootCondition[0], "botania_inject_entry"); } } diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index bcce6bebb..98e512975 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -29,7 +29,6 @@ { "type": "item", "entryName": "superBlackLotus", - "EntryName": "superBlackLotus", "name": "botania:blackLotus", "weight": 3, "quality": 1, @@ -40,7 +39,6 @@ }, { "type": "item", - "EntryName": "normalBlackLotus", "entryName": "normalBlackLotus", "name": "botania:blackLotus", "weight": 7, diff --git a/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json b/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json index 8f144da13..76e33d585 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json +++ b/src/main/resources/assets/botania/loot_tables/inject/abandoned_mineshaft.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/abandoned_mineshaft", + "__comment": "This table is injected as its own pool into minecraft:chests/abandoned_mineshaft", "pools": [{ "name": "main", "rolls": 1, @@ -7,12 +7,16 @@ { "type": "item", "name": "botania:blackLotus", - "weight": 6 + "weight": 35 }, { "type": "item", "name": "botania:overgrowthSeed", - "weight": 2 + "weight": 5 + }, + { + "type": "empty", + "weight": 60 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json b/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json index eba4a58e3..68b7e2f1d 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json +++ b/src/main/resources/assets/botania/loot_tables/inject/desert_pyramid.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/desert_pyramid", + "__comment": "This table is injected as its own pool into minecraft:chests/desert_pyramid", "pools": [{ "name": "main", "rolls": 1, @@ -7,12 +7,16 @@ { "type": "item", "name": "botania:blackLotus", - "weight": 6 + "weight": 35 }, { "type": "item", "name": "botania:overgrowthSeed", - "weight": 2 + "weight": 5 + }, + { + "type": "empty", + "weight": 60 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json b/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json index 904bfe874..02c18574d 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json +++ b/src/main/resources/assets/botania/loot_tables/inject/jungle_temple.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/jungle_temple", + "__comment": "This table is injected as its own pool into minecraft:chests/jungle_temple", "pools": [{ "name": "main", "rolls": 1, @@ -7,12 +7,16 @@ { "type": "item", "name": "botania:blackLotus", - "weight": 6 + "weight": 25 }, { "type": "item", "name": "botania:overgrowthSeed", - "weight": 2 + "weight": 5 + }, + { + "type": "empty", + "weight": 70 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json b/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json index b5763ed6b..63cc6d111 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json +++ b/src/main/resources/assets/botania/loot_tables/inject/simple_dungeon.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/simple_dungeon", + "__comment": "This table is injected as its own pool into minecraft:chests/simple_dungeon", "pools": [{ "name": "main", "rolls": 1, @@ -7,28 +7,32 @@ { "type": "item", "name": "botania:manaResource", - "weight": 9, + "weight": 50, "functions": [{ "function": "set_count", "count": { "min": 1, "max": 5 } }] }, { "type": "item", "name": "botania:lexicon", - "weight": 6 + "weight": 20 }, { "type": "item", "name": "botania:manaBottle", - "weight": 5 + "weight": 10 }, { "type": "item", "name": "botania:blackLotus", - "weight": 6 + "weight": 5 }, { "type": "item", "name": "botania:overgrowthSeed", "weight": 2 + }, + { + "type": "empty", + "weight": 13 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json b/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json index ed91190c3..a06aeb93b 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json +++ b/src/main/resources/assets/botania/loot_tables/inject/spawn_bonus_chest.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/spawn_bonus_chest", + "__comment": "This table is injected as its own pool into minecraft:chests/spawn_bonus_chest", "pools": [{ "name": "main", "rolls": 1, @@ -7,12 +7,16 @@ { "type": "item", "name": "botania:lexicon", - "weight": 7 + "weight": 80 }, { "type": "item", "name": "botania:blackLotus", - "weight": 1 + "weight": 10 + }, + { + "type": "empty", + "weight": 10 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json b/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json index 64f59ca43..06b7256b4 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json +++ b/src/main/resources/assets/botania/loot_tables/inject/stronghold_corridor.json @@ -1,5 +1,5 @@ { - "__comment": "This table is injected into minecraft:chests/stronghold_corridor", + "__comment": "This table is injected as its own pool into minecraft:chests/stronghold_corridor", "pools": [{ "name": "main", "rolls": 1, @@ -7,18 +7,22 @@ { "type": "item", "name": "botania:manaResource", - "weight": 10, + "weight": 45, "functions": [{ "function": "set_count", "count": { "min": 1, "max": 3 } }] }, { "type": "item", "name": "botania:blackLotus", - "weight": 6 + "weight": 10 }, { "type": "item", "name": "botania:overgrowthSeed", - "weight": 2 + "weight": 5 + }, + { + "type": "empty", + "weight": 40 } ] }] diff --git a/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json b/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json index dd71a90d8..02c5198bb 100644 --- a/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json +++ b/src/main/resources/assets/botania/loot_tables/inject/village_blacksmith.json @@ -1,12 +1,17 @@ { - "__comment": "This table is injected into minecraft:chests/village_blacksmith", + "__comment": "This table is injected as its own pool into minecraft:chests/village_blacksmith", "pools": [{ "name": "main", "rolls": 1, "entries": [ { "type": "item", - "name": "botania:blackLotus" + "name": "botania:blackLotus", + "weight": 10 + }, + { + "type": "empty", + "weight": 90 } ] }] From ebc6f1a8c69afa3cf2cf4531c0da8b98fbdf501a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 11 May 2016 19:27:15 -0500 Subject: [PATCH 601/935] Loonium now can be set to a custom loot table. For mapmakers --- .../subtile/functional/SubTileLoonuim.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 011d4b2c7..8b289be3f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.loot.LootContext; @@ -21,12 +22,16 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; import java.util.Random; public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; private static final int RANGE = 3; + private static final String TAG_LOOT_TABLE = "lootTable"; + + private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon"); @Override public void onUpdate() { @@ -36,7 +41,10 @@ public class SubTileLoonuim extends SubTileFunctional { ItemStack stack; do { - stack = supertile.getWorld().getLootTableManager().getLootTableFromLocation(new ResourceLocation("minecraft", "chests/simple_dungeon")).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()).get(0); + List stacks = supertile.getWorld().getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()); + if (stacks.isEmpty()) + return; + else stack = stacks.get(0); } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; @@ -77,4 +85,17 @@ public class SubTileLoonuim extends SubTileFunctional { return new RadiusDescriptor.Square(toBlockPos(), RANGE); } + @Override + public void readFromPacketNBT(NBTTagCompound cmp) { + super.readFromPacketNBT(cmp); + if (cmp.hasKey(TAG_LOOT_TABLE)) + lootTable = new ResourceLocation(cmp.getString(TAG_LOOT_TABLE)); + } + + @Override + public void writeToPacketNBT(NBTTagCompound cmp) { + super.writeToPacketNBT(cmp); + cmp.setString(TAG_LOOT_TABLE, lootTable.toString()); + } + } From a2d8aa17d23bee93ac17270849c7fc36dbf8d9a3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 14:47:29 -0500 Subject: [PATCH 602/935] Fix petal burying #274 --- .../common/item/material/ItemPetal.java | 56 ++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 21ae57708..c1862614d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -10,12 +10,17 @@ */ package vazkii.botania.common.item.material; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; @@ -30,16 +35,53 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, par1ItemStack.getItemDamage()); - stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + // Copy of ItemBlock.onItemUse + IBlockState iblockstate = world.getBlockState(pos); + Block block = iblockstate.getBlock(); - if(stackToPlace.stackSize == 0) { - if(!par2EntityPlayer.capabilities.isCreativeMode) - par1ItemStack.stackSize--; + if (!block.isReplaceable(world, pos)) + { + pos = pos.offset(facing); } - return EnumActionResult.SUCCESS; + if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack) && world.canBlockBePlaced(ModBlocks.buriedPetals, pos, false, facing, null, stack)) + { + int i = this.getMetadata(stack.getMetadata()); + IBlockState iblockstate1 = ModBlocks.buriedPetals.onBlockPlaced(world, pos, facing, hitX, hitY, hitZ, i, player); + + if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1)) + { + SoundType soundtype = ModBlocks.buriedPetals.getSoundType(); + world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + --stack.stackSize; + } + + return EnumActionResult.SUCCESS; + } + else + { + return EnumActionResult.FAIL; + } + } + + // Direct copy of ItemBlock.placeBlockAt + private boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + if (!world.setBlockState(pos, newState, 3)) return false; + + IBlockState state = world.getBlockState(pos); + if (state.getBlock() == ModBlocks.buriedPetals) + { + // setTileEntityNBT(world, player, pos, stack); + ModBlocks.buriedPetals.onBlockPlacedBy(world, pos, state, player, stack); + } + + return true; + } + + @Override + public int getMetadata(int stackMeta) { + return MathHelper.clamp_int(stackMeta, 0, 15); } @Override From 1e26be3c770f23efbe2b084f068228d6c5e2a0cb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 16:30:01 -0500 Subject: [PATCH 603/935] Weaken boss collection --- .../vazkii/botania/client/core/handler/BossBarHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 8a78d6fe3..af05aaff5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -24,14 +24,16 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import java.awt.*; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.UUID; +import java.util.WeakHashMap; public final class BossBarHandler { // Only access on the client thread! - public static final Set bosses = new HashSet<>(); + public static final Set bosses = Collections.newSetFromMap(new WeakHashMap<>()); public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); private static final BarCallback barUniformCallback = new BarCallback(); From 481eb5e711faf881c37dab07813f1709044e4a38 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 17:38:25 -0500 Subject: [PATCH 604/935] Serverside many subtiles --- .../functional/SubTileAgricarnation.java | 8 +++++- .../subtile/functional/SubTileBellethorn.java | 5 +++- .../subtile/functional/SubTileBubbell.java | 16 +++++++++--- .../subtile/functional/SubTileDaffomill.java | 6 ++--- .../subtile/functional/SubTileExoflame.java | 9 ++++--- .../functional/SubTileFallenKanade.java | 13 ++++++---- .../functional/SubTileHeiseiDream.java | 7 +++-- .../subtile/functional/SubTileHopperhock.java | 26 ++++++++----------- .../subtile/functional/SubTileHyacidus.java | 2 +- .../functional/SubTileJadedAmaranthus.java | 4 +-- .../functional/SubTileMarimorphosis.java | 6 ++--- .../subtile/functional/SubTileMedumone.java | 2 +- .../subtile/functional/SubTileOrechid.java | 6 ++--- .../functional/SubTileRannuncarpus.java | 14 +++++----- .../subtile/functional/SubTileSolegnolia.java | 18 +++++-------- .../functional/SubTileSpectranthemum.java | 14 +++++----- .../subtile/functional/SubTileTigerseye.java | 4 +++ .../subtile/functional/SubTileVinculotus.java | 5 +--- .../common/block/tile/TileFakeAir.java | 2 +- 19 files changed, 91 insertions(+), 76 deletions(-) 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 90541b8c0..7493a2719 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 @@ -36,6 +36,12 @@ public class SubTileAgricarnation extends SubTileFunctional { public void onUpdate() { super.onUpdate(); + if(supertile.getWorld().isRemote) + return; + + if(ticksExisted % 200 == 0) + sync(); + if(ticksExisted % 6 == 0 && redstoneSignal == 0) { int range = getRange(); int x = supertile.getPos().getX() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range; @@ -66,7 +72,7 @@ public class SubTileAgricarnation extends SubTileFunctional { return true; } - boolean isPlant(BlockPos pos) { + 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)) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index dc17c6d33..4f670d621 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -43,9 +43,12 @@ public class SubTileBellethorn extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote || redstoneSignal > 0) return; + if(ticksExisted % 200 == 0) + sync(); + final int manaToUse = getManaCost(); if(ticksExisted % 5 == 0) { 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 ea70ba873..a3ff05d15 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 @@ -38,6 +38,12 @@ public class SubTileBubbell extends SubTileFunctional { public void onUpdate() { super.onUpdate(); + if(supertile.getWorld().isRemote) + return; + + if(ticksExisted % 200 == 0) + sync(); + if(mana > COST_PER_TICK) { mana -= COST_PER_TICK; @@ -46,15 +52,17 @@ public class SubTileBubbell extends SubTileFunctional { for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) + for(int k = -range; k < range + 1; k++) { + BlockPos pos = supertile.getPos().add(i, j, k); if(MathHelper.pointDistanceSpace(i, j, k, 0, 0, 0) < range) { - IBlockState state = supertile.getWorld().getBlockState(supertile.getPos().add(i, j, k)); + IBlockState state = supertile.getWorld().getBlockState(pos); if(state.getMaterial() == Material.water) { - supertile.getWorld().setBlockState(supertile.getPos().add(i, j, k), ModBlocks.fakeAir.getDefaultState(), 2); - TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(supertile.getPos().add(i, j, k)); + 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/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 2629891e6..29292e4d5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -30,8 +30,8 @@ public class SubTileDaffomill extends SubTileFunctional { private static final String TAG_ORIENTATION = "orientation"; private static final String TAG_WIND_TICKS = "windTicks"; - int windTicks = 0; - EnumFacing orientation = EnumFacing.NORTH; + private int windTicks = 0; + private EnumFacing orientation = EnumFacing.NORTH; @Override public void onUpdate() { @@ -71,7 +71,7 @@ public class SubTileDaffomill extends SubTileFunctional { } } - AxisAlignedBB aabbForOrientation() { + private AxisAlignedBB aabbForOrientation() { int x = supertile.getPos().getX(); int y = supertile.getPos().getY(); int z = supertile.getPos().getZ(); 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 f770c2a4f..874682c08 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 @@ -28,13 +28,16 @@ public class SubTileExoflame extends SubTileFunctional { private static final int RANGE = 5; private static final int RANGE_Y = 2; + private static final int COST = 300; @Override public void onUpdate() { super.onUpdate(); + if(supertile.getWorld().isRemote) + return; + boolean did = false; - int cost = 300; fireFurnaces : { for(int i = -RANGE; i < RANGE + 1; i++) @@ -53,7 +56,7 @@ public class SubTileExoflame extends SubTileFunctional { if(furnace.getField(0) == 0) BlockFurnace.setState(true, supertile.getWorld(), pos); furnace.setField(0, 200); - mana = Math.max(0, mana - cost); + mana = Math.max(0, mana - COST); } if(ticksExisted % 2 == 0) furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time @@ -69,7 +72,7 @@ public class SubTileExoflame extends SubTileFunctional { if(heatable.canSmelt() && mana > 2) { if(heatable.getBurnTime() == 0) { heatable.boostBurnTime(); - mana = Math.max(0, mana - cost); + mana = Math.max(0, mana - COST); } if(ticksExisted % 2 == 0) 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 70e083721..56fde506b 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 @@ -24,21 +24,24 @@ import java.util.List; public class SubTileFallenKanade extends SubTileFunctional { private static final int RANGE = 2; + private static final int COST = 120; @Override public void onUpdate() { super.onUpdate(); - final int cost = 120; - if(!supertile.getWorld().isRemote && supertile.getWorld().provider.getDimension() != 1) { + 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)); - mana -= cost; + if(player.getActivePotionEffect(MobEffects.regeneration) == null && mana >= COST) { + player.addPotionEffect(new PotionEffect(MobEffects.regeneration, 60, 2, true, true)); + mana -= COST; + did = true; } } + if(did) + sync(); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 0e7560f6f..24d38d1c4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -37,11 +37,14 @@ public class SubTileHeiseiDream extends SubTileFunctional { public void onUpdate() { super.onUpdate(); + if(supertile.getWorld().isRemote) + return; + final int cost = 100; - List mobs = supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); + List mobs = (List) (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1 && mana >= cost) - for(IMob mob : ((List) mobs)) { + for(IMob mob : mobs) { if(mob instanceof EntityLiving) { EntityLiving entity = (EntityLiving) mob; if(brainwashEntity(entity, mobs)) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 58c52d7fd..a9cc06c1c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -54,13 +54,13 @@ public class SubTileHopperhock extends SubTileFunctional { private static Set particled = Collections.newSetFromMap(new WeakHashMap<>()); - int filterType = 0; + private int filterType = 0; @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote || redstoneSignal > 0) return; boolean pulledAny = false; @@ -97,7 +97,7 @@ public class SubTileHopperhock extends SubTileFunctional { boolean canAccept = canAcceptItem(stack, filter, filterType); ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); - int availablePut = supertile.getWorld().isRemote ? 1 : stack.stackSize - (simulate == null ? 0 : simulate.stackSize); + int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); // todo this is broken for vanilla single chests. investigate? canAccept &= availablePut > 0; @@ -118,19 +118,15 @@ public class SubTileHopperhock extends SubTileFunctional { } if(invToPutItemIn != null && !item.isDead) { - boolean remote = supertile.getWorld().isRemote; - if(remote) { - if(!particled.contains(item)) { - SubTileSpectranthemum.spawnExplosionParticles(item, 3); - particled.add(item); - } - } else { - ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); - item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. - if(item.getEntityItem().stackSize == 0) - item.setDead(); - pulledAny = true; + if(!particled.contains(item)) { + SubTileSpectranthemum.spawnExplosionParticles(item, 3); // todo packet + particled.add(item); } + ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); + item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. + if(item.getEntityItem().stackSize == 0) + item.setDead(); + pulledAny = 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 1df4ca0fa..06efc09e4 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 @@ -31,7 +31,7 @@ public class SubTileHyacidus extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote || redstoneSignal > 0) return; final int cost = 20; 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 459802e15..741a644fe 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 @@ -32,10 +32,10 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote || redstoneSignal > 0) return; - if(!supertile.getWorld().isRemote && ticksExisted % 30 == 0 && mana >= COST) { + if(ticksExisted % 30 == 0 && mana >= COST) { BlockPos pos = new BlockPos( supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), supertile.getPos().getY() + RANGE, 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 393b43721..7a92c92fc 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 @@ -52,10 +52,10 @@ public class SubTileMarimorphosis extends SubTileFunctional { @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote && redstoneSignal > 0) return; - if(!supertile.getWorld().isRemote && mana >= COST && ticksExisted % 2 == 0) { + if(mana >= COST && ticksExisted % 2 == 0) { BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getStoneToPut(coords); @@ -89,7 +89,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorld().rand.nextInt(values.size()))); } - public BlockPos getCoordsToPut() { + private BlockPos getCoordsToPut() { List possibleCoords = new ArrayList<>(); int range = getRange(); 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 9094c76d9..c57ec54b8 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 @@ -30,7 +30,7 @@ public class SubTileMedumone extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(mana > 0) { + if(!supertile.getWorld().isRemote && mana > 0) { 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) 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 b0cc72b91..64e2680fa 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 @@ -46,11 +46,11 @@ public class SubTileOrechid extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0 || !canOperate()) + if(supertile.getWorld().isRemote && redstoneSignal > 0 || !canOperate()) return; int cost = getCost(); - if(!supertile.getWorld().isRemote && mana >= cost && ticksExisted % getDelay() == 0) { + if(mana >= cost && ticksExisted % getDelay() == 0) { BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getOreToPut(); @@ -99,7 +99,7 @@ public class SubTileOrechid extends SubTileFunctional { return getOreToPut(); } - public BlockPos getCoordsToPut() { + private BlockPos getCoordsToPut() { List possibleCoords = new ArrayList<>(); Block source = getSourceBlock(); 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 81711c293..c757c7775 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 @@ -62,7 +62,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0) + if(supertile.getWorld().isRemote || redstoneSignal > 0) return; if(ticksExisted % 10 == 0) { @@ -108,7 +108,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { } - if(!validPositions.isEmpty() && !supertile.getWorld().isRemote) { + if(!validPositions.isEmpty()) { BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size())); IBlockState stateToPlace = null; @@ -140,11 +140,9 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(stackItem instanceof IFlowerPlaceable) ((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords); - if(!supertile.getWorld().isRemote) { - stack.stackSize--; - if(stack.stackSize <= 0) - item.setDead(); - } + stack.stackSize--; + if(stack.stackSize <= 0) + item.setDead(); if(mana > 1) mana--; @@ -176,7 +174,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(recieverStack != null && recieverStack.getItem() != null) { + if(recieverStack.getItem() != null) { String stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index c88a4b356..a91b73af2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; @Override @@ -46,16 +46,12 @@ public class SubTileSolegnolia extends SubTileFunctional { } public static boolean hasSolegnoliaAround(Entity e) { - for(SubTileSolegnolia flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.supertile.getWorld() != e.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) - continue; - - double range = flower.getRange(); - if(MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, flower.supertile.getPos().getX() + 0.5, flower.supertile.getPos().getY() + 0.5, flower.supertile.getPos().getZ() + 0.5) <= range) - return true; - } - - return false; + return existingFlowers.stream() + .filter(f -> f.redstoneSignal == 0) + .filter(f -> f.supertile.getWorld() != e.worldObj) + .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) + .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange()) + .findAny().isPresent(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index ab717c2c8..a952737ec 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -44,18 +44,18 @@ public class SubTileSpectranthemum extends SubTileFunctional { private static final String TAG_TELEPORTED = "Botania_TPd"; - BlockPos bindPos = new BlockPos(0, -1, 0); + private BlockPos bindPos = new BlockPos(0, -1, 0); @Override public void onUpdate() { super.onUpdate(); - if(redstoneSignal == 0 && supertile.getWorld().isBlockLoaded(bindPos)) { + if(!supertile.getWorld().isRemote && redstoneSignal == 0 && supertile.getWorld().isBlockLoaded(bindPos)) { BlockPos pos = supertile.getPos(); boolean did = false; - List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); + List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1))); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { @@ -81,11 +81,9 @@ public class SubTileSpectranthemum extends SubTileFunctional { item.setPosition(bindPos.getX() + 0.5, bindPos.getY() + 1.5, bindPos.getZ() + 0.5); item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; - spawnExplosionParticles(item, 10); - if(!supertile.getWorld().isRemote) { - mana -= cost; - did = true; - } + spawnExplosionParticles(item, 10); // todo packet + mana -= cost; + did = true; } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 043573f9f..03ae75762 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -37,6 +37,10 @@ public class SubTileTigerseye extends SubTileFunctional { @Override public void onUpdate() { super.onUpdate(); + + if(supertile.getWorld().isRemote) + return; + final int cost = 70; boolean shouldAfffect = mana >= cost; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 2e1f8855a..b56f64e30 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -36,7 +36,7 @@ public class SubTileVinculotus extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(!existingFlowers.contains(this)) { + if(!supertile.getWorld().isRemote && !existingFlowers.contains(this)) { existingFlowers.add(this); if(!registered) { MinecraftForge.EVENT_BUS.register(new EndermanIntercepter()); @@ -74,9 +74,6 @@ public class SubTileVinculotus extends SubTileFunctional { @SubscribeEvent public void onEndermanTeleport(EnderTeleportEvent event) { - if(event.getEntityLiving().worldObj.isRemote) - return; - int cost = 50; if(event.getEntityLiving() instanceof EntityEnderman) { 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 080a4c093..88dfbd9b9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -21,7 +21,7 @@ public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_Y = "flowerY"; private static final String TAG_FLOWER_Z = "flowerZ"; - BlockPos flowerPos; + private BlockPos flowerPos; public void setFlower(TileEntity tile) { flowerPos = tile.getPos(); From b0fad5db166a9950f2d8b62b6eeff60dc0915db3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 17:51:58 -0500 Subject: [PATCH 605/935] Fix hopperhock being broken with vanilla chests --- .../common/core/helper/InventoryHelper.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 9e0378252..0a52697b0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -107,14 +107,19 @@ public class InventoryHelper { if(te == null) return null; - IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? - te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; - if(te instanceof TileEntityChest) - ret = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + + if(te instanceof TileEntityChest) { + IItemHandler doubleChest = VanillaDoubleChestItemHandler.get(((TileEntityChest) te)); + if(doubleChest != VanillaDoubleChestItemHandler.NO_ADJACENT_CHESTS_INSTANCE) + return doubleChest; + } + + IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? + te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - return ret; } From 1d7a402c6e21c991c28a3f89f709332f17c72407 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 19:45:51 -0500 Subject: [PATCH 606/935] Optimize itemfinder heavily --- .../common/core/helper/InventoryHelper.java | 42 +++-- .../common/core/helper/ItemNBTHelper.java | 10 ++ .../item/equipment/bauble/ItemItemFinder.java | 166 ++++++++++-------- 3 files changed, 129 insertions(+), 89 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 0a52697b0..a1b7270fd 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -32,6 +32,10 @@ import vazkii.botania.api.corporea.InvWithLocation; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.Spliterator; +import java.util.Spliterators; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; //From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { @@ -123,22 +127,36 @@ public class InventoryHelper { return ret; } - public static Iterable toIterable(IItemHandler itemHandler) { - return () -> new Iterator() { - int index = 0; + public static Iterable asIterable(final IItemHandler itemHandler) { + return new Iterable() { + @Override + public Iterator iterator() { + return new Iterator() { + int index = 0; - @Override - public boolean hasNext() { - return index < itemHandler.getSlots(); - } + @Override + public boolean hasNext() { + return index < itemHandler.getSlots(); + } - @Override - public ItemStack next() { - return itemHandler.getStackInSlot(index++); - } - }; + @Override + public ItemStack next() { + return itemHandler.getStackInSlot(index++); + } + }; + } + + @Override + public Spliterator spliterator() { + return Spliterators.spliterator(iterator(), itemHandler.getSlots(), Spliterator.ORDERED); + } + }; } + public static Stream streamNonnull(IItemHandler itemHandler) { + return StreamSupport.stream(asIterable(itemHandler).spliterator(), false).filter(s -> s != null); + } + public static class GenericInventory implements IInventory { protected String inventoryTitle; diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index b0e773ef8..449012319 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -19,6 +19,8 @@ import net.minecraft.nbt.NBTTagList; public final class ItemNBTHelper { + private static final int[] EMPTY_INT_ARRAY = new int[0]; + /** Checks if an ItemStack has a Tag Compound **/ public static boolean detectNBT(ItemStack stack) { return stack.hasTagCompound(); @@ -63,6 +65,10 @@ public final class ItemNBTHelper { getNBT(stack).setInteger(tag, i); } + public static void setIntArray(ItemStack stack, String tag, int[] val) { + getNBT(stack).setIntArray(tag, val); + } + public static void setLong(ItemStack stack, String tag, long l) { getNBT(stack).setLong(tag, l); } @@ -114,6 +120,10 @@ public final class ItemNBTHelper { return verifyExistance(stack, tag) ? getNBT(stack).getInteger(tag) : defaultExpected; } + public static int[] getIntArray(ItemStack stack, String tag) { + return verifyExistance(stack, tag) ? getNBT(stack).getIntArray(tag) : EMPTY_INT_ARRAY; + } + public static long getLong(ItemStack stack, String tag, long defaultExpected) { return verifyExistance(stack, tag) ? getNBT(stack).getLong(tag) : defaultExpected; } 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 1965f93a2..17c37f4d4 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 @@ -14,6 +14,8 @@ import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; +import gnu.trove.list.array.TIntArrayList; +import gnu.trove.list.array.TLongArrayList; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -29,11 +31,15 @@ import net.minecraft.inventory.AnimalChest; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.common.util.Constants; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -49,11 +55,14 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class ItemItemFinder extends ItemBauble implements IBaubleRender { - private static final String TAG_POSITIONS = "highlightPositions"; + private static final String TAG_POSITIONS_OLD = "highlightPositions"; + private static final String TAG_ENTITY_POSITIONS = "highlightPositionsEnt"; + private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); @@ -71,53 +80,54 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { else tickServer(stack, (EntityPlayer) player); } - public void tickClient(ItemStack stack, EntityPlayer player) { + protected void tickClient(ItemStack stack, EntityPlayer player) { if(!Botania.proxy.isTheClientPlayer(player)) return; - String pos = ItemNBTHelper.getString(stack, TAG_POSITIONS, ""); - String[] tokens = pos.split(";"); + long[] blocks = getBlockPositions(stack); + Botania.proxy.setWispFXDepthTest(false); + for(long l : blocks) { + BlockPos pos = BlockPos.fromLong(l); + float m = 0.02F; + Botania.proxy.wispFX(player.worldObj, pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); + } - for(String token : tokens) { - if(token.isEmpty()) - continue; - - if(token.contains(",")) { - String[] tokens_ = token.split(","); - int x = Integer.parseInt(tokens_[0]); - int y = Integer.parseInt(tokens_[1]); - int z = Integer.parseInt(tokens_[2]); - float m = 0.02F; - Botania.proxy.setWispFXDepthTest(false); - Botania.proxy.wispFX(player.worldObj, x + (float) Math.random(), y + (float) Math.random(), z + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); - } else { - int id = Integer.parseInt(token); - Entity e = player.worldObj.getEntityByID(id); - - if(e != null && Math.random() < 0.6) { - Botania.proxy.setWispFXDepthTest(Math.random() < 0.6); - Botania.proxy.wispFX(player.worldObj, e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.height, e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); - } + int[] entities = ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS); + for(int i : entities) { + Entity e = player.worldObj.getEntityByID(i); + if(e != null && Math.random() < 0.6) { + Botania.proxy.setWispFXDepthTest(Math.random() < 0.6); + Botania.proxy.wispFX(player.worldObj, e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.height, e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); } } + Botania.proxy.setWispFXDepthTest(true); } - public void tickServer(ItemStack stack, EntityPlayer player) { - StringBuilder positionsBuilder = new StringBuilder(); + protected void tickServer(ItemStack stack, EntityPlayer player) { + ItemNBTHelper.removeEntry(stack, TAG_POSITIONS_OLD); - scanForStack(player.getHeldItemMainhand(), player, positionsBuilder); - scanForStack(player.getHeldItemOffhand(), player, positionsBuilder); + TIntArrayList entPosBuilder = new TIntArrayList(); + TLongArrayList blockPosBuilder = new TLongArrayList(); - String current = ItemNBTHelper.getString(stack, TAG_POSITIONS, ""); - String positions = positionsBuilder.toString(); - if(!current.equals(positions)) { - ItemNBTHelper.setString(stack, TAG_POSITIONS, positions); + scanForStack(player.getHeldItemMainhand(), player, entPosBuilder, blockPosBuilder); + scanForStack(player.getHeldItemOffhand(), player, entPosBuilder, blockPosBuilder); + + int[] currentEnts = entPosBuilder.toArray(); + long[] currentBlocks = blockPosBuilder.toArray(); + + boolean entsEqual = Arrays.equals(currentEnts, ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS)); + boolean blocksEqual = Arrays.equals(currentBlocks, getBlockPositions(stack)); + + if(!entsEqual) + ItemNBTHelper.setIntArray(stack, TAG_ENTITY_POSITIONS, currentEnts); + if(!blocksEqual) + setBlockPositions(stack, currentBlocks); + if(!entsEqual || !blocksEqual) PacketHandler.INSTANCE.sendToAll(new PacketSyncBauble(player, 0)); - } } - private void scanForStack(ItemStack pstack, EntityPlayer player, StringBuilder positionsBuilder) { + private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, TLongArrayList blockPosBuilder) { if(pstack != null || player.isSneaking()) { int range = 24; @@ -125,77 +135,63 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(Entity e : entities) { if(e == player) continue; - if(e.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) { + if(e.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) && !(e instanceof EntityPlayer)) { if(scanInventory(e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), pstack)) - positionsBuilder.append(e.getEntityId()).append(";"); + entIdBuilder.add(e.getEntityId()); + } else if(e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack istack = item.getEntityItem(); if(player.isSneaking() || istack.isItemEqual(pstack) && ItemStack.areItemStackTagsEqual(istack, pstack)) - positionsBuilder.append(item.getEntityId()).append(";"); + entIdBuilder.add(item.getEntityId()); } else if(e instanceof IInventory) { IInventory inv = (IInventory) e; if(scanInventory(new InvWrapper(inv), pstack)) - positionsBuilder.append(e.getEntityId()).append(";"); - - } else if(e instanceof EntityHorse) { - EntityHorse horse = (EntityHorse) e; - AnimalChest chest = ReflectionHelper.getPrivateValue(EntityHorse.class, horse, LibObfuscation.HORSE_CHEST); - if(scanInventory(new InvWrapper(chest), pstack)) - positionsBuilder.append(horse.getEntityId()).append(";"); + entIdBuilder.add(e.getEntityId()); } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; - IItemHandler playerInv = new InvWrapper(player_.inventory); + IItemHandler playerInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); IItemHandler binv = new InvWrapper(PlayerHandler.getPlayerBaubles(player_)); - if(scanInventory(playerInv, pstack) || scanInventory(binv, pstack)) - positionsBuilder.append(player_.getEntityId()).append(";"); + if(scanInventory(binv, pstack) || scanInventory(playerInv, pstack)) + entIdBuilder.add(player_.getEntityId()); } else if(e instanceof EntityVillager) { EntityVillager villager = (EntityVillager) e; ArrayList recipes = villager.getRecipes(player); if(pstack != null && recipes != null) for(MerchantRecipe recipe : recipes) - if(recipe != null && !recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) - positionsBuilder.append(villager.getEntityId()).append(";"); + if(recipe != null && !recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) { + entIdBuilder.add(villager.getEntityId()); + break; + } - } else if(e instanceof EntityLivingBase) { - EntityLivingBase living = (EntityLivingBase) e; - ItemStack estack = living.getHeldItemMainhand(); - if(pstack != null && estack != null && equalStacks(estack, pstack)) - positionsBuilder.append(living.getEntityId()).append(";"); - estack = living.getHeldItemOffhand(); - if(pstack != null && estack != null && equalStacks(estack, pstack)) - positionsBuilder.append(living.getEntityId()).append(";"); } } if(pstack != null) { range = 12; BlockPos pos = new BlockPos(player); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - TileEntity tile = player.worldObj.getTileEntity(pos_); - if(tile != null) { - boolean foundCap = false; - for(EnumFacing e : EnumFacing.VALUES) { - if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) - && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { - positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); - foundCap = true; - break; - } - } - if(!foundCap && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - if(scanInventory(new InvWrapper(inv), pstack)) - positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); - } + for(BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))) { + TileEntity tile = player.worldObj.getTileEntity(pos_); + if(tile != null) { + boolean foundCap = false; + for(EnumFacing e : EnumFacing.VALUES) { + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) + && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { + blockPosBuilder.add(pos_.toLong()); + foundCap = true; + break; } } + if(!foundCap && tile instanceof IInventory) { + IInventory inv = (IInventory) tile; + if(scanInventory(new InvWrapper(inv), pstack)) + blockPosBuilder.add(pos_.toLong()); + } + } + } } } } @@ -217,6 +213,22 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { return false; } + private long[] getBlockPositions(ItemStack stack) { + NBTTagList list = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); + long[] ret = new long[list.tagCount()]; + for (int i = 0; i < list.tagCount(); i++) { + ret[i] = ((NBTTagLong) list.get(i)).getLong(); + } + return ret; + } + + private void setBlockPositions(ItemStack stack, long[] vals) { + NBTTagList list = new NBTTagList(); + for(long l : vals) + list.appendTag(new NBTTagLong(l)); + ItemNBTHelper.setList(stack, TAG_BLOCK_POSITIONS, list); + } + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.AMULET; From ef0f31f2de0cc2928b521da0990310b3d6470fca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 May 2016 20:02:57 -0500 Subject: [PATCH 607/935] Some probably useless optimizations --- .../client/core/handler/LightningHandler.java | 5 +++-- .../subtile/functional/SubTileMarimorphosis.java | 3 ++- .../vazkii/botania/common/entity/EntitySpark.java | 9 +++++---- .../vazkii/botania/common/item/ItemGrassSeeds.java | 3 ++- .../equipment/tool/terrasteel/ItemTerraAxe.java | 3 ++- .../vazkii/botania/common/item/relic/ItemDice.java | 14 ++++++-------- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index ab34ca55f..3f23d3ef2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.core.handler; +import gnu.trove.map.hash.TIntIntHashMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; @@ -175,7 +176,7 @@ public class LightningHandler { public Vector3 start; public Vector3 end; BlockPos target; - HashMap splitparents = new HashMap<>(); + TIntIntHashMap splitparents = new TIntIntHashMap(); public double length; public int numsegments0; @@ -416,7 +417,7 @@ public class LightningHandler { } private void calculateCollisionAndDiffs() { - HashMap lastactivesegment = new HashMap<>(); + TIntIntHashMap lastactivesegment = new TIntIntHashMap(); Collections.sort(segments, SEGMENT_SORTER); 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 7a92c92fc..fe9470c01 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import gnu.trove.list.array.TIntArrayList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -76,7 +77,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public ItemStack getStoneToPut(BlockPos coords) { List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); - List values = new ArrayList<>(); + TIntArrayList values = new TIntArrayList(); for(int i = 0; i < 8; i++) { int times = 1; if(types.contains(TYPES[i])) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 7829e694c..aa0e6b2db 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -11,6 +11,7 @@ package vazkii.botania.common.entity; import baubles.common.lib.PlayerHandler; +import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -97,7 +98,7 @@ public class EntitySpark extends Entity implements ISparkEntity { case DISPERSIVE : { List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); - Map> receivingPlayers = new HashMap<>(); + Map> receivingPlayers = new HashMap<>(); ItemStack input = new ItemStack(ModItems.spark); for(EntityPlayer player : players) { @@ -112,11 +113,11 @@ public class EntitySpark extends Entity implements ISparkEntity { IManaItem manaItem = (IManaItem) stack.getItem(); if(manaItem.canReceiveManaFromItem(stack, input)) { - Map receivingStacks; + TObjectIntHashMap receivingStacks; boolean add = false; if(!receivingPlayers.containsKey(player)) { add = true; - receivingStacks = new HashMap<>(); + receivingStacks = new TObjectIntHashMap<>(); } else receivingStacks = receivingPlayers.get(player); int recv = Math.min(getAttachedTile().getCurrentMana(), Math.min(TRANSFER_RATE, manaItem.getMaxMana(stack) - manaItem.getMana(stack))); @@ -134,7 +135,7 @@ public class EntitySpark extends Entity implements ISparkEntity { Collections.shuffle(keys); EntityPlayer player = keys.iterator().next(); - Map items = receivingPlayers.get(player); + TObjectIntHashMap items = receivingPlayers.get(player); ItemStack stack = items.keySet().iterator().next(); int cost = items.get(stack); int manaToPut = Math.min(getAttachedTile().getCurrentMana(), cost); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index a22f8c693..a13f54f24 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; @@ -49,7 +50,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap<>(); + private static final TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, 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 dd446987b..ed5c5bf9b 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -71,7 +72,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap<>(); + private static TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); 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 800d75247..618bf56dc 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.relic; +import gnu.trove.list.array.TIntArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; @@ -33,9 +34,7 @@ import java.util.List; public class ItemDice extends ItemRelic { - private static final int[] SIDES_FOR_MOON_PHASES = new int[] { - -1, 0, 1, 2, -1, 2, 3, 4 - }; + private static final int[] SIDES_FOR_MOON_PHASES = { -1, 0, 1, 2, -1, 2, 3, 4 }; public static ItemStack[] relicStacks; @@ -56,11 +55,10 @@ public class ItemDice extends ItemRelic { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); - int side = SIDES_FOR_MOON_PHASES[moonPhase]; - int relic = side; + int relic = SIDES_FOR_MOON_PHASES[moonPhase]; if(hasRelicAlready(player, relic)) { - List possible = new ArrayList<>(); - List alreadyHas = new ArrayList<>(); + TIntArrayList possible = new TIntArrayList(); + TIntArrayList alreadyHas = new TIntArrayList(); for(int i = 0; i < 6; i++) if(hasRelicAlready(player, i)) alreadyHas.add(i); @@ -91,7 +89,7 @@ public class ItemDice extends ItemRelic { return false; } - boolean hasRelicAlready(EntityPlayer player, int relic) { + private boolean hasRelicAlready(EntityPlayer player, int relic) { if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP)) return true; From 13905a174c49a62941aa7c537f37d9a6b55eb1e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 May 2016 00:08:35 -0500 Subject: [PATCH 608/935] Fix smoke particles --- .../functional/SubTileSpectranthemum.java | 16 ++++++--------- .../common/network/PacketBotaniaEffect.java | 20 ++++++++++++++++++- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index a952737ec..c808e2c90 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -29,6 +29,8 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.util.List; @@ -81,7 +83,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { item.setPosition(bindPos.getX() + 0.5, bindPos.getY() + 1.5, bindPos.getZ() + 0.5); item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; - spawnExplosionParticles(item, 10); // todo packet + spawnExplosionParticles(item, 10); mana -= cost; did = true; } @@ -93,15 +95,9 @@ public class SubTileSpectranthemum extends SubTileFunctional { } } - public static void spawnExplosionParticles(EntityItem item, int p) { - for(int i = 0; i < p; i++) { - double m = 0.01; - double d0 = item.worldObj.rand.nextGaussian() * m; - double d1 = item.worldObj.rand.nextGaussian() * m; - double d2 = item.worldObj.rand.nextGaussian() * m; - double d3 = 10.0D; - item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, item.posX + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, item.posY + item.worldObj.rand.nextFloat() * item.height - d1 * d3, item.posZ + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); - } + static void spawnExplosionParticles(EntityItem item, int p) { + PacketHandler.sendToNearby(item.worldObj, new BlockPos(item), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.posX, item.posY, item.posZ, item.getEntityId(), p)); } @Override diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index d6512bf73..1527326b4 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -2,8 +2,10 @@ package vazkii.botania.common.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; @@ -114,6 +116,21 @@ public class PacketBotaniaEffect implements IMessage { Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, x, y, z, r, g, b, 5F, 120); } + break; + } + case ITEM_SMOKE: { + Entity item = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); + int p = message.args[1]; + + for(int i = 0; i < p; i++) { + double m = 0.01; + double d0 = item.worldObj.rand.nextGaussian() * m; + double d1 = item.worldObj.rand.nextGaussian() * m; + double d2 = item.worldObj.rand.nextGaussian() * m; + double d3 = 10.0D; + item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); + } + break; } } } @@ -127,7 +144,8 @@ public class PacketBotaniaEffect implements IMessage { POOL_CRAFT(0), POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting PAINT_LENS(1), // Arg: colour - ARENA_INDICATOR(0); + ARENA_INDICATOR(0), + ITEM_SMOKE(2); // Arg: Entity ID, number of particles private final int argCount; From 68560a335e9b4f4da000b5ba58a6595f3befe754 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 May 2016 22:47:18 -0500 Subject: [PATCH 609/935] Minor cleanup --- .../block/subtile/functional/SubTileHopperhock.java | 9 ++------- .../java/vazkii/botania/common/lib/LibObfuscation.java | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index a9cc06c1c..5bc0ba728 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -52,8 +52,6 @@ public class SubTileHopperhock extends SubTileFunctional { private static final int RANGE_MANA_MINI = 2; private static final int RANGE_MINI = 1; - private static Set particled = Collections.newSetFromMap(new WeakHashMap<>()); - private int filterType = 0; @Override @@ -97,7 +95,7 @@ public class SubTileHopperhock extends SubTileFunctional { boolean canAccept = canAcceptItem(stack, filter, filterType); ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); - int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); // todo this is broken for vanilla single chests. investigate? + int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); canAccept &= availablePut > 0; @@ -118,10 +116,7 @@ public class SubTileHopperhock extends SubTileFunctional { } if(invToPutItemIn != null && !item.isDead) { - if(!particled.contains(item)) { - SubTileSpectranthemum.spawnExplosionParticles(item, 3); // todo packet - particled.add(item); - } + SubTileSpectranthemum.spawnExplosionParticles(item, 3); ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. if(item.getEntityItem().stackSize == 0) diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 91b4e94f8..832c6ea22 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -51,7 +51,6 @@ public final class LibObfuscation { // EntityHorse public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bC" }; - public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bR" }; // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; From df478b0ff8e10cdeec2817e2e2a69ead69775495 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 15 May 2016 21:25:54 -0500 Subject: [PATCH 610/935] Fix picking root block giving bad item. Closes #282 --- src/main/java/vazkii/botania/common/block/BlockRoot.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index ad840d144..6c1f92cbf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -34,6 +35,10 @@ public class BlockRoot extends BlockMod implements ILexiconable { setSoundType(SoundType.WOOD); } + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this); + } @Override public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { From b1fad332b8f5a2297430e8c2f7e1080ed15e9106 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 15 May 2016 21:51:24 -0500 Subject: [PATCH 611/935] Fix terraaxe icon when inactive, closes #281 --- .../client/core/handler/ModelHandler.java | 3 +-- .../tool/terrasteel/ItemTerraAxe.java | 25 +++++++++++++------ .../assets/botania/models/item/terraAxe.json | 12 +++++++++ .../assets/botania/models/item/terraAxe1.json | 6 ----- .../item/{terraAxe0.json => terraAxeOn.json} | 2 +- 5 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/terraAxe.json delete mode 100644 src/main/resources/assets/botania/models/item/terraAxe1.json rename src/main/resources/assets/botania/models/item/{terraAxe0.json => terraAxeOn.json} (61%) 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 a9f6eaaa3..6bb113720 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -377,7 +377,6 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); - ModelLoader.registerItemVariants(lexicon, new ModelResourceLocation("botania:lexicon_default", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); @@ -413,7 +412,7 @@ public final class ModelHandler { registerItemModel(terrasteelLegs); registerItemModel(terrasteelBoots); registerItemModel(terraSword); - registerItemModelMetas(terraAxe, LibItemNames.TERRA_AXE, 2); + registerItemModel(terraAxe); registerItemModel(starSword); registerItemModel(thunderSword); 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 ed5c5bf9b..d5a9e638e 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 @@ -13,10 +13,13 @@ package vazkii.botania.common.item.equipment.tool.terrasteel; import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -31,6 +34,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.HashMap; @@ -49,7 +53,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * The number of blocks per tick which the Terra Truncator will * collect. */ - public static final int BLOCK_SWAP_RATE = 10; + private static final int BLOCK_SWAP_RATE = 10; /** * The maximum radius (in blocks) which the Terra Truncator will go @@ -61,7 +65,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * The maximum number of leaf blocks which the Terra Truncator will chew/go * through once a leaf block is encountered. */ - public static final int LEAF_BLOCK_RANGE = 3; + private static final int LEAF_BLOCK_RANGE = 3; /** * The amount of mana required to restore 1 point of damage. @@ -78,9 +82,17 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); MinecraftForge.EVENT_BUS.register(this); this.attackSpeed = -3f; + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, World world, EntityLivingBase entity) { + if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) + return 0; + return 1; + } + }); } - public boolean shouldBreak(EntityPlayer player) { + private boolean shouldBreak(EntityPlayer player) { return !player.isSneaking() && !ItemTemperanceStone.hasTemperanceActive(player); } @@ -192,8 +204,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * for the next candidates for swapping. 1 is a good default. */ public static final int SINGLE_BLOCK_RADIUS = 1; - - + /** * The world the block swapper is doing the swapping in. */ @@ -355,12 +366,12 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker /** * The location of this swap candidate. */ - public BlockPos coordinates; + public final BlockPos coordinates; /** * The remaining range of this swap candidate. */ - public int range; + public final int range; /** * Constructs a new Swap Candidate with the provided diff --git a/src/main/resources/assets/botania/models/item/terraAxe.json b/src/main/resources/assets/botania/models/item/terraAxe.json new file mode 100644 index 000000000..0c5e50ea7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraAxe.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terraAxe1" + }, + "overrides": [{ + "predicate": { + "botania:terraaxe_on": 1 + }, + "model": "botania:item/terraAxeOn" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxe1.json b/src/main/resources/assets/botania/models/item/terraAxe1.json deleted file mode 100644 index 81ffdb72b..000000000 --- a/src/main/resources/assets/botania/models/item/terraAxe1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraAxe1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxe0.json b/src/main/resources/assets/botania/models/item/terraAxeOn.json similarity index 61% rename from src/main/resources/assets/botania/models/item/terraAxe0.json rename to src/main/resources/assets/botania/models/item/terraAxeOn.json index 0b2851f9f..e017e1cc0 100644 --- a/src/main/resources/assets/botania/models/item/terraAxe0.json +++ b/src/main/resources/assets/botania/models/item/terraAxeOn.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "botania:item/terraAxe", "textures": { "layer0": "botania:items/terraAxe0" } From 1deb617f72d647fd1babdf57f3d36b5702213766 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 11:13:38 -0500 Subject: [PATCH 612/935] Fix GOG sound #285 --- .../vazkii/botania/common/core/handler/MethodHandles.java | 8 +++++++- .../java/vazkii/botania/common/lib/LibObfuscation.java | 3 +++ .../vazkii/botania/common/world/SkyblockWorldEvents.java | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index 9f76d1f96..e3a33192d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -1,6 +1,7 @@ package vazkii.botania.common.core.handler; import com.google.common.base.Throwables; +import net.minecraft.block.SoundType; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraftforge.fml.common.FMLLog; @@ -22,7 +23,8 @@ public final class MethodHandles { spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, maxSpawnDelay_getter, minSpawnDelay_getter, spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, - randomEntity_getter, isActivated; // MobSpawnerBaseLogic + randomEntity_getter, isActivated, // MobSpawnerBaseLogic + breakSound_getter; // SoundType static { try { @@ -79,6 +81,10 @@ public final class MethodHandles { f.setAccessible(true); randomEntity_getter = publicLookup().unreflectGetter(f); + f = ReflectionHelper.findField(SoundType.class, LibObfuscation.BREAK_SOUND); + f.setAccessible(true); + breakSound_getter = publicLookup().unreflectGetter(f); + Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); m.setAccessible(true); isActivated = publicLookup().unreflect(m); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 832c6ea22..4bbc37e2c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -102,4 +102,7 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; + // SoundType + public static final String[] BREAK_SOUND = { "breakSound", "field_185862_o", "o" }; + } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index a9ce3ce25..a24ff8656 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -19,6 +19,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -28,6 +29,7 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; +import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -74,7 +76,11 @@ public final class SkyblockWorldEvents { if(event.getWorld().isRemote) event.getEntityPlayer().swingArm(event.getHand()); else { - event.getWorld().playSound(null, event.getPos(), block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); + try { + SoundEvent breakSound = (SoundEvent) MethodHandles.breakSound_getter.invokeExact(block.getSoundType()); + event.getWorld().playSound(null, event.getPos(), breakSound, SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); + } catch (Throwable ignore) {} + if(Math.random() < 0.8) event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } From afb3f6f44be47886096ca94a903fb31572d78037 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 11:22:13 -0500 Subject: [PATCH 613/935] Fix lexicon model i accidentally broke --- .../java/vazkii/botania/client/core/handler/ModelHandler.java | 1 + 1 file changed, 1 insertion(+) 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 6bb113720..f9b166011 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -377,6 +377,7 @@ public final class ModelHandler { registerItemModel(pestleAndMortar); registerItemModel(blackLotus); registerItemModel(blackLotus, 1); + ModelLoader.registerItemVariants(lexicon, new ModelResourceLocation("botania:lexicon_default", "inventory")); registerItemModel(lexicon); registerItemModel(manasteelHelm); From 9b06371a4ecd040ed2433516fc3fd623cf0d8ab8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 11:31:12 -0500 Subject: [PATCH 614/935] Fix dirt path and spreader binding. Closes #279 --- .../vazkii/botania/common/block/decor/BlockDirtPath.java | 5 +++-- .../botania/common/block/tile/mana/TileSpreader.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) 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 1088f52e2..2ea992d16 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -44,6 +44,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { private static final UUID speedBoostUuid = UUID.fromString("c5f17cca-c89f-4f12-81da-8f04b1f27679"); private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.55, 2).setSaved(false); + private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 15F/16F, 1); public BlockDirtPath() { super(Material.ground, LibBlockNames.DIRT_PATH); @@ -76,7 +77,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { Block blockAbove = stateAbove.getBlock(); if(!blockAbove.isAir(stateAbove, world, pos.up())) return FULL_BLOCK_AABB; - else return new AxisAlignedBB(0F, 0F, 0F, 1F, 15F / 16F, 1F); + else return AABB; } @Override @@ -86,7 +87,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { - return new AxisAlignedBB(pos, pos.add(1, 1, 1)); + return FULL_BLOCK_AABB; } @Override 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 db14e56b6..e7a865d3b 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 @@ -679,9 +679,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos).offset(pos); - if(axis == null) - axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); + AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos); + if(axis != null) + axis = axis.offset(pos); + else axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); if(!blockVec.isInside(axis)) blockVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); From a59ee11da496ef1dc8c18140c6d4ba2872b201a2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 14:14:07 -0500 Subject: [PATCH 615/935] Build 305 --- build.properties | 2 +- version/1.9.txt | 2 +- web/versions.ini | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 1d7aedc52..441286610 100644 --- a/build.properties +++ b/build.properties @@ -5,5 +5,5 @@ dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9 forge_version=12.16.1.1901 -build_number=305 +build_number=306 mod_name=Botania diff --git a/version/1.9.txt b/version/1.9.txt index e2fb72373..40559f717 100644 --- a/version/1.9.txt +++ b/version/1.9.txt @@ -1 +1 @@ -r1.8-304 \ No newline at end of file +r1.8-305 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index b7df0dec5..c8e4061de 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -253,4 +253,5 @@ r1.8-300=1.9 r1.8-301=1.9 r1.8-302=1.9 r1.8-303=1.9 -r1.8-304=1.9 \ No newline at end of file +r1.8-304=1.9 +r1.8-305=1.9 \ No newline at end of file From 056f46b1f8a451313219c9dcbf2e167de7aa2a19 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 15:22:35 -0500 Subject: [PATCH 616/935] 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()); } } From bdf51cbc8b186fd46f51bddbda9ed66660c4eab3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 19:16:51 -0500 Subject: [PATCH 617/935] Move IManaCollisionGhost to blocks. Closes #280 --- .../botania/api/mana/IManaCollisionGhost.java | 8 +++++-- .../java/vazkii/botania/api/package-info.java | 2 +- .../botania/common/block/BlockPlatform.java | 7 ++++++- .../botania/common/block/BlockTinyPlanet.java | 7 ++++++- .../common/block/mana/BlockManaDetector.java | 7 ++++++- .../botania/common/block/mana/BlockPrism.java | 7 ++++++- .../common/block/tile/TilePlatform.java | 7 +------ .../common/block/tile/TileTinyPlanet.java | 7 +------ .../block/tile/mana/TileManaDetector.java | 7 +------ .../common/block/tile/mana/TilePrism.java | 7 +------ .../common/entity/EntityManaBurst.java | 21 ++++++++++--------- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java b/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java index 76b537ed1..99de9d14e 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java +++ b/src/main/java/vazkii/botania/api/mana/IManaCollisionGhost.java @@ -10,12 +10,16 @@ */ package vazkii.botania.api.mana; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + /** - * Any TileEntity that implements this can be counted as a "ghost" block of + * Any Block that implements this can be counted as a "ghost" block of * sorts, that won't call the collision code for the mana bursts. */ public interface IManaCollisionGhost { - public boolean isGhost(); + public boolean isGhost(IBlockState state, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index de410da59..8e9ef9a77 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "78", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "79", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index e50d821ed..cf7634d1f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -33,6 +33,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; @@ -44,7 +45,7 @@ import vazkii.botania.common.lib.LibBlockNames; import java.util.List; -public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable { +public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { public BlockPlatform() { super(Material.WOOD, LibBlockNames.PLATFORM); @@ -142,4 +143,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable return tile.onWanded(player); } + @Override + public boolean isGhost(IBlockState state, World world, BlockPos pos) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 4e7fbd348..5e2063922 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -22,11 +22,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTinyPlanet extends BlockMod implements ILexiconable { +public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { 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); @@ -67,4 +68,8 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable { return LexiconData.tinyPlanet; } + @Override + public boolean isGhost(IBlockState state, World world, BlockPos pos) { + return true; + } } 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 71910ee48..3796f7f17 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -26,6 +26,7 @@ import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileManaDetector; @@ -34,7 +35,7 @@ import vazkii.botania.common.lib.LibBlockNames; import java.util.List; -public class BlockManaDetector extends BlockMod implements ILexiconable { +public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { public BlockManaDetector() { super(Material.ROCK, LibBlockNames.MANA_DETECTOR); @@ -90,4 +91,8 @@ public class BlockManaDetector extends BlockMod implements ILexiconable { return LexiconData.manaDetector; } + @Override + public boolean isGhost(IBlockState state, World world, BlockPos pos) { + return true; + } } 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 57b3ace2e..762935891 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -33,6 +33,7 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; @@ -43,7 +44,7 @@ import vazkii.botania.common.lib.LibBlockNames; import java.util.Random; -public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { +public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); @@ -209,4 +210,8 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable { return LexiconData.prism; } + @Override + public boolean isGhost(IBlockState state, World world, BlockPos pos) { + return true; + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index b10287cae..ddec5590d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -16,12 +16,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.mana.IManaCollisionGhost; -public class TilePlatform extends TileCamo implements IManaCollisionGhost { - - @Override - public boolean isGhost() { - return true; - } +public class TilePlatform extends TileCamo { public boolean onWanded(EntityPlayer player) { if(player != null) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index acd6e5173..80c46346b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -13,16 +13,11 @@ package vazkii.botania.common.block.tile; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod implements IManaCollisionGhost { +public class TileTinyPlanet extends TileMod { @Override public void updateEntity() { ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } - @Override - public boolean isGhost() { - return true; - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index bf89b2dcb..a88c44f18 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -19,7 +19,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -public class TileManaDetector extends TileMod implements IManaCollisionGhost { +public class TileManaDetector extends TileMod { @Override public void updateEntity() { @@ -33,9 +33,4 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost { Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } - @Override - public boolean isGhost() { - return true; - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 71fccecec..0b4e0e586 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -21,7 +21,7 @@ import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; -public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost { +public class TilePrism extends TileSimpleInventory { public void onBurstCollision(IManaBurst burst) { ItemStack lens = itemHandler.getStackInSlot(0); @@ -49,11 +49,6 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } } - @Override - public boolean isGhost() { - return true; - } - @Override public int getSizeInventory() { return 1; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 61a25f7b3..9b31109b7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -377,15 +377,16 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - protected void onImpact(RayTraceResult RayTraceResult) { + protected void onImpact(RayTraceResult rtr) { boolean collided = false; boolean dead = false; - if(RayTraceResult.entityHit == null) { - TileEntity tile = worldObj.getTileEntity(RayTraceResult.getBlockPos()); - Block block = worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock(); + if(rtr.entityHit == null) { + TileEntity tile = worldObj.getTileEntity(rtr.getBlockPos()); + IBlockState state = worldObj.getBlockState(rtr.getBlockPos()); + Block block = state.getBlock(); - if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) + if(block instanceof IManaCollisionGhost && ((IManaCollisionGhost) block).isGhost(state, worldObj, rtr.getBlockPos()) && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) return; if(BotaniaAPI.internalHandler.isBuildcraftPipe(tile)) @@ -400,9 +401,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { onRecieverImpact((IManaReceiver) tile, tile.getPos()); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, RayTraceResult.getBlockPos()); + ((IManaTrigger) block).onBurstCollision(this, worldObj, rtr.getBlockPos()); - boolean ghost = tile instanceof IManaCollisionGhost; + boolean ghost = block instanceof IManaCollisionGhost; dead = !ghost; if(ghost) return; @@ -413,10 +414,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { ILensEffect lens = getLensInstance(); if(lens != null) - dead = lens.collideBurst(this, RayTraceResult, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); + dead = lens.collideBurst(this, rtr, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); - if(collided && !hasAlreadyCollidedAt(RayTraceResult.getBlockPos())) - alreadyCollidedAt.add(RayTraceResult.getBlockPos()); + if(collided && !hasAlreadyCollidedAt(rtr.getBlockPos())) + alreadyCollidedAt.add(rtr.getBlockPos()); if(dead && !isDead) { if(!fake) { From 3c159e248551d62ecdd783d9ca84e25b7cfbc047 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 18 May 2016 21:01:09 -0400 Subject: [PATCH 618/935] Fix recipesorter complaining Closes #269 --- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c72ea6eb5..774b9d31f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -24,6 +24,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.logging.log4j.Level; @@ -697,6 +698,7 @@ public final class ModCraftingRecipes { recipeGrassHorn = BotaniaAPI.getLatestAddedRecipe(); // Terrasteel Armor Recipes + RecipeSorter.register("botania:armorUpgrade", ArmorUpgradeRecipe.class, RecipeSorter.Category.SHAPED, ""); GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), "TRT", "SAS", " S ", 'T', LibOreDict.LIVINGWOOD_TWIG, @@ -748,6 +750,7 @@ public final class ModCraftingRecipes { recipeTinyPlanet = BotaniaAPI.getLatestAddedRecipe(); // Mana Band Recipe + RecipeSorter.register("botania:manaUpgrade", ManaUpgradeRecipe.class, RecipeSorter.Category.SHAPED, ""); GameRegistry.addRecipe(new ManaUpgradeRecipe(new ItemStack(ModItems.manaRing), "TI ", "I I", " I ", 'T', new ItemStack(ModItems.manaTablet, 1, Short.MAX_VALUE), @@ -762,6 +765,7 @@ public final class ModCraftingRecipes { recipeAuraRing = BotaniaAPI.getLatestAddedRecipe(); // Greater Mana Band Recipe + RecipeSorter.register("botania:manaUpgradeShapeless", ShapelessManaUpgradeRecipe.class, RecipeSorter.Category.SHAPELESS, ""); GameRegistry.addRecipe(new ShapelessManaUpgradeRecipe(new ItemStack(ModItems.manaRingGreater), LibOreDict.TERRA_STEEL, new ItemStack(ModItems.manaRing, 1, Short.MAX_VALUE))); recipeGreaterManaRing = BotaniaAPI.getLatestAddedRecipe(); From 8fb3b886a809da1d406cbac7086e2f70ebfe9f21 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 18 May 2016 21:03:12 -0500 Subject: [PATCH 619/935] Get rid of all the nullable-nonnull stuff, warning huge diff --- build.gradle | 2 +- build.properties | 2 +- .../java/buildcraft/api/core/EnumColor.java | 3 ++ .../java/vazkii/botania/api/BotaniaAPI.java | 39 ++++++++++++------- .../botania/api/lexicon/LexiconCategory.java | 3 +- .../botania/api/lexicon/LexiconEntry.java | 3 +- .../core/handler/BaubleRenderHandler.java | 4 +- .../client/core/handler/ColorHandler.java | 11 +++--- .../handler/ContributorFancinessHandler.java | 3 +- .../handler/CorporeaAutoCompleteHandler.java | 3 +- .../client/core/handler/ModelHandler.java | 4 +- .../core/handler/MultiblockBlockAccess.java | 19 +++++---- .../client/gui/bag/ContainerFlowerBag.java | 4 +- .../client/gui/bag/InventoryFlowerBag.java | 11 ++++-- .../client/gui/box/ContainerBaubleBox.java | 4 +- .../client/gui/box/InventoryBaubleBox.java | 11 ++++-- .../gui/crafting/ContainerCraftingHalo.java | 4 +- .../lexicon/button/GuiButtonAchievement.java | 3 +- .../gui/lexicon/button/GuiButtonBack.java | 3 +- .../gui/lexicon/button/GuiButtonBookmark.java | 3 +- .../gui/lexicon/button/GuiButtonCategory.java | 4 +- .../button/GuiButtonChallengeIcon.java | 3 +- .../button/GuiButtonChallengeInfo.java | 3 +- .../lexicon/button/GuiButtonChallenges.java | 3 +- .../gui/lexicon/button/GuiButtonDoot.java | 3 +- .../gui/lexicon/button/GuiButtonHistory.java | 3 +- .../lexicon/button/GuiButtonInvisible.java | 4 +- .../gui/lexicon/button/GuiButtonNotes.java | 3 +- .../gui/lexicon/button/GuiButtonOptions.java | 3 +- .../gui/lexicon/button/GuiButtonPage.java | 3 +- .../gui/lexicon/button/GuiButtonShare.java | 3 +- .../button/GuiButtonUpdateWarning.java | 3 +- .../lexicon/button/GuiButtonViewOnline.java | 3 +- .../client/model/FloatingFlowerModel.java | 14 ++++++- .../botania/client/model/LexiconModel.java | 5 +++ .../botania/client/model/PlatformModel.java | 22 +++++++---- .../client/model/SpecialFlowerModel.java | 10 ++++- .../model/armor/ModelArmorElementium.java | 4 +- .../model/armor/ModelArmorManasteel.java | 4 +- .../model/armor/ModelArmorManaweave.java | 4 +- .../model/armor/ModelArmorTerrasteel.java | 4 +- .../render/entity/RenderBabylonWeapon.java | 6 ++- .../render/entity/RenderDoppleganger.java | 7 +++- .../client/render/entity/RenderManaStorm.java | 7 +++- .../render/entity/RenderPinkWither.java | 3 ++ .../client/render/entity/RenderPixie.java | 7 +++- .../render/entity/RenderPoolMinecart.java | 4 +- .../render/entity/RenderSnowballStack.java | 3 ++ .../client/render/entity/RenderSparkBase.java | 6 ++- .../render/entity/RenderThornChakram.java | 7 +++- .../render/tile/RenderTileAlfPortal.java | 4 +- .../client/render/tile/RenderTileAltar.java | 4 +- .../client/render/tile/RenderTileAvatar.java | 4 +- .../client/render/tile/RenderTileBellows.java | 4 +- .../client/render/tile/RenderTileBrewery.java | 4 +- .../client/render/tile/RenderTileCocoon.java | 4 +- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileCorporeaIndex.java | 4 +- .../render/tile/RenderTileEnchanter.java | 4 +- .../render/tile/RenderTileFloatingFlower.java | 3 +- .../render/tile/RenderTileHourglass.java | 3 +- .../render/tile/RenderTileIncensePlate.java | 3 +- .../render/tile/RenderTileLightRelay.java | 4 +- .../client/render/tile/RenderTilePool.java | 3 +- .../client/render/tile/RenderTilePrism.java | 4 +- .../client/render/tile/RenderTilePylon.java | 3 +- .../render/tile/RenderTileRuneAltar.java | 4 +- .../render/tile/RenderTileSparkChanger.java | 4 +- .../render/tile/RenderTileSpreader.java | 3 +- .../render/tile/RenderTileStarfield.java | 3 +- .../render/tile/RenderTileTerraPlate.java | 4 +- .../render/tile/RenderTileTeruTeruBozu.java | 3 +- .../render/tile/RenderTileTinyPotato.java | 4 +- .../botania/common/block/BlockAlfPortal.java | 9 ++++- .../botania/common/block/BlockAltGrass.java | 12 ++++-- .../botania/common/block/BlockAltar.java | 17 +++++--- .../botania/common/block/BlockAvatar.java | 10 ++++- .../botania/common/block/BlockBifrost.java | 12 ++++-- .../common/block/BlockBifrostPerm.java | 4 +- .../common/block/BlockCacophonium.java | 15 ++++--- .../botania/common/block/BlockCell.java | 7 +++- .../botania/common/block/BlockCocoon.java | 11 ++++-- .../common/block/BlockEnchantedSoil.java | 5 ++- .../botania/common/block/BlockEnderEye.java | 7 +++- .../botania/common/block/BlockFakeAir.java | 11 ++++-- .../botania/common/block/BlockFelPumpkin.java | 4 ++ .../block/BlockFloatingSpecialFlower.java | 22 +++++++---- .../botania/common/block/BlockForestEye.java | 6 ++- .../botania/common/block/BlockGaiaHead.java | 10 +++-- .../botania/common/block/BlockGhostRail.java | 5 +++ .../botania/common/block/BlockHourglass.java | 10 ++++- .../common/block/BlockIncensePlate.java | 8 +++- .../common/block/BlockLightLauncher.java | 4 ++ .../botania/common/block/BlockLightRelay.java | 12 ++++-- .../botania/common/block/BlockLivingrock.java | 8 +++- .../botania/common/block/BlockLivingwood.java | 10 +++-- .../vazkii/botania/common/block/BlockMod.java | 3 ++ .../common/block/BlockModDoubleFlower.java | 28 ++++++++----- .../common/block/BlockModDoubleFlower1.java | 4 ++ .../common/block/BlockModDoubleFlower2.java | 4 ++ .../botania/common/block/BlockModFlower.java | 17 +++++--- .../botania/common/block/BlockOpenCrate.java | 13 +++++-- .../common/block/BlockPistonRelay.java | 10 +++-- .../botania/common/block/BlockPlatform.java | 15 ++++--- .../botania/common/block/BlockPylon.java | 10 ++++- .../botania/common/block/BlockRoot.java | 4 +- .../botania/common/block/BlockSolidVines.java | 6 ++- .../common/block/BlockSparkChanger.java | 9 ++++- .../common/block/BlockSpecialFlower.java | 26 +++++++++---- .../botania/common/block/BlockStorage.java | 5 ++- .../common/block/BlockTeruTeruBozu.java | 7 +++- .../botania/common/block/BlockTinyPlanet.java | 6 ++- .../block/corporea/BlockCorporeaBase.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 11 +++++- .../block/corporea/BlockCorporeaFunnel.java | 7 +++- .../block/corporea/BlockCorporeaIndex.java | 6 ++- .../corporea/BlockCorporeaInterceptor.java | 6 ++- .../block/corporea/BlockCorporeaRetainer.java | 7 +++- .../common/block/decor/Block18Stone.java | 8 +++- .../common/block/decor/BlockBuriedPetals.java | 5 ++- .../common/block/decor/BlockCustomBrick.java | 8 +++- .../common/block/decor/BlockDirtPath.java | 10 +++-- .../block/decor/BlockEndStoneBrick.java | 8 +++- .../block/decor/BlockFloatingFlower.java | 15 +++++-- .../common/block/decor/BlockManaBeacon.java | 9 ++++- .../common/block/decor/BlockManaFlame.java | 13 +++++-- .../common/block/decor/BlockManaGlass.java | 5 ++- .../common/block/decor/BlockModMushroom.java | 11 ++++-- .../common/block/decor/BlockPavement.java | 8 +++- .../common/block/decor/BlockPetalBlock.java | 5 ++- .../common/block/decor/BlockPrismarine.java | 8 +++- .../common/block/decor/BlockReeds.java | 5 +++ .../common/block/decor/BlockSeaLamp.java | 4 +- .../common/block/decor/BlockShinyFlower.java | 6 ++- .../common/block/decor/BlockStarfield.java | 9 ++++- .../common/block/decor/BlockTinyPotato.java | 15 +++++-- .../common/block/decor/BlockUnstable.java | 6 ++- .../decor/biomestone/BlockBiomeStone.java | 6 ++- .../decor/biomestone/BlockBiomeStoneA.java | 4 ++ .../decor/biomestone/BlockBiomeStoneB.java | 4 ++ .../block/decor/panes/BlockAlfglassPane.java | 3 ++ .../block/decor/panes/BlockBifrostPane.java | 3 ++ .../block/decor/panes/BlockManaglassPane.java | 3 ++ .../block/decor/panes/BlockModPane.java | 4 +- .../decor/quartz/BlockSpecialQuartz.java | 8 +++- .../decor/quartz/BlockSpecialQuartzSlab.java | 6 ++- .../block/decor/slabs/BlockModSlab.java | 16 ++++++-- .../block/decor/walls/Block18StoneWall.java | 5 ++- .../decor/walls/BlockBiomeStoneWall.java | 5 ++- .../block/decor/walls/BlockModWall.java | 8 +++- .../block/dispenser/BehaviourFelPumpkin.java | 3 ++ .../dispenser/BehaviourPoolMinecart.java | 3 ++ .../block/dispenser/BehaviourSeeds.java | 3 ++ .../common/block/dispenser/BehaviourWand.java | 3 ++ .../common/block/mana/BlockBellows.java | 9 ++++- .../common/block/mana/BlockBrewery.java | 10 ++++- .../common/block/mana/BlockDistributor.java | 5 ++- .../common/block/mana/BlockEnchanter.java | 8 +++- .../common/block/mana/BlockForestDrum.java | 6 ++- .../common/block/mana/BlockManaDetector.java | 8 +++- .../common/block/mana/BlockManaVoid.java | 5 ++- .../botania/common/block/mana/BlockPool.java | 22 +++++++---- .../botania/common/block/mana/BlockPrism.java | 12 ++++-- .../botania/common/block/mana/BlockPump.java | 11 +++++- .../common/block/mana/BlockRFGenerator.java | 5 ++- .../common/block/mana/BlockRuneAltar.java | 7 +++- .../common/block/mana/BlockSpawnerClaw.java | 7 +++- .../common/block/mana/BlockSpreader.java | 11 ++++-- .../common/block/mana/BlockTerraPlate.java | 6 ++- .../common/block/mana/BlockTurntable.java | 5 ++- .../common/block/string/BlockRedString.java | 4 ++ .../string/BlockRedStringComparator.java | 5 ++- .../block/string/BlockRedStringContainer.java | 5 ++- .../block/string/BlockRedStringDispenser.java | 7 +++- .../string/BlockRedStringFertilizer.java | 10 +++-- .../string/BlockRedStringInterceptor.java | 6 ++- .../block/string/BlockRedStringRelay.java | 5 ++- .../common/block/tile/TileAlfPortal.java | 3 ++ .../common/block/tile/TileBifrost.java | 3 ++ .../common/block/tile/TileBrewery.java | 2 + .../common/block/tile/TileCraftCrate.java | 3 +- .../common/block/tile/TileEnchanter.java | 2 + .../common/block/tile/TileFakeAir.java | 3 ++ .../common/block/tile/TileLightRelay.java | 7 ++-- .../botania/common/block/tile/TileMod.java | 5 ++- .../common/block/tile/TileOpenCrate.java | 4 +- .../common/block/tile/TileRuneAltar.java | 2 + .../block/tile/TileSimpleInventory.java | 7 +++- .../corporea/TileCorporeaCrystalCube.java | 6 ++- .../common/block/tile/mana/TilePool.java | 3 +- .../common/block/tile/mana/TilePump.java | 7 +++- .../common/block/tile/mana/TileSpreader.java | 3 +- .../block/tile/string/TileRedString.java | 3 ++ .../tile/string/TileRedStringContainer.java | 6 ++- .../common/brew/potion/PotionClear.java | 4 +- .../common/core/BotaniaCreativeTab.java | 4 +- .../core/command/CommandDownloadLatest.java | 8 +++- .../common/core/command/CommandOpen.java | 8 +++- .../common/core/command/CommandShare.java | 8 +++- .../core/command/CommandSkyblockSpread.java | 8 +++- .../common/core/helper/InventoryHelper.java | 11 ++++-- .../botania/common/core/loot/BindUuid.java | 9 +++-- .../common/core/loot/EnableRelics.java | 8 ++-- .../common/core/loot/TrueGuardianKiller.java | 8 ++-- .../crafting/recipe/AesirRingRecipe.java | 8 ++-- .../crafting/recipe/AncientWillRecipe.java | 9 +++-- .../BlackHoleTalismanExtractRecipe.java | 9 +++-- .../crafting/recipe/CompositeLensRecipe.java | 9 +++-- .../crafting/recipe/CosmeticAttachRecipe.java | 9 +++-- .../crafting/recipe/CosmeticRemoveRecipe.java | 9 +++-- .../crafting/recipe/HelmRevealingRecipe.java | 9 +++-- .../common/crafting/recipe/KeepIvyRecipe.java | 9 +++-- .../crafting/recipe/LensDyeingRecipe.java | 8 ++-- .../crafting/recipe/ManaGunClipRecipe.java | 9 +++-- .../crafting/recipe/ManaGunLensRecipe.java | 9 +++-- .../recipe/ManaGunRemoveLensRecipe.java | 9 +++-- .../crafting/recipe/PhantomInkRecipe.java | 9 +++-- .../crafting/recipe/RegenIvyRecipe.java | 9 +++-- .../recipe/SpecialFloatingFlowerRecipe.java | 9 +++-- .../crafting/recipe/SpellClothRecipe.java | 9 +++-- .../recipe/TerraPickTippingRecipe.java | 9 +++-- .../common/entity/EntityBabylonWeapon.java | 5 ++- .../common/entity/EntityCorporeaSpark.java | 5 ++- .../common/entity/EntityDoppleganger.java | 9 +++-- .../common/entity/EntityEnderAirBottle.java | 3 +- .../common/entity/EntityFlameRing.java | 7 ++-- .../common/entity/EntityFlyingCreature.java | 4 +- .../common/entity/EntityMagicLandmine.java | 5 ++- .../common/entity/EntityMagicMissile.java | 3 +- .../common/entity/EntityManaBurst.java | 3 +- .../common/entity/EntityManaStorm.java | 6 ++- .../common/entity/EntityPinkWither.java | 3 +- .../botania/common/entity/EntityPixie.java | 4 +- .../common/entity/EntityPoolMinecart.java | 6 ++- .../common/entity/EntitySignalFlare.java | 6 ++- .../botania/common/entity/EntitySpark.java | 5 ++- .../common/entity/EntityThornChakram.java | 4 +- .../common/entity/EntityThrowableCopy.java | 5 ++- .../common/entity/EntityThrownItem.java | 3 +- .../botania/common/entity/EntityVineBall.java | 3 +- .../botania/common/item/Item16Colors.java | 4 +- .../botania/common/item/ItemAncientWill.java | 4 +- .../botania/common/item/ItemBaubleBox.java | 5 ++- .../common/item/ItemBlackHoleTalisman.java | 11 ++++-- .../botania/common/item/ItemBlackLotus.java | 4 +- .../botania/common/item/ItemBottledMana.java | 7 +++- .../botania/common/item/ItemCacophonium.java | 6 ++- .../common/item/ItemCorporeaSpark.java | 5 ++- .../botania/common/item/ItemCraftPattern.java | 5 ++- .../botania/common/item/ItemCraftingHalo.java | 5 ++- .../botania/common/item/ItemEnderHand.java | 5 ++- .../botania/common/item/ItemFertilizer.java | 2 + .../botania/common/item/ItemFlowerBag.java | 6 ++- .../botania/common/item/ItemGaiaHead.java | 3 ++ .../botania/common/item/ItemGrassHorn.java | 8 +++- .../botania/common/item/ItemGrassSeeds.java | 5 ++- .../botania/common/item/ItemLaputaShard.java | 4 +- .../botania/common/item/ItemLexicon.java | 8 +++- .../botania/common/item/ItemManaCookie.java | 7 +++- .../botania/common/item/ItemManaGun.java | 14 ++++--- .../botania/common/item/ItemManaMirror.java | 2 + .../botania/common/item/ItemManaTablet.java | 3 +- .../vazkii/botania/common/item/ItemMod.java | 5 ++- .../common/item/ItemObedienceStick.java | 3 ++ .../botania/common/item/ItemOpenBucket.java | 5 ++- .../common/item/ItemOvergrowthSeed.java | 3 ++ .../botania/common/item/ItemPinkinator.java | 4 +- .../botania/common/item/ItemPoolMinecart.java | 3 ++ .../botania/common/item/ItemSextant.java | 5 ++- .../botania/common/item/ItemSignalFlare.java | 6 ++- .../botania/common/item/ItemSlingshot.java | 7 +++- .../vazkii/botania/common/item/ItemSpark.java | 3 ++ .../botania/common/item/ItemSparkUpgrade.java | 4 +- .../botania/common/item/ItemSpawnerMover.java | 4 +- .../botania/common/item/ItemSpellCloth.java | 4 +- .../common/item/ItemTemperanceStone.java | 4 +- .../botania/common/item/ItemThornChakram.java | 7 +++- .../botania/common/item/ItemTwigWand.java | 11 ++++-- .../botania/common/item/ItemVineBall.java | 5 ++- .../vazkii/botania/common/item/ItemVirus.java | 4 +- .../botania/common/item/ItemWorldSeed.java | 5 ++- .../block/ItemBlockFloatingSpecialFlower.java | 5 ++- .../common/item/block/ItemBlockMod.java | 5 ++- .../common/item/block/ItemBlockModSlab.java | 3 ++ .../common/item/block/ItemBlockPool.java | 3 +- .../item/block/ItemBlockSpecialFlower.java | 9 +++-- .../item/block/ItemBlockSpecialQuartz.java | 5 ++- .../block/ItemBlockWithMetadataAndName.java | 6 ++- .../common/item/brew/ItemBrewBase.java | 12 ++++-- .../common/item/brew/ItemIncenseStick.java | 3 +- .../botania/common/item/brew/ItemVial.java | 4 +- .../armor/manasteel/ItemManasteelArmor.java | 6 ++- .../armor/manaweave/ItemManaweaveArmor.java | 4 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 7 +++- .../equipment/bauble/ItemBaubleCosmetic.java | 4 +- .../equipment/bauble/ItemBloodPendant.java | 3 +- .../equipment/bauble/ItemFlightTiara.java | 3 +- .../item/equipment/bauble/ItemMagnetRing.java | 3 +- .../item/equipment/bauble/ItemManaRing.java | 3 +- .../item/equipment/tool/ItemEnderDagger.java | 5 ++- .../item/equipment/tool/ItemGlassPick.java | 4 +- .../item/equipment/tool/ItemStarSword.java | 4 +- .../item/equipment/tool/ItemThunderSword.java | 4 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 11 ++++-- .../tool/elementium/ItemElementiumShears.java | 5 ++- .../tool/manasteel/ItemManasteelAxe.java | 12 ++++-- .../tool/manasteel/ItemManasteelPick.java | 11 ++++-- .../tool/manasteel/ItemManasteelShears.java | 8 ++-- .../tool/manasteel/ItemManasteelShovel.java | 14 ++++--- .../tool/manasteel/ItemManasteelSword.java | 13 ++++--- .../tool/terrasteel/ItemTerraAxe.java | 5 ++- .../tool/terrasteel/ItemTerraPick.java | 15 ++++--- .../tool/terrasteel/ItemTerraSword.java | 3 +- .../thaumcraft/ItemManaInkwell.java | 3 +- .../botania/common/item/lens/ItemLens.java | 7 +++- .../botania/common/item/material/ItemDye.java | 3 ++ .../item/material/ItemManaResource.java | 11 ++++-- .../common/item/material/ItemPetal.java | 3 ++ .../common/item/material/ItemQuartz.java | 4 +- .../common/item/material/ItemRune.java | 4 +- .../common/item/record/ItemModRecord.java | 6 ++- .../botania/common/item/relic/ItemDice.java | 4 +- .../common/item/relic/ItemFlugelEye.java | 9 ++++- .../common/item/relic/ItemInfiniteFruit.java | 6 ++- .../common/item/relic/ItemKingKey.java | 5 ++- .../botania/common/item/relic/ItemRelic.java | 2 + .../common/item/relic/ItemRelicBauble.java | 2 + .../common/item/rod/ItemCobbleRod.java | 3 ++ .../botania/common/item/rod/ItemDirtRod.java | 3 ++ .../common/item/rod/ItemDiviningRod.java | 4 +- .../common/item/rod/ItemExchangeRod.java | 5 ++- .../botania/common/item/rod/ItemFireRod.java | 3 ++ .../common/item/rod/ItemGravityRod.java | 6 ++- .../common/item/rod/ItemMissileRod.java | 6 ++- .../common/item/rod/ItemRainbowRod.java | 7 +++- .../common/item/rod/ItemSkyDirtRod.java | 5 ++- .../botania/common/item/rod/ItemSmeltRod.java | 5 ++- .../common/item/rod/ItemTerraformRod.java | 5 ++- .../common/item/rod/ItemTornadoRod.java | 9 +++-- .../botania/common/item/rod/ItemWaterRod.java | 3 ++ .../botania/common/lexicon/BLexiconEntry.java | 4 +- .../botania/common/lexicon/WLexiconEntry.java | 4 +- .../common/world/WorldTypeSkyblock.java | 7 +++- 344 files changed, 1603 insertions(+), 582 deletions(-) diff --git a/build.gradle b/build.gradle index a3a3678e9..204859c69 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } diff --git a/build.properties b/build.properties index a9aaa8e3c..9952d750f 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9.4 -forge_version=12.16.1.1909-1.9.4 +forge_version=12.17.0.1909-1.9.4 build_number=306 mod_name=Botania diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index e93a44be4..14449b303 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -15,6 +15,8 @@ import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + /** Use minecraft's EnumDyeColor in as many places as possible. */ @Deprecated public enum EnumColor implements IStringSerializable { @@ -111,6 +113,7 @@ public enum EnumColor implements IStringSerializable { return name().replace("_", ".").toLowerCase(Locale.ENGLISH); } + @Nonnull @Override public String getName() { return NAMES[ordinal()]; diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 778d91b5a..c1482dbe0 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jan 14, 2014, 6:15:28 PM (GMT)] */ package vazkii.botania.api; @@ -32,6 +32,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Loader; @@ -74,7 +75,7 @@ public final class BotaniaAPI { public static final Map knowledgeTypes = new HashMap<>(); public static final Map brewMap = new LinkedHashMap<>(); - + public static final List disposableBlocks = new ArrayList<>(); public static final List semiDisposableBlocks = new ArrayList<>(); @@ -102,16 +103,24 @@ 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.addEnum(ArmorMaterial.class, "MANASTEEL", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness 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.addEnum(ArmorMaterial.class, "B_ELEMENTIUM", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness 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.addEnum(ArmorMaterial.class, "TERRASTEEL", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F); // todo 1.9.4 toughness 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.addEnum(ArmorMaterial.class, "MANAWEAVE", + new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, + "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 1.0F); // todo 1.9.4 toughness public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); @@ -251,7 +260,7 @@ public final class BotaniaAPI { registerPaintableBlock(Blocks.STAINED_HARDENED_CLAY, BlockColored.COLOR); registerPaintableBlock(Blocks.WOOL, BlockColored.COLOR); registerPaintableBlock(Blocks.CARPET, BlockCarpet.COLOR); - + registerDisposableBlock("dirt"); // Vanilla registerDisposableBlock("sand"); // Vanilla registerDisposableBlock("gravel"); // Vanilla @@ -306,7 +315,7 @@ public final class BotaniaAPI { public static void registerDisposableBlock(String oreDictName) { disposableBlocks.add(oreDictName); } - + /** * Registers a Block as semi disposable using its Ore Dictionary Name. * This means it will not be trashed when sneaking. @@ -314,7 +323,7 @@ public final class BotaniaAPI { public static void registerSemiDisposableBlock(String oreDictName) { semiDisposableBlocks.add(oreDictName); } - + /** * Registers a paintableBlock and returns it. * You must also provide the PropertyEnum that this block uses to express its color @@ -331,7 +340,7 @@ public final class BotaniaAPI { public static void blacklistEntityFromGravityRod(Class entity) { gravityRodBlacklist.add(entity); } - + /** * Checks if the provided Entity is contained in the Blacklist. * Pass in the class for the Entity, e.g. entity.getClass() @@ -339,7 +348,7 @@ public final class BotaniaAPI { public static boolean isEntityBlacklistedFromGravityRod(Class entity) { return gravityRodBlacklist.contains(entity); } - + /** * Blacklists an item from being pulled by the Ring of Magnetization. * Short.MAX_VALUE can be used as the stack's damage for a wildcard. @@ -361,11 +370,11 @@ public final class BotaniaAPI { public static boolean isItemBlacklistedFromMagnet(ItemStack stack) { return isItemBlacklistedFromMagnet(stack, 0); } - + public static boolean isItemBlacklistedFromMagnet(ItemStack stack, int recursion) { if(recursion > 5) return false; - + if(stack.getItemDamage() != Short.MAX_VALUE) { ItemStack copy = new ItemStack(stack.getItem(), 0, Short.MAX_VALUE); boolean general = isItemBlacklistedFromMagnet(copy, recursion + 1); @@ -388,7 +397,7 @@ public final class BotaniaAPI { public static boolean isBlockBlacklistedFromMagnet(Block block, int meta, int recursion) { if(recursion >= 5) return false; - + if(meta != Short.MAX_VALUE) { boolean general = isBlockBlacklistedFromMagnet(block, Short.MAX_VALUE, recursion + 1); if(general) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 8d46f8246..88d339381 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -70,7 +71,7 @@ public class LexiconCategory implements Comparable { } @Override - public int compareTo(LexiconCategory category) { + public int compareTo(@Nonnull LexiconCategory category) { return priority == category.priority ? sortingId - category.sortingId : category.priority - priority; } } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 6e2afd1fd..4d973c9ef 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -159,7 +160,7 @@ public class LexiconEntry implements Comparable { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return getNameForSorting().compareTo(o.getNameForSorting()); } 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 712c12b92..5519ca808 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -33,10 +33,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; +import javax.annotation.Nonnull; + 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) { + public void doRenderLayer(@Nonnull 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) return; 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 d720dc2a0..4483d28d7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -24,6 +24,7 @@ import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Map; @@ -40,7 +41,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } }, @@ -50,7 +51,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); @@ -66,7 +67,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; @@ -80,7 +81,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; @@ -96,7 +97,7 @@ public final class ColorHandler { items.registerItemColorHandler(new IItemColor() { @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) { + public int getColorFromItemstack(@Nonnull ItemStack stack, int tintIndex) { Item item = stack.getItem(); if (item instanceof IColorable) { return ((IColorable) item).getColorFromItemStack(stack, tintIndex); 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 7cb25f4bf..8d975c5d0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; @@ -45,7 +46,7 @@ public final class ContributorFancinessHandler implements LayerRenderer= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index a96dc9ece..044a45df9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -26,7 +27,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index a79da6ca7..6ebad086d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -6,6 +6,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -19,7 +20,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 139217d65..818e1999a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -27,6 +27,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; + public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); @@ -71,7 +73,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int mx, int my) { + public void drawButton(@Nonnull Minecraft mc, int mx, int my) { boolean inside = mx >= xPosition && my >= yPosition && mx < xPosition + width && my < yPosition + height; if(inside) ticksHovered = Math.min(time, ticksHovered + gui.timeDelta); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index f7a7d6b71..62bcfdac5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index f78072a7e..28a8ad0df 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -15,6 +15,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -28,7 +29,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 2476d2c79..475b77268 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); 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 338b1d122..8880af260 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 @@ -19,6 +19,7 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -31,7 +32,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index bde63829b..dd37d744f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,7 @@ public class GuiButtonHistory extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft mc, int par2, int par3) { + public void drawButton(@Nonnull Minecraft mc, int par2, int par3) { gui.drawBookmark(xPosition, yPosition, displayString, false); hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 65a5b4dec..69be381b5 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -24,6 +24,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); @@ -48,7 +50,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enableDog) { dogPos += ClientTickHandler.delta * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 036e173da..ea4625b21 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -30,7 +31,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 2f5abee27..39c581389 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index a18e2cc5a..bf3dcbc3e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -16,6 +16,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; public class GuiButtonPage extends GuiButtonLexicon { @@ -28,7 +29,7 @@ public class GuiButtonPage extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(enabled) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 2d427d6fc..c4ffa9ac6 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonShare extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index a76ce006c..d04097e30 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -19,6 +19,7 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { if(!visible || !enabled) return; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 95578bbfb..a26e71bac 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -17,6 +17,7 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { } @Override - public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + public void drawButton(@Nonnull Minecraft par1Minecraft, int par2, int par3) { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8631e8bde..bdda13468 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -43,6 +43,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; @@ -80,10 +81,11 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } @Override - public void onResourceManagerReload(IResourceManager resourceManager) { + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { CACHE.clear(); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) @@ -136,6 +138,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } } + @Nonnull @Override public ItemOverrideList getOverrides() { return itemHandler; @@ -144,7 +147,9 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return true; } @Override public boolean isBuiltInRenderer() { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } private static class CompositeBakedModel implements IBakedModel { @@ -178,6 +183,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } // Forward all to flower model + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return genQuads; @@ -198,22 +204,26 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL return base.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return base.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return base.getItemCameraTransforms(); } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; String identifier; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 61d90496c..9ff580f1b 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -13,6 +13,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.util.List; @@ -29,11 +30,15 @@ public class LexiconModel implements IPerspectiveAwareModel { return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 63e4e259a..d68f3062d 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -32,10 +32,12 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; +import javax.annotation.Nonnull; import java.util.List; public class PlatformModel implements IBakedModel { + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { if(state.getBlock() != ModBlocks.platform) @@ -91,16 +93,19 @@ public class PlatformModel implements IBakedModel { return false; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:blocks/livingwood0"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; @@ -115,7 +120,7 @@ public class PlatformModel implements IBakedModel { } @Override - public TileEntity getTileEntity(BlockPos pos) { + public TileEntity getTileEntity(@Nonnull BlockPos pos) { /* todo is this actually needed? if so this can't be an iblockaccess anymore IBlockState state = getBlockState(pos); if(state == null || !state.getBlock().hasTileEntity(state)) @@ -133,12 +138,13 @@ public class PlatformModel implements IBakedModel { } @Override - public int getCombinedLight(BlockPos pos, int lightValue) { + public int getCombinedLight(@Nonnull BlockPos pos, int lightValue) { return 15 << 20 | 15 << 4; } + @Nonnull @Override - public IBlockState getBlockState(BlockPos pos) { + public IBlockState getBlockState(@Nonnull BlockPos pos) { IBlockState state = compose.getBlockState(pos); if(state.getBlock() instanceof BlockCamo) { state = ((TileCamo) compose.getTileEntity(pos)).camoState; @@ -147,12 +153,13 @@ public class PlatformModel implements IBakedModel { } @Override - public boolean isAirBlock(BlockPos pos) { + public boolean isAirBlock(@Nonnull BlockPos pos) { return compose.isAirBlock(pos); } + @Nonnull @Override - public Biome getBiomeGenForCoords(BlockPos pos) { + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { return compose.getBiomeGenForCoords(pos); } @@ -162,17 +169,18 @@ public class PlatformModel implements IBakedModel { } @Override - public int getStrongPower(BlockPos pos, EnumFacing direction) { + public int getStrongPower(@Nonnull BlockPos pos, @Nonnull EnumFacing direction) { return compose.getStrongPower(pos, direction); } + @Nonnull @Override public WorldType getWorldType() { return compose.getWorldType(); } @Override - public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) { + public boolean isSideSolid(@Nonnull BlockPos pos, @Nonnull EnumFacing side, boolean _default) { return compose.isSideSolid(pos, side, _default); } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 029c9a444..37bc7b774 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -48,6 +48,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.io.IOException; import java.util.Collection; @@ -133,7 +134,7 @@ public class SpecialFlowerModel implements IModelCustomData { public enum Loader implements ICustomModelLoader { INSTANCE { @Override - public void onResourceManagerReload(IResourceManager resourceManager) { + public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { } @Override @@ -212,6 +213,7 @@ public class SpecialFlowerModel implements IModelCustomData { return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) @@ -224,14 +226,16 @@ public class SpecialFlowerModel implements IModelCustomData { return ret.getQuads(state, face, rand); } + @Nonnull @Override public ItemOverrideList getOverrides() { return itemHandler; } private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull @Override - public IBakedModel handleItemState(IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { + public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { refreshBakedModels(); IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); if(item == null) { @@ -260,12 +264,14 @@ public class SpecialFlowerModel implements IModelCustomData { return baseModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { refreshBakedModels(); return baseModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return baseModel.getItemCameraTransforms(); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 8645a3608..81b1be771 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorElementium extends ModelBiped { public ModelRenderer helm; @@ -210,7 +212,7 @@ public class ModelArmorElementium extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index c01443cb1..ca237daf4 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorManasteel extends ModelBiped { @@ -140,7 +142,7 @@ public class ModelArmorManasteel extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index dbf0424f0..9030d1851 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorManaweave extends ModelBiped { public ModelRenderer helm; @@ -140,7 +142,7 @@ public class ModelArmorManaweave extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index fc937b160..44f3a76fb 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -18,6 +18,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import javax.annotation.Nonnull; + public class ModelArmorTerrasteel extends ModelBiped { public ModelRenderer helm; @@ -231,7 +233,7 @@ public class ModelArmorTerrasteel extends ModelBiped { } @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armr.showModel = slot == EntityEquipmentSlot.CHEST; 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 cb3f1eae5..0e6ec4b4e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -27,6 +27,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; +import javax.annotation.Nonnull; import java.util.Random; public class RenderBabylonWeapon extends Render { @@ -38,7 +39,7 @@ public class RenderBabylonWeapon extends Render { } @Override - public void doRender(EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { GlStateManager.pushMatrix(); GlStateManager.translate((float)par2, (float)par4, (float)par6); GlStateManager.rotate(weapon.getRotation(), 0F, 1F, 0F); @@ -104,8 +105,9 @@ public class RenderBabylonWeapon extends Render { GlStateManager.popMatrix(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityBabylonWeapon p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon p_110775_1_) { return null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 1c2a9c2e1..72b7bc770 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -21,6 +21,8 @@ import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; +import javax.annotation.Nonnull; + public class RenderDoppleganger extends RenderBiped { public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; @@ -54,7 +56,7 @@ public class RenderDoppleganger extends RenderBiped { } @Override - public void doRender(EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { int invulTime = dopple.getInvulTime(); if(invulTime > 0) { grainIntensity = invulTime > 20 ? 1F : invulTime * 0.05F; @@ -69,8 +71,9 @@ public class RenderDoppleganger extends RenderBiped { ShaderHelper.releaseShader(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger par1Entity) { return DefaultPlayerSkin.getDefaultSkinLegacy(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index d9fcb9934..f0074b805 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -17,6 +17,8 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; +import javax.annotation.Nonnull; + public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { @@ -24,7 +26,7 @@ public class RenderManaStorm extends Render { } @Override - public void doRender(EntityManaStorm storm, double x, double y, double z, float something, float pticks) { + public void doRender(@Nonnull EntityManaStorm storm, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float maxScale = 1.95F; @@ -35,8 +37,9 @@ public class RenderManaStorm extends Render { GlStateManager.popMatrix(); } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityManaStorm p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm p_110775_1_) { return null; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 5dc0f46e0..da82da2a8 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -19,6 +19,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.lib.LibResources; +import javax.annotation.Nonnull; + public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); @@ -27,6 +29,7 @@ public class RenderPinkWither extends RenderWither { super(p_i46130_1_); } + @Nonnull @Override protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { return resource; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 9d47dc3b5..ea6306d07 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -23,6 +23,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; +import javax.annotation.Nonnull; + public class RenderPixie extends RenderLiving { ShaderCallback callback = shader -> { @@ -41,13 +43,14 @@ public class RenderPixie extends RenderLiving { shadowSize = 0.0F; } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityPixie entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntityPixie entity) { return new ResourceLocation(LibResources.MODEL_PIXIE); } @Override - public void doRender(EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { if(pixie.getType() == 1) ShaderHelper.useShader(ShaderHelper.doppleganger, callback); super.doRender(pixie, par2, par4, par6, par8, par9); 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 2873545e7..e5dceff22 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -20,6 +20,8 @@ import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager p_i46155_1_) { @@ -27,7 +29,7 @@ public class RenderPoolMinecart extends RenderMinecart { } @Override - protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { + protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, @Nonnull 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 cf9bfcb04..e27bbe153 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -16,6 +16,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; + // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { @@ -26,6 +28,7 @@ public class RenderSnowballStack extends RenderSnowball { this.stackGetter = stackGetter; } + @Nonnull @Override 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 952b4f850..39c8053a9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -24,6 +24,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import javax.annotation.Nonnull; import java.util.Random; public abstract class RenderSparkBase extends Render { @@ -33,7 +34,7 @@ public abstract class RenderSparkBase extends Render { } @Override - public void doRender(T tEntity, double par2, double par4, double par6, float par8, float par9) { + public void doRender(@Nonnull T tEntity, double par2, double par4, double par6, float par8, float par9) { TextureAtlasSprite iicon = getBaseIcon(tEntity); GlStateManager.pushMatrix(); @@ -95,8 +96,9 @@ public abstract class RenderSparkBase extends Render { // NO-OP } + @Nonnull @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull Entity p_110775_1_) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } 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 5f1f97ba9..4efbfd999 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -21,6 +21,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.common.entity.EntityThornChakram; +import javax.annotation.Nonnull; + // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { @@ -29,7 +31,7 @@ public class RenderThornChakram extends Render { } @Override - public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(@Nonnull EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); @@ -47,8 +49,9 @@ public class RenderThornChakram extends Render { } } + @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull EntityThornChakram p_110775_1_) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } 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 0b39da56a..76ce37640 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -25,10 +25,12 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; +import javax.annotation.Nonnull; + public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) { if (!portal.getWorld().isBlockLoaded(portal.getPos(), false) || portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 80920eb78..8f384ceed 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -27,10 +27,12 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; +import javax.annotation.Nonnull; + public class RenderTileAltar extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) { if(!altar.getWorld().isBlockLoaded(altar.getPos(), false) || altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar) return; 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 ba6bd18d0..19577f4c3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -28,6 +28,8 @@ import vazkii.botania.client.model.ModelAvatar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; +import javax.annotation.Nonnull; + public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { @@ -38,7 +40,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { if (avatar != null) if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false) || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index c7aadb1b2..b1284eb67 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -19,6 +19,8 @@ import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; +import javax.annotation.Nonnull; + public class RenderTileBellows extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { @@ -29,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { if (bellows != null) if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) 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 29d34c824..8b6a492c4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -22,6 +22,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; +import javax.annotation.Nonnull; + public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); @@ -29,7 +31,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public TileBrewery brewery; @Override - public void renderTileEntityAt(TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { this.brewery = brewery; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); 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 d00fa07f2..51b884e39 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -19,10 +19,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileCocoon; +import javax.annotation.Nonnull; + public class RenderTileCocoon extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) { float rot = 0F; float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F; if(cocoon.timePassed % modval < 10) { 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 b49b5dc9b..8057859fd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -43,13 +43,15 @@ import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private EntityItem entity = null; private RenderEntityItem itemRenderer = null; @Override - public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) { ItemStack stack = null; if (cube != null) { if(entity == null) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 245c8c536..9de4681a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -19,6 +19,8 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import javax.annotation.Nonnull; + public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); @@ -26,7 +28,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { EntityItem item; @Override - public void renderTileEntityAt(TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { float alphaMod = 0F; if(enchanter.stage == 2) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 0b0295ef6..a00e75634 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -22,12 +22,13 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { if (tile != null) if (!tile.getWorld().isBlockLoaded(tile.getPos(), false)) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 4ded315cc..59ba82aea 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -21,6 +21,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileHourglass extends TileEntitySpecialRenderer { @@ -29,7 +30,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { @@ -30,7 +31,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 0c040adcc..3574af857 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -31,6 +31,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Random; @@ -41,7 +42,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public static int forceManaNumber = -1; @Override - public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress) { if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false) || pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool)) return; 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 a83817bac..a30fb6c32 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -20,12 +20,14 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; +import javax.annotation.Nonnull; + //import vazkii.botania.client.render.item.RenderLens; public class RenderTilePrism extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; 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 67b20389b..91851f531 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTilePylon extends TileEntitySpecialRenderer { @@ -48,7 +49,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { public static boolean pink = false; @Override - public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) { if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon) return; 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 748d1ca26..c5516cec4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -21,12 +21,14 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; +import javax.annotation.Nonnull; + public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ModelSpinningCubes cubes = new ModelSpinningCubes(); @Override - public void renderTileEntityAt(TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.translate(x, y, z); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 7b3ed51ab..dce4694cf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -18,10 +18,12 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.tile.TileSparkChanger; +import javax.annotation.Nonnull; + public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) { GlStateManager.pushMatrix(); GlStateManager.translate(d0, d1, d2); GlStateManager.rotate(90F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index f78da1d77..da7415e0f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -29,6 +29,7 @@ import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; +import javax.annotation.Nonnull; import java.awt.*; import java.util.Random; @@ -45,7 +46,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer private static final ModelSpreader model = new ModelSpreader(); @Override - public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { + public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) { if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 9932f00c4..dd9166295 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; +import javax.annotation.Nonnull; import java.awt.*; import java.nio.FloatBuffer; import java.util.Random; @@ -33,7 +34,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) { float max = TileTerraPlate.MAX_MANA / 10F; float alphaMod = Math.min(max, plate.getCurrentMana()) / max; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index f0b6423fd..6d21af223 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -21,6 +21,7 @@ import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; +import javax.annotation.Nonnull; import java.util.Random; public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { @@ -30,7 +31,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); @@ -48,7 +50,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer AlfPortalState.values().length) { @@ -63,8 +67,9 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAlfPortal(); } @@ -82,7 +87,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 13e9c8ba4..7e3c3a79d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -38,6 +38,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -51,13 +52,14 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { setTickRandomly(true); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTGRASS_VARIANT); } @Override - public boolean isToolEffective(String type, IBlockState state) { + public boolean isToolEffective(String type, @Nonnull IBlockState state) { return type.equals("shovel"); } @@ -66,6 +68,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ALTGRASS_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); @@ -77,7 +80,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } @@ -102,13 +105,14 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 125009bba..3396c0158 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -50,6 +50,7 @@ import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -68,11 +69,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); @@ -83,6 +86,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta >= AltarVariant.values().length ) { @@ -91,8 +95,9 @@ public class BlockAltar extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { TileEntity te = worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = ((TileAltar) te); @@ -104,6 +109,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; @@ -115,7 +121,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } @@ -130,7 +136,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); @@ -260,13 +266,14 @@ public class BlockAltar extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAltar(); } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 84ce2d9d9..7c5deb517 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -36,6 +36,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockAvatar extends BlockMod implements ILexiconable { @@ -52,6 +53,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) @@ -59,6 +61,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { else return Z_AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -69,6 +72,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -98,7 +102,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -150,6 +154,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -160,8 +165,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAvatar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 7d2258124..e2827a337 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBifrost extends BlockMod implements ILexiconable { @@ -54,24 +55,26 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.rainbowRod); } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block != this && super.shouldSideBeRendered(state, world, pos, side); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return 0; } @@ -80,8 +83,9 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBifrost(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index a4f28eb2d..4308299b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -26,6 +26,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBifrostPerm extends BlockMod implements ILexiconable { @@ -45,7 +46,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { if (world.getBlockState(pos.offset(side)).getBlock() == this) { return false; } @@ -58,6 +59,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d86838667..ada81e200 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -25,6 +25,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -36,6 +37,7 @@ public class BlockCacophonium extends BlockMod { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -46,13 +48,14 @@ public class BlockCacophonium extends BlockMod { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } @@ -76,7 +79,7 @@ public class BlockCacophonium extends BlockMod { } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -88,14 +91,15 @@ public class BlockCacophonium extends BlockMod { } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList stacks = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -114,8 +118,9 @@ public class BlockCacophonium extends BlockMod { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 96023f2fa..85a105d1d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -25,6 +25,7 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -35,8 +36,9 @@ public class BlockCell extends BlockMod implements ILexiconable { setSoundType(SoundType.CLOTH); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return new ArrayList<>(); } @@ -45,8 +47,9 @@ public class BlockCell extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index cb310056f..c9dcf4794 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -44,6 +45,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { setSoundType(SoundType.CLOTH); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -59,6 +61,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -76,13 +79,14 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return new ArrayList<>(); } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } @@ -91,8 +95,9 @@ public class BlockCocoon extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 0fd921571..265d62f06 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @@ -49,12 +50,12 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override - public boolean canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public boolean canSilkHarvest(World world, BlockPos pos, @Nonnull IBlockState state, EntityPlayer player) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 755760ddf..c8badef79 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -28,6 +28,8 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { @@ -38,11 +40,13 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 15); @@ -68,8 +72,9 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileEnderEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 0b7ccfcb1..a11501f8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -27,6 +27,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -39,11 +40,13 @@ public class BlockFakeAir extends BlockMod { setTickRandomly(true); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; @@ -108,13 +111,14 @@ public class BlockFakeAir extends BlockMod { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World par1World, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos) { return null; } @@ -128,8 +132,9 @@ public class BlockFakeAir extends BlockMod { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFakeAir(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 6c2c9c1f1..58f99808f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -33,6 +33,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; @@ -45,6 +47,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getHorizontalIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index d557571af..c3dce0dd0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -51,6 +51,7 @@ import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -68,13 +69,15 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID, BotaniaStateProps.ISLAND_TYPE }); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getExtendedState(state, world, pos); TileEntity te = world.getTileEntity(pos); if (te instanceof TileFloatingSpecialFlower) { @@ -84,7 +87,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -126,7 +129,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -134,8 +137,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); } @@ -146,7 +150,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -158,14 +162,15 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -215,8 +220,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.register(new ItemBlockFloatingSpecialFlower(this), getRegistryName()); } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFloatingSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 7a943fdcf..75f022630 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -26,6 +26,8 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + 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); @@ -37,6 +39,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable { setSoundType(SoundType.METAL); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -68,8 +71,9 @@ public class BlockForestEye extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileForestEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index cdb2ebe47..876dc3ab7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -40,13 +41,15 @@ public class BlockGaiaHead extends BlockSkull { setHardness(1.0F); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(ModItems.gaiaHead); } - @Override - public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { + @Nonnull + @Override + public List getDrops(@Nonnull IBlockAccess p_149749_1_, @Nonnull BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { @@ -71,6 +74,7 @@ public class BlockGaiaHead extends BlockSkull { return 0; } + @Nonnull @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileGaiaHead(); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 8dc6e386b..e8ea87f9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -34,6 +34,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockGhostRail extends BlockRailBase implements ILexiconable { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; @@ -48,6 +50,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.RAIL_DIRECTION); @@ -58,6 +61,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return state.getValue(BotaniaStateProps.RAIL_DIRECTION).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta)); @@ -99,6 +103,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { return LexiconData.ghostRail; } + @Nonnull @Override public IProperty getShapeProperty() { return BlockRailPowered.SHAPE; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index daf14fc4e..6853e1b2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { @@ -58,11 +59,13 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -73,6 +76,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -130,7 +134,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -177,6 +181,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -187,8 +192,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileHourglass(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 3834f4d81..856e4c57a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -33,6 +33,8 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0.375, 0, 0.125, 0.625, 1/16.0, 0.875); @@ -45,6 +47,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -112,6 +116,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return ((TileIncensePlate) world.getTileEntity(pos)).comparatorOutput; } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { @@ -136,8 +141,9 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileIncensePlate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index efeb374ab..32866f435 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -33,6 +33,7 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -47,11 +48,13 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -62,6 +65,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index b21bee92a..e85a6a224 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -48,11 +49,13 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); @@ -69,6 +72,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -82,7 +86,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -104,7 +108,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World p_149668_1_, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World p_149668_1_, @Nonnull BlockPos pos) { return null; } @@ -139,6 +143,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -149,8 +154,9 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 4c96cc7c6..5d22668fb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockLivingrock extends BlockMod implements ILexiconable { @@ -42,6 +43,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LIVINGROCK_VARIANT); @@ -52,6 +54,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= LivingRockVariant.values().length) { @@ -71,13 +74,14 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(state)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index b1621987c..a033dd72c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockLivingwood extends BlockMod implements ILexiconable { @@ -46,6 +47,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.LIVINGWOOD_VARIANT); @@ -56,6 +58,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= LivingWoodVariant.values().length) { @@ -75,18 +78,19 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(state)); } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 442e9e876..e3d83c09b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -20,6 +20,8 @@ import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockMod extends Block { protected int originalLight; @@ -37,6 +39,7 @@ public class BlockMod extends Block { GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 0987ae281..bf5073a8c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -44,6 +44,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -66,17 +67,19 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Nonnull @Override public abstract BlockStateContainer createBlockState(); @Override public abstract int getMetaFromState(IBlockState state); + @Nonnull @Override public abstract IBlockState getStateFromMeta(int meta); @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { + public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { return null; } @@ -86,12 +89,12 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, boolean fuckifiknow) { return false; } @Override - public boolean canHarvestBlock(IBlockAccess world, BlockPos pos, EntityPlayer player) { + public boolean canHarvestBlock(IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player) { return false; } @@ -101,7 +104,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, @Nonnull EntityPlayer player) { if(state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { if(world.getBlockState(pos.down()).getBlock() == this) { if (!player.capabilities.isCreativeMode) { @@ -131,12 +134,13 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { + public boolean isShearable(ItemStack item, IBlockAccess world, @Nonnull BlockPos pos) { return true; } + @Nonnull @Override - public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { + public List onSheared(ItemStack item, IBlockAccess world, @Nonnull BlockPos pos, int fortune) { ArrayList ret = new ArrayList<>(); IBlockState state = world.getBlockState(pos); IBlockState stateBelow = world.getBlockState(pos.down()); @@ -152,17 +156,19 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return ret; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + public void getSubBlocks(@Nonnull Item p_149666_1_, CreativeTabs p_149666_2_, @Nonnull List p_149666_3_) { for(int i = 0; i < COUNT; ++i) p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } + @Nonnull @Override @SideOnly(Side.CLIENT) public Block.EnumOffsetType getOffsetType() @@ -189,8 +195,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return LexiconData.flowers; } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + public IBlockState getActualState(IBlockState state, @Nonnull IBlockAccess worldIn, @Nonnull BlockPos pos) { if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { IBlockState iblockstate = worldIn.getBlockState(pos.down()); @@ -203,8 +210,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(FACING, EnumFacing.SOUTH); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { state = state.getBlock().getActualState(state, world, pos); PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 2b4b94d2b..17b52f84f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -7,6 +7,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; +import javax.annotation.Nonnull; + // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { @@ -18,6 +20,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); @@ -32,6 +35,7 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index c824224e6..2b6206e04 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -7,6 +7,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; +import javax.annotation.Nonnull; + // Silver to black public class BlockModDoubleFlower2 extends BlockModDoubleFlower { @@ -19,6 +21,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); @@ -33,6 +36,7 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 8178c982e..2c1db1c00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -43,6 +43,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -71,11 +72,13 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, getTypeProperty(), BotaniaStateProps.COLOR); @@ -86,6 +89,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -94,11 +98,13 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(type, EnumFlowerType.POPPY); } + @Nonnull @Override public EnumFlowerColor getBlockType() { return EnumFlowerColor.RED; @@ -109,11 +115,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); @@ -147,17 +154,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean fuckifiknow) { return world.isAirBlock(pos.up()); } @Override - public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + public boolean canUseBonemeal(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { return canGrow(world, pos, state, false); } @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + public void grow(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { placeDoubleFlower(world, pos, state.getValue(BotaniaStateProps.COLOR), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b33192476..180f0e282 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -44,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -61,6 +62,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, random = new Random(); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); @@ -71,6 +73,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= CrateVariant.values().length) { @@ -79,8 +82,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { if (world.getTileEntity(pos) instanceof TileCraftCrate) { TileCraftCrate tile = ((TileCraftCrate) world.getTileEntity(pos)); state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); @@ -97,7 +101,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -120,7 +124,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -162,8 +166,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 470080636..43f2f85b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -46,6 +46,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -76,7 +77,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return 0; } @@ -86,7 +87,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { if(!par1World.isRemote) mapCoords(par1World.provider.getDimension(), pos, 2); } @@ -156,7 +157,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { + public void readFromNBT(@Nonnull NBTTagCompound nbttagcompound) { ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.clear(); Collection tags = nbttagcompound.getKeySet(); @@ -170,8 +171,9 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } } + @Nonnull @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { for(DimWithPos s : ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.keySet()) nbttagcompound.setString(s.toString(), ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.get(s).toString()); return nbttagcompound; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index cf7634d1f..402de0c90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { @@ -59,6 +60,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, @@ -70,6 +72,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PlatformVariant.values().length) { @@ -78,8 +81,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return getDefaultState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) .withProperty(BotaniaStateProps.HELD_POS, pos); @@ -92,7 +96,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { + public boolean canRenderInLayer(IBlockState state, @Nonnull BlockRenderLayer layer) { return true; } @@ -108,13 +112,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); @@ -126,8 +130,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, par1World, pos); } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePlatform(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 82cfa82e5..5a8975a82 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) @@ -53,11 +54,13 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); @@ -68,6 +71,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PylonVariant.values().length) { @@ -87,7 +91,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -102,6 +106,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -122,8 +127,9 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePylon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 49a976814..2182b5500 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -25,6 +25,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRoot extends BlockMod implements ILexiconable { @@ -35,8 +36,9 @@ public class BlockRoot extends BlockMod implements ILexiconable { setSoundType(SoundType.WOOD); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 536eb44e9..0c82c362d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -29,6 +29,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSolidVines extends BlockVine implements ILexiconable { @@ -47,7 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(World p_149674_1_, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random p_149674_5_) { // NO-OP } @@ -56,8 +57,9 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { return false; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(Blocks.VINE); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index beafa1cec..fc368d232 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSparkChanger extends BlockMod implements ILexiconable { @@ -51,11 +52,13 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -66,6 +69,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -125,7 +129,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -181,8 +185,9 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSparkChanger(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index d64e8a2e9..8f8dbbff2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -61,6 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -134,18 +135,21 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { getTypeProperty(), BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID } ); } + @Nonnull @Override - public IExtendedBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); @@ -161,6 +165,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > 15) { @@ -170,7 +175,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -205,13 +210,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -219,13 +225,15 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } } + @Nonnull @Override public EnumFlowerColor getBlockType() { return EnumFlowerColor.RED; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { String name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; return ItemBlockSpecialFlower.ofType(name); } @@ -241,7 +249,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -253,14 +261,15 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -285,8 +294,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 91cf39c3f..df396f409 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockStorage extends BlockMod implements ILexiconable { @@ -42,6 +43,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT); @@ -52,6 +54,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= StorageVariant.values().length) { @@ -61,7 +64,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 9d44f711e..fb02e2916 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -32,6 +32,8 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + 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); @@ -40,6 +42,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { super(Material.CLOTH, LibBlockNames.TERU_TERU_BOZU); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -113,6 +116,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -123,8 +127,9 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTeruTeruBozu(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 5e2063922..8decb0596 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { 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); @@ -38,6 +40,7 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl setSoundType(SoundType.STONE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -58,8 +61,9 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTinyPlanet(); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 4c24792b8..4f3a7c90b 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -25,6 +25,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; +import javax.annotation.Nonnull; import java.util.Random; public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { @@ -36,7 +37,7 @@ public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchiev } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { 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 ac7700116..2b11bd696 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -34,6 +34,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); @@ -45,6 +47,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); @@ -55,13 +58,15 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(Properties.StaticProperty, true); } @@ -73,6 +78,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -98,8 +104,9 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return false; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaCrystalCube(); } 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 015df8ed6..351e50827 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaFunnel() { @@ -36,6 +38,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -46,6 +49,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -63,8 +67,9 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaFunnel(); } 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 72ed009ea..fa81e090a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -35,6 +35,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaIndex() { @@ -53,13 +55,15 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaIndex(); } 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 36ce6f65b..4de5a9e5e 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -28,6 +28,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { @@ -39,6 +40,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -49,6 +51,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -74,8 +77,9 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return 2; } + @Nonnull @Override - public TileCorporeaBase createTileEntity(World world, IBlockState state) { + public TileCorporeaBase createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaInterceptor(); } 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 c9856e8f3..8ac491e67 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -32,6 +32,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { @@ -41,6 +43,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -51,6 +54,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 8); @@ -83,8 +87,9 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileCorporeaRetainer(); } 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 fce6084bc..e3d0c3286 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class Block18Stone extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT); @@ -53,6 +55,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= FutureStoneVariant.values().length) { @@ -62,7 +65,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } @@ -77,8 +80,9 @@ public class Block18Stone extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index d69532f27..73ecac89a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -26,6 +26,7 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBuriedPetals extends BlockModFlower { @@ -37,6 +38,7 @@ public class BlockBuriedPetals extends BlockModFlower { setLightLevel(0.25F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -44,7 +46,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); @@ -77,6 +79,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Override public void registerItemForm() {} + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; 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 5ecab220a..2ea986598 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockCustomBrick extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); @@ -53,6 +55,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= CustomBrickVariant.values().length) { @@ -72,13 +75,14 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 1a01b2b50..64b843dc5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -38,6 +38,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.UUID; public class BlockDirtPath extends BlockMod implements ILexiconable { @@ -56,7 +57,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean isToolEffective(String type, IBlockState state) { + public boolean isToolEffective(String type, @Nonnull IBlockState state) { return type.equals("shovel"); } @@ -71,6 +72,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { IBlockState stateAbove = world.getBlockState(pos.up()); @@ -81,12 +83,12 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return FULL_BLOCK_AABB; } @@ -101,7 +103,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } 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 4692f3612..36384413a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { @@ -43,6 +44,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ENDBRICK_VARIANT); @@ -53,6 +55,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.ENDBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EndBrickVariant.values().length) { @@ -62,7 +65,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } @@ -77,8 +80,9 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 cb0082dce..ce738363f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -61,6 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -84,16 +85,19 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE }); @@ -104,6 +108,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -112,8 +117,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override - public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = getActualState(state, world, pos); TileEntity te = world.getTileEntity(pos); if (te instanceof TileFloatingFlower) { @@ -160,7 +166,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); @@ -183,7 +189,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -235,8 +241,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileFloatingFlower(); } 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 c6766a540..af71c67c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -34,6 +34,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaBeacon extends BlockMod implements ILexiconable { @@ -48,6 +49,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -58,6 +60,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -66,13 +69,14 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -107,8 +111,9 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaBeacon(); } } 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 8240ada6a..8dbc34b52 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -36,6 +36,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaFlame extends BlockMod implements ILexiconable { @@ -48,6 +49,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { setLightLevel(1F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -60,12 +62,13 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; @@ -87,7 +90,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @@ -106,8 +109,9 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { return ImmutableList.of(); } @@ -116,8 +120,9 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaFlame(); } 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 4622ba2d6..66cba1f49 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass() { @@ -46,11 +48,12 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; 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 9f574d2ef..9dd6e974b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -44,6 +44,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -65,6 +66,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -75,6 +77,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -83,13 +86,14 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(@Nonnull World p_149674_1_, @Nonnull BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading } @@ -105,11 +109,12 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); @@ -118,7 +123,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); 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 86c6883af..6b9585866 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -28,6 +28,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPavement extends BlockMod { @@ -42,6 +43,7 @@ public class BlockPavement extends BlockMod { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR); @@ -60,6 +62,7 @@ public class BlockPavement extends BlockMod { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= TYPES) { @@ -90,13 +93,14 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 ca018c830..5a56ab928 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPetalBlock extends BlockMod implements ILexiconable { @@ -41,6 +42,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -51,6 +53,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -60,7 +63,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 62d61c465..32edbaab6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockPrismarine extends BlockMod implements ILexiconable { @@ -45,6 +46,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); @@ -55,6 +57,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= PrismarineVariant.values().length) { @@ -74,13 +77,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } 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 7832d8cc3..15b42bbce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -32,6 +32,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockReeds extends BlockRotatedPillar implements ILexiconable { public BlockReeds() { @@ -45,6 +47,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.AXIS_FACING); @@ -60,6 +63,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { EnumFacing.Axis axis = null; @@ -72,6 +76,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); } + @Nonnull @Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); 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 6a445f2a7..644031dc9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -26,6 +26,8 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockSeaLamp extends BlockMod implements ILexiconable { private int coloredLight = -1; @@ -39,7 +41,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 9520a9050..d04672e8c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -27,6 +27,8 @@ import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { @@ -37,7 +39,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); @@ -50,7 +52,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean fuckifiknow) { return false; } 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 2c4f1d038..6df572ab1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockStarfield extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); @@ -42,16 +44,19 @@ public class BlockStarfield extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -62,6 +67,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -82,8 +88,9 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileStarfield(); } 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 29b4b2136..b466b8228 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -51,6 +52,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { ); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -68,6 +70,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { EnumFacing side = null; @@ -82,6 +85,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -110,7 +114,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + public boolean removedByPlayer(@Nonnull IBlockState state, World world, @Nonnull BlockPos pos, @Nonnull EntityPlayer player, boolean willHarvest) { if (willHarvest) { // Copy of super.removedByPlayer but don't set to air yet // This is so getDrops below will have a TE to work with @@ -122,14 +126,15 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack stack) { + public void harvestBlock(@Nonnull World world, EntityPlayer player, @Nonnull BlockPos pos, @Nonnull IBlockState state, TileEntity te, ItemStack stack) { super.harvestBlock(world, player, pos, state, te, stack); // Now delete the block and TE world.setBlockToAir(pos); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); @@ -154,6 +159,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -164,8 +170,9 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTinyPotato(); } 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 4b494d6c6..075693bd8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; import java.util.Random; @@ -53,6 +54,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.COLOR); @@ -63,6 +65,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= EnumDyeColor.values().length) { @@ -71,13 +74,14 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 9dfc3fb1a..8c54d3ff8 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 @@ -27,6 +27,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.List; public class BlockBiomeStone extends BlockMod implements ILexiconable { @@ -39,7 +40,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } @@ -54,8 +55,9 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index e2a2c021b..a8c054cfe 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -16,6 +16,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { @@ -23,6 +25,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.BIOMESTONE_VARIANT); @@ -33,6 +36,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone { return state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= BiomeStoneVariant.values().length) { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index f015011ae..5a1a61ca2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -16,6 +16,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { @@ -23,6 +25,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.BIOMEBRICK_VARIANT); @@ -33,6 +36,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { return state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= BiomeBrickVariant.values().length) { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 464b99dd0..6bcd7df75 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockAlfglassPane extends BlockModPane { public BlockAlfglassPane() { super(ModBlocks.elfGlass); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 3fc04a984..c20a05633 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockBifrostPane extends BlockModPane { public BlockBifrostPane() { super(ModBlocks.bifrostPerm); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 4584cb39d..359eb7a45 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -13,12 +13,15 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockManaglassPane extends BlockModPane { public BlockManaglassPane() { super(ModBlocks.manaGlass); } + @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; 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 0aaa5f4a9..da85f97ee 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 @@ -24,6 +24,8 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockModPane extends BlockPane { public BlockModPane(Block source) { @@ -46,7 +48,7 @@ public class BlockModPane extends BlockPane { }*/ @Override - public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { + public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, @Nonnull EnumFacing dir) { Block block = world.getBlockState(pos).getBlock(); return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } 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 27e7ac958..06eb83dd7 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 @@ -33,6 +33,7 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.List; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @@ -47,6 +48,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.QUARTZ_VARIANT); @@ -57,6 +59,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.QUARTZ_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= QuartzVariant.values().length) { @@ -78,6 +81,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { }; } + @Nonnull @Override public IBlockState onBlockPlaced(World par1World, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { if (meta == 2) { // Pillar quartz variant @@ -104,13 +108,13 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public ItemStack createStackedBlock(IBlockState state) { + public ItemStack createStackedBlock(@Nonnull IBlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List par3List) { par3List.add(new ItemStack(this, 1, 0)); par3List.add(new ItemStack(this, 1, 1)); par3List.add(new ItemStack(this, 1, 2)); 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 04e882d07..90355a763 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 @@ -25,6 +25,7 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.Random; public class BlockSpecialQuartzSlab extends BlockModSlab { @@ -78,8 +79,9 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { return this; } + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @@ -89,7 +91,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public ItemStack createStackedBlock(IBlockState par1) { + public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 6532e0d40..f37f8ec60 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -22,6 +22,7 @@ import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; @@ -43,11 +44,13 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, HALF, getVariantProperty()); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (doubleSlab) { @@ -70,8 +73,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); + @Nonnull @Override - public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @@ -81,12 +85,12 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public int quantityDropped(IBlockState state, int fortune, Random random) { + public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return super.quantityDropped(state, fortune, random); } @Override - public ItemStack createStackedBlock(IBlockState par1) { + public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } @@ -96,6 +100,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); } + @Nonnull @Override public String getUnlocalizedName(int i) { return name; @@ -106,13 +111,15 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return doubleSlab; } + @Nonnull @Override public final IProperty getVariantProperty() { return DUMMY; // Vanilla expects us to store different kinds of slabs into one block ID. Except we don't. We need this dummy property and dummy value to satisfy it. } + @Nonnull @Override - public final Comparable getTypeForItem(ItemStack stack) { + public final Comparable getTypeForItem(@Nonnull ItemStack stack) { return DummyEnum.SINGLETON; } @@ -123,6 +130,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public enum DummyEnum implements IStringSerializable { SINGLETON { + @Nonnull @Override public String getName() { return name().toLowerCase(Locale.ROOT); diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 06a90d1a9..bd74e05cd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class Block18StoneWall extends BlockModWall { @@ -39,6 +40,7 @@ public class Block18StoneWall extends BlockModWall { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); @@ -49,6 +51,7 @@ public class Block18StoneWall extends BlockModWall { return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta > 3) { @@ -64,7 +67,7 @@ public class Block18StoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 3f85ebb4d..8ac77e3f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class BlockBiomeStoneWall extends BlockModWall { @@ -39,6 +40,7 @@ public class BlockBiomeStoneWall extends BlockModWall { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); @@ -49,6 +51,7 @@ public class BlockBiomeStoneWall extends BlockModWall { return state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ordinal() - 8; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 0 || meta >= BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues().size()) { @@ -64,7 +67,7 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 637f5f578..516f97deb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public abstract class BlockModWall extends BlockWall implements ILexiconable { @@ -51,6 +52,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Nonnull @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos).withProperty(VARIANT, EnumType.NORMAL); @@ -61,6 +63,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return getMetaFromState(state); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); @@ -71,13 +74,14 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState(); } @Override - public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean canPlaceTorchOnTop(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return true; } @@ -87,7 +91,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { list.add(new ItemStack(item)); } 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 0036a9b7d..e0d3b804d 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -10,10 +10,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + // Taken from vanilla pumpkin dispense behaviour public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { private boolean field_179241_b = true; + @Nonnull @Override protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { 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 ea51194f6..44b05e7a8 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -23,8 +23,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { + @Nonnull @Override public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { EnumFacing enumfacing = BlockDispenser.getFacing(p_82487_1_.getBlockMetadata()); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 8697138d0..7545e67d1 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -19,6 +19,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BehaviourSeeds extends BehaviorDefaultDispenseItem { Block block; @@ -27,6 +29,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { this.block = block; } + @Nonnull @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 4ce0c19be..3adace8f6 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -20,8 +20,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; +import javax.annotation.Nonnull; + public class BehaviourWand extends BehaviorDefaultDispenseItem { + @Nonnull @Override protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); 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 397d77158..7d3b0d0a1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -34,6 +34,8 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + 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); @@ -45,6 +47,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); @@ -55,6 +58,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -63,6 +67,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -90,6 +95,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -100,8 +106,9 @@ public class BlockBellows extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBellows(); } 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 8b0660b5f..bd7360d73 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -38,6 +38,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { @@ -54,6 +55,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -64,11 +66,13 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -99,7 +103,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -147,6 +151,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return brew.signal; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -167,8 +172,9 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileBrewery(); } 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 61bb50f13..ac0bc76c6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -25,6 +25,8 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { @@ -39,8 +41,9 @@ public class BlockDistributor extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileDistributor(); } 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 4fe8cea7e..573bd3513 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -40,6 +40,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { @@ -55,6 +56,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.ENCHANTER_DIRECTION); @@ -69,6 +71,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, meta == 1 ? EnumFacing.Axis.Z : EnumFacing.Axis.X); @@ -84,8 +87,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileEnchanter(); } @@ -124,7 +128,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); ItemStack itemstack = enchanter.itemToEnchant; 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 8a5042494..e6474d123 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -43,6 +43,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -58,11 +59,13 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT); @@ -73,6 +76,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getValue(BotaniaStateProps.DRUM_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta >= DrumVariant.values().length) { @@ -102,7 +106,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } 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 3796f7f17..83e5ce4d5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -33,6 +33,7 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { @@ -45,6 +46,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED); @@ -55,6 +57,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, meta == 1); @@ -71,7 +74,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo } @Override - public void addCollisionBoxToList(IBlockState state, World par1World, BlockPos pos, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); } @@ -81,8 +84,9 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaDetector(); } 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 a7b6b1ff0..034b3a04a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { @@ -44,8 +46,9 @@ public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverla return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaVoid(); } 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 59c11948a..85c085056 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -49,6 +49,7 @@ import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -69,6 +70,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR); @@ -79,6 +81,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > PoolVariant.values().length) { @@ -87,8 +90,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); @@ -97,6 +101,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -113,14 +118,15 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TilePool pool = (TilePool) par1World.getTileEntity(pos); lastFragile = pool.fragile; super.breakBlock(par1World, pos, state); } + @Nonnull @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) { ArrayList drops = new ArrayList<>(); if(!lastFragile) @@ -130,7 +136,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { par3.add(new ItemStack(par1, 1, 0)); par3.add(new ItemStack(par1, 1, 2)); par3.add(new ItemStack(par1, 1, 3)); @@ -142,8 +148,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePool(); } @@ -164,7 +171,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override - public void addCollisionBoxToList(IBlockState state, World p_149743_1_, BlockPos pos, AxisAlignedBB entityBox, List boxes, Entity entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World p_149743_1_, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); @@ -173,7 +180,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + public boolean isSideSolid(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { return side == EnumFacing.DOWN; } @@ -187,6 +194,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) 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 762935891..97c68637a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -42,6 +42,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { @@ -61,11 +62,13 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, ); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); @@ -77,12 +80,14 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, + (state.getValue(BotaniaStateProps.HAS_LENS) ? 1 : 0); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.POWERED, (meta & 8) > 0) .withProperty(BotaniaStateProps.HAS_LENS, (meta & 1) > 0); } + @Nonnull @Override @SideOnly(Side.CLIENT) public BlockRenderLayer getBlockLayer() { @@ -90,7 +95,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @@ -147,7 +152,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSimpleInventory)) return; @@ -193,8 +198,9 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePrism(); } 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 8ce2624f5..3962d5f4c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -35,6 +35,8 @@ import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); @@ -48,6 +50,7 @@ public class BlockPump extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); @@ -58,11 +61,13 @@ public class BlockPump extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } + @Nonnull @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(Properties.StaticProperty, true); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta < 2 || meta > 5) { @@ -76,6 +81,7 @@ public class BlockPump extends BlockMod implements ILexiconable { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { @@ -116,8 +122,9 @@ public class BlockPump extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePump(); } } 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 74953c77e..1231ccf6f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -27,6 +27,8 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { @@ -49,8 +51,9 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRFGenerator(); } 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 e479b5023..33f1c6415 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { @@ -50,6 +51,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -90,7 +92,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); if (inv != null) { @@ -132,8 +134,9 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRuneAltar(); } 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 e864d025f..02b3a1286 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -29,6 +29,7 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; public class BlockSpawnerClaw extends BlockMod implements ILexiconable { @@ -40,13 +41,14 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { setHardness(3.0F); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.MOB_SPAWNER)); } @@ -66,8 +68,9 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpawnerClaw(); } 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 52a632172..23d87981e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -48,6 +48,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -62,6 +63,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT); @@ -72,6 +74,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { if (meta > SpreaderVariant.values().length) { @@ -86,7 +89,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -133,6 +136,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -184,7 +188,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void breakBlock(World par1World, BlockPos pos, IBlockState state) { + public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileEntity tile = par1World.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return; @@ -236,8 +240,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileSpreader(); } 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 c9f73ff63..af7c61eca 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -32,6 +32,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); @@ -44,6 +46,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; @@ -92,8 +95,9 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTerraPlate(); } 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 57f220fa1..e78a655b2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -30,6 +30,8 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { @@ -43,8 +45,9 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return true; } + @Nonnull @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileTurntable(); } 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 c8a795a06..e817c2c53 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -27,6 +27,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { @@ -36,6 +38,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING); @@ -52,6 +55,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.FACING).getIndex(); } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 23c71fc2a..724fb32ac 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -19,6 +19,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { @@ -36,8 +38,9 @@ public class BlockRedStringComparator extends BlockRedString { return ((TileRedStringComparator) world.getTileEntity(pos)).getComparatorValue(); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringComparator(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 87062e037..c103b95c2 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -18,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { @@ -25,8 +27,9 @@ public class BlockRedStringContainer extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringContainer(); } 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 a8b4d673f..e6156608f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -21,6 +21,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { @@ -28,6 +30,7 @@ public class BlockRedStringDispenser extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); @@ -44,6 +47,7 @@ public class BlockRedStringDispenser extends BlockRedString { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -64,8 +68,9 @@ public class BlockRedStringDispenser extends BlockRedString { world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState meta) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState meta) { return new TileRedStringDispenser(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 71c8425f1..fd75ae5e8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -20,6 +20,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { @@ -30,22 +31,23 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl } @Override - public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + public boolean canGrow(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, boolean isClient) { return ((TileRedStringFertilizer) world.getTileEntity(pos)).canGrow(world, isClient); } @Override - public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) { + public boolean canUseBonemeal(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { return ((TileRedStringFertilizer) world.getTileEntity(pos)).canUseBonemeal(world, rand); } @Override - public void grow(World world, Random rand, BlockPos pos, IBlockState state) { + public void grow(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull IBlockState state) { ((TileRedStringFertilizer) world.getTileEntity(pos)).grow(world, rand); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState meta) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState meta) { return new TileRedStringFertilizer(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 82ae2c818..774f91a05 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -24,6 +24,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; import java.util.Random; public class BlockRedStringInterceptor extends BlockRedString { @@ -34,6 +35,7 @@ public class BlockRedStringInterceptor extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } + @Nonnull @Override public BlockStateContainer createBlockState() { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); @@ -50,6 +52,7 @@ public class BlockRedStringInterceptor extends BlockRedString { return meta; } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; @@ -83,8 +86,9 @@ public class BlockRedStringInterceptor extends BlockRedString { return 2; } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringInterceptor(); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 5c8b47286..db4626842 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -18,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { @@ -25,8 +27,9 @@ public class BlockRedStringRelay extends BlockRedString { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); } + @Nonnull @Override - public TileRedString createTileEntity(World world, IBlockState state) { + public TileRedString createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileRedStringRelay(); } 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 9f3dda915..69c02698c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -40,6 +40,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -234,6 +235,7 @@ public class TileAlfPortal extends TileMod { ticksSinceLastItem = 0; } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound cmp) { NBTTagCompound ret = super.writeToNBT(cmp); @@ -366,6 +368,7 @@ public class TileAlfPortal extends TileMod { return false; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; 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 aef64dd5f..5937ec5e2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; @@ -29,6 +31,7 @@ public class TileBifrost extends TileMod { Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index e9a65575b..1190a44bc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -30,6 +30,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -191,6 +192,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { return 7; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 02090196d..2756e1463 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -22,6 +22,7 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.List; public class TileCraftCrate extends TileOpenCrate { @@ -122,7 +123,7 @@ public class TileCraftCrate extends TileOpenCrate { InventoryCrafting craft = new InventoryCrafting(new Container() { @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { + public boolean canInteractWith(@Nonnull EntityPlayer p_75145_1_) { return false; } }, 3, 3); 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 53e262fb0..5b3eafcdc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -46,6 +46,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; @@ -281,6 +282,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; 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 04d9f71af..5d4ef3ee5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -15,6 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; +import javax.annotation.Nonnull; + public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_X = "flowerX"; @@ -31,6 +33,7 @@ public class TileFakeAir extends TileMod { return SubTileBubbell.isValidBubbell(worldObj, flowerPos); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 7424e74fe..27c8c1b49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -36,6 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -265,17 +266,17 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { + public boolean attackEntityFrom(@Nonnull DamageSource p_70097_1_, float p_70097_2_) { return false; } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setExit(new BlockPos(cmp.getInteger(TAG_EXIT_X), cmp.getInteger(TAG_EXIT_Y), cmp.getInteger(TAG_EXIT_Z))); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { BlockPos exit = getExitPos(); cmp.setInteger(TAG_EXIT_X, exit.getX()); cmp.setInteger(TAG_EXIT_Y, exit.getY()); 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 c204e3d88..ed85fc027 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -20,13 +20,16 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class TileMod extends TileEntity implements ITickable { @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { return oldState.getBlock() != newState.getBlock(); } + @Nonnull @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 3c80fc84b..04db2a04b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -22,10 +22,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class TileOpenCrate extends TileSimpleInventory { @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 96a9ac27b..ebe32ba46 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -291,6 +292,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver return 16; } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index db8a64237..7e59ed407 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -18,6 +18,8 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; +import javax.annotation.Nonnull; + public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); @@ -44,13 +46,14 @@ public abstract class TileSimpleInventory extends TileMod { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override @SuppressWarnings("unchecked") - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return (T) itemHandler; return super.getCapability(cap, side); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 1b4e3fdc6..9ef86faf7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -28,6 +28,7 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import javax.annotation.Nonnull; import java.util.List; public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { @@ -171,12 +172,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } else return super.getCapability(cap, side); 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 daef39ca4..286b26f47 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 @@ -60,6 +60,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -101,7 +102,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private boolean sendPacket = false; @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index b6723deb3..14b06df4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -25,6 +25,8 @@ import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; @@ -53,12 +55,13 @@ public class TilePump extends TileMod { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if (cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } 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 99337c5e6..d9fdffb38 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 @@ -62,6 +62,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -148,7 +149,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean invalidTentativeBurst = false; @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) { if(oldState.getBlock() != newState.getBlock()) return true; if(oldState.getBlock() != ModBlocks.spreader || newState.getBlock() != ModBlocks.spreader) 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 2127f0a26..bef529a75 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 @@ -21,6 +21,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @@ -61,6 +63,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { // NO-OP } + @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 3d379d6d7..eca80dc41 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; +import javax.annotation.Nonnull; import java.util.Arrays; public class TileRedStringContainer extends TileRedString { @@ -29,7 +30,7 @@ public class TileRedStringContainer extends TileRedString { } @Override - public boolean hasCapability(Capability cap, EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) @@ -37,8 +38,9 @@ public class TileRedStringContainer extends TileRedString { return super.hasCapability(cap, side); } + @Nonnull @Override - public T getCapability(Capability cap, EnumFacing side) { + public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) 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 f72d6e826..219cf3496 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -16,6 +16,8 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionClear extends PotionMod { public PotionClear() { @@ -28,7 +30,7 @@ public class PotionClear extends PotionMod { } @Override - public void affectEntity(Entity e, Entity e1, EntityLivingBase e2, int t, double d) { + public void affectEntity(Entity e, Entity e1, @Nonnull EntityLivingBase e2, int t, double d) { e2.curePotionEffects(new ItemStack(Items.MILK_BUCKET)); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2b6d1b98f..4991bba22 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -23,6 +23,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public final class BotaniaCreativeTab extends CreativeTabs { @@ -36,6 +37,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { setBackgroundImageName(LibResources.GUI_CREATIVE); } + @Nonnull @Override public ItemStack getIconItemStack() { return new ItemStack(ModItems.lexicon); @@ -52,7 +54,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllRelevantItems(List list) { + public void displayAllRelevantItems(@Nonnull List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index 934a1f9d9..c0b19fa53 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -19,22 +19,26 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; +import javax.annotation.Nonnull; + public class CommandDownloadLatest extends CommandBase { private static final boolean ENABLED = true; + @Nonnull @Override public String getCommandName() { return "botania-download-latest"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender var1) { + public String getCommandUsage(@Nonnull ICommandSender var1) { return "/botania-download-latest "; } @Override - public void execute(MinecraftServer server, ICommandSender var1, String[] var2) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender var1, @Nonnull String[] var2) { if(!ENABLED) var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED))); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 9b66ff962..f6ca3a26c 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -21,20 +21,24 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; +import javax.annotation.Nonnull; + public class CommandOpen extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-open"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return ""; } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 341cd346f..9a5b10846 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -17,20 +17,24 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class CommandShare extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-share"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return ""; } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) { String json = I18n.translateToLocal("botaniamisc.shareMsg"); json = json.replaceAll("%name%", sender.getName()); json = json.replaceAll("%entry%", args[0]); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 3243c24de..89c94229d 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -20,15 +20,19 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; +import javax.annotation.Nonnull; + public class CommandSkyblockSpread extends CommandBase { + @Nonnull @Override public String getCommandName() { return "botania-skyblock-spread"; } + @Nonnull @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { return " []"; } @@ -38,7 +42,7 @@ public class CommandSkyblockSpread extends CommandBase { } @Override - public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { + public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) throws CommandException { int maxAllowed = 1000000; int minAllowed = 250; int minDist = 100; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index a1b7270fd..fdf59bdcc 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -29,6 +29,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.VanillaDoubleChestItemHandler; import vazkii.botania.api.corporea.InvWithLocation; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -229,7 +230,7 @@ public class InventoryHelper { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { return true; } @@ -248,7 +249,7 @@ public class InventoryHelper { } @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { + public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { return true; } @@ -307,6 +308,7 @@ public class InventoryHelper { return Arrays.asList(inventoryContents); } + @Nonnull @Override public String getName() { return null; @@ -317,6 +319,7 @@ public class InventoryHelper { return false; } + @Nonnull @Override public ITextComponent getDisplayName() { return new TextComponentString(getName()); @@ -326,9 +329,9 @@ public class InventoryHelper { public void markDirty() { } @Override - public void openInventory(EntityPlayer player) { } + public void openInventory(@Nonnull EntityPlayer player) { } @Override - public void closeInventory(EntityPlayer player) { } + public void closeInventory(@Nonnull EntityPlayer player) { } } } diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index b1c10835d..5afbfeb31 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -12,6 +12,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class BindUuid extends LootFunction { @@ -20,8 +21,9 @@ public class BindUuid extends LootFunction { super(conditionsIn); } + @Nonnull @Override - public ItemStack apply(ItemStack stack, Random rand, LootContext context) { + public ItemStack apply(@Nonnull ItemStack stack, @Nonnull Random rand, @Nonnull LootContext context) { if (context.getKillerPlayer() != null) { ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); } @@ -35,10 +37,11 @@ public class BindUuid extends LootFunction { } @Override - public void serialize(JsonObject object, BindUuid functionClazz, JsonSerializationContext serializationContext) {} + public void serialize(@Nonnull JsonObject object, @Nonnull BindUuid functionClazz, @Nonnull JsonSerializationContext serializationContext) {} + @Nonnull @Override - public BindUuid deserialize(JsonObject object, JsonDeserializationContext deserializationContext, LootCondition[] conditionsIn) { + public BindUuid deserialize(@Nonnull JsonObject object, @Nonnull JsonDeserializationContext deserializationContext, @Nonnull LootCondition[] conditionsIn) { return new BindUuid(conditionsIn); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java index 590465737..2dc8b3ba7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -9,12 +9,13 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class EnableRelics implements LootCondition { @Override - public boolean testCondition(Random rand, LootContext context) { + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { return ConfigHandler.relicsEnabled; } @@ -24,10 +25,11 @@ public class EnableRelics implements LootCondition { } @Override - public void serialize(JsonObject json, EnableRelics value, JsonSerializationContext context) {} + public void serialize(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} + @Nonnull @Override - public EnableRelics deserialize(JsonObject json, JsonDeserializationContext context) { + public EnableRelics deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { return new EnableRelics(); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index 91bd2f138..6279fc2bb 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -9,12 +9,13 @@ import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Random; public class TrueGuardianKiller implements LootCondition { @Override - public boolean testCondition(Random rand, LootContext context) { + public boolean testCondition(@Nonnull Random rand, @Nonnull LootContext context) { return context.getLootedEntity() instanceof EntityDoppleganger && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; } @@ -25,10 +26,11 @@ public class TrueGuardianKiller implements LootCondition { } @Override - public void serialize(JsonObject json, TrueGuardianKiller value, JsonSerializationContext context) {} + public void serialize(@Nonnull JsonObject json, @Nonnull TrueGuardianKiller value, @Nonnull JsonSerializationContext context) {} + @Nonnull @Override - public TrueGuardianKiller deserialize(JsonObject json, JsonDeserializationContext context) { + public TrueGuardianKiller deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { return new TrueGuardianKiller(); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index c4d0ddaa0..d332d4154 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -18,12 +18,13 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.UUID; public class AesirRingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundThorRing = false; boolean foundOdinRing = false; boolean foundLokiRing = false; @@ -45,7 +46,7 @@ public class AesirRingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { String soulbind = null; UUID soulbindUUID = null; boolean hasUUID = false; @@ -91,8 +92,9 @@ public class AesirRingRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index d947402b7..4164646c2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class AncientWillRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundWill = false; boolean foundItem = false; @@ -42,7 +44,7 @@ public class AncientWillRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; int will = -1; @@ -74,8 +76,9 @@ public class AncientWillRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 9f7b01fc7..ef86d804e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -19,10 +19,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class BlackHoleTalismanExtractRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundTalisman = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -38,7 +40,7 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack talisman = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -67,8 +69,9 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } 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 061fecdd5..3b84a0a64 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -20,10 +20,12 @@ import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class CompositeLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundSecondLens = false; boolean foundSlimeball = false; @@ -45,7 +47,7 @@ public class CompositeLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; ItemStack secondLens = null; @@ -83,8 +85,9 @@ public class CompositeLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index a388e91ca..44a305842 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticAttachRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundCosmetic = false; boolean foundAttachable = false; @@ -42,7 +44,7 @@ public class CosmeticAttachRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack cosmeticItem = null; ItemStack attachableItem = null; @@ -74,8 +76,9 @@ public class CosmeticAttachRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index 1ac1b641d..1bc4b2c85 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticRemoveRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundAttachable = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -37,7 +39,7 @@ public class CosmeticRemoveRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack attachableItem = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -65,8 +67,9 @@ public class CosmeticRemoveRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } 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 76c2b4571..2ec883464 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -21,10 +21,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class HelmRevealingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { Item goggles = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "goggles")); if(goggles == null) return false; // NO TC loaded @@ -45,7 +47,7 @@ public class HelmRevealingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack helm = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -102,8 +104,9 @@ public class HelmRevealingRecipe implements IRecipe { return helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 0d81332cf..295660da9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -19,10 +19,12 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class KeepIvyRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundIvy = false; boolean foundItem = false; @@ -41,7 +43,7 @@ public class KeepIvyRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -66,8 +68,9 @@ public class KeepIvyRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index d2ff1897f..6ee297ea1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -20,6 +20,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -28,7 +29,7 @@ public class LensDyeingRecipe implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundDye = false; @@ -51,7 +52,7 @@ public class LensDyeingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; int color = -1; @@ -96,8 +97,9 @@ public class LensDyeingRecipe implements IRecipe { return -1; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 0cfc90966..15b5d050d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class ManaGunClipRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundGun = false; boolean foundClip = false; @@ -42,7 +44,7 @@ public class ManaGunClipRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack gun = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -72,8 +74,9 @@ public class ManaGunClipRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 82bb9d343..b6722e3d5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -19,10 +19,12 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundLens = false; boolean foundGun = false; @@ -46,7 +48,7 @@ public class ManaGunLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack lens = null; ItemStack gun = null; @@ -80,8 +82,9 @@ public class ManaGunLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 6335cc3b2..1730be1e3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -17,10 +17,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunRemoveLensRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundGun = false; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -37,7 +39,7 @@ public class ManaGunRemoveLensRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack gun = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -64,8 +66,9 @@ public class ManaGunRemoveLensRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 18cfd18dd..68c5d8889 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class PhantomInkRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundInk = false; boolean foundItem = false; @@ -42,7 +44,7 @@ public class PhantomInkRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -67,8 +69,9 @@ public class PhantomInkRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java index 6330d9795..518d85b58 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/RegenIvyRecipe.java @@ -20,10 +20,12 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemRegenIvy; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class RegenIvyRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { ItemStack tool = null; boolean foundIvy = false; int materialsFound = 0; @@ -56,7 +58,7 @@ public class RegenIvyRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack tool = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -83,8 +85,9 @@ public class RegenIvyRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index 17c07a082..57e1265ab 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -19,10 +19,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; + public class SpecialFloatingFlowerRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundFloatingFlower = false; boolean foundSpecialFlower = false; @@ -43,7 +45,7 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack specialFlower = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -68,8 +70,9 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 6318e39d3..71f28a442 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -18,10 +18,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class SpellClothRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundCloth = false; boolean foundEnchanted = false; @@ -42,7 +44,7 @@ public class SpellClothRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack stackToDisenchant = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); @@ -72,8 +74,9 @@ public class SpellClothRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 9f37ab337..5eebc1e8e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -18,10 +18,12 @@ import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import javax.annotation.Nonnull; + public class TerraPickTippingRecipe implements IRecipe { @Override - public boolean matches(InventoryCrafting var1, World var2) { + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World var2) { boolean foundTerraPick = false; boolean foundElementiumPick = false; @@ -42,7 +44,7 @@ public class TerraPickTippingRecipe implements IRecipe { } @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { + public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack terraPick = null; for(int i = 0; i < var1.getSizeInventory(); i++) { @@ -69,8 +71,9 @@ public class TerraPickTippingRecipe implements IRecipe { return null; } + @Nonnull @Override - public ItemStack[] getRemainingItems(InventoryCrafting inv) { + public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 12e5aefee..027f2d300 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -30,6 +30,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; +import javax.annotation.Nonnull; import java.util.List; public class EntityBabylonWeapon extends EntityThrowableCopy { @@ -168,7 +169,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } @Override - public void writeEntityToNBT(NBTTagCompound cmp) { + public void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { super.writeEntityToNBT(cmp); cmp.setBoolean(TAG_CHARGING, isCharging()); cmp.setInteger(TAG_VARIETY, getVariety()); @@ -179,7 +180,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } @Override - public void readEntityFromNBT(NBTTagCompound cmp) { + public void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { super.readEntityFromNBT(cmp); setCharging(cmp.getBoolean(TAG_CHARGING)); setVariety(cmp.getInteger(TAG_VARIETY)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 00ceb941d..420497254 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -31,6 +31,7 @@ import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -304,14 +305,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 3532e50d1..462bcd17f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -81,6 +81,7 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; @@ -359,7 +360,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { Entity e = par1DamageSource.getEntity(); if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; @@ -391,7 +392,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - protected void damageEntity(DamageSource par1DamageSource, float par2) { + protected void damageEntity(@Nonnull DamageSource par1DamageSource, float par2) { super.damageEntity(par1DamageSource, par2); Entity attacker = par1DamageSource.getEntity(); @@ -413,7 +414,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public void onDeath(DamageSource p_70645_1_) { + public void onDeath(@Nonnull DamageSource p_70645_1_) { super.onDeath(p_70645_1_); EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayer) { @@ -445,7 +446,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, @Nonnull DamageSource source) { // Save true killer, they get extra loot if ("player".equals(source.getDamageType()) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 54759b95a..0b6de8310 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -20,6 +20,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -34,7 +35,7 @@ public class EntityEnderAirBottle extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { if(pos.entityHit == null && !worldObj.isRemote) { List coordsList = getCoordsToPut(pos.getBlockPos()); worldObj.playEvent(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 6e6fce8ee..8806bbdbc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; +import javax.annotation.Nonnull; import java.util.List; @@ -91,19 +92,19 @@ public class EntityFlameRing extends Entity { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { return false; } @Override - protected void readEntityFromNBT(NBTTagCompound var1) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { // NO-OP } @Override - protected void writeEntityToNBT(NBTTagCompound var1) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { // NO-OP } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index fb274dd32..2af233082 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -17,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class EntityFlyingCreature extends EntityAmbientCreature { public EntityFlyingCreature(World par1World) { @@ -29,7 +31,7 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) { + protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 00a6c4a4f..3c1eaad46 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; import java.util.List; public class EntityMagicLandmine extends Entity { @@ -78,11 +79,11 @@ public class EntityMagicLandmine extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound var1) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { } @Override - protected void writeEntityToNBT(NBTTagCompound var1) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 965073c9b..0c9a2a0f7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -32,6 +32,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.util.List; public class EntityMagicMissile extends EntityThrowable { @@ -185,7 +186,7 @@ public class EntityMagicMissile extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { switch (pos.typeOfHit) { case BLOCK: { Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 9b31109b7..bb317befe 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -48,6 +48,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.HashSet; @@ -377,7 +378,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - protected void onImpact(RayTraceResult rtr) { + protected void onImpact(@Nonnull RayTraceResult rtr) { boolean collided = false; boolean dead = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 4343aad6c..9e9586a53 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -18,6 +18,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class EntityManaStorm extends Entity { private static final String TAG_TIME = "time"; @@ -82,14 +84,14 @@ public class EntityManaStorm extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { liveTime = cmp.getInteger(TAG_TIME); burstsFired = cmp.getInteger(TAG_BURSTS_FIRED); deathTime = cmp.getInteger(TAG_DEATH_TIME); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setInteger(TAG_TIME, liveTime); cmp.setInteger(TAG_BURSTS_FIRED, burstsFired); cmp.setInteger(TAG_DEATH_TIME, deathTime); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 9fe9a093f..3e1b721ed 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -23,6 +23,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.Iterator; public class EntityPinkWither extends EntityWither { @@ -82,7 +83,7 @@ public class EntityPinkWither extends EntityWither { } @Override - public void addTrackingPlayer(EntityPlayerMP player) + public void addTrackingPlayer(@Nonnull EntityPlayerMP player) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 77088c978..148690dfa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -21,6 +21,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntityPixie extends EntityFlyingCreature { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); @@ -100,7 +102,7 @@ public class EntityPixie extends EntityFlyingCreature { } @Override - public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) { + public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { if(getType() == 0 && par1DamageSource.getEntity() != summoner || getType() == 1 && par1DamageSource.getEntity() instanceof EntityPlayer) return super.attackEntityFrom(par1DamageSource, par2); return false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 74c7b343a..117e218f0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; public class EntityPoolMinecart extends EntityMinecart { @@ -56,16 +57,19 @@ public class EntityPoolMinecart extends EntityMinecart { dataManager.register(MANA, 0); } + @Nonnull @Override public IBlockState getDisplayTile() { return ModBlocks.pool.getDefaultState(); } + @Nonnull @Override public ItemStack getCartItem() { return new ItemStack(ModItems.poolMinecart); } + @Nonnull @Override public EntityMinecart.Type getType() { return Type.RIDEABLE; @@ -163,7 +167,7 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound p_70014_1_) { super.writeEntityToNBT(p_70014_1_); p_70014_1_.setInteger(TAG_MANA, getMana()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 033dc6087..a875df189 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -20,6 +20,8 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; @@ -64,12 +66,12 @@ public class EntitySignalFlare extends Entity { } @Override - protected void readEntityFromNBT(NBTTagCompound nbttagcompound) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound nbttagcompound) { setColor(nbttagcompound.getInteger(COLOR_TAG)); } @Override - protected void writeEntityToNBT(NBTTagCompound nbttagcompound) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound nbttagcompound) { nbttagcompound.setInteger(COLOR_TAG, getColor()); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index aa0e6b2db..ee306542d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -34,6 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; @@ -300,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - protected void readEntityFromNBT(NBTTagCompound cmp) { + protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override - protected void writeEntityToNBT(NBTTagCompound cmp) { + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 1d690b4b3..eb9b57e74 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -33,6 +33,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class EntityThornChakram extends EntityThrowable { private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); @@ -113,7 +115,7 @@ public class EntityThornChakram extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult pos) { + protected void onImpact(@Nonnull RayTraceResult pos) { if(noClip) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 962094663..42f1a7d3c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -29,6 +29,7 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -337,7 +338,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(NBTTagCompound compound) + public void writeEntityToNBT(@Nonnull NBTTagCompound compound) { compound.setInteger("xTile", this.xTile); compound.setInteger("yTile", this.yTile); @@ -358,7 +359,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(NBTTagCompound compound) + public void readEntityFromNBT(@Nonnull NBTTagCompound compound) { this.xTile = compound.getInteger("xTile"); this.yTile = compound.getInteger("yTile"); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 7561ec312..e99c26e64 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; import java.util.List; public class EntityThrownItem extends EntityItem { @@ -46,7 +47,7 @@ public class EntityThrownItem extends EntityItem { } @Override - public boolean isEntityInvulnerable(DamageSource source) { + public boolean isEntityInvulnerable(@Nonnull DamageSource source) { return true; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 9390d7a2a..9fe5c392a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.Map; public class EntityVineBall extends EntityThrowable { @@ -53,7 +54,7 @@ public class EntityVineBall extends EntityThrowable { } @Override - protected void onImpact(RayTraceResult var1) { + protected void onImpact(@Nonnull RayTraceResult var1) { if(worldObj.isRemote) { for(int j = 0; j < 16; j++) { diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 56c5a665d..1fa3d4ce0 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -15,6 +15,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; import java.util.List; public class Item16Colors extends ItemMod implements IColorable { @@ -33,11 +34,12 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index ec8416134..09b57d765 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -21,6 +21,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemAncientWill extends ItemMod { @@ -37,7 +38,7 @@ public class ItemAncientWill extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -52,6 +53,7 @@ public class ItemAncientWill extends ItemMod { tooltip.add(s.replaceAll("&", "\u00a7")); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 7fa64f914..b9eacf578 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -23,6 +23,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemBaubleBox extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -33,8 +35,9 @@ public class ItemBaubleBox extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 510581dc9..9a26ae81b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -44,6 +44,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -62,8 +63,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { RecipeSorter.register("botania:blackHoleTalismanExtract", BlackHoleTalismanExtractRecipe.class, Category.SHAPELESS, ""); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(getBlock(par1ItemStack) != Blocks.AIR && par3EntityPlayer.isSneaking()) { int dmg = par1ItemStack.getItemDamage(); par1ItemStack.setItemDamage(~dmg & 1); @@ -74,6 +76,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } + @Nonnull @Override 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); @@ -187,8 +190,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); ItemStack stack = new ItemStack(block, 1, meta); @@ -196,8 +200,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + TextFormatting.GREEN + stack.getDisplayName() + TextFormatting.RESET + ")"); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { int count = getBlockCount(itemStack); if(count == 0) return null; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 769ad9129..42b3d4834 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -24,6 +24,7 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @@ -37,7 +38,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -47,6 +48,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { return par1ItemStack.getItemDamage() > 0; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 61d7627cb..7e6db88f1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -37,6 +37,7 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -211,14 +212,15 @@ public class ItemBottledMana extends ItemMod { par3List.add(I18n.translateToLocal("botaniamisc.bottleTooltip")); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { randomEffect(living, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); @@ -233,6 +235,7 @@ public class ItemBottledMana extends ItemMod { return 20; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.DRINK; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index fb2806006..7b5ea9be3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -41,6 +41,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.util.List; public class ItemCacophonium extends ItemMod implements ICraftAchievement { @@ -89,6 +90,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return false; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { boolean can = isDOIT(stack); @@ -120,6 +122,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { list.add(I18n.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BLOCK; @@ -130,8 +133,9 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index e49e1026b..ee43f0c29 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -25,6 +25,7 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemCorporeaSpark extends ItemMod { @@ -35,11 +36,12 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); @@ -59,6 +61,7 @@ public class ItemCorporeaSpark extends ItemMod { return EnumActionResult.PASS; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index a37306976..1a09dc651 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -23,6 +23,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemCraftPattern extends ItemMod { @@ -33,6 +34,7 @@ public class ItemCraftPattern extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); @@ -46,11 +48,12 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 1df8331ce..639e60fca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -64,6 +64,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); @@ -87,8 +89,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int segment = getSegmentLookedAt(stack, player); ItemStack itemForPos = getItemForSlot(stack, segment); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 8988b31f3..cbc2c6606 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -27,6 +27,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProvider { private static final int COST_PROVIDE = 5; @@ -38,8 +40,9 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 7212d1368..66a6477b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -23,6 +23,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -32,6 +33,7 @@ public class ItemFertilizer extends ItemMod { super(LibItemNames.FERTILIZER); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { final int range = 3; diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 8d2680a58..5f5942f23 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -37,6 +37,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFlowerBag extends ItemMod { private static final String TAG_ITEMS = "InvItems"; @@ -91,12 +93,14 @@ public class ItemFlowerBag extends ItemMod { } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 9375eba63..57f292cb0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -27,6 +27,8 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { @@ -34,6 +36,7 @@ public class ItemGaiaHead extends ItemMod { } // Copied from vanila skull itemBlock. Relevant edits are indicated. + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (facing == EnumFacing.DOWN) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 040c4af56..4bed500cd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -34,6 +34,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -50,11 +51,12 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); @@ -64,6 +66,7 @@ public class ItemGrassHorn extends ItemMod { return super.getUnlocalizedName(par1ItemStack); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -74,8 +77,9 @@ public class ItemGrassHorn extends ItemMod { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 791af53b6..a2079b934 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -35,6 +35,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -67,16 +68,18 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(Item par1, CreativeTabs par2, List par3) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); } + @Nonnull @Override 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); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 1b89c1c1e..b22634cf4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -42,6 +42,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { @@ -69,7 +70,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); @@ -80,6 +81,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet list.add(String.format(I18n.translateToLocal("botaniamisc.shardLevel"), I18n.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index e7cb097c2..51804f14b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -48,6 +48,7 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -63,6 +64,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking()) { @@ -89,7 +91,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -132,8 +134,9 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { String force = getForcedPage(par1ItemStack); if(force != null && !force.isEmpty()) { LexiconEntry entry = getEntryFromForce(par1ItemStack); @@ -182,6 +185,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } } + @Nonnull @Override public EnumRarity getRarity(ItemStack par1ItemStack) { return EnumRarity.UNCOMMON; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 10a5c341b..e58ebc3c9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -24,6 +24,8 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManaCookie extends ItemFood { public ItemManaCookie() { @@ -35,13 +37,14 @@ public class ItemManaCookie extends ItemFood { } @Override - protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, EntityPlayer p_77849_3_) { + protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, @Nonnull EntityPlayer p_77849_3_) { super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_); p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 6dca1910f..8b287880d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -49,6 +49,7 @@ import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -75,20 +76,21 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return hasClip(itemStack) ? 1 : 0; } }); addPropertyOverride(new ResourceLocation("botania", "desu"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; } }); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int effCd = COOLDOWN; PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.HASTE); if(effect != null) @@ -165,8 +167,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return getLens(stack) != null; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return getLens(itemStack); } @@ -235,8 +238,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { tooltip.add(s.replaceAll("&", "\u00a7")); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { ItemStack lens = getLens(par1ItemStack); return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + TextFormatting.GREEN + lens.getDisplayName() + TextFormatting.RESET + ")"); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index d0c10132c..eff4c4e84 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -32,6 +32,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { @@ -82,6 +83,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 9994af1e8..067a43db9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -23,6 +23,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -42,7 +43,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { // Empty tablet par3List.add(new ItemStack(par1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 87d3674c4..5e0018c9d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -18,6 +18,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public abstract class ItemMod extends Item { public ItemMod(String name) { @@ -31,8 +33,9 @@ public abstract class ItemMod extends Item { return true; } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 6c7dd602e..09084277a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -28,6 +28,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { @@ -35,6 +37,7 @@ public class ItemObedienceStick extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tileAt = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index d92d8bb1c..f14324769 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -22,6 +22,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { @@ -29,8 +31,9 @@ public class ItemOpenBucket extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { RayTraceResult RayTraceResult = rayTrace(par2World, par3EntityPlayer, true); if(RayTraceResult == null) diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 9d38af0dc..bf1c19d65 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -23,12 +23,15 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { super(LibItemNames.OVERGROWTH_SEED); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { IBlockState state = world.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 98266c541..e44ba6cf7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -25,6 +25,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemPinkinator extends ItemMod { @@ -35,8 +36,9 @@ public class ItemPinkinator extends ItemMod { setFull3D(); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int range = 16; List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 79b523fe7..f123544ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -29,6 +29,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { @@ -37,6 +39,7 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 131823f6b..654308e1e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -36,6 +36,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.EnumMap; import java.util.Map; @@ -50,6 +51,7 @@ public class ItemSextant extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -99,8 +101,9 @@ public class ItemSextant extends ItemMod { } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { Botania.proxy.removeSextantMultiblock(); if(!par3EntityPlayer.isSneaking()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 8899568af..d32df0770 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSignalFlare extends ItemMod implements IColorable { @@ -46,8 +47,9 @@ public class ItemSignalFlare extends ItemMod implements IColorable { setMaxDamage(200); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 0) { if(par2World.isRemote) par3EntityPlayer.swingArm(hand); @@ -97,7 +99,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColor(i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index de172706e..e6c957f85 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -22,6 +22,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.function.Predicate; public class ItemSlingshot extends ItemMod { @@ -58,7 +59,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { return par1ItemStack; } @@ -67,13 +68,15 @@ public class ItemSlingshot extends ItemMod { return 72000; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(par3EntityPlayer.capabilities.isCreativeMode || PlayerHelper.hasAmmo(par3EntityPlayer, AMMO_FUNC)) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 813fbf613..1c048f1b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -28,12 +28,15 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { public ItemSpark() { super(LibItemNames.SPARK); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index c93a03362..3bfb71c23 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSparkUpgrade extends ItemMod { @@ -27,11 +28,12 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index b36d3ce83..d9721461d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -33,6 +33,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemSpawnerMover extends ItemMod { @@ -45,7 +46,7 @@ public class ItemSpawnerMover extends ItemMod { setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return hasData(stack) ? 1 : 0; } }); @@ -97,6 +98,7 @@ public class ItemSpawnerMover extends ItemMod { tag.setInteger(TAG_PLACE_DELAY, tag.getInteger(TAG_PLACE_DELAY) - 1); } + @Nonnull @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) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index f15474530..68191bb33 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -19,6 +19,7 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemSpellCloth extends ItemMod implements IColorable { @@ -44,8 +45,9 @@ public class ItemSpellCloth extends ItemMod implements IColorable { return true; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { ItemStack stack = itemStack.copy(); stack.setItemDamage(stack.getItemDamage() + 1); return stack; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index afc345428..0ccb83993 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -24,6 +24,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTemperanceStone extends ItemMod { @@ -34,8 +35,9 @@ public class ItemTemperanceStone extends ItemMod { setHasSubtypes(true); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull 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); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index e56ebc42b..a3930162b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -27,6 +27,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemThornChakram extends ItemMod implements ICraftAchievement { @@ -38,18 +39,20 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + stack.getItemDamage(); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull 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)); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 4766a3582..f35e9428d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -50,6 +50,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -68,12 +69,13 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "bindmode"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return getBindMode(stack) ? 1 : 0; } }); } + @Nonnull @Override 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(); @@ -194,8 +196,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { setBoundTile(par1ItemStack, UNBOUND_POS); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && player.isSneaking()) { setBindMode(stack, !getBindMode(stack)); world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); @@ -214,11 +217,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColors(i, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack); @@ -229,6 +233,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { list.add(I18n.translateToLocal(getModeString(stack))); } + @Nonnull @Override public EnumRarity getRarity(ItemStack par1ItemStack) { return EnumRarity.RARE; diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index ceafe81c6..3ceec3072 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -21,14 +21,17 @@ import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemVineBall extends ItemMod { public ItemVineBall() { super(LibItemNames.VINE_BALL); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par3EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 77c6f8924..3e4d3cc31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -37,6 +37,7 @@ import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; @@ -110,11 +111,12 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName(stack) + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 085df70fa..b6a395c4d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -23,14 +23,17 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { super(LibItemNames.WORLD_SEED); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { BlockPos coords = world.getSpawnPoint(); if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index dea3a4aa5..56e950c45 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -14,14 +14,17 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { public ItemBlockFloatingSpecialFlower(Block block1) { super(block1); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { String flowerName = getUnlocalizedName(stack) + ".name"; return String.format(I18n.translateToLocal("botaniamisc.floatingPrefix"), I18n.translateToLocal(flowerName)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index a09cbea2c..bca4aab76 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -21,14 +21,17 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; +import javax.annotation.Nonnull; + public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockMod(Block block) { super(block); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return getUnlocalizedNameInefficiently_(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 7cbcbaf30..a8c442b55 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -15,12 +15,15 @@ import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import javax.annotation.Nonnull; + public class ItemBlockModSlab extends ItemSlab { public ItemBlockModSlab(Block par1) { super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock()); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return block.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 0bf5fc125..55ec5e51f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { @@ -24,7 +25,7 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) par3List.add(I18n.translateToLocal("botaniamisc.creativePool" + i)); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 8d27b816d..3b1c5e347 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -34,6 +34,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { @@ -44,7 +45,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { + public boolean placeBlockAt(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, World world, @Nonnull BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull IBlockState newState) { boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); if(placed) { String type = getType(stack); @@ -62,18 +63,20 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return placed; } + @Nonnull @Override public String getUnlocalizedName(ItemStack stack) { return BotaniaAPI.getSignatureForName(getType(stack)).getUnlocalizedNameForStack(stack); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return getUnlocalizedNameInefficiently_(par1ItemStack); } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { String type = getType(par1ItemStack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index 16bb3fb18..c062f6045 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -15,14 +15,17 @@ import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; +import javax.annotation.Nonnull; + public class ItemBlockSpecialQuartz extends ItemMultiTexture { public ItemBlockSpecialQuartz(Block par1) { super(par1, par1, new String[]{ "" }); } + @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { + public String getUnlocalizedName(@Nonnull ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[par1ItemStack.getItemDamage()]; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index fac476911..99bf0a084 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -21,6 +21,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.IPickupAchievement; +import javax.annotation.Nonnull; + public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAchievement, ICraftAchievement { public ItemBlockWithMetadataAndName(Block par2Block) { @@ -28,11 +30,13 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc setHasSubtypes(true); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); 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 7696b710a..8223313b1 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -38,6 +38,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -69,19 +70,21 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup return drinkSpeed; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { return EnumAction.DRINK; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { p_77659_3_.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { PotionEffect newEffect = new PotionEffect(effect.getPotion(), effect.getDuration(), effect.getAmplifier(), true, true); @@ -114,7 +117,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); @@ -137,8 +140,9 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup return r << 16 | g << 8 | b; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { return String.format(I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index eeb14f653..117090009 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -28,6 +28,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -42,7 +43,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 0c0f4e145..f29f16706 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -19,6 +19,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemVial extends ItemMod implements IBrewContainer { @@ -33,11 +34,12 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index c55bd270a..fb73df1d2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -68,8 +69,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @@ -102,6 +104,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan ToolCommons.damageItem(stack, damage, entity, MANA_PER_DAMAGE); } + @Nonnull @Override public final String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return hasPhantomInk(stack) ? LibResources.MODEL_INVISIBLE_ARMOR : getArmorTextureAfterInk(stack, slot); @@ -111,6 +114,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; } + @Nonnull @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped original) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index f0c965944..e61d367fa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; import java.util.List; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { @@ -41,7 +42,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi super(type, name, BotaniaAPI.manaweaveArmorMaterial); addPropertyOverride(new ResourceLocation("botania", "holiday"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return ClientProxy.jingleTheBells ? 1 : 0; } }); @@ -59,6 +60,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } + @Nonnull @Override @SideOnly(Side.CLIENT) public String getUnlocalizedName(ItemStack p_77667_1_) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 283965a0b..7b8fcf35a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -53,8 +54,9 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } + @Nonnull @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); if (slot == this.armorType) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 7d5e9b343..994718538 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -37,6 +37,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -54,8 +55,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); @@ -175,8 +177,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt return getContainerItem(stack) != null; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return getCosmeticItem(itemStack); } 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 339b1a00b..f96346bf3 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 @@ -37,6 +37,7 @@ import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @@ -56,11 +57,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); 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 930a604ed..981f070f0 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 @@ -42,6 +42,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -55,7 +56,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); 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 006af4f3e..aea9a6ace 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 @@ -58,6 +58,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -96,7 +97,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } 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 0c1207d7b..e8c57eac5 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 @@ -36,6 +36,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -57,7 +58,7 @@ public class ItemMagnetRing extends ItemBauble { this.range = range; addPropertyOverride(new ResourceLocation("botania", "on"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return ItemMagnetRing.getCooldown(stack) <= 0 ? 1 : 0; } }); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 84a21c19f..e8bbac757 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -21,6 +21,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { @@ -46,7 +47,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 10000)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 657945793..9cdb32cea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -27,6 +27,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; public class ItemEnderDagger extends ItemManasteelSword implements IColorable { @@ -45,13 +46,14 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.NONE; } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { if(par2EntityLivingBase instanceof EntityEnderman && par3EntityLivingBase instanceof EntityPlayer) par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), 20); par1ItemStack.damageItem(1, par3EntityLivingBase); @@ -68,6 +70,7 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return false; } + @Nonnull @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); 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 71c347441..7abc350de 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 @@ -21,6 +21,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGlassPick extends ItemManasteelPick { private static final int MANA_PER_DAMAGE = 160; @@ -44,7 +46,7 @@ public class ItemGlassPick extends ItemManasteelPick { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.GLASS) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } 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 996804d6b..431453943 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 @@ -30,6 +30,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemStarSword extends ItemManasteelSword implements ICraftAchievement { private static final int MANA_PER_DAMAGE = 120; @@ -85,7 +87,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 515840725..59ac91cde 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -33,6 +33,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -46,7 +47,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) { + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, @Nonnull EntityLivingBase attacker) { if(!(entity instanceof EntityPlayer) && entity != null) { double range = 8; final List alreadyTargetedEntities = new ArrayList<>(); @@ -88,6 +89,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev return ModAchievements.terrasteelWeaponCraft; } + @Nonnull @Override public Multimap getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); 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 796755b8d..ad1952b3d 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 @@ -43,6 +43,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.function.Predicate; public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { @@ -61,7 +62,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { if (entityIn == null) { return 0.0F; @@ -75,13 +76,15 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { }); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, @Nonnull World world, EntityPlayer player, @Nonnull EnumHand hand) { // Copy from superclass with our own check boolean flag = canFire(stack, player); ActionResult ret = ForgeEventFactory.onArrowNock(stack, world, player, hand, flag); @@ -99,7 +102,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityLivingBase shooter, int useTicks) { + public void onPlayerStoppedUsing(@Nonnull ItemStack stack, @Nonnull World world, EntityLivingBase shooter, int useTicks) { int j = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); if(shooter instanceof EntityPlayer) { 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 42efe0bce..dc111e56a 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 @@ -20,6 +20,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -29,6 +30,7 @@ public class ItemElementiumShears extends ItemManasteelShears { super(LibItemNames.ELEMENTIUM_SHEARS); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -39,8 +41,9 @@ public class ItemElementiumShears extends ItemManasteelShears { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } 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 afffaf9be..35b7ec219 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 @@ -37,6 +37,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.Set; import java.util.regex.Pattern; @@ -59,24 +60,26 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta this.attackSpeed = -3.1f; } + @Nonnull @Override public Set getToolClasses(ItemStack stack) { return ImmutableSet.of("axe"); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); @@ -87,6 +90,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta return MANA_PER_DAMAGE; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -112,7 +116,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } 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 21a13443e..ddfb395d9 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 @@ -36,6 +36,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.regex.Pattern; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { @@ -55,25 +56,27 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDmg()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if(state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDmg()); return true; } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -102,7 +105,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } 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 82f11bd87..057f62356 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 @@ -35,6 +35,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; @@ -52,13 +53,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + public boolean itemInteractionForEntity(@Nonnull ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity.worldObj.isRemote) return false; @@ -85,7 +87,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) { + public boolean onBlockStartBreak(@Nonnull ItemStack itemstack, @Nonnull BlockPos pos, EntityPlayer player) { if (player.worldObj.isRemote) return false; 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 c8bfb4a9d..2a565ae3f 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 @@ -40,6 +40,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { private static final int MANA_PER_DAMAGE = 60; @@ -55,27 +57,29 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS setUnlocalizedName(name); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); return true; } + @Nonnull @Override - public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + public EnumActionResult onItemUse(@Nonnull ItemStack p_77648_1_, EntityPlayer p_77648_2_, @Nonnull World p_77648_3_, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) return EnumActionResult.PASS; else { @@ -114,7 +118,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index a755a6fb5..7760c64a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -31,6 +31,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelSword extends ItemSword implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 60; @@ -46,26 +48,27 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { setUnlocalizedName(name); addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) { + public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0; } }); } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { if(usesMana(par1ItemStack)) ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @Override - public boolean onBlockDestroyed(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if(usesMana(stack) && state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); @@ -83,7 +86,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } 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 7d75ec785..2944fc613 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 @@ -36,6 +36,7 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -84,7 +85,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.attackSpeed = -3f; addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), new IItemPropertyGetter() { @Override - public float apply(ItemStack stack, World world, EntityLivingBase entity) { + public float apply(@Nonnull ItemStack stack, World world, EntityLivingBase entity) { if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) return 0; return 1; @@ -385,7 +386,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } @Override - public int compareTo(SwapCandidate other) { + public int compareTo(@Nonnull SwapCandidate other) { // Aka, a bigger range implies a smaller value, meaning // bigger ranges will be preferred in a min-heap return other.range - range; 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 95d08c88a..f158bacfb 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 @@ -54,6 +54,7 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -82,20 +83,20 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, Category.SHAPELESS, ""); addPropertyOverride(new ResourceLocation("botania", "tipped"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isTipped(itemStack) ? 1 : 0; } }); addPropertyOverride(new ResourceLocation("botania", "enabled"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isEnabled(itemStack) ? 1 : 0; } }); } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -112,8 +113,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ par3List.add(TextFormatting.RED + I18n.translateToLocal("botaniamisc.getALife")); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { getMana(par1ItemStack); int level = getLevel(par1ItemStack); @@ -126,6 +128,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { return player.isSneaking() ? super.onItemUse(stack, player, world, pos, hand, side, sx, sy, sz) @@ -289,7 +292,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -299,7 +302,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean shouldCauseReequipAnimation(ItemStack before, ItemStack after, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack before, @Nonnull ItemStack after, boolean slotChanged) { return after.getItem() != this || isEnabled(before) != isEnabled(after); } 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 26605c313..ba89f3f54 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 @@ -39,6 +39,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, ICraftAchievement { @@ -136,7 +137,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 47ea9c972..d0f285d84 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -22,6 +22,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") @@ -41,7 +42,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index c153b5674..f8c6c7772 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -37,6 +37,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -145,7 +146,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < SUBTYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } @@ -155,6 +156,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; @@ -172,8 +174,9 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack stack) { + public String getItemStackDisplayName(@Nonnull ItemStack stack) { ItemStack compositeLens = getCompositeLens(stack); if(compositeLens == null) return super.getItemStackDisplayName(stack); 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 54df837fe..8b55de12d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -29,12 +29,15 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDye extends Item16Colors { public ItemDye() { super(LibItemNames.DYE); } + @Nonnull @Override 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(); 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 cfefaec3e..369868d4b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.awt.*; import java.util.List; @@ -84,6 +85,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) @@ -98,8 +100,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { if(par1ItemStack.getItemDamage() == 15) { if(!par2EntityPlayer.capabilities.isCreativeMode) --par1ItemStack.stackSize; @@ -120,7 +123,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) par3List.add(new ItemStack(par1, 1, i)); @@ -135,6 +138,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return 0xFFFFFF; } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; @@ -157,8 +161,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return meta == 7 || meta == 8 || meta == 9; } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return itemStack.getItemDamage() == 11 ? itemStack.copy() : null; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index c1862614d..39fe10c82 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -28,12 +28,15 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemPetal extends Item16Colors implements IFlowerComponent { public ItemPetal() { super(LibItemNames.PETAL); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { // Copy of ItemBlock.onItemUse diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 956585d51..8532f1edb 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -18,6 +18,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemQuartz extends ItemMod implements IElvenItem { @@ -30,11 +31,12 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index af6a59c0b..a15059c00 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -23,6 +23,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { @@ -33,11 +34,12 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } + @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index ce048f17d..fc9bf069c 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -19,6 +19,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemModRecord extends ItemRecord { private final String file; @@ -31,11 +33,13 @@ public class ItemModRecord extends ItemRecord { file = "botania:music." + record; } + @Nonnull @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } + @Nonnull @Override public ResourceLocation getRecordResource(String name) { return new ResourceLocation(file); 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 a02ba7bb5..edcac7ddb 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -29,6 +29,7 @@ import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -51,8 +52,9 @@ public class ItemDice extends ItemRelic { }; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); int relic = SIDES_FOR_MOON_PHASES[moonPhase]; 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 4d4445c35..a38dd754d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -32,6 +32,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { public ItemFlugelEye() { @@ -43,6 +45,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs private static final String TAG_Z = "z"; private static final String TAG_DIMENSION = "dim"; + @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { @@ -74,14 +77,15 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs Botania.proxy.wispFX(living.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!(living instanceof EntityPlayer)) return stack; @@ -119,6 +123,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs return 40; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BLOCK; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index d4042cd99..21c2c041b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -24,6 +24,8 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; + public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { @@ -35,13 +37,15 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { return 32; } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack p_77661_1_) { return isBoot(p_77661_1_) ? EnumAction.DRINK : EnumAction.EAT; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) { p_77659_3_.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index d807be644..055ed51b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Random; public class ItemKingKey extends ItemRelic implements IManaUsingItem { @@ -40,8 +41,9 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { super(LibItemNames.KING_KEY); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); setCharging(par1ItemStack, true); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); @@ -96,6 +98,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 955783261..043f6d2ee 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -27,6 +27,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -178,6 +179,7 @@ public class ItemRelic extends ItemMod implements IRelic { this.achievement = achievement; } + @Nonnull @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 928bf0e10..5239f89a1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -21,6 +21,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; +import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; @@ -105,6 +106,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { this.achievement = achievement; } + @Nonnull @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; 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 472f47149..2d9918262 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -25,6 +25,8 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProvider { static final int COST = 150; @@ -34,6 +36,7 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv setMaxStackSize(1); } + @Nonnull @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); 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 17e637dd8..329b8f766 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchievement, IBlockProvider { static final int COST = 75; @@ -45,6 +47,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev setMaxStackSize(1); } + @Nonnull @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); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 37d50435e..7bb64d6e6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -34,6 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Random; public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -47,8 +48,9 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer p, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer p, EnumHand hand) { if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; 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 714ffe102..11401445f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -47,6 +47,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -71,6 +72,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra MinecraftForge.EVENT_BUS.register(this); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState wstate = par3World.getBlockState(pos); @@ -341,8 +343,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return true; } + @Nonnull @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { + public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + TextFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + TextFormatting.RESET + ")"); 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 22a6d859a..d094f1d25 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.entity.EntityFlameRing; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_FIRE); @@ -44,6 +46,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield setMaxStackSize(1); } + @Nonnull @Override public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!par3World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { 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 5dcfc0b6b..d03caedeb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -54,7 +55,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { return newStack.getItem() != this; } @@ -85,8 +86,9 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { leftClick(player); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index b814af160..54b183de7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -32,6 +32,8 @@ import vazkii.botania.common.entity.EntityMagicMissile; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_MISSILE); @@ -44,6 +46,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -85,8 +88,9 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi return false; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 3d3696ff4..7260b2157 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -40,6 +40,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -55,8 +56,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { if(!par2World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); @@ -114,8 +116,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } + @Nonnull @Override - public ItemStack getContainerItem(ItemStack itemStack) { + public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { return itemStack.copy(); } 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 6b2cf168a..b40c62d2d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -27,14 +27,17 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSkyDirtRod extends ItemDirtRod { public ItemSkyDirtRod() { super(LibItemNames.SKY_DIRT_ROD); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); 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 a7dc692a1..b0fdb825c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -33,6 +33,7 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Map; import java.util.WeakHashMap; @@ -49,6 +50,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -59,8 +61,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { return 72000; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } 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 c4c2ddb18..81f689ffb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -42,6 +42,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -79,6 +80,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP setMaxStackSize(1); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -95,8 +97,9 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP terraform(stack, living.worldObj, ((EntityPlayer) living)); } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { par3EntityPlayer.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index b93c66833..233f429f3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -38,6 +38,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.List; public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { @@ -57,7 +58,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { @Override - public float apply(ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { + public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isFlying(itemStack) ? 1 : 0; } }); @@ -96,8 +97,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { int meta = par1ItemStack.getItemDamage(); if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, false)) { par3EntityPlayer.setActiveHand(hand); @@ -111,6 +113,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.BOW; @@ -161,7 +164,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged) { return newStack.getItem() != this || isFlying(oldStack) != isFlying(newStack); } 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 b999b8ee9..97273077a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -16,6 +16,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; @@ -25,6 +27,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { setMaxStackSize(1); } + @Nonnull @Override 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()) { diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java index ed320fb3b..0cf89b188 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java @@ -16,6 +16,8 @@ import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import javax.annotation.Nonnull; + public class BLexiconEntry extends LexiconEntry { public BLexiconEntry(String unlocalizedName, LexiconCategory category) { @@ -56,7 +58,7 @@ public class BLexiconEntry extends LexiconEntry { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return o instanceof WLexiconEntry ? 1 : super.compareTo(o); } diff --git a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java index 26d745ec6..07964153a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java @@ -18,6 +18,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; +import javax.annotation.Nonnull; + public class WLexiconEntry extends BLexiconEntry { private static final int PAGES = 7; @@ -34,7 +36,7 @@ public class WLexiconEntry extends BLexiconEntry { } @Override - public int compareTo(LexiconEntry o) { + public int compareTo(@Nonnull LexiconEntry o) { return -1; } diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 7634db73e..06968d5df 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -17,6 +17,8 @@ import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.gen.ChunkProviderFlat; +import javax.annotation.Nonnull; + public class WorldTypeSkyblock extends WorldType { public WorldTypeSkyblock() { @@ -38,7 +40,7 @@ public class WorldTypeSkyblock extends WorldType { } @Override - public int getSpawnFuzz(WorldServer world, MinecraftServer server) { + public int getSpawnFuzz(@Nonnull WorldServer world, MinecraftServer server) { return 2; } @@ -47,8 +49,9 @@ public class WorldTypeSkyblock extends WorldType { return 260f; } + @Nonnull @Override - public IChunkGenerator getChunkGenerator(World world, String generatorOptions) { + public IChunkGenerator getChunkGenerator(@Nonnull World world, String generatorOptions) { return new ChunkProviderFlat(world, world.getSeed(), false, "3;minecraft:air;"); } From 8f00e9bdd6ab623a50ac2a625f8c3f71d29c8cc4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 19 May 2016 10:03:24 -0500 Subject: [PATCH 620/935] Build 306 --- build.gradle | 6 ++++-- build.properties | 8 ++++---- version/1.9.4.txt | 1 + web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 version/1.9.4.txt diff --git a/build.gradle b/build.gradle index 204859c69..aeb1d94fb 100644 --- a/build.gradle +++ b/build.gradle @@ -75,6 +75,9 @@ compileJava { targetCompatibility = 1.8 } +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + processResources { // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { @@ -221,8 +224,7 @@ curseforge { See https://github.com/williewillus/Botania/releases/tag/${version} """ releaseType = "beta" - addGameVersion '1.9' - addGameVersion 'Java 8' + addGameVersion '1.9.4' relations { requiredLibrary 'baubles' } diff --git a/build.properties b/build.properties index 9952d750f..10b171147 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Tue May 10 23:24:10 CDT 2016 +#Thu May 19 09:23:16 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.9.4 forge_version=12.17.0.1909-1.9.4 -build_number=306 +mc_version=1.9.4 +dir_repo=./ +build_number=307 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt new file mode 100644 index 000000000..f3b791532 --- /dev/null +++ b/version/1.9.4.txt @@ -0,0 +1 @@ +r1.8-306 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index c8e4061de..5a6ea1186 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -254,4 +254,5 @@ r1.8-301=1.9 r1.8-302=1.9 r1.8-303=1.9 r1.8-304=1.9 -r1.8-305=1.9 \ No newline at end of file +r1.8-305=1.9 +r1.8-306=1.9.4 \ No newline at end of file From 995c19c04ab24ec5f6a65da850bc9050c49e47c7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 19 May 2016 14:07:52 -0500 Subject: [PATCH 621/935] Fix TE syncing on login, 2 minor optimizations --- .../vazkii/botania/common/block/tile/TileMod.java | 13 ++++++++----- .../vazkii/botania/common/item/Item16Colors.java | 3 --- .../vazkii/botania/common/item/ItemSignalFlare.java | 4 ---- 3 files changed, 8 insertions(+), 12 deletions(-) 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 ed85fc027..94dc73cd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -37,10 +37,15 @@ public class TileMod extends TileEntity implements ITickable { return ret; } + @Nonnull + @Override + public final NBTTagCompound getUpdateTag() { + return writeToNBT(new NBTTagCompound()); + } + @Override public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); - readCustomNBT(par1nbtTagCompound); } @@ -53,10 +58,8 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public SPacketUpdateTileEntity getUpdatePacket() { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); - return new SPacketUpdateTileEntity(pos, -999, nbttagcompound); + public final SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(pos, -999, getUpdateTag()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 1fa3d4ce0..0945cfeb4 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -27,9 +27,6 @@ public class Item16Colors extends ItemMod implements IColorable { @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() >= EnumDyeColor.values().length) - return 0xFFFFFF; - return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index d32df0770..e45d26be7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -91,10 +91,6 @@ public class ItemSignalFlare extends ItemMod implements IColorable { if(par2 == 0) return 0xFFFFFF; - int colorv = getColor(par1ItemStack); - if(colorv >= EnumDyeColor.values().length || colorv < 0) - return 0xFFFFFF; - return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue; } From c9de3bcc0396e80cf21506253854b3460947f24f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 20 May 2016 14:36:28 -0500 Subject: [PATCH 622/935] Mana pools now try catalyst recipes first before recipes without catalyst specified. Also make mana bar not render in spectator. Closes #291 --- .../botania/api/item/IManaDissolvable.java | 2 +- .../client/core/handler/HUDHandler.java | 102 +++++++++--------- .../common/block/tile/mana/TilePool.java | 60 +++++++---- 3 files changed, 88 insertions(+), 76 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java index 0d9ad5d4e..8e389ff63 100644 --- a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java +++ b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java @@ -22,7 +22,7 @@ public interface IManaDissolvable { /** * Called for every tick the item is on a mana pool. If the stack has stack - * size 0 the item is killed. This is called in both the server and client. + * size 0 the item is killed. This is called serverside. */ public void onDissolveTick(IManaPool pool, ItemStack stack, EntityItem item); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 9c265d5ee..31bd5b922 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -167,44 +167,47 @@ public final class HUDHandler { } profiler.startSection("manaBar"); + EntityPlayer player = mc.thePlayer; - int totalMana = 0; - int totalMaxMana = 0; - boolean anyRequest = false; - boolean creative = false; + if(!player.isSpectator()) { + int totalMana = 0; + int totalMaxMana = 0; + boolean anyRequest = false; + boolean creative = false; - IInventory mainInv = player.inventory; - IInventory baublesInv = PlayerHandler.getPlayerBaubles(player); + IInventory mainInv = player.inventory; + IInventory baublesInv = PlayerHandler.getPlayerBaubles(player); - int invSize = mainInv.getSizeInventory(); - int size = invSize; - if(baublesInv != null) - size += baublesInv.getSizeInventory(); + int invSize = mainInv.getSizeInventory(); + int size = invSize; + if(baublesInv != null) + size += baublesInv.getSizeInventory(); - for(int i = 0; i < size; i++) { - boolean useBaubles = i >= invSize; - IInventory inv = useBaubles ? baublesInv : mainInv; - ItemStack stack = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); + for(int i = 0; i < size; i++) { + boolean useBaubles = i >= invSize; + IInventory inv = useBaubles ? baublesInv : mainInv; + ItemStack stack = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); - if(stack != null) { - Item item = stack.getItem(); - if(item instanceof IManaUsingItem) - anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack); + if(stack != null) { + Item item = stack.getItem(); + if(item instanceof IManaUsingItem) + anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack); - if(item instanceof IManaItem) { - if(!((IManaItem) item).isNoExport(stack)) { - totalMana += ((IManaItem) item).getMana(stack); - totalMaxMana += ((IManaItem) item).getMaxMana(stack); + if(item instanceof IManaItem) { + if(!((IManaItem) item).isNoExport(stack)) { + totalMana += ((IManaItem) item).getMana(stack); + totalMaxMana += ((IManaItem) item).getMaxMana(stack); + } } + + if(item instanceof ICreativeManaProvider && ((ICreativeManaProvider) item).isCreative(stack)) + creative = true; } - - if(item instanceof ICreativeManaProvider && ((ICreativeManaProvider) item).isCreative(stack)) - creative = true; } - } - if(anyRequest) - renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana); + if(anyRequest) + renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana); + } profiler.endStartSection("itemsRemaining"); ItemsRemainingRenderHandler.render(event.getResolution(), event.getPartialTicks()); @@ -272,36 +275,29 @@ public final class HUDHandler { Profiler profiler = mc.mcProfiler; profiler.startSection("poolRecipe"); - for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack)) { - if(recipe.getCatalyst() == null || recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) { - int x = res.getScaledWidth() / 2 - 11; - int y = res.getScaledHeight() / 2 + 10; + RecipeManaInfusion recipe = TilePool.getMatchingRecipe(stack, tile.getWorld().getBlockState(tile.getPos().down())); + if(recipe != null) { + int x = res.getScaledWidth() / 2 - 11; + int y = res.getScaledHeight() / 2 + 10; - int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; - int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; + int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; + int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - mc.renderEngine.bindTexture(manaBar); - RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); - GlStateManager.color(1F, 1F, 1F, 1F); + mc.renderEngine.bindTexture(manaBar); + RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); + GlStateManager.color(1F, 1F, 1F, 1F); - net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); - mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, ""); - net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); + mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y); + mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, ""); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - - GlStateManager.disableLighting(); - GlStateManager.disableBlend(); - - - break; - } - } + GlStateManager.disableLighting(); + GlStateManager.disableBlend(); } profiler.endSection(); } 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 286b26f47..8491c5d27 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 @@ -62,7 +62,9 @@ import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import java.awt.*; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { @@ -135,14 +137,30 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt invalidate(); } + public static RecipeManaInfusion getMatchingRecipe(@Nonnull ItemStack stack, @Nonnull IBlockState state) { + List matchingNonCatRecipes = new ArrayList<>(); + List matchingCatRecipes = new ArrayList<>(); + + for (RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { + if (recipe.matches(stack)) { + if(recipe.getCatalyst() == null) + matchingNonCatRecipes.add(recipe); + else if (recipe.getCatalyst() == state) + matchingCatRecipes.add(recipe); + } + } + + // Recipes with matching catalyst take priority above recipes with no catalyst specified + return !matchingCatRecipes.isEmpty() ? matchingCatRecipes.get(0) : + !matchingNonCatRecipes.isEmpty() ? matchingNonCatRecipes.get(0) : + null; + } + public boolean collideEntityItem(EntityItem item) { if(worldObj.isRemote || item.isDead) return false; - boolean didChange = false; ItemStack stack = item.getEntityItem(); - if(stack == null) - return false; if(stack.getItem() instanceof IManaDissolvable) { ((IManaDissolvable) stack.getItem()).onDissolveTick(this, stack, item); @@ -158,32 +176,30 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(age > 100 && age < 130) return false; - for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (recipe.getCatalyst() == null || worldObj.getBlockState(pos.down()) == recipe.getCatalyst())) { - int mana = recipe.getManaToConsume(); - if(getCurrentMana() >= mana) { - recieveMana(-mana); + RecipeManaInfusion recipe = getMatchingRecipe(stack, worldObj.getBlockState(pos.down())); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); + if(recipe != null) { + int mana = recipe.getManaToConsume(); + if(getCurrentMana() >= mana) { + recieveMana(-mana); - ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - try { - MethodHandles.itemAge_setter.invokeExact(outputItem, 105); - } catch (Throwable ignored) {} - worldObj.spawnEntityInWorld(outputItem); + stack.stackSize--; + if(stack.stackSize == 0) + item.setDead(); - craftingFanciness(); - didChange = true; - } + ItemStack output = recipe.getOutput().copy(); + EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + try { + MethodHandles.itemAge_setter.invokeExact(outputItem, 105); + } catch (Throwable ignored) {} + worldObj.spawnEntityInWorld(outputItem); - break; + craftingFanciness(); + return true; } } - return didChange; + return false; } private void craftingFanciness() { From e2e00f7ef14633c56d88a2ba8955a6366ad21428 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 12:11:02 -0500 Subject: [PATCH 623/935] Use chunk util method that exists instead of own thing --- .../botania/api/internal/VanillaPacketDispatcher.java | 8 ++++---- .../java/vazkii/botania/common/network/PacketHandler.java | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 37cf9083b..a9aa22a9b 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -24,17 +24,17 @@ public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { if(tile.getWorld() instanceof WorldServer) { WorldServer ws = ((WorldServer) tile.getWorld()); - PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); + SPacketUpdateTileEntity packet = tile.getUpdatePacket(); - if(chunk == null) + if(packet == null) return; for (EntityPlayer player : ws.playerEntities) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 - && chunk.containsPlayer(playerMP)) { - playerMP.connection.sendPacket(tile.getUpdatePacket()); + && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4)) { + playerMP.connection.sendPacket(packet); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index a44d8a86b..89075fdb8 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -26,16 +26,12 @@ public final class PacketHandler { public static void sendToNearby(World world, BlockPos pos, IMessage toSend) { if(world instanceof WorldServer) { WorldServer ws = ((WorldServer) world); - PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(pos.getX() >> 4, pos.getZ() >> 4); - - if(chunk == null) - return; for (EntityPlayer player : ws.playerEntities) { EntityPlayerMP playerMP = ((EntityPlayerMP) player); if (playerMP.getDistanceSq(pos) < 64 * 64 - && chunk.containsPlayer(playerMP)) { + && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, pos.getX() >> 4, pos.getZ() >> 4)) { HANDLER.sendTo(toSend, playerMP); } } From 96946649228ad919f59677ecbc7ba0e125d1edac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 22:13:52 -0500 Subject: [PATCH 624/935] Fix mana cookie lasting too short (thanks wiresegal) --- src/main/java/vazkii/botania/common/item/ItemManaCookie.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index e58ebc3c9..c998c8aee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -30,7 +30,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, 20, 0), 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); From f52dca111f396ce0c86dc80d1ee62e501d570e22 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 22:55:30 -0500 Subject: [PATCH 625/935] Flower bag plays sound and animation. Closes #295 --- .../vazkii/botania/common/item/ItemFlowerBag.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 5f5942f23..7913c520f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -11,17 +11,21 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.play.server.SPacketCollectItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -83,8 +87,15 @@ public class ItemFlowerBag extends ItemMod { } } - if(didChange) + if(didChange) { setStacks(invStack, bagInv); + if (!event.getItem().isSilent()) { + event.getItem().worldObj.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, + SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, + ((event.getItem().worldObj.rand.nextFloat() - event.getItem().worldObj.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + } + ((EntityPlayerMP) event.getEntityPlayer()).connection.sendPacket(new SPacketCollectItem(event.getItem().getEntityId(), event.getEntityPlayer().getEntityId())); + } } if(stack.stackSize == 0) From 930703b5c185a655d0a6d4f3bc68bd145db9b1e8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 23:38:17 -0500 Subject: [PATCH 626/935] Workaround for 'global' particles at small render distances. Close #15 (mostly) --- .../botania/client/core/proxy/ClientProxy.java | 5 +++++ .../common/block/tile/TileManaBeacon.java | 2 +- .../botania/common/block/tile/TileStarfield.java | 2 +- .../botania/common/core/proxy/CommonProxy.java | 4 ++++ .../botania/common/entity/EntitySignalFlare.java | 16 +++++++++++++++- .../botania/common/item/ItemSignalFlare.java | 1 + 6 files changed, 27 insertions(+), 3 deletions(-) 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 6f2fb86cf..64dc9b9dd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -490,5 +490,10 @@ public class ClientProxy extends CommonProxy { public void removeBoss(IBotaniaBoss boss) { BossBarHandler.bosses.remove(boss); } + + @Override + public int getClientRenderDistance() { + return Minecraft.getMinecraft().gameSettings.renderDistanceChunks; + } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 11a9c10ea..a958338c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -35,7 +35,7 @@ public class TileManaBeacon extends TileMod { Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); for(int i = 0; i < 2; i++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, 256, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, Math.min(256, pos.getY() + Botania.proxy.getClientRenderDistance() * 16), pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 48b5b049e..414d30186 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -31,7 +31,7 @@ public class TileStarfield extends TileMod { int iter = 2; for(int i = 0; i < iter; i++) { double x = pos.getX() + 0.5 + (Math.random() - 0.5) * radius; - double y = pos.getY() + 256; + double y = Math.min(256, pos.getY() + Botania.proxy.getClientRenderDistance() * 16); double z = pos.getZ() + 0.5 + (Math.random() - 0.5) * radius; float w = 0.6F; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 40791a585..986a28cae 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -336,4 +336,8 @@ public class CommonProxy { // NO-OP } + public int getClientRenderDistance() { + return 0; + } + } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index a875df189..394ef4f4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; @@ -25,7 +26,9 @@ import javax.annotation.Nonnull; public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; + private static final String FIRED_Y_TAG = "firedY"; private static final DataParameter COLOR = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); + private static final DataParameter FIRED_Y = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); public EntitySignalFlare(World par1World) { super(par1World); @@ -35,6 +38,7 @@ public class EntitySignalFlare extends Entity { @Override protected void entityInit() { dataManager.register(COLOR, 0); + dataManager.register(FIRED_Y, 0); } @Override @@ -59,7 +63,7 @@ public class EntitySignalFlare extends Entity { Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(worldObj, posX + 0.5, 256, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(worldObj, posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } @@ -68,11 +72,13 @@ public class EntitySignalFlare extends Entity { @Override protected void readEntityFromNBT(@Nonnull NBTTagCompound nbttagcompound) { setColor(nbttagcompound.getInteger(COLOR_TAG)); + setFiredAt(nbttagcompound.getInteger(FIRED_Y_TAG)); } @Override protected void writeEntityToNBT(@Nonnull NBTTagCompound nbttagcompound) { nbttagcompound.setInteger(COLOR_TAG, getColor()); + nbttagcompound.setInteger(FIRED_Y_TAG, getFiredAt()); } public void setColor(int color) { @@ -83,4 +89,12 @@ public class EntitySignalFlare extends Entity { return dataManager.get(COLOR); } + public void setFiredAt(int y) { + dataManager.set(FIRED_Y, y); + } + + public int getFiredAt() { + return dataManager.get(FIRED_Y); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index e45d26be7..57a50db3d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -57,6 +57,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)); + flare.setFiredAt((int) par3EntityPlayer.posY); 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); From 41b3e6cd4f255c7e283d1794430a5310a57d0dea Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 21 May 2016 23:40:10 -0500 Subject: [PATCH 627/935] Use all bits for effect packet args. Closes #296 --- .../vazkii/botania/common/network/PacketBotaniaEffect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 1527326b4..59b86dc15 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -44,7 +44,7 @@ public class PacketBotaniaEffect implements IMessage { args = new int[type.argCount]; for (int i = 0; i < args.length; i++) { - args[i] = ByteBufUtils.readVarInt(buf, 3); + args[i] = ByteBufUtils.readVarInt(buf, 5); } } @@ -56,7 +56,7 @@ public class PacketBotaniaEffect implements IMessage { buf.writeDouble(z); for (int i = 0; i < type.argCount; i++) { - ByteBufUtils.writeVarInt(buf, args[i], 3); + ByteBufUtils.writeVarInt(buf, args[i], 5); } } From ff2afbf03748ffaeaf4ea5956ba65d749249c252 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 May 2016 11:41:33 -0500 Subject: [PATCH 628/935] Untested: replace most uses of common i18n with client one --- .../api/subtile/SubTileFunctional.java | 7 +++++-- .../api/subtile/SubTileGenerating.java | 7 +++++-- .../client/core/handler/HUDHandler.java | 18 ++++++++-------- .../client/core/handler/RenderLexicon.java | 18 ++++++++-------- .../TooltipAdditionDisplayHandler.java | 6 +++--- .../client/core/handler/TooltipHandler.java | 12 +++++------ .../botania/client/gui/bag/GuiFlowerBag.java | 6 +++--- .../client/gui/lexicon/GuiLexicon.java | 14 ++++++------- .../gui/lexicon/GuiLexiconChallenge.java | 10 ++++----- .../gui/lexicon/GuiLexiconChallengesList.java | 8 +++---- .../client/gui/lexicon/GuiLexiconEntry.java | 6 +++--- .../client/gui/lexicon/GuiLexiconHistory.java | 6 +++--- .../client/gui/lexicon/GuiLexiconIndex.java | 14 ++++++------- .../lexicon/button/GuiButtonAchievement.java | 4 ++-- .../gui/lexicon/button/GuiButtonBack.java | 4 ++-- .../button/GuiButtonBackWithShift.java | 4 ++-- .../gui/lexicon/button/GuiButtonBookmark.java | 10 ++++----- .../gui/lexicon/button/GuiButtonCategory.java | 4 ++-- .../button/GuiButtonChallengeIcon.java | 4 ++-- .../button/GuiButtonChallengeInfo.java | 4 ++-- .../lexicon/button/GuiButtonChallenges.java | 4 ++-- .../gui/lexicon/button/GuiButtonHistory.java | 6 +++--- .../gui/lexicon/button/GuiButtonNotes.java | 6 +++--- .../gui/lexicon/button/GuiButtonOptions.java | 4 ++-- .../gui/lexicon/button/GuiButtonPage.java | 4 ++-- .../gui/lexicon/button/GuiButtonShare.java | 4 ++-- .../button/GuiButtonUpdateWarning.java | 4 ++-- .../lexicon/button/GuiButtonViewOnline.java | 4 ++-- .../jei/brewery/BreweryRecipeCategory.java | 4 ++-- .../elventrade/ElvenTradeRecipeCategory.java | 4 ++-- .../jei/manapool/ManaPoolRecipeCategory.java | 4 ++-- .../PetalApothecaryRecipeCategory.java | 4 ++-- .../puredaisy/PureDaisyRecipeCategory.java | 4 ++-- .../runicaltar/RunicAltarRecipeCategory.java | 4 ++-- .../subtile/functional/SubTileHopperhock.java | 7 +++++-- .../functional/SubTileRannuncarpus.java | 3 +++ .../subtile/generating/SubTileSpectrolus.java | 3 +++ .../botania/common/block/tile/TileAltar.java | 9 +++++--- .../common/block/tile/TileHourglass.java | 7 +++++-- .../common/block/tile/TileRuneAltar.java | 6 +++--- .../common/block/tile/mana/TilePool.java | 7 +++++-- .../common/block/tile/mana/TileSpreader.java | 7 +++++-- .../core/version/ThreadDownloadMod.java | 4 ++-- .../common/core/version/VersionChecker.java | 4 ++-- .../botania/common/item/ItemAncientWill.java | 9 +++++--- .../common/item/ItemBlackHoleTalisman.java | 8 +++---- .../botania/common/item/ItemBlackLotus.java | 7 +++++-- .../botania/common/item/ItemBottledMana.java | 9 +++++--- .../botania/common/item/ItemCacophonium.java | 9 +++++--- .../botania/common/item/ItemCraftingHalo.java | 6 +++--- .../botania/common/item/ItemLaputaShard.java | 7 +++++-- .../botania/common/item/ItemLexicon.java | 16 ++++++++------ .../botania/common/item/ItemManaGun.java | 9 ++++---- .../botania/common/item/ItemManaTablet.java | 7 +++++-- .../botania/common/item/ItemPinkinator.java | 7 +++++-- .../botania/common/item/ItemSignalFlare.java | 7 +++++-- .../botania/common/item/ItemSpawnerMover.java | 7 +++++-- .../common/item/ItemTemperanceStone.java | 6 +++--- .../botania/common/item/ItemTwigWand.java | 7 +++++-- .../common/item/block/ItemBlockPool.java | 7 +++++-- .../item/block/ItemBlockSpecialFlower.java | 7 +++++-- .../common/item/brew/ItemBrewBase.java | 9 +++++--- .../common/item/brew/ItemIncenseStick.java | 11 ++++++---- .../armor/elementium/ItemElementiumArmor.java | 8 ++++--- .../armor/manasteel/ItemManasteelArmor.java | 21 ++++++++++++------- .../armor/manaweave/ItemManaweaveArmor.java | 19 ++++++++++------- .../armor/terrasteel/ItemTerrasteelArmor.java | 14 +++++++------ .../armor/terrasteel/ItemTerrasteelHelm.java | 4 ++-- .../item/equipment/bauble/ItemBauble.java | 13 ++++++------ .../equipment/bauble/ItemBaubleCosmetic.java | 7 +++++-- .../equipment/bauble/ItemBloodPendant.java | 11 ++++++---- .../equipment/bauble/ItemFlightTiara.java | 5 +++-- .../tool/terrasteel/ItemTerraPick.java | 9 ++++---- .../botania/common/item/lens/ItemLens.java | 13 +++++++----- .../botania/common/item/relic/ItemRelic.java | 18 +++++++++------- .../common/item/relic/ItemRelicBauble.java | 3 +++ .../botania/common/lexicon/page/PageBrew.java | 4 ++-- .../lexicon/page/PageCraftingRecipe.java | 6 +++--- .../lexicon/page/PageManaInfusionRecipe.java | 12 +++++------ .../common/lexicon/page/PageMultiblock.java | 11 +++++----- .../common/lexicon/page/PagePetalRecipe.java | 4 ++-- .../common/lexicon/page/PageRecipe.java | 6 +++--- .../common/lexicon/page/PageRuneRecipe.java | 8 +++---- .../common/lexicon/page/PageShedding.java | 4 ++-- .../botania/common/lexicon/page/PageText.java | 4 ++-- 85 files changed, 374 insertions(+), 268 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 9220a9ae4..49bf6dbf7 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -12,6 +12,7 @@ package vazkii.botania.api.subtile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,7 +20,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -211,9 +213,10 @@ public class SubTileFunctional extends SubTileEntity { return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index b01ce3fdd..99841f1de 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -23,8 +24,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -302,9 +304,10 @@ public class SubTileGenerating extends SubTileEntity { return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name"); + String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name"); int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 31bd5b922..a2465c24f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -30,7 +31,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.fml.common.eventhandler.EventPriority; @@ -137,7 +137,7 @@ public final class HUDHandler { if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) { profiler.startSection("multiblockRightClick"); - String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor"); + String s = I18n.format("botaniamisc.rightClickToAnchor"); mc.fontRendererObj.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF); profiler.endSection(); } @@ -228,7 +228,7 @@ public final class HUDHandler { if(ticks > 0) { int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F)); int color = 0x00CC00 + (alpha << 24); - String disp = I18n.translateToLocal(ItemTwigWand.getModeString(stack)); + String disp = I18n.format(ItemTwigWand.getModeString(stack)); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2; int y = res.getScaledHeight() - 70; @@ -350,8 +350,8 @@ public final class HUDHandler { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; - drawStr = I18n.translateToLocal(entry.getUnlocalizedName()); - secondLine = TextFormatting.ITALIC + I18n.translateToLocal(entry.getTagline()); + drawStr = I18n.format(entry.getUnlocalizedName()); + secondLine = TextFormatting.ITALIC + I18n.format(entry.getTagline()); draw = true; } } @@ -397,9 +397,9 @@ public final class HUDHandler { private void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); - String txt0 = I18n.translateToLocal("botaniamisc.nearIndex0"); - String txt1 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex1"); - String txt2 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex2"); + String txt0 = I18n.format("botaniamisc.nearIndex0"); + String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1"); + String txt2 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex2"); int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20; int x = res.getScaledWidth() - l - 20; @@ -432,7 +432,7 @@ public final class HUDHandler { renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana); if(mana < 0) { - String text = I18n.translateToLocal("botaniamisc.statusUnknown"); + String text = I18n.format("botaniamisc.statusUnknown"); x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2; y -= 1; mc.fontRendererObj.drawString(text, x, y, color); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 3442f22e5..55b239446 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -8,6 +8,7 @@ import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,7 +16,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -164,30 +164,30 @@ public class RenderLexicon { if(stack != null) title = stack.getDisplayName(); if(title.equals(origTitle) && bevo) - title = I18n.translateToLocal("item.botania:lexicon.bevo"); + title = I18n.format("item.botania:lexicon.bevo"); if(title.equals(origTitle) && saice) - title = I18n.translateToLocal("item.botania:lexicon.saice"); + title = I18n.format("item.botania:lexicon.saice"); font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); GlStateManager.translate(0F, 10F, 0F); GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); GlStateManager.translate(0F, 15F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 50F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92); GlStateManager.translate(0F, 10F, 0F); - font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); + font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92); if(bevo || saice) { GlStateManager.translate(0F, 10F, 0F); - font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); + font.drawString(I18n.format("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); } } 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 2404b7590..068310586 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -17,11 +17,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -185,13 +185,13 @@ public final class TooltipAdditionDisplayHandler { Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); - String rank = I18n.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); + String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { - rank = I18n.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); + rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } 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 5026af18d..e0011b70d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -10,9 +10,9 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -25,15 +25,15 @@ 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) { - event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt0")); - event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt1")); + event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); + event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip")); + event.getToolTip().add(I18n.format("botaniamisc.spawnerTip")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasIvy")); + event.getToolTip().add(I18n.format("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) - event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasKeepIvy")); + event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy")); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 786cf33a2..d417bef56 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -13,11 +13,11 @@ package vazkii.botania.client.gui.bag; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; @@ -33,9 +33,9 @@ public class GuiFlowerBag extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String s = I18n.translateToLocal("item.botania:flowerBag.name"); + String s = I18n.format("item.botania:flowerBag.name"); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); - fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 6ce5f3c9f..f282bd211 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -16,12 +16,12 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatAllowedCharacters; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -285,7 +285,7 @@ public class GuiLexicon extends GuiScreen { if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10) noteDisplay += "&r_"; - fontRendererObj.drawString(I18n.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666); + fontRendererObj.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666); boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); @@ -340,7 +340,7 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.drawString(title, left + 18, top + 13, color); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); + fontRendererObj.drawString(String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); String s = TextFormatting.BOLD + categoryHighlight; fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0); @@ -481,9 +481,9 @@ public class GuiLexicon extends GuiScreen { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i); LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_); if(category != null) - button.displayString = I18n.translateToLocal(category.getUnlocalizedName()); + button.displayString = I18n.format(category.getUnlocalizedName()); else { - button.displayString = I18n.translateToLocal("botaniamisc.lexiconIndex"); + button.displayString = I18n.format("botaniamisc.lexiconIndex"); break; } } @@ -511,9 +511,9 @@ public class GuiLexicon extends GuiScreen { } if(isMainPage()) - buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.history"), this)); + buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this)); else if(isChallenge()) - buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.info"), this)); + buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this)); } public static void startTutorial() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index ed081b42f..6cedd8e17 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -13,9 +13,9 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -44,7 +44,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } public void setTitle() { - title = challenge == null ? "(null)" : I18n.translateToLocal(challenge.unlocalizedName); + title = challenge == null ? "(null)" : I18n.format(challenge.unlocalizedName); } @Override @@ -69,8 +69,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0); - fontRendererObj.drawString(I18n.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0); + fontRendererObj.drawString(I18n.format(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0); int width = guiWidth - 30; int x = left + 16; @@ -116,7 +116,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented { } void setCompleteButtonTitle() { - completeButton.displayString = I18n.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); + completeButton.displayString = I18n.format(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted"); } void back() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 4c02437f8..1f97ef595 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -11,8 +11,8 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.EnumChallengeLevel; import vazkii.botania.client.challenge.ModChallenges; @@ -30,13 +30,13 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { public GuiLexiconChallengesList() { parent = new GuiLexicon(); - title = I18n.translateToLocal("botaniamisc.challenges"); + title = I18n.format("botaniamisc.challenges"); } @Override public void onInitGui() { super.onInitGui(); - title = I18n.translateToLocal("botaniamisc.challenges"); + title = I18n.format("botaniamisc.challenges"); buttonList.add(backButton = new GuiButtonBack(12, left + guiWidth / 2 - 8, top + guiHeight + 2)); @@ -67,7 +67,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented { if(c.complete) complete++; - fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); + fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0); } fontRendererObj.setUnicodeFlag(unicode); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index b66d25db9..5a6591152 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -13,11 +13,11 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -66,9 +66,9 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa return; } - title = I18n.translateToLocal(entry.getUnlocalizedName()); + title = I18n.format(entry.getUnlocalizedName()); if(entry instanceof IAddonEntry) - subtitle = I18n.translateToLocal(((IAddonEntry) entry).getSubtitle()); + subtitle = I18n.format(((IAddonEntry) entry).getSubtitle()); else subtitle = null; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index a244362de..8b1b1d05d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.gui.lexicon; +import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; @@ -24,7 +24,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { public GuiLexiconHistory() { super(null); - title = I18n.translateToLocal("botaniamisc.historyLong"); + title = I18n.format("botaniamisc.historyLong"); } @Override @@ -33,7 +33,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { ILexicon lex = (ILexicon) stackUsed.getItem(); for(int i = history.size() - 1; i >= 0; i--) { LexiconEntry entry = history.get(i); - if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) + if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.format(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim())) entriesToDisplay.add(entry); } } 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 19954086c..78e0e9137 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -14,11 +14,11 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; @@ -67,7 +67,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { } public void setTitle() { - title = I18n.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); + title = I18n.format(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName()); } @Override @@ -135,7 +135,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { return true; search = search.toLowerCase(); - if(I18n.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search)) + if(I18n.format(e.getUnlocalizedName()).toLowerCase().contains(search)) return true; for(ItemStack stack : e.getDisplayedRecipes()) { @@ -155,7 +155,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i - page * 12); LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i); if(entry != null) { - button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.translateToLocal(entry.getUnlocalizedName()); + button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.format(entry.getUnlocalizedName()); button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; @@ -186,14 +186,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(entriesToDisplay.size() == 1) { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = I18n.translateToLocal("botaniamisc.enterToView"); + String s = I18n.format("botaniamisc.enterToView"); mc.fontRendererObj.drawString(s, left + guiWidth / 2 - mc.fontRendererObj.getStringWidth(s) / 2, top + 30, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } } else { boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); - String s = I18n.translateToLocal("botaniamisc.typeToSearch"); + String s = I18n.format("botaniamisc.typeToSearch"); mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666); mc.fontRendererObj.setUnicodeFlag(unicode); } @@ -224,7 +224,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { int x = currentButton.xPosition; int y = currentButton.yPosition; - String s = I18n.translateToLocal(currentEntry.getTagline()); + String s = I18n.format(currentEntry.getTagline()); boolean unicode = mc.fontRendererObj.getUnicodeFlag(); mc.fontRendererObj.setUnicodeFlag(true); int width = mc.fontRendererObj.getStringWidth(s); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index e2fdc2a62..5961c55d7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -12,8 +12,8 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.achievements")); + tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.achievements")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 044a45df9..0371c342e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -44,7 +44,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(I18n.translateToLocal("botaniamisc.back")); + return Collections.singletonList(I18n.format("botaniamisc.back")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 451274db3..291914d20 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -11,7 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import java.util.Arrays; import java.util.List; @@ -24,7 +24,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack { @Override public List getTooltip() { - return Arrays.asList(I18n.translateToLocal("botaniamisc.back"), TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToIndex")); + return Arrays.asList(I18n.format("botaniamisc.back"), TextFormatting.GRAY + I18n.format("botaniamisc.clickToIndex")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 6ebad086d..d6a308244 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -2,7 +2,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -27,11 +27,11 @@ public class GuiButtonBookmark extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(displayString.equals("+")) - tooltip.add(I18n.translateToLocal("botaniamisc.clickToAdd")); + tooltip.add(I18n.format("botaniamisc.clickToAdd")); else { - tooltip.add(String.format(I18n.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToSee")); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.shiftToRemove")); + tooltip.add(String.format(I18n.format("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.clickToSee")); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.shiftToRemove")); } int tooltipY = (tooltip.size() + 1) * 5; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 818e1999a..c3719e801 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -15,7 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import org.lwjgl.opengl.ARBMultitexture; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; @@ -122,7 +122,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { GlStateManager.popMatrix(); if(inside) - gui.categoryHighlight = I18n.translateToLocal(getTooltipText()); + gui.categoryHighlight = I18n.format(getTooltipText()); } private String getTooltipText() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 62bcfdac5..145ebb69a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.challenge.Challenge; import javax.annotation.Nonnull; @@ -50,7 +50,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { List tooltip = new ArrayList<>(); - tooltip.add(TextFormatting.AQUA + I18n.translateToLocal(challenge.unlocalizedName)); + tooltip.add(TextFormatting.AQUA + I18n.format(challenge.unlocalizedName)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 28a8ad0df..ecabe2f4d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -11,7 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -35,7 +35,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(I18n.translateToLocal("botaniamisc.challengeInfo")); + tooltip.add(I18n.format("botaniamisc.challengeInfo")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 475b77268..d3460f82f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); List tooltip = new ArrayList(); - tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.challenges")); + tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.challenges")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index dd37d744f..7dc3c1972 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -36,8 +36,8 @@ public class GuiButtonHistory extends GuiButtonLexicon { int k = getHoverState(hovered); List tooltip = new ArrayList<>(); - tooltip.add(I18n.translateToLocal("botaniamisc.historyLong")); - tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.historyDesc")); + tooltip.add(I18n.format("botaniamisc.historyLong")); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.historyDesc")); int tooltipY = (tooltip.size() + 1) * 5; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index ea4625b21..058404dec 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -41,9 +41,9 @@ public class GuiButtonNotes extends GuiButtonLexicon { List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.hideNotes")); + tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.hideNotes")); else { - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.showNotes")); + tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes")); if(parent.note != null && !parent.note.isEmpty()) Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 39c581389..aa712a0fa 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -38,7 +38,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) - tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.translateToLocal("botaniamisc.lexiconOptions" + i)); + tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.format("botaniamisc.lexiconOptions" + i)); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index bf3dcbc3e..2957d2f65 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -39,7 +39,7 @@ public class GuiButtonPage extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) - RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); + RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.format(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index c4ffa9ac6..9f679d365 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -43,6 +43,6 @@ public class GuiButtonShare extends GuiButtonLexicon { } public List getTooltip() { - return Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.clickToShare")); + return Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.clickToShare")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index d04097e30..1b3e34add 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -46,7 +46,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { - tooltip.add(TextFormatting.GRAY + String.format(I18n.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); + tooltip.add(TextFormatting.GRAY + String.format(I18n.format("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); if(i == 3) tooltip.add(""); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index a26e71bac..5cf07ae21 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -36,7 +36,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); - List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.viewOnline")); + List tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 1f2c51032..ec8828dbf 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -17,7 +17,7 @@ import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import javax.annotation.Nonnull; import java.util.Collection; @@ -32,7 +32,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { public BreweryRecipeCategory(IGuiHelper guiHelper) { ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); - localizedName = I18n.translateToLocal("botania.nei.brewery"); + localizedName = I18n.format("botania.nei.brewery"); } @Nonnull 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 a501d0508..c82e17d00 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 @@ -22,7 +22,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -37,7 +37,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { private final IDrawable overlay; public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { - localizedName = I18n.translateToLocal("botania.nei.elvenTrade"); + localizedName = I18n.format("botania.nei.elvenTrade"); background = guiHelper.createBlankDrawable(145, 95); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 239c28efa..eda67238b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -34,7 +34,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { public ManaPoolRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = I18n.translateToLocal("botania.nei.manaPool"); + localizedName = I18n.format("botania.nei.manaPool"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); ItemNBTHelper.setBoolean(renderStack, "RenderFull", true); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 1d59f1734..198d3957f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -34,7 +34,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = I18n.translateToLocal("botania.nei.petalApothecary"); + localizedName = I18n.format("botania.nei.petalApothecary"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 4ca2b3156..1e567190e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -33,7 +33,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { public PureDaisyRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); - localizedName = I18n.translateToLocal("botania.nei.pureDaisy"); + localizedName = I18n.format("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 6e5695b98..0040afefc 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -15,9 +15,9 @@ import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -33,7 +33,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { public RunicAltarRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(150, 110); - localizedName = I18n.translateToLocal("botania.nei.runicAltar"); + localizedName = I18n.format("botania.nei.runicAltar"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), 0, 0, 150, 110); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 5bc0ba728..a8fac4453 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +25,8 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import org.lwjgl.opengl.GL11; @@ -234,12 +236,13 @@ public class SubTileHopperhock extends SubTileFunctional { filterType = cmp.getInteger(TAG_FILTER_TYPE); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); int color = getColor(); - String filter = I18n.translateToLocal("botaniamisc.filter" + filterType); + String filter = I18n.format("botaniamisc.filter" + filterType); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(filter) / 2; 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 ef1846576..fb569cc31 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 @@ -29,6 +29,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; @@ -164,6 +166,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { return true; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); 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 31595a5b7..f9b55b9bd 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 @@ -21,6 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -103,6 +105,7 @@ public class SubTileSpectrolus extends SubTileGenerating { return LexiconData.spectrolus; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res) { super.renderHUD(mc, res); 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 ff3b21fd6..9ee0d65af 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -24,7 +25,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -314,6 +316,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { return hasLava; } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { int xc = res.getScaledWidth() / 2; int yc = res.getScaledHeight() / 2; @@ -357,9 +360,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0 && hasWater) { - String s = I18n.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.format("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.format("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } 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 4f9ae7c87..8d9d9ec32 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -14,12 +14,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StringUtils; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -141,6 +143,7 @@ public class TileHourglass extends TileSimpleInventory { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } + @SideOnly(Side.CLIENT) public void renderHUD(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); int x = res.getScaledWidth() / 2 + 10; @@ -165,7 +168,7 @@ public class TileHourglass extends TileSimpleInventory { if(!move) status = status.isEmpty() ? "stopped" : "lockedStopped"; if(!status.isEmpty()) - mc.fontRendererObj.drawStringWithShadow(I18n.translateToLocal("botaniamisc." + status), x + 20, y + 12, getColor()); + mc.fontRendererObj.drawStringWithShadow(I18n.format("botaniamisc." + status), x + 20, y + 12, getColor()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index ebe32ba46..143c60b89 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; @@ -383,9 +383,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } else if(recipeKeepTicks > 0) { - String s = I18n.translateToLocal("botaniamisc.altarRefill0"); + String s = I18n.format("botaniamisc.altarRefill0"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 10, 0xFFFFFF); - s = I18n.translateToLocal("botaniamisc.altarRefill1"); + s = I18n.format("botaniamisc.altarRefill1"); mc.fontRendererObj.drawStringWithShadow(s, xc - mc.fontRendererObj.getStringWidth(s) / 2, yc + 20, 0xFFFFFF); } } 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 8491c5d27..5dd4e2e4e 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 @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -29,8 +30,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -359,9 +361,10 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); - String name = I18n.translateToLocal(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); 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 d9fdffb38..f65d7f0ef 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 @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -31,8 +32,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -559,8 +561,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return world.rayTraceBlocks(vec3, vec31, par3, !par3, par3); } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.translateToLocal(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index a0de3966f..f60d652de 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -11,11 +11,11 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import java.awt.*; import java.io.File; @@ -46,7 +46,7 @@ public class ThreadDownloadMod extends Thread { @Override public void run() { try { - ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.translateToLocal("botania.versioning.startingDownload"), fileName)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.format("botania.versioning.startingDownload"), fileName)); if(Minecraft.getMinecraft().thePlayer != null) Minecraft.getMinecraft().thePlayer.addChatMessage(component); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 3b4f6feaa..abf6f7dfe 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -11,12 +11,12 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; @@ -50,7 +50,7 @@ public final class VersionChecker { player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); player.addChatComponentMessage(component); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 09b57d765..6faa16fb6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -10,12 +10,14 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; @@ -43,10 +45,11 @@ public class ItemAncientWill extends ItemMod { list.add(new ItemStack(item, 1, i)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.craftToAddWill"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); + addStringToTooltip(I18n.format("botaniamisc.craftToAddWill"), list); + addStringToTooltip(I18n.format("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); } public void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9a26ae81b..297968760 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -30,7 +31,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -243,12 +243,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.AIR) { int count = getBlockCount(par1ItemStack); - par3List.add(count + " " + I18n.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + par3List.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 42b3d4834..df7eddcb7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -10,13 +10,15 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; @@ -84,9 +86,10 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(I18n.translateToLocal("botaniamisc.lotusDesc")); + list.add(I18n.format("botaniamisc.lotusDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 7e6db88f1..7bab788e6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,9 +30,10 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; @@ -201,15 +203,16 @@ public class ItemBottledMana extends ItemMod { return seed; } - long randomSeed(ItemStack stack) { + private long randomSeed(ItemStack stack) { long seed = Math.abs(itemRand.nextLong()); ItemNBTHelper.setLong(stack, TAG_SEED, seed); return seed; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(I18n.translateToLocal("botaniamisc.bottleTooltip")); + par3List.add(I18n.format("botaniamisc.bottleTooltip")); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 7b5ea9be3..b9b40cf9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -30,9 +31,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; @@ -114,12 +116,13 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { return EnumActionResult.PASS; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) - list.add(I18n.translateToLocal("botaniamisc.justDoIt")); + list.add(I18n.format("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) - list.add(I18n.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); + list.add(I18n.format(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 639e60fca..9d72ddba8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -39,7 +40,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; @@ -546,7 +546,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { mc.fontRendererObj.drawStringWithShadow(name, x, y, 0xFFFFFF); } else { ItemStack[] recipe = getCraftingItems(stack, slot); - String label = I18n.translateToLocal("botaniamisc.unsetRecipe"); + String label = I18n.format("botaniamisc.unsetRecipe"); boolean setRecipe = false; if(recipe[9] == null) @@ -595,7 +595,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { int yoff = 110; if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) { - String warning = TextFormatting.RED + I18n.translateToLocal("botaniamisc.cantCraft"); + String warning = TextFormatting.RED + I18n.format("botaniamisc.cantCraft"); mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); yoff += 12; } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index b22634cf4..e51595228 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -28,8 +29,9 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; @@ -76,9 +78,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(String.format(I18n.translateToLocal("botaniamisc.shardLevel"), I18n.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); + list.add(String.format(I18n.format("botaniamisc.shardLevel"), I18n.format("botania.roman" + (stack.getItemDamage() + 1)))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 51804f14b..c513271f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -29,8 +30,9 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; @@ -101,10 +103,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { list.add(creative); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { - String edition = TextFormatting.GOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), getEdition()); + String edition = TextFormatting.GOLD + String.format(I18n.format("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) par3List.add(edition); @@ -116,22 +119,23 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(String.format(I18n.translateToLocal(format), typesKnown.size()), par3List); + addStringToTooltip(String.format(I18n.format(format), typesKnown.size()), par3List); for(KnowledgeType type : typesKnown) - addStringToTooltip(" \u2022 " + I18n.translateToLocal(type.getUnlocalizedName()), par3List); + addStringToTooltip(" \u2022 " + I18n.format(type.getUnlocalizedName()), par3List); - } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); } private void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } + @SideOnly(Side.CLIENT) public static String getEdition() { String version = LibMisc.BUILD; int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); - return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); + return build == 0 ? I18n.format("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 8b287880d..058894c8e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +28,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -204,11 +204,12 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return null; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); return; } @@ -221,13 +222,13 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { if(clip) { int pos = getClipPos(par1ItemStack); - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasClip"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasClip"), par3List); for(int i = 0; i < CLIP_SLOTS; i++) { String name = ""; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); if(lensAt == null) - name = I18n.translateToLocal("botaniamisc.clipEmpty"); + name = I18n.format("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); addStringToTooltip(formatting + " - " + name, par3List); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 067a43db9..8e56943d1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -10,13 +10,15 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -75,10 +77,11 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP return 0; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) - par3List.add(I18n.translateToLocal("botaniamisc.creative")); + par3List.add(I18n.format("botaniamisc.creative")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index e44ba6cf7..60e487881 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -19,8 +20,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; @@ -60,9 +62,10 @@ public class ItemPinkinator extends ItemMod { return ActionResult.newResult(EnumActionResult.PASS, stack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(I18n.translateToLocal("botaniamisc.pinkinatorDesc")); + p_77624_3_.add(I18n.format("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 57a50db3d..96903ce62 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -25,9 +26,10 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; @@ -101,10 +103,11 @@ public class ItemSignalFlare extends ItemMod implements IColorable { par3List.add(forColor(i)); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); - par3List.add(String.format(I18n.translateToLocal("botaniamisc.flareColor"), I18n.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.format("botaniamisc.flareColor"), I18n.format("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index d9721461d..eb708afc9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,8 +27,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -84,11 +86,12 @@ public class ItemSpawnerMover extends ItemMod { return 0; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { String id = getEntityId(stack); if (id != null) - infoList.add(I18n.translateToLocal("entity." + id + ".name")); + infoList.add(I18n.format("entity." + id + ".name")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 0ccb83993..bb6422e4c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; @@ -18,7 +19,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -48,8 +48,8 @@ public class ItemTemperanceStone extends ItemMod { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index f35e9428d..1b78fcc36 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,8 +32,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; @@ -228,9 +230,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return getUnlocalizedNameLazy(par1ItemStack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { - list.add(I18n.translateToLocal(getModeString(stack))); + list.add(I18n.format(getModeString(stack))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 55ec5e51f..3202f6a34 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -11,9 +11,11 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; import java.util.List; @@ -24,11 +26,12 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { super(par2Block); } + @SideOnly(Side.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) - par3List.add(I18n.translateToLocal("botaniamisc.creativePool" + i)); + par3List.add(I18n.format("botaniamisc.creativePool" + i)); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 3b1c5e347..5ac094b37 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,8 +21,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; @@ -75,6 +77,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return getUnlocalizedNameInefficiently_(par1ItemStack); } + @SideOnly(Side.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { String type = getType(par1ItemStack); @@ -84,7 +87,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(ConfigHandler.referencesEnabled) { String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); - String refLocalized = I18n.translateToLocal(refUnlocalized); + String refLocalized = I18n.format(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) par3List.add(TextFormatting.ITALIC + refLocalized); } 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 8223313b1..e7804c02c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -26,8 +27,9 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; @@ -143,15 +145,16 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack stack) { - return String.format(I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); + return String.format(net.minecraft.util.text.translation.I18n.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), net.minecraft.util.text.translation.I18n.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), TextFormatting.BOLD + "" + getSwigsLeft(stack) + TextFormatting.RESET); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - list.add(format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(effect, 1F) + ")")); + list.add(format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(effect, 1F) + ")")); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 117090009..1dce2493b 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,7 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -71,19 +73,20 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain return r << 16 | g << 8 | b; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.notInfused"), list); return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotion(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); - addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(longEffect, 1F) + ")"), list); + addStringToTooltip(" " + format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))) + TextFormatting.GRAY + (effect.getPotion().isInstant() ? "" : " (" + Potion.getPotionDurationString(longEffect, 1F) + ")"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index e5843862c..96a87fafa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -1,10 +1,10 @@ package vazkii.botania.common.item.equipment.armor.elementium; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -71,15 +71,17 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.elementium.name"); + return I18n.format("botania.armorset.elementium.name"); } + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.elementium.desc"), list); + addStringToTooltip(I18n.format("botania.armorset.elementium.desc"), list); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index fb73df1d2..94145f2fc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.common.Optional; @@ -156,13 +156,15 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return true; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(GuiScreen.isShiftKeyDown()) addInformationAfterShift(stack, player, list, adv); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); + else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), list); } + @SideOnly(Side.CLIENT) public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(getArmorSetTitle(player), list); addArmorSetDescription(stack, list); @@ -170,7 +172,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan for(int i = 0; i < stacks.length; i++) addStringToTooltip((hasArmorSetItem(player, i) ? TextFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); if(hasPhantomInk(stack)) - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), list); + addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), list); } public void addStringToTooltip(String s, List tooltip) { @@ -210,7 +212,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return false; } - public int getSetPiecesEquipped(EntityPlayer player) { + private int getSetPiecesEquipped(EntityPlayer player) { int pieces = 0; for(int i = 0; i < 4; i++) if(hasArmorSetItem(player, i)) @@ -219,16 +221,19 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return pieces; } + @SideOnly(Side.CLIENT) public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.manasteel.name"); + return I18n.format("botania.armorset.manasteel.name"); } - public String getArmorSetTitle(EntityPlayer player) { - return I18n.translateToLocal("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; + @SideOnly(Side.CLIENT) + private String getArmorSetTitle(EntityPlayer player) { + return I18n.format("botaniamisc.armorset") + " " + getArmorSetName() + " (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")"; } + @SideOnly(Side.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.manasteel.desc"), list); + addStringToTooltip(I18n.format("botania.armorset.manasteel.desc"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index e61d367fa..c75ca1414 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -19,7 +20,6 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,7 +75,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } - static ItemStack[] armorset; + private static ItemStack[] armorset; @Override public ItemStack[] getArmorSetStacks() { @@ -106,25 +106,28 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.manaweave.name"); + return I18n.format("botania.armorset.manaweave.name"); } - + + @SideOnly(Side.CLIENT) @Override public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(ClientProxy.jingleTheBells) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.santaweaveInfo"), list); + addStringToTooltip(I18n.format("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); } super.addInformationAfterShift(stack, player, list, adv); } - + + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc0"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.manaweave.desc1"), list); + addStringToTooltip(I18n.format("botania.armorset.manaweave.desc0"), list); + addStringToTooltip(I18n.format("botania.armorset.manaweave.desc1"), list); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 7b8fcf35a..d956cee96 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -12,12 +12,12 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import com.google.common.collect.Multimap; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -65,7 +65,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return multimap; } - static ItemStack[] armorset; + private static ItemStack[] armorset; @Override public ItemStack[] getArmorSetStacks() { @@ -96,16 +96,18 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return false; } + @SideOnly(Side.CLIENT) @Override public String getArmorSetName() { - return I18n.translateToLocal("botania.armorset.terrasteel.name"); + return I18n.format("botania.armorset.terrasteel.name"); } + @SideOnly(Side.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc0"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc1"), list); - addStringToTooltip(I18n.translateToLocal("botania.armorset.terrasteel.desc2"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc0"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc1"), list); + addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc2"), list); } } 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 ae95c84c8..319a63d23 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 @@ -14,13 +14,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -86,7 +86,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc super.addArmorSetDescription(stack, list); for(int i = 0; i < 6; i++) if(hasAncientWill(stack, i)) - addStringToTooltip(I18n.translateToLocal("botania.armorset.will" + i + ".desc"), list); + addStringToTooltip(I18n.format("botania.armorset.will" + i + ".desc"), list); } public static boolean hasAnyWill(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 994718538..166780243 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -15,6 +15,7 @@ import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +24,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; @@ -91,24 +91,25 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), par3List); + else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); } + @SideOnly(Side.CLIENT) public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(I18n.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); + addStringToTooltip(I18n.format("botania.baubletype." + type.name().toLowerCase()), par3List); String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) - addStringToTooltip(I18n.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), par3List); + addStringToTooltip(I18n.format("botania.baubletooltip").replaceAll("%key%", key), par3List); ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + addStringToTooltip(String.format(I18n.format("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); if(hasPhantomInk(par1ItemStack)) - addStringToTooltip(I18n.translateToLocal("botaniamisc.hasPhantomInk"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), par3List); } void addStringToTooltip(String s, List tooltip) { 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 f96346bf3..78e22c18d 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 @@ -22,13 +22,15 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import org.lwjgl.opengl.GL11; @@ -68,9 +70,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.cosmeticBauble"), par3List); + addStringToTooltip(I18n.format("botaniamisc.cosmeticBauble"), par3List); super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); } 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 981f070f0..0c4e43d12 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 @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -26,7 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -84,20 +86,21 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre return r << 16 | g << 8 | b; } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { super.addHiddenTooltip(stack, player, list, adv); Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.notInfused"), list); return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; - addStringToTooltip(" " + format + I18n.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); + addStringToTooltip(" " + format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))), list); } } 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 aea9a6ace..3f9490fa8 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 @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -102,10 +102,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub list.add(new ItemStack(item, 1, i)); } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - par3List.add(I18n.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); + par3List.add(I18n.format("botania.wings" + par1ItemStack.getItemDamage())); } @Override 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 f158bacfb..0839a410b 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.terrasteel; import net.minecraft.block.material.Material; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -30,7 +31,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -104,13 +104,14 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String rankFormat = I18n.translateToLocal("botaniamisc.toolRank"); - String rank = I18n.translateToLocal("botania.rank" + getLevel(par1ItemStack)); + String rankFormat = I18n.format("botaniamisc.toolRank"); + String rank = I18n.format("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); if(getMana(par1ItemStack) == Integer.MAX_VALUE) - par3List.add(TextFormatting.RED + I18n.translateToLocal("botaniamisc.getALife")); + par3List.add(TextFormatting.RED + I18n.format("botaniamisc.getALife")); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index f8c6c7772..e9bafcf6e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.lens; +import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -18,8 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; @@ -162,16 +164,17 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getStoredColor(par1ItemStack); if(storedColor != -1) - par3List.add(String.format(I18n.translateToLocal("botaniamisc.color"), I18n.translateToLocal("botania.color" + storedColor))); + par3List.add(String.format(I18n.format("botaniamisc.color"), I18n.format("botania.color" + storedColor))); } - public String getItemShortTermName(ItemStack stack) { - return I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); + private String getItemShortTermName(ItemStack stack) { + return net.minecraft.util.text.translation.I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); } @Nonnull @@ -180,7 +183,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens ItemStack compositeLens = getCompositeLens(stack); if(compositeLens == null) return super.getItemStackDisplayName(stack); - return String.format(I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); + return String.format(net.minecraft.util.text.translation.I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 043f6d2ee..3afac8280 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -18,9 +19,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.UsernameCache; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -49,31 +51,33 @@ public class ItemRelic extends ItemMod implements IRelic { updateRelic(stack, (EntityPlayer) entity); } + @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } + @SideOnly(Side.CLIENT) public void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { if(!hasUUID(stack)) { - addStringToTooltip(I18n.translateToLocal("botaniamisc.relicUnbound"), list); + addStringToTooltip(I18n.format("botaniamisc.relicUnbound"), list); } else { - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.format("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); if(!getSoulbindUUID(stack).equals(player.getUniqueID())) - addStringToTooltip(String.format(I18n.translateToLocal("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); + addStringToTooltip(String.format(I18n.format("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); } if(stack.getItem() == ModItems.aesirRing) - addStringToTooltip(I18n.translateToLocal("botaniamisc.dropIkea"), list); + addStringToTooltip(I18n.format("botaniamisc.dropIkea"), list); if(stack.getItem() == ModItems.dice) { addStringToTooltip("", list); String name = stack.getUnlocalizedName() + ".poem"; for(int i = 0; i < 4; i++) - addStringToTooltip(TextFormatting.ITALIC + I18n.translateToLocal(name + i), list); + addStringToTooltip(TextFormatting.ITALIC + I18n.format(name + i), list); } - } else addStringToTooltip(I18n.translateToLocal("botaniamisc.shiftinfo"), list); + } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), list); } public boolean shouldDamageWrongPlayer() { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 5239f89a1..1986873ba 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -17,6 +17,8 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; @@ -56,6 +58,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } } + @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index ee5a9e967..2d826ed8d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -12,9 +12,9 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -53,7 +53,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj; boolean unicode = renderer.getUnicodeFlag(); renderer.setUnicodeFlag(true); - String s = TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.brewOf"), I18n.translateToLocal(brew.getUnlocalizedName())); + String s = TextFormatting.BOLD + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName())); renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index dc95e77e3..baec81940 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -14,12 +14,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -87,7 +87,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.shapeless"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.shapeless"))); iconY += 20; } @@ -99,7 +99,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.translateToLocal("botaniamisc.oredict"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.oredict"))); } GlStateManager.disableBlend(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 68a1da7ff..03b644de1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -16,11 +16,11 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -94,7 +94,7 @@ public class PageManaInfusionRecipe extends PageRecipe { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.format("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 105, 0x66000000); int ratio = 10; @@ -106,8 +106,8 @@ public class PageManaInfusionRecipe extends PageRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); - String dropString = I18n.translateToLocal("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; + String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String dropString = I18n.format("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; boolean hoveringOverDrop = false; @@ -136,8 +136,8 @@ public class PageManaInfusionRecipe extends PageRecipe { if(hoveringOverDrop) { String key = RenderHelper.getKeyDisplayString("key.drop"); - String tip0 = I18n.translateToLocal("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); - String tip1 = I18n.translateToLocal("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip0 = I18n.format("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip1 = I18n.format("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); RenderHelper.renderTooltip(mx, my, Arrays.asList(tip0, tip1)); } } 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 6746678de..50bff1a54 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -17,12 +17,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -85,7 +85,7 @@ public class PageMultiblock extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); - String s = TextFormatting.BOLD + I18n.translateToLocal(getUnlocalizedName()); + String s = TextFormatting.BOLD + I18n.format(getUnlocalizedName()); font.setUnicodeFlag(true); font.drawString(s, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(s) / 2, gui.getTop() + 16, 0x000000); font.setUnicodeFlag(unicode); @@ -102,7 +102,7 @@ public class PageMultiblock extends LexiconPage { GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { List mats = new ArrayList<>(); - mats.add(I18n.translateToLocal("botaniamisc.materialsRequired")); + mats.add(I18n.format("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { String size = "" + stack.stackSize; if(size.length() < 2) @@ -121,8 +121,9 @@ public class PageMultiblock extends LexiconPage { gui.getButtonList().add(button); } - String getButtonStr() { - return I18n.translateToLocal(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); + @SideOnly(Side.CLIENT) + private String getButtonStr() { + return I18n.format(MultiblockRenderHandler.currentMultiblock == set ? "botaniamisc.unvisualize" : "botaniamisc.visualize"); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index e984a6a95..8319ed722 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -15,9 +15,9 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -107,7 +107,7 @@ public class PagePetalRecipe extends PageRecipe { boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); + String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); font.setUnicodeFlag(unicode); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 014df8180..5966ea453 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -15,9 +15,9 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; @@ -79,12 +79,12 @@ public class PageRecipe extends LexiconPage { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); tooltipY += 18; } if(tooltipContainerStack != null) - vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.format("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); } tooltipStack = tooltipContainerStack = null; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index d1bf9f1ad..c51d7bf3d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -13,8 +13,8 @@ package vazkii.botania.common.lexicon.page; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @@ -47,7 +47,7 @@ public class PageRuneRecipe extends PagePetalRecipe { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - String manaUsage = I18n.translateToLocal("botaniamisc.manaUsage"); + String manaUsage = I18n.format("botaniamisc.manaUsage"); font.drawString(manaUsage, gui.getLeft() + gui.getWidth() / 2 - font.getStringWidth(manaUsage) / 2, gui.getTop() + 110, 0x66000000); int ratio = 10; @@ -59,8 +59,8 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.translateToLocal("botaniamisc.ratio"), ratio); - String stopStr = I18n.translateToLocal("botaniamisc.shiftToStopSpin"); + String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index b41eb874d..380897e20 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -16,12 +16,12 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Mouse; @@ -93,7 +93,7 @@ public class PageShedding extends PageEntity { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); tooltipY += 18; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index ccad3c5d8..40b3fc7ee 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -13,7 +13,7 @@ package vazkii.botania.common.lexicon.page; import com.google.common.base.Joiner; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -52,7 +52,7 @@ public class PageText extends LexiconPage { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; boolean unicode = font.getUnicodeFlag(); font.setUnicodeFlag(true); - String text = I18n.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); + String text = I18n.format(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
    "); List> lines = new ArrayList<>(); From 8b882897899776e459f38afd67f863c1b06ed941 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 May 2016 13:19:11 -0500 Subject: [PATCH 629/935] Fix issues associated with last commit --- .../vazkii/botania/client/core/handler/RenderLexicon.java | 2 +- .../vazkii/botania/client/gui/lexicon/GuiLexicon.java | 2 +- .../client/gui/lexicon/button/GuiButtonBookmark.java | 2 +- .../client/gui/lexicon/button/GuiButtonUpdateWarning.java | 2 +- .../botania/common/core/version/ThreadDownloadMod.java | 2 +- .../botania/common/core/version/VersionChecker.java | 3 ++- .../java/vazkii/botania/common/item/ItemLaputaShard.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 4 ++-- .../java/vazkii/botania/common/item/ItemSignalFlare.java | 2 +- .../vazkii/botania/common/item/brew/ItemIncenseStick.java | 2 +- .../botania/common/item/equipment/bauble/ItemBauble.java | 4 ++-- .../common/item/equipment/bauble/ItemBloodPendant.java | 2 +- .../item/equipment/tool/terrasteel/ItemTerraPick.java | 4 ++-- .../java/vazkii/botania/common/item/lens/ItemLens.java | 4 ++-- .../java/vazkii/botania/common/item/relic/ItemRelic.java | 4 ++-- .../java/vazkii/botania/common/lexicon/page/PageBrew.java | 2 +- .../common/lexicon/page/PageManaInfusionRecipe.java | 6 +++--- .../botania/common/lexicon/page/PageRuneRecipe.java | 2 +- src/main/resources/assets/botania/lang/de_DE.lang | 4 ++-- src/main/resources/assets/botania/lang/en_US.lang | 8 ++++---- src/main/resources/assets/botania/lang/es_AR.lang | 4 ++-- src/main/resources/assets/botania/lang/es_ES.lang | 8 ++++---- src/main/resources/assets/botania/lang/fr_FR.lang | 8 ++++---- src/main/resources/assets/botania/lang/ja_JP.lang | 4 ++-- src/main/resources/assets/botania/lang/ko_KR.lang | 6 +++--- src/main/resources/assets/botania/lang/nl_NL.lang | 8 ++++---- src/main/resources/assets/botania/lang/pt_BR.lang | 8 ++++---- src/main/resources/assets/botania/lang/ru_RU.lang | 8 ++++---- src/main/resources/assets/botania/lang/zh_CN.lang | 8 ++++---- src/main/resources/assets/botania/lang/zh_TW.lang | 8 ++++---- 30 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 55b239446..7476cc099 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -171,7 +171,7 @@ public class RenderLexicon { font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700); GlStateManager.translate(0F, 10F, 0F); GlStateManager.scale(0.6F, 0.6F, 0.6F); - font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100); + font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100); GlStateManager.translate(0F, 15F, 0F); font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index f282bd211..b9c3ac3a3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -340,7 +340,7 @@ public class GuiLexicon extends GuiScreen { boolean unicode = fontRendererObj.getUnicodeFlag(); fontRendererObj.drawString(title, left + 18, top + 13, color); fontRendererObj.setUnicodeFlag(true); - fontRendererObj.drawString(String.format(I18n.format("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color); + fontRendererObj.drawString(I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), left + 24, top + 22, color); String s = TextFormatting.BOLD + categoryHighlight; fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index d6a308244..434dcb2b4 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -29,7 +29,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon { if(displayString.equals("+")) tooltip.add(I18n.format("botaniamisc.clickToAdd")); else { - tooltip.add(String.format(I18n.format("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1)); + tooltip.add(I18n.format("botaniamisc.bookmark", id - GuiLexicon.BOOKMARK_START + 1)); tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.clickToSee")); tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.shiftToRemove")); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 1b3e34add..48ee68a59 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -46,7 +46,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { - tooltip.add(TextFormatting.GRAY + String.format(I18n.format("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); + tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.changes" + i, version).replaceAll("&", "\u00a7")); if(i == 3) tooltip.add(""); } diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index f60d652de..8f0f943e3 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -46,7 +46,7 @@ public class ThreadDownloadMod extends Thread { @Override public void run() { try { - ITextComponent component = ITextComponent.Serializer.jsonToComponent(String.format(I18n.format("botania.versioning.startingDownload"), fileName)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.startingDownload", fileName)); if(Minecraft.getMinecraft().thePlayer != null) Minecraft.getMinecraft().thePlayer.addChatMessage(component); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index abf6f7dfe..a25821051 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -15,6 +15,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; @@ -50,7 +51,7 @@ public final class VersionChecker { player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage", onlineVersion)); player.addChatComponentMessage(component); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index e51595228..66c79a0e0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -81,7 +81,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(String.format(I18n.format("botaniamisc.shardLevel"), I18n.format("botania.roman" + (stack.getItemDamage() + 1)))); + list.add(I18n.format("botaniamisc.shardLevel", I18n.format("botania.roman" + (stack.getItemDamage() + 1)))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index c513271f2..dab4a83e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -107,7 +107,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { - String edition = TextFormatting.GOLD + String.format(I18n.format("botaniamisc.edition"), getEdition()); + String edition = TextFormatting.GOLD + I18n.format("botaniamisc.edition", getEdition()); if(!edition.isEmpty()) par3List.add(edition); @@ -119,7 +119,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(String.format(I18n.format(format), typesKnown.size()), par3List); + addStringToTooltip(I18n.format(format, typesKnown.size()), par3List); for(KnowledgeType type : typesKnown) addStringToTooltip(" \u2022 " + I18n.format(type.getUnlocalizedName()), par3List); diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 96903ce62..c299671b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -107,7 +107,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); - par3List.add(String.format(I18n.format("botaniamisc.flareColor"), I18n.format("botania.color" + storedColor))); + par3List.add(I18n.format("botaniamisc.flareColor", I18n.format("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 1dce2493b..cf016d2d0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -82,7 +82,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotion(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false, true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 166780243..781a0bc85 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -102,11 +102,11 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) - addStringToTooltip(I18n.format("botania.baubletooltip").replaceAll("%key%", key), par3List); + addStringToTooltip(I18n.format("botania.baubletooltip", key), par3List); ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) - addStringToTooltip(String.format(I18n.format("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasCosmetic", cosmetic.getDisplayName()), par3List); if(hasPhantomInk(par1ItemStack)) addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), par3List); 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 0c4e43d12..a7a2e3b66 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 @@ -97,7 +97,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre return; } - addStringToTooltip(TextFormatting.LIGHT_PURPLE + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(TextFormatting.LIGHT_PURPLE + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY; addStringToTooltip(" " + format + I18n.format(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + I18n.format("botania.roman" + (effect.getAmplifier() + 1))), list); 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 0839a410b..6e87f3d20 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 @@ -107,9 +107,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String rankFormat = I18n.format("botaniamisc.toolRank"); String rank = I18n.format("botania.rank" + getLevel(par1ItemStack)); - par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); + String rankFormat = I18n.format("botaniamisc.toolRank", rank); + par3List.add(rankFormat.replaceAll("&", "\u00a7")); if(getMana(par1ItemStack) == Integer.MAX_VALUE) par3List.add(TextFormatting.RED + I18n.format("botaniamisc.getALife")); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index e9bafcf6e..e9e58a0a6 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -166,10 +166,10 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getStoredColor(par1ItemStack); if(storedColor != -1) - par3List.add(String.format(I18n.format("botaniamisc.color"), I18n.format("botania.color" + storedColor))); + par3List.add(I18n.format("botaniamisc.color", I18n.format("botania.color" + storedColor))); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 3afac8280..6762623b2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -63,9 +63,9 @@ public class ItemRelic extends ItemMod implements IRelic { if(!hasUUID(stack)) { addStringToTooltip(I18n.format("botaniamisc.relicUnbound"), list); } else { - addStringToTooltip(String.format(I18n.format("botaniamisc.relicSoulbound"), getSoulbindUsername(stack)), list); + addStringToTooltip(I18n.format("botaniamisc.relicSoulbound", getSoulbindUsername(stack)), list); if(!getSoulbindUUID(stack).equals(player.getUniqueID())) - addStringToTooltip(String.format(I18n.format("botaniamisc.notYourSagittarius"), getSoulbindUsername(stack)), list); + addStringToTooltip(I18n.format("botaniamisc.notYourSagittarius", getSoulbindUsername(stack)), list); } if(stack.getItem() == ModItems.aesirRing) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 2d826ed8d..1288b2f62 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -53,7 +53,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { FontRenderer renderer = Minecraft.getMinecraft().fontRendererObj; boolean unicode = renderer.getUnicodeFlag(); renderer.setUnicodeFlag(true); - String s = TextFormatting.BOLD + String.format(I18n.format("botaniamisc.brewOf"), I18n.format(brew.getUnlocalizedName())); + String s = TextFormatting.BOLD + I18n.format("botaniamisc.brewOf", I18n.format(brew.getUnlocalizedName())); renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 03b644de1..ada3dae29 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -106,7 +106,7 @@ public class PageManaInfusionRecipe extends PageRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String ratioString = I18n.format("botaniamisc.ratio", ratio); String dropString = I18n.format("botaniamisc.drop") + " " + TextFormatting.BOLD + "(?)"; boolean hoveringOverDrop = false; @@ -136,8 +136,8 @@ public class PageManaInfusionRecipe extends PageRecipe { if(hoveringOverDrop) { String key = RenderHelper.getKeyDisplayString("key.drop"); - String tip0 = I18n.format("botaniamisc.dropTip0").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); - String tip1 = I18n.format("botaniamisc.dropTip1").replaceAll("%key%", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip0 = I18n.format("botaniamisc.dropTip0", TextFormatting.GREEN + key + TextFormatting.WHITE); + String tip1 = I18n.format("botaniamisc.dropTip1", TextFormatting.GREEN + key + TextFormatting.WHITE); RenderHelper.renderTooltip(mx, my, Arrays.asList(tip0, tip1)); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index c51d7bf3d..7efb3323b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -59,7 +59,7 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(x, y, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / ratio); - String ratioString = String.format(I18n.format("botaniamisc.ratio"), ratio); + String ratioString = I18n.format("botaniamisc.ratio", ratio); String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); boolean unicode = font.getUnicodeFlag(); diff --git a/src/main/resources/assets/botania/lang/de_DE.lang b/src/main/resources/assets/botania/lang/de_DE.lang index deec3722c..d35e2f2ae 100644 --- a/src/main/resources/assets/botania/lang/de_DE.lang +++ b/src/main/resources/assets/botania/lang/de_DE.lang @@ -71,7 +71,7 @@ botania.versioning.flavour13=Du hast meine Fallenkarte aktiviert! Ich spiele das botania.versioning.flavour14=Wie wäre es mit 'nem Trinkspiel: Für jedes Mal, wenn Botania ein Update hat, trink einen. botania.versioning.flavour15=Ein Botania-Update? Du bist ein wahres Glücksknilz. botania.versioning.outdated=Du verwendest Botania Build %s, der neueste ist Build %s. -botania.versioning.updateMessage=["Klicken für... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um automatisch die neueste Version herunterzuladen","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um zur Website der Mod zu gelangen","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um zum Changelog der Version zu gelangen","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Klicken für... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um automatisch die neueste Version herunterzuladen","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um zur Website der Mod zu gelangen","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klicke hierauf, um zum Changelog der Version zu gelangen","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=Starte Download von %s. Bitte entferne deine Festplatte nicht. botania.versioning.doneDownloading=Download von %s beendet. Starte das Spiel neu, um zu updaten. botania.versioning.downloadedAlready=Du hast bereits die neueste Version installiert. Schließe das Spiel, lösche die alte Konfigurationsdatei aus deinem Mods-Ordner und lade das Spiel neu, um zu updaten! @@ -83,7 +83,7 @@ botania.versioning.disabled=Sorry. Dieses Feature ist momentan wegen Server-Host botania.baubletype.amulet=Ausrüstbar im &aAmulett&7-Slot botania.baubletype.ring=Ausrüstbar im &aRing&7-Slot botania.baubletype.belt=Ausrüstbar im &aGürtel&7-Slot -botania.baubletooltip=Drücke &b%key%&7, um das Baubles-Menü zu öffnen +botania.baubletooltip=Drücke &b%s&7, um das Baubles-Menü zu öffnen botania.baubleinfo=Halte &bSHIFT&7 für mehr Info # BLOCK NAMES diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 8f5b2cd16..9cced70b4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -63,8 +63,8 @@ botaniamisc.noLexicon=You need a Lexica Botania in-hand to read this. botaniamisc.cantOpen=It doesn't seem like your Lexica Botania has this page. Perhaps it comes from an outside source...? botaniamisc.clickToShare=Share botaniamisc.drop=Drop -botaniamisc.dropTip0=Tip: You can press %key% in your inv to drop -botaniamisc.dropTip1=CTRL-%key% will drop a full stack +botaniamisc.dropTip0=Tip: You can press %s in your inv to drop +botaniamisc.dropTip1=CTRL-%s will drop a full stack botaniamisc.wandMode.bind=Bind Mode botaniamisc.wandMode.function=Function Mode botaniamisc.playVideo=Play Video @@ -419,7 +419,7 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! @@ -431,7 +431,7 @@ botania.versioning.disabled=Sorry. This feature is currently disabled due to ser botania.baubletype.amulet=Equippable in the &aAmulet&7 slot botania.baubletype.ring=Equippable in the &aRing&7 slot botania.baubletype.belt=Equippable in the &aBelt&7 slot -botania.baubletooltip=Press &b%key%&7 to open the Baubles menu +botania.baubletooltip=Press &b%s&7 to open the Baubles menu # RELIC POEMS item.dice.poem0=He deals the cards to find the answer, diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index 4e97d32bb..809a3190a 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -188,7 +188,7 @@ botania.versioning.flavour33=Antes de actualizar tu versión de Botania, te gust botania.versioning.flavour34=De vuelta en la rutina de actualización de Botania. No se necesita diversión. #angbadang botania.versioning.flavour35=Te convertirías en una Niña Mágica a cambio de una actualización de Botania? botania.versioning.outdated=Estás jugando con la versión %s de Botania, la última versión es la %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz click aquí para descargar la última versión de Botania","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz click aquí para descargar la última versión de Botania","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Comenzando la descarga de la versión %s. Por favor no quites tu disco duro. Te gusta ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Quizás puedes apoyar a ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" en [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Descarga de %s completada. Borra el antiguo arhivo .jar de Botania y vuelve a cargar tu juego para que la actualización se efectúe.. botania.versioning.downloadedAlready=Ya descargaste la última versión. Cierra tu juego, borra la versión anterior de la carpeta "mods" y vuelve a iniciar Minecraft ara efectuar la actualización. @@ -200,7 +200,7 @@ botania.versioning.disabled= Lo lamentamos, esta función está desactivada por botania.baubletype.amulet=Equipable en el slot para &aAmuletos&7 botania.baubletype.ring=Equipable en el slot para &aAnillos&7 botania.baubletype.belt=Equipable en el slot para &acinturón&7 -botania.baubletooltip=Oprime la &b%key%&7 para abrir el menú de Baubles +botania.baubletooltip=Oprime la &b%s&7 para abrir el menú de Baubles # ENTITY NAMES entity.Botania.botania:manaBurst.name=Mana Burst diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index 5864a1574..153a03243 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -61,8 +61,8 @@ botaniamisc.noLexicon=Necesitas un Lexica Botania en la mano para leer eso. botaniamisc.cantOpen=Parece que tu Lexica Botania no tiene esa página. ¿Quizás venga de una fuente externa? botaniamisc.clickToShare=Comparte botaniamisc.drop=Deja caer -botaniamisc.dropTip0=Consejo: puedes presionar %key% en tu inventario para dejarlo caer -botaniamisc.dropTip1=CTRL-%key% dejará caer el montón entero +botaniamisc.dropTip0=Consejo: puedes presionar %s en tu inventario para dejarlo caer +botaniamisc.dropTip1=CTRL-%s dejará caer el montón entero botaniamisc.wandMode.bind=Modo vínculo botaniamisc.wandMode.function=Modo función botaniamisc.playVideo=Reproduce vídeo @@ -356,7 +356,7 @@ botania.versioning.flavour47=Los rumores dicen que si mueves el camión hay una botania.versioning.flavour48=Me pregunto cuando Bevo va a actualizar su pack.... botania.versioning.flavour49=1 actualización de Botania se balanceaba sobre la tela de una araña. botania.versioning.outdated=Estás jugando con la versión %s de Botania, la última versión es la %s. -botania.versioning.updateMessage=["Clic para... [",{"text":"Descarga","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para descargar la última versión de Botania","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para ir a la página del mod","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para ir al registro de cambios","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Clic para... [",{"text":"Descarga","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para descargar la última versión de Botania","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para ir a la página del mod","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para ir al registro de cambios","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Comenzando la descarga de %s. Por favor no retires tu disco duro. Disfrutando de ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Quizás puedes apoyar a ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" en [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Haz clic aquí para ir al Patreon de Vazkii","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Descarga de %s completada. Borra el antiguo archivo .jar de Botania y reinicia tu juego para actualizar. botania.versioning.downloadedAlready=Ya descargaste la última versión. Cierra tu juego, borra la versión anterior de la carpeta mods e inicia el juego para actualizar. @@ -368,7 +368,7 @@ botania.versioning.disabled=Lo sentimos. Esta característica está deshabilitad botania.baubletype.amulet=Equipable en la ranura para &aamuleto&7 botania.baubletype.ring=Equipable en la ranura para &aanillo&7 botania.baubletype.belt=Equipable en la ranura para &acinturón&7 -botania.baubletooltip=Oprime la &b%key%&7 para abrir el menú de ornamentos +botania.baubletooltip=Oprime la &b%s&7 para abrir el menú de ornamentos # RELIC POEMS item.dice.poem0=Echa las cartas para encontrar respuesta, diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index a7cab9845..f36094e29 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=Vous avez besoin d'un Lexique Botania en main pour lire ce botaniamisc.cantOpen=Il ne semble pas que votre Lexique Botania ai cette page. Il provient peut-être d'une source extérieure...? botaniamisc.clickToShare=Partagez botaniamisc.drop=Jeter -botaniamisc.dropTip0=Aide: Vous pouvez appuyer %key% dans votre inventaire pour jeter -botaniamisc.dropTip1=Ctrl-%key% jetera une pile entière +botaniamisc.dropTip0=Aide: Vous pouvez appuyer %s dans votre inventaire pour jeter +botaniamisc.dropTip1=Ctrl-%s jetera une pile entière botaniamisc.wandMode.bind=Mode de liaison botaniamisc.wandMode.function=Mode de fonction botaniamisc.playVideo=Jouer la vidéo @@ -353,7 +353,7 @@ botania.versioning.flavour47=Rumour says if you move the truck there's a Botania botania.versioning.flavour48=I wonder when Bevo's updating his pack... botania.versioning.flavour49=1 Botania Update on the wall, 1 Botania Update on the wall. botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! @@ -365,7 +365,7 @@ botania.versioning.disabled=Sorry. This feature is currently disabled due to ser botania.baubletype.amulet=Équipable dans l'emplacement &aAmulet&7 botania.baubletype.ring=Équipable dans l'emplacement &aRing&7 botania.baubletype.belt=Équipable dans l'emplacement &aBelt&7 -botania.baubletooltip=Appuyez &b%key%&7 pour ouvrir le menu Baubles +botania.baubletooltip=Appuyez &b%s&7 pour ouvrir le menu Baubles # RELIC POEMS item.infiniteFruit.poem0=The fruit of the forbidden garden diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index 9c5753814..b8723bb78 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=これを読むには、ボタニア植物辞典を手に botaniamisc.cantOpen=ボタニア植物辞典にはこのページはないようです。外部ソース・・・? botaniamisc.clickToShare=共有 botaniamisc.drop=ドロップ -botaniamisc.dropTip0=Tip: %key% キーを押すとドロップ -botaniamisc.dropTip1=CTRL-%key% キーでスタックごとドロップ +botaniamisc.dropTip0=Tip: %s キーを押すとドロップ +botaniamisc.dropTip1=CTRL-%s キーでスタックごとドロップ botaniamisc.wandMode.bind=接続モード botaniamisc.wandMode.function=機能モード botaniamisc.playVideo=動画を再生 diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 4b8ce02ea..007330dca 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -61,8 +61,8 @@ botaniamisc.noLexicon=보타니아 사전을 읽기 위해서는 당신이 그 botaniamisc.cantOpen=이 페이지는 보타니아 사전의 일부가 아닌 것 같습니다. 다른곳에서 왔을 수 도...? botaniamisc.clickToShare=공유 botaniamisc.drop=떨어뜨림 -botaniamisc.dropTip0=팁: %key% 키를 누름으로써 당신의 아이템을 드롭시킬 수 있습니다 -botaniamisc.dropTip1=컨트롤-%key% 가 한 뭉을 떨어뜨릴 겁니다 +botaniamisc.dropTip0=팁: %s 키를 누름으로써 당신의 아이템을 드롭시킬 수 있습니다 +botaniamisc.dropTip1=컨트롤-%s 가 한 뭉을 떨어뜨릴 겁니다 botaniamisc.wandMode.bind=연결모드 botaniamisc.wandMode.function=기능 모드 botaniamisc.playVideo=비디오 재생 @@ -379,7 +379,7 @@ botania.versioning.disabled=Sorry. This feature is currently disabled due to ser botania.baubletype.amulet=&a아뮬렛&7 슬릇에 착용 가능 botania.baubletype.ring=&a반지&7 슬릇에 착용 가능 botania.baubletype.belt=&a벨트&7 슬릇에 착용 가능 -botania.baubletooltip=&b%key%&7로 버블즈 인벤토리를 여세요 +botania.baubletooltip=&b%s&7로 버블즈 인벤토리를 여세요 # RELIC POEMS item.dice.poem0=그는 카드를 명상을 하듯 다루지, diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index c0fba076b..2083c2109 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -62,8 +62,8 @@ botaniamisc.noLexicon=Je moet een Lexica Botania vasthouden om dit te lezen. botaniamisc.cantOpen=Het lijkt erop dat jouw Lexica Botania deze pagina niet heeft. Misschien komt hij ergens anders vandaan...? botaniamisc.clickToShare=Delen botaniamisc.drop=Laten vallen -botaniamisc.dropTip0=Tip: Druk toets %key% in je inventaris om te laten vallen -botaniamisc.dropTip1=CTRL-%key% laat een hele stapel vallen +botaniamisc.dropTip0=Tip: Druk toets %s in je inventaris om te laten vallen +botaniamisc.dropTip1=CTRL-%s laat een hele stapel vallen botaniamisc.wandMode.bind=Verbind Modus botaniamisc.wandMode.function=Functie Modus botaniamisc.playVideo=Video afspelen @@ -388,7 +388,7 @@ botania.versioning.flavour62=Er is een Botania update! botania.versioning.flavour63=Er is een Botania update! botania.versioning.flavour64=Er is een Botania update! botania.versioning.outdated=Je gebruikt Botania versie %s, de laatste versie is %s. -botania.versioning.updateMessage=["Klik voor... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Hier klikken om automatisch bij te werken naar de laatste versie","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om naar de website van de mod te gaan","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om de lijst met wijzigingen te zien","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Klik voor... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Hier klikken om automatisch bij te werken naar de laatste versie","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om naar de website van de mod te gaan","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om de lijst met wijzigingen te zien","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Begin met downloaden van %s. Koppel je hardeschijf niet af. Plezier van ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Overweeg ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" te ondersteunen op [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om naar Vazkii's Patreon te gaan","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Klaar met downloaden van %s. Verwijder de oude Botania .jar en start het spel opnieuw om bij te werken. botania.versioning.downloadedAlready=De laatste versie is al gedownload. Sluit het spel, verwijder de oude versie uit de mods folder en start het spel opnieuw om bij te werken! @@ -400,7 +400,7 @@ botania.versioning.disabled=Sorry. Deze optie is uitgeschakeld wegens server pro botania.baubletype.amulet=Te gebruiken in het &aAmulet&7 slot botania.baubletype.ring=Te gebruiken in het &aRing&7 slot botania.baubletype.belt=Te gebruiken in het &aRiem&7 slot -botania.baubletooltip=Druk &b%key%&7 om het Baubles menu te openen +botania.baubletooltip=Druk &b%s&7 om het Baubles menu te openen # RELIC POEMS item.dice.poem0=Hij deelt de kaarten om het antwoord te vinden diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 752924ae2..96aebb655 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=Você precisa do Lexica Botania em mãos para ler isso. botaniamisc.cantOpen=Parece que essa página não existe. Talvez ela seja de uma fonte externa...? botaniamisc.clickToShare=Compartilhar botaniamisc.drop=Derrubar -botaniamisc.dropTip0=Dica: Aperte %key% no inventário para derrubar -botaniamisc.dropTip1=CTRL-%key% derruba uma stack completa +botaniamisc.dropTip0=Dica: Aperte %s no inventário para derrubar +botaniamisc.dropTip1=CTRL-%s derruba uma stack completa botaniamisc.wandMode.bind=Modo de associação botaniamisc.wandMode.function=Mode funcional botaniamisc.playVideo=Mostrar vídeo @@ -416,7 +416,7 @@ botania.versioning.flavour62=Nove entre dez médicos recomendam atualizar o Bota botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=Uma nova atualização do Botania está disponível. E seu nome é JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=Você possui a versão %s, a mais recente é %s. -botania.versioning.updateMessage=["Clique para... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aqui baixará automaticamente a nova versão","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aquie levará ao site do mod","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aqui levará ao Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Clique para... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aqui baixará automaticamente a nova versão","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aquie levará ao site do mod","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Clicar aqui levará ao Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Baixando %s. Não remova seu HD. Gosta do ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Considere doar para ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" no [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Patreon de Vazkii","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Download de %s concluído. Apague o .jar antigo do Botania e reabra o jogo. botania.versioning.downloadedAlready=Você já baixou a versão recente. Feche o jogo, apague a versão antiga e reabra para poder atualizar. @@ -428,7 +428,7 @@ botania.versioning.disabled=Desculpe. Esse recurso foi desligado por problemas n botania.baubletype.amulet=Equipável no slot de &aAmuletos&7 botania.baubletype.ring=Equipável no slot de &aAnéis&7 botania.baubletype.belt=Equipável no slot de &aCintos&7 -botania.baubletooltip=Aperte &b%key%&7 para abrir o menu do Baubles +botania.baubletooltip=Aperte &b%s&7 para abrir o menu do Baubles # RELIC POEMS item.dice.poem0=Ele oferece as cartas para a resposta, diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 423e07fa2..96ceda071 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=Вы должны держать Лексику Botania в botaniamisc.cantOpen=Похоже в Вашей Лексике Botania нет этой страницы. Возможно, она появилась из постороннего источника...? botaniamisc.clickToShare=Поделиться botaniamisc.drop=Бросить -botaniamisc.dropTip0=Совет: Вы можете нажать %key% в Вашем инвентаре, чтобы выбросить -botaniamisc.dropTip1=CTRL+%key% выбросит весь стак +botaniamisc.dropTip0=Совет: Вы можете нажать %s в Вашем инвентаре, чтобы выбросить +botaniamisc.dropTip1=CTRL+%s выбросит весь стак botaniamisc.wandMode.bind=Режим привязки botaniamisc.wandMode.function=Функциональный режим botaniamisc.playVideo=Просмотреть видео @@ -355,7 +355,7 @@ botania.versioning.flavour47=Rumour says if you move the truck there's a Botania botania.versioning.flavour48=I wonder when Bevo's updating his pack... botania.versioning.flavour49=1 Botania Update on the wall, 1 Botania Update on the wall. botania.versioning.outdated=У Вас установлена %s сборка Botania, последняя сборка - %s. -botania.versioning.updateMessage=["Нажмите, чтобы... [",{"text":"загрузить","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы автоматически загрузить последнюю версию","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Веб-сайт","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти на сайт мода","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"Изменения","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти к изменениям версии","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Нажмите, чтобы... [",{"text":"загрузить","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы автоматически загрузить последнюю версию","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Веб-сайт","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти на сайт мода","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Изменения","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти к изменениям версии","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Началась загрузка %s. Пожалуйста не вытаскивайте Ваш жёсткий диск. Наслаждайтесь ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Подумайте о поддержке ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" на [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Нажмите сюда, чтобы перейти на Patreon Vazkii","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Загрузка %s закончена. Удалите старый .jar файл Botania и перезапустите игру, чтобы обновиться. botania.versioning.downloadedAlready=Вы уже загрузили последнюю версию. Выключите игру, удалите старую версию из папки "mods" и включите её снова! @@ -367,7 +367,7 @@ botania.versioning.disabled=Извините, но данная функция botania.baubletype.amulet=Можно надеть в слот &aАмулета&7 botania.baubletype.ring=Можно надеть в слот &aКольца&7 botania.baubletype.belt=Можно надеть в слот &aРемня&7 -botania.baubletooltip=Нажмите &b%key%&7, чтобы открыть меню Baubles +botania.baubletooltip=Нажмите &b%s&7, чтобы открыть меню Baubles # RELIC POEMS item.dice.poem0=Он сдает карты , чтобы найти ответ, diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index ca11b5754..b0891f62a 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=你需要有植物魔法辞典才能阅读它. botaniamisc.cantOpen=你的书里似乎没有这一页.或许它是从书外而来的...? botaniamisc.clickToShare=分享 botaniamisc.drop=扔出 -botaniamisc.dropTip0=提示:你在物品栏内可以按下%key%键来扔出物品 -botaniamisc.dropTip1=CTRL加%key%键扔出一整组 +botaniamisc.dropTip0=提示:你在物品栏内可以按下%s键来扔出物品 +botaniamisc.dropTip1=CTRL加%s键扔出一整组 botaniamisc.wandMode.bind=绑定模式 botaniamisc.wandMode.function=工作模式 botaniamisc.playVideo=播放视频 @@ -416,7 +416,7 @@ botania.versioning.flavour62=90%的医生会推荐你更新植物魔法. botania.versioning.flavour63=本次更新承诺在午夜。 botania.versioning.flavour64=本次的植魔更新已经过时. 而他的名字是JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=你所使用的植物魔法版本为%s,最新版本为%s. -botania.versioning.updateMessage=["点击这里... [",{"text":"下载","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此自动下载最新版本","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"网站","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此浏览该mod的网站","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"更新日志","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此查看该版本的更新日志","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["点击这里... [",{"text":"下载","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此自动下载最新版本","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"网站","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此浏览该mod的网站","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"更新日志","color":"green","hoverEvent":{"action":"show_text","value":{"text":"点此查看该版本的更新日志","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"开始下载%s.请勿移除你的硬盘.祝你玩得开心 ","color":"aqua"},{"text":"植物魔法","color":"green"},{"text":"?是否考虑赞助","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"赞助","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"点此进入Vazkii的赞助界面","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=已完成下载%s.请删除旧的Botania .jar并且重启游戏以加载新版本. botania.versioning.downloadedAlready=你已下载最新版本.关闭你的游戏,从你的mods文件夹中删除就版本的mod文件,并且重启游戏以加载新版本! @@ -428,7 +428,7 @@ botania.versioning.disabled=抱歉,自动升级由于服务器主机的原因已 botania.baubletype.amulet=装备在&a项链&7栏 botania.baubletype.ring=装备在&a戒指&7栏 botania.baubletype.belt=装备在&a腰带&7栏 -botania.baubletooltip=按&b%key%&7键打开饰品菜单 +botania.baubletooltip=按&b%s&7键打开饰品菜单 # RELIC POEMS item.dice.poem0=他发牌,以寻找答案, diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index af29f8c26..d890f10f9 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -60,8 +60,8 @@ botaniamisc.noLexicon=你需要有植物魔法辭典才能閱讀它. botaniamisc.cantOpen=你的書裡似乎沒有這一頁.或許它是從其他地方來的...? botaniamisc.clickToShare=分享 botaniamisc.drop=扔出 -botaniamisc.dropTip0=提示:你在物品欄內可以按下%key%鍵來扔出物品 -botaniamisc.dropTip1=CTRL加%key%鍵扔出一整組 +botaniamisc.dropTip0=提示:你在物品欄內可以按下%s鍵來扔出物品 +botaniamisc.dropTip1=CTRL加%s鍵扔出一整組 botaniamisc.wandMode.bind=綁定模式 botaniamisc.wandMode.function=工作模式 botaniamisc.playVideo=播放視頻 @@ -416,7 +416,7 @@ botania.versioning.flavour62=90%的醫生會推薦你更新植物魔法. botania.versioning.flavour63=本次更新承諾在午夜。 botania.versioning.flavour64=本次的植魔更新已經過時. 而他的名字是JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=你所使用的植物魔法版本為%s,最新版本為%s. -botania.versioning.updateMessage=["點擊這裡... [",{"text":"下載","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此自動下載最新版本","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"網站","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此流覽該mod的網站","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/downloads.php"}},"] [",{"text":"更新日誌","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此查看該版本的更新日誌","color":"green"}},"clickEvent":{"action":"open_url","value":"http://vazkii.us/mod/Botania/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["點擊這裡... [",{"text":"下載","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此自動下載最新版本","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"網站","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此流覽該mod的網站","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"更新日誌","color":"green","hoverEvent":{"action":"show_text","value":{"text":"點此查看該版本的更新日誌","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"開始下載%s.請勿移除你的硬碟.祝你玩得開心 ","color":"aqua"},{"text":"植物魔法","color":"green"},{"text":"?是否考慮贊助","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"贊助","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"點此進入Vazkii的贊助界面","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=已完成下載%s.請刪除舊的Botania .jar並且重啟遊戲以加載新版本. botania.versioning.downloadedAlready=你已下載最新版本.關閉你的遊戲,從你的mods文件夾中刪除舊版本的mod文件,並且重啟遊戲以加載新版本! @@ -428,7 +428,7 @@ botania.versioning.disabled=抱歉,自動升級由於伺服器主機的原因已 botania.baubletype.amulet=裝備在&a項鏈&7欄 botania.baubletype.ring=裝備在&a戒指&7欄 botania.baubletype.belt=裝備在&a腰帶&7欄 -botania.baubletooltip=按&b%key%&7鍵打開飾品菜單 +botania.baubletooltip=按&b%s&7鍵打開飾品菜單 # RELIC POEMS item.dice.poem0=他發牌,以尋找答案, From 7f759c1b8848cad2be04594555e1a2bae8ccd255 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 May 2016 21:16:18 -0500 Subject: [PATCH 630/935] Fix ender air bottle being underpowered --- .../common/entity/EntityEnderAirBottle.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 0b6de8310..e11e5467e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -22,7 +22,9 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; public class EntityEnderAirBottle extends EntityThrowable { @@ -36,9 +38,9 @@ public class EntityEnderAirBottle extends EntityThrowable { @Override protected void onImpact(@Nonnull RayTraceResult pos) { - if(pos.entityHit == null && !worldObj.isRemote) { + if(pos.getBlockPos() != null && !worldObj.isRemote) { List coordsList = getCoordsToPut(pos.getBlockPos()); - worldObj.playEvent(2002, new BlockPos((int)Math.round(posX), (int)Math.round(posY), (int)Math.round(posZ)), 8); + worldObj.playEvent(2002, new BlockPos(this), 8); for(BlockPos coords : coordsList) { worldObj.setBlockState(coords, Blocks.END_STONE.getDefaultState()); @@ -49,27 +51,21 @@ public class EntityEnderAirBottle extends EntityThrowable { } } - public List getCoordsToPut(BlockPos pos) { + private List getCoordsToPut(BlockPos pos) { List possibleCoords = new ArrayList<>(); - List selectedCoords = new ArrayList<>(); int range = 4; int rangeY = 4; for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { - IBlockState state = worldObj.getBlockState(pos); + IBlockState state = worldObj.getBlockState(bPos); Block block = state.getBlock(); - if(block != null && block.isReplaceableOreGen(state, worldObj, pos, BlockStateMatcher.forBlock(Blocks.STONE))) - possibleCoords.add(pos); + if(block.isReplaceableOreGen(state, worldObj, bPos, BlockStateMatcher.forBlock(Blocks.STONE))) + possibleCoords.add(bPos); } - int count = 64; - while(!possibleCoords.isEmpty() && count > 0) { - BlockPos coords = possibleCoords.get(worldObj.rand.nextInt(possibleCoords.size())); - possibleCoords.remove(coords); - selectedCoords.add(coords); - count--; - } - return selectedCoords; + Collections.shuffle(possibleCoords, rand); + + return possibleCoords.stream().limit(64).collect(Collectors.toList()); } } From e3e6f8996f6281fd7c8165c77dbce05228f7324a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 May 2016 23:08:53 -0500 Subject: [PATCH 631/935] Cleanup --- .../vazkii/botania/api/boss/IBotaniaBoss.java | 2 - .../botania/api/corporea/CorporeaRequest.java | 4 +- .../api/internal/DummyMethodHandler.java | 1 - .../api/internal/IInternalMethodHandler.java | 1 - .../api/internal/VanillaPacketDispatcher.java | 1 - .../botania/api/item/IFloatingFlower.java | 2 +- .../botania/api/lexicon/LexiconEntry.java | 4 +- .../api/lexicon/LexiconRecipeMappings.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 6 +- .../component/MultiblockComponent.java | 2 +- .../botania/api/mana/ManaItemHandler.java | 2 +- .../client/challenge/EnumChallengeLevel.java | 2 +- .../client/core/handler/BossBarHandler.java | 1 - .../handler/CorporeaAutoCompleteHandler.java | 6 +- .../client/core/handler/HUDHandler.java | 1 - .../handler/ItemsRemainingRenderHandler.java | 4 +- .../client/core/handler/LightningHandler.java | 41 ++++++------ .../core/handler/MiscellaneousIcons.java | 2 +- .../client/core/handler/ModelHandler.java | 3 - .../core/handler/MultiblockRenderHandler.java | 2 +- .../client/core/handler/RenderLexicon.java | 10 +-- .../client/core/helper/ShaderHelper.java | 2 +- .../vazkii/botania/client/fx/FXSparkle.java | 11 ++-- .../java/vazkii/botania/client/fx/FXWisp.java | 8 +-- .../client/gui/bag/ContainerFlowerBag.java | 2 +- .../client/gui/bag/InventoryFlowerBag.java | 4 +- .../botania/client/gui/bag/SlotFlower.java | 4 +- .../client/gui/box/ContainerBaubleBox.java | 4 +- .../client/gui/box/InventoryBaubleBox.java | 4 +- .../botania/client/gui/box/SlotAnyBauble.java | 2 +- .../client/gui/lexicon/GuiLexicon.java | 6 +- .../client/gui/lexicon/GuiLexiconIndex.java | 6 +- .../gui/lexicon/button/GuiButtonBookmark.java | 2 +- .../gui/lexicon/button/GuiButtonCategory.java | 8 +-- .../button/GuiButtonChallengeIcon.java | 2 +- .../button/GuiButtonChallengeInfo.java | 2 +- .../gui/lexicon/button/GuiButtonHistory.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 2 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonPage.java | 2 +- .../integration/jei/JEIBotaniaPlugin.java | 1 - .../botania/client/model/ModelAvatar.java | 12 ++-- .../botania/client/model/ModelBellows.java | 14 ++-- .../client/model/ModelBlackHoleCube.java | 24 +++---- .../botania/client/model/ModelBrewery.java | 8 +-- .../client/model/ModelCrystalCube.java | 6 +- .../botania/client/model/ModelHourglass.java | 14 ++-- .../botania/client/model/ModelPixie.java | 6 +- .../botania/client/model/ModelPylonOld.java | 32 ++++----- .../client/model/ModelSpinningCubes.java | 2 +- .../botania/client/model/ModelSpreader.java | 20 +++--- .../client/model/ModelTeruTeruBozu.java | 8 +-- .../botania/client/model/ModelTinyPotato.java | 2 +- .../model/armor/ModelArmorElementium.java | 60 ++++++++--------- .../model/armor/ModelArmorManasteel.java | 38 +++++------ .../model/armor/ModelArmorManaweave.java | 40 +++++------ .../model/armor/ModelArmorTerrasteel.java | 66 +++++++++---------- .../render/entity/RenderDoppleganger.java | 1 - .../render/entity/RenderPinkWither.java | 3 - .../client/render/entity/RenderPixie.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 2 - .../render/tile/RenderTileCorporeaIndex.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 1 - .../render/tile/RenderTileHourglass.java | 4 +- .../client/render/tile/RenderTilePool.java | 1 - .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileStarfield.java | 4 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../botania/common/block/BlockCamo.java | 6 -- .../botania/common/block/BlockForestEye.java | 2 +- .../botania/common/block/BlockOpenCrate.java | 2 +- .../botania/common/block/ModFluffBlocks.java | 18 ++--- .../common/block/decor/BlockReeds.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../block/decor/slabs/Block18StoneSlab.java | 2 +- .../decor/slabs/BlockBiomeStoneSlab.java | 2 +- .../block/decor/slabs/BlockLivingSlab.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 7 +- .../block/decor/slabs/BlockPavementSlab.java | 2 +- .../block/dispenser/BehaviourSeeds.java | 2 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 4 -- .../functional/SubTileJadedAmaranthus.java | 2 +- .../subtile/functional/SubTileOrechid.java | 2 +- .../functional/SubTileRannuncarpus.java | 2 - .../subtile/functional/SubTileSolegnolia.java | 1 - .../functional/SubTileSpectranthemum.java | 1 - .../subtile/generating/SubTileNightshade.java | 5 -- .../common/block/tile/TileAlfPortal.java | 19 +++--- .../botania/common/block/tile/TileCocoon.java | 4 +- .../common/block/tile/TileEnchanter.java | 2 +- .../botania/common/block/tile/TileMod.java | 1 - .../common/block/tile/TilePlatform.java | 1 - .../common/block/tile/TileTinyPlanet.java | 1 - .../corporea/TileCorporeaCrystalCube.java | 1 - .../common/block/tile/mana/TileBellows.java | 16 ++--- .../block/tile/mana/TileDistributor.java | 2 +- .../block/tile/mana/TileManaDetector.java | 1 - .../common/block/tile/mana/TilePool.java | 3 +- .../common/block/tile/mana/TilePrism.java | 1 - .../block/tile/mana/TileRFGenerator.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 9 ++- .../common/core/handler/ConfigHandler.java | 4 +- .../core/handler/InternalMethodHandler.java | 1 - .../common/core/helper/InventoryHelper.java | 4 +- .../core/version/ThreadDownloadMod.java | 2 +- .../common/core/version/VersionChecker.java | 1 - .../recipe/ShapelessManaUpgradeRecipe.java | 2 - .../common/entity/EntityDoppleganger.java | 2 +- .../common/entity/EntityEnderAirBottle.java | 2 +- .../common/entity/EntityFlyingCreature.java | 2 - .../common/entity/EntityManaBurst.java | 4 +- .../common/entity/EntitySignalFlare.java | 1 - .../botania/common/entity/EntitySpark.java | 5 +- .../common/entity/EntityThrowableCopy.java | 2 +- .../common/entity/EntityThrownItem.java | 18 +++-- .../buildcraft/TriggerManaLevel.java | 2 +- .../coloredlights/ColoredLightHelper.java | 6 +- .../corporea/WrappedIInventory.java | 2 +- .../corporea/WrappedStorageDrawers.java | 2 +- .../botania/common/item/ItemCacophonium.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 4 +- .../botania/common/item/ItemLaputaShard.java | 1 - .../botania/common/item/ItemManaGun.java | 2 +- .../botania/common/item/ItemTwigWand.java | 2 +- .../vazkii/botania/common/item/ItemVirus.java | 1 - .../common/item/brew/ItemBrewBase.java | 10 +-- .../armor/manasteel/ItemManasteelArmor.java | 2 +- .../equipment/bauble/ItemBaubleModifier.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../item/equipment/bauble/ItemItemFinder.java | 5 -- .../item/equipment/bauble/ItemMagnetRing.java | 6 +- .../item/equipment/tool/ToolCommons.java | 6 +- .../tool/elementium/ItemElementiumShovel.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 15 ++--- .../botania/common/item/lens/ItemLens.java | 7 +- .../botania/common/item/relic/ItemDice.java | 2 - .../common/item/relic/ItemLokiRing.java | 5 +- .../common/item/relic/ItemOdinRing.java | 4 +- .../common/item/relic/ItemRelicBauble.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 3 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 2 +- .../botania/common/lexicon/CLexiconEntry.java | 2 +- .../botania/common/lexicon/RLexiconEntry.java | 2 +- .../botania/common/lexicon/page/PageBrew.java | 2 +- .../lexicon/page/PageCraftingRecipe.java | 2 +- .../common/lexicon/page/PageElvenRecipe.java | 2 +- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageImage.java | 2 +- .../lexicon/page/PageManaInfusionRecipe.java | 2 +- .../common/lexicon/page/PageMultiblock.java | 4 +- .../common/lexicon/page/PagePetalRecipe.java | 2 +- .../common/lexicon/page/PageShedding.java | 3 +- .../botania/common/lexicon/page/PageText.java | 2 +- .../botania/common/network/PacketHandler.java | 2 - 158 files changed, 393 insertions(+), 477 deletions(-) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index c8b6bee65..5ba3b5f87 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -11,9 +11,7 @@ package vazkii.botania.api.boss; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.ShaderCallback; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java index b1156e584..576062879 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaRequest.java @@ -10,8 +10,8 @@ package vazkii.botania.api.corporea; public class CorporeaRequest { - public Object matcher; - public boolean checkNBT; + public final Object matcher; + public final boolean checkNBT; public int count; public int foundItems = 0; public int extractedItems = 0; diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 79dd25db3..48ab9be15 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandlerModifiable; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 6224b7f5b..a28793a87 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -26,7 +26,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index a9aa22a9b..3c7992ea9 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -13,7 +13,6 @@ 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.PlayerChunkMapEntry; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index 66810c502..b685b8c92 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -23,7 +23,7 @@ public interface IFloatingFlower { public void setIslandType(IslandType type); public class IslandType { - private static HashMap registry = new HashMap<>(); + private static final HashMap registry = new HashMap<>(); public static final IslandType GRASS = new IslandType("GRASS"); public static final IslandType PODZOL = new IslandType("PODZOL"); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 4d973c9ef..22ad55673 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -28,11 +28,11 @@ public class LexiconEntry implements Comparable { private KnowledgeType type = BotaniaAPI.basicKnowledge; - public List pages = new ArrayList<>(); + public final List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; - private List extraDisplayedRecipes = new ArrayList<>(); + private final List extraDisplayedRecipes = new ArrayList<>(); /** * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 4f525effe..b955cbab6 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -23,7 +23,7 @@ import java.util.Map; */ public final class LexiconRecipeMappings { - private static Map mappings = new HashMap<>(); + private static final Map mappings = new HashMap<>(); /** * Maps the given stack to the given page of the entry. diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index dad7dd155..b37bc101d 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -29,14 +29,14 @@ import java.util.Map; */ public class Multiblock { - public List components = new ArrayList<>(); - public List materials = new ArrayList<>(); + public final List components = new ArrayList<>(); + public final List materials = new ArrayList<>(); public BlockPos minPos = BlockPos.ORIGIN; public BlockPos maxPos = BlockPos.ORIGIN; public BlockPos offPos = BlockPos.ORIGIN; - public HashMap locationCache = new HashMap<>(); + public final HashMap locationCache = new HashMap<>(); /** * Adds a multiblock component to this multiblock. The component's x y z diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 4494bb41c..43859286c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -27,7 +27,7 @@ public class MultiblockComponent { protected BlockPos relPos; protected final IBlockState state; protected final TileEntity tileEntity; - private boolean doFancyRender; + private final boolean doFancyRender; public MultiblockComponent(BlockPos relPos, IBlockState state) { this(relPos, state, null); diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index d261d5503..6ac31a878 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -145,7 +145,7 @@ public final class ManaItemHandler { if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) continue; - int received = 0; + int received; if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot)) received = manaToSend; else received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot)); diff --git a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java index 8abb8ca4a..5fe690ac9 100644 --- a/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java +++ b/src/main/java/vazkii/botania/client/challenge/EnumChallengeLevel.java @@ -17,7 +17,7 @@ public enum EnumChallengeLevel { HARD("botania.challengelevel.hard"), LUNATIC("botania.challengelevel.lunatic"); - String name; + final String name; private EnumChallengeLevel(String name) { this.name = name; diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index af05aaff5..008b20a7d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -25,7 +25,6 @@ import vazkii.botania.client.lib.LibResources; import java.awt.*; import java.util.Collections; -import java.util.HashSet; import java.util.Set; import java.util.UUID; import java.util.WeakHashMap; diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 7555b313f..dd1a091e6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -40,7 +40,7 @@ public class CorporeaAutoCompleteHandler { private List completions = new ArrayList<>(); private int position; - static TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); + static final TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); private boolean tabLastTick = false; @@ -165,8 +165,8 @@ public class CorporeaAutoCompleteHandler { private static class CompletionData implements Comparable { - private String string; - private int prefixLength; + private final String string; + private final int prefixLength; public CompletionData(String string, int prefixLength) { this.string = string; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index a2465c24f..0117408bb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -37,7 +37,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 74521d8ee..0a76127c5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -25,8 +25,8 @@ import java.util.regex.Pattern; public final class ItemsRemainingRenderHandler { - private static int maxTicks = 30; - private static int leaveTicks = 20; + private static final int maxTicks = 30; + private static final int leaveTicks = 20; private static ItemStack stack; private static int ticks, count; diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 3f23d3ef2..05280e804 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -38,7 +38,6 @@ import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.Iterator; import java.util.Random; import java.util.concurrent.ConcurrentLinkedQueue; @@ -115,7 +114,7 @@ public class LightningHandler { private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) { ParticleRenderDispatcher.lightningCount++; float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; - float mainalpha = 1; + float mainalpha; if(pass == 0) mainalpha = (1 - boltage) * 0.4F; else mainalpha = 1 - boltage * 0.5F; @@ -173,24 +172,24 @@ public class LightningHandler { public static class LightningBolt { public ArrayList segments = new ArrayList<>(); - public Vector3 start; - public Vector3 end; + public final Vector3 start; + public final Vector3 end; BlockPos target; - TIntIntHashMap splitparents = new TIntIntHashMap(); + final TIntIntHashMap splitparents = new TIntIntHashMap(); - public double length; + public final double length; public int numsegments0; private int numsplits; private boolean finalized; - private Random rand; - public long seed; + private final Random rand; + public final long seed; public int particleAge; - public int particleMaxAge; + public final int particleMaxAge; public boolean isDead; private AxisAlignedBB boundingBox; - private World world; + private final World world; private Entity source; public static final ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); @@ -201,8 +200,8 @@ public class LightningHandler { public static int playerdamage = 1; public static int entitydamage = 1; - public int colorOuter; - public int colorInner; + public final int colorOuter; + public final int colorInner; public static class BoltPoint { @@ -212,9 +211,9 @@ public class LightningHandler { this.offsetvec = offsetvec; } - public Vector3 point; - Vector3 basepoint; - Vector3 offsetvec; + public final Vector3 point; + final Vector3 basepoint; + final Vector3 offsetvec; } private static final Comparator SEGMENT_SORTER = (o1, o2) -> { @@ -274,8 +273,8 @@ public class LightningHandler { return startpoint.point.toString() + " " + endpoint.point.toString(); } - public BoltPoint startpoint; - public BoltPoint endpoint; + public final BoltPoint startpoint; + public final BoltPoint endpoint; public Vector3 diff; @@ -287,10 +286,10 @@ public class LightningHandler { public float sinprev; public float sinnext; - public float light; + public final float light; - public int segmentno; - public int splitno; + public final int segmentno; + public final int splitno; } public LightningBolt(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { @@ -338,7 +337,7 @@ public class LightningHandler { ArrayList oldsegments = segments; segments = new ArrayList<>(); - Segment prev = null; + Segment prev; for(Segment segment : oldsegments) { prev = segment.prev; 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 78660b1e4..1ceb73974 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -63,7 +63,7 @@ public class MiscellaneousIcons { public TextureAtlasSprite[] sparkUpgradeIcons; public TextureAtlasSprite[] kingKeyWeaponIcons; - public Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); public TextureAtlasSprite[] tiaraWingIcons; // begin dank_memes 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 4c9d32f92..e841f47d6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -16,11 +16,9 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -52,7 +50,6 @@ import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; 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 3fc22e535..4739d80b6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,7 +40,7 @@ import vazkii.botania.common.block.ModBlocks; public final class MultiblockRenderHandler { - private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); + private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); private static int dimension; public static boolean rendering = false; diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 7476cc099..b381c73a1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -30,12 +30,12 @@ import vazkii.botania.common.item.ModItems; // Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { - ModelBook model = new ModelBook(); - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + final ModelBook model = new ModelBook(); + final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); @SubscribeEvent public void renderItem(RenderHandEvent evt) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc; if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) return; evt.setCanceled(true); @@ -127,8 +127,8 @@ public class RenderLexicon { private void doRender() { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(texture); - float opening = 0F; - float pageFlip = 0F; + float opening; + float pageFlip; float ticks = ClientTickHandler.ticksWithLexicaOpen; if(ticks > 0 && ticks < 10) { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index ec768f65c..845211ec2 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -92,7 +92,7 @@ public final class ShaderHelper { // http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL private static int createProgram(String vert, String frag) { - int vertId = 0, fragId = 0, program = 0; + int vertId = 0, fragId = 0, program; if(vert != null) vertId = createShader(vert, VERT); if(frag != null) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index d5feac72b..aa83edf12 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -36,8 +36,8 @@ public class FXSparkle extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - private static Queue queuedRenders = new ArrayDeque<>(); - private static Queue queuedCorruptRenders = new ArrayDeque<>(); + private static final Queue queuedRenders = new ArrayDeque<>(); + private static final Queue queuedCorruptRenders = new ArrayDeque<>(); // Queue values private float f; @@ -212,7 +212,6 @@ public class FXSparkle extends Particle { } if (var21 && 1.0D - var14 < var23) { - var23 = 1.0D - var14; var22 = 5; } @@ -256,9 +255,9 @@ public class FXSparkle extends Particle { public boolean corrupt = false; public boolean fake = false; private int multiplier = 2; - private boolean shrink = true; - public int particle = 16; + private final boolean shrink = true; + public final int particle = 16; public boolean tinkle = false; - public boolean slowdown = true; + public final boolean slowdown = true; public int currentColor = 0; } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index b92693866..a9ae72ac2 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -34,8 +34,8 @@ public class FXWisp extends Particle { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); - private static Queue queuedRenders = new ArrayDeque<>(); - private static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); + private static final Queue queuedRenders = new ArrayDeque<>(); + private static final Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); // Queue values private float f; @@ -171,8 +171,8 @@ public class FXWisp extends Particle { private boolean depthTest = true; public boolean distanceLimit = true; - private float moteParticleScale; - private int moteHalfLife; + private final float moteParticleScale; + private final int moteHalfLife; public boolean tinkle = false; public int blendmode = 1; } diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index a986d1044..31e7ef8a4 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -21,7 +21,7 @@ import javax.annotation.Nonnull; public class ContainerFlowerBag extends Container { - InventoryFlowerBag flowerBagInv; + final InventoryFlowerBag flowerBagInv; public ContainerFlowerBag(EntityPlayer player) { int i; diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index 744ae6f59..f9cab4634 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -26,8 +26,8 @@ public class InventoryFlowerBag implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - EntityPlayer player; - int slot; + final EntityPlayer player; + final int slot; ItemStack[] stacks = null; boolean invPushed = false; diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java index ba4c32378..bb40c5c6c 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java +++ b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java @@ -17,8 +17,8 @@ import vazkii.botania.common.block.ModBlocks; public class SlotFlower extends Slot { - InventoryFlowerBag inv; - int color; + final InventoryFlowerBag inv; + final int color; public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) { super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 0cb1ddfbe..e97204586 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -27,8 +27,8 @@ import javax.annotation.Nonnull; public class ContainerBaubleBox extends Container { - InventoryBaubleBox baubleBoxInv; - InventoryBaubles baubles; + final InventoryBaubleBox baubleBoxInv; + final InventoryBaubles baubles; public ContainerBaubleBox(EntityPlayer player) { int i; diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 4a141a872..85539162f 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -26,8 +26,8 @@ public class InventoryBaubleBox implements IInventory { private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - EntityPlayer player; - int slot; + final EntityPlayer player; + final int slot; ItemStack[] stacks = null; boolean invPushed = false; diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java index 1999311b5..c721ea054 100644 --- a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java +++ b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java @@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaItem; public class SlotAnyBauble extends Slot { - InventoryBaubleBox inv; + final InventoryBaubleBox inv; public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index b9c3ac3a3..5e0d32170 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -110,8 +110,8 @@ public class GuiLexicon extends GuiScreen { List allCategories; String title; - int guiWidth = 146; - int guiHeight = 180; + final int guiWidth = 146; + final int guiHeight = 180; int left, top; @Override @@ -155,7 +155,7 @@ public class GuiLexicon extends GuiScreen { } else if(isCategoryIndex()) { int categories = allCategories.size(); for(int i = 0; i < categories + 1; i++) { - LexiconCategory category = null; + LexiconCategory category; category = i >= categories ? null : allCategories.get(i); int perline = 5; int x = i % perline; 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 78e0e9137..ea6a12b83 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -54,7 +54,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { LexiconEntry currentEntry; float infoTime; - List entriesToDisplay = new ArrayList<>(); + final List entriesToDisplay = new ArrayList<>(); public GuiLexiconIndex() { parent = new GuiLexicon(); @@ -206,8 +206,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { infoTime = Math.max(0, infoTime - timeDelta); if(currentButton != null && infoTime == 0) { - int x = par1 + 10; - int y = par2; + int x; + int y; x = currentButton.xPosition - 20; y = currentButton.yPosition; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 434dcb2b4..cd68ef3ee 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -12,7 +12,7 @@ import java.util.List; public class GuiButtonBookmark extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonBookmark(int par1, int par2, int par3, GuiLexicon gui, String str) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index c3719e801..2bbf672f0 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -36,13 +36,13 @@ public class GuiButtonCategory extends GuiButtonLexicon { private static boolean boundStencil = false; - GuiLexicon gui; - private LexiconCategory category; + final GuiLexicon gui; + private final LexiconCategory category; private ResourceLocation resource = null; private float ticksHovered = 0F; - private float time = 12F; + private final float time = 12F; - private ShaderCallback shaderCallback = shader -> { + private final ShaderCallback shaderCallback = shader -> { TextureManager r = Minecraft.getMinecraft().renderEngine; int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch"); int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image"); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index 145ebb69a..ae2633e65 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -23,7 +23,7 @@ import java.util.List; public class GuiButtonChallengeIcon extends GuiButtonLexicon { - public Challenge challenge; + public final Challenge challenge; public GuiButtonChallengeIcon(int id, int x, int y, Challenge challenge) { super(id, x, y, 16, 16, ""); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index ecabe2f4d..ffbbc1176 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -21,7 +21,7 @@ import java.util.List; public class GuiButtonChallengeInfo extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonChallengeInfo(int par1, int par2, int par3, String str, GuiLexicon gui) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 7dc3c1972..ff9d0fb54 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -22,7 +22,7 @@ import java.util.List; public class GuiButtonHistory extends GuiButtonLexicon { - GuiLexicon gui; + final GuiLexicon gui; public GuiButtonHistory(int par1, int par2, int par3, String str, GuiLexicon gui) { super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 69be381b5..156174922 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -30,7 +30,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); - GuiLexiconIndex gui; + final GuiLexiconIndex gui; public ItemStack displayStack = null; public boolean dog = false; float timeHover = 0; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 058404dec..f4ff7e83d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -23,7 +23,7 @@ import java.util.List; public class GuiButtonNotes extends GuiButtonLexicon { - GuiLexicon parent; + final GuiLexicon parent; public GuiButtonNotes(GuiLexicon parent, int id, int x, int y) { super(id, x, y, 11, 11, ""); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 2957d2f65..85b06bf25 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -21,7 +21,7 @@ import java.util.Collections; public class GuiButtonPage extends GuiButtonLexicon { - boolean right; + final boolean right; public GuiButtonPage(int par1, int par2, int par3, boolean right) { super(par1, par2, par3, 18, 10, ""); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index c1a62ff2c..cc6c64b00 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -33,7 +33,6 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index 934471b34..a3805d704 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -15,12 +15,12 @@ import net.minecraft.client.model.ModelRenderer; public class ModelAvatar extends ModelBase { - public ModelRenderer body; - public ModelRenderer rightarm; - public ModelRenderer leftarm; - public ModelRenderer rightleg; - public ModelRenderer leftleg; - public ModelRenderer head; + public final ModelRenderer body; + public final ModelRenderer rightarm; + public final ModelRenderer leftarm; + public final ModelRenderer rightleg; + public final ModelRenderer leftleg; + public final ModelRenderer head; public ModelAvatar() { textureWidth = 32; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index dcc3d67d2..528518b05 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -16,13 +16,13 @@ import net.minecraft.client.renderer.GlStateManager; public class ModelBellows extends ModelBase { - ModelRenderer Base; - ModelRenderer Top; - ModelRenderer Funnel; - ModelRenderer Pipe; - ModelRenderer Handle1; - ModelRenderer Handle2; - ModelRenderer Handle3; + final ModelRenderer Base; + final ModelRenderer Top; + final ModelRenderer Funnel; + final ModelRenderer Pipe; + final ModelRenderer Handle1; + final ModelRenderer Handle2; + final ModelRenderer Handle3; public ModelBellows() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java index 1c770b3b3..56ff033e7 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java @@ -15,18 +15,18 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelBlackHoleCube extends ModelBase { - public ModelRenderer shape1; - public ModelRenderer shape1_1; - public ModelRenderer shape1_2; - public ModelRenderer shape1_3; - public ModelRenderer shape1_4; - public ModelRenderer shape1_5; - public ModelRenderer shape1_6; - public ModelRenderer shape1_7; - public ModelRenderer shape1_8; - public ModelRenderer shape1_9; - public ModelRenderer shape1_10; - public ModelRenderer shape1_11; + public final ModelRenderer shape1; + public final ModelRenderer shape1_1; + public final ModelRenderer shape1_2; + public final ModelRenderer shape1_3; + public final ModelRenderer shape1_4; + public final ModelRenderer shape1_5; + public final ModelRenderer shape1_6; + public final ModelRenderer shape1_7; + public final ModelRenderer shape1_8; + public final ModelRenderer shape1_9; + public final ModelRenderer shape1_10; + public final ModelRenderer shape1_11; public ModelBlackHoleCube() { textureWidth = 36; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index d43d1fc62..5dfd81659 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -17,10 +17,10 @@ import vazkii.botania.client.render.tile.RenderTileBrewery; public class ModelBrewery extends ModelBase { - ModelRenderer Pole; - ModelRenderer Top; - ModelRenderer Bottom; - ModelRenderer Plate; + final ModelRenderer Pole; + final ModelRenderer Top; + final ModelRenderer Bottom; + final ModelRenderer Plate; public ModelBrewery() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java index 80addf965..d2d1c582e 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java +++ b/src/main/java/vazkii/botania/client/model/ModelCrystalCube.java @@ -14,9 +14,9 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelCrystalCube extends ModelBase { - public ModelRenderer cube; - public ModelRenderer base1; - public ModelRenderer base2; + public final ModelRenderer cube; + public final ModelRenderer base1; + public final ModelRenderer base2; public ModelCrystalCube() { textureWidth = 48; diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index c51b5bc13..d9c902261 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -19,13 +19,13 @@ import java.awt.*; public class ModelHourglass extends ModelBase { - public ModelRenderer ring; - public ModelRenderer base1; - public ModelRenderer base2; - public ModelRenderer glass1; - public ModelRenderer sand1; - public ModelRenderer glass2; - public ModelRenderer sand2; + public final ModelRenderer ring; + public final ModelRenderer base1; + public final ModelRenderer base2; + public final ModelRenderer glass1; + public final ModelRenderer sand1; + public final ModelRenderer glass2; + public final ModelRenderer sand2; public ModelHourglass() { textureWidth = 48; diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 36bfe0277..a4d2ddde4 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -17,9 +17,9 @@ import net.minecraft.util.math.MathHelper; public class ModelPixie extends ModelBase { - ModelRenderer Body; - ModelRenderer LeftWing; - ModelRenderer RightWing; + final ModelRenderer Body; + final ModelRenderer LeftWing; + final ModelRenderer RightWing; public ModelPixie() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index a6e664923..3c55c446e 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -16,22 +16,22 @@ import vazkii.botania.api.state.enums.PylonVariant; public class ModelPylonOld extends ModelBase implements IPylonModel { - ModelRenderer crystal1; - ModelRenderer crystal2; - ModelRenderer crystal3; - ModelRenderer crystal4; - ModelRenderer crystal5; - ModelRenderer crystal6; - ModelRenderer crystal7; - ModelRenderer crystal8; - ModelRenderer outside1; - ModelRenderer outside2; - ModelRenderer outside3; - ModelRenderer outside4; - ModelRenderer outside5; - ModelRenderer outside6; - ModelRenderer outside7; - ModelRenderer outside8; + final ModelRenderer crystal1; + final ModelRenderer crystal2; + final ModelRenderer crystal3; + final ModelRenderer crystal4; + final ModelRenderer crystal5; + final ModelRenderer crystal6; + final ModelRenderer crystal7; + final ModelRenderer crystal8; + final ModelRenderer outside1; + final ModelRenderer outside2; + final ModelRenderer outside3; + final ModelRenderer outside4; + final ModelRenderer outside5; + final ModelRenderer outside6; + final ModelRenderer outside7; + final ModelRenderer outside8; public ModelPylonOld() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 2a68fef4a..0fa96db73 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -19,7 +19,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; public class ModelSpinningCubes extends ModelBase { - ModelRenderer spinningCube; + final ModelRenderer spinningCube; public ModelSpinningCubes() { spinningCube = new ModelRenderer(this, 42, 0); diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index f0f2161db..dc52e7f91 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -15,16 +15,16 @@ import net.minecraft.client.model.ModelRenderer; public class ModelSpreader extends ModelBase { - ModelRenderer cubeSide1; - ModelRenderer cubeSide2; - ModelRenderer cubeSide3; - ModelRenderer cubeSide4; - ModelRenderer cubeSide5; - ModelRenderer cubeHole1; - ModelRenderer cubeHole2; - ModelRenderer cubeHole3; - ModelRenderer cubeHole4; - ModelRenderer cubeInside; + final ModelRenderer cubeSide1; + final ModelRenderer cubeSide2; + final ModelRenderer cubeSide3; + final ModelRenderer cubeSide4; + final ModelRenderer cubeSide5; + final ModelRenderer cubeHole1; + final ModelRenderer cubeHole2; + final ModelRenderer cubeHole3; + final ModelRenderer cubeHole4; + final ModelRenderer cubeInside; public ModelSpreader() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 06817df7c..374ef7bfe 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -16,10 +16,10 @@ import net.minecraft.client.model.ModelRenderer; public class ModelTeruTeruBozu extends ModelBase { - public ModelRenderer thread; - public ModelRenderer cloth; - public ModelRenderer happyFace; - public ModelRenderer sadFace; + public final ModelRenderer thread; + public final ModelRenderer cloth; + public final ModelRenderer happyFace; + public final ModelRenderer sadFace; public ModelTeruTeruBozu() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java index 5415f00d0..cfeba1f5a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java +++ b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java @@ -15,7 +15,7 @@ import net.minecraft.client.model.ModelRenderer; public class ModelTinyPotato extends ModelBase { - ModelRenderer potato; + final ModelRenderer potato; public ModelTinyPotato() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 81b1be771..350b8a4b5 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -22,36 +22,36 @@ import javax.annotation.Nonnull; public class ModelArmorElementium extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer fairy; - public ModelRenderer helmWing1; - public ModelRenderer helmWing2; - public ModelRenderer helmWing3; - public ModelRenderer helmWing4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer wing1; - public ModelRenderer wing2; - public ModelRenderer armLpauldron; - public ModelRenderer wing1_1; - public ModelRenderer wing2_1; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer wing1_2; - public ModelRenderer wing2_2; - public ModelRenderer bootL1; - public ModelRenderer wing1_3; - public ModelRenderer wing2_3; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm1; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer fairy; + public final ModelRenderer helmWing1; + public final ModelRenderer helmWing2; + public final ModelRenderer helmWing3; + public final ModelRenderer helmWing4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer wing1; + public final ModelRenderer wing2; + public final ModelRenderer armLpauldron; + public final ModelRenderer wing1_1; + public final ModelRenderer wing2_1; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR1; + public final ModelRenderer wing1_2; + public final ModelRenderer wing2_2; + public final ModelRenderer bootL1; + public final ModelRenderer wing1_3; + public final ModelRenderer wing2_3; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index ca237daf4..dce198dd3 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -23,25 +23,25 @@ import javax.annotation.Nonnull; public class ModelArmorManasteel extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm1; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helm5; - public ModelRenderer helm6; - public ModelRenderer helm7; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer legR; - public ModelRenderer legL; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm1; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helm5; + public final ModelRenderer helm6; + public final ModelRenderer helm7; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armLpauldron; + public final ModelRenderer legR; + public final ModelRenderer legL; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 9030d1851..21cf91296 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -22,26 +22,26 @@ import javax.annotation.Nonnull; public class ModelArmorManaweave extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armR; - public ModelRenderer armL; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmSeam1; - public ModelRenderer helmSeam2; - public ModelRenderer helmSeam3; - public ModelRenderer helmSeam4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armLpauldron; - public ModelRenderer skirtR; - public ModelRenderer skirtL; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armR; + public final ModelRenderer armL; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helmSeam1; + public final ModelRenderer helmSeam2; + public final ModelRenderer helmSeam3; + public final ModelRenderer helmSeam4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armLpauldron; + public final ModelRenderer skirtR; + public final ModelRenderer skirtL; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 44f3a76fb..6b6df2720 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -22,39 +22,39 @@ import javax.annotation.Nonnull; public class ModelArmorTerrasteel extends ModelBiped { - public ModelRenderer helm; - public ModelRenderer body; - public ModelRenderer armr; - public ModelRenderer armL; - public ModelRenderer belt; - public ModelRenderer bootR; - public ModelRenderer bootL; - public ModelRenderer helm2; - public ModelRenderer helm3; - public ModelRenderer helm4; - public ModelRenderer helmLeaf1; - public ModelRenderer helmLeaf2; - public ModelRenderer helmLeaf3; - public ModelRenderer helmLeaf4; - public ModelRenderer helmLeaf5; - public ModelRenderer helmLeaf6; - public ModelRenderer helmbranch1; - public ModelRenderer helmbranch2; - public ModelRenderer helmbranch3; - public ModelRenderer helmbranch4; - public ModelRenderer body2; - public ModelRenderer armRpauldron; - public ModelRenderer armRbranch1; - public ModelRenderer armRbranch2; - public ModelRenderer armLpauldron; - public ModelRenderer armLbranch1; - public ModelRenderer armLbranch2; - public ModelRenderer legR; - public ModelRenderer legL; - public ModelRenderer bootR1; - public ModelRenderer bootRbranch; - public ModelRenderer bootL2; - public ModelRenderer bootLbranch; + public final ModelRenderer helm; + public final ModelRenderer body; + public final ModelRenderer armr; + public final ModelRenderer armL; + public final ModelRenderer belt; + public final ModelRenderer bootR; + public final ModelRenderer bootL; + public final ModelRenderer helm2; + public final ModelRenderer helm3; + public final ModelRenderer helm4; + public final ModelRenderer helmLeaf1; + public final ModelRenderer helmLeaf2; + public final ModelRenderer helmLeaf3; + public final ModelRenderer helmLeaf4; + public final ModelRenderer helmLeaf5; + public final ModelRenderer helmLeaf6; + public final ModelRenderer helmbranch1; + public final ModelRenderer helmbranch2; + public final ModelRenderer helmbranch3; + public final ModelRenderer helmbranch4; + public final ModelRenderer body2; + public final ModelRenderer armRpauldron; + public final ModelRenderer armRbranch1; + public final ModelRenderer armRbranch2; + public final ModelRenderer armLpauldron; + public final ModelRenderer armLbranch1; + public final ModelRenderer armLbranch2; + public final ModelRenderer legR; + public final ModelRenderer legL; + public final ModelRenderer bootR1; + public final ModelRenderer bootRbranch; + public final ModelRenderer bootL2; + public final ModelRenderer bootLbranch; private final EntityEquipmentSlot slot; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 72b7bc770..77f2125b2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -17,7 +17,6 @@ import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.internal.ShaderCallback; -import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index da82da2a8..c648ddc2d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -14,9 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.lib.LibResources; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index ea6306d07..6e994257a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class RenderPixie extends RenderLiving { - ShaderCallback callback = shader -> { + final ShaderCallback callback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); 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 8b6a492c4..dc918cd54 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); - ModelBrewery model = new ModelBrewery(); + final ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; @Override 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 8057859fd..a84aae581 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -39,7 +38,6 @@ import net.minecraftforge.common.property.Properties; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.model.ModelCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 9de4681a6..6efd32834 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -24,7 +24,7 @@ import javax.annotation.Nonnull; public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); - ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); + final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false); public static boolean move = true; @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index a00e75634..56d7083f9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.model.FloatingFlowerModel; import javax.annotation.Nonnull; import java.util.Random; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 59ba82aea..236fe9e33 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -26,8 +26,8 @@ import java.util.Random; public class RenderTileHourglass extends TileEntitySpecialRenderer { - ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); - ModelHourglass model = new ModelHourglass(); + final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); + final ModelHourglass model = new ModelHourglass(); @Override public void renderTileEntityAt(@Nonnull TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 3574af857..06b07a256 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.item.EnumDyeColor; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; 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 c5516cec4..bf89a9883 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -25,7 +25,7 @@ import javax.annotation.Nonnull; public class RenderTileRuneAltar extends TileEntitySpecialRenderer { - ModelSpinningCubes cubes = new ModelSpinningCubes(); + final ModelSpinningCubes cubes = new ModelSpinningCubes(); @Override public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index dd9166295..c475a28c7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -32,7 +32,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer DUMMY = PropertyEnum.create("dummy", DummyEnum.class); @@ -84,11 +84,6 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return Item.getItemFromBlock(getSingleBlock()); } - @Override - public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { - return super.quantityDropped(state, fortune, random); - } - @Override public ItemStack createStackedBlock(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 2cdc8393d..43eaefc78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class BlockPavementSlab extends BlockLivingSlab { - int index; + final int index; public BlockPavementSlab(boolean full, EnumDyeColor color, int index) { super(full, ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color)); diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 7545e67d1..c3492adc1 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -23,7 +23,7 @@ import javax.annotation.Nonnull; public class BehaviourSeeds extends BehaviorDefaultDispenseItem { - Block block; + private final Block block; public BehaviourSeeds(Block block) { this.block = block; 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 83eda0309..c239dd854 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -41,7 +41,7 @@ public class SubTilePureDaisy extends SubTileEntity { }; int positionAt = 0; - int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1}; + final int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1}; @Override public void onUpdate() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index a8fac4453..c267a428e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -40,10 +40,7 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; public class SubTileHopperhock extends SubTileFunctional { @@ -110,7 +107,6 @@ public class SubTileHopperhock extends SubTileFunctional { invToPutItemIn = inv.handler; priorityInv = priority; - sideToPutItemIn = dir.getOpposite(); amountToPutIn = availablePut; } } 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 87d48de6f..71fab2cba 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 @@ -26,7 +26,7 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileJadedAmaranthus extends SubTileFunctional { private static final int COST = 100; - int RANGE = 4; + final int RANGE = 4; @Override public void onUpdate() { 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 1bb9c9d45..44ce95006 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 @@ -164,7 +164,7 @@ public class SubTileOrechid extends SubTileFunctional { private static class StringRandomItem extends WeightedRandom.Item { - public String s; + public final String s; public StringRandomItem(int par1, String s) { super(par1); 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 fb569cc31..43b6bba5e 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 @@ -26,8 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index a91b73af2..1bb5bf51a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import java.util.Collections; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index c808e2c90..b906047ab 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -17,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java index 66351d792..706f6e797 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java @@ -17,11 +17,6 @@ import vazkii.botania.common.lexicon.LexiconData; @PassiveFlower public class SubTileNightshade extends SubTileDaybloom { - @Override - public int getDelayBetweenPassiveGeneration() { - return super.getDelayBetweenPassiveGeneration(); - } - @Override public boolean canGeneratePassively() { return !super.canGeneratePassively() && !supertile.getWorld().isDaytime(); 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 69c02698c..a92a7059f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import com.google.common.base.Function; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -43,6 +42,7 @@ import vazkii.botania.common.lexicon.LexiconData; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import java.util.function.Function; public class TileAlfPortal extends TileMod { @@ -76,10 +76,10 @@ public class TileAlfPortal extends TileMod { private static final String TAG_STACK = "portalStack"; private static final String TAG_PORTAL_FLAG = "_elvenPortal"; - List stacksIn = new ArrayList<>(); + private final List stacksIn = new ArrayList<>(); public int ticksOpen = 0; - int ticksSinceLastItem = 0; + private int ticksSinceLastItem = 0; private boolean closeNow = false; private boolean hasUnloadedParts = false; @@ -137,7 +137,7 @@ public class TileAlfPortal extends TileMod { continue; ItemStack stack = item.getEntityItem(); - if(stack != null && (!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { + if((!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { item.setDead(); addItem(stack); ticksSinceLastItem = 0; @@ -191,7 +191,7 @@ public class TileAlfPortal extends TileMod { return false; } - AxisAlignedBB getPortalAABB() { + private AxisAlignedBB getPortalAABB() { AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); @@ -199,14 +199,14 @@ public class TileAlfPortal extends TileMod { return aabb; } - void addItem(ItemStack stack) { + private void addItem(ItemStack stack) { int size = stack.stackSize; stack.stackSize = 1; for(int i = 0; i < size; i++) stacksIn.add(stack.copy()); } - void resolveRecipes() { + private void resolveRecipes() { int i = 0; for(ItemStack stack : stacksIn) { if(stack != null && stack.getItem() instanceof ILexicon) { @@ -228,7 +228,7 @@ public class TileAlfPortal extends TileMod { } } - void spawnItem(ItemStack stack) { + private void spawnItem(ItemStack stack) { EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); item.getEntityData().setBoolean(TAG_PORTAL_FLAG, true); worldObj.spawnEntityInWorld(item); @@ -338,7 +338,8 @@ public class TileAlfPortal extends TileMod { } } - private boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function... converters) { + @SafeVarargs + private final boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function... converters) { for(BlockPos pos : positions) { for(Function f : converters) if(f != null) 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 a5a8933a2..5320fe9f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -43,9 +43,9 @@ public class TileCocoon extends TileMod { hatch(); } - public void hatch() { + private void hatch() { if(!worldObj.isRemote) { - worldObj.playEvent(2001, pos, Block.getIdFromBlock(getBlockType())); + worldObj.playEvent(2001, pos, Block.getStateId(getBlockType().getStateFromMeta(getBlockMetadata()))); 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 5b3eafcdc..e10d6db4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -72,7 +72,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { int mana = 0; public ItemStack itemToEnchant = null; - List enchants = new ArrayList<>(); + final List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { new BlockPos(0, -1, 0), 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 94dc73cd9..8330eff47 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index ddec5590d..3c4f81190 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import vazkii.botania.api.mana.IManaCollisionGhost; public class TilePlatform extends TileCamo { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 80c46346b..6e5e46c65 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; public class TileTinyPlanet extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 9ef86faf7..e8906d9cb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.model.animation.IAnimationStateMachine; 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 4d0732e27..79daa002b 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 @@ -79,20 +79,20 @@ public class TileBellows extends TileMod { switch (enumfacing) { case WEST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case EAST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case NORTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); break; case SOUTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); + worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 4b746c8bf..e9794dcc5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -22,7 +22,7 @@ import java.util.List; public class TileDistributor extends TileMod implements IManaReceiver { - List validPools = new ArrayList<>(); + final List validPools = new ArrayList<>(); @Override public void updateEntity() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index a88c44f18..b6e21c257 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -14,7 +14,6 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; 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 5dd4e2e4e..56847a1c4 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 @@ -66,7 +66,6 @@ import javax.annotation.Nonnull; import java.awt.*; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { @@ -100,7 +99,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int ticksDoingTransfer = 0; private String inputKey = ""; - private String outputKey = ""; + private final String outputKey = ""; private int ticks = 0; private boolean sendPacket = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 0b4e0e586..f8b790512 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -16,7 +16,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; -import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 4972253eb..74bc605b6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -34,7 +34,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo int mana = 0; // Thanks to skyboy for help with this cuz I'm a noob with RF - private EnumMap receiverCache = new EnumMap<>(EnumFacing.class); + private final EnumMap receiverCache = new EnumMap<>(EnumFacing.class); private boolean deadCache; @Override 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 f65d7f0ef..f05e55fb0 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 @@ -116,13 +116,13 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, float mmForcedVelocityMultiplier = 1F; String inputKey = ""; - String outputKey = ""; + final String outputKey = ""; // End Map Maker Tags - public static boolean staticRedstone = false; - public static boolean staticDreamwood = false; - public static boolean staticUltra = false; + public static final boolean staticRedstone = false; + public static final boolean staticDreamwood = false; + public static final boolean staticUltra = false; UUID identity; @@ -187,7 +187,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { ManaNetworkEvent.addCollector(this); - inNetwork = true; } boolean redstone = false; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 537c4497c..b35a0e091 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -319,8 +319,8 @@ public final class ConfigHandler { private int lastBuild; private int currentBuild; - private Map> adaptableValues = new HashMap<>(); - private List changes = new ArrayList<>(); + private final Map> adaptableValues = new HashMap<>(); + private final List changes = new ArrayList<>(); public ConfigAdaptor(boolean enabled) { this.enabled = enabled; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 54079f1c3..abe7c233c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -33,7 +33,6 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.BotaniaAPIClient; -import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index fdf59bdcc..a645b373d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -160,10 +160,10 @@ public class InventoryHelper { public static class GenericInventory implements IInventory { - protected String inventoryTitle; + protected final String inventoryTitle; protected int slotsCount; protected ItemStack[] inventoryContents; - protected boolean isInvNameLocalized; + protected final boolean isInvNameLocalized; public GenericInventory(String name, boolean isInvNameLocalized, int size) { this.isInvNameLocalized = isInvNameLocalized; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 8f0f943e3..9029c4c6a 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -26,7 +26,7 @@ import java.net.URL; public class ThreadDownloadMod extends Thread { - private String fileName; + private final String fileName; private byte[] buffer = new byte[10240]; diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index a25821051..6593d2665 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -15,7 +15,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java index 7be988dcd..0ed3c7fdd 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ShapelessManaUpgradeRecipe.java @@ -12,9 +12,7 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import vazkii.botania.api.mana.IManaItem; public class ShapelessManaUpgradeRecipe extends ShapelessOreRecipe { public ShapelessManaUpgradeRecipe(ItemStack output, Object... inputs) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 462bcd17f..c9026e397 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -136,7 +136,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private boolean spawnPixies = false; private boolean anyWithArmor = false; - private List playersWhoAttacked = new ArrayList<>(); + private final List playersWhoAttacked = new ArrayList<>(); public EntityPlayer trueKiller = null; private static boolean isPlayingMusic = false; diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index e11e5467e..71add9d03 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -45,7 +45,7 @@ public class EntityEnderAirBottle extends EntityThrowable { for(BlockPos coords : coordsList) { worldObj.setBlockState(coords, Blocks.END_STONE.getDefaultState()); if(Math.random() < 0.1) - worldObj.playEvent(2001, coords, Block.getIdFromBlock(Blocks.END_STONE)); + worldObj.playEvent(2001, coords, Block.getStateId(Blocks.END_STONE.getDefaultState())); } setDead(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index 2af233082..ffb72fac0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -53,7 +53,6 @@ public class EntityFlyingCreature extends EntityAmbientCreature { float f2 = 0.91F; if (onGround) { - f2 = 0.54600006F; Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } @@ -63,7 +62,6 @@ public class EntityFlyingCreature extends EntityAmbientCreature { f2 = 0.91F; if (onGround) { - f2 = 0.54600006F; Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); f2 = block.slipperiness * 0.91F; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index bb317befe..1b2b5d347 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -89,12 +89,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { float accumulatedManaLoss = 0; boolean fake = false; - Set alreadyCollidedAt = new HashSet<>(); + final Set alreadyCollidedAt = new HashSet<>(); boolean fullManaLastTick = true; UUID shooterIdentity = null; int _ticksExisted = 0; boolean scanBeam = false; - public List propsList = new ArrayList<>(); + public final List propsList = new ArrayList<>(); public EntityManaBurst(World world) { super(world); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 394ef4f4f..b19736686 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index ee306542d..44a2fa50b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -54,10 +54,10 @@ public class EntitySpark extends Entity implements ISparkEntity { public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); - Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); + final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); int removeTransferants = 2; - boolean firstTick = false; + final boolean firstTick = false; public EntitySpark(World world) { super(world); @@ -89,7 +89,6 @@ public class EntitySpark extends Entity implements ISparkEntity { allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); if(first) - first = true; Collection transfers = getTransfers(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 42f1a7d3c..3a73143c7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -309,7 +309,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ, new int[0]); + this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ); } f1 = 0.8F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index e99c26e64..4e802fd32 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -66,27 +66,25 @@ public class EntityThrownItem extends EntityItem { List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; - for (int j = 0; j < list.size(); ++j) - { - Entity entity1 = (Entity)list.get(j); + for (Object aList : list) { + Entity entity1 = (Entity) aList; int pickupDelay; try { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this); - } catch (Throwable ignored) { continue; } + } catch (Throwable ignored) { + continue; + } - if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) - { + if (entity1.canBeCollidedWith() && (!(entity1 instanceof EntityPlayer) || pickupDelay == 0)) { float f = 1.0F; AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expand(f, f, f); RayTraceResult RayTraceResult1 = axisalignedbb.calculateIntercept(vec3, vec31); - if (RayTraceResult1 != null) - { + if (RayTraceResult1 != null) { double d1 = vec3.distanceTo(RayTraceResult1.hitVec); - if (d1 < d0 || d0 == 0.0D) - { + if (d1 < d0 || d0 == 0.0D) { entity = entity1; d0 = d1; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 1f6bd7d50..462527a7e 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -23,7 +23,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal FULL }; - private State state; + private final State state; public TriggerManaLevel(State state) { this.state = state; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 6fda3e7fc..d60697f2f 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -25,9 +25,9 @@ public class ColoredLightHelper { // Begin API Copypasta // https://github.com/CptSpaceToaster/CptsModdingLight/blob/1.7.2/src/main/java/coloredlightscore/src/api/CLApi.java - public static int r[] = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; - public static int g[] = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; - public static int b[] = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; + public static final int[] r = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; + public static final int[] g = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; + public static final int[] b = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { // Clamp color channels diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 710ccd8c9..af10215bb 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -20,7 +20,7 @@ import java.util.List; public class WrappedIInventory extends WrappedInventoryBase{ - private InvWithLocation inv; + private final InvWithLocation inv; private WrappedIInventory(InvWithLocation inv, ICorporeaSpark spark) { this.inv = inv; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index f9dedec9b..19973269b 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -28,7 +28,7 @@ import java.util.List; */ public class WrappedStorageDrawers extends WrappedInventoryBase { - private IDrawerGroup invRaw; + private final IDrawerGroup invRaw; private WrappedStorageDrawers(IDrawerGroup inv, ICorporeaSpark spark) { this.invRaw = inv; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index b9b40cf9c..210b71bc3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -61,7 +61,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; - String sound = null; + String sound; try { if(living instanceof EntityCreeper) sound = "creeper.primed"; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index a2079b934..6fcd2b2a5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -37,11 +37,9 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.Set; @@ -247,7 +245,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private final Random rand; private final IBlockState stateToSet; - private BlockPos startCoords; + private final BlockPos startCoords; private int ticksExisted = 0; /** diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 66c79a0e0..dddbc7c92 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -134,7 +134,6 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet IBlockState state = world.getBlockState(pos_); Block block = state.getBlock(); if(!block.isAir(state, world, pos_) && !block.isReplaceable(world, pos_) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, pos_)) && state.getBlockHardness(world, pos_) != -1) { - int id = Block.getIdFromBlock(block); TileEntity tile = world.getTileEntity(pos_); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 058894c8e..783b72684 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -224,7 +224,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { int pos = getClipPos(par1ItemStack); addStringToTooltip(I18n.format("botaniamisc.hasClip"), par3List); for(int i = 0; i < CLIP_SLOTS; i++) { - String name = ""; + String name; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); if(lensAt == null) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 1b78fcc36..1e4524afc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -132,7 +132,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { TileEntity tile = par3World.getTileEntity(pos); boolean bindable = tile instanceof IWandBindable; - boolean wanded = false; + boolean wanded; if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, pos, side)) { if(boundTile.equals(pos)) setBoundTile(par1ItemStack, UNBOUND_POS); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 3e4d3cc31..1ec70b110 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -17,7 +17,6 @@ import net.minecraft.entity.ai.attributes.AbstractAttributeMap; 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; 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 e7804c02c..88d896190 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -49,11 +49,11 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; - private String name; - private String texName; - private int swigs; - private int drinkSpeed; - private ItemStack baseItem; + private final String name; + private final String texName; + private final int swigs; + private final int drinkSpeed; + private final ItemStack baseItem; public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { super(name); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 94145f2fc..8423c9f9e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -55,7 +55,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; protected Map models = null; - public EntityEquipmentSlot type; + public final EntityEquipmentSlot type; public ItemManasteelArmor(EntityEquipmentSlot type, String name) { this(type, name, BotaniaAPI.manasteelArmorMaterial); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index 5e45e0070..c0e27d830 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; public abstract class ItemBaubleModifier extends ItemBauble { - Multimap attributes = HashMultimap.create(); + final Multimap attributes = HashMultimap.create(); public ItemBaubleModifier(String name) { super(name); 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 3f9490fa8..374c4556f 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 @@ -68,8 +68,8 @@ import java.util.List; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender, ICraftAchievement { - private static ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); - private static ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); + private static final ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); + private static final ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); private static final String TAG_FLYING = "flying"; private static final String TAG_TIME_LEFT = "timeLeft"; @@ -131,7 +131,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub // Might as well be called sugar given it's not secure at all :D String salt(String str) { - str = str += "wowsuchsaltmuchsecurityverywow"; + str = str + "wowsuchsaltmuchsecurityverywow"; SecureRandom rand = new SecureRandom(str.getBytes()); int l = str.length(); int steps = rand.nextInt(l); 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 177c7312d..6f0df1577 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 @@ -24,10 +24,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.AnimalChest; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -39,8 +37,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; @@ -52,7 +48,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibObfuscation; import java.util.ArrayList; import java.util.Arrays; 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 e8c57eac5..b39ea6b84 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 @@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.IItemPropertyGetter; @@ -37,16 +38,15 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.util.Arrays; import java.util.List; public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; - private static final List BLACKLIST = Arrays.asList(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); + private static final List BLACKLIST = ImmutableList.of(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); - final int range; + private final int range; public ItemMagnetRing() { this(LibItemNames.MAGNET_RING, 6); 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 b123734e0..44a922aff 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.CRAFTED_SNOW, Material.CLAY }; - public static Material[] materialsAxe = new Material[]{ Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD }; + public static final Material[] materialsPick = new Material[]{ Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL }; + public static final Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + public static final 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; 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 3180e6ef8..2f41b7764 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.CRAFTED_SNOW, Material.CLAY }; + public static final 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); 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 2944fc613..b8c2b44e9 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 @@ -38,11 +38,9 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.PriorityQueue; import java.util.Set; @@ -77,7 +75,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); + private static final TIntObjectHashMap> blockSwappers = new TIntObjectHashMap<>(); public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); @@ -163,14 +161,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * @param steps The range of the block swapper, in blocks. * @param leaves If true, will treat leaves specially (see the BlockSwapper * documentation). - * @return The created block swapper. */ - private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, int steps, boolean leaves) { + private static void addBlockSwapper(World world, EntityPlayer player, ItemStack stack, BlockPos origCoords, int steps, boolean leaves) { BlockSwapper swapper = new BlockSwapper(world, player, stack, origCoords, steps, leaves); // Block swapper registration should only occur on the server if(world.isRemote) - return swapper; + return; // If the mapping for this dimension doesn't exist, create it. int dim = world.provider.getDimension(); @@ -179,8 +176,6 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // Add the swapper blockSwappers.get(dim).add(swapper); - - return swapper; } /** @@ -239,13 +234,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker /** * The priority queue of all possible candidates for swapping. */ - private PriorityQueue candidateQueue; + private final PriorityQueue candidateQueue; /** * The set of already swaps coordinates which do not have * to be revisited. */ - private Set completedCoords; + private final Set completedCoords; /** * Creates a new block swapper with the provided parameters. diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index e9e58a0a6..06df18f17 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -82,8 +82,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens private static final int[] props = new int[SUBTYPES]; private static final Lens[] lenses = new Lens[SUBTYPES]; - private static Lens fallbackLens = new Lens(); - private static Lens stormLens = new LensStorm(); + private static final Lens fallbackLens = new Lens(); + private static final Lens stormLens = new LensStorm(); static { setProps(NORMAL, PROP_NONE); @@ -244,9 +244,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return ItemNBTHelper.getInt(stack, TAG_COLOR, -1); } - public static ItemStack setLensColor(ItemStack stack, int color) { + public static void setLensColor(ItemStack stack, int color) { ItemNBTHelper.setInt(stack, TAG_COLOR, color); - return stack; } @Override 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 edcac7ddb..c845baf6b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -30,8 +30,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; public class ItemDice extends ItemRelic { 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 9a70fceaa..8d703eccf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -147,11 +147,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); - for(int i = 0; i < cursors.size(); i++) { - BlockPos coords = cursors.get(i); + for (BlockPos coords : cursors) { IBlockState state = world.getBlockState(coords); breaker.breakOtherBlock(player, stack, coords, coords, side); - ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[] { state.getMaterial() }, silk, fortune, state.getBlockHardness(world, coords), dispose); + ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[]{state.getMaterial()}, silk, fortune, state.getBlockHardness(world, coords), dispose); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index d333d37ea..ad7e66e41 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -33,9 +33,9 @@ import java.util.List; public class ItemOdinRing extends ItemRelicBauble { - private static List damageNegations = new ArrayList<>(); + private static final List damageNegations = new ArrayList<>(); - private Multimap attributes = HashMultimap.create(); + private final Multimap attributes = HashMultimap.create(); public ItemOdinRing() { super(LibItemNames.ODIN_RING); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 1986873ba..977c7dabf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -30,7 +30,7 @@ import java.util.UUID; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; - private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff + private final ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff @Override protected boolean shouldRegister() { return false; 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 11401445f..c8add78c8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -364,10 +364,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return ItemNBTHelper.getInt(stack, TAG_BLOCK_META, 0); } - private boolean setTargetBlock(ItemStack stack, Block block, int meta) { + private void setTargetBlock(ItemStack stack, Block block, int meta) { ItemNBTHelper.setString(stack, TAG_TARGET_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_TARGET_BLOCK_META, meta); - return true; } public static String getTargetBlockName(ItemStack stack) { 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 d03caedeb..369f03b31 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -191,7 +191,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(stack != null && stack.getItem() == ModItems.gravityRod) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); - Entity item = null; + Entity item; if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID); 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 b0fdb825c..62e5a49c7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -137,7 +137,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } static class SmeltData { - public RayTraceResult pos; + public final RayTraceResult pos; public int progress; public SmeltData(RayTraceResult pos, int progress) { diff --git a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java index 6a200cbff..f7920c3fc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java @@ -16,7 +16,7 @@ import vazkii.botania.common.lib.LibMisc; public class CLexiconEntry extends BLexiconEntry implements IAddonEntry { - String mod; + final String mod; public CLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java index 9d05978ad..f2757fce5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconCategory; public class RLexiconEntry extends BLexiconEntry { - Achievement a; + final Achievement a; public RLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 1288b2f62..c7e324b3b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -32,7 +32,7 @@ import java.util.List; public class PageBrew extends PageRecipe implements ITwoNamedPage { - RecipeBrew recipe; + final RecipeBrew recipe; String text; public PageBrew(RecipeBrew recipe, String unlocalizedName, String bottomText) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index baec81940..40776c448 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -40,7 +40,7 @@ public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 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 26850d841..8f84d67e0 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -27,7 +27,7 @@ public class PageElvenRecipe extends PageRecipe { private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; 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 16b274f9c..89d17e710 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -30,7 +30,7 @@ public class PageEntity extends LexiconPage{ Entity dummyEntity; int relativeMouseX, relativeMouseY; boolean tooltipEntity; - int size; + final int size; Constructor entityConstructor; public PageEntity(String unlocalizedName, String entity, int size) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 1abcf4474..2dae4ee89 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.LexiconPage; public class PageImage extends LexiconPage { - ResourceLocation resource; + final ResourceLocation resource; public PageImage(String unlocalizedName, String resource) { super(unlocalizedName); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index ada3dae29..882ee8161 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -45,7 +45,7 @@ public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); - private List recipes; + private final List recipes; private int ticksElapsed = 0; private int recipeAt = 0; private final ItemStack renderStack; 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 50bff1a54..793170b0d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -41,8 +41,8 @@ public class PageMultiblock extends LexiconPage { private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY); GuiButton button; - MultiblockSet set; - Multiblock mb; + final MultiblockSet set; + final Multiblock mb; int ticksElapsed; public PageMultiblock(String unlocalizedName, MultiblockSet set) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 8319ed722..854a98a2f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -39,7 +39,7 @@ public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); - List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 380897e20..0e7ba0d54 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -40,7 +40,7 @@ public class PageShedding extends PageEntity { private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); - ItemStack shedStack; + final ItemStack shedStack; ItemStack tooltipStack; boolean tooltipEntry; @@ -94,7 +94,6 @@ public class PageShedding extends PageEntity { if(tooltipEntry) { vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(TextFormatting.GRAY + I18n.format("botaniamisc.clickToRecipe"))); - tooltipY += 18; } } else if(tooltipEntity) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 40b3fc7ee..38eddeb17 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -57,7 +57,7 @@ public class PageText extends LexiconPage { List> lines = new ArrayList<>(); - String controlCodes = ""; + String controlCodes; for(String s : textEntries) { List words = new ArrayList<>(); String lineStr = ""; diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 89075fdb8..fbc995599 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -2,8 +2,6 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -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; From 51c7d310a7c52721ce72e14ba314684db385edc6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 26 May 2016 23:22:50 -0500 Subject: [PATCH 632/935] Moar clenaup --- .../botania/client/model/ModelPylon.java | 20 +++++++++---------- .../render/entity/RenderSnowballStack.java | 2 +- .../subtile/functional/SubTileBellethorn.java | 8 ++------ .../subtile/functional/SubTileDreadthorn.java | 3 ++- .../functional/SubTileHeiseiDream.java | 2 ++ .../block/tile/TileSimpleInventory.java | 3 +-- .../botania/common/entity/EntitySpark.java | 3 --- .../item/equipment/tool/ItemThunderSword.java | 6 +++--- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index cb937a9ce..f156b36bb 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.model; -import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; @@ -33,6 +32,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; import java.util.List; +import java.util.function.Function; public class ModelPylon implements IPylonModel { @@ -61,19 +61,19 @@ public class ModelPylon implements IPylonModel { // (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group) // Turn on "Crystal" - manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); // Turn on "Crystal_Ring", and "Ring_Panel0x" - manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); // Turn on "Ring_Gem0x" - manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); } catch(Exception e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } 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 e27bbe153..6e9f1500e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.render.entity; -import com.google.common.base.Function; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; @@ -17,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; +import java.util.function.Function; // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 4f670d621..13dedb072 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import com.google.common.base.Predicate; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; @@ -23,6 +22,7 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; +import java.util.function.Predicate; public class SubTileBellethorn extends SubTileFunctional { @@ -53,13 +53,9 @@ public class SubTileBellethorn extends SubTileFunctional { if(ticksExisted % 5 == 0) { int range = getRange(); - List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-range, -range, -range), supertile.getPos().add(range + 1, range + 1, range + 1))); - Predicate selector = getSelector(); + List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-range, -range, -range), supertile.getPos().add(range + 1, range + 1, range + 1)), getSelector()::test); for(EntityLivingBase entity : entities) { - if(!selector.apply(entity)) - continue; - if(entity.hurtTime == 0 && mana >= manaToUse) { int dmg = 4; if(entity instanceof EntityWitch) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 22b5aca94..36583a36e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -10,12 +10,13 @@ */ package vazkii.botania.common.block.subtile.functional; -import com.google.common.base.Predicate; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; +import java.util.function.Predicate; + public class SubTileDreadthorn extends SubTileBellethorn { @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 24d38d1c4..d3ccd248d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -42,7 +42,9 @@ public class SubTileHeiseiDream extends SubTileFunctional { final int cost = 100; + @SuppressWarnings("unchecked") List mobs = (List) (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class)); + if(mobs.size() > 1 && mana >= cost) for(IMob mob : mobs) { if(mob instanceof EntityLiving) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 7e59ed407..a9dff6caa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -52,10 +52,9 @@ public abstract class TileSimpleInventory extends TileMod { @Nonnull @Override - @SuppressWarnings("unchecked") public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) - return (T) itemHandler; + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemHandler); return super.getCapability(cap, side); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 44a2fa50b..b9496db0e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -88,11 +88,8 @@ public class EntitySpark extends Entity implements ISparkEntity { if(first || upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); - if(first) - Collection transfers = getTransfers(); - if(upgrade != SparkUpgradeType.NONE) { switch(upgrade) { case DISPERSIVE : { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 59ac91cde..2e19d4727 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import com.google.common.base.Predicate; import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -37,6 +36,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.function.Predicate; public class ItemThunderSword extends ItemManasteelSword implements ICraftAchievement { @@ -50,7 +50,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev public boolean hitEntity(ItemStack stack, EntityLivingBase entity, @Nonnull EntityLivingBase attacker) { if(!(entity instanceof EntityPlayer) && entity != null) { double range = 8; - final List alreadyTargetedEntities = new ArrayList<>(); + List alreadyTargetedEntities = new ArrayList<>(); int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); @@ -60,7 +60,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev EntityLivingBase lightningSource = entity; int hops = entity.worldObj.isThundering() ? 10 : 4; for(int i = 0; i < hops; i++) { - List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector::test); if(entities.isEmpty()) break; From a07f7914ae46c3eab22f6845f809dceeec429f17 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 May 2016 19:51:59 -0500 Subject: [PATCH 633/935] Add chest textures, update Forge --- build.properties | 2 +- .../botania/textures/model/dreamwoodChest.png | Bin 0 -> 1393 bytes .../botania/textures/model/livingwoodChest.png | Bin 0 -> 1483 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/main/resources/assets/botania/textures/model/dreamwoodChest.png create mode 100644 src/main/resources/assets/botania/textures/model/livingwoodChest.png diff --git a/build.properties b/build.properties index 10b171147..62ec2f2a5 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Thu May 19 09:23:16 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1909-1.9.4 +forge_version=12.17.0.1922-1.9.4 mc_version=1.9.4 dir_repo=./ build_number=307 diff --git a/src/main/resources/assets/botania/textures/model/dreamwoodChest.png b/src/main/resources/assets/botania/textures/model/dreamwoodChest.png new file mode 100644 index 0000000000000000000000000000000000000000..e8d2308d5bfcf80623495a6e63a602766ec4035b GIT binary patch literal 1393 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z;_6Q8AUa` z8i0aQC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDhKBB+oy>u@9`tl^45^5FJ8NTB zh@(i`XCWmvRShMl4ITLj>K(BxjvEAmGLlm#iik0GHgRMg@p5s|agjfG?3~|*jUv+C zx;$=jrXYK{_i}|FxU@ zH)x;z{ex?#Zz@e)zohPWq2!jpOW#T>-&=IA?p41l*XggsiE~$+02W!bX)HzSRxZ`6Zy>U%^YypEY^AbLQ=ee^j{EId-GDDb`P<_XNLFCUaV zJnAtg@E zbCIfY->$$N5%!bi7MLnZ{P*kK@xt&|aje+&Gm~y!y;*lKwDtGhRp%C@v6QKrXN5k` zDiA9SW$d}I?q=tM!>g^BqGQhNSoK-6A-enW+05B2;^7nPg~LS;C_FWqdR*eTURKPL z4-wtdNfw5RSY+|m&vkh272)HvTd7I zZb@_5B%2-_eKRDgY|hz&n^(fjre5pu*!DOlOMAB0>Aua9db4kxT6Src;K{N#QuUWW z^3!C~jbqHVPW4@Csyykf1y~*wVh97hQ{W2cXm0cb8*i+1vv2dtwK-b4z<}8SG`>6A z?Z}h1%Dom2og~yJ0E-hVa$D6+Mg4fZ$?g%soRoJXCHUC z@QrqzMBw4n_vU=-v>2F6?ayzSaXTunJTvneV;qby^Lxr{|>_*Z;kudd~a%cg45j3A>cS=7q+DGU&X2 zr~5?V(Z7BEj7%!WckH_UMjR;GJWt>Fux0(-`|Is8zjFu5_xsI%cvtz?zw5vV``fh6 uA$)=M1<@B=C9J!cVjHn>KiF%2;FkDuZ$scJyEb5v$KdJe=d#Wzp$Py-j(~~) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/livingwoodChest.png b/src/main/resources/assets/botania/textures/model/livingwoodChest.png new file mode 100644 index 0000000000000000000000000000000000000000..89752e6fc3b9ba3cc4959d59186c1d280d361625 GIT binary patch literal 1483 zcmZuxdo zuDLsJ)Jm-#n$-5rTpD4Trg*2$```P==lPuH^PJCfp7T8CJlThQJU1w7D+2&F?Dul> zlkvV)D9X#?qX_Z`8Ld6(jCBT}hPLi|C`^_kk9qlF0Z29mAmbtcQkj%74nQ0lfJq_% z_5}cFk_wxA9b^S1k{2Ns0F};FK$}dwGi0JR#XXRMi#b6_2t6AP4uwWUQ&2wc{>XSs zloe|CZqIoa8vtNB``w)V6GKFQvaW4%*XSh|g!Vckb4qQEuPLb!Iy^Kxz1L@xXXuq? zTzDFk-}D7a1^iw-GE{J7(JXw$RFV)o2tAT^7YBun+<(JnFT`;qMY!@u2S+gZWutoq zgl|*d-tcZWy_*^F+%8y-(a+zrH$Bj4ajaEzTblChLxsdPcINZrgnEHl6`L;p;gy=L z2yaZ|N7_-Ryp0m47E1~dqWm`#%oIK`MHPBjt}DnYT@JS`RwGB8H~*-*mr7VhQ8ixH za66r~{TiO?N1Laoi>kS;N&b2*R6i#>#}CP{1$br)v#USm)?pQekqq&_Ffxi9W1-j_ZoNBu{n@s z+W|PffE2g|%7F?iaiA(8AY)t_h`0f_1_2WKq?*F6_9JjCVzV{eBftEBBkz?*P(M;L zUEgp(?y%mC!-&Dy-8o~tI)`lx=JnB8szL3(06Ssq1#P)gWZ1(v9Gt?eMyqcpICd1k zN9Yz^u%LSS<4;JJL&q*(fvy{5;F0nH(}t+KQ^b!{^P% z53Z>*UdzAB=6lj!)8h%;$h;hkzrBz%lFCh{CF3dT@56&|Ozm8odB)BrZH7(%ux)+O z9PhFUUVt9PotTyv!e{%Vb=KaT=@-{xK-M>rj}{d4nw^xQ98D><&O2k-SCpFEN;2yS zALVpf!AeTqL{j$#!fWT3n}Wsg_v2Dtbz<*c=~b638En^L>$3X4D(Y7E^;x|EpONGp6=7=rp2a4mLtmBA z2eZww4=O#jEfJs1TFM>w`{{d=nF1>)?>F8i-@2sE~%=0QbW)Lwj-9bKYKjNEz0 z`^Z(VuN@c|+TaHELHJUm_RCv=PZbJ=pZ{`^tQon#bkv>U=e&Te=P^wwdsst_wNuO@ zss)RjDn}KITMC_82(*ww`rnvQ&V|#;!t8KP0c4`q3W=KrDldmU#G?TW|vg~2gcE8f1#3)c)))gwk+yF_N8&w zO-tWR#LgeR8{B0DBOx%6Z8O5KUR~t$lB#dH-HMjBWPQBMM*MAy@_N`MIoES{+Yb>< h&>H`nu55=b!-CI@of7b#D9D~E*zfM+R^>uG|1U39x{Ck+ literal 0 HcmV?d00001 From 1d54442e01746e26bdb42e0671d967bfb05fa41a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 May 2016 19:56:07 -0500 Subject: [PATCH 634/935] Fix axe digging closes #301 --- .../equipment/tool/manasteel/ItemManasteelAxe.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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 35b7ec219..dda99d1a8 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 @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; @@ -41,7 +42,7 @@ import javax.annotation.Nonnull; import java.util.Set; import java.util.regex.Pattern; -public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { +public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); @@ -52,18 +53,10 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta } public ItemManasteelAxe(ToolMaterial mat, String name) { - super(mat, ImmutableSet.of()); + super(mat, 8F, -3.1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); - this.damageVsEntity = 8f; - this.attackSpeed = -3.1f; - } - - @Nonnull - @Override - public Set getToolClasses(ItemStack stack) { - return ImmutableSet.of("axe"); } @Nonnull From cf82603f040f640207165ba59be260cee71f3f5a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 May 2016 20:26:54 -0500 Subject: [PATCH 635/935] Update bow methods. Closes #300 --- .../equipment/tool/bow/ItemCrystalBow.java | 9 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 144 ++++++++++-------- 2 files changed, 86 insertions(+), 67 deletions(-) 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 1dc305dec..4a753c3c3 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 @@ -33,15 +33,10 @@ public class ItemCrystalBow extends ItemLivingwoodBow { return 2F; } - @Override - boolean postsEvent() { - return false; - } - @Override boolean canFire(ItemStack stack, EntityPlayer player) { int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack); - return ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false); + return player.capabilities.isCreativeMode || ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false); } @Override @@ -52,7 +47,7 @@ public class ItemCrystalBow extends ItemLivingwoodBow { } @Override - protected ItemStack getAmmo(EntityPlayer player) { + protected ItemStack getAmmo(EntityLivingBase player) { 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 ad1952b3d..6cc8ad030 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 @@ -23,6 +23,7 @@ import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemArrow; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; +import net.minecraft.stats.StatList; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; @@ -103,78 +104,99 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { @Override public void onPlayerStoppedUsing(@Nonnull ItemStack stack, @Nonnull World world, EntityLivingBase shooter, int useTicks) { - int j = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); - if(shooter instanceof EntityPlayer) { - ArrowLooseEvent event = new ArrowLooseEvent(((EntityPlayer) shooter), stack, world, j, true); - if(MinecraftForge.EVENT_BUS.post(event)) - return; - j = event.getCharge(); - } - - boolean flag = !(shooter instanceof EntityPlayer) || canFire(stack, ((EntityPlayer) shooter)); - boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; - - if(flag) { - float f = j / 20.0F; - f = (f * f + f * 2.0F) / 3.0F; - - if(f < 0.1D) - return; - - if(f > 1.0F) - f = 1.0F; - - ItemStack ammo = shooter instanceof EntityPlayer ? getAmmo(((EntityPlayer) shooter)) : null; - if(ammo == null || !(ammo.getItem() instanceof ItemArrow)) - ammo = new ItemStack(Items.ARROW); - EntityArrow entityarrow = ((ItemArrow) ammo.getItem()).createArrow(world, ammo, shooter); - 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); - - if(k > 0) - entityarrow.setDamage(entityarrow.getDamage() + k * 0.5D + 0.5D); - - int l = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); - - if(l > 0) - entityarrow.setKnockbackStrength(l); - - 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); - - onFire(stack, shooter, infinity, entityarrow); - - if(!world.isRemote) - world.spawnEntityInWorld(entityarrow); + boolean isPlayer = shooter instanceof EntityPlayer; + EntityPlayer player = isPlayer ? (EntityPlayer) shooter : null; + + // Begin copy modified ItemBow.onPlayerStoppedUsing + boolean flag = !isPlayer || canFire(stack, player); // Botania - Custom canFire check + ItemStack itemstack = this.getAmmo(shooter); + + int i = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); // Botania - velocity multiplier + if(isPlayer) + i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, player, i, itemstack != null || flag); + if (i < 0) return; + + if (itemstack != null || flag) + { + if (itemstack == null) + { + itemstack = new ItemStack(Items.ARROW); + } + + float f = getArrowVelocity(i); + + if ((double)f >= 0.1D) + { + boolean infinite = !isPlayer || player.capabilities.isCreativeMode || (itemstack.getItem() instanceof ItemArrow && ((ItemArrow) itemstack.getItem()).isInfinite(itemstack, stack, player)); + + if (!world.isRemote) + { + ItemArrow itemarrow = (ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.ARROW); + EntityArrow entityarrow = itemarrow.createArrow(world, itemstack, shooter); + entityarrow.setAim(shooter, shooter.rotationPitch, shooter.rotationYaw, 0.0F, f * 3.0F, 1.0F); + + if (f == 1.0F) + { + entityarrow.setIsCritical(true); + } + + int j = EnchantmentHelper.getEnchantmentLevel(Enchantments.POWER, stack); + + if (j > 0) + { + entityarrow.setDamage(entityarrow.getDamage() + (double)j * 0.5D + 0.5D); + } + + int k = EnchantmentHelper.getEnchantmentLevel(Enchantments.PUNCH, stack); + + if (k > 0) + { + entityarrow.setKnockbackStrength(k); + } + + if (EnchantmentHelper.getEnchantmentLevel(Enchantments.FLAME, stack) > 0) + { + entityarrow.setFire(100); + } + + // Botania - move bow damage into onFire (below) + + if (infinite) + { + entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; + } + + world.spawnEntityInWorld(entityarrow); + onFire(stack, shooter, infinite, entityarrow); + } + + + world.playSound(null, shooter.posX, shooter.posY, shooter.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + + // Botania - move ammo consumption into onFire (above) + + if(isPlayer) + player.addStat(StatList.getObjectUseStats(this)); + } } + // End modified ItemBow.onPlayerStoppedUsing } float chargeVelocityMultiplier() { return 1F; } - boolean postsEvent() { - return true; - } - boolean canFire(ItemStack stack, EntityPlayer player) { 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.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; - else if(living instanceof EntityPlayerMP) + if(living instanceof EntityPlayerMP) { + ToolCommons.damageItem(bow, 1, living, MANA_PER_DAMAGE); if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) PlayerHelper.consumeAmmo(((EntityPlayerMP) living), AMMO_FUNC); + } } @Override @@ -185,7 +207,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 3 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 3 || super.getIsRepairable(par1ItemStack, par2ItemStack); } @Override @@ -193,8 +215,10 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } - protected ItemStack getAmmo(EntityPlayer player) { - return PlayerHelper.getAmmo(player, AMMO_FUNC); + protected ItemStack getAmmo(EntityLivingBase shooter) { + if(shooter instanceof EntityPlayer) + return PlayerHelper.getAmmo((EntityPlayer) shooter, AMMO_FUNC); + else return new ItemStack(Items.ARROW); } } From 974e8d0316ab3a4d72d1664fd75cb09e708a46fa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 May 2016 20:55:48 -0500 Subject: [PATCH 636/935] Build 307 --- build.properties | 8 ++++---- version/1.9.4.txt | 2 +- web/versions.ini | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 62ec2f2a5..98ad87606 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Thu May 19 09:23:16 CDT 2016 +#Fri May 27 20:53:49 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1922-1.9.4 -mc_version=1.9.4 dir_repo=./ -build_number=307 +mc_version=1.9.4 +forge_version=12.17.0.1922-1.9.4 +build_number=308 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt index f3b791532..c63f2e8ea 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-306 \ No newline at end of file +r1.8-307 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 5a6ea1186..d3fcadf9f 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -255,4 +255,5 @@ r1.8-302=1.9 r1.8-303=1.9 r1.8-304=1.9 r1.8-305=1.9 -r1.8-306=1.9.4 \ No newline at end of file +r1.8-306=1.9.4 +r1.8-307=1.9.4 \ No newline at end of file From 8ef557e51b89528f8c213acf5cde43defa57325f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 11:04:40 -0500 Subject: [PATCH 637/935] Remove loot debug -.- --- .../java/vazkii/botania/common/core/loot/LootHandler.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 45f7d8d30..2e341947d 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -58,14 +58,6 @@ public final class LootHandler { } } - @SubscribeEvent - public void lootTest(PlayerInteractEvent.EntityInteract evt) { - if (!evt.getWorld().isRemote && evt.getTarget() instanceof EntityMinecartChest) { - ((EntityMinecartChest) evt.getTarget()).clear(); - ((EntityMinecartChest) evt.getTarget()).setLootTable(new ResourceLocation("minecraft", "chests/village_blacksmith"), evt.getTarget().worldObj.rand.nextLong()); - } - } - private LootPool getInjectPool(String entryName) { return new LootPool(new LootEntry[] { getInjectEntry(entryName, 1) }, new LootCondition[0], new RandomValueRange(1), new RandomValueRange(0, 1), "botania_inject_pool"); } From 4f0d63f5a0941f69790782799de136922008369c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 11:09:08 -0500 Subject: [PATCH 638/935] Build 308 --- build.properties | 8 ++++---- version/1.9.4.txt | 2 +- web/versions.ini | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 98ad87606..afab433db 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Fri May 27 20:53:49 CDT 2016 +#Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.9.4 forge_version=12.17.0.1922-1.9.4 -build_number=308 +mc_version=1.9.4 +dir_repo=./ +build_number=309 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt index c63f2e8ea..4aa35fd4a 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-307 \ No newline at end of file +r1.8-308 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index d3fcadf9f..ddee2c0ed 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -256,4 +256,5 @@ r1.8-303=1.9 r1.8-304=1.9 r1.8-305=1.9 r1.8-306=1.9.4 -r1.8-307=1.9.4 \ No newline at end of file +r1.8-307=1.9.4 +r1.8-308=1.9.4 \ No newline at end of file From c08fa024a09580e1a21eeb5dbedd8137d491770d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 11:46:06 -0500 Subject: [PATCH 639/935] Add update.json not done yet, bump forge minimum req version --- .../java/vazkii/botania/common/Botania.java | 3 ++- .../vazkii/botania/common/lib/LibMisc.java | 3 ++- version/update.json | 21 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 version/update.json diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 69e897c3c..fc5a5922b 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -42,7 +42,8 @@ import vazkii.botania.common.integration.coloredlights.LightHelperColored; import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; import vazkii.botania.common.lib.LibMisc; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS) +@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, + guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) public class Botania { public static boolean gardenOfGlassLoaded = false; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 5f372cb07..0995a4ce5 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,8 +17,9 @@ 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.1909,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1922,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; + public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/version/update.json b/version/update.json new file mode 100644 index 000000000..7267968b9 --- /dev/null +++ b/version/update.json @@ -0,0 +1,21 @@ +{ + "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", + "1.9": { + "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", + "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", + "r1.8-303": "See https://github.com/williewillus/Botania/releases/r1.8-303", + "r1.8-304": "See https://github.com/williewillus/Botania/releases/r1.8-304", + "r1.8-305": "See https://github.com/williewillus/Botania/releases/r1.8-305" + }, + "1.9.4": { + "r1.8-306": "See https://github.com/williewillus/Botania/releases/r1.8-306", + "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", + "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308" + }, + "promos": { + "1.9-latest": "r1.8-305", + "1.9-recommended": "r1.8-305", + "1.9.4-latest": "r1.8-308", + "1.9.4-recommended": "r1.8-308" + } +} \ No newline at end of file From cc1b66f3cd31206a2716233816ae970fe2d53e8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 12:49:59 -0500 Subject: [PATCH 640/935] Gradle script automatically updates update.json --- build.gradle | 26 ++++++++++++++++++------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index aeb1d94fb..61fd27d75 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,6 @@ +import groovy.json.JsonSlurper +import groovy.json.JsonOutput + buildscript { repositories { mavenCentral() @@ -115,8 +118,22 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { file('web/versions.ini').append("\n${version}=${minecraft.version}") file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") + + def updateJsonFile = file('version/update.json') + def updateJson = new JsonSlurper().parse(updateJsonFile) as Map + + // Add to version section + updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" + + // Update promos + updateJson.promos."${minecraft.version}-latest" = "${version}" + updateJson.promos."${minecraft.version}-recommended" = "${version}" + + + updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) } +/* Unused - Forgecraft and web server stuff // I have no idea what I'm doing task wtfGradle2(type: Copy) { from(jar.destinationDir) @@ -154,9 +171,7 @@ task sort(type: Delete) { delete "${config.dir_output}/${deobfJar.archiveName}", "${config.dir_output}/wtf" } -/** - * This is the upload task from the build.xml - */ +// This is the upload task from the build.xml task upload() << { scp('/files') { fileset(file: jar.archivePath) @@ -172,9 +187,7 @@ task upload() << { } } -/** - * This is deply_web task - */ +// This is deploy_web task task deployWeb << { scp('/') { fileset(dir: 'web') //everything from the web directory @@ -202,6 +215,7 @@ def scp(String dir, Closure antFileset = {}) { } } } +*/ def parseConfig(File config) { config.withReader { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848f1..ca2b663a0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Sat May 28 11:56:22 CDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip From 3e0f5da01ddc1f4bb91b42e0e6b7586ef46ca87f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 15:44:20 -0500 Subject: [PATCH 641/935] Clean up gaia head renderer. Closes #303 --- .../render/tile/RenderTileSkullOverride.java | 59 +++++-------------- .../common/block/tile/TileGaiaHead.java | 4 +- .../botania/common/item/ItemGaiaHead.java | 2 +- 3 files changed, 20 insertions(+), 45 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index dd9984519..6ca9212c9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import com.mojang.authlib.GameProfile; +import com.sun.istack.internal.Nullable; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; @@ -22,56 +23,28 @@ import vazkii.botania.client.model.ModelSkullOverride; import vazkii.botania.client.render.entity.RenderDoppleganger; import vazkii.botania.common.block.tile.TileGaiaHead; +import javax.annotation.Nonnull; + public class RenderTileSkullOverride extends TileEntitySkullRenderer { - - public static final ModelSkullOverride modelSkull = new ModelSkullOverride(); - @Override - public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) { - if (p_147500_1_ != null) { - render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7), p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress); - } else { - render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0); - } - } - - public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) { + public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress) { boolean gaia = skull == null || skull instanceof TileGaiaHead; - if(gaia) { - Minecraft minecraft = Minecraft.getMinecraft(); - ResourceLocation resourcelocation = minecraft.thePlayer.getLocationSkin(); - bindTexture(resourcelocation); - GlStateManager.pushMatrix(); - GlStateManager.disableCull(); - if (par4 != EnumFacing.UP) { - switch (par4) { - case NORTH: - GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.74F); - break; - case SOUTH: - GlStateManager.translate(par1 + 0.5F, par2 + 0.25F, par3 + 0.26F); - par5 = 180.0F; - break; - case WEST: - GlStateManager.translate(par1 + 0.74F, par2 + 0.25F, par3 + 0.5F); - par5 = 270.0F; - break; - case EAST: - default: - GlStateManager.translate(par1 + 0.26F, par2 + 0.25F, par3 + 0.5F); - par5 = 90.0F; - } - } else GlStateManager.translate(par1 + 0.5F, par2, par3 + 0.5F); - GlStateManager.enableRescaleNormal(); - GlStateManager.scale(-1.0F, -1.0F, 1.0F); - GlStateManager.enableAlpha(); + if(gaia) ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - modelSkull.render(null, 0F, 0F, 0F, par5, 0F, 0.0625F); + if(skull == null) + // Copy of super that is null safe + renderSkull((float) x, (float) y, (float) z, EnumFacing.NORTH, 0, 3, null, digProgress, partialTicks); + else super.renderTileEntityAt(skull, x, y, z, partialTicks, digProgress); + if(gaia) ShaderHelper.releaseShader(); - GlStateManager.popMatrix(); - } else super.renderSkull(par1, par2, par3, par4, par5, par6, gameProfile, digProgress, 0); + } + + @Override + public void renderSkull(float x, float y, float z, @Nonnull EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { + // Null out profile so Steve skin renders at all times + super.renderSkull(x, y, z, facing, rotation, skullType, null, destroyStage, animateTicks); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java index 6d705d90a..3759f8574 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java @@ -13,5 +13,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.TileEntitySkull; public class TileGaiaHead extends TileEntitySkull { - + public TileGaiaHead() { + setType(3); + } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 57f292cb0..db672dda7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -94,7 +94,7 @@ public class ItemGaiaHead extends ItemMod { tileentityskull.setPlayerProfile(gameprofile);*/ } else { - tileentityskull.setType(stack.getMetadata()); + tileentityskull.setType(3); // Botania - Force type to 3 (humanoid) } tileentityskull.setSkullRotation(i); From ac003f13078943a384ae58e25fe93150439572bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 May 2016 16:45:57 -0500 Subject: [PATCH 642/935] Gaia guardian now looks like whoever is viewing it. spooky. --- .../client/core/proxy/ClientProxy.java | 4 +- .../render/entity/RenderDoppleganger.java | 25 +++++- .../render/tile/RenderTileGaiaHead.java | 81 +++++++++++++++++++ .../render/tile/RenderTileSkullOverride.java | 50 ------------ 4 files changed, 107 insertions(+), 53 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java delete mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java 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 64dc9b9dd..bb0227e71 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -95,7 +95,7 @@ import vazkii.botania.client.render.tile.RenderTilePrism; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.client.render.tile.RenderTileRuneAltar; -import vazkii.botania.client.render.tile.RenderTileSkullOverride; +import vazkii.botania.client.render.tile.RenderTileGaiaHead; import vazkii.botania.client.render.tile.RenderTileSparkChanger; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.client.render.tile.RenderTileStarfield; @@ -252,7 +252,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); - ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); + ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileGaiaHead()); ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 77f2125b2..551c0a10e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -10,10 +10,13 @@ */ package vazkii.botania.client.render.entity; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.internal.ShaderCallback; @@ -21,6 +24,8 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; import javax.annotation.Nonnull; +import java.util.Map; +import java.util.UUID; public class RenderDoppleganger extends RenderBiped { @@ -73,7 +78,25 @@ public class RenderDoppleganger extends RenderBiped { @Nonnull @Override protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger par1Entity) { - return DefaultPlayerSkin.getDefaultSkinLegacy(); + Minecraft mc = Minecraft.getMinecraft(); + + if(!(mc.getRenderViewEntity() instanceof EntityPlayer)) + return DefaultPlayerSkin.getDefaultSkinLegacy(); + + EntityPlayer view = (EntityPlayer) mc.getRenderViewEntity(); + + // Adapated from TileEntitySkullRenderer.renderTileEntityAt + Map map = mc.getSkinManager().loadSkinFromCache(view.getGameProfile()); + + if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) + { + return mc.getSkinManager().loadSkin(map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); + } + else + { + UUID uuid = EntityPlayer.getUUID(view.getGameProfile()); + return DefaultPlayerSkin.getDefaultSkin(uuid); + } } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java new file mode 100644 index 000000000..ce07369d4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -0,0 +1,81 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [? (GMT)] + */ +package vazkii.botania.client.render.tile; + +import com.mojang.authlib.GameProfile; +import com.sun.istack.internal.Nullable; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.EntityWither; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntitySkull; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.model.ModelSkullOverride; +import vazkii.botania.client.render.entity.RenderDoppleganger; +import vazkii.botania.common.block.tile.TileGaiaHead; + +import javax.annotation.Nonnull; + +public class RenderTileGaiaHead extends TileEntitySkullRenderer { + @Override + public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress) { + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + + // Null-safe copy of super + this.renderSkull((float)x, (float)y, (float)z, + skull == null ? EnumFacing.NORTH : EnumFacing.getFront(skull.getBlockMetadata() & 7), + skull == null ? 0 : skull.getSkullRotation() * 360 / 16.0F, + 3, null, digProgress, partialTicks); + + ShaderHelper.releaseShader(); + } + + @Override + public void setRendererDispatcher(@Nonnull TileEntityRendererDispatcher dispatcher) { + this.rendererDispatcher = dispatcher; + // Do not set `instance` to us, interferes with vanilla skulls + } + + @Override + public void renderSkull(float x, float y, float z, @Nonnull EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { + Minecraft mc = Minecraft.getMinecraft(); + Entity view = mc.getRenderViewEntity(); + + profile = null; + + if(view instanceof EntityPlayer) { + skullType = 3; + profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); + } else if (view instanceof EntitySkeleton) { + skullType = 0; + if(((EntitySkeleton) view).getSkeletonType() == 1) + skullType = 1; + } else if(view instanceof EntityWither) + skullType = 1; + else if(view instanceof EntityZombie) + skullType = 2; + else if(view instanceof EntityCreeper) + skullType = 4; + else if(view instanceof EntityDragon) + skullType = 5; + + super.renderSkull(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java deleted file mode 100644 index 6ca9212c9..000000000 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.render.tile; - -import com.mojang.authlib.GameProfile; -import com.sun.istack.internal.Nullable; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; -import net.minecraft.tileentity.TileEntitySkull; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.model.ModelSkullOverride; -import vazkii.botania.client.render.entity.RenderDoppleganger; -import vazkii.botania.common.block.tile.TileGaiaHead; - -import javax.annotation.Nonnull; - -public class RenderTileSkullOverride extends TileEntitySkullRenderer { - @Override - public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress) { - boolean gaia = skull == null || skull instanceof TileGaiaHead; - - if(gaia) - ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - - if(skull == null) - // Copy of super that is null safe - renderSkull((float) x, (float) y, (float) z, EnumFacing.NORTH, 0, 3, null, digProgress, partialTicks); - else super.renderTileEntityAt(skull, x, y, z, partialTicks, digProgress); - - if(gaia) - ShaderHelper.releaseShader(); - } - - @Override - public void renderSkull(float x, float y, float z, @Nonnull EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { - // Null out profile so Steve skin renders at all times - super.renderSkull(x, y, z, facing, rotation, skullType, null, destroyStage, animateTicks); - } -} \ No newline at end of file From 688da731ab7e4f52819e1c3c23ad04871e1601a0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 May 2016 12:57:21 -0500 Subject: [PATCH 643/935] Spell cloth can no longer be enchanted at an anvil, closes #308 --- .../botania/common/crafting/recipe/SpellClothRecipe.java | 2 +- src/main/java/vazkii/botania/common/item/ItemSpellCloth.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 71f28a442..95ac205d4 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -30,7 +30,7 @@ public class SpellClothRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { - if(stack.isItemEnchanted() && !foundEnchanted) + if(stack.isItemEnchanted() && !foundEnchanted && stack.getItem() != ModItems.spellCloth) foundEnchanted = true; else if(stack.getItem() == ModItems.spellCloth && !foundCloth) diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 68191bb33..0853c7433 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -34,6 +34,11 @@ public class ItemSpellCloth extends ItemMod implements IColorable { RecipeSorter.register("botania:spellCloth", SpellClothRecipe.class, Category.SHAPELESS, ""); } + @Override + public boolean isBookEnchantable(ItemStack stack, ItemStack book) { + return false; + } + @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { From 307068c9c42997854a0ba7dbe4a4c9b7725975cd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 May 2016 16:21:56 -0500 Subject: [PATCH 644/935] Lower spawn fuzz to 0 in gog, fixes #287 --- .../java/vazkii/botania/common/world/WorldTypeSkyblock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 06968d5df..ff3b44a9d 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -41,7 +41,7 @@ public class WorldTypeSkyblock extends WorldType { @Override public int getSpawnFuzz(@Nonnull WorldServer world, MinecraftServer server) { - return 2; + return 0; } @Override From 6c52c4f5f90ce7e4020e3721e08d3aa688d8c303 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 May 2016 17:14:06 -0500 Subject: [PATCH 645/935] Fix chakrams being weird. Closes #306 --- .../common/entity/EntityThornChakram.java | 141 +++++++++++------- .../botania/common/item/ItemThornChakram.java | 12 +- 2 files changed, 90 insertions(+), 63 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index eb9b57e74..d7a662678 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -13,6 +13,7 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -39,8 +40,9 @@ public class EntityThornChakram extends EntityThrowable { private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); private static final DataParameter FLARE = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.BOOLEAN); + private static final DataParameter RETURN_TO = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); private static final int MAX_BOUNCES = 16; - boolean bounced = false; + private boolean bounced = false; private ItemStack stack; public EntityThornChakram(World world) { @@ -57,57 +59,62 @@ public class EntityThornChakram extends EntityThrowable { super.entityInit(); dataManager.register(BOUNCES, 0); dataManager.register(FLARE, false); + dataManager.register(RETURN_TO, -1); } @Override public void onUpdate() { + // Standard motion double mx = motionX; double my = motionY; double mz = motionZ; super.onUpdate(); - if(isFire()) { + if(!bounced) { + // Reset the drag applied by super + motionX = mx; + motionY = my; + motionZ = mz; + } + + bounced = false; + + // Returning motion + if(isReturning()) { + Entity thrower = worldObj.getEntityByID(getEntityToReturnTo()); + Vector3 motion = Vector3.fromEntityCenter(thrower).sub(Vector3.fromEntityCenter(this)).normalize(); + motionX = motion.x; + motionY = motion.y; + motionZ = motion.z; + } + + // Client FX + if(worldObj.isRemote && isFire()) { double r = 0.1; double m = 0.1; for(int i = 0; i < 3; i++) worldObj.spawnParticle(EnumParticleTypes.FLAME, posX + r * (Math.random() - 0.5), posY + r * (Math.random() - 0.5), posZ + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); } - int bounces = getTimesBounced(); - if(bounces >= MAX_BOUNCES || ticksExisted > 60) { + // Server state control + if(!worldObj.isRemote && (getTimesBounced() >= MAX_BOUNCES || ticksExisted > 60)) { EntityLivingBase thrower = getThrower(); - noClip = true; - if(thrower == null) + if(thrower == null) { dropAndKill(); - else { - Vector3 motion = Vector3.fromEntityCenter(thrower).sub(Vector3.fromEntityCenter(this)).normalize(); - motionX = motion.x; - motionY = motion.y; - motionZ = motion.z; - if(!worldObj.isRemote && MathHelper.pointDistanceSpace(posX, posY, posZ, thrower.posX, thrower.posY, thrower.posZ) < 1) - if(!(thrower instanceof EntityPlayer && (((EntityPlayer) thrower).capabilities.isCreativeMode || ((EntityPlayer) thrower).inventory.addItemStackToInventory(getItemStack())))) - dropAndKill(); - else - setDead(); + } else { + setEntityToReturnTo(thrower.getEntityId()); + if(getDistanceSqToEntity(thrower) < 2) + dropAndKill(); } - } else { - if(!bounced) { - motionX = mx; - motionY = my; - motionZ = mz; - } - bounced = false; } } private void dropAndKill() { - if(!worldObj.isRemote) { - ItemStack stack = getItemStack(); - EntityItem item = new EntityItem(worldObj, posX, posY, posZ, stack); - worldObj.spawnEntityInWorld(item); - setDead(); - } + ItemStack stack = getItemStack(); + EntityItem item = new EntityItem(worldObj, posX, posY, posZ, stack); + worldObj.spawnEntityInWorld(item); + setDead(); } private ItemStack getItemStack() { @@ -116,36 +123,44 @@ public class EntityThornChakram extends EntityThrowable { @Override protected void onImpact(@Nonnull RayTraceResult pos) { - if(noClip) + if(isReturning()) return; - if (pos.getBlockPos() != null) { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); - worldObj.getTileEntity(pos.getBlockPos()); - if(block instanceof BlockBush || block instanceof BlockLeaves) - return; - } + switch (pos.typeOfHit) { + case BLOCK: { + Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + if(block instanceof BlockBush || block instanceof BlockLeaves) + return; - boolean fire = isFire(); - EntityLivingBase thrower = getThrower(); - if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { - pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causePlayerDamage((EntityPlayer) thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); - if(fire) - pos.entityHit.setFire(5); - else if(worldObj.rand.nextInt(3) == 0) - ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); - } else if (pos.getBlockPos() != null) { - int bounces = getTimesBounced(); - if(bounces < MAX_BOUNCES) { - Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); - EnumFacing dir = pos.sideHit; - Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); - Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); + int bounces = getTimesBounced(); + if(bounces < MAX_BOUNCES) { + Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); + EnumFacing dir = pos.sideHit; + Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); + Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); - motionX = movementVec.x; - motionY = movementVec.y; - motionZ = movementVec.z; - bounced = true; + motionX = movementVec.x; + motionY = movementVec.y; + motionZ = movementVec.z; + bounced = true; + + if(!worldObj.isRemote) + setTimesBounced(getTimesBounced() + 1); + } + + break; + } + case ENTITY: { + if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != getThrower()) { + EntityLivingBase thrower = getThrower(); + pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causeThrownDamage(this, thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); + if(isFire()) + pos.entityHit.setFire(5); + else if(worldObj.rand.nextInt(3) == 0) + ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); + } + + break; } } } @@ -155,11 +170,11 @@ public class EntityThornChakram extends EntityThrowable { return 0F; } - public int getTimesBounced() { + private int getTimesBounced() { return dataManager.get(BOUNCES); } - public void setTimesBounced(int times) { + private void setTimesBounced(int times) { dataManager.set(BOUNCES, times); } @@ -171,6 +186,18 @@ public class EntityThornChakram extends EntityThrowable { dataManager.set(FLARE, fire); } + private boolean isReturning() { + return getEntityToReturnTo() > -1; + } + + private int getEntityToReturnTo() { + return dataManager.get(RETURN_TO); + } + + private void setEntityToReturnTo(int entityID) { + dataManager.set(RETURN_TO, entityID); + } + @Override public void writeEntityToNBT(NBTTagCompound compound) { super.writeEntityToNBT(compound); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index a3930162b..c57e53b38 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -22,6 +22,8 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; @@ -38,6 +40,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { setHasSubtypes(true); } + @SideOnly(Side.CLIENT) @Override public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) @@ -53,20 +56,17 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { @Nonnull @Override public ActionResult onItemRightClick(@Nonnull 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)); - if(!world.isRemote) { ItemStack copy = stack.copy(); - stack.stackSize = 1; + copy.stackSize = 1; EntityThornChakram c = new EntityThornChakram(world, player, copy); c.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); c.setFire(stack.getItemDamage() != 0); world.spawnEntityInWorld(c); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + --stack.stackSize; } - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } From 2065f01b8dcaff84f60ae20b495b635f8a240db3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 May 2016 21:37:56 -0500 Subject: [PATCH 646/935] Fix pool crafting particles --- .../vazkii/botania/client/fx/FXSparkle.java | 122 ++++++++---------- .../common/network/PacketBotaniaEffect.java | 2 +- 2 files changed, 55 insertions(+), 69 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index aa83edf12..ae5e53987 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -18,9 +18,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; @@ -142,7 +142,7 @@ public class FXSparkle extends Particle { motionY -= 0.04D * particleGravity; if (!noClip && !fake) - pushOutOfBlocks(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); + wiggleAround(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); posX += motionX; posY += motionY; @@ -167,89 +167,75 @@ public class FXSparkle extends Particle { particleGravity = value; } - private boolean pushOutOfBlocks(double par1, double par3, double par5) { - int var7 = MathHelper.floor_double(par1); - int var8 = MathHelper.floor_double(par3); - int var9 = MathHelper.floor_double(par5); - double var10 = par1 - var7; - double var12 = par3 - var8; - double var14 = par5 - var9; + // Copy of Entity.pushOutOfBlocks with several important changes + private boolean wiggleAround(double x, double y, double z) + { + BlockPos blockpos = new BlockPos(x, y, z); + double d0 = x - (double)blockpos.getX(); + double d1 = y - (double)blockpos.getY(); + double d2 = z - (double)blockpos.getZ(); - BlockPos bPos = new BlockPos(var7, var8, var9); - if (!worldObj.isAirBlock(bPos)) { - boolean var16 = !worldObj.isBlockNormalCube(bPos.west(), false); - boolean var17 = !worldObj.isBlockNormalCube(bPos.east(), false); - boolean var18 = !worldObj.isBlockNormalCube(bPos.down(), false); - boolean var19 = !worldObj.isBlockNormalCube(bPos.up(), false); - boolean var20 = !worldObj.isBlockNormalCube(bPos.north(), false); - boolean var21 = !worldObj.isBlockNormalCube(bPos.south(), false); - byte var22 = -1; - double var23 = 9999.0D; + // Botania - change collision box list check to !airblock check + if (!worldObj.isAirBlock(blockpos)) + { + EnumFacing enumfacing = EnumFacing.UP; + double d3 = Double.MAX_VALUE; - if (var16 && var10 < var23) { - var23 = var10; - var22 = 0; + if (!this.worldObj.isBlockFullCube(blockpos.west()) && d0 < d3) + { + d3 = d0; + enumfacing = EnumFacing.WEST; } - if (var17 && 1.0D - var10 < var23) { - var23 = 1.0D - var10; - var22 = 1; + if (!this.worldObj.isBlockFullCube(blockpos.east()) && 1.0D - d0 < d3) + { + d3 = 1.0D - d0; + enumfacing = EnumFacing.EAST; } - if (var18 && var12 < var23) { - var23 = var12; - var22 = 2; + + if (!this.worldObj.isBlockFullCube(blockpos.north()) && d2 < d3) + { + d3 = d2; + enumfacing = EnumFacing.NORTH; } - if (var19 && 1.0D - var12 < var23) { - var23 = 1.0D - var12; - var22 = 3; + if (!this.worldObj.isBlockFullCube(blockpos.south()) && 1.0D - d2 < d3) + { + d3 = 1.0D - d2; + enumfacing = EnumFacing.SOUTH; } - if (var20 && var14 < var23) { - var23 = var14; - var22 = 4; + if (!this.worldObj.isBlockFullCube(blockpos.up()) && 1.0D - d1 < d3) + { + d3 = 1.0D - d1; + enumfacing = EnumFacing.UP; } - if (var21 && 1.0D - var14 < var23) { - var22 = 5; + float f = this.rand.nextFloat() * 0.05F + 0.01F; // Botania - made multiplier and add both smaller + float f1 = (float)enumfacing.getAxisDirection().getOffset(); + float secondary = (rand.nextFloat() - rand.nextFloat()) * 0.1F; // Botania - Make and use a secondary movement variable below + + if (enumfacing.getAxis() == EnumFacing.Axis.X) + { + this.motionX += (double)(f1 * f); + this.motionY = this.motionZ = secondary; } - - float var25 = rand.nextFloat() * 0.05F + 0.025F; - float var26 = (rand.nextFloat() - rand.nextFloat()) * 0.1F; - - if (var22 == 0) { - motionX = -var25; - motionY=motionZ=var26; + else if (enumfacing.getAxis() == EnumFacing.Axis.Y) + { + this.motionY += (double)(f1 * f); + this.motionX = this.motionZ = secondary; } - - if (var22 == 1) { - motionX = var25; - motionY=motionZ=var26; - } - - if (var22 == 2) { - motionY = -var25; - motionX=motionZ=var26; - } - - if (var22 == 3) { - motionY = var25; - motionX=motionZ=var26; - } - - if (var22 == 4) { - motionZ = -var25; - motionY=motionX=var26; - } - - if (var22 == 5) { - motionZ = var25; - motionY=motionX=var26; + else if (enumfacing.getAxis() == EnumFacing.Axis.Z) + { + this.motionZ += (double)(f1 * f); + this.motionX = this.motionY = secondary; } return true; - } else return false; + } + + return false; } public boolean corrupt = false; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 59b86dc15..9800b09dc 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -74,7 +74,7 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } break; From fd35d254230ef4d77cff1f63bc22c568a9c6f112 Mon Sep 17 00:00:00 2001 From: Howtonotwin Date: Tue, 31 May 2016 17:17:20 -0400 Subject: [PATCH 647/935] Limit BH Talisman to world height. Fixes #258 --- .../java/vazkii/botania/common/item/ItemBlackHoleTalisman.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 297968760..4812eb2bb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -115,8 +115,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } else { int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); + BlockPos correctedPos = bBlock.isReplaceable(par3World, pos) ? pos : pos.offset(side); - if(entities == 0) { + if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) { int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); if(remove > 0) { ItemStack stack = new ItemStack(bBlock, 1, bmeta); From 96a2da61f53598e9afe096ffd028db78cc6aed00 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 31 May 2016 20:03:39 -0500 Subject: [PATCH 648/935] Fix wrong import --- .../botania/client/render/tile/RenderTileGaiaHead.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index ce07369d4..0921dde96 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -11,9 +11,7 @@ package vazkii.botania.client.render.tile; import com.mojang.authlib.GameProfile; -import com.sun.istack.internal.Nullable; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.entity.Entity; @@ -25,13 +23,11 @@ import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.model.ModelSkullOverride; import vazkii.botania.client.render.entity.RenderDoppleganger; -import vazkii.botania.common.block.tile.TileGaiaHead; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class RenderTileGaiaHead extends TileEntitySkullRenderer { @Override From 6014df2b1229bd2d807224d3c37a51baceaf5035 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 31 May 2016 20:57:45 -0500 Subject: [PATCH 649/935] Fix a couple baubles --- .../common/item/equipment/bauble/ItemDivaCharm.java | 10 +++++----- .../common/item/equipment/bauble/ItemLavaPendant.java | 7 +++---- .../item/equipment/bauble/ItemSuperLavaPendant.java | 7 +++---- 3 files changed, 11 insertions(+), 13 deletions(-) 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 4b7c87ef8..d946ea300 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 @@ -99,13 +99,13 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); 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); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + GlStateManager.scale(0.8, 0.8, 0.8); + GlStateManager.rotate(-90, 0, 1, 0); + GlStateManager.rotate(180, 1, 0, 0); + GlStateManager.translate(0.1625, -1.625, 0.40); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.GROUND); } } 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 3c6929175..189cca99d 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 @@ -48,10 +48,9 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5, 0.5, 0.5); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem; float f = gemIcon.getMinU(); 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 4ef467f66..563eb43ae 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 @@ -59,10 +59,9 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5, 0.5, 0.5); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem; float f = gemIcon.getMinU(); From 1bff63807581a3b3c76c9ae92ac7d01739cf8cbe Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 1 Jun 2016 18:39:36 -0400 Subject: [PATCH 650/935] Make the lexicon recipe mappings accept the wildcard value --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index b955cbab6..81eb5e162 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -11,6 +11,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.IManaItem; import java.util.HashMap; @@ -47,13 +48,18 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { + ItemStack wildCopy = stack.copy(); + wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); + String wildKey = stackToString(wildCopy); + if (mappings.containsKey(wildKey)) + return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { if(stack == null || stack.getItem() == null) return "NULL"; - + if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); @@ -61,7 +67,7 @@ public final class LexiconRecipeMappings { } public static boolean ignoreMeta(ItemStack stack) { - return stack.isItemStackDamageable() || stack.getItem() instanceof IManaItem; + return stack.isItemStackDamageable() || stack.getItem() instanceof IManaItem || stack.getItemDamage() == OreDictionary.WILDCARD_VALUE; } public static class EntryData { From d2aa4e0ebcf6b7bf10fdd10f76d04086f1364617 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 1 Jun 2016 20:19:40 -0500 Subject: [PATCH 651/935] Fix some missing glstatemanager substitutions. Fixes #307 --- .../gui/lexicon/button/GuiButtonInvisible.java | 6 +++--- .../botania/common/block/tile/TileAltar.java | 7 ++++--- .../common/block/tile/TileRuneAltar.java | 17 +++++++++-------- .../common/lexicon/page/PagePetalRecipe.java | 6 +++--- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 156174922..bff99eccf 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -56,12 +56,12 @@ public class GuiButtonInvisible extends GuiButtonLexicon { par1Minecraft.renderEngine.bindTexture(dogResource); float f = 1F / 64F; - GL11.glTranslated(dogPos, 0, 0); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.translate(dogPos, 0, 0); + GlStateManager.color(1F, 1F, 1F, 1F); vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, (dogPos % 100 < 50) ? 23 : 0, 0, 23, 19, f, f); xPosition = (int) Math.max(xPosition, dogPos + 10); - GL11.glTranslated(-dogPos, 0, 0); + GlStateManager.translate(-dogPos, 0, 0); } hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; 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 9ee0d65af..a975d4755 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -335,7 +336,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { for(RecipePetals recipe : BotaniaAPI.petalRecipes) if(recipe.matches(itemHandler)) { - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(HUDHandler.manaBar); RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); @@ -352,9 +353,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { for(int i = 0; i < amt; i++) { double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; - GL11.glTranslated(xPos, yPos, 0); + GlStateManager.translate(xPos, yPos, 0); mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); - GL11.glTranslated(-xPos, -yPos, 0); + GlStateManager.translate(-xPos, -yPos, 0); angle += anglePer; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 143c60b89..337bce14b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -345,23 +346,23 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver float anglePer = 360F / amt; for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) if(recipe.matches(itemHandler)) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.enableRescaleNormal(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); recipe.getOutput(); float progress = (float) mana / (float) manaToGet; mc.renderEngine.bindTexture(HUDHandler.manaBar); - GL11.glColor4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, progress == 1F ? 0 : 22, 8, 22, 15); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); if(progress == 1F) { mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8); - GL11.glTranslatef(0F, 0F, 100F); + GlStateManager.translate(0F, 0F, 100F); mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.twigWand), xc + radius + 24, yc + 8); - GL11.glTranslatef(0F, 0F, -100F); + GlStateManager.translate(0F, 0F, -100F); } RenderHelper.renderProgressPie(xc + radius + 32, yc - 8, progress, recipe.getOutput()); @@ -375,9 +376,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver for(int i = 0; i < amt; i++) { double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; - GL11.glTranslated(xPos, yPos, 0); + GlStateManager.translate(xPos, yPos, 0); mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); - GL11.glTranslated(-xPos, -yPos, 0); + GlStateManager.translate(-xPos, -yPos, 0); angle += anglePer; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 854a98a2f..b1d5202ac 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -99,8 +99,8 @@ public class PagePetalRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { FontRenderer font = Minecraft.getMinecraft().fontRendererObj; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); int x = gui.getLeft() + gui.getWidth() / 2 - 50; int y = gui.getTop() + 120; @@ -111,7 +111,7 @@ public class PagePetalRecipe extends PageRecipe { font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000); font.setUnicodeFlag(unicode); - GL11.glDisable(GL11.GL_BLEND); + GlStateManager.disableBlend(); } @Override From 95bd4689d6b3bf80df75f62e2174fbe1a8b0e83a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 1 Jun 2016 20:39:49 -0500 Subject: [PATCH 652/935] Fix halo crashing, also tweak visuals slightly. Closes #314 --- .../botania/client/core/handler/HUDHandler.java | 6 +++++- .../botania/common/item/ItemCraftingHalo.java | 13 +++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 0117408bb..cc0ca7e53 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -142,9 +142,13 @@ public final class HUDHandler { } if(main != null && main.getItem() instanceof ItemCraftingHalo) { - profiler.startSection("craftingHalo"); + profiler.startSection("craftingHalo_main"); ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, main); profiler.endSection(); + } else if(offhand != null && offhand.getItem() instanceof ItemCraftingHalo) { + profiler.startSection("craftingHalo_off"); + ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, offhand); + profiler.endSection(); } if(main != null && main.getItem() instanceof ItemSextant) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 9d72ddba8..7cd743826 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -460,20 +460,13 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - float scale = seg == 0 ? 0.75F : 0.6F; + float scale = seg == 0 ? 0.9F : 0.8F; GlStateManager.scale(scale, scale, scale); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); - if(slotStack.getItem() instanceof ItemBlock) { - GlStateManager.translate(0, -0.5, 0.5F); - IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItem().getMetadata(slotStack.getMetadata())); - Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F); - } else { - - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); - Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); - } + GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); + Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); } GlStateManager.popMatrix(); From 4cfd420cc11a414a494ffe31420c6bedb3ea9c13 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 1 Jun 2016 21:09:33 -0500 Subject: [PATCH 653/935] Let some technical blocks drop normal drop from weight lens --- .../botania/common/item/lens/LensWeight.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index f735e5663..ba6a39c44 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -10,29 +10,40 @@ */ package vazkii.botania.common.item.lens; +import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.Map; + public class LensWeight extends Lens { + private static final Map TECHNICAL_BLOCK_REMAP = ImmutableMap.of( + Blocks.LIT_REDSTONE_ORE.getDefaultState(), Blocks.REDSTONE_ORE.getDefaultState(), + Blocks.LIT_REDSTONE_LAMP.getDefaultState(), Blocks.REDSTONE_LAMP.getDefaultState() + ); + @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { if(!entity.worldObj.isRemote && !burst.isFake() && pos.getBlockPos() != null) { int harvestLevel = ConfigHandler.harvestLevelWeight; Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); - Block blockBelow = entity.worldObj.getBlockState(pos.getBlockPos().down()).getBlock(); IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); int neededHarvestLevel = block.getHarvestLevel(state); - if(blockBelow.isAir(entity.worldObj.getBlockState(pos.getBlockPos().down()), entity.worldObj, pos.getBlockPos().down()) && state.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), entity.worldObj.getBlockState(pos.getBlockPos()), null)) { + if(entity.worldObj.isAirBlock(pos.getBlockPos().down()) && state.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), state, null)) { + state = TECHNICAL_BLOCK_REMAP.getOrDefault(state, state); EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, state); + falling.fallTime = 1; + entity.worldObj.setBlockToAir(pos.getBlockPos()); entity.worldObj.spawnEntityInWorld(falling); } } From b71cb163a7d8624cddadbdd1814e131ab236c43f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 2 Jun 2016 21:40:36 -0500 Subject: [PATCH 654/935] Fix fallback for contributors with flowers not in main botania. Closes #321 --- .../client/core/handler/ContributorFancinessHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 8d975c5d0..acba63243 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -19,9 +19,11 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.client.core.helper.IconHelper; @@ -43,7 +45,7 @@ public final class ContributorFancinessHandler implements LayerRenderer flowerMap = null; private volatile static boolean startedLoading = false; - public static final boolean phi = false; + private static final boolean phi = false; @Override public void doRenderLayer(@Nonnull 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) { @@ -97,9 +99,10 @@ public final class ContributorFancinessHandler implements LayerRenderer Date: Fri, 3 Jun 2016 18:56:06 -0500 Subject: [PATCH 655/935] Update BM mod id --- src/main/java/vazkii/botania/common/Botania.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index fc5a5922b..0387c914c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -71,7 +71,7 @@ public class Botania { thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); - bloodMagicLoaded = Loader.isModLoaded("AWWayofTime"); // Psh, noob + bloodMagicLoaded = Loader.isModLoaded("BloodMagic"); // Psh, noob coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); From fab5fc0087909b5975c6875d824114fc6586086a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 19:28:15 -0500 Subject: [PATCH 656/935] Remove ColoredLights integration --- .../java/vazkii/botania/common/Botania.java | 7 -- .../block/BlockFloatingSpecialFlower.java | 6 +- .../vazkii/botania/common/block/BlockMod.java | 10 --- .../botania/common/block/BlockModFlower.java | 9 --- .../common/block/BlockSpecialFlower.java | 6 +- .../common/block/decor/BlockBuriedPetals.java | 10 --- .../block/decor/BlockFloatingFlower.java | 9 --- .../common/block/decor/BlockModMushroom.java | 18 ----- .../common/block/decor/BlockSeaLamp.java | 17 ----- .../common/block/decor/BlockShinyFlower.java | 11 --- .../common/block/tile/TileManaFlame.java | 6 +- .../coloredlights/ColoredLightHelper.java | 74 ------------------- .../coloredlights/ILightHelper.java | 23 ------ .../coloredlights/LightHelper.java | 28 ------- .../coloredlights/LightHelperColored.java | 30 -------- .../coloredlights/LightHelperVanilla.java | 30 -------- 16 files changed, 3 insertions(+), 291 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java delete mode 100644 src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 0387c914c..76ee58996 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -37,9 +37,6 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.integration.coloredlights.ILightHelper; -import vazkii.botania.common.integration.coloredlights.LightHelperColored; -import vazkii.botania.common.integration.coloredlights.LightHelperVanilla; import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, @@ -57,8 +54,6 @@ public class Botania { public static boolean storageDrawersLoaded = false; public static boolean quarkLoaded = false; - public static ILightHelper lightHelper; - @Instance(LibMisc.MOD_ID) public static Botania instance; @@ -79,8 +74,6 @@ public class Botania { storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); - lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); - proxy.preInit(event); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c3dce0dd0..86c50c82d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -46,7 +46,6 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; -import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -92,10 +91,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return world.getBlockState(pos).getLightValue(world, pos); TileEntity tile = world.getTileEntity(pos); - int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; - if(currentLight == -1) - currentLight = originalLight; - return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); + return tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : lightValue; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e3d83c09b..d8c4168be 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -24,8 +24,6 @@ import javax.annotation.Nonnull; public class BlockMod extends Block { - protected int originalLight; - public BlockMod(Material par2Material, String name) { super(par2Material); setUnlocalizedName(name); @@ -39,16 +37,8 @@ public class BlockMod extends Block { GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); } - @Nonnull - @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); - } - protected boolean registerInCreative() { return true; } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 2c1db1c00..be580596e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -51,8 +51,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); - public int originalLight; - protected BlockModFlower() { this(LibBlockNames.FLOWER); } @@ -120,13 +118,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup par3List.add(new ItemStack(par1, 1, i)); } - @Nonnull - @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 8f8dbbff2..aba119a41 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -55,7 +55,6 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.integration.coloredlights.LightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -179,10 +178,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); - int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); - if(currentLight == -1) - currentLight = 0; - return LightHelper.getPackedColor(state.getValue(BotaniaStateProps.COLOR), currentLight); + return world.getTileEntity(pos) == null ? 0 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 73ecac89a..340f40d8c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -18,11 +18,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; @@ -44,14 +42,6 @@ public class BlockBuriedPetals extends BlockModFlower { return AABB; } - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); - } - @Override public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); 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 ce738363f..ca71d8d92 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -55,7 +55,6 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.IFloatingFlowerVariant; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -164,14 +163,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } } - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); - } - @Override public void registerItemForm() { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); 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 9dd6e974b..b9c2ddaa9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -38,7 +38,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -52,7 +51,6 @@ import java.util.Random; public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); - private int originalLight; public BlockModMushroom() { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); @@ -114,22 +112,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis par3List.add(new ItemStack(par1, 1, i)); } - @Nonnull - @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); - } - - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - - return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); 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 644031dc9..1691341a1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -12,26 +12,18 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; - public class BlockSeaLamp extends BlockMod implements ILexiconable { - private int coloredLight = -1; - public BlockSeaLamp() { super(Material.GLASS, LibBlockNames.SEA_LAMP); setHardness(0.3F); @@ -39,15 +31,6 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { setLightLevel(1.0F); } - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - - return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index d04672e8c..07174cff1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -20,10 +20,8 @@ import net.minecraftforge.fml.common.Optional; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -37,15 +35,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili setLightLevel(1F); } - @Override - @Optional.Method(modid = "easycoloredlights") - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - - return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 8f54ea183..64754b76f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; public class TileManaFlame extends TileMod { @@ -63,10 +62,7 @@ public class TileManaFlame extends TileMod { public int getLightColor() { if(lightColor == -1) { - float r = (float) (color >> 16 & 0xFF) / 0xFF; - float g = (float) (color >> 8 & 0xFF) / 0xFF; - float b = (float) (color & 0xFF) / 0xFF; - lightColor = ColoredLightHelper.makeRGBLightValue(r, g, b, 1F); + lightColor = 0xFFFFFF; } return lightColor; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java deleted file mode 100644 index d60697f2f..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Dec 26, 2014, 7:26:31 PM (GMT)] - */ -package vazkii.botania.common.integration.coloredlights; - - -import net.minecraft.item.EnumDyeColor; - -import java.util.EnumMap; -import java.util.Map; - -/* - * This class is presentto help with the Colored Lights mod without needing to package - * the API or hold a dependency, please understand. - */ -public class ColoredLightHelper { - - // Begin API Copypasta - // https://github.com/CptSpaceToaster/CptsModdingLight/blob/1.7.2/src/main/java/coloredlightscore/src/api/CLApi.java - - public static final int[] r = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; - public static final int[] g = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; - public static final int[] b = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; - - public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { - // Clamp color channels - if (r < 0.0f) - r = 0.0f; - else if (r > 1.0f) - r = 1.0f; - - if (g < 0.0f) - g = 0.0f; - else if (g > 1.0f) - g = 1.0f; - - if (b < 0.0f) - b = 0.0f; - else if (b > 1.0f) - b = 1.0f; - - int brightness = (int) (currentLightValue * 15.0f); - brightness &= 0xf; - - return brightness | ((int) (15.0F * b) << 15) + ((int) (15.0F * g) << 10) + ((int) (15.0F * r) << 5); - } - - // End API Copypasta - private static Map packedColors = null; - - public static int getPackedColor(EnumDyeColor color, int light) { - if(packedColors == null) - initPackedColors(); - - return packedColors.get(color)[light]; - } - - private static void initPackedColors() { - packedColors = new EnumMap<>(EnumDyeColor.class); - for(EnumDyeColor color : EnumDyeColor.values()) { - packedColors.put(color, new int[16]); - for(int j = 0; j < 16; j++) - packedColors.get(color)[j] = makeRGBLightValue(r[15 - color.getMetadata()], g[15 - color.getMetadata()], b[15 - color.getMetadata()], j / 16F); - } - } - -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java deleted file mode 100644 index 3ad64401a..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2015, 8:30:41 PM (GMT)] - */ -package vazkii.botania.common.integration.coloredlights; - -import net.minecraft.item.EnumDyeColor; - -/* - * This interface is use for wrappers for compatibility with the colored lights mod. - * It has one version for colored lights, and one version which leaves the light values unmodified for vanilla - */ -public interface ILightHelper { - - public int makeRGBLightValue(float r, float g, float b, int currentLightValue); - public int getPackedColor(EnumDyeColor meta, int light); -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java deleted file mode 100644 index 9721b5da2..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelper.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2015, 8:30:41 PM (GMT)] - */ -package vazkii.botania.common.integration.coloredlights; - -import net.minecraft.item.EnumDyeColor; -import vazkii.botania.common.Botania; - -/* - * This class acts as ColoredLightHelper if the colored lights mod is installed, and leaves the light values unmodified otherwise - */ -public class LightHelper { - - public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { - return Botania.lightHelper.makeRGBLightValue(r, g, b, (int) currentLightValue); - } - - public static int getPackedColor(EnumDyeColor meta, int light) { - return Botania.lightHelper.getPackedColor(meta, light); - } -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java deleted file mode 100644 index 51315523a..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2015, 8:30:41 PM (GMT)] - */ -package vazkii.botania.common.integration.coloredlights; - -import net.minecraft.item.EnumDyeColor; - -/* - * This is an implementation of ILightHelper for when the colored lights mod is installed - */ -public class LightHelperColored implements ILightHelper { - - @Override - public int makeRGBLightValue(float r, float g, float b, int currentLightValue) { - return ColoredLightHelper.makeRGBLightValue(r, g, b, currentLightValue); - } - - @Override - public int getPackedColor(EnumDyeColor color, int light) { - return ColoredLightHelper.getPackedColor(color, light); - } - -} diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java deleted file mode 100644 index bb793708f..000000000 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 16, 2015, 8:30:41 PM (GMT)] - */ -package vazkii.botania.common.integration.coloredlights; - -import net.minecraft.item.EnumDyeColor; - -/* - * This is an implementation of ILightHelper for when the colored lights mod isn't installed - */ -public class LightHelperVanilla implements ILightHelper { - - @Override - public int makeRGBLightValue(float r, float g, float b, int currentLightValue) { - return currentLightValue; - } - - @Override - public int getPackedColor(EnumDyeColor meta, int light) { - return light; - } - -} From 11c0e4b27453e1588b2cfc067bf9b4281914f31d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 19:41:54 -0500 Subject: [PATCH 657/935] Add warning header to all lang files --- src/main/resources/assets/botania/lang/de_DE.lang | 9 +++++++++ src/main/resources/assets/botania/lang/en_US.lang | 9 +++++++++ src/main/resources/assets/botania/lang/es_AR.lang | 8 ++++++++ src/main/resources/assets/botania/lang/es_ES.lang | 11 ++++++++--- src/main/resources/assets/botania/lang/fr_FR.lang | 11 ++++++++--- src/main/resources/assets/botania/lang/ja_JP.lang | 8 ++++++++ src/main/resources/assets/botania/lang/ko_KR.lang | 8 ++++++++ src/main/resources/assets/botania/lang/nl_NL.lang | 8 ++++++++ src/main/resources/assets/botania/lang/pt_BR.lang | 8 ++++++++ src/main/resources/assets/botania/lang/ru_RU.lang | 11 ++++++++--- src/main/resources/assets/botania/lang/zh_CN.lang | 8 ++++++++ src/main/resources/assets/botania/lang/zh_TW.lang | 8 ++++++++ 12 files changed, 98 insertions(+), 9 deletions(-) diff --git a/src/main/resources/assets/botania/lang/de_DE.lang b/src/main/resources/assets/botania/lang/de_DE.lang index d35e2f2ae..a486a1189 100644 --- a/src/main/resources/assets/botania/lang/de_DE.lang +++ b/src/main/resources/assets/botania/lang/de_DE.lang @@ -1,3 +1,12 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in de_DE, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + + # MISC itemGroup.Botania=Botania botaniamisc.nextPage=Nächste Seite diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 9cced70b4..97c284eb4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1,9 +1,18 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# +# Copying English entries will cause them to become outdated when this file changes +# Untranslated entries will automatically be inherited from this file. +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania generator.botania-skyblock=Garden of Glass generator.botania-skyblock.info=Not recommended for botania newcomers # Something that is not localized, translators, do NOT change this line. +# You do not need to copy this into your lang file botaniamisc.noloc=botaniamisc.noloc botaniamisc.unofficial.warnRemove=[Botania] Warning: Some decorative blocks are being removed, please migrate to either the vanilla or Quark versions. diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index 809a3190a..ff25eb5d5 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in es_AR, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania botaniamisc.nextPage=Página Siguiente diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index 153a03243..8e11ce52e 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -1,12 +1,17 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in es_ES, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # Traducción por mojares / Translated by mojares # MISC itemGroup.Botania=Botania generator.botania-skyblock=Jardín de cristal generator.botania-skyblock.info=No recomendado para neófitos en Botania -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=Página siguiente botaniamisc.prevPage=Página anterior botaniamisc.back=Atrás diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index f36094e29..5917fc4a7 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -1,11 +1,16 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in fr_FR, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania generator.botania-skyblock=Jardin de verre generator.botania-skyblock.info=Non recommendé pour les débutants de botania -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=Page suivante botaniamisc.prevPage=Page précédante botaniamisc.back=Retour diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index 42f0cad23..6a31fc1ab 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in ja_JP, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=ボタニア generator.botania-skyblock=ガーデンオブグラス ボタニア・スカイブロック diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 007330dca..b240d1e3f 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in ko_KR, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + #번역시 주의 점: 현재 꽃이름을 제외한 음역은 대부분 패러디로 무리한 한글화를 진행하지 말아주세요(Ex.Tiny Potato) 한글정발을 제외한 모든 패러디는 발음대로 적어주시길 바랍니다. # MISC itemGroup.Botania=보타니아 [Botania] diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index 2083c2109..0cc377119 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in nl_NL, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania generator.botania-skyblock=Glazen Tuin diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 96aebb655..659b985b8 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in pt_BR, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania generator.botania-skyblock=Jardim de Vidro diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 96ceda071..9c25c6f85 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -1,11 +1,16 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in ru_RU, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=Botania generator.botania-skyblock=Garden of Glass generator.botania-skyblock.info=Не рекомендуется для новичков -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=След. страница botaniamisc.prevPage=Пред. страница botaniamisc.back=Назад diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index b0891f62a..ca5cf55de 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in zh_CN, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=植物魔法 generator.botania-skyblock=水晶花园 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index b590b3864..024d8ab9f 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -1,3 +1,11 @@ +# Note to translators: DO NOT COPY ENTRIES FROM ENGLISH +# I repeat: do NOT copy entries from English!! +# Any entry in this lang file should be in zh_TW, or *should not be here at all* +# Copying English entries will cause them to become outdated when the main English lang file changes +# Untranslated entries will automatically be inherited from en_US +# +# Once again, don't copy from English, and THANK YOU for your hard work! + # MISC itemGroup.Botania=植物魔法 generator.botania-skyblock=硝子花園 From 3049ac97672c9baa546b3f1407cca3537c8b5149 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 19:52:54 -0500 Subject: [PATCH 658/935] Clean up English present in de_DE --- .../resources/assets/botania/lang/de_DE.lang | 248 ------------------ 1 file changed, 248 deletions(-) diff --git a/src/main/resources/assets/botania/lang/de_DE.lang b/src/main/resources/assets/botania/lang/de_DE.lang index a486a1189..5a6222540 100644 --- a/src/main/resources/assets/botania/lang/de_DE.lang +++ b/src/main/resources/assets/botania/lang/de_DE.lang @@ -54,14 +54,6 @@ botania.color14=Rot botania.color15=Schwarz botania.color16=Regenbogenfarben -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # VERSION CHECKING botania.versioning.flavour0=WAS ZUM!? BOTANIA IST NICHT AKTUALISIERT!? botania.versioning.flavour1=Willst dur mir weismachen, dass du Botania noch nicht aktualisiert hast, du ignoranter Trottel? @@ -422,45 +414,24 @@ botania.category.misc=Verschiedenes # - BASIC # -- LEXICA BOTANIA botania.entry.lexicon=Lexica Botania -botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botany related matters. But you probably knew that already.
    All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry. -botania.page.lexicon1=Crafting the &1Lexica Botania&0. # -- MYSTICAL FLOWERS botania.entry.flowers=Mystische Blumen -botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
    They come in a total of &416 &0different colors.
    It's also possible to grow these flowers using &1Floral Fertlizer&0 (read on). -botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
    These petals can also be crushed into &1Floral Powder&0, by the use of a &1Pestle and Mortar&0, which functions much alike any mundane piece of dye. -botania.page.flowers3=Plucking Petals off Flowers. -botania.page.flowers4=Crafting the &1Pestle and Mortar&0. -botania.page.flowers5=Grinding Petals into Powder. -botania.page.flowers6=By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertlizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vacinity, if you ever run low on them. -botania.page.flowers7=Making fertilizer (any powder colors work) -botania.page.flowers8=Using typical flower substances also works # -- PETAL APOTHECARY botania.entry.apothecary=Blütenblatttiegel -botania.page.apothecary0=In order for a botanist to create plantlife that can do it's bidding, one would need special means of infusing plants with mystical energy.
    Luckilly, the &1Petal Apothecary&0 does just that. -botania.page.apothecary1=The &1Petal Apothecary&0. -botania.page.apothecary2=This block, when placed in the world and given some water (by use of a &1Water Bucket&0), will accept any &1Mystical Petals&0 thrown at it, releasing their energies.
    Once one has set the correct petals in, throwing some &1Seeds&0 in will finalize the proccess.
    Tossing in the full bucket will also fill the recipient with water. -botania.page.apothecary3=Quite a few plants can be made using this method, for more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon. -botania.page.apothecary4=Crafting the &1Petal Apothecary&0. # -- PURE DAISY botania.entry.pureDaisy=Reines Gänseblümchen -botania.page.pureDaisy0=The &1Pure Daisy&0 is not only the most basic, but also the most important flower a botanist can have.
    This flower will purify any adjacent &1Wood&0 and &1Stone&0 blocks, as seen on the next page, into their purified counterparts, &1Livingwood&0 and &1Livingrock&0, which can be used for crafting. botania.page.pureDaisy1=Gib ihr einfach &4eine Munute&0 oder so... botania.page.pureDaisy2=&1Lebeholz&0 kann zu Zweigen gemacht werden botania.page.pureDaisy3=Weiß ist hell und rein # -- WAND OF THE FOREST botania.entry.wand=Stab des Waldes -botania.page.wand0=The general multi-use tool for a botanist is the &1Wand of the Forest&0.
    This wand, made by, effectively, strapping a pair of &1Mystical Petals&0 of any color to a few &1Livingwood Twigs&0, is required for a good amount of tasks. -botania.page.wand1=The petals used determine the colors of the wand # -- RUNIC ALTAR botania.entry.runeAltar=Runenaltar -botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one would require a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via right click, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by linking a &1Mana Spreader&0 to the altar, and right click it with a &1Wand of the Forest&0.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it and use the wand on it again to collect your rune. botania.page.runeAltar2=Herstellung des &1Runenaltars&0. botania.page.runeAltar3=Es gibt insgesamt 16 &1Runen&0.
    Die grundlegenden und elementaren Runen sind nach den &4Vier Elementen&0 benannt. Die mittleren Runen sind nach den &4Vier Jahreszeiten&0 benannt und die am forgeschrittendsten Runen nach den &4Sieben Todsünden&0. Auch gibt es eine seperate &1Manarune&0. botania.page.runeAltar4=Die &1Rune des Wassers&0. @@ -482,318 +453,175 @@ botania.page.runeAltar19=Die &1Rune des Hochmuts&0. # -- TERRASTEEL botania.entry.terrasteel=Terrastahl -botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.
    Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0. -botania.page.terrasteel1=Creating Terrasteel -botania.page.terrasteel2=By combining the &1Terrasteel&0 with a &1Nether Star&0 and &1Blaze Powder&0, it's possible to artificially create a small extract of &1Essence of Eternal Life&0, a very powerful component in the creation of magical flora and natural instruments. -botania.page.terrasteel3=These come not from Kyubey # - MANA # -- AN INTRODUCTION TO MANA botania.entry.mIntro=Eine Einführung in Mana -botania.page.mIntro0=&4Mana&0 is an ethereal substance. In layman's terms, it is a form of &4mystical energy&0. Its sensorial existance is inconstant, and its color depends on the environment its put in.
    Mastering &4Mana&0 is one of the most important skills a botanist needs to master. -botania.page.mIntro1=In order to create &4Mana&0, one would require a set of &4Generating Flowers&0 (read the respective section). This &4Mana&0 can be dispersed by utilizing &1Mana Spreaders&0 and stored in &1Mana Pools&0. &4Mana&0 can be used for a myriad of different things. For starters, it can be used for &4Functional Flowers&0 (read the respective section). -botania.page.mIntro2=To get started with mastering the art of &4Mana&0, one would start by learning how to use &1Dayblooms&0, &1Mana Spreaders&0 and &1Mana Pools&0.
    These form a basic infrastructure for mana, which can be used for all sorts of purposes. Have a read at the &4Functional Flora&0 and &4Magical Apparatus&0 sections of this Lexicon. # -- MANA SPREADER botania.entry.spreader=Manaverbreiter -botania.page.spreader0=The &1Mana Spreader&0 is the most important component in manipulating &4Mana&0.
    This is the block that allows &4Mana&0 to travel from point A to point B. When this block is placed on the ground, it'll face one of 6 basic directions. By shift-right clicking it with a &1Wand of the Forest&0, one can orient it to the opposite of where it was clicked. -botania.page.spreader1=Holding a &1Wand of the Forest&0 -botania.page.spreader2=The &1Mana Spreader&0 has a small internal buffer of &4Mana&0, which will get filled by nearby &4Generating Flowers&0. This buffer can be viewed by looking at the &1Spreader&0 with a &1Wand of the Forest&0, as demonstrated in the last page.
    Note that the block needs to be right clicked with a wand to get accurate and adequate values. -botania.page.spreader3=Holding a &1Wand of the Forest&0 displays a beam which shows where the spreader is pointing at. Hovering over it shows the target. The sparkle that's always shown is the point when &4Mana loss&0 starts to happen.
    If the target of the spreader is a block that can contain &4Mana&0, and isn't full, the spreader will fire a &4Mana Burst&0, which will travel to the target, and pass the &4Mana&0 along to it. -botania.page.spreader4=The spreader only fires one burst at once, it'll only fire another one when the last one hits the target.
    Furthermore, the bursts also start suffering &4mana loss&0 after a small amount of time. This can be seen in the beam, which becomes a lot thinner when this happens. There is also a small amount of &4mana loss&0 when a beam enters a spreader. -botania.page.spreader5=Crafting the &1Mana Spreader&0 -botania.page.spreader6=In order to upgrade the potential of the spreader, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
    Lenses can be &4dyed&0 all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. -botania.page.spreader7=The basic lens, it doesn't do anything... -botania.page.spreader8=&4Dyeing&0 lenses! -botania.page.spreader9=&1Rainbow Lens&0 all the way # -- MANA POOL botania.entry.pool=Manabecken -botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
    Mana can be inserted into it by usage of a &1Mana Spreader&0, and any adjacent &1Mana Spreaders&0 will pull mana from it to increase their internal buffer automatically.
    Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. -botania.page.pool1=Making the &1Mana Pool&0. -botania.page.pool2=Tossing in some resources into the Mana Pool will cause them to get infused with &4Mana&0, turning them into more powerful forms.
    A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
    &4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. -botania.page.pool3=Infusing &1Manasteel&0 -botania.page.pool4=Infusing &1Mana Pearls&0 -botania.page.pool5=Infusing &1Mana Diamonds&0 -botania.page.pool6=Infusing &1Mana Petals&0 -botania.page.pool7=&1Mana Cookies&0 feed you pretty well. # -- MANA DISTRIBUTOR botania.entry.distributor=Manaverteiler -botania.page.distributor0=Any botanist will eventually reach a point where a single &1Mana Pool&0 setup is not enough.
    The &1Mana Distributor&0 will fix all those issues. By placing it adjacently to a few &1Mana Pools&0 on its sides, when it receives &4Mana&0 through &4Mana Bursts&0 it'll equally spread it to the adjacent pools. -botania.page.distributor1=Crafting the distributor # -- MANA VOID botania.entry.manaVoid=Manaleere -botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again.
    Placing one of these under a &1Mana Pool&0 allows the pool to always accept &4Mana&0, but disposing any it can't hold. -botania.page.manaVoid1=Crafting the void block # -- MANA LENS: VELOCITY botania.entry.lensVelocity=Manalinse: Geschwindigkeit -botania.page.lensVelocity0=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose it's &4Mana&0 a lot faster, it can also carry a bit less. -botania.page.lensVelocity1=Crafting the lens # -- MANA LENS: POTENCY botania.entry.lensPotency=Manalinse: Macht -botania.page.lensPotency0=The &1Potency Lens&0 will double the amount of &4Mana&0 a &4Mana Burst&0 can carry, however, the beam becomes slower and after it starts to lose mana it does so at a lot faster rate. -botania.page.lensPotency1=Crafting the lens # -- MANA LENS: RESISTANCE botania.entry.lensResistance=Manalinse: Resistenz -botania.page.lensResistance0=The &1Resistance Lens&0 will significantly increase the amount of time the &4Mana Burst&0 can go without starting to lose &4Mana&0, but it makes it a a bit slower. -botania.page.lensResistance1=Crafting the lens # -- MANA LENS: EFFICIENCY botania.entry.lensEfficiency=Manalinse: Effizienz -botania.page.lensEfficiency0=The &1Efficiency Lens&0 will decrease the amount of time it takes for the &4Mana Burst&0 to start losing its &4Mana&0, but when that happens, it does so at a lot slower rate. -botania.page.lensEfficiency1=Crafting the lens # -- MANA LENS: BOUNCE botania.entry.lensBounce=Manalinse: Abprall -botania.page.lensBounce0=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. -botania.page.lensBounce1=Crafting the lens # -- MANA LENS: GRAVITY botania.entry.lensGravity=Manalinse: Schwerkraft -botania.page.lensGravity0=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus moving in an arc. As compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. -botania.page.lensGravity1=Crafting the lens # -- MANA LENS: BORE botania.entry.lensBore=Manalinse: Bohren -botania.page.lensBore0=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact with, draining its own mana to do so.
    Since this relies on the detection abilities of a &1Mana Spreader&0, it won't fire at just anything, as it needs a &4Mana&0 receving block in the end. -botania.page.lensBore1=Crafting the lens # -- MANA LENS: DAMAGING botania.entry.lensDamaging=Manalinse: Schädigung -botania.page.lensDamaging0=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining its own mana to do so.
    Since this relies on the detection abilities of a &1Mana Spreader&0, it won't fire at just anything, as it needs a &4Mana&0 receving block in the end. -botania.page.lensDamaging1=Crafting the lens # -- MANA LENS: PHANTOM botania.entry.lensPhantom=Manalinse: Phantom -botania.page.lensPhantom0=By utilizing the spacetime continuum tearing properties of the &1Piston Relay&0, it's possible to make a lens that'll allow the &4Mana Burst&0 to pass through blocks. In doing so, the time it can stay without losing mana is decreased. -botania.page.lensPhantom1=Crafting the lens # -- MANA LENS: MAGNETIZING botania.entry.lensMagnet=Manalinse: Magnetisierung -botania.page.lensMagnet0=The &1Magnetizing Lens&0, as its name states, allows the &4Mana Burst&0 to magnetize, or home in, on any nearby blocks that can receive &4Mana&0. Doing so slightly decreases the speed of the burst. -botania.page.lensMagnet1=Crafting the lens # -- MANA LENS: ENTROPIC botania.entry.lensExplosive=Manalinse: Chaos -botania.page.lensExplosive0=The &1Entropic Lens&0 imbues the &4Mana Burst&0 with entropy, causing it to release its energy in the form of an explosion when it collides against something that can't receive &4Mana&0.
    Since this relies on the detection abilities of a &1Mana Spreader&0, it won't fire at just anything, as it needs a &4Mana&0 receving block in the end. -botania.page.lensExplosive1=Crafting the lens # -- PORTABLE MANA TRANSPORT botania.entry.manaTransport=Tragbares Transportieren von Mana -botania.page.manaTransport0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
    The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself. -botania.page.manaTransport1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
    Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
    Lastly, unlike normal items, these will never despawn when dropped on the floor. -botania.page.manaTransport2=This doesn't run android -botania.page.manaTransport3=It's also possible to indirectly access the &4Mana&0 reserves of a &1Mana Pool&0, through using a &1Mana Mirror&0, items will pull out of the pool itself.
    To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror.
    The mirror can't put mana in or take mana out of pools in any other way. botania.page.manaTransport4=Spieglein, Spieglein an der Wand... # -- MANA DETECTOR botania.entry.manaDetector=Manadetektor -botania.page.manaDetector0=A device like the &1Mana Detector&0 is capable to detect when a &4Mana Burst&0 starts flowing through it (the burst doesn't dissipate on collision with this block) and provide a redstone signal when that is the case. -botania.page.manaDetector1=Crafting the detector # -- COMPOSITE MANA LENSES botania.entry.compositeLens=Verbundmanalinse -botania.page.compositeLens0=Having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
    The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, and that two lenses of the same type can't be stacked. # -- REDSTONE MANA SPREADER botania.entry.redstoneSpreader=Redstone-Manaverbreiter -botania.page.redstoneSpreader0=By combining a &1Mana Spreader&0 with a piece of &1Redstone&0, it's possible to create a &1Redstone Mana Spreader&0, which fires only when given a &4Redstone signal&0, regardless of having a block in the end to put the mana or not.
    It's to keep in note that this doesn't let the spreader shoot a burst until the last one dissipates or is absorbed. -botania.page.redstoneSpreader1=Just add redstone # -- MANASTAR botania.entry.manastar=Manastern -botania.page.manastar0=The imprecise measurements of the &1Wand of the Forest&0 sometimes won't cut it for telling if you're turning a profit or loss in your &1Mana Pools&0.
    Creating a &1Manastar&0 and placing it next to your pools will have it shine red if there's a loss or blue if there's a profit. The measurement happens every few seconds. -botania.page.manastar1=&rI'm a shooting star leaping through the skies&r. # - FUNCTIONAL FLOWERS # -- AN INTRODUCTION TO FUNCTION botania.entry.fIntro=Eine Einführung in Funktion -botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
    These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
    It's to note that these can't receive power directly through &1Mana Spreaders&0. -botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. -botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. -botania.page.fIntro3=Lastly, some functional flowers utilize a &1Redstone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. -botania.page.fIntro4=&1Redstone Root&0 for Redstone Control # -- JADED AMARANTHUS botania.entry.jadedAmaranthus=Jaded-Amarant -botania.page.jadedAmaranthus0=Everyone likes flowers right? The &1Jaded Amaranthus&0 is made just for that purpose.
    Feeding it with &4Mana&0 from &1Mana Pools&0 will have it quickly grow new &1Mystical Flowers&0 around it, in any spots it can. -botania.page.jadedAmaranthus1=&oIt was this or clematis.&r # -- BELLETHRONE botania.entry.bellethorne=Belldorn -botania.page.bellethorne0=The &1Bellethorne&0 is a malevelous flower. By utilizing &4Mana&0 it slowly inflicts harm in any living beings (save for &4players&0) around it. -botania.page.bellethorne1=&oEvery rose has its thorn&r. # -- DREADTHORNE botania.entry.dreadthorne=Schreckdorn -botania.page.dreadthorne0=The &1Dreadthorne&0 is a slightly more specific counterpart to the &1Bellethrorne&0, by which, instead of all mobs around, it'll only hurt &4adult&0 animals and none else. botania.page.dreadthorne1=&oNein, Mr. Bond - ich erwarte von Ihnen, dass Sie sterben&r. # -- HEISEI DREAM botania.entry.heiseiDream=Kehrnelke -botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother. -botania.page.heiseiDream1=&oA pleasant era will murder people&r. # -- TIGERSEYE botania.entry.tigerseye=Tigerauge -botania.page.tigerseye0=It's a known fact that &4Creepers&0 are terrified of &4cats&0.
    The &1Tigerseye&0 exploits that very weakness, by emiting a feline aura, petrifying any nearby &4Creepers&0, preventing them from exploding. It also has the effect of making them run away from &4players&0. -botania.page.tigerseye1=&oRisin' up to the challenge of our rivals&r. # -- ORECHID botania.entry.orechid=Erzblüte -botania.page.orechid0=While going mining is all good, a renewable means of getting ore is due. The &1Orechid&0 will use (a massive amount of) &4Mana&0 to generate &4ores&0 in nearby &1Stone&0 blocks.
    The ores it generates are random, but seem to be biased towards more common ores rather than rarer ones. -botania.page.orechid1=&oLizbeth would like this flower&r. # -- FALLEN KANADE botania.entry.fallenKanade=Engelsblüte -botania.page.fallenKanade0=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby. -botania.page.fallenKanade1=&oHand Sonic, version four&r. # -- EXOFLAME botania.entry.exoflame=Exoflamme -botania.page.exoflame0=Unlike it's generating counterpart, the &1Exoflame&0 utilizes &4Mana&0 with means to generate heat.
    Any &1Furnaces&0 nearby to the &1Exoflame&0 will be fueled, and given an efficiency boost, for the cost of some &4Mana&0. -botania.page.exoflame1=&oBut we should be going nowhere fast&r. # -- AGRICARNATION botania.entry.agricarnation=Agraryophylle -botania.page.agricarnation0=The slow growth of crops is always a problem to feed the masses. The &1Agricarnation&0 is a flower that turns &4Mana&0 into a type of natural fertilizer, causing nearby plantlife to grow at a faster rate. -botania.page.agricarnation1=&0Grandola Vila Morena&r... # -- HOPPERHOCK botania.entry.hopperhock=Trichterkraut -botania.page.hopperhock0=The &1Hopperhock&0 will pick up items around it. Giving it &4Mana&0 is optional, but it'll increase it's range.
    Items picked up will be put in adjacent inventories (e.g. &1Chests&0). Placing &1Item Frames&0 in any of the inventories will specify which items can or can't go in them. -botania.page.hopperhock1=Any inventory which has no &1Item Frame&0 adjacent to it can accept any items, but labeled inventories will take priority.
    The rule using to sort items can be changed by shift-right clicking the flower with a &1Wand of the Forest&0. -botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. # -- TANGLEBERRIE botania.entry.tangleberrie=Wirrbeere -botania.page.tangleberrie0=The &1Tangleberrie&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters within a circle ward, preventing them from getting out. -botania.page.tangleberrie1=&oTangled, brave and frozen&r. # -- JIYUULIA botania.entry.jiyuulia=Bannbeere -botania.page.jiyuulia0=The &1Jiyuulia&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters at bay, protecting a circular area from them getting in. -botania.page.jiyuulia1=&oKeep out, please&r. # -- RANNUNCARPUS botania.entry.rannuncarpus=Rannawurzel -botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 will pick up any nearby blocks in dropped item form and place them in the world nearby. It, however, only places the blocks thrown at it on top of a specific block, to specify this block, place it right below the soil the flower is resting on. -botania.page.rannuncarpus1=Block items, such as &1Sugar Cane&0 will also work, but, much alike any other blocks, will only be placed in a location where they normally would be able to be placed.
    Lastly, giving &4Mana&0 to the flower is optional, but it increases it's range. -botania.page.rannuncarpus2=&oNeed a hand&r? # -- HYACIDUS botania.entry.hyacidus=Cyazinthe -botania.page.hyacidus0=For some reason, poison does not kill. The &1Hyacidus&0, to that, can be used to poison any nearby mobs, bringing them to their knees for a one hit kill after a bit. botania.page.hyacidus1=&oStahl ist immun&r. # -- POLLIDISIAC botania.entry.pollidisiac=Pollidisie -botania.page.pollidisiac0=Animals love eating, that's all they seem to do, really. An interesting behaviour they show is that they only seem to want to eat things that are fed to them.
    The &1Pollidisiac&0 will simply do that, at the cost of some mana, any appropriate nearby food items (&1Wheat&0, &1Carrots&0, etc) will be fed to the animals, putting them in a &obetter mood&r. -botania.page.pollidisiac1=&oHell's Kitchen&r. # -- CLAYCONIA botania.entry.clayconia=Helehmie -botania.page.clayconia0=The &1Clayconia&0 is a simple flower, in essence. All it does is moisten nearby &1Sand&0, turning it into &1Clay&0, this process uses a decent amount of &4Mana&0, but nothing too insane. -botania.page.clayconia1=&oWhat a killer joke&r. # -- LOONIUM botania.entry.loonium=Beutner -botania.page.loonium0=Any weary adventurer knows that &4Dungeons&0 can hold valuable goodies. The &1Loonium&0 can, at the use of an extreme amount of &4Mana&0, materialize these items and drop them in the nearby vacinity. -botania.page.loonium1=&oTank Tank Heal Tank&r! # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=Eine Einführung in Generierung -botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckilly there's an array of &4Generating Flowers&0 willing to do the job.
    These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circunstances. -botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
    This mana will be stored in the closest &1Mana Spreader&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. # -- DAYBLOOM botania.entry.daybloom=Tagesblüte -botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it preforms a modified photosythesis process, in order to transform sunlight into &4Mana&0.
    The process is rather slow, about ten or a dozen of these should get the job done, for now. -botania.page.daybloom1=An interesting thing to take in note is that these flowers tend to compete among themselves for what sunlight hits an area, thus having any others adjacent to it on any of the four cardinal directions will result in diminshing returns of &4Mana&0 production. -botania.page.daybloom2=&oStarting up a brand new day&r. # -- NIGHTSHADE botania.entry.nightshade=Nachtschatten -botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, albeit at half the speed.
    Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent. -botania.page.nightshade1=&oThe shadow of the day&r. # -- ENDOFLAME botania.entry.endoflame=Endoflamme -botania.page.endoflame0=While the &1Daybloom&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
    The &1Endoflame&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vacinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. -botania.page.endoflame1=There is a small caveat though, the &1Endoflame&0 will not burn anything that returns a bi-product, an example are &1Lava Buckets&0, that have empty &1Buckets&0 as a bi-product. botania.page.endoflame2=&oNicht Nitor&r. # -- HYDROANGEAS -botania.entry.hydroangeas=Hydroangea -botania.page.hydroangeas0=While you can generate easy &4Mana&0 with the &1Daybloom&0, sometimes you need to create more energy without using any fuels...
    The &1Hydroangeas&0 will devour adjacent water sources to create mana, it does have a cooldown timer though, so power can not be generated instantly. botania.page.hydroangeas1=&oAquane Macht&r. # -- THERMALILY botania.entry.thermalily=Thermalilie -botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0. Care should be taken with this flower, as it generates power at an extremely fast speed. -botania.page.thermalily1=&oLily ought to know&r. # -- ROSA ARCANA -botania.entry.arcanerose=Rosa Arcana -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0. -botania.page.arcanerose1=&oGo have a drink, it might take a bit&r. # -- MUNCHDEW botania.entry.munchdew=Mampftau -botania.page.munchdew0=Generating the form of natural energy that is &4Mana&0 should be a pretty good process when done via other living materials. By using the &1Munchdew&0, any &1Leaves&0 near the flower will get munched up and convereted into &4Mana&0.
    It's to note that, though, no saplings or any other items will be dropped from the leaves. -botania.page.munchdew1=&oGuten Appetit&r. # -- ENTROPINNYUM botania.entry.entropinnyum=Entropinnyum -botania.page.entropinnyum0=In order to generate a blast of &4Mana&0, one might in fact, require a blast nearby.
    Igniting a block of &1TNT&0 in the near an &1Entropinnyum&0 will have the latter absorb all the entropy generated by the blast into itself, creating a large amount of &4Mana&0 and nullifiying any possible damage. Lastly, to absorb the explosion, the flower must not have any &4Mana&0 stored in it or the process will fail. -botania.page.entropinnyum1=&oCool guys don't look at explosions&r. # -- KEKIMURUS botania.entry.kekimurus=Kekimurus -botania.page.kekimurus0=&1Cake&0 is delicious, everyone loves it, flowers included.
    The &1Kekimurus&0 is one of these &1Cake&0 aficionados, and will eat any it spots nearby, using it's enriching nutrients to create &4Mana&0. -botania.page.kekimurus1=&oLet them eat cake&r. # - MAGICAL APPARATUS # -- FORCE RELAY botania.entry.pistonRelay=Kraftrelais -botania.page.pistonRelay0=It seems that infusing &1Pistons&0 with &4Mana&0 results in some interesting adverse effects.
    This block tears the fabric of space, relaying any piston force applied to it to the block it's bound to. -botania.page.pistonRelay1=To bind it to a block, right click it with a &1Wand of the Forest&0, and right click on the block you want to bind it to.
    Furthermore, this block is highly unstable, and may create uncanny effects, care is to be taken, it is also resistant to glue. -botania.page.pistonRelay2=Infusing a &1Piston&0 with &4Mana&0. # -- MANA PYLON botania.entry.pylon=Manapylon -botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.
    For one, setting one adjanced to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0. -botania.page.pylon1=&oYou must construct additional pylons!&r # -- MANA ENCHANTING botania.entry.manaEnchanting=Verzaubern mit Mana -botania.page.manaEnchanting0=By utilizing the magical power emited from &1Mana Pylons&0, a structure that can enchant items with books without consuming them can be created, called the &1Mana Enchanteer&0.
    Constructing one of these requires a fair amount of space and materials alike. -botania.page.manaEnchanting1=To construct the &1Mana Enchanter&0, one requires, as well as fair amount of space, 17 &1Obsidian&0 blocks, 10 &1Mystical Flowers&0 of any color, 6 &1Mana Pylons&0 and a &1Lapis Lazuli Block&0.
    The instructions on how to assemble this structure are in the following pages. -botania.page.manaEnchanting2=Start by making an &1Obsidian&0 circle. -botania.page.manaEnchanting3=Put &1Mana Pylons&0 1 block in the air where marked. -botania.page.manaEnchanting4=Put flowers under the pylons and in the center -botania.page.manaEnchanting5=Place a &1Lapis Lazuli Block&0 in the center. -botania.page.manaEnchanting6=After the construct is done, right click the Lapis block with a &1Wand of the Forest&0 and the enchanter should form.
    In order to utilize the enchanter, one would place (via right click) the item to be enchanted in the enchanter itself and drop &1Enchanted Books&0 inside the circle around it. -botania.page.manaEnchanting7=Items that are already enchanted can't be placed in the enchanter.
    To start the enchanting, right click the enchanter with a &1Wand of the Forest&0. It'll scan the books around, and once it's done, a spell circle of sorts will appear around it, indicating the books can be safely picked up again. -botania.page.manaEnchanting8=After the enchanting begins, the enchanter will require &4Mana&0.
    It can be fed via one of two ways, either via &4Mana Bursts&0 or nearby &1Mana Pools&0, the later being much faster, but a bit less efficient, as a small portion of the mana is lost. -botania.page.manaEnchanting9=When enough &4Mana&0 is gathered, the enchanting process will finalize, and the enchantments will be applied to the item.
    The amount of &4Mana&0 required depends on the rarity of the enchantments being applied, their level, and the total amount of enchantments.
    If any book has more than one enchantment, only the first will be accounted for. -botania.page.manaEnchanting10=During the enchanting process, the item can not be removed, but it can after the process has been completed.
    Note that if at any point, any component of the construct is removed, it'll revert to it's original &1Lapis Lazuli Block&0 form. # -- SPREADER TURNTABLE botania.entry.turntable=Verbreiter-Drehscheibe -botania.page.turntable0=The &1Spreader Turntable&0, as it's name implies, can turn &1Mana Spreaders&0 around and around. Placing a spreader above the turntable will rotate it, given that a redstone signal isn't applied.
    To change the speed of the turntable, right click with a &1Wand of the Forest&0, shift-right clicking will invert the movement. -botania.page.turntable1=Spin spin spin spin # -- BOTANICAL ALCHEMY botania.entry.manaAlchemy=Alchemiie mit Mana -botania.page.manaAlchemy0=&4Mana&0 is an extremely volatile substance, to a point that it's complete properties and abilities are unknown.
    One of them is known, though, by attaching an &1Alchemy Catalyst&0, created with a mixture of otherworldly materials to the bottom of a &1Mana Pool&0, it enables the pool to perform &4Alchemy&0. botania.page.manaAlchemy1=Kreieren eines &1Katalysators&0 botania.page.manaAlchemy2=&1Verrottetes Fleisch&0 zu &1Leder&0 botania.page.manaAlchemy3=Verschiedene Arten von &1Holz&0 @@ -817,57 +645,35 @@ botania.page.manaAlchemy19=Zersetzung von &1Pflasterstein&0 zu &1Sand&0 # -- EYE OF THE ANCIENTS botania.entry.forestEye=Auge der Ältesten -botania.page.forestEye0=As the Ancients who used to watch over the world always looked for the living beings on it, this block, the &1Eye of the Ancients&0 will do just that.
    By attaching a &1Comparator&0 next to it, it'll send out a redstone signal equivalent to the amount of animals it can find. -botania.page.forestEye1=The counting only starts at 2, so, with 2 animals around, it'd output a signal of strength 1, with 3 animals, of strength 2 and so on.
    Lastly, the time has worn down the sight of the Ancients, so this block can only see animals in about 6 blocks in any direction. -botania.page.forestEye2=Now you see me... # -- OPEN CRATE botania.entry.openCrate=Offene Kiste -botania.page.openCrate0=Sometimes devices like &1Droppers&0 or &1Dispensers&0 aren't precise or fast enough. A simple solution is to make a crate and punch a hole in the bottom.
    Yeah, it's that simple. The &1Open Crate&0 accepts items from &1Hoppers&0 or any other means of inserting items, and obviously, drops them directly below it. -botania.page.openCrate1=A little interesting effect the &1Open Crate&0 can do is that, when given a redstone signal, any items it drops are prevented from being caught by flowers like the &1Hopperhock&0, &1Rannuncarpus&0 or &1Pollidisiac&0 for around ten seconds more than usual. -botania.page.openCrate2=A super crate box # -- DRUM OF THE WILD botania.entry.forestDrum=Trommel der Wildnis -botania.page.forestDrum0=The &1Drum of the Wild&0 is, in layman's terms, the percussion counterpart of the &1Horn of the Wild&0. It serves the exact same purpose as the handheld horn, but is placed in world.
    To trigger a beat and break nearby folliage, one would fire a &4Mana Burst&0 at the drum. -botania.page.forestDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1Redstone Mana Spreader&0 or a &1Mana Blaster&0 is required. -botania.page.forestDrum2=But if you close your eyes... # -- ABTRUSE PLATFORM botania.entry.platform=Schimmerplattform -botania.page.platform0=By laying &1Livingwood&0 on a very specific format it's possible to create a platform of sorts, that only has a physical body for whoever is on top of it and isn't sneaking. For anyone else, it's like it's not there. &4Mana Bursts&0 will always travel through it without any trouble.
    It's also possible to camouflage this block as any other simple block by simply right clicking it. -botania.page.platform1=It would be Etheral but the name was taken # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana-Blaster -botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Mana Spreader&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
    By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. -botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot. -botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply shift-right click the blaster. -botania.page.manaBlaster3=Crafting the blaster # -- PASTURE SEEDS botania.entry.grassSeeds=Weidesamen -botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infusing some &1Tall Grass&0 with &4Mana&0, it's possible to create &1Pasture Seeds&0, which will grow grass in any barren area, via a simple right click on dirt.
    Other types of folliage can also be grown, such a &1Podzol&0 or &1Mycellium&0 with alternate seeds. botania.page.grassSeeds1=&1Weidesamen&0 für Gras botania.page.grassSeeds2=&1Boreale Samen&0 für Podsol botania.page.grassSeeds3=&1Seuchensamen&0 für Myzel # -- ROD THE LANDS botania.entry.dirtRod=Stab der Böden -botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simpleton tool, by utilizing &4Mana&0 from your inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down. botania.page.dirtRod1=Ziemlich dreckig # -- TERRA FIRMA ROD botania.entry.terraformRod=Terrafirmastab -botania.page.terraformRod0=While digging away at dirt with a shovel is definitely functional, flattening huge tracts of land can get somewhat tortuous at times.
    By utilizing the &1Terra Firma Rod&0, it's possible to terraform in a quick and enviromental friendly manner. -botania.page.terraformRod1=This rod, will, at the cost of some &4Mana&0 from your inventory, flatten the land to the level you are standing. For this to happen, charge it by &4holding right-click&0 and, slowly but surely, the nearby terrain will be flattened to your level, either by placing &1Dirt&0 or by removing blocks. -botania.page.terraformRod2=Note that blocks removed by the rod are non-recuperable. The terrain will adapt to the changes as best as it can, up to a distance limit, to avoid cuts in hills and the like, for this, the flattening will work in the terrain's natural look. -botania.page.terraformRod3=Quite a justicar # -- MANASTEEL EQUIPMENT botania.entry.manaGear=Manastahl-Equipment -botania.page.manaGear0=&1Manasteel&0, alike other metals, can be shaped into tools and armor alike.
    Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead. botania.page.manaGear1=Die &1Manastahlspitzhacke&0 botania.page.manaGear2=Die &1Manastahlschaufel&0 botania.page.manaGear3=Die &1Manastahlaxt&0 @@ -880,12 +686,9 @@ botania.page.manaGear9=Die &1Manastahlstiefel&0 # -- HORN OF THE WILD botania.entry.grassHorn=Horn der Wildnis -botania.page.grassHorn0=Clearing out &1Tall Grass&0 by hand can definitely be a nuisance.
    Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand. -botania.page.grassHorn1=Crafting the horn # -- TERRASTEEL ARMOR botania.entry.terrasteelArmor=Terrastahlrüstung -botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much alike the &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.
    This armor, however, has properties more alike &1Diamond&0 instead of &1Iron&0 and increases the wearer's health when worn. botania.page.terrasteelArmor1=Der &1Terrastahlhelmt&0 botania.page.terrasteelArmor2=Der &1Terrastahlbrustpanzer&0 botania.page.terrasteelArmor3=Der &1Terrastahlbeinschutz&0 @@ -893,112 +696,64 @@ botania.page.terrasteelArmor4=Die &1Terrastahlstiefel&0 # -- TERRA BLADE botania.entry.terraSword=Terraklinge -botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when it's swinged, there's a chance for it to create a beam that will deal as much damage as a melee hit. -botania.page.terraSword1=No Broken Hero Sword # -- TERRA SHATTERER botania.entry.terraPick=Terra-Brecher -botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for it's creation.
    The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method. -botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines it's &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.
    The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0. -botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.
    The rank of the tool does not change it's speed, but instead, it increases the power of it's &4Active Ability&0.
    Toggling the tool's ability can be done via right click. -botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger trough the ranks. It's to note that the rank &4D&0 tool does not have the active ability.
    Having the tool active consumes &4Mana&0 from it's storage passively, even if not being used to mine. -botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.
    It also won't despawn like regular dropped items. -botania.page.terraPick5=Stronger than a Gastrea # - BAUBLES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=Eine Einführung in Accessoires -botania.page.bIntro0=&4Baubles&0, also commonly refered to as &4Trinkets&0 or &4Charms&0 are pieces of equipment which offer all sorts of different effects, when worn.
    To equip them, one can press the &4B&0 (configurable) key. There's four slots, one &4Amulet&0 slot, two &4Ring&0 slots and one &4Belt&0 slot. -botania.page.bIntro1=The &4Baubles Screen&0 -botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that uses the baubles sytem is installed, this inventory will be shared between the various mods. # -- TINY PLANET botania.entry.tinyPlanet=Winziger Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a bauble with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her. -botania.page.tinyPlanet1=Clearly from rebirth botania.page.tinyPlanet2=Planetarischer als Pluto # -- BAND OF MANA botania.entry.manaRing=Manaband -botania.page.manaRing0=Combining a &1Mana Tablet&0 with some &1Manasteel&0 creates an easilly worn &4Ring&0, that functions exactly similar to the tablet used to make it, but can be worn as a &4Bauble&0.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it store about four times as much &4Mana&0. -botania.page.manaRing1=Creating the ring -botania.page.manaRing2=Upgrading the ring # -- BAND OF AURA botania.entry.auraRing=Auraband -botania.page.auraRing0=The &1Band of Aura&0 is a bit of a deviation from the typical &1Band of Mana&0, in which, instead of storing &4Mana&0, it slowly, while equipped, creates it and stores it into &4Mana&0 containing items in the wearer's inventory.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it generate &4Mana&0 at a significantly faster rate. -botania.page.auraRing1=Creating the ring -botania.page.auraRing2=Upgrading the ring # -- SOUJOURNER'S SASH botania.entry.travelBelt=Schärpe des Reisenden -botania.page.travelBelt0=Traversing terrain sometimes proves to be a hassle. The &1Soujourner's Sash&0 can be equipped in the &4Belt&0 slot, and when worn will increase the movement speed, jump height and resistance to fall damage of the wearer.
    Lastly, if not sneaking, it also allows the wearer to walk over 1 block high gaps without jumping with ease. -botania.page.travelBelt1=...everell # -- TECTONIC GIRDLE botania.entry.knockbackBelt=Tektonikgürtel -botania.page.knockbackBelt0=By harnessing the forces of tectonic movement, the &1Tectonic Girdle&0, when worn, will negate any &4Knockback&0 applied to the wearer by outside attacks. -botania.page.knockbackBelt1=Don't... move # -- SNOWFLAKE PENDANT botania.entry.icePendant=Schneeflockanhänger -botania.page.icePendant0=The &1Snowflake Pendant&0 is a &4Bauble&0 that resonates freezing energy, while it's worn, any nearby still &1Water&0 blocks at foot level will be converted into &1Ice&0.
    The &1Ice&0 will melt shortly afterward the wearer leaves the area. Lastly, this charm will not freeze any blocks if the wearer is sneaking or fully submerged. -botania.page.icePendant1=Do you want to build a snowman? # -- PYROCLAST PENDANT botania.entry.lavaPendant=Pyroklastanhänger -botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs any heat, while it's worn, the wearer becomes completely imprevious to any &4Fire&0 or &4Lava&0 damage. -botania.page.lavaPendant1=Hanako could have used one of these # -- GOLDEN LAUREL CROWN botania.entry.goldenLaurel=Goldener Lorbeerkranz -botania.page.goldenLaurel0=One of the uses for &1Essence of Eternal Life&0 is to, of course, grant a layer of immortality to one that uses it, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=Given the theme, probably Viridi # -- RING OF CHORDATA botania.entry.waterRing=Ring der Ozeane -botania.page.waterRing0=The &1Ring of Chordata&0 allows the wearer to swim like a fish. While it's equipped, the wearer is bestowed with the ability to accelarate to a decent speed while underwater. It also gives the wearer good sight underwater and, if &4Mana&0 is present, at the cost of some of it, the ability to breathe indefinitely. botania.page.waterRing1=Butter bei die Fische # -- RING OF THE MANTLE botania.entry.miningRing=Ring des Erdmantels -botania.page.miningRing0=The &1Ring of the Mantle&0 allows one to mine faster, while equipped and &4Mana&0 is present in the inventory, it'll give a &4Haste&0 effect to the wearer. Some &4Mana&0 is used while the wearer swings their arm or equipped item, be it for attacking, mining or just flailing. -botania.page.miningRing1=Diggy diggy hole # -- RING OF MAGNETIZATION botania.entry.magnetRing=Ring des Magnetismus -botania.page.magnetRing0=By turning a &1Magnetizing Lens&0 into a wearable ring, one can use it to magnetize nearby items.
    While equipped, this ring will make any nearby items magnetize towards the wearer, case they aren't sneaking. -botania.page.magnetRing1=How do they work? # -- CHARM OF THE DIVA botania.entry.divaCharm=Talisman der Diva -botania.page.divaCharm0=The &1Charm of the Diva&0 blesses the wearer with the ability to have any attacked mob follow the attacker's will, and, case there are any nearby enemies, go after them instead. This process, of course, requires a bit of &4Mana&0 from the wearer's inventory in order to function. -botania.page.divaCharm1=You shall not disrespect Big Sister # -- FLUGEL TIARA botania.entry.flightTiara=Flügel-Tiara -botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
    The usage of &1Essence of Eternal Life&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. -botania.page.flightTiara1=Forty thousand books from another world # -- ALFHOMANCY botania.entry.aIntro=Das Protal nach Alfheim -botania.page.aIntro0=Once, in olden times, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they have been banished back to their own world, &4Alfheim&0.
    Experimentation has been done in atempt to bridge the gap between the two worlds but not much has been found thus far. # - MISCLANEOUS # -- UNSTABLE CUBE botania.entry.unstableBlocks=Instabile Würfel -botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. -botania.page.unstableBlocks1=They look fancy -botania.page.unstableBlocks2=And they come in all 16 colors -botania.page.unstableBlocks3=You also found a way of creating a different version of these that releases an extremely larger amount of energy, this time in the form of a beam towards the sky that extends into a cloud of sorts. This one also seems to be disableable via a &4Redstone Signal&0, you call it &1Unstable Beacon&0, as it looks like one somehow. -botania.page.unstableBlocks4=Fireworks? -botania.page.unstableBlocks5=Combined entropy -botania.page.unstableBlocks6=It's also possible, by using the &1Unstable Beacons&0, to turn them into a manageable and portable utility, in the form of the &1Signal Flare&0.
    This gun of sorts shoots a colored round into the sky that lasts a few seconds, it also stuns any nearby enemies for just as long. -botania.page.unstableBlocks7=&oShoot in case of titan.&r # -- DECORATIVE BLOCKS botania.entry.decorativeBlocks=Dekorative Blöcke -botania.page.decorativeBlocks0=It's possible to turn blocks of &1Livingrock&0 and &1Livingwood&0 into decorative blocks. Each of them features 4 different decorative variations.
    If &4ForgeMultipart&0 is enabled, these will work as &4Microblocks&0. botania.page.decorativeBlocks1=Lebesteinziegel botania.page.decorativeBlocks2=Die Ziegel bemoosen botania.page.decorativeBlocks3=Die Ziegel brüchig machen @@ -1011,9 +766,6 @@ botania.page.decorativeBlocks9=Schimmerndes Lebeholz # -- DISPENSER TWEAKS botania.entry.dispenserTweaks=Dispenser-Änderungen -botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can also plant all sorts of crops, from &1Seeds&0, &1Potatos&0 or &1Carrots&0 to even &1Nether Wart&0. The crop is planted in the block right in front of the dispenser.
    The &1Dispensers&0 can also use the &1Wand of the Forest&0 for some specific tasks such as triggering a &1Runic Altar&0. # -- GLIMMERING FLOWERS botania.entry.shinyFlowers=Schimmernde Blumen -botania.page.shinyFlowers0=By combining your typical &1Mystical Flowers&0 with some &1Glowstone Dust&0, you can make them sparkle even brighter, and emit actual physical light, of the same brightness as a &1Glowstone Block&0. -botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny From c9e501fd020381c2019af281e9620f753528c6bf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 20:03:19 -0500 Subject: [PATCH 659/935] Clean up English present in zh_CN, zh_TW --- .../resources/assets/botania/lang/zh_CN.lang | 66 ------------------- .../resources/assets/botania/lang/zh_TW.lang | 51 -------------- 2 files changed, 117 deletions(-) diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index ca5cf55de..48fb5f4e1 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -11,9 +11,6 @@ itemGroup.Botania=植物魔法 generator.botania-skyblock=水晶花园 generator.botania-skyblock.info=不推荐植物魔法新手使用 -#并非本地化条目,请翻译者不要修改此行文本. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=下一页 botaniamisc.prevPage=上一页 botaniamisc.back=返回 @@ -215,14 +212,6 @@ botania.color14=红色 botania.color15=黑色 botania.color16=彩虹色 -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # ZODIAC SIGNS botania.sign0=白羊 botania.sign1=金牛 @@ -275,39 +264,6 @@ botania.armorset.will3.shortDesc=暴击施加重度缓慢效果 botania.armorset.will4.shortDesc=暴击伤害穿透护甲 botania.armorset.will5.shortDesc=暴击施加凋零效果 -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=原版的知识 botania.knowledge.alfheim=&a精灵&7的知识 @@ -1703,10 +1659,6 @@ botania.potion.clear=赦免 botania.gui.lexicon.header=植物魔法辞典 第%s版 - 目录 botania.gui.lexicon.wip=(本条目的编纂工作仍在进行,其当前内容仍未完全定稿) -# MUSIC DISCS -item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness -item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence - # BANNER NAMES item.banner.botania_flower.black=黑色神秘花 item.banner.botania_flower.red=红色神秘花 @@ -2008,7 +1960,6 @@ botania.page.gardenOfGlass6=除此之外, 有些东西在植 物魔法中调整 botania.page.gardenOfGlass7=制作&1甘蔗&0 botania.page.gardenOfGlass8=制作&1粘液球&0 botania.page.gardenOfGlass9=也许可以给&1南瓜&0注入一些 死去怪物的邪恶思想,来制作 &1恶魔头南瓜&0.通过将南瓜放置 在两个竖直放置的&1铁栅栏&0上 ,这有点像&1雪傀儡&0,但会出 现一个烈焰人&0.
    以这种方式生成的&1烈焰人&0会 掉落&1烈焰粉&0而不是&1烈焰棒&0. -botania.page.gardenOfGlass10=Nerfing warlocks again botania.page.gardenOfGlass11=除了照明, 将&1魔力闪光&0放在 出生点允许那些不慎丢掉 &1植物魔法辞典&0的玩家们用一 个&1树苗&0来重新获得它, 通过 手持&1树苗&0右击&1魔力闪光&0.
    这只会在玩家失去他们的&1植物魔法辞典&0时生效. botania.page.gardenOfGlass12=最后, 制作&1末地传送门&0的配方 @@ -2100,7 +2051,6 @@ botania.page.terrasteel0=&1泰拉钢&0是一种复杂的魔法合金 ,需注入 botania.page.terrasteel1=制作泰拉凝聚板 botania.page.terrasteel2=泰拉凝聚板放置好且已做好接 收&4魔力&0的准备之后,将一个&1魔 力钢锭,魔力钻石与魔力珍珠&0 掷于其顶部即可开始注魔.
    此过程中拾起任何物品均会使 注魔骤停,导致严重的 &4魔力流失&0.注魔将会使用一半 &1魔力池&0的魔力以制作一小块 &4泰拉钢&0,多个&1火花&0可加快注魔 速度. botania.page.terrasteel3=制作&1泰拉钢&0的模型 -botania.page.terrasteel4=T.A. Plate # -- BLACK LOTUS botania.entry.blackLotus=黑莲花 @@ -2186,13 +2136,11 @@ botania.page.distributor1=合成分配器 botania.entry.manaVoid=魔力销毁器 botania.tagline.manaVoid=销毁一切进来的魔力 botania.page.manaVoid0=&1魔力销毁器&0通俗的说,就是&4魔&0 &4力&0的垃圾桶.所有进入这个方 块的&4魔力&0都会消失在虚空,再 也不会出现.
    将它放在一个&1魔力池&0下方会 让池子总是接收&4魔力&0,但销毁 超出容量的部分. -botania.page.manaVoid1=Even Chad from accounting? # -- MANA FLUXFIELD botania.entry.rfGenerator=魔力转换器 botania.tagline.rfGenerator=魔力变RF啦! botania.page.rfGenerator0=将&4魔力&0引入红石能量场,就可 以将其从自然能量源形态转 为&4红石流量&0.
    将一魔力发射器对向此方块, 就可把进入其中的&4魔力&0转化 为&4RF&0.之后就能用各种传输&4RF&0 的装置来输出. -botania.page.rfGenerator1=The bullet guys. I bit it. # -- MANA LENSES botania.entry.lens=魔力透镜 @@ -2422,14 +2370,12 @@ botania.page.tangleberrie1=&o纠缠,勇敢和冻结&r. botania.entry.jiyuulia=自由之翼 botania.tagline.jiyuulia=赶走怪物 botania.page.jiyuulia0=&1自由之翼&0是种消耗少量&4魔力&0 而使得所有邻近的动物和怪 物无法进入一个圈内的花. -botania.page.jiyuulia1=&oHR HD DT Masterpiece(osu)&r. # -- RANNUNCARPUS botania.entry.rannuncarpus=手掌花 botania.tagline.rannuncarpus=放置方块 botania.page.rannuncarpus0=真是朵方便的花,&1手掌花&0会拾 取附近任何掉落物品形式的 方块并放置在其他地方.只会 将方块放置在特殊的方块上, 要指定这种特殊方块,只需将 它放在这朵花种植的土方块 下就可以. botania.page.rannuncarpus1=方块式物品,比如&1甘蔗&0也会奏 效的,但,就像这些方块一样, 它们只能被放在平常能放置 的地方.
    最后,提供&4魔力&0不是必需的, 但这会增加工作范围. -botania.page.rannuncarpus2=&oThe Sandpit of Yanille&r? # -- HYACIDUS botania.entry.hyacidus=毒风信 @@ -2473,7 +2419,6 @@ botania.tagline.spectranthemum=传送物品 botania.page.spectranthemum0=长途运输物品是一个艰巨的 任务.水路和&1扇水仙&0也没法简 单完成这个任务.&1凌空蓟&0会消 耗少量&4魔力&0将周围的掉落物 传送到另一个地点.传送过一 次之后,其他同类的花就不能 用于传送该种物品. botania.page.spectranthemum1=为了指定物品的去向,可以使 用&1森林法杖&0的绑定模式来绑 定这朵花和某个方块,就像绑 到魔力池上一样.仅在12格以 内有效.查看这朵花绑定的方 块就像查看魔力池传输&4魔力&0 那样,潜行时用法杖指向它即 可. botania.page.spectranthemum2=这朵花受&4区块加载机制&0所限, 因此它不会作用于未加载的 区块.这里就不多加叙述了.
    &o推荐查询: "Chunks and Chicken", "Anchors of the World". -botania.page.spectranthemum3=&o(n)spooky(n+2)me&r. # -- MEDUMONE botania.entry.medumone=石化草 @@ -2758,7 +2703,6 @@ botania.page.incense0=&4药剂&0以液态形式存在时可以 提供多样化 botania.page.incense1=&1熏香&0能通过右击放在&1香盘&0上, 这时再用&1打火石&0右击就能将 其点燃.一旦点着,熏香就不 能取下了.
    在需要替换前,一根熏香能燃 烧60倍于对应药水时长的时 间. botania.page.incense2=燃着&1熏香&0的&1香盘&0将会提供注 入&4药剂&0的效果,以香盘为中心 24格以内的所有玩家都会受 到影响.
    但不是所有的&4药剂&0效果都能 注入&1熏香&0,比如&4瞬间治疗&0和&1伤&0 &1害吸收&0就不能注入,熏香也不 能有一个以上的效果. botania.page.incense5=对于喜欢熏香的自动化狂魔 而言,&1熏香&0能通过&1漏斗&0或其他 输入方式接收物品.有熏香时 &1比较器&0会输出强度为1的信号 ,燃烧的时候强度则是2.
    最后,如果一束&1引燃透镜&0发出 的&4魔力脉冲&0击中了有熏香的 香盘,就会将其点着. -botania.page.incense3=Incense is wincense botania.page.incense4=放上熏香 # -- EYE OF THE ANCIENTS @@ -2962,7 +2906,6 @@ botania.page.terraPick1=工具里储存的&4魔力&0量决定了 它的&4阶位& botania.page.terraPick2=从&4C&0升至&4B&0,需要一个满的&1魔力&0 &1池&0,每级是上一级的十倍消耗 ,最终到达&4SS&0.
    工具的阶位不会改变它的速 度,但会增强&4激活能力&0.
    可以通过右击开启工具的能 力. botania.page.terraPick3=当工具激活时,它能破坏区域 内的方块.阶位&4C&0还是一小块 ,到了&4B&0就成了一个区域, 随着 阶位升高区域也会增大.注意 阶位&4D&0的工具不能激活.
    激活时会消耗工具储存的&4魔&0 &4力&0,哪怕不是用于挖掘. botania.page.terraPick4=最后,工具每次破坏方块时都 会受到磨损,所以最好物品栏 有与阶位相应的&4魔力&0储存,工 具的功能又像&1魔钢工具&0,因为 它使用&4魔力&0抵消磨损,制作原 料是&1泰拉钢&0.
    它也不会像普通掉落物品那 样消失. -botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW(ログ ホライズン) # -- ROD OF THE SEAS botania.entry.waterRod=海洋法杖 @@ -3071,7 +3014,6 @@ botania.page.gravityRod2=Why the flax? # -- TIMELESS IVY botania.entry.regenIvy=永恒常春藤 -botania.tagline.regenIvy=Ivy that can be attached to items to have them regenerate durability botania.page.regenIvy0=尽管&1魔钢&0和&1源质钢&0能用&4魔力&0 保护自身,其他的工具和护甲 却没有这种能力.
    可以给几乎所有物品附上一 些&1永恒常春藤&0,使它们能用&4魔&0 &4力&0修复. botania.page.regenIvy1=使用的话,只需将常春藤和目 标工具,以及3个在铁砧上修 理该工具的材料(比如&1钻石镐 &0用的就是&1钻石&0)
    由于没有直接连接到材料,这样消耗的&4魔力&0比起&1魔钢&0的会多很多. @@ -3097,7 +3039,6 @@ botania.entry.clip=透镜夹 botania.tagline.clip=魔力脉冲枪的多透镜升级 botania.page.clip0=&1魔力脉冲枪&0作为一个强大而 万能的工具,它的缺陷就在于 每次最多只能储存一个&1透镜&0. 将&1透镜夹&0和&1魔力脉冲枪&0在合 成栏合成后,就能让它储存最 多6个透镜.
    就像他们常说的,没有枪的 俄罗斯轮盘可不算赌博... botania.page.clip1=添加和取出&1透镜&0就像之前做 的那样,要注意的是,只会按 照脉冲枪当前的槽取出或装 入透镜.
    Shift右击&1魔力脉冲枪&0即可切 换槽位.同时也会改变所选的 透镜,前提是槽内装了透镜. -botania.page.clip2=Since we're dubbed by 4Kids we must make do without one # -- ROD OF THE DEPTHS botania.entry.cobbleRod=深渊法杖 @@ -3234,7 +3175,6 @@ botania.tagline.enderHand=随时随地的末影箱 botania.page.enderHand0=&1末影之手&0让使用者能跨维度 触及末界,换言之就是&1末影箱&0 的物品栏.无论何地只需用这 个手右击并消耗一些&4魔力&0.
    若对其他玩家使用则会相应 打开&o他们的&r末影物品栏,消耗 更多的&4魔力&0. botania.page.enderHand0a=&1末影之手&0让使用者能跨维度 触及末界,换言之就是&1末影箱&0 的物品栏.无论何地只需用这 个手右击并消耗一些&4魔力&0. botania.page.enderHand2=不仅如此,若玩家的背包中有 &1末影之手&0,那么&1移壳杆&0就能使 用玩家&1末影箱&0里的方块,这比 起平时使用,要消耗更多的&4魔 力&0. -botania.page.enderHand1=Zezima hates him! botania.page.enderHand1a=就像是4G版的末影箱 # -- SOULSCRIBE @@ -3249,7 +3189,6 @@ botania.entry.spawnerClaw=生命灌注器 botania.tagline.spawnerClaw=用魔力生成怪物,即使你不在身边 botania.page.spawnerClaw0=&1刷怪笼&0是个有趣的东西.它们 能从稀薄的空气中抽取出生 命,但不知何故,只在附近有 玩家时才会运行.
    当然这会在某些程度上限制 它生成生物的速度. botania.page.spawnerClaw1=将一个&1生命灌注器&0放在刷怪 笼的顶端并用&1魔力发射器&0提 供大量的&4魔力&0,当附近无玩家 时,&4魔力&0就会驱动刷怪笼, 就好像有玩家存在一样. -botania.page.spawnerClaw2=Something something shadow dragon # -- RED STRING botania.entry.redString=红线 @@ -3302,7 +3241,6 @@ botania.page.corporeaIndex2=输入"铁..."将搜索任何名称包 括"铁"的 botania.page.corporeaIndex3=物品名称的复数形式只能在 常规名词涉及到复数(以"-s", "-es"或"-ies"为后缀)时使用, 当前版本同样适用于多个物 品请求,例如"10 苹果".
    "10 of this"搜索10个等同于 玩家手持物品的物品. botania.page.corporeaIndex4=复数请求的例子包括 "10 apples", "a stack of apples", "2 stacks of apples", "2 stacks and 20 apples", "half a stack of apples", "a dozen apples",等等.
    索引可以识别或多或少的搜 索的繁琐形式,所以: "2x stacks and 20x of apples"等同于 "2 stack 2 apple"或 "2 stacks + 2 apples". botania.page.corporeaIndex5=搜索"all"或"every"会提供网络 内符合条件的全部物品,所以 "all 苹果"将提供网络内所有 苹果.
    另外,搜索"count","show","tell" 或"display"不会抽取任何物品, 但会显示物品库存. -botania.page.corporeaIndex6=A certain magical one at that # -- CORPOREA FUNNEL botania.entry.corporeaFunnel=多媒体漏斗 @@ -3406,14 +3344,11 @@ botania.page.cosmeticBaubles7=都给我闭嘴 botania.page.cosmeticBaubles8=这只眼睛必须被封印 botania.page.cosmeticBaubles9=这可不是豆芽 botania.page.cosmeticBaubles10=最佳色彩 -botania.page.cosmeticBaubles11=Tilting the umbrella too much botania.page.cosmeticBaubles12=邻人社 botania.page.cosmeticBaubles13=喵 botania.page.cosmeticBaubles14=别让自己太前卫了 botania.page.cosmeticBaubles15=邪恶吧! -botania.page.cosmeticBaubles16=Nudistoooooooooo botania.page.cosmeticBaubles17=谁说我是死鱼眼的 -botania.page.cosmeticBaubles18=Lurk moar botania.page.cosmeticBaubles19=我需要你的时间 botania.page.cosmeticBaubles20=稀有之物 botania.page.cosmeticBaubles21=嘿, Loki @@ -3875,7 +3810,6 @@ botania.page.preventingDecay0=绝不 #botania.page.fallenKanade2=&o我会和你结婚.不管你在现实 之中有怎样的障碍,即使无法 走路,无法站立,甚至无法生 育,既便如此我也会和你结婚 .不管在哪里遇到你.我都会 喜欢上你.
    如果在六十亿分之一的概率 下再次相遇,即使那时候你的 身体依旧无法动弹,我也会和 你结婚的.(AngelBeats) # -- Hensei Dream -- -#botania.page.heiseiDream2=&o平成壊れちゃって,壊れちゃ って.平和なんて嘘をついた のは谁だ?ほら忘れちゃっ た,忘れちゃった,祭坛に咎 めた罚も.ねえ砕けちゃって ,砕けちゃって,体も心もズ タズタにされて.
    さあどこに行くの,どこに行 くの,君は谁の味方? # -- WELCOME TO BOTANIA #botania.entry.welcome=欢迎来到植物魔法 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 024d8ab9f..32ad2f2b1 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -11,9 +11,6 @@ itemGroup.Botania=植物魔法 generator.botania-skyblock=硝子花園 generator.botania-skyblock.info=不建議植物魔法新手使用 -#並非本地化條目,請翻譯者不要修改此行文本. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=下一頁 botaniamisc.prevPage=上一頁 botaniamisc.back=返回 @@ -275,39 +272,6 @@ botania.armorset.will3.shortDesc=暴擊施加重度緩慢效果 botania.armorset.will4.shortDesc=暴擊傷害穿透護甲 botania.armorset.will5.shortDesc=暴擊施加凋零效果 -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=主世界的知識 botania.knowledge.alfheim=&a精靈&7的知識 @@ -2544,17 +2508,12 @@ botania.page.endoflame2=&o不是閃耀之光&r. # -- HYDROANGEAS botania.entry.hydroangeas=水繡球 botania.tagline.hydroangeas=水力產魔機 -botania.page.hydroangeas0=&1Hydroangeas&0 act as a liquid based passive generator. They will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. The amount they produce is comparable to that of an &1Endoflame&0. They also seem to function faster during &4Rain&0.
    &1Hydroangeas&0 are classified as &4passive flowers&0 and as such will decay. botania.page.hydroangeas2=一個簡單的&1水繡球&0系統 botania.page.hydroangeas1=&o超次元來物&r? # -- THERMALILY botania.entry.thermalily=熾玫瑰 botania.tagline.thermalily=地熱發電植魔版 -botania.page.thermalily0=The &1Thermalily&0 acts as a &1Lava&0 counterpart to the &1Hydroangeas&0. As expected, the flower will absorb &1Lava&0 around it, in the same height as it, to create &4Mana&0.
    After absorbing the &1Lava&0, the flower will produce &4Mana&0 for around 45 seconds. After it stops, it needs a bit of time, around 5 minutes, to cool down, before it can absorb more &1Lava&0. -botania.page.thermalily2=The amount of &4Mana&0 the &1Thermalily&0 produces during its active period is extremely high, serving as a very functional flower for when a quick boost is needed.
    During the "cooldown" period, if the flower were to absorb any &4Lava&0, it instead consumes it, generating no &4Mana&0 and having to wait 5 minutes from there to start over. -botania.page.thermalily3=While placing &1Lava&0 in the world is definitely possible via &1Dispensers&0, automatically gathering it and carrying it from the &4Nether&0 or deep underground is another story entirely.
    As such, the &1Thermalily&0 is clasified as a "semi-automatable" flower. -botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=阿卡納薔薇 @@ -2593,7 +2552,6 @@ botania.page.gourmaryllis3=&o為我們的新房客準備的火鍋&r. botania.entry.narslimmus=黏球草 botania.tagline.narslimmus=黏黏瑪那 botania.page.narslimmus0=這個世界上一些地方還存在 著未知的能量場,那裡能產生 &1史萊姆&0.人們稱其&4史萊姆區塊&0 .&1黏球草&0就能利用這種能量.如 果它被種在了一隻由那種能 量生出的&1史萊姆&0旁邊,它就會 將其分解並收集由其產生的 所有&4瑪那&0.&1史萊姆&0越大,產生 的&4瑪那&0就越多.它也會弄得黏 黏糊糊的. -botania.page.narslimmus1=&oStick around, would ye&r? # -- SPECTROLUS botania.entry.spectrolus=斑斕花 @@ -2750,7 +2708,6 @@ botania.page.incense0=&4藥劑&0以液態形式存在時可以 提供多樣化 botania.page.incense1=&1熏香&0能通過右擊放在&1香盤&0上, 這時再用&1打火石&0右擊就能將 其點燃.一旦點著,熏香就不 能取下了.
    在需要替換前,一根熏香能燃 燒60倍於對應藥水時長的時 間. botania.page.incense2=燃著&1熏香&0的&1香盤&0將會提供注 入&4藥劑&0的效果,以香盤為中心 24格以內的所有玩家都會受 到影響.
    但不是所有的&4藥劑&0效果都能 注入&1熏香&0,比如&4瞬間治療&0和&1傷&0 &1害吸收&0就不能注入,熏香也不 能有一個以上的效果. botania.page.incense5=對於喜歡熏香的自動化狂魔 而言,&1熏香&0能通過&1漏斗&0或其他 輸入方式接收物品.有熏香時 &1比較器&0會輸出強度為1的信號 ,燃燒的時候強度則是2.
    最後,如果一束&1引燃透鏡&0發出 的&4瑪那脈衝&0擊中了有熏香的 香盤,就會將其點著. -botania.page.incense3=Incense is wincense botania.page.incense4=放上熏香 # -- EYE OF THE ANCIENTS @@ -3092,7 +3049,6 @@ botania.entry.clip=透鏡夾 botania.tagline.clip=瑪那脈衝槍的多透鏡升級 botania.page.clip0=&1瑪那脈衝槍&0作為一個強大而 萬能的工具,它的缺陷就在於 每次最多只能儲存一個&1透鏡&0. 將&1透鏡夾&0和&1瑪那脈衝槍&0在合 成欄合成後,就能讓它儲存最 多6個透鏡.
    就像他們常說的,沒有槍的 俄羅斯輪盤可不算賭博... botania.page.clip1=添加和取出&1透鏡&0就像之前做 的那樣,要注意的是,只會按 照脈衝槍當前的槽取出或裝 入透鏡.
    Shift右擊&1瑪那脈衝槍&0即可切 換槽位.同時也會改變所選的 透鏡,前提是槽內裝了透鏡. -botania.page.clip2=Since we're dubbed by 4Kids we must make do without one # -- ROD OF THE DEPTHS botania.entry.cobbleRod=深淵法杖 @@ -3214,7 +3170,6 @@ botania.page.enderAir0=&1終界&0的空氣看起來有一些變 異的特性.如 botania.entry.enderEyeBlock=終界監視者 botania.tagline.enderEyeBlock=看著來啟動紅石信號 botania.page.enderEyeBlock0=&4終界使者&0的眼睛被看見時十分 敏感.由此製成的方塊在64格 內被玩家直視時就會發出&4紅&0 &4石信號&0.
    當然,頭戴&1南瓜&0時可以避免. -botania.page.enderEyeBlock1=MY BRAND # -- FORCE RELAY botania.entry.pistonRelay=力量傳遞器 @@ -3244,7 +3199,6 @@ botania.entry.spawnerClaw=生命灌注器 botania.tagline.spawnerClaw=用瑪那生成怪物,即使你不在身邊 botania.page.spawnerClaw0=&1刷怪籠&0是個有趣的東西.它們 能從稀薄的空氣中抽取出生 命,但不知何故,只在附近有 玩家時才會運行.
    當然這會在某些程度上限制 它生成生物的速度. botania.page.spawnerClaw1=將一個&1生命灌注器&0放在刷怪 籠的頂端並用&1瑪那發射器&0提 供大量的&4瑪那&0,當附近無玩家 時,&4瑪那&0就會驅動刷怪籠, 就好像有玩家存在一樣. -botania.page.spawnerClaw2=Something something shadow dragon # -- RED STRING botania.entry.redString=紅線 @@ -3298,9 +3252,7 @@ botania.page.corporeaIndex2=輸入"鐵..."將搜索任何名稱包 括"鐵"的 botania.page.corporeaIndex3=物品名稱的複數形式只能在 常規名詞涉及到複數(以"-s", "-es"或"-ies"為後綴)時使用, 當前版本同樣適用於多個物 品請求,例如"10 蘋果".
    "10 of this"搜索10個等同於 玩家手持物品的物品. botania.page.corporeaIndex4=複數請求的例子包括 "10 apples", "a stack of apples", "2 stacks of apples", "2 stacks and 20 apples", "half a stack of apples", "a dozen apples",等等.
    索引可以識別或多或少的搜 索的繁瑣形式,所以: "2x stacks and 20x of apples"等同於 "2 stack 2 apple"或 "2 stacks + 2 apples". botania.page.corporeaIndex5=搜索"all"或"every"會提供網絡 內符合條件的全部物品,所以 "all 蘋果"將提供網絡內所有 蘋果.
    另外,搜索"count","show","tell" 或"display"不會抽取任何物品, 但會顯示物品庫存. -botania.page.corporeaIndex8=While near a &1Corporea Index&0, if one is using &4NotEnoughItems&0, pressing C on an item in one's inventory (or NEI panel) will request 1 of said item.
    Using SHIFT will instead request a full stack, CTRL will request half a stack and SHIFT+CTRL a quarter of a stack. botania.page.corporeaIndex6=最後,在靠近&1多媒體索引&0的地方,寫上物品部份的名稱,並在聊天區域按TAB鍵將可以自動拼完物品名稱. -botania.page.corporeaIndex7=A certain magical one at that # -- CORPOREA FUNNEL botania.entry.corporeaFunnel=多媒體漏斗 @@ -3407,7 +3359,6 @@ botania.page.cosmeticBaubles7=都給我閉嘴 botania.page.cosmeticBaubles8=這隻眼睛必須被封印 botania.page.cosmeticBaubles9=這可不是豆芽 botania.page.cosmeticBaubles10=最佳色彩 -botania.page.cosmeticBaubles11=Tilting the umbrella too much botania.page.cosmeticBaubles12=鄰人部 botania.page.cosmeticBaubles13=喵 botania.page.cosmeticBaubles14=別讓自己太前衛了 @@ -3456,7 +3407,6 @@ botania.page.auraRing2=升級戒指 botania.entry.travelBelt=旅居者腰帶 botania.tagline.travelBelt=更快,更高,更遠 botania.page.travelBelt0=穿越各種地形是個麻煩事. &1旅居者腰帶&0能裝備在&4腰帶&0欄 ,裝備時增加移動速度,跳躍 高度和摔落傷害減免.
    最後,非潛行時能讓裝備者自 動走上一格高的坡而不需要 跳躍. -botania.page.travelBelt1=...everell # -- TECTONIC GIRDLE botania.entry.knockbackBelt=抗擊腰帶 @@ -3772,7 +3722,6 @@ botania.page.tinyPotato1=將它放在Kickstarter網站上 就起效了 botania.entry.headCreating=頭顱製造 botania.tagline.headCreating=製造玩家的頭顱 botania.page.headCreating0=一個特別的精靈咒語,配合一 些材料和一個&1命名牌&0就能做 出牌子裡所寫者頭的複製品. 雖然並不知道這是怎樣的原 理,但似乎可以用&1符文祭壇&0來 製作. -botania.page.headCreating2=A subset of the community has dedicated themselves to creating heads that serve as all sorts of decorations. Unlike any other page in this lexicon, clicking the &1View Online&0 button on the left of this page will take you to a website with a list of names that can be used for this purpose. Note, however, that this list is not affiliated with Botania in any way and is definitely not the only place to find these types of heads. botania.page.headCreating1=在遊戲中獲得你的頭 # -- AZULEJO -- http://en.wikipedia.org/wiki/Azulejo From 303e89f6c506b5067733f6a62f23d3a534b51797 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 20:11:55 -0500 Subject: [PATCH 660/935] Clean up English present in ja_JP and ko_KR --- .../resources/assets/botania/lang/ja_JP.lang | 30 - .../resources/assets/botania/lang/ko_KR.lang | 1592 +---------------- 2 files changed, 1 insertion(+), 1621 deletions(-) diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index 6a31fc1ab..0e2794570 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -11,9 +11,6 @@ itemGroup.Botania=ボタニア generator.botania-skyblock=ガーデンオブグラス ボタニア・スカイブロック generator.botania-skyblock.info=初心者には非推奨 -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=次ページ botaniamisc.prevPage=前ページ botaniamisc.back=戻る @@ -43,11 +40,8 @@ botaniamisc.edition=%s 版 # ^ Leave this empty for no edition display botaniamisc.devEdition=Writer's botaniamisc.lexiconcover0=説明書 by Lizbeth -botaniamisc.lexiconcover1="Vazkii" Whitewood botaniamisc.lexiconcover2=公式ガイドブック botaniamisc.lexiconcover3=ボタニアのすべてがここに! -botaniamisc.lexiconcover4=Edited by BevoLJ -botaniamisc.lexiconcover5=Edited by Saice botaniamisc.shiftinfo=&bSHIFT&7 キーを押して詳しい情報を見る botaniamisc.knowledgeTypesSingular=%s 編の知識が入っている botaniamisc.knowledgeTypesPlural=%s 編の知識が入っている @@ -94,7 +88,6 @@ botaniamisc.startTutorial=チュートリアルを始める botaniamisc.tutorialStarted=チュートリアルが始まりました。赤い矢印にしたがって内容を読み進め、ボタニアの基本を学んでください! botaniamisc.tutorialEnded=チュートリアルは終了しました。ボタニアがどのようなものかという、基本的な考えを理解したと思います。興味に従って他のページを読み、ボタニアのさらなる使い方を習得してください! botaniamisc.cosmeticBauble=&o装飾品 -botaniamisc.hasCosmetic=&oHas Cosmetic Override: &r%s botaniamisc.typeToSearch=(入力して検索) botaniamisc.viewOnline=ウェブページで見る botaniamisc.history=履歴 @@ -103,9 +96,7 @@ botaniamisc.historyDesc=直近の検索履歴を見る botaniamisc.lexiconOptions0=オプション botaniamisc.lexiconOptions1=ゲーム内から設定を変更 botaniamisc.lexiconOptions2=ゲーム再起動が必要なオプションもあります -botaniamisc.hasPhantomInk=&b Tinged with Phantom Ink botaniamisc.pinkinatorDesc=ウィザーに直接つかう -botaniamisc.relicUnbound=&6Relic&7, Unbound botaniamisc.relicSoulbound=この&6形見&7は, &f%sに属している botaniamisc.notYourSagittarius=&4この形見はあなたのものじゃないです botaniamisc.diceRoll=ダイスが %s で地面に着地し、なにか別のものに変わっていた。 @@ -155,10 +146,8 @@ botaniamisc.tutorialText=ゲーム内 botaniamisc.tutorialVideo=動画 botaniamisc.shiftToStopSpin=(シフトで停止) botaniamisc.noVideo=&4動画は公開停 止中です。ご めんね(´ρ`) -botaniamisc.adaptativeConfigChanges=Botania's adaptation Config has changed the following config defaults for you: botaniamisc.altarRefill0=何も持ってない状態で右クリックすると botaniamisc.altarRefill1=最後に使ったレシピのアイテムを補充します -botaniamisc.santaweaveInfo=Manaweave, changed up for the &cs&fe&ca&fs&co&fn botaniamisc.enterToView=^ エンターキーで見る ^ # NEI INTEGRATION @@ -250,49 +239,37 @@ death.attack.botania-relic=%s は他人の形見を使ったために処罰さ # ENTITY NAMES entity.Botania.botania:manaBurst.name=マナ放射線 -entity.Botania.botania:signalFlare.name=Signal Flare entity.Botania.botania:pixie.name=ピクシィ -entity.Botania.botania:flameRing.name=Flame Ring entity.Botania.botania:vineBall.name=ツタ玉 entity.Botania.botania:doppleganger.name=ガイアの守護者 -entity.Botania.botania:magicLandmine.name=Gaia Trap entity.Botania.botania:spark.name=スパーク entity.Botania.botania:thrownItem.name=投げ込まれたアイテム -entity.Botania.botania:magicMissile.name=Magic Missile entity.Botania.botania:thornChakram.name=棘のチャクラム entity.Botania.botania:corporeaSpark.name=コーポリアスパーク entity.Botania.botania:enderAirBottle.name=エンダー空気瓶 entity.Botania.botania:poolMinecart.name=マナプールマインカート entity.Botania.botania:pinkWither.name=桃色ウィザー entity.Botania.botania:playerMover.name=ルミナイザ光線 -entity.Botania.botania:manaStorm.name=Manastorm Epicenter entity.Botania.botania:babylonWeapon.name=宝物庫の武器 entity.Botania.botania:fallingStar.name=流星 # ACHIEVEMENT NAMES + DESC -achievement.botania:flowerPickup=Sky of Beginning achievement.botania:flowerPickup.desc=神秘的な花を拾う achievement.botania:lexiconUse=現実的論理主義者 achievement.botania:lexiconUse.desc=レキシカ・ボタニアを開いて目次を見る achievement.botania:daybloomPickup=アカツキアライヴァル achievement.botania:daybloomPickup.desc=花びらの調合所でデイブルームをつくる -achievement.botania:manaPoolPickup=ViViD WAVE achievement.botania:manaPoolPickup.desc=マナを貯蔵するマナプールをクラフトする achievement.botania:endoflamePickup=炉心融解 achievement.botania:endoflamePickup.desc=マナ生成を加速させるエンドフレイムをクラフトする -achievement.botania:tinyPotatoPet=Just Be Friends achievement.botania:tinyPotatoPet.desc=小さなポテトをつくってペットにする -achievement.botania:sparkCraft=LIVEDRIVE achievement.botania:sparkCraft.desc=マナの運搬に役立つスパークをつくる -achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=装飾品をつくって装備する achievement.botania:manaCookieEat=腐れ外道とチョコレゐト achievement.botania:manaCookieEat.desc=マナを融合したおいしい"全快ビスケット"を食べる -achievement.botania:runePickup=LILIUM DOLL achievement.botania:runePickup.desc=ルーンの祭壇を使ってルーンを作る achievement.botania:manaBlasterShoot=M'AIDER遭難ガール achievement.botania:manaBlasterShoot.desc=マナブラスターをつくって発射する -achievement.botania:tiaraWings=Heart Shooter achievement.botania:tiaraWings.desc=フリューゲルティアラをフリューゲルウィングとクラフトし、装備する achievement.botania:terrasteelPickup=ダンサーインザダーク achievement.botania:terrasteelPickup.desc=大地集積プレートをつかってテラスチールインゴットを作る @@ -310,19 +287,15 @@ achievement.botania:dirtRodCraft=ロクベル achievement.botania:dirtRodCraft.desc=汚いぼ...じゃなかった、大地の杖をクラフトしよう achievement.botania:spawnerMoverUse=◯◯◯脱げるもん! achievement.botania:spawnerMoverUse.desc=生命集積器をつかってモンスタースポナーを移動させる -achievement.botania:enderAirMake=Imitation Air achievement.botania:enderAirMake.desc=エンダー空気瓶を集める -achievement.botania:corporeaCraft=drop pop candy achievement.botania:corporeaCraft.desc=コーポリア・ネットワークに役立つブロックをクラフトする achievement.botania:cacophoniumCraft=ノイジーラバーソウル achievement.botania:cacophoniumCraft.desc=カコフォニウムをクラフトして、嫌いなアイツを静かに怒らせよう achievement.botania:manaCartCraft=ハウトゥー世界征服 achievement.botania:manaCartCraft.desc=長距離マナ輸送のためにマナプールトロッコをクラフトする -achievement.botania:craftingHaloCraft=Segments Blue achievement.botania:craftingHaloCraft.desc=簡単にクラフトができる組み立ての光輪をクラフトする achievement.botania:manaweaveArmorCraft=想像フォレスト achievement.botania:manaweaveArmorCraft.desc=杖をパワーアップさせるマナウェーブ装備をクラフトする -achievement.botania:enchanterMake=ODDS & ENDS achievement.botania:enchanterMake.desc=エンチャントを制御するための、マナエンチャンターをクラフトする achievement.botania:pollidisiacPickup=ロミオとシンデレラ achievement.botania:pollidisiacPickup.desc=ポリディシエクをクラフトして、動物を繁殖させる @@ -334,7 +307,6 @@ achievement.botania:bubbellPickup=深海少女 achievement.botania:bubbellPickup.desc=バッベルをクラフトして水中拠点を作成できるようにする achievement.botania:luminizerRide=ワールズエンド・ダンスホール achievement.botania:luminizerRide.desc=ルミナイザをクラフトして輸送につかう -achievement.botania:manaBombIgnite=Under of Fragments achievement.botania:manaBombIgnite.desc=マナストーム・チャージをクラフトして、遠くで点火する achievement.botania:dandelifeonPickup=ドーナツホール achievement.botania:dandelifeonPickup.desc=ダンデライフオンをつくって、自分の心を試す @@ -347,9 +319,7 @@ achievement.botania:gaiaGuardianNoArmor=終末のミュートロギア achievement.botania:gaiaGuardianNoArmor.desc=防具を付けずにガイアの守護者を倒す achievement.botania:rankSSPick=六兆年と一夜物語 achievement.botania:rankSSPick.desc=ランクSSのテラシャッテラーをつかう -achievement.botania:superCorporeaRequest=Invader GIRL! achievement.botania:superCorporeaRequest.desc=コーポリアの索引で、50,000個以上の一種類のアイテムのリクエストに成功する -achievement.botania:pinkinator=DECORATOR achievement.botania:pinkinator.desc=ピンキネーターをつかう achievement.botania:infiniteFruit=イノセンティア diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index b240d1e3f..476c263a1 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -12,9 +12,6 @@ itemGroup.Botania=보타니아 [Botania] generator.botania-skyblock=잔디의 정원 generator.botania-skyblock.info=보타니아를 처음하는 분에게는 권장하지 않습니다. -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=다음 장 botaniamisc.prevPage=이전 장 botaniamisc.back=뒤로 @@ -57,7 +54,6 @@ botaniamisc.clickToSee=클릭시 해당페이지 이동 botaniamisc.shiftToRemove=쉬프트클릭시 삭제 botaniamisc.clickToAdd=이곳을 누르면 북마크가 추가됩니다. botaniamisc.ratio=확대: %sx -botaniamisc.bottleTooltip=It has an acquired taste botaniamisc.coarseDirt0=거친 흙과 잔디 위에서는 botaniamisc.coarseDirt1=아무것도 자랄 수 없습니다 botaniamisc.spawnerTip=Tip: 스폰알로 몹을 변경 @@ -87,10 +83,6 @@ botaniamisc.hasClip=&6현재 적용된 렌즈클립 : botaniamisc.clipEmpty=(비어있음) botaniamisc.armorset=&b갑옷 설정&r: botaniamisc.craftToAddWill=&a테라스틸 투구와 조합할 경우 생기는 효과: -botaniamisc.requestMsg=Requested %d x "%s" out of %d. %d taken. -botaniamisc.nearIndex0=Corporea Index nearby! -botaniamisc.nearIndex1=Anything you say will be -botaniamisc.nearIndex2=intercepted as a request botaniamisc.startTutorial=튜토리얼 시작! botaniamisc.tutorialStarted=당신은 튜토리얼을 시작했습니다, 빨간화살표를 따라 눌러보며 보타니아에 대해 알아보세요! botaniamisc.tutorialEnded=튜토리얼은 여기까지입니다. 이제 당신은 이 책을 읽어서 보타니아의 사용법에 대해 알아보도록하세요 :D @@ -145,12 +137,6 @@ botaniamisc.showNotes=노트 보이기 botaniamisc.notes=노트 botaniamisc.pay2win=아이템을 마나웅덩이에 빠트려서 업그레이드해보세요 botaniamisc.justDoIt=지금 당장 -botaniamisc.changes0=&aBotania&7 has changed since you last used it in this instance! -botaniamisc.changes1=The last version of &aBotania&7 you used was &b%s&7. -botaniamisc.changes2=Things change, don't panic. If something seems off, read the entry again. -botaniamisc.changes3=&oEveryone is afraid of change, yet change is the force that moves us forward. -botaniamisc.changes4=&fShift-Left Click&7 to read the changes since then -botaniamisc.changes5=&fLeft Click&7 to dismiss this # NEI INTEGRATION botania.nei.brewery=보타니아 양조기 @@ -247,39 +233,6 @@ botania.armorset.will3.shortDesc=치명타 공격시 상대방에게 강한 구 botania.armorset.will4.shortDesc=치명타 공격시 상대방의 방어력을 무시합니다. botania.armorset.will5.shortDesc=치명타 공격시 상대방에게 위더 효과 -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=마인크래프트 전문가의 지식 botania.knowledge.alfheim=&a요정&7들의 지식 @@ -316,9 +269,7 @@ matrixMode.enabled=매트릭스 모드 활성화 references.enabled=참고 툴팁 활성화 shaders.enabled=쉐이더사용 활성화 baubleRender.enabled=버블 렌더링 활성화 -spreader.posShift=Spreader Pos Shift versionChecking.enabled=버전 체크 활성화 -wandBeam.static=Enable Static Wand Beam worldgen.flower.density=꽃의 밀도 worldgen.flower.quantity=꽃의 양 worldgen.mushroom.quantity=버섯의 양 @@ -352,7 +303,6 @@ botania.versioning.flavour24=이봐! 이봐요! 여길봐요! 보타니아 업 botania.versioning.flavour25=아주 특별한 선물을 당신에게 선물할게요. 따뜻하니까~ 매일매일 언제까지나 나를 미소짓게 만드네~ 보타니아 신버전이 도착했어요 히힛 botania.versioning.flavour26=보타니아 업데이트를 안하면 가정이 무너지고~ 사회가 무너지고~ botania.versioning.flavour27=어쩌피 원문을 번역하면 한국사람들은 이해하지 못한다구요? 그러니까 제 마음대로 할 수 있다는 이말입니다. 아, 갈때 보타니아 업데이트하고 가세요. -botania.versioning.flavour28=BotaniaWow! You'll say wow every time! As seen on your chat log! botania.versioning.flavour29=그냥 보타니아를 업데이트, 업데이트, 업데이트 , 업데이트 하세요! 구버전따위 원하는 사람은 없습니다! botania.versioning.flavour30=보타니아가 업데이트를 시전했다! 효과가 엄청났다! botania.versioning.flavour31=[리빙포인트]보타니아는 언제나 최신버전으로 업데이트하는게 좋다. @@ -381,7 +331,6 @@ botania.versioning.doneDownloading=%s의 다운로드가 끝났습니다. 당신 botania.versioning.downloadedAlready=당신은 이미 최신 버젼을 다운로드 하셨습니다. 게임을 종료하시고, .minecraft - mods 에서 구버젼을 삭제해주세요, 그리고 게임을 재시작 해주세요! botania.versioning.downloadingAlready=이미 다운로드 중입니다. 조금만 더 시간을 주세요. botania.versioning.error=앗! 보타니아 업데이트 파일 다운로드중 오류가 생긴거 같습니다. botaniamod.net에서 받아주세요 -botania.versioning.disabled=Sorry. This feature is currently disabled due to server host problems, it should be back soon. # BAUBLE TOOLTIPS botania.baubletype.amulet=&a아뮬렛&7 슬릇에 착용 가능 @@ -420,75 +369,52 @@ entity.보타니아.botania:babylonWeapon.name=보구 entity.보타니아.botania:fallingStar.name=유성 # ACHIEVEMENT NAMES DESC / 업적의 제목들은 모두 보컬로이드(VOCALOID) 노래 제목입니다. 제목은 더 이상 만지지 말아주세요. -achievement.botania:flowerPickup=Sky of Beginning achievement.botania:flowerPickup.desc=신비로운 꽃을 월드에서 얻어보세요! achievement.botania:lexiconUse=현실적 논리 주의자 achievement.botania:lexiconUse.desc=보타니아 사전을 열어서 목차를 확인해보세요! achievement.botania:daybloomPickup=새벽 어라이벌 achievement.botania:daybloomPickup.desc=꽃잎 연금술기로 해맞이 꽃을 만들어보세요! -achievement.botania:manaPoolPickup=ViViD WAVE achievement.botania:manaPoolPickup.desc=희미한 웅덩이를 업그레이드! achievement.botania:endoflamePickup=노심용해 achievement.botania:endoflamePickup.desc=불먹이 꽃으로 마나생산량 업업! -achievement.botania:tinyPotatoPet=Just Be Friends achievement.botania:tinyPotatoPet.desc=타이니 포테이토를 만들어보세요! -achievement.botania:sparkCraft=Live Drive achievement.botania:sparkCraft.desc=스파크를 만들어서 마나를 운송해 보자! -achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=버블즈 악세사리를 장착해보세요! achievement.botania:manaCookieEat=썩은 외도와 초콜릿 achievement.botania:manaCookieEat.desc=맛난 마나 쿠키를 만들어서 먹어보자 -achievement.botania:runePickup=Lilium Doll achievement.botania:runePickup.desc=신비로운 제단으로 룬을 만들어보세요! -achievement.botania:manaBlasterShoot=M'aider Stranded Girl achievement.botania:manaBlasterShoot.desc=마나블래스터를 만들어 볼까요? achievement.botania:tiaraWings=하트 슈터 achievement.botania:tiaraWings.desc=플뤼겔의 왕관을 만든 후 장착 achievement.botania:terrasteelPickup=어둠 속에의 댄서 achievement.botania:terrasteelPickup.desc=테라스틸 집적 판을 통해서 테라스틸을 만들어 보세요 -achievement.botania:elfPortalOpen=World Calling achievement.botania:elfPortalOpen.desc=알브헤임의 포탈을 열어보세요! achievement.botania:gaiaGuardianKill=데드 앤드 시크 achievement.botania:gaiaGuardianKill.desc=대지의 의식을 시행해 대지의 수호자를 소환한 후 처치하세요 -achievement.botania:terrasteelWeaponCraft=Remote Paranoia achievement.botania:terrasteelWeaponCraft.desc=테라스틸로 무기를 만들어보세요 achievement.botania:kekimurusPickup=방과후 스트라이드 achievement.botania:kekimurusPickup.desc=케키리마스를 만들어 마나를 대량생산 해보세요! -achievement.botania:heiseiDreamPickup=Heisei Cataclysm achievement.botania:heiseiDreamPickup.desc=길몽초를 만들어 몬스터에게 혼란을 가져다주세요! achievement.botania:dirtRodCraft=록벨 -achievement.botania:dirtRodCraft.desc=Craft a dirty sti- er... Rod of the Lands achievement.botania:spawnerMoverUse=(검열삭제)를 벗을 수 있는 걸 -achievement.botania:spawnerMoverUse.desc=Use a Life Aggregator to transport a Monster Spawner -achievement.botania:enderAirMake=Imitation Air achievement.botania:enderAirMake.desc=엔더의 공기를 병에 넣어보세요 -achievement.botania:corporeaCraft=Drop Pop Candy achievement.botania:corporeaCraft.desc=Corporea Network 블럭을 만들고 사용해보세요 achievement.botania:signalFlareStun=See the Lights -achievement.botania:signalFlareStun.desc=Stun 100 or more mobs at once with a Signal Flare achievement.botania:l20ShardUse=어.긋.나.간.다 -achievement.botania:l20ShardUse.desc=Raise the ground up to the sky with a Power XX Shard of Laputa achievement.botania:gaiaGuardianNoArmor=종말 -achievement.botania:gaiaGuardianNoArmor.desc=Slay a Gaia Guardian without wearing any armor at any point during the fight -achievement.botania:rankSSPick=Talent Shredder achievement.botania:rankSSPick.desc=대지파괴를 SS랭크로 업시켜보세요! -achievement.botania:superCorporeaRequest=Invader Girl achievement.botania:superCorporeaRequest.desc=50,000개 이상의 아이템을을 Corporea Network에서 불러보세요 -achievement.botania:pinkinator=Decorator achievement.botania:pinkinator.desc=핑키네이터를 사용해보세요! achievement.botania:infiniteFruit=이노센티아 achievement.botania:infiniteFruit.desc=영웅적인 위업을 달성해서 금단의 과실을 획득해보세요 -achievement.botania:kingKey=A Fake, Fake Psychotropic achievement.botania:kingKey.desc=영웅적인 위업을 달성해서 왕의 열쇠을 획득해보세요 -achievement.botania:flugelEye=Angel of Death achievement.botania:flugelEye.desc=영웅적인 위업을 달성해서 플뤼겔의 눈을 획득해보세요 achievement.botania:thorRing=원스텝·레이어드 achievement.botania:thorRing.desc=영웅적인 위업을 달성해서 토르의 반지를 획득해보세요 achievement.botania:odinRing=로스트 타임 메모리 achievement.botania:odinRing.desc=영웅적인 위업을 달성해서 오딘의 반지를 획득해보세요 -achievement.botania:lokiRing=Arithmetic achievement.botania:lokiRing.desc=영웅적인 위업을 달성해서 로키의 반지를 획득해보세요 achievement.botania:aesirRing=신이 내린 뜻대로 achievement.botania:aesirRing.desc=아사의 반지를 얻어보세요. @@ -509,44 +435,25 @@ botania.challengelevel.lunatic=마조히스트 botania.challenge.flowerFarm=꽃 농장 botania.challenge.flowerFarm.desc=자동으로 16가지 색상의 신비로운 꽃을 생산하는 농장을 만들어 보세요! 분류까지 한다면 보너스 포인트! botania.challenge.recordFarm=레코드 농장 -botania.challenge.recordFarm.desc=Create a system that produces records through the death of creepers at the hand of skeletons. Bonus points if it doesn't require a player's presence. botania.challenge.reedFarm=사탕수수 농장 botania.challenge.reedFarm.desc=자동으로 사탕수수 농장을 만들어보세요! 피스톤을 사용하지 않았다면 보너스 포인트! botania.challenge.cobbleGen=조약돌 생성기 botania.challenge.cobbleGen.desc=자동으로 조약돌을 생성한뒤 캐주세요. 조약돌을 화로에 굽는 것 까지 완성한다면 보너스 포인트! botania.challenge.pureDaisy=정화의 데이지 자동화 -botania.challenge.pureDaisy.desc=Completely automate the Pure Daisy. Bonus points if only one spreader is used and/or if the wood/stone input is also automated. botania.challenge.battery=마나배터리 -botania.challenge.battery.desc=Create a Mana Battery, a system where mana enters one pool and comes out of another, with a good amount of pools as a buffer. Bonus points if the input or output can be changed. botania.challenge.apothecaryRefill=연금술 ㅈ동화 -botania.challenge.apothecaryRefill.desc=Create a system that automatically refills the 꽃잎 Apothecary if it's empty. Bonus points if the system can also automatically create flowers, given the components. botania.challenge.treeFarm=나무농장 -botania.challenge.treeFarm.desc=Create an automated, self-sustaining tree farm. Bonus points if it can do multiple types of tree. botania.challenge.fullCropFarm=완벽한 농장 -botania.challenge.fullCropFarm.desc=Create a crop farm with all types of crops (wheat, carrot, potato, melon, pumpkin, cocoa and nether wart) that runs at full efficiency. Bonus points if the outputs are sorted. botania.challenge.animalFarm=동물농장 -botania.challenge.animalFarm.desc=Create an automated animal farm with all farmable animal types. Bonus points if the food doesn't need to be put in manually. botania.challenge.boneMealFarm=비료농장 -botania.challenge.boneMealFarm.desc=Create an automated farm that utilizes bone meal to quickly grow crops on demand. Bonus points if the Drum of the Wild isn't used. botania.challenge.orechid=광물난초 자동화 -botania.challenge.orechid.desc=Create a system that allows for the Orechid flower to be fully automated. Bonus points if the output is smelted and sorted. botania.challenge.mobTower=몹타워 -botania.challenge.mobTower.desc=Create a tower style mob farm. Mobs must be sorted and put into specific chambers at the end. Spawners can be used. Bonus points if the farm functions at 100% efficiency without a player's interaction. -botania.challenge.entropinnyumSetup=Entropinnyum Setup -botania.challenge.entropinnyumSetup.desc=Create a system that automatically crafts TNT and safely feeds it to an Entropinnyum flower, creating mana. Bonus points if the sand and gunpowder required for the TNT don't need to be put in manually. -botania.challenge.spectrolusSetup=Spectrolus Setup -botania.challenge.spectrolusSetup.desc=Create a system that feeds a Spectrolus, generating mana. Aside from raw mana, no items may be input from outside the system. Bonus points if it operates at 100% efficiency, never wasting any wool. botania.challenge.potionBrewer=교배 자동화 -botania.challenge.potionBrewer.desc=Create a system that can make all types of brews automatically on demand. Bonus points if it keeps a set of incense always ignited in the player's base. -botania.challenge.kekimurusSetup=Kekimurus Setup -botania.challenge.kekimurusSetup.desc=Fully automate a Kekimurus, every part of the system must be automated and self-sustaining. Bonus points if only one crafty crate is used. botania.challenge.autoQuarry=채굴 자동화 -botania.challenge.autoQuarry.desc=Create a mining quarry that digs for ores and stone underground. It should dig out chunks of land and output all of the mined resources, sorting them. Bonus points if it can relocate automatically after it's done with an area. botania.challenge.runeCrafter=룬 제작기 -botania.challenge.runeCrafter.desc=Create a system that can craft all runes on demand or keep them stocked. Every part of this system must be automated and self-sustaining, including the item inputs. Bonus points if only one Runic Altar block is used. You must be pretty crazy to try this one. # BLOCK NAMES tile.botania:flower0.name=신비로운 하얀색 꽃 @@ -892,8 +799,6 @@ tile.botania:petalBlock12.name=갈색 꽃잎 블럭 tile.botania:petalBlock13.name=초록색 꽃잎 블럭 tile.botania:petalBlock14.name=빨강색 꽃잎 블럭 tile.botania:petalBlock15.name=검은색 꽃잎 블럭 -tile.botania:corporeaIndex.name=Corporea Index -tile.botania:corporeaFunnel.name=Corporea Funnel tile.botania:endStoneBrick0.name=엔더 석재벽돌 tile.botania:endStoneBrick1.name=조각된 엔더 석재벽돌 tile.botania:endStoneBrick2.name=엔더 벽돌 @@ -984,7 +889,6 @@ tile.botania:stone9Slab.name=현무암 벽돌 반블럭 tile.botania:stone10Slab.name=섬록암 벽돌 반블럭 tile.botania:stone11Slab.name=화강암 벽돌 반블럭 tile.botania:blazeBlock.name=블레이즈 램프 -tile.botania:corporeaInterceptor.name=Corporea Interceptor tile.botania:corporeaCrystalCube.name=Corporea 크리스탈 큐브 tile.botania:incensePlate.name=향 받침대 tile.botania:hourglass.name=유영 모래시계 @@ -1071,7 +975,6 @@ tile.botania:flower.gourmaryllis.reference=후유카이 데스(*역자 : 일본 tile.botania:flower.narslimmus.name=나아슬리머스 tile.botania:flower.narslimmus.reference=뭐야!? 모든게 끈적거리잖아! tile.botania:flower.spectrolus.name=스펙트럴러스 -tile.botania:flower.spectrolus.reference=Profiting off Hate # - FUNCTIONAL tile.botania:flower.bellethorn.name=미인가시꽃 @@ -1122,10 +1025,7 @@ tile.botania:flower.daffomill.name=풍차꽃 tile.botania:flower.daffomill.reference=요리사의 조수 tile.botania:flower.vinculotus.name=이동간섭꽃 tile.botania:flower.vinculotus.reference=엑스트라유틸리티를 위한 모드 -tile.botania:flower.spectranthemum.name=Spectranthemum -tile.botania:flower.spectranthemum.reference=In the shell tile.botania:flower.medumone.name=속박의 꽃 -tile.botania:flower.medumone.reference='Twas Hades all along tile.botania:flower.marimorphosis.name=변성초 tile.botania:flower.marimorphosis.reference=믿고 쓰는 변성초 tile.botania:flower.marimorphosisChibi.name=작은 변성초 @@ -1134,7 +1034,6 @@ tile.botania:flower.bubbell.name=습기제거초 tile.botania:flower.bubbell.reference=휘파람(BGM. 뇌내혁명걸) tile.botania:flower.bubbellChibi.name=작은 습기제거초 tile.botania:flower.bubbellChibi.reference=휘파람(BGM. 뇌내혁명걸) -tile.botania:flower.solegnolia.name=Solegnolia tile.botania:flower.solegnolia.reference=자석은 이걸로 만들어진다카더라 아님 말고ㅋ # ITEM NAMES @@ -1501,10 +1400,6 @@ botania.potion.clear=면죄 botania.gui.lexicon.header=보타니아 사전, %s 번째 제본판 목차 - 배우길 원하는 카테고리를 클릭하세요. : botania.gui.lexicon.wip=(이 부분은 작성중입니다. 내용이 완전하지 않을수도 있습니다.) -# MUSIC DISCS -item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness -item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence - # BANNER NAMES item.banner.botania_flower.black=검은색 신비로운 꽃 item.banner.botania_flower.red=빨간색 신비로운 꽃 @@ -1778,15 +1673,6 @@ botania.category.misc=기타 # - BASIC # -- WELCOME TO BOTANIA botania.entry.welcome=보타니아를 시작하신 것을 진심으로 환영합니다. -botania.page.welcome0=&oWhat is peace? Is it truly just a lack of combat? Is it years of sitting quietly in a garden, surrounded by flowers? Is it watching over a kingdom that you are able to call your own? Is it the completion of almost every task known to man? Is it the ability to watch numbers of resources steadily rise as you watch your collection grow? -botania.page.welcome1=&oIs peace something that can be obtained easily, without work - or is it something difficult to obtain?
    Let's say for a moment - not even a second - that peace is truly just a lack of work; peaceful days surrounded by flowers. -botania.page.welcome2=&oYears spent watching time tick by while you watch your flora perform every single task imaginable, without outside help from polluting machines or computers tangled in cables and pipes.
    Now imagine that everything we just talked about was possible. -botania.page.welcome3=&oImagine that through your hard labor - your cultivation of flowers, your manipulation of mana, your knowledge of the mechanisms of the world and redstone - you could obtain that dreamlike state. Imagine that you could have everything you could ever desire automated with flora. Flora, some magic, and your own ingenuity. -botania.page.welcome4=&oWith the help of this book, your dreams will become a reality.
    The name of this book is deceptive. Despite being called the Lexica 보타니아, this tome focuses on far more than just flowers. It focuses on a variety of devices, both magical and bordering on technological. -botania.page.welcome5=&oIt holds the secrets of the elves, who have long ago fled from this world, as well as possible clues to the origins of the very world itself. For anyone with a basic knowledge of redstone and the creativity to put it to use, this book offers answers to nearly every problem known to man, without the need to use foreign schools of magic or machinery. -botania.page.welcome6=&oThis book contains instructions on how to perform nearly every task that one could ever need, with only the use of what's in it, and available in the world of Minecraft, assuming you're up to the task of putting them together in ingenious ways.
    Try it out, you'll be amazed at what you can do without outside interference. -botania.page.welcome7=&oThe school of botany does not solely apply to those with a knack for complex thought processes.
    Introduction to the art is simple, and the rewards are vast. A wide range of magical accessories and instruments allow for empowering of one who decides to study the various options therein. -botania.page.welcome8=&oDear reader, I welcome you to the realm of 보타니아.&r
    - Written by &nGideon Seymour&r, guest writer. (Adapted for use) botania.entry.tutorial=기본 사용 지침서 botania.page.tutorial0=&4본 모드는 덕질패러디가 넘쳐납니다.&0
    아래의 버튼을 통해서 "가이드 투어"가 가능합니다 :D
    처음 시작하시는 분이라면 아래의 버튼을 한번 눌러보세요!(내용이 100%번역된 항목은 ABCD순서가 나뉘어져 있습니다.) @@ -1795,22 +1681,6 @@ botania.page.tutorial0=&4본 모드는 덕질패러디가 넘쳐납니다.&0
    botania.entry.introVideo=소개 동영상 botania.page.introVideo0=보타니아의 기본적인 내용을 영상으로 보여줍니다.(영문) -# -- GARDEN OF GLASS -botania.entry.gardenOfGlass=Garden of Glass -botania.page.gardenOfGlass0=In the &2Garden of Glass&0 nobody can hear you scream.
    You're alone in space.
    How exciting. -botania.page.gardenOfGlass1=The &2Garden of Glass&0 is a skyblock mode for 보타니아. It's advised only for players who are somewhat experienced in the mod, but if you're new to it, you're more than welcome to try it out anyway.
    Most of the mod functions the same, but some tweaks have been put in place to allow for the skyblock style game. They'll be listed in the following pages. -botania.page.gardenOfGlass2=botania.page.gardenOfGlass2=After spawning in the &1Garden of Glass&0 you'll find &1Living Roots&0 below the landing area. These can be used to create &1Saplings&0 and &1Floral Fertilizer&0. They also work as &1Bone Meal&0. Shift-right clicking a &1Dirt&0 or &1Grass&0 block with an empty hand will have you rummage through the soil, finding some &1Pebbles&0, that can be converted into &1Cobblestone&0. Filling a &1Petal Apothecary&0 can be done with a &1Bowl&0 by clicking on a water block. -botania.page.gardenOfGlass3=Creating &1Saplings&0 -botania.page.gardenOfGlass4=Creating &1Floral Fertilizer&0 -botania.page.gardenOfGlass5=Creating &1Cobblestone&0 -botania.page.gardenOfGlass6=Aside from that, some things in 보타니아 are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster and much cheaper; &1Mana Spreaders&0 don't need gold; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted. -botania.page.gardenOfGlass7=Creating &1Sugar Canes&0 -botania.page.gardenOfGlass8=Creating &1Slimeballs&0 -botania.page.gardenOfGlass9=It's possible to infuse a &1Pumpkin&0 with the fel spirits of monster slain, creating a &1Fel Pumpkin&0. This can be placed atop two &1Iron Bars&0, in a similar fashion to a &1Snow Golem&0, to spawn a &1Blaze&0.
    &1Blazes&0 spawned with this method drop &1Blaze Powder&0 instead of &1Blaze Rods&0. -botania.page.gardenOfGlass10=Nerfing warlocks again -botania.page.gardenOfGlass11=Aside from providing light, the &1Mana Flash&0 present in the starting area allows a player who has lost their &1Lexica 보타니아&0 to exchange a &1Sapling&0 for it, by right clicking with the &1Sapling&0 on the &1Mana Flame&0.
    This can only be done if the player doesn't have a &1Lexica 보타니아&0 on them. -botania.page.gardenOfGlass12=Lastly, an &1End Portal&0 recipe - # -- LEXICA BOTANIA botania.entry.lexicon=보타니아 사전 botania.page.lexicon0=&1보타니아 사전&0은 모든 지식의 저장고입니다. 보타니아를 제외한 다른 모드들 까지 말이죠!
    사전을 열어 보타니아에 관련된 지식을 얻을 수 있고 심지어 사전을 들고 해당하는 아이템에 커서를 맞춘 후 쉬프트-우클릭하면 위키가 열립니다! @@ -1840,7 +1710,6 @@ botania.page.apothecary1=&1꽃잎 연금술기&0 botania.page.apothecary2=꽃잎 연금술기를 월드에 설치하고 약간의 물을 제공한다면 (&1물 양동이 1개&0 분량) 모든 종류의 &1신비로운 꽃잎&0을 연금술기에 던지면 그들의 에너지를 방출하면서 수용할 것입니다.
    올바른 &1신비로운 꽃잎&0이 들어가고 나면, &1씨앗&0 하나를 던져 완성할 수 있습니다.
    꽉찬 양동이를 뿌리는 것 또한 약제기를 물로 채웁니다. botania.page.apothecary3=대부분의 식물들은 이러한 방법으로 제조할 수 있습니다, 자세한 정보를 원한다면 이 사전에서 &1기능성 식물&0 그리고 &0생산성 식물&1란을 읽도록 하세요.
    쉬프트-우클릭으로 연금술기에 넣은 아이템을 다시 수거할 수 있습니다. botania.page.apothecary4=연금술기에는 &1물&0 대신에 &1용암&0을 둘수 있는데, 용암을 두게 되면 접촉하는 모든 아이템을 파괴하는 소각로 역할을 합니다.(마치 선인장 처럼 말이죠).
    마지막으로, 덩굴을 설치하는 것으로 이끼가 낀 듯한 시각 효과를 만들어 냅니다. -botania.page.apothecary6=A simple tip for those who want to squeeze the biggest efficiency out of every block is as follows, up to twenty seconds after crafting a flower in this block, right clicking it with an empty hand will pull the items from the inventory required for the recipe and put them into it for quick mass crafting. This only works if it has water. botania.page.apothecary5=&1꽃잎 연금술기 제작&0. # -- PURE DAISY @@ -1860,13 +1729,6 @@ botania.page.wand3=꽃잎들은 지팡이의 색깔을 결정하는데에 사용 # -- RUNIC ALTAR botania.entry.runeAltar=신비로운 제단 -botania.page.runeAltar21=Runic creation is a rather important complex in the advancement of the botanical magics. First and foremost, though, this type of crafting requires a decent knowledge of &4Mana Manipulation&0. Before proceeding further, a read through the important entries (those in &oItalics&r) on that section of the &1Lexica 보타니아&0 might prove enlightening. -botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one would require a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by linking a &1Mana Spreader&0 to the altar, and right click it with a &1Wand of the Forest&0.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it and use the wand on it again to collect your rune. -botania.page.runeAltar2=Crafting the &1Runic Altar&0. -botania.page.runeAltar3=A total of 16 &1Runes&0 exist.
    The most basic and elementary runes are named after the &4Four Elements&0. The intermediate runes are named after the &4Four Seasons&0, and the most advanced runes are named after the &4Seven Deadly Sins&0. A separate &1Rune of Mana&0 also exists. -botania.page.runeAltar20=Sneaking and right-clicking the &1Runic Altar&0 with an empty hand while it's not accepting mana will remove the last item put into it.
    Last but not least, attaching a &1Comparator&0 to it will emit signal strength &41&0 if the altar is accepting &4Mana&0 and signal strength &42&0 if it's ready to craft the rune. -botania.page.runeAltar21=Similarly to the &1Petal Apothecary&0, right clicking this block with an empty hand after a recipe is complete will place back the items used for the last recipe for faster mass crafting. botania.page.runeAltar4=&1물의 룬&0 제작하기 botania.page.runeAltar5=&1대지의 룬&0 제작하기 botania.page.runeAltar6=&1대기의 룬&0 제작하기 @@ -1882,1456 +1744,4 @@ botania.page.runeAltar15=&1탐욕의 룬&0 제작하기 botania.page.runeAltar16=&1게으름의 룬&0 제작하기 botania.page.runeAltar17=&1격노의 룬&0 제작하기 botania.page.runeAltar18=&1질투의 룬&0 제작하기 -botania.page.runeAltar19=&1교만의 룬&0 제작하기 - -# -- TERRASTEEL -botania.entry.terrasteel=Terrasteel -botania.page.terrasteel0=&1Terrasteel&0 is a complex magical alloy, infused with a great amount of &4Mana&0. Conjuring it proves not to be a small task. For starters, to create it, one would require a &1Terrestrial Agglomeration Plate&0, set on top of a checkerboard pattern of &1Lapis Lazuli Blocks&0 and &1Livingrock&0. &4Mana&0 would need to be provided to this block, &1Sparks&0 would be the most effective way. -botania.page.terrasteel1=Creating the plate -botania.page.terrasteel2=After the plate is set up and ready to receive &4Mana&0, tossing a single &1Manasteel Ingot, Mana Diamond and Mana Pearl&0 on top of it will begin the infusion.
    Picking up any of the items will halt the infusion causing severe &4Mana Loss&0. The infusion uses half a &1Mana Pool&0 total to create a single piece of &4Terrasteel&0, multiple &1Sparks&0 would make it go faster, too. -botania.page.terrasteel3=Creating &1Terrasteel&0 (there's &1Livingrock&0 under the plate) -botania.page.terrasteel4=T.A. Plate - -# -- BLACK LOTUS -botania.entry.blackLotus=Black Lotus -botania.page.blackLotus0=An elusive flower by the name of &1검은색 Lotus&0 is known to exist, however, it does not grow or reproduce. Where they can be found or come from is not known.
    It is known, however, that it contains a strong amount of concentrated &4Mana&0, that can be released by putting it in contact with a &1Mana Pool&0 that already has some in it. Just tossing it would do. - -# -- FLOWER POUCH -botania.entry.flowerBag=Flower Pouch -botania.page.flowerBag0=The laws of physics regarding one's &4Inventory&0 are somewhat skewed in this world. Thanks to that, carrying an array of different colors of flowers turns out to be a major hassle. Luckily, a &1Flower Pouch&0 takes care of all those issues. It can store up to one stack of each color of &1신비로운 꽃&0, not only that but it'll passively catch any that enter the holder's inventory. -botania.page.flowerBag2=Items won't be added automatically to the pouch if that's the item being held.
    Furthermore, shift-right clicking the pouch into a &1Chest&0 or other inventory will store the flowers it contains into said inventory. -botania.page.flowerBag1=Pull a copter out of it (any colors work) - -# -- WRAP -botania.entry.wrap=Wrap -botania.page.wrap0=It seems like the creator of this mod decided to add a weird game mechanic in the form of &1Wrap&0. I don't really know what it does, probably something bad. :/
    What's this "Fourth 벽" you're talking about...? - -# - MANA -# -- AN INTRODUCTION TO MANA -botania.entry.mIntro=An Introduction to Mana -botania.page.mIntro0=&4Mana&0 is an ethereal substance. In layman's terms, it is a form of &4mystical energy&0. Its sensorial existence is inconstant, and its color depends on the environment its put in.
    Mastering &4Mana&0 is one of the most important skills a botanist needs to master. -botania.page.mIntro1=In order to create &4Mana&0, one would require a set of &4Generating Flowers&0 (read the respective section). This &4Mana&0 can be dispersed by utilizing &1Mana Spreaders&0 and stored in &1Mana Pools&0. &4Mana&0 can be used for a myriad of different things. For starters, it can be used for &4Functional Flowers&0 (read the respective section). -botania.page.mIntro2=To get started with mastering the art of &4Mana&0, one would start by learning how to use &1Dayblooms&0, &1Mana Spreaders&0 and &1Mana Pools&0.
    These form a basic infrastructure for mana, which can be used for all sorts of purposes. Have a read at the &4Functional Flora&0 and &4Magical Apparatus&0 sections of this 사전. - -# -- MANA SPREADER -botania.entry.spreader=Mana Spreader -botania.page.spreader0=The &1Mana Spreader&0 is the most important component in manipulating &4Mana&0.
    This is the block that allows &4Mana&0 to travel from point A to point B. When this block is placed on the ground, it'll face one of 6 basic directions. By holding shift-right on it with a &1Wand of the Forest&0, one can orient it to the opposite of where it was clicked. It can be pointed to other blocks with a wand in &4Bind Mode&0. -botania.page.spreader1=Holding a &1Wand of the Forest&0 -botania.page.spreader2=The &1Mana Spreader&0 has a small internal buffer of &4Mana&0, which will get filled by nearby &4Generating Flowers&0. This buffer can be viewed by looking at the &1Spreader&0 with a &1Wand of the Forest&0, as demonstrated in the last page.
    Note that the block needs to be right clicked with a wand to get accurate and adequate values. -botania.page.spreader3=Holding a &1Wand of the Forest&0 displays a beam which shows where the spreader is pointing at. Hovering over it shows the target. The sparkle that's always shown is the point when &4Mana loss&0 starts to happen.
    If the target of the spreader is a block that can contain &4Mana&0, and isn't full, the spreader will fire a &4Mana Burst&0, which will travel to the target, and pass the &4Mana&0 along to it. -botania.page.spreader4=The spreader only fires one burst at once, it'll only fire another one when the last one hits the target.
    Furthermore, the bursts also start suffering &4mana loss&0 after a small amount of time. This can be seen in the beam, which becomes a lot thinner when this happens. There is also a small amount of &4mana loss&0 when a beam enters a spreader. -botania.page.spreader11=Applying a &4빨간색stone Signal&0 to the spreader will have it cease to function. Case better control is required, a &1빨간색stone Mana Spreader&0 is recommended, as it can fire bursts without a target block and works on redstone pulses. -botania.page.spreader5=Crafting the &1Mana Spreader&0 -botania.page.spreader10=Right clicking the spreader with a piece of &1Wool&0 will sleeve it. Aside from making it look fancier, it'll also muffle the sound when a burst is shot, making it much less obnoxious when there's a large amount of spreaders in one area.
    Right clicking with an empty hand will remove the sleeve. - -# -- MANA POOL -botania.entry.pool=Mana Pool -botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
    Mana can be inserted into it by usage of a &1Mana Spreader&0, and any adjacent &1Mana Spreaders&0 will pull mana from it to increase their internal buffer automatically.
    Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. -botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 variety which only stores a very small amount of &4Mana&0 and isn't able to infuse items, and a &1Normal&0 variety, which can store as much as a hundred times more than the dilluted one and can infuse items.
    Whenever "Mana Pool" is refered elsewhere for scale, it refers to a normal one. -botania.page.pool1=Making a &1Dilluted Mana Pool&0. -botania.page.pool10=Infusing a normal &1Mana Pool&0 -botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
    A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
    &4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1빨간색stone Comparator&0 can also output a signal based on the contents. -botania.page.pool8=&1Manasteel&0 Ingots and other ingots based on it, can be converted into both blocks or nuggets through the normal conversion recipes.
    For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. -botania.page.pool3=Infusing &1Manasteel&0 -botania.page.pool4=Infusing &1Mana Pearls&0 -botania.page.pool5=Infusing &1Mana Diamonds&0 -botania.page.pool6=Infusing &1Mana Petals&0 -botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. -botania.page.pool12=Infusing &1String&0 -botania.page.pool13=Used &1Mana Infused String&0 to make &1Cobwebs&0 -botania.page.pool7=Infusing &1Mana Cookies&0, pretty good food. - -# -- SPARKS -botania.entry.sparks=Sparks -botania.page.sparks0=&1Sparks&0 are interesting entities. Created from a combination of raw energy and &4Mana&0, they have the ability to be placed on top of a few specific &4Mana&0 containing or accepting blocks, mainly, &1Mana Pools&0.
    Some blocks have the ability to harness &4Mana&0 from &1Sparks&0, but the uses for them seem limited to a few blocks right now. -botania.page.sparks1=Placing a &1Spark&0 on top of a &1Mana Pool&0 and another on top of a block that can accept it will allow for the latter to remotely access the reservoirs of the &1Mana Pool&0 when needed, given it's not too far away.
    To remove a &1Spark&0 simply shift-right click it with a &1Wand of the Forest&0. Regular right clicking shows which other &1Sparks&0 it can transfer to. -botania.page.sparks2=&oholds up spork&r - -# -- SPARK AUGMENTATION -botania.entry.sparkUpgrades=Spark Augmentation -botania.page.sparkUpgrades0=As it seems, &1Sparks&0 are a bit more versatile than it was known previously. A variety of &1Augments&0 can be applied to them to enhance their abilities. It's to note that Augments can only be applied to &1Sparks&0 that lie on &1Mana Pools&0.
    A &1Spark&0 can only have a single &1Augment&0 at any given time. -botania.page.sparkUpgrades1=Starting off, the &1Dispersive Augment&0 has the &1Spark&0 use up the &4Mana&0 in the pool below, to charge any nearby players' &4Mana&0 containing items. -botania.page.sparkUpgrades2=The &1Dominant Augment&0 will have the &1Spark&0 pull any &4Mana&0 from nearby non-augmented &1Sparks'&0 pools into its own, until it's completely full. -botania.page.sparkUpgrades3=The &1Recessive Augment&0 will have the &1Spark&0 output all of the &4Mana&0 in its pool into any nearby non-augmented or Dispersive &1Sparks'&0 pools until it's completely empty. -botania.page.sparkUpgrades4=Lastly, the &1Isolated Augment&0 will prevent the &1Spark&0 from interacting with any Dominant or Recessive &1Sparks&0, but still allow it to interact with blocks that can receive their &4Mana&0 through the &1Spark&0 network. -botania.page.sparkUpgrades5=Crafting the Augments - -# -- MANA DISTRIBUTOR -botania.entry.distributor=Mana Distributor -botania.page.distributor0=Any botanist will eventually reach a point where a single &1Mana Pool&0 setup is not enough.
    The &1Mana Distributor&0 will fix all those issues. By placing it adjacently to a few &1Mana Pools&0 on its sides, when it receives &4Mana&0 through &4Mana Bursts&0 it'll equally spread it to the adjacent pools. -botania.page.distributor1=Crafting the distributor - -# -- MANA VOID -botania.entry.manaVoid=Mana Void -botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again.
    Placing one of these under a &1Mana Pool&0 allows the pool to always accept &4Mana&0, but disposing any it can't hold. -botania.page.manaVoid1=Even Chad from accounting? - -# -- MANA FLUXFIELD -botania.entry.rfGenerator=Mana Fluxfield -botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4빨간색stone Flux&0.
    Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4RF&0. It can then be pulled out with any &4RF&0 transporter. -botania.page.rfGenerator1=The bullet guys. I bit it. - -# -- MANA LENSES -botania.entry.lens=Mana Lenses -botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
    Lenses can be &4dyed&0, in a workbench, all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. -botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dyeing&0 lenses! -botania.page.lens3=&1Rainbow Lens&0 all the way -botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
    It's to take in mind that, if using a normal &1Mana Spreader&0, there needs to be a &4Mana&0 receiving block at the end for the burst to fire. A &1빨간색stone Mana Spreader&0 is recommended for some lenses. -botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
    The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. -botania.page.lens6=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose its &4Mana&0 a lot faster, it can also carry a bit less. -botania.page.lens7=Velocity Lens -botania.page.lens8=The &1Potency Lens&0 will double the amount of &4Mana&0 a &4Mana Burst&0 can carry, however, the beam becomes slower and after it starts to lose mana it does so at a lot faster rate. -botania.page.lens9=Potency Lens -botania.page.lens10=The &1Resistance Lens&0 will significantly increase the amount of time the &4Mana Burst&0 can go without starting to lose &4Mana&0, but it makes it a a bit slower. -botania.page.lens11=Resistance Lens -botania.page.lens12=The &1Efficiency Lens&0 will decrease the amount of time it takes for the &4Mana Burst&0 to start losing its &4Mana&0, but when that happens, it does so at a lot slower rate. -botania.page.lens13=Efficiency Lens -botania.page.lens14=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. -botania.page.lens15=Bounce Lens -botania.page.lens16=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus moving in an arc. As compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. -botania.page.lens17=Gravity Lens -botania.page.lens18=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact with, draining its own mana to do so. -botania.page.lens19=Bore Lens -botania.page.lens20=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining its own mana to do so. -botania.page.lens21=Damaging Lens -botania.page.lens22=The &1Phantom Lens&0 is an interesting one. By utilizing the &1Abstruse Platform&0 and its' properties, it's possible to make a lens that'll allow the &4Mana Burst&0 to pass through blocks. In doing so, the time it can stay without losing mana is decreased. -botania.page.lens23=Phantom Lens -botania.page.lens24=The &1Magnetizing Lens&0, as its name states, allows the &4Mana Burst&0 to magnetize, or home in, on any nearby blocks that can receive &4Mana&0. Doing so slightly decreases the speed of the burst. -botania.page.lens25=Magnetizing Lens -botania.page.lens26=The &1Entropic Lens&0 imbues the &4Mana Burst&0 with entropy, causing it to release its energy in the form of an explosion when it collides against something that can't receive &4Mana&0. -botania.page.lens27=Entropic Lens -botania.page.lens28=The &1Influence Lens&0 allows the &4Mana Burst&0 to have influence over any nearby &4dropped items&0, &4experience orbs&0 and even &4falling blocks&0, having them move in the exact same vector of motion as the burst itself. -botania.page.lens29=Influence Lens -botania.page.lens30=The &1Weight Lens&0 carries a strong burden on the &4Mana Burst&0, making any block hit by it, if there doesn't happen to be a block below it, fall, similarly to how &1Sand&0 and &1Gravel&0 do. -botania.page.lens31=Weight Lens -botania.page.lens32=The &1Kindle Lens&0 is infused with a burning spark, when it hits a block it'll set it on fire. It has the ability to both ignite and close &1Nether Portals&0. It doesn't seem to set any living beings on fire, though. -botania.page.lens33=Kindle Lens -botania.page.lens34=The &1Force Lens&0 acts as a &1Piston&0, when it hits a block that a piston can move, it'll do just so. -botania.page.lens35=Force Lens -botania.page.lens36=The &1Flash Lens&0, in contact with a block, creates a flame of the same color as the burst that caused it. The flame provides light and is purely decorative.
    If it hits one of these flames, it puts it out instead. -botania.page.lens37=Flash Lens - -# -- MANA TABLET -botania.entry.manaTablet=Mana Tablet -botania.page.manaTablet0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
    The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself.
    Not only that, but other items can also pull from it as they need it for their uses, making this an essential tool. -botania.page.manaTablet1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
    Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
    Lastly, unlike normal items, these will never despawn when dropped on the floor. -botania.page.manaTablet2=Don't put it on your pocket, it might bend - -# -- MANA MIRROR -botania.entry.manaMirror=Mana Mirror -botania.page.manaMirror0=A &1Mana Mirror&0 is an alternative to &4Mana&0 containing items such as a &1Mana Tablet&0. It can be bound to a &1Mana Pool&0 in the world and items will pull out of the pool itself when needing &4Mana&0.
    To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror. The mirror can't put mana in or take mana out of pools in any other way. -botania.page.manaMirror1=Mirror mirror on the wall... - -# -- MANA DETECTOR -botania.entry.manaDetector=Mana Detector -botania.page.manaDetector0=A device like the &1Mana Detector&0 is capable to detect when a &4Mana Burst&0 starts flowing through it (the burst doesn't dissipate on collision with this block) and provide a redstone signal when that is the case. -botania.page.manaDetector1=Crafting the detector - -# -- REDSTONE MANA SPREADER -botania.entry.redstoneSpreader=빨간색stone Mana Spreader -botania.page.redstoneSpreader0=By combining a &1Mana Spreader&0 with a piece of &1빨간색stone&0, it's possible to create a &1빨간색stone Mana Spreader&0, which fires only when given a &4빨간색stone signal&0, regardless of having a block in the end to put the mana or not.
    It's to keep in note that this doesn't let the spreader shoot a burst until the last one dissipates or is absorbed. -botania.page.redstoneSpreader1=Just add redstone - -# -- MANASTAR -botania.entry.manastar=Manastar -botania.page.manastar0=The imprecise measurements of the &1Wand of the Forest&0 sometimes won't cut it for telling if you're turning a profit or loss in your &1Mana Pools&0.
    Creating a &1Manastar&0 and placing it next to your pools will have it shine red if there's a loss or blue if there's a profit. The measurement happens every few seconds. -botania.page.manastar1=&rI'm a shooting star leaping through the skies&r. - -# -- ELVEN MANA SPREADERS -botania.entry.dreamwoodSpreader=Elven Mana Spreaders -botania.page.dreamwoodSpreader0=Simply put, &1Dreamwood&0 conducts &4Mana&0 better than &1Livingwood&0. Add in some adjustments like &1Elementium&0 or &1Mana Petals&0 and what you get is a &1Mana Spreader&0 that can conduct more &4Mana&0, faster and for more time without &4Mana loss&0.
    On the negative side, it can't be turned into a &1빨간색stone Mana Spreader&0. -botania.page.dreamwoodSpreader1=Better spreaders, that's it -botania.page.dreamwoodSpreader2=By combining this already powerful spreader with a &1Gaia Spirit&0 and a &1Dragonstone&0 gem, one can create an even more potent variant. The &1Gaia Spreader&0 is within the top percentage of Mana Spreaders, with pretty much upgrades all round.
    It's to note that these spreaders fire a larger payload at once and thus, might fire less often. -botania.page.dreamwoodSpreader3=ULTRA_SPREADER - -# -- PAINTSLINGER LENS -botania.entry.paintLens=Paintslinger Lens -botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. -botania.page.paintLens1=A M'AIDER Stranded Girl - -# -- WARP LENS -botania.entry.warpLens=Warp Lens -botania.page.warpLens0=The &1Mana Lens: Warp&0 is an interesting one. A &4Mana Burst&0 with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired. -botania.page.warpLens1=Hakase Quarries - -# -- MANA PRISM -botania.entry.prism=Mana Prism -botania.page.prism0=The concept of &1Mana Lens&0 allows for the manipulation of the power convyed through &4Mana Bursts&0, the &1Mana Prism&0 works on that technology to allow a burst to have its lens effect switched on the fly.
    Using a &1Spectral Platform&0 as a component, this block does not have a physical presence, entities and bursts can go through it as if it doesn't exist. -botania.page.prism1=Right clicking it with any variety of &1Mana Lens&0 sets the lens in the prism. Whenever a &4Mana Burst&0 goes through the prism, its color and effect will be set to that of the lens in the prism. Case the lens is not dyed, the burst will turn white.
    Using any of the four basic lenses also increases the time the burst can go before losing &4Mana&0, allowing it to go further. -botania.page.prism2=It can also be turned off by the use of a redstone signal. -botania.page.prism3=Another pixel in the wall - -# -- MANA ON RAILS -botania.entry.poolCart=Mana on Rails -botania.page.poolCart0=What could be an easier way to transport &4Mana&0 over large distances than attaching a &1Mana Pool&0 to a &1Minecart&0 and watch it do the merry-go-round? It's simple. Similarly to other types of carts, one can create a &1Minecart with Mana Pool&0 that can store and transport &4Mana&0 on rails.
    Breaking the cart while there's any &4Mana&0 in it will waste the &4Mana&0, care should be taken with it. -botania.page.poolCart1=Transfering &4Mana&0 between the cart and a pool is done with a &1Mana Pump&0. It can face any of the four cardinal directions and will transfer &4Mana&0 between a pool adjacent to it and a cart with a pool on an rail opposite to the target pool.
    The transfer rate is extremely fast due to the mechanical nature, so fast that overflow is possible, causing &4Mana Loss&0. -botania.page.poolCart2=The side of the pump where the &4Mana&0 will go towards is the pink one, &4Mana&0 is pulled from the blue side.
    The pump can be turned off with redstone, and a &1Comparator&0 on it will output how much &4Mana&0 exists in the cart.
    Lastly, a pool on a cart serves purely for transport, and can not receive, send, transfer or infuse any items with its &4Mana&0. -botania.page.poolCart3=I like trains -botania.page.poolCart4=This is not a pipe - -# -- SPARK TINKERER -botania.entry.sparkChanger=Spark Tinkerer -botania.page.sparkChanger0=The &1Spark Tinkerer&0 is a block with the ability to modify the &1Augments&0 placed on &1Sparks&0. Placing it adjacent to &1Mana Pools&0 or other blocks with a &1Spark&0 attached will connect it to those blocks.
    Right clicking the &1Spark Tinkerer&0 with a &1Spark Augment&0 will put the augment in the block, it can be removed by right clicking again. -botania.page.sparkChanger1=When the &1Spark Tinkerer&0 gets a redstone signal it'll randomly pick a &1Spark&0, between all of those it's connected to that have a different augment from the one stored in it, and swap the augment in that &1Spark&0 with the one stored in the block.
    The stored augment can be withdrawn or deposited with &1Hoppers&0 or other automation methods. -botania.page.sparkChanger2=Hahahaha, water fire... - -# -- MANATIDE BELLOWS -botania.entry.bellows=Manatide Bellows -botania.page.bellows0=&1Manatide Bellows&0 are a simple device with the purpose of increasing the speed &1Mana Pools&0 output transfer rate.
    Placing these bellows next to, and pointing towards, a &1Mana Pool&0 will increase the speed at which the pool outputs its &4Mana&0 into &1Mana Tablets&0 or other items. Multiple bellows will work at increasing further the transfer rate. -botania.page.bellows1=A slightly less interesting ability of the &1Manatide Bellows&0 is to stoke a &1Furnace&0's flames.
    &1Manatide Bellows&0 can be utilized manually via a right click. Pointing the bellows towards an active &1Furnace&0 and manning them will increase the speed and efficiency at which the items in the &1Furnace&0 get smelted. -botania.page.bellows2=It is your duty to be stoked - -# - FUNCTIONAL FLOWERS -# -- AN INTRODUCTION TO FUNCTION -botania.entry.fIntro=An Introduction to Function -botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
    These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
    It's to note that these can't receive power directly through &1Mana Spreaders&0. -botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. -botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other. It can be bound to another pool with a wand in &4Bind Mode&0. -botania.page.fIntro3=Lastly, some functional flowers utilize a &1빨간색stone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. -botania.page.fIntro4=&1빨간색stone Root&0 for 빨간색stone Control - -# -- FLOWER SHRINKING -botania.entry.flowerShrinking=Flower Shrinking -botania.page.flowerShrinking0=Some functional flowers have a bit too much reach. Sometimes one might not want that to be the case. Tossing one of those few flowers into a &1Mana Pool&0 with an &1Alchemy Catalyst&0 will, at the cost of some &4Mana&0, shrink it, making its radius smaller. Every other function remains the same. -botania.page.flowerShrinking1=Like a nendoroid - -# -- JADED AMARANTHUS -botania.entry.jadedAmaranthus=Jaded Amaranthus -botania.page.jadedAmaranthus0=Everyone likes flowers right? The &1Jaded Amaranthus&0 is made just for that purpose.
    Feeding it with &4Mana&0 from &1Mana Pools&0 will have it quickly grow new &1신비로운 꽃s&0 around it, in any spots it can. -botania.page.jadedAmaranthus1=&oIt was this or clematis.&r -botania.page.jadedAmaranthus2=&oWait a minute, did you just summon a bunch of flowers in one turn?
    Yeah, so?
    That's against the rules, isn't it?
    Screw the rules, I have Mana! - -# -- BELLETHRONE -botania.entry.bellethorne=Bellethorne -botania.page.bellethorne0=The &1Bellethorne&0 is a malevelous flower. By utilizing &4Mana&0 it slowly inflicts harm in any living beings (save for &4players&0) around it. -botania.page.bellethorne1=&oEvery rose has its thorn&r. - -# -- DREADTHORNE -botania.entry.dreadthorne=Dreadthorne -botania.page.dreadthorne0=The &1Dreadthorne&0 is a slightly more specific counterpart to the &1Bellethrorne&0, by which, instead of all mobs around, it'll only hurt &4adult&0 animals and none else. -botania.page.dreadthorne1=&oNo Mr.Bond, I expect you to die&r. - -# -- HEISEI DREAM -botania.entry.heiseiDream=Heisei Dream -botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother. -botania.page.heiseiDream1=&oA pleasant era will murder people&r. -botania.page.heiseiDream2=&oHeisei, was broken, broken. Who was the one who lied about peace? See, it's forgotten, forgotten, even the punishement blamed on the altar. Hey, it's breaking, breaking, at the end, even the meaning of shaking is killed.
    Well, where shall we go? Let's go somewhere, whose ally are you? Whose replacement am I? - -# -- TIGERSEYE -botania.entry.tigerseye=Tigerseye -botania.page.tigerseye0=It's a known fact that &4Creepers&0 are terrified of &4cats&0.
    The &1Tigerseye&0 exploits that very weakness, by emitting a feline aura, petrifying any nearby &4Creepers&0, preventing them from exploding. It also has the effect of making them run away from &4players&0. -botania.page.tigerseye1=&oRisin' up to the challenge of our rivals&r. - -# -- ORECHID -botania.entry.orechid=Orechid -botania.page.orechid0=While going mining is all good, a renewable, sedentary, means of getting ore is due. The &1Orechid&0 will use (a massive amount of) &4Mana&0 to generate &4ores&0 in nearby &1Stone&0 blocks.
    The ores it generates are random, but seem to be biased towards more common ores rather than rarer ones. -botania.page.orechid1=&oNot dragon poop&r. - -# -- ORECHID IGNEM -botania.entry.orechidIgnem=Orechid Ignem -botania.page.orechidIgnem0=The &1Orechid&0 is a great flower. The ability to create raw ores with &4Mana&0 can be a great boon to any sedentary botanist's life. It, however, can't create ores from the &4Nether&0. Getting that sorted out is easy, by switching the petals a bit, it'll create &4Nether&0 ores in &1Netherrack&0 instead. The flower must be in the &4Nether&0 to work. -botania.page.orechidIgnem1=&oGetting hot in here&r. - -# -- FALLEN KANADE -botania.entry.fallenKanade=Fallen Kanade -botania.page.fallenKanade0=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby. -botania.page.fallenKanade0a=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby.
    Interestingly enough, &4Blood Mages&0 have been known to place odd hexes on their altars which cause this flower to malfunction, that might be something to keep in mind. -botania.page.fallenKanade1=&oHand Sonic, version four&r. -botania.page.fallenKanade2=&oI'll marry you. No matter what kind of sickness you have, even if you can't walk or stand, or even if you can't have kids, I'll still marry you. No matter where or how I met you, I'll fall in love with you.
    If I can meet you again, against the six billion to one odds, and even if your body can't move, I'll marry you. - -# -- EXOFLAME -botania.entry.exoflame=Exoflame -botania.page.exoflame0=Unlike its generating counterpart, the &1Exoflame&0 utilizes &4Mana&0 with means to generate heat.
    Any &1Furnaces&0 nearby to the &1Exoflame&0 will be fueled, and given a speed boost, for the cost of some &4Mana&0. -botania.page.exoflame1=&oBut we should be going nowhere fast&r. - -# -- AGRICARNATION -botania.entry.agricarnation=Agricarnation -botania.page.agricarnation0=The slow growth of crops is always a problem to feed the masses. The &1Agricarnation&0 is a flower that turns &4Mana&0 into a type of natural fertilizer, causing nearby plantlife to grow at a faster rate. -botania.page.agricarnation1=&oGrandola Vila Morena&r... - -# -- HOPPERHOCK -botania.entry.hopperhock=Hopperhock -botania.page.hopperhock0=The &1Hopperhock&0 will pick up items around it. Giving it &4Mana&0 is optional, but it'll increase its range.
    Items picked up will be put in adjacent inventories (e.g. &1Chests&0). Placing &1Item Frames&0 on any of the inventories will specify which items can or can't go in them. -botania.page.hopperhock1=Any inventory which has no &1Item Frame&0 adjacent to it can accept any items, but labelled inventories will take priority.
    The rule using to sort items can be changed by shift-right clicking the flower with a &1Wand of the Forest&0. -botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. - -# -- TANGLEBERRIE -botania.entry.tangleberrie=Tangleberrie -botania.page.tangleberrie0=The &1Tangleberrie&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters within a circle ward, preventing them from getting out. -botania.page.tangleberrie1=&oTangled, brave and frozen&r. - -# -- JIYUULIA -botania.entry.jiyuulia=Jiyuulia -botania.page.jiyuulia0=The &1Jiyuulia&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters at bay, protecting a circular area from them getting in. -botania.page.jiyuulia1=&oHR HD DT Masterpiece&r. - -# -- RANNUNCARPUS -botania.entry.rannuncarpus=Rannuncarpus -botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 will pick up any nearby blocks in dropped item form and place them in the world nearby. It, however, only places the blocks thrown at it on top of a specific block, to specify this block, place it right below the soil the flower is resting on. -botania.page.rannuncarpus1=Block items, such as &1Sugar Cane&0 will also work, but, much alike any other blocks, will only be placed in a location where they normally would be able to be placed.
    Lastly, giving &4Mana&0 to the flower is optional, but it increases its range. -botania.page.rannuncarpus2=&oThe Sandpit of Yanille&r? - -# -- HYACIDUS -botania.entry.hyacidus=Hyacidus -botania.page.hyacidus0=For some reason, poison does not kill. The &1Hyacidus&0, to that, can be used to poison any nearby mobs, bringing them to their knees for a one hit kill after a bit. -botania.page.hyacidus1=&oSteel is immune&r. - -# -- POLLIDISIAC -botania.entry.pollidisiac=Pollidisiac -botania.page.pollidisiac0=Animals love eating, that's all they seem to do, really. An interesting behaviour they show is that they only seem to want to eat things that are fed to them.
    The &1Pollidisiac&0 will simply do that, at the cost of some mana, any appropriate nearby food items (&1Wheat&0, &1Carrots&0, etc) will be fed to the animals, putting them in a &obetter mood&r. -botania.page.pollidisiac1=&oHell's Kitchen&r. - -# -- CLAYCONIA -botania.entry.clayconia=Clayconia -botania.page.clayconia0=The &1Clayconia&0 is a simple flower, in essence. All it does is moisten nearby &1Sand&0, turning it into &1Clay&0, this process uses a decent amount of &4Mana&0, but nothing too insane. -botania.page.clayconia1=&oWhat a killer joke&r. - -# -- LOONIUM -botania.entry.loonium=Loonium -botania.page.loonium0=Any weary adventurer knows that &4Dungeons&0 can hold valuable goodies. The &1Loonium&0 can, at the use of an extreme amount of &4Mana&0, materialize these items and drop them in the nearby vicinity. -botania.page.loonium1=&oTank Tank Heal Tank&r! - -# -- DAFFOMILL -botania.entry.daffomill=Daffomill -botania.page.daffomill0=The &1Daffomill&0 works as a fan of sorts. It pushes, at the cost of a small amount of &4Mana&0, any items found in front of it.
    Shift-right clicking it with a &1Wand of the Forest&0 changes the orientation. Where it's currently facing can be seen via the subtle wind particles it emits. -botania.page.daffomill1=&oWind Turbines? I'm a big fan&r. - -# -- VINCULOTUS -botania.entry.vinculotus=Vinculotus -botania.page.vinculotus0=The &1Vinculotus&0 has the power to create a disturbance among any &4Enderman&0's teleportation powers within a fairly large radius around it. For a cost of &4Mana&0, whenever an &4Enderman&0 would teleport anywhere, instead, they're teleported to the location of the &1Vinculotus&0. -botania.page.vinculotus1=&oTouch this black lotus with your fingers&r. - -# -- SPECTRANTHEMUM -botania.entry.spectranthemum=Spectranthemum -botania.page.spectranthemum0=Transporting items a long distance can be an arduous task. Water channels and &1Daffomills&0 won't cut it forever. The &1Spectranthemum&0, at the cost of &4Mana&0 wraps the fabric of reality of any dropped items that do not contain &4Mana&0 around it, teleporting them somewhere else in the world. After teleported once, another of these flowers can't be used on the same item. -botania.page.spectranthemum1=In order to specify where the items go, one would use a &1Wand of the Forest&0 in bind mode and bind the flower to a block somewhere, similarly to binding it to a pool. This only works within 12 blocks. In order to view what block the flower is bound to rather than the pool it's pulling &4Mana&0, one would sneak while looking at it with a wand. -botania.page.spectranthemum2=This flower is governed by the &4axiom of chunkloading&0, by which it'll not function on chunks not loaded. This topic is not addressed in full extent this lexicon.
    &oRecommended Reading: "Chunks and Chicken", "Anchors of the World". -botania.page.spectranthemum3=&o(n)spooky(n2)me&r. - -# -- MEDUMONE -botania.entry.medumone=Medumone -botania.page.medumone0=The &1Medumone&0 is a flower with the ability to completely halt a creature's movement.
    While it receives &4Mana&0, it'll halt any nearby entities in their tracks with a powerful slowness effect, provided they are not players. -botania.page.medumone1=&oThose credits look fake&r... - -# -- MARIMORPHOSIS -botania.entry.marimorphosis=Marimorphosis -botania.page.marimorphosis0=The &1Marimorphosis&0 is a flower that executes metamorphic transformations on nearby &1Stone&0 blocks. These blocks get metamorphised into one of 8 different types of &1Metamorphic Stone&0. All 8 types will generate, but the type(s) that generate more often depend on the biome. All of these can be used to make bricks, chiseled bricks, slabs, stairs and even &1Petal Apothecary&0 variants. -botania.page.marimorphosis1=The various flavours of &1Metamorphic Stone&0 -botania.page.marimorphosis3=Colorful like a ClariS song -botania.page.marimorphosis2=&oThis flower is pretty gneiss&r. - -# -- BUBBELL -botania.entry.bubbell=Bubbell -botania.page.bubbell0=Building underwater is a no small task. Clearing air under the sea is incredibly troublesome and time consuming. Placing down a &1Bubbell&0 underwater and providing it with &4Mana&0 (preferably a priori) will have it start to create a dome of air which will keep water at bay. The dome has about twelve blocks of radius. &4Mana&0 is required constantly to keep it up and going. -botania.page.bubbell1=&oLike some casual game&r. - -# -- SOLEGNOLIA -botania.entry.solegnolia=Solegnolia -botania.page.solegnolia0=The &1Ring of Magnetization&0 is a rather handy tool for anyone digging or collecting. It does, however, fall into the problem that it picks up unwanted items near complex systems.
    The &1Solegnolia&0 disrupts the ring and prevents any items around it from being pulled towards a wearer of one. It uses up a small bit of &4Mana&0 for this, but nothing considerate. -botania.page.solegnolia1=On/Off - -# - GENERATING FLOWERS -# -- AN INTRODUCTION TO GENERATION -botania.entry.gIntro=An Introduction to Generation -botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckily there's an array of &4Generating Flowers&0 willing to do the job.
    These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circumstances. -botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
    This mana will be stored in the closest &1Mana Spreader&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other. It can be bound to another spreader with a wand in &4Bind Mode&0. - -# -- DAYBLOOM -botania.entry.daybloom=Daybloom -botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it performs a modified photosynthesis process, in order to transform sunlight into &4Mana&0.
    The process is rather slow, about ten or a dozen of these should get the job done, for now. -botania.page.daybloom1=These flowers tend to compete among themselves for what sunlight hits an area, thus having any other of the same type adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This fact only applies to &1Dayblooms&0 and &1Nightshades&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. -botania.page.daybloom1a=Having any other &1Dayblooms&0 adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This only applies to &1Dayblooms&0 and &1Nightshades&0.
    &1Dayblooms&0 are not very resistant, and after some time they'll wither and die off. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflames&0 or others might be a good idea. -botania.page.daybloom3=Diminishing Returns -botania.page.daybloom2=&oStarting up a brand new day&r. -botania.page.daybloom4=&oHow many of you people out there been hurt in some kind of love affair? And how many times do you swear that you'll never love again? How many lonely, sleepless nights? How many lies? How many fights? And why would you want to put yourself through all that again? "Love is pain," I hear you say. Love has a cruel and bitter way of paying you back for all the faith you ever had in your brain. (...) -botania.page.daybloom5=&oHow could it be that what you need the most can leave you feeling just like a ghost? You never want to feel so sad and lost again. One day you could be looking through an old book in rainy weather. You see a picture of her smiling at you when you were still together. You could be walking down the street and who should you chance to meet. But that same old smile that you've been thinking of all day... - -# -- NIGHTSHADE -botania.entry.nightshade=Nightshade -botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime
    Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent. -botania.page.nightshade0a=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime.
    Alike its shining counterpart, they suffer diminishing returns from having any adjacent and are not very resistant, after some time they'll wither and die off. -botania.page.nightshade1=&oThe shadow of the day&r. - -# -- ENDOFLAME -botania.entry.endoflame=Endoflame -botania.page.endoflame0=While the &1Daybloom&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
    The &1Endoflame&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vicinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. -botania.page.endoflame1=There is a small caveat though, the &1Endoflame&0 will not burn anything that returns a byproduct, an example are &1Lava Buckets&0, that have empty &1Buckets&0 as a byproduct.
    Due to their behaviour, an &1Open Crate&0, which you read about on the &4Magical Apparatus&0 section, might be a good step on getting it to be self-sustainable. -botania.page.endoflame2=&oNot nitor&r. - -# -- HYDROANGEAS -botania.entry.hydroangeas=Hydroangeas -botania.page.hydroangeas0=While passive &4Mana&0 generation can be easily achieved through &1Dayblooms&0, different means of doing so might come in handy. The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought? -botania.page.hydroangeas0a=The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought?
    Similarly to the &1Daybloom&0, these flowers are not very resistant, and after some time they'll wither and die off. -botania.page.hydroangeas2=A simple &1Hydroangeas&0 system -botania.page.hydroangeas3=These flowers, similarly to &1Dayblooms&0 or &1Nightshades&0 will receive a portion of diminishing returns if put in too compact of a pattern. Having any two &1Hydroangeas&0 one block away from eachother, including diagonals, will drastically reduce the production rate of both, as the roots get tangled. Having even more in the short space will further weaken their potency. The blue particles between them indicate this. -botania.page.hydroangeas1=&oFrom some Hyperdimension&r? - -# -- THERMALILY -botania.entry.thermalily=Thermalily -botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0, it'll produce a very large amount of &1Mana&0 at a spurt when it consumes &1Lava&0, doing this heats up the flower, and it'll need some time to cool down before it can begin the cycle anew. -botania.page.thermalily1=&o0108 Style&r. - -# -- ROSA ARCANA -botania.entry.arcanerose=Rosa Arcana -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0. -botania.page.arcanerose1=&oWhen this card is Summoned, toss a coin&r. - -# -- MUNCHDEW -botania.entry.munchdew=Munchdew -botania.page.munchdew0=Generating the form of natural energy that is &4Mana&0 should be a pretty good process when done via other living materials. By using the &1Munchdew&0, any &1Leaves&0 near the flower will get munched up and converted into &4Mana&0.
    It's to note that, though, no saplings or any other items will be dropped from the leaves. -botania.page.munchdew1=This flower outputs a hefty amount of mana per tree eaten.
    However, after if finishes eating all the available leaves, when left without any, it'll take a break from doing so and will only be able to eat again after a bit over a minute. -botania.page.munchdew2=&oYou pay for dinner, Shibazaki&r. - -# -- ENTROPINNYUM -botania.entry.entropinnyum=Entropinnyum -botania.page.entropinnyum0=In order to generate a blast of &4Mana&0, one might in fact, require a blast nearby. Igniting a block of &1TNT&0 in the near an &1Entropinnyum&0, if it doesn't fall in water, will have the latter absorb all the entropy generated by the blast into itself, creating a large amount of &4Mana&0 and nullifying any possible damage. Lastly, to absorb the explosion, the flower must not have any &4Mana&0 stored in it or the process will fail. -botania.page.entropinnyum1=&oCool guys don't look at explosions&r. - -# -- KEKIMURUS -botania.entry.kekimurus=Kekimurus -botania.page.kekimurus0=&1Cake&0 is delicious, everyone loves it, flowers included.
    The &1Kekimurus&0 is one of these &1Cake&0 aficionados, and will eat any it spots nearby, using its enriching nutrients to create &4Mana&0. -botania.page.kekimurus1=&otop kek&r - -# -- GOURMARYLLIS -botania.entry.gourmaryllis=Gourmaryllis -botania.page.gourmaryllis0=The &1Gourmaryllis&0 is one hungry flower. It'll eat up any food in a small area around it, and turn it into &4Mana&0.
    There's a catch, though, it can only digest a single food at any given time, the &4Mana&0 is created when it's done. Any other food it finds, it'll also devour, but not create any mana from it. -botania.page.gourmaryllis1=The amount of time it takes to digest a delicacy depends on its nutritional value, in layman's terms, the amount of food points it restores.
    So, a &1Steak&0 will take four seconds to digest, a &1Carrot&0 will take two, a loaf of &1Bread&0 will take two and a half, so on. -botania.page.gourmaryllis2=The amount of &4Mana&0 created also makes use of this value, but in a way where the more nutritious the food is, the more efficient it is. For example, a single &1Steak&0 will produce more &1Mana&0 than two &1Carrots&0, both absolutely and per second. -botania.page.gourmaryllis3=&oA hot pot for our new residents&r. -botania.page.gourmaryllis4=&oWell, if Men ate themselves after death, one would think of less horror and negative feeling matter. But so you know what your cruelty leads to, think, fishes, that even Men eat themselves alive like you.
    Alive was Job when he said: "Why do you follow me so inhumanely, thou who are eating me alive and getting sick of my flesh?". Do you want to see a Job like this? (...) -botania.page.gourmaryllis5=&oSee a man of those who are followed by claims or accused of crimes, and behold all who are eating them. The bailiff eats him, the jailer eats him, the scribe eats him, the requestor eats him, the lawyer eats him, the inquirer eats him, the witness eats him, the judge eats him and he's not even sentenced he's already eaten. Worse are the Men than the crows. (...) -botania.page.gourmaryllis6=&oThe sad one who was hanged, only eat him the crows past his execution and death, while the one who's being judged, not even executed or sentenced and he's already eaten.
    The true evil are the Man who eat eachother, and those who commit to it are the largest, those who eat the smallest. For that you, Man, vos estis sal terrae. - -# -- NARSLIMMUS -botania.entry.narslimmus=Narslimmus -botania.page.narslimmus0=There's some sort of unbeknownst power in the universe that creates &1Slimes&0 at seemingly random spots. &4Slime Chunks&0, they call it. The &1Narslimmus&0 is a flower that has the ability to tap into that energy. If placed down near a &1Slime&0 created by that power, it'll destroy it, collecting all the &4Mana&0 generated by the entropy. The larger the &1Slime&0, the more &4Mana&0 is created. It also makes a bit of a sticky mess. -botania.page.narslimmus1=&oStick around, would ye&r? - -# -- SPECTROLUS -botania.entry.spectrolus=Spectrolus -botania.page.spectrolus0=The &1Spectrolus&0 is a flower that's particularly fond of the various tones of &1Wool&0. It'll absorb any and all &1Wool&0 blocks dropped nearby and create &4Mana&0 from them.
    There's a caveat though. It's picky as to what colors it wants. Starting at white, after it absorbs one piece of &1Wool&0, it'll rotate to the next color in the spectrum. -botania.page.spectrolus1=While it consumes all &1Wool&0 around, it'll only create any mana if its of the color it wants, so haphazardly tossing &1Wool&0 at it is a wasteful strategy.
    The color it'll absorb properly next can be seen by hovering over the flower with a &1Wand of the Forest&0. -botania.page.spectrolus2=&oTaste the Rainbow&r. - -# - MAGICAL APPARATUS -# -- MANA PYLON -botania.entry.pylon=Mana Pylon -botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.
    For one, setting one adjusted to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0. -botania.page.pylon1=&oYou must construct additional pylons!&r - -# -- MANA ENCHANTING -botania.entry.manaEnchanting=Enchanting with Mana -botania.page.manaEnchanting0=By utilizing the magical power emitted from &1Mana Pylons&0, a structure that can enchant items with books without consuming them can be created, called the &1Mana Enchanter&0.
    Constructing one of these requires a fair amount of space and materials alike. -botania.page.manaEnchanting1=To construct the &1Mana Enchanter&0, one requires, as well as fair amount of space, 17 &1Obsidian&0 blocks, 10 &1신비로운 꽃s&0 of any color, 6 &1Mana Pylons&0 and a &1Lapis Lazuli Block&0.
    The instructions on how to assemble this structure are in the following pages. -botania.page.manaEnchanting2=Mana Enchanter -botania.page.manaEnchanting5=After the construct is done, right click the Lapis block with a &1Wand of the Forest&0 and the enchanter should form.
    In order to utilize the enchanter, one would place (via right click) the item to be enchanted in the enchanter itself and drop &1Enchanted Books&0 inside the circle around it. -botania.page.manaEnchanting6=Items that are already enchanted can't be placed in the enchanter.
    To start the enchanting, right click the enchanter with a &1Wand of the Forest&0. It'll scan the books around, and once it's done, a spell circle of sorts will appear around it, indicating the books can be safely picked up again. -botania.page.manaEnchanting7=After the enchanting begins, the enchanter will require &4Mana&0.
    It can be fed via one of two ways, either via &4Mana Bursts&0 or nearby &1Sparks&0, by placing a &1Spark&0 on top of the enchanter. The later being much faster. -botania.page.manaEnchanting8=When enough &4Mana&0 is gathered, the enchanting process will finalize, and the enchantments will be applied to the item.
    The amount of &4Mana&0 required depends on the rarity of the enchantments being applied, their level, and the total amount of enchantments.
    If any book has more than one enchantment, only the first will be accounted for. -botania.page.manaEnchanting9=During the enchanting process, the item can not be removed, but it can after the process has been completed.
    Note that if at any point, any component of the construct is removed, it'll revert to its original &1Lapis Lazuli Block&0 form. - -# -- SPREADER TURNTABLE -botania.entry.turntable=Spreader Turntable -botania.page.turntable0=The &1Spreader Turntable&0, as its name implies, can turn &1Mana Spreaders&0 around and around. Placing a spreader above the turntable will rotate it, given that a redstone signal isn't applied.
    To change the speed of the turntable, right click with a &1Wand of the Forest&0, shift-right clicking will invert the movement. -botania.page.turntable1=You spin me right round - -# -- ALCHEMISING WITH MANA -botania.entry.manaAlchemy=Alchemising with Mana -botania.page.manaAlchemy0=&4Mana&0 is an extremely volatile substance, to a point that its complete properties and abilities are unknown.
    One of them is known, though, by attaching an &1Alchemy Catalyst&0, created with a mixture of otherworldly materials to the bottom of a &1Mana Pool&0, it enables the pool to perform &4Alchemy&0. -botania.page.manaAlchemy1=Creating the &1Catalyst&0 -botania.page.manaAlchemy2=&1Rotten Flesh&0 to &1Leather&0 -botania.page.manaAlchemy3=Various types of &1Wood&0 -botania.page.manaAlchemy4=Various types of &1Saplings&0 -botania.page.manaAlchemy5=Breaking down &1Glowstone Blocks&0 -botania.page.manaAlchemy6=Breaking down &1Quartz Blocks&0 -botania.page.manaAlchemy7=Creating &1Chiseled Stone Bricks&0 -botania.page.manaAlchemy8=Further freezing &1Snow&0 into &1Ice&0 -botania.page.manaAlchemy9=Converting between &1Vines&0 and &1Lilypads&0 -botania.page.manaAlchemy10=Various breeds of &1Fish&0 -botania.page.manaAlchemy11=Transmuting &1Seeds&0 and &1Crops&0 -botania.page.manaAlchemy12=Purifying &1Poisonous Potatoes&0 -botania.page.manaAlchemy13=Conjuring &1Nether Wart&0 -botania.page.manaAlchemy14=Converting between &1Gunpowder&0 and &1Flint&0 -botania.page.manaAlchemy15=Making &1Name Tags&0 -botania.page.manaAlchemy16=Splitting &1Wool&0 into &1String&0 -botania.page.manaAlchemy17=Converting between &1Slimeballs&0 and &1Cactus&0 -botania.page.manaAlchemy18=Creating &1Ender Pearls&0 -botania.page.manaAlchemy19=Converting between &1Glowstone&0 and &1빨간색stone&0 -botania.page.manaAlchemy20=Breaking &1Cobblestone&0 into &1Sand&0 -botania.page.manaAlchemy21=Breaking &1Hardened Clay&0 into &1빨간색 Sand&0 -botania.page.manaAlchemy22=Breaking down &1Clay&0 and &1Bricks&0 -botania.page.manaAlchemy23=Making &1Coarse Dirt&0 -botania.page.manaAlchemy24=Transmuting &1Tall Grass&0 types -botania.page.manaAlchemy25=Transmuting mundane flowers - -# -- BOTANICAL BREWERY -botania.entry.brewery=Botanical Brewery -botania.page.brewery0=Given the versatility of &4Mana&0, the fact that it can be used to conjure some sort of &4Potions&0 comes to nobody's surprise. &4Brews&0 are a variant of &4Potions&0, to put it simply. They're created using &4Mana&0 and a set of ingredients.
    Unlike &4Potions&0, &4Brews&0 have defined recipes, and each vial contains multiple doses. -botania.page.brewery1=In order to create &4Brews&0 one would require a &1Botanical Brewery&0, &1Vials&0 and of course, the reagents defined in the recipe.
    The &4Mana&0 functions as the both the solvent and energy source and is given through &4Mana Bursts&0, simply pointing a &1Mana Spreader&0 at the &1Brewery&0 will work just fine. -botania.page.brewery2=Crafting the &1Botanical Brewery&0 -botania.page.brewery3=Crafting &1Vials&0 -botania.page.brewery4=Working the &1Botanical Brewery&0 is rather simple. First off, to add an item, right click with it on the block or toss it.
    Start off by adding the &1Vial&0, which will get set on the top of the brewery. Proceed by adding all the required ingredients. Once a &4Brew&0 can be created with the ingredients in the brewery, &4Mana&0 will start flowing, just wait a bit after that. -botania.page.brewery5a=A simple brew, it mimics a &1Potion of Swiftness&0, when taken, it has a similar effect, giving the individual a &4Speed II&0 effect. -botania.page.brewery5b=Gotta go fast -botania.page.brewery6a=A simple brew, it mimics a &1Potion of Strength&0, when taken, it has a similar effect, giving the individual a &4Strength II&0 effect. -botania.page.brewery6b=Hodor -botania.page.brewery7a=A simple brew, it mimics a &1Potion of Haste&0, when taken, it has a similar effect, giving the individual a &4Haste II&0 effect. -botania.page.brewery7b=Full of C9H13NO3 -botania.page.brewery8a=A simple brew, it mimics a &1Potion of Healing&0, when taken, it has a similar effect, giving the individual an &4Instant Health II&0 effect. -botania.page.brewery8b=He pulled a Truesilver, GG -botania.page.brewery9a=A simple brew, it mimics a &1Potion of Leaping&0, when taken, it has a similar effect, giving the individual a &4Jump Boost II&0 effect. -botania.page.brewery9b=I got jumps, isn't that what the kids say? -botania.page.brewery10a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration II&0 effect. -botania.page.brewery10b=Good reaction to simochi -botania.page.brewery17a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration&0 effect, albeit for longer than the previous brew. -botania.page.brewery17b=I guess she was just more resilient -botania.page.brewery11a=A simple brew, it mimics a &1Potion of Resistance&0, when taken, it has a similar effect, giving the individual a &4Resistance II&0 effect. -botania.page.brewery11b=Can't touch this -botania.page.brewery12a=A simple brew, it mimics a &1Potion of Fire Resistance&0, when taken, it has a similar effect, giving the individual a &4Fire Resistance&0 effect. -botania.page.brewery12b=He isn't a true dragon, fire can't kill a dragon -botania.page.brewery13a=A simple brew, it mimics a &1Potion of Water Breathing&0, when taken, it has a similar effect, giving the individual a &4Water Breathing&0 effect. -botania.page.brewery13b=Under the sea, under the sea -botania.page.brewery14a=A simple brew, it mimics a &1Potion of Invisibility&0, when taken, it has a similar effect, giving the individual a &4Invisibility&0 effect. -botania.page.brewery14b=Pretend you have Incursio -botania.page.brewery15a=A simple brew, it mimics a &1Potion of Night Vision&0, when taken, it has a similar effect, giving the individual a &4Night Vision&0 effect. -botania.page.brewery15b=Does it come with a silence? -botania.page.brewery16a=A simple brew, it mimics a &1Potion of Absorption&0, when taken, it has a similar effect, giving the individual a &4Absorption IV&0 effect. -botania.page.brewery16b=You're gonna catch a cold - -# -- BREWING FLASKS -botania.entry.flasks=Brewing Flasks -botania.page.flasks0=&1Alfglass&0 seems to be more maleable than the typical &1Managlass&0 used for &1Vials&0. A &1Flask&0, made with &1Alfglass&0 is the typical elven container for &4Brews&0, and can contain 6 doses of one, rather than the 4 a &1Vial&0 does. -botania.page.flasks1=While the ingredient cost to brew something in a &1Flask&0 is smaller, the &4Mana&0 cost is double that of a regular &1Vial&0.
    Lastly, given that the bottleneck of a &1Flask&0 is larger than that of a &1Vial&0, the contents can be consumed faster. -botania.page.flasks2=Get one under the bridge - -# -- COMPLEX BREWING -botania.entry.complexBrews=Complex Brews -botania.page.complexBrews0=Apart from the standard, run of the mill &1Brews&0 that don't pass from mimics of the &1Potions&0 that can be made in a &1Brewing Stand&0 there's also some more complex brews which apply either a combination of effects or new, beneficial effects altogether. -botania.page.complexBrews1a=A brew that applies both positive and negative effects. Taking it leaves the affected individual in a state of power, but also vulnerability. -botania.page.complexBrews1b=96 Herblore -botania.page.complexBrews2a=An entity affected with this brew's effect will regain HP whenever they slay any other creature. -botania.page.complexBrews2b=It predates the set -botania.page.complexBrews3a=An entity affected with this brew's effect will be completely immune to any fall damage. -botania.page.complexBrews3b=And I call it magic -botania.page.complexBrews4a=This brew casts an aura of emptiness around any entity that has its effect. In a 128 block radius, mobs will not be allowed to spawn naturally. -botania.page.complexBrews4b=Close the floodgates -botania.page.complexBrews5a=This brew casts an aura of emptiness around any entity that has its effect. In a 64 block radius, mobs will be allowed to spawn regardless of light or other conditions. This won't work with &1Emptiness&0. -botania.page.complexBrews5b=Shall we pray for a miracle? -botania.page.complexBrews6a=A player affected with this brew's effect will have much higher proficiency at fishing and will catch fish and other loot twice as fast. -botania.page.complexBrews6b=Maybe you'll catch a Chris -botania.page.complexBrews7a=When drank, this brew will clear all potion effects on the player, negative or otherwise. -botania.page.complexBrews7b=Absolute sooooooul - -# -- BREW INCENSES -botania.entry.incense=Brew Incenses -botania.page.incense0=&4Brews&0 can provide a great variety of effects when in liquid form. They, however, don't last long, and take up inventory space. Utilizing &1Incense Sticks&0 instead of flasks mitigates that problem, these can be infused with &4Brew&0 effects just like a normal flask would, but take around ten times as much &4Mana&0 to do so. -botania.page.incense1=An &1Incense Stick&0 can be placed on an &1Incense Plate&0 by right clicking on it, a simple click with a &1Flint and Steel&0 will light it up. Once lit, the stick can not be retrieved.
    A single stick of incense will burn for sixty times as long as as the liquid counterpart before needing to be replaced. -botania.page.incense2=&1Incense Plates&0 that are burning &1Incense Sticks&0 will provide the effects of the &4Brew&0 infused in the stick to any players on a 24 block radius of the plate.
    Not all &4Brews&0 can be infused into &1Incense Sticks&0, for example, &4Instant Health&0 or &1Absorption&0 can't, nor can any with more than one effect. -botania.page.incense5=For the incense lovers who are also automation junkies, the &1Incense Plate&0 can receive items through &1Hoppers&0 or other input. It'll output a &1Comparator&0 signal of 1 when it has a stick and 2 when it's burning it.
    Lastly, if a &4Mana Burst&0 with a &1Kindle Lens&0 hits the plate while there's a stick on it, it'll start burning it. -botania.page.incense3=Incense is wincense -botania.page.incense4=I can incense it - -# -- EYE OF THE ANCIENTS -botania.entry.forestEye=Eye of the Ancients -botania.page.forestEye0=As the Ancients who used to watch over the world always looked for the living beings on it, this block, the &1Eye of the Ancients&0, will do just that.
    By attaching a &1Comparator&0 next to it, it'll send out a redstone signal equivalent to the amount of animals it can find. -botania.page.forestEye1=The counting only starts at 2, so, with 2 animals around, it'd output a signal of strength 1, with 3 animals, of strength 2 and so on.
    Lastly, the time has worn down the sight of the Ancients, so this block can only see animals in about 6 blocks in any direction. -botania.page.forestEye2=Now you see me... - -# -- OPEN CRATE -botania.entry.openCrate=Open Crate -botania.page.openCrate0=Sometimes devices like &1Droppers&0 or &1Dispensers&0 aren't precise or fast enough. A simple solution is to make a crate and punch a hole in the bottom.
    Yeah, it's that simple. The &1Open Crate&0 accepts items from &1Hoppers&0 or any other means of inserting items, and obviously, drops them directly below it. -botania.page.openCrate1=A little interesting effect the &1Open Crate&0 can do is that, when given a redstone signal, any items it drops are prevented from being caught by flowers like the &1Hopperhock&0, &1Rannuncarpus&0 or &1Pollidisiac&0 for around ten seconds more than usual. -botania.page.openCrate2=A super crate box - -# -- DRUM OF THE WILD -botania.entry.forestDrum=Drum of the Wild -botania.page.forestDrum0=The &1Drum of the Wild&0 is, in layman's terms, the percussion counterpart of the &1Horn of the Wild&0. It serves the exact same purpose as the handheld horn, but is placed in world.
    To trigger a beat and break nearby foliage, one would fire a &4Mana Burst&0 at the drum. -botania.page.forestDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1빨간색stone Mana Spreader&0 or a &1Mana Blaster&0 is required. -botania.page.forestDrum2=But if you close your eyes... - -# -- ABSTRUSE PLATFORM -botania.entry.platform=Abstruse Platform -botania.page.platform0=By laying &1Livingwood&0 on a very specific format it's possible to create a platform of sorts, that only has a physical body for whoever is on top of it and isn't sneaking. For anyone else, it's like it's not there. &4Mana Bursts&0 will always travel through it without any trouble.
    It's also possible to camouflage this block as any other simple block by simply right clicking it. -botania.page.platform2=Right clicking a platform with a block in it with a &1Wand of the Forest&0 will change all connected platforms with no block set to them to the block on the one clicked. Shift-right clicking removes all blocks. -botania.page.platform1=It would be Ethereal but the name was taken - -# -- CONJURING WITH MANA -botania.entry.manaConjuration=Conjuring with Mana -botania.page.manaConjuration0=Similar to the ability to &4Alchemise with Mana&0, a catalyst also exists for &4Conjuration&0, the magic of materializing resources from magical energy only. The mechanism works in a similar way to the &1Alchemy Catalyst&0 where one tosses an item into the pool with the catalyst below. -botania.page.manaConjuration1=Creating the catalyst -botania.page.manaConjuration2=Conjuring &1빨간색stone&0 -botania.page.manaConjuration3=Conjuring &1Glowstone&0 -botania.page.manaConjuration4=Conjuring &1Quartz&0 -botania.page.manaConjuration5=Conjuring &1Coal&0 -botania.page.manaConjuration6=Conjuring &1Snow&0 -botania.page.manaConjuration7=Conjuring &1Netherrack&0 -botania.page.manaConjuration8=Conjuring &1Soul Sand&0 -botania.page.manaConjuration9=Conjuring &1Gravel&0 -botania.page.manaConjuration10=Conjuring &1Leaves&0 -botania.page.manaConjuration11=Conjuring &1Grass&0 - -# -- SPECTRAL PLATFORM -botania.entry.spectralPlatform=Spectral Platform -botania.page.spectralPlatform0=The &1Spectral Platform&0 isn't more than an &1Abstruse Platform&0 with no physical body whatsoever. Whereas the &1Abstruse Platform&0 would have a physical body in some cases, the &1Spectral Platform&0 lets anything go through it, regardless of their position. -botania.page.spectralPlatform1=This reminds me of a Puzzle - -# -- DRUM OF THE GATHERING -botania.entry.gatherDrum=Drum of the Gathering -botania.page.gatherDrum0=The &1Drum of the Gathering&0 is, in short terms, a &1Drum of the Wild&0 for livestock.
    When a &4Mana Burst&0 collides with it, it'll shear any &4Sheep&0 around with grown fleece. Any &4Cows&0, with &1Empty Buckets&0 below them will have their milk transfered to the buckets. -botania.page.gatherDrum1=Tap your lands - -# -- CRAFTY CRATE -botania.entry.craftCrate=Crafty Crate -botania.page.craftCrate0=As the name suggests, the &1Crafty Crate&0 is a counterpart to the &1Open Crate&0 with the ability to assemble items into other items similarly to a &1Crafting Table&0.
    Like a &1Crafting Table&0, it has a 9 slot inventory, which can be filled with items in the pattern of a recipe. -botania.page.craftCrate1=The items go in from left to right and top to bottom (illustration further in this entry), to that, there's a special item, named the &1Crafting Placeholder&0, which, when placed in, counts as an empty slot in the recipe. This is used to allow for recipes with gaps (eg, furnace, chest, pickaxe...) to also be doable. -botania.page.craftCrate2=Creating the placeholder -botania.page.craftCrate3=To finish the recipe, one of two things can be done.
    First off, filling every of the 9 slots with either recipe components or placeholders will instantly eject the result, the placeholders and any leftovers (e.g. buckets when making cake), this is the most straightforward method. -botania.page.craftCrate4=Right clicking the crate with a &1Wand of the Forest&0 (remember: &1Dispensers&0 can do this) will attempt at crafting with whatever is inside the crate and eject it.
    If this fails all the items inside are simply ejected with no crafting procedure done. -botania.page.craftCrate7=Attaching a &1Comparator&0 to the crate will have it emit a signal equal to the amount of items inside the crate, which can be an extremely valuable asset in creating mechanisms with it. -botania.page.craftCrate5=An example of crafting a &1Diamond Pickaxe&0 -botania.page.craftCrate6=Made in Portugal -botania.page.craftCrate8=The &1Crafty Crate&0 can also be augmented with patterns. A pattern locks specific slots in the recipe, disallowing items from going into those slots and making them count as if there were placeholders there.
    There's only a few basic patterns, which can be applied by right clicking on the crate (this doesn't consume them). -botania.page.craftCrate9=9 different patterns - -# -- HOVERING HOURGLASS -botania.entry.hourglass=Hovering Hourglass -botania.page.hourglass0=The ability to count time is an essential one to anyone who wishes to develop any redstonic contraptions. A single timer, however, can take a up both a lot of space and be slow in general. The &1Hovering Hourglass&0 is a simple, accurate, sand based timer. As the name implies, it's a hourglass that hovers and turns by itself. -botania.page.hourglass1=The hourglass contains an inventory, in which up to a stack of &1Sand&0, &1빨간색 Sand&0 or &1Soul Sand&0 can be added via a right click. Right clicking again removes it. The sand will then fall from one of the chambers into another, and when is done, release a single redstone pulse and turn over, starting the process again. -botania.page.hourglass2=The amount of time for each pulse is dependent on how much and what type of sand is in the chamber. &1Sand&0 will count for one second per block, &1빨간색 Sand&0 ten seconds per and &1Soul Sand&0 one minute per. Sand types can't be mixed. The time for each pulse can be seen by hovering over the block with a &1Wand of the Forest&0. -botania.page.hourglass3=Note that the sand is added all at once, so the size of the stack to be added needs to be set in the inventory.
    Sand can't be added to the hourglass after it already has some in, trying to do so will end up removing the sand there instead. The sand in the block can be taken and added by &1Hoppers&0 or other methods. -botania.page.hourglass4=Right clicking the block with a &1Wand of the Forest&0 locks (and unlocks) it. When locked, sand can't be added or removed, just in case someone right clicks it on accident.
    If a &4Mana Burst&0 collides with the block, it'll stop the flow of sand and pause the timer, colliding again continues it. -botania.page.hourglass5=The sands of time - -# -- SPECTRAL RAIL -botania.entry.ghostRail=Spectral Rail -botania.page.ghostRail0=Using a &1Spectral Platform&0 as a &1Rail&0 component gives some interesting abilities to a &1Minecart&0 that passes through it: when launched off the rail, the cart will float for a bit, it'll also be able to pass through walls.
    This effect stops if the cart lands on a rail or collides with any variant of &1Dreamwood&0. -botania.page.ghostRail1=Spirit Tracks, you could say - -# -- DRUM OF THE CANOPY -botania.entry.canopyDrum=Drum of the Canopy -botania.page.canopyDrum0=The &1Drum of the Canopy&0 is like the &1Drum of the Wild&0 in that it is the percussion counterpart of the &1Horn of the Canopy&0. It serves the exact same purpose as the handheld horn, but is placed in world.
    All the functionality is similar to the &1Drum of the Wild&0 -botania.page.canopyDrum1=The 분홍색ing Drum - -# -- COCOON OF CAPRICE -botania.entry.cocoon=Cocoon of Caprice -botania.page.cocoon0=A cocoon is usually a symbol of change, of evolution.
    Creating a &1Cocoon of Carpice&0 and placing it down will slowly evolve the rudimentary contents inside it into a &1Baby Animal&0. More often than not the animal hatched will be a farm animal, but on rare ocasions, different animals such as &1Wolves&0 or &1Horses&0 may be created. -botania.page.cocoon1=Speculation says that giving the cocoon &1Emeralds&0 influences the outcome towards something a bit different.
    What could come out of such experiment is anyone's guess, really. -botania.page.cocoon2=New World, Perfect World - -# -- MANASTORM CHARGE -botania.entry.manaBomb=Manastorm Charge -botania.page.manaBomb0=Putting together some &1TNT&0 and a &1Gaia Spirit&0 creates a &1Manastorm Charge&0, a type of explosive, per say. Ignited with a &1Mana Burst&0, the charge will create an unstable &1Manastorm Epicenter&0, which will, over time, spawn supercharged &1Mana Bursts&0, that explode on contact with other blocks.
    Needless to say, only a maniac would unleash such a force near anything they care about. -botania.page.manaBomb1=Prepare to face the mighty... - -# - MYSTICAL INSTRUMENTS -# -- MANA BLASTER -botania.entry.manaBlaster=Mana Blaster -botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Mana Spreader&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
    By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. -botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot. -botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply place the &1Mana Blaster&0 back on the crafting grid. -botania.page.manaBlaster3=We need more dakka - -# -- PASTURE SEEDS -botania.entry.grassSeeds=Pasture Seeds -botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infusing some &1Tall Grass&0 with &4Mana&0, it's possible to create &1Pasture Seeds&0, which will grow grass in any barren area, via a simple right click on dirt.
    Other types of foliage can also be grown, such a &1Podzol&0 or &1Mycellium&0 with alternate seeds. -botania.page.grassSeeds1=&1Pasture Seeds&0 for grass -botania.page.grassSeeds2=&1Boreal Seeds&0 for podzol -botania.page.grassSeeds3=&1Infestation Spores&0 for mycellium - -# -- ROD OF THE LANDS -botania.entry.dirtRod=Rod of the Lands -botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simpleton tool, by utilizing &4Mana&0 from the user's inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down.
    For the same &4Mana&0 cost, this item can provide &1Dirt&0 to the &1Rod of the Shifting Crust&0. -botania.page.dirtRod1=That's dirty - -# -- TERRA FIRMA ROD -botania.entry.terraformRod=Rod of the Terra Firma -botania.page.terraformRod0=While digging away at dirt with a shovel is definitely functional, flattening huge tracts of land can get somewhat tortuous at times.
    By utilizing the &1Rod of the Terra Firma&0, it's possible to terraform in a quick and environmental friendly manner. -botania.page.terraformRod1=This rod, will, at the cost of some &4Mana&0 from the user's inventory, flatten the land to the level you are standing. For this to happen, charge it by &4holding right-click&0 and, slowly but surely, the nearby terrain will be flattened to your level, either by placing &1Dirt&0 or by removing blocks. -botania.page.terraformRod2=Note that blocks removed by the rod are non-recuperable. The terrain will adapt to the changes as best as it can, up to a distance limit, to avoid cuts in hills and the like, for this, the flattening will work in the terrain's natural look.
    Lastly, the rod will cease to function whatsoever below sea level. -botania.page.terraformRod3=Quite a justicar - -# -- MANASTEEL EQUIPMENT -botania.entry.manaGear=Manasteel Equipment -botania.page.manaGear0=&1Manasteel&0, alike other metals, can be shaped into tools and armor alike.
    Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead. -botania.page.manaGear10=Some pieces of the toolset have an ability when right clicked. The &1Pickaxe&0 will place a torch from the user's inventory, the &1Axe&0 will do the same for a sapling and the &1Shovel&0 will till the earth, similarly to a hoe.
    A detail to keep in mind is that &1Shears&0 made of mana materials will trigger tripwire, unlike iron ones. -botania.page.manaGear1=The &1Manasteel Pickaxe&0 -botania.page.manaGear2=The &1Manasteel Shovel&0 -botania.page.manaGear3=The &1Manasteel Axe&0 -botania.page.manaGear4=The &1Manasteel Shears&0 -botania.page.manaGear5=The &1Manasteel Sword&0 -botania.page.manaGear6=The &1Manasteel Helmet&0 -botania.page.manaGear7=The &1Manasteel Chestplate&0 -botania.page.manaGear8=The &1Manasteel Leggings&0 -botania.page.manaGear9=The &1Manasteel Boots&0 - -# -- HORN OF THE WILD -botania.entry.grassHorn=Horn of the Wild -botania.page.grassHorn0=Clearing out &1Tall Grass&0 by hand can definitely be a nuisance.
    Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand.
    With some modifications, the horn can be modified to break leaves or snow instead. -botania.page.grassHorn1=Crafting the horn -botania.page.grassHorn2=Modifying to break &1Leaves&0 -botania.page.grassHorn3=Modifying to break &1Snow&0 - -# -- TERRASTEEL ARMOR -botania.entry.terrasteelArmor=Terrasteel Armor -botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much alike the &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.
    This armor, however, has properties more alike &1Diamond&0 instead of &1Iron&0. -botania.page.terrasteelArmor1=The &1Terrasteel Helmet&0 -botania.page.terrasteelArmor2=The &1Terrasteel Chestplate&0 -botania.page.terrasteelArmor3=The &1Terrasteel Leggings&0 -botania.page.terrasteelArmor4=The &1Terrasteel Boots&0 - -# -- TERRA BLADE -botania.entry.terraSword=Terra Blade -botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when swung, there's a chance for it to create a beam that will deal as much damage as a melee hit. -botania.page.terraSword1=No Broken Hero Sword - -# -- TERRA SHATTERER -botania.entry.terraPick=Terra Shatterer -botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for its creation.
    The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method. -botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines its &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.
    The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0. -botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.
    The rank of the tool does not change its speed, but instead, it increases the power of its &4Active Ability&0.
    Toggling the tool's ability can be done via right click. -botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger through the ranks. It's to note that the rank &4D&0 tool does not have the active ability.
    Having the tool active consumes &4Mana&0 from its storage passively, even if not being used to mine. -botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.
    It also won't despawn like regular dropped items. -botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW - -# -- ROD OF THE SEAS -botania.entry.waterRod=Rod of the Seas -botania.page.waterRod0=Similarly to its land counterpart, the &1Rod of the Seas&0 will, at the cost of some &4Mana&0, place down a &1Water&0 block wherever it's used on. Furthermore, it can also be used to refill a &1Petal Apothecary&0. -botania.page.waterRod1=Keep the Earth clean, it isn't Uranus - -# -- ELEMENTIUM EQUIPMENT -botania.entry.elfGear=Elementium Equipment -botania.page.elfGear0=Similarly to other metals, as expected, &1Elementium&0 can, too, be shaped into tools and armor.
    These pieces of equipment have a decent resistance to damage, about half of that of diamond, as well as the ability to drain &4Mana&0 to prevent damage. -botania.page.elfGear1=Each of the tools come with their own ability or power of sorts which makes them unique. The armor allows the wearer to, when hit, have a chance to spawn a &1Pixie&0 that goes after the attacker, dealing decent damage.
    The more pieces of &1Elementium Armor&0 equipped, the higher the chance. -botania.page.elfGear2=Starting off, the &1Elementium Pickaxe&0 will destroy any &1Cobblestone&0, &1Dirt&0, &1Netherrack&0 and other mundane materials, leaving behind only the ores and fine resources.
    Combining the &1Elementium Pickaxe&0 with a &1Terra Shatterer&0 in a crafting square allows for the latter to also get this power. This can't be undone. -botania.page.elfGear3=I can fit a shower in my pocket, screw cobble -botania.page.elfGear4=The &1Elementium Shovel&0 will, case the block dug is affected by gravity (&1Gravel&0, &1Sand&0, etc), dig all the blocks of that material above and/or below it, no more gravel falling while mining. -botania.page.elfGear5=Putting Things on Top of Other Things -botania.page.elfGear6=The &1Elementium Axe&0 doubles as a weapon, if used to strike the finishing blow to a &4Zombie&0, &4Skeleton&0, &4Creeper&0 or even another &4Player&0, it has a chance to decapitate them, leaving their severed head or skull behind. -botania.page.elfGear7=Off with their heads -botania.page.elfGear8=The &1Elementium Shears&0 hold the ability to, when held back like a bow, shear any nearby sheep with speed within a large area of effect centered on the holder. -botania.page.elfGear9=Nui? She's h-arm-less -botania.page.elfGear10=Lastly, the &1Elementium Sword&0 will increase the chance of a &4Pixie&0 spawning when hit (this holds true when no &1Elementium Armor&0 is worn) and increases the strength of any &4Pixies&0 spawned. -botania.page.elfGear11=The Lambent Light -botania.page.elfGear12=Fortuna on the Sixteenth Night -botania.page.elfGear13=When the Seagulls Cry Breakdown -botania.page.elfGear14=Good People Die -botania.page.elfGear15=The out of Infinity - -# -- EXTRAPOLATED BUCKET -botania.entry.openBucket=Extrapolated Bucket -botania.page.openBucket0=By creating a bucket out of &1Elementium&0 one seems to notice an interesting feature. The liquids acquired by it simply vanish into the ether, never to be seen again. This seems like a great clean up tool. -botania.page.openBucket1=A Souvenir from Lewis - -# -- ROD OF THE BIFROST -botania.entry.rainbowRod=Rod of the Bifrost -botania.page.rainbowRod0=&4Bifrost&0, the rainbow bridge that reaches between the world and the realm of the gods.
    While this item, the &1Rod of the Bifrost&0 doesn't exactly do that, it allows the holder, via a right click and at the cost of some &4Mana&0, to create a rainbow bridge in the direction he or she is looking at. -botania.page.rainbowRod1=This bridge extends as far as a hundred blocks, and will vanish after about fifteen seconds.
    Only one bridge can be created for any given &1Rod of the Bifrost&0 at a time, as soon as the old bridge vanishes, a new one can be created. -botania.page.rainbowRod2=Going my way!! Cut open a path and go! -botania.page.rainbowRod3=&1Bifrost Blocks&0 for decoration - -# -- ROD OF THE SKIES -botania.entry.tornadoRod=Rod of the Skies -botania.page.tornadoRod0=The &1Rod of the Skies&0 is a magical instrument with the ability to propel one in the air at fast velocity for the cost of some &4Mana&0.
    To do so, one would simply hold it like a bow and watch as their momentum increases.
    The rod takes a small amount of time to recharge, but during that time it'll block any fall damage, keeping the user safe. -botania.page.tornadoRod1=A treasure from Lorule - -# -- ROD OF THE HELLS -botania.entry.fireRod=Rod of the Hells -botania.page.fireRod0=The &1Rod of the Hells&0 contains the essence of a burning flame, using it on the ground will create a circle of fire that burns anything inside it, for a decent cost of &4Mana&0.
    The ring has a decent radius, and takes a small amount of time to fully propagate, it's to note that after that time it burns anything living in it, the caster included. -botania.page.fireRod1=Megu Megu Fire Endless Night - -# -- VINE BALLS -botania.entry.vineBall=Vine Balls -botania.page.vineBall0=&1Ladders&0 can't stand up on their own, they require something on their back, whereas &1Vines&0 don't. Normally, though, &1Vines&0 aren't strong enough for someone to climb them when they're freestanding.
    By combining a few &1Vines&0, it's possible to create a ball that can be thrown, to create a climbable ladder of strong &1Vines&0 where it hits. -botania.page.vineBall1=It's also possible, by combining some materials such as &1Livingwood&0 or a &1Rune of Air&0 to create a slingshot that lets these &1Vine Balls&0 be shot while completely ignoring the force of gravity. -botania.page.vineBall2=This would be in Vineacraft... -botania.page.vineBall3=...if that actually existed. -botania.page.vineBall4=Oh, and you can make &1Moss Stone&0 too - -# -- SHARD OF LAPUTA -botania.entry.laputaShard=Shard of Laputa -botania.page.laputaShard0=Via a somewhat complex magic activation sequence, combining a few interesting resources, including &1Gaia Spirits&0 would allow one to create a shard that, when used on the ground, will lift an almost spherical area around that point up into the air.
    This process consumes the shard and can take upwards of ten minutes depending on the mass of land. -botania.page.laputaShard2=The radius of the island creates start at 14 blocks, on other words, 28 blocks of diameter. It's possible to increase the size by upgrading the shard with additional &1Gaia Spirits&0, each one adds 1 block to the radius, or 2 to the diameter. -botania.page.laputaShard1=Look Shiro, Laputa exists! -botania.page.laputaShard3=Size does matter - -# -- EQUESTRIAN VIRUS -botania.entry.virus=Equestrian Virus -botania.page.virus0=Through the mixing of some ingredients, a type of virus that can alter the genetic code of equestrian life can be made.
    Using one of these viruses on a &1Horse&0 will alter its genetic code, turning it into either a &1Zombie&0 or &1Skeleton Horse&0. Not only will it do that, but it will vastly increase all the &1Horse&0's genetic attributes. -botania.page.virus1=No ponies here -botania.page.virus2=None here either - -# -- ROD OF THE HIGHLANDS -botania.entry.skyDirtRod=Rod of the Highlands -botania.page.skyDirtRod0=While the &1Rod of the Lands&0 is all well and good, being able to place &1Dirt&0 without something to hold it would be great.
    The &1Rod of the Highlands&0 does just that, while maintaining the original power of the &1Rod of the Lands&0, it can also place &1Dirt&0 in mid air, for an increased &4Mana&0 cost. -botania.page.skyDirtRod1=Dirty Stick mk2 - -# -- VITREOUS PICKAXE -botania.entry.glassPick=Vitreous Pickaxe -botania.page.glassPick0=Placing down &1Glass&0 and having to break it again can be a heartbreaking experience. Luckily, by creating a &1Vitreous Pickaxe&0, one can gather the &1Glass&0 back by mining it with the pick, it's like cheap &4Silk Touch&0 for glass! -botania.page.glassPick1=Trapped inside with food - -# -- ROD OF DIVINING -botania.entry.diviningRod=Rod of the Plentiful Mantle -botania.page.diviningRod0=The &1Rod of the Plentiful Mantle&0 has the ability to divine in a decently large radius around the user to find any ores. These will shine for a little bit, allowing their location.
    This process, obviously, requires a decent amount of &4Mana&0 from the user's inventory. -botania.page.diviningRod1=inb4 ee3 - -# -- ROD OF THE BLACK MESA -botania.entry.gravityRod=Rod of the Shaded Mesa -botania.page.gravityRod0=The &1Rod of the Shaded Mesa&0 is a powerful relic, legend says that the first of these devices was found atop a dark mesa, along with a crowbar.
    To use this device, the user may right click and hold on a monster or item to pick it up. Releasing right click will drop the selected entity, while left click will fire it in a powerful burst. -botania.page.gravityRod1=This power does not come free, of course. It requires significant amounts of &4Mana&0 from the user's inventory. -botania.page.gravityRod2=bun pls - -# -- TIMELESS IVY -botania.entry.regenIvy=Timeless Ivy -botania.page.regenIvy0=While &1Manasteel&0 or &1Elementium&0 tools have the ability to harness &4Mana&0 and use it to protect their bodies, other tools or armor don't have this property.
    A handful of &1Timeless Ivy&0 can be attached on to virtually any item, allowing it to be repaired with &4Mana&0. -botania.page.regenIvy1=To apply it, one'd simply craft the tool in question alongside the ivy and 3 of an item that can be used to repair the tool in an anvil (eg. &1Diamonds&0 for a &1Diamond Pickaxe&0).
    Due to not being in direct contact with the material, the amount of &4Mana&0 used by the ivy in comparison to &1Manasteel&0 is rather high. -botania.page.regenIvy2=Bring your Inferno Adze - -# -- ROD OF THE ARCANE BARRAGE -botania.entry.missileRod=Rod of the Unstable Reservoir -botania.page.missileRod0=The &1Rod of the Unstable Reservoir&0 is a rather powerful weapon against a large crowd of foes. Channeling its power will materialize countless arcane missiles that home in on targets at random, at a pretty hefty cost of &4Mana&0. -botania.page.missileRod1=Zapzapzapzap - -# -- ASSEMBLY HALO -botania.entry.craftingHalo=Assembly Halo -botania.page.craftingHalo0=Carrying a &1Crafting Table&0 around generally can be troublesome. The &1Assembly Halo&0 acts not only as a portable &1Crafting Table&0 but as a quick crafting method. Having the item in hand displays a "halo" of recipes around the holder.
    First off, right clicking on the &1Crafting Table&0 will open up a crafting interface. -botania.page.craftingHalo1=As long as the item is present in the inventory the last crafting recipe done will be stored in it.
    Right clicking an empty slot of the halo will set the last recipe on it. Right clicking a slot with a recipe will try to do it using items from the inventory. Removing a recipe can be done through shift-left click. -botania.page.craftingHalo2=It has no taste if you cook it from the menu - -# -- LENS CLIP -botania.entry.clip=Lens Clip -botania.page.clip0=While a formidable and versatile tool, the &1Mana Blaster&0's greatest downfall is the lack of an ability to store more than one &1Lens&0 at once. Not any more. The &1Lens Clip&0 will attach to a &1Mana Blaster&0 in a crafting grid and allow it to store up to 6 lenses rather than just one.
    As they say, Russian Roulette is not the same without a gun... -botania.page.clip1=Adding and removing &1Lenses&0 works just as it did previously, with one detail. The lens will be added or removed in the slot that the clip is currently on.
    To change this slot, simply shift-right click the &1Mana Blaster&0 in the air. This will also change which lens is selected, case there is one in that slot. -botania.page.clip2=Since we're dubbed by 4Kids we must make do without one - -# -- ROD OF THE DEPTHS -botania.entry.cobbleRod=Rod of the Depths -botania.page.cobbleRod0=The &1Rod of the Depths&0 acts pretty much as a variant to the the &1Rod of the Lands&0. It does exactly the same thing but with &1Cobblestone&0 for a bit of a higher price.
    For the same &4Mana&0 cost, this item can provide &1Cobblestone&0 to the &1Rod of the Shifting Crust&0. -botania.page.cobbleRod1=It's cobbling time - -# -- ROD OF THE MOLTEN CORE -botania.entry.smeltRod=Rod of the Molten Core -botania.page.smeltRod0=The &1Rod of the Molten Core&0 has the ability to expel heat provenient from the world's core. Holding it via right click and pointing at a block in the world that can be smelted into a different type of block will quickly turn it into that.
    For some examples, &1Cobblestone&0 turns into &1Stone&0, &1Sand&0 into &1Glass&0, so on. -botania.page.smeltRod1=Stolen from Efreet - -# -- WORLD SEED -botania.entry.worldSeed=World Seed -botania.page.worldSeed0=The &1World Seed&0 is a piece of elemental energized matter containing the ability to return its user to the world spawn.
    Case the person who is using it is farther than 24 blocks from the world's spawn point, using the seed, via right click, will instantly teleport them there, consuming the seed. -botania.page.worldSeed1=Where the heart is - -# -- SPELLBINDING CLOTH -botania.entry.spellCloth=Spellbinding Cloth -botania.page.spellCloth0=Combining &1Wool&0 with some &4Mana&0 in the form of a &1Mana Pearl&0 allows for one to create a type of cloth that will absorb any &4Enchantments&0 it comes in contact with.
    Combining the &1Spellbinding Cloth&0 with any enchanted item in a crafting table will remove all enchants from that item at the cost of some of the cloth's durability. -botania.page.spellCloth1=Oldest item in the book - -# -- THORN CHAKRAM -botania.entry.thornChakram=Thorn Chakram -botania.page.thornChakram0=The &1Thorn Chakram&0 is a thrown weapon made of &1Terrasteel&0 and plant matter. After thrown it'll pierce through enemies, damaging them and sometimes poisoning them, and bounce on blocks a few times before returning to the thrower, similarly to a boomerang.
    Up to 6 &1Thorn Chakrams&0 can be stacked together, making them a versatile weapon for closed environments. -botania.page.thornChakram1=Spores and stingers - -# -- FLARE CHAKRAM -botania.entry.fireChakram=Flare Chakram -botania.page.fireChakram0=Some &1Blaze Powder&0 and &1Pixie Dust&0 does wonders when applied to a &1Thorn Chakram&0, this combination turns the already potent weapon into a &1Flame Chakram&0.
    The &1Flame Chakram&0 works exactly the same as the original &1Thorn Chakram&0, the only difference being that it sets any living beings it touches aflame, and after all, you can't make bacon with some just some plants' thorns, can you? -botania.page.fireChakram1=As fire as fenn's mixtape - -# -- OVERGROWTH SEED -botania.entry.overgrowthSeed=Overgrowth Seed -botania.page.overgrowthSeed0=An &1Overgrowth Seed&0 is an elusive item, which can be used to enchant a piece of &1Grass&0, via right clicking on it in the world, creating &1Enchanted Soil&0. Flowers that are rooted on this &1Enchanted Soil&0 will function at double the normal speed.
    There's one problem, though. No known method of creating these exists, but they have been spotted in ancient structures and the like. - -# -- LIVINGWOOD BOW -botania.entry.livingwoodBow=Livingwood Bow -botania.page.livingwoodBow0=The &1Livingwood Bow&0 is, as the name describes, a bow made of &1Livingwood&0 strung with &1Mana Infused String&0. Due to its components, it will last for longer than a normal &1Bow&0. It'll also repair itself using &4Mana&0, similarly to &1Manasteel Tools&0. -botania.page.livingwoodBow1=Does it shoot airplanes? - -# -- CRYSTAL BOW -botania.entry.crystalBow=Crystal Bow -botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Livingwood Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies.
    Given the lightweight and flexible structure of the bow, it can also fire at a much increased velocity than a conventional wooden one. -botania.page.crystalBow1=The elves are roving - -# -- STONE OF TEMPERANCE -botania.entry.temperanceStone=Stone of Temperance -botania.page.temperanceStone0=The &1Terra Shatterer&0 is able to destroy huge tracts of land when charged to its maximum potential, however, this might not always be the user's intent. A small, 3x3 tunnel might be more fitting in some cases. Having an active &1Stone of Temperance&0 in one's inventory will prevent their shatterer from breaking any more than a 3x3 area. This also affects the &1Terra Truncator&0. The stone can be toggled on and off by shift-right clicking. -botania.page.temperanceStone1=Don't lose it - -# -- TERRA TRUNCATOR -botania.entry.terraAxe=Terra Truncator -botania.page.terraAxe0=The &1Terra Truncator&0 is a greataxe of premium quality achievable only with &1Terrasteel&0. When hitting a tree it'll take the whole thing down with speed, bringing all the logs and leaves along with it. Of course, this comes at a hefty cost of &4Mana&0.
    This effect doesn't happen while sneaking or if the user has a &1Stone of Temperance&0. -botania.page.terraAxe1=It's not a Dead END - -# -- FLORAL OBEDIENCE STICK -botania.entry.obedienceStick=Floral Obedience Stick -botania.page.obedienceStick0=Nobody knows why, but attaching some &1Manasteel&0 to &1Livingwood Twigs&0 creates a stick type device that can make nearby flowers all bind towards a single focus point.
    Dubbed the &1Floral Obedience Stick&0, right clicking with it on a &1Mana Spreader&0 or &1Mana Pool&0 in the world will bind all relevant nearby flowers to it. -botania.page.obedienceStick1=This is not a dumb new age hat - -# -- SLIME IN A BOTTLE -botania.entry.slimeBottle=Slime in a Bottle -botania.page.slimeBottle0=Placing some slime in an &1Elementium Container&0 seems to have an interesting effect on said slime. When in an area where &1Slimes&0 would naturally spawn underground, the inanimate blob of slime starts jumping for some odd reason.
    This can definitely prove useful for harvesting slimeballs or setting up a &1Narslimmus&0 however. -botania.page.slimeBottle1=JUMPYDOLL - -# -- ROD OF THE SHIFTING CRUST -botania.entry.exchangeRod=Rod of the Shifting Crust -botania.page.exchangeRod0=&1Rod of the Shifting Crust&0 is a magical device with the ability to swap blocks in the world at very fast speeds. In order to achieve this, one must first select a block to swap with, this is done by shift-right clicking that block in the world.
    After this block is selected, left clicking any other block in the world will swap it for that block, assuming it's present in the user's inventory. -botania.page.exchangeRod1=Right clicking on a block in the world will start a larger transformation, which will swap all highlighted blocks into the one selected. Obviously, these blocks do come from the user's inventory as well. Only proper, full size blocks can be used for this swap, so no flowers, torches or other shenenigans of the sort. Using this power does, naturally, require &4Mana&0 from the user's inventory. -botania.page.exchangeRod2=Other rods or devices can be used to extend the power of the &1Rod of the Shifting Crust&0.
    For example, having a &1Rod of the Lands&0 in one's inventory provides the &1Rod of the Shifting Crust&0 with an endless supply of &1Dirt&0, assuming the &4Mana&0 cost for the &1Rod of the Lands&0' dirt conjuration is fulfiled. -botania.page.exchangeRod3=Bootlegged equal trade - -# -- MANAWEAVE CLOTH -botania.entry.manaweave=Manaweave Cloth -botania.page.manaweave0=&1Manaweave Cloth&0 is a type of fabric with powerful ties to the primal energies contained in &4Mana&0.
    Armor can be made of this cloth, &1Manaweave Robes&0, while they aren't very strong when it comes to raw resistance and strength, the robes make up for it with a powerful set bonus, making tools and rods cheaper to use, &4Mana&0 wise, and making the latter more powerful. -botania.page.manaweave1=Wearing the full set of &1Manaweave Robes&0 grants the wearer with increased proficiency when operating magical rods, increasing the power or range of them, or just their cost, for some of the more simpleton ones.
    &1Manaweave Robes&0 can use &4Mana&0 from one's inventory to repair themselves, similarly to &1Manasteel Armor&0, but, due to their affinities with the primal energies, at a lower mana cost. -botania.page.manaweave2=Weaving the threads of mana -botania.page.manaweave3=Creating the Cowl -botania.page.manaweave4=Creating the Robe Top -botania.page.manaweave5=Creating the Robe Bottom -botania.page.manaweave6=Creating the Boots - -# - ENDER ARTEFACTS -# -- EXTRACTING ENDER AIR -botania.entry.enderAir=Extracting Ender Air -botania.page.enderAir0=The air present in the void of the &1End&0 seems to have some mutating properties. Right clicking with an empty &1Glass Bottle&0 while in the &1End&0 will capture some of that air, which can then later be tossed similarly to a splash potion, turning nearby &1Stone&0 on the landing point into &1End Stone&0. - -# -- ENDER OVERSEER -botania.entry.enderEyeBlock=Ender Overseer -botania.page.enderEyeBlock0=The eyes of an &4Enderman&0 have an interesting sensitivity to being watched. A block out of these will simply output a &4redstone signal&0 if a player within a 64 block radius is looking directly at it.
    Of course, wearing a &1Pumpkin&0 negates this effect. -botania.page.enderEyeBlock1=MY BRAND - -# -- FORCE RELAY -botania.entry.pistonRelay=Force Relay -botania.page.pistonRelay0=It seems that infusing &1Pistons&0 with &4Mana&0 results in some interesting adverse effects.
    This block tears the fabric of space, relaying any piston force applied to it to the block it's bound to. -botania.page.pistonRelay1=To bind it to a block, right click it with a &1Wand of the Forest&0, and right click on the block you want to bind it to.
    Furthermore, this block is highly unstable, and may create uncanny effects, care is to be taken, it is also resistant to glue, both in pulling and pushing. This allows for a "frame" like setup. -botania.page.pistonRelay2=Infusing a &1Piston&0 with &4Mana&0. - -# -- HAND OF ENDER -botania.entry.enderHand=Hand of Ender -botania.page.enderHand0=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0.
    Using the hand on another player will open up &otheir&r inventory instead, at a lot higher &4Mana&0 cost. -botania.page.enderHand0a=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0. -botania.page.enderHand2=Furthermore, simply having a &1Hand of Ender&0 present in one's inventory, allows for the &1Rod of the Shifting Crust&0 to be provided with items from that player's &1Ender Chest&0, this comes at an increased &4Mana&0 cost compared to that of the normal use of the rod. -botania.page.enderHand1=Zezima hates him! -botania.page.enderHand1a=It's like the 4G of Ender Chests - -# -- SOULSCRIBE -botania.entry.enderDagger=Soulscribe -botania.page.pistonRelay0=It seems that infusing &1Pistons&0 with &4Mana&0 results in some interesting adverse effects.
    This block tears the fabric of space, relaying any piston force applied to it to the block it's bound to.
    To bind it to a block, right click it with a &1Wand of the Forest&0, and right click on the block you want to bind it to. -botania.page.pistonRelay1=To break the block, shift-right click it with a &1Wand of the Forest&0, any other means will destroy it.
    Furthermore, this block is highly unstable, and may create uncanny effects, care is to be taken. It is also resistant to glue, both in pulling and pushing. This allows for a "frame" like setup. -botania.page.enderDagger2=Strike my Soul - -# -- LIFE IMBUER -botania.entry.spawnerClaw=Life Imbuer -botania.page.spawnerClaw0=&1Monster Spawners&0 are an interesting bunch. They have the ability to bring out life from thin air, but somehow, this only manifests when there's a player nearby.
    This, of course, tends to be a rather limiting factor in the onslaught of any creatures that they can create. -botania.page.spawnerClaw1=By placing a &1Life Imbuer&0 on top of a &1Monster Spawner&0 and giving it a rather decent chunk of &4Mana&0 through a &1Mana Spreader&0, when there aren't any players in the nearby vicinity, the &4Mana&0 will power the spawner, just as if there were players around. -botania.page.spawnerClaw2=Something something shadow dragon - -# -- RED STRING -botania.entry.redString=빨간색 String -botania.page.redString0=Lore says the Gods tie a red string around the ankles of people who are supposed to affect each others lives. This led inventors to come up with a way of connecting blocks over the air, called, of course, &1빨간색 String&0. Blocks created with this exquisite material can face in all 6 basic directions and bind to the first available and compatible block they can find, given a range. -botania.page.redString1=Each &4빨간색 Stringed&0 block has a different criteria to what it'll bind to, but the distance in which they'll bind stays constant between the variations. The string can be viewed, if a block is bound, by holding a &1Wand of the Forest&0.
    Blocks being in the way will not break the connection. Lastly, &1빨간색 String&0 blocks can't be chained. -botania.page.redString2=Are you in a pinch? -botania.page.redString3=Starting off, the &1빨간색 Stringed Container&0 will bind to any inventory (&1Chests&0, &1Furnaces&0, &1Hoppers&0, etc), items can be put into it using &1Hoppers&0 or any other means of insertion. The items will end up in the block it's bound to, and will enter from the same side as they were put on the &1빨간색 Stringed Container&0 itself. -botania.page.redString4=The &1빨간색 Stringed Container&0. -botania.page.redString5=The &1빨간색 Stringed Dispenser&0 can be bound to &1Dispensers&0 or &1Droppers&0, it functions similarly to the &1빨간색 Stringed Container&0 where items can also be placed in the bound block through it. When a redstone signal is given to it, the &1Dispenser&0 or &1Dropper&0 in the end will fire. -botania.page.redString6=The &1빨간색 Stringed Dispenser&0. -botania.page.redString7=The &1빨간색 Stringed Nutrifier&0 can be bound to any block that can be fertilized with &1Bone Meal&0. Using &1Bone Meal&0 on the block will fertilize the bound block instead. -botania.page.redString8=The &1빨간색 Stringed Nutrifier&0. -botania.page.redString9=The &1빨간색 Stringed Comparator&0 can be bound to any block whose status can be read with a &1Container&0, such as &1Chests&0, &1Mana Pools&0, &1Runic Altars&0, etc. Placing a &1Comparator&0 pointing outwards of this block will send the signal equal to the signal a &1Comparator&0 would send on the bound block. -botania.page.redString10=The &1빨간색 Stringed Comparator&0. -botania.page.redString11=Lastly, the &1빨간색 Stringed Spoofer&0 is an interesting one. Any flower with an effect can be placed on it. The block will bind to any flowers or mushrooms. While there's a flower on top of the block, that flower will not do anything, but the bound block will take all of that flower's properties and work as if it was the flower itself. -botania.page.redString12=The &1빨간색 Stringed Spoofer&0. - -# -- FLUGEL TIARA -botania.entry.flightTiara=Flügel Tiara -botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
    The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. -botania.page.flightTiara4=Not all is perfect with reproducing old technology though, the tiara has its flaws, that meaning it can't provide the power of flight constantly. If used for over ten seconds without letting it recharge it'll stop being able to provide the power of flight.
    A "flight bar" is displayed on the HUD to help monitor this. -botania.page.flightTiara5=In addition to simple flight, the tiara grants the wearer the ability to &4dash&0 and &4glide&0. Pressing the sprint key (CTRL by default) while flying, provided one isn't sprinting already, will start a dash, a quick speed boost in the direction the wearer's facing.
    Dashes can only be done every 2 seconds. -botania.page.flightTiara6=Gliding allows one to gently descend to the ground while also covering a decent horizontal distance. It also prevents fall damage. To glide, one would simply sneak while falling.
    Gliding can be executed even with an empty flight bar, but while gliding, the flight bar regenerates slower than normally. -botania.page.flightTiara1=Forty thousand books from another world -botania.page.flightTiara2=Combining the Tiara with a variety of Quartz species allows for it to create various different kinds of aesthetic wings, one for each style of quartz.
    The recipes for the various types of quartz can be found in the &4Decorative Blocks&0 entry under &4Miscellaneous&0, &1Elven Quartz&0 is acquired by trading &1Nether Quartz&0 with the elves. -botania.page.flightTiara3=Adding Wings (they can be swapped any time) - -# -- BASICS OF CORPOREA -botania.entry.corporea=Basics of Corporea -botania.page.corporea0=&4Corporea&0 is a magical system that utilizes the energy of the end and the empty space in the world to transport items from point A to point B instantly and without any connecting parts.
    The system works through a variant of &1Sparks&0, &1Corporea Sparks&0. These share some similarities with normal &1Sparks&0 but also a fair few differences. -botania.page.corporea1=Starting off, they can go on top of any &4Inventory&0, like a &1Chest&0 or a &1Dispenser&0 as opposed to &4Mana Containers&0, secondly, there's two types of &1Corporea Sparks&0, the basic &1Corporea Spark&0 and the &1Master Corporea Spark&0. These sparks work in a network-like system, each &1Master Corporea Spark&0 designates a &4Corporea Network&0, in which any spark can communicate with other sparks present in it. -botania.page.corporea2=When a &1Corporea Spark&0 is placed or polled, each spark will poll any nearby sparks, adding them to the network designated by the single &1Master Corporea Spark&0 and also polling other nearby sparks, in a chain. While each individual spark can only reach a few blocks, combined, the entire network can go for a virtually infinite distance. -botania.page.corporea3=&1Corporea Sparks&0 have a view of the inventory directly below them, but can only access items from the top side. Each &1Corporea Spark&0 has the ability to view every other spark in the network and its contents, and the ability to request them as necessary, depending on the type of block below it. -botania.page.corporea4=It's to note that the &1Master Corporea Spark&0, while being part of the network, can not have the items in its inventory extracted from.
    Futhermore, no requests for items in the network are ever done passively. Corporea does not have the ability to add new items to the network, those should be inserted physically through &1Hoppers&0 or other methods. -botania.page.corporea5=Similarly to normal &1Sparks&0, &1Corporea Sparks&0 have a method of augmentation, that being the ability to color them. While in the world, there's an icon floating around the spark that shows which color it has, this can be changed by right clicking on the spark with a piece of &1Floral Powder&0. These colors define networks. A spark may only be in the same network as another spark if the two have the same color. -botania.page.corporea6=The ability to color sparks allows for multiple different &4Corporea Networks&0 to be together in a close area, without interfering with each other.
    Viewing the network and removing the spark works exactly the same as a normal spark. Lastly, having two &1Master Corporea Sparks&0 of the same color nearby, while possible, is a bad idea and will cause conflicts and odd behaviour. -botania.page.corporea7=Creating &1Corporea Sparks&0 -botania.page.corporea8=And &1Master Corporea Sparks&0 - -# -- CORPOREA INDEX -botania.entry.corporeaIndex=Corporea Index -botania.page.corporeaIndex0=The biggest ability of a &4Corporea Network&0 is the ability to vocally request items from it by name. The &1Corporea Index&0 is an ender-crystal like block that can interface with a given &4Corporea Network&0 by having a &1Corporea Spark&0 placed on top of it.
    While in the world, approaching it will cause it to activate and show the radius in which it will stay activated. -botania.page.corporeaIndex1=While activated, the index will intercept any &4Chat Messages&0 sent by nearby players, taking them in as &4requests&0 and preventing them to be broadcasted to chat. From this, it'll request, from the network, items whose name matches the request. For example, writing "iron ingot" will have the index look through the network for a single &1Iron Ingot&0 and transport it towards itself, materializing it in the world. -botania.page.corporeaIndex2=Requests can be more complex than just a single item. For example "10 apples" will request, as described, 10 &1Apples&0. Writing "this" will search for items whose name equals the name of the item in the player's hand. Prepending or appending to a query "...", "~", "" or "?" will turn it into a "contains" rather than "equals" query. So writing "iron..." will find all items that have "iron" in their name, for example. -botania.page.corporeaIndex3=The plural form of an item's name may only be used case it's a regular noun when it comes to the plural (suffixed by "-s", "-es" or "-ies"), the singular version works just as well for requests of multiple items, such as "10 apple".
    "10 of this" requests 10 items whose name equals the item in the player's hand, as expected. -botania.page.corporeaIndex4=Examples of complex requests include "10 apples", "a stack of apples", "2 stacks of apples", "2 stacks and 20 apples", "half a stack of apples", "a dozen apples", and so on.
    The index will also recognise more or less verbose forms of request, so "2x stacks and 20x of apples" is equal to "2 stack 2 apple" or "2 stacks 2 apples". -botania.page.corporeaIndex5=Requesting with "all" or "every" will deliver every single item in the network that matches the criteria, so "all apples" will deliver all the apples in the network.
    On the other side, requesting "count", "show", "display" or "tell" won't request any, but will tell the requester how many exist in the network. -botania.page.corporeaIndex6=Lastly, while near a &1Corporea Index&0, writing part of an item's name and pressing TAB in the chat menu will autocomplete the item's name. -botania.page.corporeaIndex7=A certain magical one at that - -# -- CORPOREA FUNNEL -botania.entry.corporeaFunnel=Corporea Funnel -botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the &4Corporea Network&0 is the &1Corporea Funnel&0, when given access to a network through a &1Corporea Spark&0 on top, it'll pull a single item from the network when given a redstone signal.
    This item is put into an inventory 1 or 2 blocks below it, or case one doesn't exist or is full, tossed into the world right above the funnel. -botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
    Rotating the item changes how many will be requested at once, starting at 1, rotating once, twice and three times will pull 16, 32 and 64, respectively. -botania.page.corporeaFunnel2=Energistically applied - -# -- CORPOREA INTERCEPTOR -botania.entry.corporeaInterceptor=Corporea Interceptor -botania.page.corporeaInterceptor0=The &1Corporea Interceptor&0 does exactly as the name suggests, it intercepts corporea requests. First and foremost, &1Item Frames&0 with items need be attached around the block, these define what items will trigger the interceptor.
    Whenever a request is fired to the corporea network, be it from an Index, Funnel, etc, and there's no items in the network that can fulfil it this block will be triggered. -botania.page.corporeaInterceptor1=Of course, the the block is only triggered if the item requested matches one of items in the &1Item Frames&0 about it. When the block is triggered it'll emit a short redstone pulse. This can be used to do all sorts of things, such as craft the required item using &1Crafty Crates&0 or light up a lamp indicating that the inventory for a resource is out. -botania.page.corporeaInterceptor2=So many automation prospects - -# -- CORPOREA CRYSTAL CUBE -botania.entry.corporeaCrystalCube=Corporea Crystal Cube -botania.page.corporeaCrystalCube0=A seer usually looks through a crystal ball to see the future. Well, a corporea handler would look through a crystal cube to see the present. The &1Corporea Crystal Cube&0 acts as a visual medium to interact ith one's &4Corporea Network&0. Placing the block down and giving it a &1Corporea Spark&0 is the obvious first step to hooking it up to the network. -botania.page.corporeaCrystalCube1=When the block is connected, right clicking it with any sort of item will have it monitor that item, allowing someone who's looking at it see how many exist in the network. The display updates about once every second.
    While there's an item selected, left clicking the block will request one of that item from the network. Shift-left clicking requests a whole stack. -botania.page.corporeaCrystalCube2=I can see forever - -# -- DECORATIVE END BLOCKS -botania.entry.endStoneDecor=Decorative End Blocks -botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can be converted into bricks and chiseled bricks, the bricks can be used as stairs or slabs just like normal &1Stone Bricks&0 would.
    &1Ender Pearls&0 can be combined with the bricks to create &1Ender Brick&0 blocks, which can also can be used for stairs or slabs. -botania.page.endStoneDecor1=Making &1End Stone Bricks&0 -botania.page.endStoneDecor2=Making &1Chiseled End Stone Bricks&0 -botania.page.endStoneDecor3=Making &1Ender Bricks&0 -botania.page.endStoneDecor4=Making &1Pillar Ender Bricks&0 - -# -- LIFE AGGREGATOR -botania.entry.spawnerMover=Life Aggregator -botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
    It's to note that the device will shatter after being used once. -botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet - -# -- RESOLUTE IVY -botania.entry.keepIvy=Resolute Ivy -botania.page.keepIvy0=Everyone knows that before being ressurected, one's items splatter all over the ground, generally a massive nuisance. The fix for this is rather simple. By attaching a piece of &1Resolute Ivy&0 to an item through a crafting grid, that item will presist on one's inventory through death. The ivy will degenerate after that fact and will need to be applied again if one wishes to have the item survive another downfall. -botania.page.keepIvy2=There is, however, one restriction to the items in which this ivy can be attached to.
    For &otechnical reasons&r, the ivy may not be attached to any item that, upon being used in a crafting table, gives something in return, such as &1Buckets of Water&0 or the &1Mortar and Pestle&0. -botania.page.keepIvy1=Because people die when they are killed - -# -- BLACK HOLE TALISMAN -botania.entry.blackHoleTalisman=검은색 Hole Talisman -botania.page.blackHoleTalisman0=The void is a massive space full of... void, really. There's nothing there. But with some ingenuity, this space can be used to store items to your heart's content.
    The &1검은색 Hole Talisman&0 utilizes powerful Gaia and Ender magic to allow for a virtually infinite quantity of a single type of block to be stored in this space. -botania.page.blackHoleTalisman1=Right clicking a block in the world will set the talisman to store that type of block. This can only be done if the talisman is empty. Next off, shift-right clicking the talisman in the air will enable or disable it. Whilst enabled and in the user's inventory it'll absorb any blocks of the type into it.
    Placing the item in a crafting grid allows one to extract stacks of the blocks in it. -botania.page.blackHoleTalisman2=While the talisman has any contents in it, the blocks in it can be placed as if they were normal blocks stored in the inventory via a simple right click with it.
    Right clicking an inventory will try to fill it with the blocks stored in the talisman. Lastly, the talisman can provide the &1Rod of the Shifting Crust&0 with the blocks it contains. -botania.page.blackHoleTalisman3=Like a Rageki but twice as fun - -# -- LUMINIZER TRANSPORT -botania.entry.luminizerTransport=Luminizer Transport -botania.page.luminizerTransport0=&1Luminizers&0 serve as a simple way to transport players and other living things of the sort by having them ride on trails of light.
    &1Luminizers&0 can be placed in the world as blocks. A &1Luminizer&0, in order to work properly needs to be bound to another one. This can be done with the &1Wand of the Forest&0 in bind mode. Right clicking a &1Luminizer&0 will transport the clicker into the &1Luminizer&0 it's bound to. -botania.page.luminizerTransport1=&1Luminizers&0 have a range of twenty blocks each, but can be chained to create longer and more complex paths.
    The connection between two &1Luminizers&0 goes only one way, unless the binding is explicitly done both ways. If the connection does go both ways, an endless loop is created, though.
    Furthermore, multiple &1Luminizers&0 can target the same one as an endpoint. -botania.page.luminizerTransport2=Luminize to the future -botania.page.luminizerTransport3=Adding some redstone to a &1Luminizer&0 creates a &1Detector Luminizer&0. For all intents and purposes, it functions just like a regular &1Luminizer&0, however, it sends out a &4redstone pulse&0 every time something passes through it or reaches it as an endpoint. -botania.page.luminizerTransport4=Are you ready to draw? -botania.page.luminizerTransport5=While players can just right click the &1Luminizers&0, in order to get animals or other beings into the trails, a &1Luminizer Launcher&0 is required.
    This block needs to be placed down adjacent to &1Luminizers&0, and when it receives a &4redstone pulse&0, it'll randomly distribute all living beings on top of it into all of the adjacent &1Luminizers&0, causing them to go on their merry way. -botania.page.luminizerTransport6=Let's believe it, open the flag - -# -- STARCALLER -botania.entry.starSword=Starcaller -botania.page.starSword0=The &1Starcaller&0 is a blade with the power to call upon the wrath of the stars, when swung, there's a chance for the blade to summon a falling star heading towards where the wielder is looking, this star will deal damage upon impact with any entities. Creating this sword proves to be no easy task, as it requires &1Ender Air&0 and a &1Terra Blade&0. Keep in mind that the process does wipe the enchantments on the sword used. -botania.page.starSword1=Caller, fury, whatever... - -# -- THUNDERCALLER -botania.entry.thunderSword=Thundercaller -botania.page.thunderSword0=The &1Thundercaller&0 is a dual pronged sword with the ability to conjure lightning. Created using a &1Terra Blade&0, &1Ender Air&0 and some other materials, the &1Thundercaller&0 scarifices the power of long range attacks to be able to zap multiple targets.
    Attacks initiated with the &1Thundercaller&0 invoke upon chain lightning that homes on nearby hostile mobs, dealing decreasing damage per hit. -botania.page.thunderSword1=Blessed Blade of the Trade Chat - -# - BAUBLES AND ACCESSORIES -# -- AN INTRODUCTION TO BAUBLES -botania.entry.bIntro=An Introduction to Baubles -botania.page.bIntro0=&4Baubles&0, also commonly referred to as &4Trinkets&0 or &4Charms&0 are pieces of equipment which offer all sorts of different effects, when worn.
    To equip them, one can press the &4B&0 (configurable) key. There's four slots, one &4Amulet&0 slot, two &4Ring&0 slots and one &4Belt&0 slot. -botania.page.bIntro1=The &4Baubles Screen&0 -botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that uses the baubles system is installed, this inventory will be shared between the various mods. - -# -- COSMETIC BAUBLES -botania.entry.cosmeticBaubles=Cosmetic Baubles -botania.page.cosmeticBaubles0=A large selection of &1Cosmetic Baubles&0 is available to change or add style to any baubles a player has equipped. These can both be worn by themselves, on the amulet slot, or crafted alongside another &4Bauble&0 in a crafting grid to change the look of the bauble to the new &4Cosmetic Override&0. Removing &4Cosmetic Overrides&0 can be done through putting the bauble back in the crafting grid. -botania.page.cosmeticBaubles1=Creating these is done through an interesting method, weaving a specific color of petal around some &1Mana Infused String&0 creates an item. The type of item created doesn't seem to have anything to do with the color.
    How this works really isn't too well known, it's like the person that came up with this didn't bother to use better materials or something, who knows. -botania.page.cosmeticBaubles2=They're cool -botania.page.cosmeticBaubles3=My desires are... unconventional -botania.page.cosmeticBaubles4=How unpleasant -botania.page.cosmeticBaubles5=It's cold in Kalos -botania.page.cosmeticBaubles6=Do they reveal anything? -botania.page.cosmeticBaubles7=Shut up Alexander and the Trajan -botania.page.cosmeticBaubles8=The eye has to be hidden -botania.page.cosmeticBaubles9=Not for bean sprouts -botania.page.cosmeticBaubles10=The best color -botania.page.cosmeticBaubles11=Tilting the umbrella too much -botania.page.cosmeticBaubles12=The Neighbours' Club -botania.page.cosmeticBaubles13=Nyaa -botania.page.cosmeticBaubles14=Don't get too ahead of yourself -botania.page.cosmeticBaubles15=Evil up! -botania.page.cosmeticBaubles16=Nudistoooooooooo -botania.page.cosmeticBaubles17=(insert reference here) -botania.page.cosmeticBaubles18=Lurk moar -botania.page.cosmeticBaubles19=I need your time -botania.page.cosmeticBaubles20=So rare -botania.page.cosmeticBaubles21=Oh hey, Loki -botania.page.cosmeticBaubles22=Challenge up! -botania.page.cosmeticBaubles23=Representing! -botania.page.cosmeticBaubles24=Reminds me of a puzzle -botania.page.cosmeticBaubles25=You've met with a terrible fate, haven't you? -botania.page.cosmeticBaubles26=Thanks for the gold stranger -botania.page.cosmeticBaubles27=Woah, colors -botania.page.cosmeticBaubles28=Who the hell do you think I am? -botania.page.cosmeticBaubles29=Nothing suspicious here, nope -botania.page.cosmeticBaubles30=I can fly with these -botania.page.cosmeticBaubles31=Not actually part of spain -botania.page.cosmeticBaubles32=Now you too can believe -botania.page.cosmeticBaubles33=Get on the treadmill, angbadang - -# -- TINY PLANET -botania.entry.tinyPlanet=Tiny Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her.
    By increasing its mass with some &1Stone&0, it can also be placed in world, for the same effect. -botania.page.tinyPlanet1=Clearly from rebirth -botania.page.tinyPlanet2=More of a planet than Pluto - -# -- BAND OF MANA -botania.entry.manaRing=Band of Mana -botania.page.manaRing0=Combining a &1Mana Tablet&0 with some &1Manasteel&0 creates an easily worn &4Ring&0, that functions exactly similar to the tablet used to make it, but can be worn as a &4Bauble&0.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it store about four times as much &4Mana&0. -botania.page.manaRing1=Creating the ring -botania.page.manaRing2=Upgrading the ring - -# -- BAND OF AURA -botania.entry.auraRing=Band of Aura -botania.page.auraRing0=The &1Band of Aura&0 is a bit of a deviation from the typical &1Band of Mana&0, in which, instead of storing &4Mana&0, it slowly, while equipped, creates it and stores it into &4Mana&0 containing items in the wearer's inventory.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it generate &4Mana&0 at a significantly faster rate. -botania.page.auraRing1=Creating the ring -botania.page.auraRing2=Upgrading the ring - -# -- SOUJOURNER'S SASH -botania.entry.travelBelt=Soujourner's Sash -botania.page.travelBelt0=Traversing terrain sometimes proves to be a hassle. The &1Soujourner's Sash&0 can be equipped in the &4Belt&0 slot, and when worn will increase the movement speed, jump height and resistance to fall damage of the wearer. This power comes at a small &4Mana&0 cost.
    Lastly, if not sneaking, it also allows the wearer to walk over 1 block high gaps without jumping with ease. -botania.page.travelBelt1=...everell - -# -- TECTONIC GIRDLE -botania.entry.knockbackBelt=Tectonic Girdle -botania.page.knockbackBelt0=By harnessing the forces of tectonic movement, the &1Tectonic Girdle&0, when worn, will negate any &4Knockback&0 applied to the wearer by outside attacks. -botania.page.knockbackBelt1=I'm the man who can't be moved - -# -- SNOWFLAKE PENDANT -botania.entry.icePendant=Snowflake Pendant -botania.page.icePendant0=The &1Snowflake Pendant&0 is a &4Bauble&0 that resonates freezing energy, while it's worn, any nearby still &1Water&0 blocks at foot level will be converted into &1Ice&0.
    The &1Ice&0 will melt shortly afterward the wearer leaves the area. Lastly, this charm will not freeze any blocks if the wearer is sneaking or fully submerged. -botania.page.icePendant1=Do you want to build a snowman? - -# -- PYROCLAST PENDANT -botania.entry.lavaPendant=Pyroclast Pendant -botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs low heat, while it's worn, if the wearer is caught on fire and is not directly standing on &1Fire&0, &1Lava&0 or anything else that can induce burning, they'll be extinguished. -botania.page.lavaPendant1=Hanako could have used one of these - -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Golden Laurel Crown -botania.page.goldenLaurel0=One of the uses for &1Gaia Spririts&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=Given the theme, probably Viridi - -# -- RING OF CHORDATA -botania.entry.waterRing=Ring of Chordata -botania.page.waterRing0=The &1Ring of Chordata&0 allows the wearer to swim like a fish. While it's equipped, the wearer is bestowed with the ability to accelerate to a decent speed while underwater. It also gives the wearer good sight underwater and, if &4Mana&0 is present, at the cost of some of it, the ability to breathe indefinitely. -botania.page.waterRing1=Check out that fish AI - -# -- RING OF THE MANTLE -botania.entry.miningRing=Ring of the Mantle -botania.page.miningRing0=The &1Ring of the Mantle&0 allows one to mine faster, while equipped and &4Mana&0 is present in the inventory, it'll give a &4Haste&0 effect to the wearer. Some &4Mana&0 is used while the wearer swings their arm or equipped item, be it for attacking, mining or just flailing. -botania.page.miningRing1=Diggy diggy hole - -# -- RING OF MAGNETIZATION -botania.entry.magnetRing=Ring of Magnetization -botania.page.magnetRing0=By turning a &1Magnetizing Lens&0 into a wearable ring, one can use it to magnetize nearby items. While equipped, this ring will make any nearby items magnetize towards the wearer if they're not sneaking. A notable feature of this piece is that it'll negate its effect for 5 seconds after the wearer tosses an item so as to not interfere with whatever means it was tossed for. A &1Solegnolia&0 can disrupt this ring's functionality. -botania.page.magnetRing1=How do they work? -botania.page.magnetRing2=Upgrading the ring for a larger range - -# -- RING OF FAR REACH -botania.entry.reachRing=Ring of Far Reach -botania.page.reachRing0=Through the power of one's Pride, nothing is out of their reach. By wearing the &1Ring of Far Reach&0, the maximum distance the wearer can break, place or interact with blocks, as well as attack or interact with entities is increased by about three blocks. -botania.page.reachRing1=Fire and Blood - -# -- CHARM OF THE DIVA -botania.entry.divaCharm=Charm of the Diva -botania.page.divaCharm0=The &1Charm of the Diva&0 blesses the wearer with the ability to have any attacked mob follow the attacker's will, and, case there are any nearby enemies, go after them instead. This process, of course, requires a bit of &4Mana&0 from the wearer's inventory in order to function. -botania.page.divaCharm1=You shall not disrespect Big Sister - -# -- GREAT FAIRY RING -botania.entry.pixieRing=Great Fairy Ring -botania.page.pixieRing0=This ring works alongside the &1Elementium Armor&0, insight in the powers of it is advised before using this ring. When worn, the &1Great Fairy Ring&0 will increase the chance for a &4Pixie&0 to spawn when the wearer is hit, this still holds true case no &1Elementium Armor&0 is equipped. -botania.page.pixieRing1=We got square heads, big pointy caps - -# -- GLOBETROTTER'S SASH -botania.entry.superTravelBelt=Globetrotter's Sash -botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Gaia Spirits&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance. -botania.page.superTravelBelt1=No time for guessing, follow my plan instead - -# -- THE SPECTATOR -botania.entry.itemFinder=The Spectator -botania.page.itemFinder0=&1The Spectator&0 is a headband that allows the wearer to have a better perception of the world. While holding an item, any &4containers&0 (chests, minecarts, donkeys with chests, furnaces, etc...) that have an item of that type, &4dropped items&0 of that type, &4mobs&0 who have that item equipped &o(...)&r -botania.page.itemFinder1=&o(...)&r &4players&0 who have the item in their inventory and &4villagers&0 who want to trade either with or for that item will shine with a colorful glow, allowing them to be easily spotted.
    While sneaking, all dropped items around the wearer will shine, regardless of the item. -botania.page.itemFinder2=Do you hear their voices? - -# -- CRIMSON PENDANT -botania.entry.superLavaPendant=Crimson Pendant -botania.page.superLavaPendant0=The &1Crimson Pendant&0 is, in simple terms, an upgraded counterpart to the &1Pyroclast Pendant&0, wearing it provides the wearer immunity to all fire and lava damage, instead of just extinguishing them. -botania.page.superLavaPendant1=Runner-up on Monolith Code - -# -- TAINTED BLOOD PENDANT -botania.entry.bloodPendant=Tainted Blood Pendant -botania.page.bloodPendant0=Messing around with the original source of the &4Potion&0 design, the Nether, seems to work fairly well at harnessing that very power.
    The &1Tainted Blood Pendant&0 allows one to store a &4Brew&0 in a condensed, wearable state. Infusing this pendant with one and wearing it will apply the effect while it's worn, for the cost of &4Mana&0 depending on the power of the &4Brew&0. -botania.page.bloodPendant1=To infuse the pendant with a &4Brew&0 the normal procedure of infusing one on a &1Vial&0 is what's required. The cost increases by a tenfold, though.
    However, the pendant will not accept any and all effects, a few don't seem to behave well, such as &4Instant Health&0 or &4Absorption&0. Lastly, &4Brews&0 with more than one effect will fail as well. -botania.page.bloodPendant2=I'll get Saber for sure - -# -- CLOAKS OF JUDGEMENT -botania.entry.judgementCloaks=Cloaks of Judgement -botania.page.judgementCloaks0=The &1Cloaks of Judgement&0 are a pair of cloaks that can be worn instead of a belt (and thus, they go in the Belt slot). Their strength triggers when their wearer takes damage. After that, they'll go in a ten second recharge period in which their effects won't trigger. -botania.page.judgementCloaks1=The &1Cloak of Virtue&0 will, when active, block the full extent of a piece of damage taken. This does not apply to magic damage.
    The &1Cloak of Sin&0 will damage all nearby hostile mobs for the same amount of damage that was taken. -botania.page.judgementCloaks2=A Holy Mantle -botania.page.judgementCloaks3=Taste Vengeance! - -# -- MANASEER MONOCLE -botania.entry.monocle=Manaseer Monocle -botania.page.monocle0=A handy accessory for one who requires a thorough window into where their &4Mana Bursts&0 are going is the &1Manaseer Monocle&0. Not only is it a rather fancy eyepiece but it also allows the wearer to see all nearby &4Mana Bursts&0, even if their line of sight towards them is blocked by something. More important, perhaps, is that when someone wearing this monocle looks at a flower they'll be able to see its functional radius. -botania.page.monocle1=Why hello there old chap - -# -- RING OF CORRECTION -botania.entry.swapRing=Ring of Correction -botania.page.swapRing0=Switching tools is a pain. People often find themselves shoveling away at dirt with... a pick? Using the &1Ring of Correction&0 is a great way to, well, correct that.
    While this ring is worn, the tool in hand will always be the right one for the block being broken, be it a pick, axe or shovel. This only works with tools that can use &4Mana&0. -botania.page.swapRing1=Use the right tools - -# - ALFHOMANCY -# -- THE PORTAL TO ALFHEIM -botania.entry.aIntro=The Portal to Alfheim -botania.page.aIntro0=It's said that once, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they would've been banished back to their own world, &4Alfheim&0.
    Experimentation has been done in attempt to bridge the gap between the two worlds, and means of creating a portal that does just that have been devised. -botania.page.aIntro1=Creating this portal proves not to be an easy task, as quite a few exquisite resources are necessary. The requirements are as follows: 8 &1Livingwood&0 blocks, 3 &1Glimmering Livingwood&0 blocks, 1 &1Elven Gateway Core&0 (read on), 2 &1Mana Pools&0 and 2 &1Natura Pylons&0 (read on). -botania.page.aIntro2=Creating the &1Elven Gateway Core&0 -botania.page.aIntro3=Creating &1Natura Pylons&0 -botania.page.aIntro4=Alfheim Portal -botania.page.aIntro5=To open up the portal, simply right click the core with a &1Wand of the Forest&0.
    The portal requires a substantial amount of &4Mana&0 deposited in both the pools to open up, after that, it'll slowly drain some to keep itself powered. If it runs out of &4Mana&0, the connection will be broken. -botania.page.aIntro6=The amount of &4Mana&0 required to open up the portal is orders of magnitude higher than that to keep it maintained, thus closing the portal to prevent &4Mana&0 loss is a poor strategy.
    Furthermore, the link isn't strong enough to allow living beings to go through it, but it seems that &4items&0 can. -botania.page.aIntro7=The amount of information about &1Alfheim&0 stored in this lexicon is limited to this entry alone. Perhaps &4letting the&0 &4Elves have a look at it&0 might prove beneficial.
    Perhaps they'd also return a good amount of knowledge of their mystical constructs. - -# -- A MESSAGE FROM ELVEN GARDE -botania.entry.elfMessage=A Message from Elven Garde -botania.page.elfMessage0= -# ^ This is blank on purpose -botania.page.elfMessage1=&oGreetings. We noticed that our portal was opened via a link from another world. That's rather shocking news indeed. We thank you very much for providing us with a repository of the knowledge from your world, as to keep us up to date to what happened since we left it, it's been a while since then, it's good to see it's doing well. -botania.page.elfMessage2=&oAfter some discussion with the high council of Elven Garde, we have decided to cooperate with you. You see, reading through your "Lexica 보타니아" has shown us a good amount of resources from your world that we would be extremely keen as to get our hands on, as these are non-existent in our lands. -botania.page.elfMessage3=&oThe link you have managed to establish is rather weak, no living beings will be able to go through, as you already know. However, there's a positive side to this, the link strikes the fabric of time of both our worlds in a way where it doesn't keep them in sync, that's the reason why you received your book back so quickly. -botania.page.elfMessage4=&oWhen it comes to Mana and other magical energies, we are plenty stocked on them, so worry not about the portal closing on our end. Let's put this in prospect, in order for the advance of both our civilizations, we vow to accept a given set of resources from your world we lack in ours in exchange for resources you lack in yours. -botania.page.elfMessage5=&oWe have taken the liberty of assigning our best scribes to put together a great set of knowledge from our world we're willing to share, you can find it in your lexicon just as you'd find knowledge from yours. We hope you find it enlightening and that it encourages you to invest in our materials. -botania.page.elfMessage6=&oLast but not least, do keep in mind that if you decide to send something we have not vouched to trade for, we will assume it as a gift and keep it for ourselves, just as a forewarning. We look forward to exchanging resources with you.
    Best Regards, the High Council of Elven Garde. - -# -- THE RESOURCES OF ALFHEIM -botania.entry.elfResources=The Resources of Alfheim -botania.page.elfResources0=&4Alfheim&0 contains a very varied amount of exquisite resources. Sadly though, most of them are extremely scarce and hard to come by due to competition between the various clans. The elves are interested in trading some materials, such as &1Dreamwood&0, &1Elementium&0, &1Pixie Dust&0 or &1Dragonstone&0, resources native to their lands. -botania.page.elfResources1=Trading for &1Dreamwood&0 -botania.page.elfResources2=&1Dreamwood&0, similarly to &1Livingwood&0 can be turned into various &4Decorative Blocks&0, have a look through the &4Decorative Blocks&0 entry under &4Miscelaneous&0 for the recipes. -botania.page.elfResources10=&1Dreamwood Twigs&0 -botania.page.elfResources3=Trading for &1Elementium&0 -botania.page.elfResources4=Trading for &1Pixie Dust&0 -botania.page.elfResources5=Trading for &1Dragonstone&0 -botania.page.elfResources6=The &1Elves&0 are also quite keen on the white posh block from the &4Nether&0, &1Nether Quartz&0, the ones they have on their world are tinted green. This quartz works just like any other quartz, be it normal &1Nether Quartz&0 or any of the decorative variants you can find on the &4Decorative Blocks&0 entry under &4Miscelaneous&0. -botania.page.elfResources7=Trading for &1Elven Quartz&0 -botania.page.elfResources8=Alfheim also has its own variant of &1Glass&0, in the form of &1Alfglass&0. Its look is rather light and its patterns are randomized depending on where it's placed.
    Trading goes for &1Managlass&0. -botania.page.elfResources9=Trading for &1Alfglass&0 - -# -- RITUAL OF GAIA -botania.entry.gaiaRitual=Ritual of Gaia -botania.page.gaiaRitual0=The &4Ritual of Gaia&0 is a procedure often enacted by the elves, which is the only way to acquire &1Gaia Spirits&0, which are essences of the power of the Goddess of Gaia herself.
    This ritual required an &4Active&0 &1Beacon&0 with some &1Gaia Pylons&0 (read on) one level above the beacon as the altar, as well as a single &1Terrasteel Ingot&0 as a sacrifice. -botania.page.gaiaRitual1=Creating &1Gaia Pylons&0 -botania.page.gaiaRitual2=Ritual of Gaia -botania.page.gaiaRitual3=To start the ritual, simply shift-right click the &1Beacon&0 block with a &1Terrasteel Ingot&0, take a step back and prepare to fight for your life. Good preparation is required, as the fight with the &4Guardian of Gaia&0 can be even harder than that of the &4Wither&0. Upon defeating the &4Guardian&0, one can collect their prize, a handful of &1Spirits of Gaia&0. -botania.page.gaiaRitual4=The common attire for this ritual is a set of Enchanted &1Elementium Armor&0, a &1Terra Blade&0 and a large assortment of &4Brews&0 and &4Baubles&0. The effect of the &1Beacon&0 is nullified during the battle, so that should be taken in mind. -botania.page.gaiaRitual5=The difficulty and rewards bestowed by the ritual depend on the amount of people participating. Executing the ritual with over five people might be a recipe for disaster due to the chaos created, so collaborative rituals of that scale shouldn't be attempted.
    Lastly, staying away from the purple might be a good idea. - -# -- RITUAL OF GAIA II -botania.entry.gaiaRitualHardmode=Ritual of Gaia II -botania.page.gaiaRitualHardmode0=One would think that combining two of the most powerful resources known to existance, in the form of &1Terrasteel&0 and &1Gaia Spirits&0 would create an unstoppable material. It seems that the material is very much stoppable, though. In fact, the two forces cancel eachother out when combined into an ingot, creating an utterly useless alloy. -botania.page.gaiaRitualHardmode1=This ingot, though, due to the concentrated energy and power in it, does allow for the summoning of a stronger &1Gaia Guardian&0, with more resistance, strength and speed.
    For all of this, it also drops more &1Gaia Spirits&0 than normal, as well as a handful of goodies and rare treasure, making it a worthwhile foe. -botania.page.gaiaRitualHardmode2=Creating the &1Gaia Spirit Ingot&0. - -# -- THE RELICS OF THE AESIR -botania.entry.relics=The Relics of the Aesir -botania.page.relics0=There's an old tale from the high clans of Alfheim. It says something among the lines of "The one who rolls the Dice of Fate is to be rewarded with the Gifts of the Gods". These so called &1Relics of the Aesir&0 are rumored to be unique and soulbound, by which only one will ever be awarded to any one individual and only they might use it.
    But then again, it's probably just folklore. - -# -- THE RELICS OF THE AESIR II -botania.entry.relicInfo=The Relics of the Aesir II -botania.page.relicInfo0=It appears as if the speculated relics are, in fact, real. These items, materialized from rolls of the &1Dice of Fate&0 possess incredible powers, the fact that the dice is six-sided possibly indicates to the existance of six of these.
    Relics seem to contain knowledge of who earned them, and thus giving someone else a relic that doesn't belong to them might be a poor idea. -botania.page.relicInfo1=According to the original texts, the same relic may not be awarded to any one person twice, so keeping the item safe is a priority. Perhaps something like &1Resolute Ivy&0 would be a good investment.
    Interestingly enough, earning a relic also imparts upon this lexicon the knowledge on how to use it. How useful. - -# -- THE FRUIT OF GRISAIA -botania.entry.infiniteFruit=The Fruit of Grisaia -botania.page.infiniteFruit0=The relic known as &1The Fruit of Grisaia&0 is bestowed with the power to eternally nourish the brave soul who earned it. It can be eaten similarly to any other piece of food, but instead of utilizing matter to feed, it uses &4Mana&0 from one's inventory.
    Hope you like the taste of apple though. - -# -- KEY OF THE KING'S LAW -botania.entry.kingKey=Key of the King's Law -botania.page.kingKey0=The &1Key of the King's Law&0 is a powerful relic with the ability to materialize weapons at command. Holding right click with this key will summon a plenthora of varied weapons from... somewhere. Up to twenty weapons can be created at once. Releasing the grip on the key will launch all the weapons, one at a time, where the summoner is looking at, at high speed. These weapons will create an explosion on contact. - -# -- EYE OF THE FLUGEL -botania.entry.flugelEye=Eye of the Flügel -botania.page.flugelEye0=Unlike the fabricated &1Flügel Tiara&0, the &1Eye of the Flügel&0 contains primordial &4Flügel&0 magic. Magic strong enough, in fact, to harness the &4Flügels&0' ability to recall themselves to a place they've visited.
    Shift-right clicking with this eye somewhere will bind it to that position. After that, holding right click for a while will recall the user back to the aforementioned location. -botania.page.flugelEye1=This teleportation ability not only costs &4Mana&0 but can not be executed across two different dimensions, sadly enough.
    Aside from that, simply being in possession of an &1Eye of the Flügel&0 allows a wearer of the &1Flügel Tiara&0 to fly past the normal limits, at a higher cost, of course. - -# -- RING OF THOR -botania.entry.thorRing=Ring of Thor -botania.page.thorRing0=One of the three mythic rings of the &4Aesir&0, the &1Ring of Thor&0, when worn, bestows upon the wearer the might of the Thunder God &4Thor&0. This power drastically increases the strength of area of effect mining with a &1Terra Shatterer&0.
    This ring can be combined with the other two rings of the &4Aesir&0 in a crafting table to create the ultimate ring. - -# -- RING OF LOKI -botania.entry.lokiRing=Ring of Loki -botania.page.lokiRing0=One of the three mythic rings of the &4Aesir&0, the &1Ring of Loki&0 allows for the wearer to tap upon the Trickster God &4Loki&0 to effectively be in multiple places at once.
    The setup for this ability requires, first and foremost, an empty hand. Shift-right clicking on a block with said empty hand while having the &1Ring of Loki&0 equipped begins the procedure. -botania.page.lokiRing1=Once the source block is selected, shift-right clicking on other blocks in the world will add them to the relative positions affected by this power. In order to finish the procedure, one would shift-right click the original block.
    Shift-right clicking on one of the blocks that has been selected will remove it. To reset a completed selection, shift-right click the ground twice. -botania.page.lokiRing2=After the selection is complete, when looking around, one will notice multiple boxes in relative positions to the selected block. When a block is placed, the placing action is mimicked on all of those positions, allowing for one to place a large amount of blocks at once.
    This ability also extends to destruction using the &1Terra Shatterer&0 or &1Terra Truncator&0. -botania.page.lokiRing3=Such a power does not come for free of course. Utilizing this ability costs &4Mana&0 from the user's inventory per each block placed. It's to note that the more blocks that are selected, the more expensive &4each placed block&0 becomes.
    Lastly, this ring can be combined with the other two rings of the &4Aesir&0 in a crafting table to create the ultimate ring. - -# -- RING OF ODIN -botania.entry.odinRing=Ring of Odin -botania.page.odinRing0=One of the three mythic rings of the &4Aesir&0, the &1Ring of Odin&0 grants its wearer the vitality and resistance of the Elder God &4Odin&0. As well as the addition of ten extra hearts of health, the &1Ring of Odin&0 protects the wearer from various kinds of elemental damage such as drowning, suffocation, fire or starvation. The ring can also be combined with the other two rings of the &4Aesir&0 in a crafting table to create the ultimate ring. - -# -- ELVEN LORE - THE SHATTERING -botania.entry.elvenLore=Elven Lore - The Shattering -botania.page.elvenLore0=It seems this section of the lexicon is just a bunch of pieces of paper. By the looks of them, they seem like they were taken from a document from the libraries of Elven Garde.
    Their contents should contain historical knowledge, but doubtfully anything important to the studies of botany itself. -botania.page.elvenLore1=&oA few millennia have passed since The Shattering. The amount of us who actually know about what really happened that day is rather minute. Nidavellir broke down, and while the Dwarves' incredible resistance helped, a great part of their technology and civilization was eradicated. Muspelheim, what was (...) -botania.page.elvenLore2=&opreviously in the very opposite corner of the World 나무 herself collided with Midgard, merging the two worlds in an apocalypse, eradicating any life remaining in that world. There's theories that state Hel was also involved in the event, although none were ever confirmed. Fissures in the ground of (...) -botania.page.elvenLore3=&oJotunheim opened all around, massacring a great portion of the Giants who lived there, its current status remains unknown. Niflheim seemed to stay in place, unlike Muspelheim, interestingly enough. Since it contained no known lifeforms, we can admit that damage is irrelevant. Lastly, ourselves, the (...) -botania.page.elvenLore4=&oelves of Alfheim, the damage on our world was somewhat split. The Salamander and Undine clans suffered a massive cut on their population, due to the unstableness of their volcanic and aquatic environments, respectively. Most of the Sylph were completely intact due to their extraordinary flight capabilities, the (...) -botania.page.elvenLore5=&oSpriggan also had fairly small scale consequences. During that time our civilization prospects were fairly weak and our choices of residence were mostly just huts made of Dreamwood, so, luckily, rebuilding was little of a chore. Allewyn, our emissary in Asgard witnessed this happening, everything happened faster (...) -botania.page.elvenLore6=&othan the birth of a Pixie. Thor shattering the Bifrost with Mjolnir, her command to evacuate all of the elven civilization residing in Midgard, luckily she was here unscathed, or at least that's what records say, regardless, a few millennia later, she's passed off long ago. Right now our major concern is the status of Midgard. (...) -botania.page.elvenLore7=&oThe collapse of the Bifrost broke any interaction between the various worlds, but the sheer quantity of Mana residues we have left behind will surely have lingered and infused the world with life all over again, be it animal, floral or fungal, natural or magical in essence. We hope it's enough to create intelligent life that can properly harness it though. - -# - MISCLANEOUS -# -- UNSTABLE CUBE -botania.entry.unstableBlocks=Unstable Cubes -botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. -botania.page.unstableBlocks1=They look fancy -botania.page.unstableBlocks2=And they come in all 16 colors -botania.page.unstableBlocks3=There's also a way of creating a different version of these that releases an extremely larger amount of energy, this time in the form of a beam towards the sky that extends into a cloud of sorts. This one also seems to be disableable via a &4빨간색stone Signal&0, it's called an &1Unstable Beacon&0, as it looks like one somehow. -botania.page.unstableBlocks4=Fireworks? -botania.page.unstableBlocks5=Combined entropy -botania.page.unstableBlocks6=It's also possible, by using the &1Unstable Beacons&0, to turn them into a manageable and portable utility, in the form of the &1Signal Flare&0.
    This gun of sorts shoots a colored round into the sky that lasts a few seconds, it also stuns any nearby enemies for just as long. -botania.page.unstableBlocks7=Shoot in case of titan - -# -- DECORATIVE BLOCKS -botania.entry.decorativeBlocks=Decorative Blocks -botania.page.decorativeBlocks0=Past functionality, quite a few decorative blocks are available to make your builds look better.
    Starting off. It's possible to turn blocks of &1Livingrock&0 and &1Livingwood&0 into decorative blocks. Each of them features 4 different decorative variations. -botania.page.decorativeBlocks1=Livingrock bricks. -botania.page.decorativeBlocks2=Mossing the bricks -botania.page.decorativeBlocks3=Cracking the bricks -botania.page.decorativeBlocks4=Framing the bricks -botania.page.decorativeBlocks5=Turning wood into planks -botania.page.decorativeBlocks6=Mossing the planks -botania.page.decorativeBlocks7=Framing the planks -botania.page.decorativeBlocks8=Pattern planks -botania.page.decorativeBlocks9=Glimmering livingwood -botania.page.decorativeBlocks10=Carrying on, by combining &1Nether Quartz&0 with all sorts of other substances, it's possible to create a wide array of other decorative &1Quartz&0 blocks.
    As expected, all these items can be crafted into all their decorative block counterparts just like regular &1Quartz&0 blocks are crafted. -botania.page.decorativeBlocks11=Smokey Quartz -botania.page.decorativeBlocks12=Mana Quartz -botania.page.decorativeBlocks13=Blaze Quartz -botania.page.decorativeBlocks14=Lavender Quartz -botania.page.decorativeBlocks15=빨간색quartz -botania.page.decorativeBlocks23=Sunny Quartz -botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Reed Blocks&0, &1Thatch&0, &1Roof Tiles&0 and a few new &1Bricks&0.
    All these also can be crafted into both stairs and slabs. -botania.page.decorativeBlocks17=Crafting &1Reed Blocks&0 -botania.page.decorativeBlocks18=Crafting &1Thatch&0 -botania.page.decorativeBlocks19=Crafting &1Roof Tiles&0 -botania.page.decorativeBlocks20=Crafting &1Hellish Bricks&0 -botania.page.decorativeBlocks21=Crafting &1Soul Bricks&0 -botania.page.decorativeBlocks22=Crafting &1Frosty Bricks&0 - -# -- DISPENSER TWEAKS -botania.entry.dispenserTweaks=Dispenser Tweaks -botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can also plant all sorts of crops, from &1Seeds&0, &1Potatos&0 or &1Carrots&0 to even &1Nether Wart&0. The crop is planted in the block right in front of the dispenser.
    The &1Dispensers&0 can also use the &1Wand of the Forest&0 for some specific tasks such as triggering a &1Runic Altar&0. - -# -- GLIMMERING FLOWERS -botania.entry.shinyFlowers=Glimmering Flowers -botania.page.shinyFlowers0=By combining your typical &1신비로운 꽃s&0 with some &1Glowstone Dust&0, you can make them sparkle even brighter, and emit actual physical light, of the same brightness as a &1Glowstone Block&0.
    With some &1Dirt&0 and &1Pasture Seeds&0 it's possible to turn them into a miniature floating island that will not only emit light, but also look very fancy indeed. -botania.page.shinyFlowers3=Combining any color of &1Floating Flower&0 with any flower that has an effect (any &4Functional or Generating Flower&0, etc) in a crafting table will join the two, allowing for both the look and properties of a &1Floating Flower&0 and the effects of the flower chosen in one block. Lastly, right clicking a floating flower in the world with any type of &1Pasture Seed&0 or a &1Snowball&0 will change its look. -botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny -botania.page.shinyFlowers2=Like Laputa but (a lot) tinier - -# -- PRISMARINE -botania.entry.prismarine=Prismarine -botania.page.prismarine0=&1Prismarine&0 is an interesting component and building block. Some scholars even go as far as to say it comes from &4the future&0.
    To create it, one requires an &1Alchemy Catalyst&0. Simply tossing some &1Nether Quartz&0 into a &1Mana Pool&0 with the catalyst attached to it will get some of this material. -botania.page.prismarine1=There's various building blocks that can be created using the &1Prismarine Shards&0, to which all but the &1Sea Lantern&0 can be turned into their &1Stair&0 and &1Slab&0 variants. -botania.page.prismarine2=Creating &1Prismarine Shards&0 -botania.page.prismarine3=Crafting &1Prismarine&0 -botania.page.prismarine4=Crafting &1Prismarine Bricks&0 -botania.page.prismarine5=Crafting &1Dark Prismarine&0 -botania.page.prismarine6=Crafting the &1Sea Lantern&0 - -# -- NATURAL SHEDDING -botania.entry.shedding=Natural Shedding -botania.page.shedding0=The living and unliving beings that inhabit our lands don't live in a static state. It's common for pieces of their body to fall out, or for them to drop things, or for them to extrude substances. The following pages list some such items that can come from such entities. - -# -- TINY POTATO -botania.entry.tinyPotato=Tiny Potato -botania.page.tinyPotato0=It's a tiny potato, it believes in you, you can do the thing.
    No really, that's it, by tossing a &1Potato&0 in a &1Mana Pool&0, the potato gains a little lively essence and happy feeling. It's a lively one, giving it a right click will make it even more so!
    It can also be named in an &1Anvil&0. -botania.page.tinyPotato1=Put it on Kickstarter, it'll work - -# -- HEAD CREATION -botania.entry.headCreating=Head Creation -botania.page.headCreating0=A typical incantation of the Elves, combining a few resources and a &1Name Tag&0 allows for the creation of a replica of sorts of the head of the person described in the tag.
    How it works isn't really known, but it seems to be possible to replicate it with a &1Runic Altar&0. -botania.page.headCreating2=A subset of the community has dedicated themselves to creating heads that serve as all sorts of decorations. Unlike any other page in this lexicon, clicking the &1View Online&0 button on the left of this page will take you to a website with a list of names that can be used for this purpose. Note, however, that this list is not affiliated with 보타니아 in any way and is definitely not the only place to find these types of heads. -botania.page.headCreating1=Get your head in the game - -# -- AZULEJO -- http://en.wikipedia.org/wiki/Azulejo -botania.entry.azulejo=Azulejos -botania.page.azulejo0=&1Azulejos&0 are a type of decorative block, simply put, they are tileable patterns of blue and white. To create them, one would simply mix a piece of &1Lapis Lazuli&0 with a &1Block of Quartz&0.
    From there, placing it in the crafting grid allows for cycling between the twelve different patterns. -botania.page.azulejo1=The various patterns -botania.page.azulejo2=Crafting a block of &1Azulejo&0 -botania.page.azulejo3=Cycling between the patterns - -# -- STARFIELD CREATOR -botania.entry.starfield=Starfield Creator -botania.page.starfield0=The &1Starfield Creator&0 does exactly as it says, by releasing elven energies into the air, if it's placed in the world, during night time it will create a starry sky that extends for a fair distance. -botania.page.starfield1=Twinkle twinkle - -# -- TRODDEN DIRT -botania.entry.dirtPath=Trodden Dirt -botania.page.dirtPath0=&1Trodden Dirt&0 is a type of soil that works perfectly for the creation of natural looking artificial paths through landscape. Similarly to &1Farmland&0, it's slightly inset into the ground, walking on it also provides a small speed boost. -botania.page.dirtPath1=Follow the yellow dirt road -botania.page.dirtPath2=Also available in slabs - -# -- SHIMMERING MUSHROOMS -botania.entry.mushrooms=Shimmering Mushrooms -botania.page.mushrooms0=Sprinkling some &1Floral Powder&0 on &1Mushrooms&0 seems to have the interesting effect of them mutating into the respective color of powder, gaining a new shape and getting the ability to emit dim light. They don't seem to do anything besides look interesting.
    These can also be seldom found deep underground in isolated patches. -botania.page.mushrooms1=They don't make you bigger - -# -- PHANTOM INK -botania.entry.phantomInk=Phantom Ink -botania.page.phantomInk0=Having your beautiful skin and accessories under a set of metal armor is nobody's dream. It's bulky, flat, and worst of all, not fashionable!
    Luckilly, by tinging this horrendous armor with &1Phantom Ink&0 in a crafting grid, the armor will be completely invisible, while still providing all of its benefits. This will only work with armor sets that can use &4Mana&0. -botania.page.phantomInk1=Who you gonna call? - -# -- STONE ALCHEMY -botania.entry.stoneAlchemy=Stone Alchemy -botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cyle.
    Similarly to &1Prismarine&0, some scholars admit that this technique came from the future. Stairs and slabs can be made from the rough and brick variants of these. -botania.page.stoneAlchemy1=Creating the stones -botania.page.stoneAlchemy2=Polish -botania.page.stoneAlchemy3=Brickage -botania.page.stoneAlchemy4=Chiseling - -# -- BLAZE LIGHT -botania.entry.blazeBlock=Blaze Light -botania.page.blazeBlock0=Smashing a bunch of blazing material together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
    Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough. -botania.page.blazeBlock1=0x1a4 - -# -- CHALLENGES -botania.entry.challenges=Challenges -botania.page.challenges0=&1Challenges&0 are available in the &1Lexica 보타니아&0 by clicking the icon on the left of the landing page shaped like a cup. These, as the name says, challenge the player to create a mechanism using the features only available in &1Botania&0 and &1Minecraft&0 itself.
    Of course, you can use items from other mods to complete them, but that's no fun. -botania.page.challenges1=All of the challenges are possible, of course. They just require some thinking and knowledge of the ins and outs of redstone and the &1Botania&0 mechanics themselves.
    It's highly recommended that they're done without using features from external mods, as they have been created with that in mind, and aren't really challenges if you put down a block that solves them instantly. -botania.page.challenges2=The challenges aren't obligatory in any way, and do not provide any material reward. They're purely suggestions as to what &1Botania&0 can do, automation wise, and are but scratching the surface of that topic. Challenges need be marked completed manually.
    It should be kept in mind that the boundaries of this world are one's imagination, so don't stop at the ideas in there! - -# -- CACOPHONIUM -botania.entry.cacophonium=Cacophonium -botania.page.cacophonium0=This interesting instrument, the &1Cacophonium&0, has the ability to mimic almost every living being's cries in nature, allowing for the "musician" to play them at will. Right clicking with it on an entity has the instrument learn its sound. It can then be played by holding right click.
    Why anyone would ever want to make this, however, is beyond moral comprehension. -botania.page.cacophonium1=Hibike! Cacophoniu -botania.page.cacophonium2=For maximum cacophony, the &1Cacophonium&0 can be shift-right clicked onto a &1Note Block&0, creating the ability to sound off animal or monster sounds on demand.
    You monster. - -# -- THAUMCRAFT INTEGRATION -botania.entry.tcIntegration=Thaumcraft Integration -botania.page.tcIntegration0=Often enough, the paths of &4Botany&0 and &4Thaumaturgy&0 cross together. Mixing some of the artifacts mentioned in this book as well as any from the school of &5Thaumcraft&0 can allow for combinations of these to form. -botania.page.tcIntegration1=First and foremost, combining any of the &1Mana Metal&0 helms with a set of &1Goggles of Revealing&0 allows for a combination of both.
    The protection and regenerability of the armor works alongside the Goggles' abilities, but the &4Vis&0 discount is lost. -botania.page.tcIntegration2=Helmets of Revealing (works with any 보타니아 helm) -botania.page.tcIntegration3=Carrying on, &4Mana&0 can also serve as an interesting type of Ink. Infusing a set of black &1Scribing Tools&0 with &4Mana&0 from a &1Mana Pool&0 allows for them to use said &4Mana&0 as their source of color.
    Refilling these tools works similarly to a &1Mana Tablet&0, done by tossing it on top of the pool. It's to note that the tools do not come pre-filled. -botania.page.tcIntegration4=Making the &1Botanurgist's Inkwell -botania.page.tcIntegration5=Next off, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability, these come in the form of &1Glimmering Flowers, Floating Flowers and any variety of Pylons&0.
    Lastly, a special &4Brew&0 can be put together using typical thaumaturgic resources in order to apply a &4Warp Ward&0 effect. -botania.page.tcIntegration6a=Perhaps insanity might not be the greatest tool in all of occasions. For those cases, a nice bath generally takes care of it. A brew might be a better format for such a task, though... -botania.page.tcIntegration6b=The official frowny face - -# -- BUILDCRAFT INTEGRATION -botania.entry.bcIntegration=Buildcraft Integration -botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
    &1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes. +botania.page.runeAltar19=&1교만의 룬&0 제작하기 \ No newline at end of file From cdcfe753255e5316eb76b8eaecde6956af535f91 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 20:20:51 -0500 Subject: [PATCH 661/935] Clean up English present in es_AR, ru_RU --- .../resources/assets/botania/lang/es_AR.lang | 1433 +---------------- .../resources/assets/botania/lang/ru_RU.lang | 294 ---- 2 files changed, 1 insertion(+), 1726 deletions(-) diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index ff25eb5d5..271cefebe 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -51,12 +51,9 @@ botaniamisc.shiftToRemove=Shift + click para quitar botaniamisc.clickToAdd=Click para añadir un señalador aquí botaniamisc.ratio=%s:1 Ratio botaniamisc.bottleTooltip=Ha adquirido gusto -botaniamisc.coarseDirt0=Coarse Dirt, grass -botaniamisc.coarseDirt1=won't grow on it botaniamisc.spawnerTip=Tip: Usa un huevo de spawn para cambiar el mob botaniamisc.shardLevel=Shard Power %s botaniamisc.lexiconIndex=Índice del Lexicon -botaniamisc.hasIvy=Has Timeless Ivy # COLORS botania.color0=Blanco @@ -77,14 +74,6 @@ botania.color14=Rojo botania.color15=Negro botania.color16=Arco Iris -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # WINGS botania.wings0=No Wings botania.wings1=Wings: Flügel @@ -95,68 +84,15 @@ botania.wings5=Wings: Princesa de la Nieve Negra botania.wings6=Wings: Amo del Pozo botania.wings7=Wings: Sylph -# ROMAN NUMERALS -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX - # KNOWLEDGE botania.knowledge.minecraft=Conocimiento Minecraftiano botania.knowledge.alfheim=Conocimiento &aÉlfico&7 # CONFIGURATION blockBreakingParticles.enabled=Partículas al Romper Bloques -blockBreakingParticlesTool.enabled=Tool Block Break Particles -boundBlock.wireframe.enabled=Bound Block Wireframe -darkQuartz.enabled=Enable Smokey Quatrz -fallenKanade.enabled=Enable Fallen Kanade -manaEnchanter.enabled=Enable Mana Enchanter -flower.forceCheck=Flower Force Checking -enderPickpocket.enabled=Enable Ender Pickpocketting -thermalily.obsidian=Thermalily Needs Obsidian -passiveWither.time=Passive Wither Time -flowerParticles.frequency=Flower Particle Frequency -lexicon.enable.rotatingItems=Lexicon Rotating Items -lexicon.render.3D=3D Lexicon Render -powerSystem.subtle=Use Subtle Power System -pylonModel.old=Use Old Pylon Model -elfPortal.particles.enabled=Enable Portal Particles -chargeAnimation.enabled=Charging Animation Enabled -vanillaParticleConfig.enabled=Use Vanilla Particle Config -flowerTextures.alt=Alternate Flower Textures -matrixMode.enabled=Enable Matrix Mode -references.enabled=Enable Tooltip References -shaders.enabled=Enable Shader Usage -spreader.posShift=Spreader Pos Shift versionChecking.enabled=Permitir comprobar la versión -wandBeam.static=Enable Static Wand Beam worldgen.flower.density=Densidad de las Flores al Generar el Mundo worldgen.flower.quantity=Cantidad de Flores al Generar el Mundo -shedRate.chicken=Shed Rate: Chicken -shedRate.squid=Shed Rate: Squid -shedRate.villager=Shed Rate: Villager -shedRate.spider=Shed Rate: Spider -shedRate.blaze=Shed Rate: Blaze -shedRate.ghast=Shed Rate: Ghast -shedRate.skeleton=Shed Rate: Skeleton -shedRate.slime=Shed Rate: Slime # VERSION CHECKING botania.versioning.flavour0=NANI SORE!? BOTANIA ESTÁ DESACTUALIZADO!? @@ -210,15 +146,6 @@ botania.baubletype.ring=Equipable en el slot para &aAnillos&7 botania.baubletype.belt=Equipable en el slot para &acinturón&7 botania.baubletooltip=Oprime la &b%s&7 para abrir el menú de Baubles -# ENTITY NAMES -entity.Botania.botania:manaBurst.name=Mana Burst -entity.Botania.botania:signalFlare.name=Signal Flare -entity.Botania.botania:pixie.name=Pixie -entity.Botania.botania:flameRing.name=Flame Ring -entity.Botania.botania:vineBall.name=Vine Ball -entity.Botania.botania:doppleganger.name=Guardian of Gaia -entity.Botania.botania:magicLandmine.name=Gaia Trap - # BLOCK NAMES tile.botania:flower0.name=Flor Mística Blanca tile.botania:flower1.name=Flor Mística Naranja @@ -299,1364 +226,6 @@ tile.botania:enchanter.name=Encantador de Maná tile.botania:turntable.name=Spreader Turntable tile.botania:tinyPlanetBlock.name=Planeta Diminuto tile.botania:alchemyCatalyst.name=Catalizador Alquímico -tile.botania:openCrate0.name=Open Crate -tile.botania:openCrate1.name=Crafty Crate -tile.botania:forestEye.name=Eye of the Ancients tile.botania:storage0.name=Bloque de Acero de Maná tile.botania:storage1.name=Bloque de Acero de la Tierra -tile.botania:storage2.name=Bloque de Elementium -tile.botania:forestDrum0.name=Drum of the Wild -tile.botania:forestDrum1.name=Drum of the Gathering -tile.botania:shinyFlower0.name=Glimmering White Flower -tile.botania:shinyFlower1.name=Glimmering Orange Flower -tile.botania:shinyFlower2.name=Glimmering Magenta Flower -tile.botania:shinyFlower3.name=Glimmering Light Blue Flower -tile.botania:shinyFlower4.name=Glimmering Yellow Flower -tile.botania:shinyFlower5.name=Glimmering Lime Flower -tile.botania:shinyFlower6.name=Glimmering Pink Flower -tile.botania:shinyFlower7.name=Glimmering Gray Flower -tile.botania:shinyFlower8.name=Glimmering Light Gray Flower -tile.botania:shinyFlower9.name=Glimmering Cyan Flower -tile.botania:shinyFlower10.name=Glimmering Purple Flower -tile.botania:shinyFlower11.name=Glimmering Blue Flower -tile.botania:shinyFlower12.name=Glimmering Brown Flower -tile.botania:shinyFlower13.name=Glimmering Green Flower -tile.botania:shinyFlower14.name=Glimmering Red Flower -tile.botania:shinyFlower15.name=Glimmering Black Flower -tile.botania:platform0.name=Abstruse Platform -tile.botania:platform1.name=Spectral Platform -tile.botania:platform2.name=Infrangible Platform -tile.botania:alfheimPortal.name=Elven Gateway Core -tile.botania:blockDarkQuartz.name=Block of Smokey Quartz -tile.botania:chiseledDarkQuartz.name=Chiseled Smokey Quartz Block -tile.botania:pillarDarkQuartz.name=Pillar Smokey Quartz Block -tile.botania:quartzSlabDarkHalf.name=Smokey Quartz Slab -tile.botania:quartzStairsDark.name=Smokey Quartz Stairs -tile.botania:blockManaQuartz.name=Block of Mana Quartz -tile.botania:chiseledManaQuartz.name=Chiseled Mana Quartz Block -tile.botania:pillarManaQuartz.name=Pillar Mana Quartz Block -tile.botania:quartzSlabManaHalf.name=Mana Quartz Slab -tile.botania:quartzStairsMana.name=Mana Quartz Stairs -tile.botania:blockBlazeQuartz.name=Block of Blaze Quartz -tile.botania:chiseledBlazeQuartz.name=Chiseled Blaze Quartz Block -tile.botania:pillarBlazeQuartz.name=Pillar Blaze Quartz Block -tile.botania:quartzSlabBlazeHalf.name=Blaze Quartz Slab -tile.botania:quartzStairsBlaze.name=Blaze Quartz Stairs -tile.botania:blockLavenderQuartz.name=Block of Lavender Quartz -tile.botania:chiseledLavenderQuartz.name=Chiseled Lavender Quartz Block -tile.botania:pillarLavenderQuartz.name=Pillar Lavender Quartz Block -tile.botania:quartzSlabLavenderHalf.name=Lavender Quartz Slab -tile.botania:quartzStairsLavender.name=Lavender Quartz Stairs -tile.botania:blockRedQuartz.name=Block of Redquartz -tile.botania:chiseledRedQuartz.name=Chiseled Redquartz Block -tile.botania:pillarRedQuartz.name=Pillar Redquartz Block -tile.botania:quartzSlabRedHalf.name=Redquartz Slab -tile.botania:quartzStairsRed.name=Redquartz Stairs -tile.botania:blockElfQuartz.name=Block of Elven Quartz -tile.botania:chiseledElfQuartz.name=Chiseled Elven Quartz Block -tile.botania:pillarElfQuartz.name=Pillar Elven Quartz Block -tile.botania:quartzSlabElfHalf.name=Elven Quartz Slab -tile.botania:quartzStairsElf.name=Elven Quartz Stairs -tile.botania:dreamwood0.name=Dreamwood -tile.botania:dreamwood1.name=Dreamwood Planks -tile.botania:dreamwood2.name=Mossy Dreamwood Planks -tile.botania:dreamwood3.name=Framed Dreamwood -tile.botania:dreamwood4.name=Pattern Framed Dreamwood -tile.botania:dreamwood5.name=Glimmering Dreamwood -tile.botania:livingwood0Stairs.name=Livingwood Stairs -tile.botania:livingwood0Slab.name=Livingwood Slab -tile.botania:livingwood1Stairs.name=Livingwood Plank Stairs -tile.botania:livingwood1Slab.name=Livingwood Plank Slab -tile.botania:livingrock0Stairs.name=Livingrock Stairs -tile.botania:livingrock0Slab.name=Livingrock Slab -tile.botania:livingrock1Stairs.name=Livingrock Brick Stairs -tile.botania:livingrock1Slab.name=Livingrock Brick Slab -tile.botania:dreamwood0Stairs.name=Dreamwood Stairs -tile.botania:dreamwood0Slab.name=Dreamwood Slab -tile.botania:dreamwood1Stairs.name=Dreamwood Plank Stairs -tile.botania:dreamwood1Slab.name=Dreamwood Plank Slab -tile.botania:conjurationCatalyst.name=Conjuration Catalyst -tile.botania:prismarine0.name=Prismarine -tile.botania:prismarine1.name=Prismarine Bricks -tile.botania:prismarine2.name=Dark Prismarine -tile.botania:prismarine0Stairs.name=Prismarine Stairs -tile.botania:prismarine0Slab.name=Prismarine Slab -tile.botania:prismarine1Stairs.name=Prismarine Brick Stairs -tile.botania:prismarine1Slab.name=Prismarine Brick Slab -tile.botania:prismarine2Stairs.name=Dark Prismarine Stairs -tile.botania:prismarine2Slab.name=Dark Prismarine Slab -tile.botania:seaLamp.name=Sea Lantern -tile.botania:miniIsland0.name=Floating White Flower -tile.botania:miniIsland1.name=Floating Orange Flower -tile.botania:miniIsland2.name=Floating Magenta Flower -tile.botania:miniIsland3.name=Floating Light Blue Flower -tile.botania:miniIsland4.name=Floating Yellow Flower -tile.botania:miniIsland5.name=Floating Lime Flower -tile.botania:miniIsland6.name=Floating Pink Flower -tile.botania:miniIsland7.name=Floating Gray Flower -tile.botania:miniIsland8.name=Floating Light Gray Flower -tile.botania:miniIsland9.name=Floating Cyan Flower -tile.botania:miniIsland10.name=Floating Purple Flower -tile.botania:miniIsland11.name=Floating Blue Flower -tile.botania:miniIsland12.name=Floating Brown Flower -tile.botania:miniIsland13.name=Floating Green Flower -tile.botania:miniIsland14.name=Floating Red Flower -tile.botania:miniIsland15.name=Floating Black Flower -tile.botania:tinyPotato.name=Tiny Potato -tile.botania:spawnerClaw.name=Life Imbuer -tile.botania:reedBlock.name=Reed Block -tile.botania:reedBlock0Stairs.name=Reed Stairs -tile.botania:reedBlock0Slab.name=Reed Slab -tile.botania:thatch.name=Thatch -tile.botania:thatch0Stairs.name=Thatch Stairs -tile.botania:thatch0Slab.name=Thatch Slab -tile.botania:customBrick0.name=Hellish Brick -tile.botania:customBrick1.name=Soul Brick -tile.botania:customBrick2.name=Frosty Brick -tile.botania:customBrick3.name=Roof Tile -tile.botania:customBrick0Stairs.name=Hellish Brick Stairs -tile.botania:customBrick1Stairs.name=Soul Brick Stairs -tile.botania:customBrick2Stairs.name=Frosty Brick Stairs -tile.botania:customBrick3Stairs.name=Roof Tile Stairs -tile.botania:customBrick0Slab.name=Hellish Brick Slab -tile.botania:customBrick1Slab.name=Soul Brick Slab -tile.botania:customBrick2Slab.name=Frosty Brick Slab -tile.botania:customBrick3Slab.name=Roof Tile Slab -tile.botania:customBrick4.name=Azulejo -tile.botania:customBrick5.name=Azulejo -tile.botania:customBrick6.name=Azulejo -tile.botania:customBrick7.name=Azulejo -tile.botania:customBrick8.name=Azulejo -tile.botania:customBrick9.name=Azulejo -tile.botania:customBrick10.name=Azulejo -tile.botania:customBrick11.name=Azulejo -tile.botania:customBrick12.name=Azulejo -tile.botania:customBrick13.name=Azulejo -tile.botania:customBrick14.name=Azulejo -tile.botania:customBrick15.name=Azulejo -tile.botania:enderEyeBlock.name=Ender Overseer -tile.botania:starfield.name=Starfield Creator -tile.botania:rfGenerator.name=Mana Fluxfield -tile.botania:elfGlass.name=Alfglass - -# FLOWER NAMES -tile.botania:flower..name=Botania Flower -# ^ This is the placeholder name for when no flower type is detected -# The two dots are not a typo -tile.botania:flower..reference=If you have this, it means something went wrong, you should report it - -tile.botania:flower.puredaisy.name=Pure Daisy -tile.botania:flower.puredaisy.reference=What color do you want to be? -tile.botania:flower.manastar.name=Manastar -tile.botania:flower.manastar.reference=Wish upon a star - -# - GENERATING -tile.botania:flower.daybloom.name=Daybloom -tile.botania:flower.daybloom.reference=A Sting of light -tile.botania:flower.endoflame.name=Endoflame -tile.botania:flower.endoflame.reference=A flame like Shana -tile.botania:flower.hydroangeas.name=Hydroangeas -tile.botania:flower.hydroangeas.reference=Just friendly crustaceans -tile.botania:flower.thermalily.name=Thermalily -tile.botania:flower.thermalily.reference=A Scarlet Rose indeed -tile.botania:flower.nightshade.name=Nightshade -tile.botania:flower.nightshade.reference=Ghastly signature -tile.botania:flower.arcanerose.name=Rosa Arcana -tile.botania:flower.arcanerose.reference=Ten blue orbs in the corner -tile.botania:flower.munchdew.name=Munchdew -tile.botania:flower.munchdew.reference=Nommy nommy the art teacher -tile.botania:flower.entropinnyum.name=Entropinnyum -tile.botania:flower.entropinnyum.reference=Magical girls are an option -tile.botania:flower.kekimurus.name=Kekimurus -tile.botania:flower.kekimurus.reference=This flower is a lie -tile.botania:flower.gourmaryllis.name=Gourmaryllis -tile.botania:flower.gourmaryllis.reference=Fuyukai Desu - -# - FUNCTIONAL -tile.botania:flower.bellethorn.name=Bellethorne -tile.botania:flower.bellethorn.reference=killy killy JOKER -tile.botania:flower.dreadthorn.name=Dreadthorne -tile.botania:flower.dreadthorn.reference=Plan C -tile.botania:flower.heiseiDream.name=Heisei Dream -tile.botania:flower.heiseiDream.reference=Heisei heisei kowarete -tile.botania:flower.tigerseye.name=Tigerseye -tile.botania:flower.tigerseye.reference=The palmtop tiger -tile.botania:flower.jadedAmaranthus.name=Jaded Amaranthus -tile.botania:flower.jadedAmaranthus.reference=A couple died for this -tile.botania:flower.orechid.name=Orechid -tile.botania:flower.orechid.reference=I seed what you did there -tile.botania:flower.fallenKanade.name=Fallen Kanade -tile.botania:flower.fallenKanade.reference=I'm not an Angel -tile.botania:flower.exoflame.name=Exoflame -tile.botania:flower.exoflame.reference=Wearing her black ribbons -tile.botania:flower.agricarnation.name=Agricarnation -tile.botania:flower.agricarnation.reference=Wear on the 25th of april -tile.botania:flower.hopperhock.name=Hopperhock -tile.botania:flower.hopperhock.reference=It all funnels into it -tile.botania:flower.tangleberrie.name=Tangleberrie -tile.botania:flower.tangleberrie.reference=No frying pans allowed -tile.botania:flower.jiyuulia.name=Jiyuulia -tile.botania:flower.jiyuulia.reference=Flügel der Freiheit -tile.botania:flower.rannuncarpus.name=Rannuncarpus -tile.botania:flower.rannuncarpus.reference=That's handy -tile.botania:flower.hyacidus.name=Hyacidus -tile.botania:flower.hyacidus.reference=If you don't walk, it doesn't hurt -tile.botania:flower.pollidisiac.name=Pollidisiac -tile.botania:flower.pollidisiac.reference=Birds and bees -tile.botania:flower.clayconia.name=Clayconia -tile.botania:flower.clayconia.reference=Rupees not included -tile.botania:flower.loonium.name=Loonium -tile.botania:flower.loonium.reference=Hold it up above your head -tile.botania:flower.daffomill.name=Daffomill -tile.botania:flower.daffomill.reference=Cook's Assistant -tile.botania:flower.vinculotus.name=Vinculotus -tile.botania:flower.vinculotus.reference=Totally an Extra Utils ripoff - -# ITEM NAMES -item.botania:lexicon.name=Lexica Botania -item.botania:lexicon.bevo=Lexica Botana -item.botania:lexicon.saice=Lexica Botonia -item.botania:petal0.name=Mystical White Petal -item.botania:petal1.name=Mystical Orange Petal -item.botania:petal2.name=Mystical Magenta Petal -item.botania:petal3.name=Mystical Light Blue Petal -item.botania:petal4.name=Mystical Yellow Petal -item.botania:petal5.name=Mystical Lime Petal -item.botania:petal6.name=Mystical Pink Petal -item.botania:petal7.name=Mystical Gray Petal -item.botania:petal8.name=Mystical Light Gray Petal -item.botania:petal9.name=Mystical Cyan Petal -item.botania:petal10.name=Mystical Purple Petal -item.botania:petal11.name=Mystical Blue Petal -item.botania:petal12.name=Mystical Brown Petal -item.botania:petal13.name=Mystical Green Petal -item.botania:petal14.name=Mystical Red Petal -item.botania:petal15.name=Mystical Black Petal -item.botania:dye0.name=Floral White Powder -item.botania:dye1.name=Floral Orange Powder -item.botania:dye2.name=Floral Magenta Powder -item.botania:dye3.name=Floral Light Blue Powder -item.botania:dye4.name=Floral Yellow Powder -item.botania:dye5.name=Floral Lime Powder -item.botania:dye6.name=Floral Pink Powder -item.botania:dye7.name=Floral Gray Powder -item.botania:dye8.name=Floral Light Gray Powder -item.botania:dye9.name=Floral Cyan Powder -item.botania:dye10.name=Floral Purple Powder -item.botania:dye11.name=Floral Blue Powder -item.botania:dye12.name=Floral Brown Powder -item.botania:dye13.name=Floral Green Powder -item.botania:dye14.name=Floral Red Powder -item.botania:dye15.name=Floral Black Powder -item.botania:pestleAndMortar.name=Pestle and Mortar -item.botania:twigWand.name=Wand of the Forest -item.botania:manasteel.name=Manasteel Ingot -item.botania:manaPearl.name=Mana Pearl -item.botania:manaDiamond.name=Mana Diamond -item.botania:lensNormal.name=Mana Lens -item.botania:lensSpeed.name=Mana Lens: Velocity -item.botania:lensSpeed.short=Velocity -item.botania:lensPower.name=Mana Lens: Potency -item.botania:lensPower.short=Potency -item.botania:lensTime.name=Mana Lens: Resistance -item.botania:lensTime.short=Resistance -item.botania:lensEfficiency.name=Mana Lens: Efficiency -item.botania:lensEfficiency.short=Efficiency -item.botania:lensBounce.name=Mana Lens: Bounce -item.botania:lensBounce.short=Bounce -item.botania:lensGravity.name=Mana Lens: Gravity -item.botania:lensGravity.short=Gravity -item.botania:lensMine.name=Mana Lens: Bore -item.botania:lensMine.short=Bore -item.botania:lensDamage.name=Mana Lens: Damaging -item.botania:lensDamage.short=Damaging -item.botania:lensPhantom.name=Mana Lens: Phantom -item.botania:lensPhantom.short=Phantom -item.botania:lensMagnet.name=Mana Lens: Magnetizing -item.botania:lensMagnet.short=Magnetizing -item.botania:lensExplosive.name=Mana Lens: Entropic -item.botania:lensExplosive.short=Entropic -item.botania:lensInfluence.name=Mana Lens: Influence -item.botania:lensInfluence.short=Influence -item.botania:lensWeight.name=Mana Lens: Weight -item.botania:lensWeight.short=Weight -item.botania:lensPaint.name=Mana Lens: Paintslinger -item.botania:lensPaint.short=Paintslinger -item.botania:lensFire.name=Mana Lens: Kindle -item.botania:lensFire.short=Kindle -item.botania:lensPiston.name=Mana Lens: Force -item.botania:lensPiston.short=Force -item.botania:manaPetal0.name=White Mana Petal -item.botania:manaPetal1.name=Orange Mana Petal -item.botania:manaPetal2.name=Magenta Mana Petal -item.botania:manaPetal3.name=Light Blue Mana Petal -item.botania:manaPetal4.name=Yellow Mana Petal -item.botania:manaPetal5.name=Lime Mana Petal -item.botania:manaPetal6.name=Pink Mana Petal -item.botania:manaPetal7.name=Gray Mana Petal -item.botania:manaPetal8.name=Light Gray Mana Petal -item.botania:manaPetal9.name=Cyan Mana Petal -item.botania:manaPetal10.name=Purple Mana Petal -item.botania:manaPetal11.name=Blue Mana Petal -item.botania:manaPetal12.name=Brown Mana Petal -item.botania:manaPetal13.name=Green Mana Petal -item.botania:manaPetal14.name=Red Mana Petal -item.botania:manaPetal15.name=Black Mana Petal -item.botania:rune0.name=Rune of Water -item.botania:rune1.name=Rune of Fire -item.botania:rune2.name=Rune of Earth -item.botania:rune3.name=Rune of Air -item.botania:rune4.name=Rune of Spring -item.botania:rune5.name=Rune of Summer -item.botania:rune6.name=Rune of Autumn -item.botania:rune7.name=Rune of Winter -item.botania:rune8.name=Rune of Mana -item.botania:rune9.name=Rune of Lust -item.botania:rune10.name=Rune of Gluttony -item.botania:rune11.name=Rune of Greed -item.botania:rune12.name=Rune of Sloth -item.botania:rune13.name=Rune of Wrath -item.botania:rune14.name=Rune of Envy -item.botania:rune15.name=Rune of Pride -item.botania:signalFlare.name=Signal Flare -item.botania:manaTablet.name=Mana Tablet -item.botania:manaGun.name=Mana Blaster -item.botania:compositeLens.name=Composite Mana Lens: %s %s -item.botania:manaCookie.name=Mana Cookie -item.botania:fertilizer.name=Floral Fertilizer -item.botania:grassSeeds0.name=Pasture Seeds -item.botania:grassSeeds1.name=Boreal Seeds -item.botania:grassSeeds2.name=Infestation Spores -item.botania:livingwoodTwig.name=Livingwood Twig -item.botania:dirtRod.name=Rod of the Lands -item.botania:terraformRod.name=Terra Firma Rod -item.botania:manaMirror.name=Mana Mirror -item.botania:manasteelHelm.name=Manasteel Helmet -item.botania:manasteelChest.name=Manasteel Chestplate -item.botania:manasteelLegs.name=Manasteel Leggings -item.botania:manasteelBoots.name=Manasteel Boots -item.botania:manasteelPick.name=Manasteel Pickaxe -item.botania:manasteelShovel.name=Manasteel Shovel -item.botania:manasteelAxe.name=Manasteel Axe -item.botania:manasteelSword.name=Manasteel Sword -item.botania:manasteelShears.name=Manasteel Shears -item.botania:grassHorn0.name=Horn of the Wild -item.botania:grassHorn1.name=Horn of the Canopy -item.botania:terrasteel.name=Terrasteel Ingot -item.botania:terrasteelHelm.name=Terrasteel Helmet -item.botania:terrasteelChest.name=Terrasteel Chestplate -item.botania:terrasteelLegs.name=Terrasteel Leggings -item.botania:terrasteelBoots.name=Terrasteel Boots -item.botania:terraSword.name=Terra Blade -item.botania:tinyPlanet.name=Tiny Planet -item.botania:manaRing.name=Band of Mana -item.botania:auraRing.name=Band of Aura -item.botania:manaRingGreater.name=Greater Band of Mana -item.botania:auraRingGreater.name=Greater Band of Aura -item.botania:travelBelt.name=Soujourner's Sash -item.botania:knockbackBelt.name=Tectonic Girdle -item.botania:icePendant.name=Snowflake Pendant -item.botania:lavaPendant.name=Pyroclast Pendant -item.botania:lifeEssence.name=Gaia Spirit -item.botania:goldenLaurel.name=Golden Laurel Crown -item.botania:redstoneRoot.name=Redstone Root -item.botania:magnetRing.name=Ring of Magnetization -item.botania:waterRing.name=Ring of Chordata -item.botania:miningRing.name=Ring of the Mantle -item.botania:reachRing.name=Ring of Far Reach -item.botania:terraPick.name=Terra Shatterer -item.botania:divaCharm.name=Charm of the Diva -item.botania:flightTiara.name=Flügel Tiara -item.botania:enderDagger.name=Soulscribe -item.botania:quartz0.name=Smokey Quartz -item.botania:quartz1.name=Mana Quartz -item.botania:quartz2.name=Blaze Quartz -item.botania:quartz3.name=Lavender Quartz -item.botania:quartz4.name=Redquartz -item.botania:quartz5.name=Elven Quartz -item.botania:elementium.name=Elementium Ingot -item.botania:pixieDust.name=Pixie Dust -item.botania:dragonstone.name=Dragonstone -item.botania:waterRod.name=Rod of the Seas -item.botania:elementiumHelm.name=Elementium Helmet -item.botania:elementiumChest.name=Elementium Chestplate -item.botania:elementiumLegs.name=Elementium Leggings -item.botania:elementiumBoots.name=Elementium Boots -item.botania:elementiumPick.name=Elementium Pickaxe -item.botania:elementiumShovel.name=Elementium Shovel -item.botania:elementiumAxe.name=Elementium Axe -item.botania:elementiumSword.name=Elementium Sword -item.botania:elementiumShears.name=Elementium Shears -item.botania:openBucket.name=Extrapolated Bucket -item.botania:spawnerMover.name=Life Aggregator -item.botania:pixieRing.name=Great Fairy Ring -item.botania:superTravelBelt.name=Globetrotter's Sash -item.botania:rainbowRod.name=Rod of Bifrost -item.botania:tornadoRod.name=Rod of the Skies -item.botania:fireRod.name=Rod of the Hells -item.botania:vineBall.name=Vine Ball -item.botania:slingshot.name=Livingwood Slingshot -item.botania:manaBottle.name=Mana in a Bottle -item.botania:prismarineShard.name=Prismarine Shard -item.botania:laputaShard.name=Shard of Laputa -item.botania:virus0.name=Necrodermal Virus -item.botania:virus1.name=Nullodermal Virus -item.botania:skyDirtRod.name=Rod of the Highlands -item.botania:placeholder.name=Crafting Placeholder -item.botania:manasteelHelmReveal.name=Manasteel Helmet of Revealing -item.botania:terrasteelHelmReveal.name=Terrasteel Helmet of Revealing -item.botania:elementiumHelmReveal.name=Elementium Helmet of Revealing -item.botania:itemFinder.name=The Spectator -item.botania:superLavaPendant.name=Crimson Pendant -item.botania:enderHand.name=Hand of Ender -item.botania:glassPick.name=Vitreous Pickaxe -item.botania:spark.name=Spark -item.botania:sparkUpgrade0.name=Spark Augment: Dispersive -item.botania:sparkUpgrade1.name=Spark Augment: Dominant -item.botania:sparkUpgrade2.name=Spark Augment: Recessive -item.botania:sparkUpgrade3.name=Spark Augment: Isolated -item.botania:diviningRod.name=Rod of Divining -item.botania:gravityRod.name=Rod of the Black Mesa -item.botania:regenIvy.name=Timeless Ivy - -# GUI TEXT -botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents -botania.gui.lexicon.wip=(This entry is a Work In Progress. It's not even its final form) - -# LEXICON CATEGORIES -botania.category.basics=Basics and Mechanics -botania.category.mana=Mana Manipulation -botania.category.functionalFlowers=Functional Flora -botania.category.generationFlowers=Generating Flora -botania.category.devices=Natural Apparatus -botania.category.tools=Mystical Items -botania.category.baubles=Baubles and Acessories -botania.category.alfhomancy=Alfhomancy -botania.category.misc=Miscellaneous - -# LEXICON ENTRIES - -# - BASIC -# -- AN INTRODUCTORY CLIP -botania.entry.introVideo=An Introductory Clip -botania.page.introVideo0=For those readers who are not quite readers, a short video guide covering the basics of Botania is also available. It's to keep in note that this guide acts as an aid and not a substitution for the contents of the &1Lexica Botania&0.
    To watch this video simply press the &4ENTER&0 key. - -# -- LEXICA BOTANIA -botania.entry.lexicon=Lexica Botania -botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botany related matters. But you probably knew that already.
    All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry. -botania.page.lexicon3=Any entries typed in &oItalics&r are &4basic&0 entries, which contain the very basic knowledge required to playing Botania. They should be prioritized over others, most of the sections contain one or more, so a good look through through them is a good idea. -botania.page.lexicon1=Crafting the &1Lexica Botania&0. -botania.page.lexicon2=The &1Lexica Botania&0's title can also be customized. By placing it in an &1Anvil&0 and renaming it, one can not only change its cover, but also the title.
    The Edition of the lexica shown equates to the version of the &4Botania&0 you're running, and no, I don't care about the fourth wall. - -# -- MYSTICAL FLOWERS -botania.entry.flowers=Mystical Flowers -botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
    They come in a total of &416 &0different colors.
    It's also possible to grow these flowers using &1Floral Fertlizer&0 (read on). -botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
    Right clicking a petal on the ground will &4bury it&0, having it emit particles.
    These petals can also be crushed into &1Floral Powder&0, which functions much alike any mundane piece of dye. -botania.page.flowers3=Plucking Petals off Flowers. -botania.page.flowers4=Crafting the &1Pestle and Mortar&0. -botania.page.flowers5=Grinding Petals into Powder. -botania.page.flowers6=Right clicking the &1Floral Powder&0 in any &1Wool&0 or &1Carpet&0 changes its color to the color of the powder.
    By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertlizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vicinity, if you ever run low on them. -botania.page.flowers7=Making fertilizer (any powder colors work) -botania.page.flowers8=Using typical flower substances also works - -# -- PETAL APOTHECARY -botania.entry.apothecary=Petal Apothecary -botania.page.apothecary0=In order for a botanist to create plantlife that can do its bidding, one would need special means of infusing plants with mystical energy.
    Luckily, the &1Petal Apothecary&0 does just that. -botania.page.apothecary1=The &1Petal Apothecary&0. -botania.page.apothecary2=This block, when placed in the world and given some water (by use of a &1Water Bucket&0), will accept any &1Mystical Petals&0 thrown at it, releasing their energies.
    Once one has set the correct petals in, throwing some &1Seeds&0 in will finalize the proccess.
    Tossing in the full bucket will also fill the recipient with water. -botania.page.apothecary3=Quite a few plants can be made using this method, for more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon.
    Shift-right clicking the &1Petal Apothecary&0 with an empty hand will remove the last item thrown in.
    Lastly, tossing in &1Vines&0 also gives the block an overgrown visual. -botania.page.apothecary4=Crafting the &1Petal Apothecary&0. - -# -- PURE DAISY -botania.entry.pureDaisy=Pure Daisy -botania.page.pureDaisy0=The &1Pure Daisy&0 is not only the most basic, but also the most important flower a botanist can have.
    This flower will purify any adjacent &1Wood&0 and &1Stone&0 blocks, as seen on the next page, into their purified counterparts, &1Livingwood&0 and &1Livingrock&0, which can be used for crafting. -botania.page.pureDaisy1=Just give it &4a minute&0 or so... -botania.page.pureDaisy2=&1Livingwood&0 can be turned into twigs -botania.page.pureDaisy3=White is bright and pure - -# -- WAND OF THE FOREST -botania.entry.wand=Wand of the Forest -botania.page.wand0=The general multi-use tool for a botanist is the &1Wand of the Forest&0.
    This wand, made by, effectively, strapping a pair of &1Mystical Petals&0 of any color to a few &1Livingwood Twigs&0, is required for a good amount of tasks. -botania.page.wand1=The wand can be bound to &1Mana Spreaders&0 by shift-right clicking them, and unbound via the same task. If the wand isn't bound to anything, shift-right clicking a block allows it to be rotated around the axis of the side it's clicked on.
    For example, clicking on the top of a &1Chest&0 rotates it around. Most blocks which can be rotated should work. -botania.page.wand2=The petals used determine the colors of the wand - -# -- RUNIC ALTAR -botania.entry.runeAltar=Runic Altar -botania.page.runeAltar21=Runic creation is a rather important complex in the advancement of the botanical magics. First and foremost, though, this type of crafting requires a decent knowledge of &4Mana Manipulation&0. Before proceeding further, a read through the important entries (those in &oItalics&r) on that section of the &1Lexica Botania&0 might prove enlightening. -botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one would require a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by linking a &1Mana Spreader&0 to the altar, and right click it with a &1Wand of the Forest&0.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it and use the wand on it again to collect your rune. -botania.page.runeAltar2=Crafting the &1Runic Altar&0. -botania.page.runeAltar3=A total of 16 &1Runes&0 exist.
    The most basic and elementary runes are named after the &4Four Elements&0. The intermediate runes are named after the &4Four Seasons&0, and the most advanced runes are named after the &4Seven Deadly Sins&0. A separate &1Rune of Mana&0 also exists. -botania.page.runeAltar20=Sneaking and right-clicking the &1Runic Altar&0 with an empty hand while it's not accepting mana will remove the last item put into it.
    Last but not least, attaching a &1Comparator&0 to it will emit signal strength &41&0 if the altar is accepting &4Mana&0 and signal strength &42&0 if it's ready to craft the rune. -botania.page.runeAltar4=The &1Rune of Water&0. -botania.page.runeAltar5=The &1Rune of Earth&0. -botania.page.runeAltar6=The &1Rune of Air&0. -botania.page.runeAltar7=The &1Rune of Fire&0. -botania.page.runeAltar8=The &1Rune of Spring&0. -botania.page.runeAltar9=The &1Rune of Summer&0. -botania.page.runeAltar10=The &1Rune of Autumn&0. -botania.page.runeAltar11=The &1Rune of Winter&0. -botania.page.runeAltar12=The &1Rune of Mana&0. -botania.page.runeAltar13=The &1Rune of Lust&0. -botania.page.runeAltar14=The &1Rune of Gluttony&0. -botania.page.runeAltar15=The &1Rune of Greed&0. -botania.page.runeAltar16=The &1Rune of Sloth&0. -botania.page.runeAltar17=The &1Rune of Wrath&0. -botania.page.runeAltar18=The &1Rune of Envy&0. -botania.page.runeAltar19=The &1Rune of Pride&0. - -# -- TERRASTEEL -botania.entry.terrasteel=Terrasteel -botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.
    Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0. -botania.page.terrasteel1=Creating &1Terrasteel&0 - -# -- WRAP -botania.entry.wrap=Wrap -botania.page.wrap0=It seems like the creator of this mod decided to add a weird game mechanic in the form of &1Wrap&0. I don't really know what it does, probably something bad. :/
    What's that "Fourth Wall" you're talking about...? - -# - MANA -# -- AN INTRODUCTION TO MANA -botania.entry.mIntro=An Introduction to Mana -botania.page.mIntro0=&4Mana&0 is an ethereal substance. In layman's terms, it is a form of &4mystical energy&0. Its sensorial existence is inconstant, and its color depends on the environment its put in.
    Mastering &4Mana&0 is one of the most important skills a botanist needs to master. -botania.page.mIntro1=In order to create &4Mana&0, one would require a set of &4Generating Flowers&0 (read the respective section). This &4Mana&0 can be dispersed by utilizing &1Mana Spreaders&0 and stored in &1Mana Pools&0. &4Mana&0 can be used for a myriad of different things. For starters, it can be used for &4Functional Flowers&0 (read the respective section). -botania.page.mIntro2=To get started with mastering the art of &4Mana&0, one would start by learning how to use &1Dayblooms&0, &1Mana Spreaders&0 and &1Mana Pools&0.
    These form a basic infrastructure for mana, which can be used for all sorts of purposes. Have a read at the &4Functional Flora&0 and &4Magical Apparatus&0 sections of this Lexicon. - -# -- MANA SPREADER -botania.entry.spreader=Mana Spreader -botania.page.spreader0=The &1Mana Spreader&0 is the most important component in manipulating &4Mana&0.
    This is the block that allows &4Mana&0 to travel from point A to point B. When this block is placed on the ground, it'll face one of 6 basic directions. By holding shift-right on it with a &1Wand of the Forest&0, one can orient it to the opposite of where it was clicked. -botania.page.spreader10=Simply shift-right clicking once with the &1Wand of the Forest&0 on it once will bind the wand to it, pressing shift-right click elsewhere will orient the spreader to that point.
    Shift-right clicking the spreader again unbinds it from the wand, note that this last step has to be done, else when trying to bind to another spreader, the last one will simply turn towards it instead. -botania.page.spreader1=Holding a &1Wand of the Forest&0 -botania.page.spreader2=The &1Mana Spreader&0 has a small internal buffer of &4Mana&0, which will get filled by nearby &4Generating Flowers&0. This buffer can be viewed by looking at the &1Spreader&0 with a &1Wand of the Forest&0, as demonstrated in the last page.
    Note that the block needs to be right clicked with a wand to get accurate and adequate values. -botania.page.spreader3=Holding a &1Wand of the Forest&0 displays a beam which shows where the spreader is pointing at. Hovering over it shows the target. The sparkle that's always shown is the point when &4Mana loss&0 starts to happen.
    If the target of the spreader is a block that can contain &4Mana&0, and isn't full, the spreader will fire a &4Mana Burst&0, which will travel to the target, and pass the &4Mana&0 along to it. -botania.page.spreader4=The spreader only fires one burst at once, it'll only fire another one when the last one hits the target.
    Furthermore, the bursts also start suffering &4mana loss&0 after a small amount of time. This can be seen in the beam, which becomes a lot thinner when this happens. There is also a small amount of &4mana loss&0 when a beam enters a spreader. -botania.page.spreader11=Applying a &4Redstone Signal&0 to the spreader will have it cease to function. Case better control is required, a &1Redstone Mana Spreader&0 is recommended, as it can fire bursts without a target block and works on redstone pulses. -botania.page.spreader5=Crafting the &1Mana Spreader&0 - -# -- MANA POOL -botania.entry.pool=Mana Pool -botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
    Mana can be inserted into it by usage of a &1Mana Spreader&0, and any adjacent &1Mana Spreaders&0 will pull mana from it to increase their internal buffer automatically.
    Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. -botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 variety which only stores a very small amount of &4Mana&0 and isn't able to infuse items, and a &1Normal&0 variety, which can store as much as a hundred times more than the dilluted one and can infuse items.
    Whenever "Mana Pool" is refered elsewhere for scale, it refers to a normal one. -botania.page.pool1=Making a &1Dilluted Mana Pool&0. -botania.page.pool10=Infusing a normal &1Mana Pool&0 -botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
    A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
    &4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. -botania.page.pool8=For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. -botania.page.pool3=Infusing &1Manasteel&0 -botania.page.pool4=Infusing &1Mana Pearls&0 -botania.page.pool5=Infusing &1Mana Diamonds&0 -botania.page.pool6=Infusing &1Mana Petals&0 -botania.page.pool7=&1Mana Cookies&0 feed you pretty well. - -# -- SPARKS -botania.entry.sparks=Sparks -botania.page.sparks0=&1Sparks&0 are interesting entities. Created from a combination of raw energy and &4Mana&0, they have the ability to be placed on top of a few specific &4Mana&0 containing or accepting blocks, mainly, &1Mana Pools&0.
    Some blocks have the ability to harness &4Mana&0 from &1Sparks&0, but the uses for them seem rather limited right now. -botania.page.sparks1=&oholds up spork&r - -# -- SPARK AUGMENTATION -botania.entry.sparkUpgrades=Spark Agumentation -botania.page.sparkUpgrades0=As it seems, &1Sparks&0 are a bit more versatile than it was known previously. A variety of &1Augments&0 can be applied to them to enhance their abilities. It's to note that Augments can only be applied to &1Sparks&0 that lie on &1Mana Pools&0.
    A &1Spark&0 can only have a single &1Augment&0 at any given time. -botania.page.sparkUpgrades1=Starting off, the &1Dispersive Augment&0 has the &1Spark&0 use up the &4Mana&0 in the pool below, to charge any nearby players' &4Mana&0 containing items. -botania.page.sparkUpgrades2=The &1Dominant Augment&0 will have the &1Spark&0 pull any &4Mana&0 from nearby non-augmented &1Sparks'&0 pools into its own, until it's completely full. -botania.page.sparkUpgrades3=The &1Recessive Augment&0 will have the &1Spark&0 output all of the &4Mana&0 in its pool into any nearby non-augmented or Dispersive &1Sparks'&0 pools until it's completely empty. -botania.page.sparkUpgrades4=Lastly, the &1Isolated Augment&0 will prevent the &1Spark&0 from interacting with any Dominant or Recessive &1Sparks&0, but still allow it to interact with blocks that can receive their &4Mana&0 through the &1Spark&0 network. -botania.page.sparkUpgrades5=Crafting the Aguments - -# -- MANA DISTRIBUTOR -botania.entry.distributor=Mana Distributor -botania.page.distributor0=Any botanist will eventually reach a point where a single &1Mana Pool&0 setup is not enough.
    The &1Mana Distributor&0 will fix all those issues. By placing it adjacently to a few &1Mana Pools&0 on its sides, when it receives &4Mana&0 through &4Mana Bursts&0 it'll equally spread it to the adjacent pools. -botania.page.distributor1=Crafting the distributor - -# -- MANA VOID -botania.entry.manaVoid=Mana Void -botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again.
    Placing one of these under a &1Mana Pool&0 allows the pool to always accept &4Mana&0, but disposing any it can't hold. -botania.page.manaVoid1=Crafting the void block - -# -- MANA FLUXFIELD -botania.entry.rfGenerator=Mana Fluxfield -botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4Redstone Flux&0.
    Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4RF&0. It can then be pulled out with any &4RF&0 transporter. -botania.page.rfGenerator1=The bullet guys. I bit it. - -# -- MANA LENSES -botania.entry.lens=Mana Lenses -botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
    Lenses can be &4dyed&0 all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. -botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dyeing&0 lenses! -botania.page.lens3=&1Rainbow Lens&0 all the way -botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
    It's to take in mind that, if using a normal &1Mana Spreader&0, there needs to be a block that can receive &4Mana&0 at the end for the burst to fire. A &1Redstone Mana Spreader&0 is recommended for some of the lenses. -botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
    The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. -botania.page.lens6=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose its &4Mana&0 a lot faster, it can also carry a bit less. -botania.page.lens7=Velocity Lens -botania.page.lens8=The &1Potency Lens&0 will double the amount of &4Mana&0 a &4Mana Burst&0 can carry, however, the beam becomes slower and after it starts to lose mana it does so at a lot faster rate. -botania.page.lens9=Potency Lens -botania.page.lens10=The &1Resistance Lens&0 will significantly increase the amount of time the &4Mana Burst&0 can go without starting to lose &4Mana&0, but it makes it a a bit slower. -botania.page.lens11=Resistance Lens -botania.page.lens12=The &1Efficiency Lens&0 will decrease the amount of time it takes for the &4Mana Burst&0 to start losing its &4Mana&0, but when that happens, it does so at a lot slower rate. -botania.page.lens13=Efficiency Lens -botania.page.lens14=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. -botania.page.lens15=Bounce Lens -botania.page.lens16=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus moving in an arc. As compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. -botania.page.lens17=Gravity Lens -botania.page.lens18=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact with, draining its own mana to do so. -botania.page.lens19=Bore Lens -botania.page.lens20=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining its own mana to do so. -botania.page.lens21=Damaging Lens -botania.page.lens22=The &1Phantom Lens&0 is an interesting one. By utilizing the &1Abstruse Platform&0 and its' properties, it's possible to make a lens that'll allow the &4Mana Burst&0 to pass through blocks. In doing so, the time it can stay without losing mana is decreased. -botania.page.lens23=Phantom Lens -botania.page.lens24=The &1Magnetizing Lens&0, as its name states, allows the &4Mana Burst&0 to magnetize, or home in, on any nearby blocks that can receive &4Mana&0. Doing so slightly decreases the speed of the burst. -botania.page.lens25=Magnetizing Lens -botania.page.lens26=The &1Entropic Lens&0 imbues the &4Mana Burst&0 with entropy, causing it to release its energy in the form of an explosion when it collides against something that can't receive &4Mana&0. -botania.page.lens27=Entropic Lens -botania.page.lens28=The &1Influence Lens&0 allows the &4Mana Burst&0 to have influence over any nearby &4dropped items&0, &4experience orbs&0 and even &4falling blocks&0, having them move in the exact same vector of motion as the burst itself. -botania.page.lens29=Influence Lens -botania.page.lens30=The &1Weight Lens&0 carries a strong burden on the &4Mana Burst&0, making any block hit by it, if there doesn't happen to be a block below it, fall, similarly to how &1Sand&0 and &1Gravel&0 do. -botania.page.lens31=Weight Lens -botania.page.lens32=The &1Kindle Lens&0 is infused with a burning spark, when it hits a block it'll set it on fire. It has the ability to both ignite and close &1Nether Portals&0. It doesn't seem to set any living beings on fire, though. -botania.page.lens33=Kindle Lens -botania.page.lens34=The &1Force Lens&0 acts as a &1Piston&0, when it hits a block that a piston can move, it'll do just so. -botania.page.lens35=Force Lens - -# -- PORTABLE MANA TRANSPORT -botania.entry.manaTransport=Portable Mana Transport -botania.page.manaTransport0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
    The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself. -botania.page.manaTransport1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
    Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
    Lastly, unlike normal items, these will never despawn when dropped on the floor. -botania.page.manaTransport2=This doesn't run android -botania.page.manaTransport3=It's also possible to indirectly access the &4Mana&0 reserves of a &1Mana Pool&0, through using a &1Mana Mirror&0, items will pull out of the pool itself.
    To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror.
    The mirror can't put mana in or take mana out of pools in any other way. -botania.page.manaTransport4=Mirror mirror on the wall... - -# -- MANA DETECTOR -botania.entry.manaDetector=Mana Detector -botania.page.manaDetector0=A device like the &1Mana Detector&0 is capable to detect when a &4Mana Burst&0 starts flowing through it (the burst doesn't dissipate on collision with this block) and provide a redstone signal when that is the case. -botania.page.manaDetector1=Crafting the detector - -# -- REDSTONE MANA SPREADER -botania.entry.redstoneSpreader=Redstone Mana Spreader -botania.page.redstoneSpreader0=By combining a &1Mana Spreader&0 with a piece of &1Redstone&0, it's possible to create a &1Redstone Mana Spreader&0, which fires only when given a &4Redstone signal&0, regardless of having a block in the end to put the mana or not.
    It's to keep in note that this doesn't let the spreader shoot a burst until the last one dissipates or is absorbed. -botania.page.redstoneSpreader1=Just add redstone - -# -- MANASTAR -botania.entry.manastar=Manastar -botania.page.manastar0=The imprecise measurements of the &1Wand of the Forest&0 sometimes won't cut it for telling if you're turning a profit or loss in your &1Mana Pools&0.
    Creating a &1Manastar&0 and placing it next to your pools will have it shine red if there's a loss or blue if there's a profit. The measurement happens every few seconds. -botania.page.manastar1=&rI'm a shooting star leaping through the skies&r. - -# -- ELVEN MANA SPREADERS -botania.entry.dreamwoodSpreader=Elven Mana Spreaders -botania.page.dreamwoodSpreader0=Simply put, &1Dreamwood&0 conducts &4Mana&0 better than &1Livingwood&0. Add in some adjustments like &1Elementium&0 or &1Mana Petals&0 and what you get is a &1Mana Spreader&0 that can conduct more &4Mana&0, faster and for more time without &4Mana loss&0.
    On the negative side, it can't be turned into a &1Redstone Mana Spreader&0. -botania.page.dreamwoodSpreader1=Better spreaders, that's it -botania.page.dreamwoodSpreader2=By combining this already powerful spreader with a &1Gaia Spirit&0 and a &1Dragonstone&0 gem, one can create an even more potent variant. The &1Gaia Spreader&0 is within the top percentage of Mana Spreaders, with pretty much upgrades all round. -botania.page.dreamwoodSpreader3=ULTRA_SPREADER - -# -- PAINTSLINGER LENS -botania.entry.paintLens=Paintslinger Lens -botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. -botania.page.paintLens1=A M'AIDER Stranded Girl - -# - FUNCTIONAL FLOWERS -# -- AN INTRODUCTION TO FUNCTION -botania.entry.fIntro=An Introduction to Function -botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
    These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
    It's to note that these can't receive power directly through &1Mana Spreaders&0. -botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. -botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. -botania.page.fIntro3=Lastly, some functional flowers utilize a &1Redstone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. -botania.page.fIntro4=&1Redstone Root&0 for Redstone Control - -# -- JADED AMARANTHUS -botania.entry.jadedAmaranthus=Jaded Amaranthus -botania.page.jadedAmaranthus0=Everyone likes flowers right? The &1Jaded Amaranthus&0 is made just for that purpose.
    Feeding it with &4Mana&0 from &1Mana Pools&0 will have it quickly grow new &1Mystical Flowers&0 around it, in any spots it can. -botania.page.jadedAmaranthus1=&oIt was this or clematis.&r - -# -- BELLETHRONE -botania.entry.bellethorne=Bellethorne -botania.page.bellethorne0=The &1Bellethorne&0 is a malevelous flower. By utilizing &4Mana&0 it slowly inflicts harm in any living beings (save for &4players&0) around it. -botania.page.bellethorne1=&oEvery rose has its thorn&r. - -# -- DREADTHORNE -botania.entry.dreadthorne=Dreadthorne -botania.page.dreadthorne0=The &1Dreadthorne&0 is a slightly more specific counterpart to the &1Bellethrorne&0, by which, instead of all mobs around, it'll only hurt &4adult&0 animals and none else. -botania.page.dreadthorne1=&oNo Mr.Bond, I expect you to die&r. - -# -- HEISEI DREAM -botania.entry.heiseiDream=Heisei Dream -botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother. -botania.page.heiseiDream1=&oA pleasant era will murder people&r. - -# -- TIGERSEYE -botania.entry.tigerseye=Tigerseye -botania.page.tigerseye0=It's a known fact that &4Creepers&0 are terrified of &4cats&0.
    The &1Tigerseye&0 exploits that very weakness, by emitting a feline aura, petrifying any nearby &4Creepers&0, preventing them from exploding. It also has the effect of making them run away from &4players&0. -botania.page.tigerseye1=&oRisin' up to the challenge of our rivals&r. - -# -- ORECHID -botania.entry.orechid=Orechid -botania.page.orechid0=While going mining is all good, a renewable means of getting ore is due. The &1Orechid&0 will use (a massive amount of) &4Mana&0 to generate &4ores&0 in nearby &1Stone&0 blocks.
    The ores it generates are random, but seem to be biased towards more common ores rather than rarer ones. -botania.page.orechid1=&oLizbeth would like this flower&r. - -# -- FALLEN KANADE -botania.entry.fallenKanade=Fallen Kanade -botania.page.fallenKanade0=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby. -botania.page.fallenKanade1=&oHand Sonic, version four&r. - -# -- EXOFLAME -botania.entry.exoflame=Exoflame -botania.page.exoflame0=Unlike its generating counterpart, the &1Exoflame&0 utilizes &4Mana&0 with means to generate heat.
    Any &1Furnaces&0 nearby to the &1Exoflame&0 will be fueled, and given an efficiency boost, for the cost of some &4Mana&0. -botania.page.exoflame1=&oBut we should be going nowhere fast&r. - -# -- AGRICARNATION -botania.entry.agricarnation=Agricarnation -botania.page.agricarnation0=The slow growth of crops is always a problem to feed the masses. The &1Agricarnation&0 is a flower that turns &4Mana&0 into a type of natural fertilizer, causing nearby plantlife to grow at a faster rate. -botania.page.agricarnation1=&oGrandola Vila Morena&r... - -# -- HOPPERHOCK -botania.entry.hopperhock=Hopperhock -botania.page.hopperhock0=The &1Hopperhock&0 will pick up items around it. Giving it &4Mana&0 is optional, but it'll increase its range.
    Items picked up will be put in adjacent inventories (e.g. &1Chests&0). Placing &1Item Frames&0 in any of the inventories will specify which items can or can't go in them. -botania.page.hopperhock1=Any inventory which has no &1Item Frame&0 adjacent to it can accept any items, but labelled inventories will take priority.
    The rule using to sort items can be changed by shift-right clicking the flower with a &1Wand of the Forest&0. -botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. - -# -- TANGLEBERRIE -botania.entry.tangleberrie=Tangleberrie -botania.page.tangleberrie0=The &1Tangleberrie&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters within a circle ward, preventing them from getting out. -botania.page.tangleberrie1=&oTangled, brave and frozen&r. - -# -- JIYUULIA -botania.entry.jiyuulia=Jiyuulia -botania.page.jiyuulia0=The &1Jiyuulia&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters at bay, protecting a circular area from them getting in. -botania.page.jiyuulia1=&oKeep out, please&r. - -# -- RANNUNCARPUS -botania.entry.rannuncarpus=Rannuncarpus -botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 will pick up any nearby blocks in dropped item form and place them in the world nearby. It, however, only places the blocks thrown at it on top of a specific block, to specify this block, place it right below the soil the flower is resting on. -botania.page.rannuncarpus1=Block items, such as &1Sugar Cane&0 will also work, but, much alike any other blocks, will only be placed in a location where they normally would be able to be placed.
    Lastly, giving &4Mana&0 to the flower is optional, but it increases its range. -botania.page.rannuncarpus2=&oNeed a hand&r? - -# -- HYACIDUS -botania.entry.hyacidus=Hyacidus -botania.page.hyacidus0=For some reason, poison does not kill. The &1Hyacidus&0, to that, can be used to poison any nearby mobs, bringing them to their knees for a one hit kill after a bit. -botania.page.hyacidus1=&oSteel is immune&r. - -# -- POLLIDISIAC -botania.entry.pollidisiac=Pollidisiac -botania.page.pollidisiac0=Animals love eating, that's all they seem to do, really. An interesting behaviour they show is that they only seem to want to eat things that are fed to them.
    The &1Pollidisiac&0 will simply do that, at the cost of some mana, any appropriate nearby food items (&1Wheat&0, &1Carrots&0, etc) will be fed to the animals, putting them in a &obetter mood&r. -botania.page.pollidisiac1=&oHell's Kitchen&r. - -# -- CLAYCONIA -botania.entry.clayconia=Clayconia -botania.page.clayconia0=The &1Clayconia&0 is a simple flower, in essence. All it does is moisten nearby &1Sand&0, turning it into &1Clay&0, this process uses a decent amount of &4Mana&0, but nothing too insane. -botania.page.clayconia1=&oWhat a killer joke&r. - -# -- LOONIUM -botania.entry.loonium=Loonium -botania.page.loonium0=Any weary adventurer knows that &4Dungeons&0 can hold valuable goodies. The &1Loonium&0 can, at the use of an extreme amount of &4Mana&0, materialize these items and drop them in the nearby vicinity. -botania.page.loonium1=&oTank Tank Heal Tank&r! - -# -- DAFFOMILL -botania.entry.daffomill=Daffomill -botania.page.daffomill0=The &1Daffomill&0 works as a fan of sorts. It pushes, at the cost of a small amount of &4Mana&0, any items found in front of it.
    Shift-right clicking it with a &1Wand of the Forest&0 changes the orientation. Where it's currently facing can be seen via the subtle wind particles it emits. -botania.page.daffomill1=&oWind Turbines? I'm a big fan&r. - -# -- VINCULOTUS -botania.entry.vinculotus=Vinculotus -botania.page.vinculotus0=The &1Vinculotus&0 has the power to create a disturbance among any &4Enderman&0's teleportation powers within a fairly large radius around it. For a cost of &4Mana&0, whenever an &4Enderman&0 would teleport anywhere, instead, they're teleported to the location of the &1Vinculotus&0. -botania.page.vinculotus1=Touch this black lotus with your fingers - -# - GENERATING FLOWERS -# -- AN INTRODUCTION TO GENERATION -botania.entry.gIntro=An Introduction to Generation -botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckily there's an array of &4Generating Flowers&0 willing to do the job.
    These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circumstances. -botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
    This mana will be stored in the closest &1Mana Spreader&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Mana Spreader&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. - -# -- DAYBLOOM -botania.entry.daybloom=Daybloom -botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it performs a modified photosynthesis process, in order to transform sunlight into &4Mana&0.
    The process is rather slow, about ten or a dozen of these should get the job done, for now. -botania.page.daybloom1=An interesting thing to take in note is that these flowers tend to compete among themselves for what sunlight hits an area, thus having any other of the same type adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. -botania.page.daybloom1a=An interesting thing to take in note is that these flowers tend to compete among themselves for what sunlight hits an area, thus having any other of the same type adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production.
    These flowers are not very resistant, and after some time they'll wither and die off. -botania.page.daybloom3=Diminishing Returns -botania.page.daybloom2=&oStarting up a brand new day&r. - -# -- NIGHTSHADE -botania.entry.nightshade=Nightshade -botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, albeit at half the speed.
    Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent. -botania.page.nightshade0a=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, albeit at half the speed.
    Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent.
    Similarly to the &1Daybloom&0, these flowers are not very resistant, and after some time they'll wither and die off. -botania.page.nightshade1=&oThe shadow of the day&r. - -# -- ENDOFLAME -botania.entry.endoflame=Endoflame -botania.page.endoflame0=While the &1Daybloom&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
    The &1Endoflame&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vicinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. -botania.page.endoflame1=There is a small caveat though, the &1Endoflame&0 will not burn anything that returns a bi-product, an example are &1Lava Buckets&0, that have empty &1Buckets&0 as a bi-product. -botania.page.endoflame2=&oNot nitor&r. - -# -- HYDROANGEAS -botania.entry.hydroangeas=Hydroangeas -botania.page.hydroangeas0=While passive &4Mana&0 generation can be easily achieved through &1Dayblooms&0, different means of doing so might come in handy. The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought? -botania.page.hydroangeas0a=While passive &4Mana&0 generation can be easily achieved through &1Dayblooms&0, different means of doing so might come in handy. The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought?
    Similarly to the &1Daybloom&0, these flowers are not very resistant, and after some time they'll wither and die off. -botania.page.hydroangeas2=A simple &1Hydroangeas&0 system -botania.page.hydroangeas1=&oFrom some Hyperdimension&r? - -# -- THERMALILY -botania.entry.thermalily=Thermalily -botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0. -botania.page.thermalily0a=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflame&0 is not enough. An answer to that is the &1Thermalily&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0.
    Due to the heat the &1Lava&0 produces, there must be a block of &1Obsidian&0 below it for it to be absorbed. -botania.page.thermalily1=&oLily ought to know&r. - -# -- ROSA ARCANA -botania.entry.arcanerose=Rosa Arcana -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0. -botania.page.arcanerose1=&oGo have a drink, it might take a bit&r. - -# -- MUNCHDEW -botania.entry.munchdew=Munchdew -botania.page.munchdew0=Generating the form of natural energy that is &4Mana&0 should be a pretty good process when done via other living materials. By using the &1Munchdew&0, any &1Leaves&0 near the flower will get munched up and converted into &4Mana&0.
    It's to note that, though, no saplings or any other items will be dropped from the leaves. -botania.page.munchdew1=&oItadakimasu&r! - -# -- ENTROPINNYUM -botania.entry.entropinnyum=Entropinnyum -botania.page.entropinnyum0=In order to generate a blast of &4Mana&0, one might in fact, require a blast nearby.
    Igniting a block of &1TNT&0 in the near an &1Entropinnyum&0 will have the latter absorb all the entropy generated by the blast into itself, creating a large amount of &4Mana&0 and nullifying any possible damage. Lastly, to absorb the explosion, the flower must not have any &4Mana&0 stored in it or the process will fail. -botania.page.entropinnyum1=&oCool guys don't look at explosions&r. - -# -- KEKIMURUS -botania.entry.kekimurus=Kekimurus -botania.page.kekimurus0=&1Cake&0 is delicious, everyone loves it, flowers included.
    The &1Kekimurus&0 is one of these &1Cake&0 aficionados, and will eat any it spots nearby, using its enriching nutrients to create &4Mana&0. -botania.page.kekimurus1=&oThe flower of Flaxbeard the kekker&r. - -# -- GOURMARYLLIS -botania.entry.gourmaryllis=Gourmaryllis -botania.page.gourmaryllis0=The &1Gourmaryllis&0 is one hungry flower. It'll eat up any food in a small area around it, and turn it into &4Mana&0.
    There's a catch, though, it can only digest a single food at any given time, the &4Mana&0 is created when it's done. Any other food it finds, it'll also devour, but not create any mana from it. -botania.page.gourmaryllis1=The amount of time it takes to digest a delicacy depends on its nutritional value, in layman's terms, the amount of food points it restores.
    So, a &1Steak&0 will take four seconds to digest, a &1Carrot&0 will take two, a loaf of &1Bread&0 will take two and a half, so on. -botania.page.gourmaryllis2=The amount of &4Mana&0 created also makes use of this value, but in a way where the more nutritious the food is, the more efficient it is. For example, a single &1Steak&0 will produce more &1Mana&0 from two &1Carrots&0, both absolutely and per second. -botania.page.gourmaryllis3=&oA hot pot for our new residents&r. - -# - MAGICAL APPARATUS -# -- FORCE RELAY -botania.entry.pistonRelay=Force Relay -botania.page.pistonRelay0=It seems that infusing &1Pistons&0 with &4Mana&0 results in some interesting adverse effects.
    This block tears the fabric of space, relaying any piston force applied to it to the block it's bound to. -botania.page.pistonRelay1=To bind it to a block, right click it with a &1Wand of the Forest&0, and right click on the block you want to bind it to.
    Furthermore, this block is highly unstable, and may create uncanny effects, care is to be taken, it is also resistant to glue, both in pulling and pushing. This allows for a "frame" like setup. -botania.page.pistonRelay2=Infusing a &1Piston&0 with &4Mana&0. - -# -- MANA PYLON -botania.entry.pylon=Mana Pylon -botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.
    For one, setting one adjusted to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0. -botania.page.pylon1=&oYou must construct additional pylons!&r - -# -- MANA ENCHANTING -botania.entry.manaEnchanting=Enchanting with Mana -botania.page.manaEnchanting0=By utilizing the magical power emitted from &1Mana Pylons&0, a structure that can enchant items with books without consuming them can be created, called the &1Mana Enchanter&0.
    Constructing one of these requires a fair amount of space and materials alike. -botania.page.manaEnchanting1=To construct the &1Mana Enchanter&0, one requires, as well as fair amount of space, 17 &1Obsidian&0 blocks, 10 &1Mystical Flowers&0 of any color, 6 &1Mana Pylons&0 and a &1Lapis Lazuli Block&0.
    The instructions on how to assemble this structure are in the following pages. -botania.page.manaEnchanting2=Start by making an &1Obsidian&0 circle. -botania.page.manaEnchanting3=Put &1Mana Pylons&0 1 block in the air where marked. -botania.page.manaEnchanting4=Put flowers under the pylons and in the center -botania.page.manaEnchanting5=Place a &1Lapis Lazuli Block&0 in the center. -botania.page.manaEnchanting6=After the construct is done, right click the Lapis block with a &1Wand of the Forest&0 and the enchanter should form.
    In order to utilize the enchanter, one would place (via right click) the item to be enchanted in the enchanter itself and drop &1Enchanted Books&0 inside the circle around it. -botania.page.manaEnchanting7=Items that are already enchanted can't be placed in the enchanter.
    To start the enchanting, right click the enchanter with a &1Wand of the Forest&0. It'll scan the books around, and once it's done, a spell circle of sorts will appear around it, indicating the books can be safely picked up again. -botania.page.manaEnchanting8=After the enchanting begins, the enchanter will require &4Mana&0.
    It can be fed via one of two ways, either via &4Mana Bursts&0 or nearby &1Sparks&0, by placing a &1Spark&0 on top of the enchanter. The later being much faster. -botania.page.manaEnchanting9=When enough &4Mana&0 is gathered, the enchanting process will finalize, and the enchantments will be applied to the item.
    The amount of &4Mana&0 required depends on the rarity of the enchantments being applied, their level, and the total amount of enchantments.
    If any book has more than one enchantment, only the first will be accounted for. -botania.page.manaEnchanting10=During the enchanting process, the item can not be removed, but it can after the process has been completed.
    Note that if at any point, any component of the construct is removed, it'll revert to its original &1Lapis Lazuli Block&0 form. - -# -- SPREADER TURNTABLE -botania.entry.turntable=Spreader Turntable -botania.page.turntable0=The &1Spreader Turntable&0, as its name implies, can turn &1Mana Spreaders&0 around and around. Placing a spreader above the turntable will rotate it, given that a redstone signal isn't applied.
    To change the speed of the turntable, right click with a &1Wand of the Forest&0, shift-right clicking will invert the movement. -botania.page.turntable1=Spin spin spin spin - -# -- BOTANICAL ALCHEMY -botania.entry.manaAlchemy=Alchemising with Mana -botania.page.manaAlchemy0=&4Mana&0 is an extremely volatile substance, to a point that its complete properties and abilities are unknown.
    One of them is known, though, by attaching an &1Alchemy Catalyst&0, created with a mixture of otherworldly materials to the bottom of a &1Mana Pool&0, it enables the pool to perform &4Alchemy&0. -botania.page.manaAlchemy1=Creating the &1Catalyst&0 -botania.page.manaAlchemy2=&1Rotten Flesh&0 to &1Leather&0 -botania.page.manaAlchemy3=Various types of &1Wood&0 -botania.page.manaAlchemy4=Various types of &1Saplings&0 -botania.page.manaAlchemy5=Breaking down &1Glowstone Blocks&0 -botania.page.manaAlchemy6=Breaking down &1Quartz Blocks&0 -botania.page.manaAlchemy7=Creating &1Chiseled Stone Bricks&0 -botania.page.manaAlchemy8=Further freezing &1Snow&0 into &1Ice&0 -botania.page.manaAlchemy9=Converting between &1Vines&0 and &1Lilypads&0 -botania.page.manaAlchemy10=Various breeds of &1Fish&0 -botania.page.manaAlchemy11=Transmuting &1Seeds&0 and &1Crops&0 -botania.page.manaAlchemy12=Purifying &1Poisonous Potatoes&0 -botania.page.manaAlchemy13=Conjuring &1Nether Wart&0 -botania.page.manaAlchemy14=Converting between &1Gunpowder&0 and &1Flint&0 -botania.page.manaAlchemy15=Making &1Name Tags&0 -botania.page.manaAlchemy16=Splitting &1Wool&0 into &1String&0 -botania.page.manaAlchemy17=Converting between &1Slimeballs&0 and &1Cactus&0 -botania.page.manaAlchemy18=Creating &1Ender Pearls&0 -botania.page.manaAlchemy19=Converting between &1Glowstone&0 and &1Redstone&0 -botania.page.manaAlchemy20=Breaking &1Cobblestone&0 into &1Sand&0 -botania.page.manaAlchemy21=Making &1Coarse Dirt&0 - -# -- EYE OF THE ANCIENTS -botania.entry.forestEye=Eye of the Ancients -botania.page.forestEye0=As the Ancients who used to watch over the world always looked for the living beings on it, this block, the &1Eye of the Ancients&0, will do just that.
    By attaching a &1Comparator&0 next to it, it'll send out a redstone signal equivalent to the amount of animals it can find. -botania.page.forestEye1=The counting only starts at 2, so, with 2 animals around, it'd output a signal of strength 1, with 3 animals, of strength 2 and so on.
    Lastly, the time has worn down the sight of the Ancients, so this block can only see animals in about 6 blocks in any direction. -botania.page.forestEye2=Now you see me... - -# -- OPEN CRATE -botania.entry.openCrate=Open Crate -botania.page.openCrate0=Sometimes devices like &1Droppers&0 or &1Dispensers&0 aren't precise or fast enough. A simple solution is to make a crate and punch a hole in the bottom.
    Yeah, it's that simple. The &1Open Crate&0 accepts items from &1Hoppers&0 or any other means of inserting items, and obviously, drops them directly below it. -botania.page.openCrate1=A little interesting effect the &1Open Crate&0 can do is that, when given a redstone signal, any items it drops are prevented from being caught by flowers like the &1Hopperhock&0, &1Rannuncarpus&0 or &1Pollidisiac&0 for around ten seconds more than usual. -botania.page.openCrate2=A super crate box - -# -- DRUM OF THE WILD -botania.entry.forestDrum=Drum of the Wild -botania.page.forestDrum0=The &1Drum of the Wild&0 is, in layman's terms, the percussion counterpart of the &1Horn of the Wild&0. It serves the exact same purpose as the handheld horn, but is placed in world.
    To trigger a beat and break nearby foliage, one would fire a &4Mana Burst&0 at the drum. -botania.page.forestDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1Redstone Mana Spreader&0 or a &1Mana Blaster&0 is required. -botania.page.forestDrum2=But if you close your eyes... - -# -- ABSTRUSE PLATFORM -botania.entry.platform=Abstruse Platform -botania.page.platform0=By laying &1Livingwood&0 on a very specific format it's possible to create a platform of sorts, that only has a physical body for whoever is on top of it and isn't sneaking. For anyone else, it's like it's not there. &4Mana Bursts&0 will always travel through it without any trouble.
    It's also possible to camouflage this block as any other simple block by simply right clicking it. -botania.page.platform2=Right clicking a platform with a block in it with a &1Wand of the Forest&0 will change all connected platforms with no block set to them to the block on the one clicked. Shift-right clicking removes all blocks. -botania.page.platform1=It would be Ethereal but the name was taken - -# -- CONJURING WITH MANA -botania.entry.manaConjuration=Conjuring with Mana -botania.page.manaConjuration0=Similar to the ability to &4Alchemise with Mana&0, a catalyst also exists for &4Conjuration&0, the magic of materializing resources from magical energy only. The mechanism works in a similar way to the &1Alchemy Catalyst&0 where one tosses an item into the pool with the catalyst below. -botania.page.manaConjuration1=Creating the catalyst -botania.page.manaConjuration2=Conjuring &1Redstone&0 -botania.page.manaConjuration3=Conjuring &1Glowstone&0 -botania.page.manaConjuration4=Conjuring &1Quartz&0 -botania.page.manaConjuration5=Conjuring &1Coal&0 -botania.page.manaConjuration6=Conjuring &1Snow&0 -botania.page.manaConjuration7=Conjuring &1Netherrack&0 -botania.page.manaConjuration8=Conjuring &1Soul Sand&0 -botania.page.manaConjuration9=Conjuring &1Gravel&0 - -# -- SPECTRAL PLATFORM -botania.entry.spectralPlatform=Spectral Platform -botania.page.spectralPlatform0=The &1Spectral Platform&0 isn't more than an &1Abstruse Platform&0 with no physical body whatsoever. Whereas the &1Abstruse Platform&0 would have a physical body in some cases, the &1Spectral Platform&0 lets anything go through it, regardless of their position. -botania.page.spectralPlatform1=This reminds me of a Puzzle - -# -- DRUM OF THE GATHERING -botania.entry.gatherDrum=Drum of the Gathering -botania.page.gatherDrum0=The &1Drum of the Gathering&0 is, in short terms, a &1Drum of the Wild&0 for livestock.
    When a &4Mana Burst&0 collides with it, it'll shear any &4Sheep&0 around with grown fleece. Any &4Cows&0, with &1Empty Buckets&0 below them will have their milk transfered to the buckets. -botania.page.gatherDrum1=Tap your lands - -# -- LIFE IMBUER -botania.entry.spawnerClaw=Life Imbuer -botania.page.spawnerClaw0=&1Monster Spawners&0 are an interesting bunch. They have the ability to bring out life from thin air, but somehow, this only manifests when there's a player nearby.
    This, of course, tends to be a rather limiting factor in the onslaught of any creatures that they can create. -botania.page.spawnerClaw1=By placing a &1Life Imbuer&0 on top of a &1Monster Spawner&0 and giving it a rather decent chunk of &4Mana&0 through a &1Mana Spreader&0, when there aren't any players in the nearby vicinity, the &4Mana&0 will power the spawner, just as if there were players around. -botania.page.spawnerClaw2=Something something shadow dragon - -# -- CRAFTY CRATE -botania.entry.craftCrate=Crafty Crate -botania.page.craftCrate0=As the name suggests, the &1Crafty Crate&0 is a counterpart to the &1Open Crate&0 with the ability to assemble items into other items similarly to a &1Crafting Table&0.
    Like a &1Crafting Table&0, it has a 9 slot inventory, which can be filled with items in the pattern of a recipe. -botania.page.craftCrate1=The items go in from left to right and top to bottom (illustration further in this entry), to that, there's a special item, named the &1Crafting Placeholder&0, which, when placed in, counts as an empty slot in the recipe. This is used to allow for recipes with gaps (eg, furnace, chest, pickaxe...) to also be doable. -botania.page.craftCrate2=Creating the placeholder -botania.page.craftCrate3=To finish the recipe, one of two things can be done.
    First off, filling every of the 9 slots with either recipe components or placeholders will instantly eject the result, the placeholders and any lefovers (e.g. buckets when making cake), this is the most straightforward method. -botania.page.craftCrate4=Right clicking the crate with a &1Wand of the Forest&0 (remember: &1Dispensers&0 can do this) will attempt at crafting with whatever is inside the crate and eject it.
    If this fails all the items inside are simply ejected with no crafting procedure done. -botania.page.craftCrate7=Attaching a &1Comparator&0 to the crate will have it emit a signal equal to the amount of items inside the crate, which can be an extremely valuable asset in creating mechanisms with it. -botania.page.craftCrate5=An example of crafting a &1Diamond Pickaxe&0 -botania.page.craftCrate6=Made in Portugal - -# -- ENDER OVERSEER -botania.entry.enderEyeBlock=Ender Overseer -botania.page.enderEyeBlock0=The eyes of an &4Enderman&0 have an interesting sensitivity to being watched. A block out of these will simply output a &4redstone signal&0 if a player within a 64 block radius is looking directly at it.
    Of course, wearing a &1Pumpkin&0 negates this effect. -botania.page.enderEyeBlock1=MY BRAND - -# - MYSTICAL INSTRUMENTS -# -- MANA BLASTER -botania.entry.manaBlaster=Mana Blaster -botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Mana Spreader&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
    By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. -botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot. -botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply shift-right click the blaster. -botania.page.manaBlaster3=We need more dakka - -# -- PASTURE SEEDS -botania.entry.grassSeeds=Pasture Seeds -botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infusing some &1Tall Grass&0 with &4Mana&0, it's possible to create &1Pasture Seeds&0, which will grow grass in any barren area, via a simple right click on dirt.
    Other types of foliage can also be grown, such a &1Podzol&0 or &1Mycellium&0 with alternate seeds. -botania.page.grassSeeds1=&1Pasture Seeds&0 for grass -botania.page.grassSeeds2=&1Boreal Seeds&0 for podzol -botania.page.grassSeeds3=&1Infestation Spores&0 for mycellium - -# -- ROD THE LANDS -botania.entry.dirtRod=Rod of the Lands -botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simpleton tool, by utilizing &4Mana&0 from your inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down. -botania.page.dirtRod1=That's dirty - -# -- TERRA FIRMA ROD -botania.entry.terraformRod=Terra Firma Rod -botania.page.terraformRod0=While digging away at dirt with a shovel is definitely functional, flattening huge tracts of land can get somewhat tortuous at times.
    By utilizing the &1Terra Firma Rod&0, it's possible to terraform in a quick and environmental friendly manner. -botania.page.terraformRod1=This rod, will, at the cost of some &4Mana&0 from your inventory, flatten the land to the level you are standing. For this to happen, charge it by &4holding right-click&0 and, slowly but surely, the nearby terrain will be flattened to your level, either by placing &1Dirt&0 or by removing blocks. -botania.page.terraformRod2=Note that blocks removed by the rod are non-recuperable. The terrain will adapt to the changes as best as it can, up to a distance limit, to avoid cuts in hills and the like, for this, the flattening will work in the terrain's natural look.
    Lastly, the rod will cease to function whatsoever below sea level. -botania.page.terraformRod3=Quite a justicar - -# -- MANASTEEL EQUIPMENT -botania.entry.manaGear=Manasteel Equipment -botania.page.manaGear0=&1Manasteel&0, alike other metals, can be shaped into tools and armor alike.
    Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead. -botania.page.manaGear1=The &1Manasteel Pickaxe&0 -botania.page.manaGear2=The &1Manasteel Shovel&0 -botania.page.manaGear3=The &1Manasteel Axe&0 -botania.page.manaGear4=The &1Manasteel Shears&0 -botania.page.manaGear5=The &1Manasteel Sword&0 -botania.page.manaGear6=The &1Manasteel Helmet&0 -botania.page.manaGear7=The &1Manasteel Chestplate&0 -botania.page.manaGear8=The &1Manasteel Leggings&0 -botania.page.manaGear9=The &1Manasteel Boots&0 - -# -- HORN OF THE WILD -botania.entry.grassHorn=Horn of the Wild -botania.page.grassHorn0=Clearing out &1Tall Grass&0 by hand can definitely be a nuisance.
    Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand.
    With some modifications, the horn can be modified to break leaves instead. -botania.page.grassHorn1=Crafting the horn -botania.page.grassHorn2=Modifying the horn - -# -- TERRASTEEL ARMOR -botania.entry.terrasteelArmor=Terrasteel Armor -botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much alike the &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.
    This armor, however, has properties more alike &1Diamond&0 instead of &1Iron&0 and increases the wearer's health when worn. -botania.page.terrasteelArmor1=The &1Terrasteel Helmet&0 -botania.page.terrasteelArmor2=The &1Terrasteel Chestplate&0 -botania.page.terrasteelArmor3=The &1Terrasteel Leggings&0 -botania.page.terrasteelArmor4=The &1Terrasteel Boots&0 - -# -- TERRA BLADE -botania.entry.terraSword=Terra Blade -botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when swung, there's a chance for it to create a beam that will deal as much damage as a melee hit. -botania.page.terraSword1=No Broken Hero Sword - -# -- TERRA SHATTERER -botania.entry.terraPick=Terra Shatterer -botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for its creation.
    The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method. -botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines its &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.
    The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0. -botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.
    The rank of the tool does not change its speed, but instead, it increases the power of its &4Active Ability&0.
    Toggling the tool's ability can be done via right click. -botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger trough the ranks. It's to note that the rank &4D&0 tool does not have the active ability.
    Having the tool active consumes &4Mana&0 from its storage passively, even if not being used to mine. -botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.
    It also won't despawn like regular dropped items. -botania.page.terraPick5=Stronger than a Gastrea - -# -- SOULSCRIBE -botania.entry.enderDagger=Soulscribe -botania.page.enderDagger0=Those &4Endermen&0. They're the second more pesky thing since &4Creepers&0. I swear, the person who came up with them must have taken a &onotch&r too much of their drink.
    However, by infusing a standard dagger with some of their energy, one can create the &1Soulscribe&0, a dagger that tears through &1Endermen&0 as if they were butter. -botania.page.enderDagger1=Due of the type of infusion, though, the dagger only lasts for a few kills, and the energy that radiates from it prevents the &1Manasteel&0 from gathering &4Mana&0 to avoid damage, like typical tools would. Still, all in the name of killing those monsters. -botania.page.enderDagger2=Strike my Soul - -# -- ROD OF THE SEAS -botania.entry.waterRod=Rod of the Seas -botania.page.waterRod0=Similarly to its land counterpart, the &1Rod of the Seas&0 will, at the cost of some &4Mana&0, place down a &1Water&0 block wherever it's used on. Furthermore, it can also be used to refill a &1Petal Apothecary&0. -botania.page.waterRod1=Keep the Earth clean, it isn't Uranus - -# -- ELEMENTIUM EQUIPMENT -botania.entry.elfGear=Elementium Equipment -botania.page.elfGear0=Similarly to other metals, as expected, &1Elementium&0 can, too, be shaped into tools and armor.
    These pieces of equipment have a decent resistance to damage, about half of that of diamond, as well as the ability to drain &4Mana&0 to prevent damage. -botania.page.elfGear1=Each of the tools come with their own ability or power of sorts which makes them unique. The armor allows the wearer to, when hit, have a chance to spawn a &1Pixie&0 that goes after the attacker, dealing decent damage.
    The more pieces of &1Elementium Armor&0 equipped, the higher the chance. -botania.page.elfGear2=Starting off, the &1Elementium Pickaxe&0 will destroy any &1Cobblestone&0, &1Dirt&0, &1Netherrack&0 and other mundane materials, leaving behind only the ores and fine resources.
    Combining the &1Elementium Pickaxe&0 with a &1Terra Shatterer&0 in a crafting square allows for the latter to also get this power. This can't be undone. -botania.page.elfGear3=I can fit a shower in my pocket, screw cobble -botania.page.elfGear4=The &1Elementium Shovel&0 will, case the block dug is affected by gravity (&1Gravel&0, &1Sand&0, etc), dig all the blocks of that material above and/or below it, no more gravel falling while mining. -botania.page.elfGear5=Putting Things on Top of Other Things -botania.page.elfGear6=The &1Elementium Axe&0 doubles as a weapon, if used to strike the finishing blow to a &4Zombie&0, &4Skeleton&0, &4Creeper&0 or even another &4Player&0, it has a chance to decapitate them, leaving their severed head or skull behind. -botania.page.elfGear7=Off with their heads -botania.page.elfGear8=The &1Elementium Shears&0 hold the ability to, when held back like a bow, shear any nearby sheep with speed within a large area of effect centered on the holder. -botania.page.elfGear9=Nui? She's h-arm-less -botania.page.elfGear10=Lastly, the &1Elementium Sword&0 will increase the chance of a &4Pixie&0 spawning when hit (this holds true when no &1Elementium Armor&0 is worn) and increases the strength of any &4Pixies&0 spawned. -botania.page.elfGear11=The Lambent Light -botania.page.elfGear12=Fortuna on the Sixteenth Night -botania.page.elfGear13=When the Seagulls Cry Breakdown -botania.page.elfGear14=Good People Die -botania.page.elfGear15=The out of Infinity - -# -- EXTRAPOLATED BUCKET -botania.entry.openBucket=Extrapolated Bucket -botania.page.openBucket0=By creating a bucket out of &1Elementium&0 one seems to notice an interesting feature. The liquids acquired by it simply vanish into the ether, never to be seen again. This seems like a great clean up tool. -botania.page.openBucket1=A Souvenir from Lewis - -# -- LIFE AGGREGATOR -botania.entry.spawnerMover=Life Aggregator -botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
    It's to note that the device will shatter after being used once. -botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet - -# -- ROD OF BIFROST -botania.entry.rainbowRod=Rod of Bifrost -botania.page.rainbowRod0=&4Bifrost&0, the rainbow bridge that reaches between the world and the realm of the gods.
    While this item, the &1Rod of Bifrost&0 doesn't exactly do that, it allows the holder, via a right click and at the cost of some &4Mana&0, to create a rainbow bridge in the direction he or she is looking at. -botania.page.rainbowRod1=This bridge extends as far as a hundred blocks, and will vanish after about fifteen seconds.
    Only one bridge can be created for any given &1Rod of Bifrost&0 at a time, as soon as the old bridge vanishes, a new one can be created. -botania.page.rainbowRod2=Going my way!! Cut open a path and go! - -# -- ROD OF THE SKIES -botania.entry.tornadoRod=Rod of the Skies -botania.page.tornadoRod0=The &1Rod of the Skies&0 is a magical instrument with the ability to propel one in the air at fast velocity for the cost of some &4Mana&0.
    To do so, one would simply hold it like a bow and watch as their momentum increases.
    The rod takes a small amount of time to recharge, but during that time it'll block any fall damage, keeping the user safe. -botania.page.tornadoRod1=A treasure from Lorule - -# -- ROD OF THE HELLS -botania.entry.fireRod=Rod of the Hells -botania.page.fireRod0=The &1Rod of the Hells&0 contains the essence of a burning flame, using it on the ground will create a circle of fire that burns anything inside it, for a decent cost of &4Mana&0.
    The ring has a decent radius, and takes a small amount of time to fully propagate, it's to note that after that time it burns anything living in it, the caster included. -botania.page.fireRod1=Megu Megu Fire Endless Night - -# -- VINE BALLS -botania.entry.vineBall=Vine Balls -botania.page.vineBall0=&1Ladders&0 can't stand up on their own, they require something on their back, whereas &1Vines&0 don't. Normally, though, &1Vines&0 aren't strong enough for someone to climb them when they're freestanding.
    By combining a few &1Vines&0, it's possible to create a ball that can be thrown, to create a climbable ladder of strong &1Vines&0 where it hits. -botania.page.vineBall1=It's also possible, by combining some materials such as &1Livingwood&0 or a &1Rune of Air&0 to create a slingshot that lets these &1Vine Balls&0 be shot while completely ignoring the force of gravity. -botania.page.vineBall2=This would be in Vineacraft... -botania.page.vineBall3=...if that actually existed. - -# -- SHARD OF LAPUTA -botania.entry.laputaShard=Shard of Laputa -botania.page.laputaShard0=Via a somewhat complex magic activation sequence, combining a few interesting resources, including &1Gaia Spirits&0 would allow one to create a shard that, when used on the ground, will allow one to lift a spherical area around that point up into the air.
    This process consumes the shard and can take upwards of ten minutes depending on the mass of land. -botania.page.laputaShard2=The radius of the island creates start at 14 blocks, on other words, 28 blocks of diameter. It's possible to increase the size by upgrading the shard with additional &1Gaia Spirits&0, each one adds 1 block to the radius, or 2 to the diameter. -botania.page.laputaShard1=Look Shiro, Laputa exists! -botania.page.laputaShard3=Size does matter - -# -- EQUESTRIAN VIRUS -botania.entry.virus=Equestrian Virus -botania.page.virus0=Through the mixing of some ingredients, a type of virus that can alter the genetic code of equestrian life can be made.
    Using one of these viruses on a &1Horse&0 will alter its genetic code, turning it into either a &1Zombie&0 or &1Skeleton Horse&0. Not only will it do that, but it will vastly increase all the &1Horse&0's genetic attributes. -botania.page.virus1=No ponies here -botania.page.virus2=None here either - -# -- ROD OF THE HIGHLANDS -botania.entry.skyDirtRod=Rod of the Highlands -botania.page.skyDirtRod0=While the &1Rod of the Lands&0 is all well and good, being able to place &1Dirt&0 without something to hold it would be great.
    The &1Rod of the Highlands&0 does just that, while maintaining the original power of the &1Rod of the Lands&0, it can also place &1Dirt&0 in mid air, for an increased &4Mana&0 cost. -botania.page.skyDirtRod1=Dirty Stick mk2 - -# -- HAND OF ENDER -botania.entry.enderHand=Hand of Ender -botania.page.enderHand0=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0.
    Using the hand on another player will open up &otheir&r inventory instead, at a lot higher &4Mana&0 cost. -botania.page.enderHand0a=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0. -botania.page.enderHand1=Zezima hates him! -botania.page.enderHand1a=It's like the 4G of Ender Chests - -# -- VITREOUS PICKAXE -botania.entry.glassPick=Vitreous Pickaxe -botania.page.glassPick0=Placing down &1Glass&0 and having to break it again can be a heartbreaking experience. Luckily, by creating a &1Vitreous Pickaxe&0, one can gather the &1Glass&0 back by mining it with the pick, it's like cheap &4Silk Touch&0 for glass! -botania.page.glassPick1=Trapped inside with food - -# -- ROD OF DIVINING -botania.entry.diviningRod=Rod of Divining -botania.page.diviningRod0=As its name implies, the &1Rod of Divining&0 has the ability to divine in a decently large radius around the user to find any ores. These will shine for a little bit, allowing their location.
    This process, obviously, requires a decent amount of &4Mana&0 from the user's inventory. -botania.page.diviningRod1=inb4 ee3 - -# -- ROD OF THE BLACK MESA -botania.entry.gravityRod=Rod of the Black Mesa -botania.page.gravityRod0=The &1Rod of the Black Mesa&0 is a powerful relic, legend says that the first of these devices was found atop a dark mesa, along with a crowbar.
    To use this device, the user may right click and hold on a monster or item to pick it up. Releasing right click will drop the selected entity, while left click will fire it in a powerful burst. -botania.page.gravityRod1=This power does not come free, of course. It requires significant amounts of &4Mana&0 from the user's inventory. -botania.page.gravityRod2=Why the flax? - -# -- TIMELESS IVY -botania.entry.regenIvy=Timeless Ivy -botania.page.regenIvy0=While &1Manasteel&0 or &1Elementium&0 tools have the ability to harness &4Mana&0 and use it to protect their bodies, other tools or armor don't have this property.
    A handful of &1Timeless Ivy&0 can be attached on to virtually any item, allowing it to be repaired with &4Mana&0. -botania.page.regenIvy1=To apply it, one'd simply craft the tool in question alongside the ivy and 3 of an item that can be used to repair the tool in an anvil (eg. &1Diamonds&0 for a &1Diamond Pickaxe&0).
    Due to not being in direct contact with the material, the amount of &4Mana&0 used by the ivy in comparison to &1Manasteel&0 is rather high. -botania.page.regenIvy2=Cut it in Varrock - -# - BAUBLES -# -- AN INTRODUCTION TO BAUBLES -botania.entry.bIntro=An Introduction to Baubles -botania.page.bIntro0=&4Baubles&0, also commonly referred to as &4Trinkets&0 or &4Charms&0 are pieces of equipment which offer all sorts of different effects, when worn.
    To equip them, one can press the &4B&0 (configurable) key. There's four slots, one &4Amulet&0 slot, two &4Ring&0 slots and one &4Belt&0 slot. -botania.page.bIntro1=The &4Baubles Screen&0 -botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that uses the baubles system is installed, this inventory will be shared between the various mods. - -# -- TINY PLANET -botania.entry.tinyPlanet=Tiny Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her.
    By increasing its mass with some &1Stone&0, it can also be placed in world, for the same effect. -botania.page.tinyPlanet1=Clearly from rebirth -botania.page.tinyPlanet2=More of a planet than Pluto - -# -- BAND OF MANA -botania.entry.manaRing=Band of Mana -botania.page.manaRing0=Combining a &1Mana Tablet&0 with some &1Manasteel&0 creates an easily worn &4Ring&0, that functions exactly similar to the tablet used to make it, but can be worn as a &4Bauble&0.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it store about four times as much &4Mana&0. -botania.page.manaRing1=Creating the ring -botania.page.manaRing2=Upgrading the ring - -# -- BAND OF AURA -botania.entry.auraRing=Band of Aura -botania.page.auraRing0=The &1Band of Aura&0 is a bit of a deviation from the typical &1Band of Mana&0, in which, instead of storing &4Mana&0, it slowly, while equipped, creates it and stores it into &4Mana&0 containing items in the wearer's inventory.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it generate &4Mana&0 at a significantly faster rate. -botania.page.auraRing1=Creating the ring -botania.page.auraRing2=Upgrading the ring - -# -- SOUJOURNER'S SASH -botania.entry.travelBelt=Soujourner's Sash -botania.page.travelBelt0=Traversing terrain sometimes proves to be a hassle. The &1Soujourner's Sash&0 can be equipped in the &4Belt&0 slot, and when worn will increase the movement speed, jump height and resistance to fall damage of the wearer.
    Lastly, if not sneaking, it also allows the wearer to walk over 1 block high gaps without jumping with ease. -botania.page.travelBelt1=...everell - -# -- TECTONIC GIRDLE -botania.entry.knockbackBelt=Tectonic Girdle -botania.page.knockbackBelt0=By harnessing the forces of tectonic movement, the &1Tectonic Girdle&0, when worn, will negate any &4Knockback&0 applied to the wearer by outside attacks. -botania.page.knockbackBelt1=Don't... move - -# -- SNOWFLAKE PENDANT -botania.entry.icePendant=Snowflake Pendant -botania.page.icePendant0=The &1Snowflake Pendant&0 is a &4Bauble&0 that resonates freezing energy, while it's worn, any nearby still &1Water&0 blocks at foot level will be converted into &1Ice&0.
    The &1Ice&0 will melt shortly afterward the wearer leaves the area. Lastly, this charm will not freeze any blocks if the wearer is sneaking or fully submerged. -botania.page.icePendant1=Do you want to build a snowman? - -# -- PYROCLAST PENDANT -botania.entry.lavaPendant=Pyroclast Pendant -botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs low heat, while it's worn, if the wearer is caught on fire and is not directly standing on &1Fire&0, &1Lava&0 or anything else that can induce burning, they'll be extinguished. -botania.page.lavaPendant1=Hanako could have used one of these - -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Golden Laurel Crown -botania.page.goldenLaurel0=One of the uses for &1Gaia Spririts&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=Given the theme, probably Viridi - -# -- RING OF CHORDATA -botania.entry.waterRing=Ring of Chordata -botania.page.waterRing0=The &1Ring of Chordata&0 allows the wearer to swim like a fish. While it's equipped, the wearer is bestowed with the ability to accelerate to a decent speed while underwater. It also gives the wearer good sight underwater and, if &4Mana&0 is present, at the cost of some of it, the ability to breathe indefinitely. -botania.page.waterRing1=Go swim with the fishes - -# -- RING OF THE MANTLE -botania.entry.miningRing=Ring of the Mantle -botania.page.miningRing0=The &1Ring of the Mantle&0 allows one to mine faster, while equipped and &4Mana&0 is present in the inventory, it'll give a &4Haste&0 effect to the wearer. Some &4Mana&0 is used while the wearer swings their arm or equipped item, be it for attacking, mining or just flailing. -botania.page.miningRing1=Diggy diggy hole - -# -- RING OF MAGNETIZATION -botania.entry.magnetRing=Ring of Magnetization -botania.page.magnetRing0=By turning a &1Magnetizing Lens&0 into a wearable ring, one can use it to magnetize nearby items.
    While equipped, this ring will make any nearby items magnetize towards the wearer, case they aren't sneaking. -botania.page.magnetRing1=How do they work? - -# -- RING OF FAR REACH -botania.entry.reachRing=Ring of Far Reach -botania.page.reachRing0=Through the power of one's Pride, nothing is out of their reach. By wearing the &1Ring of Far Reach&0, the maximum distance the wearer can break, place or interact with blocks, as well as attack or interact with entities is increased by about three blocks. -botania.page.reachRing1=Fire and Blood - -# -- CHARM OF THE DIVA -botania.entry.divaCharm=Charm of the Diva -botania.page.divaCharm0=The &1Charm of the Diva&0 blesses the wearer with the ability to have any attacked mob follow the attacker's will, and, case there are any nearby enemies, go after them instead. This process, of course, requires a bit of &4Mana&0 from the wearer's inventory in order to function. -botania.page.divaCharm1=You shall not disrespect Big Sister - -# -- FLUGEL TIARA -botania.entry.flightTiara=Flügel Tiara -botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
    The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. -botania.page.flightTiara1=Forty thousand books from another world -botania.page.flightTiara2=Combining the Tiara with a variety of Quartz species allows for it to create various different kinds of aesthetic wings, one for each style of quartz.
    The recipes for the various types of quartz can be found in the &4Decorative Blocks&0 entry under &4Misclaneous&0, &1Elven Quartz&0 is acquired by trading &1Nether Quartz&0 with the elves. -botania.page.flightTiara3=Adding Wings (they can be swapped any time) - -# -- GREAT FAIRY RING -botania.entry.pixieRing=Great Fairy Ring -botania.page.pixieRing0=This ring works alongside the &1Elementium Armor&0, insight in the powers of it is advised before using this ring. When worn, the &1Great Fairy Ring&0 will increase the chance for a &4Pixie&0 to spawn when the wearer is hit, this still holds true case no &1Elementium Armor&0 is equipped. -botania.page.pixieRing1=We got square heads, big pointy caps - -# -- GLOBETROTTER'S SASH -botania.entry.superTravelBelt=Globetrotter's Sash -botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Gaia Spirits&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance. -botania.page.superTravelBelt1=No time for guessing, follow my plan instead - -# -- THE SPECTATOR -botania.entry.itemFinder=The Spectator -botania.page.itemFinder0=&1The Spectator&0 is a headband that allows the wearer to have a better perception of the world. While holding an item, any &4containers&0 (chests, minecarts, donkeys with chests, furnaces, etc...) that have an item of that type, &4dropped items&0 of that type, &4mobs&0 who have that item equipped &o(...)&r -botania.page.itemFinder1=&o(...)&r &4players&0 who have the item in their inventory and &4villagers&0 who want to trade either with or for that item will shine with a green glow, allowing them to be easily spotted.
    While sneaking, all dropped items around the wearer will shine, regardless of the item. -botania.page.itemFinder2=Do you hear their voices? - -# -- CRIMSON PENDANT -botania.entry.superLavaPendant=Crimson Pendant -botania.page.superLavaPendant0=The &1Crimson Pendant&0 is, in simple terms, an upgraded counterpart to the &1Pyroclast Pendant&0, wearing it provides the wearer immunity to all fire and lava damage, instead of just extinguishing them. -botania.page.superLavaPendant1=Runner-up on Monolith Code - -# - ALFHOMANCY -# -- THE PORTAL TO ALFHEIM -botania.entry.aIntro=The Portal to Alfheim -botania.page.aIntro0=Once, in olden times, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they have been banished back to their own world, &4Alfheim&0.
    Experimentation has been done in atempt to bridge the gap between the two worlds, and means of creating a portal that does just that have been devised. -botania.page.aIntro1=Creating this portal proves not to be an easy task, as quite a few exquisite resources are necessary. The requirements are as follows: 8 &1Livingwood&0 blocks, 3 &1Glimmering Livingwood&0 blocks, 1 &1Elven Gateway Core&0 (read on), 2 &1Mana Pools&0 and 2 &1Natura Pylons&0 (read on). -botania.page.aIntro2=Creating the &1Elven Gateway Core&0 -botania.page.aIntro3=Creating &1Natura Pylons&0 -botania.page.aIntro4=Make a frame of &1Livingwood&0 -botania.page.aIntro5=Add &1Glimmering Livingwood&0 -botania.page.aIntro6=Place the &1Elven Gateway Core&0 -botania.page.aIntro7=Add &1Mana Pools&0 -botania.page.aIntro8=Place &1Natura Pylons&0 above the pools -botania.page.aIntro9=To open up the portal, simply right click the core with a &1Wand of the Forest&0.
    The portal requires a substantial amount of &4Mana&0 deposited in both the pools to open up, after that, it'll slowly drain some to keep itself powered. If it runs out of &4Mana&0, the connection will be broken. -botania.page.aIntro10=The amount of &4Mana&0 required to open up the portal is orders of magnitude higher than that to keep it maintained, thus closing the portal to prevent &4Mana&0 loss is a poor strategy.
    Furthermore, the link isn't strong enough to allow living beings to go through it, but it seems that &4items&0 can. -botania.page.aIntro11=The amount of information about &1Alfheim&0 stored in this lexicon is resumed to this entry alone, perhaps &4letting the Elves have a look at it&0 might prove beneficial. - -# -- A MESSAGE FROM ELVEN GARDE -botania.entry.elfMessage=A Message from Elven Garde -botania.page.elfMessage0= -# ^ This is blank on purpose -botania.page.elfMessage1=&oGreetings. We noticed that our portal was opened via a link from another world. That's rather shocking news indeed. We thank you very much for providing us with a repository of the knowledge from your world, as to keep us up to date to what happened since we left it, it's been a while since then, indeed. -botania.page.elfMessage2=&oAfter some discussion with the high council of Elven Garde, we have decided to cooperate with you. You see, reading through your "Lexica Botania" has shown us a good amount of resources from your world that we would be extremely keen as to get our hands on, as these are non-existent in our lands. -botania.page.elfMessage3=&oThe link you have managed to establish is rather weak, no living beings will be able to go through, as you already know. However, there's a positive side to this, the link strikes the fabric of time of both our worlds in a way where it doesn't keep them in sync, that's the reason why you received your book back so quickly. -botania.page.elfMessage4=&oWhen it comes to Mana and other magical energies, we are plenty stocked on them, so worry not about the portal closing on our end. Let's put this in prospect, in order for the advance of both our civilizations, we vow to accept a given set of resources from your world we lack in ours in exchange for resources you lack in yours. -botania.page.elfMessage5=&oWe have taken the liberty of assigning our best scribes to put together a great set of knowledge from our world we're willing to share, you can find it in your lexicon just as you'd find knowledge from yours. We hope you find it enlightening and that it encourages you to invest in our materials. -botania.page.elfMessage6=&oLast but not least, do keep in mind that if you decide to send something we have not vouched to trade for, we will assume it as a gift and keep it for ourselves, just as a forewarning. We look forward to exchanging resources with you.
    Best Regards, the High Council of Elven Garde. - -# -- THE RESOURCES OF ALFHEIM -botania.entry.elfResources=The Resources of Alfheim -botania.page.elfResources0=&4Alfheim&0 contains a very varied amount of exquisite resources. Sadly though, most of them are extremely scarce and hard to come by due to competition between the various clans. The elves are interested in trading some materials, such as &1Dreamwood&0, &1Elementium&0, &1Pixie Dust&0 or &1Dragonstone&0, resources native to their lands. -botania.page.elfResources1=Trading for &1Dreamwood&0 -botania.page.elfResources2=&1Dreamwood&0, similarly to &1Livingwood&0 can be turned into various &4Decorative Blocks&0, have a look through the &4Decorative Blocks&0 entry under &4Miscelaneous&0 for the recipes. -botania.page.elfResources3=Trading for &1Elementium&0 -botania.page.elfResources4=Trading for &1Pixie Dust&0 -botania.page.elfResources5=Trading for &1Dragonstone&0 -botania.page.elfResources6=The &1Elves&0 are also quite keen on the white posh block from the &4Nether&0, &1Nether Quartz&0, the ones they have on their world are tinted green. This quartz works just like any other quartz, be it normal &1Nether Quartz&0 or any of the decorative variants you can find on the &4Decorative Blocks&0 entry under &4Miscelaneous&0. -botania.page.elfResources7=Trading for &1Elven Quartz&0 -botania.page.elfResources8=Alfheim also has its own variant of &1Glass&0, in the form of &1Alfglass&0. Its look is rather light and its patterns are randomized depending on where it's placed. -botania.page.elfResources9=Trading for &1Alfglass&0 - -# -- RITUAL OF GAIA -botania.entry.gaiaRitual=Ritual of Gaia -botania.page.gaiaRitual0=The &4Ritual of Gaia&0 is a procedure often enacted by the elves, which is the only way to acquire &1Gaia Spirits&0, which are essences of the power of the Goddess of Gaia herself.
    This ritual required an &4Active&0 &1Beacon&0 with some &1Gaia Pylons&0 (read on) one level above the beacon as the altar, as well as a single &1Terrasteel Ingot&0 as a sacrifice. -botania.page.gaiaRitual1=Creating &1Gaia Pylons&0 -botania.page.gaiaRitual2=Place the pylons (1 block above the beacon) -botania.page.gaiaRitual3=To start the ritual, simply shift-right click the &1Beacon&0 block with a &1Terrasteel Ingot&0, take a step back and prepare to fight for your life. Good preparation is required, as the fight with the &4Guardian of Gaia&0 can be even harder than that of the &4Wither&0. Upon defeating the &4Guardian&0, one can collect their prize, a handful of &1Spirits of Gaia&0. -botania.page.gaiaRitual4=A few pointers to take in mind are as follows. Enchanted &1Elementium Armor&0 is highly recommended, even more so than conventional &1Diamond Armor&0 due to the &1Pixies&0 it can spawn.
    The effect on the &1Beacon&0 is nullified during the battle, that should be taken in mind when preparing.
    Lastly, stay away from the purple. - -# - MISCLANEOUS -# -- UNSTABLE CUBE -botania.entry.unstableBlocks=Unstable Cubes -botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. -botania.page.unstableBlocks1=They look fancy -botania.page.unstableBlocks2=And they come in all 16 colors -botania.page.unstableBlocks3=There's also a way of creating a different version of these that releases an extremely larger amount of energy, this time in the form of a beam towards the sky that extends into a cloud of sorts. This one also seems to be disableable via a &4Redstone Signal&0, it's called an &1Unstable Beacon&0, as it looks like one somehow. -botania.page.unstableBlocks4=Fireworks? -botania.page.unstableBlocks5=Combined entropy -botania.page.unstableBlocks6=It's also possible, by using the &1Unstable Beacons&0, to turn them into a manageable and portable utility, in the form of the &1Signal Flare&0.
    This gun of sorts shoots a colored round into the sky that lasts a few seconds, it also stuns any nearby enemies for just as long. -botania.page.unstableBlocks7=Shoot in case of titan - -# -- DECORATIVE BLOCKS -botania.entry.decorativeBlocks=Decorative Blocks -botania.page.decorativeBlocks0=Past functionality, quite a few decorative blocks are available to make your builds look better.
    Starting off. It's possible to turn blocks of &1Livingrock&0 and &1Livingwood&0 into decorative blocks. Each of them features 4 different decorative variations. -botania.page.decorativeBlocks1=Livingrock bricks. -botania.page.decorativeBlocks2=Mossing the bricks -botania.page.decorativeBlocks3=Cracking the bricks -botania.page.decorativeBlocks4=Framing the bricks -botania.page.decorativeBlocks5=Turning wood into planks -botania.page.decorativeBlocks6=Mossing the planks -botania.page.decorativeBlocks7=Framing the planks -botania.page.decorativeBlocks8=Pattern planks -botania.page.decorativeBlocks9=Glimmering livingwood -botania.page.decorativeBlocks10=Carrying on, by combining &1Nether Quartz&0 with all sorts of other substances, it's possible to create a wide array of other decorative &1Quartz&0 blocks.
    As expected, all these items can be crafted into all their decorative block counterparts just like regular &1Quartz&0 blocks are crafted. -botania.page.decorativeBlocks11=Smokey Quartz -botania.page.decorativeBlocks12=Mana Quartz -botania.page.decorativeBlocks13=Blaze Quartz -botania.page.decorativeBlocks14=Lavender Quartz -botania.page.decorativeBlocks15=Redquartz -botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Reed Blocks&0, &1Thatch&0, &1Roof Tiles&0 and a few new &1Bricks&0.
    All these also can be crafted into both stairs and slabs. -botania.page.decorativeBlocks17=Crafting &1Reed Blocks&0 -botania.page.decorativeBlocks18=Crafting &1Thatch&0 -botania.page.decorativeBlocks19=Crafting &1Roof Tiles&0 -botania.page.decorativeBlocks20=Crafting &1Hellish Bricks&0 -botania.page.decorativeBlocks21=Crafting &1Soul Bricks&0 -botania.page.decorativeBlocks22=Crafting &1Frosty Bricks&0 - -# -- DISPENSER TWEAKS -botania.entry.dispenserTweaks=Dispenser Tweaks -botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can also plant all sorts of crops, from &1Seeds&0, &1Potatos&0 or &1Carrots&0 to even &1Nether Wart&0. The crop is planted in the block right in front of the dispenser.
    The &1Dispensers&0 can also use the &1Wand of the Forest&0 for some specific tasks such as triggering a &1Runic Altar&0. - -# -- GLIMMERING FLOWERS -botania.entry.shinyFlowers=Glimmering Flowers -botania.page.shinyFlowers0=By combining your typical &1Mystical Flowers&0 with some &1Glowstone Dust&0, you can make them sparkle even brighter, and emit actual physical light, of the same brightness as a &1Glowstone Block&0.
    With some &1Dirt&0 and &1Pasture Seeds&0 it's possible to turn them into a miniature floating island that will not only emit light, but also look very fancy indeed. -botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny -botania.page.shinyFlowers2=Like Laputa but (a lot) tinier - -# -- PRISMARINE -botania.entry.prismarine=Prismarine -botania.page.prismarine0=&1Prismarine&0 is an interesting component and building block. Some scholars even go as far as to say it comes from &4the future&0.
    To create it, one requires an &1Alchemy Catalyst&0. Simply tossing some &1Nether Quartz&0 into a &1Mana Pool&0 with the catalyst attached to it will get some of this material. -botania.page.prismarine1=There's various building blocks that can be created using the &1Prismarine Shards&0, to which all but the &1Sea Lantern&0 can be turned into their &1Stair&0 and &1Slab&0 variants. -botania.page.prismarine2=Creating &1Prismarine Shards&0 -botania.page.prismarine3=Crafting &1Prismarine&0 -botania.page.prismarine4=Crafting &1Prismarine Bricks&0 -botania.page.prismarine5=Crafting &1Dark Prismarine&0 -botania.page.prismarine6=Crafting the &1Sea Lantern&0 - -# -- NATURAL SHEDDING -botania.entry.shedding=Natural Shedding -botania.page.shedding0=The living and unliving beings that inhabit our lands don't live in a static state. It's common for pieces of their body to fall out, or for them to drop things, or for them to extrude substances. The following pages list some such items that can come from such entities. - -# -- TINY POTATO -botania.entry.tinyPotato=Tiny Potato -botania.page.tinyPotato0=It's a tiny potato, it believes in you, you can do the thing.
    No really, that's it, by tossing a &1Potato&0 in a &1Mana Pool&0, the potato gains a little lively essence and happy feeling. It's a lively one, giving it a right click will make it even more so! -botania.page.tinyPotato1=Put it on Kickstarter, it'll work - -# -- HEAD CREATION -botania.entry.headCreating=Head Creation -botania.page.headCreating0=A typical incantation of the Elves, combining a few resources and a &1Name Tag&0 allows for the creation of a replica of sorts of the head of the person described in the tag. How it works isn't really known, but it seems to be possible to replicate it with a &1Runic Altar&0. -botania.page.headCreating1=Get your head in the game - -# -- AZULEJO -- http://en.wikipedia.org/wiki/Azulejo -botania.entry.azulejo=Azulejos -botania.page.azulejo0=&1Azulejos&0 are a type of decorative block, simply put, they are tileable patterns of blue and white. To create them, one would simply mix a piece of &1Lapis Lazulli&0 with a &1Block of Quartz&0.
    From there, placing it in the crafting grid allows for cycling between the twelve different patterns. -botania.page.azulejo1=The various patterns -botania.page.azulejo2=Crafting a block of &1Azulejo&0 -botania.page.azulejo3=Cycling between the patterns - -# -- STARFIELD CREATOR -botania.entry.starfield=Starfield Creator -botania.page.starfield0=The &1Starfield Creator&0 does exactly as it says, by releasing elven energies into the air, if it's placed in the world, during night time it will create a starry sky that extends for a fair distance. -botania.page.starfield1=Twinkle twinkle +tile.botania:storage2.name=Bloque de Elementium \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 9c25c6f85..4c51610a7 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -8,7 +8,6 @@ # MISC itemGroup.Botania=Botania -generator.botania-skyblock=Garden of Glass generator.botania-skyblock.info=Не рекомендуется для новичков botaniamisc.nextPage=След. страница @@ -71,60 +70,8 @@ botaniamisc.wandMode.bind=Режим привязки botaniamisc.wandMode.function=Функциональный режим botaniamisc.playVideo=Просмотреть видео botaniamisc.brewOf=Настой %s -botaniamisc.needsCatalysts=No matter how hard you try to push the Ingot into the Beacon, nothing seems to happen, perhaps your configuration of catalyst pylons might be off. -botaniamisc.peacefulNoob=You try to offer the Ingot, but the peaceful vibes of your world prevent you from doing so. Perhaps you should do something about that. -botaniamisc.notInfused=Not Infused -botaniamisc.getALife=Get a Life -botaniamisc.floatingPrefix=Floating %s -botaniamisc.unsetRecipe=[No Recipe] Right click to set: -botaniamisc.cantCraft=Not enough Materials! -botaniamisc.lotusDesc=It emits strong magical vibes -botaniamisc.hasClip=&6Has Lens Clip -botaniamisc.clipEmpty=(Empty) -botaniamisc.armorset=&bArmor Set&r: -botaniamisc.craftToAddWill=&aCraft with a Terrasteel Helmet to add the following effect: -botaniamisc.requestMsg=Requested %d x "%s" out of %d. %d taken. -botaniamisc.nearIndex0=Corporea Index nearby! -botaniamisc.nearIndex1=Anything you say will be -botaniamisc.nearIndex2=intercepted as a request -botaniamisc.startTutorial=Start Tutorial -botaniamisc.tutorialStarted=You have started your tutorial, follow the red arrows and read the contents to be guided through the basics of Botania! -botaniamisc.tutorialEnded=Your tutorial is over, you should now have a basic idea of how Botania works, make sure to read through the other pages at your leisure to learn more ways of using the mod. -botaniamisc.cosmeticBauble=&oCosmetic -botaniamisc.hasCosmetic=&oHas Cosmetic Override: &r%s -botaniamisc.typeToSearch=(type to search) botaniamisc.viewOnline=Смотреть онлайн -botaniamisc.history=History -botaniamisc.historyLong=Lookup History -botaniamisc.historyDesc=See the last entries visited -botaniamisc.lexiconOptions0=Botania Options -botaniamisc.lexiconOptions1=Configure Botania from ingame -botaniamisc.lexiconOptions2=Some options might need a game restart -botaniamisc.hasPhantomInk=&bTinged with Phantom Ink -botaniamisc.pinkinatorDesc=Apply directly to Wither -botaniamisc.relicUnbound=&6Relic&7, Unbound -botaniamisc.relicSoulbound=&6Relic&7, Soulbound to &f%s -botaniamisc.notYourSagittarius=&4This relic is not yours -botaniamisc.diceRoll=The dice lands on a %s, you notice that it transforms into something else. -botaniamisc.dudDiceRoll=The dice lands on a %s, it seemed to vanish into thin air afterward. -botaniamisc.blockAway=1 Block Away -botaniamisc.blocksAway=%s Blocks Away -botaniamisc.clickToTeleport=Right click to Teleport -botaniamisc.clickToRemoveWarp=Shift-left click to Remove -botaniamisc.unboundWarp=Unbound Warp Point -botaniamisc.clickToAddWarp=Right click to bind to this position -botaniamisc.hasKeepIvy=Has Resolute Ivy -botaniamisc.active=&aActive -botaniamisc.inactive=&cInactive botaniamisc.achievements=Достижения Botania -botaniamisc.dropIkea=&bDropping this item will break it down into its components -botaniamisc.hourglassLock=This Hourglass is locked. Right click it with a Wand of the Forest to unlock it. -botaniamisc.locked=Locked -botaniamisc.stopped=Stopped -botaniamisc.lockedStopped=Locked, Stopped -botaniamisc.visualize=Visualize -botaniamisc.unvisualize=Unvisualize -botaniamisc.rightClickToAnchor=Right click any block to anchor this Structure Preview to it botaniamisc.structureComplete=Структура построена! botaniamisc.materialsRequired=Необходимые материалы botaniamisc.challenges=Испытания @@ -134,29 +81,9 @@ botaniamisc.completed=Выполнено botaniamisc.notCompleted=Не выполнено botaniamisc.info=Информация botaniamisc.challengeInfo=Узнать об испытаниях -botaniamisc.skyblockRangeTooLow=Invalid range, must be at least 250. -botaniamisc.skyblockRangeTooHigh=Invalid range, can't be higher than 10000000 (10 million). botaniamisc.hideNotes=Спрятать заметки botaniamisc.showNotes=Показать заметки botaniamisc.notes=Заметки -botaniamisc.pay2win=Upgrade your Mana Pool to infuse this item - -# NEI INTEGRATION -botania.nei.brewery=Botanical Brewery -botania.nei.elvenTrade=Elven Trade -botania.nei.floatingFlowers=Floating Flowers -botania.nei.manaPool=Mana Infusion -botania.nei.petalApothecary=Petal Apothecary -botania.nei.runicAltar=Runic Altar -botania.nei.pureDaisy=Pure Daisy - -# BUILDCRAFT INTEGRATION -botania.triggers.manaDetector=Mana Burst -botania.triggers.manaEmpty=Mana Empty -botania.triggers.manaSpace=Space for Mana -botania.triggers.manaContains=Contains Mana -botania.triggers.manaFull=Mana Full -botania.triggers.runeAltarCanCraft=Altar Can Craft # COLORS botania.color0=Белый @@ -177,28 +104,6 @@ botania.color14=Красный botania.color15=Чёрный botania.color16=Радужный -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - -# ZODIAC SIGNS -botania.sign0=Aries -botania.sign1=Taurus -botania.sign2=Gemini -botania.sign3=Cancer -botania.sign4=Leo -botania.sign5=Virgo -botania.sign6=Libra -botania.sign7=Scorpio -botania.sign8=Sagittarius -botania.sign9=Capricorn -botania.sign10=Aquarius -botania.sign11=Pisces - # WINGS botania.wings0=Без крыльев botania.wings1=Крылья: Флигель @@ -211,60 +116,6 @@ botania.wings7=Крылья: Сильф botania.wings8=Крылья: Мега-ультра-курица botania.wings9=Крылья: Тот самый -# ARMOR SETS -botania.armorset.manasteel.name=Mana Affinity -botania.armorset.manasteel.desc=10% less Mana cost on Mana Tools -botania.armorset.elementium.name=Great Fairy's Blessing -botania.armorset.elementium.desc=Chance for pixies to apply potion effects -botania.armorset.terrasteel.name=Will of the Ancients -botania.armorset.terrasteel.desc0=20% less Mana cost on Mana Tools -botania.armorset.terrasteel.desc1=Regen even if hunger isn't topped off -botania.armorset.will0.desc=Critical Hits apply a strong weakness effect (Will of Ahrim) -botania.armorset.will1.desc=Critical Hit damage increases with lower HP (Will of Dharok) -botania.armorset.will2.desc=Critical Hits heal for a portion of damage dealt (Will of Guthan) -botania.armorset.will3.desc=Critical Hits apply a strong slowness effect (Will of Torag) -botania.armorset.will4.desc=Critical Hits pierce through armor (Will of Verac) -botania.armorset.will5.desc=Critical Hits apply a wither effect (Will of Karil) -botania.armorset.will0.shortDesc=Critical Hits apply a strong weakness effect -botania.armorset.will1.shortDesc=Critical Hit damage increases with lower HP -botania.armorset.will2.shortDesc=Critical Hits heal for a portion of damage dealt -botania.armorset.will3.shortDesc=Critical Hits apply a strong slowness effect -botania.armorset.will4.shortDesc=Critical Hits pierce through armor -botania.armorset.will5.shortDesc=Critical Hits apply a wither effect - -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=Знание людей botania.knowledge.alfheim=Знание &aЭльфов&7 @@ -345,20 +196,6 @@ botania.versioning.flavour32=Поздравляем! Вы 100,000 игрок Bot botania.versioning.flavour33=Перед обновлением версии Botania, хотели ли бы Вы установить ask toolbar? botania.versioning.flavour34=Возвращаемся на беговую дорожку обновлений Botania. Веселье не требуется. #angbadang botania.versioning.flavour35=Вы станете магической девочкой за обновление Botania? -botania.versioning.flavour36=Why did the Botania Update cross the road? To get to the client side. -botania.versioning.flavour37=Take that old build, watch it burn, sink in the river the updates I learned. -botania.versioning.flavour38=This new Botania Update fits perfectly in the Super Health Space. -botania.versioning.flavour39=Introducing the new Botania Update, now with 0% more numbers and GUIs. -botania.versioning.flavour40=This is my Botania Update. There are many like it but this one is mine. -botania.versioning.flavour41=What is the air-speed velocity of an unladen Botania Update? -botania.versioning.flavour42=If you go look in the lang files, this flavour text is #42. That means you should install this Update. -botania.versioning.flavour43=That's impossible, a Botania Update doesn't break down. It's a portuguese. -botania.versioning.flavour44=Look at the update, now back at me, now back at the update. There's a download button there, moron. -botania.versioning.flavour45=No, you can't have fries with your Botania Update. -botania.versioning.flavour46=You were expecting Botania to be up to date, but it was me, Dio! -botania.versioning.flavour47=Rumour says if you move the truck there's a Botania Update below it. -botania.versioning.flavour48=I wonder when Bevo's updating his pack... -botania.versioning.flavour49=1 Botania Update on the wall, 1 Botania Update on the wall. botania.versioning.outdated=У Вас установлена %s сборка Botania, последняя сборка - %s. botania.versioning.updateMessage=["Нажмите, чтобы... [",{"text":"загрузить","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы автоматически загрузить последнюю версию","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Веб-сайт","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти на сайт мода","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Изменения","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Нажмите эту кнопку, чтобы перейти к изменениям версии","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Началась загрузка %s. Пожалуйста не вытаскивайте Ваш жёсткий диск. Наслаждайтесь ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Подумайте о поддержке ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" на [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Нажмите сюда, чтобы перейти на Patreon Vazkii","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] @@ -395,144 +232,13 @@ entity.Botania.botania:spark.name=Искра entity.Botania.botania:thrownItem.name=Брошенный предмет entity.Botania.botania:magicMissile.name=Магический снаряд entity.Botania.botania:thornChakram.name=Шипастая чакра -entity.Botania.botania:corporeaSpark.name=Corporea Spark entity.Botania.botania:enderAirBottle.name=Бутылка воздуха Края entity.Botania.botania:poolMinecart.name=Вагонетка с бассейном для маны entity.Botania.botania:pinkWither.name=Розовый иссушитель -entity.Botania.botania:playerMover.name=Luminizer Beam entity.Botania.botania:manaStorm.name=Эпицентр манашторма entity.Botania.botania:babylonWeapon.name=Оружие казначейства entity.Botania.botania:fallingStar.name=Падающая звезда -# ACHIEVEMENT NAMES + DESC -achievement.botania:flowerPickup=Sky of Beginning -achievement.botania:flowerPickup.desc=Pick up a Mystical Flower from the world -achievement.botania:lexiconUse=A Realistical Logical Ideologist -achievement.botania:lexiconUse.desc=Open a Lexica Botania and have a look through the index -achievement.botania:daybloomPickup=Daybreak Arrival -achievement.botania:daybloomPickup.desc=Make a Daybloom in a Petal Apothecary -achievement.botania:manaPoolPickup=Vivid Wave -achievement.botania:manaPoolPickup.desc=Upgrade a Diluted Mana Pool to a normal one -achievement.botania:endoflamePickup=Meltdown -achievement.botania:endoflamePickup.desc=Create an Endoflame to boost Mana production -achievement.botania:tinyPotatoPet=Just Be Friends -achievement.botania:tinyPotatoPet.desc=Make a Tiny Potato and pet it -achievement.botania:sparkCraft=Live Drive -achievement.botania:sparkCraft.desc=Make a Spark to help transfer Mana around -achievement.botania:baubleWear=Inner Arts -achievement.botania:baubleWear.desc=Craft any variety of Bauble and wear it -achievement.botania:manaCookieEat=Rotten Heresy and Chocolate -achievement.botania:manaCookieEat.desc=Infuse and eat a delicious Mana Cookie -achievement.botania:runePickup=Lilium Doll -achievement.botania:runePickup.desc=Use a Runic Altar to create a Rune -achievement.botania:manaBlasterShoot=M'aider Stranded Girl -achievement.botania:manaBlasterShoot.desc=Craft and fire a Mana Blaster -achievement.botania:tiaraWings=Heart Shooter -achievement.botania:tiaraWings.desc=Craft and adorn a Flügel Tiara with Flügel Wings -achievement.botania:terrasteelPickup=Dancer in the Dark -achievement.botania:terrasteelPickup.desc=Conjure a Terrasteel Ingot using a Terrestrial Agglomeration Plate -achievement.botania:elfPortalOpen=World Calling -achievement.botania:elfPortalOpen.desc=Open a portal to the realm of Alfheim -achievement.botania:gaiaGuardianKill=Dead and Seek -achievement.botania:gaiaGuardianKill.desc=Summon and slay a Gaia Guardian for a Ritual of Gaia -achievement.botania:terrasteelWeaponCraft=Remote Paranoia -achievement.botania:terrasteelWeaponCraft.desc=Arm yourself with a weapon made of Terrasteel -achievement.botania:kekimurusPickup=After-School Stride -achievement.botania:kekimurusPickup.desc=Create a Kekimurus to help produce large quantities of Mana -achievement.botania:heiseiDreamPickup=Heisei Cataclysm -achievement.botania:heiseiDreamPickup.desc=Create a Heisei Dream to cause havoc on mobs -achievement.botania:dirtRodCraft=Rockbell -achievement.botania:dirtRodCraft.desc=Craft a dirty sti- er... Rod of the Lands -achievement.botania:spawnerMoverUse=I can take off my (redacted) -achievement.botania:spawnerMoverUse.desc=Use a Life Aggregator to transport a Monster Spawner -achievement.botania:enderAirMake=Imitation Air -achievement.botania:enderAirMake.desc=Collect a Bottle of Ender Air -achievement.botania:corporeaCraft=Drop Pop Candy -achievement.botania:corporeaCraft.desc=Craft a block that makes use of the Corporea Network - -achievement.botania:signalFlareStun=See the Lights -achievement.botania:signalFlareStun.desc=Stun 100 or more mobs at once with a Signal Flare -achievement.botania:l20ShardUse=Out of Step -achievement.botania:l20ShardUse.desc=Raise the ground up to the sky with a Power XX Shard of Laputa -achievement.botania:gaiaGuardianNoArmor=Mythologia's End -achievement.botania:gaiaGuardianNoArmor.desc=Slay a Gaia Guardian without wearing any armor at any point during the fight -achievement.botania:rankSSPick=Talent Shredder -achievement.botania:rankSSPick.desc=Dig through the world using a rank SS Terra Shatterer -achievement.botania:superCorporeaRequest=Invader Girl -achievement.botania:superCorporeaRequest.desc=Successfully request 50,000 or more of a single item in a Corporea Index -achievement.botania:pinkinator=Decorator -achievement.botania:pinkinator.desc=Put to use The Pinkinator - -achievement.botania:infiniteFruit=Innocentia -achievement.botania:infiniteFruit.desc=Be rewarded The Fruit of Grisaia for a heroic feat -achievement.botania:kingKey=A Fake, Fake Psychotropic -achievement.botania:kingKey.desc=Be rewarded the Key of the King's Law for a heroic feat -achievement.botania:flugelEye=Angel of Death -achievement.botania:flugelEye.desc=Be rewarded the Eye of the Flügel for a heroic feat -achievement.botania:thorRing=One Step Layered -achievement.botania:thorRing.desc=Be rewarded the Ring of Thor for a heroic feat -achievement.botania:odinRing=Lost Time Memory -achievement.botania:odinRing.desc=Be rewarded the Ring of Odin for a heroic feat -achievement.botania:lokiRing=Arithmetic -achievement.botania:lokiRing.desc=Be rewarded the Ring of Loki for a heroic feat -achievement.botania:aesirRing=As the Gods Say -achievement.botania:aesirRing.desc=Create the Ring of the Aesir by combining the Rings of the Gods - -achievement.botania:nullFlower=Take it Easy -achievement.botania:nullFlower.desc=Find a bug that lets you have an undefined Botania Flower. Don't forget to report it! -achievement.botania:desuGun=Two-Faced Lovers -achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN -# ^ Don't localize - -# CHALLENGE LEVELS -botania.challengelevel.easy=Easy -botania.challengelevel.normal=Normal -botania.challengelevel.hard=Hard -botania.challengelevel.lunatic=Lunatic - -# CHALLENGE TEXT -botania.challenge.flowerFarm=Flower Farm -botania.challenge.flowerFarm.desc=Create an automated farm of all 16 colors of botania flowers. Bonus points if the flowers are sorted. -botania.challenge.recordFarm=Record Farm -botania.challenge.recordFarm.desc=Create a system that produces records through the death of creepers at the hand of skeletons. Bonus points if it doesn't require a player's presence. -botania.challenge.reedFarm=Sugar Cane Farm -botania.challenge.reedFarm.desc=Create an automated sugar cane farm. Bonus points for not using pistons. -botania.challenge.cobbleGen=Cobble Generator -botania.challenge.cobbleGen.desc=Create an automated cobblestone generator and harvester. Bonus points if it also creates smooth stone without a furnace. -botania.challenge.pureDaisy=Auto Pure Daisy -botania.challenge.pureDaisy.desc=Completely automate the Pure Daisy. Bonus points if only one spreader is used and/or if the wood/stone input is also automated. -botania.challenge.battery=Mana Battery -botania.challenge.battery.desc=Create a Mana Battery, a system where mana enters one pool and comes out of another, with a good amount of pools as a buffer. Bonus points if the input or output can be changed. - -botania.challenge.apothecaryRefill=Apothecary Refiller -botania.challenge.apothecaryRefill.desc=Create a system that automatically refills the Petal Apothecary if it's empty. Bonus points if the system can also automatically create flowers, given the components. -botania.challenge.treeFarm=Tree Farm -botania.challenge.treeFarm.desc=Create an automated, self-sustaining tree farm. Bonus points if it can do multiple types of tree. -botania.challenge.fullCropFarm=Full Crop Farm -botania.challenge.fullCropFarm.desc=Create a crop farm with all types of crops (wheat, carrot, potato, melon, pumpkin, cocoa and nether wart) that runs at full efficiency. Bonus points if the outputs are sorted. -botania.challenge.animalFarm=Animal Farm -botania.challenge.animalFarm.desc=Create an automated animal farm with all farmable animal types. Bonus points if the food doesn't need to be put in manually. -botania.challenge.boneMealFarm=Bone Meal-type Farm -botania.challenge.boneMealFarm.desc=Create an automated farm that utilizes bone meal to quickly grow crops on demand. Bonus points if the Drum of the Wild isn't used. -botania.challenge.orechid=Automated Orechid -botania.challenge.orechid.desc=Create a system that allows for the Orechid flower to be fully automated. Bonus points if the output is smelted and sorted. - -botania.challenge.mobTower=Spawning Tower -botania.challenge.mobTower.desc=Create a tower style mob farm. Mobs must be sorted and put into specific chambers at the end. Spawners can be used. Bonus points if the farm functions at 100% efficiency without a player's interaction. -botania.challenge.entropinnyumSetup=Entropinnyum Setup -botania.challenge.entropinnyumSetup.desc=Create a system that automatically crafts TNT and safely feeds it to an Entropinnyum flower, creating mana. Bonus points if the sand and gunpowder required for the TNT don't need to be put in manually. -botania.challenge.spectrolusSetup=Spectrolus Setup -botania.challenge.spectrolusSetup.desc=Create a system that feeds a Spectrolus, generating mana. Aside from raw mana, no items may be input from outside the system. Bonus points if it operates at 100% efficiency, never wasting any wool. -botania.challenge.potionBrewer=Automated Brewing -botania.challenge.potionBrewer.desc=Create a system that can make all types of brews automatically on demand. Bonus points if it keeps a set of incense always ignited in the player's base. - -botania.challenge.kekimurusSetup=Kekimurus Setup -botania.challenge.kekimurusSetup.desc=Fully automate a Kekimurus, every part of the system must be automated and self-sustaining. Bonus points if only one crafty crate is used. -botania.challenge.autoQuarry=Automated Quarry -botania.challenge.autoQuarry.desc=Create a mining quarry that digs for ores and stone underground. It should dig out chunks of land and output all of the mined resources, sorting them. Bonus points if it can relocate automatically after it's done with an area. -botania.challenge.runeCrafter=Rune Crafter -botania.challenge.runeCrafter.desc=Create a system that can craft all runes on demand or keep them stocked. Every part of this system must be automated and self-sustaining, including the item inputs. Bonus points if only one Runic Altar block is used. You must be pretty crazy to try this one. - # BLOCK NAMES tile.botania:flower0.name=Мистический белый цветок tile.botania:flower1.name=Мистический оранжевый цветок From 4aeed07f75eca186c9e753cad30694b003c5cbdc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 20:27:21 -0500 Subject: [PATCH 662/935] Clean up English present in nl_NL, pt_BR --- .../resources/assets/botania/lang/nl_NL.lang | 113 ------ .../resources/assets/botania/lang/pt_BR.lang | 364 +----------------- 2 files changed, 1 insertion(+), 476 deletions(-) diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index 0cc377119..f5530eef7 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -11,9 +11,6 @@ itemGroup.Botania=Botania generator.botania-skyblock=Glazen Tuin generator.botania-skyblock.info=Niet aanbevolen voor Botania beginners -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=Volgende pagina botaniamisc.prevPage=Vorige pagina botaniamisc.back=Terug @@ -190,14 +187,6 @@ botania.color14=Rood botania.color15=Zwart botania.color16=Regenboog -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # ZODIAC SIGNS botania.sign0=Ram botania.sign1=Stier @@ -250,39 +239,6 @@ botania.armorset.will3.shortDesc=Voltreffers geven een sterk traagheid effect botania.armorset.will4.shortDesc=Voltreffers doordringen armor botania.armorset.will5.shortDesc=Voltreffers geven aantastend effect -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=Minecraft Wijsheid botania.knowledge.alfheim=&aElven&7 Wijsheid @@ -330,71 +286,6 @@ worldgen.flower.tallChance=Worldgen lange bloemen kans worldgen.mushroom.quantity=Worldgen Paddenstoel hoeveelheid # VERSION CHECKING -botania.versioning.flavour0=Er is een Botania update! -botania.versioning.flavour1=Er is een Botania update! -botania.versioning.flavour2=Er is een Botania update! -botania.versioning.flavour3=Er is een Botania update! -botania.versioning.flavour4=Er is een Botania update! -botania.versioning.flavour5=Er is een Botania update! -botania.versioning.flavour6=Er is een Botania update! -botania.versioning.flavour7=Er is een Botania update! -botania.versioning.flavour8=Er is een Botania update! -botania.versioning.flavour9=Er is een Botania update! -botania.versioning.flavour10=Er is een Botania update! -botania.versioning.flavour11=Er is een Botania update! -botania.versioning.flavour12=Er is een Botania update! -botania.versioning.flavour13=Er is een Botania update! -botania.versioning.flavour14=Er is een Botania update! -botania.versioning.flavour15=Er is een Botania update! -botania.versioning.flavour16=Er is een Botania update! -botania.versioning.flavour17=Er is een Botania update! -botania.versioning.flavour18=Er is een Botania update! -botania.versioning.flavour19=Er is een Botania update! -botania.versioning.flavour20=Er is een Botania update! -botania.versioning.flavour21=Er is een Botania update! -botania.versioning.flavour22=Er is een Botania update! -botania.versioning.flavour23=Er is een Botania update! -botania.versioning.flavour24=Er is een Botania update! -botania.versioning.flavour25=Er is een Botania update! -botania.versioning.flavour26=Er is een Botania update! -botania.versioning.flavour27=Er is een Botania update! -botania.versioning.flavour28=Er is een Botania update! -botania.versioning.flavour29=Er is een Botania update! -botania.versioning.flavour30=Er is een Botania update! -botania.versioning.flavour31=Er is een Botania update! -botania.versioning.flavour32=Er is een Botania update! -botania.versioning.flavour33=Er is een Botania update! -botania.versioning.flavour34=Er is een Botania update! -botania.versioning.flavour35=Er is een Botania update! -botania.versioning.flavour36=Er is een Botania update! -botania.versioning.flavour37=Er is een Botania update! -botania.versioning.flavour38=Er is een Botania update! -botania.versioning.flavour39=Er is een Botania update! -botania.versioning.flavour40=Er is een Botania update! -botania.versioning.flavour41=Er is een Botania update! -botania.versioning.flavour42=Er is een Botania update! -botania.versioning.flavour43=Er is een Botania update! -botania.versioning.flavour44=Er is een Botania update! -botania.versioning.flavour45=Er is een Botania update! -botania.versioning.flavour46=Er is een Botania update! -botania.versioning.flavour47=Er is een Botania update! -botania.versioning.flavour48=Er is een Botania update! -botania.versioning.flavour49=Er is een Botania update! -botania.versioning.flavour50=Er is een Botania update! -botania.versioning.flavour51=Er is een Botania update! -botania.versioning.flavour52=Er is een Botania update! -botania.versioning.flavour53=Er is een Botania update! -botania.versioning.flavour54=Er is een Botania update! -botania.versioning.flavour55=Er is een Botania update! -botania.versioning.flavour56=Er is een Botania update! -botania.versioning.flavour57=Er is een Botania update! -botania.versioning.flavour58=Er is een Botania update! -botania.versioning.flavour59=Er is een Botania update! -botania.versioning.flavour60=Er is een Botania update! -botania.versioning.flavour61=Er is een Botania update! -botania.versioning.flavour62=Er is een Botania update! -botania.versioning.flavour63=Er is een Botania update! -botania.versioning.flavour64=Er is een Botania update! botania.versioning.outdated=Je gebruikt Botania versie %s, de laatste versie is %s. botania.versioning.updateMessage=["Klik voor... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Hier klikken om automatisch bij te werken naar de laatste versie","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om naar de website van de mod te gaan","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om de lijst met wijzigingen te zien","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] botania.versioning.startingDownload=[{"text":"Begin met downloaden van %s. Koppel je hardeschijf niet af. Plezier van ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Overweeg ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" te ondersteunen op [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Klik hier om naar Vazkii's Patreon te gaan","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] @@ -465,7 +356,6 @@ achievement.botania:manaBlasterShoot=Oh Yeah achievement.botania:manaBlasterShoot.desc=Maak en schiet een Mana Blaster achievement.botania:tiaraWings=Hartendief achievement.botania:tiaraWings.desc=Maak en gebruik een Flügel Tiara met Flügel vleugels -achievement.botania:terrasteelPickup=Dancer in the Dark achievement.botania:terrasteelPickup.desc=Roep een staaf Terrastaal op met een Bodemverbindingsplaat achievement.botania:elfPortalOpen=De Wereld Roept achievement.botania:elfPortalOpen.desc=Open een poort naar het Elvenrijk @@ -538,11 +428,8 @@ achievement.botania:lokiRing.desc=Verdien de Ring van Loki voor een heldhaftige achievement.botania:aesirRing=Zoals de Goden zeggen achievement.botania:aesirRing.desc=Vervaardig de Ring van de Aesir door de Ring der Goden te combineren -achievement.botania:nullFlower=Take it Easy achievement.botania:nullFlower.desc=Vindt een bug die je een ongedefinieerde Botania bloem geeft. Niet vergeten te melden! achievement.botania:desuGun=Tweezijdige Liefde -achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN -# ^ Don't localize # CHALLENGE LEVELS botania.challengelevel.easy=Makkelijk diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 659b985b8..5508d6d03 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -11,9 +11,6 @@ itemGroup.Botania=Botania generator.botania-skyblock=Jardim de Vidro generator.botania-skyblock.info=Não recomendado para iniciantes -# Something that is not localized, translators, do NOT change this line. -botaniamisc.noloc=botaniamisc.noloc - botaniamisc.nextPage=Próxima página botaniamisc.prevPage=Página anterior botaniamisc.back=Voltar @@ -469,108 +466,57 @@ entity.Botania.botania:babylonWeapon.name=Arma da Tesouraria entity.Botania.botania:fallingStar.name=Estrela Cadente # ACHIEVEMENT NAMES + DESC -achievement.botania:flowerPickup=Sky of Beginning achievement.botania:flowerPickup.desc=Colete uma Flor Mística no mundo -achievement.botania:lexiconUse=A Realistical Logical Ideologist achievement.botania:lexiconUse.desc=Olhe o índice do Lexica Botania -achievement.botania:daybloomPickup=Daybreak Arrival achievement.botania:daybloomPickup.desc=Crie uma Daybloom no Boticário de Pétalas -achievement.botania:manaPoolPickup=Vivid Wave achievement.botania:manaPoolPickup.desc=Melhore um Poço de Mana Diluído para um normal -achievement.botania:endoflamePickup=Meltdown achievement.botania:endoflamePickup.desc=Crie uma Endoflame para uma melhor produção de Mana -achievement.botania:tinyPotatoPet=Just Be Friends achievement.botania:tinyPotatoPet.desc=Domestique uma Batatinha -achievement.botania:sparkCraft=Live Drive achievement.botania:sparkCraft.desc=Crie uma Fagulha para ajudar na transferência de Mana -achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=Crie qualquer Bauble e equipe -achievement.botania:manaCookieEat=Rotten Heresy and Chocolate achievement.botania:manaCookieEat.desc=Infunda e coma um Biscoito de Mana -achievement.botania:runePickup=Lilium Doll achievement.botania:runePickup.desc=Use o Altar Rúnico para criar uma Runa -achievement.botania:manaBlasterShoot=M'aider Stranded Girl achievement.botania:manaBlasterShoot.desc=Crie e use um Disparador de Mana -achievement.botania:tiaraWings=Heart Shooter achievement.botania:tiaraWings.desc=Crie e adorne uma Tiara de Flügel com asas -achievement.botania:terrasteelPickup=Dancer in the Dark achievement.botania:terrasteelPickup.desc=Conjure uma Barra de Terrasteel usando a Placa de Aglomeração Terrestre -achievement.botania:elfPortalOpen=World Calling achievement.botania:elfPortalOpen.desc=Abra um portal para o reino de Alfheim -achievement.botania:gaiaGuardianKill=Dead and Seek achievement.botania:gaiaGuardianKill.desc=Invoque e mate um Guardião de Gaia -achievement.botania:terrasteelWeaponCraft=Remote Paranoia achievement.botania:terrasteelWeaponCraft.desc=Arme-se com uma arma feita de Terrasteel -achievement.botania:kekimurusPickup=After-School Stride achievement.botania:kekimurusPickup.desc=Crie uma Kekimurus para produzir grandes quantidades de Mana -achievement.botania:heiseiDreamPickup=Heisei Cataclysm achievement.botania:heiseiDreamPickup.desc=Crie uma Heisei Dream para causar uma rebelião entre os monstros -achievement.botania:dirtRodCraft=Rockbell achievement.botania:dirtRodCraft.desc=Crie um graveto su- er... Cajado das Terras -achievement.botania:spawnerMoverUse=I can take off my (redacted) achievement.botania:spawnerMoverUse.desc=Use um Agregador de Vida para transportar um Invocador de Monstros -achievement.botania:enderAirMake=Imitation Air achievement.botania:enderAirMake.desc=Colete uma Garrafa de ar do Fim -achievement.botania:corporeaCraft=Drop Pop Candy achievement.botania:corporeaCraft.desc=Crie um bloco que faça parte da Rede de Corporea -achievement.botania:cacophoniumCraft=Noisy Lover Soul achievement.botania:cacophoniumCraft.desc=Crie um Cacofônio para irritar seus inimigos -achievement.botania:manaCartCraft=World Domination How-To achievement.botania:manaCartCraft.desc=Crie um Carrinho com Poço de Mana para transporte de mana a longas distâncias -achievement.botania:craftingHaloCraft=Segments Blue achievement.botania:craftingHaloCraft.desc=Crie uma Auréola de Criação para facilitar montagem de items -achievement.botania:manaweaveArmorCraft=Imagination Forest achievement.botania:manaweaveArmorCraft.desc=Faça uma Armadura de Tecido de Mana para melhorar suas varinhas e cajados -achievement.botania:enchanterMake=Odds and Ends achievement.botania:enchanterMake.desc=Crie um Encantador de Mana para ter controle sobre encantamentos -achievement.botania:pollidisiacPickup=Romeo and Cinderella achievement.botania:pollidisiacPickup.desc=Crie uma Pollidisiac, espalhe o amor no ar -achievement.botania:brewPickup=Childhood Blues achievement.botania:brewPickup.desc=Crie um Fermentador Botânico para fazer poções de sua preferência -achievement.botania:terraformRodCraft=World is Mine achievement.botania:terraformRodCraft.desc=Crie um Cajado de Terra Firma e mude o mundo -achievement.botania:bubbellPickup=Deep Sea Girl achievement.botania:bubbellPickup.desc=Crie uma Bubbell para fazer construções sub-aquáticas -achievement.botania:luminizerRide=World's End Dancehall achievement.botania:luminizerRide.desc=Crie alguns Luminizers e os use para transporte -achievement.botania:manaBombIgnite=Under of Fragments achievement.botania:manaBombIgnite.desc=Crie uma Carga de Manastorm, e acenda-a em um lugar distante -achievement.botania:dandelifeonPickup=Donut Hole achievement.botania:dandelifeonPickup.desc=Crie uma Dandelifeon e desafie sua mente -achievement.botania:signalFlareStun=See the Lights achievement.botania:signalFlareStun.desc=Atordoe 100 ou mais monstros com uma única Fagulha Sinalizadora -achievement.botania:l20ShardUse=Out of Step achievement.botania:l20ShardUse.desc=Ergua o solo ao céu com um Fragmento de Laputa Nível XX -achievement.botania:gaiaGuardianNoArmor=Mythologia's End achievement.botania:gaiaGuardianNoArmor.desc=Mate um Guardião de Gaia sem usar armadura em qualquer parte da luta -achievement.botania:rankSSPick=Talent Shredder achievement.botania:rankSSPick.desc=Minere usando um Terra-Destruídor nível SS -achievement.botania:superCorporeaRequest=Invader Girl achievement.botania:superCorporeaRequest.desc=Requisite 50000 ou mais de um único item com o Índice Corporea -achievement.botania:pinkinator=Decorator achievement.botania:pinkinator.desc=Dê um uso ao Pinkinator -achievement.botania:infiniteFruit=Innocentia achievement.botania:infiniteFruit.desc=Seja recompensado com uma Fruta de Grisaia por um ato heróico -achievement.botania:excaliber=Streaming Heart achievement.botania:excaliber.desc=Seja recompensado com a Espada Sagrada Excaliber por um ato heróico -achievement.botania:flugelEye=Angel of Death achievement.botania:flugelEye.desc=Seja recompensado com um Olho dos Flügel por um ato heróico -achievement.botania:thorRing=One Step Layered achievement.botania:thorRing.desc=Seja recompensado com o Anel de Thor por um ato heróico -achievement.botania:odinRing=Lost Time Memory achievement.botania:odinRing.desc=Seja recompensado com o Anel de Odin por um ato heróico -achievement.botania:lokiRing=Arithmetic achievement.botania:lokiRing.desc=Seja recompensado com o Anel de Loki por um ato heróico -achievement.botania:aesirRing=As the Gods Say achievement.botania:aesirRing.desc=Crie um Anel de Aesir com os três anéis dos deuses -achievement.botania:nullFlower=Take it Easy achievement.botania:nullFlower.desc=Encontre algum bug que faça você conseguir uma flor indefinida. Não esqueça de reportá-lo! -achievement.botania:desuGun=Two-Faced Lovers -achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN -# ^ Don't localize # CHALLENGE LEVELS botania.challengelevel.easy=Fácil @@ -579,47 +525,28 @@ botania.challengelevel.hard=Difícl botania.challengelevel.lunatic=Lunático # CHALLENGE TEXT -botania.challenge.flowerFarm=Flower Farm botania.challenge.flowerFarm.desc=Crie uma farm automática das 16 cores de flores básicas do Botania. Pontos extras se elas forem organizadas. -botania.challenge.recordFarm=Record Farm botania.challenge.recordFarm.desc=Crie um sistema que produza discos matando Creepers com Esqueletos. Pontos extras se isso não precisar da presença do jogador. -botania.challenge.reedFarm=Sugar Cane Farm botania.challenge.reedFarm.desc=Crie uma plantação automática de cana. Pontos extras se não usar pistões. -botania.challenge.cobbleGen=Cobble Generator botania.challenge.cobbleGen.desc=Faça uma criação automática de pedregulhos com geração e coleção. Pontos extras se criar pedra normal sem usar fornalhas. -botania.challenge.pureDaisy=Auto Pure Daisy botania.challenge.pureDaisy.desc=Completamente automatize a Margarida Pura. Pontos extras se apenas um Dispersor for usado e/ou se a entrada/saída de pedra/madeira também for automatizada. -botania.challenge.battery=Mana Battery botania.challenge.battery.desc=Crie uma Bateria de Mana, um sistema em que mana entra em um Poço e sái em outro, usando vários Poços como reserva. Pontos extras se ambas entrada e saída podem ser aternadas. -botania.challenge.apothecaryRefill=Apothecary Refiller botania.challenge.apothecaryRefill.desc=Crie um sistema que encha o Boticário de Pétalas com água se estiver vazio. Pontos extras se o sistema também criar plantas, quando dados os componentes. -botania.challenge.treeFarm=Tree Farm botania.challenge.treeFarm.desc=Crie uma plantação auto-suficiente de madeira. Pontos extras se vários tipos de árvores forem usadas. -botania.challenge.fullCropFarm=Full Crop Farm botania.challenge.fullCropFarm.desc=Crie uma plantação de todos tipos de vegetais (trigo, cenoura, batata, melancia, abóbora, cacau e fungo do Nether) que funcione em total eficiência. Pontos extras se os resultados forem organizados. -botania.challenge.animalFarm=Animal Farm botania.challenge.animalFarm.desc=Crie uma fazenda de animais com todos animais reproduzíveis. Pontos extras se a comida for inserida no sistema automaticamente. -botania.challenge.boneMealFarm=Bone Meal-type Farm botania.challenge.boneMealFarm.desc=Crie uma plantação que use farinha de osso para crescer plantas em demanda. Pontos extras se o Tambor da Vida Selvagem não for usado. -botania.challenge.orechid=Automated Orechid botania.challenge.orechid.desc=Crie um sistema que automatize a Orechid. Pontos extras se os minérios forem derretidos e organizados. -botania.challenge.mobTower=Spawning Tower botania.challenge.mobTower.desc=Crie uma mob farm em estilo torre. Mobs precisam ser organizados em câmaras específicas. Invocadores podem ser usados. Pontos extras se isso não precisar do jogador e funcionar em máxima eficiência. -botania.challenge.entropinnyumSetup=Entropinnyum Setup botania.challenge.entropinnyumSetup.desc=Crie um sistema que monte e exploda seguramente Dinamite para uma Entropinnyum, criando mana. Pontos extras se a areia e a pólvora da dinamite são inseridas no sistema automaticamente. -botania.challenge.spectrolusSetup=Spectrolus Setup botania.challenge.spectrolusSetup.desc=Crie um sistema que alimente uma Spectrolus, gerando mana. Exceto mana, nenhum item deve ser inserido de fora do sistema. Pontos extras se operar em máxima eficiênica, sem desperdiçar lã. -botania.challenge.potionBrewer=Automated Brewing botania.challenge.potionBrewer.desc=Crie um sistema que prepare todas poções em demanda. Pontos extras o sistema manter incensos acesos na base do jogador. -botania.challenge.kekimurusSetup=Kekimurus Setup botania.challenge.kekimurusSetup.desc=Completamente automatize uma Kekimurus, todas partes do sistema devem ser automáticas e auto-suficientes. Pontos extras se apenas um Caixote Inteligente for usado. -botania.challenge.autoQuarry=Automated Quarry botania.challenge.autoQuarry.desc=Crie um minerador automático que colete pedra e minérios do subterrâneo. O sistema deve cavar pedaços do mundo e os resultados, organizados. Pontos extras se o sistema se relocar automaticamente depois de terminar uma área. -botania.challenge.runeCrafter=Rune Crafter -botania.challenge.runeCrafter.desc=Crie um sistema que crie em demanda ou que armazene certa quantidade de runas. Todas partes desse sistema devem ser automaticas e auto-suficientes, incluindo a entrada de itens. Pontos extras se apenas um Altar Rúnico for usado. Você não deve ter limites pra tentar isso. +botania.challenge.runeCrafter.desc=Crie umneeds "" sistema que crie em demanda ou que armazene certa quantidade de runas. Todas partes desse sistema devem ser automaticas e auto-suficientes, incluindo a entrada de itens. Pontos extras se apenas um Altar Rúnico for usado. Você não deve ter limites pra tentar isso. # BLOCK NAMES tile.botania:flower0.name=Flor Mística Branca @@ -1701,266 +1628,6 @@ botania.potion.clear=Absolução botania.gui.lexicon.header=Lexica Botania, Edição %s - Índice botania.gui.lexicon.wip=(Esse tópico está em progresso. Nem ao menos está na forma final) -# MUSIC DISCS -item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness -item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence - -# BANNER NAMES -item.banner.botania_flower.black=Black Mystical Flower -item.banner.botania_flower.red=Red Mystical Flower -item.banner.botania_flower.green=Green Mystical Flower -item.banner.botania_flower.brown=Brown Mystical Flower -item.banner.botania_flower.blue=Blue Mystical Flower -item.banner.botania_flower.purple=Purple Mystical Flower -item.banner.botania_flower.cyan=Cyan Mystical Flower -item.banner.botania_flower.silver=Light Gray Mystical Flower -item.banner.botania_flower.gray=Gray Mystical Flower -item.banner.botania_flower.pink=Pink Mystical Flower -item.banner.botania_flower.lime=Lime Mystical Flower -item.banner.botania_flower.yellow=Yellow Mystical Flower -item.banner.botania_flower.lightBlue=Light Blue Mystical Flower -item.banner.botania_flower.magenta=Magenta Mystical Flower -item.banner.botania_flower.orange=Orange Mystical Flower -item.banner.botania_flower.white=White Mystical Flower - -item.banner.botania_lexicon.black=Black Lexicon -item.banner.botania_lexicon.red=Red Lexicon -item.banner.botania_lexicon.green=Green Lexicon -item.banner.botania_lexicon.brown=Brown Lexicon -item.banner.botania_lexicon.blue=Blue Lexicon -item.banner.botania_lexicon.purple=Purple Lexicon -item.banner.botania_lexicon.cyan=Cyan Lexicon -item.banner.botania_lexicon.silver=Light Gray Lexicon -item.banner.botania_lexicon.gray=Gray Lexicon -item.banner.botania_lexicon.pink=Pink Lexicon -item.banner.botania_lexicon.lime=Lime Lexicon -item.banner.botania_lexicon.yellow=Yellow Lexicon -item.banner.botania_lexicon.lightBlue=Light Blue Lexicon -item.banner.botania_lexicon.magenta=Magenta Lexicon -item.banner.botania_lexicon.orange=Orange Lexicon -item.banner.botania_lexicon.white=White Lexicon - -item.banner.botania_logo.black=Black Botania -item.banner.botania_logo.red=Red Botania -item.banner.botania_logo.green=Green Botania -item.banner.botania_logo.brown=Brown Botania -item.banner.botania_logo.blue=Blue Botania -item.banner.botania_logo.purple=Purple Botania -item.banner.botania_logo.cyan=Cyan Botania -item.banner.botania_logo.silver=Light Gray Botania -item.banner.botania_logo.gray=Gray Botania -item.banner.botania_logo.pink=Pink Botania -item.banner.botania_logo.lime=Lime Botania -item.banner.botania_logo.yellow=Yellow Botania -item.banner.botania_logo.lightBlue=Light Blue Botania -item.banner.botania_logo.magenta=Magenta Botania -item.banner.botania_logo.orange=Orange Botania -item.banner.botania_logo.white=White Botania - -item.banner.botania_sapling.black=Black Tree -item.banner.botania_sapling.red=Red Tree -item.banner.botania_sapling.green=Green Tree -item.banner.botania_sapling.brown=Brown Tree -item.banner.botania_sapling.blue=Blue Tree -item.banner.botania_sapling.purple=Purple Tree -item.banner.botania_sapling.cyan=Cyan Tree -item.banner.botania_sapling.silver=Light Gray Tree -item.banner.botania_sapling.gray=Gray Tree -item.banner.botania_sapling.pink=Pink Tree -item.banner.botania_sapling.lime=Lime Tree -item.banner.botania_sapling.yellow=Yellow Tree -item.banner.botania_sapling.lightBlue=Light Blue Tree -item.banner.botania_sapling.magenta=Magenta Tree -item.banner.botania_sapling.orange=Orange Tree -item.banner.botania_sapling.white=White Tree - -item.banner.botania_tiny_potato.black=Black Potato Face -item.banner.botania_tiny_potato.red=Red Potato Face -item.banner.botania_tiny_potato.green=Green Potato Face -item.banner.botania_tiny_potato.brown=Brown Potato Face -item.banner.botania_tiny_potato.blue=Blue Potato Face -item.banner.botania_tiny_potato.purple=Purple Potato Face -item.banner.botania_tiny_potato.cyan=Cyan Potato Face -item.banner.botania_tiny_potato.silver=Light Gray Potato Face -item.banner.botania_tiny_potato.gray=Gray Potato Face -item.banner.botania_tiny_potato.pink=Pink Potato Face -item.banner.botania_tiny_potato.lime=Lime Potato Face -item.banner.botania_tiny_potato.yellow=Yellow Potato Face -item.banner.botania_tiny_potato.lightBlue=Light Blue Potato Face -item.banner.botania_tiny_potato.magenta=Magenta Potato Face -item.banner.botania_tiny_potato.orange=Orange Potato Face -item.banner.botania_tiny_potato.white=White Potato Face - -item.banner.botania_spark_dispersive.black=Black Dispersive Symbol -item.banner.botania_spark_dispersive.red=Red Dispersive Symbol -item.banner.botania_spark_dispersive.green=Green Dispersive Symbol -item.banner.botania_spark_dispersive.brown=Brown Dispersive Symbol -item.banner.botania_spark_dispersive.blue=Blue Dispersive Symbol -item.banner.botania_spark_dispersive.purple=Purple Dispersive Symbol -item.banner.botania_spark_dispersive.cyan=Cyan Dispersive Symbol -item.banner.botania_spark_dispersive.silver=Light Gray Dispersive Symbol -item.banner.botania_spark_dispersive.gray=Gray Dispersive Symbol -item.banner.botania_spark_dispersive.pink=Pink Dispersive Symbol -item.banner.botania_spark_dispersive.lime=Lime Dispersive Symbol -item.banner.botania_spark_dispersive.yellow=Yellow Dispersive Symbol -item.banner.botania_spark_dispersive.lightBlue=Light Blue Dispersive Symbol -item.banner.botania_spark_dispersive.magenta=Magenta Dispersive Symbol -item.banner.botania_spark_dispersive.orange=Orange Dispersive Symbol -item.banner.botania_spark_dispersive.white=White Dispersive Symbol - -item.banner.botania_spark_dominant.black=Black Dominant Symbol -item.banner.botania_spark_dominant.red=Red Dominant Symbol -item.banner.botania_spark_dominant.green=Green Dominant Symbol -item.banner.botania_spark_dominant.brown=Brown Dominant Symbol -item.banner.botania_spark_dominant.blue=Blue Dominant Symbol -item.banner.botania_spark_dominant.purple=Purple Dominant Symbol -item.banner.botania_spark_dominant.cyan=Cyan Dominant Symbol -item.banner.botania_spark_dominant.silver=Light Gray Dominant Symbol -item.banner.botania_spark_dominant.gray=Gray Dominant Symbol -item.banner.botania_spark_dominant.pink=Pink Dominant Symbol -item.banner.botania_spark_dominant.lime=Lime Dominant Symbol -item.banner.botania_spark_dominant.yellow=Yellow Dominant Symbol -item.banner.botania_spark_dominant.lightBlue=Light Blue Dominant Symbol -item.banner.botania_spark_dominant.magenta=Magenta Dominant Symbol -item.banner.botania_spark_dominant.orange=Orange Dominant Symbol -item.banner.botania_spark_dominant.white=White Dominant Symbol - -item.banner.botania_spark_isolated.black=Black Isolated Symbol -item.banner.botania_spark_isolated.red=Red Isolated Symbol -item.banner.botania_spark_isolated.green=Green Isolated Symbol -item.banner.botania_spark_isolated.brown=Brown Isolated Symbol -item.banner.botania_spark_isolated.blue=Blue Isolated Symbol -item.banner.botania_spark_isolated.purple=Purple Isolated Symbol -item.banner.botania_spark_isolated.cyan=Cyan Isolated Symbol -item.banner.botania_spark_isolated.silver=Light Gray Isolated Symbol -item.banner.botania_spark_isolated.gray=Gray Isolated Symbol -item.banner.botania_spark_isolated.pink=Pink Isolated Symbol -item.banner.botania_spark_isolated.lime=Lime Isolated Symbol -item.banner.botania_spark_isolated.yellow=Yellow Isolated Symbol -item.banner.botania_spark_isolated.lightBlue=Light Blue Isolated Symbol -item.banner.botania_spark_isolated.magenta=Magenta Isolated Symbol -item.banner.botania_spark_isolated.orange=Orange Isolated Symbol -item.banner.botania_spark_isolated.white=White Isolated Symbol - -item.banner.botania_spark_recessive.black=Black Recessive Symbol -item.banner.botania_spark_recessive.red=Red Recessive Symbol -item.banner.botania_spark_recessive.green=Green Recessive Symbol -item.banner.botania_spark_recessive.brown=Brown Recessive Symbol -item.banner.botania_spark_recessive.blue=Blue Recessive Symbol -item.banner.botania_spark_recessive.purple=Purple Recessive Symbol -item.banner.botania_spark_recessive.cyan=Cyan Recessive Symbol -item.banner.botania_spark_recessive.silver=Light Gray Recessive Symbol -item.banner.botania_spark_recessive.gray=Gray Recessive Symbol -item.banner.botania_spark_recessive.pink=Pink Recessive Symbol -item.banner.botania_spark_recessive.lime=Lime Recessive Symbol -item.banner.botania_spark_recessive.yellow=Yellow Recessive Symbol -item.banner.botania_spark_recessive.lightBlue=Light Blue Recessive Symbol -item.banner.botania_spark_recessive.magenta=Magenta Recessive Symbol -item.banner.botania_spark_recessive.orange=Orange Recessive Symbol -item.banner.botania_spark_recessive.white=White Recessive Symbol - -item.banner.botania_fish.black=Black Fish -item.banner.botania_fish.red=Red Fish -item.banner.botania_fish.green=Green Fish -item.banner.botania_fish.brown=Brown Fish -item.banner.botania_fish.blue=Blue Fish -item.banner.botania_fish.purple=Purple Fish -item.banner.botania_fish.cyan=Cyan Fish -item.banner.botania_fish.silver=Light Gray Fish -item.banner.botania_fish.gray=Gray Fish -item.banner.botania_fish.pink=Pink Fish -item.banner.botania_fish.lime=Lime Fish -item.banner.botania_fish.yellow=Yellow Fish -item.banner.botania_fish.lightBlue=Light Blue Fish -item.banner.botania_fish.magenta=Magenta Fish -item.banner.botania_fish.orange=Orange Fish -item.banner.botania_fish.white=White Fish - -item.banner.botania_axe.black=Black Axe -item.banner.botania_axe.red=Red Axe -item.banner.botania_axe.green=Green Axe -item.banner.botania_axe.brown=Brown Axe -item.banner.botania_axe.blue=Blue Axe -item.banner.botania_axe.purple=Purple Axe -item.banner.botania_axe.cyan=Cyan Axe -item.banner.botania_axe.silver=Light Gray Axe -item.banner.botania_axe.gray=Gray Axe -item.banner.botania_axe.pink=Pink Axe -item.banner.botania_axe.lime=Lime Axe -item.banner.botania_axe.yellow=Yellow Axe -item.banner.botania_axe.lightBlue=Light Blue Axe -item.banner.botania_axe.magenta=Magenta Axe -item.banner.botania_axe.orange=Orange Axe -item.banner.botania_axe.white=White Axe - -item.banner.botania_hoe.black=Black Hoe -item.banner.botania_hoe.red=Red Hoe -item.banner.botania_hoe.green=Green Hoe -item.banner.botania_hoe.brown=Brown Hoe -item.banner.botania_hoe.blue=Blue Hoe -item.banner.botania_hoe.purple=Purple Hoe -item.banner.botania_hoe.cyan=Cyan Hoe -item.banner.botania_hoe.silver=Light Gray Hoe -item.banner.botania_hoe.gray=Gray Hoe -item.banner.botania_hoe.pink=Pink Hoe -item.banner.botania_hoe.lime=Lime Hoe -item.banner.botania_hoe.yellow=Yellow Hoe -item.banner.botania_hoe.lightBlue=Light Blue Hoe -item.banner.botania_hoe.magenta=Magenta Hoe -item.banner.botania_hoe.orange=Orange Hoe -item.banner.botania_hoe.white=White Hoe - -item.banner.botania_pickaxe.black=Black Pickaxe -item.banner.botania_pickaxe.red=Red Pickaxe -item.banner.botania_pickaxe.green=Green Pickaxe -item.banner.botania_pickaxe.brown=Brown Pickaxe -item.banner.botania_pickaxe.blue=Blue Pickaxe -item.banner.botania_pickaxe.purple=Purple Pickaxe -item.banner.botania_pickaxe.cyan=Cyan Pickaxe -item.banner.botania_pickaxe.silver=Light Gray Pickaxe -item.banner.botania_pickaxe.gray=Gray Pickaxe -item.banner.botania_pickaxe.pink=Pink Pickaxe -item.banner.botania_pickaxe.lime=Lime Pickaxe -item.banner.botania_pickaxe.yellow=Yellow Pickaxe -item.banner.botania_pickaxe.lightBlue=Light Blue Pickaxe -item.banner.botania_pickaxe.magenta=Magenta Pickaxe -item.banner.botania_pickaxe.orange=Orange Pickaxe -item.banner.botania_pickaxe.white=White Pickaxe - -item.banner.botania_shovel.black=Black Shovel -item.banner.botania_shovel.red=Red Shovel -item.banner.botania_shovel.green=Green Shovel -item.banner.botania_shovel.brown=Brown Shovel -item.banner.botania_shovel.blue=Blue Shovel -item.banner.botania_shovel.purple=Purple Shovel -item.banner.botania_shovel.cyan=Cyan Shovel -item.banner.botania_shovel.silver=Light Gray Shovel -item.banner.botania_shovel.gray=Gray Shovel -item.banner.botania_shovel.pink=Pink Shovel -item.banner.botania_shovel.lime=Lime Shovel -item.banner.botania_shovel.yellow=Yellow Shovel -item.banner.botania_shovel.lightBlue=Light Blue Shovel -item.banner.botania_shovel.magenta=Magenta Shovel -item.banner.botania_shovel.orange=Orange Shovel -item.banner.botania_shovel.white=White Shovel - -item.banner.botania_sword.black=Black Sword -item.banner.botania_sword.red=Red Sword -item.banner.botania_sword.green=Green Sword -item.banner.botania_sword.brown=Brown Sword -item.banner.botania_sword.blue=Blue Sword -item.banner.botania_sword.purple=Purple Sword -item.banner.botania_sword.cyan=Cyan Sword -item.banner.botania_sword.silver=Light Gray Sword -item.banner.botania_sword.gray=Gray Sword -item.banner.botania_sword.pink=Pink Sword -item.banner.botania_sword.lime=Lime Sword -item.banner.botania_sword.yellow=Yellow Sword -item.banner.botania_sword.lightBlue=Light Blue Sword -item.banner.botania_sword.magenta=Magenta Sword -item.banner.botania_sword.orange=Orange Sword -item.banner.botania_sword.white=White Sword - # LEXICON CATEGORIES botania.category.basics=Mecânicas e Informações básicas botania.category.mana=Manipulação de Mana @@ -1977,17 +1644,7 @@ botania.category.misc=Conteúdo Diverso # - BASIC # -- WELCOME TO BOTANIA -botania.entry.welcome=Welcome To Botania botania.tagline.welcome=Bem-vindo ao Hotel Botania -botania.page.welcome0=&oWhat is peace? Is it truly just a lack of combat? Is it years of sitting quietly in a garden, surrounded by flowers? Is it watching over a kingdom that you are able to call your own? Is it the completion of almost every task known to man? Is it the ability to watch numbers of resources steadily rise as you watch your collection grow? -botania.page.welcome1=&oIs peace something that can be obtained easily, without work - or is it something difficult to obtain?
    Let's say for a moment - not even a second - that peace is truly just a lack of work; peaceful days surrounded by flowers. -botania.page.welcome2=&oYears spent watching time tick by while you watch your flora perform every single task imaginable, without outside help from polluting machines or computers tangled in cables and pipes.
    Now imagine that everything we just talked about was possible. -botania.page.welcome3=&oImagine that through your hard labor - your cultivation of flowers, your manipulation of mana, your knowledge of the mechanisms of the world and redstone - you could obtain that dreamlike state. Imagine that you could have everything you could ever desire automated with flora. Flora, some magic, and your own ingenuity. -botania.page.welcome4=&oWith the help of this book, your dreams will become a reality.
    The name of this book is deceptive. Despite being called the Lexica Botania, this tome focuses on far more than just flowers. It focuses on a variety of devices, both magical and bordering on technological. -botania.page.welcome5=&oIt holds the secrets of the elves, who have long ago fled from this world, as well as possible clues to the origins of the very world itself. For anyone with a basic knowledge of redstone and the creativity to put it to use, this book offers answers to nearly every problem known to man, without the need to use foreign schools of magic or machinery. -botania.page.welcome6=&oThis book contains instructions on how to perform nearly every task that one could ever need, with only the use of what's in it, and available in the world of Minecraft, assuming you're up to the task of putting them together in ingenious ways.
    Try it out, you'll be amazed at what you can do without outside interference. -botania.page.welcome7=&oThe school of botany does not solely apply to those with a knack for complex thought processes.
    Introduction to the art is simple, and the rewards are vast. A wide range of magical accessories and instruments allow for empowering of one who decides to study the various options therein. -botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
    - Written by &nGideon Seymour&r, guest writer. (Adapted for use) # -- TUTORIAL OF THE BASICS botania.entry.tutorial=Tutorial de mecânicas básicas @@ -2114,7 +1771,6 @@ botania.page.flowerBag1=Puxe uma hélice de dentro (qualquer cor funciona) # -- WRAP botania.entry.wrap=Wrap -botania.tagline.wrap=It's a wrap botania.page.wrap0=Parece que o autor do mod decidiu adicionar uma mecânica conhecida como &1Wrap&0. Não se sabe o que significa, mas certamente é algo ruim. :/
    O que é essa 'barreira da realidade' a qual você se refere...? # - MANA @@ -2294,7 +1950,6 @@ botania.tagline.warpLens=Muda os efeitos de um Pulso de Mana na hora botania.page.prism0=O conceito de &1Lentes de Mana&0 permite que tal poder possa ser usado por &4Pulsos de Mana&0, o &1Prisma de Mana&0 permite que Pulsos possam ser modificados no trajeto.
    Usando uma &1Plataforma Espectral&0 como componente, esse bloco não possúi uma presença física, entidades e Pulsos o atravessam como se não existisse. botania.page.prism1=Clicando com uma qualquer &1Lente de Mana&0 coloca a lente no Prisma. Toda vez que um &4Pulso de Mana&0 passa pelo Prisma, sua cor e efeito mudam para aqueles da lente do Prisma. No caso da lente não ser colorida, o Pulso se torna branco.
    Usar qualquer uma das quatro lentes básicas também aumenta o tempo de vida do Pulso, permitindo mais tempo sem perder &4Mana&0. botania.page.prism2=Pode ser desligado com um sinal de redstone. -botania.page.prism3=Another pixel in the wall # -- MANA ON RAILS botania.entry.poolCart=Mana sobre trilhos @@ -2370,7 +2025,6 @@ botania.page.tigerseye1=&oAceitando o desafio de nossos rivais&r. botania.entry.orechid=Orechid botania.tagline.orechid=Cria minérios a partir de pedra botania.page.orechid0=Enquanto minerar é bom, um meio renovável de conseguir minérios é bem vindo. A &1Orechid&0 usa (uma quantidade massiva de) &4Mana&0 para gerar &4minérios&0 em blocs de &1Pedra&0 adjacentes.
    Os minérios gerados são aleatórios, mas parecem tender aos mais comuns do que os mais raros. -botania.page.orechid1=&oNot dragon poop&r. # -- ORECHID IGNEM botania.entry.orechidIgnem=Orechid Ignem @@ -2408,13 +2062,11 @@ botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. botania.entry.tangleberrie=Tangleberrie botania.tagline.tangleberrie=Mantém mobs presos botania.page.tangleberrie0=A &1Tangleberrie&0 é uma flor que, a um pequeno custo de &4Mana&0, mantém animais e monstros dentro de um círculo, os impedindo de sair. -botania.page.tangleberrie1=&oTangled, brave and frozen&r. # -- JIYUULIA botania.entry.jiyuulia=Jiyuulia botania.tagline.jiyuulia=Mantém mobs longe botania.page.jiyuulia0=A &1Jiyuulia&0 é uma flor, que a um pequeno custo de &4Mana&0, afasta animais e monstros, protejendo uma área circular, os impedindo de entrar. -botania.page.jiyuulia1=&oHR HD DT Masterpiece&r. # -- RANNUNCARPUS botania.entry.rannuncarpus=Rannuncarpus @@ -2608,17 +2260,6 @@ botania.page.rafflowsia4=&oUm Novo Amanhecer, assim dizendo&r. botania.entry.dandelifeon=Dandelifeon botania.tagline.dandelifeon=Mana por vida botania.page.dandelifeon_w=Alerta: Essa funcionalidade é experimental.
    Ela pode e deve mudar futuramente. Não se acostume com ela. -// WARNING -// UNSTABLE -// -// -// -// This entry will be localized once the flower reachs it's final form -// -// -// -// This is a placeholder space for convenience sake -// WARNING # - NATURAL APPARATUS # -- MANA PYLON @@ -2743,11 +2384,8 @@ botania.page.incense0=&4Fermentado&0 oferecem uma variedade de efeitos na forma botania.page.incense1=Um &1Incenso&0 pode ser colocado numa &1Bandeja de Incensos&0 ao clicar, e um &1Isqueiro&0 para acender. Uma vez acesa, a vareta não pode ser recuperada.
    Uma única vareta queima por sessenta vezes mais que a forma líquida da poção antes de acabar. botania.page.incense2=&1Bandejas de Incenso&0 com &1Incensos&0 acesos aplicam o efeito do &4Fermentado&0 infuso na vareta para qualquer jogador num raio de 30 blocos.
    Nem todos efeitos são possíveis de aplicar aos &1Incensos&0, por exemplo, &4Cura Instantânea&0 ou &1Absorção&0, ou qualquer fermentado com mais de um efeito. botania.page.incense5=Para os amantes de incensos que também são viciados em automação, a &1Bandeja de Incensos&0 pode receber itens por &1Funis&0 ou outros métodos. Ela emite um sinal de &1Comparador&0 de força 1 quando tem uma vareta, e de 2 quando aceso.
    Finalmente, quando um &4Pulso de Mana&0 com &1Lente de Aquecimento&0 acerta uma bandeja com um incenso, ele se acende. -botania.page.incense3=Incense is wincense -botania.page.incense4=I can incense it # -- FEL PUMPKIN -botania.entry.felPumpkin=Fel Pumpkin botania.tagline.felPumpkin=Uma abóbora que pode invocar Blazes botania.page.felPumpkin0=A &1Abóbora Fel&0 é uma infusão maligna entre uma &1Abóbora&0 com o espírito de monstros mortos. Essa abóbora amaldiçoada pode ser colocada no topo de duas &1Grades de Ferro&0, igual a um &1Golem de Neve&0, para invocar um &1Blaze&0.
    &1Blazes&0 invocados com esse método derrubam uma boa quantidade de &1Pó de Blaze&0 ao invés de &1Varas Incandescentes&0. botania.page.felPumpkin1=Nerfando os warlocks outra vez From 14b2a35862c765c62c10c9ad9b6c88142809c6cb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 20:41:32 -0500 Subject: [PATCH 663/935] Clean up English present in es_ES, fr_FR. My pinkie hurts. --- .../resources/assets/botania/lang/es_ES.lang | 44 - .../resources/assets/botania/lang/fr_FR.lang | 1579 ----------------- 2 files changed, 1623 deletions(-) diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index 8e11ce52e..0f0cf2dc0 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -43,7 +43,6 @@ botaniamisc.devEdition=Del escritor botaniamisc.lexiconcover0=Tu guía para todas botaniamisc.lexiconcover1=tus necesidades botánicas botaniamisc.lexiconcover2=de la autora de bestsellers -botaniamisc.lexiconcover3=Lizbeth "Vazkii" Rika botaniamisc.lexiconcover4=Editado por BevoLJ botaniamisc.lexiconcover5=Editado por Saice botaniamisc.shiftinfo=Mantén &bSHIFT&7 apretado para más información @@ -178,14 +177,6 @@ botania.color14=rojo botania.color15=negro botania.color16=arcoíris -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # ZODIAC SIGNS botania.sign0=Aries botania.sign1=Tauro @@ -233,39 +224,6 @@ botania.armorset.will3.shortDesc=Los golpes críticos infligen un fuerte efecto botania.armorset.will4.shortDesc=Los golpes críticos atraviesan la armadura botania.armorset.will5.shortDesc=Los golpes críticos infligen un efecto de wither -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=Conocimiento minecraftiano botania.knowledge.alfheim=Conocimiento &aélfico&7 @@ -482,8 +440,6 @@ achievement.botania:aesirRing.desc=Crea el anillo del Aesir combinando los anill achievement.botania:nullFlower=Tranquilízate achievement.botania:nullFlower.desc=Encuentra un bug que te permita encontrar una flor de Botania sin definir. ¡No olvides informar! achievement.botania:desuGun=Amante de dos caras. -achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN -# ^ Don't localize # CHALLENGE LEVELS botania.challengelevel.easy=Fácil diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 5917fc4a7..2aa58b72b 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -176,14 +176,6 @@ botania.color14=Rouge botania.color15=Noir botania.color16=Arc-en-ciel -# RANKS -botania.rank0=&cD -botania.rank1=&eC -botania.rank2=&bB -botania.rank3=&aA -botania.rank4=&dS -botania.rank5=&6SS - # ZODIAC SIGNS botania.sign0=Bélier botania.sign1=Taureau @@ -231,39 +223,6 @@ botania.armorset.will3.shortDesc=Fort effet de lenteur sur coups critiques botania.armorset.will4.shortDesc=Transpercent l'armure sur coups critiques botania.armorset.will5.shortDesc=Effet de décrépitude sur coups critiques -# ROMAN NUMERALS -botania.roman0= -botania.roman1=I -botania.roman2=II -botania.roman3=III -botania.roman4=IV -botania.roman5=V -botania.roman6=VI -botania.roman7=VII -botania.roman8=VIII -botania.roman9=IX -botania.roman10=X -botania.roman11=XI -botania.roman12=XII -botania.roman13=XIII -botania.roman14=XIV -botania.roman15=XV -botania.roman16=XVI -botania.roman17=XVII -botania.roman18=XVIII -botania.roman19=XIX -botania.roman20=XX -botania.roman21=XXI -botania.roman22=XXII -botania.roman23=XXIII -botania.roman24=XXIV -botania.roman25=XXV -botania.roman26=XXVI -botania.roman27=XXVII -botania.roman28=XXVIII -botania.roman29=XXIX -botania.roman30=XXX - # KNOWLEDGE botania.knowledge.minecraft=Savoir Minecraftien botania.knowledge.alfheim=Savoir &aElfique&7 @@ -372,47 +331,6 @@ botania.baubletype.ring=Équipable dans l'emplacement &aRing&7 botania.baubletype.belt=Équipable dans l'emplacement &aBelt&7 botania.baubletooltip=Appuyez &b%s&7 pour ouvrir le menu Baubles -# RELIC POEMS -item.infiniteFruit.poem0=The fruit of the forbidden garden -item.infiniteFruit.poem1=Eternally cleanses one's hunger, -item.infiniteFruit.poem2=For that it rebuilds its pulp -item.infiniteFruit.poem3=And makes itself younger. - -item.excaliber.poem0=A sword of a true hero -item.excaliber.poem1=Fit for only one of the kind, -item.excaliber.poem2=Sharp and magic conjuring, -item.excaliber.poem3=Enemies it will quickly find. - -item.flugelEye.poem0=A vision of the past on one's mind, -item.flugelEye.poem1=Round and round is the memory matrix, -item.flugelEye.poem2=And their viable interactions -item.flugelEye.poem3=Will take the psyche back to basics. - -item.thorRing.poem0=The force of the Thunder God -item.thorRing.poem1=Will Shatter the salt of the Terra, -item.thorRing.poem2=With unstoppable strength -item.thorRing.poem3=It'll begin anew a new era. - -item.odinRing.poem0=The wise old God lays its blessings, -item.odinRing.poem1=Of virtue, life and divinity, -item.odinRing.poem2=With the hindrance of death on one's hands, -item.odinRing.poem3=They'll form the Holy Trinity. - -item.lokiRing.poem0=Empty handed, a sneaking interaction, -item.lokiRing.poem1=Once on the center, then around the track, -item.lokiRing.poem2=Back to the start one'd go to complete -item.lokiRing.poem3=The power of creating back-to-back. - -item.aesirRing.poem0=The forces of the Gods -item.aesirRing.poem1=In this band form as one, -item.aesirRing.poem2=And when combined all together -item.aesirRing.poem3=Above them will be none. - -item.dice.poem0=He deals the cards to find the answer, -item.dice.poem1=The sacred geometry of chance, -item.dice.poem2=The hidden laws of a probable outcome, -item.dice.poem3=The numbers lead a dance. - # DEATH MESSAGES death.attack.botania-relic=%s a été puni en utilisant une relique qui n'était pas la sienne @@ -480,37 +398,6 @@ achievement.botania:corporeaCraft.desc=Fabriquez un bloc qui servira au réseau achievement.botania:signalFlareStun=Voyez les lumières achievement.botania:signalFlareStun.desc=Aveugnez 100 créatures ou plus d'un coup avec une fusée de détresse -achievement.botania:l20ShardUse=Out of Step -achievement.botania:l20ShardUse.desc=Raise the ground up to the sky with a Power XX Shard of Laputa -achievement.botania:gaiaGuardianNoArmor=Mythologia's End -achievement.botania:gaiaGuardianNoArmor.desc=Slay a Gaia Guardian without wearing any armor at any point during the fight -achievement.botania:rankSSPick=Talent Shredder -achievement.botania:rankSSPick.desc=Dig through the world using a rank SS Terra Shatterer -achievement.botania:superCorporeaRequest=Invader Girl -achievement.botania:superCorporeaRequest.desc=Successfully request 50,000 or more of a single item in a Corporea Index -achievement.botania:pinkinator=Decorator -achievement.botania:pinkinator.desc=Put to use The Pinkinator - -achievement.botania:infiniteFruit=Innocentia -achievement.botania:infiniteFruit.desc=Be rewarded The Fruit of Grisaia for a heroic feat -achievement.botania:excaliber=Streaming Heart -achievement.botania:excaliber.desc=Be rewarded the Holy Sword Excaliber for a heroic feat -achievement.botania:flugelEye=Angel of Death -achievement.botania:flugelEye.desc=Be rewarded the Eye of the Flügel for a heroic feat -achievement.botania:thorRing=One Step Layered -achievement.botania:thorRing.desc=Be rewarded the Ring of Thor for a heroic feat -achievement.botania:odinRing=Lost Time Memory -achievement.botania:odinRing.desc=Be rewarded the Ring of Odin for a heroic feat -achievement.botania:lokiRing=Arithmetic -achievement.botania:lokiRing.desc=Be rewarded the Ring of Loki for a heroic feat -achievement.botania:aesirRing=As the Gods Say -achievement.botania:aesirRing.desc=Create the Ring of the Aesir by combining the Rings of the Gods - -achievement.botania:nullFlower=Take it Easy -achievement.botania:nullFlower.desc=Find a bug that lets you have an undefined Botania Flower. Don't forget to report it! -achievement.botania:desuGun=Two-Faced Lovers -achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN -# ^ Don't localize # BLOCK NAMES# CHALLENGE LEVELS botania.challengelevel.easy=Facile @@ -522,44 +409,10 @@ botania.challengelevel.lunatic=Lunatique botania.challenge.flowerFarm=Ferme de fleurs botania.challenge.flowerFarm.desc=Créez une ferme automatisée des 16 couleurs complètes de fleurs botania flowers. Point bonus si les fleurs sont triées. botania.challenge.recordFarm=Ferme de disques -botania.challenge.recordFarm.desc=Create a system that produces records through the death of creepers at the hand of skeletons. Bonus points if it doesn't require a player's presence. botania.challenge.reedFarm=Ferme de canne à sucre -botania.challenge.reedFarm.desc=Create an automated sugar cane farm. Bonus points for not using pistons. botania.challenge.cobbleGen=Générateur de pierre -botania.challenge.cobbleGen.desc=Create an automated cobblestone generator and harvester. Bonus points if it also creates smooth stone without a furnace. botania.challenge.pureDaisy=Pâquerette pure auto -botania.challenge.pureDaisy.desc=Completely automate the Pure Daisy. Bonus points if only one spreader is used and/or if the wood/stone input is also automated. botania.challenge.battery=Batterie de mana -botania.challenge.battery.desc=Create a Mana Battery, a system where mana enters one pool and comes out of another, with a good amount of pools as a buffer. Bonus points if the input or output can be changed. - -botania.challenge.apothecaryRefill=Apothecary Refiller -botania.challenge.apothecaryRefill.desc=Create a system that automatically refills the Petal Apothecary if it's empty. Bonus points if the system can also automatically create flowers, given the components. -botania.challenge.treeFarm=Tree Farm -botania.challenge.treeFarm.desc=Create an automated, self-sustaining tree farm. Bonus points if it can do multiple types of tree. -botania.challenge.fullCropFarm=Full Crop Farm -botania.challenge.fullCropFarm.desc=Create a crop farm with all types of crops (wheat, carrot, potato, melon, pumpkin, cocoa and nether wart) that runs at full efficiency. Bonus points if the outputs are sorted. -botania.challenge.animalFarm=Animal Farm -botania.challenge.animalFarm.desc=Create an automated animal farm with all farmable animal types. Bonus points if the food doesn't need to be put in manually. -botania.challenge.boneMealFarm=Bone Meal-type Farm -botania.challenge.boneMealFarm.desc=Create an automated farm that utilizes bone meal to quickly grow crops on demand. Bonus points if the Drum of the Wild isn't used. -botania.challenge.orechid=Automated Orechid -botania.challenge.orechid.desc=Create a system that allows for the Orechid flower to be fully automated. Bonus points if the output is smelted and sorted. - -botania.challenge.mobTower=Spawning Tower -botania.challenge.mobTower.desc=Create a tower style mob farm. Mobs must be sorted and put into specific chambers at the end. Spawners can be used. Bonus points if the farm functions at 100% efficiency without a player's interaction. -botania.challenge.entropinnyumSetup=Entropinnyum Setup -botania.challenge.entropinnyumSetup.desc=Create a system that automatically crafts TNT and safely feeds it to an Entropinnyum flower, creating mana. Bonus points if the sand and gunpowder required for the TNT don't need to be put in manually. -botania.challenge.spectrolusSetup=Spectrolus Setup -botania.challenge.spectrolusSetup.desc=Create a system that feeds a Spectrolus, generating mana. Aside from raw mana, no items may be input from outside the system. Bonus points if it operates at 100% efficiency, never wasting any wool. -botania.challenge.potionBrewer=Automated Brewing -botania.challenge.potionBrewer.desc=Create a system that can make all types of brews automatically on demand. Bonus points if it keeps a set of incense always ignited in the player's base. - -botania.challenge.kekimurusSetup=Kekimurus Setup -botania.challenge.kekimurusSetup.desc=Fully automate a Kekimurus, every part of the system must be automated and self-sustaining. Bonus points if only one crafty crate is used. -botania.challenge.autoQuarry=Automated Quarry -botania.challenge.autoQuarry.desc=Create a mining quarry that digs for ores and stone underground. It should dig out chunks of land and output all of the mined resources, sorting them. Bonus points if it can relocate automatically after it's done with an area. -botania.challenge.runeCrafter=Rune Crafter -botania.challenge.runeCrafter.desc=Create a system that can craft all runes on demand or keep them stocked. Every part of this system must be automated and self-sustaining, including the item inputs. Bonus points if only one Runic Altar block is used. You must be pretty crazy to try this one. # BLOCK NAMES tile.botania:flower0.name=Fleur mystique blanche @@ -1082,70 +935,6 @@ tile.botania:flower.narslimmus.reference=Qu'es-ce-que c'est ? C'est tout collant tile.botania:flower.spectrolus.name=Spectrolus tile.botania:flower.spectrolus.reference=Profiter de la haine -# - FUNCTIONAL -tile.botania:flower.bellethorn.name=Bellethorne -tile.botania:flower.bellethorn.reference=world's end, girl's rondo -tile.botania:flower.bellethornChibi.name=Bellethorne Petite -tile.botania:flower.bellethornChibi.reference=world's end, girl's rondo -tile.botania:flower.dreadthorn.name=Dreadthorne -tile.botania:flower.dreadthorn.reference=Plan C -tile.botania:flower.heiseiDream.name=Heisei Dream -tile.botania:flower.heiseiDream.reference=Heisei heisei kowarete -tile.botania:flower.tigerseye.name=Tigerseye -tile.botania:flower.tigerseye.reference=The palmtop tiger -tile.botania:flower.jadedAmaranthus.name=Jaded Amaranthus -tile.botania:flower.jadedAmaranthus.reference=A couple died for this -tile.botania:flower.orechid.name=Orechid -tile.botania:flower.orechid.reference=I seed what you did there -tile.botania:flower.orechidIgnem.name=Orechid Ignem -tile.botania:flower.orechidIgnem.reference=Red like roses -tile.botania:flower.fallenKanade.name=Fallen Kanade -tile.botania:flower.fallenKanade.reference=I'm not an Angel -tile.botania:flower.exoflame.name=Exoflame -tile.botania:flower.exoflame.reference=Wearing her black ribbons -tile.botania:flower.agricarnation.name=Agricarnation -tile.botania:flower.agricarnation.reference=Wear on the 25th of april -tile.botania:flower.agricarnationChibi.name=Agricarnation Petite -tile.botania:flower.agricarnationChibi.reference=Wear on the 25th of april -tile.botania:flower.hopperhock.name=Hopperhock -tile.botania:flower.hopperhock.reference=It all funnels into it -tile.botania:flower.hopperhockChibi.name=Hopperhock Petite -tile.botania:flower.hopperhockChibi.reference=It all funnels into it -tile.botania:flower.tangleberrie.name=Tangleberrie -tile.botania:flower.tangleberrie.reference=No frying pans allowed -tile.botania:flower.jiyuulia.name=Jiyuulia -tile.botania:flower.jiyuulia.reference=Flügel der Freiheit -tile.botania:flower.rannuncarpus.name=Rannuncarpus -tile.botania:flower.rannuncarpus.reference=That's handy -tile.botania:flower.rannuncarpusChibi.name=Rannuncarpus Petite -tile.botania:flower.rannuncarpusChibi.reference=That's handy -tile.botania:flower.hyacidus.name=Hyacidus -tile.botania:flower.hyacidus.reference=If you don't walk, it doesn't hurt -tile.botania:flower.pollidisiac.name=Pollidisiac -tile.botania:flower.pollidisiac.reference=Birds and bees -tile.botania:flower.clayconia.name=Clayconia -tile.botania:flower.clayconia.reference=Rupees not included -tile.botania:flower.loonium.name=Loonium -tile.botania:flower.loonium.reference=Hold it up above your head -tile.botania:flower.daffomill.name=Daffomill -tile.botania:flower.daffomill.reference=Cook's Assistant -tile.botania:flower.vinculotus.name=Vinculotus -tile.botania:flower.vinculotus.reference=Totally an Extra Utils ripoff -tile.botania:flower.spectranthemum.name=Spectranthemum -tile.botania:flower.spectranthemum.reference=In the shell -tile.botania:flower.medumone.name=Medumone -tile.botania:flower.medumone.reference='Twas Hades all along -tile.botania:flower.marimorphosis.name=Marimorphosis -tile.botania:flower.marimorphosis.reference=Solid as a rock -tile.botania:flower.marimorphosisChibi.name=Marimorphosis Petite -tile.botania:flower.marimorphosisChibi.reference=Solid as a rock -tile.botania:flower.bubbell.name=Bubbell -tile.botania:flower.bubbell.reference=And whistle -tile.botania:flower.bubbellChibi.name=Bubbell Petite -tile.botania:flower.bubbellChibi.reference=And whistle -tile.botania:flower.solegnolia.name=Solegnolia -tile.botania:flower.solegnolia.reference=All your magnets are belong to us - # ITEM NAMES item.botania:lexicon.name=Lexica Botania item.botania:lexicon.bevo=Lexica Botana @@ -1517,681 +1306,71 @@ botania.category.misc=Divers # LEXICON ENTRIES -# - BASIC -# -- WELCOME TO BOTANIA -botania.entry.welcome=Welcome To Botania -botania.page.welcome0=&oWhat is peace? Is it truly just a lack of combat? Is it years of sitting quietly in a garden, surrounded by flowers? Is it watching over a kingdom that you are able to call your own? Is it the completion of almost every task known to man? Is it the ability to watch numbers of resources steadily rise as you watch your collection grow? -botania.page.welcome1=&oIs peace something that can be obtained easily, without work - or is it something difficult to obtain?
    Let's say for a moment - not even a second - that peace is truly just a lack of work; peaceful days surrounded by flowers. -botania.page.welcome2=&oYears spent watching time tick by while you watch your flora perform every single task imaginable, without outside help from polluting machines or computers tangled in cables and pipes.
    Now imagine that everything we just talked about was possible. -botania.page.welcome3=&oImagine that through your hard labor - your cultivation of flowers, your manipulation of mana, your knowledge of the mechanisms of the world and redstone - you could obtain that dreamlike state. Imagine that you could have everything you could ever desire automated with flora. Flora, some magic, and your own ingenuity. -botania.page.welcome4=&oWith the help of this book, your dreams will become a reality.
    The name of this book is deceptive. Despite being called the Lexica Botania, this tome focuses on far more than just flowers. It focuses on a variety of devices, both magical and bordering on technological. -botania.page.welcome5=&oIt holds the secrets of the elves, who have long ago fled from this world, as well as possible clues to the origins of the very world itself. For anyone with a basic knowledge of redstone and the creativity to put it to use, this book offers answers to nearly every problem known to man, without the need to use foreign schools of magic or machinery. -botania.page.welcome6=&oThis book contains instructions on how to perform nearly every task that one could ever need, with only the use of what's in it, and available in the world of Minecraft, assuming you're up to the task of putting them together in ingenious ways.
    Try it out, you'll be amazed at what you can do without outside interference. -botania.page.welcome7=&oThe school of botany does not solely apply to those with a knack for complex thought processes.
    Introduction to the art is simple, and the rewards are vast. A wide range of magical accessories and instruments allow for empowering of one who decides to study the various options therein. -botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
    - Written by &nGideon Seymour&r, guest writer. (Adapted for use) - -# -- TUTORIAL OF THE BASICS -botania.entry.tutorial=A Tutorial of the Basics -botania.page.tutorial0=While one could just go through the various entries in the book at their issue, there's also a "guided tour" of sorts available. Clicking the button below will guide you through the pages useful to getting the gist of the basic concepts of Botania. - -# -- AN INTRODUCTORY CLIP -botania.entry.introVideo=An Introductory Clip -botania.page.introVideo0=For those readers who are not quite readers, a short video guide covering the basics of Botania is also available. It's to keep in note that this guide acts as an aid and not a substitution for the contents of the &1Lexica Botania&0. - -# -- GARDEN OF GLASS -botania.entry.gardenOfGlass=Garden of Glass -botania.page.gardenOfGlass0=In the &2Garden of Glass&0 nobody can hear you scream.
    You're alone in space.
    How exciting. -botania.page.gardenOfGlass1=The &2Garden of Glass&0 is a skyblock mode for Botania. It's advised only for players who are somewhat experienced in the mod, but if you're new to it, you're more than welcome to try it out anyway.
    Most of the mod functions the same, but some tweaks have been put in place to allow for the skyblock style game. They'll be listed in the following pages. -botania.page.gardenOfGlass2=After spawning in the &1Garden of Glass&0 you'll find &1Living Roots&0 below the landing area. These can be used to create &1Saplings&0 and &1Floral Fertilizer&0. They also work as &1Bone Meal&0. Shift-right clicking a &1Dirt&0 or &1Grass&0 block with an empty hand will have you rummage through the soil, finding some &1Pebbles&0, that can be converted into &1Cobblestone&0. Filling a &1Petal Apothecary&0 can be done with a &1Bowl&0 by clicking on a water block. -botania.page.gardenOfGlass3=Creating &1Saplings&0 -botania.page.gardenOfGlass4=Creating &1Floral Fertilizer&0 -botania.page.gardenOfGlass5=Creating &1Cobblestone&0 -botania.page.gardenOfGlass6=Aside from that, some things in Botania are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster and much cheaper; The &1Cocoon of Caprice&0 and the &1Mana Spreader&0 have different recipes; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted. -botania.page.gardenOfGlass7=Creating &1Sugar Canes&0 -botania.page.gardenOfGlass8=Creating &1Slimeballs&0 -botania.page.gardenOfGlass9=It's possible to infuse a &1Pumpkin&0 with the fel spirits of monster slain, creating a &1Fel Pumpkin&0. This can be placed atop two &1Iron Bars&0, in a similar fashion to a &1Snow Golem&0, to spawn a &1Blaze&0.
    &1Blazes&0 spawned with this method drop &1Blaze Powder&0 instead of &1Blaze Rods&0. -botania.page.gardenOfGlass10=Nerfing warlocks again -botania.page.gardenOfGlass11=Aside from providing light, the &1Mana Flash&0 present in the starting area allows a player who has lost their &1Lexica Botania&0 to exchange a &1Sapling&0 for it, by right clicking with the &1Sapling&0 on the &1Mana Flame&0.
    This can only be done if the player doesn't have a &1Lexica Botania&0 on them. -botania.page.gardenOfGlass12=Lastly, an &1End Portal&0 recipe - -# -- LEXICA BOTANIA -botania.entry.lexicon=Lexica Botania -botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botany related matters. But you probably knew that already.
    All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry. -botania.page.lexicon3=Any entries typed in &oItalics&r are &4basic&0 entries, which contain the very basic knowledge required to playing Botania. They should be prioritized over others, most of the sections contain one or more, so a good look through through them is a good idea. -botania.page.lexicon1=Crafting the &1Lexica Botania&0. -botania.page.lexicon2=The &1Lexica Botania&0's title can also be customized. By placing it in an &1Anvil&0 and renaming it, one can not only change its cover, but also the title.
    The Edition of the lexica shown equates to the version of the &4Botania&0 you're running, and no, I don't care about the fourth wall. - # -- MYSTICAL FLOWERS botania.entry.flowers=Fleur mystique Flowers -botania.page.flowers0=Around the world, you may stumble upon a large variety of Fleur mystique Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
    They come in a total of &416 &0different colors.
    It's also possible to grow these flowers using &1Floral Fertilizer&0 (read on). -botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Fleur mystique Petals&0, that can be used for making magical instruments and plants alike.
    Right clicking a petal on the ground will &4bury it&0, having it emit particles.
    These petals can also be crushed into &1Floral Powder&0, which functions much alike any mundane piece of dye. -botania.page.flowers3=Plucking Petals off Flowers. -botania.page.flowers4=Crafting the &1Pestle and Mortar&0. -botania.page.flowers5=Grinding Petals into Powder. -botania.page.flowers6=Right clicking the &1Floral Powder&0 in any &1Wool&0 or &1Carpet&0 changes its color to the color of the powder.
    By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertilizer&0 will grow a small amount of &1Fleur mystique Flowers&0 in the nearby vicinity, if you ever run low on them. -botania.page.flowers7=Making fertilizer (any powder colors work) -botania.page.flowers8=Using typical flower substances also works -botania.page.flowers10=There's also some taller variants of the typical &1Fleur mystique Flowers&0, spread around the place. These can only be gathered with &1Shears&0, but can be used to obtain twice the amount of petals a normal flower would yield. They're a bit too big for dye, though.
    They can be made manually by fertilizing a &1Fleur mystique Flower&0 with &1Bone Meal&0. -botania.page.flowers11=Prepare for trouble -botania.page.flowers9=Petals can also be made into blocks # -- PETAL APOTHECARY botania.entry.apothecary=Apotiquaire de pétales -botania.page.apothecary0=In order for a botanist to create plantlife that can do its bidding, one would need special means of infusing plants with Fleur mystique energy.
    Luckily, the &1Petal Apothecary&0 does just that. -botania.page.apothecary1=The &1Petal Apothecary&0. -botania.page.apothecary2=This block, when placed in the world and given some water (by use of a &1Water Bucket&0), will accept any &1Fleur mystique Petals&0 thrown at it, releasing their energies.
    Once one has set the correct petals in, throwing some &1Seeds&0 in will finalize the proccess.
    Tossing in the full bucket will also fill the recipient with water. -botania.page.apothecary3=Quite a few plants can be made using this method, for more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon.
    Shift-right clicking the &1Petal Apothecary&0 with an empty hand will remove the last item thrown in. -botania.page.apothecary4=Instead of &1Water&0, one can place &1Lava&0 in this block, if that is done, it'll serve as a brazier and incinerator, destroying any items that come in contact.
    Lastly, tossing in &1Vines&0 also gives the block an overgrown visual. -botania.page.apothecary6=A simple tip for those who want to squeeze the biggest efficiency out of every block is as follows, up to twenty seconds after crafting a flower in this block, right clicking it with an empty hand will pull the items from the inventory required for the recipe and put them into it for quick mass crafting. This only works if it has water. -botania.page.apothecary5=Crafting the &1Petal Apothecary&0. # -- PURE DAISY botania.entry.pureDaisy=Pâquerette pure -botania.page.pureDaisy0=The &1Pure Daisy&0 is not only the most basic, but also the most important flower a botanist can have.
    This flower will purify any adjacent &1Wood&0 and &1Stone&0 blocks, as seen on the next page, into their purified counterparts, &1Livingwood&0 and &1Livingrock&0, which can be used for crafting. -botania.page.pureDaisy1=Just give it &4a minute&0 or so... -botania.page.pureDaisy2=&1Livingwood&0 can be turned into twigs -botania.page.pureDaisy4=A few other blocks can also be purified by placing them around the flower. While not as unique and essential as the living blocks, perhaps this might come in handy. This includes &1Netherrack&0 into &1Cobblestone&0, &1Soul Sand&0 into &1Sand&0 or &1Ice&0 into &1Packed Ice&0. -botania.page.pureDaisy3=White is bright and pure # -- WAND OF THE FOREST botania.entry.wand=Bâton de la forêt -botania.page.wand0=The general multi-use tool for a botanist is the &1Wand of the Forest&0.
    This wand, made by, effectively, strapping a pair of &1Fleur mystique Petals&0 of any color to a few &1Vifbois Twigs&0, is required for a good amount of tasks. -botania.page.wand1=The wand has two modes, &4Bind Mode&0 and &4Function Mode&0. In &4Bind Mode&0 it can be shift-right clicked on a compatible block to select it. Shift-right clicking elsewhere binds the two blocks. In &4Function Mode&0 it'll simply not do that for shift-right clicking.
    The two modes can be switched freely by shift-right clicking on air. -botania.page.wand2=If the wand isn't bound to anything, shift-right clicking a block allows it to be rotated around the axis of the side it's clicked on.
    For example, clicking on the top of a &1Chest&0 rotates it around. Most blocks which can be rotated should work. -botania.page.wand3=The petals used determine the colors of the wand # -- RUNIC ALTAR botania.entry.runeAltar=Autel runique -botania.page.runeAltar21=Runic creation is a rather important complex in the advancement of the botanical magics. First and foremost, though, this type of crafting requires a decent knowledge of &4Mana Manipulation&0. Before proceeding further, a read through the important entries (those in &oItalics&r) on that section of the &1Lexica Botania&0 might prove enlightening. -botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one would require a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by linking a &1Diffuseur de mana&0 to the altar, and right click it with a &1Wand of the Forest&0.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it and use the wand on it again to collect your rune. -botania.page.runeAltar2=Crafting the &1Runic Altar&0. -botania.page.runeAltar3=A total of 16 &1Runes&0 exist.
    The most basic and elementary runes are named after the &4Four Elements&0. The intermediate runes are named after the &4Four Seasons&0, and the most advanced runes are named after the &4Seven Deadly Sins&0. A separate &1Rune of Mana&0 also exists. -botania.page.runeAltar20=Sneaking and right-clicking the &1Runic Altar&0 with an empty hand while it's not accepting mana will remove the last item put into it.
    Last but not least, attaching a &1Comparator&0 to it will emit signal strength &41&0 if the altar is accepting &4Mana&0 and signal strength &42&0 if it's ready to craft the rune. -botania.page.runeAltar21=Similarly to the &1Petal Apothecary&0, right clicking this block with an empty hand after a recipe is complete will place back the items used for the last recipe for faster mass crafting. -botania.page.runeAltar4=The &1Rune of Water&0. -botania.page.runeAltar5=The &1Rune of Earth&0. -botania.page.runeAltar6=The &1Rune of Air&0. -botania.page.runeAltar7=The &1Rune of Fire&0. -botania.page.runeAltar8=The &1Rune of Spring&0. -botania.page.runeAltar9=The &1Rune of Summer&0. -botania.page.runeAltar10=The &1Rune of Autumn&0. -botania.page.runeAltar11=The &1Rune of Winter&0. -botania.page.runeAltar12=The &1Rune of Mana&0. -botania.page.runeAltar13=The &1Rune of Lust&0. -botania.page.runeAltar14=The &1Rune of Gluttony&0. -botania.page.runeAltar15=The &1Rune of Greed&0. -botania.page.runeAltar16=The &1Rune of Sloth&0. -botania.page.runeAltar17=The &1Rune of Wrath&0. -botania.page.runeAltar18=The &1Rune of Envy&0. -botania.page.runeAltar19=The &1Rune of Pride&0. # -- TERRASTEEL botania.entry.terrasteel=Terracier -botania.page.terrasteel0=&1Terrasteel&0 is a complex magical alloy, infused with a great amount of &4Mana&0. Conjuring it proves not to be a small task. For starters, to create it, one would require a &1Terrestrial Agglomeration Plate&0, set on top of a checkerboard pattern of &1Lapis Lazuli Blocks&0 and &1Livingrock&0. &4Mana&0 would need to be provided to this block, &1Sparks&0 would be the most effective way.. -botania.page.terrasteel1=Creating the plate -botania.page.terrasteel2=After the plate is set up and ready to receive &4Mana&0, tossing a single &1Manasteel Ingot, Mana Diamond and Mana Pearl&0 on top of it will begin the infusion.
    Picking up any of the items will halt the infusion causing severe &4Mana Loss&0. The infusion uses half a &1Mana Pool&0 total to create a single piece of &4Terrasteel&0, multiple &1Sparks&0 would make it go faster, too. -botania.page.terrasteel3=Creating &1Terrasteel&0 (there's &1Livingrock&0 under the plate) # -- BLACK LOTUS botania.entry.blackLotus=Lotus noir -botania.page.blackLotus0=An elusive flower by the name of &1Black Lotus&0 is known to exist, however, it does not grow or reproduce. Where they can be found or come from is not known.
    It is known, however, that it contains a strong amount of concentrated &4Mana&0, that can be released by putting it in contact with a &1Mana Pool&0 that already has some in it. Just tossing it would do. - - -# -- FLOWER POUCH -botania.entry.flowerBag=Flower Pouch -botania.page.flowerBag0=The laws of physics regarding one's &4Inventory&0 are somewhat skewed in this world. Thanks to that, carrying an array of different colors of flowers turns out to be a major hassle. Luckily, a &1Flower Pouch&0 takes care of all those issues. It can store up to one stack of each color of &1Fleur mystique Flower&0, not only that but it'll passively catch any that enter the holder's inventory. -botania.page.flowerBag2=Items won't be added automatically to the pouch if that's the item being held.
    Furthermore, shift-right clicking the pouch into a &1Chest&0 or other inventory will store the flowers it contains into said inventory. -botania.page.flowerBag1=Pull a copter out of it (any colors work) - -# -- WRAP -botania.entry.wrap=Wrap -botania.page.wrap0=It seems like the creator of this mod decided to add a weird game mechanic in the form of &1Wrap&0. I don't really know what it does, probably something bad. :/
    What's this "Fourth Wall" you're talking about...? - -# - MANA -# -- AN INTRODUCTION TO MANA -botania.entry.mIntro=An Introduction to Mana -botania.page.mIntro0=&4Mana&0 is an ethereal substance. In layman's terms, it is a form of &4Fleur mystique energy&0. Its sensorial existence is inconstant, and its color depends on the environment its put in.
    Mastering &4Mana&0 is one of the most important skills a botanist needs to master. -botania.page.mIntro1=In order to create &4Mana&0, one would require a set of &4Generating Flowers&0 (read the respective section). This &4Mana&0 can be dispersed by utilizing &1Diffuseur de manas&0 and stored in &1Mana Pools&0. &4Mana&0 can be used for a myriad of different things. For starters, it can be used for &4Functional Flowers&0 (read the respective section). -botania.page.mIntro2=To get started with mastering the art of &4Mana&0, one would start by learning how to use &1Fleur de jours&0, &1Diffuseur de manas&0 and &1Mana Pools&0.
    These form a basic infrastructure for mana, which can be used for all sorts of purposes. Have a read at the &4Functional Flora&0 and &4Magical Apparatus&0 sections of this Lexicon. # -- Diffuseur de mana botania.entry.spreader=Diffuseur de mana -botania.page.spreader0=The &1Diffuseur de mana&0 is the most important component in manipulating &4Mana&0.
    This is the block that allows &4Mana&0 to travel from point A to point B. When this block is placed on the ground, it'll face one of 6 basic directions. By holding shift-right on it with a &1Wand of the Forest&0, one can orient it to the opposite of where it was clicked. It can be pointed to other blocks with a wand in &4Bind Mode&0. -botania.page.spreader1=Holding a &1Wand of the Forest&0 -botania.page.spreader2=The &1Diffuseur de mana&0 has a small internal buffer of &4Mana&0, which will get filled by nearby &4Generating Flowers&0. This buffer can be viewed by looking at the &1Spreader&0 with a &1Wand of the Forest&0, as demonstrated in the last page.
    Note that the block needs to be right clicked with a wand to get accurate and adequate values. -botania.page.spreader3=Holding a &1Wand of the Forest&0 displays a beam which shows where the spreader is pointing at. Hovering over it shows the target. The sparkle that's always shown is the point when &4Mana loss&0 starts to happen.
    If the target of the spreader is a block that can contain &4Mana&0, and isn't full, the spreader will fire a &4Mana Burst&0, which will travel to the target, and pass the &4Mana&0 along to it. -botania.page.spreader4=The spreader only fires one burst at once, it'll only fire another one when the last one hits the target.
    Furthermore, the bursts also start suffering &4mana loss&0 after a small amount of time. This can be seen in the beam, which becomes a lot thinner when this happens. There is also a small amount of &4mana loss&0 when a beam enters a spreader. -botania.page.spreader11=Applying a &4Redstone Signal&0 to the spreader will have it cease to function. Case better control is required, a &1Redstone Diffuseur de mana&0 is recommended, as it can fire bursts without a target block and works on redstone pulses. -botania.page.spreader5=Crafting the &1Diffuseur de mana&0 -botania.page.spreader10=Right clicking the spreader with a piece of &1Wool&0 will sleeve it. Aside from making it look fancier, it'll also muffle the sound when a burst is shot, making it much less obnoxious when there's a large amount of spreaders in one area.
    Right clicking with an empty hand will remove the sleeve. # -- MANA POOL botania.entry.pool=Bassin de mana -botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
    Mana can be inserted into it by usage of a &1Diffuseur de mana&0, and any adjacent &1Diffuseur de manas&0 will pull mana from it to increase their internal buffer automatically.
    Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. -botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 variety which only stores a very small amount of &4Mana&0 and isn't able to infuse items, and a &1Normal&0 variety, which can store as much as a hundred times more than the dilluted one and can infuse items.
    Whenever "Mana Pool" is refered elsewhere for scale, it refers to a normal one. -botania.page.pool1=Making a &1Dilluted Mana Pool&0. -botania.page.pool10=Infusing a normal &1Mana Pool&0 -botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
    A few examples are &1Iron Ingots&0 or &1Fleur mystique Petals&0.
    &4Mana&0 reading for this block functions like the &1Diffuseur de mana&0. A &1Redstone Comparator&0 can also output a signal based on the contents. -botania.page.pool8=For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. -botania.page.pool3=Infusing &1Manasteel&0 -botania.page.pool4=Infusing &1Mana Pearls&0 -botania.page.pool5=Infusing &1Mana Diamonds&0 -botania.page.pool6=Infusing &1Mana Petals&0 -botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. -botania.page.pool12=Infusing &1String&0 -botania.page.pool7=Infusing &1Mana Cookies&0, pretty good food. - -# -- SPARKS -botania.entry.sparks=Sparks -botania.page.sparks0=&1Sparks&0 are interesting entities. Created from a combination of raw energy and &4Mana&0, they have the ability to be placed on top of a few specific &4Mana&0 containing or accepting blocks, mainly, &1Mana Pools&0.
    Some blocks have the ability to harness &4Mana&0 from &1Sparks&0, but the uses for them seem limited to a few blocks right now. -botania.page.sparks1=Placing a &1Spark&0 on top of a &1Mana Pool&0 and another on top of a block that can accept it will allow for the latter to remotely access the reservoirs of the &1Mana Pool&0 when needed, given it's not too far away.
    To remove a &1Spark&0 simply shift-right click it with a &1Wand of the Forest&0. Regular right clicking shows which other &1Sparks&0 it can transfer to. -botania.page.sparks2=&oholds up spork&r - -# -- SPARK AUGMENTATION -botania.entry.sparkUpgrades=Spark Augmentation -botania.page.sparkUpgrades0=As it seems, &1Sparks&0 are a bit more versatile than it was known previously. A variety of &1Augments&0 can be applied to them to enhance their abilities. It's to note that Augments can only be applied to &1Sparks&0 that lie on &1Mana Pools&0.
    A &1Spark&0 can only have a single &1Augment&0 at any given time. -botania.page.sparkUpgrades1=Starting off, the &1Dispersive Augment&0 has the &1Spark&0 use up the &4Mana&0 in the pool below, to charge any nearby players' &4Mana&0 containing items. -botania.page.sparkUpgrades2=The &1Dominant Augment&0 will have the &1Spark&0 pull any &4Mana&0 from nearby non-augmented &1Sparks'&0 pools into its own, until it's completely full. -botania.page.sparkUpgrades3=The &1Recessive Augment&0 will have the &1Spark&0 output all of the &4Mana&0 in its pool into any nearby non-augmented or Dispersive &1Sparks'&0 pools until it's completely empty. -botania.page.sparkUpgrades4=Lastly, the &1Isolated Augment&0 will prevent the &1Spark&0 from interacting with any Dominant or Recessive &1Sparks&0, but still allow it to interact with blocks that can receive their &4Mana&0 through the &1Spark&0 network. -botania.page.sparkUpgrades5=Crafting the Augments - -# -- MANA DISTRIBUTOR -botania.entry.distributor=Mana Distributor -botania.page.distributor0=Any botanist will eventually reach a point where a single &1Mana Pool&0 setup is not enough.
    The &1Mana Distributor&0 will fix all those issues. By placing it adjacently to a few &1Mana Pools&0 on its sides, when it receives &4Mana&0 through &4Mana Bursts&0 it'll equally spread it to the adjacent pools. -botania.page.distributor1=Crafting the distributor - -# -- MANA VOID -botania.entry.manaVoid=Mana Void -botania.page.manaVoid0=The &1Mana Void&0 is, in layman's terms, the grave for &4Mana&0. Any &4Mana&0 shot into this block will simply vanish into the void, never to be seen again.
    Placing one of these under a &1Mana Pool&0 allows the pool to always accept &4Mana&0, but disposing any it can't hold. -botania.page.manaVoid1=Even Chad from accounting? - -# -- MANA FLUXFIELD -botania.entry.rfGenerator=Mana Fluxfield -botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4Redstone Flux&0.
    Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4RF&0. It can then be pulled out with any &4RF&0 transporter. -botania.page.rfGenerator1=The bullet guys. I bit it. - -# -- MANA LENSES -botania.entry.lens=Mana Lenses -botania.page.lens0=In order to upgrade the potential a &1Diffuseur de mana&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
    Lenses can be &4dyed&0, in a workbench, all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. -botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dyeing&0 lenses! -botania.page.lens3=&1Rainbow Lens&0 all the way -botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
    It's to take in mind that, if using a normal &1Diffuseur de mana&0, there needs to be a &4Mana&0 receiving block at the end for the burst to fire. A &1Redstone Diffuseur de mana&0 is recommended for some lenses. -botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
    The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. -botania.page.lens6=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose its &4Mana&0 a lot faster, it can also carry a bit less. -botania.page.lens7=Velocity Lens -botania.page.lens8=The &1Potency Lens&0 will double the amount of &4Mana&0 a &4Mana Burst&0 can carry, however, the beam becomes slower and after it starts to lose mana it does so at a lot faster rate. -botania.page.lens9=Potency Lens -botania.page.lens10=The &1Resistance Lens&0 will significantly increase the amount of time the &4Mana Burst&0 can go without starting to lose &4Mana&0, but it makes it a a bit slower. -botania.page.lens11=Resistance Lens -botania.page.lens12=The &1Efficiency Lens&0 will decrease the amount of time it takes for the &4Mana Burst&0 to start losing its &4Mana&0, but when that happens, it does so at a lot slower rate. -botania.page.lens13=Efficiency Lens -botania.page.lens14=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. -botania.page.lens15=Bounce Lens -botania.page.lens16=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus moving in an arc. As compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. -botania.page.lens17=Gravity Lens -botania.page.lens18=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact with, draining its own mana to do so. -botania.page.lens19=Bore Lens -botania.page.lens20=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining its own mana to do so. -botania.page.lens21=Damaging Lens -botania.page.lens22=The &1Phantom Lens&0 is an interesting one. By utilizing the &1Abstruse Platform&0 and its' properties, it's possible to make a lens that'll allow the &4Mana Burst&0 to pass through blocks. In doing so, the time it can stay without losing mana is decreased. -botania.page.lens23=Phantom Lens -botania.page.lens24=The &1Magnetizing Lens&0, as its name states, allows the &4Mana Burst&0 to magnetize, or home in, on any nearby blocks that can receive &4Mana&0. Doing so slightly decreases the speed of the burst. -botania.page.lens25=Magnetizing Lens -botania.page.lens26=The &1Entropic Lens&0 imbues the &4Mana Burst&0 with entropy, causing it to release its energy in the form of an explosion when it collides against something that can't receive &4Mana&0. -botania.page.lens27=Entropic Lens -botania.page.lens28=The &1Influence Lens&0 allows the &4Mana Burst&0 to have influence over any nearby &4dropped items&0, &4experience orbs&0 and even &4falling blocks&0, having them move in the exact same vector of motion as the burst itself. -botania.page.lens29=Influence Lens -botania.page.lens30=The &1Weight Lens&0 carries a strong burden on the &4Mana Burst&0, making any block hit by it, if there doesn't happen to be a block below it, fall, similarly to how &1Sand&0 and &1Gravel&0 do. -botania.page.lens31=Weight Lens -botania.page.lens32=The &1Kindle Lens&0 is infused with a burning spark, when it hits a block it'll set it on fire. It has the ability to both ignite and close &1Nether Portals&0. It doesn't seem to set any living beings on fire, though. -botania.page.lens33=Kindle Lens -botania.page.lens34=The &1Force Lens&0 acts as a &1Piston&0, when it hits a block that a piston can move, it'll do just so. -botania.page.lens35=Force Lens -botania.page.lens36=The &1Flash Lens&0, in contact with a block, creates a flame of the same color as the burst that caused it. The flame provides light and is purely decorative.
    If it hits one of these flames, it puts it out instead. -botania.page.lens37=Flash Lens - -# -- MANA TABLET -botania.entry.manaTablet=Tablette de mana -botania.page.manaTablet0=While using &1Diffuseur de manas&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
    The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself.
    Not only that, but other items can also pull from it as they need it for their uses, making this an essential tool. -botania.page.manaTablet1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
    Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
    Lastly, unlike normal items, these will never despawn when dropped on the floor. -botania.page.manaTablet2=Don't put it on your pocket, it might bend - -# -- MANA MIRROR -botania.entry.manaMirror=Miroir de mana -botania.page.manaMirror0=A &1Mana Mirror&0 is an alternative to &4Mana&0 containing items such as a &1Mana Tablet&0. It can be bound to a &1Mana Pool&0 in the world and items will pull out of the pool itself when needing &4Mana&0.
    To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror. The mirror can't put mana in or take mana out of pools in any other way. -botania.page.manaMirror1=Mirror mirror on the wall... # -- MANA DETECTOR botania.entry.manaDetector=Détecteur de mana -botania.page.manaDetector0=A device like the &1Mana Detector&0 is capable to detect when a &4Mana Burst&0 starts flowing through it (the burst doesn't dissipate on collision with this block) and provide a redstone signal when that is the case. -botania.page.manaDetector1=Crafting the detector # -- REDSTONE MANA SPREADER botania.entry.redstoneSpreader=Diffuseur de mana Redstone -botania.page.redstoneSpreader0=By combining a &1Diffuseur de mana&0 with a piece of &1Redstone&0, it's possible to create a &1Redstone Diffuseur de mana&0, which fires only when given a &4Redstone signal&0, regardless of having a block in the end to put the mana or not.
    It's to keep in note that this doesn't let the spreader shoot a burst until the last one dissipates or is absorbed. -botania.page.redstoneSpreader1=Just add redstone # -- MANASTAR botania.entry.manastar=Manastar -botania.page.manastar0=The imprecise measurements of the &1Wand of the Forest&0 sometimes won't cut it for telling if you're turning a profit or loss in your &1Mana Pools&0.
    Creating a &1Manastar&0 and placing it next to your pools will have it shine red if there's a loss or blue if there's a profit. The measurement happens every few seconds. -botania.page.manastar1=&rI'm a shooting star leaping through the skies&r. # -- ELVEN MANA SPREADERS botania.entry.dreamwoodSpreader=Diffuseur de mana elfique -botania.page.dreamwoodSpreader0=Simply put, &1Dreamwood&0 conducts &4Mana&0 better than &1Livingwood&0. Add in some adjustments like &1Elementium&0 or &1Mana Petals&0 and what you get is a &1Diffuseur de mana&0 that can conduct more &4Mana&0, faster and for more time without &4Mana loss&0.
    On the negative side, it can't be turned into a &1Redstone Diffuseur de mana&0. -botania.page.dreamwoodSpreader1=Better spreaders, that's it -botania.page.dreamwoodSpreader2=By combining this already powerful spreader with a &1Gaia Spirit&0 and a &1Dragonstone&0 gem, one can create an even more potent variant. The &1Gaia Spreader&0 is within the top percentage of Diffuseur de manas, with pretty much upgrades all round.
    It's to note that these spreaders fire a larger payload at once and thus, might fire less often. -botania.page.dreamwoodSpreader3=ULTRA_SPREADER - -# -- PAINTSLINGER LENS -botania.entry.paintLens=Paintslinger Lens -botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. -botania.page.paintLens1=A M'AIDER Stranded Girl # -- WARP LENS botania.entry.warpLens=Lentilles de déformation -botania.page.warpLens0=The &1Mana Lens: Warp&0 is an interesting one. A &4Mana Burst&0 with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired. -botania.page.warpLens1=Hakase Quarries # -- MANA PRISM botania.entry.prism=Prisme de mana -botania.page.prism0=The concept of &1Mana Lens&0 allows for the manipulation of the power convyed through &4Mana Bursts&0, the &1Mana Prism&0 works on that technology to allow a burst to have its lens effect switched on the fly.
    Using a &1Spectral Platform&0 as a component, this block does not have a physical presence, entities and bursts can go through it as if it doesn't exist. -botania.page.prism1=Right clicking it with any variety of &1Mana Lens&0 sets the lens in the prism. Whenever a &4Mana Burst&0 goes through the prism, its color and effect will be set to that of the lens in the prism. Case the lens is not dyed, the burst will turn white.
    Using any of the four basic lenses also increases the time the burst can go before losing &4Mana&0, allowing it to go further. -botania.page.prism2=It can also be turned off by the use of a redstone signal. -botania.page.prism3=Another pixel in the wall # -- MANA ON RAILS botania.entry.poolCart=Mana sur les rails -botania.page.poolCart0=What could be an easier way to transport &4Mana&0 over large distances than attaching a &1Mana Pool&0 to a &1Minecart&0 and watch it do the merry-go-round? It's simple. Similarly to other types of carts, one can create a &1Minecart with Mana Pool&0 that can store and transport &4Mana&0 on rails.
    Breaking the cart while there's any &4Mana&0 in it will waste the &4Mana&0, care should be taken with it. -botania.page.poolCart1=Transfering &4Mana&0 between the cart and a pool is done with a &1Mana Pump&0. It can face any of the four cardinal directions and will transfer &4Mana&0 between a pool adjacent to it and a cart with a pool on an rail opposite to the target pool.
    The transfer rate is extremely fast due to the mechanical nature, so fast that overflow is possible, causing &4Mana Loss&0. -botania.page.poolCart2=The side of the pump where the &4Mana&0 will go towards is the pink one, &4Mana&0 is pulled from the blue side.
    The pump can be turned off with redstone, and a &1Comparator&0 on it will output how much &4Mana&0 exists in the cart.
    Lastly, a pool on a cart serves purely for transport, and can not receive, send, transfer or infuse any items with its &4Mana&0. -botania.page.poolCart3=I like trains -botania.page.poolCart4=This is not a pipe # -- SPARK TINKERER botania.entry.sparkChanger=Spark Tinkerer -botania.page.sparkChanger0=The &1Spark Tinkerer&0 is a block with the ability to modify the &1Augments&0 placed on &1Sparks&0. Placing it adjacent to &1Mana Pools&0 or other blocks with a &1Spark&0 attached will connect it to those blocks.
    Right clicking the &1Spark Tinkerer&0 with a &1Spark Augment&0 will put the augment in the block, it can be removed by right clicking again. -botania.page.sparkChanger1=When the &1Spark Tinkerer&0 gets a redstone signal it'll randomly pick a &1Spark&0, between all of those it's connected to that have a different augment from the one stored in it, and swap the augment in that &1Spark&0 with the one stored in the block.
    The stored augment can be withdrawn or deposited with &1Hoppers&0 or other automation methods. -botania.page.sparkChanger2=Hahahaha, water fire... - -# - FUNCTIONAL FLOWERS -# -- AN INTRODUCTION TO FUNCTION -botania.entry.fIntro=An Introduction to Function -botania.page.fIntro0=There are various places in which the &4Mana&0 a botanist generates can be put to use, one of them is an assortment of &4Functional Flowers&0.
    These flowers will drain &4Mana&0 from a nearby &1Mana Pool&0 into themselves, in order to do whatever task they were created for.
    It's to note that these can't receive power directly through &1Diffuseur de manas&0. -botania.page.fIntro1=All &4Functional Flowers&0, alike the &4Generating Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings. -botania.page.fIntro2=It is important to keep in mind that these flowers memorize the &1Mana Pool&0 from which they should pull &4Mana&0 out of. They'll only pull from the nearest pool present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. It can be bound to another pool with a wand in &4Bind Mode&0. -botania.page.fIntro3=Lastly, some functional flowers utilize a &1Redstone Root&0 in their creation. If they do, the flower's effect can be toggled with a redstone signal. -botania.page.fIntro4=&1Redstone Root&0 for Redstone Control - -# -- FLOWER SHRINKING -botania.entry.flowerShrinking=Flower Shrinking -botania.page.flowerShrinking0=Some functional flowers have a bit too much reach. Sometimes one might not want that to be the case. Tossing one of those few flowers into a &1Mana Pool&0 with an &1Alchemy Catalyst&0 will, at the cost of some &4Mana&0, shrink it, making its radius smaller. Every other function remains the same. -botania.page.flowerShrinking1=Like a nendoroid - -# -- JADED AMARANTHUS -botania.entry.jadedAmaranthus=Jaded Amaranthus -botania.page.jadedAmaranthus0=Everyone likes flowers right? The &1Jaded Amaranthus&0 is made just for that purpose.
    Feeding it with &4Mana&0 from &1Mana Pools&0 will have it quickly grow new &1Fleur mystique Flowers&0 around it, in any spots it can. -botania.page.jadedAmaranthus1=&oIt was this or clematis.&r -botania.page.jadedAmaranthus2=&oWait a minute, did you just summon a bunch of flowers in one turn?
    Yeah, so?
    That's against the rules, isn't it?
    Screw the rules, I have Mana! - -# -- BELLETHRONE -botania.entry.bellethorne=Bellethorne -botania.page.bellethorne0=The &1Bellethorne&0 is a malevelous flower. By utilizing &4Mana&0 it slowly inflicts harm in any living beings (save for &4players&0) around it. -botania.page.bellethorne1=&oEvery rose has its thorn&r. - -# -- DREADTHORNE -botania.entry.dreadthorne=Dreadthorne -botania.page.dreadthorne0=The &1Dreadthorne&0 is a slightly more specific counterpart to the &1Bellethrorne&0, by which, instead of all mobs around, it'll only hurt &4adult&0 animals and none else. -botania.page.dreadthorne1=&oNo Mr.Bond, I expect you to die&r. - -# -- HEISEI DREAM -botania.entry.heiseiDream=Heisei Dream -botania.page.heiseiDream0=The &1Heisei Dream&0 will, by utilizing &4Mana&0, awaken feelings of anger and revenge in any nearby &4mobs&0, turning them against eachother. -botania.page.heiseiDream1=&oA pleasant era will murder people&r. -botania.page.heiseiDream2=&oHeisei, was broken, broken. Who was the one who lied about peace? See, it's forgotten, forgotten, even the punishement blamed on the altar. Hey, it's breaking, breaking, at the end, even the meaning of shaking is killed.
    Well, where shall we go? Let's go somewhere, whose ally are you? Whose replacement am I? - -# -- TIGERSEYE -botania.entry.tigerseye=Tigerseye -botania.page.tigerseye0=It's a known fact that &4Creepers&0 are terrified of &4cats&0.
    The &1Tigerseye&0 exploits that very weakness, by emitting a feline aura, petrifying any nearby &4Creepers&0, preventing them from exploding. It also has the effect of making them run away from &4players&0. -botania.page.tigerseye1=&oRisin' up to the challenge of our rivals&r. - -# -- ORECHID -botania.entry.orechid=Orechid -botania.page.orechid0=While going mining is all good, a renewable means of getting ore is due. The &1Orechid&0 will use (a massive amount of) &4Mana&0 to generate &4ores&0 in nearby &1Stone&0 blocks.
    The ores it generates are random, but seem to be biased towards more common ores rather than rarer ones. -botania.page.orechid1=&oNot dragon poop&r. - -# -- ORECHID IGNEM -botania.entry.orechidIgnem=Orechid Ignem -botania.page.orechidIgnem0=The &1Orechid&0 is a great flower. The ability to create raw ores with &4Mana&0 can be a great boon to any sedentary botanist's life. It, however, can't create ores from the &4Nether&0. Getting that sorted out is easy, by switching the petals a bit, it'll create &4Nether&0 ores in &1Netherrack&0 instead. The flower must be in the &4Nether&0 to work. -botania.page.orechidIgnem1=&oGetting hot in here&r. - -# -- FALLEN KANADE -botania.entry.fallenKanade=Fallen Kanade -botania.page.fallenKanade0=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby. -botania.page.fallenKanade0a=The &1Fallen Kanade&0 is a flower with angelic properties, it'll use &4Mana&0 from nearby &4Mana Pools&0 in order to apply a regeneration effect to any &4players&0 nearby.
    Interestingly enough, &4Blood Mages&0 have been known to place odd hexes on their altars which cause this flower to malfunction, that might be something to keep in mind. -botania.page.fallenKanade1=&oHand Sonic, version four&r. -botania.page.fallenKanade2=&oI'll marry you. No matter what kind of sickness you have, even if you can't walk or stand, or even if you can't have kids, I'll still marry you. No matter where or how I met you, I'll fall in love with you.
    If I can meet you again, against the six billion to one odds, and even if your body can't move, I'll marry you. - -# -- EXOFLAME -botania.entry.exoflame=Exoflame -botania.page.exoflame0=Unlike its generating counterpart, the &1Exoflame&0 utilizes &4Mana&0 with means to generate heat.
    Any &1Furnaces&0 nearby to the &1Exoflame&0 will be fueled, and given a speed boost, for the cost of some &4Mana&0. -botania.page.exoflame1=&oBut we should be going nowhere fast&r. - -# -- AGRICARNATION -botania.entry.agricarnation=Agricarnation -botania.page.agricarnation0=The slow growth of crops is always a problem to feed the masses. The &1Agricarnation&0 is a flower that turns &4Mana&0 into a type of natural fertilizer, causing nearby plantlife to grow at a faster rate. -botania.page.agricarnation1=&oGrandola Vila Morena&r... - -# -- HOPPERHOCK -botania.entry.hopperhock=Hopperhock -botania.page.hopperhock0=The &1Hopperhock&0 will pick up items around it. Giving it &4Mana&0 is optional, but it'll increase its range.
    Items picked up will be put in adjacent inventories (e.g. &1Chests&0). Placing &1Item Frames&0 on any of the inventories will specify which items can or can't go in them. -botania.page.hopperhock1=Any inventory which has no &1Item Frame&0 adjacent to it can accept any items, but labelled inventories will take priority.
    The rule using to sort items can be changed by shift-right clicking the flower with a &1Wand of the Forest&0. -botania.page.hopperhock2=&oI guess I'll be talking my loli and leaving&r. - -# -- TANGLEBERRIE -botania.entry.tangleberrie=Tangleberrie -botania.page.tangleberrie0=The &1Tangleberrie&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters within a circle ward, preventing them from getting out. -botania.page.tangleberrie1=&oTangled, brave and frozen&r. - -# -- JIYUULIA -botania.entry.jiyuulia=Jiyuulia -botania.page.jiyuulia0=The &1Jiyuulia&0 is a flower that, at the cost of a small amount of &4Mana&0, will keep any nearby animals or monsters at bay, protecting a circular area from them getting in. -botania.page.jiyuulia1=&oHR HD DT Masterpiece&r. - -# -- RANNUNCARPUS -botania.entry.rannuncarpus=Rannuncarpus -botania.page.rannuncarpus0=Quite a handy flower indeed, the &1Rannuncarpus&0 will pick up any nearby blocks in dropped item form and place them in the world nearby. It, however, only places the blocks thrown at it on top of a specific block, to specify this block, place it right below the soil the flower is resting on. -botania.page.rannuncarpus1=Block items, such as &1Sugar Cane&0 will also work, but, much alike any other blocks, will only be placed in a location where they normally would be able to be placed.
    Lastly, giving &4Mana&0 to the flower is optional, but it increases its range. -botania.page.rannuncarpus2=&oThe Sandpit of Yanille&r? - -# -- HYACIDUS -botania.entry.hyacidus=Hyacidus -botania.page.hyacidus0=For some reason, poison does not kill. The &1Hyacidus&0, to that, can be used to poison any nearby mobs, bringing them to their knees for a one hit kill after a bit. -botania.page.hyacidus1=&oSteel is immune&r. - -# -- POLLIDISIAC -botania.entry.pollidisiac=Pollidisiac -botania.page.pollidisiac0=Animals love eating, that's all they seem to do, really. An interesting behaviour they show is that they only seem to want to eat things that are fed to them.
    The &1Pollidisiac&0 will simply do that, at the cost of some mana, any appropriate nearby food items (&1Wheat&0, &1Carrots&0, etc) will be fed to the animals, putting them in a &obetter mood&r. -botania.page.pollidisiac1=&oHell's Kitchen&r. - -# -- CLAYCONIA -botania.entry.clayconia=Clayconia -botania.page.clayconia0=The &1Clayconia&0 is a simple flower, in essence. All it does is moisten nearby &1Sand&0, turning it into &1Clay&0, this process uses a decent amount of &4Mana&0, but nothing too insane. -botania.page.clayconia1=&oWhat a killer joke&r. - -# -- LOONIUM -botania.entry.loonium=Loonium -botania.page.loonium0=Any weary adventurer knows that &4Dungeons&0 can hold valuable goodies. The &1Loonium&0 can, at the use of an extreme amount of &4Mana&0, materialize these items and drop them in the nearby vicinity. -botania.page.loonium1=&oTank Tank Heal Tank&r! - -# -- DAFFOMILL -botania.entry.daffomill=Daffomill -botania.page.daffomill0=The &1Daffomill&0 works as a fan of sorts. It pushes, at the cost of a small amount of &4Mana&0, any items found in front of it.
    Shift-right clicking it with a &1Wand of the Forest&0 changes the orientation. Where it's currently facing can be seen via the subtle wind particles it emits. -botania.page.daffomill1=&oWind Turbines? I'm a big fan&r. - -# -- VINCULOTUS -botania.entry.vinculotus=Vinculotus -botania.page.vinculotus0=The &1Vinculotus&0 has the power to create a disturbance among any &4Enderman&0's teleportation powers within a fairly large radius around it. For a cost of &4Mana&0, whenever an &4Enderman&0 would teleport anywhere, instead, they're teleported to the location of the &1Vinculotus&0. -botania.page.vinculotus1=&oTouch this black lotus with your fingers&r. - -# -- SPECTRANTHEMUM -botania.entry.spectranthemum=Spectranthemum -botania.page.spectranthemum0=Transporting items a long distance can be an arduous task. Water channels and &1Daffomills&0 won't cut it forever.
    The &1Spectranthemum&0, at the cost of &4Mana&0 wraps the fabric of reality of any dropped items that do not contain &4Mana&0 around it, teleporting them somewhere else in the world. -botania.page.spectranthemum1=In order to specify where the items go, one would use a &1Wand of the Forest&0 in bind mode and bind the flower to a block somewhere, similarly to binding it to a pool.
    In order to view what block the flower is bound to rather than the pool it's pulling &4Mana&0, one would sneak while looking at it with a wand. -botania.page.spectranthemum2=This flower is governed by the &4axiom of chunkloading&0, by which it'll not function on chunks not loaded. This topic is not addressed in full extent this lexicon.
    &oRecommended Reading: "Chunks and Chicken", "Anchors of the World". -botania.page.spectranthemum3=&o(n)spooky(n+2)me&r. - -# -- MEDUMONE -botania.entry.medumone=Medumone -botania.page.medumone0=The &1Medumone&0 is a flower with the ability to completely halt a creature's movement.
    While it receives &4Mana&0, it'll halt any nearby entities in their tracks with a powerful slowness effect, provided they are not players. -botania.page.medumone1=&oThose credits look fake&r... - -# -- MARIMORPHOSIS -botania.entry.marimorphosis=Marimorphosis -botania.page.marimorphosis0=The &1Marimorphosis&0 is a flower that executes metamorphic transformations on nearby &1Stone&0 blocks. These blocks get metamorphised into one of 8 different types of &1Metamorphic Stone&0. All 8 types will generate, but the type(s) that generate more often depend on the biome. All of these can be used to make bricks, chiseled bricks, slabs, stairs and even &1Petal Apothecary&0 variants. -botania.page.marimorphosis1=The various flavours of &1Metamorphic Stone&0 -botania.page.marimorphosis3=Colorful like a ClariS song -botania.page.marimorphosis2=&oThis flower is pretty gneiss&r. - -# -- BUBBELL -botania.entry.bubbell=Bubbell -botania.page.bubbell0=Building underwater is a no small task. Clearing air under the sea is incredibly troublesome and time consuming. Placing down a &1Bubbell&0 underwater and providing it with &4Mana&0 (preferably a priori) will have it start to create a dome of air which will keep water at bay. The dome has about twelve blocks of radius. &4Mana&0 is required constantly to keep it up and going. -botania.page.bubbell1=&oLike some casual game&r. - -# -- SOLEGNOLIA -botania.entry.solegnolia=Solegnolia -botania.page.solegnolia0=The &1Ring of Magnetization&0 is a rather handy tool for anyone digging or collecting. It does, however, fall into the problem that it picks up unwanted items near complex systems.
    The &1Solegnolia&0 disrupts the ring and prevents any items around it from being pulled towards a wearer of one. It uses up a small bit of &4Mana&0 for this, but nothing considerate. -botania.page.solegnolia1=On/Off - -# - GENERATING FLOWERS -# -- AN INTRODUCTION TO GENERATION -botania.entry.gIntro=An Introduction to Generation -botania.page.gIntro0=&4Generating Mana&0 should be at the top of the priorities for any botanist. Luckily there's an array of &4Generating Flowers&0 willing to do the job.
    These flowers, as their name shows, generate &4Mana&0, both passively and actively. Unless stated otherwise, all &4Generating Flowers&0 generate &4Mana&0 passively under certain circumstances. -botania.page.gIntro1=All &4Generating Flowers&0, alike the &4Functional Flowers&0 contain a small buffer of &4Mana&0.
    Standard rules for &4Mana&0 reading apply, right clicking with a &1Wand of the Forest&0 will update the mana readings.
    This mana will be stored in the closest &1Diffuseur de mana&0 around. -botania.page.gIntro2=It is important to keep in mind that these flowers memorize the &1Diffuseur de mana&0 into which they should put &4Mana&0 into. They'll only store into the nearest spreader present at the time of the flower being placed (or the closest placed afterward, if none was present), and none other, unless that one is removed. It can be bound to another spreader with a wand in &4Bind Mode&0. - -# -- DAYBLOOM -botania.entry.daybloom=Fleur de jour -botania.page.daybloom0=The &1Fleur de jour&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it performs a modified photosynthesis process, in order to transform sunlight into &4Mana&0.
    The process is rather slow, about ten or a dozen of these should get the job done, for now. -botania.page.daybloom1=These flowers tend to compete among themselves for what sunlight hits an area, thus having any other of the same type adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production. This fact only applies to &1Fleur de jours&0 and &1Nightshades&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflammes&0 or others might be a good idea. -botania.page.daybloom1a=Having any other &1Fleur de jours&0 adjacent to it on any of the four cardinal directions will result in diminishing returns of &4Mana&0 production.
    These flowers are not very resistant, and after some time they'll wither and die off. This only applies to &1Fleur de jours&0 and &1Nightshades&0. They also don't produce much to begin with, so perhaps hastily upgrading to &1Endoflammes&0 or others might be a good idea. -botania.page.daybloom3=Diminishing Returns -botania.page.daybloom2=&oStarting up a brand new day&r. -botania.page.daybloom4=&oHow many of you people out there been hurt in some kind of love affair? And how many times do you swear that you'll never love again? How many lonely, sleepless nights? How many lies? How many fights? And why would you want to put yourself through all that again? "Love is pain," I hear you say. Love has a cruel and bitter way of paying you back for all the faith you ever had in your brain. (...) -botania.page.daybloom5=&oHow could it be that what you need the most can leave you feeling just like a ghost? You never want to feel so sad and lost again. One day you could be looking through an old book in rainy weather. You see a picture of her smiling at you when you were still together. You could be walking down the street and who should you chance to meet. But that same old smile that you've been thinking of all day... # -- NIGHTSHADE botania.entry.nightshade=Ombrenuit -botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Fleur de jour&0, as it generates &4Mana&0 passively in any situation the &1Fleur de jour&0 can not, as long as it's nighttime
    Similarly to their shining counterpart, they suffer diminishing returns from having any adjacent. -botania.page.nightshade0a=The &1Nightshade&0 is the dark counterpart of the &1Fleur de jour&0, as it generates &4Mana&0 passively in any situation the &1Fleur de jour&0 can not, as long as it's nighttime. Alike its shining counterpart, they suffer diminishing returns from having any adjacent and are not very resistant, and some time they'll wither and die off. -botania.page.nightshade1=&oThe shadow of the day&r. # -- ENDOFLAME botania.entry.endoflame=Endoflamme -botania.page.endoflame0=While the &1Fleur de jour&0 is all well and good, a botanist requires more effective means of generating &4Mana&0.
    The &1Endoflamme&0 does that exactly, it will absorb any combustible items or blocks dropped on the nearby vicinity (albeit only one at a time) and burn through them to passively generate mana while the fuel lasts. -botania.page.endoflame1=There is a small caveat though, the &1Endoflamme&0 will not burn anything that returns a byproduct, an example are &1Lava Buckets&0, that have empty &1Buckets&0 as a byproduct.
    Due to their behaviour, an &1Open Crate&0, which you read about on the &4Magical Apparatus&0 section, might be a good step on getting it to be self-sustainable. -botania.page.endoflame2=&oNot nitor&r. # -- HYDROANGEAS botania.entry.hydroangeas=Hydroangeas -botania.page.hydroangeas0=While passive &4Mana&0 generation can be easily achieved through &1Fleur de jours&0, different means of doing so might come in handy. The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought? -botania.page.hydroangeas0a=The &1Hydroangeas&0 will suck up any &1Still Water&0 in a 3x3 area around it, on the same height, creating &4Mana&0 from it. They also seem to function faster during &4Rain&0, who'd have thought?
    Similarly to the &1Fleur de jour&0, these flowers are not very resistant, and after some time they'll wither and die off. -botania.page.hydroangeas2=A simple &1Hydroangeas&0 system -botania.page.hydroangeas3=These flowers, similarly to &1Fleur de jours&0 or &1Nightshades&0 will receive a portion of diminishing returns if put in too compact of a pattern. Having any two &1Hydroangeas&0 one block away from eachother, including diagonals, will drastically reduce the production rate of both, as the roots get tangled. Having even more in the short space will further weaken their potency. The blue particles between them indicate this. -botania.page.hydroangeas1=&oFrom some Hyperdimension&r? # -- THERMALILY botania.entry.thermalily=Therma-lis -botania.page.thermalily0=There comes a point where slow generating power, like the &1Hydroangeas&0 or the &1Endoflamme&0 is not enough. An answer to that is the &1Therma-lis&0, which works similarly to the &1Hydroangeas&0, except with &1Lava&0, it'll produce a very large amount of &1Mana&0 at a spurt when it consumes &1Lava&0, doing this heats up the flower, and it'll need some time to cool down before it can begin the cycle anew. -botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=Rosa Arcana -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0. -botania.page.arcanerose1=&oWhen this card is Summoned, toss a coin&r. - -# -- MUNCHDEW -botania.entry.munchdew=Munchdew -botania.page.munchdew0=Generating the form of natural energy that is &4Mana&0 should be a pretty good process when done via other living materials. By using the &1Munchdew&0, any &1Leaves&0 near the flower will get munched up and converted into &4Mana&0.
    It's to note that, though, no saplings or any other items will be dropped from the leaves. -botania.page.munchdew1=This flower outputs a hefty amount of mana per tree eaten.
    However, after if finishes eating all the available leaves, when left without any, it'll take a break from doing so and will only be able to eat again after a bit over a minute. -botania.page.munchdew2=&oYou pay for dinner, Shibazaki&r. - -# -- ENTROPINNYUM -botania.entry.entropinnyum=Entropinnyum -botania.page.entropinnyum0=In order to generate a blast of &4Mana&0, one might in fact, require a blast nearby.
    Igniting a block of &1TNT&0 in the near an &1Entropinnyum&0 will have the latter absorb all the entropy generated by the blast into itself, creating a large amount of &4Mana&0 and nullifying any possible damage. Lastly, to absorb the explosion, the flower must not have any &4Mana&0 stored in it or the process will fail. -botania.page.entropinnyum1=&oCool guys don't look at explosions&r. - -# -- KEKIMURUS -botania.entry.kekimurus=Kekimurus -botania.page.kekimurus0=&1Cake&0 is delicious, everyone loves it, flowers included.
    The &1Kekimurus&0 is one of these &1Cake&0 aficionados, and will eat any it spots nearby, using its enriching nutrients to create &4Mana&0. -botania.page.kekimurus1=&otop kek&r - -# -- GOURMARYLLIS -botania.entry.gourmaryllis=Gourmaryllis -botania.page.gourmaryllis0=The &1Gourmaryllis&0 is one hungry flower. It'll eat up any food in a small area around it, and turn it into &4Mana&0.
    There's a catch, though, it can only digest a single food at any given time, the &4Mana&0 is created when it's done. Any other food it finds, it'll also devour, but not create any mana from it. -botania.page.gourmaryllis1=The amount of time it takes to digest a delicacy depends on its nutritional value, in layman's terms, the amount of food points it restores.
    So, a &1Steak&0 will take four seconds to digest, a &1Carrot&0 will take two, a loaf of &1Bread&0 will take two and a half, so on. -botania.page.gourmaryllis2=The amount of &4Mana&0 created also makes use of this value, but in a way where the more nutritious the food is, the more efficient it is. For example, a single &1Steak&0 will produce more &1Mana&0 than two &1Carrots&0, both absolutely and per second. -botania.page.gourmaryllis3=&oA hot pot for our new residents&r. -botania.page.gourmaryllis4=&oWell, if Men ate themselves after death, one would think of less horror and negative feeling matter. But so you know what your cruelty leads to, think, fishes, that even Men eat themselves alive like you.
    Alive was Job when he said: "Why do you follow me so inhumanely, thou who are eating me alive and getting sick of my flesh?". Do you want to see a Job like this? (...) -botania.page.gourmaryllis5=&oSee a man of those who are followed by claims or accused of crimes, and behold all who are eating them. The bailiff eats him, the jailer eats him, the scribe eats him, the requestor eats him, the lawyer eats him, the inquirer eats him, the witness eats him, the judge eats him and he's not even sentenced he's already eaten. Worse are the Men than the crows. (...) -botania.page.gourmaryllis6=&oThe sad one who was hanged, only eat him the crows past his execution and death, while the one who's being judged, not even executed or sentenced and he's already eaten.
    The true evil are the Man who eat eachother, and those who commit to it are the largest, those who eat the smallest. For that you, Man, vos estis sal terrae. - -# -- NARSLIMMUS -botania.entry.narslimmus=Narslimmus -botania.page.narslimmus0=There's some sort of unbeknownst power in the universe that creates &1Slimes&0 at seemingly random spots. &4Slime Chunks&0, they call it. The &1Narslimmus&0 is a flower that has the ability to tap into that energy. If placed down near a &1Slime&0 created by that power, it'll destroy it, collecting all the &4Mana&0 generated by the entropy. The larger the &1Slime&0, the more &4Mana&0 is created. It also makes a bit of a sticky mess. -botania.page.narslimmus1=&oStick around, would ye&r? - -# -- SPECTROLUS -botania.entry.spectrolus=Spectrolus -botania.page.spectrolus0=The &1Spectrolus&0 is a flower that's particularly fond of the various tones of &1Wool&0. It'll absorb any and all &1Wool&0 blocks dropped nearby and create &4Mana&0 from them.
    There's a caveat though. It's picky as to what colors it wants. Starting at white, after it absorbs one piece of &1Wool&0, it'll rotate to the next color in the spectrum. -botania.page.spectrolus1=While it consumes all &1Wool&0 around, it'll only create any mana if its of the color it wants, so haphazardly tossing &1Wool&0 at it is a wasteful strategy.
    The color it'll absorb properly next can be seen by hovering over the flower with a &1Wand of the Forest&0. -botania.page.spectrolus2=&oTaste the Rainbow&r. - -# - MAGICAL APPARATUS -# -- MANA PYLON -botania.entry.pylon=Mana Pylon -botania.page.pylon0=A &1Mana Pylon&0 is a structure that can pull energies from the earth and use them to power enchanting processes.
    For one, setting one adjusted to an &1Enchanting Table&0 as if it was a &1Bookshelf&0 will drastically increase the power it can convey, just 2 of these are enough for it to reach &4Level 30&0. -botania.page.pylon1=&oYou must construct additional pylons!&r - -# -- MANA ENCHANTING -botania.entry.manaEnchanting=Enchanting with Mana -botania.page.manaEnchanting0=By utilizing the magical power emitted from &1Mana Pylons&0, a structure that can enchant items with books without consuming them can be created, called the &1Mana Enchanter&0.
    Constructing one of these requires a fair amount of space and materials alike. -botania.page.manaEnchanting1=To construct the &1Mana Enchanter&0, one requires, as well as fair amount of space, 17 &1Obsidian&0 blocks, 10 &1Mystical Flowers&0 of any color, 6 &1Mana Pylons&0 and a &1Lapis Lazuli Block&0.
    The instructions on how to assemble this structure are in the following pages. -botania.page.manaEnchanting2=Mana Enchanter -botania.page.manaEnchanting5=After the construct is done, right click the Lapis block with a &1Wand of the Forest&0 and the enchanter should form.
    In order to utilize the enchanter, one would place (via right click) the item to be enchanted in the enchanter itself and drop &1Enchanted Books&0 inside the circle around it. -botania.page.manaEnchanting6=Items that are already enchanted can't be placed in the enchanter.
    To start the enchanting, right click the enchanter with a &1Wand of the Forest&0. It'll scan the books around, and once it's done, a spell circle of sorts will appear around it, indicating the books can be safely picked up again. -botania.page.manaEnchanting7=After the enchanting begins, the enchanter will require &4Mana&0.
    It can be fed via one of two ways, either via &4Mana Bursts&0 or nearby &1Sparks&0, by placing a &1Spark&0 on top of the enchanter. The later being much faster. -botania.page.manaEnchanting8=When enough &4Mana&0 is gathered, the enchanting process will finalize, and the enchantments will be applied to the item.
    The amount of &4Mana&0 required depends on the rarity of the enchantments being applied, their level, and the total amount of enchantments.
    If any book has more than one enchantment, only the first will be accounted for. -botania.page.manaEnchanting9=During the enchanting process, the item can not be removed, but it can after the process has been completed.
    Note that if at any point, any component of the construct is removed, it'll revert to its original &1Lapis Lazuli Block&0 form. - -# -- SPREADER TURNTABLE -botania.entry.turntable=Spreader Turntable -botania.page.turntable0=The &1Spreader Turntable&0, as its name implies, can turn &1Diffuseur de manas&0 around and around. Placing a spreader above the turntable will rotate it, given that a redstone signal isn't applied.
    To change the speed of the turntable, right click with a &1Wand of the Forest&0, shift-right clicking will invert the movement. -botania.page.turntable1=You spin me right round - -# -- ALCHEMISING WITH MANA -botania.entry.manaAlchemy=Alchemie avec le mana -botania.page.manaAlchemy0=Le &4mana&0 est une substance extrèmement volatile, au point que ses propriétés et habilités complètes soient inconnues.
    One of them is known, though, by attaching an &1Alchemy Catalyst&0, created with a mixture of otherworldly materials to the bottom of a &1Mana Pool&0, it enables the pool to perform &4Alchemy&0. -botania.page.manaAlchemy1=Creating the &1Catalyst&0 -botania.page.manaAlchemy2=&1Rotten Flesh&0 to &1Leather&0 -botania.page.manaAlchemy3=Various types of &1Wood&0 -botania.page.manaAlchemy4=Various types of &1Saplings&0 -botania.page.manaAlchemy5=Breaking down &1Glowstone Blocks&0 -botania.page.manaAlchemy6=Breaking down &1Quartz Blocks&0 -botania.page.manaAlchemy7=Creating &1Chiseled Stone Bricks&0 -botania.page.manaAlchemy8=Further freezing &1Snow&0 into &1Ice&0 -botania.page.manaAlchemy9=Converting between &1Vines&0 and &1Lilypads&0 -botania.page.manaAlchemy10=Various breeds of &1Fish&0 -botania.page.manaAlchemy11=Transmuting &1Seeds&0 and &1Crops&0 -botania.page.manaAlchemy12=Purifying &1Poisonous Potatoes&0 -botania.page.manaAlchemy13=Conjuring &1Nether Wart&0 -botania.page.manaAlchemy14=Converting between &1Gunpowder&0 and &1Flint&0 -botania.page.manaAlchemy15=Making &1Name Tags&0 -botania.page.manaAlchemy16=Splitting &1Wool&0 into &1String&0 -botania.page.manaAlchemy17=Converting between &1Slimeballs&0 and &1Cactus&0 -botania.page.manaAlchemy18=Creating &1Ender Pearls&0 -botania.page.manaAlchemy19=Converting between &1Glowstone&0 and &1Redstone&0 -botania.page.manaAlchemy20=Breaking &1Cobblestone&0 into &1Sand&0 -botania.page.manaAlchemy21=Breaking &1Hardened Clay&0 into &1Red Sand&0 -botania.page.manaAlchemy22=Breaking down &1Clay&0 and &1Bricks&0 -botania.page.manaAlchemy23=Making &1Coarse Dirt&0 -botania.page.manaAlchemy24=Transmuting &1Tall Grass&0 types -botania.page.manaAlchemy25=Transmuting mundane flowers - -# -- BOTANICAL BREWERY -botania.entry.brewery=Botanical Brewery -botania.page.brewery0=Given the versatility of &4Mana&0, the fact that it can be used to conjure some sort of &4Potions&0 comes to nobody's surprise. &4Brews&0 are a variant of &4Potions&0, to put it simply. They're created using &4Mana&0 and a set of ingredients.
    Unlike &4Potions&0, &4Brews&0 have defined recipes, and each vial contains multiple doses. -botania.page.brewery1=In order to create &4Brews&0 one would require a &1Botanical Brewery&0, &1Vials&0 and of course, the reagents defined in the recipe.
    The &4Mana&0 functions as the both the solvent and energy source and is given through &4Mana Bursts&0, simply pointing a &1Diffuseur de mana&0 at the &1Brewery&0 will work just fine. -botania.page.brewery2=Crafting the &1Botanical Brewery&0 -botania.page.brewery3=Crafting &1Vials&0 -botania.page.brewery4=Working the &1Botanical Brewery&0 is rather simple. First off, to add an item, right click with it on the block or toss it.
    Start off by adding the &1Vial&0, which will get set on the top of the brewery. Proceed by adding all the required ingredients. Once a &4Brew&0 can be created with the ingredients in the brewery, &4Mana&0 will start flowing, just wait a bit after that. -botania.page.brewery5a=A simple brew, it mimics a &1Potion of Swiftness&0, when taken, it has a similar effect, giving the individual a &4Speed II&0 effect. -botania.page.brewery5b=Gotta go fast -botania.page.brewery6a=A simple brew, it mimics a &1Potion of Strength&0, when taken, it has a similar effect, giving the individual a &4Strength II&0 effect. -botania.page.brewery6b=Hodor -botania.page.brewery7a=A simple brew, it mimics a &1Potion of Haste&0, when taken, it has a similar effect, giving the individual a &4Haste II&0 effect. -botania.page.brewery7b=Full of C9H13NO3 -botania.page.brewery8a=A simple brew, it mimics a &1Potion of Healing&0, when taken, it has a similar effect, giving the individual an &4Instant Health II&0 effect. -botania.page.brewery8b=He pulled a Truesilver, GG -botania.page.brewery9a=A simple brew, it mimics a &1Potion of Leaping&0, when taken, it has a similar effect, giving the individual a &4Jump Boost II&0 effect. -botania.page.brewery9b=I got jumps, isn't that what the kids say? -botania.page.brewery10a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration II&0 effect. -botania.page.brewery10b=Good reaction to simochi -botania.page.brewery17a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration&0 effect, albeit for longer than the previous brew. -botania.page.brewery17b=I guess she was just more resilient -botania.page.brewery11a=A simple brew, it mimics a &1Potion of Resistance&0, when taken, it has a similar effect, giving the individual a &4Resistance II&0 effect. -botania.page.brewery11b=Can't touch this -botania.page.brewery12a=A simple brew, it mimics a &1Potion of Fire Resistance&0, when taken, it has a similar effect, giving the individual a &4Fire Resistance&0 effect. -botania.page.brewery12b=He isn't a true dragon, fire can't kill a dragon -botania.page.brewery13a=A simple brew, it mimics a &1Potion of Water Breathing&0, when taken, it has a similar effect, giving the individual a &4Water Breathing&0 effect. -botania.page.brewery13b=Under the sea, under the sea -botania.page.brewery14a=A simple brew, it mimics a &1Potion of Invisibility&0, when taken, it has a similar effect, giving the individual a &4Invisibility&0 effect. -botania.page.brewery14b=Pretend you have Incursio -botania.page.brewery15a=A simple brew, it mimics a &1Potion of Night Vision&0, when taken, it has a similar effect, giving the individual a &4Night Vision&0 effect. -botania.page.brewery15b=Does it come with a silence? -botania.page.brewery16a=A simple brew, it mimics a &1Potion of Absorption&0, when taken, it has a similar effect, giving the individual a &4Absorption IV&0 effect. -botania.page.brewery16b=You're gonna catch a cold - -# -- BREWING FLASKS -botania.entry.flasks=Brewing Flasks -botania.page.flasks0=&1Alfglass&0 seems to be more maleable than the typical &1Managlass&0 used for &1Vials&0. A &1Flask&0, made with &1Alfglass&0 is the typical elfique container for &4Brews&0, and can contain 6 doses of one, rather than the 4 a &1Vial&0 does. -botania.page.flasks1=While the ingredient cost to brew something in a &1Flask&0 is smaller, the &4Mana&0 cost is double that of a regular &1Vial&0.
    Lastly, given that the bottleneck of a &1Flask&0 is larger than that of a &1Vial&0, the contents can be consumed faster. -botania.page.flasks2=Get one under the bridge - -# -- COMPLEX BREWING -botania.entry.complexBrews=Complex Brews -botania.page.complexBrews0=Apart from the standard, run of the mill &1Brews&0 that don't pass from mimics of the &1Potions&0 that can be made in a &1Brewing Stand&0 there's also some more complex brews which apply either a combination of effects or new, beneficial effects altogether. -botania.page.complexBrews1a=A brew that applies both positive and negative effects. Taking it leaves the affected individual in a state of power, but also vulnerability. -botania.page.complexBrews1b=96 Herblore -botania.page.complexBrews2a=An entity affected with this brew's effect will regain HP whenever they slay any other creature. -botania.page.complexBrews2b=killy killy JOKER -botania.page.complexBrews3a=An entity affected with this brew's effect will be completely immune to any fall damage. -botania.page.complexBrews3b=And I call it magic -botania.page.complexBrews4a=This brew casts an aura of emptiness around any entity that has its effect. In a 128 block radius, mobs will not be allowed to spawn naturally. -botania.page.complexBrews4b=50$ for a common!? -botania.page.complexBrews5a=This brew casts an aura of emptiness around any entity that has its effect. In a 64 block radius, mobs will be allowed to spawn regardless of light or other conditions. This won't work with &1Emptiness&0. -botania.page.complexBrews5b=Shall we pray for a miracle? -botania.page.complexBrews6a=A player affected with this brew's effect will have much higher proficiency at fishing and will catch fish and other loot twice as fast. -botania.page.complexBrews6b=Maybe you'll catch a Chris -botania.page.complexBrews7a=When drank, this brew will clear all potion effects on the player, negative or otherwise. -botania.page.complexBrews7b=Absolute sooooooul - -# -- BREW INCENSES -botania.entry.incense=Brew Incenses -botania.page.incense0=&4Brews&0 can provide a great variety of effects when in liquid form. They, however, don't last long, and take up inventory space. Utilizing &1Incense Sticks&0 instead of flasks mitigates that problem, these can be infused with &4Brew&0 effects just like a normal flask would, but take around ten times as much &4Mana&0 to do so. -botania.page.incense1=An &1Incense Stick&0 can be placed on an &1Incense Plate&0 by right clicking on it, a simple click with a &1Flint and Steel&0 will light it up. Once lit, the stick can not be retrieved.
    A single stick of incense will burn for sixty times as long as as the liquid counterpart before needing to be replaced. -botania.page.incense2=&1Incense Plates&0 that are burning &1Incense Sticks&0 will provide the effects of the &4Brew&0 infused in the stick to any players on a 24 block radius of the plate.
    Not all &4Brews&0 can be infused into &1Incense Sticks&0, for example, &4Instant Health&0 or &1Absorption&0 can't, nor can any with more than one effect. -botania.page.incense5=For the incense lovers who are also automation junkies, the &1Incense Plate&0 can receive items through &1Hoppers&0 or other input. It'll output a &1Comparator&0 signal of 1 when it has a stick and 2 when it's burning it.
    Lastly, if a &4Mana Burst&0 with a &1Kindle Lens&0 hits the plate while there's a stick on it, it'll start burning it. -botania.page.incense3=Incense is wincense -botania.page.incense4=I can incense it - -# -- EYE OF THE ANCIENTS -botania.entry.forestEye=Eye of the Ancients -botania.page.forestEye0=As the Ancients who used to watch over the world always looked for the living beings on it, this block, the &1Eye of the Ancients&0, will do just that.
    By attaching a &1Comparator&0 next to it, it'll send out a redstone signal equivalent to the amount of animals it can find. -botania.page.forestEye1=The counting only starts at 2, so, with 2 animals around, it'd output a signal of strength 1, with 3 animals, of strength 2 and so on.
    Lastly, the time has worn down the sight of the Ancients, so this block can only see animals in about 6 blocks in any direction. -botania.page.forestEye2=Now you see me... - -# -- OPEN CRATE -botania.entry.openCrate=Open Crate -botania.page.openCrate0=Sometimes devices like &1Droppers&0 or &1Dispensers&0 aren't precise or fast enough. A simple solution is to make a crate and punch a hole in the bottom.
    Yeah, it's that simple. The &1Open Crate&0 accepts items from &1Hoppers&0 or any other means of inserting items, and obviously, drops them directly below it. -botania.page.openCrate1=A little interesting effect the &1Open Crate&0 can do is that, when given a redstone signal, any items it drops are prevented from being caught by flowers like the &1Hopperhock&0, &1Rannuncarpus&0 or &1Pollidisiac&0 for around ten seconds more than usual. -botania.page.openCrate2=A super crate box - -# -- DRUM OF THE WILD -botania.entry.forestDrum=Drum of the Wild -botania.page.forestDrum0=The &1Drum of the Wild&0 is, in layman's terms, the percussion counterpart of the &1Horn of the Wild&0. It serves the exact same purpose as the handheld horn, but is placed in world.
    To trigger a beat and break nearby foliage, one would fire a &4Mana Burst&0 at the drum. -botania.page.forestDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1Redstone Diffuseur de mana&0 or a &1Mana Blaster&0 is required. -botania.page.forestDrum2=But if you close your eyes... - -# -- ABSTRUSE PLATFORM -botania.entry.platform=Abstruse Platform -botania.page.platform0=By laying &1Livingwood&0 on a very specific format it's possible to create a platform of sorts, that only has a physical body for whoever is on top of it and isn't sneaking. For anyone else, it's like it's not there. &4Mana Bursts&0 will always travel through it without any trouble.
    It's also possible to camouflage this block as any other simple block by simply right clicking it. -botania.page.platform2=Right clicking a platform with a block in it with a &1Wand of the Forest&0 will change all connected platforms with no block set to them to the block on the one clicked. Shift-right clicking removes all blocks. -botania.page.platform1=It would be Ethereal but the name was taken # -- CONJURING WITH MANA botania.entry.manaConjuration=Conjurer avec le mana @@ -2207,38 +1386,6 @@ botania.page.manaConjuration8=Conjurer la &1Soul Sand&0 botania.page.manaConjuration9=Conjurer le &1Gravier&0 botania.page.manaConjuration10=Conjurer les &1Feuilles&0 -# -- SPECTRAL PLATFORM -botania.entry.spectralPlatform=Spectral Platform -botania.page.spectralPlatform0=The &1Spectral Platform&0 isn't more than an &1Abstruse Platform&0 with no physical body whatsoever. Whereas the &1Abstruse Platform&0 would have a physical body in some cases, the &1Spectral Platform&0 lets anything go through it, regardless of their position. -botania.page.spectralPlatform1=This reminds me of a Puzzle - -# -- DRUM OF THE GATHERING -botania.entry.gatherDrum=Drum of the Gathering -botania.page.gatherDrum0=The &1Drum of the Gathering&0 is, in short terms, a &1Drum of the Wild&0 for livestock.
    When a &4Mana Burst&0 collides with it, it'll shear any &4Sheep&0 around with grown fleece. Any &4Cows&0, with &1Empty Buckets&0 below them will have their milk transfered to the buckets. -botania.page.gatherDrum1=Tap your lands - -# -- CRAFTY CRATE -botania.entry.craftCrate=Crafty Crate -botania.page.craftCrate0=As the name suggests, the &1Crafty Crate&0 is a counterpart to the &1Open Crate&0 with the ability to assemble items into other items similarly to a &1Crafting Table&0.
    Like a &1Crafting Table&0, it has a 9 slot inventory, which can be filled with items in the pattern of a recipe. -botania.page.craftCrate1=The items go in from left to right and top to bottom (illustration further in this entry), to that, there's a special item, named the &1Crafting Placeholder&0, which, when placed in, counts as an empty slot in the recipe. This is used to allow for recipes with gaps (eg, furnace, chest, pickaxe...) to also be doable. -botania.page.craftCrate2=Creating the placeholder -botania.page.craftCrate3=To finish the recipe, one of two things can be done.
    First off, filling every of the 9 slots with either recipe components or placeholders will instantly eject the result, the placeholders and any leftovers (e.g. buckets when making cake), this is the most straightforward method. -botania.page.craftCrate4=Right clicking the crate with a &1Wand of the Forest&0 (remember: &1Dispensers&0 can do this) will attempt at crafting with whatever is inside the crate and eject it.
    If this fails all the items inside are simply ejected with no crafting procedure done. -botania.page.craftCrate7=Attaching a &1Comparator&0 to the crate will have it emit a signal equal to the amount of items inside the crate, which can be an extremely valuable asset in creating mechanisms with it. -botania.page.craftCrate5=An example of crafting a &1Diamond Pickaxe&0 -botania.page.craftCrate6=Made in Portugal -botania.page.craftCrate8=The &1Crafty Crate&0 can also be augmented with patterns. A pattern locks specific slots in the recipe, disallowing items from going into those slots and making them count as if there were placeholders there.
    There's only a few basic patterns, which can be applied by right clicking on the crate (this doesn't consume them). -botania.page.craftCrate9=9 different patterns - -# -- HOVERING HOURGLASS -botania.entry.hourglass=Hovering Hourglass -botania.page.hourglass0=The ability to count time is an essential one to anyone who wishes to develop any redstonic contraptions. A single timer, however, can take a up both a lot of space and be slow in general. The &1Hovering Hourglass&0 is a simple, accurate, sand based timer. As the name implies, it's a hourglass that hovers and turns by itself. -botania.page.hourglass1=The hourglass contains an inventory, in which up to a stack of &1Sand&0, &1Red Sand&0 or &1Soul Sand&0 can be added via a right click. Right clicking again removes it. The sand will then fall from one of the chambers into another, and when is done, release a single redstone pulse and turn over, starting the process again. -botania.page.hourglass2=The amount of time for each pulse is dependent on how much and what type of sand is in the chamber. &1Sand&0 will count for one second per block, &1Red Sand&0 ten seconds per and &1Soul Sand&0 one minute per. Sand types can't be mixed. The time for each pulse can be seen by hovering over the block with a &1Wand of the Forest&0. -botania.page.hourglass3=Note that the sand is added all at once, so the size of the stack to be added needs to be set in the inventory.
    Sand can't be added to the hourglass after it already has some in, trying to do so will end up removing the sand there instead. The sand in the block can be taken and added by &1Hoppers&0 or other methods. -botania.page.hourglass4=Right clicking the block with a &1Wand of the Forest&0 locks (and unlocks) it. When locked, sand can't be added or removed, just in case someone right clicks it on accident.
    If a &4Mana Burst&0 collides with the block, it'll stop the flow of sand and pause the timer, colliding again continues it. -botania.page.hourglass5=The sands of time - # -- SPECTRAL RAIL botania.entry.ghostRail=Rail spectral botania.page.ghostRail0=Utiliser une &1Plateforme spectral&0 comme un composant de &1Rail&0 donne quelques habilités interressantes au &1Chariot&0 qui passerai à travers lui : lorsqu'il est éjecté de ce rail, le chariot flotte un instant, il sera aussi capable de passer à travers les murs.
    Cet effet s'arrêtera si le chariot atterri sur un rail ou rentre en collision avec n'importe quelle variété de &1Boisrève&0. @@ -2249,744 +1396,18 @@ botania.entry.canopyDrum=Tambour de la canopée botania.page.canopyDrum0=Le &1Tambour de la canopée&0 est comme le &1Tambour sauvage&0 en celà qu'il est l'équivalent percution de la &1Corne de la canopée&0. Il sert à la même chose que la corne en main, mais placé dans le monde.
    Pour déclencher un rythme et casser les feuilles alentour, quelqu'un doit tirer une *4Explosion de mana*0 sur le tambour. botania.page.canopyDrum1=Émondage avec style -# -- COCOON OF CAPRICE -botania.entry.cocoon=Cocoon of Caprice -botania.page.cocoon0=A cocoon is usually a symbol of change, of evolution.
    Creating a &1Cocoon of Caprice&0 and placing it down will slowly evolve the rudimentary contents inside it into a &1Baby Animal&0. More often than not the animal hatched will be a farm animal, but on rare ocasions, different animals such as &1Wolves&0 or &1Horses&0 may be created. -botania.page.cocoon1=Speculation says that giving the cocoon &1Emeralds&0 influences the outcome towards something a bit different.
    What could come out of such experiment is anyone's guess, really. -botania.page.cocoon2=New World, Perfect World - -# -- MANASTORM CHARGE -botania.entry.manaBomb=Manastorm Charge -botania.page.manaBomb0=Putting together some &1TNT&0 and a &1Gaia Spirit&0 creates a &1Manastorm Charge&0, a type of explosive, per say. Ignited with a &1Mana Burst&0, the charge will create an unstable &1Manastorm Epicenter&0, which will, over time, spawn supercharged &1Mana Bursts&0, that explode on contact with other blocks.
    Needless to say, only a maniac would unleash such a force near anything they care about. -botania.page.manaBomb1=Prepare to face the mighty... - # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Exploseur de mana -botania.page.manaBlaster0=The &1Exploseur de mana&0 is like a portable &1Diffuseur de mana&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
    By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. -botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot. -botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply place the &1Mana Blaster&0 back on the crafting grid. -botania.page.manaBlaster3=We need more dakka - -# -- PASTURE SEEDS -botania.entry.grassSeeds=Pasture Seeds -botania.page.grassSeeds0=Watching grass spread is seldom a fun activity. By infusing some &1ViverocheGrass&0 with &4Mana&0, it's possible to create &1Pasture Seeds&0, which will grow grass in any barren area, via a simple right click on dirt.
    Other types of foliage can also be grown, such a &1Podzol&0 or &1Mycellium&0 with alternate seeds. -botania.page.grassSeeds1=&1Pasture Seeds&0 for grass -botania.page.grassSeeds2=&1Boreal Seeds&0 for podzol -botania.page.grassSeeds3=&1Infestation Spores&0 for mycellium - -# -- ROD THE LANDS -botania.entry.dirtRod=Rod of the Lands -botania.page.dirtRod0=The &1Rod of the Lands&0 is a rather simpleton tool, by utilizing &4Mana&0 from the user's inventory (via a &1Mana Tablet&0 or others), it can materialize and place a &1Dirt&0 block down. -botania.page.dirtRod1=That's dirty - -# -- TERRA FIRMA ROD -botania.entry.terraformRod=Rod of the Terra Firma -botania.page.terraformRod0=While digging away at dirt with a shovel is definitely functional, flattening huge tracts of land can get somewhat tortuous at times.
    By utilizing the &1Rod of the Terra Firma&0, it's possible to terraform in a quick and environmental friendly manner. -botania.page.terraformRod1=This rod, will, at the cost of some &4Mana&0 from the user's inventory, flatten the land to the level you are standing. For this to happen, charge it by &4holding right-click&0 and, slowly but surely, the nearby terrain will be flattened to your level, either by placing &1Dirt&0 or by removing blocks. -botania.page.terraformRod2=Note that blocks removed by the rod are non-recuperable. The terrain will adapt to the changes as best as it can, up to a distance limit, to avoid cuts in hills and the like, for this, the flattening will work in the terrain's natural look.
    Lastly, the rod will cease to function whatsoever below sea level. -botania.page.terraformRod3=Quite a justicar - -# --Fleur chatoyante EQUIPMENT -botania.entry.manaGear=Manasteel Equipment -botania.page.manaGear0=&1Manasteel&0, alike other metals, can be shaped into tools and armor alike.
    Tools or armor crafted from this material will share their properties with &1Iron&0, albeit somewhat superior in enchantability and durability. Whenever a &1Manasteel&0 item is to take damage, if there's &4Mana&0 available in the inventory (such as a &1Mana Tablet&0), it'll use that instead. -botania.page.manaGear10=Some pieces of the toolset have an ability when right clicked. The &1Pickaxe&0 will place a torch from the user's inventory, the &1Axe&0 will do the same for a sapling and the &1Shovel&0 will till the earth, similarly to a hoe.
    A detail to keep in mind is that &1Shears&0 made of mana materials will trigger tripwire, unlike iron ones. -botania.page.manaGear1=The &1Manasteel Pickaxe&0 -botania.page.manaGear2=The &1Manasteel Shovel&0 -botania.page.manaGear3=The &1Manasteel Axe&0 -botania.page.manaGear4=The &1Manasteel Shears&0 -botania.page.manaGear5=The &1Manasteel Sword&0 -botania.page.manaGear6=The &1Manasteel Helmet&0 -botania.page.manaGear7=The &1Manasteel Chestplate&0 -botania.page.manaGear8=The &1Manasteel Leggings&0 -botania.page.manaGear9=The &1Manasteel Boots&0 - -# -- HORN OF THE WILD -botania.entry.grassHorn=Horn of the Wild -botania.page.grassHorn0=Clearing out &1ViverocheGrass&0 by hand can definitely be a nuisance.
    Simply blowing the &1Horn of the Wild&0 will quickly cause any nearby vegetation to uproot, leaving behind drops as if it had been broken by hand.
    With some modifications, the horn can be modified to break leaves or snow instead. -botania.page.grassHorn1=Crafting the horn -botania.page.grassHorn2=Modifying to break &1Leaves&0 -botania.page.grassHorn3=Modifying to break &1Snow&0 - -# -- TERRASTEEL ARMOR -botania.entry.terrasteelArmor=Armure en terracier -botania.page.terrasteelArmor0=Armor made out of &1Terrasteel&0, much alike the &1Manasteel&0 counterpart, can utilize &4Mana&0 from the inventory instead of taking damage.
    This armor, however, has properties more alike &1Diamond&0 instead of &1Iron&0. -botania.page.terrasteelArmor1=The &1Terrasteel Helmet&0 -botania.page.terrasteelArmor2=The &1Terrasteel Chestplate&0 -botania.page.terrasteelArmor3=The &1Terrasteel Leggings&0 -botania.page.terrasteelArmor4=The &1Terrasteel Boots&0 - -# -- TERRA BLADE -botania.entry.terraSword=Terra Blade -botania.page.terraSword0=The &1Terra Blade&0, crafted from &1Terrasteel Ingots&0, is a sword infused with natural strength. Not only does it par with a &1Diamond Sword&0 in terms of strength and it uses &4Mana&0 from the inventory like &1Manasteel Tools&0, but when swung, there's a chance for it to create a beam that will deal as much damage as a melee hit. -botania.page.terraSword1=No Broken Hero Sword - -# -- TERRA SHATTERER -botania.entry.terraPick=Terra Shatterer -botania.page.terraPick0=The &1Terra Shatterer&0 is a tool that can amass insane quantities of mana on itself, due to the amount of &1Terrasteel&0 required for its creation.
    The tool functions very much like a &1Mana Tablet&0 by which it can amass &4Mana&0 by being tossed on a &1Mana Pool&0, it can't give the &4Mana&0 back, though, so it doesn't function as a storage method. -botania.page.terraPick1=The amount of &4Mana&0 stored on the tool defines its &4Rank&0. Ranks go as follows: &4D&0, &4C&0, &4B&0, &4A&0, &4S&0, &4SS&0. &4D&0 being the default rank.
    The amount of &4Mana&0 required to advance from rank to rank increases as the rank does. To advance from &4D&0 to &4C&0, for example, it requires just a few seconds of exposition to a &1Mana Pool&0. -botania.page.terraPick2=To advance from rank &4C&0 to rank &4B&0, a full &1Mana Pool&0 is required, and the cost increases by a tenfold per rank from there on in, all the way to &4SS&0.
    The rank of the tool does not change its speed, but instead, it increases the power of its &4Active Ability&0.
    Toggling the tool's ability can be done via right click. -botania.page.terraPick3=While the tool is active, it enables it to break blocks in an extended area. At rank &4C&0 it's a small column, which increases to a square at rank &4B&0, that gets larger through the ranks. It's to note that the rank &4D&0 tool does not have the active ability.
    Having the tool active consumes &4Mana&0 from its storage passively, even if not being used to mine. -botania.page.terraPick4=Lastly, the tool takes damage for every single block broken, so a good supply of &4Mana&0 in the wielder's inventory is a must for the higher ranks, as the tool does function like normal &1Manasteel Tools&0, in which it'll use &4Mana&0 instead of actually taking damage, given it's made of &1Terrasteel&0.
    It also won't despawn like regular dropped items. -botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW - -# -- ROD OF THE SEAS -botania.entry.waterRod=Bâton des mers -botania.page.waterRod0=Similarly to its land counterpart, the &1Rod of the Seas&0 will, at the cost of some &4Mana&0, place down a &1Water&0 block wherever it's used on. Furthermore, it can also be used to refill a &1Petal Apothecary&0. -botania.page.waterRod1=Keep the Earth clean, it isn't Uranus - -# -- ELEMENTIUM EQUIPMENT -botania.entry.elfGear=Elementium Equipment -botania.page.elfGear0=Similarly to other metals, as expected, &1Elementium&0 can, too, be shaped into tools and armor.
    These pieces of equipment have a decent resistance to damage, about half of that of diamond, as well as the ability to drain &4Mana&0 to prevent damage. -botania.page.elfGear1=Each of the tools come with their own ability or power of sorts which makes them unique. The armor allows the wearer to, when hit, have a chance to spawn a &1Pixie&0 that goes after the attacker, dealing decent damage.
    The more pieces of &1Elementium Armor&0 equipped, the higher the chance. -botania.page.elfGear2=Starting off, the &1Elementium Pickaxe&0 will destroy any &1Cobblestone&0, &1Dirt&0, &1Netherrack&0 and other mundane materials, leaving behind only the ores and fine resources.
    Combining the &1Elementium Pickaxe&0 with a &1Terra Shatterer&0 in a crafting square allows for the latter to also get this power. This can't be undone. -botania.page.elfGear3=I can fit a shower in my pocket, screw cobble -botania.page.elfGear4=The &1Elementium Shovel&0 will, case the block dug is affected by gravity (&1Gravel&0, &1Sand&0, etc), dig all the blocks of that material above and/or below it, no more gravel falling while mining. -botania.page.elfGear5=Putting Things on Top of Other Things -botania.page.elfGear6=The &1Elementium Axe&0 doubles as a weapon, if used to strike the finishing blow to a &4Zombie&0, &4Skeleton&0, &4Creeper&0 or even another &4Player&0, it has a chance to decapitate them, leaving their severed head or skull behind. -botania.page.elfGear7=Off with their heads -botania.page.elfGear8=The &1Elementium Shears&0 hold the ability to, when held back like a bow, shear any nearby sheep with speed within a large area of effect centered on the holder. -botania.page.elfGear9=Nui? She's h-arm-less -botania.page.elfGear10=Lastly, the &1Elementium Sword&0 will increase the chance of a &4Pixie&0 spawning when hit (this holds true when no &1Elementium Armor&0 is worn) and increases the strength of any &4Pixies&0 spawned. -botania.page.elfGear11=The Lambent Light -botania.page.elfGear12=Fortuna on the Sixteenth Night -botania.page.elfGear13=When the Seagulls Cry Breakdown -botania.page.elfGear14=Good People Die -botania.page.elfGear15=The out of Infinity - -# -- EXTRAPOLATED BUCKET -botania.entry.openBucket=Extrapolated Bucket -botania.page.openBucket0=By creating a bucket out of &1Elementium&0 one seems to notice an interesting feature. The liquids acquired by it simply vanish into the ether, never to be seen again. This seems like a great clean up tool. -botania.page.openBucket1=A Souvenir from Lewis # -- ROD OF BIFROST botania.entry.rainbowRod=Bâton du Bifrost -botania.page.rainbowRod0=&4Bifrost&0, the rainbow bridge that reaches between the world and the realm of the gods.
    While this item, the &1Rod of the Bifrost&0 doesn't exactly do that, it allows the holder, via a right click and at the cost of some &4Mana&0, to create a rainbow bridge in the direction he or she is looking at. -botania.page.rainbowRod1=This bridge extends as far as a hundred blocks, and will vanish after about fifteen seconds.
    Only one bridge can be created for any given &1Rod of the Bifrost&0 at a time, as soon as the old bridge vanishes, a new one can be created. -botania.page.rainbowRod2=Going my way!! Cut open a path and go! # -- ROD OF THE SKIES botania.entry.tornadoRod=Bâton des cieux -botania.page.tornadoRod0=The &1Rod of the Skies&0 is a magical instrument with the ability to propel one in the air at fast velocity for the cost of some &4Mana&0.
    To do so, one would simply hold it like a bow and watch as their momentum increases.
    The rod takes a small amount of time to recharge, but during that time it'll block any fall damage, keeping the user safe. -botania.page.tornadoRod1=A treasure from Lorule # -- ROD OF THE HELLS botania.entry.fireRod=Bâton des enfers -botania.page.fireRod0=The &1Rod of the Hells&0 contains the essence of a burning flame, using it on the ground will create a circle of fire that burns anything inside it, for a decent cost of &4Mana&0.
    The ring has a decent radius, and takes a small amount of time to fully propagate, it's to note that after that time it burns anything living in it, the caster included. -botania.page.fireRod1=Megu Megu Fire Endless Night - -# -- VINE BALLS -botania.entry.vineBall=Vine Balls -botania.page.vineBall0=&1Ladders&0 can't stand up on their own, they require something on their back, whereas &1Vines&0 don't. Normally, though, &1Vines&0 aren't strong enough for someone to climb them when they're freestanding.
    By combining a few &1Vines&0, it's possible to create a ball that can be thrown, to create a climbable ladder of strong &1Vines&0 where it hits. -botania.page.vineBall1=It's also possible, by combining some materials such as &1Livingwood&0 or a &1Rune of Air&0 to create a slingshot that lets these &1Vine Balls&0 be shot while completely ignoring the force of gravity. -botania.page.vineBall2=This would be in Vineacraft... -botania.page.vineBall3=...if that actually existed. -botania.page.vineBall4=Oh, and you can make &1Moss Stone&0 too - -# -- SHARD OF LAPUTA -botania.entry.laputaShard=Shard of Laputa -botania.page.laputaShard0=Via a somewhat complex magic activation sequence, combining a few interesting resources, including &1Gaia Spirits&0 would allow one to create a shard that, when used on the ground, will lift an almost spherical area around that point up into the air.
    This process consumes the shard and can take upwards of ten minutes depending on the mass of land. -botania.page.laputaShard2=The radius of the island creates start at 14 blocks, on other words, 28 blocks of diameter. It's possible to increase the size by upgrading the shard with additional &1Gaia Spirits&0, each one adds 1 block to the radius, or 2 to the diameter. -botania.page.laputaShard1=Look Shiro, Laputa exists! -botania.page.laputaShard3=Size does matter - -# -- EQUESTRIAN VIRUS -botania.entry.virus=Equestrian Virus -botania.page.virus0=Through the mixing of some ingredients, a type of virus that can alter the genetic code of equestrian life can be made.
    Using one of these viruses on a &1Horse&0 will alter its genetic code, turning it into either a &1Zombie&0 or &1Skeleton Horse&0. Not only will it do that, but it will vastly increase all the &1Horse&0's genetic attributes. -botania.page.virus1=No ponies here -botania.page.virus2=None here either # -- ROD OF THE HIGHLANDS botania.entry.skyDirtRod=Bâton des hautes-terres -botania.page.skyDirtRod0=While the &1Rod of the Lands&0 is all well and good, being able to place &1Dirt&0 without something to hold it would be great.
    The &1Rod of the Highlands&0 does just that, while maintaining the original power of the &1Rod of the Lands&0, it can also place &1Dirt&0 in mid air, for an increased &4Mana&0 cost. -botania.page.skyDirtRod1=Dirty Stick mk2 - -# -- VITREOUS PICKAXE -botania.entry.glassPick=Vitreous Pickaxe -botania.page.glassPick0=Placing down &1Glass&0 and having to break it again can be a heartbreaking experience. Luckily, by creating a &1Vitreous Pickaxe&0, one can gather the &1Glass&0 back by mining it with the pick, it's like cheap &4Silk Touch&0 for glass! -botania.page.glassPick1=Trapped inside with food - -# -- ROD OF DIVINING -botania.entry.diviningRod=Rod of the Plentiful Mantle -botania.page.diviningRod0=The &1Rod of the Plentiful Mantle&0 has the ability to divine in a decently large radius around the user to find any ores. These will shine for a little bit, allowing their location.
    This process, obviously, requires a decent amount of &4Mana&0 from the user's inventory. -botania.page.diviningRod1=inb4 ee3 - -# -- ROD OF THE BLACK MESA -botania.entry.gravityRod=Rod of the Shaded Mesa -botania.page.gravityRod0=The &1Rod of the Shaded Mesa&0 is a powerful relic, legend says that the first of these devices was found atop a dark mesa, along with a crowbar.
    To use this device, the user may right click and hold on a monster or item to pick it up. Releasing right click will drop the selected entity, while left click will fire it in a powerful burst. -botania.page.gravityRod1=This power does not come free, of course. It requires significant amounts of &4Mana&0 from the user's inventory. -botania.page.gravityRod2=bun pls - -# -- TIMELESS IVY -botania.entry.regenIvy=Timeless Ivy -botania.page.regenIvy0=While &1Manasteel&0 or &1Elementium&0 tools have the ability to harness &4Mana&0 and use it to protect their bodies, other tools or armor don't have this property.
    A handful of &1Timeless Ivy&0 can be attached on to virtually any item, allowing it to be repaired with &4Mana&0. -botania.page.regenIvy1=To apply it, one'd simply craft the tool in question alongside the ivy and 3 of an item that can be used to repair the tool in an anvil (eg. &1Diamonds&0 for a &1Diamond Pickaxe&0).
    Due to not being in direct contact with the material, the amount of &4Mana&0 used by the ivy in comparison to &1Manasteel&0 is rather high. -botania.page.regenIvy2=Bring your Inferno Adze - -# -- ROD OF THE ARCANE BARRAGE -botania.entry.missileRod=Rod of the Unstable Reservoir -botania.page.missileRod0=The &1Rod of the Unstable Reservoir&0 is a rather powerful weapon against a large crowd of foes. Channeling its power will materialize countless arcane missiles that home in on targets at random, at a pretty hefty cost of &4Mana&0. -botania.page.missileRod1=Zapzapzapzap - -# -- ASSEMBLY HALO -botania.entry.craftingHalo=Assembly Halo -botania.page.craftingHalo0=Carrying a &1Crafting Table&0 around generally can be troublesome. The &1Assembly Halo&0 acts not only as a portable &1Crafting Table&0 but as a quick crafting method. Having the item in hand displays a "halo" of recipes around the holder.
    First off, right clicking on the &1Crafting Table&0 will open up a crafting interface. -botania.page.craftingHalo1=As long as the item is present in the inventory the last crafting recipe done will be stored in it.
    Right clicking an empty slot of the halo will set the last recipe on it. Right clicking a slot with a recipe will try to do it using items from the inventory. Removing a recipe can be done through shift-left click. -botania.page.craftingHalo2=It has no taste if you cook it from the menu - -# -- LENS CLIP -botania.entry.clip=Lens Clip -botania.page.clip0=While a formidable and versatile tool, the &1Mana Blaster&0's greatest downfall is the lack of an ability to store more than one &1Lens&0 at once. Not any more. The &1Lens Clip&0 will attach to a &1Mana Blaster&0 in a crafting grid and allow it to store up to 6 lenses rather than just one.
    As they say, Russian Roulette is not the same without a gun... -botania.page.clip1=Adding and removing &1Lenses&0 works just as it did previously, with one detail. The lens will be added or removed in the slot that the clip is currently on.
    To change this slot, simply shift-right click the &1Mana Blaster&0 in the air. This will also change which lens is selected, case there is one in that slot. -botania.page.clip2=Since we're dubbed by 4Kids we must make do without one - -# -- ROD OF THE DEPTHS -botania.entry.cobbleRod=Rod of the Depths -botania.page.cobbleRod0=The &1Rod of the Depths&0 acts pretty much as a variant to the the &1Rod of the Lands&0. It does exactly the same thing but with &1Cobblestone&0 for a bit of a higher price. -botania.page.cobbleRod1=It's cobbling time - -# -- ROD OF THE MOLTEN CORE -botania.entry.smeltRod=Rod of the Molten Core -botania.page.smeltRod0=The &1Rod of the Molten Core&0 has the ability to expel heat provenient from the world's core. Holding it via right click and pointing at a block in the world that can be smelted into a different type of block will quickly turn it into that.
    For some examples, &1Cobblestone&0 turns into &1Stone&0, &1Sand&0 into &1Glass&0, so on. -botania.page.smeltRod1=Stolen from Efreet - -# -- WORLD SEED -botania.entry.worldSeed=World Seed -botania.page.worldSeed0=The &1World Seed&0 is a piece of elemental energized matter containing the ability to return its user to the world spawn.
    Case the person who is using it is farther than 24 blocks from the world's spawn point, using the seed, via right click, will instantly teleport them there, consuming the seed. -botania.page.worldSeed1=Where the heart is - -# -- SPELLBINDING CLOTH -botania.entry.spellCloth=Spellbinding Cloth -botania.page.spellCloth0=Combining &1Wool&0 with some &4Mana&0 in the form of a &1Mana Pearl&0 allows for one to create a type of cloth that will absorb any &4Enchantments&0 it comes in contact with.
    Combining the &1Spellbinding Cloth&0 with any enchanted item in a crafting table will remove all enchants from that item at the cost of some of the cloth's durability. -botania.page.spellCloth1=Oldest item in the book - -# -- THORN CHAKRAM -botania.entry.thornChakram=Thorn Chakram -botania.page.thornChakram0=The &1Thorn Chakram&0 is a thrown weapon made of &1Terrasteel&0 and plant matter. After thrown it'll pierce through enemies, damaging them and sometimes poisoning them, and bounce on blocks a few times before returning to the thrower, similarly to a boomerang. -botania.page.thornChakram1=Spores and stingers - -# -- OVERGROWTH SEED -botania.entry.overgrowthSeed=Overgrowth Seed -botania.page.overgrowthSeed0=An &1Overgrowth Seed&0 is an elusive item, which can be used to enchant a piece of &1Grass&0, via right clicking on it in the world, creating &1Enchanted Soil&0. Flowers that are rooted on this &1Enchanted Soil&0 will function at double the normal speed.
    There's one problem, though. No known method of creating these exists, but they have been spotted in ancient structures and the like. - -# -- LIVINGWOOD BOW -botania.entry.livingwoodBow=Arc de vifbois -botania.page.livingwoodBow0=The &1Vifbois Bow&0 is, as the name describes, a bow made of &1Livingwood&0 strung with &1Mana Infused String&0. Due to its components, it will last for longer than a normal &1Bow&0. It'll also repair itself using &4Mana&0, similarly to &1Manasteel Tools&0. -botania.page.livingwoodBow1=Does it shoot airplanes? - -# -- CRYSTAL BOW -botania.entry.crystalBow=Arc de cristal -botania.page.crystalBow0=Crafted with &1Dragonstone&0, the &1Crystal Bow&0 is a ranged weapon with the capacity to generate arrows from &4Mana&0. Similarly to the &1Vifbois Bow&0, it'll repair using &4Mana&0 as well, but carrying &1Arrows&0 is not required as they are created through the magical energies.
    Given the lightweight and flexible structure of the bow, it can also fire at a much increased velocity than a conventional wooden one. -botania.page.crystalBow1=The elves are roving - -# -- STONE OF TEMPERANCE -botania.entry.temperanceStone=Stone of Temperance -botania.page.temperanceStone0=The &1Terra Shatterer&0 is able to destroy huge tracts of land when charged to its maximum potential, however, this might not always be the user's intent. A small, 3x3 tunnel might be more fitting in some cases. Having an active &1Stone of Temperance&0 in one's inventory will prevent their shatterer from breaking any more than a 3x3 area. This also affects the &1Terra Truncator&0. The stone can be toggled on and off by shift-right clicking. -botania.page.temperanceStone1=Don't lose it - -# -- TERRA TRUNCATOR -botania.entry.terraAxe=Terra Truncator -botania.page.terraAxe0=The &1Terra Truncator&0 is a greataxe of premium quality achievable only with &1Terrasteel&0. When hitting a tree it'll take the whole thing down with speed, bringing all the logs and leaves along with it. Of course, this comes at a hefty cost of &4Mana&0.
    This effect doesn't happen while sneaking or if the user has a &1Stone of Temperance&0. -botania.page.terraAxe1=It's not a Dead END - -# -- FLORAL OBEDIENCE STICK -botania.entry.obedienceStick=Bâton d'obéissance floral -botania.page.obedienceStick0=Nobody knows why, but attaching some &1Manasteel&0 to &1Livingwood Twigs&0 creates a stick type device that can make nearby flowers all bind towards a single focus point.
    Dubbed the &1Floral Obedience Stick&0, right clicking with it on a &1Mana Spreader&0 or &1Mana Pool&0 in the world will bind all relevant nearby flowers to it. -botania.page.obedienceStick1=This is not a dumb new age hat - -# - ENDER ARTEFACTS -# -- EXTRACTING ENDER AIR -botania.entry.enderAir=Extraction de l'air du néant -botania.page.enderAir0=The air present in the void of the &1End&0 seems to have some mutating properties. Right clicking with an empty &1Glass Bottle&0 while in the &1End&0 will capture some of that air, which can then later be tossed similarly to a splash potion, turning nearby &1Stone&0 on the landing point into &1End Stone&0. - -# -- ENDER OVERSEER -botania.entry.enderEyeBlock=Ender Overseer -botania.page.enderEyeBlock0=The eyes of an &4Enderman&0 have an interesting sensitivity to being watched. A block out of these will simply output a &4redstone signal&0 if a player within a 64 block radius is looking directly at it.
    Of course, wearing a &1Pumpkin&0 negates this effect. -botania.page.enderEyeBlock1=MY BRAND - -# -- FORCE RELAY -botania.entry.pistonRelay=Force Relay -botania.page.pistonRelay0=It seems that infusing &1Pistons&0 with &4Mana&0 results in some interesting adverse effects.
    This block tears the fabric of space, relaying any piston force applied to it to the block it's bound to. -botania.page.pistonRelay1=To bind it to a block, right click it with a &1Wand of the Forest&0, and right click on the block you want to bind it to.
    Furthermore, this block is highly unstable, and may create uncanny effects, care is to be taken, it is also resistant to glue, both in pulling and pushing. This allows for a "frame" like setup. -botania.page.pistonRelay2=Infusing a &1Piston&0 with &4Mana&0. - -# -- HAND OF ENDER -botania.entry.enderHand=Hand of Ender -botania.page.enderHand0=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0.
    Using the hand on another player will open up &otheir&r inventory instead, at a lot higher &4Mana&0 cost. -botania.page.enderHand0a=The &1Hand of Ender&0 allows the user to access the interdimensional ender field, on other words, their &1Ender Chest&0 inventory. This can be done anywhere by right clicking with the hand at the cost of some &4Mana&0. -botania.page.enderHand1=Zezima hates him! -botania.page.enderHand1a=It's like the 4G of Ender Chests - -# -- SOULSCRIBE -botania.entry.enderDagger=Soulscribe -botania.page.enderDagger0=Those &4Endermen&0. They're the second more pesky thing since &4Creepers&0. I swear, the person who came up with them must have taken a &onotch&r too much of their drink.
    However, by infusing a standard dagger with some of their energy, one can create the &1Soulscribe&0, a dagger that tears through &1Endermen&0 as if they were butter. -botania.page.enderDagger1=Due of the type of infusion, though, the dagger only lasts for a few kills, and the energy that radiates from it prevents the &1Manasteel&0 from gathering &4Mana&0 to avoid damage, like typical tools would. Still, all in the name of killing those monsters. -botania.page.enderDagger2=Strike my Soul - -# -- LIFE IMBUER -botania.entry.spawnerClaw=Life Imbuer -botania.page.spawnerClaw0=&1Monster Spawners&0 are an interesting bunch. They have the ability to bring out life from thin air, but somehow, this only manifests when there's a player nearby.
    This, of course, tends to be a rather limiting factor in the onslaught of any creatures that they can create. -botania.page.spawnerClaw1=By placing a &1Life Imbuer&0 on top of a &1Monster Spawner&0 and giving it a rather decent chunk of &4Mana&0 through a &1Diffuseur de mana&0, when there aren't any players in the nearby vicinity, the &4Mana&0 will power the spawner, just as if there were players around. -botania.page.spawnerClaw2=Something something shadow dragon - -# -- RED STRING -botania.entry.redString=Red String -botania.page.redString0=Lore says the Gods tie a red string around the ankles of people who are supposed to affect each others lives. This led inventors to come up with a way of connecting blocks over the air, called, of course, &1Red String&0. Blocks created with this exquisite material can face in all 6 basic directions and bind to the first available and compatible block they can find, given a range. -botania.page.redString1=Each &4Red Stringed&0 block has a different criteria to what it'll bind to, but the distance in which they'll bind stays constant between the variations. The string can be viewed, if a block is bound, by holding a &1Wand of the Forest&0.
    Blocks being in the way will not break the connection. Lastly, &1Red String&0 blocks can't be chained. -botania.page.redString2=Are you in a pinch? -botania.page.redString3=Starting off, the &1Red Stringed Container&0 will bind to any inventory (&1Chests&0, &1Furnaces&0, &1Hoppers&0, etc), items can be put into it using &1Hoppers&0 or any other means of insertion. The items will end up in the block it's bound to, and will enter from the same side as they were put on the &1Red Stringed Container&0 itself. -botania.page.redString4=The &1Red Stringed Container&0. -botania.page.redString5=The &1Red Stringed Dispenser&0 can be bound to &1Dispensers&0 or &1Droppers&0, it functions similarly to the &1Red Stringed Container&0 where items can also be placed in the bound block through it. When a redstone signal is given to it, the &1Dispenser&0 or &1Dropper&0 in the end will fire. -botania.page.redString6=The &1Red Stringed Dispenser&0. -botania.page.redString7=The &1Red Stringed Nutrifier&0 can be bound to any block that can be fertilized with &1Bone Meal&0. Using &1Bone Meal&0 on the block will fertilize the bound block instead. -botania.page.redString8=The &1Red Stringed Nutrifier&0. -botania.page.redString9=The &1Red Stringed Comparator&0 can be bound to any block whose status can be read with a &1Container&0, such as &1Chests&0, &1Mana Pools&0, &1Runic Altars&0, etc. Placing a &1Comparator&0 pointing outwards of this block will send the signal equal to the signal a &1Comparator&0 would send on the bound block. -botania.page.redString10=The &1Red Stringed Comparator&0. -botania.page.redString11=Lastly, the &1Red Stringed Spoofer&0 is an interesting one. Any flower with an effect can be placed on it. The block will bind to any flowers or mushrooms. While there's a flower on top of the block, that flower will not do anything, but the bound block will take all of that flower's properties and work as if it was the flower itself. -botania.page.redString12=The &1Red Stringed Spoofer&0. - -# -- FLUGEL TIARA -botania.entry.flightTiara=Flügel Tiara -botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
    The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. -botania.page.flightTiara1=Forty thousand books from another world -botania.page.flightTiara2=Combining the Tiara with a variety of Quartz species allows for it to create various different kinds of aesthetic wings, one for each style of quartz.
    The recipes for the various types of quartz can be found in the &4Decorative Blocks&0 entry under &4Miscellaneous&0, &1elfique Quartz&0 is acquired by trading &1Nether Quartz&0 with the elves. -botania.page.flightTiara3=Adding Wings (they can be swapped any time) - -# -- BASICS OF CORPOREA -botania.entry.corporea=Basics of Corporea -botania.page.corporea0=&4Corporea&0 is a magical system that utilizes the energy of the end and the empty space in the world to transport items from point A to point B instantly and without any connecting parts.
    The system works through a variant of &1Sparks&0, &1Corporea Sparks&0. These share some similarities with normal &1Sparks&0 but also a fair few differences. -botania.page.corporea1=Starting off, they can go on top of any &4Inventory&0, like a &1Chest&0 or a &1Dispenser&0 as opposed to &4Mana Containers&0, secondly, there's two types of &1Corporea Sparks&0, the basic &1Corporea Spark&0 and the &1Master Corporea Spark&0. These sparks work in a network-like system, each &1Master Corporea Spark&0 designates a &4Corporea Network&0, in which any spark can communicate with other sparks present in it. -botania.page.corporea2=When a &1Corporea Spark&0 is placed or polled, each spark will poll any nearby sparks, adding them to the network designated by the single &1Master Corporea Spark&0 and also polling other nearby sparks, in a chain. While each individual spark can only reach a few blocks, combined, the entire network can go for a virtually infinite distance. -botania.page.corporea3=&1Corporea Sparks&0 have a view of the inventory directly below them, but can only access items from the top side. Each &1Corporea Spark&0 has the ability to view every other spark in the network and its contents, and the ability to request them as necessary, depending on the type of block below it. -botania.page.corporea4=It's to note that the &1Master Corporea Spark&0, while being part of the network, can not have the items in its inventory extracted from.
    Futhermore, no requests for items in the network are ever done passively. Corporea does not have the ability to add new items to the network, those should be inserted physically through &1Hoppers&0 or other methods. -botania.page.corporea5=Similarly to normal &1Sparks&0, &1Corporea Sparks&0 have a method of augmentation, that being the ability to color them. While in the world, there's an icon Fleur flottante around the spark that shows which color it has, this can be changed by right clicking on the spark with a piece of &1Floral Powder&0. These colors define networks. A spark may only be in the same network as another spark if the two have the same color. -botania.page.corporea6=The ability to color sparks allows for multiple different &4Corporea Networks&0 to be together in a close area, without interfering with each other.
    Viewing the network and removing the spark works exactly the same as a normal spark. Lastly, having two &1Master Corporea Sparks&0 of the same color nearby, while possible, is a bad idea and will cause conflicts and odd behaviour. -botania.page.corporea7=Creating &1Corporea Sparks&0 -botania.page.corporea8=And &1Master Corporea Sparks&0 - -# -- CORPOREA INDEX -botania.entry.corporeaIndex=Corporea Index -botania.page.corporeaIndex0=The biggest ability of a &4Corporea Network&0 is the ability to vocally request items from it by name. The &1Corporea Index&0 is an ender-crystal like block that can interface with a given &4Corporea Network&0 by having a &1Corporea Spark&0 placed on top of it.
    While in the world, approaching it will cause it to activate and show the radius in which it will stay activated. -botania.page.corporeaIndex1=While activated, the index will intercept any &4Chat Messages&0 sent by nearby players, taking them in as &4requests&0 and preventing them to be broadcasted to chat. From this, it'll request, from the network, items whose name matches the request. For example, writing "iron ingot" will have the index look through the network for a single &1Iron Ingot&0 and transport it towards itself, materializing it in the world. -botania.page.corporeaIndex2=Requests can be more complex than just a single item. For example "10 apples" will request, as described, 10 &1Apples&0. Writing "this" will search for items whose name equals the name of the item in the player's hand. Prepending or appending to a query "...", "~", "+" or "?" will turn it into a "contains" rather than "equals" query. So writing "iron..." will find all items that have "iron" in their name, for example. -botania.page.corporeaIndex3=The plural form of an item's name may only be used case it's a regular noun when it comes to the plural (suffixed by "-s", "-es" or "-ies"), the singular version works just as well for requests of multiple items, such as "10 apple".
    "10 of this" requests 10 items whose name equals the item in the player's hand, as expected. -botania.page.corporeaIndex4=Examples of complex requests include "10 apples", "a stack of apples", "2 stacks of apples", "2 stacks and 20 apples", "half a stack of apples", "a dozen apples", and so on.
    The index will also recognise more or less verbose forms of request, so "2x stacks and 20x of apples" is equal to "2 stack 2 apple" or "2 stacks + 2 apples". -botania.page.corporeaIndex5=Requesting with "all" or "every" will deliver every single item in the network that matches the criteria, so "all apples" will deliver all the apples in the network.
    On the other side, requesting "count", "show", "display" or "tell" won't request any, but will tell the requester how many exist in the network. -botania.page.corporeaIndex6=Lastly, while near a &1Corporea Index&0, writing part of an item's name and pressing TAB in the chat menu will autocomplete the item's name. -botania.page.corporeaIndex7=A certain magical one at that - -# -- CORPOREA FUNNEL -botania.entry.corporeaFunnel=Corporea Funnel -botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the &4Corporea Network&0 is the &1Corporea Funnel&0, when given access to a network through a &1Corporea Spark&0 on top, it'll pull a single item from the network when given a redstone signal.
    This item is put into an inventory 1 or 2 blocks below it, or case one doesn't exist or is full, tossed into the world right above the funnel. -botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
    Rotating the item changes how many will be requested at once, starting at 1, rotating once, twice and three times will pull 16, 32 and 64, respectively. -botania.page.corporeaFunnel2=Energistically applied - -# -- CORPOREA INTERCEPTOR -botania.entry.corporeaInterceptor=Corporea Interceptor -botania.page.corporeaInterceptor0=The &1Corporea Interceptor&0 does exactly as the name suggests, it intercepts corporea requests. First and foremost, &1Item Frames&0 with items need be attached around the block, these define what items will trigger the interceptor.
    Whenever a request is fired to the corporea network, be it from an Index, Funnel, etc, and there's no items in the network that can fulfil it this block will be triggered. -botania.page.corporeaInterceptor1=Of course, the the block is only triggered if the item requested matches one of items in the &1Item Frames&0 about it. When the block is triggered it'll emit a short redstone pulse. This can be used to do all sorts of things, such as craft the required item using &1Crafty Crates&0 or light up a lamp indicating that the inventory for a resource is out. -botania.page.corporeaInterceptor2=So many automation prospects - -# -- CORPOREA CRYSTAL CUBE -botania.entry.corporeaCrystalCube=Corporea Crystal Cube -botania.page.corporeaCrystalCube0=A seer usually looks through a crystal ball to see the future. Well, a corporea handler would look through a crystal cube to see the present. The &1Corporea Crystal Cube&0 acts as a visual medium to interact ith one's &4Corporea Network&0. Placing the block down and giving it a &1Corporea Spark&0 is the obvious first step to hooking it up to the network. -botania.page.corporeaCrystalCube1=When the block is connected, right clicking it with any sort of item will have it monitor that item, allowing someone who's looking at it see how many exist in the network. The display updates about once every second.
    While there's an item selected, left clicking the block will request one of that item from the network. Shift-left clicking requests a whole stack. -botania.page.corporeaCrystalCube2=I can see forever - -# -- DECORATIVE END BLOCKS -botania.entry.endStoneDecor=Decorative End Blocks -botania.page.endStoneDecor0=Similarly to other stone blocks, &1End Stone&0 can be converted into bricks and chiseled bricks, the bricks can be used as stairs or slabs just like normal &1Stone Bricks&0 would. -botania.page.endStoneDecor1=Making &1End Stone Bricks&0 -botania.page.endStoneDecor2=Making &1Chiseled End Stone Bricks&0 -botania.page.endStoneDecor3=Making &1Ender Bricks&0 -botania.page.endStoneDecor4=Making &1Pillar Ender Bricks&0 - -# -- LIFE AGGREGATOR -botania.entry.spawnerMover=Life Aggregator -botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
    It's to note that the device will shatter after being used once. -botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet - -# -- RESOLUTE IVY -botania.entry.keepIvy=Resolute Ivy -botania.page.keepIvy0=Everyone knows that before being ressurected, one's items splatter all over the ground, generally a massive nuisance. The fix for this is rather simple. By attaching a piece of &1Resolute Ivy&0 to an item through a crafting grid, that item will presist on one's inventory through death. The ivy will degenerate after that fact and will need to be applied again if one wishes to have the item survive another downfall. -botania.page.keepIvy1=Because people die when they are killed - -# -- BLACK HOLE TALISMAN -botania.entry.blackHoleTalisman=Black Hole Talisman -botania.page.blackHoleTalisman0=The void is a massive space full of... void, really. There's nothing there. But with some ingenuity, this space can be used to store items to your heart's content.
    The &1Black Hole Talisman&0 utilizes powerful Gaia and Ender magic to allow for a virtually infinite quantity of a single type of block to be stored in this space. -botania.page.blackHoleTalisman1=Right clicking a block in the world will set the talisman to store that type of block. This can only be done if the talisman is empty. Next off, shift-right clicking the talisman in the air will enable or disable it. Whilst enabled and in the user's inventory it'll absorb any blocks of the type into it.
    Placing the item in a crafting grid allows one to extract stacks of the blocks in it. -botania.page.blackHoleTalisman2=While the talisman has any contents in it, the blocks in it can be placed as if they were normal blocks stored in the inventory via a simple right click with it.
    Right clicking an inventory will try to fill it with the blocks stored in the talisman. -botania.page.blackHoleTalisman3=Like a Rageki but twice as fun - -# -- LUMINIZER TRANSPORT -botania.entry.luminizerTransport=Transport de luminiseur -botania.page.luminizerTransport0=&1Luminizers&0 serve as a simple way to transport players and other living things of the sort by having them ride on trails of light.
    &1Luminizers&0 can be placed in the world as blocks. A &1Luminizer&0, in order to work properly needs to be bound to another one. This can be done with the &1Wand of the Forest&0 in bind mode. Right clicking a &1Luminizer&0 will transport the clicker into the &1Luminizer&0 it's bound to. -botania.page.luminizerTransport1=&1Luminizers&0 have a range of twenty blocks each, but can be chained to create longer and more complex paths.
    The connection between two &1Luminizers&0 goes only one way, unless the binding is explicitly done both ways. If the connection does go both ways, an endless loop is created, though.
    Furthermore, multiple &1Luminizers&0 can target the same one as an endpoint. -botania.page.luminizerTransport2=Luminize to the future -botania.page.luminizerTransport3=Adding some redstone to a &1Luminizer&0 creates a &1Detector Luminizer&0. For all intents and purposes, it functions just like a regular &1Luminizer&0, however, it sends out a &4redstone pulse&0 every time something passes through it or reaches it as an endpoint. -botania.page.luminizerTransport4=Are you ready to draw? -botania.page.luminizerTransport5=While players can just right click the &1Luminizers&0, in order to get animals or other beings into the trails, a &1Luminizer Launcher&0 is required.
    This block needs to be placed down adjacent to &1Luminizers&0, and when it receives a &4redstone pulse&0, it'll randomly distribute all living beings on top of it into all of the adjacent &1Luminizers&0, causing them to go on their merry way. -botania.page.luminizerTransport6=Let's believe it, open the flag - -# - BAUBLES AND ACCESSORIES -# -- AN INTRODUCTION TO BAUBLES -botania.entry.bIntro=An Introduction to Baubles -botania.page.bIntro0=&4Baubles&0, also commonly referred to as &4Trinkets&0 or &4Charms&0 are pieces of equipment which offer all sorts of different effects, when worn.
    To equip them, one can press the &4B&0 (configurable) key. There's four slots, one &4Amulet&0 slot, two &4Ring&0 slots and one &4Belt&0 slot. -botania.page.bIntro1=The &4Baubles Screen&0 -botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that uses the baubles system is installed, this inventory will be shared between the various mods. - -# -- COSMETIC BAUBLES -botania.entry.cosmeticBaubles=Cosmetic Baubles -botania.page.cosmeticBaubles0=A large selection of &1Cosmetic Baubles&0 is available to change or add style to any baubles a player has equipped. These can both be worn by themselves, on the amulet slot, or crafted alongside another &4Bauble&0 in a crafting grid to change the look of the bauble to the new &4Cosmetic Override&0. Removing &4Cosmetic Overrides&0 can be done through putting the bauble back in the crafting grid. -botania.page.cosmeticBaubles1=Creating these is done through an interesting method, weaving a specific color of petal around some &1Mana Infused String&0 creates an item. The type of item created doesn't seem to have anything to do with the color.
    How this works really isn't too well known, it's like the person that came up with this didn't bother to use better materials or something, who knows. -botania.page.cosmeticBaubles2=They're cool -botania.page.cosmeticBaubles3=My desires are... unconventional -botania.page.cosmeticBaubles4=How unpleasant -botania.page.cosmeticBaubles5=It's cold in Kalos -botania.page.cosmeticBaubles6=Do they reveal anything? -botania.page.cosmeticBaubles7=Shut up Alexander and the Trajan -botania.page.cosmeticBaubles8=The eye has to be hidden -botania.page.cosmeticBaubles9=Not for bean sprouts -botania.page.cosmeticBaubles10=The best color -botania.page.cosmeticBaubles11=Tilting the umbrella too much -botania.page.cosmeticBaubles12=The Neighbours' Club -botania.page.cosmeticBaubles13=Nyaa -botania.page.cosmeticBaubles14=Don't get too ahead of yourself -botania.page.cosmeticBaubles15=Evil up! -botania.page.cosmeticBaubles16=Nudistoooooooooo -botania.page.cosmeticBaubles17=(insert reference here) -botania.page.cosmeticBaubles18=Lurk moar -botania.page.cosmeticBaubles19=I need your time -botania.page.cosmeticBaubles20=So rare -botania.page.cosmeticBaubles21=Oh hey, Loki -botania.page.cosmeticBaubles22=Challenge up! -botania.page.cosmeticBaubles23=Representing! -botania.page.cosmeticBaubles24=Reminds me of a puzzle -botania.page.cosmeticBaubles25=You've met with a terrible fate, haven't you? -botania.page.cosmeticBaubles26=Thanks for the gold stranger -botania.page.cosmeticBaubles27=Woah, colors -botania.page.cosmeticBaubles28=Who the hell do you think I am? -botania.page.cosmeticBaubles29=Nothing suspicious here, nope -botania.page.cosmeticBaubles30=I can fly with these -botania.page.cosmeticBaubles31=Not actually part of spain -botania.page.cosmeticBaubles32=Now you too can believe -botania.page.cosmeticBaubles33=Get on the treadmill, angbadang - -# -- TINY PLANET -botania.entry.tinyPlanet=Tiny Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her.
    By increasing its mass with some &1Stone&0, it can also be placed in world, for the same effect. -botania.page.tinyPlanet1=Clearly from rebirth -botania.page.tinyPlanet2=More of a planet than Pluto - -# -- BAND OF MANA -botania.entry.manaRing=Band of Mana -botania.page.manaRing0=Combining a &1Mana Tablet&0 with some &1Manasteel&0 creates an easily worn &4Ring&0, that functions exactly similar to the tablet used to make it, but can be worn as a &4Bauble&0.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it store about four times as much &4Mana&0. -botania.page.manaRing1=Creating the ring -botania.page.manaRing2=Upgrading the ring - -# -- BAND OF AURA -botania.entry.auraRing=Band of Aura -botania.page.auraRing0=The &1Band of Aura&0 is a bit of a deviation from the typical &1Band of Mana&0, in which, instead of storing &4Mana&0, it slowly, while equipped, creates it and stores it into &4Mana&0 containing items in the wearer's inventory.
    Using some &1Terrasteel&0 allows for an upgrade, which lets it generate &4Mana&0 at a significantly faster rate. -botania.page.auraRing1=Creating the ring -botania.page.auraRing2=Upgrading the ring - -# -- SOUJOURNER'S SASH -botania.entry.travelBelt=Soujourner's Sash -botania.page.travelBelt0=Traversing terrain sometimes proves to be a hassle. The &1Soujourner's Sash&0 can be equipped in the &4Belt&0 slot, and when worn will increase the movement speed, jump height and resistance to fall damage of the wearer. This power comes at a small &4Mana&0 cost.
    Lastly, if not sneaking, it also allows the wearer to walk over 1 block high gaps without jumping with ease. -botania.page.travelBelt1=...everell - -# -- TECTONIC GIRDLE -botania.entry.knockbackBelt=Tectonic Girdle -botania.page.knockbackBelt0=By harnessing the forces of tectonic movement, the &1Tectonic Girdle&0, when worn, will negate any &4Knockback&0 applied to the wearer by outside attacks. -botania.page.knockbackBelt1=I'm the man who can't be moved - -# -- SNOWFLAKE PENDANT -botania.entry.icePendant=Snowflake Pendant -botania.page.icePendant0=The &1Snowflake Pendant&0 is a &4Bauble&0 that resonates freezing energy, while it's worn, any nearby still &1Water&0 blocks at foot level will be converted into &1Ice&0.
    The &1Ice&0 will melt shortly afterward the wearer leaves the area. Lastly, this charm will not freeze any blocks if the wearer is sneaking or fully submerged. -botania.page.icePendant1=Do you want to build a snowman? - -# -- PYROCLAST PENDANT -botania.entry.lavaPendant=Pyroclast Pendant -botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs low heat, while it's worn, if the wearer is caught on fire and is not directly standing on &1Fire&0, &1Lava&0 or anything else that can induce burning, they'll be extinguished. -botania.page.lavaPendant1=Hanako could have used one of these - -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Golden Laurel Crown -botania.page.goldenLaurel0=One of the uses for &1Gaia Spririts&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=Given the theme, probably Viridi - -# -- RING OF CHORDATA -botania.entry.waterRing=Ring of Chordata -botania.page.waterRing0=The &1Ring of Chordata&0 allows the wearer to swim like a fish. While it's equipped, the wearer is bestowed with the ability to accelerate to a decent speed while underwater. It also gives the wearer good sight underwater and, if &4Mana&0 is present, at the cost of some of it, the ability to breathe indefinitely. -botania.page.waterRing1=Check out that fish AI - -# -- RING OF THE MANTLE -botania.entry.miningRing=Ring of the Mantle -botania.page.miningRing0=The &1Ring of the Mantle&0 allows one to mine faster, while equipped and &4Mana&0 is present in the inventory, it'll give a &4Haste&0 effect to the wearer. Some &4Mana&0 is used while the wearer swings their arm or equipped item, be it for attacking, mining or just flailing. -botania.page.miningRing1=Diggy diggy hole - -# -- RING OF MAGNETIZATION -botania.entry.magnetRing=Ring of Magnetization -botania.page.magnetRing0=By turning a &1Magnetizing Lens&0 into a wearable ring, one can use it to magnetize nearby items. While equipped, this ring will make any nearby items magnetize towards the wearer if they're not sneaking. A notable feature of this piece is that it'll negate its effect for 5 seconds after the wearer tosses an item so as to not interfere with whatever means it was tossed for. A &1Solegnolia&0 can disrupt this ring's functionality. -botania.page.magnetRing1=How do they work? - -# -- RING OF FAR REACH -botania.entry.reachRing=Ring of Far Reach -botania.page.reachRing0=Through the power of one's Pride, nothing is out of their reach. By wearing the &1Ring of Far Reach&0, the maximum distance the wearer can break, place or interact with blocks, as well as attack or interact with entities is increased by about three blocks. -botania.page.reachRing1=Fire and Blood - -# -- CHARM OF THE DIVA -botania.entry.divaCharm=Charm of the Diva -botania.page.divaCharm0=The &1Charm of the Diva&0 blesses the wearer with the ability to have any attacked mob follow the attacker's will, and, case there are any nearby enemies, go after them instead. This process, of course, requires a bit of &4Mana&0 from the wearer's inventory in order to function. -botania.page.divaCharm1=You shall not disrespect Big Sister - -# -- GREAT FAIRY RING -botania.entry.pixieRing=Great Fairy Ring -botania.page.pixieRing0=This ring works alongside the &1Elementium Armor&0, insight in the powers of it is advised before using this ring. When worn, the &1Great Fairy Ring&0 will increase the chance for a &4Pixie&0 to spawn when the wearer is hit, this still holds true case no &1Elementium Armor&0 is equipped. -botania.page.pixieRing1=We got square heads, big pointy caps - -# -- GLOBETROTTER'S SASH -botania.entry.superTravelBelt=Globetrotter's Sash -botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Gaia Spirits&0 and some elfique resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance. -botania.page.superTravelBelt1=No time for guessing, follow my plan instead - -# -- THE SPECTATOR -botania.entry.itemFinder=The Spectator -botania.page.itemFinder0=&1The Spectator&0 is a headband that allows the wearer to have a better perception of the world. While holding an item, any &4containers&0 (chests, minecarts, donkeys with chests, furnaces, etc...) that have an item of that type, &4dropped items&0 of that type, &4mobs&0 who have that item equipped &o(...)&r -botania.page.itemFinder1=&o(...)&r &4players&0 who have the item in their inventory and &4villagers&0 who want to trade either with or for that item will shine with a colorful glow, allowing them to be easily spotted.
    While sneaking, all dropped items around the wearer will shine, regardless of the item. -botania.page.itemFinder2=Do you hear their voices? - -# -- CRIMSON PENDANT -botania.entry.superLavaPendant=Crimson Pendant -botania.page.superLavaPendant0=The &1Crimson Pendant&0 is, in simple terms, an upgraded counterpart to the &1Pyroclast Pendant&0, wearing it provides the wearer immunity to all fire and lava damage, instead of just extinguishing them. -botania.page.superLavaPendant1=Runner-up on Monolith Code - -# -- TAINTED BLOOD PENDANT -botania.entry.bloodPendant=Tainted Blood Pendant -botania.page.bloodPendant0=Messing around with the original source of the &4Potion&0 design, the Nether, seems to work fairly well at harnessing that very power.
    The &1Tainted Blood Pendant&0 allows one to store a &4Brew&0 in a condensed, wearable state. Infusing this pendant with one and wearing it will apply the effect while it's worn, for the cost of &4Mana&0 depending on the power of the &4Brew&0. -botania.page.bloodPendant1=To infuse the pendant with a &4Brew&0 the normal procedure of infusing one on a &1Vial&0 is what's required. The cost increases by a tenfold, though.
    However, the pendant will not accept any and all effects, a few don't seem to behave well, such as &4Instant Health&0 or &4Absorption&0. Lastly, &4Brews&0 with more than one effect will fail as well. -botania.page.bloodPendant2=I'll get Saber for sure - -# -- CLOAKS OF JUDGEMENT -botania.entry.judgementCloaks=Cloaks of Judgement -botania.page.judgementCloaks0=The &1Cloaks of Judgement&0 are a pair of cloaks that can be worn instead of a belt (and thus, they go in the Belt slot). Their strength triggers when their wearer takes damage. After that, they'll go in a ten second recharge period in which their effects won't trigger. -botania.page.judgementCloaks1=The &1Cloak of Virtue&0 will, when active, block the full extent of a piece of damage taken. This does not apply to magic damage.
    The &1Cloak of Sin&0 will damage all nearby hostile mobs for the same amount of damage that was taken. -botania.page.judgementCloaks2=A Holy Mantle -botania.page.judgementCloaks3=Taste Vengeance! - -# -- MANASEER MONOCLE -botania.entry.monocle=Manaseer Monocle -botania.page.monocle0=A handy accessory for one who requires a thorough window into where their &4Mana Bursts&0 are going is the &1Manaseer Monocle&0. Not only is it a rather fancy eyepiece but it also allows the wearer to see all nearby &4Mana Bursts&0, even if their line of sight towards them is blocked by something. More important, perhaps, is that when someone wearing this monocle looks at a flower they'll be able to see its functional radius. -botania.page.monocle1=Why hello there old chap - -# -- RING OF CORRECTION -botania.entry.swapRing=Ring of Correction -botania.page.swapRing0=Switching tools is a pain. People often find themselves shoveling away at dirt with... a pick? Using the &1Ring of Correction&0 is a great way to, well, correct that.
    While this ring is worn, the tool in hand will always be the right one for the block being broken, be it a pick, axe or shovel. This only works with tools that can use &4Mana&0. -botania.page.swapRing1=Use the right tools - -# - ALFHOMANCY -# -- THE PORTAL TO ALFHEIM -botania.entry.aIntro=The Portal to Alfheim -botania.page.aIntro0=It's said that once, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they would've been banished back to their own world, &4Alfheim&0.
    Experimentation has been done in attempt to bridge the gap between the two worlds, and means of creating a portal that does just that have been devised. -botania.page.aIntro1=Creating this portal proves not to be an easy task, as quite a few exquisite resources are necessary. The requirements are as follows: 8 &1Livingwood&0 blocks, 3 &1Glimmering Livingwood&0 blocks, 1 &1Elven Gateway Core&0 (read on), 2 &1Mana Pools&0 and 2 &1Natura Pylons&0 (read on). -botania.page.aIntro2=Creating the &1Elven Gateway Core&0 -botania.page.aIntro3=Creating &1Natura Pylons&0 -botania.page.aIntro4=Alfheim Portal -botania.page.aIntro5=To open up the portal, simply right click the core with a &1Wand of the Forest&0.
    The portal requires a substantial amount of &4Mana&0 deposited in both the pools to open up, after that, it'll slowly drain some to keep itself powered. If it runs out of &4Mana&0, the connection will be broken. -botania.page.aIntro6=The amount of &4Mana&0 required to open up the portal is orders of magnitude higher than that to keep it maintained, thus closing the portal to prevent &4Mana&0 loss is a poor strategy.
    Furthermore, the link isn't strong enough to allow living beings to go through it, but it seems that &4items&0 can. -botania.page.aIntro7=The amount of information about &1Alfheim&0 stored in this lexicon is limited to this entry alone. Perhaps &4letting the&0 &4Elves have a look at it&0 might prove beneficial.
    Perhaps they'd also return a good amount of knowledge of their mystical constructs. - -# -- A MESSAGE FROM elfique GARDE -botania.entry.elfMessage=A Message from elfique Garde -botania.page.elfMessage0= -# ^ This is blank on purpose -botania.page.elfMessage1=&oGreetings. We noticed that our portal was opened via a link from another world. That's rather shocking news indeed. We thank you very much for providing us with a repository of the knowledge from your world, as to keep us up to date to what happened since we left it, it's been a while since then, it's good to see it's doing well. -botania.page.elfMessage2=&oAfter some discussion with the high council of elfique Garde, we have decided to cooperate with you. You see, reading through your "Lexica Botania" has shown us a good amount of resources from your world that we would be extremely keen as to get our hands on, as these are non-existent in our lands. -botania.page.elfMessage3=&oThe link you have managed to establish is rather weak, no living beings will be able to go through, as you already know. However, there's a positive side to this, the link strikes the fabric of time of both our worlds in a way where it doesn't keep them in sync, that's the reason why you received your book back so quickly. -botania.page.elfMessage4=&oWhen it comes to Mana and other magical energies, we are plenty stocked on them, so worry not about the portal closing on our end. Let's put this in prospect, in order for the advance of both our civilizations, we vow to accept a given set of resources from your world we lack in ours in exchange for resources you lack in yours. -botania.page.elfMessage5=&oWe have taken the liberty of assigning our best scribes to put together a great set of knowledge from our world we're willing to share, you can find it in your lexicon just as you'd find knowledge from yours. We hope you find it enlightening and that it encourages you to invest in our materials. -botania.page.elfMessage6=&oLast but not least, do keep in mind that if you decide to send something we have not vouched to trade for, we will assume it as a gift and keep it for ourselves, just as a forewarning. We look forward to exchanging resources with you.
    Best Regards, the High Council of elfique Garde. - -# -- THE RESOURCES OF ALFHEIM -botania.entry.elfResources=The Resources of Alfheim -botania.page.elfResources0=&4Alfheim&0 contains a very varied amount of exquisite resources. Sadly though, most of them are extremely scarce and hard to come by due to competition between the various clans. The elves are interested in trading some materials, such as &1Dreamwood&0, &1Elementium&0, &1Pixie Dust&0 or &1Dragonstone&0, resources native to their lands. -botania.page.elfResources1=Trading for &1Dreamwood&0 -botania.page.elfResources2=&1Dreamwood&0, similarly to &1Livingwood&0 can be turned into various &4Decorative Blocks&0, have a look through the &4Decorative Blocks&0 entry under &4Miscelaneous&0 for the recipes. -botania.page.elfResources10=&1Dreamwood Twigs&0 -botania.page.elfResources3=Trading for &1Elementium&0 -botania.page.elfResources4=Trading for &1Pixie Dust&0 -botania.page.elfResources5=Trading for &1Dragonstone&0 -botania.page.elfResources6=The &1Elves&0 are also quite keen on the white posh block from the &4Nether&0, &1Nether Quartz&0, the ones they have on their world are tinted green. This quartz works just like any other quartz, be it normal &1Nether Quartz&0 or any of the decorative variants you can find on the &4Decorative Blocks&0 entry under &4Miscelaneous&0. -botania.page.elfResources7=Trading for &1elfique Quartz&0 -botania.page.elfResources8=Alfheim also has its own variant of &1Glass&0, in the form of &1Alfglass&0. Its look is rather light and its patterns are randomized depending on where it's placed.
    Trading goes for &1Managlass&0. -botania.page.elfResources9=Trading for &1Alfglass&0 - -# -- RITUAL OF GAIA -botania.entry.gaiaRitual=Ritual of Gaia -botania.page.gaiaRitual0=The &4Ritual of Gaia&0 is a procedure often enacted by the elves, which is the only way to acquire &1Gaia Spirits&0, which are essences of the power of the Goddess of Gaia herself.
    This ritual required an &4Active&0 &1Beacon&0 with some &1Gaia Pylons&0 (read on) one level above the beacon as the altar, as well as a single &1Terrasteel Ingot&0 as a sacrifice. -botania.page.gaiaRitual1=Creating &1Gaia Pylons&0 -botania.page.gaiaRitual2=Place the pylons (1 block above the beacon) -botania.page.gaiaRitual3=To start the ritual, simply shift-right click the &1Beacon&0 block with a &1Terrasteel Ingot&0, take a step back and prepare to fight for your life. Good preparation is required, as the fight with the &4Guardian of Gaia&0 can be even harder than that of the &4Wither&0. Upon defeating the &4Guardian&0, one can collect their prize, a handful of &1Spirits of Gaia&0. -botania.page.gaiaRitual4=The common attire for this ritual is a set of Enchanted &1Elementium Armor&0, a &1Terra Blade&0 and a large assortment of &4Brews&0 and &4Baubles&0.
    The effect of the &1Beacon&0 is nullified during the battle, so that should be taken in mind. Lastly, staying away from the purple might be a good idea. - -# -- RITUAL OF GAIA II -botania.entry.gaiaRitualHardmode=Ritual of Gaia II -botania.page.gaiaRitualHardmode0=One would think that combining two of the most powerful resources known to existance, in the form of &1Terrasteel&0 and &1Gaia Spirits&0 would create an unstoppable material. It seems that the material is very much stoppable, though. In fact, the two forces cancel eachother out when combined into an ingot, creating an utterly useless alloy. -botania.page.gaiaRitualHardmode1=This ingot, though, due to the concentrated energy and power in it, does allow for the summoning of a stronger &1Gaia Guardian&0, with more resistance, strength and speed.
    For all of this, it also drops more &1Gaia Spirits&0 than normal, as well as a handful of goodies and rare treasure, making it a worthwhile foe. -botania.page.gaiaRitualHardmode2=Creating the &1Gaia Spirit Ingot&0. - -# -- THE RELICS OF THE AESIR -botania.entry.relics=The Relics of the Aesir -botania.page.relics0=There's an old tale from the high clans of Alfheim. It says something among the lines of "The one who rolls the Dice of Fate is to be rewarded with the Gifts of the Gods". These so called &1Relics of the Aesir&0 are rumored to be unique and soulbound, by which only one will ever be awarded to any one individual and only they might use it.
    But then again, it's probably just folklore. - -# -- ELVEN LORE - THE SHATTERING -botania.entry.elvenLore=Elven Lore - The Shattering -botania.page.elvenLore0=It seems this section of the lexicon is just a bunch of pieces of paper. By the looks of them, they seem like they were taken from a document from the libraries of elfique Garde.
    Their contents should contain historical knowledge, but doubtfully anything important to the studies of botany itself. -botania.page.elvenLore1=&oA few millennia have passed since The Shattering. The amount of us who actually know about what really happened that day is rather minute. Nidavellir broke down, and while the Dwarves' incredible resistance helped, a great part of their technology and civilization was eradicated. Muspelheim, what was (...) -botania.page.elvenLore2=&opreviously in the very opposite corner of the World Tree herself collided with Midgard, merging the two worlds in an apocalypse, eradicating any life remaining in that world. There's theories that state Hel was also involved in the event, although none were ever confirmed. Fissures in the ground of (...) -botania.page.elvenLore3=&oJotunheim opened all around, massacring a great portion of the Giants who lived there, its current status remains unknown. Niflheim seemed to stay in place, unlike Muspelheim, interestingly enough. Since it contained no known lifeforms, we can admit that damage is irrelevant. Lastly, ourselves, the (...) -botania.page.elvenLore4=&oelves of Alfheim, the damage on our world was somewhat split. The Salamander and Undine clans suffered a massive cut on their population, due to the unstableness of their volcanic and aquatic environments, respectively. Most of the Sylph were completely intact due to their extraordinary flight capabilities, the (...) -botania.page.elvenLore5=&oSpriggan also had fairly small scale consequences. During that time our civilization prospects were fairly weak and our choices of residence were mostly just huts made of Dreamwood, so, luckily, rebuilding was little of a chore. Allewyn, our emissary in Asgard witnessed this happening, everything happened faster (...) -botania.page.elvenLore6=&othan the birth of a Pixie. Thor shattering the Bifrost with Mjolnir, her command to evacuate all of the elfique civilization residing in Midgard, luckily she was here unscathed, or at least that's what records say, regardless, a few millennia later, she's passed off long ago. Right now our major concern is the status of Midgard. (...) -botania.page.elvenLore7=&oThe collapse of the Bifrost broke any interaction between the various worlds, but the sheer quantity of Mana residues we have left behind will surely have lingered and infused the world with life all over again, be it animal, floral or fungal, natural or magical in essence. We hope it's enough to create intelligent life that can properly harness it though. - -# - MISCLANEOUS -# -- UNSTABLE CUBE -botania.entry.unstableBlocks=Unstable Cubes -botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. -botania.page.unstableBlocks1=They look fancy -botania.page.unstableBlocks2=And they come in all 16 colors -botania.page.unstableBlocks3=There's also a way of creating a different version of these that releases an extremely larger amount of energy, this time in the form of a beam towards the sky that extends into a cloud of sorts. This one also seems to be disableable via a &4Redstone Signal&0, it's called an &1Unstable Beacon&0, as it looks like one somehow. -botania.page.unstableBlocks4=Fireworks? -botania.page.unstableBlocks5=Combined entropy -botania.page.unstableBlocks6=It's also possible, by using the &1Unstable Beacons&0, to turn them into a manageable and portable utility, in the form of the &1Signal Flare&0.
    This gun of sorts shoots a colored round into the sky that lasts a few seconds, it also stuns any nearby enemies for just as long. -botania.page.unstableBlocks7=Shoot in case of titan - -# -- DECORATIVE BLOCKS -botania.entry.decorativeBlocks=Decorative Blocks -botania.page.decorativeBlocks0=Past functionality, quite a few decorative blocks are available to make your builds look better.
    Starting off. It's possible to turn blocks of &1Livingrock&0 and &1Livingwood&0 into decorative blocks. Each of them features 4 different decorative variations. -botania.page.decorativeBlocks1=Viveroche bricks. -botania.page.decorativeBlocks2=Mossing the bricks -botania.page.decorativeBlocks3=Cracking the bricks -botania.page.decorativeBlocks4=Framing the bricks -botania.page.decorativeBlocks5=Turning wood into planks -botania.page.decorativeBlocks6=Mossing the planks -botania.page.decorativeBlocks7=Framing the planks -botania.page.decorativeBlocks8=Pattern planks -botania.page.decorativeBlocks9=Fleur chatoyante livingwood -botania.page.decorativeBlocks10=Carrying on, by combining &1Nether Quartz&0 with all sorts of other substances, it's possible to create a wide array of other decorative &1Quartz&0 blocks.
    As expected, all these items can be crafted into all their decorative block counterparts just like regular &1Quartz&0 blocks are crafted. -botania.page.decorativeBlocks11=Smokey Quartz -botania.page.decorativeBlocks12=Mana Quartz -botania.page.decorativeBlocks13=Blaze Quartz -botania.page.decorativeBlocks14=Lavender Quartz -botania.page.decorativeBlocks15=Redquartz -botania.page.decorativeBlocks23=Sunny Quartz -botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Reed Blocks&0, &1Thatch&0, &1Roof Tiles&0 and a few new &1Bricks&0.
    All these also can be crafted into both stairs and slabs. -botania.page.decorativeBlocks17=Crafting &1Reed Blocks&0 -botania.page.decorativeBlocks18=Crafting &1Thatch&0 -botania.page.decorativeBlocks19=Crafting &1Roof Tiles&0 -botania.page.decorativeBlocks20=Crafting &1Hellish Bricks&0 -botania.page.decorativeBlocks21=Crafting &1Soul Bricks&0 -botania.page.decorativeBlocks22=Crafting &1Frosty Bricks&0 - -# -- DISPENSER TWEAKS -botania.entry.dispenserTweaks=Dispenser Tweaks -botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can also plant all sorts of crops, from &1Seeds&0, &1Potatos&0 or &1Carrots&0 to even &1Nether Wart&0. The crop is planted in the block right in front of the dispenser.
    The &1Dispensers&0 can also use the &1Wand of the Forest&0 for some specific tasks such as triggering a &1Runic Altar&0. - -# -- GLIMMERING FLOWERS -botania.entry.shinyFlowers=Fleur chatoyante -botania.page.shinyFlowers0=En combinant votre &1Fleur mystique&0 typique avec un peu de &1Poudre lumineuse&0, vous pouvez les faire miroiter encore plus brillante, et émettre une lumière physique actuelle, de la même brillance comme un &1Bloc lumineux&0.
    With some &1Dirt&0 and &1Pasture Seeds&0 it's possible to turn them into a miniature Fleur flottante island that will not only emit light, but also look very fancy indeed. -botania.page.shinyFlowers3=Combining any color of &1Fleur flottante Flower&0 with any flower that has an effect (any &4Functional or Generating Flower&0, etc) in a crafting table will join the two, allowing for both the look and properties of a &1Fleur flottante Flower&0 and the effects of the flower chosen in one block. Lastly, right clicking a Fleur flottante flower in the world with any type of &1Pasture Seed&0 or a &1Snowball&0 will change its look. -botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny -botania.page.shinyFlowers2=Like Laputa but (a lot) tinier - -# -- PRISMARINE -botania.entry.prismarine=Prismarine -botania.page.prismarine0=&1Prismarine&0 is an interesting component and building block. Some scholars even go as far as to say it comes from &4the future&0.
    To create it, one requires an &1Alchemy Catalyst&0. Simply tossing some &1Nether Quartz&0 into a &1Mana Pool&0 with the catalyst attached to it will get some of this material. -botania.page.prismarine1=There's various building blocks that can be created using the &1Prismarine Shards&0, to which all but the &1Sea Lantern&0 can be turned into their &1Stair&0 and &1Slab&0 variants. -botania.page.prismarine2=Creating &1Prismarine Shards&0 -botania.page.prismarine3=Crafting &1Prismarine&0 -botania.page.prismarine4=Crafting &1Prismarine Bricks&0 -botania.page.prismarine5=Crafting &1Dark Prismarine&0 -botania.page.prismarine6=Crafting the &1Sea Lantern&0 - -# -- NATURAL SHEDDING -botania.entry.shedding=Natural Shedding -botania.page.shedding0=The living and unliving beings that inhabit our lands don't live in a static state. It's common for pieces of their body to fall out, or for them to drop things, or for them to extrude substances. The following pages list some such items that can come from such entities. - -# -- TINY POTATO -botania.entry.tinyPotato=Tiny Potato -botania.page.tinyPotato0=It's a tiny potato, it believes in you, you can do the thing.
    No really, that's it, by tossing a &1Potato&0 in a &1Mana Pool&0, the potato gains a little lively essence and happy feeling. It's a lively one, giving it a right click will make it even more so!
    It can also be named in an &1Anvil&0. -botania.page.tinyPotato1=Put it on Kickstarter, it'll work - -# -- HEAD CREATION -botania.entry.headCreating=Head Creation -botania.page.headCreating0=A typical incantation of the Elves, combining a few resources and a &1Name Tag&0 allows for the creation of a replica of sorts of the head of the person described in the tag. How it works isn't really known, but it seems to be possible to replicate it with a &1Runic Altar&0. -botania.page.headCreating1=Get your head in the game - -# -- AZULEJO -- http://en.wikipedia.org/wiki/Azulejo -botania.entry.azulejo=Azuléjos -botania.page.azulejo0=&1Azuléjos&0 are a type of decorative block, simply put, they are tileable patterns of blue and white. To create them, one would simply mix a piece of &1Lapis Lazuli&0 with a &1Block of Quartz&0.
    From there, placing it in the crafting grid allows for cycling between the twelve different patterns. -botania.page.azulejo1=The various patterns -botania.page.azulejo2=Crafting a block of &1Azuléjo&0 -botania.page.Lentilles de mana3=Cycling between the patterns - -# -- STARFIELD CREATOR -botania.entry.starfield=Starfield Creator -botania.page.starfield0=The &1Starfield Creator&0 does exactly as it says, by releasing elfique energies into the air, if it's placed in the world, during night time it will create a starry sky that extends for a fair distance. -botania.page.starfield1=Twinkle twinkle - -# -- TRODDEN DIRT -botania.entry.dirtPath=Trodden Dirt -botania.page.dirtPath0=&1Trodden Dirt&0 is a type of soil that works perfectly for the creation of natural looking artificial paths through landscape. Similarly to &1Farmland&0, it's slightly inset into the ground, walking on it also provides a small speed boost. -botania.page.dirtPath1=Follow the yellow dirt road -botania.page.dirtPath2=Also available in slabs - -# -- SHIMMERING MUSHROOMS -botania.entry.mushrooms=Shimmering Mushrooms -botania.page.mushrooms0=Sprinkling some &1Floral Powder&0 on &1Mushrooms&0 seems to have the interesting effect of them mutating into the respective color of powder, gaining a new shape and getting the ability to emit dim light. They don't seem to do anything besides look interesting.
    These can also be seldom found deep underground in isolated patches. -botania.page.mushrooms1=They don't make you bigger - -# -- PHANTOM INK -botania.entry.phantomInk=Encre sympatique -botania.page.phantomInk0=Having your beautiful skin and accessories under a set of metal armor is nobody's dream. It's bulky, flat, and worst of all, not fashionable!
    Luckilly, by tinging this horrendous armor with &1Phantom Ink&0 in a crafting grid, the armor will be completely invisible, while still providing all of its benefits. This will only work with armor sets that can use &4Mana&0. -botania.page.phantomInk1=Who you gonna call? - -# -- STONE ALCHEMY -botania.entry.stoneAlchemy=Stone Alchemy -botania.page.stoneAlchemy0=Using an &1Alchemy Catalyst&0 proves to be a decently functional method of generating new types of &1Stone&0. Simple deal, tossing a piece of &1Stone&0 into the catalized pool will transform it into another in a cyle.
    Similarly to &1Prismarine&0, some scholars admit that this technique came from the future. Stairs and slabs can be made from the rough and brick variants of these. -botania.page.stoneAlchemy1=Creating the stones -botania.page.stoneAlchemy2=Polish -botania.page.stoneAlchemy3=Brickage -botania.page.stoneAlchemy4=Chiseling - -# -- BLAZE LIGHT -botania.entry.blazeBlock=Blaze Light -botania.page.blazeBlock0=Smashing a bunch of &1Blaze Rods&0 together makes a usable decorative light block. A crude one, admittedly, but a source of light non the less.
    Naturally, like a &1Block of Coal&0, the &1Blaze Light&0 can also be used to fuel furnaces and other fuel consumers alike. Putting it next to a &1Pure Daisy&0 converts it into &1Obsidian&0, strangely enough. -botania.page.blazeBlock1=0x1a4 - -# -- CHALLENGES -botania.entry.challenges=Challenges -botania.page.challenges0=&1Challenges&0 are available in the &1Lexica Botania&0 by clicking the icon in the right of the landing page shaped like a cup. These, as the name says, challenge the player to create a mechanism using the features only available in &1Botania&0 and &1Minecraft&0 itself.
    Of course, you can use items from other mods to complete them, but that's no fun. -botania.page.challenges1=All of the challenges are possible, of course. They just require some thinking and knowledge of the ins and outs of redstone and the &1Botania&0 mechanics themselves.
    It's highly recommended that they're done without using features from external mods, as they have been created with that in mind, and aren't really challenges if you put down a block that solves them instantly. -botania.page.challenges2=The challenges aren't obligatory in any way, and do not provide any material reward. They're purely suggestions as to what &1Botania&0 can do, automation wise, and are but scratching the surface of that topic. Challenges need be marked completed manually.
    It should be kept in mind that the boundaries of this world are one's imagination, so don't stop at the ideas in there! - -# -- CACOPHONIUM -botania.entry.cacophonium=Cacophonium -botania.page.cacophonium0=This interesting instrument, the &1Cacophonium&0, has the ability to mimic almost every living being's cries in nature, allowing for the "musician" to play them at will. Right clicking with it on an entity has the instrument learn its sound. It can then be played by holding right click.
    Why anyone would ever want to make this, however, is beyond moral comprehension. -botania.page.cacophonium1=Hibike! Cacophonium - -# -- THAUMCRAFT INTEGRATION -botania.entry.tcIntegration=Thaumcraft Integration -botania.page.tcIntegration0=Often enough, the paths of &4Botany&0 and &4Thaumaturgy&0 cross together. Mixing some of the artifacts mentioned in this book as well as any from the school of &5Thaumcraft&0 can allow for combinations of these to form. -botania.page.tcIntegration1=First and foremost, combining any of the &1Mana Metal&0 helms with a set of &1Goggles of Revealing&0 allows for a combination of both.
    The protection and regenerability of the armor works alongside the Goggles' abilities, but the &4Vis&0 discount is lost. -botania.page.tcIntegration2=Helmets of Revealing (works with any Botania helm) -botania.page.tcIntegration3=Carrying on, &4Mana&0 can also serve as an interesting type of Ink. Infusing a set of black &1Scribing Tools&0 with &4Mana&0 from a &1Mana Pool&0 allows for them to use said &4Mana&0 as their source of color.
    Refilling these tools works similarly to a &1Mana Tablet&0, done by tossing it on top of the pool. It's to note that the tools do not come pre-filled. -botania.page.tcIntegration4=Making the &1Botanurgist's Inkwell -botania.page.tcIntegration5=Next off, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability, these come in the form of &1Fleur chatoyante Flowers, Fleur flottante Flowers and any variety of Pylons&0.
    Lastly, a special &4Brew&0 can be put together using typical thaumaturgic resources in order to apply a &4Warp Ward&0 effect. -botania.page.tcIntegration6a=Perhaps insanity might not be the greatest tool in all of occasions. For those cases, a nice bath generally takes care of it. A brew might be a better format for such a task, though... -botania.page.tcIntegration6b=The official frowny face - -# -- BUILDCRAFT INTEGRATION -botania.entry.bcIntegration=Buildcraft Integration -botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
    &1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes. From 49a6f00b411d0ce7a32981c8543c334043375cfd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jun 2016 23:10:33 -0500 Subject: [PATCH 664/935] Update Forge, some fluid cap stuff --- build.properties | 2 +- .../botania/common/block/tile/TileAltar.java | 39 ++++++++++++---- .../botania/common/item/ItemWaterBowl.java | 46 +++++++++++-------- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/build.properties b/build.properties index afab433db..580ed074c 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1922-1.9.4 +forge_version=12.17.0.1948 mc_version=1.9.4 dir_repo=./ build_number=309 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 a975d4755..96055aede 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -26,6 +26,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; @@ -80,19 +85,33 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { item.setDead(); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } + + return true; } } - if(!hasWater() && !hasLava()) { - 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) { - setLava(true); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.setItem(Items.BUCKET); - } else return false; + if(!hasWater() && !hasLava() && !worldObj.isRemote) { + + if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { + IFluidHandler fluidHandler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + + FluidStack drainWater = fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), false); + FluidStack drainLava = fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), false); + + if(drainWater != null && drainWater.getFluid() == FluidRegistry.WATER && drainWater.amount == Fluid.BUCKET_VOLUME) { + setWater(true); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), true); + return true; + } else if(drainLava != null && drainLava.getFluid() == FluidRegistry.LAVA && drainLava.amount == Fluid.BUCKET_VOLUME) { + setLava(true); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), true); + return true; + } + } + + return false; } if(hasLava()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index 6c3cae147..32024fa7c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -10,41 +10,47 @@ */ package vazkii.botania.common.item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; import vazkii.botania.common.lib.LibItemNames; -public class ItemWaterBowl extends ItemMod implements IFluidContainerItem { +import javax.annotation.Nonnull; - private static final FluidStack STACK = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); +public class ItemWaterBowl extends ItemMod { public ItemWaterBowl() { super(LibItemNames.WATER_BOWL); setMaxStackSize(1); } - // Needed for rendering water dynamic model - + @Nonnull @Override - public FluidStack getFluid(ItemStack container) { - return STACK; + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new Handler(stack); } - @Override - public int getCapacity(ItemStack container) { - return 0; + private static class Handler extends FluidHandlerItemStackSimple.SwapEmpty { + + private Handler(ItemStack stack) { + super(stack, new ItemStack(Items.BOWL), Fluid.BUCKET_VOLUME); + setFluid(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME)); + } + + @Override + public boolean canFillFluidType(FluidStack fluid) { + return false; + } + + @Override + public boolean canDrainFluidType(FluidStack fluid) { + return fluid.getFluid() == FluidRegistry.WATER; + } } - @Override - public int fill(ItemStack container, FluidStack resource, boolean doFill) { - return 0; - } - - @Override - public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - return null; - } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 0995a4ce5..283ac2679 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.17.0.1922,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1948,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; From d241f95bee34ec59073c4da78821ea9518d029e9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 12:06:39 -0500 Subject: [PATCH 665/935] Zap some duplicated code --- .../botania/common/block/BlockAltar.java | 46 ++----------------- .../botania/common/block/BlockAvatar.java | 34 +------------- .../botania/common/block/BlockHourglass.java | 34 +------------- .../botania/common/block/BlockOpenCrate.java | 35 +------------- .../common/block/BlockSparkChanger.java | 34 +------------- .../block/corporea/BlockCorporeaBase.java | 34 +------------- .../common/block/mana/BlockBrewery.java | 46 ++----------------- .../botania/common/block/mana/BlockPrism.java | 38 ++------------- .../common/block/mana/BlockRuneAltar.java | 46 ++----------------- .../common/block/mana/BlockSpreader.java | 38 ++------------- .../botania/common/block/tile/TileAltar.java | 2 +- .../common/block/tile/TileEnchanter.java | 2 +- .../common/core/helper/InventoryHelper.java | 35 +++++++++++++- 13 files changed, 63 insertions(+), 361 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 3396c0158..a2e1f3c90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -44,6 +44,7 @@ import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.item.rod.ItemWaterRod; @@ -58,8 +59,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); - private final Random random = new Random(); - protected BlockAltar() { super(Material.ROCK, LibBlockNames.ALTAR); setHardness(3.5F); @@ -147,17 +146,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { - for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = tile.getItemHandler().getStackInSlot(i); - if(stackAt != null) { - ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropItem(copy, false); - tile.getItemHandler().setStackInSlot(i, null); - par1World.updateComparatorOutputLevel(pos, this); - break; - } - } + InventoryHelper.withdrawFromInventory(tile, par5EntityPlayer); } else if(tile.isEmpty() && tile.hasWater && stack == null) tile.trySetLastRecipe(par5EntityPlayer); else { @@ -276,36 +265,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 7c5deb517..919ccd960 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -33,6 +33,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -44,8 +45,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(.21875, 0, .3125, 1-.21875, 17/16.0, 1-.3125); - private final Random random = new Random(); - protected BlockAvatar() { super(Material.WOOD, LibBlockNames.AVATAR); setHardness(2.0F); @@ -105,36 +104,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 6853e1b2f..5962acca0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -39,6 +39,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -50,8 +51,6 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1.15, 0.75); - private final Random random = new Random(); - protected BlockHourglass() { super(Material.IRON, LibBlockNames.HOURGLASS); setHardness(2.0F); @@ -137,36 +136,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b974423d8..0b7985176 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -40,6 +40,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -50,8 +51,6 @@ import java.util.Random; public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { - final Random random; - public BlockOpenCrate() { super(Material.WOOD, LibBlockNames.OPEN_CRATE); setHardness(2.0F); @@ -59,7 +58,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, setDefaultState(blockState.getBaseState() .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); - random = new Random(); } @Nonnull @@ -127,36 +125,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index fc368d232..677b53497 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -31,6 +31,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -42,8 +43,6 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); - private final Random random = new Random(); - public BlockSparkChanger() { super(Material.ROCK, LibBlockNames.SPARK_CHANGER); setHardness(2.0F); @@ -132,36 +131,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 4f3a7c90b..8a0a50919 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -24,14 +24,13 @@ import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import javax.annotation.Nonnull; import java.util.Random; public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement { - private final Random random = new Random(); - public BlockCorporeaBase(Material material, String name) { super(material, name); } @@ -40,36 +39,7 @@ public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchiev public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.notifyNeighborsOfStateChange(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } 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 bd7360d73..ce4545118 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -35,6 +35,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -45,8 +46,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); - private final Random random = new Random(); - public BlockBrewery() { super(Material.ROCK, LibBlockNames.BREWERY); setHardness(2.0F); @@ -84,17 +83,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { if(par5EntityPlayer.isSneaking()) { if(brew.recipe == null && !state.getValue(BotaniaStateProps.POWERED)) - for(int i = brew.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = brew.getItemHandler().getStackInSlot(i); - if(stackAt != null) { - ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropItem(copy, false); - brew.getItemHandler().setStackInSlot(i, null); - par1World.updateComparatorOutputLevel(pos, this); - break; - } - } + InventoryHelper.withdrawFromInventory(brew, par5EntityPlayer); } else { if(stack != null) return brew.addItem(par5EntityPlayer, stack); @@ -106,36 +95,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } 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 97c68637a..113f33a51 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -39,6 +39,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePrism; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -153,42 +154,9 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Override public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileEntity tile = par1World.getTileEntity(pos); - if(!(tile instanceof TileSimpleInventory)) - return; + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - TileSimpleInventory inv = (TileSimpleInventory) tile; - - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } 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 33f1c6415..4131af021 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -31,6 +31,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -41,8 +42,6 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); - private final Random random = new Random(); - public BlockRuneAltar() { super(Material.ROCK, LibBlockNames.RUNE_ALTAR); setHardness(2.0F); @@ -73,17 +72,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) - for(int i = altar.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = altar.getItemHandler().getStackInSlot(i); - if(stackAt != null) { - ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropItem(copy, false); - altar.getItemHandler().setStackInSlot(i, null); - par1World.updateComparatorOutputLevel(pos, this); - break; - } - } + InventoryHelper.withdrawFromInventory(altar, par5EntityPlayer); } else if(altar.isEmpty() && stack == null) altar.trySetLastRecipe(par5EntityPlayer); else if(stack != null) @@ -95,36 +84,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - if (inv != null) { - for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - - if (itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); - } + InventoryHelper.dropInventory(inv, par1World, state, pos); super.breakBlock(par1World, pos, state); } 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 23d87981e..c7917a861 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -19,12 +19,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -43,6 +41,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; +import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; @@ -54,8 +53,6 @@ import java.util.Random; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { - private final Random random = new Random(); - public BlockSpreader() { super(Material.WOOD, LibBlockNames.SPREADER); setHardness(2.0F); @@ -195,37 +192,12 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex TileSpreader inv = (TileSpreader) tile; - 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); - - if(itemstack != null) { - float f = random.nextFloat() * 0.8F + 0.1F; - float f1 = random.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { - int k1 = random.nextInt(21) + 10; - - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; - - itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)random.nextGaussian() * f3; - entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)random.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - - par1World.updateComparatorOutputLevel(pos, state.getBlock()); + if(inv.paddingColor != -1) { + net.minecraft.inventory.InventoryHelper.spawnItemStack(par1World, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Blocks.WOOL, 1, inv.paddingColor)); } + InventoryHelper.dropInventory(inv, par1World, state, pos); + super.breakBlock(par1World, pos, 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 96055aede..862ecf5c3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -226,7 +226,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } } - public void craftingFanciness() { + private void craftingFanciness() { worldObj.playSound(null, pos, BotaniaSoundEvents.altarCraft, SoundCategory.BLOCKS, 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); 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 e10d6db4f..6761eb3aa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -272,7 +272,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { sync(); } - public void craftingFanciness() { + private void craftingFanciness() { worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); for(int i = 0; i < 25; i++) { float red = (float) Math.random(); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index a645b373d..601a5be8a 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.core.helper; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -26,19 +28,22 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.VanillaDoubleChestItemHandler; import vazkii.botania.api.corporea.InvWithLocation; +import vazkii.botania.common.block.tile.TileSimpleInventory; import javax.annotation.Nonnull; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.Random; import java.util.Spliterator; import java.util.Spliterators; import java.util.stream.Stream; import java.util.stream.StreamSupport; -//From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib +// Some methods from OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { protected static boolean areMergeCandidates(ItemStack source, ItemStack target) { @@ -334,4 +339,32 @@ public class InventoryHelper { @Override public void closeInventory(@Nonnull EntityPlayer player) { } } + + public static void dropInventory(TileSimpleInventory inv, World world, IBlockState state, BlockPos pos) { + if(inv != null) { + for(int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); + + if(itemstack != null) { + net.minecraft.inventory.InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), itemstack); + } + } + + world.updateComparatorOutputLevel(pos, state.getBlock()); + } + } + + public static void withdrawFromInventory(TileSimpleInventory inv, EntityPlayer player) { + for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { + ItemStack stackAt = inv.getItemHandler().getStackInSlot(i); + if(stackAt != null) { + ItemStack copy = stackAt.copy(); + ItemHandlerHelper.giveItemToPlayer(player, copy); + inv.getItemHandler().setStackInSlot(i, null); + player.worldObj.updateComparatorOutputLevel(inv.getPos(), null); + break; + } + } + } + } From 05c6a07bc23bcb2dc33e57512c6c395ef07b249a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 19:01:34 -0500 Subject: [PATCH 666/935] Clean up logging and log spam. #cleanloginitiative --- .../core/handler/ClientMethodHandles.java | 4 +- .../handler/ContributorFancinessHandler.java | 4 +- .../core/handler/MiscellaneousIcons.java | 6 +- .../client/core/handler/RenderLexicon.java | 5 +- .../client/core/helper/ShaderHelper.java | 7 +- .../client/core/proxy/ClientProxy.java | 5 +- .../client/model/FloatingFlowerModel.java | 4 +- .../client/model/SpecialFlowerModel.java | 4 +- .../java/vazkii/botania/common/Botania.java | 6 +- .../common/core/handler/MethodHandles.java | 4 +- .../common/core/proxy/CommonProxy.java | 4 +- .../common/crafting/ModCraftingRecipes.java | 4 +- .../corporea/WrappedDeepStorage.java | 5 +- .../assets/botania/models/block/pylon.obj | 74 +++++++++---------- 14 files changed, 66 insertions(+), 70 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index dcf425788..8f4ccd30d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -3,8 +3,8 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; @@ -67,7 +67,7 @@ public final class ClientMethodHandles { // f.setAccessible(true); // equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { - FMLLog.severe("[Botania]: Couldn't initialize client methodhandles! Things will be broken!"); + Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); e.printStackTrace(); throw Throwables.propagate(e); } 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 acba63243..7c548c1db 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -21,13 +21,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.FMLLog; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -208,7 +208,7 @@ public final class ContributorFancinessHandler implements LayerRenderer Date: Sat, 4 Jun 2016 20:00:10 -0500 Subject: [PATCH 667/935] Fix armor material registration, buff terrasteel armor slightly --- .../java/vazkii/botania/api/BotaniaAPI.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index c1482dbe0..8cf4d22a6 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -103,24 +103,20 @@ public final class BotaniaAPI { public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "MANASTEEL", - new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, - "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness + public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, + new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "B_ELEMENTIUM", - new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, - "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 1.0F); // todo 1.9.4 toughness + public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, + new int[] { 2, 6, 5, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "TERRASTEEL", - new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, - "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F); // todo 1.9.4 toughness + public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, + new int[] { 3, 8, 6, 3 }, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3F); public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addEnum(ArmorMaterial.class, "MANAWEAVE", - new Class[] { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class }, - "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 1.0F); // todo 1.9.4 toughness + public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, + new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0); public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); From 39517588e717ff7296782ae3308da1a11fa4cbe0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 20:10:13 -0500 Subject: [PATCH 668/935] Clean up some todos --- .../botania/client/core/handler/ModelHandler.java | 7 +++---- .../vazkii/botania/client/model/PlatformModel.java | 13 ------------- .../common/block/tile/mana/TileRFGenerator.java | 3 +-- .../botania/common/core/handler/ConfigHandler.java | 4 ---- .../common/crafting/ModMigrationRecipes.java | 10 +++++----- .../botania/common/entity/EntityManaBurst.java | 4 +--- 6 files changed, 10 insertions(+), 31 deletions(-) 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 e841f47d6..9ff0e8ee5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -121,7 +121,6 @@ import static vazkii.botania.common.item.ModItems.*; public final class ModelHandler { - // todo reorganize, alphabetize public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); @@ -525,7 +524,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.avatar); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - registerItemModel(ModBlocks.bellows); // todo await animation api + registerItemModel(ModBlocks.bellows); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); registerItemModel(ModBlocks.brewery); @@ -534,13 +533,13 @@ public final class ModelHandler { registerItemModel(ModBlocks.corporeaCrystalCube); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - registerItemModel(ModBlocks.corporeaIndex); // todo json maybe? await animation api + registerItemModel(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); registerItemModel(ModItems.gaiaHead); ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerItemModel(ModBlocks.hourglass); // todo json maybe? + registerItemModel(ModBlocks.hourglass); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); registerItemModel(ModBlocks.teruTeruBozu); diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index d68f3062d..9264ea595 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -121,19 +121,6 @@ public class PlatformModel implements IBakedModel { @Override public TileEntity getTileEntity(@Nonnull BlockPos pos) { - /* todo is this actually needed? if so this can't be an iblockaccess anymore - IBlockState state = getBlockState(pos); - if(state == null || !state.getBlock().hasTileEntity(state)) - return null; - - TileEntity tile = state.getBlock().createTileEntity(this, state); - if(tile == null) - return null; - - tile.setWorldObj(this); - tile.setPos(pos); - - return tile;*/ return compose.getTileEntity(pos); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 74bc605b6..4df7bf647 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -57,8 +57,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Optional.Method(modid = "CoFHAPI|energy") - protected final int transmitEnergy(int energy) { - // TODO: Share energy amoung receivers ? + private final int transmitEnergy(int energy) { for(Map.Entry e : receiverCache.entrySet()) { IEnergyReceiver tile = e.getValue(); if (tile == null) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index b35a0e091..16d5ccb6d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -187,10 +187,6 @@ public final class ConfigHandler { desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); -// todo - this has been split into a separate respack for now -// desc = "Set this to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; -// altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); - desc = "Set this to true if you are the chosen one. For lovers of glitch art and just general mad people."; matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode); diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 0a2d1c031..ec6e4d4a3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -49,7 +49,7 @@ public final class ModMigrationRecipes { if (quark) { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_stairs")), new ItemStack(ModFluffBlocks.endStoneStairs)); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_slab")), new ItemStack(ModFluffBlocks.endStoneSlab)); - // todo End stone chiseled brick? (not in quark) + // End stone chiseled brick - not in quark } // Andesite normal + polished -> vanilla @@ -64,7 +64,7 @@ public final class ModMigrationRecipes { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4])); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4])); - // todo Andesite chiseled brick? (not in quark) + // Andesite chiseled brick - not in quark // Andesite wall GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal())); } @@ -80,7 +80,7 @@ public final class ModMigrationRecipes { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5])); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5])); - // todo Basalt chiseled brick? (not in quark) + // Basalt chiseled brick - not in quark // Basalt wall GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal())); } @@ -97,7 +97,7 @@ public final class ModMigrationRecipes { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6])); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6])); - // todo Diorite chiseled brick? (not in quark) + // Diorite chiseled brick - not in quark // Diorite wall GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal())); } @@ -114,7 +114,7 @@ public final class ModMigrationRecipes { GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7])); GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7])); - // todo Granite chiseled brick? (not in quark) + // Granite chiseled brick - not in quark // Granite wall GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal())); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 1b2b5d347..526cda76c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -155,8 +155,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public void onUpdate() { setTicksExisted(getTicksExisted() + 1); super.onUpdate(); - // superUpdate(); todo 1.9 removed a ton of what appears to just be copied superclass code - // todo 1.9 if shit breaks revert this :P if(!fake && !isDead) ping(); @@ -560,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); else return stack.get(); } From c83578b9203890e627284cf34cbae5abe1b97f3d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 21:35:43 -0500 Subject: [PATCH 669/935] Clean up basic section lexicon and some misc lang entries --- .../resources/assets/botania/lang/en_US.lang | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 97c284eb4..4340afbfa 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -72,13 +72,13 @@ botaniamisc.noLexicon=You need a Lexica Botania in-hand to read this. botaniamisc.cantOpen=It doesn't seem like your Lexica Botania has this page. Perhaps it comes from an outside source...? botaniamisc.clickToShare=Share botaniamisc.drop=Drop -botaniamisc.dropTip0=Tip: You can press %s in your inv to drop +botaniamisc.dropTip0=Tip: You can press %s over an item in your inv to drop botaniamisc.dropTip1=CTRL-%s will drop a full stack botaniamisc.wandMode.bind=Bind Mode botaniamisc.wandMode.function=Function Mode botaniamisc.playVideo=Play Video botaniamisc.brewOf=Brew of %s -botaniamisc.needsCatalysts=No matter how hard you try to push the Ingot into the Beacon, nothing seems to happen, perhaps your configuration of catalyst pylons might be off. +botaniamisc.needsCatalysts=No matter how hard you try to push the Ingot into the Beacon, nothing seems to happen. Perhaps your configuration of catalyst pylons is off. botaniamisc.peacefulNoob=You try to offer the Ingot, but the peaceful vibes of your world prevent you from doing so. Perhaps you should do something about that. botaniamisc.notInfused=Not Infused botaniamisc.getALife=Get a Life @@ -96,7 +96,7 @@ botaniamisc.nearIndex1=Anything you say will be botaniamisc.nearIndex2=intercepted as a request botaniamisc.startTutorial=Start Tutorial botaniamisc.tutorialStarted=You have started your tutorial, follow the red arrows and read the contents to be guided through the basics of Botania! -botaniamisc.tutorialEnded=Your tutorial is over, you should now have a basic idea of how Botania works, make sure to read through the other pages at your leisure to learn more ways of using the mod. +botaniamisc.tutorialEnded=Your tutorial is over, you should now have a basic idea of how Botania works. Make sure to read through the other pages at your leisure to learn more ways of using the mod. botaniamisc.cosmeticBauble=&oCosmetic botaniamisc.hasCosmetic=&oHas Cosmetic Override: &r%s botaniamisc.typeToSearch=(type to search) @@ -112,12 +112,12 @@ botaniamisc.pinkinatorDesc=Apply directly to Wither botaniamisc.relicUnbound=&6Relic&7, Unbound botaniamisc.relicSoulbound=&6Relic&7, Soulbound to &f%s botaniamisc.notYourSagittarius=&4This relic is not yours -botaniamisc.diceRoll=The dice lands on a %s, you notice that it transforms into something else. -botaniamisc.dudDiceRoll=The dice lands on a %s, it seemed to vanish into thin air afterward. +botaniamisc.diceRoll=The dice lands on a %s and you notice that it transforms into something else. +botaniamisc.dudDiceRoll=The dice lands on a %s and seems to vanish into thin air. botaniamisc.blockAway=1 Block Away botaniamisc.blocksAway=%s Blocks Away -botaniamisc.clickToTeleport=Right click to Teleport -botaniamisc.clickToRemoveWarp=Shift-left click to Remove +botaniamisc.clickToTeleport=Right click to teleport +botaniamisc.clickToRemoveWarp=Shift-left click to remove botaniamisc.unboundWarp=Unbound Warp Point botaniamisc.clickToAddWarp=Right click to bind to this position botaniamisc.hasKeepIvy=Has Resolute Ivy @@ -154,7 +154,7 @@ botaniamisc.changes2=Things change, don't panic. If something seems off, read th botaniamisc.changes3=&oEveryone is afraid of change, yet change is the force that moves us forward. botaniamisc.changes4=&fShift-Left Click&7 to read the changes since then botaniamisc.changes5=&fLeft Click&7 to dismiss this -botaniamisc.badArena=As hard as you try, the Beacon will not accept your sacrifice. You believe the ritual grounds might be improper. It might be a good idea to check for obstructions on the nearby area or large gaps on the floor. +botaniamisc.badArena=As hard as you try, the Beacon will not accept your sacrifice. You believe the ritual grounds might be improper. It might be a good idea to check for obstructions in the nearby area or large gaps in the floor. botaniamisc.tutorialText=Ingame botaniamisc.tutorialVideo=Video botaniamisc.shiftToStopSpin=(SHIFT to stop animation) @@ -1233,7 +1233,7 @@ tile.botania:flower.manastar.reference=Wish upon a star tile.botania:flower.daybloom.name=Daybloom tile.botania:flower.daybloom.reference=A Sting of light tile.botania:flower.daybloomDecor.name=Daybloom Motif -tile.botania:flower.daybloomDecor.reference=A Sting of light +tile.botania:flower.daybloomDecor.reference=A Stylish Touch of light tile.botania:flower.daybloomPrime.name=Daybloom Primus tile.botania:flower.daybloomPrime.reference=You should not have this on you tile.botania:flower.endoflame.name=Endoflame @@ -1241,7 +1241,7 @@ tile.botania:flower.endoflame.reference=Squirting Lag tile.botania:flower.hydroangeas.name=Hydroangeas tile.botania:flower.hydroangeas.reference=Just friendly crustaceans tile.botania:flower.hydroangeasDecor.name=Hydroangeas Motif -tile.botania:flower.hydroangeasDecor.reference=Just friendly crustaceans +tile.botania:flower.hydroangeasDecor.reference=Just friendlier crustaceans tile.botania:flower.thermalily.name=Thermalily tile.botania:flower.thermalily.reference=A Scarlet Rose indeed tile.botania:flower.nightshade.name=Nightshade @@ -1327,7 +1327,7 @@ tile.botania:flower.medumone.reference='Twas Hades all along tile.botania:flower.marimorphosis.name=Marimorphosis tile.botania:flower.marimorphosis.reference=U-MA-RU tile.botania:flower.marimorphosisChibi.name=Marimorphosis Petite -tile.botania:flower.marimorphosisChibi.reference=U-MA-RU +tile.botania:flower.marimorphosisChibi.reference=U-MA-RU-CHAN tile.botania:flower.bubbell.name=Bubbell tile.botania:flower.bubbell.reference=And whistle tile.botania:flower.bubbellChibi.name=Bubbell Petite @@ -1987,9 +1987,9 @@ botania.entry.welcome=Welcome To Botania botania.tagline.welcome=Welcome to the Hotel Botania botania.page.welcome0=&oWelcome to Botania! I congratulate you on the fine choice of strapping a sapling and a book together, or just finding this tome in a chest. Whichever applies.
    &oYou can navigate this book using the arrows at the bottom of this page, your mouse wheel or the arrow keys in your keyboard. botania.page.welcome1=&oDespite its looks, Botania is in essence a "tech mod", by definition of requiring you to put to use ingenuity, thought and redstone to create and progress. It's good to keep that in mind.
    &oOf course you'll also be rewarded with cool toys, blocks and equipment, if you're worried. -botania.page.welcome2=&oFor all intents and purposes, Botania is a mod that anybody who likes to play the game with the primary purpose of building cool things will likely enjoy. It is designed to be fully playable standalone, but is also playable with other mods.
    &oExcluding a small few examples, everything in the mod is fully automatable using minecraft and its own features exclusively. +botania.page.welcome2=&oFor all intents and purposes, Botania is a mod for anybody who likes to play the game with the primary purpose of building cool things. It is designed to be fully playable standalone, but is also playable with other mods.
    &oExcluding a couple cases, everything in the mod is fully automatable using only Minecraft and itself. botania.page.welcome3=&oIf you happen to find yourself lost, try checking out the mod's Achievements or Challenges, both of which can be found on the left hand side of this book's main page.
    &oThe book is laid out in a friendly way with a good amount of handy features, so before you start jumping in and playing, take a bit of time to familiarize yourself with what the various tidbits around the place do. -botania.page.welcome4=&oAfter this you'll be taken to a page where you can optionally start a tutorial that will teach you the basics of the mod in around ten minutes, give or take.
    &oHowever, it teaches you only the very basics. So, after you got a good foothold on those concepts, further research is a good idea. +botania.page.welcome4=&oAfter this you'll be taken to a page where you can optionally start a tutorial that will teach you the basics of the mod in around ten minutes, give or take.
    &oHowever, it teaches you only the very basics. So, after you have a good foothold on those concepts, further research is a good idea. botania.page.welcome5=&oIf you're unsure as to what you want to learn about, hold SHIFT while browsing through the various categories to get a quick idea of what each thing is.
    &oThe "Lexicon Index" category can be very helpful for searching, as it contains every entry in the book in one place. botania.page.welcome6=&oAnd that's it for this introduction! You can move on to the tutorial now. I hope you enjoy playing with Botania as much as I enjoyed making it!
    &o~Vazkii, the mod author

    &oCarry on by pressing the "Back" button on the bottom. Your right mouse button or backspace key will have the same effect. @@ -2007,18 +2007,18 @@ botania.page.gardenOfGlass2=After spawning in the &1Garden of Glass&0 you'll fin botania.page.gardenOfGlass3=Creating &1Saplings&0 botania.page.gardenOfGlass4=Creating &1Floral Fertilizer&0 botania.page.gardenOfGlass5=Creating &1Cobblestone&0 -botania.page.gardenOfGlass6=Aside from that, some things in Botania are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster and much cheaper; The &1Cocoon of Caprice&0 and the &1Mana Spreader&0 have different recipes; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted. +botania.page.gardenOfGlass6=Aside from that, some things in Botania are different to fit the Skyblock play: The &1Orechid&0 is easier to make, faster, and much cheaper; The &1Cocoon of Caprice&0 and the &1Mana Spreader&0 have different recipes; the &1Blaze Lamp&0, which can be used to create &1Obsidian&0, uses powder instead of rods; melon or pumpkin seeds may drop from tall grass; floral fertilizer creates more per craft, and &1Sugar Canes&0 and &1Slimeballs&0 can be crafted. botania.page.gardenOfGlass7=Creating &1Sugar Canes&0 botania.page.gardenOfGlass8=Creating &1Slimeballs&0 botania.page.gardenOfGlass9=A problem that one might face in this world is entering the &4Nether&0. Worry not, however, as &1Blaze Lamps&0, as mentioned previously, can create &1Obsidian&0. To get these lamps, creating &1Blazes&0 using &1Fel Pumpkins&0 might be a good investment.
    Since there's no easily available &1Flint&0, opening the portal with a &1Fire Charge&0 will have to do. botania.page.gardenOfGlass11=Aside from providing light, the &1Mana Flash&0 present in the starting area allows a player who has lost their &1Lexica Botania&0 to exchange a &1Sapling&0 for it, by right clicking with the &1Sapling&0 on the &1Mana Flame&0.
    This can only be done if the player doesn't have a &1Lexica Botania&0 on them. -botania.page.gardenOfGlass12=Lastly, an &1End Portal&0 recipe +botania.page.gardenOfGlass12=Lastly, a way to finish the game # -- LEXICA BOTANIA botania.entry.lexicon=Lexica Botania botania.tagline.lexicon=What you're reading right now, dummy -botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botany related matters. But you probably knew that already.
    All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry. -botania.page.lexicon3=Any entries typed in &oItalics&r are &4basic&0 entries, which contain the very basic knowledge required to play Botania. They should be prioritized over others, most of the sections contain one or more, so a good look through through them is a good idea. +botania.page.lexicon0=The &1Lexica Botania&0 is the repository of all knowledge for all botanical matters. But you probably knew that already.
    All information is stored here, as expected. For convenience, if a block happens to have an entry, it can be shift-right clicked with the &1Lexica Botania&0 to open that entry. +botania.page.lexicon3=Any entries typed in &oItalics&r are &4basic&0 entries, which contain the very basic knowledge required to play Botania and should be prioritized over others. Most of the sections contain one or more of such entries, so a good look through them is a good idea. botania.page.lexicon1=Crafting the &1Lexica Botania&0. botania.page.lexicon2=The &1Lexica Botania&0's title can also be customized. By placing it in an &1Anvil&0 and renaming it, one can not only change its cover, but also the title.
    The Edition of the lexica shown equates to the version of the &4Botania&0 you're running, and no, I don't care about the fourth wall. @@ -2027,12 +2027,12 @@ botania.entry.flowers=Mystical Flowers botania.tagline.flowers=The roots of your studies botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
    They come in a total of &416 &0different colors.
    It's also possible to grow these flowers using &1Floral Fertilizer&0 (read on). botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
    Right clicking a petal on the ground will &4bury it&0, having it emit particles.
    These petals can also be crushed into &1Floral Powder&0, which functions much alike any mundane piece of dye. -botania.page.flowers3=Plucking Petals off Flowers. +botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, which can be used for making magical instruments and plants alike.
    Right clicking a petal on the ground will &4bury it&0, having it emit particles.
    These petals can also be crushed into &1Floral Powder&0, which functions much alike any mundane piece of dye. +botania.page.flowers3=Plucking petals off flowers. botania.page.flowers4=Crafting the &1Pestle and Mortar&0. botania.page.flowers5=Grinding Petals into Powder. botania.page.flowers5.5=Grinding mundane flowers into Powder. -botania.page.flowers6=Right clicking the &1Floral Powder&0 in any &1Wool&0 or &1Carpet&0 changes its color to the color of the powder.
    By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertilizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vicinity, if you ever run low on them. +botania.page.flowers6=Right clicking the &1Floral Powder&0 on any &1Wool&0 or &1Carpet&0 changes its color to the color of the powder.
    By mixing the &1Floral Powder&0 with some &1Bone Meal&0, it's possible to create a different type of fertilizer. The &1Floral Fertilizer&0 will grow a small amount of &1Mystical Flowers&0 in the nearby vicinity, if you ever run low on them. botania.page.flowers7=Making fertilizer (any powder colors work) botania.page.flowers8=Using typical flower substances also works botania.page.flowers10=There's also some taller variants of the typical &1Mystical Flowers&0, spread around the place. These can only be gathered with &1Shears&0, but can be used to obtain twice the amount of petals a normal flower would yield. They're a bit too big for dye, though. @@ -2044,13 +2044,13 @@ botania.page.flowers13=And the other way around # -- PETAL APOTHECARY botania.entry.apothecary=Petal Apothecary botania.tagline.apothecary=What you use to make flowers -botania.page.apothecary0=In order for a botanist to create plantlife that can do its bidding, one would need special means of infusing plants with mystical energy.
    Luckily, the &1Petal Apothecary&0 does just that. +botania.page.apothecary0=In order for a botanist to create plantlife that can do their bidding, they would need a special means of infusing plants with mystical energy.
    Luckily, the &1Petal Apothecary&0 does just that. botania.page.apothecary1=The &1Petal Apothecary&0. -botania.page.apothecary2=This block, when placed in the world and given some water (by use of a &1Water Bucket&0), will accept any &1Mystical Petals&0 thrown at it, releasing their energies.
    Once one has set the correct petals in, throwing some &1Seeds&0 in will finalize the proccess.
    Tossing in the full bucket will also fill the recipient with water. -botania.page.apothecary3=Quite a few plants can be made using this method, for more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon.
    Shift-right clicking the &1Petal Apothecary&0 with an empty hand will remove the last item thrown in. +botania.page.apothecary2=This block, when placed in the world and given some water (by use of a &1Water Bucket&0), will accept any &1Mystical Petals&0 thrown at it, releasing their energies.
    Once one has inserted the correct petals, throwing some &1Seeds&0 in will finalize the proccess.
    Tossing in a full bucket will also fill the apothecary with water. +botania.page.apothecary3=Quite a few plants can be made using this method. For more information, read on the &4Functional Flora&0 and &4Generation Flora&0 sections of this Lexicon.
    Shift-right clicking the &1Petal Apothecary&0 with an empty hand will remove the last item thrown in. botania.page.apothecary4=Instead of &1Water&0, one can place &1Lava&0 in this block, if that is done, it'll serve as a brazier and incinerator, destroying any items that come in contact.
    Furthermore, tossing in &1Vines&0 also gives the block an overgrown visual. botania.page.apothecary7=&1Comparators&0 can detect whether the block has water or not.
    Since the &1Petal Apothecary&0 can be filled by usage of a dropped &1Water Bucket&0, and &1Dispensers&0 can fill buckets, creating a system that can automatically refill the water in the dish shouldn't prove too difficult. -botania.page.apothecary6=A simple tip for those who want to squeeze the biggest efficiency out of every block is as follows, up to twenty seconds after crafting a flower in this block, right clicking it with an empty hand will pull the items from the inventory required for the recipe and put them into it for quick mass crafting. This only works if it has water. +botania.page.apothecary6=A simple tip for those who want to squeeze the biggest efficiency out of every block is as follows: Up to twenty seconds after crafting a flower, right clicking the apothecary with an empty hand will pull another set of the same ingredients out of your inventory and put them into the apothecary for quick mass crafting. This only works if the apothecary's water is refilled. botania.page.apothecary5=Crafting the &1Petal Apothecary&0. # -- PURE DAISY @@ -2059,13 +2059,13 @@ botania.tagline.pureDaisy=Creator of Livingwood and Livingrock, among others botania.page.pureDaisy0=The &1Pure Daisy&0 is not only the most basic, but also the most important flower a botanist can have.
    This flower will purify any adjacent &1Wood&0 and &1Stone&0 blocks, as seen on the next page, into their purified counterparts, &1Livingwood&0 and &1Livingrock&0, which can be used for crafting. botania.page.pureDaisy1=Just give it &4a minute&0 or so... botania.page.pureDaisy2=&1Livingwood&0 can be turned into twigs -botania.page.pureDaisy4=A few other blocks can also be purified by placing them around the flower. While not as unique and essential as the living blocks, perhaps this might come in handy. This includes &1Netherrack&0 into &1Cobblestone&0, &1Soul Sand&0 into &1Sand&0, &1Ice&0 into &1Packed Ice&0 or &1Water&0 to &1Snow&0. +botania.page.pureDaisy4=A few other blocks can also be purified by placing them around the flower. While not as unique and essential as the living blocks, perhaps this might come in handy. This includes &1Netherrack&0 into &1Cobblestone&0, &1Soul Sand&0 into &1Sand&0, &1Ice&0 into &1Packed Ice&0, and &1Water&0 into &1Snow&0. botania.page.pureDaisy3=White is bright and pure # -- WAND OF THE FOREST botania.entry.wand=Wand of the Forest botania.tagline.wand=Your essential multitool -botania.page.wand0=The general multi-use tool for a botanist is the &1Wand of the Forest&0.
    This wand, made by, effectively, strapping a pair of &1Mystical Petals&0 of any color to a few &1Livingwood Twigs&0, is required for a good amount of tasks. +botania.page.wand0=The general multi-use tool for a botanist is the &1Wand of the Forest&0.
    This wand, made by effectively strapping a pair of &1Mystical Petals&0 of any color to a few &1Livingwood Twigs&0, is required for a good amount of tasks. botania.page.wand1=The wand has two modes, &4Bind Mode&0 and &4Function Mode&0. In &4Bind Mode&0 it can be shift-right clicked on a compatible block to select it. Shift-right clicking elsewhere binds the two blocks. In &4Function Mode&0 it'll simply not do that for shift-right clicking.
    The two modes can be switched freely by shift-right clicking on air. botania.page.wand2=If the wand isn't bound to anything, shift-right clicking a block allows it to be rotated around the axis of the side it's clicked on.
    For example, clicking on the top of a &1Chest&0 rotates it around. Most blocks which can be rotated should work. botania.page.wand3=The petals used determine the colors of the wand @@ -2074,8 +2074,8 @@ botania.page.wand3=The petals used determine the colors of the wand botania.entry.runeAltar=Runic Altar botania.tagline.runeAltar=Create runes for stronger flowers and items botania.page.runeAltar21=Runic creation is a rather important complex in the advancement of the botanical magics. First and foremost, though, this type of crafting requires a decent knowledge of &4Mana Manipulation&0. Before proceeding further, a read through the important entries (those in &oItalics&r) on that section of the &1Lexica Botania&0 might prove enlightening. -botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one would require a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by pointing a &1Mana Spreader&0 to the altar so that &4Mana&0 transfer can occur.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it, or right click with it, and use the wand on it again to collect your rune. +botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
    In order to create these, one requires a &1Runic Altar&0.
    To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components of the rune you want to create. +botania.page.runeAltar1=Proceed by pointing a &1Mana Spreader&0 to the altar so that &4Mana&0 transfer can occur.
    It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop or right click a piece of &1Livingrock&0 on top of it, then use the wand on it again to collect your rune. botania.page.runeAltar2=Crafting the &1Runic Altar&0. botania.page.runeAltar3=A total of 16 &1Runes&0 exist.
    The most basic and elementary runes are named after the &4Four Elements&0. The intermediate runes are named after the &4Four Seasons&0, and the most advanced runes are named after the &4Seven Deadly Sins&0. A separate &1Rune of Mana&0 also exists. botania.page.runeAltar20=Sneaking and right-clicking the &1Runic Altar&0 with an empty hand while it's not accepting mana will remove the last item put into it.
    Last but not least, attaching a &1Comparator&0 to it will emit signal strength &41&0 if the altar is accepting &4Mana&0 and signal strength &42&0 if it's ready to craft the rune. @@ -2100,22 +2100,22 @@ botania.page.runeAltar19=The &1Rune of Pride&0. # -- TERRASTEEL botania.entry.terrasteel=Terrasteel botania.tagline.terrasteel=Powerful metal derived from Mana and nature -botania.page.terrasteel0=&1Terrasteel&0 is a complex magical alloy, infused with a great amount of &4Mana&0. Conjuring it proves not to be a small task. For starters, to create it, one would require a &1Terrestrial Agglomeration Plate&0, set on top of a checkerboard pattern of &1Lapis Lazuli Blocks&0 and &1Livingrock&0. &4Mana&0 would need to be provided to this block, &1Sparks&0 would be the most effective way. +botania.page.terrasteel0=&1Terrasteel&0 is a complex magical alloy, infused with a great amount of &4Mana&0. Conjuring it proves to be no small task. For starters, to create it, one requires a &1Terrestrial Agglomeration Plate&0, set on top of a checkerboard pattern of &1Lapis Lazuli Blocks&0 and &1Livingrock&0. &4Mana&0 needs to be provided to this block, with &1Sparks&0 being the most effective method. botania.page.terrasteel1=Creating the plate -botania.page.terrasteel2=After the plate is set up and ready to receive &4Mana&0, tossing a single &1Manasteel Ingot, Mana Diamond and Mana Pearl&0 on top of it will begin the infusion.
    Picking up any of the items will halt the infusion causing severe &4Mana Loss&0. The infusion uses half a &1Mana Pool&0 total to create a single piece of &4Terrasteel&0, multiple &1Sparks&0 would make it go faster, too. +botania.page.terrasteel2=After the plate is set up and ready to receive &4Mana&0, tossing a single &1Manasteel Ingot, Mana Diamond and Mana Pearl&0 on top of it will begin the infusion.
    Picking up any of the items will halt the infusion causing severe &4Mana Loss&0. The infusion uses mana equivalent to about half a &1Mana Pool&0 to create a single piece of &4Terrasteel&0; multiple &1Sparks&0 will accelerate the process as well. botania.page.terrasteel3=Creating &1Terrasteel&0 (there's &1Livingrock&0 under the plate) botania.page.terrasteel4=T.A. Plate # -- BLACK LOTUS botania.entry.blackLotus=Black Lotus botania.tagline.blackLotus=Rare loot that can make mana -botania.page.blackLotus0=An elusive flower by the name of &1Black Lotus&0 is known to exist, however, it does not grow or reproduce. Where they can be found or come from is not known.
    It is known, however, that it contains a strong amount of concentrated &4Mana&0, that can be released by putting it in contact with a &1Mana Pool&0 that already has some in it. Just tossing it would do. +botania.page.blackLotus0=An elusive flower by the name of &1Black Lotus&0 is known to exist, however, it does not grow or reproduce. Where they can be found or come from is not known.
    It is known, however, that it contains a strong amount of concentrated &4Mana&0 that can be released by putting it inside a &1Mana Pool&0 that already has mana in it. Just tossing it will do. # -- FLOWER POUCH botania.entry.flowerBag=Flower Pouch botania.tagline.flowerBag=A trusty pouch to hold your floral goodness -botania.page.flowerBag0=The laws of physics regarding one's &4Inventory&0 are somewhat skewed in this world. Thanks to that, carrying an array of different colors of flowers turns out to be a major hassle. Luckily, a &1Flower Pouch&0 takes care of all those issues. It can store up to one stack of each color of &1Mystical Flower&0, not only that but it'll passively catch any that enter the holder's inventory. -botania.page.flowerBag2=Items won't be added automatically to the pouch if that's the item being held.
    Furthermore, shift-right clicking the pouch into a &1Chest&0 or other inventory will store the flowers it contains into said inventory. +botania.page.flowerBag0=The laws of physics regarding one's &4Inventory&0 are somewhat skewed in this world. Thanks to that, carrying an array of different colors of flowers turns out to be a major hassle. Luckily, a &1Flower Pouch&0 takes care of all those issues. It can store up to one stack of each color of &1Mystical Flower&0. Not only that but it'll also passively catch any that enter the holder's inventory. +botania.page.flowerBag2=Items won't be added automatically to the pouch if the pouch is held in your dominant hand.
    Furthermore, shift-right clicking the pouch on a &1Chest&0 or other inventory will store all flowers the pouch contains into said inventory. botania.page.flowerBag1=Pull a copter out of it (any colors work) # -- WRAP From 55df4f061997f6d86de27a0dea7e8b71368edb59 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 22:59:53 -0500 Subject: [PATCH 670/935] Move flower pouch to caps --- .../client/gui/bag/ContainerFlowerBag.java | 33 ++-- .../botania/client/gui/bag/GuiFlowerBag.java | 5 +- .../client/gui/bag/InventoryFlowerBag.java | 177 ++---------------- .../botania/client/gui/bag/SlotFlower.java | 11 +- .../botania/common/item/ItemBaubleBox.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 2 +- .../botania/common/item/ItemFlowerBag.java | 172 +++++++++-------- .../botania/common/network/GuiHandler.java | 14 +- 8 files changed, 145 insertions(+), 271 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 31e7ef8a4..24e4d741e 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -11,6 +11,8 @@ package vazkii.botania.client.gui.bag; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; @@ -21,15 +23,13 @@ import javax.annotation.Nonnull; public class ContainerFlowerBag extends Container { - final InventoryFlowerBag flowerBagInv; + private final InventoryFlowerBag flowerBagInv; - public ContainerFlowerBag(EntityPlayer player) { + public ContainerFlowerBag(InventoryPlayer playerInv, InventoryFlowerBag flowerBagInv) { int i; int j; - int slot = player.inventory.currentItem; - IInventory playerInv = player.inventory; - flowerBagInv = new InventoryFlowerBag(player, slot); + this.flowerBagInv = flowerBagInv; for(i = 0; i < 2; ++i) for(j = 0; j < 8; ++j) { @@ -42,26 +42,25 @@ public class ContainerFlowerBag extends Container { addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); for(i = 0; i < 9; ++i) { - if(player.inventory.currentItem == i) - addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); - else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + /*if(player.inventory.currentItem == i) + addSlotToContainer(new SlotLocked(player.inventory, i, 8 + i * 18, 142)); + else*/ addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); } } @Override - public boolean canInteractWith(@Nonnull EntityPlayer player) { - boolean can = flowerBagInv.isUseableByPlayer(player); - if(!can) - onContainerClosed(player); - - return can; + public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { + if (slotId >= 0 && slotId < inventorySlots.size() + && getSlot(slotId).getStack() == flowerBagInv.bag) + return null; + else return super.slotClick(slotId, dragType, clickTypeIn, player); } @Override - public void onContainerClosed(EntityPlayer player) { - super.onContainerClosed(player); - flowerBagInv.pushInventory(); + public boolean canInteractWith(@Nonnull EntityPlayer player) { + return player.getHeldItemMainhand() == flowerBagInv.bag + || player.getHeldItemOffhand() == flowerBagInv.bag; } @Override diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index d417bef56..d56e63fb6 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -27,8 +28,8 @@ public class GuiFlowerBag extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG); - public GuiFlowerBag(EntityPlayer player) { - super(new ContainerFlowerBag(player)); + public GuiFlowerBag(InventoryPlayer playerInv, InventoryFlowerBag flowerBagInv) { + super(new ContainerFlowerBag(playerInv, flowerBagInv)); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index f9cab4634..7451d27d0 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -10,183 +10,42 @@ */ package vazkii.botania.client.gui.bag; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import vazkii.botania.common.item.ItemFlowerBag; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; -import javax.annotation.Nonnull; -import java.util.Arrays; +public class InventoryFlowerBag implements IItemHandlerModifiable { -public class InventoryFlowerBag implements IInventory { + private final IItemHandlerModifiable bagInv; + final ItemStack bag; - private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - - final EntityPlayer player; - final int slot; - ItemStack[] stacks = null; - - boolean invPushed = false; - ItemStack storedInv = null; - - public InventoryFlowerBag(EntityPlayer player, int slot) { - this.player = player; - this.slot = slot; - } - - public static boolean isFlowerBag(ItemStack stack) { - return stack != null && stack.getItem() == ModItems.flowerBag; - } - - ItemStack getStack() { - ItemStack stack = player.inventory.getStackInSlot(slot); - if(stack != null) - storedInv = stack; - return stack; - } - - ItemStack[] getInventory() { - if(stacks != null) - return stacks; - - ItemStack stack = getStack(); - if(isFlowerBag(getStack())) { - stacks = ItemFlowerBag.loadStacks(stack); - return stacks; - } - - return FALLBACK_INVENTORY; - } - - public void pushInventory() { - if(invPushed) - return; - - ItemStack stack = getStack(); - if(stack == null) - stack = storedInv; - - if(stack != null) { - ItemStack[] inv = getInventory(); - ItemFlowerBag.setStacks(stack, inv); - } - - invPushed = true; + public InventoryFlowerBag(ItemStack bag) { + this.bag = bag; + this.bagInv = (IItemHandlerModifiable) bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); } @Override - public int getSizeInventory() { - return 16; + public void setStackInSlot(int slot, ItemStack stack) { + bagInv.setStackInSlot(slot, stack); } @Override - public ItemStack getStackInSlot(int i) { - return getInventory()[i]; + public int getSlots() { + return bagInv.getSlots(); } @Override - public ItemStack decrStackSize(int i, int j) { - ItemStack[] inventorySlots = getInventory(); - if (inventorySlots[i] != null) { - ItemStack stackAt; - - if (inventorySlots[i].stackSize <= j) { - stackAt = inventorySlots[i]; - inventorySlots[i] = null; - return stackAt; - } else { - stackAt = inventorySlots[i].splitStack(j); - - if (inventorySlots[i].stackSize == 0) - inventorySlots[i] = null; - - return stackAt; - } - } - - return null; + public ItemStack getStackInSlot(int slot) { + return bagInv.getStackInSlot(slot); } @Override - public ItemStack removeStackFromSlot(int i) { - return getStackInSlot(i); + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + return bagInv.insertItem(slot, stack, simulate); } @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - ItemStack[] inventorySlots = getInventory(); - inventorySlots[i] = itemstack; + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return bagInv.extractItem(slot, amount, simulate); } - - @Override - public int getInventoryStackLimit() { - return isFlowerBag(getStack()) ? 64 : 0; - } - - @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { - return isFlowerBag(getStack()); - } - - @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { - return isFlowerBag(getStack()); - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) {} - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - if (stacks != null) { - Arrays.fill(stacks, null); - } - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Nonnull - @Override - public ITextComponent getDisplayName() { - return new TextComponentString(getName()); - } - - @Override - public void openInventory(@Nonnull EntityPlayer player) { - // NO-OP - } - - @Override - public void closeInventory(@Nonnull EntityPlayer player) { - // NO-OP - } - - @Nonnull - @Override - public String getName() { - return LibItemNames.FLOWER_BAG; - } - - @Override - public void markDirty() { - // NO-OP - } - } diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java index bb40c5c6c..96cf3cdad 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java +++ b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.gui.bag; -import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.common.block.ModBlocks; -public class SlotFlower extends Slot { +public class SlotFlower extends SlotItemHandler { - final InventoryFlowerBag inv; + private final InventoryFlowerBag inv; final int color; public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) { @@ -26,11 +26,6 @@ public class SlotFlower extends Slot { inv = p_i1824_1_; } - @Override - public void onSlotChange(ItemStack oldStack, ItemStack newStack) { - inv.setInventorySlotContents(color, newStack); - } - @Override public boolean isItemValid(ItemStack stack) { return stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.getItemDamage() == color; diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index b9eacf578..29e60febe 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -38,7 +38,7 @@ public class ItemBaubleBox extends ItemMod { @Nonnull @Override public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); + player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 7cd743826..33564c6eb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -96,7 +96,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack itemForPos = getItemForSlot(stack, segment); if(segment == 0) - player.openGui(Botania.instance, LibGuiIDs.CRAFTING_HALO, world, 0, 0, 0); + player.openGui(Botania.instance, LibGuiIDs.CRAFTING_HALO, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); else { if(itemForPos == null) assignRecipe(stack, itemForPos, segment); diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 7913c520f..56abdf86e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -10,12 +10,14 @@ */ package vazkii.botania.common.item; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.play.server.SPacketCollectItem; @@ -29,11 +31,17 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.common.capabilities.ICapabilitySerializable; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -42,6 +50,7 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class ItemFlowerBag extends ItemMod { @@ -54,11 +63,66 @@ public class ItemFlowerBag extends ItemMod { MinecraftForge.EVENT_BUS.register(this); } + @Nonnull + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound oldCapNbt) { + return new InvProvider(); + } + + private static class InvProvider implements ICapabilitySerializable { + + private final IItemHandler inv = new ItemStackHandler(16) { + @Override + public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { + if(toInsert != null && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower)) + return super.insertItem(slot, toInsert, simulate); + else return toInsert; + } + }; + + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; + } + + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(inv); + else return null; + } + + @Override + public NBTBase serializeNBT() { + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.writeNBT(inv, null); + } + + @Override + public void deserializeNBT(NBTBase nbt) { + CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.readNBT(inv, null, nbt); + } + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + if(stack.getTagCompound() != null && stack.getTagCompound().hasKey(TAG_ITEMS)) { + NBTTagList oldData = stack.getTagCompound().getTagList(TAG_ITEMS, Constants.NBT.TAG_COMPOUND); + IItemHandler newInv = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + + CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.readNBT(newInv, null, oldData); + + stack.getTagCompound().removeTag(TAG_ITEMS); + + if(stack.getTagCompound().getSize() == 0) + stack.setTagCompound(null); + } + } + @SubscribeEvent public void onPickupItem(EntityItemPickupEvent event) { - ItemStack stack = event.getItem().getEntityItem(); - if(stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.stackSize > 0) { - int color = stack.getItemDamage(); + ItemStack entityStack = event.getItem().getEntityItem(); + if(entityStack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && entityStack.stackSize > 0) { + int color = entityStack.getItemDamage(); if(color > 15) return; @@ -66,40 +130,31 @@ public class ItemFlowerBag extends ItemMod { if(i == event.getEntityPlayer().inventory.currentItem) continue; // prevent item deletion - ItemStack invStack = event.getEntityPlayer().inventory.getStackInSlot(i); - if(invStack != null && invStack.getItem() == this) { - ItemStack[] bagInv = loadStacks(invStack); - ItemStack stackAt = bagInv[color]; - boolean didChange = false; - if(stackAt == null) { - bagInv[color] = stack.copy(); - stack.stackSize = 0; - didChange = true; - } else { - int stackAtSize = stackAt.stackSize; - int stackSize = stack.stackSize; - int spare = 64 - stackAtSize; - int pass = Math.min(spare, stackSize); - if(pass > 0) { - stackAt.stackSize += pass; - stack.stackSize -= pass; - didChange = true; - } + ItemStack bag = event.getEntityPlayer().inventory.getStackInSlot(i); + if(bag != null && bag.getItem() == this) { + event.setCanceled(true); + + IItemHandler bagInv = bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + + ItemStack result = bagInv.insertItem(color, entityStack, false); + + if(result == null) + event.getItem().setDead(); + else { + event.getItem().setEntityItemStack(result); + event.getItem().setDefaultPickupDelay(); } - if(didChange) { - setStacks(invStack, bagInv); + if(result != entityStack) { if (!event.getItem().isSilent()) { event.getItem().worldObj.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((event.getItem().worldObj.rand.nextFloat() - event.getItem().worldObj.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } ((EntityPlayerMP) event.getEntityPlayer()).connection.sendPacket(new SPacketCollectItem(event.getItem().getEntityId(), event.getEntityPlayer().getEntityId())); + event.getEntityPlayer().openContainer.detectAndSendChanges(); } } - - if(stack.stackSize == 0) - return; } } } @@ -107,7 +162,7 @@ public class ItemFlowerBag extends ItemMod { @Nonnull @Override public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, 0, 0, 0); + player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @@ -117,35 +172,20 @@ public class ItemFlowerBag extends ItemMod { TileEntity tile = world.getTileEntity(pos); if(tile != null) { if(!world.isRemote) { - IItemHandler inv = null; - if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) - inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + IItemHandler tileInv = null; + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) + tileInv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); else if(tile instanceof IInventory) - inv = new InvWrapper(((IInventory) tile)); + tileInv = new InvWrapper(((IInventory) tile)); - if(inv == null) - return EnumActionResult.SUCCESS; + if(tileInv == null) + return EnumActionResult.FAIL; - ItemStack[] stacks = loadStacks(stack); - ItemStack[] newStacks = new ItemStack[stacks.length]; - boolean putAny = false; + IItemHandlerModifiable bagInv = (IItemHandlerModifiable) stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - int i = 0; - for(ItemStack petal : stacks) { - if(petal != null) { - newStacks[i] = ItemHandlerHelper.insertItemStacked(inv, petal, false); - int count = petal.stackSize; - if(newStacks[i] != null) - count = petal.stackSize - newStacks[i].stackSize; - putAny |= count > 0; - } - - i++; - } - - setStacks(stack, newStacks); - if(putAny && tile instanceof TileEntityChest) { - player.displayGUIChest(((TileEntityChest) tile)); + for(int i = 0; i < bagInv.getSlots(); i++) { + ItemStack flower = bagInv.getStackInSlot(i); + bagInv.setStackInSlot(i, ItemHandlerHelper.insertItemStacked(tileInv, flower, false)); } } @@ -154,30 +194,4 @@ public class ItemFlowerBag extends ItemMod { return EnumActionResult.PASS; } - public static ItemStack[] loadStacks(ItemStack stack) { - NBTTagList var2 = ItemNBTHelper.getList(stack, TAG_ITEMS, 10, false); - ItemStack[] inventorySlots = new ItemStack[16]; - for(int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = var2.getCompoundTagAt(var3); - byte var5 = var4.getByte(TAG_SLOT); - if(var5 >= 0 && var5 < inventorySlots.length) - inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); - } - - return inventorySlots; - } - - public static void setStacks(ItemStack stack, ItemStack[] inventorySlots) { - NBTTagList var2 = new NBTTagList(); - for(int var3 = 0; var3 < inventorySlots.length; ++var3) - if(inventorySlots[var3] != null) { - NBTTagCompound var4 = new NBTTagCompound(); - var4.setByte(TAG_SLOT, (byte)var3); - inventorySlots[var3].writeToNBT(var4); - var2.appendTag(var4); - } - - ItemNBTHelper.setList(stack, TAG_ITEMS, var2); - } - } diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index 7f65011e4..25b954c2d 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -11,10 +11,12 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; import vazkii.botania.client.gui.bag.ContainerFlowerBag; import vazkii.botania.client.gui.bag.GuiFlowerBag; +import vazkii.botania.client.gui.bag.InventoryFlowerBag; import vazkii.botania.client.gui.box.ContainerBaubleBox; import vazkii.botania.client.gui.box.GuiBaubleBox; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; @@ -25,12 +27,14 @@ import vazkii.botania.common.lib.LibGuiIDs; public class GuiHandler implements IGuiHandler { @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int handId, int unused1, int unused2) { + EnumHand hand = handId == 1 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND; + switch(ID) { case LibGuiIDs.CRAFTING_HALO : return new ContainerCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : - return new ContainerFlowerBag(player); + return new ContainerFlowerBag(player.inventory, new InventoryFlowerBag(player.getHeldItem(hand))); case LibGuiIDs.BAUBLE_BOX : return new ContainerBaubleBox(player); } @@ -39,14 +43,16 @@ public class GuiHandler implements IGuiHandler { } @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int handId, int unused1, int unused2) { + EnumHand hand = handId == 1 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND; + switch(ID) { case LibGuiIDs.LEXICON : return GuiLexicon.currentOpenLexicon; case LibGuiIDs.CRAFTING_HALO : return new GuiCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : - return new GuiFlowerBag(player); + return new GuiFlowerBag(player.inventory, new InventoryFlowerBag(player.getHeldItem(hand))); case LibGuiIDs.BAUBLE_BOX : return new GuiBaubleBox(player); } From 4b4b9a308c75077dedebc678226dd2a9cdf8917f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Jun 2016 23:14:33 -0500 Subject: [PATCH 671/935] Tweaks to previous commit --- .../client/gui/bag/ContainerFlowerBag.java | 9 ++--- .../botania/client/gui/bag/GuiFlowerBag.java | 7 ++-- .../botania/client/gui/bag/SlotFlower.java | 34 ------------------- .../botania/common/item/ItemFlowerBag.java | 8 ++--- 4 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 24e4d741e..d804a9da9 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.gui.SlotLocked; import javax.annotation.Nonnull; @@ -34,7 +35,7 @@ public class ContainerFlowerBag extends Container { for(i = 0; i < 2; ++i) for(j = 0; j < 8; ++j) { int k = j + i * 8; - addSlotToContainer(new SlotFlower(flowerBagInv, k, 17 + j * 18, 26 + i * 18, k)); + addSlotToContainer(new SlotItemHandler(flowerBagInv, k, 17 + j * 18, 26 + i * 18)); } for(i = 0; i < 3; ++i) @@ -42,9 +43,9 @@ public class ContainerFlowerBag extends Container { addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); for(i = 0; i < 9; ++i) { - /*if(player.inventory.currentItem == i) - addSlotToContainer(new SlotLocked(player.inventory, i, 8 + i * 18, 142)); - else*/ addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + if(playerInv.getStackInSlot(i) == flowerBagInv.bag) + addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); + else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); } } diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index d56e63fb6..512b87d0b 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; @@ -49,10 +50,10 @@ public class GuiFlowerBag extends GuiContainer { List slotList = inventorySlots.inventorySlots; for(Slot slot : slotList) - if(slot instanceof SlotFlower) { - SlotFlower slotf = (SlotFlower) slot; + if(slot instanceof SlotItemHandler) { + SlotItemHandler slotf = (SlotItemHandler) slot; if(!slotf.getHasStack()) { - ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.color); + ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.getSlotIndex()); // index matches colors int x = guiLeft + slotf.xDisplayPosition; int y = guiTop + slotf.yDisplayPosition; RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java b/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java deleted file mode 100644 index 96cf3cdad..000000000 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotFlower.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 16, 2015, 7:20:05 PM (GMT)] - */ -package vazkii.botania.client.gui.bag; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.SlotItemHandler; -import vazkii.botania.common.block.ModBlocks; - -public class SlotFlower extends SlotItemHandler { - - private final InventoryFlowerBag inv; - final int color; - - public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) { - super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); - this.color = color; - inv = p_i1824_1_; - } - - @Override - public boolean isItemValid(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && stack.getItemDamage() == color; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 56abdf86e..953befc31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -74,7 +74,9 @@ public class ItemFlowerBag extends ItemMod { private final IItemHandler inv = new ItemStackHandler(16) { @Override public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { - if(toInsert != null && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower)) + if(toInsert != null + && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower) + && toInsert.getItemDamage() == slot) return super.insertItem(slot, toInsert, simulate); else return toInsert; } @@ -132,8 +134,6 @@ public class ItemFlowerBag extends ItemMod { ItemStack bag = event.getEntityPlayer().inventory.getStackInSlot(i); if(bag != null && bag.getItem() == this) { - event.setCanceled(true); - IItemHandler bagInv = bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); ItemStack result = bagInv.insertItem(color, entityStack, false); @@ -142,10 +142,10 @@ public class ItemFlowerBag extends ItemMod { event.getItem().setDead(); else { event.getItem().setEntityItemStack(result); - event.getItem().setDefaultPickupDelay(); } if(result != entityStack) { + event.setCanceled(true); if (!event.getItem().isSilent()) { event.getItem().worldObj.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, From 02cfe14d94728b5348317b9cfab9de827fcb071f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 14:32:08 -0500 Subject: [PATCH 672/935] Move bauble box to caps as well. Closes #297 --- .../client/gui/bag/ContainerFlowerBag.java | 8 - .../botania/client/gui/bag/GuiFlowerBag.java | 5 - .../client/gui/box/ContainerBaubleBox.java | 23 +-- .../botania/client/gui/box/GuiBaubleBox.java | 9 +- .../client/gui/box/InventoryBaubleBox.java | 175 ++---------------- .../botania/client/gui/box/SlotAnyBauble.java | 37 ---- .../botania/common/item/ItemBaubleBox.java | 99 +++++++--- .../botania/common/item/ItemFlowerBag.java | 1 - .../botania/common/network/GuiHandler.java | 5 +- 9 files changed, 103 insertions(+), 259 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index d804a9da9..882dfffde 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -50,14 +50,6 @@ public class ContainerFlowerBag extends Container { } - @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { - if (slotId >= 0 && slotId < inventorySlots.size() - && getSlot(slotId).getStack() == flowerBagInv.bag) - return null; - else return super.slotClick(slotId, dragType, clickTypeIn, player); - } - @Override public boolean canInteractWith(@Nonnull EntityPlayer player) { return player.getHeldItemMainhand() == flowerBagInv.bag diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 512b87d0b..99cb744d0 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -64,9 +64,4 @@ public class GuiFlowerBag extends GuiContainer { } } - @Override - protected boolean checkHotbarKeys(int p_146983_1_) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index e97204586..6405101dd 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -20,6 +20,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; @@ -27,16 +28,15 @@ import javax.annotation.Nonnull; public class ContainerBaubleBox extends Container { - final InventoryBaubleBox baubleBoxInv; - final InventoryBaubles baubles; + private final InventoryBaubleBox baubleBoxInv; + private final InventoryBaubles baubles; - public ContainerBaubleBox(EntityPlayer player) { + public ContainerBaubleBox(EntityPlayer player, InventoryBaubleBox boxInv) { int i; int j; - int slot = player.inventory.currentItem; IInventory playerInv = player.inventory; - baubleBoxInv = new InventoryBaubleBox(player, slot); + baubleBoxInv = boxInv; baubles = new InventoryBaubles(player); baubles.setEventHandler(this); @@ -51,7 +51,7 @@ public class ContainerBaubleBox extends Container { for(i = 0; i < 4; ++i) for(j = 0; j < 6; ++j) { int k = j + i * 6; - addSlotToContainer(new SlotAnyBauble(baubleBoxInv, k, 62 + j * 18, 8 + i * 18)); + addSlotToContainer(new SlotItemHandler(baubleBoxInv, k, 62 + j * 18, 8 + i * 18)); } for(i = 0; i < 3; ++i) @@ -59,7 +59,7 @@ public class ContainerBaubleBox extends Container { addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); for(i = 0; i < 9; ++i) { - if(player.inventory.currentItem == i) + if(playerInv.getStackInSlot(i) == baubleBoxInv.box) addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); } @@ -68,17 +68,13 @@ public class ContainerBaubleBox extends Container { @Override public boolean canInteractWith(@Nonnull EntityPlayer player) { - boolean can = baubleBoxInv.isUseableByPlayer(player); - if(!can) - onContainerClosed(player); - - return can; + return player.getHeldItemMainhand() == baubleBoxInv.box + || player.getHeldItemOffhand() == baubleBoxInv.box; } @Override public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); - baubleBoxInv.pushInventory(); if(!player.worldObj.isRemote) PlayerHandler.setPlayerBaubles(player, baubles); @@ -99,7 +95,6 @@ public class ContainerBaubleBox extends Container { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - System.out.println(p_82846_2_ + " " + itemstack); if(p_82846_2_ < 28) { if(!mergeItemStack(itemstack1, 28, 64, true)) return null; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index a52620a79..9004a85ca 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -22,13 +22,8 @@ public class GuiBaubleBox extends InventoryEffectRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); - public GuiBaubleBox(EntityPlayer player) { - super(new ContainerBaubleBox(player)); - } - - @Override - protected boolean checkHotbarKeys(int p_146983_1_) { - return false; + public GuiBaubleBox(EntityPlayer player, InventoryBaubleBox box) { + super(new ContainerBaubleBox(player, box)); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 85539162f..3d2cca86e 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -10,182 +10,43 @@ */ package vazkii.botania.client.gui.box; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import vazkii.botania.common.item.ItemBaubleBox; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; -import javax.annotation.Nonnull; -import java.util.Arrays; +public class InventoryBaubleBox implements IItemHandlerModifiable { -public class InventoryBaubleBox implements IInventory { + private final IItemHandlerModifiable boxInv; + final ItemStack box; - private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; - - final EntityPlayer player; - final int slot; - ItemStack[] stacks = null; - - boolean invPushed = false; - ItemStack storedInv = null; - - public InventoryBaubleBox(EntityPlayer player, int slot) { - this.player = player; - this.slot = slot; - } - - public static boolean isBaubleBox(ItemStack stack) { - return stack != null && stack.getItem() == ModItems.baubleBox; - } - - ItemStack getStack() { - ItemStack stack = player.inventory.getStackInSlot(slot); - if(stack != null) - storedInv = stack; - return stack; - } - - ItemStack[] getInventory() { - if(stacks != null) - return stacks; - - ItemStack stack = getStack(); - if(isBaubleBox(getStack())) { - stacks = ItemBaubleBox.loadStacks(stack); - return stacks; - } - - return FALLBACK_INVENTORY; - } - - public void pushInventory() { - if(invPushed) - return; - - ItemStack stack = getStack(); - if(stack == null) - stack = storedInv; - - if(stack != null) { - ItemStack[] inv = getInventory(); - ItemBaubleBox.setStacks(stack, inv); - } - - invPushed = true; + public InventoryBaubleBox(ItemStack box) { + this.box = box; + this.boxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); } @Override - public int getSizeInventory() { - return 16; + public void setStackInSlot(int slot, ItemStack stack) { + boxInv.setStackInSlot(slot, stack); } @Override - public ItemStack getStackInSlot(int i) { - return getInventory()[i]; + public int getSlots() { + return boxInv.getSlots(); } @Override - public ItemStack decrStackSize(int i, int j) { - ItemStack[] inventorySlots = getInventory(); - if (inventorySlots[i] != null) { - ItemStack stackAt; - - if (inventorySlots[i].stackSize <= j) { - stackAt = inventorySlots[i]; - inventorySlots[i] = null; - return stackAt; - } else { - stackAt = inventorySlots[i].splitStack(j); - - if (inventorySlots[i].stackSize == 0) - inventorySlots[i] = null; - - return stackAt; - } - } - - return null; + public ItemStack getStackInSlot(int slot) { + return boxInv.getStackInSlot(slot); } @Override - public ItemStack removeStackFromSlot(int i) { - return getStackInSlot(i); + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + return boxInv.insertItem(slot, stack, simulate); } @Override - public void setInventorySlotContents(int slot, ItemStack itemstack) { - ItemStack[] inventorySlots = getInventory(); - inventorySlots[slot] = itemstack; - } - - @Override - public int getInventoryStackLimit() { - return isBaubleBox(getStack()) ? 64 : 0; - } - - @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { - return isBaubleBox(getStack()); - } - - @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { - return isBaubleBox(getStack()); - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) {} - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - if (stacks != null) - Arrays.fill(stacks, null); - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Nonnull - @Override - public ITextComponent getDisplayName() { - return new TextComponentString(getName()); - } - - @Override - public void openInventory(@Nonnull EntityPlayer player) { - // NO-OP - } - - @Override - public void closeInventory(@Nonnull EntityPlayer player) { - // NO-OP - } - - @Nonnull - @Override - public String getName() { - return LibItemNames.BAUBLE_BOX; - } - - @Override - public void markDirty() { - // NO-OP + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return boxInv.extractItem(slot, amount, simulate); } } diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java deleted file mode 100644 index c721ea054..000000000 --- a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [25/11/2015, 19:59:22 (GMT)] - */ -package vazkii.botania.client.gui.box; - -import baubles.api.IBauble; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.mana.IManaItem; - -public class SlotAnyBauble extends Slot { - - final InventoryBaubleBox inv; - - public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { - super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); - inv = p_i1824_1_; - } - - @Override - public void onSlotChange(ItemStack oldStack, ItemStack newStack) { - inv.setInventorySlotContents(slotNumber, newStack); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return stack.getItem() instanceof IBauble || stack.getItem() instanceof IManaItem; - } - -} diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 29e60febe..ab0349f05 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -10,31 +10,101 @@ */ package vazkii.botania.common.item; +import baubles.api.IBauble; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.common.capabilities.ICapabilitySerializable; +import net.minecraftforge.common.util.Constants; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemStackHandler; +import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class ItemBaubleBox extends ItemMod { private static final String TAG_ITEMS = "InvItems"; - private static final String TAG_SLOT = "Slot"; public ItemBaubleBox() { super(LibItemNames.BAUBLE_BOX); setMaxStackSize(1); } + @Nonnull + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound oldCapNbt) { + return new InvProvider(); + } + + private static class InvProvider implements ICapabilitySerializable { + + private final IItemHandler inv = new ItemStackHandler(24) { + @Override + public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { + if(toInsert != null && + (toInsert.getItem() instanceof IManaItem + || toInsert.getItem() instanceof IBauble)) + return super.insertItem(slot, toInsert, simulate); + else return toInsert; + } + }; + + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; + } + + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(inv); + else return null; + } + + @Override + public NBTBase serializeNBT() { + return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.writeNBT(inv, null); + } + + @Override + public void deserializeNBT(NBTBase nbt) { + CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.readNBT(inv, null, nbt); + } + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + if(stack.getTagCompound() != null && stack.getTagCompound().hasKey(TAG_ITEMS)) { + NBTTagList oldData = stack.getTagCompound().getTagList(TAG_ITEMS, Constants.NBT.TAG_COMPOUND); + IItemHandler newInv = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + + CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.readNBT(newInv, null, oldData); + + stack.getTagCompound().removeTag(TAG_ITEMS); + + if(stack.getTagCompound().getSize() == 0) + stack.setTagCompound(null); + } + } + @Nonnull @Override public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { @@ -42,31 +112,4 @@ public class ItemBaubleBox extends ItemMod { return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - - public static ItemStack[] loadStacks(ItemStack stack) { - NBTTagList var2 = ItemNBTHelper.getList(stack, TAG_ITEMS, 10, false); - ItemStack[] inventorySlots = new ItemStack[36]; - for(int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = var2.getCompoundTagAt(var3); - byte var5 = var4.getByte(TAG_SLOT); - if(var5 >= 0 && var5 < inventorySlots.length) - inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); - } - - return inventorySlots; - } - - public static void setStacks(ItemStack stack, ItemStack[] inventorySlots) { - NBTTagList var2 = new NBTTagList(); - for(int var3 = 0; var3 < inventorySlots.length; ++var3) - if(inventorySlots[var3] != null) { - NBTTagCompound var4 = new NBTTagCompound(); - var4.setByte(TAG_SLOT, (byte)var3); - inventorySlots[var3].writeToNBT(var4); - var2.appendTag(var4); - } - - ItemNBTHelper.setList(stack, TAG_ITEMS, var2); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 953befc31..ae02fa878 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -55,7 +55,6 @@ import javax.annotation.Nullable; public class ItemFlowerBag extends ItemMod { private static final String TAG_ITEMS = "InvItems"; - private static final String TAG_SLOT = "Slot"; public ItemFlowerBag() { super(LibItemNames.FLOWER_BAG); diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index 25b954c2d..403babdcd 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -19,6 +19,7 @@ import vazkii.botania.client.gui.bag.GuiFlowerBag; import vazkii.botania.client.gui.bag.InventoryFlowerBag; import vazkii.botania.client.gui.box.ContainerBaubleBox; import vazkii.botania.client.gui.box.GuiBaubleBox; +import vazkii.botania.client.gui.box.InventoryBaubleBox; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -36,7 +37,7 @@ public class GuiHandler implements IGuiHandler { case LibGuiIDs.FLOWER_BAG : return new ContainerFlowerBag(player.inventory, new InventoryFlowerBag(player.getHeldItem(hand))); case LibGuiIDs.BAUBLE_BOX : - return new ContainerBaubleBox(player); + return new ContainerBaubleBox(player, new InventoryBaubleBox(player.getHeldItem(hand))); } return null; @@ -54,7 +55,7 @@ public class GuiHandler implements IGuiHandler { case LibGuiIDs.FLOWER_BAG : return new GuiFlowerBag(player.inventory, new InventoryFlowerBag(player.getHeldItem(hand))); case LibGuiIDs.BAUBLE_BOX : - return new GuiBaubleBox(player); + return new GuiBaubleBox(player, new InventoryBaubleBox(player.getHeldItem(hand))); } return null; From 85eef6c461a9b73380e7d64d472b58a067dbc7b6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 15:11:17 -0500 Subject: [PATCH 673/935] Steal the transforms from Psi :P --- .../botania/client/model/ManaGunModel.java | 47 ------------------- .../botania/common/item/ItemManaGun.java | 12 ++--- .../assets/botania/models/item/manaGun.json | 47 +++++++++++++++++-- 3 files changed, 47 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ManaGunModel.java diff --git a/src/main/java/vazkii/botania/client/model/ManaGunModel.java b/src/main/java/vazkii/botania/client/model/ManaGunModel.java deleted file mode 100644 index 50ce901ba..000000000 --- a/src/main/java/vazkii/botania/client/model/ManaGunModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package vazkii.botania.client.model; - -import com.google.common.collect.ImmutableList; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import vazkii.botania.common.item.ItemManaGun; - -import java.util.List; - -public class ManaGunModel implements IBakedModel { - - private final ItemHandler itemHandler = new ItemHandler(); - - @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return null; } - @Override public boolean isAmbientOcclusion() { return true; } - @Override public boolean isGui3d() { return true; } - @Override public boolean isBuiltInRenderer() { return false; } - @Override public TextureAtlasSprite getParticleTexture() { return null; } - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - - @Override - public ItemOverrideList getOverrides() { - return itemHandler; - } - - private class ItemHandler extends ItemOverrideList { - private ItemHandler() { - super(ImmutableList.of()); - } - - @Override - public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { - boolean hasClip = ItemManaGun.hasClip(stack); - if (hasClip) { - List lenses = ItemManaGun.getAllLens(stack); - } - } - } -} diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index ca230a47b..2622ea423 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -14,18 +14,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -75,7 +72,8 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); - addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { + + /*addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { @Override public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return hasClip(itemStack) ? 1 : 0; @@ -86,7 +84,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; } - }); + })*/; } @Nonnull @@ -150,8 +148,8 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) + public int getColorFromItemStack(ItemStack par1ItemStack, int tintIndex) { + if(tintIndex != 1) return 0xFFFFFF; EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false); diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 16e586c2d..34d3cccff 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -1,5 +1,5 @@ { - "__comment": "", + "__comment": "Author: wiiv", "textures": { "layer0": "botania:items/manaBlaster", "layer1": "botania:items/manaBlasterColor", @@ -131,9 +131,9 @@ "from": [ 9.5, 11.0, 6.0 ], "to": [ 17.5, 12.0, 10.0 ], "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ] }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ] } + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } } }, { @@ -161,5 +161,42 @@ "down": { "texture": "layer3", "uv": [ 3.0, 0.01, 6.0, 6.5 ], "rotation": 90 } } } - ] + ], + "display": { + "gui": { + "rotation": [ 0, -20, -40 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 10, 80, -5 ], + "translation": [ 0.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "firstperson_righthand": { + "rotation": [ 10, -80, 5 ], + "translation": [ -1.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + } + } } \ No newline at end of file From 89834b40535a6349c89bcb536f4d832053d6ef75 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 15:15:45 -0500 Subject: [PATCH 674/935] Clean up some other models --- .../assets/botania/models/block/altar.json | 1 - .../assets/botania/models/block/claw.json | 1 - .../botania/models/block/incense_plate.json | 1 - .../botania/models/block/miniIsland.json | 2 +- .../botania/models/block/pane_ns_fixed.json | 21 ------------------- .../assets/botania/models/block/pool.json | 1 - .../botania/models/block/pool_filled.json | 1 - .../botania/models/block/pool_tinted.json | 1 - 8 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/pane_ns_fixed.json diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json index d87d20b2a..fcab68549 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "elements": [ { "name": "gobletBase", diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/claw.json index a6ac94af1..95f76d9b7 100644 --- a/src/main/resources/assets/botania/models/block/claw.json +++ b/src/main/resources/assets/botania/models/block/claw.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/incense_plate.json b/src/main/resources/assets/botania/models/block/incense_plate.json index e4f392a43..71ba93775 100644 --- a/src/main/resources/assets/botania/models/block/incense_plate.json +++ b/src/main/resources/assets/botania/models/block/incense_plate.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 26faf293e..81411d25c 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -1,5 +1,5 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "__comment": "Author: wiiv", "elements": [ { "name": "Shape0", diff --git a/src/main/resources/assets/botania/models/block/pane_ns_fixed.json b/src/main/resources/assets/botania/models/block/pane_ns_fixed.json deleted file mode 100644 index b9fd7289f..000000000 --- a/src/main/resources/assets/botania/models/block/pane_ns_fixed.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "__coment": "Copy of vanilla pane_ns, fixing the incorrect cullfaces there. Remove in 1.9", - "ambientocclusion": false, - "textures": { - "particle": "#pane" - }, - "elements": [ - { "from": [ 7, 0, 0 ], - "to": [ 9, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, - "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, - "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" }, - "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#pane" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#pane" } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/pool.json b/src/main/resources/assets/botania/models/block/pool.json index 65ae0a289..988db7dce 100644 --- a/src/main/resources/assets/botania/models/block/pool.json +++ b/src/main/resources/assets/botania/models/block/pool.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "botania:blocks/livingrock0" }, diff --git a/src/main/resources/assets/botania/models/block/pool_filled.json b/src/main/resources/assets/botania/models/block/pool_filled.json index c02fa6f95..081311e4b 100644 --- a/src/main/resources/assets/botania/models/block/pool_filled.json +++ b/src/main/resources/assets/botania/models/block/pool_filled.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "botania:blocks/livingrock0" }, diff --git a/src/main/resources/assets/botania/models/block/pool_tinted.json b/src/main/resources/assets/botania/models/block/pool_tinted.json index d08ac9201..b99d089b9 100644 --- a/src/main/resources/assets/botania/models/block/pool_tinted.json +++ b/src/main/resources/assets/botania/models/block/pool_tinted.json @@ -1,5 +1,4 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "particle": "botania:blocks/livingrock0" }, From 5d19a0dd6cedd6e6147e4b1ff710c74435b9177f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 16:37:52 -0500 Subject: [PATCH 675/935] Workaround for armorstand helmets. Closes #23 --- .../model/armor/ModelArmorElementium.java | 116 ++++++----------- .../model/armor/ModelArmorManasteel.java | 92 ++++---------- .../model/armor/ModelArmorManaweave.java | 96 ++++---------- .../model/armor/ModelArmorTerrasteel.java | 120 ++++++------------ 4 files changed, 133 insertions(+), 291 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 350b8a4b5..24245b427 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -14,44 +14,46 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; +import vazkii.botania.common.Botania; import javax.annotation.Nonnull; public class ModelArmorElementium extends ModelBiped { - public final ModelRenderer helm; + private final ModelRenderer helm; public final ModelRenderer body; - public final ModelRenderer armR; - public final ModelRenderer armL; + private final ModelRenderer armR; + private final ModelRenderer armL; public final ModelRenderer belt; - public final ModelRenderer bootR; - public final ModelRenderer bootL; - public final ModelRenderer helm1; - public final ModelRenderer helm2; - public final ModelRenderer helm3; - public final ModelRenderer fairy; - public final ModelRenderer helmWing1; - public final ModelRenderer helmWing2; - public final ModelRenderer helmWing3; - public final ModelRenderer helmWing4; - public final ModelRenderer body2; - public final ModelRenderer armRpauldron; - public final ModelRenderer wing1; - public final ModelRenderer wing2; - public final ModelRenderer armLpauldron; - public final ModelRenderer wing1_1; - public final ModelRenderer wing2_1; - public final ModelRenderer legR; - public final ModelRenderer legL; - public final ModelRenderer bootR1; - public final ModelRenderer wing1_2; - public final ModelRenderer wing2_2; - public final ModelRenderer bootL1; - public final ModelRenderer wing1_3; - public final ModelRenderer wing2_3; + private final ModelRenderer bootR; + private final ModelRenderer bootL; + private final ModelRenderer helm1; + private final ModelRenderer helm2; + private final ModelRenderer helm3; + private final ModelRenderer fairy; + private final ModelRenderer helmWing1; + private final ModelRenderer helmWing2; + private final ModelRenderer helmWing3; + private final ModelRenderer helmWing4; + private final ModelRenderer body2; + private final ModelRenderer armRpauldron; + private final ModelRenderer wing1; + private final ModelRenderer wing2; + private final ModelRenderer armLpauldron; + private final ModelRenderer wing1_1; + private final ModelRenderer wing2_1; + private final ModelRenderer legR; + private final ModelRenderer legL; + private final ModelRenderer bootR1; + private final ModelRenderer wing1_2; + private final ModelRenderer wing2_2; + private final ModelRenderer bootL1; + private final ModelRenderer wing1_3; + private final ModelRenderer wing2_3; private final EntityEquipmentSlot slot; @@ -212,7 +214,13 @@ public class ModelArmorElementium extends ModelBiped { } @Override - public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + + if(entity instanceof EntityArmorStand) { + // Hack so helmets look right on armor stand + netHeadYaw = 0; + } + helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -235,56 +243,10 @@ public class ModelArmorElementium extends ModelBiped { bipedLeftLeg = bootL; } - prepareForRender(entity); - super.render(entity, f, f1, f2, f3, f4, f5); + super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - public void prepareForRender(Entity entity) { - EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null && living.isSneaking(); - isChild = living != null && living.isChild(); - if(living != null) { - ModelBiped.ArmPose mainPose = ArmPose.EMPTY; - ModelBiped.ArmPose offPose = ArmPose.EMPTY; - - // Copy from RenderPlayer.setModelVisibilities - if(living.getHeldItemMainhand() != null) { - mainPose = ArmPose.ITEM; - if (living.getItemInUseCount() > 0) { - EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) { - mainPose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == EnumAction.BOW) { - mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; - } - } - } - - if (living.getHeldItemOffhand() != null) { - offPose = ModelBiped.ArmPose.ITEM; - - if (living.getItemInUseCount() > 0) { - EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); - - if (enumaction1 == EnumAction.BLOCK) { - offPose = ModelBiped.ArmPose.BLOCK; - } - } - } - - if(living.getPrimaryHand() == EnumHandSide.RIGHT) { - rightArmPose = mainPose; - leftArmPose = offPose; - } else { - rightArmPose = offPose; - leftArmPose = mainPose; - } - // End copy RenderPlayer.setModelVisibilities - } - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index dce198dd3..32c623c7c 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -14,6 +14,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; @@ -23,25 +24,25 @@ import javax.annotation.Nonnull; public class ModelArmorManasteel extends ModelBiped { - public final ModelRenderer helm; + private final ModelRenderer helm; public final ModelRenderer body; - public final ModelRenderer armR; - public final ModelRenderer armL; + private final ModelRenderer armR; + private final ModelRenderer armL; public final ModelRenderer belt; - public final ModelRenderer bootR; - public final ModelRenderer bootL; - public final ModelRenderer helm1; - public final ModelRenderer helm2; - public final ModelRenderer helm3; - public final ModelRenderer helm4; - public final ModelRenderer helm5; - public final ModelRenderer helm6; - public final ModelRenderer helm7; - public final ModelRenderer body2; - public final ModelRenderer armRpauldron; - public final ModelRenderer armLpauldron; - public final ModelRenderer legR; - public final ModelRenderer legL; + private final ModelRenderer bootR; + private final ModelRenderer bootL; + private final ModelRenderer helm1; + private final ModelRenderer helm2; + private final ModelRenderer helm3; + private final ModelRenderer helm4; + private final ModelRenderer helm5; + private final ModelRenderer helm6; + private final ModelRenderer helm7; + private final ModelRenderer body2; + private final ModelRenderer armRpauldron; + private final ModelRenderer armLpauldron; + private final ModelRenderer legR; + private final ModelRenderer legL; private final EntityEquipmentSlot slot; @@ -142,7 +143,12 @@ public class ModelArmorManasteel extends ModelBiped { } @Override - public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + if(entity instanceof EntityArmorStand) { + // Hack so helmets look right on armor stand + netHeadYaw = 0; + } + helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -165,56 +171,10 @@ public class ModelArmorManasteel extends ModelBiped { bipedLeftLeg = bootL; } - prepareForRender(entity); - super.render(entity, f, f1, f2, f3, f4, f5); + super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - public void prepareForRender(Entity entity) { - EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null && living.isSneaking(); - isChild = living != null && living.isChild(); - if(living != null) { - ModelBiped.ArmPose mainPose = ArmPose.EMPTY; - ModelBiped.ArmPose offPose = ArmPose.EMPTY; - - // Copy from RenderPlayer.setModelVisibilities - if(living.getHeldItemMainhand() != null) { - mainPose = ArmPose.ITEM; - if (living.getItemInUseCount() > 0) { - EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) { - mainPose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == EnumAction.BOW) { - mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; - } - } - } - - if (living.getHeldItemOffhand() != null) { - offPose = ModelBiped.ArmPose.ITEM; - - if (living.getItemInUseCount() > 0) { - EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); - - if (enumaction1 == EnumAction.BLOCK) { - offPose = ModelBiped.ArmPose.BLOCK; - } - } - } - - if(living.getPrimaryHand() == EnumHandSide.RIGHT) { - rightArmPose = mainPose; - leftArmPose = offPose; - } else { - rightArmPose = offPose; - leftArmPose = mainPose; - } - // End copy RenderPlayer.setModelVisibilities - } - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 21cf91296..67abe34a0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -14,6 +14,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; @@ -22,26 +23,26 @@ import javax.annotation.Nonnull; public class ModelArmorManaweave extends ModelBiped { - public final ModelRenderer helm; + private final ModelRenderer helm; public final ModelRenderer body; - public final ModelRenderer armR; - public final ModelRenderer armL; - public final ModelRenderer legR; - public final ModelRenderer legL; - public final ModelRenderer bootR; - public final ModelRenderer bootL; - public final ModelRenderer helm2; - public final ModelRenderer helm3; - public final ModelRenderer helm4; - public final ModelRenderer helmSeam1; - public final ModelRenderer helmSeam2; - public final ModelRenderer helmSeam3; - public final ModelRenderer helmSeam4; - public final ModelRenderer body2; - public final ModelRenderer armRpauldron; - public final ModelRenderer armLpauldron; - public final ModelRenderer skirtR; - public final ModelRenderer skirtL; + private final ModelRenderer armR; + private final ModelRenderer armL; + private final ModelRenderer legR; + private final ModelRenderer legL; + private final ModelRenderer bootR; + private final ModelRenderer bootL; + private final ModelRenderer helm2; + private final ModelRenderer helm3; + private final ModelRenderer helm4; + private final ModelRenderer helmSeam1; + private final ModelRenderer helmSeam2; + private final ModelRenderer helmSeam3; + private final ModelRenderer helmSeam4; + private final ModelRenderer body2; + private final ModelRenderer armRpauldron; + private final ModelRenderer armLpauldron; + private final ModelRenderer skirtR; + private final ModelRenderer skirtL; private final EntityEquipmentSlot slot; @@ -142,7 +143,12 @@ public class ModelArmorManaweave extends ModelBiped { } @Override - public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + if(entity instanceof EntityArmorStand) { + // Hack so helmets look right on armor stand + netHeadYaw = 0; + } + helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armR.showModel = slot == EntityEquipmentSlot.CHEST; @@ -165,56 +171,10 @@ public class ModelArmorManaweave extends ModelBiped { bipedLeftLeg = bootL; } - prepareForRender(entity); - super.render(entity, f, f1, f2, f3, f4, f5); + super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - public void prepareForRender(Entity entity) { - EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null && living.isSneaking(); - isChild = living != null && living.isChild(); - if(living != null) { - ModelBiped.ArmPose mainPose = ArmPose.EMPTY; - ModelBiped.ArmPose offPose = ArmPose.EMPTY; - - // Copy from RenderPlayer.setModelVisibilities - if(living.getHeldItemMainhand() != null) { - mainPose = ArmPose.ITEM; - if (living.getItemInUseCount() > 0) { - EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) { - mainPose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == EnumAction.BOW) { - mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; - } - } - } - - if (living.getHeldItemOffhand() != null) { - offPose = ModelBiped.ArmPose.ITEM; - - if (living.getItemInUseCount() > 0) { - EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); - - if (enumaction1 == EnumAction.BLOCK) { - offPose = ModelBiped.ArmPose.BLOCK; - } - } - } - - if(living.getPrimaryHand() == EnumHandSide.RIGHT) { - rightArmPose = mainPose; - leftArmPose = offPose; - } else { - rightArmPose = offPose; - leftArmPose = mainPose; - } - // End copy RenderPlayer.setModelVisibilities - } - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 6b6df2720..1fc135e38 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -14,6 +14,7 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumAction; import net.minecraft.util.EnumHandSide; @@ -22,39 +23,39 @@ import javax.annotation.Nonnull; public class ModelArmorTerrasteel extends ModelBiped { - public final ModelRenderer helm; + private final ModelRenderer helm; public final ModelRenderer body; - public final ModelRenderer armr; - public final ModelRenderer armL; + private final ModelRenderer armr; + private final ModelRenderer armL; public final ModelRenderer belt; - public final ModelRenderer bootR; - public final ModelRenderer bootL; - public final ModelRenderer helm2; - public final ModelRenderer helm3; - public final ModelRenderer helm4; - public final ModelRenderer helmLeaf1; - public final ModelRenderer helmLeaf2; - public final ModelRenderer helmLeaf3; - public final ModelRenderer helmLeaf4; - public final ModelRenderer helmLeaf5; - public final ModelRenderer helmLeaf6; - public final ModelRenderer helmbranch1; - public final ModelRenderer helmbranch2; - public final ModelRenderer helmbranch3; - public final ModelRenderer helmbranch4; - public final ModelRenderer body2; - public final ModelRenderer armRpauldron; - public final ModelRenderer armRbranch1; - public final ModelRenderer armRbranch2; - public final ModelRenderer armLpauldron; - public final ModelRenderer armLbranch1; - public final ModelRenderer armLbranch2; - public final ModelRenderer legR; - public final ModelRenderer legL; - public final ModelRenderer bootR1; - public final ModelRenderer bootRbranch; - public final ModelRenderer bootL2; - public final ModelRenderer bootLbranch; + private final ModelRenderer bootR; + private final ModelRenderer bootL; + private final ModelRenderer helm2; + private final ModelRenderer helm3; + private final ModelRenderer helm4; + private final ModelRenderer helmLeaf1; + private final ModelRenderer helmLeaf2; + private final ModelRenderer helmLeaf3; + private final ModelRenderer helmLeaf4; + private final ModelRenderer helmLeaf5; + private final ModelRenderer helmLeaf6; + private final ModelRenderer helmbranch1; + private final ModelRenderer helmbranch2; + private final ModelRenderer helmbranch3; + private final ModelRenderer helmbranch4; + private final ModelRenderer body2; + private final ModelRenderer armRpauldron; + private final ModelRenderer armRbranch1; + private final ModelRenderer armRbranch2; + private final ModelRenderer armLpauldron; + private final ModelRenderer armLbranch1; + private final ModelRenderer armLbranch2; + private final ModelRenderer legR; + private final ModelRenderer legL; + private final ModelRenderer bootR1; + private final ModelRenderer bootRbranch; + private final ModelRenderer bootL2; + private final ModelRenderer bootLbranch; private final EntityEquipmentSlot slot; @@ -233,7 +234,12 @@ public class ModelArmorTerrasteel extends ModelBiped { } @Override - public void render(@Nonnull Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + public void render(@Nonnull Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + if(entity instanceof EntityArmorStand) { + // Hack so helmets look right on armor stand + netHeadYaw = 0; + } + helm.showModel = slot == EntityEquipmentSlot.HEAD; body.showModel = slot == EntityEquipmentSlot.CHEST; armr.showModel = slot == EntityEquipmentSlot.CHEST; @@ -256,56 +262,10 @@ public class ModelArmorTerrasteel extends ModelBiped { bipedLeftLeg = bootL; } - prepareForRender(entity); - super.render(entity, f, f1, f2, f3, f4, f5); + super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); } - public void prepareForRender(Entity entity) { - EntityLivingBase living = (EntityLivingBase) entity; - isSneak = living != null && living.isSneaking(); - isChild = living != null && living.isChild(); - if(living != null) { - ModelBiped.ArmPose mainPose = ArmPose.EMPTY; - ModelBiped.ArmPose offPose = ArmPose.EMPTY; - - // Copy from RenderPlayer.setModelVisibilities - if(living.getHeldItemMainhand() != null) { - mainPose = ArmPose.ITEM; - if (living.getItemInUseCount() > 0) { - EnumAction enumaction = living.getHeldItemMainhand().getItemUseAction(); - - if (enumaction == EnumAction.BLOCK) { - mainPose = ModelBiped.ArmPose.BLOCK; - } else if (enumaction == EnumAction.BOW) { - mainPose = ModelBiped.ArmPose.BOW_AND_ARROW; - } - } - } - - if (living.getHeldItemOffhand() != null) { - offPose = ModelBiped.ArmPose.ITEM; - - if (living.getItemInUseCount() > 0) { - EnumAction enumaction1 = living.getHeldItemOffhand().getItemUseAction(); - - if (enumaction1 == EnumAction.BLOCK) { - offPose = ModelBiped.ArmPose.BLOCK; - } - } - } - - if(living.getPrimaryHand() == EnumHandSide.RIGHT) { - rightArmPose = mainPose; - leftArmPose = offPose; - } else { - rightArmPose = offPose; - leftArmPose = mainPose; - } - // End copy RenderPlayer.setModelVisibilities - } - } - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + private void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; From 9b3c1d721d393542cb909c439651929799360b75 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 17:45:58 -0500 Subject: [PATCH 676/935] Minor potion cleanup --- .../vazkii/botania/common/brew/BrewMod.java | 7 ++++++ .../botania/common/brew/BrewModPotion.java | 24 ------------------- .../vazkii/botania/common/brew/ModBrews.java | 12 +++++----- .../common/brew/potion/PotionAllure.java | 17 ++++++++----- .../common/brew/potion/PotionFeatherfeet.java | 16 ++++++++----- .../common/brew/potion/PotionSoulCross.java | 6 ++--- 6 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/brew/BrewModPotion.java diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index 765c957c1..07770128f 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -11,9 +11,12 @@ package vazkii.botania.common.brew; import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.PotionUtils; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; +import java.util.Arrays; + public class BrewMod extends Brew { public BrewMod(String key, int color, int cost, PotionEffect... effects) { @@ -21,6 +24,10 @@ public class BrewMod extends Brew { BotaniaAPI.registerBrew(this); } + public BrewMod(String key, int cost, PotionEffect... effects) { + this(key, PotionUtils.getPotionColorFromEffectList(Arrays.asList(effects)), cost, effects); + } + @Override public String getUnlocalizedName() { return "botania.brew." + super.getUnlocalizedName(); diff --git a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java b/src/main/java/vazkii/botania/common/brew/BrewModPotion.java deleted file mode 100644 index 746004b99..000000000 --- a/src/main/java/vazkii/botania/common/brew/BrewModPotion.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Nov 2, 2014, 10:37:12 PM (GMT)] - */ -package vazkii.botania.common.brew; - -import net.minecraft.potion.PotionEffect; -import net.minecraft.potion.PotionUtils; - -import java.util.Arrays; - -public class BrewModPotion extends BrewMod { - - public BrewModPotion(String key, int cost, PotionEffect... effects) { - super(key, PotionUtils.getPotionColorFromEffectList(Arrays.asList(effects)), cost, effects); - } - -} diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index fc383a299..e9eb90564 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -59,12 +59,12 @@ public class ModBrews { 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.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)); - bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffect(ModPotions.bloodthrst, 7200, 0)); - allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffect(ModPotions.allure, 4800, 0)); - clear = new BrewModPotion(LibBrewNames.CLEAR, 4000, new PotionEffect(ModPotions.clear, 0, 0)); + soulCross = new BrewMod(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross, 1800, 0)); + featherfeet = new BrewMod(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet, 1800, 0)); + emptiness = new BrewMod(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness, 7200, 0)); + bloodthirst = new BrewMod(LibBrewNames.BLOODTHIRST, 20000, new PotionEffect(ModPotions.bloodthrst, 7200, 0)); + allure = new BrewMod(LibBrewNames.ALLURE, 2000, new PotionEffect(ModPotions.allure, 4800, 0)); + clear = new BrewMod(LibBrewNames.CLEAR, 4000, new PotionEffect(ModPotions.clear, 0, 0)); } public static void initTC() { 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 fa5112c9c..0a055ddd5 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -18,19 +18,24 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionAllure extends PotionMod { public PotionAllure() { super(LibPotionNames.ALLURE, false, 0x0034E4, 5); - MinecraftForge.EVENT_BUS.register(this); setBeneficial(); } - @SubscribeEvent - public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.getEntityLiving(); - if(e instanceof EntityPlayer && hasEffect(e)) { - EntityFishHook hook = ((EntityPlayer) e).fishEntity; + @Override + public boolean isReady(int duration, int amplifier) { + return true; + } + + @Override + public void performEffect(@Nonnull EntityLivingBase living, int amplified) { + if(living instanceof EntityPlayer) { + EntityFishHook hook = ((EntityPlayer) living).fishEntity; if(hook != null) hook.onUpdate(); } 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 6cf76b1c3..28ca98c01 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -16,19 +16,23 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); - MinecraftForge.EVENT_BUS.register(this); setBeneficial(); } - @SubscribeEvent - public void onEntityUpdate(LivingUpdateEvent event) { - EntityLivingBase e = event.getEntityLiving(); - if(hasEffect(e)) - e.fallDistance = 2.5F; + @Override + public boolean isReady(int duration, int amplifier) { + return true; + } + + @Override + public void performEffect(@Nonnull EntityLivingBase living, int amplified) { + living.fallDistance = 2.5F; } } 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 304490783..23b4cc7fe 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -27,9 +27,9 @@ public class PotionSoulCross extends PotionMod { @SubscribeEvent public void onEntityKill(LivingDeathEvent event) { - Entity e = event.getSource().getEntity(); - if(e != null && e instanceof EntityLivingBase) { - EntityLivingBase living = (EntityLivingBase) e; + Entity killer = event.getSource().getEntity(); + if(killer != null && killer instanceof EntityLivingBase) { + EntityLivingBase living = (EntityLivingBase) killer; if(hasEffect(living)) living.heal(event.getEntityLiving().getMaxHealth() / 20); } From c47de38ec9ba4352db3e01367e54816c801c38a9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 5 Jun 2016 18:14:07 -0500 Subject: [PATCH 677/935] Fix inventory transforms for floating flowers --- .../client/model/FloatingFlowerModel.java | 80 ++++++++----------- .../botania/models/block/miniIsland.json | 1 + 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 124449997..c60522ded 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -22,12 +22,11 @@ import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.pipeline.IVertexConsumer; @@ -35,6 +34,7 @@ import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; @@ -44,12 +44,13 @@ import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; import java.util.stream.Collectors; -public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadListener { +public class FloatingFlowerModel implements IBakedModel { private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; private final Table CACHE = HashBasedTable.create(); @@ -80,11 +81,6 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL return builder.build(); } - @Override - public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { - CACHE.clear(); - } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { @@ -147,18 +143,18 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return true; } @Override public boolean isBuiltInRenderer() { return false; } - @Nonnull - @Override public TextureAtlasSprite getParticleTexture() { return null; } - @Nonnull - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/dirt"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - private static class CompositeBakedModel implements IBakedModel { + private static class CompositeBakedModel implements IPerspectiveAwareModel { - private final IBakedModel base; + private final IBakedModel flower; + private final IBakedModel island; private final List genQuads; public CompositeBakedModel(IBakedModel flower, IBakedModel island) { - this.base = flower; + this.flower = flower; + this.island = island; ImmutableList.Builder genBuilder = ImmutableList.builder(); final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); @@ -183,41 +179,35 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL } // Forward all to flower model - @Nonnull - @Override - public List getQuads(IBlockState state, EnumFacing face, long rand) { + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return genQuads; } + @Override public boolean isAmbientOcclusion() { + return flower.isAmbientOcclusion(); + } + @Override public boolean isGui3d() { + return flower.isGui3d(); + } + @Override public boolean isBuiltInRenderer() { + return flower.isBuiltInRenderer(); + } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { + return flower.getParticleTexture(); + } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { + return flower.getItemCameraTransforms(); + } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + if(island instanceof IPerspectiveAwareModel) { + Pair pair = ((IPerspectiveAwareModel) island).handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); + } + return Pair.of(this, TRSRTransformation.identity().getMatrix()); } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); - } - - @Nonnull - @Override - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); - } - - @Nonnull - @Override - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); - } - - @Nonnull - @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 81411d25c..fb2cfe6b6 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -1,5 +1,6 @@ { "__comment": "Author: wiiv", + "parent": "minecraft:block/block", "elements": [ { "name": "Shape0", From c15f08b066f6940b88d8e3eb85e724353f1f6c12 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 7 Jun 2016 20:18:05 -0500 Subject: [PATCH 678/935] Remove unofficial port message from login nag --- src/main/java/vazkii/botania/common/Botania.java | 13 +------------ src/main/resources/assets/botania/lang/en_US.lang | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 7cdb9d536..fc1f41556 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -83,22 +83,11 @@ public class Botania { } @SubscribeEvent - public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) { + public void nagRemoval(PlayerEvent.PlayerLoggedInEvent evt) { EntityPlayer player = evt.player; - ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.warnRemove"); message.setStyle(new Style().setColor(TextFormatting.RED)); - - ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report"); - message2.setStyle(new Style().setColor(TextFormatting.YELLOW)); - - ITextComponent url = new TextComponentString(" https://github.com/williewillus/Botania/issues"); - url.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues")); - url.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK"))); - player.addChatComponentMessage(message); - - player.addChatComponentMessage(message2.appendSibling(url)); } @EventHandler diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4340afbfa..53543ca1e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -16,7 +16,6 @@ generator.botania-skyblock.info=Not recommended for botania newcomers botaniamisc.noloc=botaniamisc.noloc botaniamisc.unofficial.warnRemove=[Botania] Warning: Some decorative blocks are being removed, please migrate to either the vanilla or Quark versions. -botaniamisc.unofficial.report=[Botania] This port is unofficial! Report issues to the porter HERE: botaniamisc.nextPage=Next Page botaniamisc.prevPage=Previous Page From 3c0fe199d513d081a3eca69a269bca5cba880122 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Wed, 8 Jun 2016 17:02:41 -0400 Subject: [PATCH 679/935] Fix sneaking transforms being out of place for baubles --- .../java/vazkii/botania/api/item/IBaubleRender.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index f890c256a..43d0e5359 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -13,6 +13,7 @@ package vazkii.botania.api.item; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.MathHelper; /** * A Bauble Item that implements this will be have hooks to render something on @@ -42,11 +43,14 @@ public interface IBaubleRender { } public static void applySneakingRotation() { - GlStateManager.rotate(28.64789F, 1.0F, 0.0F, 0.0F); + GlStateManager.translate(0F, 0.2F, 0F); + GlStateManager.rotate(90F / (float) Math.PI, 1.0F, 0.0F, 0.0F); } public static void translateToHeadLevel(EntityPlayer player) { - GlStateManager.translate(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.25 : 0), 0); + GlStateManager.translate(0, -player.getDefaultEyeHeight(), 0); + if (player.isSneaking()) + GlStateManager.translate(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F); } } @@ -61,7 +65,7 @@ public interface IBaubleRender { /** * Render Type for the player's body, translations apply on the player's head rotations. - * Sneaking is not handled and should be done during the render.~ + * Sneaking is not handled and should be done during the render. * @see IBaubleRender.Helper */ HEAD; From 699ee5027ab6b98ff04ae6936d52176a8aed8d67 Mon Sep 17 00:00:00 2001 From: isambourgg Date: Thu, 9 Jun 2016 16:42:34 -0400 Subject: [PATCH 680/935] Update fr_FR.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relecture et correction jusqu'à la Ligne 559. --- .../resources/assets/botania/lang/fr_FR.lang | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 2aa58b72b..3de24ea80 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -9,7 +9,7 @@ # MISC itemGroup.Botania=Botania generator.botania-skyblock=Jardin de verre -generator.botania-skyblock.info=Non recommendé pour les débutants de botania +generator.botania-skyblock.info=Non recommandé pour les débutants de botania botaniamisc.nextPage=Page suivante botaniamisc.prevPage=Page précédante @@ -21,7 +21,7 @@ botaniamisc.statusUnknown=Statut inconnu botaniamisc.color=%s teinté botaniamisc.manaUsage=Utilisation de mana botaniamisc.shiftToRead=Maj-cliquez droit pour lire plus -botaniamisc.clickToRecipe=Maj-cliquez vour voir la recette +botaniamisc.clickToRecipe=Maj-cliquez pour voir la recette botaniamisc.clickToIndex=Maj-cliquez pour l'index botaniamisc.flareColor=%s tours botaniamisc.outputtingPower=Partage le mana aux éléments @@ -32,7 +32,7 @@ botaniamisc.compositeLens=Composé avec %s botaniamisc.filter0=Ramassage seulement des éléments en cadres botaniamisc.filter1=Ramassage seulement des éléments hors cadres botaniamisc.filter2=Ramassage de tous les éléments -botaniamisc.creativePool0=Bassin de mana créatif, a du mana à l'infini +botaniamisc.creativePool0=Bassin de mana créatif, possède du mana à l'infini botaniamisc.creativePool1=Digne d'un égoïste botaniamisc.savedByLaurel=Votre couronne de laurier d'or vole en éclats, dès qu'elle vous sauve de la mort. botaniamisc.toolRank=%s&7 rang @@ -62,7 +62,7 @@ botaniamisc.lexiconIndex=Index du lexique botaniamisc.hasIvy=A lierre éternel botaniamisc.shareMsg=[{"text":"%name%","color":"light_purple"},{"text":" a partagé un ","color":"blue"},{"text":"Lexique Botania","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Vous pouvez le créer avec un livre et une pousse d'arbre !","color":"aqua"}}},{"text":" entrée, cliquez pour la voir : ","color":"blue"},{"text":"[%entryname%]","color":"green","clickEvent":{"action":"run_command","value":"/botania-open %entry%"},"hoverEvent":{"action":"show_text","value":{"text":"Cliquez pour lire ceci","color":"aqua"}}}] botaniamisc.noLexicon=Vous avez besoin d'un Lexique Botania en main pour lire ceci. -botaniamisc.cantOpen=Il ne semble pas que votre Lexique Botania ai cette page. Il provient peut-être d'une source extérieure...? +botaniamisc.cantOpen=Il ne semble pas que votre Lexique Botania contient cette page. Il provient peut-être d'une source extérieure...? botaniamisc.clickToShare=Partagez botaniamisc.drop=Jeter botaniamisc.dropTip0=Aide: Vous pouvez appuyer %s dans votre inventaire pour jeter @@ -71,7 +71,7 @@ botaniamisc.wandMode.bind=Mode de liaison botaniamisc.wandMode.function=Mode de fonction botaniamisc.playVideo=Jouer la vidéo botaniamisc.brewOf=Brassage de %s -botaniamisc.needsCatalysts=Qu'importe la force avec laquelle vous essayez depoussez le lingot dans la balise, rien ne semble arriver, peut-être que la configuration vos pylônes de catalyseur est débranchée. +botaniamisc.needsCatalysts=Qu'importe la force avec laquelle vous essayez d'insérer le lingot dans la balise, rien ne semble arriver, peut-être que la configuration vos pylônes de catalyseur est débranchée. botaniamisc.peacefulNoob=Vous essayez d'offrir le lingot, mais l'ambiance paisible de votre monde vous empêche de faire ainsi. Peut-être devriez-vous faire quelque chose à cela. botaniamisc.notInfused=Non infusé botaniamisc.getALife=Prennez une vie @@ -89,17 +89,17 @@ botaniamisc.nearIndex1=Tout ce que vous direz pourra être botaniamisc.nearIndex2=intercepte comme demande botaniamisc.startTutorial=Débuter le tutoriel botaniamisc.tutorialStarted=Vous avez débuté le tutoriel. Veuillez suivre les flêches rouges et lire le contenu afin d'être guidé à travers les fondements de Botania! -botaniamisc.tutorialEnded=Le tutoriel est terminé. Vous devez maintenant avoir une idée sur le fonctionnement de Botania, assurez-vous d'avoir lu les autres pages afin de découvrir d'autres manière d'utiliser le mod. +botaniamisc.tutorialEnded=Le tutoriel est terminé. Vous devez maintenant avoir une idée sur le fonctionnement de Botania, assurez-vous d'avoir lu les autres pages afin de découvrir d'autres manières d'utiliser le mod. botaniamisc.cosmeticBauble=&oCosmétique botaniamisc.hasCosmetic=&oA un ajout cosmétique: &r%s botaniamisc.typeToSearch=(texte à rechercher) -botaniamisc.viewOnline=Visionnez en ligne +botaniamisc.viewOnline=Visionner en ligne botaniamisc.history=Histoire -botaniamisc.historyLong=Consultez l'histoire -botaniamisc.historyDesc=Voyez les dernières entrées vititées +botaniamisc.historyLong=Consulter l'histoire +botaniamisc.historyDesc=Voir les dernières entrées visitées botaniamisc.lexiconOptions0=Options de Botania -botaniamisc.lexiconOptions1=Configurez Botania depuis le jeu -botaniamisc.lexiconOptions2=Quelques options réclameront la relance du jeu +botaniamisc.lexiconOptions1=Configurer Botania depuis le jeu +botaniamisc.lexiconOptions2=Quelques options réclameront le redémarrage du jeu botaniamisc.hasPhantomInk=&bcamoufflé par de l'encre sympatique botaniamisc.pinkinatorDesc=S'applique directement au Wither. botaniamisc.relicUnbound=&6Relique&7, déliée @@ -112,7 +112,7 @@ botaniamisc.blocksAway=%s Blocs plus loin botaniamisc.clickToTeleport=Cliquez-droit pour téléporter botaniamisc.clickToRemoveWarp=Maj-cliquez-gauche pour retirer botaniamisc.unboundWarp=Délier un point de déformation -botaniamisc.clickToAddWarp=Cliquez-droit pour lier à cette position +botaniamisc.clickToAddWarp=Cliquer-droit pour lier à cette position botaniamisc.hasKeepIvy=A un lierre résolu botaniamisc.active=&aActive botaniamisc.inactive=&cInactive @@ -122,11 +122,11 @@ botaniamisc.hourglassLock=Ce sablier est verrouillé. Cliquez-droit dessus avec botaniamisc.locked=Verrouillé botaniamisc.stopped=Arrêté botaniamisc.lockedStopped=Verrouillé, Arrêté -botaniamisc.visualize=Visualisez -botaniamisc.unvisualize=Dévisualisez +botaniamisc.visualize=Visualiser +botaniamisc.unvisualize=Dévisualiser botaniamisc.rightClickToAnchor=Cliquez-droit n'importe quel bloc pour ancrer cette apercu de structure à cela. botaniamisc.structureComplete=Structure complété ! -botaniamisc.materialsRequired=Materiaux requis +botaniamisc.materialsRequired=Matériaux requis botaniamisc.challenges=Défis botaniamisc.markCompleted=Marque complété botaniamisc.markNotCompleted=Marque non complété @@ -211,7 +211,7 @@ botania.armorset.terrasteel.name=Volonté des ancients botania.armorset.terrasteel.desc0=20% de mana en moins sur les outils à mana botania.armorset.terrasteel.desc1=Régénère même si la faim n'est pas complète botania.armorset.will0.desc=Les coups critiques appliquent un fort effet de faiblesse (Volonté d'Ahrim) -botania.armorset.will1.desc=Les dégâts de coup critiques augmentent avec l'HP inférieur (Volonté de Dharok) +botania.armorset.will1.desc=Les dégâts de coup critiques augmentent avec de faibles PV (Volonté de Dharok) botania.armorset.will2.desc=Les coups critiques guérissent une partie de dégâts reçus (Volonté de Guthan) botania.armorset.will3.desc=Les coups critiques appliquent un fort effet de lenteur (Volonté de Torag) botania.armorset.will4.desc=Les coups critiques transpercent l'armure (Volonté de Verac) @@ -249,7 +249,7 @@ lexicon.render.3D=Rendu 3D du lexique manaBar.height=Hauteur de la barre de mana powerSystem.subtle=Use Subtle Power System pylonModel.old=Utiliser l'ancien modèle de pylône -elfPortal.particles.enabled=Activer Portal Particles +elfPortal.particles.enabled=Activer les particules des portails elfiques chargeAnimation.enabled=Animation de chargement activée vanillaParticleConfig.enabled=Utiliser la config des particules Vanilla manaSpreaders.silent=Diffuseurs de mana silencieux @@ -267,24 +267,24 @@ worldgen.mushroom.quantity=Quantité de génération de champignons # VERSION CHECKING botania.versioning.flavour0=NANI SORE!? BOTANIA EST OBSOLETE!? -botania.versioning.flavour1=Que voulez-vous dire par Botania est obsolète, ignard personnage? +botania.versioning.flavour1=Que voulez-vous dire par Botania est obsolète, fou ignorant ? botania.versioning.flavour2=Ce n'est pas comme si Botania souhaitait devenir obsolète, b-b-BAKA! -botania.versioning.flavour3=Téléportez-moi Scotty. Nous avons une nouvelle version de Botaina. -botania.versioning.flavour4=La mise à jour de Botania update demande si vous avez accepté Vazkii en tant que seigneur et sauveur. +botania.versioning.flavour3=Téléportez-moi Scotty. Nous avons une nouvelle version de Botania. +botania.versioning.flavour4=La mise à jour de Botania demande si vous avez accepté Vazkii en tant que seigneur et sauveur. botania.versioning.flavour5=Hey, une mise à jour de Botania, c'est rare, n'est-ce pas? botania.versioning.flavour6=Que pense le scout à propos de la mise à jour de Botania? -botania.versioning.flavour7=Hey dude, il y a une novuelle mise à jour de Botania. Why am I australian? -botania.versioning.flavour8=Comme avoir une vie est dépassé, voici une mise à jour de Botania. +botania.versioning.flavour7=Hey chéri, il y a une nouvelle mise à jour de Botania. Why am I australian? +botania.versioning.flavour8=Comme n'avoir qu'une vie est dépassé, voici une mise à jour de Botania. botania.versioning.flavour9=Mise à jour Botania basée sur le remerciement. botania.versioning.flavour10=200 mises à jour, c'est pour cela qu'on m'appelle Mister Fahrenheit. botania.versioning.flavour11=Perry l'ornithorinque, permets moi de te présenter le Botania-MaJ-inator. botania.versioning.flavour12=Botania mis à jour. #hoennconfirmed botania.versioning.flavour13=Tu as activé ma Carte Piège! Je joue Mise à Jour de Botania ! -botania.versioning.flavour14=Jouons à un drinking game, buvons un verre à chaque mise à jour de Botania. *hic* +botania.versioning.flavour14=Jouons à un jeu à boire, buvons un verre à chaque mise à jour de Botania. *hic* botania.versioning.flavour15=Ne faites pas attention à la mise à jour de Botania derrière les rideaux. botania.versioning.flavour16=Tu reçois une mise à jour ! Tu reçois une mise à jour ! TOUT LE MONDE RECOIT UNE MISE A JOUR ! botania.versioning.flavour17=Your build's unbalanced and your hair's a Kuriboh! Hey. Hoo. -botania.versioning.flavour18=WhY iS tHiS uPdAtE mEsSaGe CaSeD lIkE tHiS!? +botania.versioning.flavour18=PoUrQuOi La NoTiFiCaTiOn De MiSe à JoUr S'aFfIcHe CoMmE çA !? botania.versioning.flavour19=Afin de mettre à jour Botania vous devez accepter les conditions d'utilisation. botania.versioning.flavour20=wow such botania so update much fix very content botania.versioning.flavour21=Cette mise à jour de Botania va s'auto-détruire dans 3...2... @@ -299,7 +299,7 @@ botania.versioning.flavour29=Mets-le à jour, mets-le à jour, mets-le à jour, botania.versioning.flavour30=Botania utilise Mise à Jour ! C'est super efficace ! botania.versioning.flavour31=Une nouvelle mise à jour de Botania est disponible, 20% plus fraîche. botania.versioning.flavour32=Félicitations ! Tu es le 100'000ème joueur de Botania ayant une version obsolète, cliquez ICI pour un iPad gratuit! -botania.versioning.flavour33=Avant de mette à jour Botania, souhaitez-vous insViverochethe la barre de recherche Ask? +botania.versioning.flavour33=Avant de mettre à jour Botania, souhaitez-vous insViverochethe la barre de recherche Ask? botania.versioning.flavour34=Back on the Botania update treadmill. No fun required. #angbadang botania.versioning.flavour35=Souhaite-tu devenir une magicienne pour la mise à jour de Botania ? botania.versioning.flavour36=Pourquoi la mise à jour de Botania à traversée la route ? Pour passer du côté client. @@ -326,9 +326,9 @@ botania.versioning.error=Woah! It seems like something went wrong while trying t botania.versioning.disabled=Sorry. This feature is currently disabled due to server host problems, it should be back soon. # BAUBLE TOOLTIPS -botania.baubletype.amulet=Équipable dans l'emplacement &aAmulet&7 -botania.baubletype.ring=Équipable dans l'emplacement &aRing&7 -botania.baubletype.belt=Équipable dans l'emplacement &aBelt&7 +botania.baubletype.amulet=A équiper dans l'emplacement &aAmulet&7 +botania.baubletype.ring=A équiper dans l'emplacement &aRing&7 +botania.baubletype.belt=A équiper dans l'emplacement &aBelt&7 botania.baubletooltip=Appuyez &b%s&7 pour ouvrir le menu Baubles # DEATH MESSAGES @@ -345,7 +345,7 @@ entity.Botania.botania:magicLandmine.name=Piège de Gaïa entity.Botania.botania:spark.name=Étincelle entity.Botania.botania:thrownItem.name=Élément jeté entity.Botania.botania:magicMissile.name=Missile magique -entity.Botania.botania:thornChakram.name=Thorn Chakram +entity.Botania.botania:thornChakram.name=Chakram d'épines entity.Botania.botania:corporeaSpark.name=Étincelle de Corporea entity.Botania.botania:enderAirBottle.name=Bouteille d'air du néant entity.Botania.botania:poolMinecart.name=Wagonnet à bassin de mana @@ -359,7 +359,7 @@ achievement.botania:EndoflammePickup=Arrivée de l'aube achievement.botania:daybloomPickup.desc=Faite une Fleur de jour dans l'apoticaire de pétale achievement.botania:manaPoolPickup=Vague vive achievement.botania:manaPoolPickup.desc=Améliorez un bassin de mana dilué à un normal -achievement.botania:endoflamePickup=Fussion +achievement.botania:endoflamePickup=Fusion achievement.botania:endoflamePickup.desc=Faite une Endoflamme pour augmenter la production de mana achievement.botania:tinyPotatoPet=Soyons juste amis achievement.botania:tinyPotatoPet.desc=Faites d'une minuscule pomme de terre votre animal de compagnie @@ -367,7 +367,7 @@ achievement.botania:sparkCraft=Énergie directe achievement.botania:sparkCraft.desc=Faites une étincelle pour aider à transférer le mana autour achievement.botania:baubleWear=Arts intérieurs achievement.botania:baubleWear.desc=Faite n'importe quelle variété de Bibelot et portez-les -achievement.botania:manaCookieEat=Hérésie pourrie et chocolat +achievement.botania:manaCookieEat=Hérésie accablante et chocolat achievement.botania:manaCookieEat.desc=Infusez et mangez un délicieux cookie de mana achievement.botania:runePickup=Poupée Lilium achievement.botania:runePickup.desc=Utilisez l'autel runique pour créer une rune @@ -389,15 +389,15 @@ achievement.botania:heiseiDreamPickup=Cataclysme Heisei achievement.botania:heiseiDreamPickup.desc=Créez un rève Heisei pour provoquer des ravage sur les créatures achievement.botania:dirtRodCraft=Rockbell achievement.botania:dirtRodCraft.desc=Fabriquez un dil- euh... Baton des landes -achievement.botania:spawnerMoverUse=je ne peux pas lever mon (censuré) -achievement.botania:spawnerMoverUse.desc=Utilisez un aggrégateur de vie pour transporter une cage de monstre +achievement.botania:spawnerMoverUse=Je ne peux pas lever mon (censuré) +achievement.botania:spawnerMoverUse.desc=Utilisez un aggrégateur de vie pour transporter un générateur de monstre achievement.botania:enderAirMake=Imitation à l'air achievement.botania:enderAirMake.desc=Récupérez une bouteille d'air du néant -achievement.botania:corporeaCraft=Poser boissons et friandises +achievement.botania:corporeaCraft=Jeter des boissons gazeuses et des friandises achievement.botania:corporeaCraft.desc=Fabriquez un bloc qui servira au réseau Corporea achievement.botania:signalFlareStun=Voyez les lumières -achievement.botania:signalFlareStun.desc=Aveugnez 100 créatures ou plus d'un coup avec une fusée de détresse +achievement.botania:signalFlareStun.desc=Aveuglez 100 créatures ou plus d'un coup avec une fusée de détresse # BLOCK NAMES# CHALLENGE LEVELS botania.challengelevel.easy=Facile @@ -407,7 +407,7 @@ botania.challengelevel.lunatic=Lunatique # CHALLENGE TEXT botania.challenge.flowerFarm=Ferme de fleurs -botania.challenge.flowerFarm.desc=Créez une ferme automatisée des 16 couleurs complètes de fleurs botania flowers. Point bonus si les fleurs sont triées. +botania.challenge.flowerFarm.desc=Créer une ferme automatisée des 16 couleurs complètes de fleurs botania flowers. Point bonus si les fleurs sont triées. botania.challenge.recordFarm=Ferme de disques botania.challenge.reedFarm=Ferme de canne à sucre botania.challenge.cobbleGen=Générateur de pierre @@ -1374,7 +1374,7 @@ botania.entry.arcanerose=Rosa Arcana # -- CONJURING WITH MANA botania.entry.manaConjuration=Conjurer avec le mana -botania.page.manaConjuration0=Similaira à la capacité de &4Alchemie avec le mana&0, a catalyst also exists for &4Conjuration&0, the magic of materializing resources from magical energy only. The mechanism works in a similar way to the &1Alchemy Catalyst&0 where one tosses an item into the pool with the catalyst below. +botania.page.manaConjuration0=Similaire à la capacité de &4Alchemie avec le mana&0, a catalyst also exists for &4Conjuration&0, the magic of materializing resources from magical energy only. The mechanism works in a similar way to the &1Alchemy Catalyst&0 where one tosses an item into the pool with the catalyst below. botania.page.manaConjuration1=Creating the catalyst botania.page.manaConjuration2=Conjurer la &1Redstone&0 botania.page.manaConjuration3=Conjurer la &1Glowstone&0 @@ -1389,7 +1389,7 @@ botania.page.manaConjuration10=Conjurer les &1Feuilles&0 # -- SPECTRAL RAIL botania.entry.ghostRail=Rail spectral botania.page.ghostRail0=Utiliser une &1Plateforme spectral&0 comme un composant de &1Rail&0 donne quelques habilités interressantes au &1Chariot&0 qui passerai à travers lui : lorsqu'il est éjecté de ce rail, le chariot flotte un instant, il sera aussi capable de passer à travers les murs.
    Cet effet s'arrêtera si le chariot atterri sur un rail ou rentre en collision avec n'importe quelle variété de &1Boisrève&0. -botania.page.ghostRail1=Voie de l'esprit, pourriez-vous dire +botania.page.ghostRail1=Voie de l'esprit, vous pourriez dire # -- DRUM OF THE CANOPY botania.entry.canopyDrum=Tambour de la canopée @@ -1400,14 +1400,14 @@ botania.page.canopyDrum1=Émondage avec style # -- MANA BLASTER botania.entry.manaBlaster=Exploseur de mana -# -- ROD OF BIFROST +# -- BÂTON DU BIFROST botania.entry.rainbowRod=Bâton du Bifrost -# -- ROD OF THE SKIES +# -- BÂTON DES CIEUX botania.entry.tornadoRod=Bâton des cieux -# -- ROD OF THE HELLS +# -- BÂTON DES ENFERS botania.entry.fireRod=Bâton des enfers -# -- ROD OF THE HIGHLANDS +# -- BÂTON DES HAUTES TERRES botania.entry.skyDirtRod=Bâton des hautes-terres From 5f35b8aef0d473979429493c545057b2242e4925 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 9 Jun 2016 20:49:49 -0500 Subject: [PATCH 681/935] Readd old overrides, not working because of forge bug --- .../botania/common/item/ItemManaGun.java | 7 +- .../assets/botania/models/item/manaGun.json | 87 ++++---- .../botania/models/item/manaGunClip.json | 201 +++++++++++++++++- .../botania/models/item/manaGunOld.json | 28 --- 4 files changed, 250 insertions(+), 73 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/item/manaGunOld.json diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 2622ea423..d222d1f8c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -14,15 +14,18 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -73,7 +76,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); - /*addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { + addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { @Override public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return hasClip(itemStack) ? 1 : 0; @@ -84,7 +87,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; } - })*/; + }); } @Nonnull diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 34d3cccff..678d3ca53 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -3,14 +3,13 @@ "textures": { "layer0": "botania:items/manaBlaster", "layer1": "botania:items/manaBlasterColor", - "layer2": "botania:items/manaBlasterGlass", - "layer3": "botania:items/manaBlasterLensClip" + "layer2": "botania:items/manaBlasterGlass" }, "elements": [ { "name": "Barrel1", - "from": [ -10.0, 5.0, 5.5 ], - "to": [ -3.0, 14.0, 10.5 ], + "from": [ -10.0, 5.0, 5.5 ], + "to": [ -3.0, 14.0, 10.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, @@ -22,8 +21,8 @@ }, { "name": "Barrel2", - "from": [ -3.0, 5.0, 5.5 ], - "to": [ 7.0, 9.0, 10.5 ], + "from": [ -3.0, 5.0, 5.5 ], + "to": [ 7.0, 9.0, 10.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, @@ -33,8 +32,8 @@ }, { "name": "Barrel3", - "from": [ 7.0, 5.0, 5.5 ], - "to": [ 10.0, 14.0, 10.5 ], + "from": [ 7.0, 5.0, 5.5 ], + "to": [ 10.0, 14.0, 10.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, @@ -46,8 +45,8 @@ }, { "name": "Barrel4", - "from": [ 10.0, 12.0, 5.5 ], - "to": [ 18.0, 14.0, 10.5 ], + "from": [ 10.0, 12.0, 5.5 ], + "to": [ 18.0, 14.0, 10.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, @@ -58,8 +57,8 @@ }, { "name": "Barrel5", - "from": [ 10.0, 9.0, 5.5 ], - "to": [ 18.0, 11.0, 10.5 ], + "from": [ 10.0, 9.0, 5.5 ], + "to": [ 18.0, 11.0, 10.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, @@ -70,8 +69,8 @@ }, { "name": "Strap", - "from": [ 14.0, -5.0, 6.5 ], - "to": [ 19.0, 9.0, 9.5 ], + "from": [ 14.0, -5.0, 6.5 ], + "to": [ 19.0, 9.0, 9.5 ], "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, "faces": { "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, @@ -83,8 +82,8 @@ }, { "name": "Magazine", - "from": [ 12.5, -6.0, 7.0 ], - "to": [ 18.5, -5.0, 9.0 ], + "from": [ 12.5, -6.0, 7.0 ], + "to": [ 18.5, -5.0, 9.0 ], "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, "faces": { "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, @@ -97,8 +96,8 @@ }, { "name": "Trigger Guard1", - "from": [ 10.0, 6.0, 7.0 ], - "to": [ 16.0, 7.0, 9.0 ], + "from": [ 10.0, 6.0, 7.0 ], + "to": [ 16.0, 7.0, 9.0 ], "faces": { "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, @@ -108,8 +107,8 @@ }, { "name": "Trigger", - "from": [ 13.0, 7.0, 7.5 ], - "to": [ 16.0, 9.0, 8.5 ], + "from": [ 13.0, 7.0, 7.5 ], + "to": [ 16.0, 9.0, 8.5 ], "faces": { "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, @@ -118,8 +117,8 @@ }, { "name": "Trigger Guard2", - "from": [ 10.0, 7.0, 7.0 ], - "to": [ 11.0, 9.0, 9.0 ], + "from": [ 10.0, 7.0, 7.0 ], + "to": [ 11.0, 9.0, 9.0 ], "faces": { "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, @@ -128,8 +127,8 @@ }, { "name": "Colorizer", - "from": [ 9.5, 11.0, 6.0 ], - "to": [ 17.5, 12.0, 10.0 ], + "from": [ 9.5, 11.0, 6.0 ], + "to": [ 17.5, 12.0, 10.0 ], "faces": { "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, @@ -138,8 +137,8 @@ }, { "name": "Glass", - "from": [ -3.5, 9.5, 6.0 ], - "to": [ 7.5, 13.5, 10.0 ], + "from": [ -3.5, 9.5, 6.0 ], + "to": [ 7.5, 13.5, 10.0 ], "faces": { "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, @@ -147,19 +146,6 @@ "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } } - }, - { - "name": "Clip", - "from": [ -4.5, 2.0, 5.0 ], - "to": [ 8.5, 8.0, 11.0 ], - "faces": { - "north": { "texture": "layer3", "uv": [ 0.01, 6.51, 6.5, 9.49 ] }, - "east": { "texture": "layer3", "uv": [ 6.01, 0.0, 9.0, 3.0 ] }, - "south": { "texture": "layer3", "uv": [ 6.5, 6.5, 0.01, 9.5 ] }, - "west": { "texture": "layer3", "uv": [ 6.0, 3.0, 9.0, 6.0 ] }, - "up": { "texture": "layer3", "uv": [ 0.0, 0.01, 3.0, 6.5 ], "rotation": 90 }, - "down": { "texture": "layer3", "uv": [ 3.0, 0.01, 6.0, 6.5 ], "rotation": 90 } - } } ], "display": { @@ -198,5 +184,26 @@ "translation": [ -1.8, 2.5, 0 ], "scale": [ 0.45, 0.45, 0.45 ] } - } + }, + "overrides": [ + { + "predicate": { + "botania:clip": 1 + }, + "model": "botania:item/manaGunClip" + }, + { + "predicate": { + "botania:desu": 1 + }, + "model": "botania:item/desuGun" + }, + { + "predicate": { + "botania:desu": 1, + "botania:clip": 1 + }, + "model": "botania:item/desuGunClip" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json index 4758d1c14..f13aec897 100644 --- a/src/main/resources/assets/botania/models/item/manaGunClip.json +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -1,7 +1,202 @@ { - "parent": "minecraft:item/handheld", + "__comment": "Author: wiiv", "textures": { - "layer0": "botania:items/manaGun2", - "layer1": "botania:items/manaGun1" + "layer0": "botania:items/manaBlaster", + "layer1": "botania:items/manaBlasterColor", + "layer2": "botania:items/manaBlasterGlass", + "layer3": "botania:items/manaBlasterLensClip" + }, + "elements": [ + { + "name": "Barrel1", + "from": [ -10.0, 5.0, 5.5 ], + "to": [ -3.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, + "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, + "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, + "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel2", + "from": [ -3.0, 5.0, 5.5 ], + "to": [ 7.0, 9.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, + "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, + "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } + } + }, + { + "name": "Barrel3", + "from": [ 7.0, 5.0, 5.5 ], + "to": [ 10.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } + } + }, + { + "name": "Barrel4", + "from": [ 10.0, 12.0, 5.5 ], + "to": [ 18.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel5", + "from": [ 10.0, 9.0, 5.5 ], + "to": [ 18.0, 11.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } + } + }, + { + "name": "Strap", + "from": [ 14.0, -5.0, 6.5 ], + "to": [ 19.0, 9.0, 9.5 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, + "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, + "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } + } + }, + { + "name": "Magazine", + "from": [ 12.5, -6.0, 7.0 ], + "to": [ 18.5, -5.0, 9.0 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, + "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, + "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, + "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } + } + }, + { + "name": "Trigger Guard1", + "from": [ 10.0, 6.0, 7.0 ], + "to": [ 16.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, + "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } + } + }, + { + "name": "Trigger", + "from": [ 13.0, 7.0, 7.5 ], + "to": [ 16.0, 9.0, 8.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } + } + }, + { + "name": "Trigger Guard2", + "from": [ 10.0, 7.0, 7.0 ], + "to": [ 11.0, 9.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, + "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } + } + }, + { + "name": "Colorizer", + "from": [ 9.5, 11.0, 6.0 ], + "to": [ 17.5, 12.0, 10.0 ], + "faces": { + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } + } + }, + { + "name": "Glass", + "from": [ -3.5, 9.5, 6.0 ], + "to": [ 7.5, 13.5, 10.0 ], + "faces": { + "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, + "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, + "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, + "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, + "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } + } + }, + { + "name": "Clip", + "from": [ -4.5, 2.0, 5.0 ], + "to": [ 8.5, 8.0, 11.0 ], + "faces": { + "north": { "texture": "layer3", "uv": [ 0.01, 6.51, 6.5, 9.49 ] }, + "east": { "texture": "layer3", "uv": [ 6.01, 0.0, 9.0, 3.0 ] }, + "south": { "texture": "layer3", "uv": [ 6.5, 6.5, 0.01, 9.5 ] }, + "west": { "texture": "layer3", "uv": [ 6.0, 3.0, 9.0, 6.0 ] }, + "up": { "texture": "layer3", "uv": [ 0.0, 0.01, 3.0, 6.5 ], "rotation": 90 }, + "down": { "texture": "layer3", "uv": [ 3.0, 0.01, 6.0, 6.5 ], "rotation": 90 } + } + } + ], + "display": { + "gui": { + "rotation": [ 0, -20, -40 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 10, 80, -5 ], + "translation": [ 0.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "firstperson_righthand": { + "rotation": [ 10, -80, 5 ], + "translation": [ -1.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunOld.json b/src/main/resources/assets/botania/models/item/manaGunOld.json deleted file mode 100644 index fa04ed4ee..000000000 --- a/src/main/resources/assets/botania/models/item/manaGunOld.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/manaGun0", - "layer1": "botania:items/manaGun1" - }, - "overrides": [ - { - "predicate": { - "botania:clip": 1 - }, - "model": "botania:item/manaGunClip" - }, - { - "predicate": { - "botania:desu": 1 - }, - "model": "botania:item/desuGun" - }, - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" - } - ] -} \ No newline at end of file From 491452ac7bd654abb349bb596519b95218985a26 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Fri, 10 Jun 2016 16:56:39 -0400 Subject: [PATCH 682/935] Fix all outstanding auxiliary renders. close #49 until the next time renders break --- .../botania/api/item/IBaubleRender.java | 35 +- .../equipment/bauble/ItemBaubleCosmetic.java | 426 +++++++++--------- .../equipment/bauble/ItemGoldenLaurel.java | 7 +- .../item/equipment/bauble/ItemMonocle.java | 10 +- 4 files changed, 247 insertions(+), 231 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 43d0e5359..aa37cb72f 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -35,27 +35,58 @@ public interface IBaubleRender { /** * A few helper methods for the render. */ - public static class Helper { + final class Helper { + /** + * Rotates the render for a bauble correctly if the player is sneaking. + * Use for renders under {@link RenderType#BODY}. + */ public static void rotateIfSneaking(EntityPlayer player) { if(player.isSneaking()) applySneakingRotation(); } + /** + * Rotates the render for a bauble correctly for a sneaking player. + * Use for renders under {@link RenderType#BODY}. + */ public static void applySneakingRotation() { GlStateManager.translate(0F, 0.2F, 0F); GlStateManager.rotate(90F / (float) Math.PI, 1.0F, 0.0F, 0.0F); } + /** + * Shifts the render for a bauble correctly to the head, including sneaking rotation. + * Use for renders under {@link RenderType#HEAD}. + */ public static void translateToHeadLevel(EntityPlayer player) { GlStateManager.translate(0, -player.getDefaultEyeHeight(), 0); if (player.isSneaking()) GlStateManager.translate(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F); } + /** + * Shifts the render for a bauble correctly to the face. + * Use for renders under {@link RenderType#HEAD}, and usually after calling {@link Helper#translateToHeadLevel(EntityPlayer)}. + */ + public static void translateToFace() { + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(0f, -1.6f, -0.35f); + } + + /** + * Shifts the render for a bauble correctly to the chest. + * Use for renders under {@link RenderType#BODY}, and usually after calling {@link Helper#rotateIfSneaking(EntityPlayer)}. + */ + public static void translateToChest() { + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(0F, -0.3F, 0.0825F); + } + } - public static enum RenderType { + enum RenderType { /** * Render Type for the player's body, translations apply on the player's rotation. * Sneaking is not handled and should be done during the render. 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 78e22c18d..157974219 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 @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Feb 22, 2015, 2:01:01 PM (GMT)] */ package vazkii.botania.common.item.equipment.bauble; @@ -44,8 +44,19 @@ import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { + private enum Variants { + BLACK_BOWTIE, BLACK_TIE, RED_GLASSES, PUFFY_SCARF, + ENGINEER_GOGGLES, EYEPATCH, WICKED_EYEPATCH, RED_RIBBONS, + PINK_FLOWER_BUD, POLKA_DOTTED_BOWS, BLUE_BUTTERFLY, CAT_EARS, + WITCH_PIN, DEVIL_TAIL, KAMUI_EYE, GOOGLY_EYES, + FOUR_LEAF_CLOVER, CLOCK_EYE, UNICORN_HORN, DEVIL_HORNS, + HYPER_PLUS, BOTANIST_EMBLEM, ANCIENT_MASK, EERIE_MASK, + ALIEN_ANTENNA, ANAGLYPH_GLASSES, ORANGE_SHADES, GROUCHO_GLASSES, + THICK_EYEBROWS, LUSITANIC_SHIELD, TINY_POTATO_MASK, QUESTGIVER_MARK + } + private static final int SUBTYPES = 32; - private final ItemStack renderStack; + private ItemStack renderStack; public ItemBaubleCosmetic() { super(LibItemNames.COSMETIC); @@ -85,243 +96,214 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - if(type == RenderType.HEAD) { + + renderStack = stack; + + if (stack.getItemDamage() >= 32 || stack.getItemDamage() < 0) return; + Variants variant = Variants.values()[stack.getItemDamage()]; + + if (type == RenderType.HEAD) { Helper.translateToHeadLevel(player); - switch(stack.getItemDamage()) { - case 2: - faceTranslate(); - GlStateManager.translate(0F, 0F, 0.045F); - renderIcon(2); - break; - case 4: - faceTranslate(); - GlStateManager.translate(0F, 0F, 0.045F); - renderIcon(4); - break; - case 5: - faceTranslate(); - scale(0.35F); - GlStateManager.translate(-0.3F, 0.2F, -0.5F); - renderIcon(5); - break; - case 6: - faceTranslate(); - scale(0.45F); - GlStateManager.translate(0.2F, 0.2F, -0.4F); - renderIcon(6); - break; - case 7: - faceTranslate(); - scale(0.9F); - GlStateManager.translate(0F, -0.4F, -0.42F); - renderIcon(7); - break; - case 8: - faceTranslate(); - GlStateManager.rotate(-90F, 0F, 0F, 1F); - GlStateManager.translate(0F, 0.1F, -0.2F); - renderIcon(8); - break; - case 9: - faceTranslate(); - GlStateManager.rotate(-90F, 0F, 0F, 1F); - GlStateManager.translate(0F, 0.1F, -0.1F); - renderIcon(9); - GlStateManager.translate(0F, -0.45F, 0F); - renderIcon(9); - break; - case 10: - faceTranslate(); - GlStateManager.rotate(-90F, 0F, 0F, 1F); - scale(0.6F); - GlStateManager.translate(0F, 0.25F, -0.4F); + Helper.translateToFace(); + switch (variant) { + case RED_GLASSES: + GlStateManager.translate(0F, 0.01F, 0.045F); + renderItem(); + break; + case ENGINEER_GOGGLES: + GlStateManager.translate(0F, 0.01F, 0.045F); + renderItem(); + break; + case EYEPATCH: + scale(0.35F); + GlStateManager.translate(-0.3F, 0.4F, 0.1F); + renderItem(); + break; + case WICKED_EYEPATCH: + scale(0.45F); + GlStateManager.translate(0.2F, 0.2F, -0.4F); + renderItem(); + break; + case RED_RIBBONS: + scale(0.9F); + GlStateManager.translate(0F, 0.4F, 0.42F); + renderItem(); + break; + case PINK_FLOWER_BUD: + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.4F, 0.1F, 0.2F); + renderItem(); + break; + case POLKA_DOTTED_BOWS: + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.4F, 0.3F, 0.2F); + renderItem(); + GlStateManager.translate(0F, 0F, -0.525F); + renderItem(); + break; + case BLUE_BUTTERFLY: + GlStateManager.rotate(-90F, 0F, 0F, 1F); + renderItem(); + GlStateManager.translate(0F, 0.25F, -0.4F); - GlStateManager.pushMatrix(); - GlStateManager.translate(-0.2F, 0.15F, 0F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); - renderIcon(10); - GlStateManager.popMatrix(); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.2F, 0.15F, 0F); + GlStateManager.rotate(-45F, 0F, 0F, 1F); + renderItem(); + GlStateManager.popMatrix(); - GlStateManager.translate(0.15F, 0.3F, 0F); - GlStateManager.rotate(-135F, 0F, 0F, 1F); - renderIcon(10); - break; - case 11: - faceTranslate(); - scale(0.6F); - GlStateManager.translate(0F, 0F, -0.55F); - renderIcon(11); - break; - case 15: - faceTranslate(); - GlStateManager.translate(-0.01F, 0F, 0.05F); - renderIcon(15); - break; - case 17: - faceTranslate(); - scale(0.35F); - GlStateManager.translate(0.25F, 0.2F, -0.60F); - renderIcon(17); - break; - case 18: - faceTranslate(); - scale(0.75F); - GlStateManager.rotate(-90F, 0F, 0F, 1F); - GlStateManager.translate(-0.2F, -0.15F, -0.5F); - renderIcon(18); - break; - case 19: - faceTranslate(); - scale(0.6F); - GlStateManager.translate(0F, 0F, -0.5F); - renderIcon(19); - break; - case 20: - faceTranslate(); - scale(0.25F); - GlStateManager.translate(-0.7F, 0.3F, -1.5F); - renderIcon(20); - GlStateManager.translate(1.4F, 0F, 0F); - renderIcon(20); - break; - case 22: - faceTranslate(); - renderIcon(22); - break; - case 23: - faceTranslate(); - renderIcon(23); - break; - case 24: - faceTranslate(); - scale(0.8F); - GlStateManager.translate(0F, -0.1F, -0.5F); - renderIcon(24); - break; - case 25: - faceTranslate(); - GlStateManager.translate(0F, 0F, 0.04F); - renderIcon(25); - break; - case 26: - faceTranslate(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, 0.7F); - renderIcon(26); - break; - case 27: - faceTranslate(); - scale(0.90F); - GlStateManager.translate(0F, 0F, 0.09F); - renderIcon(27); - break; - case 28: - faceTranslate(); - scale(0.25F); - GlStateManager.translate(-0.4F, 0.4F, -1.1F); - renderIcon(28); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-0.775F, -0.4F, 0.04F); - renderIcon(28); - break; - case 30: - faceTranslate(); - renderIcon(30); - break; - case 31: - faceTranslate(); - scale(0.8F); - GlStateManager.translate(0F, -0.3F, -0.75F); - renderIcon(31); - break; + GlStateManager.translate(0.15F, 0.3F, 0F); + GlStateManager.rotate(-135F, 0F, 0F, 1F); + renderItem(); + break; + case CAT_EARS: + GlStateManager.translate(0F, 0.25F, 0.25F); + renderItem(); + break; + case GOOGLY_EYES: + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.scale(1.5F, 1.5F, 1F); + GlStateManager.translate(0F, -0.05F, -0.15F); + renderItem(); + break; + case CLOCK_EYE: + scale(0.5F); + GlStateManager.translate(0.25F, 0.2F, 0.1F); + renderItem(); + break; + case UNICORN_HORN: + scale(0.75F); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.translate(0.1F, 0.4F, -0.0625F); + renderItem(); + break; + case DEVIL_HORNS: + GlStateManager.translate(0F, 0.2F, 0.25F); + renderItem(); + break; + case HYPER_PLUS: + scale(0.3125F); + GlStateManager.translate(-0.7F, 1.5F, 0.3F); + renderItem(); + GlStateManager.translate(1.4F, 0F, 0F); + renderItem(); + break; + case ANCIENT_MASK: + scale(1.25F); + GlStateManager.translate(0F, 0.025F, 0.01F); + renderItem(); + break; + case EERIE_MASK: + GlStateManager.translate(0F, 0.05F, 0F); + renderItem(); + break; + case ALIEN_ANTENNA: + scale(0.8F); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0F, 0.5F, -0.85F); + renderItem(); + break; + case ANAGLYPH_GLASSES: + scale(1.25F); + GlStateManager.translate(0F, -0.025F, 0F); + renderItem(); + break; + case ORANGE_SHADES: + GlStateManager.translate(0F, 0.04F, 0F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1F, 1F, 1F, 0.7F); + renderItem(); + break; + case GROUCHO_GLASSES: + scale(0.90F); + GlStateManager.translate(0F, -0.035F, 0F); + renderItem(); + break; + case THICK_EYEBROWS: + scale(0.35F); + GlStateManager.translate(-0.4F, 0.6F, 0.2F); + renderItem(); + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(-0.775F, 0.2F, 0F); + renderItem(); + break; + case TINY_POTATO_MASK: + scale(1.25F); + GlStateManager.translate(0F, 0.025F, 0F); + renderItem(); + break; + case QUESTGIVER_MARK: + scale(0.8F); + GlStateManager.translate(0F, 0.75F, 0.3F); + renderItem(); + break; } } else { Helper.rotateIfSneaking(player); - switch(stack.getItemDamage()) { - case 0: - chestTranslate(); - renderIcon(0); - break; - case 1: - chestTranslate(); - GlStateManager.translate(0F, 0F, 0.2F); - renderIcon(1); - break; - case 3: - chestTranslate(); - GlStateManager.translate(0F, 0F, 0.15F); - renderIcon(3); - break; - case 12: - chestTranslate(); - scale(0.225F); - GlStateManager.translate(-0.725F, 0.45F, -0.6F); - renderIcon(12); - break; - case 13: - chestTranslate(); - GlStateManager.rotate(-90F, 0F, 0F, 1F); - GlStateManager.translate(0.33F, -0.15F, 0.55F); - renderIcon(13); - break; - case 14: - chestTranslate(); - scale(0.9F); - GlStateManager.translate(0.45F, 0.05F, -0.1F); - renderIcon(14); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(0.9F, -0.25F, 0F); - renderKamuiBlack(); - break; - case 16: - chestTranslate(); - scale(0.225F); - GlStateManager.translate(0.725F, 0.45F, -0.6F); - renderIcon(16); - break; - case 21: - chestTranslate(); - scale(0.5F); - GlStateManager.translate(0F, 0.15F, 0.32F); - renderIcon(21); - break; - case 29: - chestTranslate(); - GlStateManager.translate(0.05F, -0.25F, 0.25F); - GlStateManager.rotate(8F, 0F, 1F, 0F); - renderIcon(29); - break; + Helper.translateToChest(); + switch (variant) { + case BLACK_BOWTIE: + renderItem(); + break; + case BLACK_TIE: + GlStateManager.translate(0F, -0.15F, 0F); + renderItem(); + break; + case PUFFY_SCARF: + GlStateManager.translate(0F, -0.15F, 0F); + renderItem(); + break; + case WITCH_PIN: + scale(0.35F); + GlStateManager.translate(-0.35F, 0.35F, 0.15F); + renderItem(); + break; + case DEVIL_TAIL: + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.translate(0.25F, -0.4F, -0.055F); + renderItem(); + break; + case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY + scale(0.9F); + GlStateManager.translate(0.45F, 0.2F, -0.1F); + renderItem(); + GlStateManager.rotate(180F, 0F, 0F, 1F); + GlStateManager.rotate(180F, 1F, 0F, 0F); + GlStateManager.translate(0.9F, -0.225F, -0.18F); + renderKamuiBlack(); + break; + case FOUR_LEAF_CLOVER: + scale(0.35F); + GlStateManager.translate(-0.35F, 0.35F, 0.15F); + renderItem(); + break; + case BOTANIST_EMBLEM: + scale(0.5F); + GlStateManager.translate(0.2F, 0.125F, 0.05F); + renderItem(); + break; + case LUSITANIC_SHIELD: + GlStateManager.rotate(180F, 0F, 1F, 0F); + GlStateManager.translate(0.035F, -0.2F, 0.175F); + GlStateManager.rotate(8F, 0F, 0F, 1F); + renderItem(); + break; } } } - public void faceTranslate() { - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.rotate(-90F, 1F, 0F, 0F); - GlStateManager.scale(1.25F, 1.25F, 1.25F); - GlStateManager.translate(0F, 0.10F, 1.45F); - } - - public void chestTranslate() { - GlStateManager.translate(0F, 0.5F, 0F); - GlStateManager.rotate(-90F, 1F, 0F, 0F); - } - public void scale(float f) { GlStateManager.scale(f, f, f); } - @SuppressWarnings("deprecation") - public void renderIcon(int i) { + public void renderItem() { GlStateManager.pushMatrix(); - renderStack.setItemDamage(i); - Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); GlStateManager.popMatrix(); } public void renderKamuiBlack() { - renderStack.setItemDamage(14); // Modified copy of RenderItem.renderItem(stack, transformtype) Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); @@ -334,7 +316,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); - model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false); // todo 1.9 + model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false); GlStateManager.translate(-0.5F, -0.1F, -0.4F); this.renderModel(model, renderStack, 0xFF00004C); 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 87b5ca131..dd2173972 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 @@ -69,13 +69,14 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + GlStateManager.translate(-0.35F, 1.1F, 0); 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); + GlStateManager.scale(1.625F, 1.625F, 1.625F); + GlStateManager.rotate(-80F, 1F, 0F, 0F); if(armor) { GlStateManager.scale(1.1F, 1.1F, 1.1F); } - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); } } } 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 65220e839..11d0982f5 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 @@ -52,12 +52,14 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; - Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + + Helper.translateToHeadLevel(player); + Helper.translateToFace(); + GlStateManager.rotate(180F, 0F, 1F, 0F); 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); - Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9 + GlStateManager.translate(0.32F, 0.125F, armor ? -0.13F : -0.25F); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); } } From 27410530d6181a299f5940e5e26deb9a5d7d5c2e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jun 2016 19:18:28 -0500 Subject: [PATCH 683/935] Tweak horn sidings --- .../common/block/mana/BlockForestDrum.java | 13 +++++++------ .../botania/common/item/ItemGrassHorn.java | 16 ++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) 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 e6474d123..f449840da 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -115,12 +115,16 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; + if(world.isRemote) { + world.spawnParticle(EnumParticleTypes.NOTE, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5D, 1.0 / 24.0, 0, 0); + return; + } DrumVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.DRUM_VARIANT); if(variant == DrumVariant.WILD) ItemGrassHorn.breakGrass(world, null, 0, pos); else if(variant == DrumVariant.CANOPY) ItemGrassHorn.breakGrass(world, null, 1, pos); - else if(!world.isRemote) { + else { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); List shearables = new ArrayList<>(); @@ -166,11 +170,8 @@ 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); - else world.spawnParticle(EnumParticleTypes.NOTE, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5D, 1.0 / 24.0, 0, 0); - + for(int i = 0; i < 10; i++) + world.playSound(null, pos, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 4bed500cd..6c3e84917 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -59,11 +59,7 @@ public class ItemGrassHorn extends ItemMod { @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } @Nonnull @@ -86,11 +82,11 @@ public class ItemGrassHorn extends ItemMod { @Override public void onUsingTick(ItemStack stack, EntityLivingBase player, int time) { - if(time != getMaxItemUseDuration(stack) && time % 5 == 0) - breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); - - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote) { + if(time != getMaxItemUseDuration(stack) && time % 5 == 0) + breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); 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) { @@ -121,7 +117,7 @@ public class ItemGrassHorn extends ItemMod { if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); - else if(!world.isRemote) { + else { world.setBlockToAir(currCoords); if(ConfigHandler.blockBreakParticles) world.playEvent(2001, currCoords, Block.getStateId(state)); From 873aedf4e565ae5955c13ef5f54059c5f1e8ee78 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jun 2016 19:31:11 -0500 Subject: [PATCH 684/935] Fix #332 --- .../botania/common/block/BlockOpenCrate.java | 7 ++++--- .../botania/common/block/tile/TileCraftCrate.java | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 0b7985176..15a54cb16 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -123,9 +123,10 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, par1World, state, pos); + if (!par1World.isRemote) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + InventoryHelper.dropInventory(inv, par1World, state, pos); + } super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 2756e1463..c69fc2482 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -70,7 +70,7 @@ public class TileCraftCrate extends TileOpenCrate { private static final String TAG_PATTERN = "pattern"; public int pattern = -1; - int signal = 0; + private int signal = 0; @Override public int getSizeInventory() { @@ -117,7 +117,7 @@ public class TileCraftCrate extends TileOpenCrate { } } - boolean craft(boolean fullCheck) { + private boolean craft(boolean fullCheck) { if(fullCheck && !isFull()) return false; @@ -163,14 +163,14 @@ public class TileCraftCrate extends TileOpenCrate { return true; } - void ejectAll() { + private void ejectAll() { for(int i = 0; i < getSizeInventory(); ++i) { ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) eject(stack, false); itemHandler.setStackInSlot(i, null); - markDirty(); } + markDirty(); } @Override @@ -187,8 +187,10 @@ public class TileCraftCrate extends TileOpenCrate { @Override public boolean onWanded(EntityPlayer player, ItemStack stack) { - craft(false); - ejectAll(); + if(!player.worldObj.isRemote) { + craft(false); + ejectAll(); + } return true; } From 5ac09b830d87a480a7af66295dbbe3372429887e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jun 2016 19:52:05 -0500 Subject: [PATCH 685/935] Some net stuff for later --- .../common/core/helper/MathHelper.java | 19 +++++++++++++++++++ .../common/network/PacketBotaniaEffect.java | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index be297b5b1..5f5357a65 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -16,6 +16,25 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { + public static int[] doubleArrayToIntArray(double[] doubles) { + int[] ret = new int[doubles.length * 2]; + for (int i = 0; i < doubles.length; i++) { + long l = Double.doubleToLongBits(doubles[i]); + ret[i] = (int) (l >>> 32); + ret[i + 1] = (int) l; + } + return ret; + } + + public static double[] intArrayToDoubleArray(int[] ints) { + double[] ret = new double[ints.length / 2]; + for (int i = 0; i < ints.length; i += 2) { + long l = ((long) ints[i]) << 32 | ints[i + 1]; + ret[i / 2] = Double.longBitsToDouble(l); + } + return ret; + } + public static float pointDistanceSpace(BlockPos p1, BlockPos p2) { return pointDistanceSpace(p1.getX(), p1.getY(), p1.getZ(), p2.getX(), p2.getY(), p2.getZ()); } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 9800b09dc..892e0c25b 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityDoppleganger; @@ -35,6 +36,10 @@ public class PacketBotaniaEffect implements IMessage { this.args = args; } + public PacketBotaniaEffect(EffectType type, double x, double y, double z, double... args) { + this(type, x, y, z, MathHelper.doubleArrayToIntArray(args)); + } + @Override public void fromBytes(ByteBuf buf) { type = EffectType.values()[buf.readShort()]; From c289edd8257bdcfd8db6d3be0451ab4f295f030c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jun 2016 20:31:34 -0500 Subject: [PATCH 686/935] Serverside normal sparks --- .../botania/common/entity/EntitySpark.java | 126 +++++++----------- .../common/network/PacketBotaniaEffect.java | 62 ++++++++- .../botania/common/network/PacketHandler.java | 5 + 3 files changed, 112 insertions(+), 81 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index b9496db0e..b51cb1741 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -33,14 +33,16 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; -import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -54,10 +56,9 @@ public class EntitySpark extends Entity implements ISparkEntity { public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); - final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); + private final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); - int removeTransferants = 2; - final boolean firstTick = false; + private int removeTransferants = 2; public EntitySpark(World world) { super(world); @@ -75,23 +76,23 @@ public class EntitySpark extends Entity implements ISparkEntity { public void onUpdate() { super.onUpdate(); + if(worldObj.isRemote) + return; + ISparkAttachable tile = getAttachedTile(); if(tile == null) { - if(!worldObj.isRemote) - setDead(); + setDead(); return; } - boolean first = worldObj.isRemote && !firstTick; SparkUpgradeType upgrade = getUpgrade(); List allSparks = null; - if(first || upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) + if(upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); Collection transfers = getTransfers(); - if(upgrade != SparkUpgradeType.NONE) { - switch(upgrade) { + switch(upgrade) { case DISPERSIVE : { List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); @@ -158,7 +159,7 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } - case RECESSIVE : { // Recessive + case RECESSIVE : { for(ISparkEntity spark : allSparks) { if(spark == this) continue; @@ -169,7 +170,8 @@ public class EntitySpark extends Entity implements ISparkEntity { } break; } - } + case NONE: + default: break; } if(!transfers.isEmpty()) { @@ -197,51 +199,20 @@ public class EntitySpark extends Entity implements ISparkEntity { if(removeTransferants > 0) removeTransferants--; - getTransfers(); + filterTransfers(); } - void particlesTowards(Entity e) { - Vector3 thisVec = Vector3.fromEntityCenter(this).add(0, 0, 0); - Vector3 receiverVec = Vector3.fromEntityCenter(e).add(0, 0, 0); - - double rc = 0.45; - thisVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - receiverVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - - Vector3 motion = receiverVec.copy().sub(thisVec); - motion.multiply(0.04F); - float r = 0.4F + 0.3F * (float) Math.random(); - float g = 0.4F + 0.3F * (float) Math.random(); - float b = 0.4F + 0.3F * (float) Math.random(); - float size = 0.125F + 0.125F * (float) Math.random(); - - Botania.proxy.wispFX(worldObj, thisVec.x, thisVec.y, thisVec.z, r, g, b, size, (float) motion.x, (float) motion.y, (float) motion.z); + private void particlesTowards(Entity e) { + PacketHandler.sendToNearby(worldObj, this, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_MANA_FLOW, posX, posY, posZ, + getEntityId(), e.getEntityId())); } public static void particleBeam(Entity e1, Entity e2) { - if(e1 == null || e2 == null) - return; - - Vector3 orig = new Vector3(e1.posX , e1.posY + 0.25, e1.posZ); - Vector3 end = new Vector3(e2.posX, e2.posY + 0.25, e2.posZ); - Vector3 diff = end.copy().sub(orig); - Vector3 movement = diff.copy().normalize().multiply(0.1); - int iters = (int) (diff.mag() / movement.mag()); - float huePer = 1F / iters; - float hueSum = (float) Math.random(); - - Vector3 currentPos = orig.copy(); - for(int i = 0; i < iters; i++) { - float hue = i * huePer + hueSum; - Color color = Color.getHSBColor(hue, 1F, 1F); - float r = Math.min(1F, color.getRed() / 255F + 0.4F); - float g = Math.min(1F, color.getGreen() / 255F + 0.4F); - float b = Math.min(1F, color.getBlue() / 255F + 0.4F); - - Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(e1.worldObj, currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); - Botania.proxy.setSparkleFXNoClip(false); - currentPos.add(movement); + if(e1 != null && e2 != null && !e1.worldObj.isRemote) { + PacketHandler.sendToNearby(e1.worldObj, e1, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ, + e1.getEntityId(), e2.getEntityId())); } } @@ -253,19 +224,23 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { if(stack != null) { + if(worldObj.isRemote) + return stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade + || stack.getItem() == ModItems.phantomInk; + SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { if(upgrade != SparkUpgradeType.NONE) { - if(!worldObj.isRemote) - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); + if (worldObj.isRemote) + System.out.println("WTF"); + entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); setUpgrade(SparkUpgradeType.NONE); transfers.clear(); removeTransferants = 2; } else setDead(); - if(player.worldObj.isRemote) - player.swingArm(hand); + player.swingArm(hand); return true; } else { List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); @@ -277,22 +252,15 @@ public class EntitySpark extends Entity implements ISparkEntity { int newUpgrade = stack.getItemDamage() + 1; setUpgrade(SparkUpgradeType.values()[newUpgrade]); stack.stackSize--; - if(player.worldObj.isRemote) - player.swingArm(hand); + player.swingArm(hand); + return true; + } else if (stack.getItem() == ModItems.phantomInk) { + int invis = dataManager.get(INVISIBILITY); + dataManager.set(INVISIBILITY, ~invis & 1); return true; } } - return doPhantomInk(stack); - } - - public boolean doPhantomInk(ItemStack stack) { - if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataManager.get(INVISIBILITY); - dataManager.set(INVISIBILITY, ~invis & 1); - return true; - } - return false; } @@ -331,12 +299,10 @@ public class EntitySpark extends Entity implements ISparkEntity { return null; } - - @Override - public Collection getTransfers() { - Collection removals = new ArrayList<>(); - - for(ISparkEntity spark : transfers) { + private void filterTransfers() { + Iterator iter = transfers.iterator(); + while (iter.hasNext()) { + ISparkEntity spark = iter.next(); SparkUpgradeType upgr = getUpgrade(); SparkUpgradeType supgr = spark.getUpgrade(); ISparkAttachable atile = spark.getAttachedTile(); @@ -345,12 +311,13 @@ public class EntitySpark extends Entity implements ISparkEntity { && !spark.areIncomingTransfersDone() && atile != null && !atile.isFull() && (upgr == SparkUpgradeType.NONE && supgr == SparkUpgradeType.DOMINANT || upgr == SparkUpgradeType.RECESSIVE && (supgr == SparkUpgradeType.NONE || supgr == SparkUpgradeType.DISPERSIVE) || !(atile instanceof IManaPool)))) - removals.add(spark); + iter.remove(); } + } - if(!removals.isEmpty()) - transfers.removeAll(removals); - + @Override + public Collection getTransfers() { + filterTransfers(); return transfers; } @@ -380,8 +347,7 @@ public class EntitySpark extends Entity implements ISparkEntity { ISparkAttachable tile = getAttachedTile(); if(tile instanceof IManaPool) return removeTransferants > 0; - - return tile != null && tile.areIncomingTranfersDone(); + return tile != null && tile.areIncomingTranfersDone(); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 892e0c25b..951c08644 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -18,6 +18,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityDoppleganger; +import java.awt.*; + public class PacketBotaniaEffect implements IMessage { private EffectType type; @@ -137,6 +139,62 @@ public class PacketBotaniaEffect implements IMessage { } break; } + case SPARK_NET_INDICATOR: { + Entity e1 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); + Entity e2 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[1]); + + if(e1 == null || e2 == null) + return; + + Vector3 orig = new Vector3(e1.posX , e1.posY + 0.25, e1.posZ); + Vector3 end = new Vector3(e2.posX, e2.posY + 0.25, e2.posZ); + Vector3 diff = end.copy().sub(orig); + Vector3 movement = diff.copy().normalize().multiply(0.1); + int iters = (int) (diff.mag() / movement.mag()); + float huePer = 1F / iters; + float hueSum = (float) Math.random(); + + Vector3 currentPos = orig.copy(); + for(int i = 0; i < iters; i++) { + float hue = i * huePer + hueSum; + Color color = Color.getHSBColor(hue, 1F, 1F); + float r = Math.min(1F, color.getRed() / 255F + 0.4F); + float g = Math.min(1F, color.getGreen() / 255F + 0.4F); + float b = Math.min(1F, color.getBlue() / 255F + 0.4F); + + Botania.proxy.setSparkleFXNoClip(true); + Botania.proxy.sparkleFX(e1.worldObj, currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); + Botania.proxy.setSparkleFXNoClip(false); + currentPos.add(movement); + } + + break; + } + case SPARK_MANA_FLOW: { + Entity e1 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); + Entity e2 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[1]); + + if(e1 == null || e2 == null) + return; + + Vector3 thisVec = Vector3.fromEntityCenter(e1).add(0, 0, 0); + Vector3 receiverVec = Vector3.fromEntityCenter(e2).add(0, 0, 0); + + double rc = 0.45; + thisVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + receiverVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + + Vector3 motion = receiverVec.copy().sub(thisVec); + motion.multiply(0.04F); + float r = 0.4F + 0.3F * (float) Math.random(); + float g = 0.4F + 0.3F * (float) Math.random(); + float b = 0.4F + 0.3F * (float) Math.random(); + float size = 0.125F + 0.125F * (float) Math.random(); + + Botania.proxy.wispFX(Minecraft.getMinecraft().theWorld, thisVec.x, thisVec.y, thisVec.z, r, g, b, + size, (float) motion.x, (float) motion.y, (float) motion.z); + break; + } } } }); @@ -150,7 +208,9 @@ public class PacketBotaniaEffect implements IMessage { POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting PAINT_LENS(1), // Arg: colour ARENA_INDICATOR(0), - ITEM_SMOKE(2); // Arg: Entity ID, number of particles + ITEM_SMOKE(2), // Arg: Entity ID, number of particles + SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards + SPARK_MANA_FLOW(2); // Arg: Entity ID from, Entity ID towards private final int argCount; diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index fbc995599..cc2634d4f 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -1,5 +1,6 @@ package vazkii.botania.common.network; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; @@ -37,6 +38,10 @@ public final class PacketHandler { } } + public static void sendToNearby(World world, Entity e, IMessage toSend) { + sendToNearby(world, new BlockPos(e), toSend); + } + public static void sendTo(EntityPlayerMP playerMP, IMessage toSend) { HANDLER.sendTo(toSend, playerMP); } From f4d7a80e496603e31a9e8e53cc825f994d236f44 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Fri, 10 Jun 2016 22:49:53 -0400 Subject: [PATCH 687/935] Fix all cosmetic baubles and use NONE --- .../botania/api/item/IBaubleRender.java | 13 ++- .../equipment/bauble/ItemBaubleCosmetic.java | 88 +++++++++---------- .../equipment/bauble/ItemGoldenLaurel.java | 5 +- .../item/equipment/bauble/ItemMonocle.java | 5 +- 4 files changed, 61 insertions(+), 50 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index aa37cb72f..6eb04fcc0 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -72,7 +72,16 @@ public interface IBaubleRender { public static void translateToFace() { GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(0f, -1.6f, -0.35f); + GlStateManager.translate(0f, -4.35f, -1.27f); + } + + /** + * Scales down the render to a correct size. + * Use for any render. + */ + public static void defaultTransforms() { + GlStateManager.translate(0.0, 3.0, 1.0); + GlStateManager.scale(0.55, 0.55, 0.55); } /** @@ -81,7 +90,7 @@ public interface IBaubleRender { */ public static void translateToChest() { GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(0F, -0.3F, 0.0825F); + GlStateManager.translate(0F, -3.2F, -0.85F); } } 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 157974219..35dc535de 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 @@ -105,55 +105,54 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { if (type == RenderType.HEAD) { Helper.translateToHeadLevel(player); Helper.translateToFace(); + Helper.defaultTransforms(); switch (variant) { case RED_GLASSES: - GlStateManager.translate(0F, 0.01F, 0.045F); + GlStateManager.scale(1.25, 1.25, 1.25); + GlStateManager.translate(0F, -0.085F, 0.045F); renderItem(); break; case ENGINEER_GOGGLES: - GlStateManager.translate(0F, 0.01F, 0.045F); + GlStateManager.scale(1.25, 1.25, 1.25); + GlStateManager.translate(0F, -0.085F, 0.045F); renderItem(); break; case EYEPATCH: - scale(0.35F); - GlStateManager.translate(-0.3F, 0.4F, 0.1F); + scale(0.55F); + GlStateManager.translate(-0.45F, -0.25F, 0F); renderItem(); break; case WICKED_EYEPATCH: - scale(0.45F); - GlStateManager.translate(0.2F, 0.2F, -0.4F); + scale(0.55F); + GlStateManager.translate(0.45F, -0.25F, 0F); renderItem(); break; case RED_RIBBONS: scale(0.9F); - GlStateManager.translate(0F, 0.4F, 0.42F); + GlStateManager.translate(0F, 0.75F, 1F); renderItem(); break; case PINK_FLOWER_BUD: GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0.4F, 0.1F, 0.2F); + GlStateManager.translate(0.4F, 0.6F, 0.45F); renderItem(); break; case POLKA_DOTTED_BOWS: GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0.4F, 0.3F, 0.2F); + GlStateManager.translate(0.65F, 0.3F, 0.5F); renderItem(); - GlStateManager.translate(0F, 0F, -0.525F); + GlStateManager.translate(0F, 0F, -1F); renderItem(); break; case BLUE_BUTTERFLY: - GlStateManager.rotate(-90F, 0F, 0F, 1F); - renderItem(); - GlStateManager.translate(0F, 0.25F, -0.4F); - + GlStateManager.translate(-0.75F, 0.1F, 1F); GlStateManager.pushMatrix(); - GlStateManager.translate(-0.2F, 0.15F, 0F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); + GlStateManager.rotate(45F, 0F, 1F, 0F); renderItem(); GlStateManager.popMatrix(); - GlStateManager.translate(0.15F, 0.3F, 0F); - GlStateManager.rotate(-135F, 0F, 0F, 1F); + GlStateManager.translate(0F, 0F, -0.75F); + GlStateManager.rotate(-45F, 0F, 1F, 0F); renderItem(); break; case CAT_EARS: @@ -167,14 +166,15 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderItem(); break; case CLOCK_EYE: - scale(0.5F); - GlStateManager.translate(0.25F, 0.2F, 0.1F); + scale(0.75F); + GlStateManager.translate(-0.25F, -0.1F, 0F); + GlStateManager.rotate(180F, 0F, 0F, 1F); renderItem(); break; case UNICORN_HORN: - scale(0.75F); + scale(1.25F); GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.translate(0.1F, 0.4F, -0.0625F); + GlStateManager.translate(0F, 0.4F, 0F); renderItem(); break; case DEVIL_HORNS: @@ -182,10 +182,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderItem(); break; case HYPER_PLUS: - scale(0.3125F); - GlStateManager.translate(-0.7F, 1.5F, 0.3F); + scale(0.35F); + GlStateManager.translate(-0.7F, 1F, -0.5F); renderItem(); - GlStateManager.translate(1.4F, 0F, 0F); + GlStateManager.translate(1.45F, 0F, 0F); renderItem(); break; case ANCIENT_MASK: @@ -194,13 +194,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderItem(); break; case EERIE_MASK: - GlStateManager.translate(0F, 0.05F, 0F); renderItem(); break; case ALIEN_ANTENNA: - scale(0.8F); + scale(0.9F); GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(0F, 0.5F, -0.85F); + GlStateManager.translate(0F, 0.75F, -1F); renderItem(); break; case ANAGLYPH_GLASSES: @@ -209,6 +208,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderItem(); break; case ORANGE_SHADES: + scale(1.25f); GlStateManager.translate(0F, 0.04F, 0F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -216,16 +216,16 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { renderItem(); break; case GROUCHO_GLASSES: - scale(0.90F); - GlStateManager.translate(0F, -0.035F, 0F); + scale(1.5F); + GlStateManager.translate(0F, -0.2125F, 0F); renderItem(); break; case THICK_EYEBROWS: - scale(0.35F); - GlStateManager.translate(-0.4F, 0.6F, 0.2F); + scale(0.5F); + GlStateManager.translate(-0.4F, 0.05F, 0F); renderItem(); GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(-0.775F, 0.2F, 0F); + GlStateManager.translate(-0.775F, 0F, 0F); renderItem(); break; case TINY_POTATO_MASK: @@ -235,15 +235,17 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case QUESTGIVER_MARK: scale(0.8F); - GlStateManager.translate(0F, 0.75F, 0.3F); + GlStateManager.translate(0F, 1F, 0.3F); renderItem(); break; } } else { Helper.rotateIfSneaking(player); Helper.translateToChest(); + Helper.defaultTransforms(); switch (variant) { case BLACK_BOWTIE: + GlStateManager.translate(0F, 0.15F, 0F); renderItem(); break; case BLACK_TIE: @@ -266,26 +268,26 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY scale(0.9F); - GlStateManager.translate(0.45F, 0.2F, -0.1F); + GlStateManager.translate(0.9F, 0.35F, 0F); renderItem(); + GlStateManager.translate(-1.3F, -0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(0.9F, -0.225F, -0.18F); renderKamuiBlack(); break; case FOUR_LEAF_CLOVER: - scale(0.35F); - GlStateManager.translate(-0.35F, 0.35F, 0.15F); + scale(0.5F); + GlStateManager.translate(0.35F, 0.3F, -0.075F); renderItem(); break; case BOTANIST_EMBLEM: scale(0.5F); - GlStateManager.translate(0.2F, 0.125F, 0.05F); + GlStateManager.translate(0F, -0.75F, 0F); renderItem(); break; case LUSITANIC_SHIELD: GlStateManager.rotate(180F, 0F, 1F, 0F); - GlStateManager.translate(0.035F, -0.2F, 0.175F); + GlStateManager.translate(0.035F, -0.2F, 0.55F); GlStateManager.rotate(8F, 0F, 0F, 1F); renderItem(); break; @@ -299,7 +301,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public void renderItem() { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); + Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.NONE); GlStateManager.popMatrix(); } @@ -316,9 +318,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.pushMatrix(); - model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false); + model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.NONE, false); - GlStateManager.translate(-0.5F, -0.1F, -0.4F); this.renderModel(model, renderStack, 0xFF00004C); GlStateManager.cullFace(GlStateManager.CullFace.BACK); @@ -327,7 +328,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { GlStateManager.disableBlend(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Minecraft.getMinecraft().renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap(); - // } // Adapted from RenderItem.renderModel(model, stack), added extra color param 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 dd2173972..ff7608103 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 @@ -68,15 +68,16 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); + Helper.defaultTransforms(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - GlStateManager.translate(-0.35F, 1.1F, 0); + GlStateManager.translate(0F, -3.2F, -1.825F); GlStateManager.rotate(-90F, 0F, 1F, 0F); GlStateManager.scale(1.625F, 1.625F, 1.625F); GlStateManager.rotate(-80F, 1F, 0F, 0F); if(armor) { GlStateManager.scale(1.1F, 1.1F, 1.1F); } - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); } } } 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 11d0982f5..40c330048 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 @@ -56,10 +56,11 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm Helper.translateToHeadLevel(player); Helper.translateToFace(); + Helper.defaultTransforms(); GlStateManager.rotate(180F, 0F, 1F, 0F); GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(0.32F, 0.125F, armor ? -0.13F : -0.25F); - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); + GlStateManager.translate(0.5F, -0.2F, armor ? 0.12F : 0F); + Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); } } From ec5fcef90cfcf51b3e6a28e8363f63988dd3d721 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Fri, 10 Jun 2016 23:22:41 -0400 Subject: [PATCH 688/935] fix devil tail --- .../common/item/equipment/bauble/ItemBaubleCosmetic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 35dc535de..c7910044a 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 @@ -263,7 +263,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case DEVIL_TAIL: GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.translate(0.25F, -0.4F, -0.055F); + GlStateManager.translate(0.5F, -0.75F, 0F); renderItem(); break; case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY From f56eca23fc6fac9056d0af86e8ee5171f2e05a6d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 11:24:00 -0500 Subject: [PATCH 689/935] Fix #330 --- .../client/core/handler/ColorHandler.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 4483d28d7..03821405c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -25,6 +25,7 @@ import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.awt.*; import java.util.Map; @@ -81,13 +82,15 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - TileEntity tile = world.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState camoState = camo.camoState; - if(camoState != null) - return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + public int colorMultiplier(@Nonnull IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) { + if (world != null && pos != null) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + } } return 0xFFFFFF; } From cfc1ba8bafa5e636a71ee2f95142434a54ebd67a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 12:57:46 -0500 Subject: [PATCH 690/935] Gaia head can now be worn. Closes #305 --- .../client/core/proxy/ClientProxy.java | 3 + .../client/render/entity/LayerGaiaHead.java | 102 ++++++++++++++++++ .../botania/common/item/ItemGaiaHead.java | 22 ++++ 3 files changed, 127 insertions(+) create mode 100644 src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java 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 43707d833..3a26f6abd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -67,6 +67,7 @@ import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; +import vazkii.botania.client.render.entity.LayerGaiaHead; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; import vazkii.botania.client.render.entity.RenderDoppleganger; @@ -277,10 +278,12 @@ public class ClientProxy extends CommonProxy { render = skinMap.get("default"); render.addLayer(new ContributorFancinessHandler()); render.addLayer(new BaubleRenderHandler()); + render.addLayer(new LayerGaiaHead(render.getMainModel().bipedHead)); render = skinMap.get("slim"); render.addLayer(new ContributorFancinessHandler()); render.addLayer(new BaubleRenderHandler()); + render.addLayer(new LayerGaiaHead(render.getMainModel().bipedHead)); } @Override diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java new file mode 100644 index 000000000..8db3e0532 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -0,0 +1,102 @@ +package vazkii.botania.client.render.entity; + +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.layers.LayerRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.render.tile.RenderTileGaiaHead; +import vazkii.botania.common.block.tile.TileGaiaHead; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; + +public class LayerGaiaHead implements LayerRenderer { + + private final ModelRenderer modelRenderer; + + public LayerGaiaHead(ModelRenderer modelRenderer) + { + this.modelRenderer = modelRenderer; + } + + // Copied from LayerCustomHead, edits noted + @Override + public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); + + if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head + { + GlStateManager.pushMatrix(); + + if (player.isSneaking()) + { + GlStateManager.translate(0.0F, 0.2F, 0.0F); + } + + /*boolean flag = player instanceof EntityVillager || player instanceof EntityZombie && ((EntityZombie)player).isVillager(); + + if (player.isChild() && !(player instanceof EntityVillager)) + { + float f = 2.0F; + float f1 = 1.4F; + GlStateManager.translate(0.0F, 0.5F * scale, 0.0F); + GlStateManager.scale(f1 / f, f1 / f, f1 / f); + GlStateManager.translate(0.0F, 16.0F * scale, 0.0F); + } Botania - N/A */ + + this.modelRenderer.postRender(0.0625F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + + float f2 = 1.1875F; + GlStateManager.scale(f2, -f2, -f2); + + // Botania - remove if check for skull and else branch. Check done above. + + /*if (flag) + { + GlStateManager.translate(0.0F, 0.0625F, 0.0F); + } Botania - N/A */ + + /*GameProfile gameprofile = null; + + if (itemstack.hasTagCompound()) + { + NBTTagCompound nbttagcompound = itemstack.getTagCompound(); + + if (nbttagcompound.hasKey("SkullOwner", 10)) + { + gameprofile = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("SkullOwner")); + } + else if (nbttagcompound.hasKey("SkullOwner", 8)) + { + String s = nbttagcompound.getString("SkullOwner"); + + if (!StringUtils.isNullOrEmpty(s)) + { + gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((UUID)null, s)); + nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile)); + } + } + } Botania - Don't do skin stuff */ + + // Botania - use gaia TESR + ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); + ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TileGaiaHead.class)) + .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing); + ShaderHelper.releaseShader(); + + GlStateManager.popMatrix(); + } + } + + @Override + public boolean shouldCombineTextures() { + return false; + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index db672dda7..eb176dcb1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -13,8 +13,12 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; @@ -24,6 +28,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -31,10 +37,26 @@ import javax.annotation.Nonnull; public class ItemGaiaHead extends ItemMod { + @SideOnly(Side.CLIENT) + private static final ModelBiped EMPTY = new ModelBiped(); + public ItemGaiaHead() { super(LibItemNames.GAIA_HEAD); } + @Override + public boolean isValidArmor(ItemStack stack, EntityEquipmentSlot armorType, Entity entity) { + return armorType == EntityEquipmentSlot.HEAD; + } + + @SideOnly(Side.CLIENT) + @Nonnull + @Override + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default) { + EMPTY.setInvisible(true); + return EMPTY; + } + // Copied from vanila skull itemBlock. Relevant edits are indicated. @Nonnull @Override From c357ab68c319f899eb2da9fb0537e61d526044e6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 13:58:05 -0500 Subject: [PATCH 691/935] Super minor optimization for object alloc --- .../vazkii/botania/client/core/handler/ColorHandler.java | 5 +++-- .../vazkii/botania/client/render/tile/RenderTilePool.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 03821405c..eebce5624 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -12,6 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -55,7 +56,7 @@ public final class ColorHandler { public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); } else { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @@ -72,7 +73,7 @@ public final class ColorHandler { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); + return MathHelper.hsvToRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); } }, ModBlocks.spreader diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 06b07a256..ed31c275f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; @@ -68,7 +69,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; if(pool != null) time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + color = MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); } if (fab || forceManaNumber > -1) { From ece95aca1c31b25cdd5b93cf3b15becdeeab08d0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 14:28:22 -0500 Subject: [PATCH 692/935] Big parameter name cleanup, part 1 --- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BotaniaPlayerController.java | 4 +-- .../client/core/handler/ColorHandler.java | 6 ++-- .../handler/ContributorFancinessHandler.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 4 +-- .../vazkii/botania/client/fx/FXSparkle.java | 2 +- .../client/gui/GuiAchievementsHacky.java | 4 +-- .../vazkii/botania/client/gui/SlotLocked.java | 8 +++--- .../client/gui/bag/ContainerFlowerBag.java | 8 +++--- .../botania/client/gui/bag/GuiFlowerBag.java | 4 +-- .../client/gui/box/ContainerBaubleBox.java | 12 ++++---- .../botania/client/gui/box/GuiBaubleBox.java | 4 +-- .../gui/crafting/ContainerCraftingHalo.java | 12 ++++---- .../client/gui/crafting/GuiCraftingHalo.java | 8 +++--- .../gui/crafting/InventoryCraftingHalo.java | 4 +-- .../gui/lexicon/button/GuiButtonLexicon.java | 8 +++--- .../render/entity/RenderBabylonWeapon.java | 4 +-- .../render/entity/RenderCorporeaSpark.java | 4 +-- .../client/render/entity/RenderManaStorm.java | 5 ++-- .../render/entity/RenderPinkWither.java | 6 ++-- .../render/entity/RenderPoolMinecart.java | 6 ++-- .../client/render/entity/RenderSparkBase.java | 6 ++-- .../render/entity/RenderThornChakram.java | 4 +-- .../botania/common/block/BlockAltGrass.java | 4 +-- .../botania/common/block/BlockAvatar.java | 4 +-- .../common/block/BlockEnchantedSoil.java | 4 +-- .../botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/BlockFelPumpkin.java | 26 ++++++++--------- .../botania/common/block/BlockGaiaHead.java | 8 +++--- .../common/block/BlockIncensePlate.java | 4 +-- .../common/block/BlockLightLauncher.java | 2 +- .../botania/common/block/BlockLightRelay.java | 6 ++-- .../common/block/BlockModDoubleFlower.java | 4 +-- .../botania/common/block/BlockRoot.java | 4 +-- .../botania/common/block/BlockSolidVines.java | 2 +- .../common/block/BlockSparkChanger.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockModMushroom.java | 2 +- .../decor/quartz/BlockSpecialQuartzSlab.java | 2 +- .../block/decor/slabs/BlockModSlab.java | 2 +- .../dispenser/BehaviourPoolMinecart.java | 28 +++++++++---------- .../common/block/mana/BlockBellows.java | 4 +-- .../common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPool.java | 2 +- .../botania/common/block/mana/BlockPump.java | 4 +-- .../common/block/mana/BlockTerraPlate.java | 2 +- .../string/BlockRedStringInterceptor.java | 2 +- .../common/block/tile/TileCraftCrate.java | 2 +- .../common/block/tile/TileLightRelay.java | 2 +- .../tile/string/TileRedStringFertilizer.java | 12 ++++---- .../common/core/command/CommandOpen.java | 2 +- .../common/core/command/CommandShare.java | 2 +- .../core/command/CommandSkyblockSpread.java | 2 +- .../common/entity/EntityDoppleganger.java | 4 +-- .../common/entity/EntityManaBurst.java | 6 ++-- .../common/entity/EntityManaStorm.java | 4 +-- .../common/entity/EntityPinkWither.java | 6 ++-- .../common/entity/EntityPoolMinecart.java | 24 ++++++++-------- .../common/entity/EntityThrownItem.java | 6 ++-- .../common/item/ItemBlackHoleTalisman.java | 2 +- .../botania/common/item/ItemManaCookie.java | 6 ++-- .../botania/common/item/ItemPinkinator.java | 4 +-- .../botania/common/item/ItemPoolMinecart.java | 16 +++++------ .../common/item/brew/ItemBrewBase.java | 10 +++---- .../armor/manaweave/ItemManaweaveArmor.java | 4 +-- .../tool/manasteel/ItemManasteelShovel.java | 20 ++++++------- .../botania/common/item/material/ItemDye.java | 10 +++---- .../common/item/relic/ItemInfiniteFruit.java | 16 +++++------ .../botania/common/item/relic/ItemRelic.java | 6 ++-- .../common/item/relic/ItemRelicBauble.java | 8 +++--- .../common/item/rod/ItemGravityRod.java | 2 +- 73 files changed, 216 insertions(+), 215 deletions(-) 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 5519ca808..38b1c7f38 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -38,7 +38,7 @@ import javax.annotation.Nonnull; public final class BaubleRenderHandler implements LayerRenderer { @Override - public void doRenderLayer(@Nonnull 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) { + public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index 89bc0e915..7170e0603 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -22,8 +22,8 @@ public class BotaniaPlayerController extends PlayerControllerMP implements IExte private float distance = 0F; - public BotaniaPlayerController(Minecraft p_i45062_1_, NetHandlerPlayClient p_i45062_2_) { - super(p_i45062_1_, p_i45062_2_); + public BotaniaPlayerController(Minecraft mc, NetHandlerPlayClient netHandler) { + super(mc, netHandler); } @Override 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 eebce5624..0ff8c52c5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -43,7 +43,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } }, @@ -53,7 +53,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); @@ -69,7 +69,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; 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 7c548c1db..e8d066e1c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -48,7 +48,7 @@ public final class ContributorFancinessHandler implements LayerRenderer { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon p_110775_1_) { - return null; + protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon entity) { + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } 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 f4115cb79..599140677 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -19,8 +19,8 @@ import vazkii.botania.common.entity.EntityCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { - public RenderCorporeaSpark(RenderManager p_i46185_1_) { - super(p_i46185_1_); + public RenderCorporeaSpark(RenderManager manager) { + super(manager); } protected DataParameter getInvisibilityParam() { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index f0074b805..cfa912b81 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; @@ -39,8 +40,8 @@ public class RenderManaStorm extends Render { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm p_110775_1_) { - return null; + protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm entity) { + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index c648ddc2d..b98cdf83e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -22,13 +22,13 @@ public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); - public RenderPinkWither(RenderManager p_i46130_1_) { - super(p_i46130_1_); + public RenderPinkWither(RenderManager manager) { + super(manager); } @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityWither entity) { return resource; } 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 e5dceff22..230086138 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -24,12 +24,12 @@ import javax.annotation.Nonnull; public class RenderPoolMinecart extends RenderMinecart { - public RenderPoolMinecart(RenderManager p_i46155_1_) { - super(p_i46155_1_); + public RenderPoolMinecart(RenderManager manager) { + super(manager); } @Override - protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, @Nonnull IBlockState state) { + protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull 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/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 39c8053a9..de1fbafa5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -29,8 +29,8 @@ import java.util.Random; public abstract class RenderSparkBase extends Render { - public RenderSparkBase(RenderManager p_i46185_1_) { - super(p_i46185_1_); + public RenderSparkBase(RenderManager manager) { + super(manager); } @Override @@ -98,7 +98,7 @@ public abstract class RenderSparkBase extends Render { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull Entity entity) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } 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 4efbfd999..8410a27fd 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -31,13 +31,13 @@ public class RenderThornChakram extends Render { } @Override - public void doRender(@Nonnull EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(@Nonnull EntityThornChakram c, double x, double y, double z, float entityYaw, float partialTicks) { boolean fire = c.isFire(); TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); if(iicon != null) { GlStateManager.pushMatrix(); - GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GlStateManager.translate((float)x, (float)y, (float)z); GlStateManager.enableRescaleNormal(); GlStateManager.scale(0.5F, 0.5F, 0.5F); bindEntityTexture(c); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7e3c3a79d..783bd6f29 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -101,8 +101,8 @@ 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_); + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Blocks.DIRT.getItemDropped(state, rand, fortune); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 919ccd960..66a18720d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -110,8 +110,8 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 265d62f06..d45fd01b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -45,8 +45,8 @@ 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_); + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Blocks.DIRT.getItemDropped(state, rand, fortune); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index a11501f8b..04a945156 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -72,7 +72,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 4; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 58f99808f..f6ab2b843 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -65,26 +65,26 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @Override - public void onBlockAdded(World p_149726_1_, BlockPos pos, IBlockState state) { - super.onBlockAdded(p_149726_1_, pos, state); + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { + super.onBlockAdded(world, 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); - EntityBlaze blaze = new EntityBlaze(p_149726_1_); + if(!world.isRemote && world.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && world.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) { + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + world.setBlockState(pos.down(), Blocks.AIR.getDefaultState(), 2); + world.setBlockState(pos.down(2), Blocks.AIR.getDefaultState(), 2); + EntityBlaze blaze = new EntityBlaze(world); 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); + world.spawnEntityInWorld(blaze); + world.notifyNeighborsOfStateChange(pos, Blocks.AIR); + world.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR); + world.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR); } } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 876dc3ab7..a69d006c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -49,12 +49,12 @@ public class BlockGaiaHead extends BlockSkull { @Nonnull @Override - public List getDrops(@Nonnull IBlockAccess p_149749_1_, @Nonnull BlockPos pos, IBlockState state, int fortune) { + public List getDrops(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); - TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(pos); + TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); if(tileentityskull == null) return ret; @@ -65,7 +65,7 @@ public class BlockGaiaHead extends BlockSkull { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.gaiaHead; } @@ -76,7 +76,7 @@ public class BlockGaiaHead extends BlockSkull { @Nonnull @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileGaiaHead(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 856e4c57a..d22f988c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -102,8 +102,8 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 32866f435..1b2babb8e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -82,7 +82,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index e85a6a224..0a3776833 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -97,7 +97,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } @@ -108,12 +108,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World p_149668_1_, @Nonnull BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index bf5073a8c..5209556d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -163,9 +163,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(@Nonnull Item p_149666_1_, CreativeTabs p_149666_2_, @Nonnull List p_149666_3_) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(int i = 0; i < COUNT; ++i) - p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 2182b5500..f825b95bb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -43,12 +43,12 @@ public class BlockRoot extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.manaResource; } @Override - public int damageDropped(IBlockState p_149692_1_) { + public int damageDropped(IBlockState state) { return 20; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 0c82c362d..96801691f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -48,7 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World p_149674_1_, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random p_149674_5_) { + public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 677b53497..ca898e756 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -85,7 +85,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } 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 4de5a9e5e..708293ecc 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -73,7 +73,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 340f40d8c..e54086ab0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -62,7 +62,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.petal; } 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 8dbc34b52..9bda6cca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -85,7 +85,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return true; } 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 b9c2ddaa9..cf78b3348 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -91,7 +91,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void updateTick(@Nonnull World p_149674_1_, @Nonnull BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) { // NO-OP, to prevent spreading } 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 be89ded75..1b2db8806 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 @@ -86,7 +86,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 909ecd6b8..b6107bfee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -80,7 +80,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } 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 44b05e7a8..57f8d55d2 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -29,13 +29,13 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull @Override - public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { - EnumFacing enumfacing = BlockDispenser.getFacing(p_82487_1_.getBlockMetadata()); - World world = p_82487_1_.getWorld(); - double d0 = p_82487_1_.getX() + enumfacing.getFrontOffsetX() * 1.125F; - double d1 = p_82487_1_.getY() + enumfacing.getFrontOffsetY() * 1.125F; - double d2 = p_82487_1_.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; - BlockPos pos = p_82487_1_.getBlockPos().offset(enumfacing); + public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + EnumFacing enumfacing = BlockDispenser.getFacing(source.getBlockMetadata()); + World world = source.getWorld(); + double d0 = source.getX() + enumfacing.getFrontOffsetX() * 1.125F; + double d1 = source.getY() + enumfacing.getFrontOffsetY() * 1.125F; + double d2 = source.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; + BlockPos pos = source.getBlockPos().offset(enumfacing); IBlockState state = world.getBlockState(pos); double d3; @@ -43,24 +43,24 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { d3 = 0.0D; else { if(state.getMaterial() != Material.AIR || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) - return super.dispenseStack(p_82487_1_, p_82487_2_); + return super.dispenseStack(source, stack); d3 = -1.0D; } EntityMinecart entityminecart = new EntityPoolMinecart(world, d0, d1 + d3, d2); - if(p_82487_2_.hasDisplayName()) - entityminecart.setCustomNameTag(p_82487_2_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setCustomNameTag(stack.getDisplayName()); world.spawnEntityInWorld(entityminecart); - p_82487_2_.splitStack(1); - return p_82487_2_; + stack.splitStack(1); + return stack; } @Override - protected void playDispenseSound(IBlockSource p_82485_1_) { - p_82485_1_.getWorld().playEvent(1000, p_82485_1_.getBlockPos(), 0); + protected void playDispenseSound(IBlockSource source) { + source.getWorld().playEvent(1000, source.getBlockPos(), 0); } } 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 7d3b0d0a1..e03223cec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -74,8 +74,8 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing()), 2); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing()), 2); } @Override 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 573bd3513..ce9b17f43 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -94,7 +94,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(Blocks.LAPIS_BLOCK); } 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 85c085056..cee06a999 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -171,7 +171,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World p_149743_1_, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); 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 3962d5f4c..0c6bf4fbd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -77,8 +77,8 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite()), 2); } @Nonnull 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 af7c61eca..a647b1ed5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -86,7 +86,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 774f91a05..6bd123d34 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -82,7 +82,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index c69fc2482..2ba68987d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -123,7 +123,7 @@ public class TileCraftCrate extends TileOpenCrate { InventoryCrafting craft = new InventoryCrafting(new Container() { @Override - public boolean canInteractWith(@Nonnull EntityPlayer p_75145_1_) { + public boolean canInteractWith(@Nonnull EntityPlayer player) { return false; } }, 3, 3); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 27c8c1b49..2103a5435 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -266,7 +266,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public boolean attackEntityFrom(@Nonnull DamageSource p_70097_1_, float p_70097_2_) { + public boolean attackEntityFrom(@Nonnull DamageSource source, float damage) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 9d2b7baf3..c030fe615 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -19,24 +19,24 @@ import java.util.Random; public class TileRedStringFertilizer extends TileRedString { - public boolean canGrow(World p_149851_1_, boolean p_149851_5_) { + public boolean canGrow(World world, boolean isClient) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).canGrow(p_149851_1_, binding, p_149851_1_.getBlockState(binding), p_149851_5_) : false; + return block instanceof IGrowable ? ((IGrowable) block).canGrow(world, binding, world.getBlockState(binding), isClient) : false; } - public boolean canUseBonemeal(World p_149852_1_, Random p_149852_2_) { + public boolean canUseBonemeal(World world, Random rand) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).canUseBonemeal(p_149852_1_, p_149852_2_, binding, p_149852_1_.getBlockState(binding)) : false; + return block instanceof IGrowable ? ((IGrowable) block).canUseBonemeal(world, rand, binding, world.getBlockState(binding)) : false; } - public void grow(World p_149853_1_, Random p_149853_2_) { + public void grow(World world, Random rand) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); if(block instanceof IGrowable) - ((IGrowable) block).grow(p_149853_1_, p_149853_2_, binding, p_149853_1_.getBlockState(binding)); + ((IGrowable) block).grow(world, rand, binding, world.getBlockState(binding)); } @Override diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index f6ca3a26c..c0f142445 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -33,7 +33,7 @@ public class CommandOpen extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return ""; } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 9a5b10846..10b187f99 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -29,7 +29,7 @@ public class CommandShare extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return ""; } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 89c94229d..c4d89764e 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -32,7 +32,7 @@ public class CommandSkyblockSpread extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return " []"; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c9026e397..1614ad34b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -414,8 +414,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public void onDeath(@Nonnull DamageSource p_70645_1_) { - super.onDeath(p_70645_1_); + public void onDeath(@Nonnull DamageSource source) { + super.onDeath(source); EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayer) { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianKill, 1); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 526cda76c..0a86083f2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -194,9 +194,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override @SideOnly(Side.CLIENT) - 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_); + public void setPositionAndRotationDirect(double x, double y, double z, float yaw, float pitch, int posRotationIncrements, boolean teleport) { + setPosition(x, y, z); + setRotation(yaw, pitch); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 9e9586a53..5b9b0abe4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -33,8 +33,8 @@ public class EntityManaStorm extends Entity { public int burstsFired; public int deathTime; - public EntityManaStorm(World p_i1582_1_) { - super(p_i1582_1_); + public EntityManaStorm(World world) { + super(world); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 3e1b721ed..963754adb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -28,8 +28,8 @@ import java.util.Iterator; public class EntityPinkWither extends EntityWither { - public EntityPinkWither(World p_i1701_1_) { - super(p_i1701_1_); + public EntityPinkWither(World world) { + super(world); Iterator taskIter = this.tasks.taskEntries.iterator(); while (taskIter.hasNext()) { @@ -78,7 +78,7 @@ public class EntityPinkWither extends EntityWither { } @Override - protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { + protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 117e218f0..50c3f069d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -43,12 +43,12 @@ public class EntityPoolMinecart extends EntityMinecart { private static final String TAG_MANA = "mana"; private static final DataParameter MANA = EntityDataManager.createKey(EntityPoolMinecart.class, DataSerializers.VARINT); - public EntityPoolMinecart(World p_i1712_1_) { - super(p_i1712_1_); + public EntityPoolMinecart(World world) { + super(world); } - public EntityPoolMinecart(World p_i1715_1_, double p_i1715_2_, double p_i1715_4_, double p_i1715_6_) { - super(p_i1715_1_, p_i1715_2_, p_i1715_4_, p_i1715_6_); + public EntityPoolMinecart(World world, double x, double y, double z) { + super(world, x, y, z); } @Override @@ -81,8 +81,8 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public void killMinecart(DamageSource p_94095_1_) { - super.killMinecart(p_94095_1_); + public void killMinecart(DamageSource source) { + super.killMinecart(source); dropItemWithOffset(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F); } @@ -167,15 +167,15 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - protected void writeEntityToNBT(@Nonnull NBTTagCompound p_70014_1_) { - super.writeEntityToNBT(p_70014_1_); - p_70014_1_.setInteger(TAG_MANA, getMana()); + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { + super.writeEntityToNBT(cmp); + cmp.setInteger(TAG_MANA, getMana()); } @Override - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { - super.readEntityFromNBT(p_70037_1_); - setMana(p_70037_1_.getInteger(TAG_MANA)); + protected void readEntityFromNBT(NBTTagCompound cmp) { + super.readEntityFromNBT(cmp); + setMana(cmp.getInteger(TAG_MANA)); } public int getMana() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 4e802fd32..9a8b926f0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -31,9 +31,9 @@ public class EntityThrownItem extends EntityItem { super(par1World); } - public EntityThrownItem(World p_i1710_1_, double p_i1710_2_, - double p_i1710_4_, double p_i1710_6_, EntityItem item) { - super(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, item.getEntityItem()); + public EntityThrownItem(World world, double x, + double y, double z, EntityItem item) { + super(world, x, y, z, item.getEntityItem()); int pickupDelay = 0; try { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 4812eb2bb..3f6923860 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -135,7 +135,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_) { + public void onUpdate(ItemStack itemstack, World world, Entity entity, int slot, boolean selected) { Block block = getBlock(itemstack); if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.AIR && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index c998c8aee..7134cb647 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -37,9 +37,9 @@ public class ItemManaCookie extends ItemFood { } @Override - protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, @Nonnull EntityPlayer p_77849_3_) { - super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_); - p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); + protected void onFoodEaten(ItemStack stack, World world, @Nonnull EntityPlayer player) { + super.onFoodEaten(stack, world, player); + player.addStat(ModAchievements.manaCookieEat, 1); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 60e487881..f2bc9d8f5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -64,8 +64,8 @@ public class ItemPinkinator extends ItemMod { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(I18n.format("botaniamisc.pinkinatorDesc")); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + tooltip.add(I18n.format("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index f123544ba..46bf17e79 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -41,18 +41,18 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin @Nonnull @Override - public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { - if(!p_77648_3_.isRemote) { - EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + if(BlockRailBase.isRailBlock(world.getBlockState(pos))) { + if(!world.isRemote) { + EntityMinecart entityminecart = new EntityPoolMinecart(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - if(p_77648_1_.hasDisplayName()) - entityminecart.setCustomNameTag(p_77648_1_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setCustomNameTag(stack.getDisplayName()); - p_77648_3_.spawnEntityInWorld(entityminecart); + world.spawnEntityInWorld(entityminecart); } - --p_77648_1_.stackSize; + --stack.stackSize; return EnumActionResult.SUCCESS; } 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 88d896190..f09078471 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -68,21 +68,21 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return drinkSpeed; } @Nonnull @Override - public EnumAction getItemUseAction(ItemStack p_77661_1_) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.DRINK; } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { - p_77659_3_.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index c75ca1414..894592791 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -63,8 +63,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Nonnull @Override @SideOnly(Side.CLIENT) - public String getUnlocalizedName(ItemStack p_77667_1_) { - String name = super.getUnlocalizedName(p_77667_1_); + public String getUnlocalizedName(ItemStack stack) { + String name = super.getUnlocalizedName(stack); if(ClientProxy.jingleTheBells) name = name.replaceAll("manaweave", "santaweave"); return name; 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 2a565ae3f..88a36b1a8 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 @@ -79,30 +79,30 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS @Nonnull @Override - public EnumActionResult onItemUse(@Nonnull ItemStack p_77648_1_, EntityPlayer p_77648_2_, @Nonnull World p_77648_3_, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) + public EnumActionResult onItemUse(@Nonnull ItemStack stack, EntityPlayer player, @Nonnull World world, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ) { + if(!player.canPlayerEdit(pos, side, stack)) return EnumActionResult.PASS; else { - UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, pos); + UseHoeEvent event = new UseHoeEvent(player, stack, world, pos); if(MinecraftForge.EVENT_BUS.post(event)) return EnumActionResult.FAIL; if(event.getResult() == Result.ALLOW) { - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return EnumActionResult.SUCCESS; } - Block block = p_77648_3_.getBlockState(pos).getBlock(); + Block block = world.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)) { + if(side != EnumFacing.DOWN && world.getBlockState(pos.up()).getBlock().isAir(world.getBlockState(pos.up()), world, 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); + world.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) + if (world.isRemote) return EnumActionResult.SUCCESS; else { - p_77648_3_.setBlockState(pos, block1.getDefaultState()); - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + world.setBlockState(pos, block1.getDefaultState()); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return EnumActionResult.SUCCESS; } } 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 8b55de12d..ccc913ce0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -63,14 +63,14 @@ public class ItemDye extends Item16Colors { } @Override - public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_, EnumHand hand) { - if(p_111207_3_ instanceof EntitySheep) { - EntitySheep entitysheep = (EntitySheep)p_111207_3_; - EnumDyeColor i = EnumDyeColor.byMetadata(p_111207_1_.getItemDamage()); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target, EnumHand hand) { + if(target instanceof EntitySheep) { + EntitySheep entitysheep = (EntitySheep)target; + EnumDyeColor i = EnumDyeColor.byMetadata(stack.getItemDamage()); if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { entitysheep.setFleeceColor(i); - --p_111207_1_.stackSize; + --stack.stackSize; } return true; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 21c2c041b..9cae941e0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -33,24 +33,24 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return 32; } @Nonnull @Override - public EnumAction getItemUseAction(ItemStack p_77661_1_) { - return isBoot(p_77661_1_) ? EnumAction.DRINK : EnumAction.EAT; + public EnumAction getItemUseAction(ItemStack stack) { + return isBoot(stack) ? EnumAction.DRINK : EnumAction.EAT; } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { - if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) { - p_77659_3_.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(player.canEat(false) && isRightPlayer(player, stack)) { + player.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, p_77659_1_); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 6762623b2..170a9cfe5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -53,8 +53,8 @@ public class ItemRelic extends ItemMod implements IRelic { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + addBindInfo(tooltip, stack, player); } @SideOnly(Side.CLIENT) @@ -185,7 +185,7 @@ public class ItemRelic extends ItemMod implements IRelic { @Nonnull @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 977c7dabf..45235087f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -42,9 +42,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { - if(p_77663_3_ instanceof EntityPlayer) - dummy.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean held) { + if(entity instanceof EntityPlayer) + dummy.updateRelic(stack, (EntityPlayer) entity); } @Override @@ -111,7 +111,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Nonnull @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } 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 369f03b31..86c56db08 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -60,7 +60,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity par3Entity, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(ItemStack stack, World world, Entity par3Entity, int slot, boolean held) { if(!(par3Entity instanceof EntityPlayer)) return; From 8bca8bb5f66ff7dfef84404caf07c4f14b16e710 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 14:42:18 -0500 Subject: [PATCH 693/935] Get rid of some of the many stupid parXX parameter names --- .../botania/common/block/BlockAltar.java | 56 +++++++-------- .../botania/common/block/BlockAvatar.java | 8 +-- .../botania/common/block/BlockCamo.java | 10 +-- .../botania/common/block/BlockFakeAir.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 14 ++-- .../botania/common/block/BlockForestEye.java | 4 +- .../botania/common/block/BlockHourglass.java | 8 +-- .../botania/common/block/BlockLivingrock.java | 4 +- .../botania/common/block/BlockLivingwood.java | 4 +- .../common/block/BlockModDoubleFlower.java | 6 +- .../botania/common/block/BlockModFlower.java | 10 +-- .../botania/common/block/BlockOpenCrate.java | 18 ++--- .../common/block/BlockPistonRelay.java | 6 +- .../botania/common/block/BlockPlatform.java | 14 ++-- .../botania/common/block/BlockPylon.java | 4 +- .../common/block/BlockSparkChanger.java | 8 +-- .../common/block/BlockSpecialFlower.java | 12 ++-- .../botania/common/block/BlockStorage.java | 4 +- .../block/corporea/BlockCorporeaBase.java | 8 +-- .../common/block/decor/BlockBuriedPetals.java | 4 +- .../common/block/decor/BlockCustomBrick.java | 4 +- .../block/decor/BlockFloatingFlower.java | 10 +-- .../common/block/decor/BlockManaBeacon.java | 4 +- .../common/block/decor/BlockModMushroom.java | 10 +-- .../common/block/decor/BlockPavement.java | 4 +- .../common/block/decor/BlockPrismarine.java | 4 +- .../common/block/decor/BlockTinyPotato.java | 14 ++-- .../common/block/decor/BlockUnstable.java | 12 ++-- .../decor/quartz/BlockSpecialQuartz.java | 10 +-- .../common/block/mana/BlockBrewery.java | 22 +++--- .../common/block/mana/BlockEnchanter.java | 22 +++--- .../common/block/mana/BlockManaDetector.java | 4 +- .../botania/common/block/mana/BlockPool.java | 26 +++---- .../botania/common/block/mana/BlockPrism.java | 24 +++---- .../common/block/mana/BlockRuneAltar.java | 24 +++---- .../common/block/mana/BlockSpreader.java | 38 +++++----- .../common/block/mana/BlockTerraPlate.java | 4 +- .../common/block/string/BlockRedString.java | 4 +- .../common/entity/EntityDoppleganger.java | 4 +- .../common/entity/EntityFlyingCreature.java | 4 +- .../common/entity/EntityMagicLandmine.java | 4 +- .../common/entity/EntitySignalFlare.java | 4 +- .../common/entity/EntityThrownItem.java | 4 +- .../botania/common/entity/EntityVineBall.java | 4 +- .../botania/common/item/Item16Colors.java | 4 +- .../common/item/ItemBlackHoleTalisman.java | 30 ++++---- .../botania/common/item/ItemBottledMana.java | 12 ++-- .../botania/common/item/ItemCacophonium.java | 4 +- .../botania/common/item/ItemFertilizer.java | 18 ++--- .../botania/common/item/ItemGrassHorn.java | 4 +- .../botania/common/item/ItemGrassSeeds.java | 14 ++-- .../botania/common/item/ItemLaputaShard.java | 10 +-- .../botania/common/item/ItemLexicon.java | 30 ++++---- .../botania/common/item/ItemManaGun.java | 52 +++++++------- .../botania/common/item/ItemManaMirror.java | 12 ++-- .../botania/common/item/ItemManaTablet.java | 16 ++--- .../botania/common/item/ItemOpenBucket.java | 16 ++--- .../botania/common/item/ItemSextant.java | 10 +-- .../botania/common/item/ItemSignalFlare.java | 34 ++++----- .../botania/common/item/ItemSlingshot.java | 14 ++-- .../common/item/ItemTemperanceStone.java | 6 +- .../botania/common/item/ItemTwigWand.java | 72 +++++++++---------- .../botania/common/item/ItemVineBall.java | 14 ++-- .../vazkii/botania/common/item/ItemVirus.java | 4 +- .../common/item/block/ItemBlockPool.java | 4 +- .../item/block/ItemBlockSpecialFlower.java | 8 +-- .../item/equipment/bauble/ItemBauble.java | 34 ++++----- .../equipment/bauble/ItemBaubleCosmetic.java | 6 +- .../equipment/bauble/ItemFlightTiara.java | 6 +- .../item/equipment/bauble/ItemManaRing.java | 4 +- .../item/equipment/tool/ItemStarSword.java | 22 +++--- .../tool/elementium/ItemElementiumShears.java | 2 +- .../tool/terrasteel/ItemTerraPick.java | 16 ++--- .../tool/terrasteel/ItemTerraSword.java | 10 +-- .../botania/common/item/lens/ItemLens.java | 8 +-- .../botania/common/item/material/ItemDye.java | 12 ++-- .../item/material/ItemManaResource.java | 32 ++++----- .../common/item/material/ItemRune.java | 4 +- .../common/item/relic/ItemFlugelEye.java | 4 +- .../common/item/relic/ItemKingKey.java | 4 +- .../common/item/relic/ItemRelicBauble.java | 6 +- .../common/item/rod/ItemCobbleRod.java | 4 +- .../botania/common/item/rod/ItemDirtRod.java | 16 ++--- .../common/item/rod/ItemExchangeRod.java | 18 ++--- .../botania/common/item/rod/ItemFireRod.java | 8 +-- .../common/item/rod/ItemMissileRod.java | 4 +- .../common/item/rod/ItemRainbowRod.java | 32 ++++----- .../botania/common/item/rod/ItemSmeltRod.java | 4 +- .../common/item/rod/ItemTerraformRod.java | 30 ++++---- .../common/item/rod/ItemTornadoRod.java | 10 +-- .../botania/common/item/rod/ItemWaterRod.java | 16 ++--- 91 files changed, 584 insertions(+), 584 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a2e1f3c90..01a007a3e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -126,9 +126,9 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) { if(par5Entity instanceof EntityItem) { - TileAltar tile = (TileAltar) par1World.getTileEntity(pos); + TileAltar tile = (TileAltar) world.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } @@ -143,51 +143,51 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { - TileAltar tile = (TileAltar) par1World.getTileEntity(pos); - if(par5EntityPlayer.isSneaking()) { - InventoryHelper.withdrawFromInventory(tile, par5EntityPlayer); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { + TileAltar tile = (TileAltar) world.getTileEntity(pos); + if(player.isSneaking()) { + InventoryHelper.withdrawFromInventory(tile, player); } else if(tile.isEmpty() && tile.hasWater && stack == null) - tile.trySetLastRecipe(par5EntityPlayer); + tile.trySetLastRecipe(player); else { - if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, false))) { + if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { if(!tile.hasWater) { if(stack.getItem() == ModItems.waterRod) - ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, true); - else if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); + ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); + else if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); tile.setWater(true); - par1World.updateComparatorOutputLevel(pos, this); - par1World.checkLight(pos); + world.updateComparatorOutputLevel(pos, this); + world.checkLight(pos); } return true; } else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) { - if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); tile.setLava(true); tile.setWater(false); - par1World.updateComparatorOutputLevel(pos, this); - par1World.checkLight(pos); + world.updateComparatorOutputLevel(pos, this); + world.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); if(stack.stackSize == 1) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket); + player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket); else { - if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket)) - par5EntityPlayer.dropItem(bucket, false); + if(!player.inventory.addItemStackToInventory(bucket)) + player.dropItem(bucket, false); stack.stackSize--; } if(tile.hasLava) tile.setLava(false); else tile.setWater(false); - par1World.updateComparatorOutputLevel(pos, this); - par1World.checkLight(pos); + world.updateComparatorOutputLevel(pos, this); + world.checkLight(pos); return true; } @@ -262,12 +262,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override @@ -276,8 +276,8 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileAltar altar = (TileAltar) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileAltar altar = (TileAltar) world.getTileEntity(pos); return altar.hasWater ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 66a18720d..1018721d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -101,12 +101,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 276fa47b6..376fe3437 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -35,21 +35,21 @@ public abstract class BlockCamo extends BlockMod { @Override @SuppressWarnings("unchecked") - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { - TileEntity tile = par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { + TileEntity tile = world.getTileEntity(pos); - if(par1World.isRemote) + if(world.isRemote) return true; if(currentStack != null && Block.getBlockFromItem(currentStack.getItem()) != null && tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(par1World, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), par5EntityPlayer); + IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(world, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), player); if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.AIR) { camo.camoState = changeState; - par1World.notifyBlockUpdate(pos, state, state, 8); + world.notifyBlockUpdate(pos, state, state, 8); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 04a945156..396c5a61e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -118,7 +118,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 86c50c82d..5d7f16475 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -120,16 +120,16 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { // NO-OP } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { - par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); + stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) - par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), BotaniaAPI.miniFlowers.get(s))); + stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), BotaniaAPI.miniFlowers.get(s))); } } @@ -180,9 +180,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - 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); + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int eventID, int value) { + super.eventReceived(state, world, pos, eventID, value); + TileEntity tileentity = world.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 0f0fca13b..cb72976e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -61,8 +61,8 @@ public class BlockForestEye extends BlockMod implements ILexiconable { } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileForestEye eye = (TileForestEye) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileForestEye eye = (TileForestEye) world.getTileEntity(pos); return eye == null ? 0 : Math.min(15, Math.max(0, eye.entities - 1)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 5962acca0..1f23e5928 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -133,12 +133,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 5d22668fb..b185705b5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -74,9 +74,9 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a033dd72c..5a498e17b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -78,9 +78,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 5209556d2..37ce7349d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -178,15 +178,15 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { state = getActualState(state, world, pos); int hex = state.getValue(second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index be580596e..2d89c4c7c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -113,9 +113,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override @@ -124,14 +124,14 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 15a54cb16..8e2977b9a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -99,9 +99,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CrateVariant.values().length; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override @@ -116,19 +116,19 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(pos); return crate.getSignal(); } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - if (!par1World.isRemote) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + if (!world.isRemote) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); + InventoryHelper.dropInventory(inv, world, state, pos); } - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 43f2f85b7..8013548a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -87,9 +87,9 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - if(!par1World.isRemote) - mapCoords(par1World.provider.getDimension(), pos, 2); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + if(!world.isRemote) + mapCoords(world.provider.getDimension(), pos, 2); } private void mapCoords(int world, BlockPos pos, int time) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 402de0c90..0ce7e6368 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -112,22 +112,22 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity); } @Override - public float getBlockHardness(IBlockState state, World par1World, BlockPos pos) { - PlatformVariant variant = par1World.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); - return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, par1World, pos); + public float getBlockHardness(IBlockState state, World world, BlockPos pos) { + PlatformVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT); + return variant == PlatformVariant.INFRANGIBLE ? -1F : super.getBlockHardness(state, world, pos); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 5a8975a82..0714cfdca 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -91,9 +91,9 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) - par3.add(new ItemStack(par1, 1, i)); + par3.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index ca898e756..705b9458d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -128,12 +128,12 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index aba119a41..707e75ef7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -213,11 +213,11 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, @Nonnull List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { - par3List.add(ItemBlockSpecialFlower.ofType(s)); + stacks.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) - par3List.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s))); + stacks.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s))); } } @@ -279,9 +279,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - 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); + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int par5, int par6) { + super.eventReceived(state, world, pos, par5, par6); + TileEntity tileentity = world.getTileEntity(pos); return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index df396f409..833d54301 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -64,9 +64,9 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) - par3.add(new ItemStack(par1, 1, i)); + par3.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 8a0a50919..d67e812d6 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -36,12 +36,12 @@ public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchiev } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index e54086ab0..5edfa88f7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -43,7 +43,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); int hex = color.getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; @@ -51,7 +51,7 @@ public class BlockBuriedPetals extends BlockModFlower { int b = (hex & 0xFF); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.1 + par5Random.nextFloat() * 0.1, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.1 + rand.nextFloat() * 0.1, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); Botania.proxy.setSparkleFXNoClip(false); } 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 2ea986598..3e2da2553 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -75,9 +75,9 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CustomBrickVariant.values().length; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull 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 ca71d8d92..a1d9de8dc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -169,20 +169,20 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) - par3.add(new ItemStack(par1, 1, i)); + par3.add(new ItemStack(item, 1, i)); } @Override 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 af71c67c8..214d08e6c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -76,9 +76,9 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override 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 cf78b3348..71616ce37 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -107,9 +107,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override @@ -118,14 +118,14 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, par5Random.nextFloat(), 5); + if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) + Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @Override 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 6b9585866..4fe5a108e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -93,9 +93,9 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull 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 32edbaab6..684e698b0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -77,9 +77,9 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull 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 dd3a7fcbf..5e9f97d89 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -96,21 +96,21 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName()); } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); - par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); + player.addStat(ModAchievements.tinyPotatoPet, 1); + world.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); } return true; } @Override - public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { - par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, par5EntityLiving.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, par5EntityLiving.getHorizontalFacing().getOpposite())); if (par6ItemStack.hasDisplayName()) - ((TileTinyPotato) par1World.getTileEntity(pos)).name = par6ItemStack.getDisplayName(); + ((TileTinyPotato) world.getTileEntity(pos)).name = par6ItemStack.getDisplayName(); } @Override 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 075693bd8..7da7d35e7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -81,9 +81,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override @@ -103,14 +103,14 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World par1World, BlockPos pos, Random par5Random) { - int color = Minecraft.getMinecraft().getBlockColors().colorMultiplier(state, par1World, pos, 0); + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { + int color = Minecraft.getMinecraft().getBlockColors().colorMultiplier(state, world, pos, 0); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1); - Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright); + Vector3 endVector = origVector.copy().add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); + Botania.proxy.lightningFX(world, origVector, endVector, 5F, colorDark, colorBright); } @Override 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 06eb83dd7..b303e9532 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 @@ -83,7 +83,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Nonnull @Override - public IBlockState onBlockPlaced(World par1World, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { + public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { if (meta == 2) { // Pillar quartz variant switch (side.getAxis()) { case Y: @@ -114,10 +114,10 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List par3List) { - par3List.add(new ItemStack(this, 1, 0)); - par3List.add(new ItemStack(this, 1, 1)); - par3List.add(new ItemStack(this, 1, 2)); + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + stacks.add(new ItemStack(this, 1, 0)); + stacks.add(new ItemStack(this, 1, 1)); + stacks.add(new ItemStack(this, 1, 2)); } @Override 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 ce4545118..3a456f05f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -78,26 +78,26 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + TileBrewery brew = (TileBrewery) world.getTileEntity(pos); - if(par5EntityPlayer.isSneaking()) { + if(player.isSneaking()) { if(brew.recipe == null && !state.getValue(BotaniaStateProps.POWERED)) - InventoryHelper.withdrawFromInventory(brew, par5EntityPlayer); + InventoryHelper.withdrawFromInventory(brew, player); } else { if(stack != null) - return brew.addItem(par5EntityPlayer, stack); + return brew.addItem(player, stack); } return false; } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override @@ -106,8 +106,8 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileBrewery brew = (TileBrewery) world.getTileEntity(pos); return brew.signal; } 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 ce9b17f43..70ed3c422 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -104,8 +104,8 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -114,22 +114,22 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(enchanter.itemToEnchant == null) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); enchanter.sync(); } } else if(enchanter.stage == 0) { - if(par5EntityPlayer.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { + if(player.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { enchanter.itemToEnchant = null; enchanter.sync(); - } else par5EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.invFull")); + } else player.addChatMessage(new TextComponentTranslation("botaniamisc.invFull")); } return true; } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); ItemStack itemstack = enchanter.itemToEnchant; @@ -138,14 +138,14 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3 * 0.5; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -156,9 +156,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } } - par1World.updateComparatorOutputLevel(pos, state.getBlock()); + world.updateComparatorOutputLevel(pos, state.getBlock()); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override 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 83e5ce4d5..f6b6d3db4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -74,9 +74,9 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo } @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List par6List, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) - super.addCollisionBoxToList(state, par1World, pos, par5AxisAlignedBB, par6List, par7Entity); + super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity); } @Override 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 cee06a999..79bdd076c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -118,10 +118,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TilePool pool = (TilePool) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TilePool pool = (TilePool) world.getTileEntity(pos); lastFragile = pool.fragile; - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Nonnull @@ -136,11 +136,11 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { - par3.add(new ItemStack(par1, 1, 0)); - par3.add(new ItemStack(par1, 1, 2)); - par3.add(new ItemStack(par1, 1, 3)); - par3.add(new ItemStack(par1, 1, 1)); + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + par3.add(new ItemStack(item, 1, 0)); + par3.add(new ItemStack(item, 1, 2)); + par3.add(new ItemStack(item, 1, 3)); + par3.add(new ItemStack(item, 1, 1)); } @Override @@ -155,11 +155,11 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) { if(par5Entity instanceof EntityItem) { - TilePool tile = (TilePool) par1World.getTileEntity(pos); + TilePool tile = (TilePool) world.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) par5Entity)) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } @@ -208,8 +208,8 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TilePool pool = (TilePool) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TilePool pool = (TilePool) world.getTileEntity(pos); int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); if(pool.getCurrentMana() > 0) val = Math.max(val, 1); 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 113f33a51..fe37c587f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -111,8 +111,8 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing side, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float par7, float par8, float par9) { + TileEntity tile = world.getTileEntity(pos); if(!(tile instanceof TilePrism)) return false; @@ -121,19 +121,19 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; if(lens == null && isHeldItemLens) { - if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); - par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropItem(add, false); + if(!player.inventory.addItemStackToInventory(add)) + player.dropItem(add, false); prism.getItemHandler().setStackInSlot(0, null); prism.markDirty(); - par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); } return true; @@ -153,12 +153,12 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override 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 4131af021..557b07977 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -67,26 +67,26 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(pos); - if(par5EntityPlayer.isSneaking()) { + if(player.isSneaking()) { if(altar.manaToGet == 0) - InventoryHelper.withdrawFromInventory(altar, par5EntityPlayer); + InventoryHelper.withdrawFromInventory(altar, player); } else if(altar.isEmpty() && stack == null) - altar.trySetLastRecipe(par5EntityPlayer); + altar.trySetLastRecipe(player); else if(stack != null) - return altar.addItem(par5EntityPlayer, stack); + return altar.addItem(player, stack); return false; } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override @@ -106,8 +106,8 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(pos); return altar.signal; } 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 c7917a861..09cd4e6f8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -86,16 +86,16 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void getSubBlocks(@Nonnull Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) - par3.add(new ItemStack(par1, 1, i)); + par3.add(new ItemStack(item, 1, i)); } @Override - public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); - TileSpreader spreader = (TileSpreader) par1World.getTileEntity(pos); - par1World.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); + TileSpreader spreader = (TileSpreader) world.getTileEntity(pos); + world.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); switch(orientation) { case DOWN: @@ -140,8 +140,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(pos); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = world.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return false; @@ -155,15 +155,15 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return false; if(lens == null && isHeldItemLens) { - if (!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + if (!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); } else if(lens != null && !wool) { ItemStack add = lens.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropItem(add, false); + if(!player.inventory.addItemStackToInventory(add)) + player.dropItem(add, false); spreader.getItemHandler().setStackInSlot(0, null); spreader.markDirty(); } @@ -172,11 +172,11 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex spreader.paddingColor = heldItem.getItemDamage(); heldItem.stackSize--; if(heldItem.stackSize == 0) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); - if(!par5EntityPlayer.inventory.addItemStackToInventory(pad)) - par5EntityPlayer.dropItem(pad, false); + if(!player.inventory.addItemStackToInventory(pad)) + player.dropItem(pad, false); spreader.paddingColor = -1; spreader.markDirty(); } @@ -185,20 +185,20 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileEntity tile = par1World.getTileEntity(pos); + public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + TileEntity tile = world.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return; TileSpreader inv = (TileSpreader) tile; if(inv.paddingColor != -1) { - net.minecraft.inventory.InventoryHelper.spawnItemStack(par1World, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Blocks.WOOL, 1, inv.paddingColor)); + net.minecraft.inventory.InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Blocks.WOOL, 1, inv.paddingColor)); } - InventoryHelper.dropInventory(inv, par1World, state, pos); + InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(par1World, pos, state); + super.breakBlock(world, pos, state); } @Override 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 a647b1ed5..61a7702cb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -112,8 +112,8 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) { - TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(pos); + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + TileTerraPlate plate = (TileTerraPlate) world.getTileEntity(pos); int val = (int) ((double) plate.getCurrentMana() / (double) TileTerraPlate.MAX_MANA * 15.0); if(plate.getCurrentMana() > 0) val = Math.max(val, 1); 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 e817c2c53..a9bbfcf82 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -45,9 +45,9 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); - par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); + world.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 1614ad34b..37271f98d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -143,8 +143,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setCreateFog(true); - public EntityDoppleganger(World par1World) { - super(par1World); + public EntityDoppleganger(World world) { + super(world); setSize(0.6F, 1.8F); ((PathNavigateGround) getNavigator()).setCanSwim(true); tasks.addTask(0, new EntityAISwimming(this)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index ffb72fac0..2699c292a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -21,8 +21,8 @@ import javax.annotation.Nonnull; public class EntityFlyingCreature extends EntityAmbientCreature { - public EntityFlyingCreature(World par1World) { - super(par1World); + public EntityFlyingCreature(World world) { + super(world); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 3c1eaad46..a94dbb810 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -29,8 +29,8 @@ public class EntityMagicLandmine extends Entity { public EntityDoppleganger summoner; - public EntityMagicLandmine(World par1World) { - super(par1World); + public EntityMagicLandmine(World world) { + super(world); setSize(0F, 0F); } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index b19736686..c66e612a7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -29,8 +29,8 @@ public class EntitySignalFlare extends Entity { private static final DataParameter COLOR = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); private static final DataParameter FIRED_Y = EntityDataManager.createKey(EntitySignalFlare.class, DataSerializers.VARINT); - public EntitySignalFlare(World par1World) { - super(par1World); + public EntitySignalFlare(World world) { + super(world); setSize(0F, 0F); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 9a8b926f0..73caba59a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -27,8 +27,8 @@ import java.util.List; public class EntityThrownItem extends EntityItem { - public EntityThrownItem(World par1World) { - super(par1World); + public EntityThrownItem(World world) { + super(world); } public EntityThrownItem(World world, double x, diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 9fe5c392a..0cd26a163 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -38,8 +38,8 @@ public class EntityVineBall extends EntityThrowable { private static final Map propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH, EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST); - public EntityVineBall(World par1World) { - super(par1World); + public EntityVineBall(World world) { + super(world); } public EntityVineBall(EntityLivingBase thrower, boolean gravity) { diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 0945cfeb4..e8f0c3ee9 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -31,9 +31,9 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override - public void getSubItems(@Nonnull Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(item, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 3f6923860..cca7fb1cc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -65,11 +65,11 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(getBlock(par1ItemStack) != Blocks.AIR && par3EntityPlayer.isSneaking()) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + if(getBlock(par1ItemStack) != Blocks.AIR && player.isSneaking()) { int dmg = par1ItemStack.getItemDamage(); par1ItemStack.setItemDamage(~dmg & 1); - par3EntityPlayer.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); + player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -78,15 +78,15 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - 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); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + IBlockState state = world.getBlockState(pos); boolean set = setBlock(par1ItemStack, state.getBlock(), state.getBlock().getMetaFromState(state)); if(!set) { Block bBlock = getBlock(par1ItemStack); int bmeta = getBlockMeta(par1ItemStack); - TileEntity tile = par3World.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof IInventory) { IInventory inv = (IInventory) tile; int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : InventoryHelper.buildSlotsForLinearInventory(inv); @@ -114,23 +114,23 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } } } else { - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); - BlockPos correctedPos = bBlock.isReplaceable(par3World, pos) ? pos : pos.offset(side); + int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); + BlockPos correctedPos = bBlock.isReplaceable(world, pos) ? pos : pos.offset(side); if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) { - int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); + int remove = player.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); if(remove > 0) { ItemStack stack = new ItemStack(bBlock, 1, bmeta); ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack)); - Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); + Item.getItemFromBlock(bBlock).onItemUse(stack, player, world, pos, hand, side, par8, par9, par10); set = true; } } } } - par2EntityPlayer.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); + player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } @@ -240,16 +240,16 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.AIR) { int count = getBlockCount(par1ItemStack); - par3List.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + stacks.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.format("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), stacks); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), stacks); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 7bab788e6..8643917e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -188,7 +188,7 @@ public class ItemBottledMana extends ItemMod { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { getSeed(par1ItemStack); } @@ -211,19 +211,19 @@ public class ItemBottledMana extends ItemMod { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(I18n.format("botaniamisc.bottleTooltip")); + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { + stacks.add(I18n.format("botaniamisc.bottleTooltip")); } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @Override - public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World world, EntityLivingBase living) { randomEffect(living, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 210b71bc3..92260f15d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -138,9 +138,9 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) - par3EntityPlayer.setActiveHand(hand); + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 66a6477b5..0d7478425 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -35,36 +35,36 @@ public class ItemFertilizer extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { final int range = 3; - if(!par3World.isRemote) { + if(!world.isRemote) { List validCoords = new ArrayList<>(); for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { for(int k = 2; k >= -2; k--) { BlockPos pos_ = pos.add(i + 1, k + 1, j + 1); - if(par3World.isAirBlock(pos_) && (!par3World.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canPlaceBlockAt(par3World, pos_)) + if(world.isAirBlock(pos_) && (!world.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canPlaceBlockAt(world, pos_)) validCoords.add(pos_); } } - int flowerCount = Math.min(validCoords.size(), par3World.rand.nextBoolean() ? 3 : 4); + int flowerCount = Math.min(validCoords.size(), world.rand.nextBoolean() ? 3 : 4); for(int i = 0; i < flowerCount; i++) { - BlockPos coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); + BlockPos coords = validCoords.get(world.rand.nextInt(validCoords.size())); validCoords.remove(coords); - par3World.setBlockState(coords, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(par3World.rand.nextInt(16))), 1 | 2); + world.setBlockState(coords, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(world.rand.nextInt(16))), 1 | 2); } par1ItemStack.stackSize--; } else { for(int i = 0; i < 15; i++) { - double x = pos.getX() - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double x = pos.getX() - range + world.rand.nextInt(range * 2 + 1) + Math.random(); double y = pos.getY() + 1; - double z = pos.getZ() - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double z = pos.getZ() - range + world.rand.nextInt(range * 2 + 1) + Math.random(); float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(par3World, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); + Botania.proxy.wispFX(world, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 6c3e84917..d225b9729 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -75,8 +75,8 @@ public class ItemGrassHorn extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 6fcd2b2a5..52a159f5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -66,9 +66,9 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2, List par3) { + public void getSubItems(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) - par3.add(new ItemStack(par1, 1, i)); + par3.add(new ItemStack(item, 1, i)); } @Nonnull @@ -79,14 +79,14 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Nonnull @Override - 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); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + IBlockState state = world.getBlockState(pos); 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); - par3World.setBlockState(pos, swapper.stateToSet, 1 | 2); + BlockSwapper swapper = addBlockSwapper(world, pos, meta); + world.setBlockState(pos, swapper.stateToSet, 1 | 2); for(int i = 0; i < 50; i++) { double x = (Math.random() - 0.5) * 3; double y = Math.random() - 0.5 + 1; @@ -148,7 +148,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { float velMul = 0.025F; - Botania.proxy.wispFX(par3World, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(world, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } par1ItemStack.stackSize--; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index dddbc7c92..56479bc42 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -86,13 +86,13 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!par3World.isRemote && pos.getY() < 160 && !par3World.provider.doesWaterVaporize()) { - par3World.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F); - spawnBurstFirst(par3World, pos, par1ItemStack); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + if(!world.isRemote && pos.getY() < 160 && !world.provider.doesWaterVaporize()) { + world.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F); + spawnBurstFirst(world, pos, par1ItemStack); par1ItemStack.stackSize--; if(par1ItemStack.getItemDamage() == 19) - par2EntityPlayer.addStat(ModAchievements.l20ShardUse, 1); + player.addStat(ModAchievements.l20ShardUse, 1); } return EnumActionResult.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index dab4a83e8..e7c965cc6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -68,23 +68,23 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(par2EntityPlayer.isSneaking()) { - Block block = par3World.getBlockState(pos).getBlock(); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + if(player.isSneaking()) { + Block block = world.getBlockState(pos).getBlock(); if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, pos, par2EntityPlayer, par1ItemStack); + LexiconEntry entry = ((ILexiconable) block).getEntry(world, pos, player, par1ItemStack); if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); Botania.proxy.setLexiconStack(par1ItemStack); - openBook(par2EntityPlayer, par1ItemStack, par3World, false); + openBook(player, par1ItemStack, world, false); return EnumActionResult.SUCCESS; } - } else if(par3World.isRemote) { + } else if(world.isRemote) { RayTraceResult mop = new RayTraceResult(new Vec3d(par8, par9, par10), side, pos); - return Botania.proxy.openWikiPage(par3World, block, mop) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return Botania.proxy.openWikiPage(world, block, mop) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } } } @@ -105,11 +105,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { if(GuiScreen.isShiftKeyDown()) { String edition = TextFormatting.GOLD + I18n.format("botaniamisc.edition", getEdition()); if(!edition.isEmpty()) - par3List.add(edition); + stacks.add(edition); List typesKnown = new ArrayList<>(); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -119,12 +119,12 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(I18n.format(format, typesKnown.size()), par3List); + addStringToTooltip(I18n.format(format, typesKnown.size()), stacks); for(KnowledgeType type : typesKnown) - addStringToTooltip(" \u2022 " + I18n.format(type.getUnlocalizedName()), par3List); + addStringToTooltip(" \u2022 " + I18n.format(type.getUnlocalizedName()), stacks); - } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); + } else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), stacks); } private void addStringToTooltip(String s, List tooltip) { @@ -140,17 +140,17 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { String force = getForcedPage(par1ItemStack); if(force != null && !force.isEmpty()) { LexiconEntry entry = getEntryFromForce(par1ItemStack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); + else player.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); setForcedPage(par1ItemStack, ""); } - openBook(par3EntityPlayer, par1ItemStack, par2World, skipSound); + openBook(player, par1ItemStack, world, skipSound); skipSound = false; return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index d222d1f8c..a15af29f6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -92,39 +92,39 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { int effCd = COOLDOWN; - PotionEffect effect = par3EntityPlayer.getActivePotionEffect(MobEffects.HASTE); + PotionEffect effect = player.getActivePotionEffect(MobEffects.HASTE); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; - if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) { + if(player.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); - if(par2World.isRemote) - par3EntityPlayer.swingArm(hand); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + if(world.isRemote) + player.swingArm(hand); ItemStack lens = getLens(par1ItemStack); ItemsRemainingRenderHandler.set(lens, -2); par1ItemStack.setItemDamage(effCd); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } else if(par1ItemStack.getItemDamage() == 0) { - EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true); - if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) { - if(!par2World.isRemote) { - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); - par3EntityPlayer.addStat(ModAchievements.manaBlasterShoot, 1); + EntityManaBurst burst = getBurst(player, par1ItemStack, true); + if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, player, burst.getMana(), true)) { + if(!world.isRemote) { + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); + player.addStat(ModAchievements.manaBlasterShoot, 1); if(isSugoiKawaiiDesuNe(par1ItemStack)) - par3EntityPlayer.addStat(ModAchievements.desuGun, 1); - par2World.spawnEntityInWorld(burst); + player.addStat(ModAchievements.desuGun, 1); + world.spawnEntityInWorld(burst); } else { - par3EntityPlayer.swingArm(hand); - par3EntityPlayer.motionX -= burst.motionX * 0.1; - par3EntityPlayer.motionY -= burst.motionY * 0.3; - par3EntityPlayer.motionZ -= burst.motionZ * 0.1; + player.swingArm(hand); + player.motionX -= burst.motionX * 0.1; + player.motionY -= burst.motionY * 0.3; + player.motionZ -= burst.motionZ * 0.1; } 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); + } else if(!world.isRemote) + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -208,23 +208,23 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { - addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); + addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), stacks); return; } ItemStack lens = getLens(par1ItemStack); if(lens != null) { - List tooltip = lens.getTooltip(par2EntityPlayer, false); + List tooltip = lens.getTooltip(player, false); if(tooltip.size() > 1) - par3List.addAll(tooltip.subList(1, tooltip.size())); + stacks.addAll(tooltip.subList(1, tooltip.size())); } if(clip) { int pos = getClipPos(par1ItemStack); - addStringToTooltip(I18n.format("botaniamisc.hasClip"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasClip"), stacks); for(int i = 0; i < CLIP_SLOTS; i++) { String name; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; @@ -232,7 +232,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { if(lensAt == null) name = I18n.format("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); - addStringToTooltip(formatting + " - " + name, par3List); + addStringToTooltip(formatting + " - " + name, stacks); } } } @@ -332,7 +332,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { if(par1ItemStack.isItemDamaged()) par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index eff4c4e84..d81c544fc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -67,8 +67,8 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par2World.isRemote) + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { + if(world.isRemote) return; IManaPool pool = getManaPool(par1ItemStack); @@ -85,12 +85,12 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { - TileEntity tile = par3World.getTileEntity(pos); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + if(player.isSneaking() && !world.isRemote) { + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof IManaPool) { bindPool(par1ItemStack, tile); - par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 8e56943d1..1346022e5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -45,20 +45,20 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { // Empty tablet - par3List.add(new ItemStack(par1, 1)); + stacks.add(new ItemStack(item, 1)); // Full tablet - ItemStack fullPower = new ItemStack(par1, 1); + ItemStack fullPower = new ItemStack(item, 1); setMana(fullPower, MAX_MANA); - par3List.add(fullPower); + stacks.add(fullPower); // Creative Tablet - ItemStack creative = new ItemStack(par1, 1); + ItemStack creative = new ItemStack(item, 1); setMana(creative, MAX_MANA); setStackCreative(creative); - par3List.add(creative); + stacks.add(creative); } @Override @@ -79,9 +79,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { if(isStackCreative(par1ItemStack)) - par3List.add(I18n.format("botaniamisc.creative")); + stacks.add(I18n.format("botaniamisc.creative")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index f14324769..50354752c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -33,8 +33,8 @@ public class ItemOpenBucket extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - RayTraceResult RayTraceResult = rayTrace(par2World, par3EntityPlayer, true); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + RayTraceResult RayTraceResult = rayTrace(world, player, true); if(RayTraceResult == null) return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); @@ -42,20 +42,20 @@ public class ItemOpenBucket extends ItemMod { if(RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { BlockPos pos = RayTraceResult.getBlockPos(); - if(!par2World.isBlockModifiable(par3EntityPlayer, pos)) + if(!world.isBlockModifiable(player, pos)) return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); - if(!par3EntityPlayer.canPlayerEdit(pos, RayTraceResult.sideHit, par1ItemStack)) + if(!player.canPlayerEdit(pos, RayTraceResult.sideHit, par1ItemStack)) return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); - 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 + Material material = world.getBlockState(pos).getMaterial(); + int l = world.getBlockState(pos).getBlock().getMetaFromState(world.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) { - par2World.setBlockToAir(pos); + world.setBlockToAir(pos); for(int x = 0; x < 5; x++) - par2World.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 654308e1e..a02e8ed4a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -103,20 +103,20 @@ public class ItemSextant extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { Botania.proxy.removeSextantMultiblock(); - if(!par3EntityPlayer.isSneaking()) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); + if(!player.isSneaking()) { + RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, false, 128); if(pos != null && pos.entityHit == null && pos.getBlockPos() != null) { - if(!par2World.isRemote) { + if(!world.isRemote) { ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.getBlockPos().getX()); ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.getBlockPos().getY()); ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.getBlockPos().getZ()); } } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); - par3EntityPlayer.setActiveHand(hand); + player.setActiveHand(hand); } return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index c299671b1..1009d6a43 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -51,32 +51,32 @@ public class ItemSignalFlare extends ItemMod implements IColorable { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { if(par1ItemStack.getItemDamage() == 0) { - if(par2World.isRemote) - par3EntityPlayer.swingArm(hand); + if(world.isRemote) + player.swingArm(hand); else { - EntitySignalFlare flare = new EntitySignalFlare(par2World); - flare.setPosition(par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ); + EntitySignalFlare flare = new EntitySignalFlare(world); + flare.setPosition(player.posX, player.posY, player.posZ); flare.setColor(getColor(par1ItemStack)); - flare.setFiredAt((int) par3EntityPlayer.posY); - 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); + flare.setFiredAt((int) player.posY); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.PLAYERS, 40F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - par2World.spawnEntityInWorld(flare); + world.spawnEntityInWorld(flare); int stunned = 0; int range = 5; - 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)); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityLivingBase entity : entities) - if(entity != par3EntityPlayer && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) { + if(entity != player && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) { entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 50, 5)); stunned++; } if(stunned >= 100) - par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); + player.addStat(ModAchievements.signalFlareStun, 1); } - par1ItemStack.damageItem(200, par3EntityPlayer); + par1ItemStack.damageItem(200, player); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -84,7 +84,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { if(par1ItemStack.isItemDamaged()) par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } @@ -98,16 +98,16 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(forColor(i)); + stacks.add(forColor(i)); } @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { int storedColor = getColor(par1ItemStack); - par3List.add(I18n.format("botaniamisc.flareColor", I18n.format("botania.color" + storedColor))); + stacks.add(I18n.format("botaniamisc.flareColor", I18n.format("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index e6c957f85..03f8e8815 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -35,7 +35,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityLivingBase living, int par4) { + public void onPlayerStoppedUsing(ItemStack par1ItemStack, World world, EntityLivingBase living, int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; if(!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo(((EntityPlayer) living), AMMO_FUNC)) { @@ -48,18 +48,18 @@ public class ItemSlingshot extends ItemMod { if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); - if(!par2World.isRemote) { + if(!world.isRemote) { EntityVineBall ball = new EntityVineBall(living, false); ball.motionX *= 1.6; ball.motionY *= 1.6; ball.motionZ *= 1.6; - par2World.spawnEntityInWorld(ball); + world.spawnEntityInWorld(ball); } } } @Override - public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World par2World, EntityLivingBase living) { + public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World world, EntityLivingBase living) { return par1ItemStack; } @@ -76,9 +76,9 @@ public class ItemSlingshot extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(par3EntityPlayer.capabilities.isCreativeMode || PlayerHelper.hasAmmo(par3EntityPlayer, AMMO_FUNC)) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + if(player.capabilities.isCreativeMode || PlayerHelper.hasAmmo(player, AMMO_FUNC)) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index bb6422e4c..b02673bcf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -46,10 +46,10 @@ public class ItemTemperanceStone extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(I18n.format("botaniamisc.active"), par3List); - else addStringToTooltip(I18n.format("botaniamisc.inactive"), par3List); + addStringToTooltip(I18n.format("botaniamisc.active"), stacks); + else addStringToTooltip(I18n.format("botaniamisc.inactive"), stacks); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 1e4524afc..a905ac546 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -79,41 +79,41 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Nonnull @Override - 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(); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + Block block = world.getBlockState(pos).getBlock(); BlockPos boundTile = getBoundTile(par1ItemStack); - if(boundTile.getY() != -1 && par2EntityPlayer.isSneaking() && !pos.equals(boundTile)) { - TileEntity tile = par3World.getTileEntity(boundTile); + if(boundTile.getY() != -1 && player.isSneaking() && !pos.equals(boundTile)) { + TileEntity tile = world.getTileEntity(boundTile); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, pos, side)) { + if(((IWandBindable) tile).bindTo(player, par1ItemStack, pos, side)) { Vector3 orig = new Vector3(boundTile.getX() + 0.5, boundTile.getY() + 0.5, boundTile.getZ() + 0.5); Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - doParticleBeam(par3World, orig, end); + doParticleBeam(world, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, boundTile); setBoundTile(par1ItemStack, UNBOUND_POS); } return EnumActionResult.SUCCESS; } else setBoundTile(par1ItemStack, UNBOUND_POS); - } else if(par2EntityPlayer.isSneaking()) { - block.rotateBlock(par3World, pos, side); - if(par3World.isRemote) - par2EntityPlayer.swingArm(hand); + } else if(player.isSneaking()) { + block.rotateBlock(world, pos, side); + if(world.isRemote) + player.swingArm(hand); } if(block == Blocks.LAPIS_BLOCK && ConfigHandler.enchanterEnabled) { EnumFacing.Axis axis = null; - if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.X)) + if(TileEnchanter.canEnchanterExist(world, pos, EnumFacing.Axis.X)) axis = EnumFacing.Axis.X; - else if(TileEnchanter.canEnchanterExist(par3World, pos, EnumFacing.Axis.Z)) + else if(TileEnchanter.canEnchanterExist(world, pos, EnumFacing.Axis.Z)) axis = EnumFacing.Axis.Z; - if(axis != null && !par3World.isRemote) { - par3World.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); - par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); + if(axis != null && !world.isRemote) { + world.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); + player.addStat(ModAchievements.enchanterMake, 1); + world.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -125,40 +125,40 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { float velMul = 0.07F; - Botania.proxy.wispFX(par3World, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(world, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } } } else if(block instanceof IWandable) { - TileEntity tile = par3World.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); boolean bindable = tile instanceof IWandBindable; boolean wanded; - if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, pos, side)) { + if(getBindMode(par1ItemStack) && bindable && player.isSneaking() && ((IWandBindable) tile).canSelect(player, par1ItemStack, pos, side)) { if(boundTile.equals(pos)) setBoundTile(par1ItemStack, UNBOUND_POS); else setBoundTile(par1ItemStack, pos); - if(par3World.isRemote) - par2EntityPlayer.swingArm(hand); - par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); + if(world.isRemote) + player.swingArm(hand); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, pos, side); - if(wanded && par3World.isRemote) - par2EntityPlayer.swingArm(hand); + wanded = ((IWandable) block).onUsedByWand(player, par1ItemStack, world, pos, side); + if(wanded && world.isRemote) + player.swingArm(hand); } return wanded ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - } else if(((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.containsKey(par2EntityPlayer.getUniqueID()) && !par3World.isRemote) { - BlockPistonRelay.DimWithPos bindPos = ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.get(par2EntityPlayer.getUniqueID()); - BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(par3World.provider.getDimension(), pos); + } else if(((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.containsKey(player.getUniqueID()) && !world.isRemote) { + BlockPistonRelay.DimWithPos bindPos = ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.get(player.getUniqueID()); + BlockPistonRelay.DimWithPos currentPos = new BlockPistonRelay.DimWithPos(world.provider.getDimension(), pos); - ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.remove(par2EntityPlayer.getUniqueID()); + ((BlockPistonRelay) (ModBlocks.pistonRelay)).playerPositions.remove(player.getUniqueID()); ((BlockPistonRelay) (ModBlocks.pistonRelay)).mappedPositions.put(bindPos, currentPos); - BlockPistonRelay.WorldData.get(par3World).markDirty(); + BlockPistonRelay.WorldData.get(world).markDirty(); - par3World.playSound(null, par2EntityPlayer.posX, par2EntityPlayer.posY, par2EntityPlayer.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); return EnumActionResult.SUCCESS; } @@ -191,9 +191,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { BlockPos coords = getBoundTile(par1ItemStack); - TileEntity tile = par2World.getTileEntity(coords); + TileEntity tile = world.getTileEntity(coords); if(tile == null || !(tile instanceof IWandBindable)) setBoundTile(par1ItemStack, UNBOUND_POS); } @@ -219,9 +219,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(forColors(i, i)); + stacks.add(forColors(i, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 3ceec3072..59d52dbb0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -31,16 +31,16 @@ public class ItemVineBall extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par3EntityPlayer.capabilities.isCreativeMode) + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + if(!player.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)); + 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(!par2World.isRemote) { - EntityVineBall ball = new EntityVineBall(par3EntityPlayer, true); - ball.setHeadingFromThrower(par3EntityPlayer, par3EntityPlayer.rotationPitch, par3EntityPlayer.rotationYaw, 0.0F, 1.5F, 1.0F); - par2World.spawnEntityInWorld(ball); + if(!world.isRemote) { + EntityVineBall ball = new EntityVineBall(player, true); + ball.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + world.spawnEntityInWorld(ball); } return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 1ec70b110..2fec7b3d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -52,9 +52,9 @@ public class ItemVirus extends ItemMod { } @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase, EnumHand hand) { + public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer player, EntityLivingBase par3EntityLivingBase, EnumHand hand) { if(par3EntityLivingBase instanceof EntityHorse) { - if(par2EntityPlayer.worldObj.isRemote) + if(player.worldObj.isRemote) return true; EntityHorse horse = (EntityHorse) par3EntityLivingBase; if(horse.getType() != HorseType.ZOMBIE && horse.getType() != HorseType.SKELETON && horse.isTame()) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 3202f6a34..1dfa544f2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -28,10 +28,10 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { @SideOnly(Side.CLIENT) @Override - public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer player, @Nonnull List stacks, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) - par3List.add(I18n.format("botaniamisc.creativePool" + i)); + stacks.add(I18n.format("botaniamisc.creativePool" + i)); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 5ac094b37..dacb292bc 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -79,22 +79,22 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @SideOnly(Side.CLIENT) @Override - public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer par2EntityPlayer, @Nonnull List par3List, boolean par4) { + public void addInformation(@Nonnull ItemStack par1ItemStack, @Nonnull EntityPlayer player, @Nonnull List stacks, boolean par4) { String type = getType(par1ItemStack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); - sig.addTooltip(par1ItemStack, par2EntityPlayer, par3List); + sig.addTooltip(par1ItemStack, player, stacks); if(ConfigHandler.referencesEnabled) { String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); String refLocalized = I18n.format(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) - par3List.add(TextFormatting.ITALIC + refLocalized); + stacks.add(TextFormatting.ITALIC + refLocalized); } String mod = BotaniaAPI.subTileMods.get(type); if(!mod.equals(LibMisc.MOD_ID)) - par3List.add(TextFormatting.ITALIC + "[" + mod + "]"); + stacks.add(TextFormatting.ITALIC + "[" + mod + "]"); } public static String getType(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 781a0bc85..f4ab4bd26 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -57,24 +57,24 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + if(!EntityDoppleganger.isTruePlayer(player)) return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); - if(canEquip(par1ItemStack, par3EntityPlayer)) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer); + if(canEquip(par1ItemStack, player)) { + InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) { if(baubles.isItemValidForSlot(i, par1ItemStack)) { ItemStack stackInSlot = baubles.getStackInSlot(i); - if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) { - if(!par2World.isRemote) { + if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { + if(!world.isRemote) { baubles.setInventorySlotContents(i, par1ItemStack.copy()); - if(!par3EntityPlayer.capabilities.isCreativeMode) - par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } if(stackInSlot != null) { - ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); + ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); return ActionResult.newResult(EnumActionResult.SUCCESS, stackInSlot.copy()); } break; @@ -88,28 +88,28 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { if(GuiScreen.isShiftKeyDown()) - addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), par3List); + addHiddenTooltip(par1ItemStack, player, stacks, par4); + else addStringToTooltip(I18n.format("botaniamisc.shiftinfo"), stacks); } @SideOnly(Side.CLIENT) - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(I18n.format("botania.baubletype." + type.name().toLowerCase()), par3List); + addStringToTooltip(I18n.format("botania.baubletype." + type.name().toLowerCase()), stacks); String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) - addStringToTooltip(I18n.format("botania.baubletooltip", key), par3List); + addStringToTooltip(I18n.format("botania.baubletooltip", key), stacks); ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) - addStringToTooltip(I18n.format("botaniamisc.hasCosmetic", cosmetic.getDisplayName()), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasCosmetic", cosmetic.getDisplayName()), stacks); if(hasPhantomInk(par1ItemStack)) - addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), par3List); + addStringToTooltip(I18n.format("botaniamisc.hasPhantomInk"), stacks); } void addStringToTooltip(String s, List tooltip) { 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 c7910044a..7ebeec53f 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 @@ -83,9 +83,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @SideOnly(Side.CLIENT) @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - addStringToTooltip(I18n.format("botaniamisc.cosmeticBauble"), par3List); - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { + addStringToTooltip(I18n.format("botaniamisc.cosmeticBauble"), stacks); + super.addHiddenTooltip(par1ItemStack, player, stacks, par4); } @Override 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 374c4556f..6dacac2ec 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 @@ -104,9 +104,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @SideOnly(Side.CLIENT) @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - par3List.add(I18n.format("botania.wings" + par1ItemStack.getItemDamage())); + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { + super.addHiddenTooltip(par1ItemStack, player, stacks, par4); + stacks.add(I18n.format("botania.wings" + par1ItemStack.getItemDamage())); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index e8bbac757..40810a6e0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -47,8 +47,8 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 10000)); + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + stacks.add(new ItemStack(item, 1, 10000)); } @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 431453943..b865c4f6c 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 @@ -41,41 +41,41 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { + super.onUpdate(par1ItemStack, world, par3Entity, par4, par5); if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; 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) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); + if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote) { + RayTraceResult pos = ToolCommons.raytraceFromEntity(world, par3Entity, true, 48); if(pos != null && pos.getBlockPos() != null) { Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); posVec.add(motVec); motVec.normalize().negate().multiply(1.5); - EntityFallingStar star = new EntityFallingStar(par2World, player); + EntityFallingStar star = new EntityFallingStar(world, player); star.setPosition(posVec.x, posVec.y, posVec.z); star.motionX = motVec.x; star.motionY = motVec.y; star.motionZ = motVec.z; - par2World.spawnEntityInWorld(star); + world.spawnEntityInWorld(star); - if (!par2World.isRaining() - && Math.abs(par2World.getWorldTime() - 18000) < 1800 + if (!world.isRaining() + && Math.abs(world.getWorldTime() - 18000) < 1800 && Math.random() < 0.125) { - EntityFallingStar bonusStar = new EntityFallingStar(par2World, player); + EntityFallingStar bonusStar = new EntityFallingStar(world, player); bonusStar.setPosition(posVec.x, posVec.y, posVec.z); bonusStar.motionX = motVec.x + Math.random() - 0.5; bonusStar.motionY = motVec.y + Math.random() - 0.5; bonusStar.motionZ = motVec.z + Math.random() - 0.5; - par2World.spawnEntityInWorld(bonusStar); + world.spawnEntityInWorld(bonusStar); } ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } 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 dc111e56a..4f6be4ed2 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 @@ -43,7 +43,7 @@ public class ItemElementiumShears extends ItemManasteelShears { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } 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 6e87f3d20..cbbd01944 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 @@ -106,24 +106,24 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { String rank = I18n.format("botania.rank" + getLevel(par1ItemStack)); String rankFormat = I18n.format("botaniamisc.toolRank", rank); - par3List.add(rankFormat.replaceAll("&", "\u00a7")); + stacks.add(rankFormat.replaceAll("&", "\u00a7")); if(getMana(par1ItemStack) == Integer.MAX_VALUE) - par3List.add(TextFormatting.RED + I18n.format("botaniamisc.getALife")); + stacks.add(TextFormatting.RED + I18n.format("botaniamisc.getALife")); } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { getMana(par1ItemStack); int level = getLevel(par1ItemStack); if(level != 0) { setEnabled(par1ItemStack, !isEnabled(par1ItemStack)); - if(!par2World.isRemote) - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); + if(!world.isRemote) + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); } return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); @@ -137,8 +137,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { + super.onUpdate(par1ItemStack, world, par3Entity, par4, par5); if(isEnabled(par1ItemStack)) { int level = getLevel(par1ItemStack); 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 ba89f3f54..bc5d49302 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 @@ -53,18 +53,18 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { + super.onUpdate(par1ItemStack, world, par3Entity, par4, par5); if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; 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) { + if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) { EntityManaBurst burst = getBurst(player, par1ItemStack); - par2World.spawnEntityInWorld(burst); + world.spawnEntityInWorld(burst); ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 06df18f17..005279df7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -148,9 +148,9 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < SUBTYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override @@ -166,10 +166,10 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { int storedColor = getStoredColor(par1ItemStack); if(storedColor != -1) - par3List.add(I18n.format("botaniamisc.color", I18n.format("botania.color" + storedColor))); + stacks.add(I18n.format("botaniamisc.color", I18n.format("botania.color" + storedColor))); } 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 ccc913ce0..b4814f715 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -39,17 +39,17 @@ public class ItemDye extends Item16Colors { @Nonnull @Override - 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(); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + Block block = world.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 != world.getBlockState(pos).getValue(BlockColored.COLOR) + || block == Blocks.CARPET && color != world.getBlockState(pos).getValue(BlockCarpet.COLOR)) { + world.setBlockState(pos, world.getBlockState(pos).withProperty(block == Blocks.WOOL ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2); par1ItemStack.stackSize--; return EnumActionResult.SUCCESS; } - TileEntity tile = par3World.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); if(tile instanceof IManaPool) { IManaPool pool = (IManaPool) tile; if(color != pool.getColor()) { 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 369868d4b..384b105ca 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -87,34 +87,34 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - 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.playEvent(2005, pos, 0); + return world.isRemote || EntityDoppleganger.spawn(player, par1ItemStack, world, pos, par1ItemStack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, world, pos, player)) { + if(!world.isRemote) + world.playEvent(2005, pos, 0); return EnumActionResult.SUCCESS; } - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); + return super.onItemUse(par1ItemStack, player, world, pos, hand, side, par8, par9, par10); } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { if(par1ItemStack.getItemDamage() == 15) { - if(!par2EntityPlayer.capabilities.isCreativeMode) + if(!player.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)); + world.playSound(null, player.posX, player.posY, player.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); - b.setHeadingFromThrower(par2EntityPlayer, par2EntityPlayer.rotationPitch, par2EntityPlayer.rotationYaw, 0F, 1.5F, 1F); - par3World.spawnEntityInWorld(b); + if(!world.isRemote) { + EntityEnderAirBottle b = new EntityEnderAirBottle(world, player); + b.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0F, 1.5F, 1F); + world.spawnEntityInWorld(b); } - else par2EntityPlayer.swingArm(hand); + else player.swingArm(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } @@ -123,10 +123,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index a15059c00..36ed48e7b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -34,9 +34,9 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(@Nonnull Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull 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 a38dd754d..8fa7d8f46 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -79,8 +79,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 055ed51b7..dd66339fe 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -43,8 +43,8 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); setCharging(par1ItemStack, true); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 45235087f..20a7e4f4e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -60,9 +60,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @SideOnly(Side.CLIENT) @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - dummy.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { + super.addHiddenTooltip(par1ItemStack, player, stacks, par4); + dummy.addBindInfo(stacks, par1ItemStack, player); } public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { 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 2d9918262..8a299bed5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -38,8 +38,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv @Nonnull @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); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + return ItemDirtRod.place(par1ItemStack, player, world, pos, hand, side, par8, par9, par10, Blocks.COBBLESTONE, COST, 0.3F, 0.3F, 0.3F); } @Override 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 329b8f766..dfb0fb215 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -49,22 +49,22 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev @Nonnull @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); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + return place(par1ItemStack, player, world, 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) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, false)) { - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); + public static EnumActionResult place(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { + if(ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, false)) { + int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.onItemUse(par2EntityPlayer, par3World, pos, hand, side, par8, par9, par10); + stackToPlace.onItemUse(player, world, pos, hand, side, par8, par9, par10); if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, true); + ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, true); 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(), r, g, b, 1F, 5); + Botania.proxy.sparkleFX(world, pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); return EnumActionResult.SUCCESS; } } 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 c8add78c8..877a75b3f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -74,34 +74,34 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - IBlockState wstate = par3World.getBlockState(pos); + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + IBlockState wstate = world.getBlockState(pos); - if(par2EntityPlayer.isSneaking()) { - TileEntity tile = par3World.getTileEntity(pos); + if(player.isSneaking()) { + TileEntity tile = world.getTileEntity(pos); if(tile == null) { if(BlockCamo.isValidBlock(wstate)) { Item item = Item.getItemFromBlock(wstate.getBlock()); boolean set = setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); - par2EntityPlayer.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); + player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); - displayRemainderCounter(par2EntityPlayer, par1ItemStack); + displayRemainderCounter(player, par1ItemStack); return EnumActionResult.SUCCESS; } } } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); - List swap = getBlocksToSwap(par3World, par1ItemStack, block.getStateFromMeta(meta), pos, null); + List swap = getBlocksToSwap(world, par1ItemStack, block.getStateFromMeta(meta), pos, null); if(swap.size() > 0) { ItemNBTHelper.setBoolean(par1ItemStack, TAG_SWAPPING, true); ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, pos.getX()); ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Y, pos.getY()); ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, pos.getZ()); setTargetBlock(par1ItemStack, wstate.getBlock(), wstate.getBlock().getMetaFromState(wstate)); - if(par3World.isRemote) - par2EntityPlayer.swingArm(hand); + if(world.isRemote) + player.swingArm(hand); } } 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 d094f1d25..093aacdc3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -48,8 +48,8 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!par3World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + if(!world.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); player.worldObj.spawnEntityInWorld(entity); @@ -57,14 +57,14 @@ 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); + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_BLAZE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); } return EnumActionResult.SUCCESS; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { // Keep for backward compat if(par1ItemStack.getItemDamage() > 0) par1ItemStack.setItemDamage(0); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 54b183de7..190ff4a2a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -90,8 +90,8 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 7260b2157..757f91528 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -58,38 +58,38 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - if(!par2World.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + if(!world.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, MANA_COST, false)) { Block place = ModBlocks.bifrost; - Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); + Vector3 vector = new Vector3(player.getLookVec()).normalize(); - double x = par3EntityPlayer.posX; - double y = par3EntityPlayer.posY; - double z = par3EntityPlayer.posZ; + double x = player.posX; + double y = player.posY; + double z = player.posZ; double lx = 0; double ly = -1; double lz = 0; int count = 0; - boolean prof = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer); + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; BlockPos playerPos = new BlockPos((int) x, (int) y, (int) z); - while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlockState(playerPos).getBlock().isAir(par2World.getBlockState(playerPos), par2World, playerPos) || par2World.getBlockState(playerPos).getBlock() == place) { + while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || world.getBlockState(playerPos).getBlock().isAir(world.getBlockState(playerPos), world, playerPos) || world.getBlockState(playerPos).getBlock() == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) for(int j = -2; j < 1; j++) { BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); - if(par2World.getBlockState(pos_).getBlock().isAir(par2World.getBlockState(pos_), par2World, pos_) || par2World.getBlockState(pos_).getBlock() == place) { - par2World.setBlockState(pos_, place.getDefaultState()); - TileBifrost tile = (TileBifrost) par2World.getTileEntity(pos_); + if(world.getBlockState(pos_).getBlock().isAir(world.getBlockState(pos_), world, pos_) || world.getBlockState(pos_).getBlock() == place) { + world.setBlockState(pos_, place.getDefaultState()); + TileBifrost tile = (TileBifrost) world.getTileEntity(pos_); if(tile != null) { for(int k = 0; k < 4; k++) - Botania.proxy.sparkleFX(par2World, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(world, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); tile.ticks = time; } } @@ -107,9 +107,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } if(count > 0) { - par2World.playSound(null, par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); - ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false); - par3EntityPlayer.getCooldownTracker().setCooldown(this, TIME); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); + ManaItemHandler.requestManaExactForTool(par1ItemStack, player, MANA_COST, false); + player.getCooldownTracker().setCooldown(this, TIME); } } @@ -128,7 +128,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { // Kept for backward compat if (par1ItemStack.getItemDamage() > 0) par1ItemStack.setItemDamage(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 62e5a49c7..f09fc35af 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -63,8 +63,8 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } 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 81f689ffb..60b9c2fc7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -99,23 +99,23 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { - par3EntityPlayer.setActiveHand(hand); + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); } - private void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; + private void terraform(ItemStack par1ItemStack, World world, EntityPlayer player) { + int range = IManaProficiencyArmor.Helper.hasProficiency(player) ? 22 : 16; - BlockPos startCenter = new BlockPos(par3EntityPlayer).down(); + BlockPos startCenter = new BlockPos(player).down(); - if(startCenter.getY() < par2World.getSeaLevel()) // Not below sea level + if(startCenter.getY() < world.getSeaLevel()) // Not below sea level return; List blocks = new ArrayList<>(); for(BlockPos pos : BlockPos.getAllInBoxMutable(startCenter.add(-range, -range, -range), startCenter.add(range, range, range))) { - IBlockState state = par2World.getBlockState(pos); + IBlockState state = world.getBlockState(pos); if(state.getBlock() == Blocks.AIR) continue; else if(Item.getItemFromBlock(state.getBlock()) == null) @@ -127,8 +127,8 @@ 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) { + Block block_ = world.getBlockState(pos_).getBlock(); + if(block_.isAir(world.getBlockState(pos_), world, pos_) || block_.isReplaceable(world, pos_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.DOUBLE_PLANT) { airBlocks.add(pos_); } } @@ -137,7 +137,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(pos.getY() > startCenter.getY()) blocks.add(new CoordsWithBlock(pos, Blocks.AIR)); else for(BlockPos coords : airBlocks) { - if(par2World.getBlockState(coords.down()).getBlock() != Blocks.AIR) + if(world.getBlockState(coords.down()).getBlock() != Blocks.AIR) blocks.add(new CoordsWithBlock(coords, Blocks.DIRT)); } } @@ -147,16 +147,16 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int cost = COST_PER * blocks.size(); - if(par2World.isRemote || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, cost, true)) { - if(!par2World.isRemote) + if(world.isRemote || ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, true)) { + if(!world.isRemote) for(CoordsWithBlock block : blocks) - par2World.setBlockState(block, block.block.getDefaultState()); + world.setBlockState(block, block.block.getDefaultState()); 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); + world.playSound(player, player.posX, player.posY, player.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); + Botania.proxy.sparkleFX(world, 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); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 233f429f3..0ac7595db 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -65,7 +65,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean holding) { + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean holding) { if(par3Entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) par3Entity; boolean damaged = par1ItemStack.getItemDamage() > 0; @@ -99,12 +99,12 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { int meta = par1ItemStack.getItemDamage(); - if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, false)) { - par3EntityPlayer.setActiveHand(hand); + if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + player.setActiveHand(hand); if(meta == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, true); + ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); setFlying(par1ItemStack, true); } return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); 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 97273077a..8abe327ee 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -29,21 +29,21 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { @Nonnull @Override - 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()) { + public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + if(ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false) && !world.provider.doesWaterVaporize()) { // Adapted from bucket code - RayTraceResult mop = rayTrace(par3World, par2EntityPlayer, false); + RayTraceResult mop = rayTrace(world, player, false); if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos hitPos = mop.getBlockPos(); - if(!par3World.isBlockModifiable(par2EntityPlayer, hitPos)) + if(!world.isBlockModifiable(player, hitPos)) return EnumActionResult.FAIL; 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)) { + if(player.canPlayerEdit(placePos, mop.sideHit, par1ItemStack)) { + if (ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true) + && ((ItemBucket) Items.WATER_BUCKET).tryPlaceContainedLiquid(player, world, 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); + Botania.proxy.sparkleFX(world, 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; } } From bc0ca77960d0cca0a72fab496d813de7d0e815ee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jun 2016 21:11:47 -0500 Subject: [PATCH 694/935] Terra blade now respects 1.9 cooldown --- .../tool/terrasteel/ItemTerraSword.java | 46 ++++++++++++------- .../botania/common/network/PacketHandler.java | 6 +++ .../common/network/PacketLeftClick.java | 29 ++++++++++++ 3 files changed, 64 insertions(+), 17 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/network/PacketLeftClick.java 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 bc5d49302..fa1e5ec27 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 @@ -10,21 +10,21 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.MobEffects; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.AttackEntityEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; @@ -38,6 +38,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.network.PacketLeftClick; import javax.annotation.Nonnull; import java.util.List; @@ -50,22 +52,32 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I public ItemTerraSword() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_SWORD); + MinecraftForge.EVENT_BUS.register(this); } - @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, world, par3Entity, par4, par5); - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(MobEffects.HASTE); - float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; + @SubscribeEvent + public void leftClick(PlayerInteractEvent.LeftClickEmpty evt) { + if (evt.getItemStack() != null + && evt.getItemStack().getItem() == this) { + PacketHandler.sendToServer(new PacketLeftClick()); + } + } - if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) { - EntityManaBurst burst = getBurst(player, par1ItemStack); - world.spawnEntityInWorld(burst); - ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); - } + @SubscribeEvent + public void attackEntity(AttackEntityEvent evt) { + if (!evt.getEntityPlayer().worldObj.isRemote) { + trySpawnBurst(evt.getEntityPlayer()); + } + } + + public void trySpawnBurst(EntityPlayer player) { + if (player.getHeldItemMainhand() != null + && player.getHeldItemMainhand().getItem() == this + && player.getCooledAttackStrength(0) == 1) { + EntityManaBurst burst = getBurst(player, player.getHeldItemMainhand()); + player.worldObj.spawnEntityInWorld(burst); + ToolCommons.damageItem(player.getHeldItemMainhand(), 1, player, MANA_PER_DAMAGE); + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index cc2634d4f..963f6410b 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; @@ -17,6 +18,7 @@ public final class PacketHandler { public static void init() { HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT); + HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, 1, Side.SERVER); } /** @@ -46,6 +48,10 @@ public final class PacketHandler { HANDLER.sendTo(toSend, playerMP); } + public static void sendToServer(IMessage msg) { + HANDLER.sendToServer(msg); + } + private PacketHandler() {} } diff --git a/src/main/java/vazkii/botania/common/network/PacketLeftClick.java b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java new file mode 100644 index 000000000..284059c36 --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java @@ -0,0 +1,29 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; + +public class PacketLeftClick implements IMessage { + @Override + public void fromBytes(ByteBuf buf) {} + + @Override + public void toBytes(ByteBuf buf) {} + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketLeftClick message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + player.mcServer.addScheduledTask(() -> ((ItemTerraSword) ModItems.terraSword).trySpawnBurst(player)); + return null; + } + } + +} From 9e09a3f42d61d4cbd52723f188c0881fb2521903 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 12 Jun 2016 13:19:31 -0500 Subject: [PATCH 695/935] Update forge and fix pylon transforms, closes #252 --- build.properties | 2 +- .../vazkii/botania/common/lib/LibMisc.java | 2 +- .../assets/botania/blockstates/pylon.json | 45 ++++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 580ed074c..837a2eb82 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1948 +forge_version=12.17.0.1960 mc_version=1.9.4 dir_repo=./ build_number=309 diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 283ac2679..07b446601 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.17.0.1948,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1960,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json index 4b99230ed..f118d25f3 100644 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -2,7 +2,50 @@ "forge_marker": 1, "defaults": { "model": "botania:pylon.obj", - "transform": "forge:default-block", + "transform": { + "gui": { + "rotation": [ {"x": 30}, {"y": 225}, {"z": 0} ], + "translation": [ -0.25, 0, 0], + "scale": 0.5625, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "ground": { + "rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ], + "translation": [ 0, 0.1875, 0], + "scale": 0.25, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "fixed": { + "rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ], + "translation": [ 0, -0.15625, 0.3125 ], + "scale": 0.5, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "thirdperson_righthand": { + "rotation": [ {"x": 75}, {"y": 45}, {"z": 0} ], + "translation": [ 0.125, -0.125, 0 ], + "scale": 0.375, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "thirdperson_lefthand": { + "rotation": [ {"x": 75}, {"y": 225}, {"z": 0} ], + "translation": [ -0.375, 0.375, -0.125 ], + "scale": 0.375, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "firstperson_righthand": { + "rotation": [ {"x": 0}, {"y": 45}, {"z": 0} ], + "translation": [ 0.375, 0, 0.25 ], + "scale": 0.4, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + }, + "firstperson_lefthand": { + "rotation": [ {"x": 0}, {"y": 225}, {"z": 0} ], + "translation": [ -0.375, 0, -0.25 ], + "scale": 0.4, + "post-rotation": [ {"x": 0}, {"y": 0}, {"z": 0} ] + } + }, "custom": { "flip-v": true } From 96bf87333be04f6a9a202f3346d8d671722e0eec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 14 Jun 2016 20:30:52 -0500 Subject: [PATCH 696/935] Clean up lightning code, batch the render by 200's to not overflow the tess. Closes #342 --- .../client/core/handler/LightningHandler.java | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 05280e804..5dd8f8f13 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -10,10 +10,10 @@ */ package vazkii.botania.client.core.handler; +import com.google.common.collect.Lists; import gnu.trove.map.hash.TIntIntHashMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; @@ -22,7 +22,6 @@ import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -39,11 +38,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; +import java.util.List; import java.util.Random; -import java.util.concurrent.ConcurrentLinkedQueue; public class LightningHandler { + private static final int BATCH_THRESHOLD = 200; private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); @@ -82,15 +82,31 @@ public class LightningHandler { ParticleRenderDispatcher.lightningCount = 0; render.bindTexture(outsideResource); + int counter = 0; + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for(LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false); + for (LightningBolt bolt : LightningBolt.boltlist) { + renderBolt(bolt, tessellator, 0, false); + if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { + tessellator.draw(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + } + counter++; + } tessellator.draw(); render.bindTexture(insideResource); + counter = 0; + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for(LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true); + for (LightningBolt bolt : LightningBolt.boltlist) { + renderBolt(bolt, tessellator, 0, false); + if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { + tessellator.draw(); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + } + counter++; + } tessellator.draw(); GlStateManager.disableBlend(); @@ -111,7 +127,7 @@ public class LightningHandler { LightningBolt.boltlist.add(bolt); } - private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) { + private void renderBolt(LightningBolt bolt, Tessellator tessellator, int pass, boolean inner) { ParticleRenderDispatcher.lightningCount++; float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; float mainalpha; @@ -174,7 +190,6 @@ public class LightningHandler { public ArrayList segments = new ArrayList<>(); public final Vector3 start; public final Vector3 end; - BlockPos target; final TIntIntHashMap splitparents = new TIntIntHashMap(); public final double length; @@ -187,19 +202,15 @@ public class LightningHandler { public int particleAge; public final int particleMaxAge; public boolean isDead; - private AxisAlignedBB boundingBox; private final World world; private Entity source; - public static final ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); + public static final List boltlist = new ArrayList<>(); public float speed = 1.5F; public static final int fadetime = 20; - public static int playerdamage = 1; - public static int entitydamage = 1; - public final int colorOuter; public final int colorInner; @@ -311,21 +322,9 @@ public class LightningHandler { particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; particleAge = -(int) (length * speed); - boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0); - boundingBox = new AxisAlignedBB(Math.min(start.x, end.x), Math.min(start.y, end.y), Math.min(start.z, end.z), Math.max(start.x, end.x), Math.max(start.y, end.y), Math.max(start.z, end.z)).expand(length / 2, length / 2, length / 2); - segments.add(new Segment(start, end)); } - public static Vector3 getFocalPoint(TileEntity tile) { - return Vector3.fromTileEntityCenter(tile); - } - - public LightningBolt(World world, Vector3 sourcevec, TileEntity target, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - this(world, sourcevec, getFocalPoint(target), ticksPerMeter, seed, colorOuter, colorInner); - this.target = target.getPos(); - } - public void setWrapper(Entity entity) { source = entity; } From ae0894a8d09704dce4d123716ad4bb9a16b810d1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 19:24:12 -0500 Subject: [PATCH 697/935] Fix keybinding crash. Closes #344 --- .../java/vazkii/botania/client/core/helper/RenderHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index e944aa073..926cdef19 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -241,7 +241,7 @@ public final class RenderHelper { KeyBinding[] keys = Minecraft.getMinecraft().gameSettings.keyBindings; for(KeyBinding otherKey : keys) if(otherKey.getKeyDescription().equals(keyName)) { - key = Keyboard.getKeyName(otherKey.getKeyCode()); + key = otherKey.getDisplayName(); break; } From 47ac6fc65afa5349a0f205dc54d71ef09527050f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 19:26:29 -0500 Subject: [PATCH 698/935] Check for blocks with no item in overgrowth seed. Closes #347 --- .../java/vazkii/botania/common/item/ItemOvergrowthSeed.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index bf1c19d65..bfe420a78 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -35,6 +36,8 @@ public class ItemOvergrowthSeed extends ItemMod { @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { IBlockState state = world.getBlockState(pos); + if(Item.getItemFromBlock(state.getBlock()) == null) + return EnumActionResult.PASS; ItemStack blockStack = new ItemStack(state.getBlock()); int[] ids = OreDictionary.getOreIDs(blockStack); for(int i : ids) { From 5f3951c7fa209bfef6856dc2cf8bce53fc9700fd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 19:39:26 -0500 Subject: [PATCH 699/935] Fix solegnolia having lower range than advertised. Closes #346 --- .../common/block/subtile/functional/SubTileSolegnolia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 1bb5bf51a..108a728d6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -49,7 +49,7 @@ public class SubTileSolegnolia extends SubTileFunctional { .filter(f -> f.redstoneSignal == 0) .filter(f -> f.supertile.getWorld() != e.worldObj) .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) - .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange()) + .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) .findAny().isPresent(); } From ec9496b0e7d513d208351546682e76edc0d7040d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 19:48:14 -0500 Subject: [PATCH 700/935] Remove some unused stuff --- .../common/block/subtile/functional/SubTileSolegnolia.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 108a728d6..36ca0c765 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,6 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE_MINI = 1; private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); - private static boolean registered = false; @Override public void onUpdate() { @@ -34,8 +33,6 @@ public class SubTileSolegnolia extends SubTileFunctional { if(!existingFlowers.contains(this)) { existingFlowers.add(this); - if(!registered) - registered = true; } } From 95f1e768fe6ee1a3ae8a487480dbe10ed0bfa73f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 20:40:11 -0500 Subject: [PATCH 701/935] Update forge, fix mana blaster overrides --- build.properties | 2 +- .../java/vazkii/botania/common/lib/LibMisc.java | 2 +- .../assets/botania/models/item/manaGun.json | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 837a2eb82..6be06eaa1 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1960 +forge_version=12.17.0.1965 mc_version=1.9.4 dir_repo=./ build_number=309 diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 07b446601..58e2ed205 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.17.0.1960,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1965,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 678d3ca53..5e6ef87b7 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -186,6 +186,13 @@ } }, "overrides": [ + { + "predicate": { + "botania:desu": 1, + "botania:clip": 1 + }, + "model": "botania:item/desuGunClip" + }, { "predicate": { "botania:clip": 1 @@ -197,13 +204,6 @@ "botania:desu": 1 }, "model": "botania:item/desuGun" - }, - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" } ] } \ No newline at end of file From c1fff324d15d98535f1dfc34b71c5488f2871876 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 20:59:52 -0500 Subject: [PATCH 702/935] Remove extraneous debug print --- src/main/java/vazkii/botania/common/entity/EntitySpark.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index b51cb1741..795c14410 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -232,8 +232,6 @@ public class EntitySpark extends Entity implements ISparkEntity { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { if(upgrade != SparkUpgradeType.NONE) { - if (worldObj.isRemote) - System.out.println("WTF"); entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); setUpgrade(SparkUpgradeType.NONE); From 1d5dfa149e28c97ba6367692ab7e0ea1c9681db8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 21:04:36 -0500 Subject: [PATCH 703/935] TIL Collection.removeIf --- .../common/entity/EntityDoppleganger.java | 8 +------- .../common/entity/EntityPinkWither.java | 18 +++--------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 37271f98d..927176a66 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -594,13 +594,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { anyWithArmor = true; Collection active = player.getActivePotionEffects(); - Iterator iter = active.iterator(); - - while (iter.hasNext()) { - PotionEffect effect = iter.next(); - if(effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) - iter.remove(); - } + active.removeIf(effect -> effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()); player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 963754adb..54cbe1b57 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -31,22 +31,10 @@ public class EntityPinkWither extends EntityWither { public EntityPinkWither(World world) { super(world); - Iterator taskIter = this.tasks.taskEntries.iterator(); - while (taskIter.hasNext()) { - EntityAITasks.EntityAITaskEntry entry = taskIter.next(); - if (entry.action instanceof EntityAIAttackRanged) { - taskIter.remove(); // Remove firing wither skulls - } - } + this.tasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIAttackRanged); // Remove firing wither skulls - Iterator targetTaskIter = this.targetTasks.taskEntries.iterator(); - while (targetTaskIter.hasNext()) { - EntityAITasks.EntityAITaskEntry entry = targetTaskIter.next(); - if (entry.action instanceof EntityAIHurtByTarget - || entry.action instanceof EntityAINearestAttackableTarget) { - targetTaskIter.remove(); // Remove revenge and aggro - } - } + this.targetTasks.taskEntries.removeIf(entry -> entry.action instanceof EntityAIHurtByTarget + || entry.action instanceof EntityAINearestAttackableTarget); // Remove revenge and aggro } @Override From 73c06c10ebebe8b392ade0fa6ba76ac7d9c12ee9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 21:18:35 -0500 Subject: [PATCH 704/935] Fix server crash --- .../vazkii/botania/client/core/proxy/ClientProxy.java | 11 +++++++++++ .../vazkii/botania/common/core/proxy/CommonProxy.java | 4 ++++ .../java/vazkii/botania/common/item/ItemGaiaHead.java | 7 ++----- 3 files changed, 17 insertions(+), 5 deletions(-) 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 3a26f6abd..03439d800 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -12,6 +12,7 @@ package vazkii.botania.client.core.proxy; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; @@ -167,6 +168,11 @@ public class ClientProxy extends CommonProxy { public static boolean jingleTheBells = false; public static boolean dootDoot = false; + private static final ModelBiped EMPTY_MODEL = new ModelBiped(); + static { + EMPTY_MODEL.setInvisible(true); + } + @Override public void preInit(FMLPreInitializationEvent event) { PersistentVariableHelper.setCacheFile(new File(Minecraft.getMinecraft().mcDataDir, "BotaniaVars.dat")); @@ -497,5 +503,10 @@ public class ClientProxy extends CommonProxy { public int getClientRenderDistance() { return Minecraft.getMinecraft().gameSettings.renderDistanceChunks; } + + @Override + public ModelBiped getEmptyModelBiped() { + return EMPTY_MODEL; + } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index d116f7e33..a1932383b 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -338,4 +338,8 @@ public class CommonProxy { return 0; } + public Object getEmptyModelBiped() { + return null; + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index eb176dcb1..6678d8386 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -37,9 +38,6 @@ import javax.annotation.Nonnull; public class ItemGaiaHead extends ItemMod { - @SideOnly(Side.CLIENT) - private static final ModelBiped EMPTY = new ModelBiped(); - public ItemGaiaHead() { super(LibItemNames.GAIA_HEAD); } @@ -53,8 +51,7 @@ public class ItemGaiaHead extends ItemMod { @Nonnull @Override public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default) { - EMPTY.setInvisible(true); - return EMPTY; + return (ModelBiped) Botania.proxy.getEmptyModelBiped(); } // Copied from vanila skull itemBlock. Relevant edits are indicated. From 3cf1619b2e5c14ff3c0413a7838bdb3598a77860 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 21:22:51 -0500 Subject: [PATCH 705/935] Build 309 --- build.properties | 8 ++++---- version/1.9.4.txt | 2 +- version/update.json | 39 ++++++++++++++++++++------------------- web/versions.ini | 3 ++- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/build.properties b/build.properties index 6be06eaa1..66e9179ae 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat May 28 11:07:09 CDT 2016 +#Thu Jun 16 21:22:01 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1965 -mc_version=1.9.4 dir_repo=./ -build_number=309 +mc_version=1.9.4 +forge_version=12.17.0.1965 +build_number=310 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt index 4aa35fd4a..cddaed97e 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-308 \ No newline at end of file +r1.8-309 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 7267968b9..11a34c283 100644 --- a/version/update.json +++ b/version/update.json @@ -1,21 +1,22 @@ { - "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", - "1.9": { - "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", - "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", - "r1.8-303": "See https://github.com/williewillus/Botania/releases/r1.8-303", - "r1.8-304": "See https://github.com/williewillus/Botania/releases/r1.8-304", - "r1.8-305": "See https://github.com/williewillus/Botania/releases/r1.8-305" - }, - "1.9.4": { - "r1.8-306": "See https://github.com/williewillus/Botania/releases/r1.8-306", - "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", - "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308" - }, - "promos": { - "1.9-latest": "r1.8-305", - "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-308", - "1.9.4-recommended": "r1.8-308" - } + "1.9": { + "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", + "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", + "r1.8-303": "See https://github.com/williewillus/Botania/releases/r1.8-303", + "r1.8-304": "See https://github.com/williewillus/Botania/releases/r1.8-304", + "r1.8-305": "See https://github.com/williewillus/Botania/releases/r1.8-305" + }, + "1.9.4": { + "r1.8-306": "See https://github.com/williewillus/Botania/releases/r1.8-306", + "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", + "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308", + "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309" + }, + "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", + "promos": { + "1.9-latest": "r1.8-305", + "1.9-recommended": "r1.8-305", + "1.9.4-latest": "r1.8-309", + "1.9.4-recommended": "r1.8-309" + } } \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index ddee2c0ed..a3210113e 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -257,4 +257,5 @@ r1.8-304=1.9 r1.8-305=1.9 r1.8-306=1.9.4 r1.8-307=1.9.4 -r1.8-308=1.9.4 \ No newline at end of file +r1.8-308=1.9.4 +r1.8-309=1.9.4 \ No newline at end of file From 25cd5746626fddbcda4adff69aae17de2ec99c65 Mon Sep 17 00:00:00 2001 From: Wire Segal Date: Thu, 16 Jun 2016 23:57:43 -0400 Subject: [PATCH 706/935] Fix other mods crashing because of alternate implementations of metadata Closes #352 Closes #353 --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 81eb5e162..156d34298 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -48,22 +48,24 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - ItemStack wildCopy = stack.copy(); - wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); - String wildKey = stackToString(wildCopy); + String wildKey = stackToString(stack, true); if (mappings.containsKey(wildKey)) return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { + return stackToString(stack, false); + } + + public static String stackToString(ItemStack stack, boolean forceIgnore) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { From d5c9c7815e264bbf36d5e8bf7c5a73fc2c2a1e72 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 23:12:22 -0500 Subject: [PATCH 707/935] Clean up lightning code --- .../core/handler/ClientTickHandler.java | 2 - .../client/core/handler/LightningHandler.java | 400 +----------------- .../client/core/proxy/ClientProxy.java | 3 +- .../vazkii/botania/client/fx/FXLightning.java | 248 +++++++++++ .../client/fx/FXLightningBoltPoint.java | 17 + .../botania/client/fx/FXLightningSegment.java | 71 ++++ .../common/network/PacketBotaniaEffect.java | 2 +- 7 files changed, 349 insertions(+), 394 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/fx/FXLightning.java create mode 100644 src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java create mode 100644 src/main/java/vazkii/botania/client/fx/FXLightningSegment.java diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 78a8d6e28..3807efc2c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -21,7 +21,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; -import vazkii.botania.client.core.handler.LightningHandler.LightningBolt; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -57,7 +56,6 @@ public class ClientTickHandler { @SubscribeEvent public void clientTickEnd(ClientTickEvent event) { if(event.phase == Phase.END) { - LightningBolt.update(); RedStringRenderer.tick(); ItemsRemainingRenderHandler.tick(); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 5dd8f8f13..1bba39526 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.collect.Lists; -import gnu.trove.map.hash.TIntIntHashMap; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -20,37 +17,23 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.profiler.Profiler; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.LightningHandler.LightningBolt.Segment; +import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.helper.Vector3; -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Random; +import java.util.ArrayDeque; +import java.util.Deque; public class LightningHandler { private static final int BATCH_THRESHOLD = 200; private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); - - private static Vector3 getRelativeViewVector(Vector3 pos) { - Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); - return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); - } + public static final Deque queuedLightningBolts = new ArrayDeque<>(); @SubscribeEvent public void onRenderWorldLast(RenderWorldLastEvent event) { @@ -85,8 +68,8 @@ public class LightningHandler { int counter = 0; tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for (LightningBolt bolt : LightningBolt.boltlist) { - renderBolt(bolt, tessellator, 0, false); + for (FXLightning bolt : queuedLightningBolts) { + bolt.renderBolt(0, false); if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { tessellator.draw(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); @@ -99,8 +82,8 @@ public class LightningHandler { counter = 0; tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); - for (LightningBolt bolt : LightningBolt.boltlist) { - renderBolt(bolt, tessellator, 0, false); + for (FXLightning bolt : queuedLightningBolts) { + bolt.renderBolt(1, true); if(counter % BATCH_THRESHOLD == BATCH_THRESHOLD - 1) { tessellator.draw(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); @@ -109,6 +92,8 @@ public class LightningHandler { } tessellator.draw(); + queuedLightningBolts.clear(); + GlStateManager.disableBlend(); GlStateManager.depthMask(true); @@ -119,369 +104,4 @@ public class LightningHandler { profiler.endSection(); } - - public static void spawnLightningBolt(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - LightningBolt bolt = new LightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); - bolt.defaultFractal(); - bolt.finalizeBolt(); - LightningBolt.boltlist.add(bolt); - } - - private void renderBolt(LightningBolt bolt, Tessellator tessellator, int pass, boolean inner) { - ParticleRenderDispatcher.lightningCount++; - float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; - float mainalpha; - if(pass == 0) - mainalpha = (1 - boltage) * 0.4F; - else mainalpha = 1 - boltage * 0.5F; - - int expandTime = (int) (bolt.length * bolt.speed); - - int renderstart = (int) ((expandTime / 2 - bolt.particleMaxAge + bolt.particleAge) / (float) (expandTime / 2) * bolt.numsegments0); - int renderend = (int) ((bolt.particleAge + expandTime) / (float) expandTime * bolt.numsegments0); - - for(Segment rendersegment : bolt.segments) { - if(rendersegment.segmentno < renderstart || rendersegment.segmentno > renderend) - continue; - - Vector3 playervec = getRelativeViewVector(rendersegment.startpoint.point).multiply(-1); - - double width = 0.025F * (playervec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; - - Vector3 diff1 = playervec.copy().crossProduct(rendersegment.prevdiff).normalize().multiply(width / rendersegment.sinprev); - Vector3 diff2 = playervec.copy().crossProduct(rendersegment.nextdiff).normalize().multiply(width / rendersegment.sinnext); - - Vector3 startvec = rendersegment.startpoint.point; - Vector3 endvec = rendersegment.endpoint.point; - - int color = inner ? bolt.colorInner : bolt.colorOuter; - int r = (color & 0xFF0000) >> 16; - int g = (color & 0xFF00) >> 8; - int b = (color & 0xFF); - int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()); - - tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - - if(rendersegment.next == null) { - Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - - tessellator.getBuffer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - } - - if(rendersegment.prev == null) { - Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - - tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); - } - } - } - - public static class LightningBolt { - - public ArrayList segments = new ArrayList<>(); - public final Vector3 start; - public final Vector3 end; - final TIntIntHashMap splitparents = new TIntIntHashMap(); - - public final double length; - public int numsegments0; - private int numsplits; - private boolean finalized; - private final Random rand; - public final long seed; - - public int particleAge; - public final int particleMaxAge; - public boolean isDead; - - private final World world; - private Entity source; - - public static final List boltlist = new ArrayList<>(); - - public float speed = 1.5F; - public static final int fadetime = 20; - - public final int colorOuter; - public final int colorInner; - - public static class BoltPoint { - - public BoltPoint(Vector3 basepoint, Vector3 offsetvec) { - point = basepoint.copy().add(offsetvec); - this.basepoint = basepoint; - this.offsetvec = offsetvec; - } - - public final Vector3 point; - final Vector3 basepoint; - final Vector3 offsetvec; - } - - private static final Comparator SEGMENT_SORTER = (o1, o2) -> { - int comp = Integer.valueOf(o1.splitno).compareTo(o2.splitno); - if(comp == 0) - return Integer.valueOf(o1.segmentno).compareTo(o2.segmentno); - else return comp; - }; - - private static final Comparator SEGMENT_LIGHT_SORTER = (o1, o2) -> Float.compare(o2.light, o1.light); - - public class Segment { - public Segment(BoltPoint start, BoltPoint end, float light, int segmentnumber, int splitnumber) { - startpoint = start; - endpoint = end; - this.light = light; - segmentno = segmentnumber; - splitno = splitnumber; - - calcDiff(); - } - - public Segment(Vector3 start, Vector3 end) { - this(new BoltPoint(start, new Vector3(0, 0, 0)), new BoltPoint(end, new Vector3(0, 0, 0)), 1, 0, 0); - } - - public void calcDiff() { - diff = endpoint.point.copy().subtract(startpoint.point); - } - - public void calcEndDiffs() { - if(prev != null) { - Vector3 prevdiffnorm = prev.diff.copy().normalize(); - Vector3 thisdiffnorm = diff.copy().normalize(); - - prevdiff = thisdiffnorm.copy().add(prevdiffnorm).normalize(); - sinprev = (float) Math.sin(thisdiffnorm.angle(prevdiffnorm.multiply(-1)) / 2); - } else { - prevdiff = diff.copy().normalize(); - sinprev = 1; - } - - if(next != null) { - Vector3 nextdiffnorm = next.diff.copy().normalize(); - Vector3 thisdiffnorm = diff.copy().normalize(); - - nextdiff = thisdiffnorm.add(nextdiffnorm).normalize(); - sinnext = (float) Math.sin(thisdiffnorm.angle(nextdiffnorm.multiply(-1)) / 2); - } else { - nextdiff = diff.copy().normalize(); - sinnext = 1; - } - } - - @Override - public String toString() { - return startpoint.point.toString() + " " + endpoint.point.toString(); - } - - public final BoltPoint startpoint; - public final BoltPoint endpoint; - - public Vector3 diff; - - public Segment prev; - public Segment next; - - public Vector3 nextdiff; - public Vector3 prevdiff; - - public float sinprev; - public float sinnext; - public final float light; - - public final int segmentno; - public final int splitno; - } - - public LightningBolt(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - this.world = world; - this.seed = seed; - rand = new Random(seed); - - start = sourcevec; - end = targetvec; - - speed = ticksPerMeter; - - this.colorOuter = colorOuter; - this.colorInner = colorInner; - - numsegments0 = 1; - - length = end.copy().subtract(start).mag(); - particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; - particleAge = -(int) (length * speed); - - segments.add(new Segment(start, end)); - } - - public void setWrapper(Entity entity) { - source = entity; - } - - public void fractal(int splits, double amount, double splitchance, double splitlength, double splitangle) { - if(finalized) - return; - - ArrayList oldsegments = segments; - segments = new ArrayList<>(); - - Segment prev; - - for(Segment segment : oldsegments) { - prev = segment.prev; - - Vector3 subsegment = segment.diff.copy().multiply(1F / splits); - - BoltPoint[] newpoints = new BoltPoint[splits + 1]; - - Vector3 startpoint = segment.startpoint.point; - newpoints[0] = segment.startpoint; - newpoints[splits] = segment.endpoint; - - for(int i = 1; i < splits; i++) { - Vector3 randoff = segment.diff.copy().perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); - randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); - - Vector3 basepoint = startpoint.copy().add(subsegment.copy().multiply(i)); - - newpoints[i] = new BoltPoint(basepoint, randoff); - } - - for(int i = 0; i < splits; i++) { - Segment next = new Segment(newpoints[i], newpoints[i + 1], segment.light, segment.segmentno * splits + i, segment.splitno); - next.prev = prev; - if (prev != null) - prev.next = next; - - if(i != 0 && rand.nextFloat() < splitchance) { - Vector3 splitrot = next.diff.copy().xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); - Vector3 diff = next.diff.copy().rotate((rand.nextFloat() * 0.66F + 0.33F) * splitangle, splitrot).multiply(splitlength); - - numsplits++; - splitparents.put(numsplits, next.splitno); - - Segment split = new Segment(newpoints[i], new BoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.copy().add(diff)), segment.light / 2F, next.segmentno, numsplits); - split.prev = prev; - - segments.add(split); - } - - prev = next; - segments.add(next); - } - - if(segment.next != null) - segment.next.prev = prev; - } - - numsegments0 *= splits; - } - - public void defaultFractal() { - fractal(2, length / 1.5, 0.7F, 0.7F, 45); - fractal(2, length / 4, 0.5F, 0.8F, 50); - fractal(2, length / 15, 0.5F, 0.9F, 55); - fractal(2, length / 30, 0.5F, 1.0F, 60); - fractal(2, length / 60, 0, 0, 0); - fractal(2, length / 100, 0, 0, 0); - fractal(2, length / 400, 0, 0, 0); - } - - private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { - RayTraceResult mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D()); - - if(mop == null) - return prevresistance; - - if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { - Block block = world.getBlockState(mop.getBlockPos()).getBlock(); - - if(world.isAirBlock(mop.getBlockPos())) - return prevresistance; - - return prevresistance + block.getExplosionResistance(source) + 0.3F; - } else return prevresistance; - } - - private void calculateCollisionAndDiffs() { - TIntIntHashMap lastactivesegment = new TIntIntHashMap(); - - Collections.sort(segments, SEGMENT_SORTER); - - int lastsplitcalc = 0; - int lastactiveseg = 0;// unterminated - float splitresistance = 0; - - for(Segment segment : segments) { - if(segment.splitno > lastsplitcalc) { - lastactivesegment.put(lastsplitcalc, lastactiveseg); - lastsplitcalc = segment.splitno; - lastactiveseg = lastactivesegment.get(splitparents.get(segment.splitno)); - splitresistance = lastactiveseg < segment.segmentno ? 50 : 0; - } - - if(splitresistance >= 40 * segment.light) - continue; - - splitresistance = rayTraceResistance(segment.startpoint.point, segment.endpoint.point, splitresistance); - lastactiveseg = segment.segmentno; - } - lastactivesegment.put(lastsplitcalc, lastactiveseg); - - lastsplitcalc = 0; - lastactiveseg = lastactivesegment.get(0); - for(Iterator iterator = segments.iterator(); iterator.hasNext();) { - Segment segment = iterator.next(); - if(lastsplitcalc != segment.splitno) { - lastsplitcalc = segment.splitno; - lastactiveseg = lastactivesegment.get(segment.splitno); - } - - if(segment.segmentno > lastactiveseg) - iterator.remove(); - segment.calcEndDiffs(); - } - } - - public void finalizeBolt() { - if(finalized) - return; - finalized = true; - - calculateCollisionAndDiffs(); - - Collections.sort(segments, SEGMENT_LIGHT_SORTER); - - boltlist.add(this); - } - - public void onUpdate() { - particleAge++; - - if (particleAge >= particleMaxAge) - isDead = true; - } - - // Called in ClientTickHandler - public static void update() { - for(Iterator iterator = boltlist.iterator(); iterator.hasNext();) { - LightningBolt bolt = iterator.next(); - - bolt.onUpdate(); - if(bolt.isDead) - iterator.remove(); - } - } - } } \ No newline at end of file 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 03439d800..5b9de22c9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -63,6 +63,7 @@ import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.FXSparkle; import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -486,7 +487,7 @@ public class ClientProxy extends CommonProxy { @Override public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - LightningHandler.spawnLightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); + Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java new file mode 100644 index 000000000..b882ba0b8 --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -0,0 +1,248 @@ +package vazkii.botania.client.fx; + +import gnu.trove.map.hash.TIntIntHashMap; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.common.core.helper.Vector3; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; + +// Originally taken with permission from WRCBE - heavily modified +public class FXLightning extends Particle { + + private static final int fadetime = 20; + private final TIntIntHashMap splitParents = new TIntIntHashMap(); + private final double length; + private final Random rand; + private final int colorOuter; + private final int colorInner; + + private List segments = new ArrayList<>(); + private int segmentCount = 1; + private int splitCount; + private float speed = 1.5F; + + public FXLightning(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { + super(world, sourcevec.x, sourcevec.y, sourcevec.z); + this.rand = new Random(seed); + this.speed = ticksPerMeter; + this.colorOuter = colorOuter; + this.colorInner = colorInner; + this.length = targetvec.copy().subtract(sourcevec).mag(); + this.particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; + this.particleAge = -(int) (length * speed); + + segments.add(new FXLightningSegment(sourcevec, targetvec)); + + fractal(2, length / 1.5, 0.7F, 0.7F, 45); + fractal(2, length / 4, 0.5F, 0.8F, 50); + fractal(2, length / 15, 0.5F, 0.9F, 55); + fractal(2, length / 30, 0.5F, 1.0F, 60); + fractal(2, length / 60, 0, 0, 0); + fractal(2, length / 100, 0, 0, 0); + fractal(2, length / 400, 0, 0, 0); + + calculateCollisionAndDiffs(); + + Collections.sort(segments, (o1, o2) -> Float.compare(o2.light, o1.light)); + } + + @Override + public void renderParticle(VertexBuffer wr, Entity entity, float partialTicks, float rotX, float rotZ, float rotYZ, float rotXY, float rotXZ) { + LightningHandler.queuedLightningBolts.offer(this); + } + + public void renderBolt(int pass, boolean inner) { + ParticleRenderDispatcher.lightningCount++; + VertexBuffer wr = Tessellator.getInstance().getBuffer(); + + float boltAge = particleAge < 0 ? 0 : (float) particleAge / (float) particleMaxAge; + float mainAlpha; + if(pass == 0) + mainAlpha = (1 - boltAge) * 0.4F; + else mainAlpha = 1 - boltAge * 0.5F; + + int expandTime = (int) (length * speed); + + int renderstart = (int) ((expandTime / 2 - particleMaxAge + particleAge) / (float) (expandTime / 2) * segmentCount); + int renderend = (int) ((particleAge + expandTime) / (float) expandTime * segmentCount); + + for(FXLightningSegment rendersegment : segments) { + if(rendersegment.segmentNo < renderstart || rendersegment.segmentNo > renderend) + continue; + + Vector3 playerVec = getRelativeViewVector(rendersegment.startPoint.point).multiply(-1); + + double width = 0.025F * (playerVec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; + + Vector3 diff1 = playerVec.copy().crossProduct(rendersegment.prevDiff).normalize().multiply(width / rendersegment.sinPrev); + Vector3 diff2 = playerVec.copy().crossProduct(rendersegment.nextDiff).normalize().multiply(width / rendersegment.sinNext); + + Vector3 startvec = rendersegment.startPoint.point; + Vector3 endvec = rendersegment.endPoint.point; + + int color = inner ? colorInner : colorOuter; + int r = (color & 0xFF0000) >> 16; + int g = (color & 0xFF00) >> 8; + int b = (color & 0xFF); + int a = (int) (mainAlpha * rendersegment.light * 0xFF); + + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + + if(rendersegment.next == null) { + Vector3 roundend = rendersegment.endPoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); + + wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + } + + if(rendersegment.prev == null) { + Vector3 roundend = rendersegment.startPoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); + + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); + } + } + } + + private void fractal(int splits, double amount, double splitChance, double splitLength, double splitAngle) { + List oldSegments = segments; + segments = new ArrayList<>(); + + FXLightningSegment prev; + + for(FXLightningSegment segment : oldSegments) { + prev = segment.prev; + + Vector3 subsegment = segment.diff.copy().multiply(1F / splits); + + FXLightningBoltPoint[] newpoints = new FXLightningBoltPoint[splits + 1]; + + Vector3 startpoint = segment.startPoint.point; + newpoints[0] = segment.startPoint; + newpoints[splits] = segment.endPoint; + + for(int i = 1; i < splits; i++) { + Vector3 randoff = segment.diff.copy().perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); + randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); + + Vector3 basepoint = startpoint.copy().add(subsegment.copy().multiply(i)); + + newpoints[i] = new FXLightningBoltPoint(basepoint, randoff); + } + + for(int i = 0; i < splits; i++) { + FXLightningSegment next = new FXLightningSegment(newpoints[i], newpoints[i + 1], segment.light, segment.segmentNo * splits + i, segment.splitNo); + next.prev = prev; + if (prev != null) + prev.next = next; + + if(i != 0 && rand.nextFloat() < splitChance) { + Vector3 splitrot = next.diff.copy().xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); + Vector3 diff = next.diff.copy().rotate((rand.nextFloat() * 0.66F + 0.33F) * splitAngle, splitrot).multiply(splitLength); + + splitCount++; + splitParents.put(splitCount, next.splitNo); + + FXLightningSegment split = new FXLightningSegment(newpoints[i], new FXLightningBoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.copy().add(diff)), segment.light / 2F, next.segmentNo, splitCount); + split.prev = prev; + + segments.add(split); + } + + prev = next; + segments.add(next); + } + + if(segment.next != null) + segment.next.prev = prev; + } + + segmentCount *= splits; + } + + private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { + RayTraceResult mop = worldObj.rayTraceBlocks(start.toVec3D(), end.toVec3D()); + + if(mop == null) + return prevresistance; + + if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { + Block block = worldObj.getBlockState(mop.getBlockPos()).getBlock(); + + if(worldObj.isAirBlock(mop.getBlockPos())) + return prevresistance; + + return prevresistance + block.getExplosionResistance(null) + 0.3F; + } else return prevresistance; + } + + private void calculateCollisionAndDiffs() { + TIntIntHashMap lastactivesegment = new TIntIntHashMap(); + + Collections.sort(segments, (o1, o2) -> { + int comp = Integer.valueOf(o1.splitNo).compareTo(o2.splitNo); + if(comp == 0) + return Integer.valueOf(o1.segmentNo).compareTo(o2.segmentNo); + else return comp; + }); + + int lastSplitCalc = 0; + int lastActiveSegment = 0;// unterminated + float splitResistance = 0; + + for(FXLightningSegment segment : segments) { + if(segment.splitNo > lastSplitCalc) { + lastactivesegment.put(lastSplitCalc, lastActiveSegment); + lastSplitCalc = segment.splitNo; + lastActiveSegment = lastactivesegment.get(splitParents.get(segment.splitNo)); + splitResistance = lastActiveSegment < segment.segmentNo ? 50 : 0; + } + + if(splitResistance >= 40 * segment.light) + continue; + + splitResistance = rayTraceResistance(segment.startPoint.point, segment.endPoint.point, splitResistance); + lastActiveSegment = segment.segmentNo; + } + lastactivesegment.put(lastSplitCalc, lastActiveSegment); + + lastSplitCalc = 0; + lastActiveSegment = lastactivesegment.get(0); + for(Iterator iterator = segments.iterator(); iterator.hasNext();) { + FXLightningSegment segment = iterator.next(); + if(lastSplitCalc != segment.splitNo) { + lastSplitCalc = segment.splitNo; + lastActiveSegment = lastactivesegment.get(segment.splitNo); + } + + if(segment.segmentNo > lastActiveSegment) + iterator.remove(); + segment.calcEndDiffs(); + } + } + + private static Vector3 getRelativeViewVector(Vector3 pos) { + Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); + return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); + } + +} diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java new file mode 100644 index 000000000..c5ac33f0c --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java @@ -0,0 +1,17 @@ +package vazkii.botania.client.fx; + +import vazkii.botania.common.core.helper.Vector3; + +public class FXLightningBoltPoint { + + public final Vector3 point; + public final Vector3 basepoint; + public final Vector3 offsetvec; + + public FXLightningBoltPoint(Vector3 basepoint, Vector3 offsetvec) { + point = basepoint.copy().add(offsetvec); + this.basepoint = basepoint; + this.offsetvec = offsetvec; + } + +} diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java new file mode 100644 index 000000000..97adf5853 --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java @@ -0,0 +1,71 @@ +package vazkii.botania.client.fx; + +import vazkii.botania.common.core.helper.Vector3; + +public class FXLightningSegment { + + public final FXLightningBoltPoint startPoint; + public final FXLightningBoltPoint endPoint; + + public Vector3 diff; + + public FXLightningSegment prev; + public FXLightningSegment next; + + public Vector3 nextDiff; + public Vector3 prevDiff; + + public float sinPrev; + public float sinNext; + public final float light; + + public final int segmentNo; + public final int splitNo; + + public FXLightningSegment(FXLightningBoltPoint start, FXLightningBoltPoint end, float light, int segmentnumber, int splitnumber) { + startPoint = start; + endPoint = end; + this.light = light; + segmentNo = segmentnumber; + splitNo = splitnumber; + + calcDiff(); + } + + public FXLightningSegment(Vector3 start, Vector3 end) { + this(new FXLightningBoltPoint(start, new Vector3(0, 0, 0)), new FXLightningBoltPoint(end, new Vector3(0, 0, 0)), 1, 0, 0); + } + + public void calcDiff() { + diff = endPoint.point.copy().subtract(startPoint.point); + } + + public void calcEndDiffs() { + if(prev != null) { + Vector3 prevdiffnorm = prev.diff.copy().normalize(); + Vector3 thisdiffnorm = diff.copy().normalize(); + + prevDiff = thisdiffnorm.copy().add(prevdiffnorm).normalize(); + sinPrev = (float) Math.sin(thisdiffnorm.angle(prevdiffnorm.multiply(-1)) / 2); + } else { + prevDiff = diff.copy().normalize(); + sinPrev = 1; + } + + if(next != null) { + Vector3 nextdiffnorm = next.diff.copy().normalize(); + Vector3 thisdiffnorm = diff.copy().normalize(); + + nextDiff = thisdiffnorm.add(nextdiffnorm).normalize(); + sinNext = (float) Math.sin(thisdiffnorm.angle(nextdiffnorm.multiply(-1)) / 2); + } else { + nextDiff = diff.copy().normalize(); + sinNext = 1; + } + } + + @Override + public String toString() { + return startPoint.point.toString() + " " + endPoint.point.toString(); + } +} diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 951c08644..929f9e6e0 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -92,7 +92,7 @@ public class PacketBotaniaEffect implements IMessage { BlockPos pos = new BlockPos(message.x, message.y, message.z); Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - LightningHandler.spawnLightningBolt(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, + Botania.proxy.lightningFX(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, Minecraft.getMinecraft().theWorld.rand.nextLong(), 0x4400799c, 0x4400C6FF); } break; From 2d0af453b3ce718b48b2dda4f9561222f9dba266 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 23:30:23 -0500 Subject: [PATCH 708/935] Tweak various model transforms. Closes #350: --- src/main/resources/assets/botania/blockstates/altar.json | 3 +-- .../resources/assets/botania/blockstates/miniIsland.json | 3 +-- .../resources/assets/botania/blockstates/spawnerClaw.json | 3 +-- src/main/resources/assets/botania/models/block/altar.json | 8 ++++++++ src/main/resources/assets/botania/models/block/claw.json | 8 ++++++++ .../resources/assets/botania/models/block/miniIsland.json | 7 +++++++ 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 1438c5ac9..3194dee58 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -2,8 +2,7 @@ "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!", "forge_marker": 1, "defaults": { - "model": "botania:altar", - "transform": "forge:default-block" + "model": "botania:altar" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 9a8553523..44a91fc1b 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,8 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland", - "transform": "forge:default-block" + "model": "botania:miniIsland" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index 91fa6cd6d..fa9ccbbb5 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -4,8 +4,7 @@ "model": "botania:claw", "textures": { "all": "botania:model/spawnerClaw" - }, - "transform": "forge:default-block" + } }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json index fcab68549..180c4d4c5 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -1,4 +1,12 @@ { + "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, -1, 0], + "scale":[ 0.6, 0.6, 0.6 ] + } + }, "elements": [ { "name": "gobletBase", diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/claw.json index 95f76d9b7..e0aedef0d 100644 --- a/src/main/resources/assets/botania/models/block/claw.json +++ b/src/main/resources/assets/botania/models/block/claw.json @@ -1,4 +1,12 @@ { + "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.625, 0.625, 0.625 ] + } + }, "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index fb2cfe6b6..6da36e326 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -1,6 +1,13 @@ { "__comment": "Author: wiiv", "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.75, 0.75, 0.75 ] + } + }, "elements": [ { "name": "Shape0", From d2e84babb7cf51319e1b3efd8a38aebfa421f817 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 23:44:44 -0500 Subject: [PATCH 709/935] Fix flowers popping off on relay and mycelium --- .../botania/common/block/BlockSpecialFlower.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 707e75ef7..24ba0b6f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -236,7 +236,16 @@ 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 world.getBlockState(pos.down()).getBlock() == ModBlocks.redStringRelay + || world.getBlockState(pos.down()).getBlock() == Blocks.MYCELIUM + || super.canPlaceBlockAt(world, pos); + } + + @Override + protected boolean canSustainBush(IBlockState state) { + return state.getBlock() == ModBlocks.redStringRelay + || state.getBlock() == Blocks.MYCELIUM + || super.canSustainBush(state); } @Override From fc23dedd051b9011e072171d29aae0b288c4e0e9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:03:04 -0500 Subject: [PATCH 710/935] Revert "Fix other mods crashing because of alternate implementations of metadata" This reverts commit 25cd5746626fddbcda4adff69aae17de2ec99c65. --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 156d34298..81eb5e162 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -48,24 +48,22 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - String wildKey = stackToString(stack, true); + ItemStack wildCopy = stack.copy(); + wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); + String wildKey = stackToString(wildCopy); if (mappings.containsKey(wildKey)) return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { - return stackToString(stack, false); - } - - public static String stackToString(ItemStack stack, boolean forceIgnore) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { From a9cc76576a8845e3ef9a6cc2f1960f152a5cbb53 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:03:35 -0500 Subject: [PATCH 711/935] Cleaner solution --- .../vazkii/botania/api/lexicon/LexiconRecipeMappings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 81eb5e162..2878fdfd4 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -56,14 +56,14 @@ public final class LexiconRecipeMappings { return mappings.get(stackToString(stack)); } - public static String stackToString(ItemStack stack) { + private static String stackToString(ItemStack stack) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getItem().getRegistryName().toString() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { From 5cdd2ee32f3563d77caed9b1d449092ec08fb903 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:17:48 -0500 Subject: [PATCH 712/935] Revert "Cleaner solution" This reverts commit a9cc76576a8845e3ef9a6cc2f1960f152a5cbb53. --- .../vazkii/botania/api/lexicon/LexiconRecipeMappings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 2878fdfd4..81eb5e162 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -56,14 +56,14 @@ public final class LexiconRecipeMappings { return mappings.get(stackToString(stack)); } - private static String stackToString(ItemStack stack) { + public static String stackToString(ItemStack stack) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getItem().getRegistryName().toString() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { From f3a3e8033441ab3252520fd8c6cb3f265b6159ca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:17:51 -0500 Subject: [PATCH 713/935] Revert "Revert "Fix other mods crashing because of alternate implementations of metadata"" This reverts commit fc23dedd051b9011e072171d29aae0b288c4e0e9. --- .../botania/api/lexicon/LexiconRecipeMappings.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 81eb5e162..156d34298 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -48,22 +48,24 @@ public final class LexiconRecipeMappings { } public static EntryData getDataForStack(ItemStack stack) { - ItemStack wildCopy = stack.copy(); - wildCopy.setItemDamage(OreDictionary.WILDCARD_VALUE); - String wildKey = stackToString(wildCopy); + String wildKey = stackToString(stack, true); if (mappings.containsKey(wildKey)) return mappings.get(wildKey); return mappings.get(stackToString(stack)); } public static String stackToString(ItemStack stack) { + return stackToString(stack, false); + } + + public static String stackToString(ItemStack stack, boolean forceIgnore) { if(stack == null || stack.getItem() == null) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getUnlocalizedName() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { From 6b10ada28a8014ae677f9ed4d8738e71a4f3d94b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 00:21:01 -0500 Subject: [PATCH 714/935] Build 310 I need sleep --- build.properties | 8 ++++---- version/1.9.4.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 66e9179ae..c1b34c24e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Thu Jun 16 21:22:01 CDT 2016 +#Fri Jun 17 00:20:23 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.9.4 forge_version=12.17.0.1965 -build_number=310 +mc_version=1.9.4 +dir_repo=./ +build_number=311 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt index cddaed97e..fd32bc288 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-309 \ No newline at end of file +r1.8-310 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 11a34c283..b2e7b47d9 100644 --- a/version/update.json +++ b/version/update.json @@ -10,13 +10,14 @@ "r1.8-306": "See https://github.com/williewillus/Botania/releases/r1.8-306", "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308", - "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309" + "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309", + "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310" }, "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", "promos": { "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-309", - "1.9.4-recommended": "r1.8-309" + "1.9.4-latest": "r1.8-310", + "1.9.4-recommended": "r1.8-310" } } \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index a3210113e..756d69266 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -258,4 +258,5 @@ r1.8-305=1.9 r1.8-306=1.9.4 r1.8-307=1.9.4 r1.8-308=1.9.4 -r1.8-309=1.9.4 \ No newline at end of file +r1.8-309=1.9.4 +r1.8-310=1.9.4 \ No newline at end of file From 9fef5189685a8d773e3de9b763c6da74e4283c9e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 19:41:59 -0500 Subject: [PATCH 715/935] Fix broken hsb calculation because mojang's function is broken. Also fix upstream issue 1672 --- .../vazkii/botania/client/core/handler/BoundTileRenderer.java | 2 +- .../java/vazkii/botania/client/core/handler/ColorHandler.java | 4 ++-- .../botania/client/core/handler/MultiblockRenderHandler.java | 2 +- .../vazkii/botania/client/core/handler/RedStringRenderer.java | 2 +- .../client/core/handler/SubTileRadiusRenderHandler.java | 2 +- .../client/core/handler/TooltipAdditionDisplayHandler.java | 4 ++-- .../vazkii/botania/client/fx/ParticleRenderDispatcher.java | 2 +- src/main/java/vazkii/botania/client/model/ModelHourglass.java | 2 +- .../vazkii/botania/client/render/tile/RenderTilePool.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 752a28cf9..10f442d30 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -42,7 +42,7 @@ public final class BoundTileRenderer { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableDepth(); GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); 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 0ff8c52c5..8ff802be2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -56,7 +56,7 @@ public final class ColorHandler { public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); + return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); } else { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @@ -73,7 +73,7 @@ public final class ColorHandler { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return MathHelper.hsvToRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); + return Color.HSBtoRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); } }, ModBlocks.spreader 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 4739d80b6..9c9c2f74b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -100,7 +100,7 @@ public final class MultiblockRenderHandler { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.disableLighting(); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 7bfb610df..dc231720f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -37,7 +37,7 @@ public final class RedStringRenderer { GlStateManager.pushMatrix(); GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableLighting(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.color(1F, 0F, 0F, sizeAlpha); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 9a0f1e342..ea9402843 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -64,7 +64,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.pushMatrix(); GlStateManager.disableTexture2D(); - GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableLighting(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); 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 068310586..80e0186f0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -187,8 +187,8 @@ public final class TooltipAdditionDisplayHandler { String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); - GL11.glPushAttrib(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GlStateManager.disableLighting(); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index a0458839a..39aa887c1 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -32,7 +32,7 @@ public final class ParticleRenderDispatcher { Profiler profiler = Minecraft.getMinecraft().mcProfiler; - GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.depthMask(false); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index d9c902261..fd71cce21 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -66,7 +66,7 @@ public class ModelHourglass extends ModelBase { base2.render(f); Color c = new Color(color); GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); - GL11.glPushAttrib(GL11.GL_NORMALIZE); + GL11.glPushAttrib(GL11.GL_TRANSFORM_BIT); GlStateManager.enableNormalize(); if(fract1 > 0) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index ed31c275f..707f8c8de 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -69,7 +69,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; if(pool != null) time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - color = MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); + color = Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); } if (fab || forceManaNumber > -1) { From 0001f9c8f1765e7a334003963355b9df2d689e45 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jun 2016 19:43:45 -0500 Subject: [PATCH 716/935] Save flare chakram state in NBT, closes upstream issue 1620 --- .../java/vazkii/botania/common/entity/EntityThornChakram.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index d7a662678..2e85d0648 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -204,6 +204,7 @@ public class EntityThornChakram extends EntityThrowable { if(stack != null) { compound.setTag("fly_stack", stack.writeToNBT(new NBTTagCompound())); } + compound.setBoolean("flare", isFire()); } @Override @@ -212,6 +213,7 @@ public class EntityThornChakram extends EntityThrowable { if(compound.hasKey("fly_stack")) { stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("fly_stack")); } + setFire(compound.getBoolean("flare")); } } From bc52c67c89624456a5a2269d32c44cb1bf9ce164 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 12:42:18 -0500 Subject: [PATCH 717/935] Fix tiara conflicting with spectator mode, closes #356 --- .../botania/common/item/equipment/bauble/ItemFlightTiara.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6dacac2ec..bee323ec6 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 @@ -283,7 +283,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } } else { - if(!player.capabilities.isCreativeMode) { + if(!player.isSpectator() && !player.capabilities.isCreativeMode) { player.capabilities.allowFlying = false; player.capabilities.isFlying = false; player.capabilities.disableDamage = false; From 8767180a7be3318fe36f972074b16c15c46142fd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:21:56 -0500 Subject: [PATCH 718/935] Made special flower models use a guava cache. Fixes threading issues, closes #338 --- .../client/model/SpecialFlowerModel.java | 89 ++++++++----------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index a02f44914..6c5a3db3a 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -10,6 +10,10 @@ package vazkii.botania.client.model; import com.google.common.base.Function; import com.google.common.base.Optional; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -153,74 +157,60 @@ public class SpecialFlowerModel implements IModelCustomData { } } - public static class SpecialFlowerBakedModel implements IPerspectiveAwareModel { + private static class SpecialFlowerBakedModel implements IPerspectiveAwareModel { private final ImmutableMap transforms; private final ImmutableMap, ModelResourceLocation> blockModels; private final ImmutableMap, ModelResourceLocation> itemModels; - private IBakedModel baseModel; - private ImmutableMap bakedBlockModels; - private ImmutableMap bakedItemModels; + private final IBakedModel baseModel; + private final LoadingCache bakedBlockModels; + private final LoadingCache bakedItemModels; - public SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, + SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { this.blockModels = blockModels; this.itemModels = itemModels; this.transforms = cameraTransforms; + + ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.absent(), + new ModelResourceLocation("builtin/missing", "missing")); + this.baseModel = ModelLoaderRegistry.getModelOrMissing(baseModelPath) + .bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); + + this.bakedBlockModels = CacheBuilder.newBuilder().build(new Loader(true)); + this.bakedItemModels = CacheBuilder.newBuilder().build(new Loader(false)); } - private void refreshBakedModels() { - if(baseModel == null) { - // If not done already, bake and cache all models - baseModel = getBlockModel(Optional.absent()); + private class Loader extends CacheLoader { - ImmutableMap.Builder builder = ImmutableMap.builder(); - for(Map.Entry, ModelResourceLocation> e : blockModels.entrySet()) { - if(e.getKey().isPresent()) { - builder.put(e.getKey().get(), getBlockModel(e.getKey())); - } + private final boolean loadBlocks; + + Loader(boolean blocks) { + this.loadBlocks = blocks; + } + + @Override + public IBakedModel load(@Nonnull String key) { + Botania.LOGGER.info("Cached special flower {} model for key {}", loadBlocks ? "block": "item", key); + Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; + + ModelResourceLocation loc = loadFrom.get(Optional.of(key)); + if(loc == null) { + loc = new ModelResourceLocation("builtin/missing", "missing"); } - - bakedBlockModels = builder.build(); - - ImmutableMap.Builder builder2 = ImmutableMap.builder(); - for(Map.Entry, ModelResourceLocation> e : itemModels.entrySet()) { - if(e.getKey().isPresent()) { - builder2.put(e.getKey().get(), getItemModel(e.getKey())); - } - } - - bakedItemModels = builder2.build(); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); + return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); } } - private IBakedModel getBlockModel(Optional opt) { - ModelResourceLocation loc = blockModels.get(opt); - if(loc == null) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } - IModel model = ModelLoaderRegistry.getModelOrMissing(loc); - return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); - } - - private IBakedModel getItemModel(Optional opt) { - ModelResourceLocation loc = itemModels.get(opt); - if(loc == null) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } - IModel model = ModelLoaderRegistry.getModelOrMissing(loc); - return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); - } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + IBakedModel ret = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); if(ret == null) ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); return ret.getQuads(state, face, rand); @@ -236,10 +226,9 @@ public class SpecialFlowerModel implements IModelCustomData { @Nonnull @Override public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { - refreshBakedModels(); - IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); + IBakedModel item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); if(item == null) { - item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); + item = bakedBlockModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); } return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; @@ -248,26 +237,22 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public boolean isAmbientOcclusion() { - refreshBakedModels(); return baseModel.isAmbientOcclusion(); } @Override public boolean isGui3d() { - refreshBakedModels(); return baseModel.isGui3d(); } @Override public boolean isBuiltInRenderer() { - refreshBakedModels(); return baseModel.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { - refreshBakedModels(); return baseModel.getParticleTexture(); } From b7e77936b33e485a8e370da25b20d60938eb31d1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:36:36 -0500 Subject: [PATCH 719/935] Remove guards in TileMod since forge has them now --- .../botania/common/block/tile/TileAlfPortal.java | 2 +- .../vazkii/botania/common/block/tile/TileAltar.java | 3 +-- .../vazkii/botania/common/block/tile/TileAvatar.java | 2 +- .../vazkii/botania/common/block/tile/TileBifrost.java | 2 +- .../vazkii/botania/common/block/tile/TileBrewery.java | 2 +- .../vazkii/botania/common/block/tile/TileCocoon.java | 2 +- .../botania/common/block/tile/TileCraftCrate.java | 2 +- .../botania/common/block/tile/TileEnchanter.java | 2 +- .../vazkii/botania/common/block/tile/TileEnderEye.java | 2 +- .../botania/common/block/tile/TileForestEye.java | 2 +- .../botania/common/block/tile/TileHourglass.java | 2 +- .../botania/common/block/tile/TileIncensePlate.java | 2 +- .../botania/common/block/tile/TileLightRelay.java | 2 +- .../botania/common/block/tile/TileManaBeacon.java | 2 +- .../botania/common/block/tile/TileManaFlame.java | 2 +- .../java/vazkii/botania/common/block/tile/TileMod.java | 10 +--------- .../botania/common/block/tile/TileOpenCrate.java | 2 +- .../botania/common/block/tile/TileRuneAltar.java | 3 +-- .../botania/common/block/tile/TileSpawnerClaw.java | 2 +- .../botania/common/block/tile/TileSpecialFlower.java | 2 +- .../botania/common/block/tile/TileSpiritShrine.java | 2 +- .../botania/common/block/tile/TileStarfield.java | 2 +- .../botania/common/block/tile/TileTerraPlate.java | 2 +- .../botania/common/block/tile/TileTeruTeruBozu.java | 2 +- .../botania/common/block/tile/TileTinyPlanet.java | 2 +- .../botania/common/block/tile/TileTinyPotato.java | 2 +- .../block/tile/corporea/TileCorporeaCrystalCube.java | 2 +- .../common/block/tile/corporea/TileCorporeaIndex.java | 2 +- .../botania/common/block/tile/mana/TileBellows.java | 2 +- .../common/block/tile/mana/TileDistributor.java | 2 +- .../common/block/tile/mana/TileManaDetector.java | 2 +- .../botania/common/block/tile/mana/TilePool.java | 2 +- .../botania/common/block/tile/mana/TilePump.java | 2 +- .../common/block/tile/mana/TileRFGenerator.java | 2 +- .../botania/common/block/tile/mana/TileSpreader.java | 2 +- .../botania/common/block/tile/mana/TileTurntable.java | 2 +- .../common/block/tile/string/TileRedString.java | 2 +- .../block/tile/string/TileRedStringComparator.java | 4 ++-- .../block/tile/string/TileRedStringInterceptor.java | 4 ++-- 39 files changed, 41 insertions(+), 51 deletions(-) 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 a92a7059f..38944a87f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -108,7 +108,7 @@ public class TileAlfPortal extends TileMod { } @Override - public void updateEntity() { + public void update() { IBlockState iBlockState = worldObj.getBlockState(getPos()); if(iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { ticksOpen = 0; 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 862ecf5c3..a519c99b0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -34,7 +34,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; @@ -245,7 +244,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void updateEntity() { + public void update() { List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); boolean didChange = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index b8737f28d..67f29ac8e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -30,7 +30,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { int mana; @Override - public void updateEntity() { + public void update() { enabled = true; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); 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 5937ec5e2..3702277c4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -22,7 +22,7 @@ public class TileBifrost extends TileMod { public int ticks = 0; @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote) { if(ticks <= 0) { worldObj.setBlockToAir(pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 1190a44bc..fe4412b2b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -79,7 +79,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } @Override - public void updateEntity() { + public void update() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(itemHandler)) { 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 5320fe9f5..2c421bf16 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -37,7 +37,7 @@ public class TileCocoon extends TileMod { public int emeraldsGiven; @Override - public void updateEntity() { + public void update() { timePassed++; if(timePassed >= TOTAL_TIME) hatch(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 2ba68987d..02b925c79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -99,7 +99,7 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; 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 6761eb3aa..f1a2881ae 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -137,7 +137,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void updateEntity() { + public void update() { IBlockState state = worldObj.getBlockState(getPos()); EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); 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 7825f795e..fbc3c557c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -27,7 +27,7 @@ import java.util.List; public class TileEnderEye extends TileMod { @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 4ff7e5dcf..2927a6179 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -18,7 +18,7 @@ public class TileForestEye extends TileMod { public int entities = 0; @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; int range = 6; 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 8d9d9ec32..91f921440 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -42,7 +42,7 @@ public class TileHourglass extends TileSimpleInventory { public boolean move = true; @Override - public void updateEntity() { + public void update() { int totalTime = getTotalTime(); if(totalTime > 0) { if(move) 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 1dca546f9..e24df9698 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -40,7 +40,7 @@ public class TileIncensePlate extends TileSimpleInventory { public int comparatorOutput = 0; @Override - public void updateEntity() { + public void update() { ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 2103a5435..0ec1e489a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -67,7 +67,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void updateEntity() { + public void update() { ticksElapsed++; if(bindPos.getY() > -1 && isValidBinding()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index a958338c0..379159d12 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -17,7 +17,7 @@ import vazkii.botania.common.Botania; public class TileManaBeacon extends TileMod { @Override - public void updateEntity() { + public void update() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 64754b76f..5fb526148 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -29,7 +29,7 @@ public class TileManaFlame extends TileMod { } @Override - public void updateEntity() { + public void update() { float c = 0.3F; if(worldObj.isRemote && Math.random() < c) { 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 8330eff47..634ee588b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -68,14 +68,6 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public final void update() { - if (!isInvalid() && worldObj.isBlockLoaded(getPos(), !worldObj.isRemote)) { - updateEntity(); - } - } - - protected void updateEntity() { - // NO-OP - } + public void update() {} } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 04db2a04b..77c476774 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -41,7 +41,7 @@ public class TileOpenCrate extends TileSimpleInventory { } @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 337bce14b..33f01f7a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -22,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; @@ -102,7 +101,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } @Override - public void updateEntity() { + public void update() { // Update every tick. recieveMana(0); 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 6b1e0b6b3..2ad1b4a26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -36,7 +36,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { int mana = 0; @Override - public void updateEntity() { + public void update() { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; 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 fcb8429bc..48ed8dd84 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -72,7 +72,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void updateEntity() { + public void update() { if(subTile != null) { TileEntity tileBelow = worldObj.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 8ab7f4f0f..f9396260e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -17,7 +17,7 @@ public class TileSpiritShrine extends TileMod { int ticks; @Override - public void updateEntity() { + public void update() { if(worldObj.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 414d30186..f8145e3c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -16,7 +16,7 @@ import vazkii.botania.common.Botania; public class TileStarfield extends TileMod { @Override - public void updateEntity() { + public void update() { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); if(!worldObj.isRemote) { boolean newState = !worldObj.isDaytime(); 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 47fc10d9c..8fa745355 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -69,7 +69,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void updateEntity() { + public void update() { boolean removeMana = true; if(hasValidPlatform()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index afed2e16b..a0414cd4a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -15,7 +15,7 @@ public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 6e5e46c65..b034e32fa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -15,7 +15,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; public class TileTinyPlanet extends TileMod { @Override - public void updateEntity() { + public void update() { ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index b452a5323..78110a5bc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -37,7 +37,7 @@ public class TileTinyPotato extends TileMod { } @Override - public void updateEntity() { + public void update() { if(worldObj.rand.nextInt(100) == 0) jump(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index e8906d9cb..f8e829c28 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -53,7 +53,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void updateEntity() { + public void update() { ++ticks; if(ticks % 20 == 0) updateCount(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index b542252a7..c2c5dc628 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -148,7 +148,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public boolean hasCloseby; @Override - public void updateEntity() { + public void update() { double x = pos.getX() + 0.5; double y = pos.getY() + 0.5; double z = pos.getZ() + 0.5; 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 79daa002b..6758332ba 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 @@ -38,7 +38,7 @@ public class TileBellows extends TileMod { } @Override - public void updateEntity() { + public void update() { boolean disable = true; TileEntity tile = getLinkedTile(); if(!active && tile instanceof TilePool) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index e9794dcc5..ae11b8d8b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -25,7 +25,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { final List validPools = new ArrayList<>(); @Override - public void updateEntity() { + public void update() { if (worldObj.isRemote) return; validPools.clear(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index b6e21c257..bef4c86bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -21,7 +21,7 @@ import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod { @Override - public void updateEntity() { + public void update() { boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(state != expectedState && !worldObj.isRemote) 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 56847a1c4..564f2cc01 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 @@ -214,7 +214,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void updateEntity() { + public void update() { if(manaCap == -1) manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 14b06df4f..8e9221d23 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -69,7 +69,7 @@ public class TilePump extends TileMod { } @Override - public void updateEntity() { + public void update() { hasRedstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 4df7bf647..0392a884a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -45,7 +45,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void updateEntity() { + public void update() { if(!worldObj.isRemote && Botania.rfApiLoaded) { if(deadCache) reCache(); 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 f05e55fb0..ed5fa28f5 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 @@ -182,7 +182,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void updateEntity() { + public void update() { boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(this); boolean wasInNetwork = inNetwork; if(!inNetwork && !isInvalid()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index fcbaa3536..6a5927e79 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -32,7 +32,7 @@ public class TileTurntable extends TileMod { boolean backwards = false; @Override - public void updateEntity() { + public void update() { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { 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 bef529a75..84a46f19e 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 @@ -28,7 +28,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; @Override - public void updateEntity() { + public void update() { EnumFacing dir = getOrientation(); BlockPos pos_ = getPos(); int range = getRange(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 349f4b9f8..d9de807b4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -19,8 +19,8 @@ public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { + super.update(); BlockPos binding = getBinding(); EnumFacing dir = getOrientation(); IBlockState state = getStateAtBinding(); 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 1bc39f10f..188b2d17c 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 @@ -29,8 +29,8 @@ public class TileRedStringInterceptor extends TileRedString { private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; @Override - public void updateEntity() { - super.updateEntity(); + public void update() { + super.update(); interceptors.get().add(this); } From f2544a6fa45d715eacf916598f346c6da9c6b681 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:37:07 -0500 Subject: [PATCH 720/935] Remove debug logging in special flower model --- .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 6c5a3db3a..b72874de3 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,7 +192,6 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel load(@Nonnull String key) { - Botania.LOGGER.info("Cached special flower {} model for key {}", loadBlocks ? "block": "item", key); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); From 3a8fc10cc9ad2c52d22f53c8494c245c0066ab56 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:57:13 -0500 Subject: [PATCH 721/935] Fix TE resyncs sending a bit too much stuff --- .../common/block/tile/TileAlfPortal.java | 4 ++-- .../botania/common/block/tile/TileAltar.java | 8 ++++---- .../botania/common/block/tile/TileAvatar.java | 8 ++++---- .../botania/common/block/tile/TileBrewery.java | 8 ++++---- .../common/block/tile/TileCacophonium.java | 8 ++++---- .../botania/common/block/tile/TileCamo.java | 4 ++-- .../botania/common/block/tile/TileCell.java | 4 ++-- .../botania/common/block/tile/TileCocoon.java | 4 ++-- .../common/block/tile/TileCraftCrate.java | 8 ++++---- .../common/block/tile/TileEnchanter.java | 4 ++-- .../botania/common/block/tile/TileFakeAir.java | 2 +- .../common/block/tile/TileFloatingFlower.java | 4 ++-- .../block/tile/TileFloatingSpecialFlower.java | 8 ++++---- .../common/block/tile/TileHourglass.java | 8 ++++---- .../common/block/tile/TileIncensePlate.java | 8 ++++---- .../common/block/tile/TileLightRelay.java | 4 ++-- .../common/block/tile/TileManaFlame.java | 4 ++-- .../botania/common/block/tile/TileMod.java | 18 ++++++++---------- .../common/block/tile/TileRuneAltar.java | 8 ++++---- .../common/block/tile/TileSimpleInventory.java | 4 ++-- .../common/block/tile/TileSpawnerClaw.java | 4 ++-- .../common/block/tile/TileSpecialFlower.java | 8 ++++---- .../common/block/tile/TileTerraPlate.java | 4 ++-- .../common/block/tile/TileTinyPotato.java | 4 ++-- .../tile/corporea/TileCorporeaCrystalCube.java | 8 ++++---- .../tile/corporea/TileCorporeaRetainer.java | 8 ++++---- .../common/block/tile/mana/TileBellows.java | 4 ++-- .../common/block/tile/mana/TilePool.java | 6 +++--- .../common/block/tile/mana/TilePump.java | 4 ++-- .../block/tile/mana/TileRFGenerator.java | 4 ++-- .../common/block/tile/mana/TileSpreader.java | 10 +++++----- .../common/block/tile/mana/TileTurntable.java | 4 ++-- 32 files changed, 97 insertions(+), 99 deletions(-) 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 38944a87f..25f606725 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -266,13 +266,13 @@ public class TileAlfPortal extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TICKS_OPEN, ticksOpen); cmp.setInteger(TAG_TICKS_SINCE_LAST_ITEM, ticksSinceLastItem); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { ticksOpen = cmp.getInteger(TAG_TICKS_OPEN); ticksSinceLastItem = cmp.getInteger(TAG_TICKS_SINCE_LAST_ITEM); } 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 a519c99b0..3c11c78da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -283,8 +283,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setBoolean(TAG_HAS_WATER, hasWater()); cmp.setBoolean(TAG_HAS_LAVA, hasLava()); @@ -292,8 +292,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); hasWater = cmp.getBoolean(TAG_HAS_WATER); hasLava = cmp.getBoolean(TAG_HAS_LAVA); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 67f29ac8e..a7afccf04 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -51,16 +51,16 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setBoolean(TAG_ENABLED, enabled); par1nbtTagCompound.setInteger(TAG_TICKS_ELAPSED, ticksElapsed); par1nbtTagCompound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); enabled = par1nbtTagCompound.getBoolean(TAG_ENABLED); ticksElapsed = par1nbtTagCompound.getInteger(TAG_TICKS_ELAPSED); mana = par1nbtTagCompound.getInteger(TAG_MANA); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index fe4412b2b..2aa7bb2ef 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -174,15 +174,15 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); mana = par1nbtTagCompound.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index 7c47564c9..a4f899098 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -25,8 +25,8 @@ public class TileCacophonium extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); NBTTagCompound cmp1 = new NBTTagCompound(); if(stack != null) @@ -35,8 +35,8 @@ public class TileCacophonium extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_STACK); stack = ItemStack.loadItemStackFromNBT(cmp1); 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 c41fc91e0..7ccdfeb93 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -25,7 +25,7 @@ public class TileCamo extends TileMod { public IBlockState camoState; @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { if(camoState != null) { cmp.setString(TAG_CAMO, Block.REGISTRY.getNameForObject(camoState.getBlock()).toString()); cmp.setInteger(TAG_CAMO_META, camoState.getBlock().getMetaFromState(camoState)); @@ -33,7 +33,7 @@ public class TileCamo extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { Block b = Block.getBlockFromName(cmp.getString(TAG_CAMO)); if (b != null) { camoState = b.getStateFromMeta(cmp.getInteger(TAG_CAMO_META)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 60afb0be3..97d4b9c1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -53,7 +53,7 @@ public class TileCell extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_GENERATION, generation); cmp.setBoolean(TAG_TICKED, ticked); if(ticked) { @@ -67,7 +67,7 @@ public class TileCell extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { generation = cmp.getInteger(TAG_GENERATION); ticked = cmp.getBoolean(TAG_TICKED); if(ticked) { 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 2c421bf16..831045fca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -105,13 +105,13 @@ public class TileCocoon extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TIME_PASSED, timePassed); cmp.setInteger(TAG_EMERALDS_GIVEN, emeraldsGiven); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { timePassed = cmp.getInteger(TAG_TIME_PASSED); emeraldsGiven = cmp.getInteger(TAG_EMERALDS_GIVEN); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 02b925c79..4b7959080 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -174,14 +174,14 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_PATTERN, pattern); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); pattern = par1nbtTagCompound.getInteger(TAG_PATTERN); } 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 f1a2881ae..ee0f9f557 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -313,7 +313,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setInteger(TAG_MANA_REQUIRED, manaRequired); cmp.setInteger(TAG_STAGE, stage); @@ -332,7 +332,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); manaRequired = cmp.getInteger(TAG_MANA_REQUIRED); stage = cmp.getInteger(TAG_STAGE); 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 5d4ef3ee5..25700314b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -23,7 +23,7 @@ public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_Y = "flowerY"; private static final String TAG_FLOWER_Z = "flowerZ"; - private BlockPos flowerPos; + private BlockPos flowerPos = BlockPos.ORIGIN; public void setFlower(TileEntity tile) { flowerPos = tile.getPos(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 7209e4cb9..fa8aa6382 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -46,12 +46,12 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setString(TAG_ISLAND_TYPE, type.toString()); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index 9313c95da..b8cb635bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -41,14 +41,14 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setString(TAG_ISLAND_TYPE, type.toString()); } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); } 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 91f921440..092716fc9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -109,8 +109,8 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_TIME, time); par1nbtTagCompound.setFloat(TAG_TIME_FRACTION, timeFraction); par1nbtTagCompound.setBoolean(TAG_FLIP, flip); @@ -120,8 +120,8 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); time = par1nbtTagCompound.getInteger(TAG_TIME); timeFraction = par1nbtTagCompound.getFloat(TAG_TIME_FRACTION); flip = par1nbtTagCompound.getBoolean(TAG_FLIP); 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 e24df9698..b79ea0c60 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -105,15 +105,15 @@ public class TileIncensePlate extends TileSimpleInventory { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_TIME_LEFT, timeLeft); par1nbtTagCompound.setBoolean(TAG_BURNING, burning); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); timeLeft = par1nbtTagCompound.getInteger(TAG_TIME_LEFT); burning = par1nbtTagCompound.getBoolean(TAG_BURNING); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 0ec1e489a..dec033274 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -163,7 +163,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { bindPos = new BlockPos( cmp.getInteger(TAG_BIND_X), cmp.getInteger(TAG_BIND_Y), @@ -172,7 +172,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_BIND_X, bindPos.getX()); cmp.setInteger(TAG_BIND_Y, bindPos.getY()); cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 5fb526148..ae53ff8f3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -69,12 +69,12 @@ public class TileManaFlame extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_COLOR, color); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { color = cmp.getInteger(TAG_COLOR); } 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 634ee588b..14952b522 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -32,7 +32,7 @@ public class TileMod extends TileEntity implements ITickable { @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); - writeCustomNBT(ret); + writePacketNBT(ret); return ret; } @@ -45,26 +45,24 @@ public class TileMod extends TileEntity implements ITickable { @Override public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); - readCustomNBT(par1nbtTagCompound); + readPacketNBT(par1nbtTagCompound); } - public void writeCustomNBT(NBTTagCompound cmp) { - // NO-OP - } + public void writePacketNBT(NBTTagCompound cmp) {} - public void readCustomNBT(NBTTagCompound cmp) { - // NO-OP - } + public void readPacketNBT(NBTTagCompound cmp) {} @Override public final SPacketUpdateTileEntity getUpdatePacket() { - return new SPacketUpdateTileEntity(pos, -999, getUpdateTag()); + NBTTagCompound tag = new NBTTagCompound(); + writePacketNBT(tag); + return new SPacketUpdateTileEntity(pos, -999, tag); } @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { super.onDataPacket(net, packet); - readCustomNBT(packet.getNbtCompound()); + readPacketNBT(packet.getNbtCompound()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 33f01f7a7..6683fc508 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -272,16 +272,16 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_MANA, mana); par1nbtTagCompound.setInteger(TAG_MANA_TO_GET, manaToGet); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); mana = par1nbtTagCompound.getInteger(TAG_MANA); manaToGet = par1nbtTagCompound.getInteger(TAG_MANA_TO_GET); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index a9dff6caa..715ad134d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -25,13 +25,13 @@ public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); @Override - public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { + public void readPacketNBT(NBTTagCompound par1NBTTagCompound) { itemHandler = createItemHandler(); itemHandler.deserializeNBT(par1NBTTagCompound); } @Override - public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) { + public void writePacketNBT(NBTTagCompound par1NBTTagCompound) { par1NBTTagCompound.merge(itemHandler.serializeNBT()); } 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 2ad1b4a26..6251b5b25 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -155,12 +155,12 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } 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 48ed8dd84..544315950 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -106,8 +106,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setString(TAG_SUBTILE_NAME, subTileName); NBTTagCompound subCmp = new NBTTagCompound(); @@ -118,8 +118,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); subTileName = cmp.getString(TAG_SUBTILE_NAME); NBTTagCompound subCmp = cmp.getCompoundTag(TAG_SUBTILE_CMP); 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 8fa745355..4d1eae1f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -187,12 +187,12 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 78110a5bc..8807fff4d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -48,12 +48,12 @@ public class TileTinyPotato extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setString(TAG_NAME, name); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { name = cmp.getString(TAG_NAME); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index f8e829c28..715ebb432 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -115,8 +115,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); NBTTagCompound cmp = new NBTTagCompound(); if(requestTarget != null) requestTarget.writeToNBT(cmp); @@ -125,8 +125,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); NBTTagCompound cmp = par1nbtTagCompound.getCompoundTag(TAG_REQUEST_TARGET); requestTarget = ItemStack.loadItemStackFromNBT(cmp); itemCount = par1nbtTagCompound.getInteger(TAG_ITEM_COUNT); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 21ef1715b..b80e561e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -71,8 +71,8 @@ public class TileCorporeaRetainer extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setBoolean(TAG_PENDING_REQUEST, pendingRequest); cmp.setInteger(TAG_REQUEST_X, requestPos.getX()); @@ -99,8 +99,8 @@ public class TileCorporeaRetainer extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); pendingRequest = cmp.getBoolean(TAG_PENDING_REQUEST); int x = cmp.getInteger(TAG_REQUEST_X); 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 6758332ba..1b2658fc8 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 @@ -122,12 +122,12 @@ public class TileBellows extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_ACTIVE, active); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { active = cmp.getBoolean(TAG_ACTIVE); } 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 564f2cc01..67566cd31 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 @@ -303,7 +303,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setBoolean(TAG_OUTPUTTING, outputting); cmp.setInteger(TAG_COLOR, color.getMetadata()); @@ -318,7 +318,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); outputting = cmp.getBoolean(TAG_OUTPUTTING); color = EnumDyeColor.byMetadata(cmp.getInteger(TAG_COLOR)); @@ -351,7 +351,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(!worldObj.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); + writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 8e9221d23..57ffa9bb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -121,12 +121,12 @@ public class TilePump extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_ACTIVE, active); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { boolean prevActive = active; active = cmp.getBoolean(TAG_ACTIVE); if(worldObj != null && worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 0392a884a..18ef60515 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -121,12 +121,12 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } 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 ed5fa28f5..f550b0f31 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 @@ -270,8 +270,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); UUID identity = getIdentifier(); cmp.setBoolean(TAG_HAS_IDENTITY, true); @@ -309,8 +309,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); if(cmp.getBoolean(TAG_HAS_IDENTITY)) { long most = cmp.getLong(TAG_UUID_MOST); @@ -383,7 +383,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(!player.isSneaking()) { if(!worldObj.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); + writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 6a5927e79..3634200a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -55,13 +55,13 @@ public class TileTurntable extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_SPEED, speed); cmp.setBoolean(TAG_BACKWARDS, backwards); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { speed = cmp.getInteger(TAG_SPEED); backwards = cmp.getBoolean(TAG_BACKWARDS); } From 6c307d16f40be3205f34f64ec9037cf717942b8f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 15:28:54 -0500 Subject: [PATCH 722/935] Made Quats proper value type --- .../botania/common/core/helper/Quat.java | 74 ++++++++----------- 1 file changed, 31 insertions(+), 43 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index 765d50912..9bc002343 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -10,42 +10,26 @@ */ package vazkii.botania.common.core.helper; +import java.util.Arrays; import java.util.Formatter; import java.util.Locale; +import java.util.Objects; -public class Quat { +public final class Quat { - public double x; - public double y; - public double z; - public double s; - - public Quat() { - s = 1.0D; - x = 0.0D; - y = 0.0D; - z = 0.0D; - } - - public Quat(Quat quat) { - x = quat.x; - y = quat.y; - z = quat.z; - s = quat.s; - } + public static final Quat IDENTITY = new Quat(0, 0, 0, 1); + public final double x; + public final double y; + public final double z; + public final double s; + private final int hashCode; public Quat(double d, double d1, double d2, double d3) { x = d1; y = d2; z = d3; s = d; - } - - public void set(Quat quat) { - x = quat.x; - y = quat.y; - z = quat.z; - s = quat.s; + this.hashCode = Arrays.hashCode(new double[] { d, d1, d2, d3 } ); } public static Quat aroundAxis(double ax, double ay, double az, double angle) { @@ -54,43 +38,33 @@ public class Quat { return new Quat(Math.cos(angle), ax * d4, ay * d4, az * d4); } - public void multiply(Quat quat) { + public Quat multiply(Quat quat) { double d = s * quat.s - x * quat.x - y * quat.y - z * quat.z; double d1 = s * quat.x + x * quat.s - y * quat.z + z * quat.y; double d2 = s * quat.y + x * quat.z + y * quat.s - z * quat.x; double d3 = s * quat.z - x * quat.y + y * quat.x + z * quat.s; - s = d; - x = d1; - y = d2; - z = d3; + return new Quat(d1, d2, d3, d); } - public void rightMultiply(Quat quat) { + public Quat rightMultiply(Quat quat) { double d = s * quat.s - x * quat.x - y * quat.y - z * quat.z; double d1 = s * quat.x + x * quat.s + y * quat.z - z * quat.y; double d2 = s * quat.y - x * quat.z + y * quat.s + z * quat.x; double d3 = s * quat.z + x * quat.y - y * quat.x + z * quat.s; - s = d; - x = d1; - y = d2; - z = d3; + return new Quat(d1, d2, d3, d); } public double mag() { return Math.sqrt(x * x + y * y + z * z + s * s); } - public void normalize() { + public Quat normalize() { double d = mag(); if (d == 0.0D) { - return; + return this; } else { d = 1.0D / d; - x *= d; - y *= d; - z *= d; - s *= d; - return; + return new Quat(x * d, y * d, z * d, s * d); } } @@ -104,6 +78,20 @@ public class Quat { vec.z = d3 * s - d * z - d1 * y + d2 * x; } + @Override + public int hashCode() { + return hashCode; + } + + @Override + public boolean equals(Object o) { + return o instanceof Quat + && ((Quat) o).x == this.x + && ((Quat) o).y == this.y + && ((Quat) o).z == this.z + && ((Quat) o).s == this.s; + } + @Override public String toString() { StringBuilder stringbuilder = new StringBuilder(); From cfb368f67e8c53cbff8271530423efebc2031ed7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 16:11:03 -0500 Subject: [PATCH 723/935] Immutabilize vector3 as it being defensively copied all over already --- .../core/handler/RedStringRenderer.java | 8 +- .../vazkii/botania/client/fx/FXLightning.java | 24 ++-- .../client/fx/FXLightningBoltPoint.java | 2 +- .../botania/client/fx/FXLightningSegment.java | 16 +-- .../common/block/decor/BlockUnstable.java | 2 +- .../common/block/tile/TileLightRelay.java | 8 +- .../botania/common/block/tile/TilePylon.java | 6 +- .../common/block/tile/TileRuneAltar.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 2 +- .../common/core/helper/MathHelper.java | 4 +- .../botania/common/core/helper/Quat.java | 11 +- .../botania/common/core/helper/Vector3.java | 124 ++++-------------- .../common/entity/EntityBabylonWeapon.java | 2 +- .../common/entity/EntityDoppleganger.java | 7 +- .../common/entity/EntityMagicMissile.java | 12 +- .../common/entity/EntityManaBurst.java | 6 +- .../common/entity/EntityThornChakram.java | 3 +- .../botania/common/item/ItemSextant.java | 9 +- .../botania/common/item/ItemTwigWand.java | 8 +- .../equipment/bauble/ItemFlightTiara.java | 4 +- .../item/equipment/bauble/ItemTinyPlanet.java | 2 +- .../item/equipment/tool/ItemStarSword.java | 4 +- .../botania/common/item/lens/LensMagnet.java | 10 +- .../common/item/lens/LensRedirect.java | 2 +- .../common/item/relic/ItemKingKey.java | 16 +-- .../common/item/rod/ItemGravityRod.java | 19 +-- .../common/item/rod/ItemSkyDirtRod.java | 2 +- .../common/network/PacketBotaniaEffect.java | 16 +-- 28 files changed, 122 insertions(+), 209 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index dc231720f..292eea138 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -81,9 +81,9 @@ public final class RedStringRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(tile.getPos().getX() + 0.5 - renderPosX, tile.getPos().getY() + 0.5 - renderPosY, tile.getPos().getZ() + 0.5 - renderPosZ); Vector3 vecOrig = new Vector3(bind.getX() - tile.getPos().getX(), bind.getY() - tile.getPos().getY(), bind.getZ() - tile.getPos().getZ()); - Vector3 vecNorm = vecOrig.copy().normalize(); - Vector3 vecMag = vecNorm.copy().multiply(0.025); - Vector3 vecApply = vecMag.copy(); + Vector3 vecNorm = vecOrig.normalize(); + Vector3 vecMag = vecNorm.multiply(0.025); + Vector3 vecApply = vecMag; int stages = (int) (vecOrig.mag() / vecMag.mag()); @@ -97,7 +97,7 @@ public final class RedStringRenderer { for(int i = 0; i < stages; i++) { addVertexAtWithTranslation(tessellator, dir, vecApply.x, vecApply.y, vecApply.z, rand, len); rand = Math.random() - 0.5; - vecApply.add(vecMag); + vecApply = vecApply.add(vecMag); len += add; addVertexAtWithTranslation(tessellator, dir, vecApply.x, vecApply.y, vecApply.z, rand, len); } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index b882ba0b8..c739d7633 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -39,7 +39,7 @@ public class FXLightning extends Particle { this.speed = ticksPerMeter; this.colorOuter = colorOuter; this.colorInner = colorInner; - this.length = targetvec.copy().subtract(sourcevec).mag(); + this.length = targetvec.subtract(sourcevec).mag(); this.particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; this.particleAge = -(int) (length * speed); @@ -86,8 +86,8 @@ public class FXLightning extends Particle { double width = 0.025F * (playerVec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; - Vector3 diff1 = playerVec.copy().crossProduct(rendersegment.prevDiff).normalize().multiply(width / rendersegment.sinPrev); - Vector3 diff2 = playerVec.copy().crossProduct(rendersegment.nextDiff).normalize().multiply(width / rendersegment.sinNext); + Vector3 diff1 = playerVec.crossProduct(rendersegment.prevDiff).normalize().multiply(width / rendersegment.sinPrev); + Vector3 diff2 = playerVec.crossProduct(rendersegment.nextDiff).normalize().multiply(width / rendersegment.sinNext); Vector3 startvec = rendersegment.startPoint.point; Vector3 endvec = rendersegment.endPoint.point; @@ -104,7 +104,7 @@ public class FXLightning extends Particle { wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); if(rendersegment.next == null) { - Vector3 roundend = rendersegment.endPoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); + Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width)); wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); @@ -113,7 +113,7 @@ public class FXLightning extends Particle { } if(rendersegment.prev == null) { - Vector3 roundend = rendersegment.startPoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); + Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width)); wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex(); @@ -132,7 +132,7 @@ public class FXLightning extends Particle { for(FXLightningSegment segment : oldSegments) { prev = segment.prev; - Vector3 subsegment = segment.diff.copy().multiply(1F / splits); + Vector3 subsegment = segment.diff.multiply(1F / splits); FXLightningBoltPoint[] newpoints = new FXLightningBoltPoint[splits + 1]; @@ -141,10 +141,10 @@ public class FXLightning extends Particle { newpoints[splits] = segment.endPoint; for(int i = 1; i < splits; i++) { - Vector3 randoff = segment.diff.copy().perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); - randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); + Vector3 randoff = segment.diff.perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff); + randoff = randoff.multiply((rand.nextFloat() - 0.5F) * amount * 2); - Vector3 basepoint = startpoint.copy().add(subsegment.copy().multiply(i)); + Vector3 basepoint = startpoint.add(subsegment.multiply(i)); newpoints[i] = new FXLightningBoltPoint(basepoint, randoff); } @@ -156,13 +156,13 @@ public class FXLightning extends Particle { prev.next = next; if(i != 0 && rand.nextFloat() < splitChance) { - Vector3 splitrot = next.diff.copy().xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); - Vector3 diff = next.diff.copy().rotate((rand.nextFloat() * 0.66F + 0.33F) * splitAngle, splitrot).multiply(splitLength); + Vector3 splitrot = next.diff.xCrossProduct().rotate(rand.nextFloat() * 360, next.diff); + Vector3 diff = next.diff.rotate((rand.nextFloat() * 0.66F + 0.33F) * splitAngle, splitrot).multiply(splitLength); splitCount++; splitParents.put(splitCount, next.splitNo); - FXLightningSegment split = new FXLightningSegment(newpoints[i], new FXLightningBoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.copy().add(diff)), segment.light / 2F, next.segmentNo, splitCount); + FXLightningSegment split = new FXLightningSegment(newpoints[i], new FXLightningBoltPoint(newpoints[i + 1].basepoint, newpoints[i + 1].offsetvec.add(diff)), segment.light / 2F, next.segmentNo, splitCount); split.prev = prev; segments.add(split); diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java index c5ac33f0c..4c82eb3ab 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightningBoltPoint.java @@ -9,7 +9,7 @@ public class FXLightningBoltPoint { public final Vector3 offsetvec; public FXLightningBoltPoint(Vector3 basepoint, Vector3 offsetvec) { - point = basepoint.copy().add(offsetvec); + point = basepoint.add(offsetvec); this.basepoint = basepoint; this.offsetvec = offsetvec; } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java index 97adf5853..7f0e8750d 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightningSegment.java @@ -37,29 +37,29 @@ public class FXLightningSegment { } public void calcDiff() { - diff = endPoint.point.copy().subtract(startPoint.point); + diff = endPoint.point.subtract(startPoint.point); } public void calcEndDiffs() { if(prev != null) { - Vector3 prevdiffnorm = prev.diff.copy().normalize(); - Vector3 thisdiffnorm = diff.copy().normalize(); + Vector3 prevdiffnorm = prev.diff.normalize(); + Vector3 thisdiffnorm = diff.normalize(); - prevDiff = thisdiffnorm.copy().add(prevdiffnorm).normalize(); + prevDiff = thisdiffnorm.add(prevdiffnorm).normalize(); sinPrev = (float) Math.sin(thisdiffnorm.angle(prevdiffnorm.multiply(-1)) / 2); } else { - prevDiff = diff.copy().normalize(); + prevDiff = diff.normalize(); sinPrev = 1; } if(next != null) { - Vector3 nextdiffnorm = next.diff.copy().normalize(); - Vector3 thisdiffnorm = diff.copy().normalize(); + Vector3 nextdiffnorm = next.diff.normalize(); + Vector3 thisdiffnorm = diff.normalize(); nextDiff = thisdiffnorm.add(nextdiffnorm).normalize(); sinNext = (float) Math.sin(thisdiffnorm.angle(nextdiffnorm.multiply(-1)) / 2); } else { - nextDiff = diff.copy().normalize(); + nextDiff = diff.normalize(); sinNext = 1; } } 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 7da7d35e7..d2406153e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -109,7 +109,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { int colorDark = new Color(color).darker().getRGB(); Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - Vector3 endVector = origVector.copy().add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); + Vector3 endVector = origVector.add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); Botania.proxy.lightningFX(world, origVector, endVector, 5F, colorDark, colorBright); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index dec033274..74d388e5e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -78,8 +78,8 @@ public class TileLightRelay extends TileMod implements IWandBindable { int count = 10; int start = ticksElapsed % size; - Vector3 vecMag = vec.copy().normalize().multiply(dist); - Vector3 vecTip = vecMag.copy().multiply(start).add(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + Vector3 vecMag = vec.normalize().multiply(dist); + Vector3 vecTip = vecMag.multiply(start).add(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); double radPer = Math.PI / 16.0; float mul = 0.5F; @@ -88,9 +88,9 @@ public class TileLightRelay extends TileMod implements IWandBindable { for(int i = start; i < start + count; i++) { mul = Math.min(maxMul, mul + mulPer); double rad = radPer * (i + ticksElapsed * 0.4); - Vector3 vecRot = vecMag.copy().crossProduct(Vector3.one).multiply(mul).rotate(rad, vecMag).add(vecTip); + Vector3 vecRot = vecMag.crossProduct(Vector3.ONE).multiply(mul).rotate(rad, vecMag).add(vecTip); Botania.proxy.wispFX(worldObj, vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); - vecTip.add(vecMag); + vecTip = vecTip.add(vecMag); } BlockPos endpoint = getEndpoint(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index e58461414..b2eadda8b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -58,8 +58,8 @@ public class TilePylon extends TileEntity implements ITickable { double z = pos.getZ() + 0.5 + Math.sin(worldTime) * r; Vector3 ourCoords = new Vector3(x, pos.getY() + 0.25, z); - centerBlock.sub(new Vector3(0, 0.5, 0)); - Vector3 movementVector = centerBlock.sub(ourCoords).normalize().multiply(0.2); + centerBlock = centerBlock.subtract(new Vector3(0, 0.5, 0)); + Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); Botania.proxy.wispFX(worldObj, x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); if(worldObj.rand.nextInt(3) == 0) @@ -67,7 +67,7 @@ public class TilePylon extends TileEntity implements ITickable { } } else { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); - Vector3 movementVector = centerBlock.sub(ourCoords).normalize().multiply(0.2); + Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); Block block = worldObj.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 6683fc508..5c43bca0e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -120,7 +120,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver if(worldObj.isRemote && manaToGet > 0 && mana >= manaToGet) { if(worldObj.rand.nextInt(20) == 0) { Vector3 vec = Vector3.fromTileEntityCenter(this); - Vector3 endVec = vec.copy().add(0, 2.5, 0); + Vector3 endVec = vec.add(0, 2.5, 0); Botania.proxy.lightningFX(worldObj, vec, endVec, 2F, 0x00948B, 0x00E4D7); } } 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 f550b0f31..ba7d8bf6c 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 @@ -690,7 +690,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(!blockVec.isInside(axis)) blockVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); - Vector3 diffVec = blockVec.copy().sub(thisVec); + Vector3 diffVec = blockVec.subtract(thisVec); Vector3 diffVec2D = new Vector3(diffVec.x, diffVec.z, 0); Vector3 rotVec = new Vector3(0, 1, 0); double angle = rotVec.angle(diffVec2D) / Math.PI * 180.0; diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 5f5357a65..66fe640e0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -50,10 +50,10 @@ public final class MathHelper { public static void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) { Vector3 entityVector = Vector3.fromEntityCenter(entity); - Vector3 finalVector = originalPosVector.copy().subtract(entityVector); + Vector3 finalVector = originalPosVector.subtract(entityVector); if(finalVector.mag() > 1) - finalVector.normalize(); + finalVector = finalVector.normalize(); entity.motionX = finalVector.x * modifier; entity.motionY = finalVector.y * modifier; diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index 9bc002343..d6d246815 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -68,14 +68,17 @@ public final class Quat { } } - public void rotate(Vector3 vec) { + public Vector3 rotate(Vector3 vec) { double d = -x * vec.x - y * vec.y - z * vec.z; double d1 = s * vec.x + y * vec.z - z * vec.y; double d2 = s * vec.y - x * vec.z + z * vec.x; double d3 = s * vec.z + x * vec.y - y * vec.x; - vec.x = d1 * s - d * x - d2 * z + d3 * y; - vec.y = d2 * s - d * y + d1 * z - d3 * x; - vec.z = d3 * s - d * z - d1 * y + d2 * x; + + double vx = d1 * s - d * x - d2 * z + d3 * y; + double vy = d2 * s - d * y + d1 * z - d3 * x; + double vz = d3 * s - d * z - d1 * y + d2 * x; + + return new Vector3(vx, vy, vz); } @Override diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index e79c53dd9..c5eb1cf4d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -24,20 +24,18 @@ import org.lwjgl.util.vector.Vector4f; import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; +import java.util.Arrays; import java.util.Objects; public class Vector3 { - public static final Vector3 zero = new Vector3(); - public static final Vector3 one = new Vector3(1, 1, 1); - public static final Vector3 center = new Vector3(0.5, 0.5, 0.5); + public static final Vector3 ZERO = new Vector3(0, 0, 0); + public static final Vector3 ONE = new Vector3(1, 1, 1); + public static final Vector3 CENTER = new Vector3(0.5, 0.5, 0.5); - public double x; - public double y; - public double z; - - public Vector3() { - } + public final double x; + public final double y; + public final double z; public Vector3(double d, double d1, double d2) { x = d; @@ -45,20 +43,8 @@ public class Vector3 z = d2; } - public Vector3(Vector3 vec) { - x = vec.x; - y = vec.y; - z = vec.z; - } - public Vector3(Vec3d vec) { - x = vec.xCoord; - y = vec.yCoord; - z = vec.zCoord; - } - - public Vector3 copy() { - return new Vector3(this); + this(vec.xCoord, vec.yCoord, vec.zCoord); } public static Vector3 fromBlockPos(BlockPos pos) { @@ -81,20 +67,6 @@ public class Vector3 return fromTileEntity(e).add(0.5); } - public Vector3 set(double d, double d1, double d2) { - x = d; - y = d1; - z = d2; - return this; - } - - public Vector3 set(Vector3 vec) { - x = vec.x; - y = vec.y; - z = vec.z; - return this; - } - public double dotProduct(Vector3 vec) { double d = vec.x * x + vec.y * y + vec.z * z; @@ -113,67 +85,35 @@ public class Vector3 double d = y * vec.z - z * vec.y; double d1 = z * vec.x - x * vec.z; double d2 = x * vec.y - y * vec.x; - x = d; - y = d1; - z = d2; - return this; + return new Vector3(d, d1, d2); } public Vector3 add(double d, double d1, double d2) { - x += d; - y += d1; - z += d2; - return this; + return new Vector3(x + d, y + d1, z + d2); } public Vector3 add(Vector3 vec) { - x += vec.x; - y += vec.y; - z += vec.z; - return this; + return add(vec.x, vec.y, vec.z); } public Vector3 add(double d) { return add(d, d, d); } - public Vector3 sub(Vector3 vec) { - return subtract(vec); - } - public Vector3 subtract(Vector3 vec) { - x -= vec.x; - y -= vec.y; - z -= vec.z; - return this; - } - - public Vector3 negate(Vector3 vec) { - x = -x; - y = -y; - z = -z; - return this; + return new Vector3(x - vec.x, y - vec.y, z - vec.z); } public Vector3 multiply(double d) { - x *= d; - y *= d; - z *= d; - return this; + return multiply(d, d, d); } public Vector3 multiply(Vector3 f) { - x *= f.x; - y *= f.y; - z *= f.z; - return this; + return multiply(f.x, f.y, f.z); } public Vector3 multiply(double fx, double fy, double fz) { - x *= fx; - y *= fy; - z *= fz; - return this; + return new Vector3(x * fx, y * fy, z * fz); } public double mag() { @@ -187,7 +127,7 @@ public class Vector3 public Vector3 normalize() { double d = mag(); if(d != 0) - multiply(1 / d); + return multiply(1 / d); return this; } @@ -207,29 +147,19 @@ public class Vector3 public Vector3 xCrossProduct() { double d = z; double d1 = -y; - x = 0; - y = d; - z = d1; - return this; + return new Vector3(0, d, d1); } public Vector3 zCrossProduct() { double d = y; - double d1 = -x; - x = d; - y = d1; - z = 0; - return this; + return new Vector3(d, d1, 0); } public Vector3 yCrossProduct() { double d = -z; double d1 = x; - x = d; - y = 0; - z = d1; - return this; + return new Vector3(d, 0, d1); } public Vec3d toVec3D() { @@ -237,7 +167,7 @@ public class Vector3 } public double angle(Vector3 vec) { - return Math.acos(copy().normalize().dotProduct(vec.copy().normalize())); + return Math.acos(normalize().dotProduct(vec.normalize())); } public boolean isInside(AxisAlignedBB aabb) { @@ -266,10 +196,7 @@ public class Vector3 } public Vector3 negate() { - x = -x; - y = -y; - z = -z; - return this; + return new Vector3(-x, -y, -z); } public double scalarProject(Vector3 b) { @@ -280,18 +207,15 @@ public class Vector3 public Vector3 project(Vector3 b) { double l = b.magSquared(); if(l == 0) { - set(0, 0, 0); - return this; + return ZERO; } double m = dotProduct(b)/l; - set(b).multiply(m); - return this; + return b.multiply(m); } public Vector3 rotate(double angle, Vector3 axis) { - Quat.aroundAxis(axis.copy().normalize(), angle).rotate(this); - return this; + return Quat.aroundAxis(axis.normalize(), angle).rotate(this); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 027f2d300..77c18a553 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -119,7 +119,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { else playerLook = new Vector3(lookat.getBlockPos().getX() + 0.5, lookat.getBlockPos().getY() + 0.5, lookat.getBlockPos().getZ() + 0.5); Vector3 thisVec = Vector3.fromEntityCenter(this); - Vector3 motionVec = playerLook.sub(thisVec).normalize().multiply(2); + Vector3 motionVec = playerLook.subtract(thisVec).normalize().multiply(2); x = motionVec.x; y = motionVec.y; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 927176a66..4d168a8d6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -86,7 +86,6 @@ import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.UUID; import java.util.regex.Pattern; @@ -399,7 +398,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(attacker != null) { Vector3 thisVector = Vector3.fromEntityCenter(this); Vector3 playerVector = Vector3.fromEntityCenter(attacker); - Vector3 motionVector = thisVector.copy().sub(playerVector).copy().normalize().multiply(0.75); + Vector3 motionVector = thisVector.subtract(playerVector).normalize().multiply(0.75); if(getHealth() > 0) { motionX = -motionVector.x; @@ -536,7 +535,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { double zp = pylonPos.z + 0.5 + Math.sin(worldTime) * rad; Vector3 partPos = new Vector3(xp, pylonPos.y, zp); - Vector3 mot = pos.copy().sub(partPos).multiply(0.04); + Vector3 mot = pos.subtract(partPos).multiply(0.04); float r = 0.7F + (float) Math.random() * 0.3F; float g = (float) Math.random() * 0.3F; @@ -600,7 +599,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { Vector3 sourceVector = new Vector3(source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5); Vector3 playerVector = Vector3.fromEntityCenter(player); - Vector3 motion = sourceVector.copy().sub(playerVector).copy().normalize(); + Vector3 motion = sourceVector.subtract(playerVector).normalize(); player.motionX = motion.x; player.motionY = 0.2; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 0c9a2a0f7..297b2fd5f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -98,10 +98,10 @@ public class EntityMagicMissile extends EntityThrowable { boolean evil = isEvil(); Vector3 thisVec = Vector3.fromEntityCenter(this); Vector3 oldPos = new Vector3(lastTickPosX, lastTickPosY, lastTickPosZ); - Vector3 diff = thisVec.copy().sub(oldPos); - Vector3 step = diff.copy().normalize().multiply(0.05); + Vector3 diff = thisVec.subtract(oldPos); + Vector3 step = diff.normalize().multiply(0.05); int steps = (int) (diff.mag() / step.mag()); - Vector3 particlePos = oldPos.copy(); + Vector3 particlePos = oldPos; Botania.proxy.setSparkleFXCorrupt(evil); for(int i = 0; i < steps; i++) { @@ -109,7 +109,7 @@ public class EntityMagicMissile extends EntityThrowable { if(worldObj.rand.nextInt(steps) <= 1) Botania.proxy.sparkleFX(worldObj, particlePos.x + (Math.random() - 0.5) * 0.4, particlePos.y + (Math.random() - 0.5) * 0.4, particlePos.z + (Math.random() - 0.5) * 0.4, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); - particlePos.add(step); + particlePos = particlePos.add(step); } Botania.proxy.setSparkleFXCorrupt(false); @@ -122,8 +122,8 @@ public class EntityMagicMissile extends EntityThrowable { } Vector3 targetVec = evil ? new Vector3(lockX, lockY, lockZ) : Vector3.fromEntityCenter(target); - Vector3 diffVec = targetVec.copy().sub(thisVec); - Vector3 motionVec = diffVec.copy().normalize().multiply(evil ? 0.5 : 0.6); + Vector3 diffVec = targetVec.subtract(thisVec); + Vector3 motionVec = diffVec.normalize().multiply(evil ? 0.5 : 0.6); motionX = motionVec.x; motionY = motionVec.y; if(time < 10) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 0a86083f2..c959624b4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -339,8 +339,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { Vector3 currentPos = Vector3.fromEntity(this); Vector3 oldPos = new Vector3(prevPosX, prevPosY, prevPosZ); - Vector3 diffVec = oldPos.copy().sub(currentPos); - Vector3 diffVecNorm = diffVec.copy().normalize(); + Vector3 diffVec = oldPos.subtract(currentPos); + Vector3 diffVecNorm = diffVec.normalize(); double distance = 0.095; @@ -358,7 +358,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { posZ += diffVecNorm.z * distance; currentPos = Vector3.fromEntity(this); - diffVec = oldPos.copy().sub(currentPos); + diffVec = oldPos.subtract(currentPos); if(getEntityData().hasKey(ItemTinyPlanet.TAG_ORBIT)) break; } while(Math.abs(diffVec.mag()) > distance); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 2e85d0648..6fc9f4d01 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -30,7 +30,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -83,7 +82,7 @@ public class EntityThornChakram extends EntityThrowable { // Returning motion if(isReturning()) { Entity thrower = worldObj.getEntityByID(getEntityToReturnTo()); - Vector3 motion = Vector3.fromEntityCenter(thrower).sub(Vector3.fromEntityCenter(this)).normalize(); + Vector3 motion = Vector3.fromEntityCenter(thrower).subtract(Vector3.fromEntityCenter(this)).normalize(); motionX = motion.x; motionY = motion.y; motionZ = motion.z; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index a02e8ed4a..cb3ae7ae8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -131,13 +131,14 @@ public class ItemSextant extends ItemMod { Botania.proxy.wispFX(world, source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F); Vector3 centerVec = Vector3.fromEntityCenter(player); - Vector3 diffVec = source.copy().subtract(centerVec); + Vector3 diffVec = source.subtract(centerVec); Vector3 lookVec = new Vector3(player.getLookVec()); double mul = diffVec.y / lookVec.y; - lookVec.multiply(mul).add(centerVec); + lookVec = lookVec.multiply(mul).add(centerVec); - lookVec.x = net.minecraft.util.math.MathHelper.floor_double(lookVec.x); - lookVec.z = net.minecraft.util.math.MathHelper.floor_double(lookVec.z); + lookVec = new Vector3(net.minecraft.util.math.MathHelper.floor_double(lookVec.x), + lookVec.y, + net.minecraft.util.math.MathHelper.floor_double(lookVec.z)); return MathHelper.pointDistancePlane(source.x, source.z, lookVec.x, lookVec.z); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index a905ac546..b9766d45e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -169,13 +169,13 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(!world.isRemote) return; - Vector3 diff = end.copy().sub(orig); - Vector3 movement = diff.copy().normalize().multiply(0.05); + Vector3 diff = end.subtract(orig); + Vector3 movement = diff.normalize().multiply(0.05); int iters = (int) (diff.mag() / movement.mag()); float huePer = 1F / iters; float hueSum = (float) Math.random(); - Vector3 currentPos = orig.copy(); + Vector3 currentPos = orig; for(int i = 0; i < iters; i++) { float hue = i * huePer + hueSum; Color color = Color.getHSBColor(hue, 1F, 1F); @@ -186,7 +186,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { Botania.proxy.setSparkleFXNoClip(true); Botania.proxy.sparkleFX(world, currentPos.x, currentPos.y, currentPos.z, r, g, b, 0.5F, 4); Botania.proxy.setSparkleFXNoClip(false); - currentPos.add(movement); + currentPos = currentPos.add(movement); } } 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 bee323ec6..157e45773 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 @@ -164,9 +164,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub int time = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME); int newTime = time; - Vector3 look = new Vector3(p.getLookVec()); - look.y = 0; - look.normalize(); + Vector3 look = new Vector3(p.getLookVec()).multiply(1, 0, 1).normalize(); if(flying) { if(time > 0 && !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false)) 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 d84d6994b..f3abaf290 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 @@ -79,7 +79,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { Vector3 targetVec = new Vector3(xTarget, yTarget, zTarget); Vector3 currentVec = new Vector3(entity.posX, entity.posY, entity.posZ); - Vector3 moveVector = targetVec.copy().sub(currentVec); + Vector3 moveVector = targetVec.subtract(currentVec); burst.setMotion(moveVector.x, moveVector.y, moveVector.z); 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 b865c4f6c..f3a378c13 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 @@ -51,9 +51,9 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote) { RayTraceResult pos = ToolCommons.raytraceFromEntity(world, par3Entity, true, 48); if(pos != null && pos.getBlockPos() != null) { - Vector3 posVec = new Vector3(pos.getBlockPos().getX(), pos.getBlockPos().getY(), pos.getBlockPos().getZ()); + Vector3 posVec = Vector3.fromBlockPos(pos.getBlockPos()); Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); - posVec.add(motVec); + posVec = posVec.add(motVec); motVec.normalize().negate().multiply(1.5); EntityFallingStar star = new EntityFallingStar(world, player); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 274bb7f0f..fefd9a71d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -54,13 +54,13 @@ public class LensMagnet extends Lens { Vector3 tileVec = Vector3.fromTileEntityCenter(tile).add(0, -0.1, 0); Vector3 motionVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - Vector3 normalMotionVec = motionVec.copy().normalize(); - Vector3 magnetVec = tileVec.sub(burstVec).normalize(); - Vector3 differenceVec = normalMotionVec.sub(magnetVec).multiply(motionVec.mag() * 0.1); + Vector3 normalMotionVec = motionVec.normalize(); + Vector3 magnetVec = tileVec.subtract(burstVec).normalize(); + Vector3 differenceVec = normalMotionVec.subtract(magnetVec).multiply(motionVec.mag() * 0.1); - Vector3 finalMotionVec = motionVec.sub(differenceVec); + Vector3 finalMotionVec = motionVec.subtract(differenceVec); if(!magnetized) { - finalMotionVec.multiply(0.75); + finalMotionVec = finalMotionVec.multiply(0.75); entity.getEntityData().setBoolean(TAG_MAGNETIZED, true); entity.getEntityData().setInteger(TAG_MAGNETIZED_X, tile.getPos().getX()); entity.getEntityData().setInteger(TAG_MAGNETIZED_Y, tile.getPos().getY()); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 2e36da093..5e406db0a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -41,7 +41,7 @@ public class LensRedirect extends Lens { if(!sourceVec.isInside(axis)) sourceVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); - Vector3 diffVec = sourceVec.copy().sub(tileVec); + Vector3 diffVec = sourceVec.subtract(tileVec); Vector3 diffVec2D = new Vector3(diffVec.x, diffVec.z, 0); Vector3 rotVec = new Vector3(0, 1, 0); double angle = rotVec.angle(diffVec2D) / Math.PI * 180.0; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index dd66339fe..d8266a1cd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -63,25 +63,23 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { int spawned = getWeaponsSpawned(stack); if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, ((EntityPlayer) living), 150, true))) { - Vector3 look = new Vector3(living.getLookVec()); - look.y = 0; - look.normalize().negate().multiply(2); + Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1).normalize().negate().multiply(2); int div = spawned / 5; int mod = spawned % 5; - Vector3 pl = look.copy().add(Vector3.fromEntityCenter(living)).add(0, 1.6, div * 0.1); + Vector3 pl = look.add(Vector3.fromEntityCenter(living)).add(0, 1.6, div * 0.1); Random rand = living.worldObj.rand; - Vector3 axis = look.copy().normalize().crossProduct(new Vector3(-1, 0, -1)).normalize(); - Vector3 axis1 = axis.copy(); + Vector3 axis = look.normalize().crossProduct(new Vector3(-1, 0, -1)).normalize(); + Vector3 axis1 = axis; double rot = mod * Math.PI / 4 - Math.PI / 2; - axis1.multiply(div * 3.5 + 5).rotate(rot, look); + axis1 = axis1.multiply(div * 3.5 + 5).rotate(rot, look); if(axis1.y < 0) - axis1.y = -axis1.y; + axis1 = axis.multiply(0, -1, 0); - Vector3 end = pl.copy().add(axis1); + Vector3 end = pl.add(axis1); EntityBabylonWeapon weapon = new EntityBabylonWeapon(living.worldObj, living); weapon.posX = end.x; 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 86c56db08..b9e99b7f6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -103,9 +103,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { - target.add(new Vector3(player.getLookVec()).multiply(distance)); - - target.y += 0.5; + target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) @@ -121,9 +119,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { - target.add(new Vector3(player.getLookVec()).multiply(distance)); - - target.y += 0.5; + target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; } @@ -151,11 +147,10 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { targetEntity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 2, 3, true, true)); } - Vector3 target3 = Vector3.fromEntityCenter(player); - target3.add(new Vector3(player.getLookVec()).multiply(length)); - target3.y += 0.5; + Vector3 target3 = Vector3.fromEntityCenter(player) + .add(new Vector3(player.getLookVec()).multiply(length)).add(0, 0.5, 0); if(item instanceof EntityItem) - target3.y += 0.25; + target3 = target3.add(0, 0.25, 0); for(int i = 0; i < 4; i++) { float r = 0.5F + (float) Math.random() * 0.5F; @@ -201,9 +196,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { - target.add(new Vector3(player.getLookVec()).multiply(distance)); - - target.y += 0.5; + target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) 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 b40c62d2d..e4e8e3bfc 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -41,7 +41,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); - Vector3 placeVec = playerVec.copy().add(lookVec); + Vector3 placeVec = playerVec.add(lookVec); int x = MathHelper.floor_double(placeVec.x); int y = MathHelper.floor_double(placeVec.y) + 1; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 929f9e6e0..c99bec37d 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -11,7 +11,6 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.MathHelper; @@ -148,13 +147,13 @@ public class PacketBotaniaEffect implements IMessage { Vector3 orig = new Vector3(e1.posX , e1.posY + 0.25, e1.posZ); Vector3 end = new Vector3(e2.posX, e2.posY + 0.25, e2.posZ); - Vector3 diff = end.copy().sub(orig); - Vector3 movement = diff.copy().normalize().multiply(0.1); + Vector3 diff = end.subtract(orig); + Vector3 movement = diff.normalize().multiply(0.1); int iters = (int) (diff.mag() / movement.mag()); float huePer = 1F / iters; float hueSum = (float) Math.random(); - Vector3 currentPos = orig.copy(); + Vector3 currentPos = orig; for(int i = 0; i < iters; i++) { float hue = i * huePer + hueSum; Color color = Color.getHSBColor(hue, 1F, 1F); @@ -165,7 +164,7 @@ public class PacketBotaniaEffect implements IMessage { Botania.proxy.setSparkleFXNoClip(true); Botania.proxy.sparkleFX(e1.worldObj, currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); Botania.proxy.setSparkleFXNoClip(false); - currentPos.add(movement); + currentPos = currentPos.add(movement); } break; @@ -177,15 +176,14 @@ public class PacketBotaniaEffect implements IMessage { if(e1 == null || e2 == null) return; - Vector3 thisVec = Vector3.fromEntityCenter(e1).add(0, 0, 0); - Vector3 receiverVec = Vector3.fromEntityCenter(e2).add(0, 0, 0); + Vector3 thisVec = Vector3.fromEntityCenter(e1); + Vector3 receiverVec = Vector3.fromEntityCenter(e2); double rc = 0.45; thisVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); receiverVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - Vector3 motion = receiverVec.copy().sub(thisVec); - motion.multiply(0.04F); + Vector3 motion = receiverVec.subtract(thisVec).multiply(0.04F); float r = 0.4F + 0.3F * (float) Math.random(); float g = 0.4F + 0.3F * (float) Math.random(); float b = 0.4F + 0.3F * (float) Math.random(); From 53147606c1b358009f0c32c814127fe6e8fa1530 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 16:48:58 -0500 Subject: [PATCH 724/935] GG automatically distributes drops to appropriate players. Also fix mobs getting too short of a fire resist --- .../common/entity/EntityDoppleganger.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4d168a8d6..e1e207a63 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -467,8 +467,18 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { continue; EntityPlayer saveLastAttacker = this.attackingPlayer; - attackingPlayer = player; + double savePosX = posX; + double savePosY = posY; + double savePosZ = posZ; + + attackingPlayer = player; // Fake attacking player as the killer + posX = player.posX; // Spoof pos so drops spawn at the player + posY = player.posY; + posZ = player.posZ; super.dropLoot(wasRecentlyHit, lootingModifier, DamageSource.causePlayerDamage(player)); + posX = savePosX; + posY = savePosY; + posZ = savePosZ; attackingPlayer = saveLastAttacker; } @@ -570,14 +580,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { int zp = posZInt + k; BlockPos posp = new BlockPos(xp, yp, zp); if(isCheatyBlock(worldObj, posp)) { - Block block = worldObj.getBlockState(posp).getBlock(); - List items = block.getDrops(worldObj, posp, worldObj.getBlockState(posp), 0); - for(ItemStack stack : items) { - if(ConfigHandler.blockBreakParticles) - 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); + worldObj.destroyBlock(posp, true); } } @@ -674,7 +677,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(entity != null) { if(!entity.isImmuneToFire()) - entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 30, 0)); + entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 600, 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); From d9522fcc18167a462d231bb95bb7e739fd24b803 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 17:25:51 -0500 Subject: [PATCH 725/935] Fix gaia removed potion effects not syncing, made magic landmines deal magic (armor bypassing) damage --- .../botania/common/entity/EntityDoppleganger.java | 13 ++++++++++--- .../botania/common/entity/EntityMagicLandmine.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index e1e207a63..d26511e47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -24,7 +24,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.monster.EntityZombie; @@ -41,6 +40,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.network.play.server.SPacketRemoveEntityEffect; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; @@ -74,7 +74,6 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; @@ -86,6 +85,7 @@ import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Iterator; import java.util.List; import java.util.UUID; import java.util.regex.Pattern; @@ -596,7 +596,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { anyWithArmor = true; Collection active = player.getActivePotionEffects(); - active.removeIf(effect -> effect.getDuration() < 200 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()); + Iterator iter = active.iterator(); + while(iter.hasNext()) { + PotionEffect effect = iter.next(); + if (effect.getDuration() < 160 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) { + iter.remove(); + ((EntityPlayerMP) player).connection.sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), effect.getPotion())); + } + } player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index a94dbb810..d69335170 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -62,7 +62,7 @@ public class EntityMagicLandmine extends Entity { if(!worldObj.isRemote) { 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.attackEntityFrom(summoner == null ? DamageSource.generic : DamageSource.causeIndirectMagicDamage(this, summoner), 10); player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 25, 0)); PotionEffect wither = new PotionEffect(MobEffects.WITHER, 70, 3); wither.getCurativeItems().clear(); From d34fc5a3e111c98ee1ca0c70c6d83238bee696fd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 18:03:21 -0500 Subject: [PATCH 726/935] GG now deals damage if a player is in its path of teleport --- .../botania/common/entity/EntityDoppleganger.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d26511e47..4615dfc2f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -50,6 +50,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; @@ -853,6 +855,18 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + + Vec3d origPos = new Vec3d(d3, d4 + height / 2, d5); + Vec3d newPos = new Vec3d(posX, posY + height / 2, posZ); + + if(origPos.squareDistanceTo(newPos) > 1) { + for(EntityPlayer player : getPlayersAround()) { + RayTraceResult rtr = player.getEntityBoundingBox().expandXyz(0.25).calculateIntercept(origPos, newPos); + if(rtr != null) + player.attackEntityFrom(DamageSource.causeMobDamage(this), 6); + } + } + return true; } } From e33873581479a2df10ca58d87b3644fa0f98cc6f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 18:36:15 -0500 Subject: [PATCH 727/935] Allow non-melle player damage to GG (arrows) damage cap still applies. Damage reduction in hard mode now done using armor --- .../common/entity/EntityDoppleganger.java | 19 ++++++++++--------- .../common/entity/EntityMagicLandmine.java | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4615dfc2f..452296787 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -45,6 +45,7 @@ import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -215,6 +216,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { e.setPlayerCount(playerCount); e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); + if (hard) + e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.ARMOR).setBaseValue(15); e.playSound(SoundEvents.ENTITY_ENDERDRAGON_GROWL, 10F, 0.1F); world.spawnEntityInWorld(e); @@ -361,23 +364,21 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public boolean attackEntityFrom(@Nonnull DamageSource par1DamageSource, float par2) { - Entity e = par1DamageSource.getEntity(); - if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) { + public boolean attackEntityFrom(@Nonnull DamageSource source, float par2) { + Entity e = source.getEntity(); + + if (e instanceof EntityPlayer && isTruePlayer(e) && getInvulTime() == 0) { EntityPlayer player = (EntityPlayer) e; if(!playersWhoAttacked.contains(player.getUniqueID())) playersWhoAttacked.add(player.getUniqueID()); - 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(); - } + boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); int cap = crit ? 60 : 40; - return super.attackEntityFrom(par1DamageSource, Math.min(cap, par2) * (isHardMode() ? 0.6F : 1F)); + return super.attackEntityFrom(source, Math.min(cap, par2)); } + return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index d69335170..ae5936229 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -62,7 +62,7 @@ public class EntityMagicLandmine extends Entity { if(!worldObj.isRemote) { 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.causeIndirectMagicDamage(this, summoner), 10); + player.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, summoner), 10); player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 25, 0)); PotionEffect wither = new PotionEffect(MobEffects.WITHER, 70, 3); wither.getCurativeItems().clear(); From 3c9388702c62304a625ccbbdc158ae97908c61a7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 18:42:27 -0500 Subject: [PATCH 728/935] Prevent GG from being shoved while it's still spawning --- .../vazkii/botania/common/entity/EntityDoppleganger.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 452296787..7c4a93087 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -776,6 +776,11 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { this.bossInfo.removePlayer(player); } + @Override + public boolean canBePushed() { + return super.canBePushed() && getInvulTime() == 0; + } + private void spawnMissile() { EntityMagicMissile missile = new EntityMagicMissile(this, true); missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); From 7d87732ccb6b91271cc24818d4987b33a8d9263f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 19:04:54 -0500 Subject: [PATCH 729/935] Actually prevent shoving. Why the heck does it require three overrides?? --- .../botania/common/entity/EntityDoppleganger.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 7c4a93087..dec5522ed 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -776,6 +776,18 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { this.bossInfo.removePlayer(player); } + @Override + protected void collideWithEntity(Entity entity) { + if(getInvulTime() == 0) + super.collideWithEntity(entity); + } + + @Override + protected void collideWithNearbyEntities() { + if(getInvulTime() == 0) + super.collideWithNearbyEntities(); + } + @Override public boolean canBePushed() { return super.canBePushed() && getInvulTime() == 0; From 7b6d2e843ec5f51484cffc639cc5fa187b6caf72 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 19:10:27 -0500 Subject: [PATCH 730/935] JK it's 2 overrides --- .../vazkii/botania/common/entity/EntityDoppleganger.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index dec5522ed..977bbb6b9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -776,12 +776,6 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { this.bossInfo.removePlayer(player); } - @Override - protected void collideWithEntity(Entity entity) { - if(getInvulTime() == 0) - super.collideWithEntity(entity); - } - @Override protected void collideWithNearbyEntities() { if(getInvulTime() == 0) From 9f94407be01b8bb877cbd93eae0a027cf24352cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 21:09:08 -0500 Subject: [PATCH 731/935] Fix armor format error --- src/main/resources/assets/botania/lang/en_US.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 53543ca1e..88b9595c5 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -254,15 +254,15 @@ botania.wings9=Wings: The One # ARMOR SETS botania.armorset.manasteel.name=Mana Affinity -botania.armorset.manasteel.desc=10% less Mana cost on Mana Tools and Rods +botania.armorset.manasteel.desc=10%% less Mana cost on Mana Tools and Rods botania.armorset.elementium.name=Great Fairy's Blessing botania.armorset.elementium.desc=Chance for pixies to apply potion effects botania.armorset.terrasteel.name=Will of the Ancients -botania.armorset.terrasteel.desc0=20% less Mana cost on Mana Tools and Rods +botania.armorset.terrasteel.desc0=20%% less Mana cost on Mana Tools and Rods botania.armorset.terrasteel.desc1=Regen even if hunger isn't topped off botania.armorset.terrasteel.desc2=Passive Mana generation on Mana Tablets botania.armorset.manaweave.name=Manatide Prowess -botania.armorset.manaweave.desc0=35% less Mana cost on Mana Tools and Rods +botania.armorset.manaweave.desc0=35%% less Mana cost on Mana Tools and Rods botania.armorset.manaweave.desc1=Increased proficiency with Magical Rods botania.armorset.will0.desc=Critical Hits apply a strong weakness effect (Will of Ahrim) From 37c2adece1f9fcb256b5444e9d1894565ec87a57 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 21:28:19 -0500 Subject: [PATCH 732/935] Fix spark particles not spreading out --- .../vazkii/botania/common/network/PacketBotaniaEffect.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index c99bec37d..56c2ab0ff 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -176,12 +176,9 @@ public class PacketBotaniaEffect implements IMessage { if(e1 == null || e2 == null) return; - Vector3 thisVec = Vector3.fromEntityCenter(e1); - Vector3 receiverVec = Vector3.fromEntityCenter(e2); - double rc = 0.45; - thisVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); - receiverVec.add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + Vector3 thisVec = Vector3.fromEntityCenter(e1).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); + Vector3 receiverVec = Vector3.fromEntityCenter(e2).add((Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc, (Math.random() - 0.5) * rc); Vector3 motion = receiverVec.subtract(thisVec).multiply(0.04F); float r = 0.4F + 0.3F * (float) Math.random(); From eaa9c896840e9b994cd7f5bd40ffd5b6c0b6e917 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 21:42:53 -0500 Subject: [PATCH 733/935] Optimize spectator net traffic more - don't use nbt list of nbt longs just use nbt int array --- .../common/core/helper/MathHelper.java | 17 +++++++++++++++++ .../item/equipment/bauble/ItemItemFinder.java | 19 ++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 66fe640e0..e2c92f72b 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -26,6 +26,23 @@ public final class MathHelper { return ret; } + public static int[] longArrayToIntArray(long[] longs) { + int[] ret = new int[longs.length * 2]; + for (int i = 0; i < longs.length; i++) { + ret[i] = (int) (longs[i] >>> 32); + ret[i + 1] = (int) longs[i]; + } + return ret; + } + + public static long[] intArrayToLongArray(int[] ints) { + long[] ret = new long[ints.length / 2]; + for (int i = 0; i < ints.length; i += 2) { + ret[i / 2] = ((long) ints[i]) << 32 | ints[i + 1]; + } + return ret; + } + public static double[] intArrayToDoubleArray(int[] ints) { double[] ret = new double[ints.length / 2]; for (int i = 0; i < ints.length; i += 2) { 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 6f0df1577..cd94c0bbd 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 @@ -29,6 +29,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; @@ -47,6 +48,7 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; import java.util.ArrayList; @@ -57,7 +59,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { private static final String TAG_POSITIONS_OLD = "highlightPositions"; private static final String TAG_ENTITY_POSITIONS = "highlightPositionsEnt"; - private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock"; + private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock1"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); @@ -209,19 +211,14 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } private long[] getBlockPositions(ItemStack stack) { - NBTTagList list = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); - long[] ret = new long[list.tagCount()]; - for (int i = 0; i < list.tagCount(); i++) { - ret[i] = ((NBTTagLong) list.get(i)).getLong(); - } - return ret; + int[] ints = ItemNBTHelper.getIntArray(stack, TAG_BLOCK_POSITIONS); + return MathHelper.intArrayToLongArray(ints); } private void setBlockPositions(ItemStack stack, long[] vals) { - NBTTagList list = new NBTTagList(); - for(long l : vals) - list.appendTag(new NBTTagLong(l)); - ItemNBTHelper.setList(stack, TAG_BLOCK_POSITIONS, list); + stack.getTagCompound().removeTag(TAG_BLOCK_POSITIONS); + int[] write = MathHelper.longArrayToIntArray(vals); + ItemNBTHelper.setIntArray(stack, TAG_BLOCK_POSITIONS, write); } @Override From 4ef18f3347dc8c0f60f7aad6ae64ec7a5d486f8e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 23:09:27 -0500 Subject: [PATCH 734/935] Fully serverside enchanter --- .../render/tile/RenderTileEnchanter.java | 12 +- .../common/block/mana/BlockEnchanter.java | 4 +- .../common/block/tile/TileEnchanter.java | 273 +++++++++--------- .../common/network/PacketBotaniaEffect.java | 25 +- 4 files changed, 173 insertions(+), 141 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index b97486dbd..351dde8b2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -31,17 +31,17 @@ import javax.annotation.Nonnull; public class RenderTileEnchanter extends TileEntitySpecialRenderer { - EntityItem item; + private EntityItem item; @Override public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) { float alphaMod = 0F; - if(enchanter.stage == 2) + if(enchanter.stage == TileEnchanter.State.GATHER_MANA) alphaMod = Math.min(20, enchanter.stageTicks) / 20F; - else if(enchanter.stage == 4) + else if(enchanter.stage == TileEnchanter.State.RESET) alphaMod = (20 - enchanter.stageTicks) / 20F; - else if(enchanter.stage > 2) + else if(enchanter.stage == TileEnchanter.State.DO_ENCHANT) alphaMod = 1F; if(enchanter.itemToEnchant != null) { @@ -85,7 +85,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer. It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Mar 15, 2014, 4:57:52 PM (GMT)] */ package vazkii.botania.common.block.tile; import com.google.common.base.Predicates; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -45,9 +46,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import java.util.ArrayList; +import java.util.Arrays; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -63,16 +67,16 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_ITEM = "item"; private static final String TAG_ENCHANTS = "enchantsToApply"; - public int stage = 0; + public State stage = State.IDLE; public int stageTicks = 0; public int stage3EndTicks = 0; - int manaRequired = -1; - int mana = 0; + private int manaRequired = -1; + private int mana = 0; public ItemStack itemToEnchant = null; - final List enchants = new ArrayList<>(); + private final List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { new BlockPos(0, -1, 0), @@ -112,7 +116,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void onWanded(EntityPlayer player, ItemStack wand) { - if(stage != 0 || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) + if(stage != State.IDLE || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) return; List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); @@ -143,129 +147,131 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); - if(tile != null && tile instanceof TilePylon) - ((TilePylon) tile).activated = false; + if(tile != null && tile instanceof TilePylon) { + ((TilePylon) tile).activated = stage == State.GATHER_MANA; + if(stage == State.GATHER_MANA) + ((TilePylon) tile).centerPos = pos; + } } - if(!canEnchanterExist(worldObj, pos, axis)) { + if(stage != State.IDLE) + stageTicks++; + if(worldObj.isRemote) + return; + + if(!canEnchanterExist(worldObj, pos, axis)) { 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(); - float blue = (float) Math.random(); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); - } + PacketHandler.sendToNearby(worldObj, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, + pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5)); worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { - case 1 : { // Get books - if(stageTicks % 20 == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); - int count = items.size(); - boolean addedEnch = false; + case GATHER_ENCHANTS : { // Get books + if(stageTicks % 20 == 0) { + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); + int count = items.size(); + boolean addedEnch = false; - 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(enchants != null && enchants.tagCount() > 0) { - NBTTagCompound enchant = enchants.getCompoundTagAt(0); - short enchantId = enchant.getShort("id"); - short enchantLvl = enchant.getShort("lvl"); - Enchantment ench = Enchantment.getEnchantmentByID(enchantId); - if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { - this.enchants.add(new EnchantmentData(ench, enchantLvl)); - worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); - addedEnch = true; - break; - } - } - } - } - } + 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(enchants != null && enchants.tagCount() > 0) { + NBTTagCompound enchant = enchants.getCompoundTagAt(0); + short enchantId = enchant.getShort("id"); + short enchantLvl = enchant.getShort("lvl"); + Enchantment ench = Enchantment.getEnchantmentByID(enchantId); + if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { + this.enchants.add(new EnchantmentData(ench, enchantLvl)); + worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); + addedEnch = true; + break; + } + } + } + } + } - if(!addedEnch) { - if(enchants.isEmpty()) - stage = 0; - else advanceStage(); - } + if(!addedEnch) { + if(enchants.isEmpty()) + stage = State.IDLE; + else advanceStage(); + } + } + break; + } + case GATHER_MANA : { // Get Mana + if(manaRequired == -1) { + manaRequired = 0; + for(EnchantmentData data : enchants) { + 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; + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) + ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; + + advanceStage(); + } else { + ISparkEntity spark = getAttachedSpark(); + if(spark != null) { + List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + for(ISparkEntity otherSpark : sparkEntities) { + if(spark == otherSpark) + continue; + + if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) + otherSpark.registerTransfer(spark); + } + } + if(stageTicks % 5 == 0) + sync(); + } + + break; + } + case DO_ENCHANT : { // Enchant + if(stageTicks >= 100) { + for(EnchantmentData data : enchants) + if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) + itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); + + enchants.clear(); + manaRequired = -1; + mana = 0; + + craftingFanciness(); + advanceStage(); + } + break; + } + case RESET: { // Reset + if(stageTicks >= 20) + advanceStage(); + + break; } - break; } - case 2 : { // Get Mana - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { - TilePylon pylonTile = (TilePylon) worldObj.getTileEntity(pos.add(pylon)); - if(pylonTile != null) { - pylonTile.activated = true; - pylonTile .centerPos = pos; - } - } - - if(manaRequired == -1) { - manaRequired = 0; - for(EnchantmentData data : enchants) { - 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; - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; - - advanceStage(); - } else { - ISparkEntity spark = getAttachedSpark(); - if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - for(ISparkEntity otherSpark : sparkEntities) { - if(spark == otherSpark) - continue; - - if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) - otherSpark.registerTransfer(spark); - } - } - } - - break; - } - case 3 : { // Enchant - if(stageTicks >= 100) { - for(EnchantmentData data : enchants) - if(EnchantmentHelper.getEnchantmentLevel(data.enchantmentobj, itemToEnchant) == 0) - itemToEnchant.addEnchantment(data.enchantmentobj, data.enchantmentLevel); - - enchants.clear(); - manaRequired = -1; - mana = 0; - - craftingFanciness(); - advanceStage(); - } - break; - } - case 4 : { // Reset - if(stageTicks >= 20) - advanceStage(); - - break; - } - } - - if(stage != 0) - stageTicks++; } - public void advanceStage() { - stage++; - - if(stage == 4) - stage3EndTicks = stageTicks; - else if(stage == 5) { - stage = 0; - stage3EndTicks = 0; + private void advanceStage() { + switch(stage) { + case IDLE: stage = State.GATHER_ENCHANTS; break; + case GATHER_ENCHANTS: stage = State.GATHER_MANA; break; + case GATHER_MANA: stage = State.DO_ENCHANT; break; + case DO_ENCHANT: { + stage = State.RESET; + stage3EndTicks = stageTicks; + break; + } + case RESET: { + stage = State.IDLE; + stage3EndTicks = 0; + break; + } } stageTicks = 0; @@ -274,12 +280,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private void craftingFanciness() { worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - 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); - } + PacketHandler.sendToNearby(worldObj, pos, + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_CRAFT, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5)); } @Nonnull @@ -316,7 +318,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setInteger(TAG_MANA_REQUIRED, manaRequired); - cmp.setInteger(TAG_STAGE, stage); + cmp.setInteger(TAG_STAGE, stage.ordinal()); cmp.setInteger(TAG_STAGE_TICKS, stageTicks); cmp.setInteger(TAG_STAGE_3_END_TICKS, stage3EndTicks); @@ -326,16 +328,16 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setTag(TAG_ITEM, itemCmp); String enchStr = enchants.stream() - .map(e -> Enchantment.REGISTRY.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)); + cmp.setString(TAG_ENCHANTS, enchStr); } @Override public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); manaRequired = cmp.getInteger(TAG_MANA_REQUIRED); - stage = cmp.getInteger(TAG_STAGE); + stage = State.values()[cmp.getInteger(TAG_STAGE)]; stageTicks = cmp.getInteger(TAG_STAGE_TICKS); stage3EndTicks = cmp.getInteger(TAG_STAGE_3_END_TICKS); @@ -346,11 +348,10 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { String enchStr = cmp.getString(TAG_ENCHANTS); if(!enchStr.isEmpty()) { String[] enchTokens = enchStr.split(","); + Botania.LOGGER.info(Arrays.toString(enchTokens)); for(String token : enchTokens) { - String[] entryTokens = token.split(":"); + String[] entryTokens = token.split("="); Enchantment ench = Enchantment.getEnchantmentByLocation(entryTokens[0]); - if(ench == null) - ench = Enchantment.getEnchantmentByID(Integer.parseInt(entryTokens[0])); int lvl = Integer.parseInt(entryTokens[1]); enchants.add(new EnchantmentData(ench, lvl)); } @@ -365,7 +366,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return false; } - public boolean isEnchantmentValid(Enchantment ench) { + private boolean isEnchantmentValid(Enchantment ench) { if(!ench.canApply(itemToEnchant) || !ench.type.canEnchantItem(itemToEnchant.getItem())) return false; @@ -417,7 +418,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { @Override public boolean areIncomingTranfersDone() { - return stage == 3; + return stage == State.DO_ENCHANT; } @Override @@ -425,7 +426,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return Math.max(0, manaRequired - getCurrentMana()); } - public void renderHUD(Minecraft mc, ScaledResolution res) { + public void renderHUD(ScaledResolution res) { if(manaRequired > 0 && itemToEnchant != null) { int x = res.getScaledWidth() / 2 + 20; int y = res.getScaledHeight() / 2 - 8; @@ -434,4 +435,12 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } } + public enum State { + IDLE, + GATHER_ENCHANTS, + GATHER_MANA, + DO_ENCHANT, + RESET + } + } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 56c2ab0ff..0f3e81959 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -190,6 +190,27 @@ public class PacketBotaniaEffect implements IMessage { size, (float) motion.x, (float) motion.y, (float) motion.z); break; } + case ENCHANTER_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, + message.x + Math.random() * 0.4 - 0.2, message.y, message.z + Math.random() * 0.4 - 0.2, + red, green, blue, (float) Math.random(), 10); + } + break; + } + case ENCHANTER_DESTROY: { + for(int i = 0; i < 50; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.wispFX(Minecraft.getMinecraft().theWorld, message.x, message.y, message.z, + red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); + } + break; + } } } }); @@ -205,7 +226,9 @@ public class PacketBotaniaEffect implements IMessage { ARENA_INDICATOR(0), ITEM_SMOKE(2), // Arg: Entity ID, number of particles SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards - SPARK_MANA_FLOW(2); // Arg: Entity ID from, Entity ID towards + SPARK_MANA_FLOW(2), // Arg: Entity ID from, Entity ID towards + ENCHANTER_CRAFT(0), + ENCHANTER_DESTROY(0); private final int argCount; From 4fede6f49e57361fcef0f45b1bc340cbe54955ff Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 23:12:37 -0500 Subject: [PATCH 735/935] Cleanup --- .../common/network/PacketBotaniaEffect.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 0f3e81959..37d0c7fb8 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -7,6 +7,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -74,13 +75,15 @@ public class PacketBotaniaEffect implements IMessage { // Use anon - lambda causes classloading issues @Override public void run() { + Minecraft mc = Minecraft.getMinecraft(); + World world = mc.theWorld; switch (message.type) { case POOL_CRAFT: { for(int i = 0; i < 25; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, + Botania.proxy.sparkleFX(world, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } break; @@ -91,8 +94,8 @@ public class PacketBotaniaEffect implements IMessage { BlockPos pos = new BlockPos(message.x, message.y, message.z); Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - Botania.proxy.lightningFX(Minecraft.getMinecraft().theWorld, outputting ? tileVec : itemVec, - outputting ? itemVec : tileVec, 80, Minecraft.getMinecraft().theWorld.rand.nextLong(), 0x4400799c, 0x4400C6FF); + Botania.proxy.lightningFX(world, outputting ? tileVec : itemVec, + outputting ? itemVec : tileVec, 80, world.rand.nextLong(), 0x4400799c, 0x4400C6FF); } break; } @@ -103,8 +106,8 @@ public class PacketBotaniaEffect implements IMessage { int g = (hex & 0xFF00) >> 8; int b = (hex & 0xFF); for(int i = 0; i < 10; i++) { - BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[Minecraft.getMinecraft().theWorld.rand.nextInt(6)]); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, + BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[world.rand.nextInt(6)]); + Botania.proxy.sparkleFX(world, pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); } @@ -120,12 +123,12 @@ public class PacketBotaniaEffect implements IMessage { double y = message.y + 0.5; double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, x, y, z, r, g, b, 5F, 120); + Botania.proxy.sparkleFX(world, x, y, z, r, g, b, 5F, 120); } break; } case ITEM_SMOKE: { - Entity item = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); + Entity item = world.getEntityByID(message.args[0]); int p = message.args[1]; for(int i = 0; i < p; i++) { @@ -134,13 +137,15 @@ public class PacketBotaniaEffect implements IMessage { double d1 = item.worldObj.rand.nextGaussian() * m; double d2 = item.worldObj.rand.nextGaussian() * m; double d3 = 10.0D; - item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); + item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, + message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, + message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); } break; } case SPARK_NET_INDICATOR: { - Entity e1 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); - Entity e2 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[1]); + Entity e1 = world.getEntityByID(message.args[0]); + Entity e2 = world.getEntityByID(message.args[1]); if(e1 == null || e2 == null) return; @@ -170,8 +175,8 @@ public class PacketBotaniaEffect implements IMessage { break; } case SPARK_MANA_FLOW: { - Entity e1 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[0]); - Entity e2 = Minecraft.getMinecraft().theWorld.getEntityByID(message.args[1]); + Entity e1 = world.getEntityByID(message.args[0]); + Entity e2 = world.getEntityByID(message.args[1]); if(e1 == null || e2 == null) return; @@ -186,7 +191,7 @@ public class PacketBotaniaEffect implements IMessage { float b = 0.4F + 0.3F * (float) Math.random(); float size = 0.125F + 0.125F * (float) Math.random(); - Botania.proxy.wispFX(Minecraft.getMinecraft().theWorld, thisVec.x, thisVec.y, thisVec.z, r, g, b, + Botania.proxy.wispFX(world, thisVec.x, thisVec.y, thisVec.z, r, g, b, size, (float) motion.x, (float) motion.y, (float) motion.z); break; } @@ -195,7 +200,7 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(Minecraft.getMinecraft().theWorld, + Botania.proxy.sparkleFX(world, message.x + Math.random() * 0.4 - 0.2, message.y, message.z + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } @@ -206,7 +211,7 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(Minecraft.getMinecraft().theWorld, message.x, message.y, message.z, + Botania.proxy.wispFX(world, message.x, message.y, message.z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } break; From 71edb3abb12e75c1c35bc397d0355dceaf495f5f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jun 2016 09:47:58 -0500 Subject: [PATCH 736/935] Fix transforms on runic altar. Closes #351 --- .../client/render/tile/RenderTileRuneAltar.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 bf89a9883..de0936cbd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -47,21 +47,18 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer Date: Sun, 19 Jun 2016 10:05:10 -0500 Subject: [PATCH 737/935] Minor opt to red string interceptor --- .../tile/string/TileRedStringComparator.java | 3 +-- .../tile/string/TileRedStringInterceptor.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index d9de807b4..cb606bd48 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -16,13 +16,12 @@ import net.minecraft.util.math.BlockPos; public class TileRedStringComparator extends TileRedString { - int comparatorValue = 0; + private int comparatorValue = 0; @Override public void update() { super.update(); BlockPos binding = getBinding(); - EnumFacing dir = getOrientation(); IBlockState state = getStateAtBinding(); int origVal = comparatorValue; 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 188b2d17c..b8dd24d5f 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 @@ -26,12 +26,13 @@ import java.util.Set; public class TileRedStringInterceptor extends TileRedString { - private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; + private static final Set interceptors = new HashSet<>(); @Override public void update() { super.update(); - interceptors.get().add(this); + if(!worldObj.isRemote) + interceptors.add(this); } @Override @@ -44,11 +45,14 @@ public class TileRedStringInterceptor extends TileRedString { } public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { + if(world.isRemote) + return; + List remove = new ArrayList<>(); boolean did = false; - for(TileRedStringInterceptor inter : interceptors.get()) { + for(TileRedStringInterceptor inter : interceptors) { if(!inter.saneState()) { remove.add(inter); continue; @@ -57,22 +61,18 @@ public class TileRedStringInterceptor extends TileRedString { if(inter.worldObj == world) { BlockPos coords = inter.getBinding(); if(coords != null && coords.equals(pos)) { - if(!world.isRemote) { - Block block = inter.getBlockType(); - world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); - } - + Block block = inter.getBlockType(); + world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); did = true; } } } - interceptors.get().removeAll(remove); + interceptors.removeAll(remove); if(did) { - if(world.isRemote) - player.swingArm(hand); - else world.playSound(null, pos, SoundEvents.BLOCK_DISPENSER_DISPENSE, SoundCategory.BLOCKS, 0.3F, 0.6F); + player.swingArm(hand); + world.playSound(null, pos, SoundEvents.BLOCK_DISPENSER_DISPENSE, SoundCategory.BLOCKS, 0.3F, 0.6F); } } From d7929eed08c6d7ec28099f33e951d04d75946fb9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jun 2016 10:21:37 -0500 Subject: [PATCH 738/935] Fix terra pick darkening screen --- .../client/core/handler/TooltipAdditionDisplayHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 80e0186f0..7c1dcdcc9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -49,7 +49,7 @@ public final class TooltipAdditionDisplayHandler { GuiScreen gui = mc.currentScreen; if(gui != null && gui instanceof GuiContainer && mc.thePlayer != null && mc.thePlayer.inventory.getItemStack() == null) { GuiContainer container = (GuiContainer) gui; - Slot slot = ReflectionHelper.getPrivateValue(GuiContainer.class, container, LibObfuscation.THE_SLOT); + Slot slot = container.getSlotUnderMouse(); if(slot != null && slot.getHasStack()) { ItemStack stack = slot.getStack(); if(stack != null) { @@ -194,7 +194,7 @@ public final class TooltipAdditionDisplayHandler { rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } - + GlStateManager.enableLighting(); GlStateManager.enableDepth(); GL11.glPopAttrib(); } From 6a4f8e9f4b9e1c5ca02843e12a514e175a07d5ce Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jun 2016 10:37:32 -0500 Subject: [PATCH 739/935] Switch some things to tessellator --- .../handler/TooltipAdditionDisplayHandler.java | 18 +++++++++++------- .../client/core/helper/RenderHelper.java | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) 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 7c1dcdcc9..344e44df7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -17,6 +17,9 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; @@ -122,19 +125,20 @@ public final class TooltipAdditionDisplayHandler { GlStateManager.shadeModel(GL11.GL_SMOOTH); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glBegin(GL11.GL_TRIANGLE_FAN); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - GlStateManager.color(0F, 0.5F, 0F, a); - GL11.glVertex2i(cx, cy); - GlStateManager.color(0F, 1F, 0F, 1F); + buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); for(float i = angles; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; - GL11.glVertex2d(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r); + buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); } - GL11.glVertex2i(cx, cy); - GL11.glEnd(); + + buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); + Tessellator.getInstance().draw(); GlStateManager.disableBlend(); GlStateManager.enableTexture2D(); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 926cdef19..3db962e08 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; @@ -220,16 +221,19 @@ public final class RenderHelper { GlStateManager.depthMask(true); GL11.glStencilMask(0x00); GL11.glStencilFunc(GL11.GL_EQUAL, 1, 0xFF); - GL11.glBegin(GL11.GL_TRIANGLE_FAN); - GlStateManager.color(0F, 0.5F, 0.5F, a); - GL11.glVertex2i(centerX, centerY); - GlStateManager.color(0F, 1F, 0.5F, a); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + buf.pos(centerX, centerY, 0).color(0, 0.5F, 0.5F, a).endVertex(); + for(int i = degs; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; - GL11.glVertex2d(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r); + buf.pos(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r, 0).color(0F, 1F, 0.5F, a).endVertex(); } - GL11.glVertex2i(centerX, centerY); - GL11.glEnd(); + + buf.pos(centerX, centerY, 0).color(0F, 1F, 0.5F, a).endVertex(); + Tessellator.getInstance().draw(); + GlStateManager.disableBlend(); GlStateManager.enableTexture2D(); GlStateManager.shadeModel(GL11.GL_FLAT); From e37b3ac3e6e8230617a76f7863804913f28204ed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 20 Jun 2016 19:34:08 -0500 Subject: [PATCH 740/935] Soulscribe only effective when fully charged --- .../item/equipment/tool/ItemEnderDagger.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 9cdb32cea..f947bbf1a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -53,17 +53,20 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, @Nonnull EntityLivingBase par3EntityLivingBase) { - if(par2EntityLivingBase instanceof EntityEnderman && par3EntityLivingBase instanceof EntityPlayer) - par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), 20); - par1ItemStack.damageItem(1, par3EntityLivingBase); + public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { + if(!target.worldObj.isRemote + && target instanceof EntityEnderman + && attacker instanceof EntityPlayer + && ((EntityPlayer) attacker).getCooledAttackStrength(0) == 1) { + target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 20); + } + + stack.damageItem(1, attacker); return true; } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - // NO-OP - } + public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {} @Override public boolean usesMana(ItemStack stack) { From d4b0d0aec9eb022ee480e0fa978f56c98d58fd0c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 20 Jun 2016 19:54:33 -0500 Subject: [PATCH 741/935] Cleanup --- .../api/internal/DummyManaNetwork.java | 4 +- .../api/internal/DummyMethodHandler.java | 24 +-- .../botania/api/internal/DummyPage.java | 4 +- .../botania/api/lexicon/LexiconPage.java | 24 +-- .../botania/api/subtile/SubTileEntity.java | 16 +- .../subtile/signature/SubTileSignature.java | 4 +- .../botania/client/core/proxy/GuiFactory.java | 4 +- .../client/gui/lexicon/GuiLexicon.java | 4 +- .../client/gui/lexicon/GuiLexiconHistory.java | 4 +- .../botania/client/model/ModelPylonOld.java | 4 +- .../client/render/entity/RenderSparkBase.java | 8 +- .../block/BlockFloatingSpecialFlower.java | 8 +- .../botania/common/block/BlockSolidVines.java | 4 +- .../block/decor/BlockFloatingFlower.java | 2 + .../common/block/decor/BlockModMushroom.java | 12 +- .../common/block/decor/BlockShinyFlower.java | 4 +- .../common/block/tile/TileEnchanter.java | 4 +- .../common/block/tile/TileTerraPlate.java | 4 +- .../corporea/TileCorporeaInterceptor.java | 4 +- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../block/tile/string/TileRedString.java | 4 +- .../common/core/proxy/CommonProxy.java | 60 ++---- .../common/entity/EntityFlameRing.java | 11 +- .../common/entity/EntityFlyingCreature.java | 8 +- .../common/entity/EntityManaStorm.java | 6 +- .../common/entity/EntityPinkWither.java | 9 +- .../botania/common/item/ItemLaputaShard.java | 4 +- .../botania/common/item/ItemManaMirror.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 8 +- .../item/equipment/bauble/ItemTravelBelt.java | 8 +- .../tool/terrasteel/ItemTerraSword.java | 4 +- .../vazkii/botania/common/item/lens/Lens.java | 16 +- .../common/item/relic/ItemExcaliber.java | 189 ------------------ .../common/item/relic/ItemRelicBauble.java | 4 +- .../common/lexicon/page/PageRecipe.java | 4 +- 36 files changed, 83 insertions(+), 406 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 899801be5..f28a7c9b2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -23,9 +23,7 @@ public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); @Override - public void clear() { - // NO-OP - } + public void clear() {} @Override public TileEntity getClosestPool(BlockPos pos, World world, int limit) { diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 48ab9be15..b1f724be2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -150,14 +150,10 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { - // NO-OP - } + public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) {} @Override - public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { - // NO-OP - } + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) {} @Override public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { @@ -165,14 +161,10 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { - // NO-OP - } + public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) {} @Override - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - // NO-OP - } + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {} @Override public IInventory getBaublesInventory(EntityPlayer player) { @@ -205,9 +197,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { - // NO-OP - } + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) {} @Override public boolean hasSolegnoliaAround(Entity e) { @@ -225,9 +215,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void sendBaubleUpdatePacket(EntityPlayer player, int slot) { - // NO-OP - } + public void sendBaubleUpdatePacket(EntityPlayer player, int slot) {} @Override public List wrapInventory(List inventories) { diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 6b8d7be91..3c5db7166 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -27,8 +27,6 @@ public class DummyPage extends LexiconPage { @Override @SideOnly(Side.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int x, int y) { - // NO-OP - } + public void renderScreen(IGuiLexiconEntry gui, int x, int y) {} } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index a19fd9dc7..9fa6fbe49 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -40,9 +40,7 @@ public abstract class LexiconPage { * Called per update tick. Non gui-sensitive version, kept for backwards compatibility only. */ @SideOnly(Side.CLIENT) - public void updateScreen() { - // NO-OP - } + public void updateScreen() {} /** * Called per update tick. Feel free to override fully, the @@ -58,41 +56,31 @@ public abstract class LexiconPage { * You can add buttons and whatever you'd do on initGui() here. */ @SideOnly(Side.CLIENT) - public void onOpened(IGuiLexiconEntry gui) { - // NO-OP - } + public void onOpened(IGuiLexiconEntry gui) {} /** * Called when this page is opened, be it via closing the gui or when the player changes page. * Make sure to dispose of anything you don't use any more, such as buttons in the gui's buttonList. */ @SideOnly(Side.CLIENT) - public void onClosed(IGuiLexiconEntry gui) { - // NO-OP - } + public void onClosed(IGuiLexiconEntry gui) {} /** * Called when a button is pressed, equivalent to GuiScreen.actionPerformed. */ @SideOnly(Side.CLIENT) - public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) { - // NO-OP - } + public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) {} /** * Called when a key is pressed. */ @SideOnly(Side.CLIENT) - public void onKeyPressed(char c, int key) { - // NO-OP - } + public void onKeyPressed(char c, int key) {} /** * Called when {@link LexiconEntry#setLexiconPages(LexiconPage...)} is called. */ - public void onPageAdded(LexiconEntry entry, int index) { - // NO-OP - } + public void onPageAdded(LexiconEntry entry, int index) {} /** * Shows the list of recipes present in this page for display in the category diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 05e310e80..b785a0250 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -120,9 +120,7 @@ public class SubTileEntity { /** * Called when this sub tile is placed in the world (by an entity). */ - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - // NO-OP - } + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {} /** * Called when a player right clicks this sub tile. @@ -132,16 +130,12 @@ public class SubTileEntity { /** * Called when this sub tile is added to the world. */ - public void onBlockAdded(World world, BlockPos pos, IBlockState state) { - //NO-OP - } + public void onBlockAdded(World world, BlockPos pos, IBlockState state) {} /** * Called when this sub tile is harvested */ - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - //NO-OP - } + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {} /** * Allows additional processing of sub tile drops @@ -201,9 +195,7 @@ public class SubTileEntity { * Used to render a HUD portraying some data from this sub tile. */ @SideOnly(Side.CLIENT) - public void renderHUD(Minecraft mc, ScaledResolution res) { - // NO-OP - } + public void renderHUD(Minecraft mc, ScaledResolution res) {} /** * Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower) diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 9db646582..31b8c75b6 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -37,8 +37,6 @@ public abstract class SubTileSignature { /** * Adds additional text to the tooltip. This text is added after getUnlocalizedLoreTextForStack. */ - public void addTooltip(ItemStack stack, EntityPlayer player, List tooltip) { - // NO-OP - } + public void addTooltip(ItemStack stack, EntityPlayer player, List tooltip) {} } diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 66ea8640d..09ee76c03 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -20,9 +20,7 @@ import java.util.Set; public class GuiFactory implements IModGuiFactory { @Override - public void initialize(Minecraft minecraftInstance) { - // NO-OP - } + public void initialize(Minecraft minecraftInstance) {} @Override public Class mainConfigGuiClass() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 5e0d32170..e14132b96 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -638,9 +638,7 @@ public class GuiLexicon extends GuiScreen { return "index"; } - public void load(NBTTagCompound cmp) { - // NO-OP - } + public void load(NBTTagCompound cmp) {} public GuiLexicon copy() { return new GuiLexicon(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 8b1b1d05d..31e1e84e7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -50,9 +50,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { } @Override - public void load(NBTTagCompound cmp) { - // NO-OP - } + public void load(NBTTagCompound cmp) {} @Override public String getNotesKey() { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index 3c55c446e..ad615f98d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -152,8 +152,6 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderGems(PylonVariant variant) { - // NO-OP - } + public void renderGems(PylonVariant variant) {} } \ No newline at end of file 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 de1fbafa5..78dd27620 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -84,17 +84,13 @@ public abstract class RenderSparkBase extends Render { return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } - protected void colorSpinningIcon(T entity, float a) { - // NO-OP - } + protected void colorSpinningIcon(T entity, float a) {} protected TextureAtlasSprite getSpinningIcon(T entity) { return null; } - protected void renderCallback(T entity, float pticks) { - // NO-OP - } + protected void renderCallback(T entity, float pticks) {} @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 5d7f16475..cbf48db81 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -32,6 +32,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -119,11 +121,11 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return true; } + @SideOnly(Side.CLIENT) @Override - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - // NO-OP - } + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {} + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 96801691f..51912a242 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -48,9 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) { - // NO-OP - } + public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) {} @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { 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 a1d9de8dc..d11ebabfd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -168,6 +168,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; @@ -179,6 +180,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) 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 71616ce37..70cc14779 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -30,6 +30,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; @@ -91,9 +93,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) { - // NO-OP, to prevent spreading - } + public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) {} // Prevent spreading @Override public boolean canPlaceBlockAt(World world, BlockPos pos) { @@ -106,6 +106,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return false; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) @@ -117,6 +118,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; @@ -149,8 +151,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { - // NO-OP - } + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 07174cff1..66829a04a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -61,8 +61,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { - // NO-OP - } + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} } 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 23b1b849b..e2c075407 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -401,9 +401,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { 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 4d1eae1f8..5f5c18969 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -223,9 +223,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 82e544f19..743826e9b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -37,9 +37,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } @Override - public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { - // NO-OP - } + public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) {} @Override public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { 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 67566cd31..b6a7d04f5 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 @@ -423,9 +423,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { 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 ba7d8bf6c..2e0fbd19a 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 @@ -711,9 +711,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void markDispatchable() { - // NO-OP - } + public void markDispatchable() {} @Override public float getRotationX() { 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 84a46f19e..7b3f869ce 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 @@ -59,9 +59,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { public abstract boolean acceptBlock(BlockPos pos); - public void onBound(BlockPos pos) { - // NO-OP - } + public void onBound(BlockPos pos) {} @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index a1932383b..3f8324694 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -221,17 +221,11 @@ public class CommonProxy { event.registerServerCommand(new CommandSkyblockSpread()); } - public void setEntryToOpen(LexiconEntry entry) { - // NO-OP - } + public void setEntryToOpen(LexiconEntry entry) {} - public void setToTutorialIfFirstLaunch() { - // NO-OP - } + public void setToTutorialIfFirstLaunch() {} - public void setLexiconStack(ItemStack stack) { - // NO-OP - } + public void setLexiconStack(ItemStack stack) {} public boolean isTheClientPlayer(EntityLivingBase entity) { return false; @@ -258,45 +252,29 @@ public class CommonProxy { return false; } - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { - // NO-OP - } + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} - public void setMultiblock(World world, int x, int y, int z, double radius, Block block) { - // NO-OP - } + public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} - public void removeSextantMultiblock() { - // NO-OP - } + public void removeSextantMultiblock() {} public long getWorldElapsedTicks() { return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); } - public void setSparkleFXNoClip(boolean noclip) { - // NO-OP - } + public void setSparkleFXNoClip(boolean noclip) {} - public void setSparkleFXCorrupt(boolean corrupt) { - // NO-OP - } + public void setSparkleFXCorrupt(boolean corrupt) {} public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { sparkleFX(world, x, y, z, r, g, b, size, m, false); } - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) { - // NO-OP - } + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} - public void setWispFXDistanceLimit(boolean limit) { - // NO-OP - } + public void setWispFXDistanceLimit(boolean limit) {} - public void setWispFXDepthTest(boolean depth) { - // NO-OP - } + public void setWispFXDepthTest(boolean depth) {} public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { wispFX(world, x, y, z, r, g, b, size, 0F); @@ -314,25 +292,17 @@ public class CommonProxy { wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); } - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) { - // NO-OP - } + public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); } - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - // NO-OP - } + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} - public void addBoss(IBotaniaBoss boss) { - // NO-OP - } + public void addBoss(IBotaniaBoss boss) {} - public void removeBoss(IBotaniaBoss boss) { - // NO-OP - } + public void removeBoss(IBotaniaBoss boss) {} public int getClientRenderDistance() { return 0; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 8806bbdbc..bea9c8c12 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -65,7 +65,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(posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); if(worldObj.isRemote) return; @@ -98,13 +98,8 @@ public class EntityFlameRing extends Entity { @Override - protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { - // NO-OP - } - + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) {} @Override - protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { - // NO-OP - } + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) {} } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index 2699c292a..7da3b679d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -26,14 +26,10 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - public void fall(float dist, float damageMult) { - // NO-OP - } + public void fall(float dist, float damageMult) {} @Override - protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) { - // NO-OP - } + protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) {} @Override public void moveEntityWithHeading(float par1, float par2) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 5b9b0abe4..4049ae21e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -38,9 +38,7 @@ public class EntityManaStorm extends Entity { } @Override - protected void entityInit() { - // NO-OP - } + protected void entityInit() {} @Override public void onUpdate() { @@ -63,7 +61,7 @@ public class EntityManaStorm extends Entity { } } - public void spawnBurst() { + private void spawnBurst() { EntityManaBurst burst = new EntityManaBurst(worldObj); burst.setPosition(posX, posY, posZ); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 54cbe1b57..fd10c6256 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -66,15 +66,10 @@ public class EntityPinkWither extends EntityWither { } @Override - protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) { - // NO-OP - } + protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) {} @Override - public void addTrackingPlayer(@Nonnull EntityPlayerMP player) - { - // NO-OP - } + public void addTrackingPlayer(@Nonnull EntityPlayerMP player) {} // COPYPASTA diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 56479bc42..ab03c2bd8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -200,9 +200,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} @Override public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index d81c544fc..c5c847677 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -212,9 +212,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public void recieveMana(int mana) { - // NO-OP - } + public void recieveMana(int mana) {} @Override public boolean canRecieveManaFromBursts() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index f4ab4bd26..f8be37bb8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -148,14 +148,10 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { - // NO-OP - } + public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) {} @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) { - // NO-OP - } + public void onUnequipped(ItemStack stack, EntityLivingBase player) {} @Override public ItemStack getCosmeticItem(ItemStack stack) { 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 a871f2229..34d9c668b 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 @@ -108,13 +108,9 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs return speed; } - public void onMovedTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onMovedTick(ItemStack stack, EntityPlayer player) {} - public void onNotMovingTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onNotMovingTick(ItemStack stack, EntityPlayer player) {} @SubscribeEvent public void onPlayerJump(LivingJumpEvent event) { 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 fa1e5ec27..f19ee6299 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 @@ -106,9 +106,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} @Override public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 2f66541c9..544ea8450 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -19,29 +19,21 @@ import vazkii.botania.api.mana.IManaSpreader; public class Lens { - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return dead; } - public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { - // NO-OP - } + public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) {} public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) { return true; } - public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) { - // NO-OP - } + public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {} - public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) { - // NO-OP - } + public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {} } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java deleted file mode 100644 index 3a235b3c0..000000000 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ /dev/null @@ -1,189 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 29, 2015, 10:12:50 PM (GMT)] - */ -package vazkii.botania.common.item.relic; - -/* -public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { - - private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; - private static final String TAG_HOME_ID = "homeID"; - - public static ToolMaterial toolMaterial = EnumHelper.addToolMaterial("B_EXCALIBER", 3, -1, 6.2F, 6F, 40); - - Achievement achievement; - - public ItemExcaliber() { - super(toolMaterial, LibItemNames.EXCALIBER); - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - ItemRelic.updateRelic(par1ItemStack, player); - if(ItemRelic.isRightPlayer(player, par1ItemStack)) { - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); - float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote) { - EntityManaBurst burst = getBurst(player, par1ItemStack); - par2World.spawnEntityInWorld(burst); - par2World.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F); - } - } - } - } - - @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - ItemRelic.addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); - } - - @Override - public void bindToUsername(String playerName, ItemStack stack) { - ItemRelic.bindToUsernameS(playerName, stack); - } - - @Override - public String getSoulbindUsername(ItemStack stack) { - return ItemRelic.getSoulbindUsernameS(stack); - } - - @Override - public Achievement getBindAchievement() { - return achievement; - } - - @Override - public void setBindAchievement(Achievement achievement) { - this.achievement = achievement; - } - - @Override - public boolean usesMana(ItemStack stack) { - return false; - } - - @Override - public boolean isItemTool(ItemStack p_77616_1_) { - return true; - } - - @Override - public int getEntityLifespan(ItemStack itemStack, World world) { - return Integer.MAX_VALUE; - } - - @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 10, 0)); - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 0.3, 1)); - return multimap; - } - - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { - EntityManaBurst burst = new EntityManaBurst(player); - - float motionModifier = 7F; - - burst.setColor(0xFFFF20); - burst.setMana(1); - burst.setStartingMana(1); - burst.setMinManaLoss(200); - burst.setManaLossPerTick(1F); - burst.setGravity(0F); - burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); - - ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); - burst.setSourceLens(lens); - return burst; - } - - @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } - - @Override - public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - return dead; - } - - @Override - public void updateBurst(IManaBurst burst, ItemStack stack) { - EntityThrowable entity = (EntityThrowable) burst; - AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); - - String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); - int homeID = ItemNBTHelper.getInt(stack, TAG_HOME_ID, -1); - if(homeID == -1) { - AxisAlignedBB axis1 = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(5, 5, 5); - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis1); - for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer || living instanceof IBossDisplayData || !(living instanceof IMob) || living.hurtTime != 0) - continue; - - homeID = living.getEntityId(); - ItemNBTHelper.setInt(stack, TAG_HOME_ID, homeID); - break; - } - } - - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); - - if(homeID != -1) { - Entity home = entity.worldObj.getEntityByID(homeID); - if(home != null) { - Vector3 vecEntity = Vector3.fromEntityCenter(home); - Vector3 vecThis = Vector3.fromEntityCenter(entity); - Vector3 vecMotion = vecEntity.sub(vecThis); - Vector3 vecCurrentMotion = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - - vecMotion.normalize().multiply(vecCurrentMotion.mag()); - burst.setMotion(vecMotion.x, vecMotion.y, vecMotion.z); - } - } - - for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) - continue; - - if(living.hurtTime == 0) { - int cost = 1; - int mana = burst.getMana(); - if(mana >= cost) { - burst.setMana(mana - cost); - float damage = 4F + toolMaterial.getDamageVsEntity(); - if(!burst.isFake() && !entity.worldObj.isRemote) { - EntityPlayer player = living.worldObj.getPlayerEntityByName(attacker); - living.attackEntityFrom(player == null ? DamageSource.magic : DamageSource.causePlayerDamage(player), damage); - entity.setDead(); - break; - } - } - } - } - } - - @Override - public boolean doParticles(IManaBurst burst, ItemStack stack) { - return true; - } - - @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { - return BotaniaAPI.rarityRelic; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 20a7e4f4e..9e4690736 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -65,9 +65,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { dummy.addBindInfo(stacks, par1ItemStack, player); } - public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) {} @Override public boolean canEquip(ItemStack stack, EntityLivingBase player) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 5966ea453..d0ef3ae09 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -94,9 +94,7 @@ public class PageRecipe extends LexiconPage { } @SideOnly(Side.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - // NO-OP - } + public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {} @SideOnly(Side.CLIENT) public void renderItemAtAngle(IGuiLexiconEntry gui, float angle, ItemStack stack) { From 420d4b0aa4a009c1802dd636f14011c4061a1e2d Mon Sep 17 00:00:00 2001 From: Luxor5393 Date: Tue, 21 Jun 2016 16:57:47 +0200 Subject: [PATCH 742/935] Fix two typos. --- src/main/resources/assets/botania/lang/en_US.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 88b9595c5..8bab9135f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3102,7 +3102,7 @@ botania.page.clip2=Since we're dubbed by 4Kids we must make do without one # -- ROD OF THE DEPTHS botania.entry.cobbleRod=Rod of the Depths botania.tagline.cobbleRod=A rod to create cobble -botania.page.cobbleRod0=The &1Rod of the Depths&0 acts pretty much as a variant to the the &1Rod of the Lands&0. It does exactly the same thing but with &1Cobblestone&0 for a bit of a higher price.
    For the same &4Mana&0 cost, this item can provide &1Cobblestone&0 to the &1Rod of the Shifting Crust&0. +botania.page.cobbleRod0=The &1Rod of the Depths&0 acts pretty much as a variant to the &1Rod of the Lands&0. It does exactly the same thing but with &1Cobblestone&0 for a bit of a higher price.
    For the same &4Mana&0 cost, this item can provide &1Cobblestone&0 to the &1Rod of the Shifting Crust&0. botania.page.cobbleRod1=It's cobbling time # -- ROD OF THE MOLTEN CORE @@ -3318,7 +3318,7 @@ botania.page.corporeaFunnel2=Energistically applied botania.entry.corporeaInterceptor=Corporea Interceptor botania.tagline.corporeaInterceptor=Intercept Corporea requests and send redstone signals botania.page.corporeaInterceptor0=The &1Corporea Interceptor&0 does exactly as the name suggests, it intercepts corporea requests. First and foremost, &1Item Frames&0 with items need be attached around the block, these define what items will trigger the interceptor.
    Whenever a request is fired to the corporea network, be it from an Index, Funnel, etc, and there's no items in the network that can fulfil it this block will be triggered. -botania.page.corporeaInterceptor1=Of course, the the block is only triggered if the item requested matches one of items in the &1Item Frames&0 about it. When the block is triggered it'll emit a short redstone pulse. This can be used to do all sorts of things, such as craft the required item using &1Crafty Crates&0 or light up a lamp indicating that the inventory for a resource is out. +botania.page.corporeaInterceptor1=Of course, the block is only triggered if the item requested matches one of items in the &1Item Frames&0 about it. When the block is triggered it'll emit a short redstone pulse. This can be used to do all sorts of things, such as craft the required item using &1Crafty Crates&0 or light up a lamp indicating that the inventory for a resource is out. botania.page.corporeaInterceptor2=So many automation prospects # -- CORPOREA CRYSTAL CUBE @@ -3908,4 +3908,4 @@ botania.subtitle.terraPickMode=Terrasteel Pick powers up botania.subtitle.terrasteelCraft=Terrasteel finishes botania.subtitle.thermalily=Thermalily consumes lava botania.subtitle.unholyCloak=Cloak of Sin activates -botania.subtitle.way=And his name is.... JOHN CENA!!! \ No newline at end of file +botania.subtitle.way=And his name is.... JOHN CENA!!! From b232d8bb93255ad046016ad9e6fa477602f75cf4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 21 Jun 2016 19:31:24 -0500 Subject: [PATCH 743/935] Fix #367 --- .../vazkii/botania/common/entity/EntityBabylonWeapon.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 77c18a553..a143f8045 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -70,6 +70,11 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { dataManager.register(ROTATION, 0F); } + @Override + public boolean isImmuneToExplosions() { + return true; + } + @Override public void onUpdate() { EntityLivingBase thrower = getThrower(); From 337851994fc5a824630a8384e49249e315cb9d6d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 21 Jun 2016 19:44:14 -0500 Subject: [PATCH 744/935] Fix bad portuguese brick recipes. Closes #368 --- src/main/java/vazkii/botania/common/block/ModFluffBlocks.java | 4 +++- .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 62758a829..6b840a64a 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; @@ -345,7 +346,8 @@ public final class ModFluffBlocks { stoneWall = new Block18StoneWall(); count = 0; - for (EnumDyeColor color : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { + for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, + EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) { pavementStairs[count] = new BlockPavementStairs(color); pavementSlabs[count] = new BlockPavementSlab(false, color, count); pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index d23ee8abf..a15b29c37 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2163,7 +2163,7 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); } - // Pavement Stairsm & Stairs + // Pavement Stairs & Stairs for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]); From 8600b756915b82163d04ddca9e8973836b17aec7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 18:41:21 -0500 Subject: [PATCH 745/935] Fix solegnolia not working on dediserver and threadsafe the collection. Fixes #346 --- .../common/block/subtile/functional/SubTileSolegnolia.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 36ca0c765..232d0b234 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import com.google.common.collect.MapMaker; import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -25,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set existingFlowers = Collections.newSetFromMap(new MapMaker().concurrencyLevel(2).weakKeys().makeMap()); @Override public void onUpdate() { @@ -44,7 +45,7 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld() != e.worldObj) + .filter(f -> f.supertile.getWorld() == e.worldObj) .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) .findAny().isPresent(); From 1bb254a4fc83ffee1cfa2a039219c0e6a05845e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 19:04:19 -0500 Subject: [PATCH 746/935] Workaround subtiles crashing when dug --- .../botania/client/model/SpecialFlowerModel.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index b72874de3..e56aa0266 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,6 +192,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel load(@Nonnull String key) { + if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); @@ -208,10 +209,17 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); - IBakedModel ret = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(ret == null) - ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); + + IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + if(subtileId != null) { // Todo remove - workaround for subtile ID being null? + IBakedModel specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(specialModel != null) + ret = specialModel; + } + return ret.getQuads(state, face, rand); } From 9a11ebef1f85b02fef5798e964713971be3a8e53 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 19:16:52 -0500 Subject: [PATCH 747/935] Fix 1.8 stones not being voided, clean up ore dict registrations that are no longer needed --- .../botania/common/block/ModBlocks.java | 14 ------------- .../common/crafting/ModCraftingRecipes.java | 6 +++--- .../tool/elementium/ItemElementiumPick.java | 21 ++++++++++++------- .../vazkii/botania/common/lib/LibOreDict.java | 7 ------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 61de7cb57..64e8a2a18 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -381,27 +381,13 @@ 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("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)); BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index a15b29c37..0378ea537 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1243,12 +1243,12 @@ public final class ModCraftingRecipes { // Crafty Crate Recipe GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.openCrate, 1, 1), "WCW", "W W", "W W", - 'C', "craftingTableWood", + 'C', "workbench", 'W', new ItemStack(ModBlocks.dreamwood, 1, 1))); recipeCraftCrate = BotaniaAPI.getLatestAddedRecipe(); // Crafting Placeholder Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "craftingTableWood", LibOreDict.LIVING_ROCK); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "workbench", LibOreDict.LIVING_ROCK); recipePlaceholder = BotaniaAPI.getLatestAddedRecipe(); // Nether Brick Recipe @@ -1523,7 +1523,7 @@ public final class ModCraftingRecipes { " P ", "ICI", " I ", 'P', LibOreDict.MANA_PEARL, 'I', LibOreDict.MANA_STEEL, - 'C', "craftingTableWood"); + 'C', "workbench"); recipeCraftingHalo = BotaniaAPI.getLatestAddedRecipe(); // Mana Lens: Flash Recipe diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 0b008d15c..adc263411 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -27,11 +27,8 @@ public class ItemElementiumPick extends ItemManasteelPick { for(int i = 0; i < event.getDrops().size(); i++) { ItemStack drop = event.getDrops().get(i); if(drop != null) { - Block block = Block.getBlockFromItem(drop.getItem()); - if(block != null){ - if(isDisposable(block) || (isSemiDisposable(block) && !event.getHarvester().isSneaking())) - event.getDrops().remove(i); - } + if(isDisposable(drop) || (isSemiDisposable(drop) && !event.getHarvester().isSneaking())) + event.getDrops().remove(i); } } } @@ -39,7 +36,11 @@ public class ItemElementiumPick extends ItemManasteelPick { } public static boolean isDisposable(Block block) { - for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { + return isDisposable(new ItemStack(block)); + } + + private static boolean isDisposable(ItemStack stack) { + for(int id : OreDictionary.getOreIDs(stack)) { String name = OreDictionary.getOreName(id); if(BotaniaAPI.disposableBlocks.contains(name)) return true; @@ -47,8 +48,12 @@ public class ItemElementiumPick extends ItemManasteelPick { return false; } - public static boolean isSemiDisposable(Block block) { - for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { + private static boolean isSemiDisposable(Block block) { + return isSemiDisposable(new ItemStack(block)); + } + + private static boolean isSemiDisposable(ItemStack stack) { + for(int id : OreDictionary.getOreIDs(stack)) { String name = OreDictionary.getOreName(id); if(BotaniaAPI.semiDisposableBlocks.contains(name)) return true; diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 145ed4827..21d9e56b1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -84,13 +84,6 @@ public final class LibOreDict { "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" }; - public static final String[] STONE_18_VARIANTS = new String[] { - "stoneAndesite", "stoneBasalt", "stoneDiorite", "stoneGranite", - "stoneAndesitePolished", "stoneBasaltPolished", "stoneDioritePolished", "stoneGranitePolished", - "stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks", - "stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled" - }; - public static final String[] QUARTZ = new String[] { "quartzDark", "quartzMana", "quartzBlaze", "quartzLavender", "quartzRed", "quartzElven", "quartzSunny" From c6df7c260a58427b11d518302df09f727bfb6339 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 19:29:06 -0500 Subject: [PATCH 748/935] Fix lexicon word count --- .../java/vazkii/botania/common/core/proxy/CommonProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 3f8324694..dd7676c09 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -167,14 +167,14 @@ public class CommonProxy { if(page instanceof ITwoNamedPage) words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName()); } - Botania.LOGGER.info("The Lexica Botania has %d words.", words); + Botania.LOGGER.info("The Lexica Botania has {} words.", words); registerDefaultEntityBlacklist(); } private int countWords(String s) { String s1 = I18n.translateToLocal(s); - return s1.split(" ").length; + return s1.split("\\s+").length; } private void registerDefaultEntityBlacklist() { From b6ddefcaf4ddc6e57d9da212886278f2a16d8f62 Mon Sep 17 00:00:00 2001 From: Howtonotwin Date: Fri, 24 Jun 2016 15:42:45 -0400 Subject: [PATCH 749/935] Rewrite some of the Ring of Chordata Add guard against having two rings equipped; the second ring will be inactive. Fixes #340 --- .../item/equipment/bauble/ItemWaterRing.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) 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 72dfda554..24414352b 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; +import baubles.common.lib.PlayerHandler; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +24,9 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemWaterRing extends ItemBauble implements IManaUsingItem { + private static final double SPEED_MULT = 1.2; + private static final double MAX_SPEED = 1.3; + public ItemWaterRing() { super(LibItemNames.WATER_RING); } @@ -32,22 +36,24 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { super.onWornTick(stack, player); if(player.isInsideOfMaterial(Material.WATER)) { - double motionX = player.motionX * 1.2; - double motionY = player.motionY * 1.2; - double motionZ = player.motionZ * 1.2; + if(player instanceof EntityPlayer) { + ItemStack firstRing = PlayerHandler.getPlayerBaubles((EntityPlayer) player).getStackInSlot(1); + if(firstRing != null && firstRing.getItem() instanceof ItemWaterRing && firstRing != stack) { + return; + } + } - boolean changeX = Math.min(1.3, Math.abs(motionX)) == Math.abs(motionX); - boolean changeY = Math.min(1.3, Math.abs(motionY)) == Math.abs(motionY); - boolean changeZ = Math.min(1.3, Math.abs(motionZ)) == Math.abs(motionZ); + double motionX = player.motionX * SPEED_MULT; + double motionY = player.motionY * SPEED_MULT; + double motionZ = player.motionZ * SPEED_MULT; - if(player instanceof EntityPlayer && ((EntityPlayer) player).capabilities.isFlying) - changeX = changeY = changeZ = false; + boolean flying = player instanceof EntityPlayer && ((EntityPlayer) player).capabilities.isFlying; - if(changeX) + if(Math.abs(motionX) < MAX_SPEED && !flying) player.motionX = motionX; - if(changeY) + if(Math.abs(motionY) < MAX_SPEED && !flying) player.motionY = motionY; - if(changeZ) + if(Math.abs(motionZ) < MAX_SPEED && !flying) player.motionZ = motionZ; PotionEffect effect = player.getActivePotionEffect(MobEffects.NIGHT_VISION); @@ -58,7 +64,7 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(player.getAir() <= 1 && player instanceof EntityPlayer) { int mana = ManaItemHandler.requestMana(stack, (EntityPlayer) player, 300, true); - if(mana > 0) // If zero gets in the player has no air but won't drown. + if (mana > 0) player.setAir(mana); } } else onUnequipped(stack, player); From 6f348e7db1732976577987a04f62d64a880d9ebd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 18:55:41 -0500 Subject: [PATCH 750/935] Made dispenser behaviours 1.10 safe --- .../common/block/dispenser/BehaviourFelPumpkin.java | 4 +++- .../common/block/dispenser/BehaviourPoolMinecart.java | 2 +- .../botania/common/block/dispenser/BehaviourSeeds.java | 10 +++++----- .../botania/common/block/dispenser/BehaviourWand.java | 10 +++++----- 4 files changed, 14 insertions(+), 12 deletions(-) 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 e0d3b804d..52b1f3381 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -6,6 +6,7 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; @@ -21,7 +22,8 @@ public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { World world = source.getWorld(); - BlockPos blockpos = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata())); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos blockpos = source.getBlockPos().offset(facing); Block blockpumpkin = ModBlocks.felPumpkin; if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS 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 57f8d55d2..62f67508b 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -30,8 +30,8 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { - EnumFacing enumfacing = BlockDispenser.getFacing(source.getBlockMetadata()); World world = source.getWorld(); + EnumFacing enumfacing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); double d0 = source.getX() + enumfacing.getFrontOffsetX() * 1.125F; double d1 = source.getY() + enumfacing.getFrontOffsetY() * 1.125F; double d2 = source.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index c3492adc1..23c700885 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -31,10 +31,10 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { @Nonnull @Override - public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); - BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); - World world = par1IBlockSource.getWorld(); + public ItemStack dispenseStack(IBlockSource source, ItemStack par2ItemStack) { + World world = source.getWorld(); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos pos = source.getBlockPos().offset(facing); if(world.getBlockState(pos).getBlock().isAir(world.getBlockState(pos), world, pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState()); @@ -42,7 +42,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { return par2ItemStack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, par2ItemStack); } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 3adace8f6..506849d73 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -26,17 +26,17 @@ public class BehaviourWand extends BehaviorDefaultDispenseItem { @Nonnull @Override - protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); - BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); - World world = par1IBlockSource.getWorld(); + protected ItemStack dispenseStack(IBlockSource source, ItemStack par2ItemStack) { + World world = source.getWorld(); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos pos = source.getBlockPos().offset(facing); Block block = world.getBlockState(pos).getBlock(); if(block instanceof IWandable) { ((IWandable) block).onUsedByWand(null, par2ItemStack, world, pos, facing.getOpposite()); return par2ItemStack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, par2ItemStack); } } From f7a1f629bead77c46b5f935b27637145d0e6f47d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 18:59:23 -0500 Subject: [PATCH 751/935] JEI hack for 1.10 --- .../integration/jei/brewery/BreweryRecipeHandler.java | 6 ++++++ .../integration/jei/elventrade/ElvenTradeRecipeHandler.java | 6 ++++++ .../integration/jei/manapool/ManaPoolRecipeHandler.java | 6 ++++++ .../jei/petalapothecary/PetalApothecaryRecipeHandler.java | 6 ++++++ .../integration/jei/puredaisy/PureDaisyRecipeHandler.java | 6 ++++++ .../integration/jei/runicaltar/RunicAltarRecipeHandler.java | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index fdd5a08f6..94333df71 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -28,6 +28,12 @@ public class BreweryRecipeHandler implements IRecipeHandler { return "botania.brewery"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index e80a550af..d4737d903 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -28,6 +28,12 @@ public class ElvenTradeRecipeHandler implements IRecipeHandler return "botania.elvenTrade"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index 8dc1eed45..d7e5a0136 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -28,6 +28,12 @@ public class ManaPoolRecipeHandler implements IRecipeHandler return "botania.manaPool"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 9c462db79..1e8ffd20d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -28,6 +28,12 @@ public class PetalApothecaryRecipeHandler implements IRecipeHandler { return "botania.pureDaisy"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 83156eb25..73018b711 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -28,6 +28,12 @@ public class RunicAltarRecipeHandler implements IRecipeHandler return "botania.runicAltar"; } + @Nonnull + // @Override todo hack to support 1.10 JEI + public String getRecipeCategoryUid(Object o) { // o is erased type param + return getRecipeCategoryUid(); + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { From 5863b165ad0fb96ca8b84e3b3c927d31c6c5b953 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 19:33:58 -0500 Subject: [PATCH 752/935] Added cross version proxies --- .../java/vazkii/botania/common/Botania.java | 15 +++++ .../core/proxy/CrossVersionProxy_110.java | 58 +++++++++++++++++++ .../core/proxy/CrossVersionProxy_19.java | 55 ++++++++++++++++++ .../common/core/proxy/ICrossVersionProxy.java | 25 ++++++++ 4 files changed, 153 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java create mode 100644 src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java create mode 100644 src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index fc1f41556..975d0aa3e 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -39,6 +39,7 @@ import org.apache.logging.log4j.Logger; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.core.proxy.ICrossVersionProxy; import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, @@ -62,10 +63,24 @@ public class Botania { @SidedProxy(serverSide = LibMisc.PROXY_COMMON, clientSide = LibMisc.PROXY_CLIENT) public static CommonProxy proxy; + public static ICrossVersionProxy crossVersionProxy; + public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); @EventHandler public void preInit(FMLPreInitializationEvent event) { + try { + if ("1.10".equals(Loader.MC_VERSION)) { + crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_110").newInstance(); + } else if ("1.9.4".equals(Loader.MC_VERSION)) { + crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_19").newInstance(); + } else { + throw new IllegalStateException("Botania couldn't find a cross version proxy!"); + } + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { + throw new IllegalStateException("Botania couldn't find a cross version proxy!", ex); + } + gardenOfGlassLoaded = Loader.isModLoaded("GardenOfGlass"); thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java new file mode 100644 index 000000000..05b505de3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java @@ -0,0 +1,58 @@ +package vazkii.botania.common.core.proxy; + +import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.BotaniaPlayerController; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public class CrossVersionProxy_110 implements ICrossVersionProxy { + @Override + public TileEntity createTeFromCompound(World world, NBTTagCompound compound) { + Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "func_190200_a", "a" }, World.class, NBTTagCompound.class); + try { + return (TileEntity) m.invoke(null, world, compound); + } catch (IllegalAccessException | InvocationTargetException e) { + return null; + } + } + + @SideOnly(Side.CLIENT) + @Override + public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { + try { + Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); + Object gameType = from.getCurrentGameType(); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + m.invoke(to, gameType); + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} + } + + @Override + public int getSkeletonTypeInt(EntitySkeleton skeleton) { + try { + Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[] { "func_189771_df", "df" }); + Enum e = (Enum) m.invoke(skeleton); + return e.ordinal(); + } catch (IllegalAccessException | InvocationTargetException e1) { + return 0; + } + } + + @Override + public void setSkeletonTypeInt(EntitySkeleton skeleton, int type) { + try { + Class skeletonTypeClazz = Class.forName("net.minecraft.entity.monster.SkeletonType"); + Object typeToSet = skeletonTypeClazz.getEnumConstants()[type]; + Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[] { "func_189768_a", "a" }, skeletonTypeClazz); + m.invoke(skeleton, typeToSet); + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {} + } +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java new file mode 100644 index 000000000..378b3f3d0 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java @@ -0,0 +1,55 @@ +package vazkii.botania.common.core.proxy; + +import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.BotaniaPlayerController; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public class CrossVersionProxy_19 implements ICrossVersionProxy { + @Override + public TileEntity createTeFromCompound(World world, NBTTagCompound compound) { + Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "create", "func_189514_c", "c" }, NBTTagCompound.class); + try { + return (TileEntity) m.invoke(null, compound); + } catch (IllegalAccessException | InvocationTargetException e) { + return null; + } + } + + @SideOnly(Side.CLIENT) + @Override + public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { + try { + Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings.GameType"); + Object gameType = from.getCurrentGameType(); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + m.invoke(to, gameType); + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} + } + + @Override + public int getSkeletonTypeInt(EntitySkeleton skeleton) { + try { + Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "getSkeletonType", "func_82202_m", "db" }); + return (int) m.invoke(skeleton); + } catch (IllegalAccessException | InvocationTargetException e) { + return 0; + } + } + + @Override + public void setSkeletonTypeInt(EntitySkeleton skeleton, int type) { + try { + Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "setSkeletonType", "func_82201_a", "a" }, int.class); + m.invoke(skeleton, type); + } catch (IllegalAccessException | InvocationTargetException e) {} + } +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java new file mode 100644 index 000000000..d2f160d4c --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java @@ -0,0 +1,25 @@ +package vazkii.botania.common.core.proxy; + +import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.BotaniaPlayerController; + +// horrible hax to try to run 1.9/10 from the same jar :D +// Taking this as an example is heavily discouraged +public interface ICrossVersionProxy { + + TileEntity createTeFromCompound(World world, NBTTagCompound compound); + + @SideOnly(Side.CLIENT) + void copyGameType(PlayerControllerMP from, BotaniaPlayerController to); + + int getSkeletonTypeInt(EntitySkeleton skeleton); + + void setSkeletonTypeInt(EntitySkeleton skeleton, int type); + +} From 9d1e7f86cf72c519a19c2aef968a0b6976c294ba Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 19:35:24 -0500 Subject: [PATCH 753/935] Futureproof update json url --- src/main/java/vazkii/botania/common/lib/LibMisc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 58e2ed205..aeee30b23 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ public final class LibMisc { public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1965,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; - public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json"; + public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; From 38cd0fbf55c75d6a54b8bf2ed2fc120fc2a435a4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 19:43:31 -0500 Subject: [PATCH 754/935] Switch pain spots to using crossproxy --- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 3 +-- .../vazkii/botania/client/render/tile/RenderTileGaiaHead.java | 3 ++- .../java/vazkii/botania/common/entity/EntityDoppleganger.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLaputaShard.java | 3 ++- .../item/equipment/tool/elementium/ItemElementiumAxe.java | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) 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 5b9de22c9..9b147ffca 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -331,12 +331,11 @@ public class ClientProxy extends CommonProxy { EntityPlayer player = mc.thePlayer; if(entity == player) { if(!(mc.playerController instanceof IExtendedPlayerController)) { - GameType type = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.CURRENT_GAME_TYPE); NetHandlerPlayClient net = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.NET_CLIENT_HANDLER); BotaniaPlayerController controller = new BotaniaPlayerController(mc, net); boolean isFlying = player.capabilities.isFlying; boolean allowFlying = player.capabilities.allowFlying; - controller.setGameType(type); + Botania.crossVersionProxy.copyGameType(mc.playerController, controller); player.capabilities.isFlying = isFlying; player.capabilities.allowFlying = allowFlying; mc.playerController = controller; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index 0921dde96..10ab76a25 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -25,6 +25,7 @@ import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.entity.RenderDoppleganger; +import vazkii.botania.common.Botania; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -61,7 +62,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); } else if (view instanceof EntitySkeleton) { skullType = 0; - if(((EntitySkeleton) view).getSkeletonType() == 1) + if(Botania.crossVersionProxy.getSkeletonTypeInt((EntitySkeleton) view) == 1) skullType = 1; } else if(view instanceof EntityWither) skullType = 1; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 977bbb6b9..d4b3d61ed 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -669,7 +669,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { entity = new EntitySkeleton(worldObj); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); if(worldObj.rand.nextInt(8) == 0) { - ((EntitySkeleton) entity).setSkeletonType(1); + Botania.crossVersionProxy.setSkeletonTypeInt((EntitySkeleton) entity, 1); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ab03c2bd8..221647f70 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -38,6 +38,7 @@ import vazkii.botania.api.mana.ILaputaImmobile; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -250,7 +251,7 @@ 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.create(tilecmp); + tile = Botania.crossVersionProxy.createTeFromCompound(entity.worldObj, tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); 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 1b2a77765..a8480a843 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 @@ -14,6 +14,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ModItems; @@ -41,7 +42,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { 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, Botania.crossVersionProxy.getSkeletonTypeInt((EntitySkeleton) event.getEntityLiving()))); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) From 1a3b6833b53667b6404083b67dd1e5e57a9454c4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 19:58:57 -0500 Subject: [PATCH 755/935] Update JEI --- build.gradle | 2 +- .../client/integration/jei/brewery/BreweryRecipeHandler.java | 4 ++-- .../integration/jei/elventrade/ElvenTradeRecipeHandler.java | 4 ++-- .../integration/jei/manapool/ManaPoolRecipeHandler.java | 4 ++-- .../jei/petalapothecary/PetalApothecaryRecipeHandler.java | 4 ++-- .../integration/jei/puredaisy/PureDaisyRecipeHandler.java | 4 ++-- .../integration/jei/runicaltar/RunicAltarRecipeHandler.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 61fd27d75..04e48a68f 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202" + deobfCompile "mezz.jei:jei_1.9.4:3.6.7.216" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index 94333df71..e4ffe0bd4 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -29,8 +29,8 @@ public class BreweryRecipeHandler implements IRecipeHandler { } @Nonnull - // @Override todo hack to support 1.10 JEI - public String getRecipeCategoryUid(Object o) { // o is erased type param + @Override + public String getRecipeCategoryUid(@Nonnull RecipeBrew recipe) { // o is erased type param return getRecipeCategoryUid(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index d4737d903..a791ad23a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -29,8 +29,8 @@ public class ElvenTradeRecipeHandler implements IRecipeHandler } @Nonnull - // @Override todo hack to support 1.10 JEI - public String getRecipeCategoryUid(Object o) { // o is erased type param + @Override + public String getRecipeCategoryUid(@Nonnull RecipeElvenTrade recipe) { // o is erased type param return getRecipeCategoryUid(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index d7e5a0136..4096fea8b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -29,8 +29,8 @@ public class ManaPoolRecipeHandler implements IRecipeHandler } @Nonnull - // @Override todo hack to support 1.10 JEI - public String getRecipeCategoryUid(Object o) { // o is erased type param + @Override + public String getRecipeCategoryUid(@Nonnull RecipeManaInfusion recipe) { // o is erased type param return getRecipeCategoryUid(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 1e8ffd20d..fe4860533 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -29,8 +29,8 @@ public class PetalApothecaryRecipeHandler implements IRecipeHandler { } @Nonnull - // @Override todo hack to support 1.10 JEI - public String getRecipeCategoryUid(Object o) { // o is erased type param + @Override + public String getRecipeCategoryUid(@Nonnull RecipePureDaisy recipe) { // o is erased type param return getRecipeCategoryUid(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 73018b711..2c4c17fb6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -29,8 +29,8 @@ public class RunicAltarRecipeHandler implements IRecipeHandler } @Nonnull - // @Override todo hack to support 1.10 JEI - public String getRecipeCategoryUid(Object o) { // o is erased type param + @Override + public String getRecipeCategoryUid(@Nonnull RecipeRuneAltar recipe) { // o is erased type param return getRecipeCategoryUid(); } From 49d79abb83687651af44c4ddd9dd7c4541f2532e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Jun 2016 19:59:24 -0500 Subject: [PATCH 756/935] Include 1.10 in accepted mc versions --- src/main/java/vazkii/botania/common/lib/LibMisc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index aeee30b23..ecf6a3c61 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -18,7 +18,7 @@ public final class LibMisc { public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1965,];required-after:Baubles;after:Thaumcraft"; - public static final String MC_VERSIONS = "[1.9.4]"; + public static final String MC_VERSIONS = "[1.9.4,1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; // Network Contants From 81c45fb0791c51775cf1c134c778e156b1d7fccd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 14:43:24 -0500 Subject: [PATCH 757/935] Fix ring of far reach and fix proxy selection --- src/main/java/vazkii/botania/common/Botania.java | 6 ++++-- .../botania/common/core/proxy/CrossVersionProxy_110.java | 5 +++-- .../botania/common/core/proxy/CrossVersionProxy_19.java | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 975d0aa3e..2c09f10ac 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -70,9 +70,11 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { try { - if ("1.10".equals(Loader.MC_VERSION)) { + if ("Minecraft 1.10".equals(Loader.instance().getMCVersionString())) { + Botania.LOGGER.info("Enabling proxy for Minecraft 1.10"); crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_110").newInstance(); - } else if ("1.9.4".equals(Loader.MC_VERSION)) { + } else if ("Minecraft 1.9.4".equals(Loader.instance().getMCVersionString())) { + Botania.LOGGER.info("Enabling proxy for Minecraft 1.9.4"); crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_19").newInstance(); } else { throw new IllegalStateException("Botania couldn't find a cross version proxy!"); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java index 05b505de3..17ebd45ac 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java @@ -29,8 +29,9 @@ public class CrossVersionProxy_110 implements ICrossVersionProxy { public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { try { Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); - Object gameType = from.getCurrentGameType(); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); + Object gameType = m.invoke(from); + m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java index 378b3f3d0..cccf9d8b5 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java @@ -29,8 +29,9 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { try { Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings.GameType"); - Object gameType = from.getCurrentGameType(); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); + Object gameType = m.invoke(from); + m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} } From 4ddf3767c5ce0f4b448720d30925c9a1ef17a02f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 14:50:07 -0500 Subject: [PATCH 758/935] Update buildscript for 1.10 --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 04e48a68f..cc1af8321 100644 --- a/build.gradle +++ b/build.gradle @@ -117,17 +117,21 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { } file('web/versions.ini').append("\n${version}=${minecraft.version}") - file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") + file('web/versions.ini').append("\n${version}=1.10") + file("${config.dir_repo}/version/1.10.txt").write("${version}") def updateJsonFile = file('version/update.json') def updateJson = new JsonSlurper().parse(updateJsonFile) as Map // Add to version section updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" + updateJson."1.10"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" // Update promos updateJson.promos."${minecraft.version}-latest" = "${version}" updateJson.promos."${minecraft.version}-recommended" = "${version}" + updateJson.promos."1.10-latest" = "${version}" + updateJson.promos."1.10-recommended" = "${version}" updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) @@ -239,6 +243,7 @@ curseforge { """ releaseType = "beta" addGameVersion '1.9.4' + addGameVersion '1.10' relations { requiredLibrary 'baubles' } From da3958a4144cb08f7f78e5a800657366308f573b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 14:59:39 -0500 Subject: [PATCH 759/935] Fix more build stuff --- build.gradle | 7 ++++++- version/update.json | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cc1af8321..305eb97e6 100644 --- a/build.gradle +++ b/build.gradle @@ -116,13 +116,18 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { config.toProperties().store(it, "") } + // todo make this flexibile - collection of supported mc versions + file('web/versions.ini').append("\n${version}=${minecraft.version}") file('web/versions.ini').append("\n${version}=1.10") + file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") file("${config.dir_repo}/version/1.10.txt").write("${version}") def updateJsonFile = file('version/update.json') def updateJson = new JsonSlurper().parse(updateJsonFile) as Map + // todo detect if the mcversion is absent + // Add to version section updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" updateJson."1.10"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" @@ -241,7 +246,7 @@ curseforge { changelog = """ See https://github.com/williewillus/Botania/releases/tag/${version} """ - releaseType = "beta" + releaseType = "release" addGameVersion '1.9.4' addGameVersion '1.10' relations { diff --git a/version/update.json b/version/update.json index b2e7b47d9..c1acc3bc8 100644 --- a/version/update.json +++ b/version/update.json @@ -1,4 +1,7 @@ { + "1.10": { + + }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", From 28b3e5d22b844f9f057a57c2ff2efcae3bff186e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 15:10:02 -0500 Subject: [PATCH 760/935] Build 311 --- build.properties | 8 ++++---- version/1.10.txt | 1 + version/1.9.4.txt | 2 +- version/update.json | 11 +++++++---- web/versions.ini | 4 +++- 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 version/1.10.txt diff --git a/build.properties b/build.properties index c1b34c24e..10e8aa415 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Fri Jun 17 00:20:23 CDT 2016 +#Sat Jun 25 15:01:49 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1965 -mc_version=1.9.4 dir_repo=./ -build_number=311 +mc_version=1.9.4 +forge_version=12.17.0.1965 +build_number=312 mod_name=Botania diff --git a/version/1.10.txt b/version/1.10.txt new file mode 100644 index 000000000..c5e7d9272 --- /dev/null +++ b/version/1.10.txt @@ -0,0 +1 @@ +r1.8-311 \ No newline at end of file diff --git a/version/1.9.4.txt b/version/1.9.4.txt index fd32bc288..c5e7d9272 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-310 \ No newline at end of file +r1.8-311 \ No newline at end of file diff --git a/version/update.json b/version/update.json index c1acc3bc8..10a0e3b5a 100644 --- a/version/update.json +++ b/version/update.json @@ -1,6 +1,6 @@ { "1.10": { - + "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -14,13 +14,16 @@ "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308", "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309", - "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310" + "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310", + "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" }, "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", "promos": { + "1.10-latest": "r1.8-311", + "1.10-recommended": "r1.8-311", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-310", - "1.9.4-recommended": "r1.8-310" + "1.9.4-latest": "r1.8-311", + "1.9.4-recommended": "r1.8-311" } } \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 756d69266..efe07c467 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -259,4 +259,6 @@ r1.8-306=1.9.4 r1.8-307=1.9.4 r1.8-308=1.9.4 r1.8-309=1.9.4 -r1.8-310=1.9.4 \ No newline at end of file +r1.8-310=1.9.4 +r1.8-311=1.9.4 +r1.8-311=1.10 \ No newline at end of file From 2afaac9f2055b863e50707451b6ed72621519f5b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 15:27:34 -0500 Subject: [PATCH 761/935] Fix flowers emitting light. Closes #369 --- src/main/java/vazkii/botania/api/subtile/SubTileEntity.java | 2 +- .../vazkii/botania/common/block/tile/TileSpecialFlower.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index b785a0250..8c79e71f6 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -201,7 +201,7 @@ public class SubTileEntity { * Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower) */ public int getLightValue() { - return -1; + return 0; } /** 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 544315950..167cacc4d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -41,7 +41,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil private static final String TAG_SUBTILE_CMP = "subTileCmp"; public String subTileName = ""; - SubTileEntity subTile; + private SubTileEntity subTile; @Override public SubTileEntity getSubTile() { @@ -193,7 +193,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public int getLightValue() { if(subTile == null) - return -1; + return 0; return subTile.getLightValue(); } From b2d7bc2794d5bfa972cad50a4d681d84995fd4c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 16:09:46 -0500 Subject: [PATCH 762/935] Pick block for entities --- .../vazkii/botania/common/entity/EntityCorporeaSpark.java | 7 +++++++ .../vazkii/botania/common/entity/EntityPoolMinecart.java | 7 +++++++ .../java/vazkii/botania/common/entity/EntitySpark.java | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 420497254..20ac2dd47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; @@ -71,6 +72,12 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { dataManager.register(DISPLAY_STACK, Optional.absent()); } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return isMaster() ? new ItemStack(ModItems.corporeaSpark, 1, 1) : new ItemStack(ModItems.corporeaSpark); + } + @Override public boolean canBeCollidedWith() { return true; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 50c3f069d..de95a2998 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -24,6 +24,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; @@ -80,6 +81,12 @@ public class EntityPoolMinecart extends EntityMinecart { return false; } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return new ItemStack(ModItems.poolMinecart); + } + @Override public void killMinecart(DamageSource source) { super.killMinecart(source); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 795c14410..c4a7e28c2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; @@ -72,6 +73,12 @@ public class EntitySpark extends Entity implements ISparkEntity { dataManager.register(UPGRADE, 0); } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return new ItemStack(ModItems.spark); + } + @Override public void onUpdate() { super.onUpdate(); From d3d94e46d73faaef79dc4f2ed03fe48c50f5aad7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 09:05:35 -0500 Subject: [PATCH 763/935] Special flower item models fall back to poppy. Close #375 --- .../handler/ContributorFancinessHandler.java | 5 +-- .../client/model/SpecialFlowerModel.java | 45 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) 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 e8d066e1c..93d8d64ab 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -99,10 +99,7 @@ public final class ContributorFancinessHandler implements LayerRenderer, ModelResourceLocation> itemModels; private final IBakedModel baseModel; - private final LoadingCache bakedBlockModels; - private final LoadingCache bakedItemModels; + private final LoadingCache> bakedBlockModels; + private final LoadingCache> bakedItemModels; SpecialFlowerBakedModel(ImmutableMap, ModelResourceLocation> blockModels, ImmutableMap, ModelResourceLocation> itemModels, ImmutableMap cameraTransforms) { @@ -173,7 +173,7 @@ public class SpecialFlowerModel implements IModelCustomData { this.itemModels = itemModels; this.transforms = cameraTransforms; - ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.absent(), + ModelResourceLocation baseModelPath = blockModels.getOrDefault(Optional.empty(), new ModelResourceLocation("builtin/missing", "missing")); this.baseModel = ModelLoaderRegistry.getModelOrMissing(baseModelPath) .bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); @@ -182,7 +182,7 @@ public class SpecialFlowerModel implements IModelCustomData { this.bakedItemModels = CacheBuilder.newBuilder().build(new Loader(false)); } - private class Loader extends CacheLoader { + private class Loader extends CacheLoader> { private final boolean loadBlocks; @@ -191,16 +191,17 @@ public class SpecialFlowerModel implements IModelCustomData { } @Override - public IBakedModel load(@Nonnull String key) { + public Optional load(@Nonnull String key) { if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); - if(loc == null) { - loc = new ModelResourceLocation("builtin/missing", "missing"); - } + if(loc == null) + return Optional.empty(); IModel model = ModelLoaderRegistry.getModelOrMissing(loc); - return model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter()); + if(model == ModelLoaderRegistry.getMissingModel()) + return Optional.empty(); + return Optional.of(model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); } } @@ -215,9 +216,9 @@ public class SpecialFlowerModel implements IModelCustomData { IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); if(subtileId != null) { // Todo remove - workaround for subtile ID being null? - IBakedModel specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(specialModel != null) - ret = specialModel; + Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); + if(specialModel.isPresent()) + ret = specialModel.get(); } return ret.getQuads(state, face, rand); @@ -229,16 +230,20 @@ public class SpecialFlowerModel implements IModelCustomData { return itemHandler; } + private final ItemStack roseFallback = new ItemStack(Blocks.RED_FLOWER); + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { - IBakedModel item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - if(item == null) { - item = bakedBlockModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - } + Optional item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); - return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; + if(!item.isPresent()) + item = bakedBlockModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); + + return item.isPresent() + ? item.get() + : Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(roseFallback); } }; From e28f82dc7d78f6766927a9f6c3c09ec2f7e1bad5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 11:07:46 -0500 Subject: [PATCH 764/935] Apothecary right click uses caps --- .../botania/common/block/BlockAltar.java | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 01a007a3e..92ed8cdb2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -21,7 +21,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; @@ -30,10 +29,13 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -53,7 +55,6 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.List; -import java.util.Random; public class BlockAltar extends BlockMod implements ILexiconable { @@ -147,6 +148,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { TileAltar tile = (TileAltar) world.getTileEntity(pos); if(player.isSneaking()) { InventoryHelper.withdrawFromInventory(tile, player); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } else if(tile.isEmpty() && tile.hasWater && stack == null) tile.trySetLastRecipe(player); else { @@ -155,7 +157,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { if(stack.getItem() == ModItems.waterRod) ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); else if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); + drain(FluidRegistry.WATER, stack); tile.setWater(true); world.updateComparatorOutputLevel(pos, this); @@ -165,7 +167,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return true; } else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) { if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); + drain(FluidRegistry.LAVA, stack); tile.setLava(true); tile.setWater(false); @@ -196,6 +198,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return false; } + @Override public void fillWithRain(World world, BlockPos pos) { if(world.rand.nextInt(20) == 1) { TileEntity tile = world.getTileEntity(pos); @@ -216,28 +219,20 @@ public class BlockAltar extends BlockMod implements ILexiconable { private boolean isValidWaterContainer(ItemStack stack) { if(stack == null || stack.stackSize != 1) return false; - if(stack.getItem() == ModItems.waterBowl) - return true; - if(stack.getItem() instanceof IFluidContainerItem) { - FluidStack fluidStack = ((IFluidContainerItem) stack.getItem()).getFluid(stack); - return fluidStack != null && fluidStack.getFluid() == FluidRegistry.WATER && fluidStack.amount >= FluidContainerRegistry.BUCKET_VOLUME; + if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { + IFluidHandler handler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + FluidStack simulate = handler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), false); + if(simulate != null && simulate.getFluid() == FluidRegistry.WATER && simulate.amount == Fluid.BUCKET_VOLUME) + return true; } - FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); - return fluidStack != null && fluidStack.getFluid() == FluidRegistry.WATER && fluidStack.amount >= FluidContainerRegistry.BUCKET_VOLUME; + + return false; } - private ItemStack getContainer(ItemStack stack) { - if(stack.getItem() == ModItems.waterBowl) - return new ItemStack(Items.BOWL); - - if (stack.getItem().hasContainerItem(stack)) - return stack.getItem().getContainerItem(stack); - else if (stack.getItem() instanceof IFluidContainerItem) { - ((IFluidContainerItem) stack.getItem()).drain(stack, FluidContainerRegistry.BUCKET_VOLUME, true); - return stack; - } - return FluidContainerRegistry.drainFluidContainer(stack); + private void drain(Fluid fluid, ItemStack stack) { + stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null) + .drain(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); } @Override From 1fbcb0b39b3e506c2fbba97722b0baec879ea7b4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 11:29:47 -0500 Subject: [PATCH 765/935] Fix desyncing in runic altar, closes #374 --- .../common/block/mana/BlockRuneAltar.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) 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 557b07977..54d0a258b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -25,6 +25,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; @@ -68,15 +69,25 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + if(world.isRemote) + return true; + TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(pos); if(player.isSneaking()) { - if(altar.manaToGet == 0) + if(altar.manaToGet == 0) { InventoryHelper.withdrawFromInventory(altar, player); - } else if(altar.isEmpty() && stack == null) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); + } + } else if(altar.isEmpty() && stack == null) { altar.trySetLastRecipe(player); - else if(stack != null) - return altar.addItem(player, stack); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); + } else if(stack != null) { + boolean result = altar.addItem(player, stack); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); + return result; + } + return false; } From 2650813f959ebb9da70b7ed5f7d70e87ccccb357 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 16:19:40 -0500 Subject: [PATCH 766/935] Fix burst range being much smaller than it should be. Closes #376 --- .../common/entity/EntityManaBurst.java | 159 +++++++++++++++++- 1 file changed, 158 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c959624b4..a35b4b339 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -25,9 +25,12 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -151,10 +154,164 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { setMotion(mx, my, mz); } + // Copy of EntityThrowable.onUpdate. Relevant edits indicated. + private void superUpdate() { + this.lastTickPosX = this.posX; + this.lastTickPosY = this.posY; + this.lastTickPosZ = this.posZ; + // super.onUpdate(); Botania - inline supersuperclass's onUpdate + { + if (!this.worldObj.isRemote) + { + this.setFlag(6, this.isGlowing()); + } + + this.onEntityUpdate(); + } + + if (this.throwableShake > 0) + { + --this.throwableShake; + } + + // Botania - remove inGround check and its else branch. Bursts are never inGround. + + Vec3d vec3d = new Vec3d(this.posX, this.posY, this.posZ); + Vec3d vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + RayTraceResult raytraceresult = this.worldObj.rayTraceBlocks(vec3d, vec3d1); + vec3d = new Vec3d(this.posX, this.posY, this.posZ); + vec3d1 = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + + if (raytraceresult != null) + { + vec3d1 = new Vec3d(raytraceresult.hitVec.xCoord, raytraceresult.hitVec.yCoord, raytraceresult.hitVec.zCoord); + } + + if(!worldObj.isRemote) { // Botania - only do entity colliding on server + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox().addCoord(this.motionX, this.motionY, this.motionZ).expandXyz(1.0D)); + double d0 = 0.0D; + boolean flag = false; + + for (int i = 0; i < list.size(); ++i) + { + Entity entity1 = (Entity)list.get(i); + + if (entity1.canBeCollidedWith()) + { + if (entity1 == this.ignoreEntity) + { + flag = true; + } + else if (this.ticksExisted < 2 && this.ignoreEntity == null) + { + this.ignoreEntity = entity1; + flag = true; + } + else + { + flag = false; + AxisAlignedBB axisalignedbb = entity1.getEntityBoundingBox().expandXyz(0.30000001192092896D); + RayTraceResult raytraceresult1 = axisalignedbb.calculateIntercept(vec3d, vec3d1); + + if (raytraceresult1 != null) + { + double d1 = vec3d.squareDistanceTo(raytraceresult1.hitVec); + + if (d1 < d0 || d0 == 0.0D) + { + entity = entity1; + d0 = d1; + } + } + } + } + } + + if (this.ignoreEntity != null) + { + /*if (flag) + { + this.ignoreTime = 2; + } + else if (this.ignoreTime-- <= 0) + { + this.ignoreEntity = null; + }*/ + } + + if (entity != null) + { + raytraceresult = new RayTraceResult(entity); + } + } // End wrap - only do entity colliding on server + + if (raytraceresult != null) + { + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) + { + this.setPortal(raytraceresult.getBlockPos()); + } + else + { + this.onImpact(raytraceresult); + } + } + + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float)(MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI)); + + for (this.rotationPitch = (float)(MathHelper.atan2(this.motionY, (double)f) * (180D / Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + { + ; + } + + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) + { + this.prevRotationPitch += 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw < -180.0F) + { + this.prevRotationYaw -= 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) + { + this.prevRotationYaw += 360.0F; + } + + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + float f1 = 0.99F; + float f2 = this.getGravityVelocity(); + + if (this.isInWater()) + { + for (int j = 0; j < 4; ++j) + { + float f3 = 0.25F; + this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * (double)f3, this.posY - this.motionY * (double)f3, this.posZ - this.motionZ * (double)f3, this.motionX, this.motionY, this.motionZ, new int[0]); + } + + f1 = 0.8F; + } + + // Botania - don't apply drag + // this.motionX *= (double)f1; + // this.motionY *= (double)f1; + // this.motionZ *= (double)f1; + this.motionY -= (double)f2; + this.setPosition(this.posX, this.posY, this.posZ); + } + @Override public void onUpdate() { setTicksExisted(getTicksExisted() + 1); - super.onUpdate(); + superUpdate(); if(!fake && !isDead) ping(); From 4172637bcc08724b385fdad4ea204a79293e8407 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Jun 2016 17:18:10 -0500 Subject: [PATCH 767/935] Fix drum sound --- .../java/vazkii/botania/common/block/mana/BlockForestDrum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f449840da..1edb23326 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -171,7 +171,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } for(int i = 0; i < 10; i++) - world.playSound(null, pos, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, SoundEvents.BLOCK_NOTE_BASEDRUM, SoundCategory.BLOCKS, 1F, 1F); } @Override From 971b1ee3e26e1703b178c682ba4b783d7b41a6fb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 28 Jun 2016 21:19:18 -0500 Subject: [PATCH 768/935] Fix typo in king key, closes #381 --- .../java/vazkii/botania/common/item/relic/ItemKingKey.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index d8266a1cd..e84dcb1c8 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -67,7 +67,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { int div = spawned / 5; int mod = spawned % 5; - Vector3 pl = look.add(Vector3.fromEntityCenter(living)).add(0, 1.6, div * 0.1); + Vector3 pl = look.add(Vector3.fromEntityCenter(living)).add(0, living.getEyeHeight(), div * 0.1); Random rand = living.worldObj.rand; Vector3 axis = look.normalize().crossProduct(new Vector3(-1, 0, -1)).normalize(); @@ -77,7 +77,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { axis1 = axis1.multiply(div * 3.5 + 5).rotate(rot, look); if(axis1.y < 0) - axis1 = axis.multiply(0, -1, 0); + axis1 = axis1.multiply(0, -1, 0); Vector3 end = pl.add(axis1); From bea1c6ecdc97f8c62e55acd6466044a241c0360e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 19:29:54 -0500 Subject: [PATCH 769/935] Fix cross proxy detection to support 1.10.2 --- .../java/vazkii/botania/common/Botania.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 2c09f10ac..8395d5053 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common; +import com.google.common.collect.ImmutableMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; @@ -42,6 +43,8 @@ import vazkii.botania.common.core.proxy.CommonProxy; import vazkii.botania.common.core.proxy.ICrossVersionProxy; import vazkii.botania.common.lib.LibMisc; +import java.util.Map; + @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) public class Botania { @@ -67,18 +70,25 @@ public class Botania { public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); + private static final Map PROXY_MAP = ImmutableMap.of( + "1.9.4", "vazkii.botania.common.core.proxy.CrossVersionProxy_19", + "1.10", "vazkii.botania.common.core.proxy.CrossVersionProxy_110", + "1.10.2", "vazkii.botania.common.core.proxy.CrossVersionProxy_110" + ); + @EventHandler public void preInit(FMLPreInitializationEvent event) { try { - if ("Minecraft 1.10".equals(Loader.instance().getMCVersionString())) { - Botania.LOGGER.info("Enabling proxy for Minecraft 1.10"); - crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_110").newInstance(); - } else if ("Minecraft 1.9.4".equals(Loader.instance().getMCVersionString())) { - Botania.LOGGER.info("Enabling proxy for Minecraft 1.9.4"); - crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_19").newInstance(); - } else { + // Prevent constant "1.9.4" from being inlined and messing up selection in 1.10 + String mcVersion = Loader.MC_VERSION.toString(); + + if(!PROXY_MAP.containsKey(mcVersion)) throw new IllegalStateException("Botania couldn't find a cross version proxy!"); - } + + Class clazz = Class.forName(PROXY_MAP.get(mcVersion)); + crossVersionProxy = (ICrossVersionProxy) clazz.newInstance(); + + Botania.LOGGER.info("Enabling proxy for Minecraft {}", mcVersion); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { throw new IllegalStateException("Botania couldn't find a cross version proxy!", ex); } From be667b2ee3cc05f3786e979756e189a2ccdbe50d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 19:30:06 -0500 Subject: [PATCH 770/935] Fix some items not being held right --- src/main/resources/assets/botania/models/item/cacophonium.json | 2 +- .../resources/assets/botania/models/item/obedienceStick.json | 2 +- src/main/resources/assets/botania/models/item/signalFlare.json | 2 +- src/main/resources/assets/botania/models/item/twigWand.json | 2 +- .../resources/assets/botania/models/item/twigWand_bind.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/botania/models/item/cacophonium.json b/src/main/resources/assets/botania/models/item/cacophonium.json index 69c801cc9..4121bd1a7 100644 --- a/src/main/resources/assets/botania/models/item/cacophonium.json +++ b/src/main/resources/assets/botania/models/item/cacophonium.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/cacophonium" } diff --git a/src/main/resources/assets/botania/models/item/obedienceStick.json b/src/main/resources/assets/botania/models/item/obedienceStick.json index 07f94f48c..af91086e8 100644 --- a/src/main/resources/assets/botania/models/item/obedienceStick.json +++ b/src/main/resources/assets/botania/models/item/obedienceStick.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/obedienceStick" } diff --git a/src/main/resources/assets/botania/models/item/signalFlare.json b/src/main/resources/assets/botania/models/item/signalFlare.json index 44625efaa..3fffde5d5 100644 --- a/src/main/resources/assets/botania/models/item/signalFlare.json +++ b/src/main/resources/assets/botania/models/item/signalFlare.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/signalFlare0", "layer1": "botania:items/signalFlare1" diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json index a513a38f4..ab49ee092 100644 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ b/src/main/resources/assets/botania/models/item/twigWand.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", diff --git a/src/main/resources/assets/botania/models/item/twigWand_bind.json b/src/main/resources/assets/botania/models/item/twigWand_bind.json index f7dd52606..0c1b31567 100644 --- a/src/main/resources/assets/botania/models/item/twigWand_bind.json +++ b/src/main/resources/assets/botania/models/item/twigWand_bind.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/twigWand0", "layer1": "botania:items/twigWand1", From b30ad911fad8e8b7d45de4d9b32e3892b0d97899 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 20:22:14 -0500 Subject: [PATCH 771/935] Reflect since trying to get around inlining isn't working --- src/main/java/vazkii/botania/common/Botania.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 8395d5053..d662eb974 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -79,8 +79,8 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { try { - // Prevent constant "1.9.4" from being inlined and messing up selection in 1.10 - String mcVersion = Loader.MC_VERSION.toString(); + // The constant is inlined at compile time, we want the real value. + String mcVersion = (String) Loader.class.getDeclaredField("MC_VERSION").get(null); if(!PROXY_MAP.containsKey(mcVersion)) throw new IllegalStateException("Botania couldn't find a cross version proxy!"); @@ -89,7 +89,7 @@ public class Botania { crossVersionProxy = (ICrossVersionProxy) clazz.newInstance(); Botania.LOGGER.info("Enabling proxy for Minecraft {}", mcVersion); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) { + } catch (NoSuchFieldException | ClassNotFoundException | InstantiationException | IllegalAccessException ex) { throw new IllegalStateException("Botania couldn't find a cross version proxy!", ex); } From 589b4e49b613725bef11b3b69bce31774daf4346 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 20:24:25 -0500 Subject: [PATCH 772/935] Prep buildscripts for 1.10.2 --- build.gradle | 10 +++++----- version/update.json | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 305eb97e6..8c0713e7c 100644 --- a/build.gradle +++ b/build.gradle @@ -119,9 +119,9 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { // todo make this flexibile - collection of supported mc versions file('web/versions.ini').append("\n${version}=${minecraft.version}") - file('web/versions.ini').append("\n${version}=1.10") + file('web/versions.ini').append("\n${version}=1.10.2") file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") - file("${config.dir_repo}/version/1.10.txt").write("${version}") + file("${config.dir_repo}/version/1.10.2.txt").write("${version}") def updateJsonFile = file('version/update.json') def updateJson = new JsonSlurper().parse(updateJsonFile) as Map @@ -130,13 +130,13 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { // Add to version section updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" - updateJson."1.10"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" + updateJson."1.10.2"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" // Update promos updateJson.promos."${minecraft.version}-latest" = "${version}" updateJson.promos."${minecraft.version}-recommended" = "${version}" - updateJson.promos."1.10-latest" = "${version}" - updateJson.promos."1.10-recommended" = "${version}" + updateJson.promos."1.10.2-latest" = "${version}" + updateJson.promos."1.10.2-recommended" = "${version}" updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) diff --git a/version/update.json b/version/update.json index 10a0e3b5a..685d93756 100644 --- a/version/update.json +++ b/version/update.json @@ -2,6 +2,7 @@ "1.10": { "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" }, + "1.10.2": {}, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", From 6f69d5d1543d525af66b7aaba00d6eede0f58b0b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 20:28:09 -0500 Subject: [PATCH 773/935] Build 312 --- build.properties | 8 ++++---- version/1.9.4.txt | 2 +- version/update.json | 13 +++++++++---- web/versions.ini | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/build.properties b/build.properties index 10e8aa415..19707b798 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat Jun 25 15:01:49 CDT 2016 +#Wed Jun 29 20:26:39 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.9.4 forge_version=12.17.0.1965 -build_number=312 +mc_version=1.9.4 +dir_repo=./ +build_number=313 mod_name=Botania diff --git a/version/1.9.4.txt b/version/1.9.4.txt index c5e7d9272..117602655 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-311 \ No newline at end of file +r1.8-312 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 685d93756..4bdef8628 100644 --- a/version/update.json +++ b/version/update.json @@ -2,7 +2,9 @@ "1.10": { "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" }, - "1.10.2": {}, + "1.10.2": { + "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312" + }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", @@ -16,15 +18,18 @@ "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308", "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309", "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310", - "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" + "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311", + "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312" }, "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", + "1.10.2-latest": "r1.8-312", + "1.10.2-recommended": "r1.8-312", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-311", - "1.9.4-recommended": "r1.8-311" + "1.9.4-latest": "r1.8-312", + "1.9.4-recommended": "r1.8-312" } } \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index efe07c467..b279ed6fa 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -261,4 +261,6 @@ r1.8-308=1.9.4 r1.8-309=1.9.4 r1.8-310=1.9.4 r1.8-311=1.9.4 -r1.8-311=1.10 \ No newline at end of file +r1.8-311=1.10 +r1.8-312=1.9.4 +r1.8-312=1.10.2 \ No newline at end of file From 0b635c5bc7e9361d36977e55c8951779dd5f16df Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 29 Jun 2016 20:28:36 -0500 Subject: [PATCH 774/935] Fix missed change in gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8c0713e7c..cc5732c62 100644 --- a/build.gradle +++ b/build.gradle @@ -248,7 +248,7 @@ curseforge { """ releaseType = "release" addGameVersion '1.9.4' - addGameVersion '1.10' + addGameVersion '1.10.2' relations { requiredLibrary 'baubles' } From 8e70e9fa683e45831c5ffbaeb5e2a9176d355505 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 30 Jun 2016 21:24:40 -0500 Subject: [PATCH 775/935] FIx starcaller not working, blacklist aura nodes from rod of shaded mesa. Closes #387: --- .../java/vazkii/botania/common/core/proxy/CommonProxy.java | 6 ++++++ .../botania/common/item/equipment/tool/ItemStarSword.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index dd7676c09..9b3e9019e 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -11,6 +11,7 @@ package vazkii.botania.common.core.proxy; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.boss.EntityDragonPart; @@ -153,6 +154,11 @@ public class CommonProxy { if(Botania.thaumcraftLoaded) { ModBrews.initTC(); ModBrewRecipes.initTC(); + try { + @SuppressWarnings("unchecked") + Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); + BotaniaAPI.blacklistEntityFromGravityRod(clazz); + } catch (ClassNotFoundException ignored) {} } ModBlocks.addDispenserBehaviours(); 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 f3a378c13..f093099ee 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 @@ -54,7 +54,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme Vector3 posVec = Vector3.fromBlockPos(pos.getBlockPos()); Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); posVec = posVec.add(motVec); - motVec.normalize().negate().multiply(1.5); + motVec = motVec.normalize().negate().multiply(1.5); EntityFallingStar star = new EntityFallingStar(world, player); star.setPosition(posVec.x, posVec.y, posVec.z); From 44a4657cd80c1e428459b3bfcf379f68e8c8608d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jul 2016 12:09:52 -0500 Subject: [PATCH 776/935] Fix crafting halo crash and cleanup inventory utils, closes #385 --- .../common/core/helper/InventoryHelper.java | 258 ------------------ .../common/item/ItemAutocraftingHalo.java | 3 +- .../botania/common/item/ItemCraftingHalo.java | 52 ++-- 3 files changed, 33 insertions(+), 280 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 601a5be8a..c8e554b04 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -46,57 +46,6 @@ import java.util.stream.StreamSupport; // Some methods from OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { - protected static boolean areMergeCandidates(ItemStack source, ItemStack target) { - return source.isItemEqual(target) && ItemStack.areItemStackTagsEqual(source, target) && target.stackSize < target.getMaxStackSize(); - } - - public static int testInventoryInsertion(IInventory inventory, ItemStack item, EnumFacing side) { - if(item == null || item.stackSize == 0) - return 0; - item = item.copy(); - - if(inventory == null) - return 0; - - inventory.getSizeInventory(); - - int itemSizeCounter = item.stackSize; - int[] availableSlots; - - if(inventory instanceof ISidedInventory) - availableSlots = ((ISidedInventory) inventory).getSlotsForFace(side); - else { - availableSlots = buildSlotsForLinearInventory(inventory); - } - - for(int i : availableSlots) { - if(itemSizeCounter <= 0) - break; - - if (!inventory.isItemValidForSlot(i, item)) - continue; - - if(side != null && inventory instanceof ISidedInventory) - if(!((ISidedInventory)inventory).canInsertItem(i, item, side)) - continue; - - ItemStack inventorySlot = inventory.getStackInSlot(i); - if(inventorySlot == null) - itemSizeCounter -= Math.min(Math.min(itemSizeCounter, inventory.getInventoryStackLimit()), item.getMaxStackSize()); - else if(areMergeCandidates(item, inventorySlot)) { - int space = Math.min(inventory.getInventoryStackLimit(), inventorySlot.getMaxStackSize()) - inventorySlot.stackSize; - itemSizeCounter -= Math.min(itemSizeCounter, space); - } - } - - if(itemSizeCounter != item.stackSize) { - itemSizeCounter = Math.max(itemSizeCounter, 0); - return item.stackSize - itemSizeCounter; - } - - return 0; - } - public static int[] buildSlotsForLinearInventory(IInventory inv) { int[] slots = new int[inv.getSizeInventory()]; for (int i = 0; i < slots.length; i++) @@ -133,213 +82,6 @@ public class InventoryHelper { return ret; } - public static Iterable asIterable(final IItemHandler itemHandler) { - return new Iterable() { - @Override - public Iterator iterator() { - return new Iterator() { - int index = 0; - - @Override - public boolean hasNext() { - return index < itemHandler.getSlots(); - } - - @Override - public ItemStack next() { - return itemHandler.getStackInSlot(index++); - } - }; - } - - @Override - public Spliterator spliterator() { - return Spliterators.spliterator(iterator(), itemHandler.getSlots(), Spliterator.ORDERED); - } - }; - } - - public static Stream streamNonnull(IItemHandler itemHandler) { - return StreamSupport.stream(asIterable(itemHandler).spliterator(), false).filter(s -> s != null); - } - - public static class GenericInventory implements IInventory { - - protected final String inventoryTitle; - protected int slotsCount; - protected ItemStack[] inventoryContents; - protected final boolean isInvNameLocalized; - - public GenericInventory(String name, boolean isInvNameLocalized, int size) { - this.isInvNameLocalized = isInvNameLocalized; - slotsCount = size; - inventoryTitle = name; - inventoryContents = new ItemStack[size]; - } - - @Override - public ItemStack decrStackSize(int par1, int par2) { - if(inventoryContents[par1] != null) { - ItemStack itemstack; - - if(inventoryContents[par1].stackSize <= par2) { - itemstack = inventoryContents[par1]; - inventoryContents[par1] = null; - return itemstack; - } - - itemstack = inventoryContents[par1].splitStack(par2); - if(inventoryContents[par1].stackSize == 0) - inventoryContents[par1] = null; - - return itemstack; - } - return null; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public int getSizeInventory() { - return slotsCount; - } - - @Override - public ItemStack getStackInSlot(int i) { - return inventoryContents[i]; - } - - public ItemStack getStackInSlot(Enum i) { - return getStackInSlot(i.ordinal()); - } - - @Override - public ItemStack removeStackFromSlot(int i) { - if(i >= inventoryContents.length) - return null; - - if(inventoryContents[i] != null) { - ItemStack itemstack = inventoryContents[i]; - inventoryContents[i] = null; - return itemstack; - } - - return null; - } - - public boolean isItem(int slot, Item item) { - return inventoryContents[slot] != null && inventoryContents[slot].getItem() == item; - } - - @Override - public boolean isItemValidForSlot(int i, @Nonnull ItemStack itemstack) { - return true; - } - - @Override - public int getField(int id) { return 0; } - - @Override - public void setField(int id, int value) { } - - @Override - public int getFieldCount() { return 0; } - - @Override - public void clear() { - Arrays.fill(inventoryContents, null); - } - - @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { - return true; - } - - public void clearAndSetSlotCount(int amount) { - slotsCount = amount; - inventoryContents = new ItemStack[amount]; - } - - public void readFromNBT(NBTTagCompound tag) { - if(tag.hasKey("size")) - slotsCount = tag.getInteger("size"); - - NBTTagList nbttaglist = tag.getTagList("Items", 10); - inventoryContents = new ItemStack[slotsCount]; - for(int i = 0; i < nbttaglist.tagCount(); i++) { - NBTTagCompound stacktag = nbttaglist.getCompoundTagAt(i); - int j = stacktag.getByte("Slot"); - if(j >= 0 && j < inventoryContents.length) - inventoryContents[j] = ItemStack.loadItemStackFromNBT(stacktag); - } - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - inventoryContents[i] = itemstack; - - if(itemstack != null && itemstack.stackSize > getInventoryStackLimit()) - itemstack.stackSize = getInventoryStackLimit(); - } - - public void writeToNBT(NBTTagCompound tag) { - tag.setInteger("size", getSizeInventory()); - NBTTagList nbttaglist = new NBTTagList(); - for(int i = 0; i < inventoryContents.length; i++) { - if(inventoryContents[i] != null) { - NBTTagCompound stacktag = new NBTTagCompound(); - stacktag.setByte("Slot", (byte)i); - inventoryContents[i].writeToNBT(stacktag); - nbttaglist.appendTag(stacktag); - } - } - tag.setTag("Items", nbttaglist); - } - - public void copyFrom(IInventory inventory) { - for(int i = 0; i < inventory.getSizeInventory(); i++) - if(i < getSizeInventory()) { - ItemStack stack = inventory.getStackInSlot(i); - if(stack != null) - setInventorySlotContents(i, stack.copy()); - else setInventorySlotContents(i, null); - } - } - - public List contents() { - return Arrays.asList(inventoryContents); - } - - @Nonnull - @Override - public String getName() { - return null; - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Nonnull - @Override - public ITextComponent getDisplayName() { - return new TextComponentString(getName()); - } - - @Override - public void markDirty() { } - - @Override - public void openInventory(@Nonnull EntityPlayer player) { } - - @Override - public void closeInventory(@Nonnull EntityPlayer player) { } - } - public static void dropInventory(TileSimpleInventory inv, World world, IBlockState state, BlockPos pos) { if(inv != null) { for(int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index abafbe8c7..b84491605 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; @@ -33,7 +34,7 @@ public class ItemAutocraftingHalo extends ItemCraftingHalo { if(entity instanceof EntityPlayer && !equipped) { EntityPlayer player = (EntityPlayer) entity; - IInventory inv = getFakeInv(player); + IItemHandler inv = getFakeInv(player); for(int i = 1; i < SEGMENTS; i++) tryCraft(player, stack, i, false, inv, false); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 33564c6eb..07da35603 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; @@ -34,6 +35,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -47,7 +49,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemStackHandler; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -56,8 +61,6 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.core.helper.InventoryHelper.GenericInventory; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; @@ -106,10 +109,15 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - public static IInventory getFakeInv(EntityPlayer player) { - GenericInventory tempInv = new GenericInventory("temp", false, player.inventory.getSizeInventory() - 4); - tempInv.copyFrom(player.inventory); - return tempInv; + public static IItemHandler getFakeInv(EntityPlayer player) { + ItemStackHandler ret = new ItemStackHandler(player.inventory.mainInventory.length); + for(int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack stack = player.inventory.mainInventory[i]; + if(stack != null) + ret.setStackInSlot(i, player.inventory.mainInventory[i].copy()); + } + + return ret; } @Override @@ -134,7 +142,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } } - void tryCraft(EntityPlayer player, ItemStack stack, int slot, boolean particles, IInventory inv, boolean validate) { + void tryCraft(EntityPlayer player, ItemStack stack, int slot, boolean particles, IItemHandler inv, boolean validate) { ItemStack itemForPos = getItemForSlot(stack, slot); if(itemForPos == null) return; @@ -143,7 +151,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(validate) recipe = validateRecipe(player, stack, recipe, slot); - if(canCraft(player, recipe, inv)) + if(canCraft(recipe, inv)) doCraft(player, recipe, particles); } @@ -166,18 +174,18 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { return recipe; } - private static boolean canCraft(EntityPlayer player, ItemStack[] recipe, IInventory inv) { + private static boolean canCraft(ItemStack[] recipe, IItemHandler inv) { if(recipe == null) return false; - if(recipe[9].stackSize != InventoryHelper.testInventoryInsertion(inv, recipe[9], null)) + if(ItemHandlerHelper.insertItemStacked(inv, recipe[9], true) != null) return false; return consumeRecipeIngredients(recipe, inv, null); } private static void doCraft(EntityPlayer player, ItemStack[] recipe, boolean particles) { - consumeRecipeIngredients(recipe, player.inventory, player); + consumeRecipeIngredients(recipe, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP), player); if(!player.inventory.addItemStackToInventory(recipe[9])) player.dropItem(recipe[9], false); @@ -191,7 +199,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Botania.proxy.wispFX(player.worldObj, centerVector.x, centerVector.y, centerVector.z, 1F, 0F, 1F, 0.2F + 0.2F * (float) Math.random(), ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m); } - private static boolean consumeRecipeIngredients(ItemStack[] recipe, IInventory inv, EntityPlayer player) { + private static boolean consumeRecipeIngredients(ItemStack[] recipe, IItemHandler inv, EntityPlayer player) { for(int i = 0; i < 9; i++) { ItemStack ingredient = recipe[i]; if(ingredient != null && !consumeFromInventory(ingredient, inv, player)) @@ -201,8 +209,8 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { return true; } - private static boolean consumeFromInventory(ItemStack stack, IInventory inv, EntityPlayer player) { - for(int i = 0; i < inv.getSizeInventory(); i++) { + private static boolean consumeFromInventory(ItemStack stack, IItemHandler inv, EntityPlayer player) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stackAt = inv.getStackInSlot(i); if(stackAt != null && stack.isItemEqual(stackAt) && ItemStack.areItemStackTagsEqual(stack, stackAt)) { boolean consume = true; @@ -212,15 +220,15 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(container == stackAt) consume = false; else { - ItemHandlerHelper.giveItemToPlayer(player, container); + if(player == null) + ItemHandlerHelper.insertItem(inv, container, false); + else + ItemHandlerHelper.giveItemToPlayer(player, container); } } - if(consume) { - stackAt.stackSize--; - if(stackAt.stackSize == 0) - inv.setInventorySlotContents(i, null); - } + if(consume) + inv.extractItem(i, 1, false); return true; } @@ -460,6 +468,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack slotStack = getItemForSlot(stack, seg); if(slotStack != null) { mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + RenderHelper.enableStandardItemLighting(); float scale = seg == 0 ? 0.9F : 0.8F; GlStateManager.scale(scale, scale, scale); GlStateManager.rotate(180F, 0F, 1F, 0F); @@ -467,6 +476,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI); + RenderHelper.disableStandardItemLighting(); } GlStateManager.popMatrix(); @@ -587,7 +597,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } int yoff = 110; - if(setRecipe && !canCraft(player, recipe, getFakeInv(player))) { + if(setRecipe && !canCraft(recipe, getFakeInv(player))) { String warning = TextFormatting.RED + I18n.format("botaniamisc.cantCraft"); mc.fontRendererObj.drawStringWithShadow(warning, resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(warning) / 2, resolution.getScaledHeight() / 2 - yoff, 0xFFFFFF); yoff += 12; From cd3daf2b4751a13589ef9be6e1eac14ab826ab7e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jul 2016 13:17:57 -0500 Subject: [PATCH 777/935] Fix rod of bifrost going batshit. Closes #386 --- .../common/item/rod/ItemRainbowRod.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 757f91528..38d39ebc6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -66,43 +66,46 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi double x = player.posX; double y = player.posY; double z = player.posZ; + BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos((int) x, (int) y, (int) z); - double lx = 0; - double ly = -1; - double lz = 0; + double lastX = 0; + double lastY = -1; + double lastZ = 0; int count = 0; boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; - BlockPos playerPos = new BlockPos((int) x, (int) y, (int) z); - while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || world.getBlockState(playerPos).getBlock().isAir(world.getBlockState(playerPos), world, playerPos) || world.getBlockState(playerPos).getBlock() == place) { + while(count < maxlen && (int) lastX == (int) x && (int) lastY == (int) y && (int) lastZ == (int) z + || count < 4 + || world.isAirBlock(pos) + || world.getBlockState(pos).getBlock() == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) for(int j = -2; j < 1; j++) { BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); - if(world.getBlockState(pos_).getBlock().isAir(world.getBlockState(pos_), world, pos_) || world.getBlockState(pos_).getBlock() == place) { + if(world.isAirBlock(pos_) + || world.getBlockState(pos_).getBlock() == place) { world.setBlockState(pos_, place.getDefaultState()); TileBifrost tile = (TileBifrost) world.getTileEntity(pos_); if(tile != null) { - for(int k = 0; k < 4; k++) - Botania.proxy.sparkleFX(world, tile.getPos().getX() + Math.random(), tile.getPos().getY() + Math.random(), tile.getPos().getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); tile.ticks = time; } } } - lx = x; - ly = y; - lz = z; + lastX = x; + lastY = y; + lastZ = z; x += vector.x; y += vector.y; z += vector.z; + pos.setPos(x, y, z); count++; } From a76efcc6fc2bcc10785986286961123144d9d0cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Jul 2016 21:46:39 -0500 Subject: [PATCH 778/935] Actually fix #386 --- .../common/item/rod/ItemRainbowRod.java | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 38d39ebc6..babd13164 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -71,32 +71,38 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi double lastX = 0; double lastY = -1; double lastZ = 0; + BlockPos.MutableBlockPos lastChecker = new BlockPos.MutableBlockPos(); int count = 0; boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; - while(count < maxlen && (int) lastX == (int) x && (int) lastY == (int) y && (int) lastZ == (int) z - || count < 4 - || world.isAirBlock(pos) - || world.getBlockState(pos).getBlock() == place) { - if(y >= 256 || y <= 0) - break; + BlockPos.MutableBlockPos placePos = new BlockPos.MutableBlockPos(); + while (count < maxlen) { + lastChecker.setPos(lastX, lastY, lastZ); - for(int i = -2; i < 1; i++) - for(int j = -2; j < 1; j++) { - BlockPos pos_ = new BlockPos((int) x + i, (int) y, (int) z + j); - if(world.isAirBlock(pos_) - || world.getBlockState(pos_).getBlock() == place) { - world.setBlockState(pos_, place.getDefaultState()); - TileBifrost tile = (TileBifrost) world.getTileEntity(pos_); - if(tile != null) { - tile.ticks = time; + if (!lastChecker.equals(pos)) { + if (y >= world.getHeight() || y <= 0 + || (!world.isAirBlock(pos) && world.getBlockState(pos).getBlock() != place)) + break; + + for(int i = -2; i < 1; i++) + for(int j = -2; j < 1; j++) { + placePos.setPos(pos.getX() + i, pos.getY(), pos.getZ() + j); + if(world.isAirBlock(placePos) + || world.getBlockState(placePos).getBlock() == place) { + world.setBlockState(placePos, place.getDefaultState()); + TileBifrost tile = (TileBifrost) world.getTileEntity(placePos); + if(tile != null) { + tile.ticks = time; + } } - } - } + } + count++; + } + lastX = x; lastY = y; @@ -106,7 +112,6 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi y += vector.y; z += vector.z; pos.setPos(x, y, z); - count++; } if(count > 0) { From 611f33a133b8e15aac500cf4d7f8c85e623c5ac9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jul 2016 21:13:36 -0500 Subject: [PATCH 779/935] Fix #395 --- .../java/vazkii/botania/common/block/BlockOpenCrate.java | 2 +- .../vazkii/botania/common/block/tile/TileCraftCrate.java | 5 +++-- .../java/vazkii/botania/common/block/tile/TileOpenCrate.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 8e2977b9a..24db554ee 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -150,7 +150,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(pos); - return crate.onWanded(player, stack); + return crate.onWanded(world, player, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 4b7959080..7008c600b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -19,6 +19,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -186,8 +187,8 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public boolean onWanded(EntityPlayer player, ItemStack stack) { - if(!player.worldObj.isRemote) { + public boolean onWanded(World world, EntityPlayer player, ItemStack stack) { + if(!world.isRemote) { craft(false); ejectAll(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 77c476774..5d788a80a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -84,7 +84,7 @@ public class TileOpenCrate extends TileSimpleInventory { worldObj.spawnEntityInWorld(item); } - public boolean onWanded(EntityPlayer player, ItemStack stack) { + public boolean onWanded(World world, EntityPlayer player, ItemStack stack) { return false; } From 124fdeeee3fdf160d83a666a818331e64eb6ed42 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Jul 2016 21:44:10 -0500 Subject: [PATCH 780/935] Possible fix for #343 --- .../common/entity/EntityCorporeaSpark.java | 12 ++++++---- .../botania/common/entity/EntitySpark.java | 23 ++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 20ac2dd47..2c24f7131 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -89,7 +89,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { InvWithLocation inv = getSparkInventory(); if(inv == null) { if(!worldObj.isRemote) - setDead(); + dropAndKill(); return; } @@ -116,11 +116,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { setItemDisplayTicks(displayTicks + 1); } + private void dropAndKill() { + entityDropItem(new ItemStack(ModItems.corporeaSpark, 1, isMaster() ? 1 : 0), 0F); + setDead(); + } + @Override public void setDead() { super.setDead(); - if(!worldObj.isRemote) - entityDropItem(new ItemStack(ModItems.corporeaSpark, 1, isMaster() ? 1 : 0), 0F); connections.remove(this); connectionsClient.remove(this); restartNetwork(); @@ -272,7 +275,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(stack != null) { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { - setDead(); + if(!player.worldObj.isRemote) + dropAndKill(); if(isMaster()) restartNetwork(); if(player.worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index c4a7e28c2..7500166d3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -88,7 +88,7 @@ public class EntitySpark extends Entity implements ISparkEntity { ISparkAttachable tile = getAttachedTile(); if(tile == null) { - setDead(); + dropAndKill(); return; } @@ -223,6 +223,14 @@ public class EntitySpark extends Entity implements ISparkEntity { } } + private void dropAndKill() { + SparkUpgradeType upgrade = getUpgrade(); + entityDropItem(new ItemStack(ModItems.spark), 0F); + if(upgrade != SparkUpgradeType.NONE) + entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); + setDead(); + } + @Override public boolean canBeCollidedWith() { return true; @@ -244,7 +252,7 @@ public class EntitySpark extends Entity implements ISparkEntity { transfers.clear(); removeTransferants = 2; - } else setDead(); + } else dropAndKill(); player.swingArm(hand); return true; } else { @@ -281,17 +289,6 @@ public class EntitySpark extends Entity implements ISparkEntity { cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } - @Override - public void setDead() { - super.setDead(); - if(!worldObj.isRemote) { - SparkUpgradeType upgrade = getUpgrade(); - entityDropItem(new ItemStack(ModItems.spark), 0F); - if(upgrade != SparkUpgradeType.NONE) - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); - } - } - @Override public ISparkAttachable getAttachedTile() { int x = MathHelper.floor_double(posX); From 7f5d3859e4b96c4ed7cb31c76752902c28722dc8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jul 2016 16:52:59 -0500 Subject: [PATCH 781/935] Added the Bergamute --- .../botania/api/subtile/SubTileEntity.java | 8 + .../api/subtile/SubTileFunctional.java | 4 +- .../api/subtile/SubTileGenerating.java | 4 +- .../client/core/handler/ModelHandler.java | 2 + .../client/core/proxy/ClientProxy.java | 2 + .../client/gui/lexicon/GuiLexiconIndex.java | 4 +- .../common/block/BlockSpecialFlower.java | 4 +- .../botania/common/block/ModBlocks.java | 2 + .../functional/BergamuteEventHandler.java | 99 ++++ .../subtile/functional/SubTileBergamute.java | 61 +++ .../common/crafting/ModPetalRecipes.java | 2 + .../common/item/ItemObedienceStick.java | 2 +- ...conEntry.java => AlfheimLexiconEntry.java} | 4 +- ...xiconEntry.java => BasicLexiconEntry.java} | 6 +- ...iconEntry.java => CompatLexiconEntry.java} | 4 +- ...LexiconEntry.java => DogLexiconEntry.java} | 4 +- ...exiconEntry.java => HeadLexiconEntry.java} | 4 +- .../botania/common/lexicon/LexiconData.java | 458 +++++++++--------- ...xiconEntry.java => RelicLexiconEntry.java} | 4 +- ...LexiconEntry.java => TutLexiconEntry.java} | 4 +- .../common/lexicon/WIPLexiconEntry.java | 2 +- ...conEntry.java => WelcomeLexiconEntry.java} | 4 +- .../botania/common/lexicon/page/PageText.java | 7 +- .../botania/common/lib/LibBlockNames.java | 1 + .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 8 + 26 files changed, 447 insertions(+), 258 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java create mode 100644 src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java rename src/main/java/vazkii/botania/common/lexicon/{ALexiconEntry.java => AlfheimLexiconEntry.java} (60%) rename src/main/java/vazkii/botania/common/lexicon/{BLexiconEntry.java => BasicLexiconEntry.java} (89%) rename src/main/java/vazkii/botania/common/lexicon/{CLexiconEntry.java => CompatLexiconEntry.java} (79%) rename src/main/java/vazkii/botania/common/lexicon/{DLexiconEntry.java => DogLexiconEntry.java} (84%) rename src/main/java/vazkii/botania/common/lexicon/{HLexiconEntry.java => HeadLexiconEntry.java} (80%) rename src/main/java/vazkii/botania/common/lexicon/{RLexiconEntry.java => RelicLexiconEntry.java} (87%) rename src/main/java/vazkii/botania/common/lexicon/{TLexiconEntry.java => TutLexiconEntry.java} (89%) rename src/main/java/vazkii/botania/common/lexicon/{WLexiconEntry.java => WelcomeLexiconEntry.java} (92%) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 8c79e71f6..a9fbbf435 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -52,6 +52,14 @@ public class SubTileEntity { public static final String TAG_TYPE = "type"; public static final String TAG_TICKS_EXISTED = "ticksExisted"; + public final BlockPos getPos() { + return supertile.getPos(); + } + + public final World getWorld() { + return supertile.getWorld(); + } + public void setSupertile(TileEntity tile) { supertile = tile; } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 49bf6dbf7..5c13a3a54 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -34,7 +34,7 @@ import java.awt.*; */ public class SubTileFunctional extends SubTileEntity { - public static final int RANGE = 10; + public static final int LINK_RANGE = 10; private static final String TAG_MANA = "mana"; @@ -117,7 +117,7 @@ public class SubTileFunctional extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllPoolsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), RANGE); + linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), LINK_RANGE); sizeLastCheck = size; } } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 99841f1de..b715827b4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -40,7 +40,7 @@ import java.util.List; */ public class SubTileGenerating extends SubTileEntity { - public static final int RANGE = 6; + public static final int LINK_RANGE = 6; private static final String TAG_MANA = "mana"; @@ -142,7 +142,7 @@ public class SubTileGenerating extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), RANGE); + linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), LINK_RANGE); sizeLastCheck = size; } } 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 9ff0e8ee5..ed67f2183 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -59,6 +59,7 @@ import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileBergamute; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; import vazkii.botania.common.block.subtile.functional.SubTileClayconia; import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; @@ -277,6 +278,7 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); // todo model } private static void registerStandardBlocks() { 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 9b147ffca..089a7020e 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -106,6 +106,7 @@ import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.client.render.world.SkyblockRenderEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.subtile.functional.BergamuteEventHandler; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileAvatar; @@ -211,6 +212,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); MinecraftForge.EVENT_BUS.register(new RenderLexicon()); MinecraftForge.EVENT_BUS.register(new BossBarHandler()); + MinecraftForge.EVENT_BUS.register(new BergamuteEventHandler()); if(ConfigHandler.useAdaptativeConfig) MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); 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 ea6a12b83..433cd8c83 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -28,7 +28,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; -import vazkii.botania.common.lexicon.DLexiconEntry; +import vazkii.botania.common.lexicon.DogLexiconEntry; import java.io.IOException; import java.util.ArrayList; @@ -160,7 +160,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { if(entry == tutEntry) tutPage = page; - if(entry instanceof DLexiconEntry) + if(entry instanceof DogLexiconEntry) button.dog = true; } else button.displayString = ""; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 24ba0b6f9..7b7f45cc1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -114,13 +114,13 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I LibBlockNames.SUBTILE_VINCULOTUS, LibBlockNames.SUBTILE_SPECTRANTHEMUM, LibBlockNames.SUBTILE_BUBBELL, - LibBlockNames.SUBTILE_SOLEGNOLIA)); + LibBlockNames.SUBTILE_SOLEGNOLIA, + LibBlockNames.SUBTILE_BERGAMUTE)); } private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); protected BlockSpecialFlower() { - super(); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 64e8a2a18..cb28eb687 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -84,6 +84,7 @@ import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileBergamute; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; import vazkii.botania.common.block.subtile.functional.SubTileClayconia; import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; @@ -507,6 +508,7 @@ public final class ModBlocks { registerSubTileWithMini(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); registerSubTileWithMini(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BERGAMUTE, SubTileBergamute.class); } public static void registerMultiparts() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java new file mode 100644 index 000000000..222c8e799 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -0,0 +1,99 @@ +package vazkii.botania.common.block.subtile.functional; + +import net.minecraft.client.audio.ISound; +import net.minecraft.client.audio.Sound; +import net.minecraft.client.audio.SoundEventAccessor; +import net.minecraft.client.audio.SoundHandler; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraftforge.client.event.sound.PlaySoundEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPI; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Color; +import java.util.Random; + +@SideOnly(Side.CLIENT) +public class BergamuteEventHandler { + private static final Random RAND = new Random(); + private static final float MULTIPLIER = 0.1F; + + @SubscribeEvent(priority = EventPriority.LOWEST) + public void onSoundEvent(PlaySoundEvent evt) { + ISound sound = evt.getResultSound(); + + if (sound != null && shouldSilence(sound.getCategory())) { + SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); + + if (berg != null) { + evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); + + if (RAND.nextBoolean()) { + Color color = new Color(berg.getColor()); + BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + } + } + } + } + + private static boolean shouldSilence(SoundCategory category) { + return category != SoundCategory.VOICE && category != SoundCategory.MUSIC; + } + + @SideOnly(Side.CLIENT) + private static class WrappedSound implements ISound { + + private final ISound compose; + private final float volMult; + + private WrappedSound(ISound toWrap, float volMult) { + this.compose = toWrap; + this.volMult = volMult; + } + + @Override + public float getVolume() { + return compose.getVolume() * volMult; + } + + @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } + @Nullable @Override public SoundEventAccessor createAccessor(SoundHandler handler) { return compose.createAccessor(handler); } + @Nonnull @Override public Sound getSound() { + return compose.getSound(); + } + + @Nonnull + @Override + public SoundCategory getCategory() { + return compose.getCategory(); + } + + @Override + public boolean canRepeat() { + return compose.canRepeat(); + } + + @Override + public int getRepeatDelay() { + return compose.getRepeatDelay(); + } + + @Override + public float getPitch() { + return compose.getPitch(); + } + + @Override + public float getXPosF() { + return compose.getXPosF(); + } + @Override public float getYPosF() { return compose.getYPosF(); } + @Override public float getZPosF() { return compose.getZPosF(); } + @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } + } +} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java new file mode 100644 index 000000000..099392b34 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -0,0 +1,61 @@ +package vazkii.botania.common.block.subtile.functional; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.lexicon.LexiconData; + +import java.util.Collections; +import java.util.Set; +import java.util.WeakHashMap; + +public class SubTileBergamute extends SubTileFunctional { + private static final int RANGE = 4; + private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + + @Override + public void onUpdate() { + super.onUpdate(); + + if (supertile.getWorld().isRemote) { + if(!existingFlowers.contains(this)) { + existingFlowers.add(this); + } + } + } + + // todo seems expensive when we have lots of sounds cache maybe? + protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { + return existingFlowers.stream() + .filter(f -> f.redstoneSignal == 0) + .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) + .filter(f -> f.supertile.getDistanceSq(x, y, z) <= RANGE * RANGE) + .findAny().orElse(null); + } + + @Override + public boolean acceptsRedstone() { + return true; + } + + @Override + public int getMaxMana() { + return 1; + } + + @Override + public int getColor() { + return 0x1FCBFF; + } + + @Override + public RadiusDescriptor getRadius() { + return new RadiusDescriptor.Circle(toBlockPos(), RANGE); + } + + @Override + public LexiconEntry getEntry() { + return LexiconData.bergamute; + } + +} diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 2a1c6b947..5c6ee477f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -75,6 +75,7 @@ public final class ModPetalRecipes { public static RecipePetals marimorphosisRecipe; public static RecipePetals bubbellRecipe; public static RecipePetals solegnoliaRecipe; + public static RecipePetals bergamuteRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -125,6 +126,7 @@ public final class ModPetalRecipes { marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot); 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); + bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); // todo temporary ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 09084277a..11e17b6cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -44,7 +44,7 @@ public class ItemObedienceStick extends ItemMod { if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { boolean pool = tileAt instanceof IManaPool; Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; - int range = pool ? SubTileFunctional.RANGE : SubTileGenerating.RANGE; + int range = pool ? SubTileFunctional.LINK_RANGE : SubTileGenerating.LINK_RANGE; for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) diff --git a/src/main/java/vazkii/botania/common/lexicon/ALexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java similarity index 60% rename from src/main/java/vazkii/botania/common/lexicon/ALexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java index 5ffc8b989..4fc32c0bc 100644 --- a/src/main/java/vazkii/botania/common/lexicon/ALexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/AlfheimLexiconEntry.java @@ -3,9 +3,9 @@ package vazkii.botania.common.lexicon; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -public class ALexiconEntry extends BLexiconEntry { +public class AlfheimLexiconEntry extends BasicLexiconEntry { - public ALexiconEntry(String unlocalizedName, LexiconCategory category) { + public AlfheimLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); setKnowledgeType(BotaniaAPI.elvenKnowledge); } diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java similarity index 89% rename from src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java index 0cf89b188..c0f2afa5b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java @@ -18,9 +18,9 @@ import vazkii.botania.api.lexicon.LexiconPage; import javax.annotation.Nonnull; -public class BLexiconEntry extends LexiconEntry { +public class BasicLexiconEntry extends LexiconEntry { - public BLexiconEntry(String unlocalizedName, LexiconCategory category) { + public BasicLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); BotaniaAPI.addEntry(this, category); } @@ -59,7 +59,7 @@ public class BLexiconEntry extends LexiconEntry { @Override public int compareTo(@Nonnull LexiconEntry o) { - return o instanceof WLexiconEntry ? 1 : super.compareTo(o); + return o instanceof WelcomeLexiconEntry ? 1 : super.compareTo(o); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java similarity index 79% rename from src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java index f7920c3fc..541974c24 100644 --- a/src/main/java/vazkii/botania/common/lexicon/CLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/CompatLexiconEntry.java @@ -14,11 +14,11 @@ import vazkii.botania.api.lexicon.IAddonEntry; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.common.lib.LibMisc; -public class CLexiconEntry extends BLexiconEntry implements IAddonEntry { +public class CompatLexiconEntry extends BasicLexiconEntry implements IAddonEntry { final String mod; - public CLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { + public CompatLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) { super(unlocalizedName, category); this.mod = mod; } diff --git a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java similarity index 84% rename from src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java index 7db5de0e9..ae2190f08 100644 --- a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/DogLexiconEntry.java @@ -15,9 +15,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.PersistentVariableHelper; -public class DLexiconEntry extends BLexiconEntry { +public class DogLexiconEntry extends BasicLexiconEntry { - public DLexiconEntry(String unlocalizedName, LexiconCategory category) { + public DogLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); } diff --git a/src/main/java/vazkii/botania/common/lexicon/HLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java similarity index 80% rename from src/main/java/vazkii/botania/common/lexicon/HLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java index 099956394..e4cc9a29a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/HLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/HeadLexiconEntry.java @@ -12,9 +12,9 @@ package vazkii.botania.common.lexicon; import vazkii.botania.api.lexicon.LexiconCategory; -public class HLexiconEntry extends ALexiconEntry { +public class HeadLexiconEntry extends AlfheimLexiconEntry { - public HLexiconEntry(String unlocalizedName, LexiconCategory category) { + public HeadLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index fce0f44d2..5a9d0a773 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -119,6 +119,7 @@ public final class LexiconData { public static LexiconEntry marimorphosis; public static LexiconEntry bubbell; public static LexiconEntry solegnolia; + public static LexiconEntry bergamute; public static LexiconEntry generatingIntro; public static LexiconEntry passiveGen; @@ -320,10 +321,10 @@ public final class LexiconData { LexiconCategory categoryMisc = BotaniaAPI.categoryMisc; // BASICS ENTRIES - welcome = new WLexiconEntry(); - tutorial = new TLexiconEntry(); + welcome = new WelcomeLexiconEntry(); + tutorial = new TutLexiconEntry(); - flowers = new BLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); + flowers = new BasicLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics); flowers.setPriority() .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesPetals), @@ -338,20 +339,20 @@ public final class LexiconData { new PageCraftingRecipe("13", ModCraftingRecipes.recipesReversePetalBlocks)) .setIcon(new ItemStack(ModBlocks.flower, 1, 6)); - apothecary = new BLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); + apothecary = new BasicLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics); apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("7"), new PageText("6"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesApothecary)); - lexicon = new BLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics); + lexicon = new BasicLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics); lexicon.setPriority().setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLexicon), new PageText("2")); - wand = new BLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics); + wand = new BasicLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics); wand.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesTwigWand)); - pureDaisy = new BLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); + pureDaisy = new BasicLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); pureDaisy.setPriority() .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), @@ -362,7 +363,7 @@ public final class LexiconData { LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingrock), pureDaisy, 1); - runicAltar = new BLexiconEntry(LibLexicon.BASICS_RUNE_ALTAR, categoryBasics); + runicAltar = new BasicLexiconEntry(LibLexicon.BASICS_RUNE_ALTAR, categoryBasics); runicAltar.setPriority().setLexiconPages(new PageText("21"), new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesRuneAltar), new PageText("3"), new PageText("20"), new PageText("22"), new PageRuneRecipe("4", ModRuneRecipes.recipeWaterRune), @@ -382,21 +383,21 @@ public final class LexiconData { new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune)); - terrasteel = new BLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); + terrasteel = new BasicLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraPlate), new PageText("2"), new PageMultiblock("4", ModMultiblocks.terrasteelPlate), new PageTerrasteel("3")) .setIcon(new ItemStack(ModItems.manaResource, 1, 4)); - blackLotus = new BLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); + blackLotus = new BasicLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); blackLotus.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.blackLotus)); blackLotus.addExtraDisplayedRecipe(new ItemStack(ModItems.blackLotus)); - flowerBag = new BLexiconEntry(LibLexicon.BASICS_FLOWER_BAG, categoryBasics); + flowerBag = new BasicLexiconEntry(LibLexicon.BASICS_FLOWER_BAG, categoryBasics); flowerBag.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlowerBag)); if (Botania.gardenOfGlassLoaded) { - gardenOfGlass = new BLexiconEntry(LibLexicon.BASICS_GARDEN_OF_GLASS, categoryBasics); + gardenOfGlass = new BasicLexiconEntry(LibLexicon.BASICS_GARDEN_OF_GLASS, categoryBasics); gardenOfGlass.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeRootToSapling), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRootToFertilizer), @@ -408,18 +409,18 @@ public final class LexiconData { } if (Botania.thaumcraftLoaded) - new CLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel + new CompatLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel // MANA ENTRIES - manaIntro = new BLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); + manaIntro = new BasicLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); manaIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); - spreader = new BLexiconEntry(LibLexicon.MANA_SPREADER, categoryMana); + spreader = new BasicLexiconEntry(LibLexicon.MANA_SPREADER, categoryMana); spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader), new PageText("10")); - pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); + pool = new BasicLexiconEntry(LibLexicon.MANA_POOL, categoryMana); pool.setPriority() .setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), @@ -436,21 +437,21 @@ public final class LexiconData { new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.prismarineRecipe)) .setIcon(new ItemStack(ModBlocks.pool)); - sparks = new BLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); + sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesSpark)); - sparkUpgrades = new ALexiconEntry(LibLexicon.MANA_SPARK_UPGRADES, categoryMana); + sparkUpgrades = new AlfheimLexiconEntry(LibLexicon.MANA_SPARK_UPGRADES, categoryMana); sparkUpgrades.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSparkUpgrades)); if (ConfigHandler.fluxfieldEnabled) { - rfGenerator = new BLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); + rfGenerator = new BasicLexiconEntry(LibLexicon.MANA_RF_GENERATOR, categoryMana); rfGenerator.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRFGenerator)); } - lenses = new BLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); + lenses = new BasicLexiconEntry(LibLexicon.MANA_LENSES, categoryMana); lenses.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesManaLens), new PageText("4"), new PageText("5"), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeLensVelocity), new PageText("8"), @@ -470,38 +471,38 @@ public final class LexiconData { new PageCraftingRecipe("35", ModCraftingRecipes.recipeLensPiston), new PageText("36"), new PageCraftingRecipe("37", ModCraftingRecipes.recipesLensFlash)); - distributor = new BLexiconEntry(LibLexicon.MANA_DISTRIBUTOR, categoryMana); + distributor = new BasicLexiconEntry(LibLexicon.MANA_DISTRIBUTOR, categoryMana); distributor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDistributor)); - manaVoid = new BLexiconEntry(LibLexicon.MANA_VOID, categoryMana); + manaVoid = new BasicLexiconEntry(LibLexicon.MANA_VOID, categoryMana); manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaVoid)); - manaTablet = new BLexiconEntry(LibLexicon.MANA_TABLET, categoryMana); + manaTablet = new BasicLexiconEntry(LibLexicon.MANA_TABLET, categoryMana); manaTablet.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesManaTablet)); - manaMirror = new BLexiconEntry(LibLexicon.MANA_MIRROR, categoryMana); + manaMirror = new BasicLexiconEntry(LibLexicon.MANA_MIRROR, categoryMana); manaMirror.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaMirror)); - manaDetector = new BLexiconEntry(LibLexicon.MANA_DETECTOR, categoryMana); + manaDetector = new BasicLexiconEntry(LibLexicon.MANA_DETECTOR, categoryMana); manaDetector.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaDetector)); - redstoneSpreader = new BLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); + redstoneSpreader = new BasicLexiconEntry(LibLexicon.MANA_REDSTONE_SPREADER, categoryMana); redstoneSpreader.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRedstoneSpreader)); - manastar = new BLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); + manastar = new BasicLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); manastar.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.manastarRecipe)); - dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); + dreamwoodSpreader = new AlfheimLexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesDreamwoodSpreader), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader)); - elvenLenses = new ALexiconEntry(LibLexicon.MANA_ELVEN_LENSES, categoryMana); + elvenLenses = new AlfheimLexiconEntry(LibLexicon.MANA_ELVEN_LENSES, categoryMana); elvenLenses.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLensPaint), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeLensWarp), new PageText("5"), @@ -509,202 +510,205 @@ public final class LexiconData { new PageCraftingRecipe("8", ModCraftingRecipes.recipeLensFirework), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeLensFlare)); - prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana); + prism = new AlfheimLexiconEntry(LibLexicon.MANA_PRISM, categoryMana); prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrism)); - poolCart = new BLexiconEntry(LibLexicon.MANA_POOL_CART, categoryMana); + poolCart = new BasicLexiconEntry(LibLexicon.MANA_POOL_CART, categoryMana); poolCart.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipePoolCart), new PageCraftingRecipe("4", ModCraftingRecipes.recipePump)); - sparkChanger = new ALexiconEntry(LibLexicon.MANA_SPARK_CHANGER, categoryMana); + sparkChanger = new AlfheimLexiconEntry(LibLexicon.MANA_SPARK_CHANGER, categoryMana); sparkChanger.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeSparkChanger)); - bellows = new BLexiconEntry(LibLexicon.MANA_BELLOWS, categoryMana); + bellows = new BasicLexiconEntry(LibLexicon.MANA_BELLOWS, categoryMana); bellows.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBellows)); // FUNCTIONAL FLOWERS ENTRIES - functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); + functionalIntro = new BasicLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)) .setIcon(null); ; - flowerShrinking = new BLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); + flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)) .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); - flowerSpeed = new BLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); + flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); flowerSpeed.setIcon(new ItemStack(Blocks.DIRT, 1, 2)); - jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); + jadedAmaranthus = new BasicLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); - bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); + bellethorne = new BasicLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bellethorneRecipe)); - dreadthorne = new BLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); + dreadthorne = new BasicLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.dreadthorneRecipe)); - heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); + heiseiDream = new AlfheimLexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.heiseiDreamRecipe)); - tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); + tigerseye = new BasicLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tigerseyeRecipe)); - orechid = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) - : new ALexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); + orechid = Botania.gardenOfGlassLoaded ? new BasicLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) + : new AlfheimLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidRecipe)); if (Botania.gardenOfGlassLoaded) orechid.setPriority(); - orechidIgnem = new ALexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); + orechidIgnem = new AlfheimLexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidIgnemRecipe)); if (ConfigHandler.fallenKanadeEnabled) { - fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); + fallenKanade = new BasicLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe<>("1", ModPetalRecipes.fallenKanadeRecipe)); } - exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); + exoflame = new BasicLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.exoflameRecipe)); - agricarnation = new BLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); + agricarnation = new BasicLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.agricarnationRecipe)); - hopperhock = new BLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); + hopperhock = new BasicLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.hopperhockRecipe)); - tangleberrie = new BLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); + tangleberrie = new BasicLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tangleberrieRecipe)); - jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); + jiyuulia = new BasicLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jiyuuliaRecipe)); - rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); + rannuncarpus = new BasicLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.rannuncarpusRecipe)); - hyacidus = new BLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); + hyacidus = new BasicLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.hyacidusRecipe)); - pollidisiac = new BLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); + pollidisiac = new BasicLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.pollidisiacRecipe)); - clayconia = new BLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); + clayconia = new BasicLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.clayconiaRecipe)); - loonium = new ALexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); + loonium = new AlfheimLexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.looniumRecipe)); - daffomill = new BLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); + daffomill = new BasicLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.daffomillRecipe)); - vinculotus = new BLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); + vinculotus = new BasicLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.vinculotusRecipe)); - spectranthemum = new ALexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); + spectranthemum = new AlfheimLexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.spectranthemumRecipe)); - medumone = new BLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); + medumone = new BasicLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.medumoneRecipe)); - marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); + marimorphosis = new BasicLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe<>("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); - bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); + bubbell = new AlfheimLexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bubbellRecipe)); - solegnolia = new BLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); + solegnolia = new BasicLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.solegnoliaRecipe)); + bergamute = new BasicLexiconEntry(LibLexicon.FFLOWER_BERGAMUTE, categoryFunctionalFlowers); + bergamute.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bergamuteRecipe)); + // GENERATING FLOWERS ENTRIES if (ConfigHandler.hardcorePassiveGeneration > 0) { - generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); + generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); } - passiveGen = new BLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers); + passiveGen = new BasicLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers); passiveGen.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) .setIcon(new ItemStack(Blocks.DEADBUSH)); - primusLoci = new BLexiconEntry(LibLexicon.GFLOWER_PRIMUS_LOCI, categoryGenerationFlowers); + primusLoci = new BasicLexiconEntry(LibLexicon.GFLOWER_PRIMUS_LOCI, categoryGenerationFlowers); primusLoci.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); primusLoci.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); - daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); + daybloom = new BasicLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe)); - nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); + nightshade = new BasicLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe)); - endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); + endoflame = new BasicLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PagePetalRecipe<>("2", ModPetalRecipes.endoflameRecipe)); - hydroangeas = new BLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); + hydroangeas = new BasicLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe<>("1", ModPetalRecipes.hydroangeasRecipe)); - thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); + thermalily = new BasicLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("1", ModPetalRecipes.thermalilyRecipe)); - arcaneRose = new BLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); + arcaneRose = new BasicLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.arcaneRoseRecipe)); - munchdew = new BLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); + munchdew = new BasicLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); munchdew.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.munchdewRecipe)); - entropinnyum = new BLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); + entropinnyum = new BasicLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.entropinnyumRecipe)); - kekimurus = new ALexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); + kekimurus = new AlfheimLexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.kekimurusRecipe)); - gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); + gourmaryllis = new BasicLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.gourmaryllisRecipe)); - narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); + narslimmus = new BasicLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.narslimmusRecipe)); - spectrolus = new ALexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); + spectrolus = new AlfheimLexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); - rafflowsia = new ALexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); + rafflowsia = new AlfheimLexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("4", ModPetalRecipes.rafflowsiaRecipe)); - dandelifeon = new ALexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); + dandelifeon = new AlfheimLexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), new PageText("7"), new PagePetalRecipe<>("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); // DEVICES ENTRIES - pylon = new BLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); + pylon = new BasicLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); pylon.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePylon)); if (ConfigHandler.enchanterEnabled) { - manaEnchanting = new BLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); + manaEnchanting = new BasicLexiconEntry(LibLexicon.DEVICE_MANA_ENCHANTING, categoryDevices); manaEnchanting .setLexiconPages(new PageText("0"), new PageText("1"), new PageMultiblock("2", ModMultiblocks.enchanter), new PageText("5"), new PageText("6"), @@ -712,10 +716,10 @@ public final class LexiconData { .setIcon(new ItemStack(ModBlocks.enchanter)); } - turntable = new BLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); + turntable = new BasicLexiconEntry(LibLexicon.DEVICE_TURNTABLE, categoryDevices); turntable.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTurntable)); - alchemy = new BLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); + alchemy = new BasicLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); alchemy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeAlchemyCatalyst), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), @@ -743,23 +747,23 @@ public final class LexiconData { new PageManaInfusionRecipe("25", ModManaAlchemyRecipes.flowersRecipes), new PageManaInfusionRecipe("23", ModManaAlchemyRecipes.coarseDirtRecipe)); - openCrate = new BLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); + openCrate = new BasicLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); openCrate.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeOpenCrate)); - forestEye = new BLexiconEntry(LibLexicon.DEVICE_FOREST_EYE, categoryDevices); + forestEye = new BasicLexiconEntry(LibLexicon.DEVICE_FOREST_EYE, categoryDevices); forestEye.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeForestEye)); - forestDrum = new BLexiconEntry(LibLexicon.DEVICE_FOREST_DRUM, categoryDevices); + forestDrum = new BasicLexiconEntry(LibLexicon.DEVICE_FOREST_DRUM, categoryDevices); forestDrum.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeForestDrum)); - platform = new BLexiconEntry(LibLexicon.DEVICE_PLATFORM, categoryDevices); + platform = new BasicLexiconEntry(LibLexicon.DEVICE_PLATFORM, categoryDevices); platform.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePlatform)); - conjurationCatalyst = new ALexiconEntry(LibLexicon.DEVICE_MANA_CONJURATION, categoryDevices); + conjurationCatalyst = new AlfheimLexiconEntry(LibLexicon.DEVICE_MANA_CONJURATION, categoryDevices); conjurationCatalyst.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeConjurationCatalyst), new PageManaInfusionRecipe("2", ModManaConjurationRecipes.redstoneRecipe), @@ -773,14 +777,14 @@ public final class LexiconData { new PageManaInfusionRecipe("10", ModManaConjurationRecipes.leavesRecipes), new PageManaInfusionRecipe("11", ModManaConjurationRecipes.grassRecipe)); - spectralPlatform = new ALexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices); + spectralPlatform = new AlfheimLexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices); spectralPlatform.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpectralPlatform)); - gatherDrum = new ALexiconEntry(LibLexicon.DEVICE_GATHER_DRUM, categoryDevices); + gatherDrum = new AlfheimLexiconEntry(LibLexicon.DEVICE_GATHER_DRUM, categoryDevices); gatherDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGatherDrum)); - craftCrate = new ALexiconEntry(LibLexicon.DEVICE_CRAFT_CRATE, categoryDevices); + craftCrate = new AlfheimLexiconEntry(LibLexicon.DEVICE_CRAFT_CRATE, categoryDevices); craftCrate .setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipePlaceholder), new PageText("3"), @@ -789,7 +793,7 @@ public final class LexiconData { new PageCraftingRecipe("9", ModCraftingRecipes.recipesPatterns)) .setIcon(new ItemStack(ModBlocks.openCrate, 1, 1)); - brewery = new BLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); + brewery = new BasicLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); brewery.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBrewery), new PageCraftingRecipe("3", ModCraftingRecipes.recipeVial), new PageText("4"), @@ -807,11 +811,11 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.nightVisionBrew, "15a", "15b"), new PageBrew(ModBrewRecipes.absorptionBrew, "16a", "16b")); - flasks = new ALexiconEntry(LibLexicon.DEVICE_FLASKS, categoryDevices); + flasks = new AlfheimLexiconEntry(LibLexicon.DEVICE_FLASKS, categoryDevices); flasks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeFlask)); - complexBrews = new BLexiconEntry(LibLexicon.DEVICE_COMPLEX_BREWS, categoryDevices); + complexBrews = new BasicLexiconEntry(LibLexicon.DEVICE_COMPLEX_BREWS, categoryDevices); complexBrews.setLexiconPages(new PageText("0"), new PageBrew(ModBrewRecipes.overloadBrew, "1a", "1b"), new PageBrew(ModBrewRecipes.soulCrossBrew, "2a", "2b"), new PageBrew(ModBrewRecipes.featherFeetBrew, "3a", "3b"), @@ -821,60 +825,60 @@ public final class LexiconData { .setIcon(((IBrewContainer) ModItems.vial).getItemForBrew(ModBrews.jumpBoost, new ItemStack(ModItems.vial))); - incense = new BLexiconEntry(LibLexicon.DEVICE_INCENSE, categoryDevices); + incense = new BasicLexiconEntry(LibLexicon.DEVICE_INCENSE, categoryDevices); incense.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("5"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeIncenseStick), new PageCraftingRecipe("4", ModCraftingRecipes.recipeIncensePlate)); - hourglass = new BLexiconEntry(LibLexicon.DEVICE_HOURGLASS, categoryDevices); + hourglass = new BasicLexiconEntry(LibLexicon.DEVICE_HOURGLASS, categoryDevices); hourglass.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipeHourglass)); - ghostRail = new ALexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices); + ghostRail = new AlfheimLexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices); ghostRail.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGhostRail)); - canopyDrum = new BLexiconEntry(LibLexicon.DEVICE_CANOPY_DRUM, categoryDevices); + canopyDrum = new BasicLexiconEntry(LibLexicon.DEVICE_CANOPY_DRUM, categoryDevices); canopyDrum.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCanopyDrum)); - cocoon = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices) - : new ALexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices); + cocoon = Botania.gardenOfGlassLoaded ? new BasicLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices) + : new AlfheimLexiconEntry(LibLexicon.DEVICE_COCOON, categoryDevices); cocoon.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCocoon)); - manaBomb = new ALexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); + manaBomb = new AlfheimLexiconEntry(LibLexicon.DEVICE_MANA_BOMB, categoryDevices); manaBomb.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaBomb)); - teruTeruBozu = new BLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); + teruTeruBozu = new BasicLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); teruTeruBozu.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTeruTeruBozu)); - avatar = new BLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices); + avatar = new BasicLexiconEntry(LibLexicon.DEVICE_AVATAR, categoryDevices); avatar.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAvatar)); - felPumpkin = new BLexiconEntry(LibLexicon.DEVICE_FEL_PUMPKIN, categoryDevices); + felPumpkin = new BasicLexiconEntry(LibLexicon.DEVICE_FEL_PUMPKIN, categoryDevices); felPumpkin.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFelPumpkin)); // TOOLS ENTRIES - manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); + manaBlaster = new BasicLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); - grassSeeds = new BLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools); + grassSeeds = new BasicLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools); grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesAltGrassSeeds)); - dirtRod = new BLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools); + dirtRod = new BasicLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools); dirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtRod)); - terraformRod = new BLexiconEntry(LibLexicon.TOOL_TERRAFORM_ROD, categoryTools); + terraformRod = new BasicLexiconEntry(LibLexicon.TOOL_TERRAFORM_ROD, categoryTools); terraformRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeTerraformRod)); - manasteelGear = new BLexiconEntry(LibLexicon.TOOL_MANASTEEL_GEAR, categoryTools); + manasteelGear = new BasicLexiconEntry(LibLexicon.TOOL_MANASTEEL_GEAR, categoryTools); manasteelGear.setPriority().setLexiconPages(new PageText("0"), new PageText("10"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManasteelPick), new PageCraftingRecipe("2", ModCraftingRecipes.recipeManasteelShovel), @@ -886,29 +890,29 @@ public final class LexiconData { new PageCraftingRecipe("8", ModCraftingRecipes.recipeManasteelLegs), new PageCraftingRecipe("9", ModCraftingRecipes.recipeManasteelBoots)); - terrasteelArmor = new BLexiconEntry(LibLexicon.TOOL_TERRASTEEL_ARMOR, categoryTools); + terrasteelArmor = new BasicLexiconEntry(LibLexicon.TOOL_TERRASTEEL_ARMOR, categoryTools); terrasteelArmor.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerrasteelHelm), new PageCraftingRecipe("2", ModCraftingRecipes.recipeTerrasteelChest), new PageCraftingRecipe("3", ModCraftingRecipes.recipeTerrasteelLegs), new PageCraftingRecipe("4", ModCraftingRecipes.recipeTerrasteelBoots)); - grassHorn = new BLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); + grassHorn = new BasicLexiconEntry(LibLexicon.TOOL_GRASS_HORN, categoryTools); grassHorn.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGrassHorn), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLeafHorn), new PageCraftingRecipe("3", ModCraftingRecipes.recipeSnowHorn)); - terraBlade = new BLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); + terraBlade = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_SWORD, categoryTools); terraBlade.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraSword)); - terraPick = new BLexiconEntry(LibLexicon.TOOL_TERRA_PICK, categoryTools); + terraPick = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_PICK, categoryTools); terraPick.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipeTerraPick)); - waterRod = new BLexiconEntry(LibLexicon.TOOL_WATER_ROD, categoryTools); + waterRod = new BasicLexiconEntry(LibLexicon.TOOL_WATER_ROD, categoryTools); waterRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRod)); - elfGear = new ALexiconEntry(LibLexicon.TOOL_ELF_GEAR, categoryTools); + elfGear = new AlfheimLexiconEntry(LibLexicon.TOOL_ELF_GEAR, categoryTools); elfGear.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeElementiumPick), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipeElementiumShovel), new PageText("6"), @@ -920,10 +924,10 @@ public final class LexiconData { new PageCraftingRecipe("14", ModCraftingRecipes.recipeElementiumLegs), new PageCraftingRecipe("15", ModCraftingRecipes.recipeElementiumBoots)); - openBucket = new ALexiconEntry(LibLexicon.TOOL_OPEN_BUCKET, categoryTools); + openBucket = new AlfheimLexiconEntry(LibLexicon.TOOL_OPEN_BUCKET, categoryTools); openBucket.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeOpenBucket)); - rainbowRod = new ALexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); + rainbowRod = new AlfheimLexiconEntry(LibLexicon.TOOL_RAINBOW_ROD, categoryTools); rainbowRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("6"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRainbowRod), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBifrost), @@ -931,112 +935,112 @@ public final class LexiconData { new PageCraftingRecipe("5", ModCraftingRecipes.recipeShimmerwoodPlanks), new PageCraftingRecipe("7", ModCraftingRecipes.recipePoolFabulous)); - tornadoRod = new BLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools); + tornadoRod = new BasicLexiconEntry(LibLexicon.TOOL_TORNADO_ROD, categoryTools); tornadoRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTornadoRod)); - fireRod = new BLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools); + fireRod = new BasicLexiconEntry(LibLexicon.TOOL_FIRE_ROD, categoryTools); fireRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireRod)); - vineBall = new BLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); + vineBall = new BasicLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); vineBall.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeVineBall), new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot), new PageCraftingRecipe("4", ModCraftingRecipes.recipeMossStone)); - laputaShard = new ALexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); + laputaShard = new AlfheimLexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); laputaShard.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesLaputaShard), new PageCraftingRecipe("3", ModCraftingRecipes.recipesLaputaShardUpgrade)); - virus = new ALexiconEntry(LibLexicon.TOOL_VIRUS, categoryTools); + virus = new AlfheimLexiconEntry(LibLexicon.TOOL_VIRUS, categoryTools); virus.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeVirusZombie), new PageCraftingRecipe("2", ModCraftingRecipes.recipeVirusSkeleton)); - skyDirtRod = new ALexiconEntry(LibLexicon.TOOL_SKY_DIRT_ROD, categoryTools); + skyDirtRod = new AlfheimLexiconEntry(LibLexicon.TOOL_SKY_DIRT_ROD, categoryTools); skyDirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSkyDirtRod)); - glassPick = new BLexiconEntry(LibLexicon.TOOL_GLASS_PICK, categoryTools); + glassPick = new BasicLexiconEntry(LibLexicon.TOOL_GLASS_PICK, categoryTools); glassPick.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGlassPick)); - diviningRod = new BLexiconEntry(LibLexicon.TOOL_DIVINING_ROD, categoryTools); + diviningRod = new BasicLexiconEntry(LibLexicon.TOOL_DIVINING_ROD, categoryTools); diviningRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDiviningRod)); - gravityRod = new ALexiconEntry(LibLexicon.TOOL_GRAVITY_ROD, categoryTools); + gravityRod = new AlfheimLexiconEntry(LibLexicon.TOOL_GRAVITY_ROD, categoryTools); gravityRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGravityRod)); - regenIvy = new ALexiconEntry(LibLexicon.TOOL_REGEN_IVY, categoryTools); + regenIvy = new AlfheimLexiconEntry(LibLexicon.TOOL_REGEN_IVY, categoryTools); regenIvy.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRegenIvy)); - missileRod = new ALexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); + missileRod = new AlfheimLexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); missileRod.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); - craftingHalo = new BLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); + craftingHalo = new BasicLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCraftingHalo)); - clip = new ALexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); + clip = new AlfheimLexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); clip.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeClip)); - cobbleRod = new BLexiconEntry(LibLexicon.TOOL_COBBLE_ROD, categoryTools); + cobbleRod = new BasicLexiconEntry(LibLexicon.TOOL_COBBLE_ROD, categoryTools); cobbleRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCobbleRod)); - smeltRod = new BLexiconEntry(LibLexicon.TOOL_SMELT_ROD, categoryTools); + smeltRod = new BasicLexiconEntry(LibLexicon.TOOL_SMELT_ROD, categoryTools); smeltRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSmeltRod)); - worldSeed = new ALexiconEntry(LibLexicon.TOOL_WORLD_SEED, categoryTools); + worldSeed = new AlfheimLexiconEntry(LibLexicon.TOOL_WORLD_SEED, categoryTools); worldSeed.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWorldSeed)); - spellCloth = new BLexiconEntry(LibLexicon.TOOL_SPELL_CLOTH, categoryTools); + spellCloth = new BasicLexiconEntry(LibLexicon.TOOL_SPELL_CLOTH, categoryTools); spellCloth.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpellCloth)); - thornChakram = new BLexiconEntry(LibLexicon.TOOL_THORN_CHAKRAM, categoryTools); + thornChakram = new BasicLexiconEntry(LibLexicon.TOOL_THORN_CHAKRAM, categoryTools); thornChakram.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeThornChakram)); - fireChakram = new ALexiconEntry(LibLexicon.TOOL_FIRE_CHAKRAM, categoryTools); + fireChakram = new AlfheimLexiconEntry(LibLexicon.TOOL_FIRE_CHAKRAM, categoryTools); fireChakram.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFireChakram)); - overgrowthSeed = new BLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools); + overgrowthSeed = new BasicLexiconEntry(LibLexicon.TOOL_OVERGROWTH_SEED, categoryTools); overgrowthSeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) .setIcon(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModItems.overgrowthSeed)); overgrowthSeed.addExtraDisplayedRecipe(new ItemStack(ModBlocks.enchantedSoil)); - livingwoodBow = new BLexiconEntry(LibLexicon.TOOL_LIVINGWOOD_BOW, categoryTools); + livingwoodBow = new BasicLexiconEntry(LibLexicon.TOOL_LIVINGWOOD_BOW, categoryTools); livingwoodBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingwoodBow)); - crystalBow = new ALexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); + crystalBow = new AlfheimLexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCrystalBow)); - temperanceStone = new BLexiconEntry(LibLexicon.TOOL_TEMPERANCE_STONE, categoryTools); + temperanceStone = new BasicLexiconEntry(LibLexicon.TOOL_TEMPERANCE_STONE, categoryTools); temperanceStone.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTemperanceStone)); - terraAxe = new BLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools); + terraAxe = new BasicLexiconEntry(LibLexicon.TOOL_TERRA_AXE, categoryTools); terraAxe.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraAxe)); - obedienceStick = new BLexiconEntry(LibLexicon.TOOL_OBEDIENCE_STICK, categoryTools); + obedienceStick = new BasicLexiconEntry(LibLexicon.TOOL_OBEDIENCE_STICK, categoryTools); obedienceStick.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeObedienceStick)); - slimeBottle = new ALexiconEntry(LibLexicon.TOOL_SLIME_BOTTLE, categoryTools); + slimeBottle = new AlfheimLexiconEntry(LibLexicon.TOOL_SLIME_BOTTLE, categoryTools); slimeBottle.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSlimeBottle)); - exchangeRod = new BLexiconEntry(LibLexicon.TOOL_EXCHANGE_ROD, categoryTools); + exchangeRod = new BasicLexiconEntry(LibLexicon.TOOL_EXCHANGE_ROD, categoryTools); exchangeRod.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeExchangeRod)); - manaweave = new BLexiconEntry(LibLexicon.TOOL_MANAWEAVE, categoryTools); + manaweave = new BasicLexiconEntry(LibLexicon.TOOL_MANAWEAVE, categoryTools); manaweave.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeManaweaveCloth), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaweaveHelm), @@ -1044,42 +1048,42 @@ public final class LexiconData { new PageCraftingRecipe("5", ModCraftingRecipes.recipeManaweaveLegs), new PageCraftingRecipe("6", ModCraftingRecipes.recipeManaweaveBoots)); - autocraftingHalo = new BLexiconEntry(LibLexicon.TOOL_AUTOCRAFTING_HALO, categoryTools); + autocraftingHalo = new BasicLexiconEntry(LibLexicon.TOOL_AUTOCRAFTING_HALO, categoryTools); autocraftingHalo.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeAutocraftingHalo)); - sextant = new BLexiconEntry(LibLexicon.TOOL_SEXTANT, categoryTools); + sextant = new BasicLexiconEntry(LibLexicon.TOOL_SEXTANT, categoryTools); sextant.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeSextant)); // ENDER ENTRIES - enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); + enderAir = new BasicLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); enderAir.setPriority().setLexiconPages(new PageText("0")); enderAir.addExtraDisplayedRecipe(new ItemStack(ModItems.manaResource, 1, 15)); LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 15), enderAir, 0); - enderEyeBlock = new BLexiconEntry(LibLexicon.ENDER_ENDER_EYE_BLOCK, categoryEnder); + enderEyeBlock = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_EYE_BLOCK, categoryEnder); enderEyeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEnderEyeBlock)); - pistonRelay = new BLexiconEntry(LibLexicon.ENDER_PISTON_RELAY, categoryEnder); + pistonRelay = new BasicLexiconEntry(LibLexicon.ENDER_PISTON_RELAY, categoryEnder); pistonRelay.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.pistonRelayRecipe)); - enderHand = new BLexiconEntry(LibLexicon.ENDER_ENDER_HAND, categoryEnder); + enderHand = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_HAND, categoryEnder); enderHand.setLexiconPages(new PageText(ConfigHandler.enderPickpocketEnabled ? "0" : "0a"), new PageText("2"), new PageCraftingRecipe(ConfigHandler.enderPickpocketEnabled ? "1" : "1a", ModCraftingRecipes.recipeEnderHand)); - enderDagger = new BLexiconEntry(LibLexicon.ENDER_ENDER_DAGGER, categoryEnder); + enderDagger = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_DAGGER, categoryEnder); enderDagger.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeEnderDagger)); - spawnerClaw = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_CLAW, categoryEnder); + spawnerClaw = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_CLAW, categoryEnder); spawnerClaw.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeSpawnerClaw)); - redString = new ALexiconEntry(LibLexicon.ENDER_RED_STRING, categoryEnder); + redString = new AlfheimLexiconEntry(LibLexicon.ENDER_RED_STRING, categoryEnder); redString.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRedString), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedStringContainer), new PageText("5"), @@ -1089,69 +1093,69 @@ public final class LexiconData { new PageCraftingRecipe("12", ModCraftingRecipes.recipeRedStringRelay), new PageText("13"), new PageCraftingRecipe("14", ModCraftingRecipes.recipeRedStringInterceptor)); - flightTiara = new ALexiconEntry(LibLexicon.ENDER_FLIGHT_TIARA, categoryEnder); + flightTiara = new AlfheimLexiconEntry(LibLexicon.ENDER_FLIGHT_TIARA, categoryEnder); flightTiara.setLexiconPages(new PageText("0"), new PageText("4"), new PageText("5"), new PageText("6"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFlightTiara), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesWings)); - corporea = new ALexiconEntry(LibLexicon.ENDER_CORPOREA, categoryEnder); + corporea = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA, categoryEnder); corporea.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeCorporeaSpark), new PageCraftingRecipe("8", ModCraftingRecipes.recipeMasterCorporeaSpark)); - corporeaIndex = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_INDEX, categoryEnder); + corporeaIndex = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_INDEX, categoryEnder); corporeaIndex.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("8"), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipeCorporeaIndex)); - corporeaFunnel = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder); + corporeaFunnel = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_FUNNEL, categoryEnder); corporeaFunnel.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaFunnel)); - corporeaInterceptor = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_INTERCEPTOR, categoryEnder); + corporeaInterceptor = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_INTERCEPTOR, categoryEnder); corporeaInterceptor.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaInterceptor)); - spawnerMover = new ALexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); + spawnerMover = new AlfheimLexiconEntry(LibLexicon.ENDER_SPAWNER_MOVER, categoryEnder); spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); - keepIvy = new ALexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); + keepIvy = new AlfheimLexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); keepIvy.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); - blackHoleTalisman = new ALexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); + blackHoleTalisman = new AlfheimLexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); - corporeaCrystalCube = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_CRYSTAL_CUBE, categoryEnder); + corporeaCrystalCube = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_CRYSTAL_CUBE, categoryEnder); corporeaCrystalCube.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCorporeaCrystalCube)); - luminizerTransport = new ALexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); + luminizerTransport = new AlfheimLexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); luminizerTransport.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLuminizer), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeDetectorLuminizer), new PageText("5"), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLuminizerLauncher)); - starSword = new ALexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder); + starSword = new AlfheimLexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder); starSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarSword)); - thunderSword = new ALexiconEntry(LibLexicon.ENDER_THUNDER_SWORD, categoryEnder); + thunderSword = new AlfheimLexiconEntry(LibLexicon.ENDER_THUNDER_SWORD, categoryEnder); thunderSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeThunderSword)); - corporeaRetainer = new ALexiconEntry(LibLexicon.ENDER_CORPOREA_RETAINER, categoryEnder); + corporeaRetainer = new AlfheimLexiconEntry(LibLexicon.ENDER_CORPOREA_RETAINER, categoryEnder); corporeaRetainer.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeCorporeaRetainer)); // BAUBLES ENTRIES - baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); + baublesIntro = new BasicLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); - cosmeticBaubles = new BLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); + cosmeticBaubles = new BasicLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); { List pages = new ArrayList<>(); pages.add(new PageText("0")); @@ -1161,93 +1165,93 @@ public final class LexiconData { cosmeticBaubles.setPriority().setLexiconPages(pages.toArray(new LexiconPage[pages.size()])); } - tinyPlanet = new BLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); + tinyPlanet = new BasicLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTinyPlanet), new PageCraftingRecipe("2", ModCraftingRecipes.recipeTinyPlanetBlock)); - manaRing = new BLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); + manaRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); manaRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaRing), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterManaRing)); - auraRing = new BLexiconEntry(LibLexicon.BAUBLE_AURA_RING, categoryBaubles); + auraRing = new BasicLexiconEntry(LibLexicon.BAUBLE_AURA_RING, categoryBaubles); auraRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeAuraRing), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterAuraRing)); - travelBelt = new BLexiconEntry(LibLexicon.BAUBLE_TRAVEL_BELT, categoryBaubles); + travelBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_TRAVEL_BELT, categoryBaubles); travelBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTravelBelt)); - knockbacklBelt = new BLexiconEntry(LibLexicon.BAUBLE_KNOCKBACK_BELT, categoryBaubles); + knockbacklBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_KNOCKBACK_BELT, categoryBaubles); knockbacklBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKnocbackBelt)); - icePendant = new BLexiconEntry(LibLexicon.BAUBLE_ICE_PENDANT, categoryBaubles); + icePendant = new BasicLexiconEntry(LibLexicon.BAUBLE_ICE_PENDANT, categoryBaubles); icePendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeIcePendant)); - lavaPendant = new BLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles); + lavaPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles); lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFirePendant)); - goldLaurel = new ALexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); + goldLaurel = new AlfheimLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); goldLaurel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGoldenLaurel)); - waterRing = new BLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); + waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRing)); - miningRing = new BLexiconEntry(LibLexicon.BAUBLE_MINING_RING, categoryBaubles); + miningRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MINING_RING, categoryBaubles); miningRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMiningRing)); - magnetRing = new BLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); + magnetRing = new BasicLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMagnetRing), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGreaterMagnetRing)); - divaCharm = new ALexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); + divaCharm = new AlfheimLexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDivaCharm)); - pixieRing = new ALexiconEntry(LibLexicon.BAUBLE_PIXIE_RING, categoryBaubles); + pixieRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_PIXIE_RING, categoryBaubles); pixieRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePixieRing)); - superTravelBelt = new ALexiconEntry(LibLexicon.BAUBLE_SUPER_TRAVEL_BELT, categoryBaubles); + superTravelBelt = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_TRAVEL_BELT, categoryBaubles); superTravelBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperTravelBelt)); - reachRing = new ALexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); + reachRing = new AlfheimLexiconEntry(LibLexicon.BAUBLE_REACH_RING, categoryBaubles); reachRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeReachRing)); - itemFinder = new BLexiconEntry(LibLexicon.BAUBLE_ITEM_FINDER, categoryBaubles); + itemFinder = new BasicLexiconEntry(LibLexicon.BAUBLE_ITEM_FINDER, categoryBaubles); itemFinder.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeItemFinder)); - superLavaPendant = new ALexiconEntry(LibLexicon.BAUBLE_SUPER_LAVA_PENDANT, categoryBaubles); + superLavaPendant = new AlfheimLexiconEntry(LibLexicon.BAUBLE_SUPER_LAVA_PENDANT, categoryBaubles); superLavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperLavaPendant)); - bloodPendant = new BLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); + bloodPendant = new BasicLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBloodPendant)); - judgementCloaks = new ALexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); + judgementCloaks = new AlfheimLexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHolyCloak), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak)); - monocle = new BLexiconEntry(LibLexicon.BAUBLE_MONOCLE, categoryBaubles); + monocle = new BasicLexiconEntry(LibLexicon.BAUBLE_MONOCLE, categoryBaubles); monocle.setPriority().setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMonocle)); - swapRing = new BLexiconEntry(LibLexicon.BAUBLE_SWAP_RING, categoryBaubles); + swapRing = new BasicLexiconEntry(LibLexicon.BAUBLE_SWAP_RING, categoryBaubles); swapRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSwapRing)); - speedUpBelt = new BLexiconEntry(LibLexicon.BAUBLE_SPEED_UP_BELT, categoryBaubles); + speedUpBelt = new BasicLexiconEntry(LibLexicon.BAUBLE_SPEED_UP_BELT, categoryBaubles); speedUpBelt.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpeedUpBelt)); - baubleBox = new BLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); + baubleBox = new BasicLexiconEntry(LibLexicon.BAUBLE_BOX, categoryBaubles); baubleBox.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBaubleCase)) .setPriority(); // ALFHOMANCY ENTRIES - alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); + alfhomancyIntro = new BasicLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority() .setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), @@ -1256,14 +1260,14 @@ public final class LexiconData { new PageText("7")) .setIcon(new ItemStack(ModItems.lexicon)); - elvenMessage = new ALexiconEntry(LibLexicon.ALF_MESSAGE, categoryAlfhomancy); + elvenMessage = new AlfheimLexiconEntry(LibLexicon.ALF_MESSAGE, categoryAlfhomancy); elvenMessage.setPriority() .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)); - elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); + elvenResources = new AlfheimLexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); elvenResources.setPriority() .setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageText("2"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeDreamwoodTwig), @@ -1274,61 +1278,61 @@ public final class LexiconData { new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe)) .setIcon(new ItemStack(ModItems.manaResource, 1, 9)); - gaiaRitual = new ALexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy); + gaiaRitual = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy); gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGaiaPylon), new PageMultiblock("2", ModMultiblocks.gaiaRitual), new PageText("3"), new PageText("4"), new PageText("5")).setIcon(new ItemStack(ModItems.manaResource, 1, 5)); LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 5), gaiaRitual, 0); - gaiaRitualHardmode = new ALexiconEntry(LibLexicon.ALF_GAIA_RITUAL_HARDMODE, categoryAlfhomancy); + gaiaRitualHardmode = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL_HARDMODE, categoryAlfhomancy); gaiaRitualHardmode .setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeGaiaIngot)) .setIcon(new ItemStack(ModItems.manaResource, 1, 14)); - elvenLore = new ALexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy); + elvenLore = new AlfheimLexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy); 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)); if (ConfigHandler.relicsEnabled) { - relics = new ALexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); + relics = new AlfheimLexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); relics.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.dice)); - relicInfo = new RLexiconEntry(LibLexicon.ALF_RELIC_INFO, categoryAlfhomancy, null); + relicInfo = new RelicLexiconEntry(LibLexicon.ALF_RELIC_INFO, categoryAlfhomancy, null); relicInfo.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.dice)); - infiniteFruit = new RLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, + infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, ModAchievements.relicInfiniteFruit); infiniteFruit.setLexiconPages(new PageText("0")); - kingKey = new RLexiconEntry(LibLexicon.ALF_KING_KEY, categoryAlfhomancy, ModAchievements.relicKingKey); + kingKey = new RelicLexiconEntry(LibLexicon.ALF_KING_KEY, categoryAlfhomancy, ModAchievements.relicKingKey); kingKey.setLexiconPages(new PageText("0")); - flugelEye = new RLexiconEntry(LibLexicon.ALF_FLUGEL_EYE, categoryAlfhomancy, + flugelEye = new RelicLexiconEntry(LibLexicon.ALF_FLUGEL_EYE, categoryAlfhomancy, ModAchievements.relicFlugelEye); flugelEye.setLexiconPages(new PageText("0"), new PageText("1")); - thorRing = new RLexiconEntry(LibLexicon.ALF_THOR_RING, categoryAlfhomancy, ModAchievements.relicThorRing); + thorRing = new RelicLexiconEntry(LibLexicon.ALF_THOR_RING, categoryAlfhomancy, ModAchievements.relicThorRing); thorRing.setLexiconPages(new PageText("0")); - lokiRing = new RLexiconEntry(LibLexicon.ALF_LOKI_RING, categoryAlfhomancy, ModAchievements.relicLokiRing); + lokiRing = new RelicLexiconEntry(LibLexicon.ALF_LOKI_RING, categoryAlfhomancy, ModAchievements.relicLokiRing); lokiRing.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")); - odinRing = new RLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, ModAchievements.relicOdinRing); + odinRing = new RelicLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, ModAchievements.relicOdinRing); odinRing.setLexiconPages(new PageText("0")); } // MISCLENAEOUS ENTRIES - unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); + unstableBlocks = new BasicLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCraftingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCraftingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipesSignalFlares)); - decorativeBlocks = new BLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); + decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); if (ConfigHandler.darkQuartzEnabled) decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLivingrockDecor1), @@ -1371,10 +1375,10 @@ public final class LexiconData { new PageCraftingRecipe("21", ModCraftingRecipes.recipeSoulBrick), new PageCraftingRecipe("22", ModCraftingRecipes.recipeSnowBrick)); - dispenserTweaks = new BLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); + dispenserTweaks = new BasicLexiconEntry(LibLexicon.MISC_DISPENSER_TWEAKS, categoryMisc); dispenserTweaks.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Blocks.DISPENSER)); - shinyFlowers = new BLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); + shinyFlowers = new BasicLexiconEntry(LibLexicon.MISC_SHINY_FLOWERS, categoryMisc); shinyFlowers.setLexiconPages(new PageText("0"), new PageText("3"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); @@ -1387,71 +1391,71 @@ public final class LexiconData { new PageCraftingRecipe("5", ModCraftingRecipes.recipeDarkPrismarine), new PageCraftingRecipe("6", ModCraftingRecipes.recipeSeaLamp));*/ - tinyPotato = new BLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); + tinyPotato = new BasicLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); - headCreating = new HLexiconEntry(LibLexicon.MISC_HEAD_CREATING, categoryMisc); + headCreating = new HeadLexiconEntry(LibLexicon.MISC_HEAD_CREATING, categoryMisc); headCreating.setLexiconPages(new PageText("0"), new PageText("2"), new PageRuneRecipe("1", ModRuneRecipes.recipeHead)); - azulejo = new BLexiconEntry(LibLexicon.MISC_AZULEJO, categoryMisc); + azulejo = new BasicLexiconEntry(LibLexicon.MISC_AZULEJO, categoryMisc); azulejo.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_AZULEJOS), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAzulejo), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAzulejoCycling)); - starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); + starfield = new AlfheimLexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarfield)); - dirtPath = new BLexiconEntry(LibLexicon.MISC_DIRT_PATH, categoryMisc); + dirtPath = new BasicLexiconEntry(LibLexicon.MISC_DIRT_PATH, categoryMisc); dirtPath.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtPath), new PageCraftingRecipe("2", ModCraftingRecipes.recipeDirtPathSlab)); - mushrooms = new BLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc); + mushrooms = new BasicLexiconEntry(LibLexicon.MISC_MUSHROOMS, categoryMisc); mushrooms.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesMushrooms)); - phantomInk = new BLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); + phantomInk = new BasicLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk)); if (ConfigHandler.stones18Enabled) { - stoneAlchemy = new BLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); + stoneAlchemy = new BasicLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); stoneAlchemy.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes)); } - blazeBlock = new BLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); + blazeBlock = new BasicLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); LexiconRecipeMappings.map(new ItemStack(Blocks.OBSIDIAN), blazeBlock, 0); - challenges = new BLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); + challenges = new BasicLexiconEntry(LibLexicon.MISC_CHALLENGES, categoryMisc); challenges.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")).setPriority() .setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); - cacophonium = new BLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); + cacophonium = new BasicLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCacophonium), new PageText("2")); - pavement = new BLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); + pavement = new BasicLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); - preventingDecay = new DLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); + preventingDecay = new DogLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.DEADBUSH)); if (Botania.bcTriggersLoaded) { - bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); + bcIntegration = new CompatLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); 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 = new BasicLexiconEntry(LibLexicon.MISC_SHEDDING, BotaniaAPI.categoryMisc); shedding.setLexiconPages(new PageText("0")).setPriority().setIcon(new ItemStack(Items.FEATHER)); SheddingHandler.addToLexicon(); } if (Botania.thaumcraftLoaded) { - tcIntegration = new CLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); + tcIntegration = new CompatLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); if (ConfigHandler.enableThaumcraftStablizers) tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), @@ -1468,7 +1472,7 @@ public final class LexiconData { } if (Botania.etFuturumLoaded) { - banners = new CLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc, "EtFuturum"); + banners = new CompatLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc, "EtFuturum"); banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) .setIcon(new ItemStack(ModItems.lexicon)); } diff --git a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java similarity index 87% rename from src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index f2757fce5..9d0d9ee41 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -18,11 +18,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -public class RLexiconEntry extends BLexiconEntry { +public class RelicLexiconEntry extends BasicLexiconEntry { final Achievement a; - public RLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) { + public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) { super(unlocalizedName, category); setKnowledgeType(BotaniaAPI.relicKnowledge); this.a = a; diff --git a/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java similarity index 89% rename from src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java index 81ccee150..2a4beb1fd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/TLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/TutLexiconEntry.java @@ -16,9 +16,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.lexicon.page.PageTutorial; import vazkii.botania.common.lib.LibLexicon; -public class TLexiconEntry extends BLexiconEntry { +public class TutLexiconEntry extends BasicLexiconEntry { - public TLexiconEntry() { + public TutLexiconEntry() { super(LibLexicon.BASICS_TUTORIAL, BotaniaAPI.categoryBasics); setPriority(); setIcon(new ItemStack(Items.BOOK)); diff --git a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java index da8b7031f..be16aca87 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WIPLexiconEntry.java @@ -13,7 +13,7 @@ package vazkii.botania.common.lexicon; import vazkii.botania.api.lexicon.IAddonEntry; import vazkii.botania.api.lexicon.LexiconCategory; -public class WIPLexiconEntry extends BLexiconEntry implements IAddonEntry { +public class WIPLexiconEntry extends BasicLexiconEntry implements IAddonEntry { public WIPLexiconEntry(String unlocalizedName, LexiconCategory category) { super(unlocalizedName, category); diff --git a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java similarity index 92% rename from src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java rename to src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java index 07964153a..f04f75fb2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java @@ -20,11 +20,11 @@ import vazkii.botania.common.lib.LibLexicon; import javax.annotation.Nonnull; -public class WLexiconEntry extends BLexiconEntry { +public class WelcomeLexiconEntry extends BasicLexiconEntry { private static final int PAGES = 7; - public WLexiconEntry() { + public WelcomeLexiconEntry() { super(LibLexicon.BASICS_WELCOME, BotaniaAPI.categoryBasics); setPriority(); setIcon(new ItemStack(ModItems.cosmetic, 1, 31)); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index 38eddeb17..3d9b7d44d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -117,13 +117,12 @@ public class PageText extends LexiconPage { font.setUnicodeFlag(unicode); } - public static String getControlCodes(String s) { + private static String getControlCodes(String s) { String controls = s.replaceAll("(? Date: Sat, 16 Jul 2016 17:34:57 -0500 Subject: [PATCH 782/935] Tidy up, add texture --- .../client/core/handler/ModelHandler.java | 2 +- .../functional/BergamuteEventHandler.java | 42 +++++------------- .../assets/botania/blockstates/bergamute.json | 18 ++++++++ .../botania/textures/blocks/bergamute.png | Bin 0 -> 317 bytes 4 files changed, 29 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/bergamute.json create mode 100644 src/main/resources/assets/botania/textures/blocks/bergamute.png 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 ed67f2183..a602d4e68 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -278,7 +278,7 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); // todo model + BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); } private static void registerStandardBlocks() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 222c8e799..c18dee15f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -12,6 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -21,7 +22,7 @@ import java.util.Random; @SideOnly(Side.CLIENT) public class BergamuteEventHandler { private static final Random RAND = new Random(); - private static final float MULTIPLIER = 0.1F; + private static final float MULTIPLIER = 0.15F; @SubscribeEvent(priority = EventPriority.LOWEST) public void onSoundEvent(PlaySoundEvent evt) { @@ -34,7 +35,7 @@ public class BergamuteEventHandler { evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); if (RAND.nextBoolean()) { - Color color = new Color(berg.getColor()); + Color color = TilePool.PARTICLE_COLOR; BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } @@ -62,36 +63,13 @@ public class BergamuteEventHandler { } @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } - @Nullable @Override public SoundEventAccessor createAccessor(SoundHandler handler) { return compose.createAccessor(handler); } - @Nonnull @Override public Sound getSound() { - return compose.getSound(); - } - - @Nonnull - @Override - public SoundCategory getCategory() { - return compose.getCategory(); - } - - @Override - public boolean canRepeat() { - return compose.canRepeat(); - } - - @Override - public int getRepeatDelay() { - return compose.getRepeatDelay(); - } - - @Override - public float getPitch() { - return compose.getPitch(); - } - - @Override - public float getXPosF() { - return compose.getXPosF(); - } + @Nullable @Override public SoundEventAccessor createAccessor(@Nonnull SoundHandler handler) { return compose.createAccessor(handler); } + @Nonnull @Override public Sound getSound() { return compose.getSound(); } + @Nonnull @Override public SoundCategory getCategory() { return compose.getCategory(); } + @Override public boolean canRepeat() { return compose.canRepeat(); } + @Override public int getRepeatDelay() { return compose.getRepeatDelay(); } + @Override public float getPitch() { return compose.getPitch(); } + @Override public float getXPosF() { return compose.getXPosF(); } @Override public float getYPosF() { return compose.getYPosF(); } @Override public float getZPosF() { return compose.getZPosF(); } @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } diff --git a/src/main/resources/assets/botania/blockstates/bergamute.json b/src/main/resources/assets/botania/blockstates/bergamute.json new file mode 100644 index 000000000..52beeea8a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bergamute.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bergamute" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bergamute" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/bergamute.png b/src/main/resources/assets/botania/textures/blocks/bergamute.png new file mode 100644 index 0000000000000000000000000000000000000000..04dae273394c1f5360bd9535c033ef3b918fb0aa GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!AqVljv*HQ$v^)8w`W$Jp>$TE`ygAy`6DJF}+cH@16h62AgcU#La&G{1bmagV`))@_cg%{gUFw$L!IM59G{Y zYfxEcdFy}uE@Q?VfsVMCv~TiD1YN%0ywz~@qZETNOG?1%rK((PC(oX}qL{;AlJ%c? zv3QSZvFpQG&s0_kq%)imc+96cr;*FwV~3M$iuFad19P|+C9*A&W(aQ1(eN^9`olG; zMUpA0*??K#0FN^t|D3o6NtR1I$&0gFb_%7(F=RR%+i{4KAxU;#!IxsMNkHE*c)I$z JtaD0e0sx*zagG20 literal 0 HcmV?d00001 From 347c100e93c56a7d94de338d28b9bb5d97d0cfd5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jul 2016 17:35:56 -0500 Subject: [PATCH 783/935] Add the version txt for 1.10.2 that never got added .-. --- version/1.10.2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 version/1.10.2.txt diff --git a/version/1.10.2.txt b/version/1.10.2.txt new file mode 100644 index 000000000..117602655 --- /dev/null +++ b/version/1.10.2.txt @@ -0,0 +1 @@ +r1.8-312 \ No newline at end of file From dff2cf2bf1cac567fee7a0d689bf1f00fb9f934c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 16 Jul 2016 17:40:10 -0500 Subject: [PATCH 784/935] Change flavour text --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 6dc262b5e..667f25c32 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1336,7 +1336,7 @@ tile.botania:flower.solegnolia.reference=All your magnets are belong to us tile.botania:flower.solegnoliaChibi.name=Solegnolia Petite tile.botania:flower.solegnoliaChibi.reference=All your magnets are belong to us tile.botania:flower.bergamute.name=Bergamute -tile.botania:flower.bergamute.reference=Totally another Extra Utils ripoff +tile.botania:flower.bergamute.reference=My lips are sealed # ITEM NAMES item.botania:lexicon.name=Lexica Botania From aa8dc5d16cb7e570ca8691912fc7a979d763c0f3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Jul 2016 20:33:56 -0500 Subject: [PATCH 785/935] Fix something in bows not being cross proxied. Closes #398 --- .../core/proxy/CrossVersionProxy_110.java | 29 +++++++++++++++++-- .../core/proxy/CrossVersionProxy_19.java | 29 +++++++++++++++++-- .../common/core/proxy/ICrossVersionProxy.java | 3 ++ .../equipment/tool/bow/ItemLivingwoodBow.java | 3 +- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java index 17ebd45ac..bf0c8ccde 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java @@ -2,13 +2,16 @@ package vazkii.botania.common.core.proxy; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.management.PlayerInteractionManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.BotaniaPlayerController; +import vazkii.botania.common.Botania; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -16,10 +19,11 @@ import java.lang.reflect.Method; public class CrossVersionProxy_110 implements ICrossVersionProxy { @Override public TileEntity createTeFromCompound(World world, NBTTagCompound compound) { - Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "func_190200_a", "a" }, World.class, NBTTagCompound.class); + Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "create", "func_190200_a", "a" }, World.class, NBTTagCompound.class); try { return (TileEntity) m.invoke(null, world, compound); } catch (IllegalAccessException | InvocationTargetException e) { + Botania.LOGGER.error("Couldn't create TE in 1.10 crossversion proxy"); return null; } } @@ -33,7 +37,9 @@ public class CrossVersionProxy_110 implements ICrossVersionProxy { Object gameType = m.invoke(from); m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { + Botania.LOGGER.error("Couldn't copy gametype in 1.10 crossversion proxy"); + } } @Override @@ -43,6 +49,7 @@ public class CrossVersionProxy_110 implements ICrossVersionProxy { Enum e = (Enum) m.invoke(skeleton); return e.ordinal(); } catch (IllegalAccessException | InvocationTargetException e1) { + Botania.LOGGER.error("Couldn't get skeleton type in 1.10 crossversion proxy"); return 0; } } @@ -54,6 +61,22 @@ public class CrossVersionProxy_110 implements ICrossVersionProxy { Object typeToSet = skeletonTypeClazz.getEnumConstants()[type]; Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[] { "func_189768_a", "a" }, skeletonTypeClazz); m.invoke(skeleton, typeToSet); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {} + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException e) { + Botania.LOGGER.error("Couldn't set skeleton type in 1.10 crossversion proxy"); + } + } + + @Override + public boolean isSurvivalOrAdventure(EntityPlayerMP playerMP) { + try { + Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); + Method m = ReflectionHelper.findMethod(PlayerInteractionManager.class, null, new String[] { "getGameType", "func_73081_b", "b" }); + Object gameType = m.invoke(playerMP.interactionManager); + m = ReflectionHelper.findMethod(gameTypeClazz, null, new String[] { "isSurvivalOrAdventure", "func_77144_e", "e" }); + return (Boolean) m.invoke(gameType); + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { + Botania.LOGGER.error("Couldn't determine survival or adventure in 1.10 crossversion proxy"); + return true; + } } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java index cccf9d8b5..2b6005a26 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java @@ -2,13 +2,16 @@ package vazkii.botania.common.core.proxy; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.management.PlayerInteractionManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.BotaniaPlayerController; +import vazkii.botania.common.Botania; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -20,6 +23,7 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { try { return (TileEntity) m.invoke(null, compound); } catch (IllegalAccessException | InvocationTargetException e) { + Botania.LOGGER.error("Couldn't create TE in 1.9 crossversion proxy"); return null; } } @@ -28,12 +32,14 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { @Override public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { try { - Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings.GameType"); + Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings$GameType"); Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); Object gameType = m.invoke(from); m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { + Botania.LOGGER.error("Couldn't copy game type in 1.9 crossversion proxy"); + } } @Override @@ -42,6 +48,7 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "getSkeletonType", "func_82202_m", "db" }); return (int) m.invoke(skeleton); } catch (IllegalAccessException | InvocationTargetException e) { + Botania.LOGGER.error("Couldn't get skeleton type in 1.9 crossversion proxy"); return 0; } } @@ -51,6 +58,22 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { try { Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "setSkeletonType", "func_82201_a", "a" }, int.class); m.invoke(skeleton, type); - } catch (IllegalAccessException | InvocationTargetException e) {} + } catch (IllegalAccessException | InvocationTargetException e) { + Botania.LOGGER.error("Couldn't set skeleton type in 1.9 crossversion proxy"); + } + } + + @Override + public boolean isSurvivalOrAdventure(EntityPlayerMP playerMP) { + try { + Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings$GameType"); + Method m = ReflectionHelper.findMethod(PlayerInteractionManager.class, null, new String[] { "getGameType", "func_73081_b", "b" }); + Object gameType = m.invoke(playerMP.interactionManager); + m = ReflectionHelper.findMethod(gameTypeClazz, null, new String[] { "isSurvivalOrAdventure", "func_77144_e", "e" }); + return (Boolean) m.invoke(gameType); + } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { + Botania.LOGGER.error("Couldn't determine survival or adventure in 1.9 crossversion proxy"); + return true; + } } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java index d2f160d4c..ccd24d540 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java @@ -2,6 +2,7 @@ package vazkii.botania.common.core.proxy; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -22,4 +23,6 @@ public interface ICrossVersionProxy { void setSkeletonTypeInt(EntitySkeleton skeleton, int type); + boolean isSurvivalOrAdventure(EntityPlayerMP playerMP); + } 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 6cc8ad030..dac5b2c5b 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 @@ -37,6 +37,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; @@ -194,7 +195,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(living instanceof EntityPlayerMP) { ToolCommons.damageItem(bow, 1, living, MANA_PER_DAMAGE); - if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) + if(Botania.crossVersionProxy.isSurvivalOrAdventure((EntityPlayerMP) living)) PlayerHelper.consumeAmmo(((EntityPlayerMP) living), AMMO_FUNC); } } From ce0ba85397e75cc3d0b3d6b52e00a78011eb9dc5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Jul 2016 20:58:30 -0500 Subject: [PATCH 786/935] Made it more reliable --- .../common/block/tile/TileLightRelay.java | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 74d388e5e..d36e77cde 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -71,48 +71,53 @@ public class TileLightRelay extends TileMod implements IWandBindable { ticksElapsed++; if(bindPos.getY() > -1 && isValidBinding()) { - Vector3 vec = getMovementVector(); + if(worldObj.isRemote) { + Vector3 vec = getMovementVector(); - double dist = 0.1; - int size = (int) (vec.mag() / dist); - int count = 10; - int start = ticksElapsed % size; + double dist = 0.1; + int size = (int) (vec.mag() / dist); + int count = 10; + int start = ticksElapsed % size; - Vector3 vecMag = vec.normalize().multiply(dist); - Vector3 vecTip = vecMag.multiply(start).add(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + Vector3 vecMag = vec.normalize().multiply(dist); + Vector3 vecTip = vecMag.multiply(start).add(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - double radPer = Math.PI / 16.0; - float mul = 0.5F; - float mulPer = 0.4F; - float maxMul = 2; - for(int i = start; i < start + count; i++) { - mul = Math.min(maxMul, mul + mulPer); - double rad = radPer * (i + ticksElapsed * 0.4); - Vector3 vecRot = vecMag.crossProduct(Vector3.ONE).multiply(mul).rotate(rad, vecMag).add(vecTip); - Botania.proxy.wispFX(worldObj, vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); - vecTip = vecTip.add(vecMag); - } - - BlockPos endpoint = getEndpoint(); + double radPer = Math.PI / 16.0; + float mul = 0.5F; + float mulPer = 0.4F; + float maxMul = 2; + for(int i = start; i < start + count; i++) { + mul = Math.min(maxMul, mul + mulPer); + double rad = radPer * (i + ticksElapsed * 0.4); + Vector3 vecRot = vecMag.crossProduct(Vector3.ONE).multiply(mul).rotate(rad, vecMag).add(vecTip); + Botania.proxy.wispFX(worldObj, vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); + vecTip = vecTip.add(vecMag); + } + } else { + BlockPos endpoint = getEndpoint(); - if(endpoint != null && !worldObj.isRemote) { - float range = 0.5F; - List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(1 + range, 1 + range, 1 + range))); - for(EntityEnderPearl pearl : enderPearls) { - pearl.posX = endpoint.getX() + pearl.posX - pos.getX(); - pearl.posY = endpoint.getY() + pearl.posY - pos.getY(); - pearl.posZ = endpoint.getZ() + pearl.posZ - pos.getZ(); + if(endpoint != null) { + AxisAlignedBB aabb = ModBlocks.lightRelay.getBoundingBox(worldObj.getBlockState(pos), worldObj, pos).offset(pos); + float range = 0.5F; + List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, aabb.expandXyz(range)); + for(EntityEnderPearl pearl : enderPearls) { + pearl.setPositionAndUpdate( + endpoint.getX() + pearl.posX - pos.getX(), + endpoint.getY() + pearl.posY - pos.getY(), + endpoint.getZ() + pearl.posZ - pos.getZ() + ); + } } } } } - public boolean isValidBinding() { + private boolean isValidBinding() { Block block = worldObj.getBlockState(bindPos).getBlock(); return block == ModBlocks.lightRelay; } - public BlockPos getEndpoint() { + private BlockPos getEndpoint() { List pointsPassed = new ArrayList<>(); TileLightRelay relay = this; BlockPos lastCoords = null; From 252e3191dc6448dbc660a00147626c9ba2c5a077 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Jul 2016 21:16:50 -0500 Subject: [PATCH 787/935] Fix some particles being missing --- .../generating/SubTileEntropinnyum.java | 20 ++++++------- .../botania/common/item/ItemBlackLotus.java | 16 ++--------- .../common/network/PacketBotaniaEffect.java | 28 ++++++++++++++++++- 3 files changed, 38 insertions(+), 26 deletions(-) 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 78189cac9..58bcaf92d 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 @@ -20,6 +20,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import java.util.List; @@ -31,22 +33,16 @@ public class SubTileEntropinnyum extends SubTileGenerating { public void onUpdate() { super.onUpdate(); - if(mana == 0) { + if(!supertile.getWorld().isRemote && mana == 0) { List tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); 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.setDead(); - mana += getMaxMana(); - sync(); - } + 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(); - for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(tnt.worldObj, tnt.posX + Math.random() * 4 - 2, tnt.posY + Math.random() * 4 - 2, tnt.posZ + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); - - supertile.getWorld().spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, tnt.posX, tnt.posY, tnt.posZ, 1D, 0D, 0D); - return; + PacketHandler.sendToNearby(supertile.getWorld(), supertile.getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENTROPINNYUM, tnt.posX, tnt.posY, tnt.posZ)); } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index df7eddcb7..e31dff106 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -25,6 +25,8 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import java.util.List; @@ -70,19 +72,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); } - for(int i = 0; i < 50; i++) { - float r = (float) Math.random() * 0.25F; - float g = 0F; - float b = (float) Math.random() * 0.25F; - float s = 0.45F * (float) Math.random() * 0.25F; - - float m = 0.045F; - float mx = ((float) Math.random() - 0.5F) * m; - float my = (float) Math.random() * m; - float mz = ((float) Math.random() - 0.5F) * m; - - Botania.proxy.wispFX(item.worldObj, item.posX, tile.getPos().getY() + 0.5F, item.posZ, r, g, b, s, mx, my, mz); - } + PacketHandler.sendToNearby(item.worldObj, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.posX, tile.getPos().getY() + 0.5, item.posZ)); item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 37d0c7fb8..a0c6f5b52 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -216,6 +216,30 @@ public class PacketBotaniaEffect implements IMessage { } break; } + case ENTROPINNYUM: { + for(int i = 0; i < 50; i++) + Botania.proxy.sparkleFX(world, message.x + Math.random() * 4 - 2, message.y + Math.random() * 4 - 2, message.z + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); + + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, message.x, message.y, message.z, 1D, 0D, 0D); + break; + } + case BLACK_LOTUS_DISSOLVE: { + for(int i = 0; i < 50; i++) { + float r = (float) Math.random() * 0.35F; + float g = 0F; + float b = (float) Math.random() * 0.35F; + float s = 0.45F * (float) Math.random() * 0.25F; + + float m = 0.045F; + float mx = ((float) Math.random() - 0.5F) * m; + float my = (float) Math.random() * m; + float mz = ((float) Math.random() - 0.5F) * m; + + Botania.proxy.wispFX(world, message.x, message.y, message.z, r, g, b, s, mx, my, mz); + } + + break; + } } } }); @@ -233,7 +257,9 @@ public class PacketBotaniaEffect implements IMessage { SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards SPARK_MANA_FLOW(2), // Arg: Entity ID from, Entity ID towards ENCHANTER_CRAFT(0), - ENCHANTER_DESTROY(0); + ENCHANTER_DESTROY(0), + ENTROPINNYUM(0), + BLACK_LOTUS_DISSOLVE(0); private final int argCount; From 16381383cbc26e4a8f89addf1431631293d2257a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jul 2016 20:18:16 -0500 Subject: [PATCH 788/935] Fix wills not applying. Closes #372 --- .../item/equipment/armor/terrasteel/ItemTerrasteelHelm.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 319a63d23..748e4c549 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 @@ -22,6 +22,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -48,6 +49,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc public ItemTerrasteelHelm(String name) { super(EntityEquipmentSlot.HEAD, name); + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -123,7 +125,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc 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(); - ItemStack stack = player.inventory.armorItemInSlot(3); + ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if(crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { boolean ahrim = hasAncientWill(stack, 0); boolean dharok = hasAncientWill(stack, 1); From 87172ea3f2ae9422521116d1bc74061dd070b1c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jul 2016 20:29:16 -0500 Subject: [PATCH 789/935] Build 314 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/1.9.4.txt | 2 +- version/update.json | 14 ++++++++------ web/versions.ini | 4 +++- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build.properties b/build.properties index 19707b798..06df2b19c 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Jun 29 20:26:39 CDT 2016 +#Wed Jul 20 20:28:08 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1965 -mc_version=1.9.4 dir_repo=./ -build_number=313 +mc_version=1.9.4 +forge_version=12.17.0.1965 +build_number=314 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 117602655..6a4e1cdfa 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-312 \ No newline at end of file +r1.8-313 \ No newline at end of file diff --git a/version/1.9.4.txt b/version/1.9.4.txt index 117602655..6a4e1cdfa 100644 --- a/version/1.9.4.txt +++ b/version/1.9.4.txt @@ -1 +1 @@ -r1.8-312 \ No newline at end of file +r1.8-313 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 4bdef8628..5319d60db 100644 --- a/version/update.json +++ b/version/update.json @@ -3,7 +3,8 @@ "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" }, "1.10.2": { - "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312" + "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", + "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -19,17 +20,18 @@ "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309", "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310", "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311", - "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312" + "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", + "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313" }, "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-312", - "1.10.2-recommended": "r1.8-312", + "1.10.2-latest": "r1.8-313", + "1.10.2-recommended": "r1.8-313", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-312", - "1.9.4-recommended": "r1.8-312" + "1.9.4-latest": "r1.8-313", + "1.9.4-recommended": "r1.8-313" } } \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index b279ed6fa..a03abc0b5 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -263,4 +263,6 @@ r1.8-310=1.9.4 r1.8-311=1.9.4 r1.8-311=1.10 r1.8-312=1.9.4 -r1.8-312=1.10.2 \ No newline at end of file +r1.8-312=1.10.2 +r1.8-313=1.9.4 +r1.8-313=1.10.2 \ No newline at end of file From a0d0fefe8db8679f66f7961f3bba3ceec01edde0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jul 2016 20:55:20 -0500 Subject: [PATCH 790/935] Move to 1.10 --- build.gradle | 13 +-- build.properties | 4 +- .../buildcraft/api/core/EnumPipePart.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 9 +- .../client/core/proxy/ClientProxy.java | 3 +- .../botania/client/model/PlatformModel.java | 9 +- .../render/tile/RenderTileGaiaHead.java | 3 +- .../java/vazkii/botania/common/Botania.java | 30 ------- .../functional/SubTileMarimorphosis.java | 2 +- .../subtile/generating/SubTileDaybloom.java | 2 +- .../generating/SubTileHydroangeas.java | 2 +- .../core/handler/BiomeDecorationHandler.java | 4 +- .../core/proxy/CrossVersionProxy_110.java | 82 ------------------- .../core/proxy/CrossVersionProxy_19.java | 79 ------------------ .../common/core/proxy/ICrossVersionProxy.java | 28 ------- .../common/entity/EntityDoppleganger.java | 3 +- .../botania/common/item/ItemLaputaShard.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 2 +- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../vazkii/botania/common/lib/LibMisc.java | 4 +- 20 files changed, 25 insertions(+), 260 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java delete mode 100644 src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java delete mode 100644 src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java diff --git a/build.gradle b/build.gradle index cc5732c62..5cb5aba8d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20160518" + mappings = "snapshot_20160718" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -67,7 +67,7 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - deobfCompile "mezz.jei:jei_1.9.4:3.6.7.216" + deobfCompile "mezz.jei:jei_1.10.2:3.7.8.234" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" @@ -119,9 +119,7 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { // todo make this flexibile - collection of supported mc versions file('web/versions.ini').append("\n${version}=${minecraft.version}") - file('web/versions.ini').append("\n${version}=1.10.2") file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") - file("${config.dir_repo}/version/1.10.2.txt").write("${version}") def updateJsonFile = file('version/update.json') def updateJson = new JsonSlurper().parse(updateJsonFile) as Map @@ -130,14 +128,10 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { // Add to version section updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" - updateJson."1.10.2"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" // Update promos updateJson.promos."${minecraft.version}-latest" = "${version}" updateJson.promos."${minecraft.version}-recommended" = "${version}" - updateJson.promos."1.10.2-latest" = "${version}" - updateJson.promos."1.10.2-recommended" = "${version}" - updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) } @@ -247,8 +241,7 @@ curseforge { See https://github.com/williewillus/Botania/releases/tag/${version} """ releaseType = "release" - addGameVersion '1.9.4' - addGameVersion '1.10.2' + addGameVersion "${minecraft.version}" relations { requiredLibrary 'baubles' } diff --git a/build.properties b/build.properties index 06df2b19c..d9f32acbf 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.4 -forge_version=12.17.0.1965 +mc_version=1.10.2 +forge_version=12.18.1.2014 build_number=314 mod_name=Botania diff --git a/src/api/java/buildcraft/api/core/EnumPipePart.java b/src/api/java/buildcraft/api/core/EnumPipePart.java index f3ea8d6fb..f515ff92b 100644 --- a/src/api/java/buildcraft/api/core/EnumPipePart.java +++ b/src/api/java/buildcraft/api/core/EnumPipePart.java @@ -6,7 +6,7 @@ import java.util.Map; import com.google.common.collect.Maps; import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTBase.NBTPrimitive; +import net.minecraft.nbt.NBTPrimitive; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; 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 76a539734..12e3c993f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -85,17 +85,12 @@ public class MultiblockBlockAccess implements IBlockAccess { @Nonnull @Override - public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { + public Biome getBiome(@Nonnull BlockPos pos) { if(hasBlockAccess) - return originalBlockAccess.getBiomeGenForCoords(pos); + return originalBlockAccess.getBiome(pos); return null; } - @Override - public boolean extendedLevelsInChunkCache() { - return hasBlockAccess && originalBlockAccess.extendedLevelsInChunkCache(); - } - @Override public boolean isSideSolid(@Nonnull BlockPos pos, @Nonnull EnumFacing side, boolean _default) { if(hasBlockAccess) 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 089a7020e..b36b10528 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -26,7 +26,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -337,7 +336,7 @@ public class ClientProxy extends CommonProxy { BotaniaPlayerController controller = new BotaniaPlayerController(mc, net); boolean isFlying = player.capabilities.isFlying; boolean allowFlying = player.capabilities.allowFlying; - Botania.crossVersionProxy.copyGameType(mc.playerController, controller); + controller.setGameType(mc.playerController.getCurrentGameType()); player.capabilities.isFlying = isFlying; player.capabilities.allowFlying = allowFlying; mc.playerController = controller; diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 9264ea595..5ae521951 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -146,13 +146,8 @@ public class PlatformModel implements IBakedModel { @Nonnull @Override - public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { - return compose.getBiomeGenForCoords(pos); - } - - @Override - public boolean extendedLevelsInChunkCache() { - return compose.extendedLevelsInChunkCache(); + public Biome getBiome(@Nonnull BlockPos pos) { + return compose.getBiome(pos); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index 10ab76a25..a0761b115 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -20,6 +20,7 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.monster.SkeletonType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; @@ -62,7 +63,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); } else if (view instanceof EntitySkeleton) { skullType = 0; - if(Botania.crossVersionProxy.getSkeletonTypeInt((EntitySkeleton) view) == 1) + if (((EntitySkeleton) view).getSkeletonType() == SkeletonType.WITHER) skullType = 1; } else if(view instanceof EntityWither) skullType = 1; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d662eb974..0570304d0 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,15 +10,11 @@ */ package vazkii.botania.common; -import com.google.common.collect.ImmutableMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.event.ClickEvent; -import net.minecraft.util.text.event.HoverEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; @@ -40,11 +36,8 @@ import org.apache.logging.log4j.Logger; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.core.proxy.ICrossVersionProxy; import vazkii.botania.common.lib.LibMisc; -import java.util.Map; - @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) public class Botania { @@ -66,33 +59,10 @@ public class Botania { @SidedProxy(serverSide = LibMisc.PROXY_COMMON, clientSide = LibMisc.PROXY_CLIENT) public static CommonProxy proxy; - public static ICrossVersionProxy crossVersionProxy; - public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); - private static final Map PROXY_MAP = ImmutableMap.of( - "1.9.4", "vazkii.botania.common.core.proxy.CrossVersionProxy_19", - "1.10", "vazkii.botania.common.core.proxy.CrossVersionProxy_110", - "1.10.2", "vazkii.botania.common.core.proxy.CrossVersionProxy_110" - ); - @EventHandler public void preInit(FMLPreInitializationEvent event) { - try { - // The constant is inlined at compile time, we want the real value. - String mcVersion = (String) Loader.class.getDeclaredField("MC_VERSION").get(null); - - if(!PROXY_MAP.containsKey(mcVersion)) - throw new IllegalStateException("Botania couldn't find a cross version proxy!"); - - Class clazz = Class.forName(PROXY_MAP.get(mcVersion)); - crossVersionProxy = (ICrossVersionProxy) clazz.newInstance(); - - Botania.LOGGER.info("Enabling proxy for Minecraft {}", mcVersion); - } catch (NoSuchFieldException | ClassNotFoundException | InstantiationException | IllegalAccessException ex) { - throw new IllegalStateException("Botania couldn't find a cross version proxy!", ex); - } - gardenOfGlassLoaded = Loader.isModLoaded("GardenOfGlass"); thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); 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 baa411ee5..ae2334e13 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 @@ -75,7 +75,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public ItemStack getStoneToPut(BlockPos coords) { - List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiome(coords))); TIntArrayList values = new TIntArrayList(); for(int i = 0; i < 8; i++) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index ed783f822..d3118f373 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } 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 f2ab181bd..69aae6dc6 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 @@ -180,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 537534b15..b1760de21 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -34,8 +34,8 @@ public class BiomeDecorationHandler { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld()); - else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); + else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); if(!flowers) return; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java deleted file mode 100644 index bf0c8ccde..000000000 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java +++ /dev/null @@ -1,82 +0,0 @@ -package vazkii.botania.common.core.proxy; - -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.management.PlayerInteractionManager; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.BotaniaPlayerController; -import vazkii.botania.common.Botania; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class CrossVersionProxy_110 implements ICrossVersionProxy { - @Override - public TileEntity createTeFromCompound(World world, NBTTagCompound compound) { - Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "create", "func_190200_a", "a" }, World.class, NBTTagCompound.class); - try { - return (TileEntity) m.invoke(null, world, compound); - } catch (IllegalAccessException | InvocationTargetException e) { - Botania.LOGGER.error("Couldn't create TE in 1.10 crossversion proxy"); - return null; - } - } - - @SideOnly(Side.CLIENT) - @Override - public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { - try { - Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); - Object gameType = m.invoke(from); - m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); - m.invoke(to, gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { - Botania.LOGGER.error("Couldn't copy gametype in 1.10 crossversion proxy"); - } - } - - @Override - public int getSkeletonTypeInt(EntitySkeleton skeleton) { - try { - Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[] { "func_189771_df", "df" }); - Enum e = (Enum) m.invoke(skeleton); - return e.ordinal(); - } catch (IllegalAccessException | InvocationTargetException e1) { - Botania.LOGGER.error("Couldn't get skeleton type in 1.10 crossversion proxy"); - return 0; - } - } - - @Override - public void setSkeletonTypeInt(EntitySkeleton skeleton, int type) { - try { - Class skeletonTypeClazz = Class.forName("net.minecraft.entity.monster.SkeletonType"); - Object typeToSet = skeletonTypeClazz.getEnumConstants()[type]; - Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[] { "func_189768_a", "a" }, skeletonTypeClazz); - m.invoke(skeleton, typeToSet); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException e) { - Botania.LOGGER.error("Couldn't set skeleton type in 1.10 crossversion proxy"); - } - } - - @Override - public boolean isSurvivalOrAdventure(EntityPlayerMP playerMP) { - try { - Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); - Method m = ReflectionHelper.findMethod(PlayerInteractionManager.class, null, new String[] { "getGameType", "func_73081_b", "b" }); - Object gameType = m.invoke(playerMP.interactionManager); - m = ReflectionHelper.findMethod(gameTypeClazz, null, new String[] { "isSurvivalOrAdventure", "func_77144_e", "e" }); - return (Boolean) m.invoke(gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { - Botania.LOGGER.error("Couldn't determine survival or adventure in 1.10 crossversion proxy"); - return true; - } - } -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java deleted file mode 100644 index 2b6005a26..000000000 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java +++ /dev/null @@ -1,79 +0,0 @@ -package vazkii.botania.common.core.proxy; - -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.management.PlayerInteractionManager; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.BotaniaPlayerController; -import vazkii.botania.common.Botania; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class CrossVersionProxy_19 implements ICrossVersionProxy { - @Override - public TileEntity createTeFromCompound(World world, NBTTagCompound compound) { - Method m = ReflectionHelper.findMethod(TileEntity.class, null, new String[] { "create", "func_189514_c", "c" }, NBTTagCompound.class); - try { - return (TileEntity) m.invoke(null, compound); - } catch (IllegalAccessException | InvocationTargetException e) { - Botania.LOGGER.error("Couldn't create TE in 1.9 crossversion proxy"); - return null; - } - } - - @SideOnly(Side.CLIENT) - @Override - public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { - try { - Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings$GameType"); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); - Object gameType = m.invoke(from); - m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); - m.invoke(to, gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { - Botania.LOGGER.error("Couldn't copy game type in 1.9 crossversion proxy"); - } - } - - @Override - public int getSkeletonTypeInt(EntitySkeleton skeleton) { - try { - Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "getSkeletonType", "func_82202_m", "db" }); - return (int) m.invoke(skeleton); - } catch (IllegalAccessException | InvocationTargetException e) { - Botania.LOGGER.error("Couldn't get skeleton type in 1.9 crossversion proxy"); - return 0; - } - } - - @Override - public void setSkeletonTypeInt(EntitySkeleton skeleton, int type) { - try { - Method m = ReflectionHelper.findMethod(EntitySkeleton.class, null, new String[]{ "setSkeletonType", "func_82201_a", "a" }, int.class); - m.invoke(skeleton, type); - } catch (IllegalAccessException | InvocationTargetException e) { - Botania.LOGGER.error("Couldn't set skeleton type in 1.9 crossversion proxy"); - } - } - - @Override - public boolean isSurvivalOrAdventure(EntityPlayerMP playerMP) { - try { - Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings$GameType"); - Method m = ReflectionHelper.findMethod(PlayerInteractionManager.class, null, new String[] { "getGameType", "func_73081_b", "b" }); - Object gameType = m.invoke(playerMP.interactionManager); - m = ReflectionHelper.findMethod(gameTypeClazz, null, new String[] { "isSurvivalOrAdventure", "func_77144_e", "e" }); - return (Boolean) m.invoke(gameType); - } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) { - Botania.LOGGER.error("Couldn't determine survival or adventure in 1.9 crossversion proxy"); - return true; - } - } -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java deleted file mode 100644 index ccd24d540..000000000 --- a/src/main/java/vazkii/botania/common/core/proxy/ICrossVersionProxy.java +++ /dev/null @@ -1,28 +0,0 @@ -package vazkii.botania.common.core.proxy; - -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.BotaniaPlayerController; - -// horrible hax to try to run 1.9/10 from the same jar :D -// Taking this as an example is heavily discouraged -public interface ICrossVersionProxy { - - TileEntity createTeFromCompound(World world, NBTTagCompound compound); - - @SideOnly(Side.CLIENT) - void copyGameType(PlayerControllerMP from, BotaniaPlayerController to); - - int getSkeletonTypeInt(EntitySkeleton skeleton); - - void setSkeletonTypeInt(EntitySkeleton skeleton, int type); - - boolean isSurvivalOrAdventure(EntityPlayerMP playerMP); - -} diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d4b3d61ed..bdccd1c8f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -27,6 +27,7 @@ import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.monster.SkeletonType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -669,7 +670,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { entity = new EntitySkeleton(worldObj); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); if(worldObj.rand.nextInt(8) == 0) { - Botania.crossVersionProxy.setSkeletonTypeInt((EntitySkeleton) entity, 1); + ((EntitySkeleton) entity).setSkeletonType(SkeletonType.WITHER); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 221647f70..c83d74c73 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -251,7 +251,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet TileEntity tile = null; NBTTagCompound tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false); if(tilecmp.hasKey("id")) - tile = Botania.crossVersionProxy.createTeFromCompound(entity.worldObj, tilecmp); + tile = TileEntity.create(entity.worldObj, tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); 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 dac5b2c5b..5ca7c91e7 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 @@ -195,7 +195,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(living instanceof EntityPlayerMP) { ToolCommons.damageItem(bow, 1, living, MANA_PER_DAMAGE); - if(Botania.crossVersionProxy.isSurvivalOrAdventure((EntityPlayerMP) living)) + 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 a8480a843..f4ee342b4 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 @@ -42,7 +42,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, weapon); if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.SKULL, 1, Botania.crossVersionProxy.getSkeletonTypeInt((EntitySkeleton) event.getEntityLiving()))); + addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).getSkeletonType().ordinal())); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index ecf6a3c61..242ee221b 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.17.0.1965,];required-after:Baubles;after:Thaumcraft"; - public static final String MC_VERSIONS = "[1.9.4,1.10.2]"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2014,];required-after:Baubles;after:Thaumcraft"; + public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; // Network Contants From c5208175d73383dc447f174c9cfc9eb661d6027f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jul 2016 21:22:33 -0500 Subject: [PATCH 791/935] Made a bunch of evthandlers static --- .../client/core/handler/BossBarHandler.java | 4 ++- .../core/handler/BoundTileRenderer.java | 10 ++++--- .../core/handler/ClientTickHandler.java | 10 ++++--- .../client/core/handler/DebugHandler.java | 4 ++- .../client/core/handler/HUDHandler.java | 18 +++++++------ .../client/core/handler/LightningHandler.java | 4 ++- .../core/handler/MultiblockRenderHandler.java | 10 ++++--- .../handler/SubTileRadiusRenderHandler.java | 8 +++--- .../client/core/handler/TooltipHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 26 +++++++++---------- .../render/world/SkyblockRenderEvents.java | 2 +- .../achievement/AchievementTriggerer.java | 6 +++-- .../common/achievement/ModAchievements.java | 2 +- .../botania/common/block/BlockBifrost.java | 1 - .../botania/common/block/BlockFelPumpkin.java | 4 +-- .../botania/common/block/BlockGhostRail.java | 6 ++--- .../common/block/decor/BlockDirtPath.java | 7 ++--- .../string/BlockRedStringInterceptor.java | 4 +-- .../functional/BergamuteEventHandler.java | 5 +++- .../subtile/functional/SubTileVinculotus.java | 4 +-- .../subtile/generating/SubTileNarslimmus.java | 2 +- .../core/handler/BiomeDecorationHandler.java | 6 +++-- .../core/handler/CommonTickHandler.java | 4 ++- .../common/core/handler/ConfigHandler.java | 4 +-- .../common/core/handler/PixieHandler.java | 8 +++--- .../common/core/handler/SheddingHandler.java | 4 ++- .../common/core/proxy/CommonProxy.java | 12 ++++----- .../common/core/version/AdaptorNotifier.java | 6 +++-- .../common/core/version/VersionChecker.java | 8 +++--- .../botania/common/item/ItemKeepIvy.java | 4 +-- .../botania/common/item/ItemRegenIvy.java | 4 +-- .../vazkii/botania/common/item/ItemVirus.java | 4 +-- .../common/item/relic/ItemLokiRing.java | 4 +-- .../common/item/relic/ItemOdinRing.java | 4 +-- .../common/world/SkyblockWorldEvents.java | 8 +++--- 35 files changed, 127 insertions(+), 92 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 008b20a7d..037f0a538 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -31,13 +31,15 @@ import java.util.WeakHashMap; public final class BossBarHandler { + private BossBarHandler() {} + // Only access on the client thread! public static final Set bosses = Collections.newSetFromMap(new WeakHashMap<>()); public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); private static final BarCallback barUniformCallback = new BarCallback(); @SubscribeEvent - public void onBarRender(RenderGameOverlayEvent.BossInfo evt) { + public static void onBarRender(RenderGameOverlayEvent.BossInfo evt) { UUID infoUuid = evt.getBossInfo().getUniqueId(); for(IBotaniaBoss currentBoss : bosses) { if(currentBoss.getBossInfoUuid().equals(infoUuid)) { diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 10f442d30..db585084f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -39,8 +39,10 @@ import java.util.List; public final class BoundTileRenderer { + private BoundTileRenderer() {} + @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableDepth(); @@ -89,11 +91,11 @@ public final class BoundTileRenderer { GlStateManager.popMatrix(); } - private void renderBlockOutlineAt(BlockPos pos, int color) { + private static void renderBlockOutlineAt(BlockPos pos, int color) { renderBlockOutlineAt(pos, color, 1F); } - private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { + private static void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { double renderPosX, renderPosY, renderPosZ; try { @@ -140,7 +142,7 @@ public final class BoundTileRenderer { GlStateManager.popMatrix(); } - private void renderBlockOutline(AxisAlignedBB aabb) { + private static void renderBlockOutline(AxisAlignedBB aabb) { Tessellator tessellator = Tessellator.getInstance(); double ix = aabb.minX; diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 3807efc2c..8d2f897cd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -28,7 +28,9 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; -public class ClientTickHandler { +public final class ClientTickHandler { + + private ClientTickHandler() {} public static int ticksWithLexicaOpen = 0; public static int pageFlipTicks = 0; @@ -37,14 +39,14 @@ public class ClientTickHandler { public static float delta = 0; public static float total = 0; - private void calcDelta() { + private static void calcDelta() { float oldTotal = total; total = ticksInGame + partialTicks; delta = total - oldTotal; } @SubscribeEvent - public void renderTick(RenderTickEvent event) { + public static void renderTick(RenderTickEvent event) { if(event.phase == Phase.START) partialTicks = event.renderTickTime; else { @@ -54,7 +56,7 @@ public class ClientTickHandler { } @SubscribeEvent - public void clientTickEnd(ClientTickEvent event) { + public static void clientTickEnd(ClientTickEvent event) { if(event.phase == Phase.END) { RedStringRenderer.tick(); ItemsRemainingRenderHandler.tick(); 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 ab62a71ce..210341701 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -31,10 +31,12 @@ import java.util.UUID; public final class DebugHandler { + private DebugHandler() {} + private static final String PREFIX = TextFormatting.GREEN + "[Botania] " + TextFormatting.RESET; @SubscribeEvent - public void onDrawDebugText(RenderGameOverlayEvent.Text event) { + public static void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { event.getLeft().add(null); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index cc0ca7e53..c6c1c83c4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -70,10 +70,12 @@ import java.awt.*; public final class HUDHandler { + private HUDHandler() {} + public static final ResourceLocation manaBar = new ResourceLocation(LibResources.GUI_MANA_HUD); @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onDrawScreenPre(RenderGameOverlayEvent.Pre event) { + public static void onDrawScreenPre(RenderGameOverlayEvent.Pre event) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -90,7 +92,7 @@ public final class HUDHandler { } @SubscribeEvent - public void onDrawScreenPost(RenderGameOverlayEvent.Post event) { + public static void onDrawScreenPost(RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; ItemStack main = mc.thePlayer.getHeldItemMainhand(); @@ -221,7 +223,7 @@ public final class HUDHandler { } } - private void renderWandModeDisplay(ItemStack stack, ScaledResolution res) { + private static void renderWandModeDisplay(ItemStack stack, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -244,7 +246,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderManaInvBar(ScaledResolution res, boolean hasCreative, int totalMana, int totalMaxMana) { + private static void renderManaInvBar(ScaledResolution res, boolean hasCreative, int totalMana, int totalMaxMana) { Minecraft mc = Minecraft.getMinecraft(); int width = 182; int x = res.getScaledWidth() / 2 - width / 2; @@ -273,7 +275,7 @@ public final class HUDHandler { GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); } - private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { + private static void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -305,7 +307,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderCrystalCubeHUD(ScaledResolution res, TileCorporeaCrystalCube tile) { + private static void renderCrystalCubeHUD(ScaledResolution res, TileCorporeaCrystalCube tile) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -331,7 +333,7 @@ public final class HUDHandler { profiler.endSection(); } - private void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { + private static void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Block block = state.getBlock(); Profiler profiler = mc.mcProfiler; @@ -398,7 +400,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderNearIndexDisplay(ScaledResolution res) { + private static void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); String txt0 = I18n.format("botaniamisc.nearIndex0"); String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1"); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 1bba39526..a14cb4bd9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -30,13 +30,15 @@ import java.util.Deque; public class LightningHandler { + private LightningHandler() {} + private static final int BATCH_THRESHOLD = 200; private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); public static final Deque queuedLightningBolts = new ArrayDeque<>(); @SubscribeEvent - public void onRenderWorldLast(RenderWorldLastEvent event) { + public static void onRenderWorldLast(RenderWorldLastEvent event) { Profiler profiler = Minecraft.getMinecraft().mcProfiler; profiler.startSection("botania-particles"); 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 9c9c2f74b..47c8add7f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,6 +40,8 @@ import vazkii.botania.common.block.ModBlocks; public final class MultiblockRenderHandler { + private MultiblockRenderHandler() {} + private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); private static int dimension; @@ -79,7 +81,7 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { renderPlayerLook(mc.thePlayer, mc.objectMouseOver); @@ -87,7 +89,7 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); @@ -95,7 +97,7 @@ public final class MultiblockRenderHandler { } } - private void renderPlayerLook(EntityPlayer player, RayTraceResult src) { + private static void renderPlayerLook(EntityPlayer player, RayTraceResult src) { if(currentMultiblock != null && dimension == player.worldObj.provider.getDimension()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); @@ -133,7 +135,7 @@ public final class MultiblockRenderHandler { } } - private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { + private static boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { double renderPosX, renderPosY, renderPosZ; try { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index ea9402843..914c2ade6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -34,8 +34,10 @@ import java.awt.*; public final class SubTileRadiusRenderHandler { + private SubTileRadiusRenderHandler() {} + @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); RayTraceResult pos = mc.objectMouseOver; @@ -79,7 +81,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private void renderRectangle(AxisAlignedBB aabb) { + private static void renderRectangle(AxisAlignedBB aabb) { double renderPosX, renderPosY, renderPosZ; try { @@ -124,7 +126,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private void renderCircle(BlockPos center, double radius) { + private static void renderCircle(BlockPos center, double radius) { double renderPosX, renderPosY, renderPosZ; try { 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 e0011b70d..57199cec6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -23,7 +23,7 @@ import vazkii.botania.common.item.ItemRegenIvy; public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onTooltipEvent(ItemTooltipEvent event) { + public static void onTooltipEvent(ItemTooltipEvent event) { if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); 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 b36b10528..e9d82f2bc 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -199,24 +199,24 @@ public class ClientProxy extends CommonProxy { ModChallenges.init(); - MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); - MinecraftForge.EVENT_BUS.register(new HUDHandler()); - MinecraftForge.EVENT_BUS.register(new LightningHandler()); + MinecraftForge.EVENT_BUS.register(ClientTickHandler.class); + MinecraftForge.EVENT_BUS.register(HUDHandler.class); + MinecraftForge.EVENT_BUS.register(LightningHandler.class); if(ConfigHandler.boundBlockWireframe) - MinecraftForge.EVENT_BUS.register(new BoundTileRenderer()); - MinecraftForge.EVENT_BUS.register(new TooltipHandler()); - MinecraftForge.EVENT_BUS.register(new DebugHandler()); - MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); - MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); - MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); + MinecraftForge.EVENT_BUS.register(BoundTileRenderer.class); + MinecraftForge.EVENT_BUS.register(TooltipHandler.class); + MinecraftForge.EVENT_BUS.register(DebugHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileRadiusRenderHandler.class); + MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class); + MinecraftForge.EVENT_BUS.register(SkyblockRenderEvents.class); MinecraftForge.EVENT_BUS.register(new RenderLexicon()); - MinecraftForge.EVENT_BUS.register(new BossBarHandler()); - MinecraftForge.EVENT_BUS.register(new BergamuteEventHandler()); + MinecraftForge.EVENT_BUS.register(BossBarHandler.class); + MinecraftForge.EVENT_BUS.register(BergamuteEventHandler.class); if(ConfigHandler.useAdaptativeConfig) - MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); + MinecraftForge.EVENT_BUS.register(AdaptorNotifier.class); if(ConfigHandler.versionCheckEnabled) - new VersionChecker().init(); + VersionChecker.init(); if(ConfigHandler.enableSeasonalFeatures) { LocalDateTime now = LocalDateTime.now(); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 639dbfd6e..983fe27cb 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -20,7 +20,7 @@ import vazkii.botania.common.world.WorldTypeSkyblock; public final class SkyblockRenderEvents { @SubscribeEvent - public void onRender(RenderWorldLastEvent event) { + public static void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index e5c32613e..3605f7159 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -18,8 +18,10 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; public final class AchievementTriggerer { + private AchievementTriggerer() {} + @SubscribeEvent - public void onItemPickedUp(ItemPickupEvent event) { + public static void onItemPickedUp(ItemPickupEvent event) { ItemStack stack = event.pickedUp.getEntityItem(); if(stack != null && stack.getItem() instanceof IPickupAchievement) { Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player, event.pickedUp); @@ -29,7 +31,7 @@ public final class AchievementTriggerer { } @SubscribeEvent - public void onItemCrafted(ItemCraftedEvent event) { + public static void onItemCrafted(ItemCraftedEvent event) { if(event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) { Achievement achievement = ((ICraftAchievement) event.crafting.getItem()).getAchievementOnCraft(event.crafting, event.player, event.craftMatrix); if(achievement != null) diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 40cdd5f06..82606ae69 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -157,7 +157,7 @@ public final class ModAchievements { botaniaPage = new AchievementPage(LibMisc.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); AchievementPage.registerAchievementPage(botaniaPage); - MinecraftForge.EVENT_BUS.register(new AchievementTriggerer()); + MinecraftForge.EVENT_BUS.register(AchievementTriggerer.class); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index e2827a337..9c600aaa4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -42,7 +42,6 @@ public class BlockBifrost extends BlockMod implements ILexiconable { setLightLevel(1F); setBlockUnbreakable(); setSoundType(SoundType.GLASS); - MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index f6ab2b843..4fcb1771f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -43,7 +43,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { super(Material.GOURD, LibBlockNames.FEL_PUMPKIN); setHardness(1F); setSoundType(SoundType.WOOD); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockFelPumpkin.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -88,7 +88,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @SubscribeEvent - public void onDrops(LivingDropsEvent event) { + public static 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))); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index e8ea87f9c..690eebdbb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -46,7 +46,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.GHOST_RAIL); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @@ -68,14 +68,14 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @SubscribeEvent - public void onMinecartUpdate(MinecartUpdateEvent event) { + public static void onMinecartUpdate(MinecartUpdateEvent event) { BlockPos entPos = new BlockPos(event.getEntity()); IBlockState state = event.getEntity().worldObj.getBlockState(entPos); Block block = state.getBlock(); boolean air = block.isAir(state, event.getEntity().worldObj, entPos); int floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); - if(block == this) + if(block == ModBlocks.ghostRail) event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 20); else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0); 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 64b843dc5..0a9d79e2c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -35,6 +35,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -53,7 +54,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { setHardness(0.6F); setSoundType(SoundType.GROUND); useNeighborBrightness = true; - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockDirtPath.class); } @Override @@ -113,11 +114,11 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @SubscribeEvent - public void onTickEnd(TickEvent.WorldTickEvent event) { + public static void onTickEnd(TickEvent.WorldTickEvent event) { if(event.world.isRemote || event.phase != TickEvent.Phase.END) return; for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).hasModifier(speedBoost))) { - if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != this) { + if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != ModBlocks.dirtPath) { player.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).removeModifier(speedBoost); } } // todo 1.8 there's probably a better way to do this. diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 6bd123d34..682984cfb 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -31,7 +31,7 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockRedStringInterceptor.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @@ -62,7 +62,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @SubscribeEvent - public void onInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onInteract(PlayerInteractEvent.RightClickBlock event) { TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), event.getHand()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index c18dee15f..2c290ee59 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -21,11 +21,14 @@ import java.util.Random; @SideOnly(Side.CLIENT) public class BergamuteEventHandler { + + private BergamuteEventHandler() {} + private static final Random RAND = new Random(); private static final float MULTIPLIER = 0.15F; @SubscribeEvent(priority = EventPriority.LOWEST) - public void onSoundEvent(PlaySoundEvent evt) { + public static void onSoundEvent(PlaySoundEvent evt) { ISound sound = evt.getResultSound(); if (sound != null && shouldSilence(sound.getCategory())) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index b56f64e30..a622e8b96 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -39,7 +39,7 @@ public class SubTileVinculotus extends SubTileFunctional { if(!supertile.getWorld().isRemote && !existingFlowers.contains(this)) { existingFlowers.add(this); if(!registered) { - MinecraftForge.EVENT_BUS.register(new EndermanIntercepter()); + MinecraftForge.EVENT_BUS.register(EndermanIntercepter.class); registered = true; } } @@ -73,7 +73,7 @@ public class SubTileVinculotus extends SubTileFunctional { public static class EndermanIntercepter { @SubscribeEvent - public void onEndermanTeleport(EnderTeleportEvent event) { + public static void onEndermanTeleport(EnderTeleportEvent event) { int cost = 50; if(event.getEntityLiving() instanceof EntityEnderman) { 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 4c0a6a77c..b7d4f18d7 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 @@ -89,7 +89,7 @@ public class SubTileNarslimmus extends SubTileGenerating { public static class SpawnIntercepter { @SubscribeEvent - public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().worldObj, MathHelper.floor_double(event.getX()), MathHelper.floor_double(event.getZ()))) event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index b1760de21..7e420810c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -26,10 +26,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -public class BiomeDecorationHandler { +public final class BiomeDecorationHandler { + + private BiomeDecorationHandler() {} @SubscribeEvent(priority = EventPriority.LOWEST) - public void onWorldDecoration(DecorateBiomeEvent.Decorate event) { + public static void onWorldDecoration(DecorateBiomeEvent.Decorate event) { if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.getType() == EventType.FLOWERS) { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 2bb5c6e91..f816b37f8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -17,8 +17,10 @@ import vazkii.botania.api.corporea.CorporeaHelper; public final class CommonTickHandler { + private CommonTickHandler() {} + @SubscribeEvent - public void onTick(WorldTickEvent event) { + public static void onTick(WorldTickEvent event) { if(event.phase == Phase.END) { CorporeaHelper.clearCache(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 16d5ccb6d..cce9c2bb1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -102,7 +102,7 @@ public final class ConfigHandler { config.load(); load(); - MinecraftForge.EVENT_BUS.register(new ChangeListener()); + MinecraftForge.EVENT_BUS.register(ChangeListener.class); } public static void load() { @@ -436,7 +436,7 @@ public final class ConfigHandler { public static class ChangeListener { @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { if(eventArgs.getModID().equals(LibMisc.MOD_ID)) load(); } 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 a4b91cc80..c46996666 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -16,7 +16,9 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; -public class PixieHandler { +public final class PixieHandler { + + private PixieHandler() {} private static final Potion[] potions = { MobEffects.BLINDNESS, @@ -26,7 +28,7 @@ public class PixieHandler { }; @SubscribeEvent - public void onDamageTaken(LivingHurtEvent event) { + public static void onDamageTaken(LivingHurtEvent event) { if(!event.getEntityLiving().worldObj.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); @@ -57,7 +59,7 @@ public class PixieHandler { } } - private float getChance(ItemStack stack) { + private static float getChance(ItemStack stack) { if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); 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 017f45a73..c62c3c78b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -38,11 +38,13 @@ import java.util.Map.Entry; public final class SheddingHandler { + private SheddingHandler() {} + private static final List patterns = new ArrayList<>(); private static final List defaultPatterns = new ArrayList<>(); @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) { + public static void onLivingUpdate(LivingUpdateEvent event) { if(event.getEntityLiving().worldObj.isRemote) return; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 9b3e9019e..f69406110 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -131,18 +131,18 @@ public class CommonProxy { NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); - MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeDecorationHandler()); + MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(new PixieHandler()); - MinecraftForge.EVENT_BUS.register(new SheddingHandler()); - MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); + MinecraftForge.EVENT_BUS.register(PixieHandler.class); + MinecraftForge.EVENT_BUS.register(SheddingHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); MinecraftForge.EVENT_BUS.register(new LootHandler()); if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); + MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); - MinecraftForge.EVENT_BUS.register(new CommonTickHandler()); + MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 8bb8af6e6..ca406f7f7 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -18,10 +18,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; public final class AdaptorNotifier { - private boolean triedToWarnPlayer; + private AdaptorNotifier() {} + + private static boolean triedToWarnPlayer; @SubscribeEvent - public void onTick(ClientTickEvent event) { + public static void onTick(ClientTickEvent event) { if(!triedToWarnPlayer && Minecraft.getMinecraft().thePlayer != null) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; ConfigHandler.adaptor.tellChanges(player); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 6593d2665..d3c5f90cb 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -25,6 +25,8 @@ import vazkii.botania.common.lib.LibMisc; public final class VersionChecker { + private VersionChecker() {} + private static final int FLAVOUR_MESSAGES = 65; public static boolean doneChecking = false; @@ -34,13 +36,13 @@ public final class VersionChecker { public static boolean startedDownload = false; public static boolean downloadedFile = false; - public void init() { + public static void init() { new ThreadVersionChecker(); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(VersionChecker.class); } @SubscribeEvent - public void onTick(ClientTickEvent event) { + public static void onTick(ClientTickEvent event) { if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) { if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 7b558b071..5182b7741 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -40,7 +40,7 @@ public class ItemKeepIvy extends ItemMod { super(LibItemNames.KEEP_IVY); GameRegistry.addRecipe(new KeepIvyRecipe()); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemKeepIvy.class); } @SubscribeEvent @@ -78,7 +78,7 @@ public class ItemKeepIvy extends ItemMod { } @SubscribeEvent - public void onPlayerRespawn(PlayerRespawnEvent event) { + public static void onPlayerRespawn(PlayerRespawnEvent event) { NBTTagCompound data = event.player.getEntityData(); if(data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) { NBTTagCompound cmp = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index c71203ed3..a3de78fe2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -33,11 +33,11 @@ public class ItemRegenIvy extends ItemMod { super(LibItemNames.REGEN_IVY); GameRegistry.addRecipe(new RegenIvyRecipe()); RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemRegenIvy.class); } @SubscribeEvent(priority = EventPriority.LOWEST) - public void onTick(PlayerTickEvent event) { + public static void onTick(PlayerTickEvent event) { if(event.phase == Phase.END && !event.player.worldObj.isRemote) for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { ItemStack stack = event.player.inventory.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 2fec7b3d6..b7faf644f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -48,7 +48,7 @@ public class ItemVirus extends ItemMod { public ItemVirus() { super(LibItemNames.VIRUS); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemVirus.class); } @Override @@ -96,7 +96,7 @@ public class ItemVirus extends ItemMod { } @SubscribeEvent - public void onLivingHurt(LivingHurtEvent event) { + public static void onLivingHurt(LivingHurtEvent event) { EntityLivingBase entity = event.getEntityLiving(); if(entity.isRiding() && entity.getRidingEntity() instanceof EntityLivingBase) entity = (EntityLivingBase) entity.getRidingEntity(); 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 8d703eccf..c0a4d38c0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -62,11 +62,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public ItemLokiRing() { super(LibItemNames.LOKI_RING); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemLokiRing.class); } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index ad7e66e41..700a6d181 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -39,7 +39,7 @@ public class ItemOdinRing extends ItemRelicBauble { public ItemOdinRing() { super(LibItemNames.ODIN_RING); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemOdinRing.class); damageNegations.add(DamageSource.drown.damageType); damageNegations.add(DamageSource.fall.damageType); @@ -60,7 +60,7 @@ public class ItemOdinRing extends ItemRelicBauble { } @SubscribeEvent - public void onPlayerAttacked(LivingAttackEvent event) { + public static void onPlayerAttacked(LivingAttackEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); if(getOdinRing(player) != null && damageNegations.contains(event.getSource().damageType)) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 66c433eff..57452544e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -37,6 +37,8 @@ import java.awt.*; public final class SkyblockWorldEvents { + private SkyblockWorldEvents() {} + private static final String TAG_MADE_ISLAND = "Botania-MadeIsland"; private static final String TAG_HAS_OWN_ISLAND = "Botania-HasOwnIsland"; private static final String TAG_ISLAND_X = "Botania-IslandX"; @@ -44,7 +46,7 @@ public final class SkyblockWorldEvents { private static final String TAG_ISLAND_Z = "Botania-IslandZ"; @SubscribeEvent - public void onPlayerUpdate(LivingUpdateEvent event) { + public static void onPlayerUpdate(LivingUpdateEvent event) { if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().worldObj.isRemote) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); NBTTagCompound data = player.getEntityData(); @@ -67,7 +69,7 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { ItemStack equipped = event.getItemStack(); if(equipped == null && event.getEntityPlayer().isSneaking()) { @@ -103,7 +105,7 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onDrops(BlockEvent.HarvestDropsEvent event) { + public static void onDrops(BlockEvent.HarvestDropsEvent event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.TALLGRASS) { ItemStack stackToRemove = null; for(ItemStack stack : event.getDrops()) From d8bdb6a31dfea8f4ef2c3e42f4a1e669b011317f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Jul 2016 19:02:23 -0500 Subject: [PATCH 792/935] Fix cacophonium. Closes #400 --- .../common/block/tile/TileCacophonium.java | 3 ++- .../botania/common/item/ItemCacophonium.java | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index a4f899098..4e8259c3e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import vazkii.botania.common.item.ItemCacophonium; public class TileCacophonium extends TileMod { @@ -21,7 +22,7 @@ public class TileCacophonium extends TileMod { public ItemStack stack; public void annoyDirewolf() { - ItemCacophonium.playSound(worldObj, stack, pos.getX(), pos.getY(), pos.getZ(), 1F); + ItemCacophonium.playSound(worldObj, stack, pos.getX(), pos.getY(), pos.getZ(), SoundCategory.BLOCKS, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 92260f15d..09e34fb91 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -19,6 +19,7 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; @@ -61,23 +62,24 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; - String sound; + SoundEvent sound; try { if(living instanceof EntityCreeper) - sound = "creeper.primed"; + sound = SoundEvents.ENTITY_CREEPER_PRIMED; else if(living instanceof EntitySlime) - sound = "mob.slime." + (((EntitySlime) living).getSlimeSize() > 1 ? "big" : "small"); - else sound = (String) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; + else sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); if(sound != null) { String s = EntityList.getEntityString(entity); if(s == null) s = "generic"; - ItemNBTHelper.setString(stack, TAG_SOUND, sound); + ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); ItemNBTHelper.setBoolean(stack, TAG_HAS_SOUND, true); - player.inventory.setInventorySlotContents(player.inventory.currentItem, stack.copy()); + player.setHeldItem(hand, stack); + //player.inventory.setInventorySlotContents(player.inventory.currentItem, stack.copy()); if(player.worldObj.isRemote) player.swingArm(hand); @@ -147,10 +149,10 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public void onUsingTick(ItemStack stack, EntityLivingBase player, int count) { if(count % (isDOIT(stack) ? 20 : 6) == 0) - playSound(player.worldObj, stack, player.posX, player.posY, player.posZ, 0.9F); + playSound(player.worldObj, stack, player.posX, player.posY, player.posZ, SoundCategory.PLAYERS, 0.9F); } - public static void playSound(World world, ItemStack stack, double x, double y, double z, float volume) { + public static void playSound(World world, ItemStack stack, double x, double y, double z, SoundCategory category, float volume) { if(stack == null) return; @@ -160,7 +162,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { sound = "botania:doit"; 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); + world.playSound(null, x, y, z, SoundEvent.REGISTRY.getObject(new ResourceLocation(sound)), category, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); } private static boolean isDOIT(ItemStack stack) { From 404c39c8f8e559425a3963f198957d001a5c27e4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 22 Jul 2016 18:33:36 -0500 Subject: [PATCH 793/935] Fix slingshot not firing properly, fixes #402 --- .../botania/common/item/ItemSlingshot.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 03f8e8815..50941026b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -12,11 +12,13 @@ package vazkii.botania.common.item; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; @@ -38,7 +40,7 @@ public class ItemSlingshot extends ItemMod { public void onPlayerStoppedUsing(ItemStack par1ItemStack, World world, EntityLivingBase living, int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; - if(!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo(((EntityPlayer) living), AMMO_FUNC)) { + if(!world.isRemote && (!(living instanceof EntityPlayer) || ((EntityPlayer) living).capabilities.isCreativeMode || PlayerHelper.hasAmmo(((EntityPlayer) living), AMMO_FUNC))) { float f = j / 20.0F; f = (f * f + f * 2.0F) / 3.0F; @@ -48,21 +50,16 @@ public class ItemSlingshot extends ItemMod { if(living instanceof EntityPlayer && !((EntityPlayer) living).capabilities.isCreativeMode) PlayerHelper.consumeAmmo(((EntityPlayer) living), AMMO_FUNC); - if(!world.isRemote) { - EntityVineBall ball = new EntityVineBall(living, false); - ball.motionX *= 1.6; - ball.motionY *= 1.6; - ball.motionZ *= 1.6; - world.spawnEntityInWorld(ball); - } + EntityVineBall ball = new EntityVineBall(living, false); + ball.setHeadingFromThrower(living, living.rotationPitch, living.rotationYaw, 0F, 1.5F, 1F); + ball.motionX *= 1.6; + ball.motionY *= 1.6; + ball.motionZ *= 1.6; + world.spawnEntityInWorld(ball); + world.playSound(null, living.posX, living.posY, living.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); } } - @Override - public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World world, EntityLivingBase living) { - return par1ItemStack; - } - @Override public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 72000; From b242d43861797a5113fbe6bd6500611f0e0f1704 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 10:48:57 -0500 Subject: [PATCH 794/935] Update forge --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index d9f32acbf..f3174e9bf 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2014 +forge_version=12.18.1.2018 build_number=314 mod_name=Botania From 2bf69eaa562ffd53ec78a6fa858dcc977a15c198 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 13:32:31 -0500 Subject: [PATCH 795/935] Useless constant change --- src/main/java/vazkii/botania/common/network/PacketHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 963f6410b..6875cd962 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -14,7 +14,7 @@ import vazkii.botania.common.lib.LibMisc; public final class PacketHandler { - private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.MOD_ID); + private static final SimpleNetworkWrapper HANDLER = new SimpleNetworkWrapper(LibMisc.NETWORK_CHANNEL); public static void init() { HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, 0, Side.CLIENT); From 1344bb8c081310ac0899ea6922ca61ea1adebb60 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 13:51:19 -0500 Subject: [PATCH 796/935] Exorcism begins: remove (almost) all prismarine --- .../client/core/handler/ModelHandler.java | 14 +-- .../botania/common/block/ModBlocks.java | 6 -- .../botania/common/block/ModFluffBlocks.java | 36 ------- .../common/block/decor/BlockPrismarine.java | 95 ------------------ .../common/block/decor/BlockSeaLamp.java | 39 ------- .../prismarine/BlockDarkPrismarineSlab.java | 23 ----- .../prismarine/BlockPrismarineBrickSlab.java | 23 ----- .../slabs/prismarine/BlockPrismarineSlab.java | 45 --------- .../prismarine/BlockDarkPrismarineStairs.java | 12 --- .../BlockPrismarineBrickStairs.java | 12 --- .../prismarine/BlockPrismarineStairs.java | 29 ------ .../decor/walls/BlockPrismarineWall.java | 36 ------- .../common/crafting/ModMigrationRecipes.java | 15 --- .../botania/common/lexicon/LexiconData.java | 9 -- .../botania/blockstates/prismarine.json | 14 --- .../botania/blockstates/prismarine0Slab.json | 20 ---- .../blockstates/prismarine0SlabFull.json | 9 -- .../blockstates/prismarine0Stairs.json | 53 ---------- .../botania/blockstates/prismarine0Wall.json | 34 ------- .../botania/blockstates/prismarine1Slab.json | 20 ---- .../blockstates/prismarine1SlabFull.json | 9 -- .../blockstates/prismarine1Stairs.json | 53 ---------- .../botania/blockstates/prismarine2Slab.json | 20 ---- .../blockstates/prismarine2SlabFull.json | 9 -- .../blockstates/prismarine2Stairs.json | 53 ---------- .../botania/models/item/prismarineShard.json | 6 +- .../botania/textures/blocks/prismarine0.png | Bin 3378 -> 0 bytes .../textures/blocks/prismarine0.png.mcmeta | 30 ------ .../botania/textures/blocks/prismarine1.png | Bin 936 -> 0 bytes .../botania/textures/blocks/prismarine2.png | Bin 867 -> 0 bytes .../textures/items/prismarineShard.png | Bin 579 -> 0 bytes 31 files changed, 3 insertions(+), 721 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine0Wall.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine1Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/prismarine2Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine0.png.mcmeta delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/prismarine2.png delete mode 100644 src/main/resources/assets/botania/textures/items/prismarineShard.png 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 a602d4e68..ce7bc5ef3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -323,7 +323,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.runeAltar); - registerItemModel(ModBlocks.seaLamp); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); @@ -357,7 +356,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); @@ -623,7 +621,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -641,7 +638,7 @@ public final class ModelHandler { } List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, @@ -667,7 +664,7 @@ public final class ModelHandler { } List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, @@ -773,7 +770,6 @@ public final class ModelHandler { } registerItemModel(ModFluffBlocks.blazeQuartzStairs); - registerItemModel(ModFluffBlocks.darkPrismarineStairs); if (ConfigHandler.darkQuartzEnabled) registerItemModel(ModFluffBlocks.darkQuartzStairs); registerItemModel(ModFluffBlocks.dreamwoodStairs); @@ -788,8 +784,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingwoodPlankStairs); registerItemModel(ModFluffBlocks.manaQuartzStairs); registerItemModel(ModFluffBlocks.netherBrickStairs); - registerItemModel(ModFluffBlocks.prismarineStairs); - registerItemModel(ModFluffBlocks.prismarineBrickStairs); registerItemModel(ModFluffBlocks.redQuartzStairs); registerItemModel(ModFluffBlocks.reedStairs); registerItemModel(ModFluffBlocks.shimmerrockStairs); @@ -830,9 +824,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dreamwoodSlab); registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); - registerItemModel(ModFluffBlocks.prismarineSlab); - registerItemModel(ModFluffBlocks.prismarineBrickSlab); - registerItemModel(ModFluffBlocks.darkPrismarineSlab); registerItemModel(ModFluffBlocks.dirtPathSlab); registerItemModel(ModFluffBlocks.shimmerrockSlab); registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); @@ -863,7 +854,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); - registerItemModel(ModFluffBlocks.prismarineWall); registerItemModel(ModFluffBlocks.reedWall); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index cb28eb687..faf98ab43 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -41,9 +41,7 @@ import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; -import vazkii.botania.common.block.decor.BlockPrismarine; import vazkii.botania.common.block.decor.BlockReeds; -import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShimmerrock; import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; @@ -213,8 +211,6 @@ public final class ModBlocks { public static Block bifrost; public static Block solidVines; public static Block buriedPetals; - public static Block prismarine; - public static Block seaLamp; public static Block floatingFlower; public static Block tinyPotato; public static Block spawnerClaw; @@ -305,8 +301,6 @@ public final class ModBlocks { bifrost = new BlockBifrost(); solidVines = new BlockSolidVines(); buriedPetals = new BlockBuriedPetals(); - prismarine = new BlockPrismarine(); - seaLamp = new BlockSeaLamp(); floatingFlower = new BlockFloatingFlower(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 6b840a64a..03ab840d7 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -49,9 +49,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; -import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; @@ -71,12 +68,8 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockDarkPrismarineStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineBrickStairs; -import vazkii.botania.common.block.decor.stairs.prismarine.BlockPrismarineStairs; import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; -import vazkii.botania.common.block.decor.walls.BlockPrismarineWall; import vazkii.botania.common.block.decor.walls.BlockReedWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -111,17 +104,6 @@ public final class ModFluffBlocks { public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; - public static Block prismarineStairs; - public static Block prismarineSlab; - public static Block prismarineSlabFull; - public static Block prismarineWall; - public static Block prismarineBrickStairs; - public static Block prismarineBrickSlab; - public static Block prismarineBrickSlabFull; - public static Block darkPrismarineStairs; - public static Block darkPrismarineSlab; - public static Block darkPrismarineSlabFull; - public static Block reedStairs; public static Block reedSlab; public static Block reedSlabFull; @@ -235,17 +217,6 @@ public final class ModFluffBlocks { dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - prismarineStairs = new BlockPrismarineStairs(); - prismarineSlab = new BlockPrismarineSlab(false); - prismarineSlabFull = new BlockPrismarineSlab(true); - prismarineWall = new BlockPrismarineWall(); - prismarineBrickStairs = new BlockPrismarineBrickStairs(); - prismarineBrickSlab = new BlockPrismarineBrickSlab(false); - prismarineBrickSlabFull = new BlockPrismarineBrickSlab(true); - darkPrismarineStairs = new BlockDarkPrismarineStairs(); - darkPrismarineSlab = new BlockDarkPrismarineSlab(false); - darkPrismarineSlabFull = new BlockDarkPrismarineSlab(true); - reedStairs = new BlockReedStairs(); reedSlab = new BlockReedSlab(false); reedSlabFull = new BlockReedSlab(true); @@ -407,13 +378,6 @@ public final class ModFluffBlocks { ((BlockModSlab) thatchSlab).register(); ((BlockModSlab) thatchSlabFull).register(); - ((BlockModSlab) prismarineSlab).register(); - ((BlockModSlab) prismarineSlabFull).register(); - ((BlockModSlab) prismarineBrickSlab).register(); - ((BlockModSlab) prismarineBrickSlabFull).register(); - ((BlockModSlab) darkPrismarineSlab).register(); - ((BlockModSlab) darkPrismarineSlabFull).register(); - ((BlockModSlab) netherBrickSlab).register(); ((BlockModSlab) netherBrickSlabFull).register(); ((BlockModSlab) soulBrickSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java deleted file mode 100644 index 684e698b0..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 28, 2014, 8:25:39 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class BlockPrismarine extends BlockMod implements ILexiconable { - - private static final int TYPES = 3; - - public BlockPrismarine() { - super(Material.ROCK, LibBlockNames.PRISMARINE); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.PRISMARINE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.PRISMARINE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= PrismarineVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { - for(int i = 0; i < TYPES; i++) - stacks.add(new ItemStack(item, 1, i)); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java deleted file mode 100644 index 1691341a1..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jun 28, 2014, 9:24:43 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockSeaLamp extends BlockMod implements ILexiconable { - - public BlockSeaLamp() { - super(Material.GLASS, LibBlockNames.SEA_LAMP); - setHardness(0.3F); - setSoundType(SoundType.GLASS); - setLightLevel(1.0F); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java deleted file mode 100644 index b89bc6f21..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockDarkPrismarineSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockDarkPrismarineSlab extends BlockPrismarineSlab { - - public BlockDarkPrismarineSlab(boolean full) { - super(full, PrismarineVariant.DARK_PRISMARINE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.darkPrismarineSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java deleted file mode 100644 index 23fe690a0..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineBrickSlab.java +++ /dev/null @@ -1,23 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModFluffBlocks; - -public class BlockPrismarineBrickSlab extends BlockPrismarineSlab { - - public BlockPrismarineBrickSlab(boolean full) { - super(full, PrismarineVariant.PRISMARINE_BRICKS); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineBrickSlab; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java deleted file mode 100644 index 2cc57b012..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ /dev/null @@ -1,45 +0,0 @@ -package vazkii.botania.common.block.decor.slabs.prismarine; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.decor.slabs.BlockLivingSlab; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineSlab extends BlockLivingSlab { - - public BlockPrismarineSlab(boolean full) { - this(full, PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineSlab(boolean full, PrismarineVariant variant) { - super(full, ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.prismarineSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java deleted file mode 100644 index db71c7774..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockDarkPrismarineStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockDarkPrismarineStairs extends BlockPrismarineStairs { - - public BlockDarkPrismarineStairs() { - super(PrismarineVariant.DARK_PRISMARINE); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java deleted file mode 100644 index 4babc82fa..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineBrickStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - - -import vazkii.botania.api.state.enums.PrismarineVariant; - -public class BlockPrismarineBrickStairs extends BlockPrismarineStairs { - - public BlockPrismarineBrickStairs() { - super(PrismarineVariant.PRISMARINE_BRICKS); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java deleted file mode 100644 index 4d4fee99d..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ /dev/null @@ -1,29 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.prismarine; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineStairs extends BlockLivingStairs { - - public BlockPrismarineStairs() { - this(PrismarineVariant.PRISMARINE); - } - - public BlockPrismarineStairs(PrismarineVariant variant) { - super(ModBlocks.prismarine.getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, variant)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java deleted file mode 100644 index 7067dc353..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:30:00 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockPrismarineWall extends BlockModWall { - - public BlockPrismarineWall() { - super(ModBlocks.prismarine, 0); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.prismarine; - } - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index ec6e4d4a3..44fb482ff 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -22,21 +22,6 @@ public final class ModMigrationRecipes { // 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)); - - // Prismarine -> quark - if (quark) { - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_rough_wall")), new ItemStack(ModFluffBlocks.prismarineWall)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_stairs")), new ItemStack(ModFluffBlocks.prismarineStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_slab")), new ItemStack(ModFluffBlocks.prismarineSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_stairs")), new ItemStack(ModFluffBlocks.prismarineBrickStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_bricks_slab")), new ItemStack(ModFluffBlocks.prismarineBrickSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_stairs")), new ItemStack(ModFluffBlocks.darkPrismarineStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("prismarine_dark_slab")), new ItemStack(ModFluffBlocks.darkPrismarineSlab)); - } // End stuff -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Blocks.END_BRICKS), new ItemStack(ModBlocks.endStoneBrick)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 5a9d0a773..819c39092 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -275,7 +275,6 @@ public final class LexiconData { public static LexiconEntry decorativeBlocks; public static LexiconEntry dispenserTweaks; public static LexiconEntry shinyFlowers; - public static LexiconEntry prismarine; public static LexiconEntry shedding; public static LexiconEntry tinyPotato; public static LexiconEntry headCreating; @@ -1383,14 +1382,6 @@ public final class LexiconData { new PageCraftingRecipe("1", ModCraftingRecipes.recipesShinyFlowers), new PageCraftingRecipe("2", ModCraftingRecipes.recipesMiniIsland)); - /*prismarine = new BLexiconEntry(LibLexicon.MISC_PRISMARINE, categoryMisc); - prismarine.setLexiconPages(new PageText("0"), new PageText("1"), - new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), - new PageCraftingRecipe("3", ModCraftingRecipes.recipePrismarine), - new PageCraftingRecipe("4", ModCraftingRecipes.recipePrismarineBrick), - new PageCraftingRecipe("5", ModCraftingRecipes.recipeDarkPrismarine), - new PageCraftingRecipe("6", ModCraftingRecipes.recipeSeaLamp));*/ - tinyPotato = new BasicLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); diff --git a/src/main/resources/assets/botania/blockstates/prismarine.json b/src/main/resources/assets/botania/blockstates/prismarine.json deleted file mode 100644 index 06f4f69ea..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "variant": { - "prismarine": { "textures": { "all": "botania:blocks/prismarine0" } }, - "prismarine_bricks": { "textures": { "all": "botania:blocks/prismarine1" } }, - "dark_prismarine": { "textures": { "all": "botania:blocks/prismarine2" } } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json b/src/main/resources/assets/botania/blockstates/prismarine0Slab.json deleted file mode 100644 index 24486d75c..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine0", - "top": "botania:blocks/prismarine0", - "side": "botania:blocks/prismarine0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json deleted file mode 100644 index 461c065a6..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json deleted file mode 100644 index 7859d57bc..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine0", - "top": "botania:blocks/prismarine0", - "side": "botania:blocks/prismarine0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json deleted file mode 100644 index 94f6ccc2a..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#wall", "wall": "botania:blocks/prismarine0" } - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} - }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} - }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} - }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} - }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "inventory": [{ - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json b/src/main/resources/assets/botania/blockstates/prismarine1Slab.json deleted file mode 100644 index 9c9871a93..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine1", - "top": "botania:blocks/prismarine1", - "side": "botania:blocks/prismarine1" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json deleted file mode 100644 index 6bf1e8c65..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine1" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json deleted file mode 100644 index 577d100d9..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine1", - "top": "botania:blocks/prismarine1", - "side": "botania:blocks/prismarine1" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json b/src/main/resources/assets/botania/blockstates/prismarine2Slab.json deleted file mode 100644 index e4a919630..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/prismarine2", - "top": "botania:blocks/prismarine2", - "side": "botania:blocks/prismarine2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json b/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json deleted file mode 100644 index ed540022e..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/prismarine2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json b/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json deleted file mode 100644 index edfc32a39..000000000 --- a/src/main/resources/assets/botania/blockstates/prismarine2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/prismarine2", - "top": "botania:blocks/prismarine2", - "side": "botania:blocks/prismarine2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineShard.json index 7e2137c98..a7126693f 100644 --- a/src/main/resources/assets/botania/models/item/prismarineShard.json +++ b/src/main/resources/assets/botania/models/item/prismarineShard.json @@ -1,7 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/prismarineShard" - } + "parent": "minecraft:item/prismarine_shard" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine0.png b/src/main/resources/assets/botania/textures/blocks/prismarine0.png deleted file mode 100644 index fe133e294841a56f396ba17d097930006919b754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3378 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 KMNUMnLSTY0rm!0T diff --git a/src/main/resources/assets/botania/textures/blocks/prismarine2.png b/src/main/resources/assets/botania/textures/blocks/prismarine2.png deleted file mode 100644 index 07bed857b00a51c7169a011dea51235fcf7e601b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmV-p1DyPcP)Px#24YJ`L;xiKIRKKy**AOu000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^q` z4+Aj`wj0y{00QGlL_t(I%LT#NZsSw{fZ_kxCw7*muA7ClWoC-dun2(!NW2AiT=D>j zd!BP{kVc)B(v;e9yx02@`|y3@*FS$(P1~Z>fb36nz}dM)cN$2ZUwHS!chq@F-PBN* zD18E&&dry%_zw?g#$+T-BjnkFD9aFlt(d#|aTqN6bzB{_uf= z>!M|G%IdQXd6bgHIomh4s9_)v0!(8<;sz+8gOmtBNEH38MNkWp9bbUkLHjH&k?D%A!Pv4D*-~ReT=~AaiUMYhJ^TOiPH|*Z5 zIefflvb2%LoU^q>^t4A!rYz2vG*w9zCunlI!1V&$V~FD&vDP+*ZF6_G$8iG;L!sLX z;_Q`!AEN0RS*PgalsGMr!SfSxzC_B3rM09fO42lA7&L@oqG<+)rx&`erKu{$aiC68 zW|l?Uw#c!paUb^xsnOLf+Nmc@a?Gj8?A)fVd)hLmP75wKD@4~av@ zykB1sI5Ewrh>s!WVu2qgoK8Jmma`cZNnRsnK5>#D?du)FvUqiTlDZ=GV}w4?6(LQP z(KI!eyDb3Ge$Q-qj=9+qI0v%y6?yo0N1T^*Rl_j!v{?p1F=~p%+@MKfvS$xrLR;3% z5M=!bY5+ir`5a5r`23fj@b2$HYOLo|&a5fne=e&pzCtmf@;&^gXRg2hmQ6P@bS>Ve zd*rF9G3^!3vqN}{*j{aL{0Q8Ep(r@BBhm(jVI(eVZb!w@J))E%Ofxh9_i2xu8dOEj z`ud9X?wZ;1g1SDD=PhX%GoDT;1xXZBmIYN+Vs9>yv>inl@fb&d;_&GK=MbRjI^#H! tA49sXCwXyLUu~f($vltMc1=~*{0~}Q!*tZW(<%S}002ovPDHLkV1mUbj~oC1 diff --git a/src/main/resources/assets/botania/textures/items/prismarineShard.png b/src/main/resources/assets/botania/textures/items/prismarineShard.png deleted file mode 100644 index 4030b4c1bc1f08a26491c6b7b05942ecf1beda61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ1_}%f10kRkr~m)~)k#D_R5;7c zlg~?&aU92A-)EM~wl=ptZS(_{dhoD==)nvRf<=dghkV?n4jm-c#akX_23__KXal1| z9%|M>u!DqvPq&6}4>`}iRs{ZZh>>!&CZ zg6&->v8V)yUmY%ilyY(7Qc+CL&0{$L1=9c^qkrN`C`5W?h3?iSx?7tVh(%?`wM()B zplM;^@iC0eE&OgD9;@K6)j@w>kT{KJ$@hi3E9Rq9>O*m9tljv}!Dx76#z0Ehkm~aeBHs z@z@)=b^8u2>#nMO5VbZ;)53gEH>A_+#_98*Cznf&+f%d+hGg4dNbcJK{shh7tNqwE Rh-d%+002ovPDHLkV1jTo`x^iN From cf56634a91505a182c21fd9c2506e6ae1f94a274 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 14:04:49 -0500 Subject: [PATCH 797/935] Byebye thatch and reeds! --- .../client/core/handler/ModelHandler.java | 13 +-- .../botania/common/block/ModBlocks.java | 6 -- .../botania/common/block/ModFluffBlocks.java | 26 ----- .../common/block/decor/BlockReeds.java | 89 ------------------ .../common/block/decor/BlockThatch.java | 38 -------- .../block/decor/slabs/BlockReedSlab.java | 48 ---------- .../block/decor/slabs/BlockThatchSlab.java | 48 ---------- .../block/decor/stairs/BlockReedStairs.java | 33 ------- .../block/decor/stairs/BlockThatchStairs.java | 33 ------- .../block/decor/walls/BlockReedWall.java | 24 ----- .../common/crafting/ModCraftingRecipes.java | 2 - .../common/crafting/ModMigrationRecipes.java | 15 --- .../assets/botania/blockstates/reedBlock.json | 19 ---- .../botania/blockstates/reedBlock0Slab.json | 20 ---- .../blockstates/reedBlock0SlabFull.json | 9 -- .../botania/blockstates/reedBlock0Stairs.json | 53 ----------- .../botania/blockstates/reedBlock0Wall.json | 34 ------- .../assets/botania/blockstates/thatch.json | 14 --- .../botania/blockstates/thatch0Slab.json | 20 ---- .../botania/blockstates/thatch0SlabFull.json | 9 -- .../botania/blockstates/thatch0Stairs.json | 53 ----------- .../botania/textures/blocks/reedBlock0.png | Bin 3571 -> 0 bytes .../botania/textures/blocks/reedBlock1.png | Bin 3711 -> 0 bytes .../botania/textures/blocks/seaLamp.png | Bin 3033 -> 0 bytes .../textures/blocks/seaLamp.png.mcmeta | 22 ----- .../assets/botania/textures/blocks/thatch.png | Bin 3489 -> 0 bytes 26 files changed, 2 insertions(+), 626 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockReeds.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockThatch.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java delete mode 100644 src/main/resources/assets/botania/blockstates/reedBlock.json delete mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/reedBlock0Wall.json delete mode 100644 src/main/resources/assets/botania/blockstates/thatch.json delete mode 100644 src/main/resources/assets/botania/blockstates/thatch0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/thatch0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/thatch0Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/reedBlock0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/reedBlock1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/seaLamp.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/seaLamp.png.mcmeta delete mode 100644 src/main/resources/assets/botania/textures/blocks/thatch.png 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 ce7bc5ef3..d94d1fd63 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -319,7 +319,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringFertilizer); registerItemModel(ModBlocks.redStringInterceptor); registerItemModel(ModBlocks.redStringRelay); - registerItemModel(ModBlocks.reedBlock); registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); registerItemModel(ModBlocks.runeAltar); @@ -329,7 +328,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.starfield); - registerItemModel(ModBlocks.thatch); registerItemModel(ModBlocks.terraPlate); registerItemModel(ModBlocks.tinyPlanet); registerItemModel(ModBlocks.tinyPotato); @@ -621,7 +619,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); // Ignore dummy variant in slabs @@ -639,7 +636,7 @@ public final class ModelHandler { List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, - ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab); @@ -665,7 +662,7 @@ public final class ModelHandler { List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, - ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull); @@ -785,13 +782,11 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.manaQuartzStairs); registerItemModel(ModFluffBlocks.netherBrickStairs); registerItemModel(ModFluffBlocks.redQuartzStairs); - registerItemModel(ModFluffBlocks.reedStairs); registerItemModel(ModFluffBlocks.shimmerrockStairs); registerItemModel(ModFluffBlocks.shimmerwoodPlankStairs); registerItemModel(ModFluffBlocks.snowBrickStairs); registerItemModel(ModFluffBlocks.soulBrickStairs); registerItemModel(ModFluffBlocks.sunnyQuartzStairs); - registerItemModel(ModFluffBlocks.thatchStairs); registerItemModel(ModFluffBlocks.tileStairs); } @@ -833,9 +828,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.soulBrickSlab); registerItemModel(ModFluffBlocks.snowBrickSlab); registerItemModel(ModFluffBlocks.tileSlab); - registerItemModel(ModFluffBlocks.reedSlab); - registerItemModel(ModFluffBlocks.thatchSlab); - } private static void registerWalls() { @@ -854,7 +846,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); - registerItemModel(ModFluffBlocks.reedWall); } private static void registerPanes() { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index faf98ab43..99701bb7f 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -41,12 +41,10 @@ import vazkii.botania.common.block.decor.BlockManaFlame; import vazkii.botania.common.block.decor.BlockManaGlass; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; -import vazkii.botania.common.block.decor.BlockReeds; import vazkii.botania.common.block.decor.BlockShimmerrock; import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks; import vazkii.botania.common.block.decor.BlockShinyFlower; import vazkii.botania.common.block.decor.BlockStarfield; -import vazkii.botania.common.block.decor.BlockThatch; import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.decor.BlockUnstable; import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; @@ -214,8 +212,6 @@ public final class ModBlocks { public static Block floatingFlower; public static Block tinyPotato; public static Block spawnerClaw; - public static Block reedBlock; - public static Block thatch; public static Block customBrick; public static Block enderEye; public static Block starfield; @@ -304,8 +300,6 @@ public final class ModBlocks { floatingFlower = new BlockFloatingFlower(); tinyPotato = new BlockTinyPotato(); spawnerClaw = new BlockSpawnerClaw(); - reedBlock = new BlockReeds(); - thatch = new BlockThatch(); customBrick = new BlockCustomBrick(); enderEye = new BlockEnderEye(); starfield = new BlockStarfield(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 03ab840d7..4d6d24b82 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -35,8 +35,6 @@ import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockEnderBrickSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.decor.slabs.BlockPavementSlab; -import vazkii.botania.common.block.decor.slabs.BlockReedSlab; -import vazkii.botania.common.block.decor.slabs.BlockThatchSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockSnowBrickSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockSoulBrickSlab; @@ -54,8 +52,6 @@ import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockEnderBrickStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; -import vazkii.botania.common.block.decor.stairs.BlockReedStairs; -import vazkii.botania.common.block.decor.stairs.BlockThatchStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockSnowBrickStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockSoulBrickStairs; @@ -70,7 +66,6 @@ import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; -import vazkii.botania.common.block.decor.walls.BlockReedWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; @@ -104,14 +99,6 @@ public final class ModFluffBlocks { public static Block dreamwoodPlankSlab; public static Block dreamwoodPlankSlabFull; - public static Block reedStairs; - public static Block reedSlab; - public static Block reedSlabFull; - public static Block reedWall; - public static Block thatchStairs; - public static Block thatchSlab; - public static Block thatchSlabFull; - public static Block netherBrickStairs; public static Block netherBrickSlab; public static Block netherBrickSlabFull; @@ -217,14 +204,6 @@ public final class ModFluffBlocks { dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); - reedStairs = new BlockReedStairs(); - reedSlab = new BlockReedSlab(false); - reedSlabFull = new BlockReedSlab(true); - reedWall = new BlockReedWall(); - thatchStairs = new BlockThatchStairs(); - thatchSlab = new BlockThatchSlab(false); - thatchSlabFull = new BlockThatchSlab(true); - netherBrickStairs = new BlockCustomBrickStairs(); netherBrickSlab = new BlockCustomBrickSlab(false); netherBrickSlabFull = new BlockCustomBrickSlab(true); @@ -373,11 +352,6 @@ public final class ModFluffBlocks { ((BlockModSlab) dreamwoodPlankSlab).register(); ((BlockModSlab) dreamwoodPlankSlabFull).register(); - ((BlockModSlab) reedSlab).register(); - ((BlockModSlab) reedSlabFull).register(); - ((BlockModSlab) thatchSlab).register(); - ((BlockModSlab) thatchSlabFull).register(); - ((BlockModSlab) netherBrickSlab).register(); ((BlockModSlab) netherBrickSlabFull).register(); ((BlockModSlab) soulBrickSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java deleted file mode 100644 index 44ee3186f..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 8:02:49 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.BlockRotatedPillar; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; - -public class BlockReeds extends BlockRotatedPillar implements ILexiconable { - - public BlockReeds() { - super(Material.WOOD); - setHardness(1.0F); - setSoundType(SoundType.WOOD); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.REED_BLOCK)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); - setUnlocalizedName(LibBlockNames.REED_BLOCK); - setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.AXIS_FACING); - } - - @Override - public int getMetaFromState(IBlockState state) { - switch (state.getValue(BotaniaStateProps.AXIS_FACING)) { - case Z: return 8; - case X: return 4; - case Y: - default: return 0; - } - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - EnumFacing.Axis axis; - switch (meta) { - case 8: axis = EnumFacing.Axis.Z; break; - case 4: axis = EnumFacing.Axis.X; break; - case 0: - default: axis = EnumFacing.Axis.Y; break; - } - return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); - } - - @Nonnull - @Override - public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { - return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis()); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java deleted file mode 100644 index c63642f0c..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 9:07:00 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockThatch extends BlockMod implements ILexiconable { - - public BlockThatch() { - super(Material.GRASS, LibBlockNames.THATCH); - setHardness(1.0F); - setSoundType(SoundType.PLANT); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java deleted file mode 100644 index a4fefc680..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 8:49:59 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockReedSlab extends BlockLivingSlab { - - public BlockReedSlab(boolean full) { - super(full, ModBlocks.reedBlock.getDefaultState()); - setHardness(1.0F); - setSoundType(SoundType.WOOD); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.reedSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.reedSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java deleted file mode 100644 index 08a3ed40b..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 8:49:59 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockThatchSlab extends BlockLivingSlab { - - public BlockThatchSlab(boolean full) { - super(full, ModBlocks.thatch.getDefaultState()); - setHardness(1.0F); - setSoundType(SoundType.PLANT); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.thatchSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.thatchSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java deleted file mode 100644 index 3081d3c9c..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 8:47:52 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockReedStairs extends BlockLivingStairs { - - public BlockReedStairs() { - super(ModBlocks.reedBlock.getDefaultState()); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java deleted file mode 100644 index 2c9a93e62..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 28, 2014, 8:47:52 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockThatchStairs extends BlockLivingStairs { - - public BlockThatchStairs() { - super(ModBlocks.thatch.getDefaultState()); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.decorativeBlocks; - } - - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java deleted file mode 100644 index 3caebc96b..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockReedWall.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:31:04 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.SoundType; -import vazkii.botania.common.block.ModBlocks; - -public class BlockReedWall extends BlockModWall { - - public BlockReedWall() { - super(ModBlocks.reedBlock, 0); - setHardness(1.0F); - setSoundType(SoundType.WOOD); - } - -} diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 0378ea537..7b53fce60 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -2168,8 +2168,6 @@ 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)); - if(Botania.gardenOfGlassLoaded) initGardenOfGlass(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 44fb482ff..ed35079a2 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -103,21 +103,6 @@ public final class ModMigrationRecipes { // Granite wall GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal())); } - - // Thatch - if (quark) { - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch")), new ItemStack(ModBlocks.thatch)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_slab")), new ItemStack(ModFluffBlocks.thatchSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("thatch_stairs")), new ItemStack(ModFluffBlocks.thatchStairs)); - } - - // Reeds - if (quark) { - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block")), new ItemStack(ModBlocks.reedBlock)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_slab")), new ItemStack(ModFluffBlocks.reedSlab)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_stairs")), new ItemStack(ModFluffBlocks.reedStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("reed_block_wall")), new ItemStack(ModFluffBlocks.reedWall)); - } } private static Block findQuarkBlock(String name) { diff --git a/src/main/resources/assets/botania/blockstates/reedBlock.json b/src/main/resources/assets/botania/blockstates/reedBlock.json deleted file mode 100644 index 2eecb5a5d..000000000 --- a/src/main/resources/assets/botania/blockstates/reedBlock.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/reedBlock1", - "top": "botania:blocks/reedBlock1", - "side": "botania:blocks/reedBlock0" - }, - "transform": "forge:default-block" - }, - "variants": { - "axis=x": [{ "x": 90, "y": 90 }], - "axis=y": [{}], - "axis=z": [{ "x": 90 }], - "inventory": [{}] - } - -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json b/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json deleted file mode 100644 index 73f9957ca..000000000 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/reedBlock1", - "top": "botania:blocks/reedBlock1", - "side": "botania:blocks/reedBlock0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json b/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json deleted file mode 100644 index 3ddec2017..000000000 --- a/src/main/resources/assets/botania/blockstates/reedBlock0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { "bottom": "botania:blocks/reedBlock1", "top": "botania:blocks/reedBlock1", "side": "botania:blocks/reedBlock0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json b/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json deleted file mode 100644 index 46e4d5454..000000000 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/reedBlock1", - "top": "botania:blocks/reedBlock1", - "side": "botania:blocks/reedBlock0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json deleted file mode 100644 index 1359e060d..000000000 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#side", "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } - }, - "variants": { - "north": { - "true": { "submodel": "botania:wall_side_bottom_top" }, - "false": {} - }, - "south": { - "true": { "submodel": "botania:wall_side_bottom_top", "y": 180 }, - "false": {} - }, - "west": { - "true": { "submodel": "botania:wall_side_bottom_top", "y": 270 }, - "false": {} - }, - "east": { - "true": { "submodel": "botania:wall_side_bottom_top", "y": 90 }, - "false": {} - }, - "up": { - "true": { "submodel": "botania:wall_post_bottom_top" }, - "false": {} - }, - "inventory": [{ - "model": "botania:wall_inventory_bottom_top" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch.json b/src/main/resources/assets/botania/blockstates/thatch.json deleted file mode 100644 index c3cf1397e..000000000 --- a/src/main/resources/assets/botania/blockstates/thatch.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/thatch" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0Slab.json b/src/main/resources/assets/botania/blockstates/thatch0Slab.json deleted file mode 100644 index cbeb6431f..000000000 --- a/src/main/resources/assets/botania/blockstates/thatch0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/thatch", - "top": "botania:blocks/thatch", - "side": "botania:blocks/thatch" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json b/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json deleted file mode 100644 index 427822d3b..000000000 --- a/src/main/resources/assets/botania/blockstates/thatch0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/thatch" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json b/src/main/resources/assets/botania/blockstates/thatch0Stairs.json deleted file mode 100644 index a0db9e291..000000000 --- a/src/main/resources/assets/botania/blockstates/thatch0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/thatch", - "top": "botania:blocks/thatch", - "side": "botania:blocks/thatch" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/textures/blocks/reedBlock0.png b/src/main/resources/assets/botania/textures/blocks/reedBlock0.png deleted file mode 100644 index 38b94b50d813fe66187d0f6d2308671a49d7ce98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3571 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 diff --git a/src/main/resources/assets/botania/textures/blocks/reedBlock1.png b/src/main/resources/assets/botania/textures/blocks/reedBlock1.png deleted file mode 100644 index b8282f4e0c201976e23d1e16c1ebdac74dcb634e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3711 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 P00000NkvXXu0mjfj~|9S From 1fd48994d76b57010199e83975ab9273489f98f5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 14:17:27 -0500 Subject: [PATCH 798/935] Byebye ender stuff! --- .../client/core/handler/ModelHandler.java | 9 +- .../botania/common/block/ModBlocks.java | 3 - .../botania/common/block/ModFluffBlocks.java | 23 ----- .../block/decor/BlockEndStoneBrick.java | 94 ------------------ .../block/decor/slabs/BlockEndStoneSlab.java | 48 --------- .../decor/slabs/BlockEnderBrickSlab.java | 50 ---------- .../decor/stairs/BlockEndStoneStairs.java | 32 ------ .../decor/stairs/BlockEnderBrickStairs.java | 34 ------- .../common/core/BotaniaCreativeTab.java | 8 -- .../common/core/handler/ConfigHandler.java | 4 - .../common/crafting/ModMigrationRecipes.java | 14 --- .../botania/blockstates/endStoneBrick.json | 13 --- .../blockstates/endStoneBrick0Slab.json | 20 ---- .../blockstates/endStoneBrick0SlabFull.json | 9 -- .../blockstates/endStoneBrick0Stairs.json | 53 ---------- .../blockstates/endStoneBrick2Slab.json | 20 ---- .../blockstates/endStoneBrick2SlabFull.json | 9 -- .../blockstates/endStoneBrick2Stairs.json | 53 ---------- .../textures/blocks/endStoneBrick0.png | Bin 773 -> 0 bytes .../textures/blocks/endStoneBrick2.png | Bin 657 -> 0 bytes .../textures/blocks/endStoneBrick3.png | Bin 743 -> 0 bytes .../textures/blocks/endStoneBrick4.png | Bin 768 -> 0 bytes .../blocks/{ => unused}/endStoneBrick1.png | Bin 23 files changed, 2 insertions(+), 494 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/endStoneBrick0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/endStoneBrick2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/endStoneBrick3.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/endStoneBrick4.png rename src/main/resources/assets/botania/textures/blocks/{ => unused}/endStoneBrick1.png (100%) 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 d94d1fd63..d931d9fd1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -347,7 +347,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); @@ -639,7 +638,7 @@ public final class ModelHandler { ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, - ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab, ModFluffBlocks.endStoneSlab, ModFluffBlocks.enderBrickSlab); + ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab); for (Block b : otherSlabs) { if (b == null) // Dark quartz disabled @@ -665,7 +664,7 @@ public final class ModelHandler { ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, - ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull, ModFluffBlocks.endStoneSlabFull, ModFluffBlocks.enderBrickSlabFull); + ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull); for (Block b : otherFullSlabs) { if (b == null) // Dark quartz disabled @@ -772,8 +771,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dreamwoodStairs); registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); registerItemModel(ModFluffBlocks.elfQuartzStairs); - registerItemModel(ModFluffBlocks.enderBrickStairs); - registerItemModel(ModFluffBlocks.endStoneStairs); registerItemModel(ModFluffBlocks.lavenderQuartzStairs); registerItemModel(ModFluffBlocks.livingrockStairs); registerItemModel(ModFluffBlocks.livingrockBrickStairs); @@ -822,8 +819,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.dirtPathSlab); registerItemModel(ModFluffBlocks.shimmerrockSlab); registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); - registerItemModel(ModFluffBlocks.endStoneSlab); - registerItemModel(ModFluffBlocks.enderBrickSlab); registerItemModel(ModFluffBlocks.netherBrickSlab); registerItemModel(ModFluffBlocks.soulBrickSlab); registerItemModel(ModFluffBlocks.snowBrickSlab); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 99701bb7f..5c1a90b32 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -34,7 +34,6 @@ import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockCustomBrick; import vazkii.botania.common.block.decor.BlockDirtPath; import vazkii.botania.common.block.decor.BlockElfGlass; -import vazkii.botania.common.block.decor.BlockEndStoneBrick; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockManaBeacon; import vazkii.botania.common.block.decor.BlockManaFlame; @@ -233,7 +232,6 @@ public final class ModBlocks { public static Block petalBlock; public static Block corporeaIndex; public static Block corporeaFunnel; - public static Block endStoneBrick; public static Block mushroom; public static Block pump; public static Block doubleFlower1; @@ -321,7 +319,6 @@ public final class ModBlocks { petalBlock = new BlockPetalBlock(); corporeaIndex = new BlockCorporeaIndex(); corporeaFunnel = new BlockCorporeaFunnel(); - endStoneBrick = new BlockEndStoneBrick(); mushroom = new BlockModMushroom(); pump = new BlockPump(); doubleFlower1 = new BlockModDoubleFlower1(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 4d6d24b82..91302af9d 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -31,8 +31,6 @@ import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; import vazkii.botania.common.block.decor.slabs.Block18StoneSlab; import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; -import vazkii.botania.common.block.decor.slabs.BlockEndStoneSlab; -import vazkii.botania.common.block.decor.slabs.BlockEnderBrickSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.decor.slabs.BlockPavementSlab; import vazkii.botania.common.block.decor.slabs.bricks.BlockCustomBrickSlab; @@ -49,8 +47,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; -import vazkii.botania.common.block.decor.stairs.BlockEndStoneStairs; -import vazkii.botania.common.block.decor.stairs.BlockEnderBrickStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockSnowBrickStairs; @@ -163,13 +159,6 @@ public final class ModFluffBlocks { public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES]; public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; - public static Block endStoneSlab; - public static Block endStoneSlabFull; - public static Block endStoneStairs; - public static Block enderBrickSlab; - public static Block enderBrickSlabFull; - public static Block enderBrickStairs; - public static Block shimmerrockSlab; public static Block shimmerrockSlabFull; public static Block shimmerrockStairs; @@ -304,13 +293,6 @@ public final class ModFluffBlocks { count++; } - endStoneSlab = new BlockEndStoneSlab(false); - endStoneSlabFull = new BlockEndStoneSlab(true); - endStoneStairs = new BlockEndStoneStairs(); - enderBrickSlab = new BlockEnderBrickSlab(false); - enderBrickSlabFull = new BlockEnderBrickSlab(true); - enderBrickStairs = new BlockEnderBrickStairs(); - shimmerrockSlab = new BlockShimmerrockSlab(false); shimmerrockSlabFull = new BlockShimmerrockSlab(true); shimmerrockStairs = new BlockShimmerrockStairs(); @@ -364,11 +346,6 @@ public final class ModFluffBlocks { ((BlockModSlab) dirtPathSlab).register(); ((BlockModSlab) dirtPathSlabFull).register(); - ((BlockModSlab) endStoneSlab).register(); - ((BlockModSlab) endStoneSlabFull).register(); - ((BlockModSlab) enderBrickSlab).register(); - ((BlockModSlab) enderBrickSlabFull).register(); - ((BlockModSlab) shimmerrockSlab).register(); ((BlockModSlab) shimmerrockSlabFull).register(); ((BlockModSlab) shimmerwoodPlankSlab).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java deleted file mode 100644 index 36384413a..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 16, 2015, 8:17:12 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class BlockEndStoneBrick extends BlockMod implements ILexiconable { - - public BlockEndStoneBrick() { - super(Material.ROCK, LibBlockNames.END_STONE_BRICK); - setHardness(1.5F); - setResistance(10F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.ENDBRICK_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.ENDBRICK_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EndBrickVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.values()[meta]); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { - for(int i = 0; i < EndBrickVariant.values().length; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.endStoneDecor; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java deleted file mode 100644 index 976fa1633..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 16, 2015, 8:45:00 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockEndStoneSlab extends BlockLivingSlab { - - public BlockEndStoneSlab(boolean full) { - super(full, ModBlocks.endStoneBrick.getDefaultState()); - setHardness(1.5F); - setResistance(10F); - setSoundType(SoundType.STONE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.endStoneSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.endStoneSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.endStoneDecor; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java deleted file mode 100644 index eb8c67b32..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 7, 2015, 10:37:15 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockEnderBrickSlab extends BlockLivingSlab { - - public BlockEnderBrickSlab(boolean full) { - super(full, ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); - setHardness(1.5F); - setResistance(10F); - setSoundType(SoundType.STONE); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.enderBrickSlabFull; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.enderBrickSlab; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.endStoneDecor; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java deleted file mode 100644 index 995e15624..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 16, 2015, 8:44:03 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockEndStoneStairs extends BlockLivingStairs { - - public BlockEndStoneStairs() { - super(ModBlocks.endStoneBrick.getDefaultState()); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.endStoneDecor; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java deleted file mode 100644 index d9edef07a..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 7, 2015, 10:38:15 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class BlockEnderBrickStairs extends BlockLivingStairs { - - public BlockEnderBrickStairs() { - super(ModBlocks.endStoneBrick.getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.ENDER_BRICKS)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.endStoneDecor; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 4991bba22..2bacc7390 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -386,14 +386,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { for (Block pavementSlab : ModFluffBlocks.pavementSlabs) addBlock(pavementSlab); - if(ConfigHandler.enderStuff19Enabled) { - addBlock(ModBlocks.endStoneBrick); - addBlock(ModFluffBlocks.endStoneSlab); - addBlock(ModFluffBlocks.endStoneStairs); - addBlock(ModFluffBlocks.enderBrickSlab); - addBlock(ModFluffBlocks.enderBrickStairs); - } - addItem(ModItems.cosmetic); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index cce9c2bb1..4d89f7761 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -82,7 +82,6 @@ public final class ConfigHandler { public static boolean relicsEnabled = true; public static boolean stones18Enabled = true; public static boolean ringOfOdinFireResist = true; - public static boolean enderStuff19Enabled = true; public static boolean invertMagnetRing = false; public static boolean enableThaumcraftStablizers = true; @@ -226,9 +225,6 @@ public final class ConfigHandler { desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations."; ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist); - desc = "Set this to false to disable the 1.9 Ender features available as recipes. This only disables the recipes and entries. Old ones that are already in the world will stay."; - enderStuff19Enabled = loadPropBool("19enderStuff.enabled", desc, enderStuff19Enabled); - desc = "Set this to true to invert the Ring of Magnetization's controls (from shift to stop to shift to work)"; invertMagnetRing = loadPropBool("magnetRing.invert", desc, invertMagnetRing); diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index ed35079a2..e7e5f65b8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -23,20 +23,6 @@ public final class ModMigrationRecipes { // Prismarine -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - // 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)); - - // End stuff -> quark - if (quark) { - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_stairs")), new ItemStack(ModFluffBlocks.endStoneStairs)); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_slab")), new ItemStack(ModFluffBlocks.endStoneSlab)); - // End stone chiseled brick - not in quark - } - // 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())); diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick.json b/src/main/resources/assets/botania/blockstates/endStoneBrick.json deleted file mode 100644 index 890ba9ef8..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "variant=end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick0" } }], - "variant=chiseled_end_stone_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick1" } }], - "variant=ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick2" } }], - "variant=pillar_ender_bricks": [{ "textures": { "all": "botania:blocks/endStoneBrick3" } }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json deleted file mode 100644 index b3e717f45..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/endStoneBrick0", - "top": "botania:blocks/endStoneBrick0", - "side": "botania:blocks/endStoneBrick0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json deleted file mode 100644 index b53fb4fba..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/endStoneBrick0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json deleted file mode 100644 index 0bcdf53a6..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/endStoneBrick0", - "top": "botania:blocks/endStoneBrick0", - "side": "botania:blocks/endStoneBrick0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json deleted file mode 100644 index eabc7e3a6..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/endStoneBrick2", - "top": "botania:blocks/endStoneBrick2", - "side": "botania:blocks/endStoneBrick2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json deleted file mode 100644 index d3d956779..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/endStoneBrick2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json deleted file mode 100644 index 46823a572..000000000 --- a/src/main/resources/assets/botania/blockstates/endStoneBrick2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/endStoneBrick2", - "top": "botania:blocks/endStoneBrick2", - "side": "botania:blocks/endStoneBrick2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/textures/blocks/endStoneBrick0.png b/src/main/resources/assets/botania/textures/blocks/endStoneBrick0.png deleted file mode 100644 index 667186a3391c7be3c5f86efe8ebbfbb7e614ea39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 773 zcmV+g1N!`lP)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^Ra0vZk?4Y@`4RsaA3mq|oHR5;5; zl1p#oL==U;TXuC9-T=~lD6G; z+iknbRV*CB`s$o>&qLn+@J;yQos{3*kDj1Qjk zpT485TV%U?6TDQU*&P7+ea3J)VQ4h*AjY+h&~e1SqpD+GwsXmPplnAMVmC zwCU9VYz_=8Q52!H0wDOncs!-U5rAq_QspHIV7!=OYYTux5l6=-B&#*sO+j!TfW_nq zJg5VV_a=xaV!Wf;Y}sF&5a{sqL{C5e1lKf-%$$LYxljKAKpTy%8?+fxBsp>C1#L8C zo6=UzgNclT{iirnVnaiotslX`c_db}RgH+Ce*g7Hf)5M^!#?rt4sA5W?iPnbq_?Pz z=KbZ0JjwCav-;x(*Er&~Zpq$fc%P8pZF>DxM&}$VQiK2^AR-g=Lx76hhGci1W@d{BwQ6vn^08zp)o+5Yk>tO4KtL%L&UWm!J4A%p;S7Lul>yL}HOFTsXfq_aS@YqO<43#l=G(8sbTPws z9YtC&Kbljl3!*r}`#@(M2d9S=>jDTk>w51xCWOGh?lxfL1s#mB00000NkvXXu0mjf D%aB|0 diff --git a/src/main/resources/assets/botania/textures/blocks/endStoneBrick2.png b/src/main/resources/assets/botania/textures/blocks/endStoneBrick2.png deleted file mode 100644 index 9c657760b43a4c99d84872dfe7b3fcd2733fb9f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 657 zcmV;C0&e|@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z4h1P7PjDju00I$7L_t(I%Tb8cfI4qs~4P(C%if< zSus8x+5g-_!tQ2Ai5fiqdgS+y-z3Ss+#@QGFxQ!StlaKy0YG599f=44!UL^d@o=md zNn*vAV@6VzPn*q#?REze1e3-!+}~WhvNZFMO26g%nSr{ zb+MvG{p(OrRn(Mm96@0FY|AhXl(C?yG;f%7w?NN;*3~l;TN%@7TFz0U7ts|(g%*uy zL1t3I0|Z)YhzL;wQ(Ib6>#8-o%c7;L3y28i^M}u5%f-@J`JDRI$E&5ib5UmYGf-Z? zecibN?#||NL!Bxa$<@azUcPzBbexzU=bn1$j>3cMFV~d)-JZK|cZ>3aJrEIGj28f$ z9!}hUzsJm&>x`;)2O_8_s;aDqHLAL_V8xhyM(BZ=8P)6Z9xZ6CK|-lh?P*%+1=$dU z>Xm4Lhm)C|(3ySHB_ka#M?9PwwHN=Lvh{k6i16h36UtB)ha$o-43tu6+4>w5E4VwY zwa&f;D!td!{?x5np?XD9@a7$Lf_gX}PRoWj?+UA7VLjD}X`Yztyx0R r?41Jt_?|z0{qz-)|L;Tuq0hq~-?P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z3l*KR)7|yDRatb>#&=nqI(5%iM}7F?L)lzzD7kQRd&9fm-{A*OPMOO; zFM0Fp8{FVXG12_p@Z#bHt4}MkWH$F3tnWQ3CSr{E=-J+G8Mh-jWfp3|ZnNX=`VN48 z>UzVA_bBD-F#`G1}sKgD3sOa{uRi9vH{kSrugoWK3X;Pc1Nyng>0 z-}{-#;)exQT_G~*t?L{`3L1^U&@3Ac_XlA5(stF-x6_uv1%eBBKQSYNb>5L=Duy5& zRY#;c5mG=K&Hk|eb^)L;SHE7=Se-OlX^b({Rn7H3*K_w3igwkal$x20<48&gYb_Fm Ze*u$vsQKb8`)B|F002ovPDHLkV1n_BOE3Tc diff --git a/src/main/resources/assets/botania/textures/blocks/endStoneBrick4.png b/src/main/resources/assets/botania/textures/blocks/endStoneBrick4.png deleted file mode 100644 index 3269d450833081c7b4ea9f4ba259b6862aec3f1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 768 zcmV+b1ONPqP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z4kR8FZNSd}00MwXL_t(I%SDn)YaCY)g};0IcK1wc#!V!G89_ABEFy#Btn#DtPYi)< zjDu|gaflunjm5k={kYG{qOD2o4xFkw=Txb;zr2-p+kybV{9=x6EiptMZXa0vxWcv; z?>&C!IbWUAJT-_2NfO3)o=@*Sk!Lx}nog;?G z=RZDEe_M0+`yG;m?O}_tt)=gK0Ah+nAL(~J$ITHzIH&_kD-dwr;RjD}0e}<}+V$=v z2L(QOLJVXkLl82P;i5yyXd}dcC_$8HkN$sx*62(#nM^>z>ZcWTT{EA}Nhx8PZNo4OWAfe- zeS|bR5)raI!w&X@UGEtBk*~DE6!~~>0Ama>L{N}YLMcV`kxXZ&m_iKbOphRei7t|7 zIlJQy1U|m|h$KOtfBWm^=a8Q>2tI%YQ(aV47ZnQ@tZ&y`es_r Date: Sat, 23 Jul 2016 14:50:03 -0500 Subject: [PATCH 799/935] Byebye Future (hah) stones! --- .../botania/api/state/BotaniaStateProps.java | 21 ---- .../api/state/enums/EndBrickVariant.java | 26 ----- .../api/state/enums/FutureStoneVariant.java | 38 ------- .../api/state/enums/PrismarineVariant.java | 25 ----- .../client/core/handler/ModelHandler.java | 27 ----- .../botania/common/block/ModFluffBlocks.java | 37 ------- .../common/block/decor/Block18Stone.java | 94 ------------------ .../block/decor/slabs/Block18StoneSlab.java | 50 ---------- .../decor/stairs/Block18StoneStairs.java | 34 ------- .../block/decor/walls/Block18StoneWall.java | 80 --------------- .../common/core/BotaniaCreativeTab.java | 9 -- .../common/crafting/ModCraftingRecipes.java | 4 +- .../common/crafting/ModMigrationRecipes.java | 80 --------------- .../assets/botania/blockstates/stone.json | 27 ----- .../botania/blockstates/stone0Slab.json | 20 ---- .../botania/blockstates/stone0SlabFull.json | 9 -- .../botania/blockstates/stone0Stairs.json | 53 ---------- .../botania/blockstates/stone0Wall.json | 55 ---------- .../botania/blockstates/stone10Slab.json | 20 ---- .../botania/blockstates/stone10SlabFull.json | 9 -- .../botania/blockstates/stone10Stairs.json | 53 ---------- .../botania/blockstates/stone11Slab.json | 20 ---- .../botania/blockstates/stone11SlabFull.json | 9 -- .../botania/blockstates/stone11Stairs.json | 53 ---------- .../botania/blockstates/stone1Slab.json | 20 ---- .../botania/blockstates/stone1SlabFull.json | 9 -- .../botania/blockstates/stone1Stairs.json | 53 ---------- .../botania/blockstates/stone2Slab.json | 20 ---- .../botania/blockstates/stone2SlabFull.json | 9 -- .../botania/blockstates/stone2Stairs.json | 53 ---------- .../botania/blockstates/stone3Slab.json | 20 ---- .../botania/blockstates/stone3SlabFull.json | 9 -- .../botania/blockstates/stone3Stairs.json | 53 ---------- .../botania/blockstates/stone8Slab.json | 20 ---- .../botania/blockstates/stone8SlabFull.json | 9 -- .../botania/blockstates/stone8Stairs.json | 53 ---------- .../botania/blockstates/stone9Slab.json | 20 ---- .../botania/blockstates/stone9SlabFull.json | 9 -- .../botania/blockstates/stone9Stairs.json | 53 ---------- .../assets/botania/textures/blocks/stone0.png | Bin 1024 -> 0 bytes .../assets/botania/textures/blocks/stone1.png | Bin 15344 -> 0 bytes .../botania/textures/blocks/stone10.png | Bin 16597 -> 0 bytes .../botania/textures/blocks/stone11.png | Bin 15964 -> 0 bytes .../assets/botania/textures/blocks/stone2.png | Bin 984 -> 0 bytes .../assets/botania/textures/blocks/stone3.png | Bin 979 -> 0 bytes .../assets/botania/textures/blocks/stone4.png | Bin 850 -> 0 bytes .../assets/botania/textures/blocks/stone5.png | Bin 15239 -> 0 bytes .../assets/botania/textures/blocks/stone6.png | Bin 15236 -> 0 bytes .../assets/botania/textures/blocks/stone7.png | Bin 804 -> 0 bytes .../assets/botania/textures/blocks/stone8.png | Bin 15964 -> 0 bytes .../assets/botania/textures/blocks/stone9.png | Bin 15878 -> 0 bytes .../textures/blocks/{ => unused}/stone12.png | Bin .../textures/blocks/{ => unused}/stone13.png | Bin .../textures/blocks/{ => unused}/stone14.png | Bin .../textures/blocks/{ => unused}/stone15.png | Bin 55 files changed, 2 insertions(+), 1261 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java delete mode 100644 src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java delete mode 100644 src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/Block18Stone.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java delete mode 100644 src/main/resources/assets/botania/blockstates/stone.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone0Wall.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone10Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone11Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone1Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone2Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone3Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone8Stairs.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9Slab.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/stone9Stairs.json delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone0.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone1.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone10.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone11.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone2.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone3.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone4.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone5.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone6.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone7.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone8.png delete mode 100644 src/main/resources/assets/botania/textures/blocks/stone9.png rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone12.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone13.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone14.png (100%) rename src/main/resources/assets/botania/textures/blocks/{ => unused}/stone15.png (100%) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index a5775dc68..f31df9465 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -30,14 +30,11 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.api.state.enums.SpreaderVariant; @@ -90,18 +87,6 @@ public final class BotaniaStateProps { /** Properties for individual blocks **/ - // Block18Stone - public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); - - // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("fswall_variant", FutureStoneVariant.class, new Predicate() { - @Override - public boolean apply(FutureStoneVariant variant) { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; - } - }); - // BlockAlfPortal public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); @@ -134,9 +119,6 @@ public final class BotaniaStateProps { // BlockEnchanter public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); - // BlockEndStoneBrick - public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); - // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); @@ -188,9 +170,6 @@ public final class BotaniaStateProps { // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); - // BlockPrismarine - public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); - // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java deleted file mode 100644 index bbec78401..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

    - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EndBrickVariant implements IStringSerializable { - END_STONE_BRICKS, - CHISELED_END_STONE_BRICKS, - ENDER_BRICKS, - PILLAR_ENDER_BRICKS; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java deleted file mode 100644 index 079c7aeef..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

    - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum FutureStoneVariant implements IStringSerializable { - ANDESITE, - BASALT, - DIORITE, - GRANITE, - POLISHED_ANDESITE, - POLISHED_BASALT, - POLISHED_DIORITE, - POLISHED_GRANITE, - ANDESITE_BRICK, - BASALT_BRICK, - DIORITE_BRICK, - GRANITE_BRICK, - CHISELED_ANDESITE, - CHISELED_BASALT, - CHISELED_DIORITE, - CHISELED_GRANITE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java deleted file mode 100644 index 15eb2e77a..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - *

    - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum PrismarineVariant implements IStringSerializable { - PRISMARINE, - PRISMARINE_BRICKS, - DARK_PRISMARINE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} 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 d931d9fd1..938ccbea4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -39,14 +39,11 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.api.state.enums.FutureStoneVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; @@ -355,7 +352,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture - registerVariantsDefaulted(ModFluffBlocks.stone, FutureStoneVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } @@ -618,7 +614,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); // Ignore dummy variant in slabs for (Block b : ModFluffBlocks.biomeStoneSlabs) { @@ -629,10 +624,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); } - for (Block b : ModFluffBlocks.stoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, @@ -655,10 +646,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } - for (Block b : ModFluffBlocks.stoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, @@ -753,10 +740,6 @@ public final class ModelHandler { } private static void registerStairs() { - for (Block b : ModFluffBlocks.stoneStairs) { - registerItemModel(b); - } - for (Block b : ModFluffBlocks.pavementStairs) { registerItemModel(b); } @@ -796,10 +779,6 @@ public final class ModelHandler { registerItemModel(b); } - for (Block b : ModFluffBlocks.stoneSlabs) { - registerItemModel(b); - } - registerItemModel(ModFluffBlocks.livingwoodSlab); registerItemModel(ModFluffBlocks.livingwoodPlankSlab); registerItemModel(ModFluffBlocks.livingrockSlab); @@ -832,12 +811,6 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } - item = Item.getItemFromBlock(ModFluffBlocks.stoneWall); - for (FutureStoneVariant variant : BotaniaStateProps.FUTURESTONEWALL_VARIANT.getAllowedValues()) { - String variantName = "inventory_" + variant.getName(); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation("botania:stone0Wall", variantName)); - } - registerItemModel(ModFluffBlocks.livingrockWall); registerItemModel(ModFluffBlocks.livingwoodWall); registerItemModel(ModFluffBlocks.dreamwoodWall); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 91302af9d..62691fd73 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -11,14 +11,11 @@ package vazkii.botania.common.block; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.decor.Block18Stone; import vazkii.botania.common.block.decor.BlockPavement; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB; @@ -28,7 +25,6 @@ import vazkii.botania.common.block.decor.panes.BlockManaglassPane; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; -import vazkii.botania.common.block.decor.slabs.Block18StoneSlab; import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -45,7 +41,6 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab; import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; -import vazkii.botania.common.block.decor.stairs.Block18StoneStairs; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; @@ -60,7 +55,6 @@ import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStair import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs; import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs; -import vazkii.botania.common.block.decor.walls.Block18StoneWall; import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall; import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall; import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall; @@ -69,7 +63,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; import java.util.Locale; -import java.util.Set; public final class ModFluffBlocks { @@ -142,7 +135,6 @@ public final class ModFluffBlocks { public static Block biomeStoneA; public static Block biomeStoneB; - public static Block stone; public static Block pavement; public static final Block[] biomeStoneStairs = new Block[24]; @@ -150,11 +142,6 @@ public final class ModFluffBlocks { public static final Block[] biomeStoneFullSlabs = new Block[24]; public static Block biomeStoneWall; - public static final Block[] stoneStairs = new Block[8]; - public static final Block[] stoneSlabs = new Block[8]; - public static final Block[] stoneFullSlabs = new Block[8]; - public static Block stoneWall; - public static final Block[] pavementStairs = new Block[BlockPavement.TYPES]; public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES]; public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; @@ -208,7 +195,6 @@ public final class ModFluffBlocks { biomeStoneA = new BlockBiomeStoneA(); biomeStoneB = new BlockBiomeStoneB(); - stone = new Block18Stone(); pavement = new BlockPavement(); if(ConfigHandler.darkQuartzEnabled) { @@ -266,24 +252,6 @@ public final class ModFluffBlocks { } biomeStoneWall = new BlockBiomeStoneWall(); - Set allowed = ImmutableSet.of(FutureStoneVariant.ANDESITE, FutureStoneVariant.ANDESITE_BRICK, - FutureStoneVariant.BASALT, FutureStoneVariant.BASALT_BRICK, FutureStoneVariant.DIORITE, FutureStoneVariant.DIORITE_BRICK, - FutureStoneVariant.GRANITE, FutureStoneVariant.GRANITE_BRICK); - - count = 0; - for(FutureStoneVariant variant : FutureStoneVariant.values()) { - if (!allowed.contains(variant)) { - // Filter - only get the base blocks, and the brick versions - continue; - } - - stoneStairs[count] = new Block18StoneStairs(variant); - stoneSlabs[count] = new Block18StoneSlab(false, variant, count); - stoneFullSlabs[count] = new Block18StoneSlab(true, variant, count); - count++; - } - stoneWall = new Block18StoneWall(); - count = 0; for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) { @@ -356,11 +324,6 @@ public final class ModFluffBlocks { ((BlockModSlab) biomeStoneFullSlabs[i]).register(); } - for(int i = 0; i < 8; i++) { - ((BlockModSlab) stoneSlabs[i]).register(); - ((BlockModSlab) stoneFullSlabs[i]).register(); - } - for(int i = 0; i < pavementSlabs.length; i++) { ((BlockModSlab) pavementSlabs[i]).register(); ((BlockModSlab) pavementFullSlabs[i]).register(); diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java deleted file mode 100644 index e3d0c3286..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:34:31 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; -import java.util.List; - -public class Block18Stone extends BlockMod implements ILexiconable { - - public Block18Stone() { - super(Material.ROCK, LibBlockNames.STONE); - setHardness(1.5F); - setResistance(10F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.FUTURESTONE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= FutureStoneVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.values()[meta]); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 16; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java deleted file mode 100644 index b7d022956..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:52:06 PM (GMT)] - */ -package vazkii.botania.common.block.decor.slabs; - -import net.minecraft.block.BlockSlab; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class Block18StoneSlab extends BlockLivingSlab { - - final int index; - - public Block18StoneSlab(boolean full, FutureStoneVariant variant, int index) { - super(full, ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); - this.index = index; - setHardness(1.5F); - setResistance(10F); - } - - @Override - public BlockSlab getFullBlock() { - return (BlockSlab) ModFluffBlocks.stoneFullSlabs[index]; - } - - @Override - public BlockSlab getSingleBlock() { - return (BlockSlab) ModFluffBlocks.stoneSlabs[index]; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java deleted file mode 100644 index 9d7ef3f81..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 10, 2015, 7:51:29 PM (GMT)] - */ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.lexicon.LexiconData; - -public class Block18StoneStairs extends BlockLivingStairs { - - public Block18StoneStairs(FutureStoneVariant variant) { - super(ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java deleted file mode 100644 index bd74e05cd..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 18, 2015, 8:41:10 PM (GMT)] - */ -package vazkii.botania.common.block.decor.walls; - -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; -import java.util.List; - -public class Block18StoneWall extends BlockModWall { - - public Block18StoneWall() { - super(ModFluffBlocks.stone, 0); - setHardness(1.5F); - setResistance(10F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.FUTURESTONEWALL_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta > 3) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); - } - - @Override - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - - @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { - for(int i = 0; i < 4; i++) - list.add(new ItemStack(item, 1, i)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.stoneAlchemy; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2bacc7390..8d0fd68f9 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -363,15 +363,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.sunnyQuartzSlab); addBlock(ModFluffBlocks.sunnyQuartzStairs); - if(ConfigHandler.stones18Enabled) { - addBlock(ModFluffBlocks.stone); - for(int i = 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneStairs[i]); - for(int i = 0; i < 8; i++) - addBlock(ModFluffBlocks.stoneSlabs[i]); - addBlock(ModFluffBlocks.stoneWall); - } - addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); for(int i = 0; i < 24; i++) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 7b53fce60..5abea5661 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1764,12 +1764,12 @@ public final class ModCraftingRecipes { new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0), }; - for(int i = 0; i < 4; i++) { + /*for(int i = 0; i < 4; i++) { todo readd chiseled versions addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), "SS", "SS", 'S', quarkBlocks[i]); recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); - } + }*/ } // Blaze Light Recipe diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index e7e5f65b8..2c83807c3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -1,15 +1,8 @@ package vazkii.botania.common.crafting; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.ModItems; /** @@ -18,81 +11,8 @@ import vazkii.botania.common.item.ModItems; public final class ModMigrationRecipes { public static void init() { - boolean quark = Botania.quarkLoaded; - // Prismarine -> vanilla GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); - - // 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())); - - if (quark) { - // Andesite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[0])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[0])); - // Andesite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4])); - // Andesite chiseled brick - not in quark - // Andesite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal())); - } - - if (quark) { - // Basalt normal + polished -> quark - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt")), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.POLISHED_BASALT.ordinal())); - // Basalt rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[1])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[1])); - // Basalt bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5])); - // Basalt chiseled brick - not in quark - // Basalt wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal())); - } - - // 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())); - - if (quark) { - // Diorite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[2])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[2])); - // Diorite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6])); - // Diorite chiseled brick - not in quark - // Diorite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal())); - } - - // 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())); - - if (quark) { - // Granite rough stairs and slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[3])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[3])); - // Granite bricks, brick stairs, brick slab - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal())); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7])); - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7])); - // Granite chiseled brick - not in quark - // Granite wall - GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal())); - } - } - - private static Block findQuarkBlock(String name) { - return Block.REGISTRY.getObject(new ResourceLocation("Quark", name)); } private ModMigrationRecipes() {} diff --git a/src/main/resources/assets/botania/blockstates/stone.json b/src/main/resources/assets/botania/blockstates/stone.json deleted file mode 100644 index f62868e48..000000000 --- a/src/main/resources/assets/botania/blockstates/stone.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "variant": { - "andesite": { "textures": { "all": "botania:blocks/stone0" } }, - "basalt": { "textures": { "all": "botania:blocks/stone1" } }, - "diorite": { "textures": { "all": "botania:blocks/stone2" } }, - "granite": { "textures": { "all": "botania:blocks/stone3" } }, - "polished_andesite": { "textures": { "all": "botania:blocks/stone4" } }, - "polished_basalt": { "textures": { "all": "botania:blocks/stone5" } }, - "polished_diorite": { "textures": { "all": "botania:blocks/stone6" } }, - "polished_granite": { "textures": { "all": "botania:blocks/stone7" } }, - "andesite_brick": { "textures": { "all": "botania:blocks/stone8" } }, - "basalt_brick": { "textures": { "all": "botania:blocks/stone9" } }, - "diorite_brick": { "textures": { "all": "botania:blocks/stone10" } }, - "granite_brick": { "textures": { "all": "botania:blocks/stone11" } }, - "chiseled_andesite": { "textures": { "all": "botania:blocks/stone12" } }, - "chiseled_basalt": { "textures": { "all": "botania:blocks/stone13" } }, - "chiseled_diorite": { "textures": { "all": "botania:blocks/stone14" } }, - "chiseled_granite": { "textures": { "all": "botania:blocks/stone15" } } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Slab.json b/src/main/resources/assets/botania/blockstates/stone0Slab.json deleted file mode 100644 index e89c9749c..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone0", - "top": "botania:blocks/stone0", - "side": "botania:blocks/stone0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json b/src/main/resources/assets/botania/blockstates/stone0SlabFull.json deleted file mode 100644 index abf015306..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone0" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Stairs.json b/src/main/resources/assets/botania/blockstates/stone0Stairs.json deleted file mode 100644 index c584e6e60..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone0", - "top": "botania:blocks/stone0", - "side": "botania:blocks/stone0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json deleted file mode 100644 index 320bb94e1..000000000 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "textures": { - "particle": "#wall" - }, - "uvlock": true, - "transform": "forge:default-block" - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} - }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} - }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} - }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} - }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "fswall_variant": { - "andesite": { "textures": { "wall": "botania:blocks/stone0" } }, - "basalt": { "textures": { "wall": "botania:blocks/stone1" } }, - "diorite": { "textures": { "wall": "botania:blocks/stone2" } }, - "granite": { "textures": { "wall": "botania:blocks/stone3" } } - }, - "inventory_andesite": [{ - "textures": { "wall": "botania:blocks/stone0" }, - "model": "minecraft:wall_inventory" - }], - "inventory_basalt": [{ - "textures": { "wall": "botania:blocks/stone1" }, - "model": "minecraft:wall_inventory" - }], - "inventory_diorite": [{ - "textures": { "wall": "botania:blocks/stone2" }, - "model": "minecraft:wall_inventory" - }], - "inventory_granite": [{ - "textures": { "wall": "botania:blocks/stone3" }, - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Slab.json b/src/main/resources/assets/botania/blockstates/stone10Slab.json deleted file mode 100644 index a35008ce3..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone10", - "top": "botania:blocks/stone10", - "side": "botania:blocks/stone10" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json b/src/main/resources/assets/botania/blockstates/stone10SlabFull.json deleted file mode 100644 index 3c06d8495..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone10" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone10Stairs.json b/src/main/resources/assets/botania/blockstates/stone10Stairs.json deleted file mode 100644 index a882c36e3..000000000 --- a/src/main/resources/assets/botania/blockstates/stone10Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone10", - "top": "botania:blocks/stone10", - "side": "botania:blocks/stone10" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone11Slab.json b/src/main/resources/assets/botania/blockstates/stone11Slab.json deleted file mode 100644 index 9eb36491f..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone11", - "top": "botania:blocks/stone11", - "side": "botania:blocks/stone11" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json b/src/main/resources/assets/botania/blockstates/stone11SlabFull.json deleted file mode 100644 index c23b8fae1..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone11" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone11Stairs.json b/src/main/resources/assets/botania/blockstates/stone11Stairs.json deleted file mode 100644 index a7b9b1660..000000000 --- a/src/main/resources/assets/botania/blockstates/stone11Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone11", - "top": "botania:blocks/stone11", - "side": "botania:blocks/stone11" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone1Slab.json b/src/main/resources/assets/botania/blockstates/stone1Slab.json deleted file mode 100644 index af0f40a52..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone1", - "top": "botania:blocks/stone1", - "side": "botania:blocks/stone1" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json b/src/main/resources/assets/botania/blockstates/stone1SlabFull.json deleted file mode 100644 index f4aabbb94..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone1" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone1Stairs.json b/src/main/resources/assets/botania/blockstates/stone1Stairs.json deleted file mode 100644 index 6d0dccf35..000000000 --- a/src/main/resources/assets/botania/blockstates/stone1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone1", - "top": "botania:blocks/stone1", - "side": "botania:blocks/stone1" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone2Slab.json b/src/main/resources/assets/botania/blockstates/stone2Slab.json deleted file mode 100644 index 9fd9a2319..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone2", - "top": "botania:blocks/stone2", - "side": "botania:blocks/stone2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json b/src/main/resources/assets/botania/blockstates/stone2SlabFull.json deleted file mode 100644 index 651f4de73..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone2" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone2Stairs.json b/src/main/resources/assets/botania/blockstates/stone2Stairs.json deleted file mode 100644 index ef6a5e14f..000000000 --- a/src/main/resources/assets/botania/blockstates/stone2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone2", - "top": "botania:blocks/stone2", - "side": "botania:blocks/stone2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone3Slab.json b/src/main/resources/assets/botania/blockstates/stone3Slab.json deleted file mode 100644 index 567b35dc0..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone3", - "top": "botania:blocks/stone3", - "side": "botania:blocks/stone3" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json b/src/main/resources/assets/botania/blockstates/stone3SlabFull.json deleted file mode 100644 index f12af79cc..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone3" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone3Stairs.json b/src/main/resources/assets/botania/blockstates/stone3Stairs.json deleted file mode 100644 index 796df4563..000000000 --- a/src/main/resources/assets/botania/blockstates/stone3Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone3", - "top": "botania:blocks/stone3", - "side": "botania:blocks/stone3" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone8Slab.json b/src/main/resources/assets/botania/blockstates/stone8Slab.json deleted file mode 100644 index c841c3a9c..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone8", - "top": "botania:blocks/stone8", - "side": "botania:blocks/stone8" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json b/src/main/resources/assets/botania/blockstates/stone8SlabFull.json deleted file mode 100644 index b9418ced7..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone8" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone8Stairs.json b/src/main/resources/assets/botania/blockstates/stone8Stairs.json deleted file mode 100644 index 0dde759af..000000000 --- a/src/main/resources/assets/botania/blockstates/stone8Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone8", - "top": "botania:blocks/stone8", - "side": "botania:blocks/stone8" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/stone9Slab.json b/src/main/resources/assets/botania/blockstates/stone9Slab.json deleted file mode 100644 index 85faa62e9..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9Slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/stone9", - "top": "botania:blocks/stone9", - "side": "botania:blocks/stone9" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json b/src/main/resources/assets/botania/blockstates/stone9SlabFull.json deleted file mode 100644 index 17c878f1b..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/stone9" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone9Stairs.json b/src/main/resources/assets/botania/blockstates/stone9Stairs.json deleted file mode 100644 index 88dc97a8b..000000000 --- a/src/main/resources/assets/botania/blockstates/stone9Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/stone9", - "top": "botania:blocks/stone9", - "side": "botania:blocks/stone9" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/textures/blocks/stone0.png b/src/main/resources/assets/botania/textures/blocks/stone0.png deleted file mode 100644 index 680a899f2cee987edfe0c17654c26be18df46cce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 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 diff --git a/src/main/resources/assets/botania/textures/blocks/stone10.png b/src/main/resources/assets/botania/textures/blocks/stone10.png deleted file mode 100644 index d0110b4b8e079f7a801b19b23945ebbf18b98e2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16597 zcmeI3U2GKB6@ZWJwXxSWwlP00q++uvQQLHPcJ{~X8Lc-WHo=y%)PO5YUy||8tUY3P zXS=(`i`9p!eW?1{r>g2pmG>%@5Trs0sj7;gP$+pwAc+msMPMj4*kJGvY|p*>>+AIm zO(Ip1W~7CnOFjQqwdvALJ1$!(zao3M2~md=gyq9 z+jOG+>%2SWv^cr zJ8k*H9<<`GKvIp!hk9SnheN5`KAKJ^WI-4oA9s#>oJMj)5G6?xTyDYbc3=-j>O?%P zWE}C-OF1V6KfPKioYWI(-H6+WUuD=BOLyDtBvA3l&nuQF28yTh?2w|6Q4)gabP1J= z)Ns)zF_w(dp{Zd(i)t|~o=%~iSkW#qYNUH*|+2=Yj<{?AXBPUpM(I@-7vbSJf)`>O81*0ly<;xtDcPn$DhUJKnj4A1$ z9#cj%ArT)52&Kldp2Z51dyJ@UyhPe7>DT+yo62#=8x-Wv~VDFmM?O9-ZgF4EVO zk+rP_MN|)B7M!ZC$`Q?{dR4`Z`+($eNTRpPp@?F{(dBoE!(Eyxs$LuxS(<268VT`4 zTi3=Yp8#)!B-5dg+#gS+6`VkSFCCAL<8iCL&SAG-a(E*?w7*_47|PH?lJGb*_J$)Ny-OqGf&lH=4N+72K=~)u)r(o?yU} zY#i2pwzjpDTe^`Zlw?XH+eEj$uul|sUhG;t0(85Pl`z?YgJH6YH8mitX)O(lHPhE8 z@c9ZV=fBK+;~3+kT6}}8Am@d4*w{X0MAG9*QrkO%%jHY>gmF_0^EoH zFYpQGT;TAi5+Bjjpime|q2b$E~XivhwHO&?`7l}&7XySZnz;CU7_Etm0m2teTzo!^*2KjC z;fp3NJ|9MF;$ndCMH3gF52H14F+ljDiHpyN(VDmzAbiop#plClO>oJAfU=Z{Pg;>i`y8fA8MGOck_R z=2oh{_+l#C&`=M}&CRg5_?Uca40CgH(B9q-b#=Ay4cxkQ3toKD2G_1#hx6ypqvNfxXV3TG z!i5WP|NaB0x_$djc6$0IHT?MF%k;iw%NBZn`Q<$@HFXVES6AVM7rsl|tk!yHY1s_# zyz^(ce*Fei6D2Y1=-38Mr$A5I6ECf;EwFRvE@*3Oqoe!q!*e*LWtf@y53H=L!qO5> zZ+UqcKK=9)YWVc&QykVTyz`6;1d=W=8L~qS69G7pd2}Jlr|D$ zGPjP74!C`L20r`jDoB!C994UJ8=O7+0qsjhwRLMd0bB!Du6zPFZv2ZXT3cJ;(xpo@ z6D=(*2y+20Ui=3%H8sMsXV0LfrUo`|ZpN%Ez~jeDP?bm|v%7cO;O5PnbeLRKK(B3Fh8FIMx5^0u?9lvib=2@9)nQ5}E7Z;9bdGPo{YT8gcVN?|P4pxsOpcQ$Pr|)>cj3Wd|ou&qhi!5!j@^e?Occ9{cwl=>5}cZ~gMW DIh8%I diff --git a/src/main/resources/assets/botania/textures/blocks/stone11.png b/src/main/resources/assets/botania/textures/blocks/stone11.png deleted file mode 100644 index 531ea834425760f37de6d5682988b49646b9f248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15964 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 ByNdt- diff --git a/src/main/resources/assets/botania/textures/blocks/stone4.png b/src/main/resources/assets/botania/textures/blocks/stone4.png deleted file mode 100644 index a77809c04b651d9f92c7ee1347cdd71823c5453c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 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 U_^ETl&i7<>$>~W)SLMI-KN{s1Gynhq diff --git a/src/main/resources/assets/botania/textures/blocks/stone7.png b/src/main/resources/assets/botania/textures/blocks/stone7.png deleted file mode 100644 index d5b37f1b4cd3a70ecd804c81266e6fee9e324026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 804 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 diff --git a/src/main/resources/assets/botania/textures/blocks/stone9.png b/src/main/resources/assets/botania/textures/blocks/stone9.png deleted file mode 100644 index 468697763a6e966e6a124a7468f96398e8110d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15878 zcmeI3eTWog9LGn6v@^xSz)O+VQ6uqY=Vf>HcE-Kc^H#l!)-GN1&I+BKm%H(HXSSU= zckhz4`bRA+H1LI_C=5ADFnUqM5t(!du=4I~sxyhN~6)SlVdw|j2yNmB^n8Q7QK z^LxI(=XpNAd44nV$ExhXsW5rB8ZV= zozD-#kX5enW)@Lryh8IJYT30{`>3oKjf;TYCOvkc7%6w8YKI*|={@&_5N z0{=p3MH3f9=H`b3Rz2Ba+bNNzGntGx6wP`Wx{^qdi<(qdI+2^2 zBGYO@O{#`%0UcXWm+CNW)9Nq>8M5debYPH^XtX$X#rY@7~cBN%?&I+)U$(2@b>sl!}{USM@LFcY!^+9Bg$Cc$y1vf(>uvW1#txC3;j+tg6 z?4D&U1%#f)M$glWbwe>T*0c}}_b#Qn6iAIowi*VfB2O_siVegVMr3)>7hF=NcRNAy zsHx~$cbVKzu}q8u@;Z?ZOlMe;VcZyHJ>eK&*C>)L-BpzGzGZO~S=7vQQnJH(QfgP} zl+hldOO0hci|3NqXeP`wn3fv$h3HDn6;%;a?s87%218aYkOHeLH6TH`?K)d(@84Q* zB=j)IhgZ=RQP6^l&nNgOfsHGaqWLvS3d(*;@kxA;lbArz52od8QXneL#EFz^?LS8O z0#Gw_avqI}&4y)5U;)jM+tEYAI3H=iX?#LsSSeV5lbD$!#|T-pR&7^_Bju zrQGI9YD!95s#7rP$wI{_)?m=Jc!Y9=N0elz7>8wNKdVZJ?$=tH7A(^TCh+b~C^vqY zeDEv&d+^YNg+klgtDw)-~ji<;K)nM-LSL`EiHG$(votKq1$0DKN{3rrgHAd+*^l*;PF8X z2YBAchiJGNRAe(q}Jwt~k9@B~8_ zA7KVu$cmSl2l=P8q6ZljiiHP(fS^r`3(W`eVq6dqw25({`9NNb3j%^RF)lP8$cu47 zK+q<}h2{f!F)j!Q+Qhifd>}8z1pz^u7#ErkN@?u;N5VVPLq4_{wj0*ySHZd+VAIOVwK|s(Z#)aksc`+^s2-?KB(0m{- z#svXEn-~|G59GzTARuTH<3jU+ycib*1Z`qmXg-h^J9aiRG@ zUW^L@f;KTOG#|)|aX~=PCK6Xw>7`)R0B-_kz$?F}&mZdquM2zRrUg-g=$T3otKTGu z>vzEKMS|#J2;%o;1R-uFh;inIr3dE{#E{v|k%n0I=amazTz_EJV;1KG6HL<$)z!B#AnqlP7YiD;QC!C(x zyX2j{lSvQB&x)kPZOdo%O^hw7Jv`L+UCpq|>rX71wB^_rCzfezM(mzJtkz!mv+2aO z+9QV|?=|^0)4f&I)26Jwv~iV}ATq;$yx`LwuO6~t&ZM_CuG=!vIN0^_m7aa0Cur-f ztDpY#`hjoyh8rJ*E^OYkXU6W@kvmWRv3OhGUo*U$4o|vsaqQ)rqlvEl*Jt%sZD>9D z<#KI1d5)4_dwb2&qrSRBJ6_s)_)J6fv@^}OxkclrPe`|Pj+*l8yeVz(j(wh-wD#<) zd#+kzCV%wdCpWcQ*3p`eNAKwE_-vo)A#3E7$J-WN$%fWFb3?xU!`~~zcaA?n^z^N| c@mo8w{M1vcyL-j+&YRlJbLK~O&R+J$KOSURvj6}9 diff --git a/src/main/resources/assets/botania/textures/blocks/stone12.png b/src/main/resources/assets/botania/textures/blocks/unused/stone12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone12.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone12.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone13.png b/src/main/resources/assets/botania/textures/blocks/unused/stone13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone13.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone13.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone14.png b/src/main/resources/assets/botania/textures/blocks/unused/stone14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone14.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone14.png diff --git a/src/main/resources/assets/botania/textures/blocks/stone15.png b/src/main/resources/assets/botania/textures/blocks/unused/stone15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/stone15.png rename to src/main/resources/assets/botania/textures/blocks/unused/stone15.png From c05c1ef8bf0f26d40e07c088ae1abbb6a825a81f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 15:08:26 -0500 Subject: [PATCH 800/935] Clean out lang files --- .../resources/assets/botania/lang/en_US.lang | 57 ----------------- .../resources/assets/botania/lang/es_ES.lang | 50 --------------- .../resources/assets/botania/lang/fr_FR.lang | 50 --------------- .../resources/assets/botania/lang/ja_JP.lang | 63 ------------------- .../resources/assets/botania/lang/ko_KR.lang | 50 --------------- .../resources/assets/botania/lang/nl_NL.lang | 63 ------------------- .../resources/assets/botania/lang/pt_BR.lang | 63 ------------------- .../resources/assets/botania/lang/ru_RU.lang | 16 ----- .../resources/assets/botania/lang/zh_CN.lang | 63 ------------------- .../resources/assets/botania/lang/zh_TW.lang | 63 ------------------- 10 files changed, 538 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 667f25c32..beb750812 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -811,19 +811,6 @@ tile.botania:dreamwood1Stairs.name=Dreamwood Plank Stairs tile.botania:dreamwood1Slab.name=Dreamwood Plank Slab tile.botania:dreamwood1SlabFull.name=Dreamwood Plank Slab tile.botania:conjurationCatalyst.name=Conjuration Catalyst -tile.botania:prismarine0.name=Prismarine -tile.botania:prismarine1.name=Prismarine Bricks -tile.botania:prismarine2.name=Dark Prismarine -tile.botania:prismarine0Stairs.name=Prismarine Stairs -tile.botania:prismarine0Slab.name=Prismarine Slab -tile.botania:prismarine0SlabFull.name=Prismarine Slab -tile.botania:prismarine1Stairs.name=Prismarine Brick Stairs -tile.botania:prismarine1Slab.name=Prismarine Brick Slab -tile.botania:prismarine1SlabFull.name=Prismarine Brick Slab -tile.botania:prismarine2Stairs.name=Dark Prismarine Stairs -tile.botania:prismarine2Slab.name=Dark Prismarine Slab -tile.botania:prismarine2SlabFull.name=Dark Prismarine Slab -tile.botania:seaLamp.name=Sea Lantern tile.botania:miniIsland0.name=Floating White Flower tile.botania:miniIsland1.name=Floating Orange Flower tile.botania:miniIsland2.name=Floating Magenta Flower @@ -842,14 +829,6 @@ tile.botania:miniIsland14.name=Floating Red Flower tile.botania:miniIsland15.name=Floating Black Flower tile.botania:tinyPotato.name=Tiny Potato tile.botania:spawnerClaw.name=Life Imbuer -tile.botania:reedBlock.name=Reed Block -tile.botania:reedBlock0Stairs.name=Reed Stairs -tile.botania:reedBlock0Slab.name=Reed Slab -tile.botania:reedBlock0SlabFull.name=Reed Slab -tile.botania:thatch.name=Thatch -tile.botania:thatch0Stairs.name=Thatch Stairs -tile.botania:thatch0Slab.name=Thatch Slab -tile.botania:thatch0SlabFull.name=Thatch Slab tile.botania:customBrick0.name=Hellish Brick tile.botania:customBrick1.name=Soul Brick tile.botania:customBrick2.name=Frosty Brick @@ -1078,46 +1057,10 @@ tile.botania:doubleFlower212.name=Tall Mystical Brown Flower tile.botania:doubleFlower213.name=Tall Mystical Green Flower tile.botania:doubleFlower214.name=Tall Mystical Red Flower tile.botania:doubleFlower215.name=Tall Mystical Black Flower -tile.botania:stone0.name=Andesite -tile.botania:stone1.name=Basalt -tile.botania:stone2.name=Diorite -tile.botania:stone3.name=Granite -tile.botania:stone4.name=Polished Andesite -tile.botania:stone5.name=Polished Basalt -tile.botania:stone6.name=Polished Diorite -tile.botania:stone7.name=Polished Granite -tile.botania:stone8.name=Andesite Bricks -tile.botania:stone9.name=Basalt Bricks -tile.botania:stone10.name=Diorite Bricks -tile.botania:stone11.name=Granite Bricks tile.botania:stone12.name=Chiseled Andesite Brick tile.botania:stone13.name=Chiseled Basalt Brick tile.botania:stone14.name=Chiseled Diorite Brick tile.botania:stone15.name=Chiseled Granite Brick -tile.botania:stone0Stairs.name=Andesite Stairs -tile.botania:stone1Stairs.name=Basalt Stairs -tile.botania:stone2Stairs.name=Diorite Stairs -tile.botania:stone3Stairs.name=Granite Stairs -tile.botania:stone8Stairs.name=Andesite Brick Stairs -tile.botania:stone9Stairs.name=Basalt Brick Stairs -tile.botania:stone10Stairs.name=Diorite Brick Stairs -tile.botania:stone11Stairs.name=Granite Brick Stairs -tile.botania:stone0Slab.name=Andesite Slab -tile.botania:stone1Slab.name=Basalt Slab -tile.botania:stone2Slab.name=Diorite Slab -tile.botania:stone3Slab.name=Granite Slab -tile.botania:stone8Slab.name=Andesite Brick Slab -tile.botania:stone9Slab.name=Basalt Brick Slab -tile.botania:stone10Slab.name=Diorite Brick Slab -tile.botania:stone11Slab.name=Granite Brick Slab -tile.botania:stone0SlabFull.name=Andesite Slab -tile.botania:stone1SlabFull.name=Basalt Slab -tile.botania:stone2SlabFull.name=Diorite Slab -tile.botania:stone3SlabFull.name=Granite Slab -tile.botania:stone8SlabFull.name=Andesite Brick Slab -tile.botania:stone9SlabFull.name=Basalt Brick Slab -tile.botania:stone10SlabFull.name=Diorite Brick Slab -tile.botania:stone11SlabFull.name=Granite Brick Slab tile.botania:blazeBlock.name=Blaze Lamp tile.botania:corporeaInterceptor.name=Corporea Interceptor tile.botania:corporeaCrystalCube.name=Corporea Crystal Cube diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index 0f0cf2dc0..fb1b313db 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -663,16 +663,6 @@ tile.botania:dreamwood0Slab.name=Losa de madera onírica tile.botania:dreamwood1Stairs.name=Escaleras de tablas de madera onírica tile.botania:dreamwood1Slab.name=Losa de tablas de madera onírica tile.botania:conjurationCatalyst.name=Catalizador de conjuración -tile.botania:prismarine0.name=Prismarina -tile.botania:prismarine1.name=Ladrillos de prismarina -tile.botania:prismarine2.name=Prismarina oscura -tile.botania:prismarine0Stairs.name=Escaleras de prismarina -tile.botania:prismarine0Slab.name=Losa de prismarina -tile.botania:prismarine1Stairs.name=Escaleras de ladrillos de prismarina -tile.botania:prismarine1Slab.name=Losa de ladrillos de prismarina -tile.botania:prismarine2Stairs.name=Escaleras de prismarina oscura -tile.botania:prismarine2Slab.name=Losa de prismarina oscura -tile.botania:seaLamp.name=Linterna marina tile.botania:miniIsland0.name=Flor flotante blanca tile.botania:miniIsland1.name=Flor flotante naranja tile.botania:miniIsland2.name=Flor flotante magenta @@ -691,12 +681,6 @@ tile.botania:miniIsland14.name=Flor flotante roja tile.botania:miniIsland15.name=Flor flotante negra tile.botania:tinyPotato.name=Patatita tile.botania:spawnerClaw.name=Imbusor de vida -tile.botania:reedBlock.name=Bloque de caña -tile.botania:reedBlock0Stairs.name=Escaleras de caña -tile.botania:reedBlock0Slab.name=Losa de caña -tile.botania:thatch.name=Paja entrelazada -tile.botania:thatch0Stairs.name=Escaleras de paja entrelazada -tile.botania:thatch0Slab.name=Losa de paja entrelazada tile.botania:customBrick0.name=Ladrillo infernal tile.botania:customBrick1.name=Ladrillo de almas tile.botania:customBrick2.name=Ladrillo de escarcha @@ -893,38 +877,10 @@ tile.botania:doubleFlower212.name=Flor mística alta marrón tile.botania:doubleFlower213.name=Flor mística alta verde tile.botania:doubleFlower214.name=Flor mística alta roja tile.botania:doubleFlower215.name=Flor mística alta negra -tile.botania:stone0.name=Andesita -tile.botania:stone1.name=Basalto -tile.botania:stone2.name=Diorita -tile.botania:stone3.name=Granito -tile.botania:stone4.name=Andesita pulida -tile.botania:stone5.name=Basalto pulido -tile.botania:stone6.name=Diorita pulida -tile.botania:stone7.name=Granito pulido -tile.botania:stone8.name=Ladrillos de andesita -tile.botania:stone9.name=Ladrillos de basalto -tile.botania:stone10.name=Ladrillos de diorita -tile.botania:stone11.name=Ladrillos de granito tile.botania:stone12.name=Ladrillos cincelados de andesita tile.botania:stone13.name=Ladrillos cincelados de basalto tile.botania:stone14.name=Ladrillos cincelados de diorita tile.botania:stone15.name=Ladrillos cincelados de granito -tile.botania:stone0Stairs.name=Escaleras de andesita -tile.botania:stone1Stairs.name=Escaleras de basalto -tile.botania:stone2Stairs.name=Escaleras de diorita -tile.botania:stone3Stairs.name=Escaleras de granito -tile.botania:stone8Stairs.name=Escaleras de ladrillos de andesita -tile.botania:stone9Stairs.name=Escaleras de ladrillos de basalto -tile.botania:stone10Stairs.name=Escaleras de ladrillos de diorita -tile.botania:stone11Stairs.name=Escaleras de ladrillos de granito -tile.botania:stone0Slab.name=Losa de andesita -tile.botania:stone1Slab.name=Losa de basalto -tile.botania:stone2Slab.name=Losa de diorita -tile.botania:stone3Slab.name=Losa de granito -tile.botania:stone8Slab.name=Losa de ladrillos de andesita -tile.botania:stone9Slab.name=Losa de ladrillos de basalto -tile.botania:stone10Slab.name=Losa de ladrillos de diorita -tile.botania:stone11Slab.name=Losa de ladrillos de granito tile.botania:blazeBlock.name=Lámpara de blaze tile.botania:corporeaInterceptor.name=Interceptor de corporea tile.botania:corporeaCrystalCube.name=Cubo de cristal de corporea @@ -941,8 +897,6 @@ tile.botania:lightLauncher.name=Lanzador de luminaria tile.botania:livingrock0Wall.name=Muro de piedra viviente tile.botania:livingwood0Wall.name=Muro de madera viviente tile.botania:dreamwood0Wall.name=Muro de madera onírica -tile.botania:prismarine0Wall.name=Muro de prismarina -tile.botania:reedBlock0Wall.name=Muro de caña tile.botania:biomeStoneA0Wall0.name=Muro metamórfico de roca de bosque tile.botania:biomeStoneA0Wall1.name=Muro metamórfico de roca de llanura tile.botania:biomeStoneA0Wall2.name=Muro metamórfico de roca de montaña @@ -951,10 +905,6 @@ tile.botania:biomeStoneA0Wall4.name=Muro metamórfico de roca de pantano tile.botania:biomeStoneA0Wall5.name=Muro metamórfico de roca de desierto tile.botania:biomeStoneA0Wall6.name=Muro metamórfico de roca taiga tile.botania:biomeStoneA0Wall7.name=Muro metamórfico de roca de mesa -tile.botania:stone0Wall0.name=Muro de andesita -tile.botania:stone0Wall1.name=Muro de basalto -tile.botania:stone0Wall2.name=Muro de diorita -tile.botania:stone0Wall3.name=Muro de granito tile.botania:manaBomb.name=Carga de tormenta de maná tile.botania:buriedPetals0=Pétalo blanco enterrado tile.botania:buriedPetals0.name=Pétalo blanco enterrado diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 3de24ea80..2d49a91e6 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -587,16 +587,6 @@ tile.botania:dreamwood0Slab.name=Dalle en boisrève tile.botania:dreamwood1Stairs.name=Escalliers en planches de boisrève tile.botania:dreamwood1Slab.name=Dalle en planches de boisrève tile.botania:conjurationCatalyst.name=Catalyseur de conjuration -tile.botania:prismarine0.name=Prismarin -tile.botania:prismarine1.name=Briques prismarine -tile.botania:prismarine2.name=Prismarin sombre -tile.botania:prismarine0Stairs.name=Escalliers en prismarin -tile.botania:prismarine0Slab.name=Dalle en prismarin -tile.botania:prismarine1Stairs.name=Escaliers en briques prismarine -tile.botania:prismarine1Slab.name=Dalle en briques prismarine -tile.botania:prismarine2Stairs.name=Escalliers en prismarin sombre -tile.botania:prismarine2Slab.name=Dalle en prismarin sombre -tile.botania:seaLamp.name=Lanterne marine tile.botania:miniIsland0.name=Fleur flottante blanche tile.botania:miniIsland1.name=Fleur flottante orange tile.botania:miniIsland2.name=Fleur flottante magenta @@ -615,12 +605,6 @@ tile.botania:miniIsland14.name=Fleur flottante rouge tile.botania:miniIsland15.name=Fleur flottante noire tile.botania:tinyPotato.name=Minuscule pomme de terre tile.botania:spawnerClaw.name=Imbueur de vie -tile.botania:reedBlock.name=Bloc de roseau -tile.botania:reedBlock0Stairs.name=Escaliers de roseau -tile.botania:reedBlock0Slab.name=Dalle de roseau -tile.botania:thatch.name=Chaume -tile.botania:thatch0Stairs.name=Escaliers de chaume -tile.botania:thatch0Slab.name=Dalle de chaume tile.botania:customBrick0.name=Brique cauchemardesque tile.botania:customBrick1.name=Brique d'âme tile.botania:customBrick2.name=Brique glaciale @@ -817,38 +801,10 @@ tile.botania:doubleFlower212.name=Fleur mystique marron haute tile.botania:doubleFlower213.name=Fleur mystique verte haute tile.botania:doubleFlower214.name=Fleur mystique rouge haute tile.botania:doubleFlower215.name=Fleur mystique noire haute -tile.botania:stone0.name=Andésite -tile.botania:stone1.name=Basalt -tile.botania:stone2.name=Diorite -tile.botania:stone3.name=Granite -tile.botania:stone4.name=Andésite polie -tile.botania:stone5.name=Basalt poli -tile.botania:stone6.name=Diorite polie -tile.botania:stone7.name=Granite polie -tile.botania:stone8.name=Briques d'andésite -tile.botania:stone9.name=Briques de basalt -tile.botania:stone10.name=Briques de diorite -tile.botania:stone11.name=Briques de granite tile.botania:stone12.name=Brique d'andésite sculpté tile.botania:stone13.name=Brique de basalt sculpté tile.botania:stone14.name=Brique de diorite sculpté tile.botania:stone15.name=Briques de granite sculpté -tile.botania:stone0Stairs.name=Escaliers d'andésite -tile.botania:stone1Stairs.name=Escaliers de basalt -tile.botania:stone2Stairs.name=Escaliers de diorite -tile.botania:stone3Stairs.name=Escaliers de granite -tile.botania:stone8Stairs.name=Escaliers de brique d'andésite -tile.botania:stone9Stairs.name=Escaliers de brique de basalt -tile.botania:stone10Stairs.name=Escaliers de brique de diorite -tile.botania:stone11Stairs.name=Escaliers de brique de granite -tile.botania:stone0Slab.name=Dalle d'andésite -tile.botania:stone1Slab.name=Dalle de basalt -tile.botania:stone2Slab.name=Dalle de diorite -tile.botania:stone3Slab.name=Dalle de granite -tile.botania:stone8Slab.name=Dalle de brique d'andésite -tile.botania:stone9Slab.name=Dalle de brique de basalt -tile.botania:stone10Slab.name=Dalle de brique de diorite -tile.botania:stone11Slab.name=Dalle de brique de granite tile.botania:blazeBlock.name=Lampe de flamme tile.botania:corporeaInterceptor.name=Intercepteur de Corporea tile.botania:corporeaCrystalCube.name=Cube de cristal Corporea @@ -865,8 +821,6 @@ tile.botania:lightLauncher.name=Lanceur de luminiseur tile.botania:livingrock0Wall.name=Mur de viveroche tile.botania:livingwood0Wall.name=Mur de vifbois tile.botania:dreamwood0Wall.name=Mur de boisrève -tile.botania:prismarine0Wall.name=Mur de prismarin -tile.botania:reedBlock0Wall.name=Mur de bloc de roseau tile.botania:biomeStoneA0Wall0.name=Mur de roche métamorphique des forêts tile.botania:biomeStoneA0Wall1.name=Mur de roche métamorphique des plaines tile.botania:biomeStoneA0Wall2.name=Mur de roche métamorphique des montagnes @@ -875,10 +829,6 @@ tile.botania:biomeStoneA0Wall4.name=Mur de roche métamorphique des marais tile.botania:biomeStoneA0Wall5.name=Mur de roche métamorphique des déserts tile.botania:biomeStoneA0Wall6.name=Mur de roche métamorphique des taigas tile.botania:biomeStoneA0Wall7.name=Mur de roche métamorphique des mesas -tile.botania:stone0Wall0.name=Mur d'andésite -tile.botania:stone0Wall1.name=Mur de basalt -tile.botania:stone0Wall2.name=Mur de diorite -tile.botania:stone0Wall3.name=Mur de granite tile.botania:manaBomb.name=Charge de manatempète tile.botania:buriedPetals0=Pétale blanche enterrée tile.botania:buriedPetals0.name=Pétale blanche enterrée diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index 0e2794570..fc6f9c561 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -581,19 +581,6 @@ tile.botania:dreamwood1Stairs.name=ドリームウッドの木材の階段 tile.botania:dreamwood1Slab.name=ドリームウッドの木材のハーフブロック tile.botania:dreamwood1SlabFull.name=ドリームウッドの木材のハーフブロック tile.botania:conjurationCatalyst.name=魔法の触媒 -tile.botania:prismarine0.name=プリズマリン -tile.botania:prismarine1.name=プリズマリンレンガ -tile.botania:prismarine2.name=ダークプリズマリン -tile.botania:prismarine0Stairs.name=プリズマリンの階段 -tile.botania:prismarine0Slab.name=プリズマリンのハーフブロック -tile.botania:prismarine0SlabFull.name=プリズマリンのハーフブロック -tile.botania:prismarine1Stairs.name=プリズマリンレンガの階段 -tile.botania:prismarine1Slab.name=プリズマリンレンガのハーフブロック -tile.botania:prismarine1SlabFull.name=プリズマリンレンガのハーフブロック -tile.botania:prismarine2Stairs.name=ダークプリズマリンの階段 -tile.botania:prismarine2Slab.name=ダークプリズマリンのハーフブロック -tile.botania:prismarine2SlabFull.name=ダークプリズマリンのハーフブロック -tile.botania:seaLamp.name=シーランタン tile.botania:miniIsland0.name=浮遊する白色の神秘の花 tile.botania:miniIsland1.name=浮遊する橙色の神秘の花 tile.botania:miniIsland2.name=浮遊する赤紫色の神秘の花 @@ -612,14 +599,6 @@ tile.botania:miniIsland14.name=浮遊する赤色の神秘の花 tile.botania:miniIsland15.name=浮遊する黒色の神秘の花 tile.botania:tinyPotato.name=小さなポテト tile.botania:spawnerClaw.name=生命浸透器 -tile.botania:reedBlock.name=サトウキビブロック -tile.botania:reedBlock0Stairs.name=サトウキビの階段 -tile.botania:reedBlock0Slab.name=サトウキビハーフブロック -tile.botania:reedBlock0SlabFull.name=サトウキビハーフブロック -tile.botania:thatch.name=わらぶきブロック -tile.botania:thatch0Stairs.name=わらぶきの階段 -tile.botania:thatch0Slab.name=わらぶきのハーフブロック -tile.botania:thatch0SlabFull.name=わらぶきのハーフブロック tile.botania:customBrick0.name=地獄レンガ tile.botania:customBrick1.name=ソウルレンガ tile.botania:customBrick2.name=雪レンガ @@ -848,46 +827,10 @@ tile.botania:doubleFlower212.name=背の高い茶色の神秘の花 tile.botania:doubleFlower213.name=背の高い緑色の神秘の花 tile.botania:doubleFlower214.name=背の高い赤色の神秘の花 tile.botania:doubleFlower215.name=背の高い黒色の神秘の花 -tile.botania:stone0.name=安山岩 -tile.botania:stone1.name=玄武岩 -tile.botania:stone2.name=閃緑岩 -tile.botania:stone3.name=花崗岩 -tile.botania:stone4.name=磨かれた安山岩 -tile.botania:stone5.name=磨かれた玄武岩 -tile.botania:stone6.name=磨かれた閃緑岩 -tile.botania:stone7.name=磨かれた花崗岩 -tile.botania:stone8.name=安山岩ブロック -tile.botania:stone9.name=玄武岩ブロック -tile.botania:stone10.name=閃緑岩ブロック -tile.botania:stone11.name=花崗岩ブロック tile.botania:stone12.name=模様入り安山岩ブロック tile.botania:stone13.name=模様入り玄武岩ブロック tile.botania:stone14.name=模様入り閃緑岩ブロック tile.botania:stone15.name=模様入り花崗岩ブロック -tile.botania:stone0Stairs.name=安山岩の階段 -tile.botania:stone1Stairs.name=玄武岩の階段 -tile.botania:stone2Stairs.name=閃緑岩の階段 -tile.botania:stone3Stairs.name=花崗岩の階段 -tile.botania:stone8Stairs.name=安山岩レンガの階段 -tile.botania:stone9Stairs.name=玄武岩レンガの階段 -tile.botania:stone10Stairs.name=閃緑岩レンガの階段 -tile.botania:stone11Stairs.name=花崗岩レンガの階段 -tile.botania:stone0Slab.name=安山岩のハーフブロック -tile.botania:stone1Slab.name=玄武岩のハーフブロック -tile.botania:stone2Slab.name=閃緑岩のハーフブロック -tile.botania:stone3Slab.name=花崗岩のハーフブロック -tile.botania:stone8Slab.name=安山岩のハーフブロック -tile.botania:stone9Slab.name=玄武岩のハーフブロック -tile.botania:stone10Slab.name=閃緑岩のハーフブロック -tile.botania:stone11Slab.name=花崗岩のハーフブロック -tile.botania:stone0SlabFull.name=安山岩のハーフブロック -tile.botania:stone1SlabFull.name=玄武岩のハーフブロック -tile.botania:stone2SlabFull.name=閃緑岩のハーフブロック -tile.botania:stone3SlabFull.name=花崗岩のハーフブロック -tile.botania:stone8SlabFull.name=安山岩レンガのハーフブロック -tile.botania:stone9SlabFull.name=玄武岩レンガのハーフブロック -tile.botania:stone10SlabFull.name=閃緑岩レンガのハーフブロック -tile.botania:stone11SlabFull.name=花崗岩レンガのハーフブロック tile.botania:blazeBlock.name=ブレイズランプ tile.botania:corporeaInterceptor.name=コーポリア妨害検出器 tile.botania:corporeaCrystalCube.name=コーポリアクリスタルキューブ @@ -904,8 +847,6 @@ tile.botania:lightLauncher.name=ルミナイザ発射器 tile.botania:livingrock0Wall.name=リビングロックの壁 tile.botania:livingwood0Wall.name=リビングウッドの壁 tile.botania:dreamwood0Wall.name=ドリームウッドの壁 -tile.botania:prismarine0Wall.name=プリズマリンの壁 -tile.botania:reedBlock0Wall.name=サトウキビブロックの壁 tile.botania:biomeStoneA0Wall0.name=森に変質した丸石の壁 tile.botania:biomeStoneA0Wall1.name=平原に変質した丸石の壁 tile.botania:biomeStoneA0Wall2.name=山に変質した丸石の壁 @@ -914,10 +855,6 @@ tile.botania:biomeStoneA0Wall4.name=沼に変質した丸石の壁 tile.botania:biomeStoneA0Wall5.name=砂漠に変質した丸石の壁 tile.botania:biomeStoneA0Wall6.name=タイガに変質した丸石の壁 tile.botania:biomeStoneA0Wall7.name=メサに変質した丸石の壁 -tile.botania:stone0Wall0.name=安山岩の壁 -tile.botania:stone0Wall1.name=玄武岩の壁 -tile.botania:stone0Wall2.name=閃緑岩の壁 -tile.botania:stone0Wall3.name=花崗岩の壁 tile.botania:manaBomb.name=マナストーム・チャージ tile.botania:buriedPetals0=埋もれた白色の花びら tile.botania:buriedPetals0.name=埋もれた白色の花びら diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 476c263a1..258ce220a 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -628,16 +628,6 @@ tile.botania:dreamwood0Slab.name=꿈의나무 반블럭 tile.botania:dreamwood1Stairs.name=꿈의나무 목재 계단 tile.botania:dreamwood1Slab.name=꿈의나무 목재 반블럭 tile.botania:conjurationCatalyst.name=마법 촉매 -tile.botania:prismarine0.name=프리스마린 -tile.botania:prismarine1.name=프리스마린 벽돌 -tile.botania:prismarine2.name=검은 프리스마린 -tile.botania:prismarine0Stairs.name=프리스마린 계단 -tile.botania:prismarine0Slab.name=프리스마린 반블럭 -tile.botania:prismarine1Stairs.name=프리스마린 벽돌 계단 -tile.botania:prismarine1Slab.name=프리스마린 벽돌 반블럭 -tile.botania:prismarine2Stairs.name=검은 프리스마린 계단 -tile.botania:prismarine2Slab.name=검은 프리스마린 벽돌 -tile.botania:seaLamp.name=바다 등 tile.botania:miniIsland0.name=부유 하얀색 꽃 tile.botania:miniIsland1.name=부유 주황색 꽃 tile.botania:miniIsland2.name=부유 자홍색 꽃 @@ -656,12 +646,6 @@ tile.botania:miniIsland14.name=부유 빨간색 꽃 tile.botania:miniIsland15.name=부유 검은색 꽃 tile.botania:tinyPotato.name=타이니 포테이토 tile.botania:spawnerClaw.name=생명 침투 -tile.botania:reedBlock.name=수수 블럭 -tile.botania:reedBlock0Stairs.name=수수 계단 -tile.botania:reedBlock0Slab.name=수수 반블럭 -tile.botania:thatch.name=짚 -tile.botania:thatch0Stairs.name=짚 계단 -tile.botania:thatch0Slab.name=짚 반블럭 tile.botania:customBrick0.name=지옥 벽돌 tile.botania:customBrick1.name=영혼 벽돌 tile.botania:customBrick2.name=서리 벽돌 @@ -856,38 +840,10 @@ tile.botania:doubleFlower212.name=신비로운 갈색 꽃 tile.botania:doubleFlower213.name=신비로운 초록색 꽃 tile.botania:doubleFlower214.name=신비로운 빨강색 꽃 tile.botania:doubleFlower215.name=신비로운 검은색 꽃 -tile.botania:stone0.name=안산암 -tile.botania:stone1.name=현무암 -tile.botania:stone2.name=섬록암 -tile.botania:stone3.name=화강암 -tile.botania:stone4.name=세련된 안산암 -tile.botania:stone5.name=세련된 현무암 -tile.botania:stone6.name=세련된 섬록암 -tile.botania:stone7.name=세련된 화강암 -tile.botania:stone8.name=안산암 벽돌 -tile.botania:stone9.name=현무암 벽돌 -tile.botania:stone10.name=섬록암 벽돌 -tile.botania:stone11.name=화강암 벽돌 tile.botania:stone12.name=조각된 안산암 벽돌 tile.botania:stone13.name=조각된 현무암 벽돌 tile.botania:stone14.name=조각된 섬록암 벽돌 tile.botania:stone15.name=조각된 화강암 벽돌 -tile.botania:stone0Stairs.name=안산암 계단 -tile.botania:stone1Stairs.name=현무암 계단 -tile.botania:stone2Stairs.name=섬록암 계단 -tile.botania:stone3Stairs.name=화강암 계단 -tile.botania:stone8Stairs.name=안산암 벽돌 계단 -tile.botania:stone9Stairs.name=현무암 벽돌 계단 -tile.botania:stone10Stairs.name=섬록암 벽돌 계단 -tile.botania:stone11Stairs.name=화강암 벽돌 계단 -tile.botania:stone0Slab.name=안산암 반블럭 -tile.botania:stone1Slab.name=현무암 반블럭 -tile.botania:stone2Slab.name=섬록암 반블럭 -tile.botania:stone3Slab.name=화강암 반블럭 -tile.botania:stone8Slab.name=안산암 벽돌 반블럭 -tile.botania:stone9Slab.name=현무암 벽돌 반블럭 -tile.botania:stone10Slab.name=섬록암 벽돌 반블럭 -tile.botania:stone11Slab.name=화강암 벽돌 반블럭 tile.botania:blazeBlock.name=블레이즈 램프 tile.botania:corporeaCrystalCube.name=Corporea 크리스탈 큐브 tile.botania:incensePlate.name=향 받침대 @@ -903,8 +859,6 @@ tile.botania:lightLauncher.name=루미나이저 런처 tile.botania:livingrock0Wall.name=생명의 나무 벽 tile.botania:livingwood0Wall.name=생명의 돌 벽 tile.botania:dreamwood0Wall.name=꿈의나무 벽 -tile.botania:prismarine0Wall.name=프리스마린 벽 -tile.botania:reedBlock0Wall.name=수수블럭 벽 tile.botania:biomeStoneA0Wall0.name=변성산악 조약돌 벽 tile.botania:biomeStoneA0Wall1.name=변성평원 조약돌 벽 tile.botania:biomeStoneA0Wall2.name=변성산악 조약돌 벽 @@ -913,10 +867,6 @@ tile.botania:biomeStoneA0Wall4.name=변성습지 조약돌 벽 tile.botania:biomeStoneA0Wall5.name=변성황야 조약돌 벽 tile.botania:biomeStoneA0Wall6.name=변성침엽수림 조약돌 벽 tile.botania:biomeStoneA0Wall7.name=변성메사 조약돌 벽 -tile.botania:stone0Wall0.name=안산암 벽 -tile.botania:stone0Wall1.name=현무암 벽 -tile.botania:stone0Wall2.name=섬록암 벽 -tile.botania:stone0Wall3.name=화강암 벽 tile.botania:manaBomb.name=마나폭탄 tile.botania:buriedPetals0=묻혀있는 하얀색 꽃잎 tile.botania:buriedPetals0.name=묻혀있는 하얀색 꽃잎 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index f5530eef7..cb5563a04 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -666,19 +666,6 @@ tile.botania:dreamwood1Stairs.name=Droomhout Plank Trap tile.botania:dreamwood1Slab.name=Droomhout Plank Plaat tile.botania:dreamwood1SlabFull.name=Droomhout Plank Plaat tile.botania:conjurationCatalyst.name=Oproepversneller -tile.botania:prismarine0.name=Prismarine -tile.botania:prismarine1.name=Prismarine Baksteen -tile.botania:prismarine2.name=Donker Prismarine -tile.botania:prismarine0Stairs.name=Prismarine Trap -tile.botania:prismarine0Slab.name=Prismarine Plaat -tile.botania:prismarine0SlabFull.name=Prismarine Plaat -tile.botania:prismarine1Stairs.name=Prismarine Baksteen Trap -tile.botania:prismarine1Slab.name=Prismarine Baksteen Plaat -tile.botania:prismarine1SlabFull.name=Prismarine Baksteen Plaat -tile.botania:prismarine2Stairs.name=Donker Prismarine Trap -tile.botania:prismarine2Slab.name=Donker Prismarine Plaat -tile.botania:prismarine2SlabFull.name=Donker Prismarine Plaat -tile.botania:seaLamp.name=Zeelantaarn tile.botania:miniIsland0.name=Drijvende Witte Bloem tile.botania:miniIsland1.name=Drijvende Oranje Bloem tile.botania:miniIsland2.name=Drijvende Magenta Bloem @@ -697,14 +684,6 @@ tile.botania:miniIsland14.name=Drijvende Rode Bloem tile.botania:miniIsland15.name=Drijvende Zwarte Bloem tile.botania:tinyPotato.name=Kleine Aardappel tile.botania:spawnerClaw.name=Levensbrenger -tile.botania:reedBlock.name=Rietblok -tile.botania:reedBlock0Stairs.name=Rieten Trap -tile.botania:reedBlock0Slab.name=Rieten Plaat -tile.botania:reedBlock0SlabFull.name=Rieten Plaat -tile.botania:thatch.name=Rietbedekking -tile.botania:thatch0Stairs.name=Rietbedekking Trap -tile.botania:thatch0Slab.name=Rietbedekking Plaat -tile.botania:thatch0SlabFull.name=Rietbedekking Plaat tile.botania:customBrick0.name=Helse Baksteen tile.botania:customBrick1.name=Zielen Baksteen tile.botania:customBrick2.name=Bevroren Baksteen @@ -933,46 +912,10 @@ tile.botania:doubleFlower212.name=Lange Mystieke Bruine Bloem tile.botania:doubleFlower213.name=Lange Mystieke Groene Bloem tile.botania:doubleFlower214.name=Lange Mystieke Rode Bloem tile.botania:doubleFlower215.name=Lange Mystieke Zwarte Bloem -tile.botania:stone0.name=Andesiet -tile.botania:stone1.name=Basalt -tile.botania:stone2.name=Diorite -tile.botania:stone3.name=Graniet -tile.botania:stone4.name=Gepolijst Andesiet -tile.botania:stone5.name=Gepolijst Basalt -tile.botania:stone6.name=Gepolijst Diorite -tile.botania:stone7.name=Gepolijst Graniet -tile.botania:stone8.name=Andesieten Bakstenen -tile.botania:stone9.name=Basalten Bakstenen -tile.botania:stone10.name=Dioriten Bakstenen -tile.botania:stone11.name=Granieten Bakstenen tile.botania:stone12.name=Gebeitelde Andesiete Baksteen tile.botania:stone13.name=Gebeitelde Basalte Baksteen tile.botania:stone14.name=Gebeitelde Diorite Baksteen tile.botania:stone15.name=Gebeitelde Graniete Baksteen -tile.botania:stone0Stairs.name=Andesieten Trap -tile.botania:stone1Stairs.name=Basalten Trap -tile.botania:stone2Stairs.name=Dioriten Trap -tile.botania:stone3Stairs.name=Granieten Trap -tile.botania:stone8Stairs.name=Andesieten Baksteen Trap -tile.botania:stone9Stairs.name=Basalten Baksteen Trap -tile.botania:stone10Stairs.name=Dioriten Baksteen Trap -tile.botania:stone11Stairs.name=Granieten Baksteen Trap -tile.botania:stone0Slab.name=Andesiet Plaat -tile.botania:stone1Slab.name=Basalt Plaat -tile.botania:stone2Slab.name=Diorite Plaat -tile.botania:stone3Slab.name=Graniet Plaat -tile.botania:stone8Slab.name=Andesieten Baksteen Plaat -tile.botania:stone9Slab.name=Basalten Baksteen Plaat -tile.botania:stone10Slab.name=Dioriten Baksteen Plaat -tile.botania:stone11Slab.name=Granieten Baksteen Plaat -tile.botania:stone0SlabFull.name=Andesiet Plaat -tile.botania:stone1SlabFull.name=Basalt Plaat -tile.botania:stone2SlabFull.name=Diorite Plaat -tile.botania:stone3SlabFull.name=Graniet Plaat -tile.botania:stone8SlabFull.name=Andesieten Baksteen Plaat -tile.botania:stone9SlabFull.name=Basalten Baksteen Plaat -tile.botania:stone10SlabFull.name=Dioriten Baksteen Plaat -tile.botania:stone11SlabFull.name=Granieten Baksteen Plaat tile.botania:blazeBlock.name=Blazelamp tile.botania:corporeaInterceptor.name=Corporea Onderschepper tile.botania:corporeaCrystalCube.name=Corporea Kristallen Kubus @@ -989,8 +932,6 @@ tile.botania:lightLauncher.name=Verlichter Lanceerder tile.botania:livingrock0Wall.name=Levensteen Muur tile.botania:livingwood0Wall.name=Levenshout Muur tile.botania:dreamwood0Wall.name=Droomhout Muur -tile.botania:prismarine0Wall.name=Prismarine Muur -tile.botania:reedBlock0Wall.name=Reed Block Muur tile.botania:biomeStoneA0Wall0.name=Veranderlijke Woudkeisteen Muur tile.botania:biomeStoneA0Wall1.name=Veranderlijke Veldkeisteen Muur tile.botania:biomeStoneA0Wall2.name=Veranderlijke Bergkeisteen Muur @@ -999,10 +940,6 @@ tile.botania:biomeStoneA0Wall4.name=Veranderlijke Moeraskeisteen Muur tile.botania:biomeStoneA0Wall5.name=Veranderlijke Woestijnkeisteen Muur tile.botania:biomeStoneA0Wall6.name=Veranderlijke Winterwoudkeisteen Muur tile.botania:biomeStoneA0Wall7.name=Veranderlijke Hoogvlaktekeisteen Muur -tile.botania:stone0Wall0.name=Andesiet Muur -tile.botania:stone0Wall1.name=Basalt Muur -tile.botania:stone0Wall2.name=Diorite Muur -tile.botania:stone0Wall3.name=Graniet Muur tile.botania:manaBomb.name=Manastorm Lading tile.botania:buriedPetals0=Begraven Witte Bloemblad tile.botania:buriedPetals0.name=Begraven Witte Bloemblad diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 5508d6d03..625e7b5d2 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -735,19 +735,6 @@ tile.botania:dreamwood1Stairs.name=Escadas de Tábuas de Madeira dos Sonhos tile.botania:dreamwood1Slab.name=Laje de Tábuas de Madeira dos Sonhos tile.botania:dreamwood1SlabFull.name=Laje de Tábuas de Madeira dos Sonhos tile.botania:conjurationCatalyst.name=Catalizador de Conjurações -tile.botania:prismarine0.name=Prismarinho -tile.botania:prismarine1.name=Tijolos de Prismarinho -tile.botania:prismarine2.name=Prismarinho Escuro -tile.botania:prismarine0Stairs.name=Escadas de Prismarinho -tile.botania:prismarine0Slab.name=Laje de Prismarinho -tile.botania:prismarine0SlabFull.name=Laje de Prismarinho -tile.botania:prismarine1Stairs.name=Escadas de Tijolos de Prismarinho -tile.botania:prismarine1Slab.name=Laje de Tijolos de Prismarinho -tile.botania:prismarine1SlabFull.name=Laje de Tijolos de Prismarinho -tile.botania:prismarine2Stairs.name=Escadas de Prismarinho Escuro -tile.botania:prismarine2Slab.name=Laje de Prismarinho Escuro -tile.botania:prismarine2SlabFull.name=Laje de Prismarinho Escuro -tile.botania:seaLamp.name=Lanterna do Mar tile.botania:miniIsland0.name=Flor Branca Flutuante tile.botania:miniIsland1.name=Flor Laranja Flutuante tile.botania:miniIsland2.name=Flor Magenta Flutuante @@ -766,14 +753,6 @@ tile.botania:miniIsland14.name=Flor Vermelha Flutuante tile.botania:miniIsland15.name=Flor Preta Flutuante tile.botania:tinyPotato.name=Batatinha tile.botania:spawnerClaw.name=Imbuidor de Vida -tile.botania:reedBlock.name=Bloco de Cana-de-açúcar -tile.botania:reedBlock0Stairs.name=Escadas de Cana-de-açúcar -tile.botania:reedBlock0Slab.name=Laje de Cana-de-açúcar -tile.botania:reedBlock0SlabFull.name=Laje de Cana-de-açúcar -tile.botania:thatch.name=Palha -tile.botania:thatch0Stairs.name=Escadas de Palha -tile.botania:thatch0Slab.name=Laje de Palha -tile.botania:thatch0SlabFull.name=Laje de Palha tile.botania:customBrick0.name=Tijolo Infernal tile.botania:customBrick1.name=Tijolo da Alma tile.botania:customBrick2.name=Tijolo Invernal @@ -1002,46 +981,10 @@ tile.botania:doubleFlower212.name=Flor Mística Alta Marrom tile.botania:doubleFlower213.name=Flor Mística Alta Verde tile.botania:doubleFlower214.name=Flor Mística Alta Vermelha tile.botania:doubleFlower215.name=Flor Mística Alta Preta -tile.botania:stone0.name=Andesito -tile.botania:stone1.name=Basalto -tile.botania:stone2.name=Diorito -tile.botania:stone3.name=Granito -tile.botania:stone4.name=Andesito Polido -tile.botania:stone5.name=Basalto Polido -tile.botania:stone6.name=Diorito Polido -tile.botania:stone7.name=Granito Polido -tile.botania:stone8.name=Tijolos de Andesito -tile.botania:stone9.name=Tijolos de Basalto -tile.botania:stone10.name=Tijoloes de Diorito -tile.botania:stone11.name=Tijolos de Granito tile.botania:stone12.name=Tijolos de Andesito Talhados tile.botania:stone13.name=Tijolos de Basalto Talhados tile.botania:stone14.name=Tijolos de Diorito Talhados tile.botania:stone15.name=Tijolos de Granito Talhados -tile.botania:stone0Stairs.name=Escadas de Andesito -tile.botania:stone1Stairs.name=Escadas de Basalto -tile.botania:stone2Stairs.name=Escadas de Diorito -tile.botania:stone3Stairs.name=Escadas de Granito -tile.botania:stone8Stairs.name=Escadas de Tijolos de Andesito -tile.botania:stone9Stairs.name=Escadas de Tijolos de Basalto -tile.botania:stone10Stairs.name=Escadas de Tijolos de Diorito -tile.botania:stone11Stairs.name=Escadas de Tijolos de Granito -tile.botania:stone0Slab.name=Laje de Andesito -tile.botania:stone1Slab.name=Laje de Basalto -tile.botania:stone2Slab.name=Laje de Diorito -tile.botania:stone3Slab.name=Laje de Granito -tile.botania:stone8Slab.name=Laje de Tijolos de Andesito -tile.botania:stone9Slab.name=Laje de Tijolos de Basalto -tile.botania:stone10Slab.name=Laje de Tijolos de Diorito -tile.botania:stone11Slab.name=Laje de Tijolos de Granito -tile.botania:stone0SlabFull.name=Laje de Andesito -tile.botania:stone1SlabFull.name=Laje de Basalto -tile.botania:stone2SlabFull.name=Laje de Diorito -tile.botania:stone3SlabFull.name=Laje de Granito -tile.botania:stone8SlabFull.name=Laje de Tijolos de Andesito -tile.botania:stone9SlabFull.name=Laje de Tijolos de Basalto -tile.botania:stone10SlabFull.name=Laje de Tijolos de Diorito -tile.botania:stone11SlabFull.name=Laje de Tijolos de Granito tile.botania:blazeBlock.name=Lâmpada Infernal tile.botania:corporeaInterceptor.name=Interceptador Corporea tile.botania:corporeaCrystalCube.name=Cubo de Cristal Corporea @@ -1058,8 +1001,6 @@ tile.botania:lightLauncher.name=Lançador Luminizer tile.botania:livingrock0Wall.name=Muro de Rocha-viva tile.botania:livingwood0Wall.name=Muro de Madeira-viva tile.botania:dreamwood0Wall.name=Muro de Madeira dos Sonhos -tile.botania:prismarine0Wall.name=Muro de Prismarinho -tile.botania:reedBlock0Wall.name=Muro de Cana-da-açúcar tile.botania:biomeStoneA0Wall0.name=Muro de Pedra Metamórfica - Floresta tile.botania:biomeStoneA0Wall1.name=Muro de Pedra Metamórfica - Planície tile.botania:biomeStoneA0Wall2.name=Muro de Pedra Metamórfica - Montanha @@ -1068,10 +1009,6 @@ tile.botania:biomeStoneA0Wall4.name=Muro de Pedra Metamórfica - Pântano tile.botania:biomeStoneA0Wall5.name=Muro de Pedra Metamórfica - Deserto tile.botania:biomeStoneA0Wall6.name=Muro de Pedra Metamórfica - Taiga tile.botania:biomeStoneA0Wall7.name=Muro de Pedra Metamórfica - Mesa -tile.botania:stone0Wall0.name=Muro de Andesito -tile.botania:stone0Wall1.name=Muro de Basalto -tile.botania:stone0Wall2.name=Muro de Diorito -tile.botania:stone0Wall3.name=Muro de Granito tile.botania:manaBomb.name=Carga de Manastorm tile.botania:buriedPetals0=Pétala Enterrada tile.botania:buriedPetals0.name=Pétala Branca Enterrada diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 4c51610a7..79d8510e4 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -396,16 +396,6 @@ tile.botania:dreamwood0Slab.name=Плита из древесины мечтан tile.botania:dreamwood1Stairs.name=Ступеньки из досок мечтаний tile.botania:dreamwood1Slab.name=Плита из досок мечтаний tile.botania:conjurationCatalyst.name=Колдовской катализатор -tile.botania:prismarine0.name=Призмарин -tile.botania:prismarine1.name=Призмариновые кирпичи -tile.botania:prismarine2.name=Тёмный призмарин -tile.botania:prismarine0Stairs.name=Ступеньки из призмарина -tile.botania:prismarine0Slab.name=Плита из призмарина -tile.botania:prismarine1Stairs.name=Ступеньки из призмаринового кирпича -tile.botania:prismarine1Slab.name=Плита из призмаринового кирпича -tile.botania:prismarine2Stairs.name=Ступеньки из тёмного призмарина -tile.botania:prismarine2Slab.name=Плита из тёмного призмарина -tile.botania:seaLamp.name=Морской светильник tile.botania:miniIsland0.name=Парящий белый цветок tile.botania:miniIsland1.name=Парящий оранжевый цветок tile.botania:miniIsland2.name=Парящий сиреневый цветок @@ -424,12 +414,6 @@ tile.botania:miniIsland14.name=Парящий красный цветок tile.botania:miniIsland15.name=Парящий чёрный цветок tile.botania:tinyPotato.name=Миникартофель tile.botania:spawnerClaw.name=Вдох жизни -tile.botania:reedBlock.name=Тростниковый блок -tile.botania:reedBlock0Stairs.name=Тростниковые ступеньки -tile.botania:reedBlock0Slab.name=Тростниковая плита -tile.botania:thatch.name=Солома -tile.botania:thatch0Stairs.name=Соломенные ступеньки -tile.botania:thatch0Slab.name=Соломенная плита tile.botania:customBrick0.name=Адский кирпич tile.botania:customBrick1.name=Душевный кирпич tile.botania:customBrick2.name=Ледяной кирпич diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 48fb5f4e1..a62103994 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -764,19 +764,6 @@ tile.botania:dreamwood1Stairs.name=梦之木楼梯 tile.botania:dreamwood1Slab.name=梦之木台阶 tile.botania:dreamwood1SlabFull.name=梦之木台阶 tile.botania:conjurationCatalyst.name=炼造催化器 -tile.botania:prismarine0.name=海晶石 -tile.botania:prismarine1.name=海晶石砖 -tile.botania:prismarine2.name=深色海晶石 -tile.botania:prismarine0Stairs.name=海晶石楼梯 -tile.botania:prismarine0Slab.name=海晶石台阶 -tile.botania:prismarine0SlabFull.name=海晶石台阶 -tile.botania:prismarine1Stairs.name=海晶石砖楼梯 -tile.botania:prismarine1Slab.name=海晶石砖台阶 -tile.botania:prismarine1SlabFull.name=海晶石砖台阶 -tile.botania:prismarine2Stairs.name=深色海晶石楼梯 -tile.botania:prismarine2Slab.name=深色海晶石台阶 -tile.botania:prismarine2SlabFull.name=深色海晶石台阶 -tile.botania:seaLamp.name=海灯笼 tile.botania:miniIsland0.name=白色浮空花 tile.botania:miniIsland1.name=橙色浮空花 tile.botania:miniIsland2.name=品红色浮空花 @@ -795,14 +782,6 @@ tile.botania:miniIsland14.name=红色浮空花 tile.botania:miniIsland15.name=黑色浮空花 tile.botania:tinyPotato.name=小土豆 tile.botania:spawnerClaw.name=生命灌注器 -tile.botania:reedBlock.name=甘蔗块 -tile.botania:reedBlock0Stairs.name=甘蔗楼梯 -tile.botania:reedBlock0Slab.name=甘蔗台阶 -tile.botania:reedBlock0SlabFull.name=甘蔗台阶 -tile.botania:thatch.name=茅草块 -tile.botania:thatch0Stairs.name=茅草楼梯 -tile.botania:thatch0Slab.name=茅草台阶 -tile.botania:thatch0SlabFull.name=茅草台阶 tile.botania:customBrick0.name=炼狱砖块 tile.botania:customBrick1.name=灵魂砖块 tile.botania:customBrick2.name=霜冻砖块 @@ -1031,46 +1010,10 @@ tile.botania:doubleFlower212.name=褐色高神秘花 tile.botania:doubleFlower213.name=绿色高神秘花 tile.botania:doubleFlower214.name=红色高神秘花 tile.botania:doubleFlower215.name=黑色高神秘花 -tile.botania:stone0.name=安山岩 -tile.botania:stone1.name=玄武岩 -tile.botania:stone2.name=闪长岩 -tile.botania:stone3.name=花岗岩 -tile.botania:stone4.name=抛光安山岩 -tile.botania:stone5.name=抛光玄武岩 -tile.botania:stone6.name=抛光闪长岩 -tile.botania:stone7.name=抛光花岗岩 -tile.botania:stone8.name=安山岩砖 -tile.botania:stone9.name=玄武岩砖 -tile.botania:stone10.name=闪长岩砖 -tile.botania:stone11.name=花岗岩砖 tile.botania:stone12.name=錾制安山岩砖 tile.botania:stone13.name=錾制玄武岩砖 tile.botania:stone14.name=錾制闪长岩砖 tile.botania:stone15.name=錾制花岗岩砖 -tile.botania:stone0Stairs.name=安山岩楼梯 -tile.botania:stone1Stairs.name=玄武岩楼梯 -tile.botania:stone2Stairs.name=闪长岩楼梯 -tile.botania:stone3Stairs.name=花岗岩楼梯 -tile.botania:stone8Stairs.name=安山岩砖楼梯 -tile.botania:stone9Stairs.name=玄武岩砖楼梯 -tile.botania:stone10Stairs.name=闪长岩砖楼梯 -tile.botania:stone11Stairs.name=花岗岩砖楼梯 -tile.botania:stone0Slab.name=安山岩台阶 -tile.botania:stone1Slab.name=玄武岩台阶 -tile.botania:stone2Slab.name=闪长岩台阶 -tile.botania:stone3Slab.name=花岗岩台阶 -tile.botania:stone8Slab.name=安山岩砖台阶 -tile.botania:stone9Slab.name=玄武岩砖台阶 -tile.botania:stone10Slab.name=闪长岩砖台阶 -tile.botania:stone11Slab.name=花岗岩砖台阶 -tile.botania:stone0SlabFull.name=安山岩台阶 -tile.botania:stone1SlabFull.name=玄武岩台阶 -tile.botania:stone2SlabFull.name=闪长岩台阶 -tile.botania:stone3SlabFull.name=花岗岩台阶 -tile.botania:stone8SlabFull.name=安山岩砖台阶 -tile.botania:stone9SlabFull.name=玄武岩砖台阶 -tile.botania:stone10SlabFull.name=闪长岩砖台阶 -tile.botania:stone11SlabFull.name=花岗岩砖台阶 tile.botania:blazeBlock.name=烈焰灯 tile.botania:corporeaInterceptor.name=多媒体拦截器 tile.botania:corporeaCrystalCube.name=多媒体水晶魔方 @@ -1087,8 +1030,6 @@ tile.botania:lightLauncher.name=微光发射器 tile.botania:livingrock0Wall.name=活石墙 tile.botania:livingwood0Wall.name=活木墙 tile.botania:dreamwood0Wall.name=梦之木墙 -tile.botania:prismarine0Wall.name=海晶石墙 -tile.botania:reedBlock0Wall.name=甘蔗围墙 tile.botania:biomeStoneA0Wall0.name=变质森林石墙 tile.botania:biomeStoneA0Wall1.name=变质平原石墙 tile.botania:biomeStoneA0Wall2.name=变质高山石墙 @@ -1097,10 +1038,6 @@ tile.botania:biomeStoneA0Wall4.name=变质沼泽石墙 tile.botania:biomeStoneA0Wall5.name=变质沙漠石墙 tile.botania:biomeStoneA0Wall6.name=变质雪原石墙 tile.botania:biomeStoneA0Wall7.name=变质高原石墙 -tile.botania:stone0Wall0.name=安山岩石墙 -tile.botania:stone0Wall1.name=玄武岩石墙 -tile.botania:stone0Wall2.name=闪长岩石墙 -tile.botania:stone0Wall3.name=花岗岩石墙 tile.botania:manaBomb.name=魔力风暴 tile.botania:buriedPetals0=埋藏白色花瓣 tile.botania:buriedPetals0.name=埋藏白色花瓣 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 32ad2f2b1..e9b345cb3 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -773,19 +773,6 @@ tile.botania:dreamwood1Stairs.name=夢之木階梯 tile.botania:dreamwood1Slab.name=夢之木半磚 tile.botania:dreamwood1SlabFull.name=夢之木半磚 tile.botania:conjurationCatalyst.name=煉造催化器 -tile.botania:prismarine0.name=海磷石 -tile.botania:prismarine1.name=海磷石磚 -tile.botania:prismarine2.name=暗海磷石 -tile.botania:prismarine0Stairs.name=海磷石階梯 -tile.botania:prismarine0Slab.name=海磷石階梯 -tile.botania:prismarine0SlabFull.name=海磷石半磚 -tile.botania:prismarine1Stairs.name=海磷石磚階梯 -tile.botania:prismarine1Slab.name=海磷石磚半磚 -tile.botania:prismarine1SlabFull.name=海磷石磚半磚 -tile.botania:prismarine2Stairs.name=暗海磷石階梯 -tile.botania:prismarine2Slab.name=暗海磷石半磚 -tile.botania:prismarine2SlabFull.name=暗海磷石半磚 -tile.botania:seaLamp.name=海燈籠 tile.botania:miniIsland0.name=白色浮空花 tile.botania:miniIsland1.name=橘色浮空花 tile.botania:miniIsland2.name=洋紅色浮空花 @@ -804,14 +791,6 @@ tile.botania:miniIsland14.name=紅色浮空花 tile.botania:miniIsland15.name=黑色浮空花 tile.botania:tinyPotato.name=小小馬鈴薯 tile.botania:spawnerClaw.name=生命灌注器 -tile.botania:reedBlock.name=甘蔗塊 -tile.botania:reedBlock0Stairs.name=甘蔗階梯 -tile.botania:reedBlock0Slab.name=甘蔗半磚 -tile.botania:reedBlock0SlabFull.name=甘蔗半磚 -tile.botania:thatch.name=茅草塊 -tile.botania:thatch0Stairs.name=茅草階梯 -tile.botania:thatch0Slab.name=茅草半磚 -tile.botania:thatch0SlabFull.name=茅草半磚 tile.botania:customBrick0.name=煉獄磚塊 tile.botania:customBrick1.name=靈魂磚塊 tile.botania:customBrick2.name=霜凍磚塊 @@ -1040,46 +1019,10 @@ tile.botania:doubleFlower212.name=棕色高神秘花 tile.botania:doubleFlower213.name=綠色高神秘花 tile.botania:doubleFlower214.name=紅色高神秘花 tile.botania:doubleFlower215.name=黑色高神秘花 -tile.botania:stone0.name=安山岩 -tile.botania:stone1.name=玄武岩 -tile.botania:stone2.name=閃長岩 -tile.botania:stone3.name=花崗岩 -tile.botania:stone4.name=拋光安山岩 -tile.botania:stone5.name=拋光玄武岩 -tile.botania:stone6.name=拋光閃長岩 -tile.botania:stone7.name=拋光花崗岩 -tile.botania:stone8.name=安山岩磚 -tile.botania:stone9.name=玄武岩磚 -tile.botania:stone10.name=閃長岩磚 -tile.botania:stone11.name=花崗岩磚 tile.botania:stone12.name=浮雕安山岩磚 tile.botania:stone13.name=浮雕玄武岩磚 tile.botania:stone14.name=浮雕閃長岩磚 tile.botania:stone15.name=浮雕花崗岩磚 -tile.botania:stone0Stairs.name=安山岩階梯 -tile.botania:stone1Stairs.name=玄武岩階梯 -tile.botania:stone2Stairs.name=閃長岩階梯 -tile.botania:stone3Stairs.name=花崗岩階梯 -tile.botania:stone8Stairs.name=安山岩磚階梯 -tile.botania:stone9Stairs.name=玄武岩磚階梯 -tile.botania:stone10Stairs.name=閃長岩磚階梯 -tile.botania:stone11Stairs.name=花崗岩磚階梯 -tile.botania:stone0Slab.name=安山岩半磚 -tile.botania:stone1Slab.name=玄武岩半磚 -tile.botania:stone2Slab.name=閃長岩半磚 -tile.botania:stone3Slab.name=花崗岩半磚 -tile.botania:stone8Slab.name=安山岩磚半磚 -tile.botania:stone9Slab.name=玄武岩磚半磚 -tile.botania:stone10Slab.name=閃長岩磚半磚 -tile.botania:stone11Slab.name=花崗岩磚半磚 -tile.botania:stone0SlabFull.name=安山岩半磚 -tile.botania:stone1SlabFull.name=玄武岩半磚 -tile.botania:stone2SlabFull.name=閃長岩半磚 -tile.botania:stone3SlabFull.name=花崗岩半磚 -tile.botania:stone8SlabFull.name=安山岩磚半磚 -tile.botania:stone9SlabFull.name=玄武岩磚半磚 -tile.botania:stone10SlabFull.name=閃長岩磚半磚 -tile.botania:stone11SlabFull.name=花崗岩磚半磚 tile.botania:blazeBlock.name=烈焰燈 tile.botania:corporeaInterceptor.name=多媒體攔截器 tile.botania:corporeaCrystalCube.name=多媒體水晶魔方 @@ -1096,8 +1039,6 @@ tile.botania:lightLauncher.name=微光發射器 tile.botania:livingrock0Wall.name=活石牆 tile.botania:livingwood0Wall.name=活木牆 tile.botania:dreamwood0Wall.name=夢之木牆 -tile.botania:prismarine0Wall.name=海晶石牆 -tile.botania:reedBlock0Wall.name=甘蔗圍牆 tile.botania:biomeStoneA0Wall0.name=變質森林石牆 tile.botania:biomeStoneA0Wall1.name=變質平原石牆 tile.botania:biomeStoneA0Wall2.name=變質高山石牆 @@ -1106,10 +1047,6 @@ tile.botania:biomeStoneA0Wall4.name=變質沼澤石牆 tile.botania:biomeStoneA0Wall5.name=變質沙漠石牆 tile.botania:biomeStoneA0Wall6.name=變質雪原石牆 tile.botania:biomeStoneA0Wall7.name=變質高原石牆 -tile.botania:stone0Wall0.name=安山岩石牆 -tile.botania:stone0Wall1.name=玄武岩石牆 -tile.botania:stone0Wall2.name=閃長岩石牆 -tile.botania:stone0Wall3.name=花崗岩石牆 tile.botania:manaBomb.name=瑪那風暴 tile.botania:buriedPetals0=埋藏白色花瓣 tile.botania:buriedPetals0.name=埋藏白色花瓣 From 83d0b8dc12fd38177500bc7fc657969bc2b1bd55 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 15:09:20 -0500 Subject: [PATCH 801/935] Remvoe the nag (you're welcome) --- .../java/vazkii/botania/common/Botania.java | 17 ----------------- .../resources/assets/botania/lang/en_US.lang | 2 -- 2 files changed, 19 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 0570304d0..1e542160e 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -29,8 +23,6 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import vazkii.botania.common.core.handler.IMCHandler; @@ -76,15 +68,6 @@ public class Botania { storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); proxy.preInit(event); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void nagRemoval(PlayerEvent.PlayerLoggedInEvent evt) { - EntityPlayer player = evt.player; - ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.warnRemove"); - message.setStyle(new Style().setColor(TextFormatting.RED)); - player.addChatComponentMessage(message); } @EventHandler diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index beb750812..905d3716a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -15,8 +15,6 @@ generator.botania-skyblock.info=Not recommended for botania newcomers # You do not need to copy this into your lang file botaniamisc.noloc=botaniamisc.noloc -botaniamisc.unofficial.warnRemove=[Botania] Warning: Some decorative blocks are being removed, please migrate to either the vanilla or Quark versions. - botaniamisc.nextPage=Next Page botaniamisc.prevPage=Previous Page botaniamisc.back=Back From a5d688883e358cbb1ed092fc0de81e45c3a12b02 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 15:31:18 -0500 Subject: [PATCH 802/935] Fix some walls being flipped, separate the models out --- .../client/core/handler/ModelHandler.java | 12 ++++-- .../botania/blockstates/dreamwood0Wall.json | 43 ++++++------------- .../botania/blockstates/livingrock0Wall.json | 43 ++++++------------- .../botania/blockstates/livingwood0Wall.json | 43 ++++++------------- .../models/block/dreamwood_wall_post.json | 6 +++ .../models/block/dreamwood_wall_side.json | 6 +++ .../models/block/livingrock_wall_post.json | 6 +++ .../models/block/livingrock_wall_side.json | 6 +++ .../models/block/livingwood_wall_post.json | 6 +++ .../models/block/livingwood_wall_side.json | 6 +++ .../botania/models/item/dreamwood_wall.json | 6 +++ .../botania/models/item/livingrock_wall.json | 6 +++ .../botania/models/item/livingwood_wall.json | 6 +++ 13 files changed, 105 insertions(+), 90 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_wall_side.json create mode 100644 src/main/resources/assets/botania/models/item/dreamwood_wall.json create mode 100644 src/main/resources/assets/botania/models/item/livingrock_wall.json create mode 100644 src/main/resources/assets/botania/models/item/livingwood_wall.json 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 938ccbea4..77d47b9de 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -811,9 +811,9 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); } - registerItemModel(ModFluffBlocks.livingrockWall); - registerItemModel(ModFluffBlocks.livingwoodWall); - registerItemModel(ModFluffBlocks.dreamwoodWall); + registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); + registerBlock(ModFluffBlocks.livingwoodWall, "livingwood_wall"); + registerBlock(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); } private static void registerPanes() { @@ -883,6 +883,12 @@ public final class ModelHandler { } } + private static void registerBlock(Block b, String name) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), 0, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + name, "inventory")); + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json index 7ba7ff648..f11b7c08a 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -1,34 +1,19 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#wall", "wall": "botania:blocks/dreamwood0" } - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:dreamwood_wall_post" } }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} + { "when": { "north": "true" }, + "apply": { "model": "botania:dreamwood_wall_side", "uvlock": true } }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} + { "when": { "east": "true" }, + "apply": { "model": "botania:dreamwood_wall_side", "y": 90, "uvlock": true } }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} + { "when": { "south": "true" }, + "apply": { "model": "botania:dreamwood_wall_side", "y": 180, "uvlock": true } }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "inventory": [{ - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file + { "when": { "west": "true" }, + "apply": { "model": "botania:dreamwood_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json index aa60e4087..ddc9bd49c 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -1,34 +1,19 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#wall", "wall": "botania:blocks/livingrock0" } - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:livingrock_wall_post" } }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} + { "when": { "north": "true" }, + "apply": { "model": "botania:livingrock_wall_side", "uvlock": true } }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} + { "when": { "east": "true" }, + "apply": { "model": "botania:livingrock_wall_side", "y": 90, "uvlock": true } }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} + { "when": { "south": "true" }, + "apply": { "model": "botania:livingrock_wall_side", "y": 180, "uvlock": true } }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "inventory": [{ - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file + { "when": { "west": "true" }, + "apply": { "model": "botania:livingrock_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json index 84cd1fa66..7a78863c4 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -1,34 +1,19 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "uvlock": true, - "transform": "forge:default-block", - "textures": { "particle": "#wall", "wall": "botania:blocks/livingwood0" } - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:livingwood_wall_post" } }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} + { "when": { "north": "true" }, + "apply": { "model": "botania:livingwood_wall_side", "uvlock": true } }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} + { "when": { "east": "true" }, + "apply": { "model": "botania:livingwood_wall_side", "y": 90, "uvlock": true } }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} + { "when": { "south": "true" }, + "apply": { "model": "botania:livingwood_wall_side", "y": 180, "uvlock": true } }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "inventory": [{ - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file + { "when": { "west": "true" }, + "apply": { "model": "botania:livingwood_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json new file mode 100644 index 000000000..451c92071 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json new file mode 100644 index 000000000..2f5e5ae88 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_wall_post.json b/src/main/resources/assets/botania/models/block/livingrock_wall_post.json new file mode 100644 index 000000000..ea11aa2fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_wall_side.json b/src/main/resources/assets/botania/models/block/livingrock_wall_side.json new file mode 100644 index 000000000..7102bcfdf --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_post.json b/src/main/resources/assets/botania/models/block/livingwood_wall_post.json new file mode 100644 index 000000000..ff3d1f95c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_side.json b/src/main/resources/assets/botania/models/block/livingwood_wall_side.json new file mode 100644 index 000000000..50761f621 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_wall.json b/src/main/resources/assets/botania/models/item/dreamwood_wall.json new file mode 100644 index 000000000..0bcdda9a9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwood_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingrock_wall.json b/src/main/resources/assets/botania/models/item/livingrock_wall.json new file mode 100644 index 000000000..bc8157d2a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingrock_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_wall.json b/src/main/resources/assets/botania/models/item/livingwood_wall.json new file mode 100644 index 000000000..8f6d35e18 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/livingwood0" + } +} \ No newline at end of file From bedbf55b33707168f7c3766ccc0d7a200060083b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 15:58:03 -0500 Subject: [PATCH 803/935] Separate out biome wall models. Don't worry it'll get organized. Closes #401 --- .../client/core/handler/ModelHandler.java | 6 +++--- .../blockstates/desert_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/forest_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/fungal_cobble_wall.json | 19 +++++++++++++++++++ .../botania/blockstates/mesa_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/mountain_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/plains_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/swamp_cobble_wall.json | 19 +++++++++++++++++++ .../blockstates/taiga_cobble_wall.json | 19 +++++++++++++++++++ .../models/block/desert_cobble_wall_post.json | 6 ++++++ .../models/block/desert_cobble_wall_side.json | 6 ++++++ .../models/block/forest_cobble_wall_post.json | 6 ++++++ .../models/block/forest_cobble_wall_side.json | 6 ++++++ .../models/block/fungal_cobble_wall_post.json | 6 ++++++ .../models/block/fungal_cobble_wall_side.json | 6 ++++++ .../models/block/mesa_cobble_wall_post.json | 6 ++++++ .../models/block/mesa_cobble_wall_side.json | 6 ++++++ .../block/mountain_cobble_wall_post.json | 6 ++++++ .../block/mountain_cobble_wall_side.json | 6 ++++++ .../models/block/plains_cobble_wall_post.json | 6 ++++++ .../models/block/plains_cobble_wall_side.json | 6 ++++++ .../models/block/swamp_cobble_wall_post.json | 6 ++++++ .../models/block/swamp_cobble_wall_side.json | 6 ++++++ .../models/block/taiga_cobble_wall_post.json | 6 ++++++ .../models/block/taiga_cobble_wall_side.json | 6 ++++++ .../models/item/desert_cobble_wall.json | 6 ++++++ .../models/item/forest_cobble_wall.json | 6 ++++++ .../models/item/fungal_cobble_wall.json | 6 ++++++ .../botania/models/item/mesa_cobble_wall.json | 6 ++++++ .../models/item/mountain_cobble_wall.json | 6 ++++++ .../models/item/plains_cobble_wall.json | 6 ++++++ .../models/item/swamp_cobble_wall.json | 6 ++++++ .../models/item/taiga_cobble_wall.json | 6 ++++++ 33 files changed, 299 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/desert_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/forest_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/plains_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json create mode 100644 src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json create mode 100644 src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json create mode 100644 src/main/resources/assets/botania/models/item/desert_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/forest_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/fungal_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/mesa_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/mountain_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/plains_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/swamp_cobble_wall.json create mode 100644 src/main/resources/assets/botania/models/item/taiga_cobble_wall.json 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 77d47b9de..c34ef7de6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -610,7 +610,8 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, + (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ignore(BlockWall.VARIANT).withSuffix("_wall").build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -807,8 +808,7 @@ public final class ModelHandler { private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { - String variantName = "inventory_" + variant.getName(); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":" + variant.getName() + "_wall", "inventory")); } registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); diff --git a/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json new file mode 100644 index 000000000..8705b2a52 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:desert_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json new file mode 100644 index 000000000..71f9c1d4b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:forest_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json new file mode 100644 index 000000000..c503bf282 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json new file mode 100644 index 000000000..a960b7bec --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json new file mode 100644 index 000000000..2606d1a7a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json new file mode 100644 index 000000000..948c22f9c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:plains_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json new file mode 100644 index 000000000..a05e64004 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json new file mode 100644 index 000000000..ce48b7bc7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json new file mode 100644 index 000000000..33636683b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json new file mode 100644 index 000000000..c8943f49c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json new file mode 100644 index 000000000..0a10f6f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json new file mode 100644 index 000000000..0ca607833 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json new file mode 100644 index 000000000..ce1756c91 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json new file mode 100644 index 000000000..7abed6202 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json new file mode 100644 index 000000000..8fb930ad8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json new file mode 100644 index 000000000..c968443d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json new file mode 100644 index 000000000..b00803b65 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json new file mode 100644 index 000000000..350481030 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json new file mode 100644 index 000000000..6ea6ee189 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json new file mode 100644 index 000000000..7b2077e0a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json new file mode 100644 index 000000000..67d8fe9fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json new file mode 100644 index 000000000..cbda4914e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json new file mode 100644 index 000000000..20ac75792 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json new file mode 100644 index 000000000..4fa74426f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/desert_cobble_wall.json new file mode 100644 index 000000000..c3487cd69 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desert_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/forest_cobble_wall.json new file mode 100644 index 000000000..9cde1a1d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/forest_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json new file mode 100644 index 000000000..00845bd40 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json new file mode 100644 index 000000000..4b6794cfd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json new file mode 100644 index 000000000..0c229f43c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/plains_cobble_wall.json new file mode 100644 index 000000000..14a90dc0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/plains_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json new file mode 100644 index 000000000..3367852d2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json new file mode 100644 index 000000000..18efd12a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file From 6264ebddbc56ad2d1111236cfdf72cda83547ac6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 16:04:03 -0500 Subject: [PATCH 804/935] Move itemblock jsons to their own subfolder --- .../java/vazkii/botania/client/core/handler/ModelHandler.java | 4 ++-- .../models/item/{ => itemblock}/desert_cobble_wall.json | 0 .../botania/models/item/{ => itemblock}/dreamwood_wall.json | 0 .../models/item/{ => itemblock}/forest_cobble_wall.json | 0 .../models/item/{ => itemblock}/fungal_cobble_wall.json | 0 .../botania/models/item/{ => itemblock}/livingrock_wall.json | 0 .../botania/models/item/{ => itemblock}/livingwood_wall.json | 0 .../botania/models/item/{ => itemblock}/mesa_cobble_wall.json | 0 .../models/item/{ => itemblock}/mountain_cobble_wall.json | 0 .../models/item/{ => itemblock}/plains_cobble_wall.json | 0 .../models/item/{ => itemblock}/swamp_cobble_wall.json | 0 .../models/item/{ => itemblock}/taiga_cobble_wall.json | 0 12 files changed, 2 insertions(+), 2 deletions(-) rename src/main/resources/assets/botania/models/item/{ => itemblock}/desert_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/dreamwood_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/forest_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/fungal_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/livingrock_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/livingwood_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/mesa_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/mountain_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/plains_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/swamp_cobble_wall.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/taiga_cobble_wall.json (100%) 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 c34ef7de6..adb5e268c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -808,7 +808,7 @@ public final class ModelHandler { private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":" + variant.getName() + "_wall", "inventory")); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + variant.getName() + "_wall", "inventory")); } registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); @@ -886,7 +886,7 @@ public final class ModelHandler { private static void registerBlock(Block b, String name) { ModelLoader.setCustomModelResourceLocation( Item.getItemFromBlock(b), 0, - new ModelResourceLocation(LibMisc.MOD_ID + ":" + name, "inventory")); + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + name, "inventory")); } private static void registerItemModel(Block b) { diff --git a/src/main/resources/assets/botania/models/item/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/desert_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/dreamwood_wall.json b/src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/dreamwood_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/forest_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/fungal_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/livingrock_wall.json b/src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingrock_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json diff --git a/src/main/resources/assets/botania/models/item/livingwood_wall.json b/src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingwood_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mesa_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/mountain_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/plains_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/swamp_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json diff --git a/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/taiga_cobble_wall.json rename to src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json From 233bc705b03f7a8dc281f79c4127e33409be4ce4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 16:39:05 -0500 Subject: [PATCH 805/935] More model cleanup --- .../client/core/handler/ModelHandler.java | 4 +-- .../assets/botania/blockstates/openCrate.json | 25 +++++++++---------- .../assets/botania/blockstates/runeAltar.json | 16 +++--------- .../botania/blockstates/spawnerClaw.json | 12 +++------ .../models/block/cube_bottom_other.json | 12 --------- .../botania/models/block/life_imbuer.json | 6 +++++ .../botania/models/block/runic_altar.json | 8 ++++++ .../models/block/{ => shapes}/claw.json | 0 .../botania/models/block/shapes/note.txt | 2 ++ .../twelve_high_bottom_top.json} | 3 ++- .../models/item/itemblock/life_imbuer.json | 3 +++ .../models/item/itemblock/runic_altar.json | 3 +++ 12 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/cube_bottom_other.json create mode 100644 src/main/resources/assets/botania/models/block/life_imbuer.json create mode 100644 src/main/resources/assets/botania/models/block/runic_altar.json rename src/main/resources/assets/botania/models/block/{ => shapes}/claw.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/shapes/note.txt rename src/main/resources/assets/botania/models/block/{biggerthanslab.json => shapes/twelve_high_bottom_top.json} (91%) create mode 100644 src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/runic_altar.json 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 adb5e268c..cd2b8f128 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -318,11 +318,11 @@ public final class ModelHandler { registerItemModel(ModBlocks.redStringRelay); registerItemModel(ModBlocks.rfGenerator); registerItemModel(ModBlocks.root); - registerItemModel(ModBlocks.runeAltar); + registerBlock(ModBlocks.runeAltar, "runic_altar"); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); registerItemModel(ModBlocks.sparkChanger); - registerItemModel(ModBlocks.spawnerClaw); + registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.starfield); registerItemModel(ModBlocks.terraPlate); diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json index 35e3f6aae..9cde21a91 100644 --- a/src/main/resources/assets/botania/blockstates/openCrate.json +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -1,26 +1,25 @@ { "forge_marker": 1, "defaults": { - "model": "botania:cube_bottom_other", + "model": "minecraft:orientable_vertical", "transform": "forge:default-block" }, "variants": { "pattern": { "none": {}, - "crafty_1_1": { "textures": { "other": "botania:blocks/ocPattern0" } }, - "crafty_2_2": { "textures": { "other": "botania:blocks/ocPattern1" } }, - "crafty_1_2": { "textures": { "other": "botania:blocks/ocPattern2" } }, - "crafty_2_1": { "textures": { "other": "botania:blocks/ocPattern3" } }, - "crafty_1_3": { "textures": { "other": "botania:blocks/ocPattern4" } }, - "crafty_3_1": { "textures": { "other": "botania:blocks/ocPattern5" } }, - "crafty_2_3": { "textures": { "other": "botania:blocks/ocPattern6" } }, - "crafty_3_2": { "textures": { "other": "botania:blocks/ocPattern7" } }, - "crafty_donut": { "textures": { "other": "botania:blocks/ocPattern8" } } + "crafty_1_1": { "textures": { "side": "botania:blocks/ocPattern0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/ocPattern1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/ocPattern2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/ocPattern3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/ocPattern4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/ocPattern5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/ocPattern6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/ocPattern7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/ocPattern8" } } }, "variant": { - "open": { "textures": { "bottom": "botania:blocks/openCrate1", "other": "botania:blocks/openCrate0" } }, - "crafty": { "textures": { "bottom": "botania:blocks/openCrate3", "other": "botania:blocks/openCrate2" } } + "open": { "x": 180, "textures": { "front": "botania:blocks/openCrate1", "side": "botania:blocks/openCrate0" } }, + "crafty": { "x": 180, "textures": { "front": "botania:blocks/openCrate3", "side": "botania:blocks/openCrate2" } } } - } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json index fcff3d2dc..cc64d8632 100644 --- a/src/main/resources/assets/botania/blockstates/runeAltar.json +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -1,17 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:biggerthanslab", - "textures": { - "top": "botania:blocks/runeAltar1", - "side": "botania:blocks/runeAltar2", - "bottom": "botania:blocks/runeAltar0" - } - }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": { + "model": "botania:runic_altar" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index fa9ccbbb5..8c9da4cac 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:claw", - "textures": { - "all": "botania:model/spawnerClaw" - } - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { + "model": "botania:life_imbuer" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_bottom_other.json b/src/main/resources/assets/botania/models/block/cube_bottom_other.json deleted file mode 100644 index 8c2629967..000000000 --- a/src/main/resources/assets/botania/models/block/cube_bottom_other.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "down": "#bottom", - "up": "#other", - "north": "#other", - "south": "#other", - "west": "#other", - "east": "#other", - "particle": "#other" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/life_imbuer.json b/src/main/resources/assets/botania/models/block/life_imbuer.json new file mode 100644 index 000000000..83a5becdc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/life_imbuer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/claw", + "textures": { + "all": "botania:model/spawnerClaw" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/runic_altar.json b/src/main/resources/assets/botania/models/block/runic_altar.json new file mode 100644 index 000000000..bb055b11d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/runic_altar.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/twelve_high_bottom_top", + "textures": { + "top": "botania:blocks/runeAltar1", + "side": "botania:blocks/runeAltar2", + "bottom": "botania:blocks/runeAltar0" + } +} diff --git a/src/main/resources/assets/botania/models/block/claw.json b/src/main/resources/assets/botania/models/block/shapes/claw.json similarity index 100% rename from src/main/resources/assets/botania/models/block/claw.json rename to src/main/resources/assets/botania/models/block/shapes/claw.json diff --git a/src/main/resources/assets/botania/models/block/shapes/note.txt b/src/main/resources/assets/botania/models/block/shapes/note.txt new file mode 100644 index 000000000..18061f888 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shapes/note.txt @@ -0,0 +1,2 @@ +This folder is for "abstract" models, that only define shapes and not textures. +Textured models for actual blocks goes in the root folder (one level up). \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/biggerthanslab.json b/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json similarity index 91% rename from src/main/resources/assets/botania/models/block/biggerthanslab.json rename to src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json index 7c944c1fd..d27a32522 100644 --- a/src/main/resources/assets/botania/models/block/biggerthanslab.json +++ b/src/main/resources/assets/botania/models/block/shapes/twelve_high_bottom_top.json @@ -1,6 +1,7 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#side" + "particle": "#top" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json new file mode 100644 index 000000000..06e94f1b1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/life_imbuer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json new file mode 100644 index 000000000..942906288 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/runic_altar" +} \ No newline at end of file From 110396f39efd6002122ba7277b4ad269ed8c7317 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 17:29:22 -0500 Subject: [PATCH 806/935] More model cleanup --- .../client/core/handler/ModelHandler.java | 37 +-- .../botania/blockstates/agricarnation.json | 2 +- .../blockstates/agricarnationChibi.json | 2 +- .../assets/botania/blockstates/altar.json | 217 +----------------- .../botania/blockstates/arcanerose.json | 2 +- .../botania/blockstates/bellethorn.json | 2 +- .../botania/blockstates/bellethornChibi.json | 2 +- .../assets/botania/blockstates/bergamute.json | 2 +- .../assets/botania/blockstates/bubbell.json | 2 +- .../botania/blockstates/bubbellChibi.json | 2 +- .../assets/botania/blockstates/clayconia.json | 2 +- .../botania/blockstates/clayconiaChibi.json | 2 +- .../assets/botania/blockstates/daffomill.json | 2 +- .../botania/blockstates/dandelifeon.json | 2 +- .../assets/botania/blockstates/daybloom.json | 2 +- .../botania/blockstates/daybloomDecor.json | 2 +- .../botania/blockstates/daybloomPrime.json | 2 +- .../botania/blockstates/dreadthorn.json | 2 +- .../assets/botania/blockstates/endoflame.json | 2 +- .../botania/blockstates/entropinnyum.json | 2 +- .../assets/botania/blockstates/exoflame.json | 2 +- .../botania/blockstates/fallenKanade.json | 2 +- .../botania/blockstates/gourmaryllis.json | 2 +- .../botania/blockstates/heiseiDream.json | 2 +- .../botania/blockstates/hopperhock.json | 2 +- .../botania/blockstates/hopperhockChibi.json | 2 +- .../assets/botania/blockstates/hyacidus.json | 2 +- .../botania/blockstates/hydroangeas.json | 2 +- .../botania/blockstates/hydroangeasDecor.json | 2 +- .../botania/blockstates/jadedAmaranthus.json | 2 +- .../assets/botania/blockstates/jiyuulia.json | 2 +- .../assets/botania/blockstates/kekimurus.json | 2 +- .../assets/botania/blockstates/loonium.json | 2 +- .../assets/botania/blockstates/manastar.json | 2 +- .../botania/blockstates/marimorphosis.json | 2 +- .../blockstates/marimorphosisChibi.json | 2 +- .../assets/botania/blockstates/medumone.json | 2 +- .../assets/botania/blockstates/munchdew.json | 2 +- .../botania/blockstates/narslimmus.json | 2 +- .../botania/blockstates/nightshade.json | 2 +- .../botania/blockstates/nightshadeDecor.json | 2 +- .../botania/blockstates/nightshadePrime.json | 2 +- .../assets/botania/blockstates/orechid.json | 2 +- .../botania/blockstates/orechidIgnem.json | 2 +- .../botania/blockstates/petalBlock.json | 14 +- .../botania/blockstates/pollidisiac.json | 2 +- .../assets/botania/blockstates/puredaisy.json | 2 +- .../botania/blockstates/rafflowsia.json | 2 +- .../botania/blockstates/rannuncarpus.json | 2 +- .../blockstates/rannuncarpusChibi.json | 2 +- .../botania/blockstates/solegnolia.json | 2 +- .../botania/blockstates/solegnoliaChibi.json | 2 +- .../botania/blockstates/sparkChanger.json | 17 +- .../botania/blockstates/spectranthemum.json | 2 +- .../botania/blockstates/spectrolus.json | 2 +- .../botania/blockstates/tangleberrie.json | 2 +- .../botania/blockstates/terraPlate.json | 13 +- .../botania/blockstates/thermalily.json | 2 +- .../assets/botania/blockstates/tigerseye.json | 2 +- .../botania/blockstates/vinculotus.json | 2 +- .../models/block/default_apothecary.json | 23 ++ .../models/block/desert_apothecary.json | 23 ++ .../models/block/forest_apothecary.json | 23 ++ .../models/block/fungal_apothecary.json | 23 ++ .../botania/models/block/mesa_apothecary.json | 23 ++ .../models/block/mossy_apothecary.json | 23 ++ .../models/block/mountain_apothecary.json | 23 ++ .../botania/models/block/petalApothecary.json | 47 ---- .../botania/models/block/petal_block.json | 6 + .../models/block/plains_apothecary.json | 23 ++ .../block/{ => shapes}/cross_tinted.json | 0 .../block/{ => shapes}/cube_all_tinted.json | 1 + .../petal_apothecary.json} | 1 + .../three_high_bottom_top.json} | 1 + .../botania/models/block/spark_tinkerer.json | 8 + .../models/block/swamp_apothecary.json | 23 ++ .../models/block/taiga_apothecary.json | 23 ++ .../botania/models/block/terra_plate.json | 8 + .../block/wall_inventory_bottom_top.json | 46 ---- .../models/block/wall_post_bottom_top.json | 20 -- .../models/block/wall_side_bottom_top.json | 19 -- .../item/itemblock/default_apothecary.json | 3 + .../item/itemblock/desert_apothecary.json | 3 + .../item/itemblock/forest_apothecary.json | 3 + .../item/itemblock/fungal_apothecary.json | 3 + .../item/itemblock/mesa_apothecary.json | 3 + .../item/itemblock/mountain_apothecary.json | 3 + .../models/item/itemblock/petal_block.json | 3 + .../item/itemblock/plains_apothecary.json | 3 + .../models/item/itemblock/spark_tinkerer.json | 3 + .../item/itemblock/swamp_apothecary.json | 3 + .../item/itemblock/taiga_apothecary.json | 3 + .../models/item/itemblock/terra_plate.json | 3 + 93 files changed, 383 insertions(+), 448 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/default_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/desert_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/forest_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/fungal_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/mesa_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/mossy_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/mountain_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/petalApothecary.json create mode 100644 src/main/resources/assets/botania/models/block/petal_block.json create mode 100644 src/main/resources/assets/botania/models/block/plains_apothecary.json rename src/main/resources/assets/botania/models/block/{ => shapes}/cross_tinted.json (100%) rename src/main/resources/assets/botania/models/block/{ => shapes}/cube_all_tinted.json (94%) rename src/main/resources/assets/botania/models/block/{altar.json => shapes/petal_apothecary.json} (98%) rename src/main/resources/assets/botania/models/block/{threehigh.json => shapes/three_high_bottom_top.json} (94%) create mode 100644 src/main/resources/assets/botania/models/block/spark_tinkerer.json create mode 100644 src/main/resources/assets/botania/models/block/swamp_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/taiga_apothecary.json create mode 100644 src/main/resources/assets/botania/models/block/terra_plate.json delete mode 100644 src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json delete mode 100644 src/main/resources/assets/botania/models/block/wall_post_bottom_top.json delete mode 100644 src/main/resources/assets/botania/models/block/wall_side_bottom_top.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/petal_block.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/terra_plate.json 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 cd2b8f128..3513d18f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -114,6 +114,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; import java.util.Locale; +import java.util.function.IntFunction; import static vazkii.botania.common.item.ModItems.*; @@ -138,7 +139,6 @@ public final class ModelHandler { registerSlabs(); registerWalls(); registerPanes(); - registerAltars(); registerQuartzBlocks(); registerLuminizers(); @@ -281,6 +281,8 @@ public final class ModelHandler { private static void registerStandardBlocks() { registerItemModel(ModBlocks.alchemyCatalyst); registerItemModel(ModBlocks.alfPortal); + // Off by one on purpose to exclude MOSSY + registerBlockAllMetaNames(ModBlocks.altar, AltarVariant.values().length - 1, i -> AltarVariant.values()[i].getName() + "_apothecary"); registerItemModel(ModBlocks.bifrost); registerItemModel(ModBlocks.bifrostPerm); registerItemModel(ModBlocks.blazeBlock); @@ -321,11 +323,11 @@ public final class ModelHandler { registerBlock(ModBlocks.runeAltar, "runic_altar"); registerItemModel(ModBlocks.shimmerrock); registerItemModel(ModBlocks.shimmerwoodPlanks); - registerItemModel(ModBlocks.sparkChanger); + registerBlock(ModBlocks.sparkChanger, "spark_tinkerer"); registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); registerItemModel(ModBlocks.specialFlower); registerItemModel(ModBlocks.starfield); - registerItemModel(ModBlocks.terraPlate); + registerBlock(ModBlocks.terraPlate, "terra_plate"); registerItemModel(ModBlocks.tinyPlanet); registerItemModel(ModBlocks.tinyPotato); registerItemModel(ModBlocks.turntable); @@ -335,7 +337,7 @@ public final class ModelHandler { // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); + registerBlockAllMeta(ModBlocks.petalBlock, EnumDyeColor.values().length, "petal_block"); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); // Blocks which share models with their item, and have only one variant to switch over @@ -822,15 +824,6 @@ public final class ModelHandler { registerItemModel(ModFluffBlocks.managlassPane); } - private static void registerAltars() { - Item item = Item.getItemFromBlock(ModBlocks.altar); - 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)); - } - } - private static void registerQuartzBlocks() { for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { if (b == null) // Dark quartz disabled @@ -884,9 +877,21 @@ public final class ModelHandler { } private static void registerBlock(Block b, String name) { - ModelLoader.setCustomModelResourceLocation( - Item.getItemFromBlock(b), 0, - new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + name, "inventory")); + registerBlockAllMeta(b, 1, name); + } + + private static void registerBlockAllMeta(Block b, int maxExclusive, String name) { + registerBlockAllMetaNames(b, maxExclusive, i -> name); + } + + private static void registerBlockAllMetaNames(Block b, int maxExclusive, IntFunction metaToName) { + Item item = Item.getItemFromBlock(b); + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToName.apply(i), "inventory") + ); + } } private static void registerItemModel(Block b) { diff --git a/src/main/resources/assets/botania/blockstates/agricarnation.json b/src/main/resources/assets/botania/blockstates/agricarnation.json index fea9affd1..5e38ff9cd 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnation.json +++ b/src/main/resources/assets/botania/blockstates/agricarnation.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/agricarnation" } diff --git a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json index 75f3debf9..b56f4f80e 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json +++ b/src/main/resources/assets/botania/blockstates/agricarnationChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/agricarnationChibi" } diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 3194dee58..8d6de2515 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -1,211 +1,14 @@ { - "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!", - "forge_marker": 1, - "defaults": { - "model": "botania:altar" - }, "variants": { - "variant": { - "default": { "textures": { - "gobletbaseside": "botania:model/altar/default/gobletBase_sides", - "gobletbasetop": "botania:model/altar/default/gobletBase_top", - "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/default/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/default/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/default/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/default/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/default/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/default/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/default/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/default/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom", - "kelkwall": "botania:model/altar/default/kelkWall", - "particle": "minecraft:blocks/cobblestone" - }}, - "forest": { "textures": { - "gobletbaseside": "botania:model/altar/forest/gobletBase_sides", - "gobletbasetop": "botania:model/altar/forest/gobletBase_top", - "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/forest/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/forest/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/forest/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/forest/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/forest/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom", - "kelkwall": "botania:model/altar/forest/kelkWall", - "particle": "botania:blocks/biomeStone0" - }}, - "plains": { "textures": { - "gobletbaseside": "botania:model/altar/plains/gobletBase_sides", - "gobletbasetop": "botania:model/altar/plains/gobletBase_top", - "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/plains/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/plains/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/plains/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/plains/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/plains/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom", - "kelkwall": "botania:model/altar/plains/kelkWall", - "particle": "botania:blocks/biomeStone1" - }}, - "mountain": { "textures": { - "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mountain/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mountain/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mountain/kelkWall", - "particle": "botania:blocks/biomeStone2" - }}, - "fungal": { "textures": { - "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides", - "gobletbasetop": "botania:model/altar/fungal/gobletBase_top", - "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/fungal/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom", - "kelkwall": "botania:model/altar/fungal/kelkWall", - "particle": "botania:blocks/biomeStone3" - }}, - "swamp": { "textures": { - "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides", - "gobletbasetop": "botania:model/altar/swamp/gobletBase_top", - "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/swamp/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom", - "kelkwall": "botania:model/altar/swamp/kelkWall", - "particle": "botania:blocks/biomeStone4" - }}, - "desert": { "textures": { - "gobletbaseside": "botania:model/altar/desert/gobletBase_sides", - "gobletbasetop": "botania:model/altar/desert/gobletBase_top", - "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/desert/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/desert/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/desert/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/desert/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/desert/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom", - "kelkwall": "botania:model/altar/desert/kelkWall", - "particle": "botania:blocks/biomeStone5" - }}, - "taiga": { "textures": { - "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides", - "gobletbasetop": "botania:model/altar/taiga/gobletBase_top", - "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/taiga/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom", - "kelkwall": "botania:model/altar/taiga/kelkWall", - "particle": "botania:blocks/biomeStone6" - }}, - "mesa": { "textures": { - "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mesa/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mesa/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mesa/kelkWall", - "particle": "botania:blocks/biomeStone7" - }}, - "mossy": { "textures": { - "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mossy/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mossy/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mossy/kelkWall", - "particle": "minecraft:blocks/cobblestone_mossy" - }} - } + "variant=default": { "model": "botania:default_apothecary" }, + "variant=forest": { "model": "botania:forest_apothecary" }, + "variant=plains": { "model": "botania:plains_apothecary" }, + "variant=mountain": { "model": "botania:mountain_apothecary" }, + "variant=fungal": { "model": "botania:fungal_apothecary" }, + "variant=swamp": { "model": "botania:swamp_apothecary" }, + "variant=desert": { "model": "botania:desert_apothecary" }, + "variant=taiga": { "model": "botania:taiga_apothecary" }, + "variant=mesa": { "model": "botania:mesa_apothecary" }, + "variant=mossy": { "model": "botania:mossy_apothecary" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/arcanerose.json b/src/main/resources/assets/botania/blockstates/arcanerose.json index 14f2a67b5..5ace26e7a 100644 --- a/src/main/resources/assets/botania/blockstates/arcanerose.json +++ b/src/main/resources/assets/botania/blockstates/arcanerose.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/arcanerose" } diff --git a/src/main/resources/assets/botania/blockstates/bellethorn.json b/src/main/resources/assets/botania/blockstates/bellethorn.json index a32114a6c..cad8c4b97 100644 --- a/src/main/resources/assets/botania/blockstates/bellethorn.json +++ b/src/main/resources/assets/botania/blockstates/bellethorn.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/bellethorn" } diff --git a/src/main/resources/assets/botania/blockstates/bellethornChibi.json b/src/main/resources/assets/botania/blockstates/bellethornChibi.json index be25798d4..aed72d21b 100644 --- a/src/main/resources/assets/botania/blockstates/bellethornChibi.json +++ b/src/main/resources/assets/botania/blockstates/bellethornChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/bellethornChibi" } diff --git a/src/main/resources/assets/botania/blockstates/bergamute.json b/src/main/resources/assets/botania/blockstates/bergamute.json index 52beeea8a..087add64d 100644 --- a/src/main/resources/assets/botania/blockstates/bergamute.json +++ b/src/main/resources/assets/botania/blockstates/bergamute.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/bergamute" } diff --git a/src/main/resources/assets/botania/blockstates/bubbell.json b/src/main/resources/assets/botania/blockstates/bubbell.json index 039acac9a..694180568 100644 --- a/src/main/resources/assets/botania/blockstates/bubbell.json +++ b/src/main/resources/assets/botania/blockstates/bubbell.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/bubbell" } diff --git a/src/main/resources/assets/botania/blockstates/bubbellChibi.json b/src/main/resources/assets/botania/blockstates/bubbellChibi.json index 26771a891..7f73d9733 100644 --- a/src/main/resources/assets/botania/blockstates/bubbellChibi.json +++ b/src/main/resources/assets/botania/blockstates/bubbellChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/bubbellChibi" } diff --git a/src/main/resources/assets/botania/blockstates/clayconia.json b/src/main/resources/assets/botania/blockstates/clayconia.json index 00a986196..327e6bee4 100644 --- a/src/main/resources/assets/botania/blockstates/clayconia.json +++ b/src/main/resources/assets/botania/blockstates/clayconia.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/clayconia" } diff --git a/src/main/resources/assets/botania/blockstates/clayconiaChibi.json b/src/main/resources/assets/botania/blockstates/clayconiaChibi.json index 5921deab9..534a6fde4 100644 --- a/src/main/resources/assets/botania/blockstates/clayconiaChibi.json +++ b/src/main/resources/assets/botania/blockstates/clayconiaChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/clayconiaChibi" } diff --git a/src/main/resources/assets/botania/blockstates/daffomill.json b/src/main/resources/assets/botania/blockstates/daffomill.json index fff602c34..d8864e463 100644 --- a/src/main/resources/assets/botania/blockstates/daffomill.json +++ b/src/main/resources/assets/botania/blockstates/daffomill.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/daffomill" } diff --git a/src/main/resources/assets/botania/blockstates/dandelifeon.json b/src/main/resources/assets/botania/blockstates/dandelifeon.json index 4b6c71c69..afd8fd88b 100644 --- a/src/main/resources/assets/botania/blockstates/dandelifeon.json +++ b/src/main/resources/assets/botania/blockstates/dandelifeon.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/dandelifeon" } diff --git a/src/main/resources/assets/botania/blockstates/daybloom.json b/src/main/resources/assets/botania/blockstates/daybloom.json index 81dc313b2..3039b1ff2 100644 --- a/src/main/resources/assets/botania/blockstates/daybloom.json +++ b/src/main/resources/assets/botania/blockstates/daybloom.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/daybloom" } diff --git a/src/main/resources/assets/botania/blockstates/daybloomDecor.json b/src/main/resources/assets/botania/blockstates/daybloomDecor.json index 4ec50a0e5..ee92199f2 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomDecor.json +++ b/src/main/resources/assets/botania/blockstates/daybloomDecor.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/daybloomDecor" } diff --git a/src/main/resources/assets/botania/blockstates/daybloomPrime.json b/src/main/resources/assets/botania/blockstates/daybloomPrime.json index 80792cd90..3e8aac7c9 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomPrime.json +++ b/src/main/resources/assets/botania/blockstates/daybloomPrime.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/daybloomPrime" } diff --git a/src/main/resources/assets/botania/blockstates/dreadthorn.json b/src/main/resources/assets/botania/blockstates/dreadthorn.json index 5c1309347..ea12ba1a0 100644 --- a/src/main/resources/assets/botania/blockstates/dreadthorn.json +++ b/src/main/resources/assets/botania/blockstates/dreadthorn.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/dreadthorn" } diff --git a/src/main/resources/assets/botania/blockstates/endoflame.json b/src/main/resources/assets/botania/blockstates/endoflame.json index 1a83629e2..39e033093 100644 --- a/src/main/resources/assets/botania/blockstates/endoflame.json +++ b/src/main/resources/assets/botania/blockstates/endoflame.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/endoflame" } diff --git a/src/main/resources/assets/botania/blockstates/entropinnyum.json b/src/main/resources/assets/botania/blockstates/entropinnyum.json index 5c15e1a4a..c34f0cae3 100644 --- a/src/main/resources/assets/botania/blockstates/entropinnyum.json +++ b/src/main/resources/assets/botania/blockstates/entropinnyum.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/entropinnyum" } diff --git a/src/main/resources/assets/botania/blockstates/exoflame.json b/src/main/resources/assets/botania/blockstates/exoflame.json index 14c0f9e15..81b76d343 100644 --- a/src/main/resources/assets/botania/blockstates/exoflame.json +++ b/src/main/resources/assets/botania/blockstates/exoflame.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/exoflame" } diff --git a/src/main/resources/assets/botania/blockstates/fallenKanade.json b/src/main/resources/assets/botania/blockstates/fallenKanade.json index 9dc163cc7..577aaf195 100644 --- a/src/main/resources/assets/botania/blockstates/fallenKanade.json +++ b/src/main/resources/assets/botania/blockstates/fallenKanade.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/fallenKanade" } diff --git a/src/main/resources/assets/botania/blockstates/gourmaryllis.json b/src/main/resources/assets/botania/blockstates/gourmaryllis.json index 4002fcdff..2416e8497 100644 --- a/src/main/resources/assets/botania/blockstates/gourmaryllis.json +++ b/src/main/resources/assets/botania/blockstates/gourmaryllis.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/gourmaryllis" } diff --git a/src/main/resources/assets/botania/blockstates/heiseiDream.json b/src/main/resources/assets/botania/blockstates/heiseiDream.json index 717513a65..1c547476a 100644 --- a/src/main/resources/assets/botania/blockstates/heiseiDream.json +++ b/src/main/resources/assets/botania/blockstates/heiseiDream.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/heiseiDream" } diff --git a/src/main/resources/assets/botania/blockstates/hopperhock.json b/src/main/resources/assets/botania/blockstates/hopperhock.json index d154cda9c..befced811 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhock.json +++ b/src/main/resources/assets/botania/blockstates/hopperhock.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/hopperhock" } diff --git a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json index 4c4f3f840..0f140cfc2 100644 --- a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json +++ b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/hopperhockChibi" } diff --git a/src/main/resources/assets/botania/blockstates/hyacidus.json b/src/main/resources/assets/botania/blockstates/hyacidus.json index ea8ff7336..02f2e0543 100644 --- a/src/main/resources/assets/botania/blockstates/hyacidus.json +++ b/src/main/resources/assets/botania/blockstates/hyacidus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/hyacidus" } diff --git a/src/main/resources/assets/botania/blockstates/hydroangeas.json b/src/main/resources/assets/botania/blockstates/hydroangeas.json index 1d0db7d65..a1d968249 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeas.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeas.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/hydroangeas" } diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json index 7667397dc..61cd3b7d5 100644 --- a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json +++ b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/hydroangeasDecor" } diff --git a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json index 626df23f9..492f3120d 100644 --- a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json +++ b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/jadedAmaranthus" } diff --git a/src/main/resources/assets/botania/blockstates/jiyuulia.json b/src/main/resources/assets/botania/blockstates/jiyuulia.json index 4297c619d..84286f930 100644 --- a/src/main/resources/assets/botania/blockstates/jiyuulia.json +++ b/src/main/resources/assets/botania/blockstates/jiyuulia.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/jiyuulia" } diff --git a/src/main/resources/assets/botania/blockstates/kekimurus.json b/src/main/resources/assets/botania/blockstates/kekimurus.json index 4f6f415a4..0946b31b4 100644 --- a/src/main/resources/assets/botania/blockstates/kekimurus.json +++ b/src/main/resources/assets/botania/blockstates/kekimurus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/kekimurus" } diff --git a/src/main/resources/assets/botania/blockstates/loonium.json b/src/main/resources/assets/botania/blockstates/loonium.json index 35255a6e0..7f1c475ca 100644 --- a/src/main/resources/assets/botania/blockstates/loonium.json +++ b/src/main/resources/assets/botania/blockstates/loonium.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/loonium" } diff --git a/src/main/resources/assets/botania/blockstates/manastar.json b/src/main/resources/assets/botania/blockstates/manastar.json index 316de14f6..231686329 100644 --- a/src/main/resources/assets/botania/blockstates/manastar.json +++ b/src/main/resources/assets/botania/blockstates/manastar.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/manastar" } diff --git a/src/main/resources/assets/botania/blockstates/marimorphosis.json b/src/main/resources/assets/botania/blockstates/marimorphosis.json index 9b8864318..dd45b4746 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosis.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosis.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/marimorphosis" } diff --git a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json index 54ce24860..b8b180b56 100644 --- a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json +++ b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/marimorphosisChibi" } diff --git a/src/main/resources/assets/botania/blockstates/medumone.json b/src/main/resources/assets/botania/blockstates/medumone.json index 8120698cd..1de43a6d4 100644 --- a/src/main/resources/assets/botania/blockstates/medumone.json +++ b/src/main/resources/assets/botania/blockstates/medumone.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/medumone" } diff --git a/src/main/resources/assets/botania/blockstates/munchdew.json b/src/main/resources/assets/botania/blockstates/munchdew.json index 8d9d7a3a7..a17b88c1e 100644 --- a/src/main/resources/assets/botania/blockstates/munchdew.json +++ b/src/main/resources/assets/botania/blockstates/munchdew.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/munchdew" } diff --git a/src/main/resources/assets/botania/blockstates/narslimmus.json b/src/main/resources/assets/botania/blockstates/narslimmus.json index 143dab445..a3b0f9be9 100644 --- a/src/main/resources/assets/botania/blockstates/narslimmus.json +++ b/src/main/resources/assets/botania/blockstates/narslimmus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/narslimmus" } diff --git a/src/main/resources/assets/botania/blockstates/nightshade.json b/src/main/resources/assets/botania/blockstates/nightshade.json index 868ea45b8..0b2df4378 100644 --- a/src/main/resources/assets/botania/blockstates/nightshade.json +++ b/src/main/resources/assets/botania/blockstates/nightshade.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/nightshade" } diff --git a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json index 6da17dd9f..b4dafe2d2 100644 --- a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json +++ b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/nightshadeDecor" } diff --git a/src/main/resources/assets/botania/blockstates/nightshadePrime.json b/src/main/resources/assets/botania/blockstates/nightshadePrime.json index 22ce1d835..9b4f450be 100644 --- a/src/main/resources/assets/botania/blockstates/nightshadePrime.json +++ b/src/main/resources/assets/botania/blockstates/nightshadePrime.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/nightshadePrime" } diff --git a/src/main/resources/assets/botania/blockstates/orechid.json b/src/main/resources/assets/botania/blockstates/orechid.json index b9ed976ae..2d545ab0b 100644 --- a/src/main/resources/assets/botania/blockstates/orechid.json +++ b/src/main/resources/assets/botania/blockstates/orechid.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/orechid" } diff --git a/src/main/resources/assets/botania/blockstates/orechidIgnem.json b/src/main/resources/assets/botania/blockstates/orechidIgnem.json index 273b5e669..240726792 100644 --- a/src/main/resources/assets/botania/blockstates/orechidIgnem.json +++ b/src/main/resources/assets/botania/blockstates/orechidIgnem.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/orechidIgnem" } diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json index 4e6278648..ec1198c64 100644 --- a/src/main/resources/assets/botania/blockstates/petalBlock.json +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -1,15 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:cube_all_tinted", - "textures": { - "all": "botania:blocks/petalBlock" - } - }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": { + "model": "botania:petal_block" + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pollidisiac.json b/src/main/resources/assets/botania/blockstates/pollidisiac.json index b53aebd9b..0330d0445 100644 --- a/src/main/resources/assets/botania/blockstates/pollidisiac.json +++ b/src/main/resources/assets/botania/blockstates/pollidisiac.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/pollidisiac" } diff --git a/src/main/resources/assets/botania/blockstates/puredaisy.json b/src/main/resources/assets/botania/blockstates/puredaisy.json index 1ea981ff1..f2ee23af9 100644 --- a/src/main/resources/assets/botania/blockstates/puredaisy.json +++ b/src/main/resources/assets/botania/blockstates/puredaisy.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/puredaisy" } diff --git a/src/main/resources/assets/botania/blockstates/rafflowsia.json b/src/main/resources/assets/botania/blockstates/rafflowsia.json index e263bb769..601c180d5 100644 --- a/src/main/resources/assets/botania/blockstates/rafflowsia.json +++ b/src/main/resources/assets/botania/blockstates/rafflowsia.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/rafflowsia" } diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpus.json b/src/main/resources/assets/botania/blockstates/rannuncarpus.json index 4acadf424..02998a79d 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpus.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/rannuncarpus" } diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json index 8e385fd1d..6fa8e1649 100644 --- a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json +++ b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/rannuncarpusChibi" } diff --git a/src/main/resources/assets/botania/blockstates/solegnolia.json b/src/main/resources/assets/botania/blockstates/solegnolia.json index a5173a435..53dee6310 100644 --- a/src/main/resources/assets/botania/blockstates/solegnolia.json +++ b/src/main/resources/assets/botania/blockstates/solegnolia.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/solegnolia" } diff --git a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json index 71f1173eb..1f1ff497d 100644 --- a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json +++ b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/solegnoliaChibi" } diff --git a/src/main/resources/assets/botania/blockstates/sparkChanger.json b/src/main/resources/assets/botania/blockstates/sparkChanger.json index e148127b5..3e3682625 100644 --- a/src/main/resources/assets/botania/blockstates/sparkChanger.json +++ b/src/main/resources/assets/botania/blockstates/sparkChanger.json @@ -1,19 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:threehigh", - "textures": { - "bottom": "botania:blocks/sparkChanger0", - "top": "botania:blocks/sparkChanger1", - "side": "botania:blocks/sparkChanger2" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - }, - "inventory": [{}] + "powered=true": { "model": "botania:spark_tinkerer" }, + "powered=false": { "model": "botania:spark_tinkerer" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spectranthemum.json b/src/main/resources/assets/botania/blockstates/spectranthemum.json index a9885c596..7d5752c71 100644 --- a/src/main/resources/assets/botania/blockstates/spectranthemum.json +++ b/src/main/resources/assets/botania/blockstates/spectranthemum.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/spectranthemum" } diff --git a/src/main/resources/assets/botania/blockstates/spectrolus.json b/src/main/resources/assets/botania/blockstates/spectrolus.json index 9c5a5fcda..8cc462bb8 100644 --- a/src/main/resources/assets/botania/blockstates/spectrolus.json +++ b/src/main/resources/assets/botania/blockstates/spectrolus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/spectrolus" } diff --git a/src/main/resources/assets/botania/blockstates/tangleberrie.json b/src/main/resources/assets/botania/blockstates/tangleberrie.json index 77695bb45..7c3368d28 100644 --- a/src/main/resources/assets/botania/blockstates/tangleberrie.json +++ b/src/main/resources/assets/botania/blockstates/tangleberrie.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/tangleberrie" } diff --git a/src/main/resources/assets/botania/blockstates/terraPlate.json b/src/main/resources/assets/botania/blockstates/terraPlate.json index 35e443a5d..3f3da5b1c 100644 --- a/src/main/resources/assets/botania/blockstates/terraPlate.json +++ b/src/main/resources/assets/botania/blockstates/terraPlate.json @@ -1,16 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:threehigh", - "textures": { - "bottom": "botania:blocks/terraPlate0", - "top": "botania:blocks/terraPlate1", - "side": "botania:blocks/terraPlate2" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:terra_plate" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thermalily.json b/src/main/resources/assets/botania/blockstates/thermalily.json index 760e52e70..2c1dcc3d0 100644 --- a/src/main/resources/assets/botania/blockstates/thermalily.json +++ b/src/main/resources/assets/botania/blockstates/thermalily.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/thermalily" } diff --git a/src/main/resources/assets/botania/blockstates/tigerseye.json b/src/main/resources/assets/botania/blockstates/tigerseye.json index 8977cfe1c..c6994913c 100644 --- a/src/main/resources/assets/botania/blockstates/tigerseye.json +++ b/src/main/resources/assets/botania/blockstates/tigerseye.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/tigerseye" } diff --git a/src/main/resources/assets/botania/blockstates/vinculotus.json b/src/main/resources/assets/botania/blockstates/vinculotus.json index dbdf9c15b..39faf2bd5 100644 --- a/src/main/resources/assets/botania/blockstates/vinculotus.json +++ b/src/main/resources/assets/botania/blockstates/vinculotus.json @@ -2,7 +2,7 @@ "forge_marker": 1, "variants": { "normal": [{ - "model": "botania:cross_tinted", + "model": "botania:shapes/cross_tinted", "textures": { "cross": "botania:blocks/vinculotus" } diff --git a/src/main/resources/assets/botania/models/block/default_apothecary.json b/src/main/resources/assets/botania/models/block/default_apothecary.json new file mode 100644 index 000000000..827f9cf07 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/default_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/default/gobletBase_sides", + "gobletbasetop": "botania:model/altar/default/gobletBase_top", + "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/default/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/default/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/default/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/default/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/default/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/default/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/default/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/default/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom", + "kelkwall": "botania:model/altar/default/kelkWall", + "particle": "minecraft:blocks/cobblestone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_apothecary.json b/src/main/resources/assets/botania/models/block/desert_apothecary.json new file mode 100644 index 000000000..64158af35 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/desert/gobletBase_sides", + "gobletbasetop": "botania:model/altar/desert/gobletBase_top", + "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/desert/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/desert/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/desert/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/desert/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/desert/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom", + "kelkwall": "botania:model/altar/desert/kelkWall", + "particle": "botania:blocks/biomeStone5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_apothecary.json b/src/main/resources/assets/botania/models/block/forest_apothecary.json new file mode 100644 index 000000000..a9fe8da9f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/forest/gobletBase_sides", + "gobletbasetop": "botania:model/altar/forest/gobletBase_top", + "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/forest/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/forest/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/forest/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/forest/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/forest/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom", + "kelkwall": "botania:model/altar/forest/kelkWall", + "particle": "botania:blocks/biomeStone0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_apothecary.json b/src/main/resources/assets/botania/models/block/fungal_apothecary.json new file mode 100644 index 000000000..f96590633 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides", + "gobletbasetop": "botania:model/altar/fungal/gobletBase_top", + "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/fungal/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom", + "kelkwall": "botania:model/altar/fungal/kelkWall", + "particle": "botania:blocks/biomeStone3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_apothecary.json b/src/main/resources/assets/botania/models/block/mesa_apothecary.json new file mode 100644 index 000000000..70b8e6265 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mesa/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mesa/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mesa/kelkWall", + "particle": "botania:blocks/biomeStone7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mossy_apothecary.json b/src/main/resources/assets/botania/models/block/mossy_apothecary.json new file mode 100644 index 000000000..aec443fe5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mossy_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mossy/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mossy/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mossy/kelkWall", + "particle": "minecraft:blocks/cobblestone_mossy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_apothecary.json b/src/main/resources/assets/botania/models/block/mountain_apothecary.json new file mode 100644 index 000000000..c97c84b44 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides", + "gobletbasetop": "botania:model/altar/mountain/gobletBase_top", + "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/mountain/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom", + "kelkwall": "botania:model/altar/mountain/kelkWall", + "particle": "botania:blocks/biomeStone2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/petalApothecary.json b/src/main/resources/assets/botania/models/block/petalApothecary.json deleted file mode 100644 index 0d731159b..000000000 --- a/src/main/resources/assets/botania/models/block/petalApothecary.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "textures": { - "particle": "#all" - }, - "elements": [ - { - "name": "Base 1", - "from": [ 0, 0, 0 ], - "to": [ 16, 1, 0 ], - "faces": { - "down": { "texture": "#all", "uv": [ 16, 0, 31, 15 ], "cullface": "down" }, - "up": { "texture": "#all", "uv": [ 32, 0, 47, 15 ] }, - "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, - "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, - "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, - "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] } - } - }, - { - "name": "Base 2" - }, - { - "name": "Base 3" - }, - { - "name": "Column" - }, - { - "name": "Cup Base 1" - }, - { - "name": "Cup Base 2" - }, - { - "name": "Cup North" - }, - { - "name": "Cup South" - }, - { - "name": "Cup West" - }, - { - "name": "Cup East" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/petal_block.json b/src/main/resources/assets/botania/models/block/petal_block.json new file mode 100644 index 000000000..6f010e3f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/petal_block.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cube_all_tinted", + "textures": { + "all": "botania:blocks/petalBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_apothecary.json b/src/main/resources/assets/botania/models/block/plains_apothecary.json new file mode 100644 index 000000000..6db37a5e9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/plains/gobletBase_sides", + "gobletbasetop": "botania:model/altar/plains/gobletBase_top", + "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/plains/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/plains/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/plains/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/plains/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/plains/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom", + "kelkwall": "botania:model/altar/plains/kelkWall", + "particle": "botania:blocks/biomeStone1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cross_tinted.json b/src/main/resources/assets/botania/models/block/shapes/cross_tinted.json similarity index 100% rename from src/main/resources/assets/botania/models/block/cross_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/cross_tinted.json diff --git a/src/main/resources/assets/botania/models/block/cube_all_tinted.json b/src/main/resources/assets/botania/models/block/shapes/cube_all_tinted.json similarity index 94% rename from src/main/resources/assets/botania/models/block/cube_all_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/cube_all_tinted.json index bde99787b..2f3cc5a33 100644 --- a/src/main/resources/assets/botania/models/block/cube_all_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/cube_all_tinted.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json similarity index 98% rename from src/main/resources/assets/botania/models/block/altar.json rename to src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json index 180c4d4c5..debf7a786 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json @@ -1,4 +1,5 @@ { + "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!", "parent": "minecraft:block/block", "display": { "gui": { diff --git a/src/main/resources/assets/botania/models/block/threehigh.json b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json similarity index 94% rename from src/main/resources/assets/botania/models/block/threehigh.json rename to src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json index b462b3ccb..20f9257d0 100644 --- a/src/main/resources/assets/botania/models/block/threehigh.json +++ b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#side" }, diff --git a/src/main/resources/assets/botania/models/block/spark_tinkerer.json b/src/main/resources/assets/botania/models/block/spark_tinkerer.json new file mode 100644 index 000000000..3466d1c1d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spark_tinkerer.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:blocks/sparkChanger0", + "top": "botania:blocks/sparkChanger1", + "side": "botania:blocks/sparkChanger2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_apothecary.json b/src/main/resources/assets/botania/models/block/swamp_apothecary.json new file mode 100644 index 000000000..17a0846eb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides", + "gobletbasetop": "botania:model/altar/swamp/gobletBase_top", + "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/swamp/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom", + "kelkwall": "botania:model/altar/swamp/kelkWall", + "particle": "botania:blocks/biomeStone4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_apothecary.json b/src/main/resources/assets/botania/models/block/taiga_apothecary.json new file mode 100644 index 000000000..cca3fe4af --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_apothecary.json @@ -0,0 +1,23 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides", + "gobletbasetop": "botania:model/altar/taiga/gobletBase_top", + "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom", + "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides", + "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top", + "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom", + "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides", + "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top", + "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom", + "gobletstandside": "botania:model/altar/taiga/gobletStand_sides", + "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom", + "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides", + "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom", + "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides", + "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top", + "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom", + "kelkwall": "botania:model/altar/taiga/kelkWall", + "particle": "botania:blocks/biomeStone6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terra_plate.json b/src/main/resources/assets/botania/models/block/terra_plate.json new file mode 100644 index 000000000..22f023eff --- /dev/null +++ b/src/main/resources/assets/botania/models/block/terra_plate.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/three_high_bottom_top", + "textures": { + "bottom": "botania:blocks/terraPlate0", + "top": "botania:blocks/terraPlate1", + "side": "botania:blocks/terraPlate2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json deleted file mode 100644 index f22935748..000000000 --- a/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "__comment": "Copy of minecraft:wall_inventory with separate bottom and top textures", - "parent": "block/block", - "display": { - "gui": { - "rotation": [ 30, 135, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "fixed": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - }, - "ambientocclusion": false, - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 4, 0, 4 ], - "to": [ 12, 16, 12 ], - "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } - } - }, - { - "from": [ 5, 0, 0 ], - "to": [ 11, 13, 16 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 16 ], "texture": "#top" }, - "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" }, - "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json deleted file mode 100644 index c90838654..000000000 --- a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "__comment": "Copy of minecraft:wall_post with separate top and bottom textures", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 4, 0, 4 ], - "to": [ 12, 16, 12 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down" }, - "up": { "texture": "#top", "cullface": "up" }, - "north": { "texture": "#side" }, - "south": { "texture": "#side" }, - "west": { "texture": "#side" }, - "east": { "texture": "#side" } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json deleted file mode 100644 index 80594c7c0..000000000 --- a/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "__comment": "Copy of minecraft:wall_side with separate top and bottom textures", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 5, 0, 0 ], - "to": [ 11, 14, 8 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down" }, - "up": { "texture": "#top" }, - "north": { "texture": "#side", "cullface": "north" }, - "west": { "texture": "#side" }, - "east": { "texture": "#side" } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json new file mode 100644 index 000000000..4df782b0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/default_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json new file mode 100644 index 000000000..bffef4406 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/desert_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json new file mode 100644 index 000000000..3cd855b1a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/forest_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json new file mode 100644 index 000000000..3245bebc2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/fungal_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json new file mode 100644 index 000000000..5020f058b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mesa_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json new file mode 100644 index 000000000..c5a551203 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/mountain_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/petal_block.json b/src/main/resources/assets/botania/models/item/itemblock/petal_block.json new file mode 100644 index 000000000..f8bb788c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/petal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/petal_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json new file mode 100644 index 000000000..715eab38c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/plains_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json b/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json new file mode 100644 index 000000000..d419af93d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/spark_tinkerer" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json new file mode 100644 index 000000000..8d0aa8c27 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/swamp_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json new file mode 100644 index 000000000..efa64b8a9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/taiga_apothecary" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json b/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json new file mode 100644 index 000000000..dd6a18f0a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/terra_plate" +} \ No newline at end of file From 01a913c96cedb28321ca3a25b409fce68721d031 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 17:49:00 -0500 Subject: [PATCH 807/935] More model cleanup --- .../client/core/handler/ModelHandler.java | 4 ++-- .../assets/botania/blockstates/forestDrum.json | 13 +++---------- .../botania/blockstates/lightLauncher.json | 17 ++--------------- .../assets/botania/blockstates/starfield.json | 17 ++--------------- .../botania/models/block/drum_canopy.json | 7 +++++++ .../botania/models/block/drum_gathering.json | 7 +++++++ .../assets/botania/models/block/drum_wild.json | 7 +++++++ .../models/block/luminizer_launcher.json | 8 ++++++++ .../botania/models/block/{ => shapes}/drum.json | 1 + .../four_high_bottom_top.json} | 1 + .../botania/models/block/starfield_creator.json | 8 ++++++++ .../models/item/itemblock/drum_canopy.json | 3 +++ .../models/item/itemblock/drum_gathering.json | 3 +++ .../models/item/itemblock/drum_wild.json | 3 +++ .../item/itemblock/luminizer_launcher.json | 3 +++ .../item/itemblock/starfield_creator.json | 3 +++ 16 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/block/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/block/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/block/luminizer_launcher.json rename src/main/resources/assets/botania/models/block/{ => shapes}/drum.json (93%) rename src/main/resources/assets/botania/models/block/{fourhigh.json => shapes/four_high_bottom_top.json} (94%) create mode 100644 src/main/resources/assets/botania/models/block/starfield_creator.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_wild.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json 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 3513d18f9..90392f52b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -304,7 +304,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.forestEye); registerItemModel(ModBlocks.ghostRail); registerItemModel(ModBlocks.incensePlate); - registerItemModel(ModBlocks.lightLauncher); + registerBlock(ModBlocks.lightLauncher, "luminizer_launcher"); registerItemModel(ModBlocks.manaBomb); registerItemModel(ModBlocks.manaDetector); registerItemModel(ModBlocks.manaGlass); @@ -326,7 +326,7 @@ public final class ModelHandler { registerBlock(ModBlocks.sparkChanger, "spark_tinkerer"); registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); registerItemModel(ModBlocks.specialFlower); - registerItemModel(ModBlocks.starfield); + registerBlock(ModBlocks.starfield, "starfield_creator"); registerBlock(ModBlocks.terraPlate, "terra_plate"); registerItemModel(ModBlocks.tinyPlanet); registerItemModel(ModBlocks.tinyPotato); diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestDrum.json index 41c22e65e..a7f73aba4 100644 --- a/src/main/resources/assets/botania/blockstates/forestDrum.json +++ b/src/main/resources/assets/botania/blockstates/forestDrum.json @@ -1,14 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:drum", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "wild": { "textures": { "top": "botania:blocks/forestDrum0", "side": "botania:blocks/forestDrum1" } }, - "gathering": { "textures": { "top": "botania:blocks/forestDrum2", "side": "botania:blocks/forestDrum3" } }, - "canopy": { "textures": { "top": "botania:blocks/forestDrum4", "side": "botania:blocks/forestDrum5" } } - } + "variant=wild": { "model": "botania:drum_wild" }, + "variant=gathering": { "model": "botania:drum_gathering" }, + "variant=canopy": { "model": "botania:drum_canopy" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightLauncher.json b/src/main/resources/assets/botania/blockstates/lightLauncher.json index 96cde7753..bd135fbef 100644 --- a/src/main/resources/assets/botania/blockstates/lightLauncher.json +++ b/src/main/resources/assets/botania/blockstates/lightLauncher.json @@ -1,19 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/lightLauncher", - "top": "botania:blocks/lightLauncher", - "side": "botania:blocks/lightLauncher" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - }, - "inventory": [{}] + "powered=true": { "model": "botania:luminizer_launcher" }, + "powered=false": { "model": "botania:luminizer_launcher" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/starfield.json b/src/main/resources/assets/botania/blockstates/starfield.json index ffec0652f..998b2c14e 100644 --- a/src/main/resources/assets/botania/blockstates/starfield.json +++ b/src/main/resources/assets/botania/blockstates/starfield.json @@ -1,19 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:fourhigh", - "textures": { - "bottom": "botania:blocks/starfield0", - "top": "botania:blocks/starfield1", - "side": "botania:blocks/starfield2" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - }, - "inventory": [{}] + "powered=true": { "model": "botania:starfield_creator" }, + "powered=false": { "model": "botania:starfield_creator" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json new file mode 100644 index 000000000..24d215ac8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum4", + "side": "botania:blocks/forestDrum5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json new file mode 100644 index 000000000..59c45b760 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum2", + "side": "botania:blocks/forestDrum3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json new file mode 100644 index 000000000..14f676eb8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/drum", + "textures": { + "top": "botania:blocks/forestDrum0", + "side": "botania:blocks/forestDrum1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/luminizer_launcher.json b/src/main/resources/assets/botania/models/block/luminizer_launcher.json new file mode 100644 index 000000000..9d87e408b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/luminizer_launcher.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/four_high_bottom_top", + "textures": { + "bottom": "botania:blocks/lightLauncher", + "top": "botania:blocks/lightLauncher", + "side": "botania:blocks/lightLauncher" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum.json b/src/main/resources/assets/botania/models/block/shapes/drum.json similarity index 93% rename from src/main/resources/assets/botania/models/block/drum.json rename to src/main/resources/assets/botania/models/block/shapes/drum.json index f7c0d0dae..7968b80e7 100644 --- a/src/main/resources/assets/botania/models/block/drum.json +++ b/src/main/resources/assets/botania/models/block/shapes/drum.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#side" }, diff --git a/src/main/resources/assets/botania/models/block/fourhigh.json b/src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json similarity index 94% rename from src/main/resources/assets/botania/models/block/fourhigh.json rename to src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json index 3e9cc996a..8344c3415 100644 --- a/src/main/resources/assets/botania/models/block/fourhigh.json +++ b/src/main/resources/assets/botania/models/block/shapes/four_high_bottom_top.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#side" }, diff --git a/src/main/resources/assets/botania/models/block/starfield_creator.json b/src/main/resources/assets/botania/models/block/starfield_creator.json new file mode 100644 index 000000000..f2e797e20 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/starfield_creator.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/four_high_bottom_top", + "textures": { + "bottom": "botania:blocks/starfield0", + "top": "botania:blocks/starfield1", + "side": "botania:blocks/starfield2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json new file mode 100644 index 000000000..58385e894 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_canopy" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json new file mode 100644 index 000000000..b18a74edb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_gathering" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json new file mode 100644 index 000000000..3ec534da6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/drum_wild" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json new file mode 100644 index 000000000..fc2612afc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/luminizer_launcher" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json new file mode 100644 index 000000000..64ac9b949 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/starfield_creator" +} \ No newline at end of file From 7ef27df0bce78728510c368608cb5835903b3c70 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 19:29:36 -0500 Subject: [PATCH 808/935] Cleanup the cleanup --- .../client/core/handler/ModelHandler.java | 271 ++++++++++-------- .../assets/botania/blockstates/dirtPath.json | 11 +- .../botania/blockstates/dirtPath0Slab.json | 6 +- .../blockstates/dirtPath0SlabFull.json | 2 +- .../assets/botania/blockstates/forestEye.json | 16 +- .../botania/blockstates/manaBeacon.json | 12 +- .../botania/blockstates/tinyPlanetBlock.json | 11 +- .../botania/blockstates/unstableBlock.json | 11 +- .../botania/models/block/eye_of_ancients.json | 11 + .../models/block/miniblock_all_tinted.json | 20 -- .../eightbyeight.json} | 1 + .../eightbyeight_all_tinted.json} | 1 + .../fifteen_high_all.json} | 1 + .../tenbyten_all.json} | 1 + .../tenbyten_top_tinted.json} | 1 + .../models/block/tiny_planet_block.json | 6 + .../botania/models/block/trodden_dirt.json | 6 + .../botania/models/block/unstable_beacon.json | 7 + .../botania/models/block/unstable_cube.json | 6 + .../item/itemblock/default_apothecary.json | 3 - .../item/itemblock/desert_apothecary.json | 3 - .../models/item/itemblock/drum_canopy.json | 3 - .../models/item/itemblock/drum_gathering.json | 3 - .../models/item/itemblock/drum_wild.json | 3 - .../item/itemblock/forest_apothecary.json | 3 - .../item/itemblock/fungal_apothecary.json | 3 - .../models/item/itemblock/life_imbuer.json | 3 - .../item/itemblock/luminizer_launcher.json | 3 - .../item/itemblock/mesa_apothecary.json | 3 - .../item/itemblock/mountain_apothecary.json | 3 - .../models/item/itemblock/petal_block.json | 3 - .../item/itemblock/plains_apothecary.json | 3 - .../models/item/itemblock/runic_altar.json | 3 - .../models/item/itemblock/spark_tinkerer.json | 3 - .../item/itemblock/starfield_creator.json | 3 - .../item/itemblock/swamp_apothecary.json | 3 - .../item/itemblock/taiga_apothecary.json | 3 - .../models/item/itemblock/terra_plate.json | 3 - 38 files changed, 194 insertions(+), 264 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/eye_of_ancients.json delete mode 100644 src/main/resources/assets/botania/models/block/miniblock_all_tinted.json rename src/main/resources/assets/botania/models/block/{microblock.json => shapes/eightbyeight.json} (93%) rename src/main/resources/assets/botania/models/block/{microblock_all_tinted.json => shapes/eightbyeight_all_tinted.json} (94%) rename src/main/resources/assets/botania/models/block/{minusone_all.json => shapes/fifteen_high_all.json} (94%) rename src/main/resources/assets/botania/models/block/{miniblock_all.json => shapes/tenbyten_all.json} (93%) rename src/main/resources/assets/botania/models/block/{miniblock_top_tinted.json => shapes/tenbyten_top_tinted.json} (94%) create mode 100644 src/main/resources/assets/botania/models/block/tiny_planet_block.json create mode 100644 src/main/resources/assets/botania/models/block/trodden_dirt.json create mode 100644 src/main/resources/assets/botania/models/block/unstable_beacon.json create mode 100644 src/main/resources/assets/botania/models/block/unstable_cube.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/drum_wild.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/petal_block.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/runic_altar.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/item/itemblock/terra_plate.json 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 90392f52b..6bc8e1663 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -140,7 +140,6 @@ public final class ModelHandler { registerWalls(); registerPanes(); registerQuartzBlocks(); - registerLuminizers(); /** Normal Items **/ registerStandardItems(); @@ -279,75 +278,75 @@ public final class ModelHandler { } private static void registerStandardBlocks() { - registerItemModel(ModBlocks.alchemyCatalyst); - registerItemModel(ModBlocks.alfPortal); - // Off by one on purpose to exclude MOSSY - registerBlockAllMetaNames(ModBlocks.altar, AltarVariant.values().length - 1, i -> AltarVariant.values()[i].getName() + "_apothecary"); - registerItemModel(ModBlocks.bifrost); - registerItemModel(ModBlocks.bifrostPerm); - registerItemModel(ModBlocks.blazeBlock); - registerItemModel(ModBlocks.cacophonium); - registerItemModel(ModBlocks.cellBlock); - registerItemModel(ModBlocks.conjurationCatalyst); - registerItemModel(ModBlocks.cocoon); - registerItemModel(ModBlocks.corporeaFunnel); - registerItemModel(ModBlocks.corporeaInterceptor); - registerItemModel(ModBlocks.corporeaRetainer); - registerItemModel(ModBlocks.dirtPath); - registerItemModel(ModBlocks.distributor); - registerItemModel(ModBlocks.elfGlass); - registerItemModel(ModBlocks.enchantedSoil); - registerItemModel(ModBlocks.enchanter); - registerItemModel(ModBlocks.enderEye); - registerItemModel(ModBlocks.felPumpkin); - registerItemModel(ModBlocks.floatingSpecialFlower); - registerItemModel(ModBlocks.forestEye); - registerItemModel(ModBlocks.ghostRail); - registerItemModel(ModBlocks.incensePlate); - registerBlock(ModBlocks.lightLauncher, "luminizer_launcher"); - registerItemModel(ModBlocks.manaBomb); - registerItemModel(ModBlocks.manaDetector); - registerItemModel(ModBlocks.manaGlass); - registerItemModel(ModBlocks.manaVoid); - registerItemModel(ModBlocks.prism); - registerItemModel(ModBlocks.pistonRelay); - registerItemModel(ModBlocks.pump); - registerItemModel(ModBlocks.redStringComparator); - registerItemModel(ModBlocks.redStringContainer); - registerItemModel(ModBlocks.redStringDispenser); - registerItemModel(ModBlocks.redStringFertilizer); - registerItemModel(ModBlocks.redStringInterceptor); - registerItemModel(ModBlocks.redStringRelay); - registerItemModel(ModBlocks.rfGenerator); - registerItemModel(ModBlocks.root); - registerBlock(ModBlocks.runeAltar, "runic_altar"); - registerItemModel(ModBlocks.shimmerrock); - registerItemModel(ModBlocks.shimmerwoodPlanks); - registerBlock(ModBlocks.sparkChanger, "spark_tinkerer"); - registerBlock(ModBlocks.spawnerClaw, "life_imbuer"); - registerItemModel(ModBlocks.specialFlower); - registerBlock(ModBlocks.starfield, "starfield_creator"); - registerBlock(ModBlocks.terraPlate, "terra_plate"); - registerItemModel(ModBlocks.tinyPlanet); - registerItemModel(ModBlocks.tinyPotato); - registerItemModel(ModBlocks.turntable); + registerBlockStandardPath(ModBlocks.alchemyCatalyst); + registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockStandardPath(ModBlocks.bifrost); + registerBlockStandardPath(ModBlocks.bifrostPerm); + registerBlockStandardPath(ModBlocks.blazeBlock); + registerBlockStandardPath(ModBlocks.cacophonium); + registerBlockStandardPath(ModBlocks.cellBlock); + registerBlockStandardPath(ModBlocks.conjurationCatalyst); + registerBlockStandardPath(ModBlocks.cocoon); + registerBlockStandardPath(ModBlocks.corporeaFunnel); + registerBlockStandardPath(ModBlocks.corporeaInterceptor); + registerBlockStandardPath(ModBlocks.corporeaRetainer); + registerBlockVariant(ModBlocks.dirtPath); + registerBlockStandardPath(ModBlocks.distributor); + registerBlockStandardPath(ModBlocks.elfGlass); + registerBlockStandardPath(ModBlocks.enchantedSoil); + registerBlockStandardPath(ModBlocks.enchanter); + registerBlockStandardPath(ModBlocks.enderEye); + registerBlockStandardPath(ModBlocks.felPumpkin); + registerBlockStandardPath(ModBlocks.floatingSpecialFlower); + registerBlockVariant(ModBlocks.forestEye); + registerBlockStandardPath(ModBlocks.ghostRail); + registerBlockStandardPath(ModBlocks.incensePlate); + registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); + registerBlockStandardPath(ModBlocks.manaBomb); + registerBlockStandardPath(ModBlocks.manaDetector); + registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockStandardPath(ModBlocks.manaVoid); + registerBlockStandardPath(ModBlocks.prism); + registerBlockStandardPath(ModBlocks.pistonRelay); + registerBlockStandardPath(ModBlocks.pump); + registerBlockStandardPath(ModBlocks.redStringComparator); + registerBlockStandardPath(ModBlocks.redStringContainer); + registerBlockStandardPath(ModBlocks.redStringDispenser); + registerBlockStandardPath(ModBlocks.redStringFertilizer); + registerBlockStandardPath(ModBlocks.redStringInterceptor); + registerBlockStandardPath(ModBlocks.redStringRelay); + registerBlockStandardPath(ModBlocks.rfGenerator); + registerBlockStandardPath(ModBlocks.root); + registerBlockVariant(ModBlocks.runeAltar); + registerBlockStandardPath(ModBlocks.shimmerrock); + registerBlockStandardPath(ModBlocks.shimmerwoodPlanks); + registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); + registerBlockVariant(ModBlocks.spawnerClaw); + registerBlockStandardPath(ModBlocks.specialFlower); + registerBlockVariant(ModBlocks.starfield, "powered=false"); + registerBlockVariant(ModBlocks.terraPlate); + registerBlockVariant(ModBlocks.tinyPlanet); + registerBlockStandardPath(ModBlocks.tinyPotato); + registerBlockStandardPath(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); // Item models which all use the same base model and recolored by render layer - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length); - registerBlockAllMeta(ModBlocks.petalBlock, EnumDyeColor.values().length, "petal_block"); - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); + registerBlockVariantMetas(ModBlocks.manaBeacon, EnumDyeColor.values().length, "normal"); + registerBlockVariantMetas(ModBlocks.petalBlock, EnumDyeColor.values().length, "normal"); + registerBlockVariantMetas(ModBlocks.unstableBlock, EnumDyeColor.values().length, "normal"); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.altar, AltarVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.lightRelay, LuminizerVariant.class, "powered=false,variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); @@ -516,28 +515,28 @@ public final class ModelHandler { // Only for models that absolutely can't be converted to JSON. Use VERY sparingly @SuppressWarnings("deprecation") private static void registerTESRItems() { - registerItemModel(ModBlocks.avatar); + registerBlockStandardPath(ModBlocks.avatar); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - registerItemModel(ModBlocks.bellows); + registerBlockStandardPath(ModBlocks.bellows); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); - registerItemModel(ModBlocks.brewery); + registerBlockStandardPath(ModBlocks.brewery); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - registerItemModel(ModBlocks.corporeaCrystalCube); + registerBlockStandardPath(ModBlocks.corporeaCrystalCube); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - registerItemModel(ModBlocks.corporeaIndex); + registerBlockStandardPath(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); registerItemModel(ModItems.gaiaHead); ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerItemModel(ModBlocks.hourglass); + registerBlockStandardPath(ModBlocks.hourglass); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - registerItemModel(ModBlocks.teruTeruBozu); + registerBlockStandardPath(ModBlocks.teruTeruBozu); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } @@ -744,67 +743,67 @@ public final class ModelHandler { private static void registerStairs() { for (Block b : ModFluffBlocks.pavementStairs) { - registerItemModel(b); + registerBlockStandardPath(b); } for (Block b : ModFluffBlocks.biomeStoneStairs) { - registerItemModel(b); + registerBlockStandardPath(b); } - registerItemModel(ModFluffBlocks.blazeQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.blazeQuartzStairs); if (ConfigHandler.darkQuartzEnabled) - registerItemModel(ModFluffBlocks.darkQuartzStairs); - registerItemModel(ModFluffBlocks.dreamwoodStairs); - registerItemModel(ModFluffBlocks.dreamwoodPlankStairs); - registerItemModel(ModFluffBlocks.elfQuartzStairs); - registerItemModel(ModFluffBlocks.lavenderQuartzStairs); - registerItemModel(ModFluffBlocks.livingrockStairs); - registerItemModel(ModFluffBlocks.livingrockBrickStairs); - registerItemModel(ModFluffBlocks.livingwoodStairs); - registerItemModel(ModFluffBlocks.livingwoodPlankStairs); - registerItemModel(ModFluffBlocks.manaQuartzStairs); - registerItemModel(ModFluffBlocks.netherBrickStairs); - registerItemModel(ModFluffBlocks.redQuartzStairs); - registerItemModel(ModFluffBlocks.shimmerrockStairs); - registerItemModel(ModFluffBlocks.shimmerwoodPlankStairs); - registerItemModel(ModFluffBlocks.snowBrickStairs); - registerItemModel(ModFluffBlocks.soulBrickStairs); - registerItemModel(ModFluffBlocks.sunnyQuartzStairs); - registerItemModel(ModFluffBlocks.tileStairs); + registerBlockStandardPath(ModFluffBlocks.darkQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.dreamwoodStairs); + registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.elfQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.lavenderQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.livingrockStairs); + registerBlockStandardPath(ModFluffBlocks.livingrockBrickStairs); + registerBlockStandardPath(ModFluffBlocks.livingwoodStairs); + registerBlockStandardPath(ModFluffBlocks.livingwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.manaQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.netherBrickStairs); + registerBlockStandardPath(ModFluffBlocks.redQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.shimmerrockStairs); + registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankStairs); + registerBlockStandardPath(ModFluffBlocks.snowBrickStairs); + registerBlockStandardPath(ModFluffBlocks.soulBrickStairs); + registerBlockStandardPath(ModFluffBlocks.sunnyQuartzStairs); + registerBlockStandardPath(ModFluffBlocks.tileStairs); } private static void registerSlabs() { for (Block b : ModFluffBlocks.biomeStoneSlabs) { - registerItemModel(b); + registerBlockStandardPath(b); } for (Block b : ModFluffBlocks.pavementSlabs) { - registerItemModel(b); + registerBlockStandardPath(b); } - registerItemModel(ModFluffBlocks.livingwoodSlab); - registerItemModel(ModFluffBlocks.livingwoodPlankSlab); - registerItemModel(ModFluffBlocks.livingrockSlab); - registerItemModel(ModFluffBlocks.livingrockBrickSlab); + registerBlockStandardPath(ModFluffBlocks.livingwoodSlab); + registerBlockStandardPath(ModFluffBlocks.livingwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.livingrockSlab); + registerBlockStandardPath(ModFluffBlocks.livingrockBrickSlab); - registerItemModel(ModFluffBlocks.blazeQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.blazeQuartzSlab); if (ConfigHandler.darkQuartzEnabled) - registerItemModel(ModFluffBlocks.darkQuartzSlab); - registerItemModel(ModFluffBlocks.elfQuartzSlab); - registerItemModel(ModFluffBlocks.lavenderQuartzSlab); - registerItemModel(ModFluffBlocks.manaQuartzSlab); - registerItemModel(ModFluffBlocks.redQuartzSlab); - registerItemModel(ModFluffBlocks.sunnyQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.darkQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.elfQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.lavenderQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.manaQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.redQuartzSlab); + registerBlockStandardPath(ModFluffBlocks.sunnyQuartzSlab); - registerItemModel(ModFluffBlocks.dreamwoodSlab); - registerItemModel(ModFluffBlocks.dreamwoodPlankSlab); - registerItemModel(ModFluffBlocks.dirtPathSlab); - registerItemModel(ModFluffBlocks.shimmerrockSlab); - registerItemModel(ModFluffBlocks.shimmerwoodPlankSlab); - registerItemModel(ModFluffBlocks.netherBrickSlab); - registerItemModel(ModFluffBlocks.soulBrickSlab); - registerItemModel(ModFluffBlocks.snowBrickSlab); - registerItemModel(ModFluffBlocks.tileSlab); + registerBlockStandardPath(ModFluffBlocks.dreamwoodSlab); + registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.dirtPathSlab); + registerBlockStandardPath(ModFluffBlocks.shimmerrockSlab); + registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankSlab); + registerBlockStandardPath(ModFluffBlocks.netherBrickSlab); + registerBlockStandardPath(ModFluffBlocks.soulBrickSlab); + registerBlockStandardPath(ModFluffBlocks.snowBrickSlab); + registerBlockStandardPath(ModFluffBlocks.tileSlab); } private static void registerWalls() { @@ -813,15 +812,15 @@ public final class ModelHandler { ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + variant.getName() + "_wall", "inventory")); } - registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); - registerBlock(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlock(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); + registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); + registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); + registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); } private static void registerPanes() { - registerItemModel(ModFluffBlocks.alfglassPane); - registerItemModel(ModFluffBlocks.bifrostPane); - registerItemModel(ModFluffBlocks.managlassPane); + registerBlockStandardPath(ModFluffBlocks.alfglassPane); + registerBlockStandardPath(ModFluffBlocks.bifrostPane); + registerBlockStandardPath(ModFluffBlocks.managlassPane); } private static void registerQuartzBlocks() { @@ -836,14 +835,6 @@ public final class ModelHandler { } } - private static void registerLuminizers() { - Item item = Item.getItemFromBlock(ModBlocks.lightRelay); - 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())); - } - } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { @@ -876,28 +867,54 @@ public final class ModelHandler { } } - private static void registerBlock(Block b, String name) { - registerBlockAllMeta(b, 1, name); + + // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // + private static void registerBlockVariant(Block b) { + registerBlockVariant(b, "normal"); } - private static void registerBlockAllMeta(Block b, int maxExclusive, String name) { - registerBlockAllMetaNames(b, maxExclusive, i -> name); + private static void registerBlockVariant(Block b, String variant) { + registerBlockVariantMetas(b, 1, variant); } - private static void registerBlockAllMetaNames(Block b, int maxExclusive, IntFunction metaToName) { + private static void registerBlockVariantMetas(Block b, int maxExclusive, String variant) { + registerBlockVariantMetas(b, maxExclusive, i -> variant); + } + + private static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( item, i, - new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToName.apply(i), "inventory") + new ModelResourceLocation(item.getRegistryName(), metaToVariant.apply(i)) ); } } - private static void registerItemModel(Block b) { + // Registers the ItemBlock to models/item/#inventory + private static void registerBlockStandardPath(Block b) { registerItemModel(Item.getItemFromBlock(b)); } + // Registers the ItemBlock to a custom path in models/item/itemblock/ + private static void registerBlockCustomPath(Block b, String path) { + registerBlockCustomPathMetas(b, 1, path); + } + + private static void registerBlockCustomPathMetas(Block b, int maxExclusive, String path) { + registerBlockCustomPathMetas(b, maxExclusive, i -> path); + } + + private static void registerBlockCustomPathMetas(Block b, int maxExclusive, IntFunction metaToPath) { + Item item = Item.getItemFromBlock(b); + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToPath.apply(i), "inventory") + ); + } + } + private static void registerItemModel(Item i,int meta) { ResourceLocation loc = i.getRegistryName(); ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json index 46fdc670f..dba05d34f 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:minusone_all", - "textures": { - "all": "botania:blocks/dirtPath" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:trodden_dirt" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json index f052f297d..321fdc8e1 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/dirtPath", - "top": "botania:blocks/dirtPath", - "side": "botania:blocks/dirtPath" + "bottom": "minecraft:blocks/grass_path_top", + "top": "minecraft:blocks/grass_path_top", + "side": "minecraft:blocks/grass_path_top" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json index c5205f908..8c1f76359 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dirtPath" } + "textures": { "all": "minecraft:blocks/grass_path_top" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestEye.json b/src/main/resources/assets/botania/blockstates/forestEye.json index 882a5bbc2..8b96be9a7 100644 --- a/src/main/resources/assets/botania/blockstates/forestEye.json +++ b/src/main/resources/assets/botania/blockstates/forestEye.json @@ -1,19 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:microblock", - "textures": { - "bottom": "botania:blocks/forestEye0", - "top": "botania:blocks/forestEye1", - "north": "botania:blocks/forestEye2", - "south": "botania:blocks/forestEye3", - "west": "botania:blocks/forestEye4", - "east": "botania:blocks/forestEye5" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:eye_of_ancients" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json index 646dcd2dc..09ef83a89 100644 --- a/src/main/resources/assets/botania/blockstates/manaBeacon.json +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:miniblock_top_tinted", - "textures": { - "all": "botania:blocks/manaBeacon0", - "top": "botania:blocks/manaBeacon1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:unstable_beacon" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json index daec2757c..dc46fcfaf 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json +++ b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:miniblock_all", - "textures": { - "all": "botania:blocks/tinyPlanetBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:tiny_planet_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json index 23238ca79..5083a6d3c 100644 --- a/src/main/resources/assets/botania/blockstates/unstableBlock.json +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:microblock_all_tinted", - "textures": { - "all": "botania:blocks/unstableBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:unstable_cube" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/eye_of_ancients.json b/src/main/resources/assets/botania/models/block/eye_of_ancients.json new file mode 100644 index 000000000..57b92028c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/eye_of_ancients.json @@ -0,0 +1,11 @@ +{ + "parent": "botania:block/shapes/eightbyeight", + "textures": { + "bottom": "botania:blocks/forestEye0", + "top": "botania:blocks/forestEye1", + "north": "botania:blocks/forestEye2", + "south": "botania:blocks/forestEye3", + "west": "botania:blocks/forestEye4", + "east": "botania:blocks/forestEye5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json deleted file mode 100644 index cda6e04b8..000000000 --- a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "textures": { - "particle": "#all" - }, - "elements": [ - { - "name": "Cube", - "from": [ 3, 3, 3 ], - "to": [ 13, 13, 13 ], - "faces": { - "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, - "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock.json b/src/main/resources/assets/botania/models/block/shapes/eightbyeight.json similarity index 93% rename from src/main/resources/assets/botania/models/block/microblock.json rename to src/main/resources/assets/botania/models/block/shapes/eightbyeight.json index e4ae95d3b..ca0a08ead 100644 --- a/src/main/resources/assets/botania/models/block/microblock.json +++ b/src/main/resources/assets/botania/models/block/shapes/eightbyeight.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#top" }, diff --git a/src/main/resources/assets/botania/models/block/microblock_all_tinted.json b/src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json similarity index 94% rename from src/main/resources/assets/botania/models/block/microblock_all_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json index 9cd2d3fc0..4bd8721fe 100644 --- a/src/main/resources/assets/botania/models/block/microblock_all_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/eightbyeight_all_tinted.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/minusone_all.json b/src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json similarity index 94% rename from src/main/resources/assets/botania/models/block/minusone_all.json rename to src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json index 78896926e..bcca615cd 100644 --- a/src/main/resources/assets/botania/models/block/minusone_all.json +++ b/src/main/resources/assets/botania/models/block/shapes/fifteen_high_all.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniblock_all.json b/src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json similarity index 93% rename from src/main/resources/assets/botania/models/block/miniblock_all.json rename to src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json index 78ea55b41..6691908eb 100644 --- a/src/main/resources/assets/botania/models/block/miniblock_all.json +++ b/src/main/resources/assets/botania/models/block/shapes/tenbyten_all.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json b/src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json similarity index 94% rename from src/main/resources/assets/botania/models/block/miniblock_top_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json index 9022ed180..d77c17bc9 100644 --- a/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/tenbyten_top_tinted.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#all" }, diff --git a/src/main/resources/assets/botania/models/block/tiny_planet_block.json b/src/main/resources/assets/botania/models/block/tiny_planet_block.json new file mode 100644 index 000000000..62c80768e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/tiny_planet_block.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/tenbyten_all", + "textures": { + "all": "botania:blocks/tinyPlanetBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/trodden_dirt.json b/src/main/resources/assets/botania/models/block/trodden_dirt.json new file mode 100644 index 000000000..3547f8951 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/trodden_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/fifteen_high_all", + "textures": { + "all": "botania:blocks/dirtPath" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_beacon.json b/src/main/resources/assets/botania/models/block/unstable_beacon.json new file mode 100644 index 000000000..2d0e6eb60 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/unstable_beacon.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/tenbyten_top_tinted", + "textures": { + "all": "botania:blocks/manaBeacon0", + "top": "botania:blocks/manaBeacon1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_cube.json b/src/main/resources/assets/botania/models/block/unstable_cube.json new file mode 100644 index 000000000..9be86d7a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/unstable_cube.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/eightbyeight_all_tinted", + "textures": { + "all": "botania:blocks/unstableBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json deleted file mode 100644 index 4df782b0c..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/default_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json deleted file mode 100644 index bffef4406..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/desert_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json b/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json deleted file mode 100644 index 58385e894..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_canopy.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_canopy" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json b/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json deleted file mode 100644 index b18a74edb..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_gathering.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_gathering" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json b/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json deleted file mode 100644 index 3ec534da6..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/drum_wild.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/drum_wild" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json deleted file mode 100644 index 3cd855b1a..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/forest_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json deleted file mode 100644 index 3245bebc2..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/fungal_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json b/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json deleted file mode 100644 index 06e94f1b1..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/life_imbuer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/life_imbuer" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json b/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json deleted file mode 100644 index fc2612afc..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/luminizer_launcher.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/luminizer_launcher" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json deleted file mode 100644 index 5020f058b..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/mesa_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json deleted file mode 100644 index c5a551203..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/mountain_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/petal_block.json b/src/main/resources/assets/botania/models/item/itemblock/petal_block.json deleted file mode 100644 index f8bb788c2..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/petal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/petal_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json deleted file mode 100644 index 715eab38c..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/plains_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json b/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json deleted file mode 100644 index 942906288..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/runic_altar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/runic_altar" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json b/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json deleted file mode 100644 index d419af93d..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/spark_tinkerer" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json b/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json deleted file mode 100644 index 64ac9b949..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/starfield_creator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/starfield_creator" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json deleted file mode 100644 index 8d0aa8c27..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/swamp_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json deleted file mode 100644 index efa64b8a9..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/taiga_apothecary" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json b/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json deleted file mode 100644 index dd6a18f0a..000000000 --- a/src/main/resources/assets/botania/models/item/itemblock/terra_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "botania:block/terra_plate" -} \ No newline at end of file From 8a13a030161f2085113fede767cf01bf5d688d76 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 19:41:19 -0500 Subject: [PATCH 809/935] Optimize number of slab models --- .../client/core/handler/ModelHandler.java | 44 +++++++++---------- .../botania/blockstates/biomeStoneA0Slab.json | 3 +- .../blockstates/biomeStoneA10Slab.json | 3 +- .../blockstates/biomeStoneA11Slab.json | 3 +- .../blockstates/biomeStoneA12Slab.json | 3 +- .../blockstates/biomeStoneA13Slab.json | 3 +- .../blockstates/biomeStoneA14Slab.json | 3 +- .../blockstates/biomeStoneA15Slab.json | 3 +- .../botania/blockstates/biomeStoneA1Slab.json | 3 +- .../botania/blockstates/biomeStoneA2Slab.json | 3 +- .../botania/blockstates/biomeStoneA3Slab.json | 3 +- .../botania/blockstates/biomeStoneA4Slab.json | 3 +- .../botania/blockstates/biomeStoneA5Slab.json | 3 +- .../botania/blockstates/biomeStoneA6Slab.json | 3 +- .../botania/blockstates/biomeStoneA7Slab.json | 3 +- .../botania/blockstates/biomeStoneA8Slab.json | 3 +- .../botania/blockstates/biomeStoneA9Slab.json | 3 +- .../botania/blockstates/biomeStoneB0Slab.json | 3 +- .../botania/blockstates/biomeStoneB1Slab.json | 3 +- .../botania/blockstates/biomeStoneB2Slab.json | 3 +- .../botania/blockstates/biomeStoneB3Slab.json | 3 +- .../botania/blockstates/biomeStoneB4Slab.json | 3 +- .../botania/blockstates/biomeStoneB5Slab.json | 3 +- .../botania/blockstates/biomeStoneB6Slab.json | 3 +- .../botania/blockstates/biomeStoneB7Slab.json | 3 +- .../botania/blockstates/customBrick0Slab.json | 3 +- .../botania/blockstates/customBrick1Slab.json | 3 +- .../botania/blockstates/customBrick2Slab.json | 3 +- .../botania/blockstates/customBrick3Slab.json | 3 +- .../botania/blockstates/dirtPath0Slab.json | 3 +- .../botania/blockstates/dreamwood0Slab.json | 3 +- .../botania/blockstates/dreamwood1Slab.json | 3 +- .../botania/blockstates/livingrock0Slab.json | 3 +- .../botania/blockstates/livingrock1Slab.json | 3 +- .../botania/blockstates/livingwood0Slab.json | 3 +- .../botania/blockstates/livingwood1Slab.json | 3 +- .../botania/blockstates/pavement0Slab.json | 3 +- .../botania/blockstates/pavement1Slab.json | 3 +- .../botania/blockstates/pavement2Slab.json | 3 +- .../botania/blockstates/pavement3Slab.json | 3 +- .../botania/blockstates/pavement4Slab.json | 3 +- .../botania/blockstates/pavement5Slab.json | 3 +- .../blockstates/quartzSlabBlazeHalf.json | 3 +- .../blockstates/quartzSlabDarkHalf.json | 3 +- .../blockstates/quartzSlabElfHalf.json | 3 +- .../blockstates/quartzSlabLavenderHalf.json | 3 +- .../blockstates/quartzSlabManaHalf.json | 3 +- .../blockstates/quartzSlabRedHalf.json | 3 +- .../blockstates/quartzSlabSunnyHalf.json | 3 +- .../botania/blockstates/shimmerrock0Slab.json | 3 +- .../blockstates/shimmerwoodPlanks0Slab.json | 3 +- 51 files changed, 72 insertions(+), 122 deletions(-) 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 6bc8e1663..463f7d457 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -774,36 +774,36 @@ public final class ModelHandler { private static void registerSlabs() { for (Block b : ModFluffBlocks.biomeStoneSlabs) { - registerBlockStandardPath(b); + registerBlockVariant(b, "half=bottom"); } for (Block b : ModFluffBlocks.pavementSlabs) { - registerBlockStandardPath(b); + registerBlockVariant(b, "half=bottom"); } - registerBlockStandardPath(ModFluffBlocks.livingwoodSlab); - registerBlockStandardPath(ModFluffBlocks.livingwoodPlankSlab); - registerBlockStandardPath(ModFluffBlocks.livingrockSlab); - registerBlockStandardPath(ModFluffBlocks.livingrockBrickSlab); + registerBlockVariant(ModFluffBlocks.livingwoodSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.livingwoodPlankSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.livingrockSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.livingrockBrickSlab, "half=bottom"); - registerBlockStandardPath(ModFluffBlocks.blazeQuartzSlab); + registerBlockVariant(ModFluffBlocks.blazeQuartzSlab, "half=bottom"); if (ConfigHandler.darkQuartzEnabled) - registerBlockStandardPath(ModFluffBlocks.darkQuartzSlab); - registerBlockStandardPath(ModFluffBlocks.elfQuartzSlab); - registerBlockStandardPath(ModFluffBlocks.lavenderQuartzSlab); - registerBlockStandardPath(ModFluffBlocks.manaQuartzSlab); - registerBlockStandardPath(ModFluffBlocks.redQuartzSlab); - registerBlockStandardPath(ModFluffBlocks.sunnyQuartzSlab); + registerBlockVariant(ModFluffBlocks.darkQuartzSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.elfQuartzSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.lavenderQuartzSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.manaQuartzSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.redQuartzSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.sunnyQuartzSlab, "half=bottom"); - registerBlockStandardPath(ModFluffBlocks.dreamwoodSlab); - registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankSlab); - registerBlockStandardPath(ModFluffBlocks.dirtPathSlab); - registerBlockStandardPath(ModFluffBlocks.shimmerrockSlab); - registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankSlab); - registerBlockStandardPath(ModFluffBlocks.netherBrickSlab); - registerBlockStandardPath(ModFluffBlocks.soulBrickSlab); - registerBlockStandardPath(ModFluffBlocks.snowBrickSlab); - registerBlockStandardPath(ModFluffBlocks.tileSlab); + registerBlockVariant(ModFluffBlocks.dreamwoodSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.dreamwoodPlankSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.dirtPathSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.shimmerrockSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.shimmerwoodPlankSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.netherBrickSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.soulBrickSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.snowBrickSlab, "half=bottom"); + registerBlockVariant(ModFluffBlocks.tileSlab, "half=bottom"); } private static void registerWalls() { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json index 932a9150f..8ae3b6d68 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json index 42384d85f..dee3eb2cb 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json index 5c5c29ae4..e8cc23536 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json index a30da66e1..4850027be 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json index bfa7b1f12..9761ac673 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json index 40015ed13..065079c46 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json index efc0755f4..cd96ded79 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json index 6d830d0b3..3acad118c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json index 494d3e4f9..e76d3dd8f 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json index e6ebd77a2..f1fe24970 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json index 659103f1a..be8a0caa9 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json index 2d286158c..b4846b648 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json index bc6cf0a01..8bdfb2408 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json index e425405d4..3a6dc3729 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json index fb7879f92..016d8afd0 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json index 3628a3d9e..4dd5cd8c7 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json index c28daf734..27effcde8 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json index d2b187a97..b2927f15d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json index 751fa02bf..b5ea1a1ba 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json index 87be524ef..1309a9e20 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json index 7674c1ff1..78e0d7ed4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json index 080478ca7..97b237701 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json index da1feee89..62856fcb4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json index 44ab63c49..ce02273ba 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json index 003182a31..abdd8bee0 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json index d1155de5b..49c293195 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json index 34b5c8e59..4ed57c712 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json index 58a5330a0..f4cbb49ce 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json +++ b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json index 321fdc8e1..1269589ed 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json index 8521a9854..110556584 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json index 550583fe7..3ee6100d0 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json index 9d25d84ea..b228f4123 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json index d06490b80..872083377 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json index 434e23575..69d691de7 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json index 9211425a8..3971fc8c6 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0Slab.json index 86d73e29f..75ba25ae6 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1Slab.json index 4c00ba077..9890b2c28 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement1Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2Slab.json index 1839a6cba..902f1ea09 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement2Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3Slab.json index ab3ddf3c9..717c31065 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement3Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4Slab.json index 0a1c72b64..8a585b586 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement4Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5Slab.json index ec83954b1..93a0d97b1 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5Slab.json +++ b/src/main/resources/assets/botania/blockstates/pavement5Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json index 99e35dfbb..5a4d1b316 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json index 85dd37cca..342294d24 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json index 78573a0a7..d45d69008 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json index 87d48c58d..0eb7e4354 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json index f94866467..0aee75219 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json index 38b9e93cb..1b99d3fbd 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json index 0b8a0aa99..87f085275 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json index 4daa48cde..3709fac6a 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json index 438a1fcf2..5bf7d62bc 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json @@ -14,7 +14,6 @@ "x": 180, "uvlock": true }], - "half=bottom": [{}], - "inventory": [{}] + "half=bottom": [{}] } } \ No newline at end of file From 9f0c710479514d13947aaff07a449222ecebd646 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 20:51:45 -0500 Subject: [PATCH 810/935] More --- .../client/core/handler/ModelHandler.java | 50 ++++------------- .../botania/blockstates/doubleFlower1.json | 43 +-------------- .../botania/blockstates/doubleFlower2.json | 43 +-------------- .../assets/botania/blockstates/flower.json | 55 ++++++------------- .../assets/botania/blockstates/mushroom.json | 55 ++++++------------- .../botania/blockstates/shinyFlower.json | 55 ++++++------------- .../botania/blockstates/tinyPotato.json | 19 ++----- .../botania/models/block/flower_black.json | 6 ++ .../botania/models/block/flower_blue.json | 6 ++ .../botania/models/block/flower_brown.json | 6 ++ .../botania/models/block/flower_cyan.json | 6 ++ .../botania/models/block/flower_gray.json | 6 ++ .../botania/models/block/flower_green.json | 6 ++ .../models/block/flower_light_blue.json | 6 ++ .../botania/models/block/flower_lime.json | 6 ++ .../botania/models/block/flower_magenta.json | 6 ++ .../botania/models/block/flower_orange.json | 6 ++ .../botania/models/block/flower_pink.json | 6 ++ .../botania/models/block/flower_purple.json | 6 ++ .../botania/models/block/flower_red.json | 6 ++ .../botania/models/block/flower_silver.json | 6 ++ .../botania/models/block/flower_white.json | 6 ++ .../botania/models/block/flower_yellow.json | 6 ++ .../models/block/glimmering_flower_black.json | 6 ++ .../models/block/glimmering_flower_blue.json | 6 ++ .../models/block/glimmering_flower_brown.json | 6 ++ .../models/block/glimmering_flower_cyan.json | 6 ++ .../models/block/glimmering_flower_gray.json | 6 ++ .../models/block/glimmering_flower_green.json | 6 ++ .../block/glimmering_flower_light_blue.json | 6 ++ .../models/block/glimmering_flower_lime.json | 6 ++ .../block/glimmering_flower_magenta.json | 6 ++ .../block/glimmering_flower_orange.json | 6 ++ .../models/block/glimmering_flower_pink.json | 6 ++ .../block/glimmering_flower_purple.json | 6 ++ .../models/block/glimmering_flower_red.json | 6 ++ .../block/glimmering_flower_silver.json | 6 ++ .../models/block/glimmering_flower_white.json | 6 ++ .../block/glimmering_flower_yellow.json | 6 ++ .../botania/models/block/mushroom_black.json | 6 ++ .../botania/models/block/mushroom_blue.json | 6 ++ .../botania/models/block/mushroom_brown.json | 6 ++ .../botania/models/block/mushroom_cyan.json | 6 ++ .../botania/models/block/mushroom_gray.json | 6 ++ .../botania/models/block/mushroom_green.json | 6 ++ .../models/block/mushroom_light_blue.json | 6 ++ .../botania/models/block/mushroom_lime.json | 6 ++ .../models/block/mushroom_magenta.json | 6 ++ .../botania/models/block/mushroom_orange.json | 6 ++ .../botania/models/block/mushroom_pink.json | 6 ++ .../botania/models/block/mushroom_purple.json | 6 ++ .../botania/models/block/mushroom_red.json | 6 ++ .../botania/models/block/mushroom_silver.json | 6 ++ .../botania/models/block/mushroom_white.json | 6 ++ .../botania/models/block/mushroom_yellow.json | 6 ++ .../botania/models/block/tiny_potato.json | 4 +- .../item/itemblock/double_flower_black.json | 6 ++ .../item/itemblock/double_flower_blue.json | 6 ++ .../item/itemblock/double_flower_brown.json | 6 ++ .../item/itemblock/double_flower_cyan.json | 6 ++ .../item/itemblock/double_flower_gray.json | 6 ++ .../item/itemblock/double_flower_green.json | 6 ++ .../itemblock/double_flower_light_blue.json | 6 ++ .../item/itemblock/double_flower_lime.json | 6 ++ .../item/itemblock/double_flower_magenta.json | 6 ++ .../item/itemblock/double_flower_orange.json | 6 ++ .../item/itemblock/double_flower_pink.json | 6 ++ .../item/itemblock/double_flower_purple.json | 6 ++ .../item/itemblock/double_flower_red.json | 6 ++ .../item/itemblock/double_flower_silver.json | 6 ++ .../item/itemblock/double_flower_white.json | 6 ++ .../item/itemblock/double_flower_yellow.json | 6 ++ .../models/item/itemblock/flower_black.json | 6 ++ .../models/item/itemblock/flower_blue.json | 6 ++ .../models/item/itemblock/flower_brown.json | 6 ++ .../models/item/itemblock/flower_cyan.json | 6 ++ .../models/item/itemblock/flower_gray.json | 6 ++ .../models/item/itemblock/flower_green.json | 6 ++ .../item/itemblock/flower_light_blue.json | 6 ++ .../models/item/itemblock/flower_lime.json | 6 ++ .../models/item/itemblock/flower_magenta.json | 6 ++ .../models/item/itemblock/flower_orange.json | 6 ++ .../models/item/itemblock/flower_pink.json | 6 ++ .../models/item/itemblock/flower_purple.json | 6 ++ .../models/item/itemblock/flower_red.json | 6 ++ .../models/item/itemblock/flower_silver.json | 6 ++ .../models/item/itemblock/flower_white.json | 6 ++ .../models/item/itemblock/flower_yellow.json | 6 ++ .../itemblock/glimmering_flower_black.json | 6 ++ .../itemblock/glimmering_flower_blue.json | 6 ++ .../itemblock/glimmering_flower_brown.json | 6 ++ .../itemblock/glimmering_flower_cyan.json | 6 ++ .../itemblock/glimmering_flower_gray.json | 6 ++ .../itemblock/glimmering_flower_green.json | 6 ++ .../glimmering_flower_light_blue.json | 6 ++ .../itemblock/glimmering_flower_lime.json | 6 ++ .../itemblock/glimmering_flower_magenta.json | 6 ++ .../itemblock/glimmering_flower_orange.json | 6 ++ .../itemblock/glimmering_flower_pink.json | 6 ++ .../itemblock/glimmering_flower_purple.json | 6 ++ .../item/itemblock/glimmering_flower_red.json | 6 ++ .../itemblock/glimmering_flower_silver.json | 6 ++ .../itemblock/glimmering_flower_white.json | 6 ++ .../itemblock/glimmering_flower_yellow.json | 6 ++ .../models/item/itemblock/mushroom_black.json | 6 ++ .../models/item/itemblock/mushroom_blue.json | 6 ++ .../models/item/itemblock/mushroom_brown.json | 6 ++ .../models/item/itemblock/mushroom_cyan.json | 6 ++ .../models/item/itemblock/mushroom_gray.json | 6 ++ .../models/item/itemblock/mushroom_green.json | 6 ++ .../item/itemblock/mushroom_light_blue.json | 6 ++ .../models/item/itemblock/mushroom_lime.json | 6 ++ .../item/itemblock/mushroom_magenta.json | 6 ++ .../item/itemblock/mushroom_orange.json | 6 ++ .../models/item/itemblock/mushroom_pink.json | 6 ++ .../item/itemblock/mushroom_purple.json | 6 ++ .../models/item/itemblock/mushroom_red.json | 6 ++ .../item/itemblock/mushroom_silver.json | 6 ++ .../models/item/itemblock/mushroom_white.json | 6 ++ .../item/itemblock/mushroom_yellow.json | 6 ++ 120 files changed, 739 insertions(+), 257 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/flower_black.json create mode 100644 src/main/resources/assets/botania/models/block/flower_blue.json create mode 100644 src/main/resources/assets/botania/models/block/flower_brown.json create mode 100644 src/main/resources/assets/botania/models/block/flower_cyan.json create mode 100644 src/main/resources/assets/botania/models/block/flower_gray.json create mode 100644 src/main/resources/assets/botania/models/block/flower_green.json create mode 100644 src/main/resources/assets/botania/models/block/flower_light_blue.json create mode 100644 src/main/resources/assets/botania/models/block/flower_lime.json create mode 100644 src/main/resources/assets/botania/models/block/flower_magenta.json create mode 100644 src/main/resources/assets/botania/models/block/flower_orange.json create mode 100644 src/main/resources/assets/botania/models/block/flower_pink.json create mode 100644 src/main/resources/assets/botania/models/block/flower_purple.json create mode 100644 src/main/resources/assets/botania/models/block/flower_red.json create mode 100644 src/main/resources/assets/botania/models/block/flower_silver.json create mode 100644 src/main/resources/assets/botania/models/block/flower_white.json create mode 100644 src/main/resources/assets/botania/models/block/flower_yellow.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_black.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_blue.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_brown.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_gray.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_green.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_lime.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_orange.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_pink.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_purple.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_red.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_silver.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_white.json create mode 100644 src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_black.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_blue.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_brown.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_cyan.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_gray.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_green.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_light_blue.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_lime.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_magenta.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_orange.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_pink.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_purple.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_red.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_silver.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_white.json create mode 100644 src/main/resources/assets/botania/models/block/mushroom_yellow.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_black.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_brown.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_gray.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_green.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_lime.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_orange.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_pink.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_purple.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_red.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_silver.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_white.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json 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 463f7d457..e4c3415cb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -132,8 +132,6 @@ public final class ModelHandler { /** ItemBlocks **/ registerStandardBlocks(); - registerMushrooms(); - registerFlowers(); registerPavement(); registerStairs(); registerSlabs(); @@ -291,6 +289,11 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.corporeaInterceptor); registerBlockStandardPath(ModBlocks.corporeaRetainer); registerBlockVariant(ModBlocks.dirtPath); + registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); + Item item = Item.getItemFromBlock(ModBlocks.doubleFlower2); // todo make this look pretty :( + for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/double_flower_" + color.getName(), "inventory")); + } registerBlockStandardPath(ModBlocks.distributor); registerBlockStandardPath(ModBlocks.elfGlass); registerBlockStandardPath(ModBlocks.enchantedSoil); @@ -298,6 +301,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.enderEye); registerBlockStandardPath(ModBlocks.felPumpkin); registerBlockStandardPath(ModBlocks.floatingSpecialFlower); + registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockVariant(ModBlocks.forestEye); registerBlockStandardPath(ModBlocks.ghostRail); registerBlockStandardPath(ModBlocks.incensePlate); @@ -306,6 +310,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.manaDetector); registerBlockStandardPath(ModBlocks.manaGlass); registerBlockStandardPath(ModBlocks.manaVoid); + registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); registerBlockStandardPath(ModBlocks.prism); registerBlockStandardPath(ModBlocks.pistonRelay); registerBlockStandardPath(ModBlocks.pump); @@ -320,13 +325,14 @@ public final class ModelHandler { registerBlockVariant(ModBlocks.runeAltar); registerBlockStandardPath(ModBlocks.shimmerrock); registerBlockStandardPath(ModBlocks.shimmerwoodPlanks); + registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); registerBlockVariant(ModBlocks.spawnerClaw); registerBlockStandardPath(ModBlocks.specialFlower); registerBlockVariant(ModBlocks.starfield, "powered=false"); registerBlockVariant(ModBlocks.terraPlate); registerBlockVariant(ModBlocks.tinyPlanet); - registerBlockStandardPath(ModBlocks.tinyPotato); + registerBlockVariant(ModBlocks.tinyPotato, "facing=north"); registerBlockStandardPath(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons @@ -669,42 +675,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); } - private static void registerMushrooms() { - Item item = Item.getItemFromBlock(ModBlocks.mushroom); - for (EnumDyeColor color : EnumDyeColor.values()) { - String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.mushroom).toString(); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); - } - } - - private static void registerFlowers() { - Item item = Item.getItemFromBlock(ModBlocks.flower); - for (EnumDyeColor color : EnumDyeColor.values()) { - 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 = 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 = 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 = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower2).toString(); - String variant = "inventory_" + color.getName(); - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); - } - } - private static void registerPavement() { Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); String name = ForgeRegistries.BLOCKS.getKey(ModFluffBlocks.pavement).toString(); @@ -893,7 +863,7 @@ public final class ModelHandler { // Registers the ItemBlock to models/item/#inventory private static void registerBlockStandardPath(Block b) { - registerItemModel(Item.getItemFromBlock(b)); + registerBlockVariant(b, "inventory"); } // Registers the ItemBlock to a custom path in models/item/itemblock/ diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleFlower1.json index 1d25e07a5..339214df2 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower1.json +++ b/src/main/resources/assets/botania/blockstates/doubleFlower1.json @@ -19,47 +19,6 @@ "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], - "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }], - - "inventory_white": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower0Tall1" }, - "transform": "forge:default-item" - }], - "inventory_orange": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower1Tall1" }, - "transform": "forge:default-item" - }], - "inventory_magenta": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower2Tall1" }, - "transform": "forge:default-item" - }], - "inventory_light_blue": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower3Tall1" }, - "transform": "forge:default-item" - }], - "inventory_yellow": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower4Tall1" }, - "transform": "forge:default-item" - }], - "inventory_lime": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower5Tall1" }, - "transform": "forge:default-item" - }], - "inventory_pink": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower6Tall1" }, - "transform": "forge:default-item" - }], - "inventory_gray": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower7Tall1" }, - "transform": "forge:default-item" - }] + "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleFlower2.json index b4c5d0df9..d74db343c 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower2.json +++ b/src/main/resources/assets/botania/blockstates/doubleFlower2.json @@ -19,47 +19,6 @@ "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], - "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }], - - "inventory_silver": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower8Tall1" }, - "transform": "forge:default-item" - }], - "inventory_cyan": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower9Tall1" }, - "transform": "forge:default-item" - }], - "inventory_purple": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower10Tall1" }, - "transform": "forge:default-item" - }], - "inventory_blue": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower11Tall1" }, - "transform": "forge:default-item" - }], - "inventory_brown": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower12Tall1" }, - "transform": "forge:default-item" - }], - "inventory_green": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower13Tall1" }, - "transform": "forge:default-item" - }], - "inventory_red": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower14Tall1" }, - "transform": "forge:default-item" - }], - "inventory_black": [{ - "model": "builtin/generated", - "textures": { "layer0": "botania:blocks/flower15Tall1" }, - "transform": "forge:default-item" - }] + "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 9472ebe07..6a386460e 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -1,43 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross" - }, "variants": { - "color": { - "white": { "textures": { "cross": "botania:blocks/flower0" } }, - "orange": { "textures": { "cross": "botania:blocks/flower1" } }, - "magenta": { "textures": { "cross": "botania:blocks/flower2" } }, - "light_blue": { "textures": { "cross": "botania:blocks/flower3" } }, - "yellow": { "textures": { "cross": "botania:blocks/flower4" } }, - "lime": { "textures": { "cross": "botania:blocks/flower5" } }, - "pink": { "textures": { "cross": "botania:blocks/flower6" } }, - "gray": { "textures": { "cross": "botania:blocks/flower7" } }, - "silver": { "textures": { "cross": "botania:blocks/flower8" } }, - "cyan": { "textures": { "cross": "botania:blocks/flower9" } }, - "purple": { "textures": { "cross": "botania:blocks/flower10" } }, - "blue": { "textures": { "cross": "botania:blocks/flower11" } }, - "brown": { "textures": { "cross": "botania:blocks/flower12" } }, - "green": { "textures": { "cross": "botania:blocks/flower13" } }, - "red": { "textures": { "cross": "botania:blocks/flower14" } }, - "black": { "textures": { "cross": "botania:blocks/flower15" } } - }, - - "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }], - "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }], - "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower2" } }], - "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower3" } }], - "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower4" } }], - "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower5" } }], - "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower6" } }], - "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower7" } }], - "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower8" } }], - "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower9" } }], - "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower10" } }], - "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower11" } }], - "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower12" } }], - "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower13" } }], - "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower14" } }], - "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower15" } }] + "color=white": { "model": "botania:flower_white" }, + "color=orange": { "model": "botania:flower_orange" }, + "color=magenta": { "model": "botania:flower_magenta" }, + "color=light_blue": { "model": "botania:flower_light_blue" }, + "color=yellow": { "model": "botania:flower_yellow" }, + "color=lime": { "model": "botania:flower_lime" }, + "color=pink": { "model": "botania:flower_pink" }, + "color=gray": { "model": "botania:flower_gray" }, + "color=silver": { "model": "botania:flower_silver" }, + "color=cyan": { "model": "botania:flower_cyan" }, + "color=purple": { "model": "botania:flower_purple" }, + "color=blue": { "model": "botania:flower_blue" }, + "color=brown": { "model": "botania:flower_brown" }, + "color=green": { "model": "botania:flower_green" }, + "color=red": { "model": "botania:flower_red" }, + "color=black": { "model": "botania:flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index b5e1da5ae..42d93df72 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -1,43 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross" - }, "variants": { - "color": { - "white": { "textures": { "cross": "botania:blocks/mushroom0" } }, - "orange": { "textures": { "cross": "botania:blocks/mushroom1" } }, - "magenta": { "textures": { "cross": "botania:blocks/mushroom2" } }, - "light_blue": { "textures": { "cross": "botania:blocks/mushroom3" } }, - "yellow": { "textures": { "cross": "botania:blocks/mushroom4" } }, - "lime": { "textures": { "cross": "botania:blocks/mushroom5" } }, - "pink": { "textures": { "cross": "botania:blocks/mushroom6" } }, - "gray": { "textures": { "cross": "botania:blocks/mushroom7" } }, - "silver": { "textures": { "cross": "botania:blocks/mushroom8" } }, - "cyan": { "textures": { "cross": "botania:blocks/mushroom9" } }, - "purple": { "textures": { "cross": "botania:blocks/mushroom10" } }, - "blue": { "textures": { "cross": "botania:blocks/mushroom11" } }, - "brown": { "textures": { "cross": "botania:blocks/mushroom12" } }, - "green": { "textures": { "cross": "botania:blocks/mushroom13" } }, - "red": { "textures": { "cross": "botania:blocks/mushroom14" } }, - "black": { "textures": { "cross": "botania:blocks/mushroom15" } } - }, - - "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }], - "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }], - "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom2" } }], - "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom3" } }], - "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom4" } }], - "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom5" } }], - "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom6" } }], - "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom7" } }], - "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom8" } }], - "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom9" } }], - "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom10" } }], - "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom11" } }], - "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom12" } }], - "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom13" } }], - "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom14" } }], - "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom15" } }] + "color=white": { "model": "botania:mushroom_white" }, + "color=orange": { "model": "botania:mushroom_orange" }, + "color=magenta": { "model": "botania:mushroom_magenta" }, + "color=light_blue": { "model": "botania:mushroom_light_blue" }, + "color=yellow": { "model": "botania:mushroom_yellow" }, + "color=lime": { "model": "botania:mushroom_lime" }, + "color=pink": { "model": "botania:mushroom_pink" }, + "color=gray": { "model": "botania:mushroom_gray" }, + "color=silver": { "model": "botania:mushroom_silver" }, + "color=cyan": { "model": "botania:mushroom_cyan" }, + "color=purple": { "model": "botania:mushroom_purple" }, + "color=blue": { "model": "botania:mushroom_blue" }, + "color=brown": { "model": "botania:mushroom_brown" }, + "color=green": { "model": "botania:mushroom_green" }, + "color=red": { "model": "botania:mushroom_red" }, + "color=black": { "model": "botania:mushroom_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index a8b2f6868..5317eb11b 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -1,43 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cross" - }, "variants": { - "color": { - "white": { "textures": { "cross": "botania:blocks/flowerGlimmering0" } }, - "orange": { "textures": { "cross": "botania:blocks/flowerGlimmering1" } }, - "magenta": { "textures": { "cross": "botania:blocks/flowerGlimmering2" } }, - "light_blue": { "textures": { "cross": "botania:blocks/flowerGlimmering3" } }, - "yellow": { "textures": { "cross": "botania:blocks/flowerGlimmering4" } }, - "lime": { "textures": { "cross": "botania:blocks/flowerGlimmering5" } }, - "pink": { "textures": { "cross": "botania:blocks/flowerGlimmering6" } }, - "gray": { "textures": { "cross": "botania:blocks/flowerGlimmering7" } }, - "silver": { "textures": { "cross": "botania:blocks/flowerGlimmering8" } }, - "cyan": { "textures": { "cross": "botania:blocks/flowerGlimmering9" } }, - "purple": { "textures": { "cross": "botania:blocks/flowerGlimmering10" } }, - "blue": { "textures": { "cross": "botania:blocks/flowerGlimmering11" } }, - "brown": { "textures": { "cross": "botania:blocks/flowerGlimmering12" } }, - "green": { "textures": { "cross": "botania:blocks/flowerGlimmering13" } }, - "red": { "textures": { "cross": "botania:blocks/flowerGlimmering14" } }, - "black": { "textures": { "cross": "botania:blocks/flowerGlimmering15" } } - }, - - "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }], - "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }], - "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering2" } }], - "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering3" } }], - "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering4" } }], - "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering5" } }], - "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering6" } }], - "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering7" } }], - "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering8" } }], - "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering9" } }], - "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering10" } }], - "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering11" } }], - "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering12" } }], - "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering13" } }], - "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering14" } }], - "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering15" } }] + "color=white": { "model": "botania:glimmering_flower_white" }, + "color=orange": { "model": "botania:glimmering_flower_orange" }, + "color=magenta": { "model": "botania:glimmering_flower_magenta" }, + "color=light_blue": { "model": "botania:glimmering_flower_light_blue" }, + "color=yellow": { "model": "botania:glimmering_flower_yellow" }, + "color=lime": { "model": "botania:glimmering_flower_lime" }, + "color=pink": { "model": "botania:glimmering_flower_pink" }, + "color=gray": { "model": "botania:glimmering_flower_gray" }, + "color=silver": { "model": "botania:glimmering_flower_silver" }, + "color=cyan": { "model": "botania:glimmering_flower_cyan" }, + "color=purple": { "model": "botania:glimmering_flower_purple" }, + "color=blue": { "model": "botania:glimmering_flower_blue" }, + "color=brown": { "model": "botania:glimmering_flower_brown" }, + "color=green": { "model": "botania:glimmering_flower_green" }, + "color=red": { "model": "botania:glimmering_flower_red" }, + "color=black": { "model": "botania:glimmering_flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinyPotato.json index 91f7e87d5..c8daa4af1 100644 --- a/src/main/resources/assets/botania/blockstates/tinyPotato.json +++ b/src/main/resources/assets/botania/blockstates/tinyPotato.json @@ -1,19 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:tiny_potato", - "textures": { - "all": "botania:model/tinyPotatoCopy" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - }, - "inventory": [{}] + "facing=north": { "model": "botania:tiny_potato" }, + "facing=south": { "model": "botania:tiny_potato", "y": 180 }, + "facing=west": { "model": "botania:tiny_potato", "y": 270 }, + "facing=east": { "model": "botania:tiny_potato", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_black.json b/src/main/resources/assets/botania/models/block/flower_black.json new file mode 100644 index 000000000..aac7f8f8c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_blue.json b/src/main/resources/assets/botania/models/block/flower_blue.json new file mode 100644 index 000000000..f93a12fe1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_brown.json b/src/main/resources/assets/botania/models/block/flower_brown.json new file mode 100644 index 000000000..cb5ca8c28 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_cyan.json b/src/main/resources/assets/botania/models/block/flower_cyan.json new file mode 100644 index 000000000..c6d9c7de8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_gray.json b/src/main/resources/assets/botania/models/block/flower_gray.json new file mode 100644 index 000000000..e5881a183 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_green.json b/src/main/resources/assets/botania/models/block/flower_green.json new file mode 100644 index 000000000..ddcaf49c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_light_blue.json b/src/main/resources/assets/botania/models/block/flower_light_blue.json new file mode 100644 index 000000000..b2a7a9141 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_lime.json b/src/main/resources/assets/botania/models/block/flower_lime.json new file mode 100644 index 000000000..45daff76a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_magenta.json b/src/main/resources/assets/botania/models/block/flower_magenta.json new file mode 100644 index 000000000..10c32215d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_orange.json b/src/main/resources/assets/botania/models/block/flower_orange.json new file mode 100644 index 000000000..794cac4f5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_pink.json b/src/main/resources/assets/botania/models/block/flower_pink.json new file mode 100644 index 000000000..312f10937 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_purple.json b/src/main/resources/assets/botania/models/block/flower_purple.json new file mode 100644 index 000000000..76fe63787 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_red.json b/src/main/resources/assets/botania/models/block/flower_red.json new file mode 100644 index 000000000..48120da38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_silver.json b/src/main/resources/assets/botania/models/block/flower_silver.json new file mode 100644 index 000000000..2395dd225 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_white.json b/src/main/resources/assets/botania/models/block/flower_white.json new file mode 100644 index 000000000..73c03fdcd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_yellow.json b/src/main/resources/assets/botania/models/block/flower_yellow.json new file mode 100644 index 000000000..759579f96 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/flower_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flower4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_black.json b/src/main/resources/assets/botania/models/block/glimmering_flower_black.json new file mode 100644 index 000000000..3bded4905 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/block/glimmering_flower_blue.json new file mode 100644 index 000000000..fdbfff359 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/block/glimmering_flower_brown.json new file mode 100644 index 000000000..3bb133d50 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json new file mode 100644 index 000000000..77a701a1b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/block/glimmering_flower_gray.json new file mode 100644 index 000000000..29fe5c73f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_green.json b/src/main/resources/assets/botania/models/block/glimmering_flower_green.json new file mode 100644 index 000000000..22d92ffbf --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json new file mode 100644 index 000000000..89490999c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/block/glimmering_flower_lime.json new file mode 100644 index 000000000..07862b0a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json new file mode 100644 index 000000000..f20cc0e84 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/block/glimmering_flower_orange.json new file mode 100644 index 000000000..05a56031a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/block/glimmering_flower_pink.json new file mode 100644 index 000000000..d53240004 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/block/glimmering_flower_purple.json new file mode 100644 index 000000000..ddf0b9f9c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_red.json b/src/main/resources/assets/botania/models/block/glimmering_flower_red.json new file mode 100644 index 000000000..8ea3ea26d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/block/glimmering_flower_silver.json new file mode 100644 index 000000000..367bfbe3b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_white.json b/src/main/resources/assets/botania/models/block/glimmering_flower_white.json new file mode 100644 index 000000000..0a106deef --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json new file mode 100644 index 000000000..0b6d9c508 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/flowerGlimmering4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_black.json b/src/main/resources/assets/botania/models/block/mushroom_black.json new file mode 100644 index 000000000..e6c0ef8c5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_blue.json b/src/main/resources/assets/botania/models/block/mushroom_blue.json new file mode 100644 index 000000000..30a6d82f2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_brown.json b/src/main/resources/assets/botania/models/block/mushroom_brown.json new file mode 100644 index 000000000..a687be665 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_cyan.json b/src/main/resources/assets/botania/models/block/mushroom_cyan.json new file mode 100644 index 000000000..adc3fdf35 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_gray.json b/src/main/resources/assets/botania/models/block/mushroom_gray.json new file mode 100644 index 000000000..8c5f8eae7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_green.json b/src/main/resources/assets/botania/models/block/mushroom_green.json new file mode 100644 index 000000000..cfdeed53d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_light_blue.json b/src/main/resources/assets/botania/models/block/mushroom_light_blue.json new file mode 100644 index 000000000..b80a18220 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_lime.json b/src/main/resources/assets/botania/models/block/mushroom_lime.json new file mode 100644 index 000000000..cb4077df9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_magenta.json b/src/main/resources/assets/botania/models/block/mushroom_magenta.json new file mode 100644 index 000000000..78a96604e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_orange.json b/src/main/resources/assets/botania/models/block/mushroom_orange.json new file mode 100644 index 000000000..7e3b273fb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_pink.json b/src/main/resources/assets/botania/models/block/mushroom_pink.json new file mode 100644 index 000000000..75c75823b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_purple.json b/src/main/resources/assets/botania/models/block/mushroom_purple.json new file mode 100644 index 000000000..64334d4fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_red.json b/src/main/resources/assets/botania/models/block/mushroom_red.json new file mode 100644 index 000000000..488f9c1bd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_silver.json b/src/main/resources/assets/botania/models/block/mushroom_silver.json new file mode 100644 index 000000000..853f9915e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_white.json b/src/main/resources/assets/botania/models/block/mushroom_white.json new file mode 100644 index 000000000..66f03c27f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mushroom_yellow.json b/src/main/resources/assets/botania/models/block/mushroom_yellow.json new file mode 100644 index 000000000..50451fe12 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mushroom_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "botania:blocks/mushroom4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/tiny_potato.json b/src/main/resources/assets/botania/models/block/tiny_potato.json index 38c56cb6c..84f06fe5f 100644 --- a/src/main/resources/assets/botania/models/block/tiny_potato.json +++ b/src/main/resources/assets/botania/models/block/tiny_potato.json @@ -1,6 +1,8 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "minecraft:blocks/hardened_clay" + "all": "botania:model/tinyPotatoCopy", + "particle": "botania:model/tinyPotatoCopy" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json new file mode 100644 index 000000000..e4a45a6db --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower15Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json new file mode 100644 index 000000000..9668e1b59 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower11Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json new file mode 100644 index 000000000..b3d75c7f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower12Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json new file mode 100644 index 000000000..ef2e30ccb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower9Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json new file mode 100644 index 000000000..75f4a0808 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower7Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json new file mode 100644 index 000000000..18828e58a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower13Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json new file mode 100644 index 000000000..8320ee8c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower3Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json new file mode 100644 index 000000000..f608684b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower5Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json new file mode 100644 index 000000000..c483545ff --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower2Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json new file mode 100644 index 000000000..3f8539119 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower1Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json new file mode 100644 index 000000000..914aaa92f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower6Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json new file mode 100644 index 000000000..d472eb44c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower10Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json new file mode 100644 index 000000000..b28bc6877 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower14Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json new file mode 100644 index 000000000..46cfc57db --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower8Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json new file mode 100644 index 000000000..e46bcdf60 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower0Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json new file mode 100644 index 000000000..b0555d4fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower4Tall1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_black.json b/src/main/resources/assets/botania/models/item/itemblock/flower_black.json new file mode 100644 index 000000000..7b8759f21 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_blue.json b/src/main/resources/assets/botania/models/item/itemblock/flower_blue.json new file mode 100644 index 000000000..baa6ad215 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_brown.json b/src/main/resources/assets/botania/models/item/itemblock/flower_brown.json new file mode 100644 index 000000000..9b966692f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json new file mode 100644 index 000000000..8a6db1986 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_gray.json b/src/main/resources/assets/botania/models/item/itemblock/flower_gray.json new file mode 100644 index 000000000..f06ff8933 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_green.json b/src/main/resources/assets/botania/models/item/itemblock/flower_green.json new file mode 100644 index 000000000..09b6686c9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json new file mode 100644 index 000000000..ebf0200f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_lime.json b/src/main/resources/assets/botania/models/item/itemblock/flower_lime.json new file mode 100644 index 000000000..d3cc07a48 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json new file mode 100644 index 000000000..e57acc7b5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_orange.json b/src/main/resources/assets/botania/models/item/itemblock/flower_orange.json new file mode 100644 index 000000000..9f6758004 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_pink.json b/src/main/resources/assets/botania/models/item/itemblock/flower_pink.json new file mode 100644 index 000000000..e2e3f146d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_purple.json b/src/main/resources/assets/botania/models/item/itemblock/flower_purple.json new file mode 100644 index 000000000..e8de2aa22 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_red.json b/src/main/resources/assets/botania/models/item/itemblock/flower_red.json new file mode 100644 index 000000000..a72be29fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_silver.json b/src/main/resources/assets/botania/models/item/itemblock/flower_silver.json new file mode 100644 index 000000000..54e5d9208 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_white.json b/src/main/resources/assets/botania/models/item/itemblock/flower_white.json new file mode 100644 index 000000000..e719bb6a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json new file mode 100644 index 000000000..ce43ba47e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flower4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json new file mode 100644 index 000000000..7db03e570 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json new file mode 100644 index 000000000..386070987 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json new file mode 100644 index 000000000..57785a008 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json new file mode 100644 index 000000000..78c2694ed --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json new file mode 100644 index 000000000..a3d4c6d9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json new file mode 100644 index 000000000..766eaea66 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json new file mode 100644 index 000000000..d1741a155 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json new file mode 100644 index 000000000..93bd43215 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json new file mode 100644 index 000000000..b97b05c9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json new file mode 100644 index 000000000..cfd163cc3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json new file mode 100644 index 000000000..12ff0e450 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json new file mode 100644 index 000000000..308c42aba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json new file mode 100644 index 000000000..c99198612 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json new file mode 100644 index 000000000..e289f2fbd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json new file mode 100644 index 000000000..929d50392 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json new file mode 100644 index 000000000..38009d69f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/flowerGlimmering4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json new file mode 100644 index 000000000..eeba54dde --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json new file mode 100644 index 000000000..64c3ce175 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json new file mode 100644 index 000000000..71239c09a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json new file mode 100644 index 000000000..9ccac0b4a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json new file mode 100644 index 000000000..0a3130a28 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json new file mode 100644 index 000000000..a20206e35 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json new file mode 100644 index 000000000..228222a56 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json new file mode 100644 index 000000000..2856a495f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json new file mode 100644 index 000000000..4dc00cbc5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json new file mode 100644 index 000000000..e6b2b5eac --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json new file mode 100644 index 000000000..5eb32af3b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json new file mode 100644 index 000000000..9e71669b4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json new file mode 100644 index 000000000..c3eff9660 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json new file mode 100644 index 000000000..a05ee207e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json new file mode 100644 index 000000000..93653859a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json new file mode 100644 index 000000000..c2b9c4ba4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/mushroom4" + } +} \ No newline at end of file From 1c4ae58377b48b211d7f518c1c28abfe8059882b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 21:08:01 -0500 Subject: [PATCH 811/935] Clean up the pools --- .../client/core/handler/ModelHandler.java | 20 +----- .../common/item/block/ItemBlockPool.java | 14 ++++ .../assets/botania/blockstates/pool.json | 31 ++------- .../botania/models/block/creative_pool.json | 12 ++++ .../models/block/creative_pool_full.json | 7 ++ .../botania/models/block/default_pool.json | 12 ++++ .../models/block/default_pool_full.json | 7 ++ .../botania/models/block/diluted_pool.json | 12 ++++ .../models/block/diluted_pool_full.json | 7 ++ .../botania/models/block/fabulous_pool.json | 12 ++++ .../models/block/fabulous_pool_full.json | 7 ++ .../assets/botania/models/block/pool.json | 68 ------------------- .../{pool_tinted.json => shapes/pool.json} | 1 + .../pool_full.json} | 55 +++++++-------- 14 files changed, 124 insertions(+), 141 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/creative_pool.json create mode 100644 src/main/resources/assets/botania/models/block/creative_pool_full.json create mode 100644 src/main/resources/assets/botania/models/block/default_pool.json create mode 100644 src/main/resources/assets/botania/models/block/default_pool_full.json create mode 100644 src/main/resources/assets/botania/models/block/diluted_pool.json create mode 100644 src/main/resources/assets/botania/models/block/diluted_pool_full.json create mode 100644 src/main/resources/assets/botania/models/block/fabulous_pool.json create mode 100644 src/main/resources/assets/botania/models/block/fabulous_pool_full.json delete mode 100644 src/main/resources/assets/botania/models/block/pool.json rename src/main/resources/assets/botania/models/block/{pool_tinted.json => shapes/pool.json} (98%) rename src/main/resources/assets/botania/models/block/{pool_filled.json => shapes/pool_full.json} (73%) 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 e4c3415cb..1b2871def 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -150,25 +150,6 @@ public final class ModelHandler { /** Special Item Meshers **/ // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper // See https://github.com/MinecraftForge/ForgeGradle/issues/314. - - ModelLoader.registerItemVariants(Item.getItemFromBlock(ModBlocks.pool), - new ModelResourceLocation("botania:pool", "variant=default"), - new ModelResourceLocation("botania:pool", "variant=diluted"), - new ModelResourceLocation("botania:pool", "variant=creative"), - new ModelResourceLocation("botania:pool", "variant=fabulous"), - new ModelResourceLocation("botania:pool", "default_full"), - new ModelResourceLocation("botania:pool", "diluted_full"), - new ModelResourceLocation("botania:pool", "creative_full"), - new ModelResourceLocation("botania:pool", "fabulous_full")); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(ModBlocks.pool), MesherWrapper.of(stack -> { - int meta = stack.getMetadata(); - if (meta < 0 || meta > 3) - meta = 0; - PoolVariant v = PoolVariant.values()[meta]; - boolean renderFull = v == PoolVariant.CREATIVE || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); - return new ModelResourceLocation("botania:pool", renderFull ? v.getName() + "_full" : "variant=" + v.getName()); - })); - ModelLoader.registerItemVariants(elementiumShears, new ModelResourceLocation("botania:elementiumShears", "inventory"), new ModelResourceLocation("botania:dammitReddit", "inventory")); @@ -357,6 +338,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 1dfa544f2..80f5855c8 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -12,18 +12,32 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public ItemBlockPool(Block par2Block) { super(par2Block); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); + return renderFull ? 1F : 0F; + } + }); } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 2cf104169..b4108d997 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -1,31 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:pool_tinted", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "default": { "textures": { "all": "botania:model/pool" } }, - "diluted": { "textures": { "all": "botania:model/dilutedPool" } }, - "creative": { "textures": { "all": "botania:model/infinitePool" } }, - "fabulous": { "textures": { "all": "botania:model/pool" } } - }, - "default_full": [{ - "model": "botania:pool_filled", - "textures": { "all": "botania:model/pool", "liquid": "botania:blocks/manaWater" } - }], - "diluted_full": [{ - "model": "botania:pool_filled", - "textures": { "all": "botania:model/dilutedPool", "liquid": "botania:blocks/manaWater" } - }], - "creative_full": [{ - "model": "botania:pool_filled", - "textures": { "all": "botania:model/infinitePool", "liquid": "botania:blocks/manaWater" } - }], - "fabulous_full": [{ - "model": "botania:pool_filled", - "textures": { "all": "botania:model/pool", "liquid": "botania:blocks/manaWater" } - }] + "variant=default": { "model": "botania:default_pool" }, + "variant=diluted": { "model": "botania:diluted_pool" }, + "variant=creative": { "model": "botania:creative_pool" }, + "variant=fabulous": { "model": "botania:fabulous_pool" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/creative_pool.json b/src/main/resources/assets/botania/models/block/creative_pool.json new file mode 100644 index 000000000..11fa1c65e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/creative_pool.json @@ -0,0 +1,12 @@ +{ + "parent": "botania:block/shapes/pool", + "textures": { + "all": "botania:model/infinitePool" + }, + "overrides": [{ + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/creative_pool_full" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/creative_pool_full.json b/src/main/resources/assets/botania/models/block/creative_pool_full.json new file mode 100644 index 000000000..148cd08fc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/creative_pool_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:model/infinitePool", + "liquid": "botania:blocks/manaWater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_pool.json b/src/main/resources/assets/botania/models/block/default_pool.json new file mode 100644 index 000000000..bbb969142 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/default_pool.json @@ -0,0 +1,12 @@ +{ + "parent": "botania:block/shapes/pool", + "textures": { + "all": "botania:model/pool" + }, + "overrides": [{ + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/default_pool_full" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_pool_full.json b/src/main/resources/assets/botania/models/block/default_pool_full.json new file mode 100644 index 000000000..615f4d40a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/default_pool_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:model/pool", + "liquid": "botania:blocks/manaWater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool.json b/src/main/resources/assets/botania/models/block/diluted_pool.json new file mode 100644 index 000000000..43647054d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/diluted_pool.json @@ -0,0 +1,12 @@ +{ + "parent": "botania:block/shapes/pool", + "textures": { + "all": "botania:model/dilutedPool" + }, + "overrides": [{ + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/diluted_pool_full" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool_full.json b/src/main/resources/assets/botania/models/block/diluted_pool_full.json new file mode 100644 index 000000000..c39b6723c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/diluted_pool_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:model/dilutedPool", + "liquid": "botania:blocks/manaWater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool.json b/src/main/resources/assets/botania/models/block/fabulous_pool.json new file mode 100644 index 000000000..8ae898e5b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fabulous_pool.json @@ -0,0 +1,12 @@ +{ + "parent": "botania:block/shapes/pool", + "textures": { + "all": "botania:model/pool" + }, + "overrides": [{ + "predicate": { + "botania:full": 1 + }, + "model": "botania:block/fabulous_pool_full" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool_full.json b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json new file mode 100644 index 000000000..615f4d40a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:block/shapes/pool_full", + "textures": { + "all": "botania:model/pool", + "liquid": "botania:blocks/manaWater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool.json b/src/main/resources/assets/botania/models/block/pool.json deleted file mode 100644 index 988db7dce..000000000 --- a/src/main/resources/assets/botania/models/block/pool.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "textures": { - "particle": "botania:blocks/livingrock0" - }, - "elements": [ - { - "name": "Base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 1.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ] }, - "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ] }, - "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ] }, - "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } - } - }, - { - "name": "SideSouth", - "from": [ 0.0, 1.0, 15.0 ], - "to": [ 16.0, 8.0, 16.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ] }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "cullface": "south" }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } - } - }, - { - "name": "SideNorth", - "from": [ 0.0, 1.0, 0.0 ], - "to": [ 16.0, 8.0, 1.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "cullface": "north" }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ] }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } - } - }, - { - "name": "SideWest", - "from": [ 0.0, 1.0, 1.0 ], - "to": [ 1.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "cullface": "west" }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ] }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } - } - }, - { - "name": "SideEast", - "from": [ 15.0, 1.0, 1.0 ], - "to": [ 16.0, 8.0, 15.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ] }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "cullface": "east" }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pool_tinted.json b/src/main/resources/assets/botania/models/block/shapes/pool.json similarity index 98% rename from src/main/resources/assets/botania/models/block/pool_tinted.json rename to src/main/resources/assets/botania/models/block/shapes/pool.json index b99d089b9..0a8f0619c 100644 --- a/src/main/resources/assets/botania/models/block/pool_tinted.json +++ b/src/main/resources/assets/botania/models/block/shapes/pool.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "botania:blocks/livingrock0" }, diff --git a/src/main/resources/assets/botania/models/block/pool_filled.json b/src/main/resources/assets/botania/models/block/shapes/pool_full.json similarity index 73% rename from src/main/resources/assets/botania/models/block/pool_filled.json rename to src/main/resources/assets/botania/models/block/shapes/pool_full.json index 081311e4b..6342e2f6d 100644 --- a/src/main/resources/assets/botania/models/block/pool_filled.json +++ b/src/main/resources/assets/botania/models/block/shapes/pool_full.json @@ -1,6 +1,7 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "botania:blocks/livingrock0" + "particle": "#all" }, "elements": [ { @@ -8,12 +9,12 @@ "from": [ 0.0, 0.0, 0.0 ], "to": [ 16.0, 1.0, 16.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ] }, - "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ] }, - "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ] }, - "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "cullface": "down" } + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 4.0, 4.25 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 4.0, 4.0, 8.0, 4.25 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 8.0, 4.0, 12.0, 4.25 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 12.0, 4.0, 16.0, 4.25 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 4.0, 0.0, 8.0, 4.0 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 12.0, 4.0 ], "tintindex": 0, "cullface": "down" } } }, { @@ -21,12 +22,12 @@ "from": [ 0.0, 1.0, 15.0 ], "to": [ 16.0, 8.0, 16.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ] }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "cullface": "south" }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0, "cullface": "south" }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } } }, { @@ -34,12 +35,12 @@ "from": [ 0.0, 1.0, 0.0 ], "to": [ 16.0, 8.0, 1.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "cullface": "west" }, - "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "cullface": "north" }, - "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "cullface": "east" }, - "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ] }, - "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ] }, - "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ] } + "west": { "texture": "#all", "uv": [ 0.0, 0.25, 0.25, 2.0 ], "tintindex": 0, "cullface": "west" }, + "north": { "texture": "#all", "uv": [ 0.25, 0.25, 4.0, 2.0 ], "tintindex": 0, "cullface": "north" }, + "east": { "texture": "#all", "uv": [ 4.0, 0.25, 4.25, 2.0 ], "tintindex": 0, "cullface": "east" }, + "south": { "texture": "#all", "uv": [ 4.25, 0.25, 8.0, 2.0 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 0.25, 0.0, 4.0, 0.25 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 4.25, 8.0, 16.0, 0.25 ], "tintindex": 0 } } }, { @@ -47,10 +48,10 @@ "from": [ 0.0, 1.0, 1.0 ], "to": [ 1.0, 8.0, 15.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "cullface": "west" }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ] }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0, "cullface": "west" }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } } }, { @@ -58,10 +59,10 @@ "from": [ 15.0, 1.0, 1.0 ], "to": [ 16.0, 8.0, 15.0 ], "faces": { - "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ] }, - "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "cullface": "east" }, - "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ] }, - "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ] } + "west": { "texture": "#all", "uv": [ 0.0, 3.5, 3.5, 5.25 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3.75, 3.5, 7.25, 5.25 ], "tintindex": 0, "cullface": "east" }, + "up": { "texture": "#all", "uv": [ 3.5, 1.0, 3.75, 3.5 ], "tintindex": 0 }, + "down": { "texture": "#all", "uv": [ 3.75, 1.0, 4.0, 3.5 ], "tintindex": 0 } } }, { From 4751da9e7b335daf69b50c6a7489c3f63f9fb042 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jul 2016 21:18:48 -0500 Subject: [PATCH 812/935] Panes --- .../botania/client/core/handler/ModelHandler.java | 10 +++------- .../assets/botania/blockstates/bifrostPermPane.json | 9 +-------- .../assets/botania/blockstates/elfGlassPane.json | 9 +-------- .../assets/botania/blockstates/manaGlassPane.json | 9 +-------- .../botania/models/item/itemblock/alfglass_pane.json | 6 ++++++ .../botania/models/item/itemblock/bifrost_pane.json | 6 ++++++ .../botania/models/item/itemblock/managlass_pane.json | 6 ++++++ 7 files changed, 24 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json create mode 100644 src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json 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 1b2871def..d2f98a9cc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -136,7 +136,6 @@ public final class ModelHandler { registerStairs(); registerSlabs(); registerWalls(); - registerPanes(); registerQuartzBlocks(); /** Normal Items **/ @@ -259,7 +258,9 @@ public final class ModelHandler { private static void registerStandardBlocks() { registerBlockStandardPath(ModBlocks.alchemyCatalyst); registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); registerBlockStandardPath(ModBlocks.bifrost); + registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); registerBlockStandardPath(ModBlocks.bifrostPerm); registerBlockStandardPath(ModBlocks.blazeBlock); registerBlockStandardPath(ModBlocks.cacophonium); @@ -290,6 +291,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.manaBomb); registerBlockStandardPath(ModBlocks.manaDetector); registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); registerBlockStandardPath(ModBlocks.manaVoid); registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); registerBlockStandardPath(ModBlocks.prism); @@ -769,12 +771,6 @@ public final class ModelHandler { registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); } - private static void registerPanes() { - registerBlockStandardPath(ModFluffBlocks.alfglassPane); - registerBlockStandardPath(ModFluffBlocks.bifrostPane); - registerBlockStandardPath(ModFluffBlocks.managlassPane); - } - private static void registerQuartzBlocks() { for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { if (b == null) // Dark quartz disabled diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json index 3d16698ae..f26442e9e 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/bifrost" - } - }] + } } } diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index f89c7ffe7..91e8fff09 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/elfGlass" - } - }] + } } } diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index d302a6427..4b9443f11 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -23,13 +23,6 @@ "east": { "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - }, - "inventory": [{ - "transform": "forge:default-item", - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/manaGlass" - } - }] + } } } diff --git a/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json new file mode 100644 index 000000000..421b6da4d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/elfGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json b/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json new file mode 100644 index 000000000..38006dc9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json new file mode 100644 index 000000000..0316bf04a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/manaGlass" + } +} \ No newline at end of file From 3b5c500bc99652c61c2bef4da41007b974b699e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 10:12:12 -0500 Subject: [PATCH 813/935] Clean up meshers --- .../client/core/handler/ModelHandler.java | 72 +++---------------- .../botania/common/item/ItemGrassHorn.java | 11 +++ .../botania/common/item/ItemManaCookie.java | 10 +++ .../tool/elementium/ItemElementiumShears.java | 7 ++ .../common/item/relic/ItemInfiniteFruit.java | 10 ++- .../botania/models/item/elementiumShears.json | 11 ++- .../botania/models/item/grassHorn0.json | 8 ++- .../botania/models/item/grassHorn1.json | 8 ++- .../botania/models/item/grassHorn2.json | 8 ++- .../botania/models/item/infiniteFruit.json | 8 ++- .../botania/models/item/manaCookie.json | 8 ++- .../assets/botania/models/item/vuvuzela.json | 2 +- 12 files changed, 88 insertions(+), 75 deletions(-) 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 d2f98a9cc..888616e40 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -16,12 +16,10 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockSkull; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -124,13 +122,10 @@ public final class ModelHandler { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - /** Subtile block models **/ registerSubtiles(); - /** Custom statemappers **/ registerStateMappers(); - /** ItemBlocks **/ registerStandardBlocks(); registerPavement(); registerStairs(); @@ -138,50 +133,12 @@ public final class ModelHandler { registerWalls(); registerQuartzBlocks(); - /** Normal Items **/ registerStandardItems(); registerTESRItems(); registerManaResources(); registerRunes(); registerLens(); registerBrews(); - - /** Special Item Meshers **/ - // Cannot use lambdas directly yet because FG/SS can't reobfuscate them, need a dummy wrapper - // See https://github.com/MinecraftForge/ForgeGradle/issues/314. - ModelLoader.registerItemVariants(elementiumShears, - new ModelResourceLocation("botania:elementiumShears", "inventory"), - new ModelResourceLocation("botania:dammitReddit", "inventory")); - ModelLoader.setCustomMeshDefinition(elementiumShears, MesherWrapper.of(stack -> - stack.getDisplayName().equalsIgnoreCase("dammit reddit") - ? new ModelResourceLocation("botania:dammitReddit", "inventory") - : new ModelResourceLocation("botania:elementiumShears", "inventory"))); - - ModelLoader.registerItemVariants(grassHorn, - new ModelResourceLocation("botania:grassHorn0", "inventory"), - new ModelResourceLocation("botania:grassHorn1", "inventory"), - new ModelResourceLocation("botania:grassHorn2", "inventory"), - new ModelResourceLocation("botania:vuvuzela", "inventory")); - ModelLoader.setCustomMeshDefinition(grassHorn, MesherWrapper.of(stack -> - stack.getDisplayName().toLowerCase().contains("vuvuzela") - ? new ModelResourceLocation("botania:vuvuzela", "inventory") - : new ModelResourceLocation("botania:grassHorn" + stack.getMetadata(), "inventory"))); - - ModelLoader.registerItemVariants(infiniteFruit, - new ModelResourceLocation("botania:infiniteFruit", "inventory"), - new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, MesherWrapper.of(stack -> - ItemInfiniteFruit.isBoot(stack) - ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"))); - - ModelLoader.registerItemVariants(manaCookie, - new ModelResourceLocation("botania:manaCookie", "inventory"), - new ModelResourceLocation("botania:totalBiscuit", "inventory")); - ModelLoader.setCustomMeshDefinition(manaCookie, MesherWrapper.of(stack -> - stack.getDisplayName().toLowerCase().equals("totalbiscuit") - ? new ModelResourceLocation("botania:totalBiscuit", "inventory") - : new ModelResourceLocation("botania:manaCookie", "inventory"))); } private static void registerSubtiles() { @@ -388,6 +345,7 @@ public final class ModelHandler { registerItemModel(elementiumShovel); registerItemModel(elementiumAxe); registerItemModel(elementiumSword); + registerItemModel(elementiumShears); registerItemModel(terrasteelHelm); registerItemModel(terrasteelHelmRevealing); @@ -457,6 +415,8 @@ public final class ModelHandler { registerItemModel(auraRing); registerItemModel(auraRingGreater); registerItemModel(spark); + registerItemModel(manaCookie); + registerItemModel(infiniteFruit); registerItemModel(waterRing); registerItemModel(miningRing); @@ -500,6 +460,7 @@ public final class ModelHandler { registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); registerItemModelMetas(virus, LibItemNames.VIRUS, 2); + registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } // Only for models that absolutely can't be converted to JSON. Use VERY sparingly @@ -560,19 +521,19 @@ public final class ModelHandler { ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewFlask, MesherWrapper.of(stack -> { + ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - })); + }); for (int i = 0; i < 4; i++) { ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewVial, MesherWrapper.of(stack -> { + ModelLoader.setCustomMeshDefinition(brewVial, stack -> { int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - })); + }); } private static void registerStateMappers() { @@ -873,21 +834,4 @@ public final class ModelHandler { } private ModelHandler() {} - - private interface MesherWrapper extends ItemMeshDefinition { - - static MesherWrapper of(MesherWrapper w) { - return w; - } - - ModelResourceLocation getLocation(ItemStack stack); - - @Nonnull - @Override - default ModelResourceLocation getModelLocation(@Nonnull ItemStack stack) { - return getLocation(stack); - } - - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index d225b9729..48a5a54d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -20,11 +20,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -33,11 +35,14 @@ import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.Random; public class ItemGrassHorn extends ItemMod { @@ -48,6 +53,12 @@ public class ItemGrassHorn extends ItemMod { super(LibItemNames.GRASS_HORN); setMaxStackSize(1); setHasSubtypes(true); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 7134cb647..a90063f99 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.item; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -25,6 +27,8 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Locale; public class ItemManaCookie extends ItemFood { @@ -34,6 +38,12 @@ public class ItemManaCookie extends ItemFood { setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "totalbiscuit"), new IItemPropertyGetter() { + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F; + } + }); } @Override 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 4f6be4ed2..f1e51222f 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 @@ -8,10 +8,12 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -19,15 +21,20 @@ import net.minecraftforge.common.IShearable; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; +import java.util.Locale; import java.util.Random; public class ItemElementiumShears extends ItemManasteelShears { public ItemElementiumShears() { super(LibItemNames.ELEMENTIUM_SHEARS); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "reddit"), + (stack, worldIn, entityIn) -> stack.getDisplayName().equalsIgnoreCase("dammit reddit") ? 1F: 0F); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 9cae941e0..2479fefe8 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -13,23 +13,29 @@ package vazkii.botania.common.item.relic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Locale; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "boot"), (stack, worldIn, entityIn) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F); } @Override @@ -69,8 +75,8 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } } - public static boolean isBoot(ItemStack par1ItemStack) { - String name = par1ItemStack.getDisplayName().toLowerCase().trim(); + private static boolean isBoot(ItemStack par1ItemStack) { + String name = par1ItemStack.getDisplayName().toLowerCase(Locale.ROOT).trim(); return name.equals("das boot"); } diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumShears.json index d7b2f9a53..70b29c93f 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumShears.json @@ -1,7 +1,12 @@ { "parent": "minecraft:item/handheld", - "textures": - { + "textures": { "layer0": "botania:items/elementiumShears" - } + }, + "overrides": [{ + "predicate": { + "botania:reddit": 1 + }, + "model": "botania:item/dammitReddit" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grassHorn0.json index 0109ba579..41fe77a90 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn0.json +++ b/src/main/resources/assets/botania/models/item/grassHorn0.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn0" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grassHorn1.json index 179d15288..519d2b035 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn1.json +++ b/src/main/resources/assets/botania/models/item/grassHorn1.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn1" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grassHorn2.json index e77f4e412..96e0cadc3 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn2.json +++ b/src/main/resources/assets/botania/models/item/grassHorn2.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/grassHorn2" - } + }, + "overrides": [{ + "predicate": { + "botania:vuvuzela": 1 + }, + "model": "botania:item/vuvuzela" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infiniteFruit.json b/src/main/resources/assets/botania/models/item/infiniteFruit.json index d0bd03eee..bac332e08 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruit.json +++ b/src/main/resources/assets/botania/models/item/infiniteFruit.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/infiniteFruit" - } + }, + "overrides": [{ + "predicate": { + "botania:boot": 1 + }, + "model": "botania:item/infiniteFruitBoot" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manaCookie.json index f1fd19778..3f825a6c8 100644 --- a/src/main/resources/assets/botania/models/item/manaCookie.json +++ b/src/main/resources/assets/botania/models/item/manaCookie.json @@ -2,5 +2,11 @@ "parent": "minecraft:item/generated", "textures": { "layer0": "botania:items/manaCookie" - } + }, + "overrides": [{ + "predicate": { + "botania:totalbiscuit": 1 + }, + "model": "botania:item/totalBiscuit" + }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vuvuzela.json b/src/main/resources/assets/botania/models/item/vuvuzela.json index 365e71f56..20f0310d8 100644 --- a/src/main/resources/assets/botania/models/item/vuvuzela.json +++ b/src/main/resources/assets/botania/models/item/vuvuzela.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "botania:items/vuvuzela" } From 881e271a0beab65236613039c69434564882b51d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 10:36:58 -0500 Subject: [PATCH 814/935] Lambdafy everything as they now work --- .../client/core/handler/ColorHandler.java | 73 ++++++++----------- .../botania/common/item/ItemGrassHorn.java | 8 +- .../botania/common/item/ItemManaCookie.java | 8 +- .../botania/common/item/ItemManaGun.java | 14 +--- .../botania/common/item/ItemSpawnerMover.java | 7 +- .../botania/common/item/ItemTwigWand.java | 7 +- .../common/item/block/ItemBlockPool.java | 11 +-- .../armor/manaweave/ItemManaweaveArmor.java | 7 +- .../item/equipment/bauble/ItemMagnetRing.java | 7 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 25 +++---- .../tool/manasteel/ItemManasteelSword.java | 8 +- .../tool/terrasteel/ItemTerraAxe.java | 13 ++-- .../tool/terrasteel/ItemTerraPick.java | 14 +--- .../common/item/rod/ItemTornadoRod.java | 7 +- 14 files changed, 64 insertions(+), 145 deletions(-) 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 8ff802be2..5abbfddff 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -41,25 +41,17 @@ public final class ColorHandler { // 16 colors blocks.registerBlockColorHandler( - new IBlockColor() { - @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - }, + (state, world, pos, tintIndex) -> state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue, ModBlocks.specialFlower, ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock); // Pool blocks.registerBlockColorHandler( - new IBlockColor() { - @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); - } else { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } + (state, world, pos, tintIndex) -> { + if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); + } else { + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } }, ModBlocks.pool @@ -67,47 +59,40 @@ public final class ColorHandler { // Spreader blocks.registerBlockColorHandler( - new IBlockColor() { - @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) - return 0xFFFFFF; - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.HSBtoRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); - } + (state, world, pos, tintIndex) -> { + if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) + return 0xFFFFFF; + float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; + return Color.HSBtoRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); }, ModBlocks.spreader ); // Platforms blocks.registerBlockColorHandler( - new IBlockColor() { - @Override - public int colorMultiplier(@Nonnull IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) { - if (world != null && pos != null) { - TileEntity tile = world.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState camoState = camo.camoState; - if(camoState != null) - return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); - } + (state, world, pos, tintIndex) -> { + if (world != null && pos != null) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo + ? 0xFFFFFF + : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); } - return 0xFFFFFF; } + return 0xFFFFFF; }, ModBlocks.platform); ItemColors items = Minecraft.getMinecraft().getItemColors(); - items.registerItemColorHandler(new IItemColor() { - @Override - public int getColorFromItemstack(@Nonnull ItemStack stack, int tintIndex) { - Item item = stack.getItem(); - if (item instanceof IColorable) { - return ((IColorable) item).getColorFromItemStack(stack, tintIndex); - } else { - return 0xFFFFFF; - } + items.registerItemColorHandler((stack, tintIndex) -> { + Item item = stack.getItem(); + if (item instanceof IColorable) { + return ((IColorable) item).getColorFromItemStack(stack, tintIndex); + } else { + return 0xFFFFFF; } }, ModItems.manaResource, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 48a5a54d2..567eabd1b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -53,12 +53,8 @@ public class ItemGrassHorn extends ItemMod { super(LibItemNames.GRASS_HORN); setMaxStackSize(1); setHasSubtypes(true); - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), new IItemPropertyGetter() { - @Override - public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { - return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "vuvuzela"), + (stack, worldIn, entityIn) -> stack.getDisplayName().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index a90063f99..ac72c995a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -38,12 +38,8 @@ public class ItemManaCookie extends ItemFood { setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "totalbiscuit"), new IItemPropertyGetter() { - @Override - public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { - return stack.getDisplayName().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F; - } - }); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "totalbiscuit"), + (stack, worldIn, entityIn) -> stack.getDisplayName().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index a15af29f6..5fd2d2163 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -76,18 +76,8 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); - addPropertyOverride(new ResourceLocation("botania", "clip"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { - return hasClip(itemStack) ? 1 : 0; - } - }); - addPropertyOverride(new ResourceLocation("botania", "desu"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { - return isSugoiKawaiiDesuNe(itemStack) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "clip"), (itemStack, world, entityLivingBase) -> hasClip(itemStack) ? 1 : 0); + addPropertyOverride(new ResourceLocation("botania", "desu"), (itemStack, world, entityLivingBase) -> isSugoiKawaiiDesuNe(itemStack) ? 1 : 0); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index eb708afc9..e2c69d917 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -46,12 +46,7 @@ public class ItemSpawnerMover extends ItemMod { public ItemSpawnerMover() { super(LibItemNames.SPAWNER_MOVER); setMaxStackSize(1); - addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - return hasData(stack) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "full"), (stack, worldIn, entityIn) -> hasData(stack) ? 1 : 0); } public static NBTTagCompound getSpawnerTag(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index b9766d45e..3d425c8b8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -69,12 +69,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { public ItemTwigWand() { super(LibItemNames.TWIG_WAND); setMaxStackSize(1); - addPropertyOverride(new ResourceLocation("botania", "bindmode"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - return getBindMode(stack) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "bindmode"), (stack, worldIn, entityIn) -> getBindMode(stack) ? 1 : 0); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 80f5855c8..22114525f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -31,13 +31,10 @@ public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { public ItemBlockPool(Block par2Block) { super(par2Block); - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), new IItemPropertyGetter() { - @Override - public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { - boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); - return renderFull ? 1F : 0F; - } - }); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), (stack, worldIn, entityIn) -> { + boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || (stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull")); + return renderFull ? 1F : 0F; + }); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 894592791..e38abef77 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -40,12 +40,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); - addPropertyOverride(new ResourceLocation("botania", "holiday"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - return ClientProxy.jingleTheBells ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "holiday"), (stack, worldIn, entityIn) -> ClientProxy.jingleTheBells ? 1 : 0); } @Override 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 b39ea6b84..4cb5a750f 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 @@ -56,12 +56,7 @@ public class ItemMagnetRing extends ItemBauble { public ItemMagnetRing(String name, int range) { super(name); this.range = range; - addPropertyOverride(new ResourceLocation("botania", "on"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - return ItemMagnetRing.getCooldown(stack) <= 0 ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "on"), (stack, worldIn, entityIn) -> ItemMagnetRing.getCooldown(stack) <= 0 ? 1 : 0); } @SubscribeEvent 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 5ca7c91e7..d076d0e1a 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 @@ -62,20 +62,17 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setMaxDamage(500); - addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - if (entityIn == null) - { - return 0.0F; - } - else - { - ItemStack itemstack = entityIn.getActiveItemStack(); - return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (float)(stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; - } - } - }); + addPropertyOverride(new ResourceLocation("minecraft:pull"), (stack, worldIn, entityIn) -> { + if (entityIn == null) + { + return 0.0F; + } + else + { + ItemStack itemstack = entityIn.getActiveItemStack(); + return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (float)(stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; + } + }); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 7760c64a8..bc8254ac7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -46,12 +46,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { setCreativeTab(BotaniaCreativeTab.INSTANCE); GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); - addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World worldIn, EntityLivingBase entityIn) { - return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "elucidator"), + (stack, worldIn, entityIn) -> "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0); } @Nonnull 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 b8c2b44e9..45c2d870e 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 @@ -81,14 +81,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); MinecraftForge.EVENT_BUS.register(this); this.attackSpeed = -3f; - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack stack, World world, EntityLivingBase entity) { - if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) - return 0; - return 1; - } - }); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), (stack, world, entity) -> { + if(entity instanceof EntityPlayer && !shouldBreak(((EntityPlayer) entity))) + return 0; + return 1; + }); } private boolean shouldBreak(EntityPlayer player) { 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 cbbd01944..0b6f8762d 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 @@ -81,18 +81,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); GameRegistry.addRecipe(new TerraPickTippingRecipe()); RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, Category.SHAPELESS, ""); - addPropertyOverride(new ResourceLocation("botania", "tipped"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { - return isTipped(itemStack) ? 1 : 0; - } - }); - addPropertyOverride(new ResourceLocation("botania", "enabled"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { - return isEnabled(itemStack) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "tipped"), (itemStack, world, entityLivingBase) -> isTipped(itemStack) ? 1 : 0); + addPropertyOverride(new ResourceLocation("botania", "enabled"), (itemStack, world, entityLivingBase) -> isEnabled(itemStack) ? 1 : 0); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 0ac7595db..e7176bbab 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -56,12 +56,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi super(LibItemNames.TORNADO_ROD); setMaxDamage(MAX_DAMAGE); setMaxStackSize(1); - addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { - @Override - public float apply(@Nonnull ItemStack itemStack, World world, EntityLivingBase entityLivingBase) { - return isFlying(itemStack) ? 1 : 0; - } - }); + addPropertyOverride(new ResourceLocation("botania", "flying"), (stack, world, living) -> isFlying(stack) ? 1 : 0); } @Override From fbd9917fd41e57726440d250ede8462dd26b0c25 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 13:18:46 -0500 Subject: [PATCH 815/935] FOld more methods in --- .../client/core/handler/ModelHandler.java | 119 ++++-------------- 1 file changed, 24 insertions(+), 95 deletions(-) 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 888616e40..ecac53730 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -104,12 +104,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; -import vazkii.botania.common.item.relic.ItemInfiniteFruit; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; import java.util.List; import java.util.Locale; import java.util.function.IntFunction; @@ -127,17 +125,12 @@ public final class ModelHandler { registerStateMappers(); registerStandardBlocks(); - registerPavement(); registerStairs(); registerSlabs(); - registerWalls(); registerQuartzBlocks(); registerStandardItems(); registerTESRItems(); - registerManaResources(); - registerRunes(); - registerLens(); registerBrews(); } @@ -219,6 +212,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.bifrost); registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); registerBlockStandardPath(ModBlocks.bifrostPerm); + registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); registerBlockStandardPath(ModBlocks.blazeBlock); registerBlockStandardPath(ModBlocks.cacophonium); registerBlockStandardPath(ModBlocks.cellBlock); @@ -229,11 +223,9 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.corporeaRetainer); registerBlockVariant(ModBlocks.dirtPath); registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); - Item item = Item.getItemFromBlock(ModBlocks.doubleFlower2); // todo make this look pretty :( - for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { - ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/double_flower_" + color.getName(), "inventory")); - } + registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); registerBlockStandardPath(ModBlocks.distributor); + registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); registerBlockStandardPath(ModBlocks.elfGlass); registerBlockStandardPath(ModBlocks.enchantedSoil); registerBlockStandardPath(ModBlocks.enchanter); @@ -245,12 +237,17 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.ghostRail); registerBlockStandardPath(ModBlocks.incensePlate); registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); + registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); + registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); registerBlockStandardPath(ModBlocks.manaBomb); registerBlockStandardPath(ModBlocks.manaDetector); registerBlockStandardPath(ModBlocks.manaGlass); registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); registerBlockStandardPath(ModBlocks.manaVoid); registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); + // Explicit mapping needed because saved meta does not match EnumDyeColor + EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN }; + registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName()); registerBlockStandardPath(ModBlocks.prism); registerBlockStandardPath(ModBlocks.pistonRelay); registerBlockStandardPath(ModBlocks.pump); @@ -410,13 +407,17 @@ public final class ModelHandler { registerItemModel(aesirRing); registerItemModel(baubleBox); registerItemModel(tinyPlanet); + registerItemModelMetas(manaResource, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); registerItemModel(manaRing); registerItemModel(manaRingGreater); + String[] runeNames = { "water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride" }; + registerItemModelMetas(rune, runeNames.length, i -> "rune_" + runeNames[i]); registerItemModel(auraRing); registerItemModel(auraRingGreater); registerItemModel(spark); registerItemModel(manaCookie); registerItemModel(infiniteFruit); + registerItemModelMetas(lens, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]); registerItemModel(waterRing); registerItemModel(miningRing); @@ -491,28 +492,6 @@ public final class ModelHandler { ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } - private static void registerManaResources() { - Item item = manaResource; - for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { - String name = "botania:" + LibItemNames.MANA_RESOURCE_NAMES[i]; - ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); - } - } - - private static void registerRunes() { - List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); - for (int i = 0; i < variantNames.size(); i++) { - ModelLoader.setCustomModelResourceLocation(rune, i, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); - } - } - - private static void registerLens() { - int counter = 0; - for (String s : LibItemNames.LENS_NAMES) { - ModelLoader.setCustomModelResourceLocation(lens, counter++, new ModelResourceLocation("botania:" + s, "inventory")); - } - } - private static void registerBrews() { ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); @@ -620,42 +599,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); } - private static void registerPavement() { - Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); - String name = ForgeRegistries.BLOCKS.getKey(ModFluffBlocks.pavement).toString(); - - for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { - String variant = "color=" + e.getName(); - switch (e) { // Explicit switch needed because saved meta does not match EnumDyeColor - case BLACK: { - ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, variant)); - break; - } - case BLUE: { - ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, variant)); - break; - } - case RED: { - ModelLoader.setCustomModelResourceLocation(item, 3, new ModelResourceLocation(name, variant)); - break; - } - case YELLOW: { - ModelLoader.setCustomModelResourceLocation(item, 4, new ModelResourceLocation(name, variant)); - break; - } - case GREEN: { - ModelLoader.setCustomModelResourceLocation(item, 5, new ModelResourceLocation(name, variant)); - break; - } - case WHITE: - default: { - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, variant)); - break; - } - } - } - } - private static void registerStairs() { for (Block b : ModFluffBlocks.pavementStairs) { registerBlockStandardPath(b); @@ -721,26 +664,12 @@ public final class ModelHandler { registerBlockVariant(ModFluffBlocks.tileSlab, "half=bottom"); } - private static void registerWalls() { - Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); - for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + variant.getName() + "_wall", "inventory")); - } - - registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); - registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); - } - private static void registerQuartzBlocks() { + String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { if (b == null) // Dark quartz disabled continue; - Item item = Item.getItemFromBlock(b); - 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")); + registerBlockVariantMetas(b, 3, i -> variantNames[i]); } } @@ -757,11 +686,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 = 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")); - } + registerItemModelMetas(item, range, i -> item.getRegistryName().getResourcePath()); } /** @@ -769,13 +694,17 @@ public final class ModelHandler { * Range is exclusive upper bound */ private static void registerItemModelMetas(Item item, String loc, int range) { - for(int i = 0; i < range; i++) { - String name = "botania:" + loc + i; - ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); - ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, "inventory")); - } + registerItemModelMetas(item, range, i -> loc + i); } + private static void registerItemModelMetas(Item item, int maxExclusive, IntFunction metaToName) { + for (int i = 0; i < maxExclusive; i++) { + ModelLoader.setCustomModelResourceLocation( + item, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + metaToName.apply(i), "inventory") + ); + } + } // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // private static void registerBlockVariant(Block b) { From e7e5b1b484e0ea2eab48148c74fa243c08ca5685 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 14:01:14 -0500 Subject: [PATCH 816/935] Migrate other meshers --- .../client/core/handler/ModelHandler.java | 29 ++------------ .../common/item/brew/ItemBrewBase.java | 13 +++---- .../common/item/brew/ItemBrewFlask.java | 2 +- .../common/item/brew/ItemBrewVial.java | 2 +- .../assets/botania/models/item/brewFlask.json | 39 +++++++++++++++++++ .../item/{flask1_1.json => brewFlask_1.json} | 0 .../item/{flask1_2.json => brewFlask_2.json} | 0 .../item/{flask1_3.json => brewFlask_3.json} | 0 .../item/{flask1_4.json => brewFlask_4.json} | 0 .../item/{flask1_5.json => brewFlask_5.json} | 0 .../assets/botania/models/item/brewVial.json | 27 +++++++++++++ .../item/{vial1_1.json => brewVial_1.json} | 0 .../item/{vial1_2.json => brewVial_2.json} | 0 .../item/{vial1_3.json => brewVial_3.json} | 0 .../assets/botania/models/item/flask1_0.json | 7 ---- .../assets/botania/models/item/vial1_0.json | 7 ---- 16 files changed, 78 insertions(+), 48 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/brewFlask.json rename src/main/resources/assets/botania/models/item/{flask1_1.json => brewFlask_1.json} (100%) rename src/main/resources/assets/botania/models/item/{flask1_2.json => brewFlask_2.json} (100%) rename src/main/resources/assets/botania/models/item/{flask1_3.json => brewFlask_3.json} (100%) rename src/main/resources/assets/botania/models/item/{flask1_4.json => brewFlask_4.json} (100%) rename src/main/resources/assets/botania/models/item/{flask1_5.json => brewFlask_5.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/brewVial.json rename src/main/resources/assets/botania/models/item/{vial1_1.json => brewVial_1.json} (100%) rename src/main/resources/assets/botania/models/item/{vial1_2.json => brewVial_2.json} (100%) rename src/main/resources/assets/botania/models/item/{vial1_3.json => brewVial_3.json} (100%) delete mode 100644 src/main/resources/assets/botania/models/item/flask1_0.json delete mode 100644 src/main/resources/assets/botania/models/item/vial1_0.json 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 ecac53730..5bcb9b209 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; @@ -131,7 +130,6 @@ public final class ModelHandler { registerStandardItems(); registerTESRItems(); - registerBrews(); } private static void registerSubtiles() { @@ -418,6 +416,10 @@ public final class ModelHandler { registerItemModel(manaCookie); registerItemModel(infiniteFruit); registerItemModelMetas(lens, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]); + ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); + ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); + registerItemModel(brewFlask); + registerItemModel(brewVial); registerItemModel(waterRing); registerItemModel(miningRing); @@ -492,29 +494,6 @@ public final class ModelHandler { ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); } - private static void registerBrews() { - ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); - ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); - - for (int i = 0; i < 6; i++) { - ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); - } - - ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { - int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); - return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - }); - - for (int i = 0; i < 4; i++) { - ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); - } - - ModelLoader.setCustomMeshDefinition(brewVial, stack -> { - int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); - return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - }); - } - private static void registerStateMappers() { // Override to let custom model loader work, see SpecialFlowerModel ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); 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 f09078471..25346cf71 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -17,6 +17,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -25,6 +26,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -39,8 +41,10 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.awt.*; import java.util.List; @@ -49,22 +53,17 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; - private final String name; - private final String texName; private final int swigs; private final int drinkSpeed; private final ItemStack baseItem; - public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { + public ItemBrewBase(String name, int swigs, int drinkSpeed, ItemStack baseItem) { super(name); - this.name = name; - this.texName = texName; this.swigs = swigs; this.drinkSpeed = drinkSpeed; this.baseItem = baseItem; setMaxStackSize(1); - setMaxDamage(swigs); - setNoRepair(); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "swigs_taken"), (stack, world, entity) -> swigs - getSwigsLeft(stack)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java index 5bded703a..0a9ba330c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java @@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemBrewFlask extends ItemBrewBase { public ItemBrewFlask() { - super(LibItemNames.BREW_FLASK, LibItemNames.FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1)); + super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1)); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java index 6ebfeeec3..d62840bf9 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java @@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemBrewVial extends ItemBrewBase { public ItemBrewVial() { - super(LibItemNames.BREW_VIAL, LibItemNames.VIAL, 4, 32, new ItemStack(ModItems.vial)); + super(LibItemNames.BREW_VIAL, 4, 32, new ItemStack(ModItems.vial)); } } diff --git a/src/main/resources/assets/botania/models/item/brewFlask.json b/src/main/resources/assets/botania/models/item/brewFlask.json new file mode 100644 index 000000000..9cdf4a51d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brewFlask.json @@ -0,0 +1,39 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_0" + }, + "overrides": [ + { + "predicate": { + "botania:swigs_taken": 1 + }, + "model": "botania:item/brewFlask_1" + }, + { + "predicate": { + "botania:swigs_taken": 2 + }, + "model": "botania:item/brewFlask_2" + }, + { + "predicate": { + "botania:swigs_taken": 3 + }, + "model": "botania:item/brewFlask_3" + }, + { + "predicate": { + "botania:swigs_taken": 4 + }, + "model": "botania:item/brewFlask_4" + }, + { + "predicate": { + "botania:swigs_taken": 5 + }, + "model": "botania:item/brewFlask_5" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_1.json b/src/main/resources/assets/botania/models/item/brewFlask_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/flask1_1.json rename to src/main/resources/assets/botania/models/item/brewFlask_1.json diff --git a/src/main/resources/assets/botania/models/item/flask1_2.json b/src/main/resources/assets/botania/models/item/brewFlask_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/flask1_2.json rename to src/main/resources/assets/botania/models/item/brewFlask_2.json diff --git a/src/main/resources/assets/botania/models/item/flask1_3.json b/src/main/resources/assets/botania/models/item/brewFlask_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/flask1_3.json rename to src/main/resources/assets/botania/models/item/brewFlask_3.json diff --git a/src/main/resources/assets/botania/models/item/flask1_4.json b/src/main/resources/assets/botania/models/item/brewFlask_4.json similarity index 100% rename from src/main/resources/assets/botania/models/item/flask1_4.json rename to src/main/resources/assets/botania/models/item/brewFlask_4.json diff --git a/src/main/resources/assets/botania/models/item/flask1_5.json b/src/main/resources/assets/botania/models/item/brewFlask_5.json similarity index 100% rename from src/main/resources/assets/botania/models/item/flask1_5.json rename to src/main/resources/assets/botania/models/item/brewFlask_5.json diff --git a/src/main/resources/assets/botania/models/item/brewVial.json b/src/main/resources/assets/botania/models/item/brewVial.json new file mode 100644 index 000000000..42d0aef20 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brewVial.json @@ -0,0 +1,27 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_0" + }, + "overrides": [ + { + "predicate": { + "botania:swigs_taken": 1 + }, + "model": "botania:item/brewVial_1" + }, + { + "predicate": { + "botania:swigs_taken": 2 + }, + "model": "botania:item/brewVial_2" + }, + { + "predicate": { + "botania:swigs_taken": 3 + }, + "model": "botania:item/brewVial_3" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_1.json b/src/main/resources/assets/botania/models/item/brewVial_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/vial1_1.json rename to src/main/resources/assets/botania/models/item/brewVial_1.json diff --git a/src/main/resources/assets/botania/models/item/vial1_2.json b/src/main/resources/assets/botania/models/item/brewVial_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/vial1_2.json rename to src/main/resources/assets/botania/models/item/brewVial_2.json diff --git a/src/main/resources/assets/botania/models/item/vial1_3.json b/src/main/resources/assets/botania/models/item/brewVial_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/vial1_3.json rename to src/main/resources/assets/botania/models/item/brewVial_3.json diff --git a/src/main/resources/assets/botania/models/item/flask1_0.json b/src/main/resources/assets/botania/models/item/flask1_0.json deleted file mode 100644 index b0f86a4c0..000000000 --- a/src/main/resources/assets/botania/models/item/flask1_0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/flask0", - "layer1": "botania:items/flask1_0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_0.json b/src/main/resources/assets/botania/models/item/vial1_0.json deleted file mode 100644 index 90c9f9b14..000000000 --- a/src/main/resources/assets/botania/models/item/vial1_0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/vial0", - "layer1": "botania:items/vial1_0" - } -} \ No newline at end of file From 179ca23f6c20d1b9dbcac2a5ef4e430453fa0a99 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 15:09:05 -0500 Subject: [PATCH 817/935] Items now 'own' their own model registration! --- .../client/core/handler/ModelHandler.java | 199 ++---------------- .../botania/client/render/IModelRegister.java | 12 ++ .../botania/common/item/Item16Colors.java | 9 + .../botania/common/item/ItemAncientWill.java | 6 + .../common/item/ItemBlackHoleTalisman.java | 7 + .../botania/common/item/ItemBlackLotus.java | 9 +- .../botania/common/item/ItemBottledMana.java | 7 + .../common/item/ItemCorporeaSpark.java | 9 + .../botania/common/item/ItemCraftPattern.java | 9 + .../botania/common/item/ItemGaiaHead.java | 9 + .../botania/common/item/ItemGrassHorn.java | 9 + .../botania/common/item/ItemGrassSeeds.java | 9 + .../botania/common/item/ItemLaputaShard.java | 8 +- .../botania/common/item/ItemLexicon.java | 11 +- .../vazkii/botania/common/item/ItemMod.java | 13 +- .../botania/common/item/ItemSignalFlare.java | 7 + .../botania/common/item/ItemSlimeBottle.java | 9 + .../botania/common/item/ItemSparkUpgrade.java | 9 + .../common/item/ItemTemperanceStone.java | 9 +- .../botania/common/item/ItemThornChakram.java | 7 + .../botania/common/item/ItemTwigWand.java | 8 + .../vazkii/botania/common/item/ItemVirus.java | 7 + .../botania/common/item/brew/ItemVial.java | 11 + .../armor/manasteel/ItemManasteelArmor.java | 11 +- .../equipment/bauble/ItemBaubleCosmetic.java | 7 + .../equipment/bauble/ItemFlightTiara.java | 7 + .../equipment/tool/bow/ItemLivingwoodBow.java | 12 +- .../tool/manasteel/ItemManasteelAxe.java | 12 +- .../tool/manasteel/ItemManasteelPick.java | 12 +- .../tool/manasteel/ItemManasteelShears.java | 13 +- .../tool/manasteel/ItemManasteelShovel.java | 12 +- .../tool/manasteel/ItemManasteelSword.java | 12 +- .../botania/common/item/lens/ItemLens.java | 8 + .../item/material/ItemManaResource.java | 7 + .../common/item/material/ItemQuartz.java | 11 +- .../common/item/material/ItemRune.java | 10 + .../common/item/record/ItemModRecord.java | 12 +- 37 files changed, 340 insertions(+), 199 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/IModelRegister.java 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 5bcb9b209..9099887ec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -45,6 +45,7 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.model.SpecialFlowerModel; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; @@ -101,8 +102,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.brew.ItemBrewBase; -import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -128,7 +127,12 @@ public final class ModelHandler { registerSlabs(); registerQuartzBlocks(); - registerStandardItems(); + for (Item item : Item.REGISTRY) { + if (item.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) + && item instanceof IModelRegister) + ((IModelRegister) item).registerModels(); + } + registerTESRItems(); } @@ -271,7 +275,7 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons - registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); + registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); // Item models which all use the same base model and recolored by render layer registerBlockVariantMetas(ModBlocks.manaBeacon, EnumDyeColor.values().length, "normal"); @@ -298,174 +302,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } - private static void registerStandardItems() { - registerItemModel(manasteelSword); - registerItemModel(spawnerMover); - registerItemModel(terraPick); - registerItemModel(magnetRing); - registerItemModel(magnetRingGreater); - registerItemModel(manaGun); - registerItemModel(tornadoRod); - - registerItemModel(twigWand); - registerItemModel(pestleAndMortar); - registerItemModel(blackLotus); - registerItemModel(blackLotus, 1); - ModelLoader.registerItemVariants(lexicon, new ModelResourceLocation("botania:lexicon_default", "inventory")); - registerItemModel(lexicon); - - registerItemModel(manasteelHelm); - registerItemModel(manasteelHelmRevealing); - registerItemModel(manasteelChest); - registerItemModel(manasteelLegs); - registerItemModel(manasteelBoots); - - registerItemModel(manasteelPick); - registerItemModel(manasteelShovel); - registerItemModel(manasteelAxe); - registerItemModel(manasteelShears); - - registerItemModel(manaweaveHelm); - registerItemModel(manaweaveChest); - registerItemModel(manaweaveLegs); - registerItemModel(manaweaveBoots); - - registerItemModel(elementiumHelm); - registerItemModel(elementiumHelmRevealing); - registerItemModel(elementiumChest); - registerItemModel(elementiumLegs); - registerItemModel(elementiumBoots); - - registerItemModel(elementiumPick); - registerItemModel(elementiumShovel); - registerItemModel(elementiumAxe); - registerItemModel(elementiumSword); - registerItemModel(elementiumShears); - - registerItemModel(terrasteelHelm); - registerItemModel(terrasteelHelmRevealing); - registerItemModel(terrasteelChest); - registerItemModel(terrasteelLegs); - registerItemModel(terrasteelBoots); - registerItemModel(terraSword); - registerItemModel(terraAxe); - - registerItemModel(starSword); - registerItemModel(thunderSword); - registerItemModel(crystalBow); - registerItemModel(livingwoodBow); - registerItemModel(glassPick); - - registerItemModel(flowerBag); - registerItemModel(fertilizer); - registerItemModel(obedienceStick); - - registerItemModel(dirtRod); - registerItemModel(waterRod); - registerItemModel(cobbleRod); - registerItemModel(fireRod); - registerItemModel(rainbowRod); - registerItemModel(skyDirtRod); - registerItemModel(terraformRod); - registerItemModel(diviningRod); - registerItemModel(gravityRod); - registerItemModel(missileRod); - registerItemModel(smeltRod); - registerItemModel(exchangeRod); - - registerItemModel(openBucket); - registerItemModel(bloodPendant); - registerItemModel(manaTablet); - registerItemModel(enderDagger); - registerItemModel(slingshot); - registerItemModel(vineBall); - registerItemModel(regenIvy); - registerItemModel(keepIvy); - registerItemModel(recordGaia1); - registerItemModel(recordGaia2); - registerItemModel(overgrowthSeed); - registerItemModel(worldSeed); - registerItemModel(incenseStick); - registerItemModel(enderHand); - registerItemModel(craftingHalo); - registerItemModel(spellCloth); - registerItemModel(autocraftingHalo); - registerItemModel(sextant); - registerItemModel(cacophonium); - registerItemModel(clip); - registerItemModel(phantomInk); - registerItemModel(poolMinecart); - registerItemModel(pinkinator); - registerItemModel(dice); - registerItemModel(kingKey); - registerItemModel(flugelEye); - registerItemModel(thorRing); - registerItemModel(lokiRing); - registerItemModel(odinRing); - registerItemModel(aesirRing); - registerItemModel(baubleBox); - registerItemModel(tinyPlanet); - registerItemModelMetas(manaResource, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); - registerItemModel(manaRing); - registerItemModel(manaRingGreater); - String[] runeNames = { "water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride" }; - registerItemModelMetas(rune, runeNames.length, i -> "rune_" + runeNames[i]); - registerItemModel(auraRing); - registerItemModel(auraRingGreater); - registerItemModel(spark); - registerItemModel(manaCookie); - registerItemModel(infiniteFruit); - registerItemModelMetas(lens, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]); - ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); - ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); - registerItemModel(brewFlask); - registerItemModel(brewVial); - - registerItemModel(waterRing); - registerItemModel(miningRing); - registerItemModel(reachRing); - registerItemModel(swapRing); - registerItemModel(pixieRing); - registerItemModel(travelBelt); - registerItemModel(superTravelBelt); - registerItemModel(speedUpBelt); - registerItemModel(knockbackBelt); - registerItemModel(itemFinder); - registerItemModel(monocle); - registerItemModel(icePendant); - registerItemModel(lavaPendant); - registerItemModel(superLavaPendant); - registerItemModel(holyCloak); - registerItemModel(unholyCloak); - registerItemModel(goldLaurel); - registerItemModel(flightTiara); - registerItemModel(divaCharm); - registerItemModel(manaMirror); - registerItemModel(manaInkwell); - registerItemModel(waterBowl); - - registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); - registerItemModelAllMeta(laputaShard, 20); - registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); - registerItemModelAllMeta(dye, EnumDyeColor.values().length); - registerItemModelAllMeta(petal, EnumDyeColor.values().length); - - registerItemModelMetas(sparkUpgrade, LibItemNames.SPARK_UPGRADE, 4); - registerItemModelMetas(corporeaSpark, LibItemNames.CORPOREA_SPARK, 2); - registerItemModelMetas(manaBottle, LibItemNames.MANA_BOTTLE, 6); - registerItemModelMetas(ancientWill, LibItemNames.ANCIENT_WILL, 6); - registerItemModelMetas(temperanceStone, LibItemNames.TEMPERANCE_STONE, 2); - registerItemModelMetas(thornChakram, LibItemNames.THORN_CHAKRAM, 2); - registerItemModelMetas(blackHoleTalisman, LibItemNames.BLACK_HOLE_TALISMAN, 2); - registerItemModelMetas(slimeBottle, LibItemNames.SLIME_BOTTLE, 2); - registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); - registerItemModelMetas(quartz, LibItemNames.QUARTZ, 7); - registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); - registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); - registerItemModelMetas(virus, LibItemNames.VIRUS, 2); - registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); - } - // Only for models that absolutely can't be converted to JSON. Use VERY sparingly @SuppressWarnings("deprecation") private static void registerTESRItems() { @@ -484,9 +320,6 @@ public final class ModelHandler { registerBlockStandardPath(ModBlocks.corporeaIndex); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); - registerItemModel(ModItems.gaiaHead); - ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class); - registerBlockStandardPath(ModBlocks.hourglass); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); @@ -664,19 +497,19 @@ public final class ModelHandler { /** * Registers all metas of the given item to models/item/registryname.json */ - private static void registerItemModelAllMeta(Item item, int range) { - registerItemModelMetas(item, range, i -> item.getRegistryName().getResourcePath()); + public static void registerItemAllMeta(Item item, int range) { + registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); } /** * Registers each meta of an item to models/item/registryname.json * Range is exclusive upper bound */ - private static void registerItemModelMetas(Item item, String loc, int range) { - registerItemModelMetas(item, range, i -> loc + i); + public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { + registerItemMetas(item, maxExclusive, i -> loc + i); } - private static void registerItemModelMetas(Item item, int maxExclusive, IntFunction metaToName) { + public static void registerItemMetas(Item item, int maxExclusive, IntFunction metaToName) { for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( item, i, @@ -732,14 +565,10 @@ public final class ModelHandler { } } - private static void registerItemModel(Item i,int meta) { + public static void registerItemModel(Item i,int meta) { ResourceLocation loc = i.getRegistryName(); ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); } - private static void registerItemModel(Item i) { - registerItemModel(i, 0); - } - private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/client/render/IModelRegister.java b/src/main/java/vazkii/botania/client/render/IModelRegister.java new file mode 100644 index 000000000..4f3f82a3d --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/IModelRegister.java @@ -0,0 +1,12 @@ +package vazkii.botania.client.render; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface IModelRegister { + /** + * Do whatever needs to be done to register models + */ + @SideOnly(Side.CLIENT) + void registerModels(); +} diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index e8f0c3ee9..a49210a4e 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -14,6 +14,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; import java.util.List; @@ -42,6 +45,12 @@ public class Item16Colors extends ItemMod implements IColorable { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length); + } + String getUnlocalizedNameLazy(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 6faa16fb6..0e064e8a6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -20,6 +20,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; @@ -62,5 +63,10 @@ public class ItemAncientWill extends ItemMod { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 6, LibItemNames.ANCIENT_WILL); + } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index cca7fb1cc..f48cabb00 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -39,6 +39,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; @@ -309,4 +310,10 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return 0; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.BLACK_HOLE_TALISMAN); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index e31dff106..685946295 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -23,7 +23,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.Botania; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -82,4 +82,11 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { list.add(I18n.format("botaniamisc.lotusDesc")); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemModel(this, 0); + ModelHandler.registerItemModel(this, 1); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 8643917e8..ab9843edb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -34,6 +34,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; @@ -244,4 +245,10 @@ public class ItemBottledMana extends ItemMod { return EnumAction.DRINK; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 6, LibItemNames.MANA_BOTTLE); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index ee43f0c29..13d182023 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -20,8 +20,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; @@ -67,4 +70,10 @@ public class ItemCorporeaSpark extends ItemMod { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.CORPOREA_SPARK); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 1a09dc651..05f2499f6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -20,6 +20,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; @@ -59,4 +62,10 @@ public class ItemCraftPattern extends ItemMod { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 9, LibItemNames.CRAFT_PATTERN); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 6678d8386..ee156c1f6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -28,10 +28,12 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; @@ -54,6 +56,13 @@ public class ItemGaiaHead extends ItemMod { return (ModelBiped) Botania.proxy.getEmptyModelBiped(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(this, 0, TileGaiaHead.class); + } + // Copied from vanila skull itemBlock. Relevant edits are indicated. @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 567eabd1b..f1767a650 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -30,9 +30,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -69,6 +72,12 @@ public class ItemGrassHorn extends ItemMod { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 3, LibItemNames.GRASS_HORN); + } + @Nonnull @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 52a159f5b..64ec96613 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -28,9 +28,12 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -158,6 +161,12 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { return EnumActionResult.PASS; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 9, LibItemNames.GRASS_SEEDS); + } + @SubscribeEvent public void onTickEnd(TickEvent.WorldTickEvent event) { // Block swapper updates should only occur on the server diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index c83d74c73..ebb93eada 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -38,7 +38,7 @@ import vazkii.botania.api.mana.ILaputaImmobile; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.Botania; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -283,4 +283,10 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet return false; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAllMeta(this, 20); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index e7c965cc6..8766e377a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -31,6 +32,7 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -59,7 +61,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; private static final String TAG_FORCED_MESSAGE = "forcedMessage"; private static final String TAG_QUEUE_TICKS = "queueTicks"; - boolean skipSound = false; + private boolean skipSound = false; public ItemLexicon() { super(LibItemNames.LEXICON); @@ -237,4 +239,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { return isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.registerItemVariants(this, new ModelResourceLocation("botania:lexicon_default", "inventory")); + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 5e0018c9d..58c5eb080 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -10,17 +10,22 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public abstract class ItemMod extends Item { +public abstract class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); @@ -38,4 +43,10 @@ public abstract class ItemMod extends Item { public String getUnlocalizedNameInefficiently(@Nonnull ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 1009d6a43..857822fba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -30,6 +30,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; @@ -110,6 +111,12 @@ public class ItemSignalFlare extends ItemMod implements IColorable { stacks.add(I18n.format("botaniamisc.flareColor", I18n.format("botania.color" + storedColor))); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length); + } + public static ItemStack forColor(int color) { ItemStack stack = new ItemStack(ModItems.signalFlare); ItemNBTHelper.setInt(stack, TAG_COLOR, color); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 701a30e08..f8f7018e9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -14,6 +14,9 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.lib.LibItemNames; @@ -38,4 +41,10 @@ public class ItemSlimeBottle extends ItemMod { } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.SLIME_BOTTLE); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 3bfb71c23..adbeac582 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -13,6 +13,9 @@ package vazkii.botania.common.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; @@ -39,6 +42,12 @@ public class ItemSparkUpgrade extends ItemMod { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 4, LibItemNames.SPARK_UPGRADE); + } + String getUnlocalizedNameLazy(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index b02673bcf..f36629641 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -22,6 +22,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; @@ -52,7 +53,13 @@ public class ItemTemperanceStone extends ItemMod { else addStringToTooltip(I18n.format("botaniamisc.inactive"), stacks); } - void addStringToTooltip(String s, List tooltip) { + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.TEMPERANCE_STONE); + } + + private void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index c57e53b38..5a93994d4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -24,6 +24,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; @@ -75,4 +76,10 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { return ModAchievements.terrasteelWeaponCraft; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.THORN_CHAKRAM); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 3d425c8b8..5d9114e3e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -33,6 +34,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -296,4 +298,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return null; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index b7faf644f..351c99776 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -33,6 +33,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; @@ -121,4 +122,10 @@ public class ItemVirus extends ItemMod { return super.getUnlocalizedName(stack) + stack.getItemDamage(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.VIRUS); + } + } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index f29f16706..5c53ccf00 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -10,9 +10,13 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.common.item.ItemMod; @@ -57,4 +61,11 @@ public class ItemVial extends ItemMod implements IBrewContainer { return brew.getManaCost() * (stack.getItemDamage() + 1); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation("botania:vial", "inventory")); + ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation("botania:flask", "inventory")); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 8423c9f9e..1f700ac64 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -23,6 +24,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -35,6 +37,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManasteel; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -48,7 +51,7 @@ import java.util.List; import java.util.Map; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") -public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { +public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor, IModelRegister { private static final int MANA_PER_DAMAGE = 70; @@ -251,4 +254,10 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan public int getRunicCharge(ItemStack itemstack) { return 0; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } 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 7ebeec53f..6610b1cd7 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 @@ -35,6 +35,7 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; @@ -88,6 +89,12 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { super.addHiddenTooltip(par1ItemStack, player, stacks, par4); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 32, LibItemNames.COSMETIC); + } + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.AMULET; 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 157e45773..562d3cec7 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 @@ -45,6 +45,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; @@ -537,4 +538,10 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub return stack.getItemDamage() == 1 ? ModAchievements.tiaraWings : null; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAllMeta(this, WING_TYPES); + } + } 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 d076d0e1a..3d775d710 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 @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.bow; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -30,13 +31,17 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.helper.PlayerHelper; @@ -48,7 +53,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.function.Predicate; -public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { +public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModelRegister { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() instanceof ItemArrow; public static final int MANA_PER_DAMAGE = 40; @@ -219,4 +224,9 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { else return new ItemStack(Items.ARROW); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } 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 dda99d1a8..ca607fc4f 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import com.google.common.collect.ImmutableSet; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -25,13 +26,17 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -42,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.Set; import java.util.regex.Pattern; -public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { +public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); @@ -128,4 +133,9 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab return ToolCommons.getToolPriority(stack); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } \ No newline at end of file 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 ddfb395d9..10a7f128d 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,13 +24,17 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -39,7 +44,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.regex.Pattern; -public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { +public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern TORCH_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)torch)|(?:(?:[a-z-_.:]|^)Torch))(?:[A-Z-_.:]|$)"); @@ -124,4 +129,9 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS return ToolCommons.getToolPriority(stack); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } 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 057f62356..957a750a1 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 @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -24,11 +25,15 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -39,7 +44,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class ItemManasteelShears extends ItemShears implements IManaUsingItem { +public class ItemManasteelShears extends ItemShears implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 30; @@ -132,4 +137,10 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { public boolean usesMana(ItemStack stack) { return true; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } 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 88a36b1a8..5623f1008 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 @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -25,15 +26,19 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -42,7 +47,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { +public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool, IModelRegister { private static final int MANA_PER_DAMAGE = 60; @@ -137,4 +142,9 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS return ToolCommons.getToolPriority(stack); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index bc8254ac7..51075af7d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.tool.manasteel; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -20,11 +21,15 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -33,7 +38,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class ItemManasteelSword extends ItemSword implements IManaUsingItem { +public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 60; @@ -91,4 +96,9 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { return true; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 005279df7..57bfad516 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -31,6 +31,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; @@ -341,4 +342,11 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens public boolean isCombinable(ItemStack stack) { return stack.getItemDamage() != NORMAL; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemMetas(this, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]); + } + } 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 384b105ca..78508fdd7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -33,6 +33,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -172,4 +173,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve return stack.getItemDamage() == 4 ? ModAchievements.terrasteelPickup : null; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemMetas(this, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); + } + } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 8532f1edb..d08ba180a 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -13,7 +13,10 @@ package vazkii.botania.common.item.material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; @@ -42,7 +45,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { + private String getUnlocalizedNameLazy(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack); } @@ -50,4 +53,10 @@ public class ItemQuartz extends ItemMod implements IElvenItem { public boolean isElvenItem(ItemStack stack) { return stack.getItemDamage() == 5; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerItemAppendMeta(this, 7, LibItemNames.QUARTZ); + } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 36ed48e7b..4be693ca3 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -16,8 +16,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; @@ -64,4 +67,11 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev return ModAchievements.runePickup; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + String[] runeNames = { "water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride" }; + ModelHandler.registerItemMetas(this, runeNames.length, i -> "rune_" + runeNames[i]); + } + } diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index fc9bf069c..5d36bb0a8 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -10,18 +10,23 @@ */ package vazkii.botania.common.item.record; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class ItemModRecord extends ItemRecord { +public class ItemModRecord extends ItemRecord implements IModelRegister { private final String file; @@ -45,4 +50,9 @@ public class ItemModRecord extends ItemRecord { return new ResourceLocation(file); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } From 6997a96460719dbbea062921d14b1c37ccf912ec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 15:45:43 -0500 Subject: [PATCH 818/935] Slabs/walls/stairs own their own model registration --- .../client/core/handler/ModelHandler.java | 180 ++---------------- .../botania/common/block/BlockAvatar.java | 14 ++ .../botania/common/block/BlockGaiaHead.java | 13 +- .../botania/common/block/BlockHourglass.java | 14 ++ .../vazkii/botania/common/block/BlockMod.java | 10 +- .../common/block/BlockTeruTeruBozu.java | 10 + .../corporea/BlockCorporeaCrystalCube.java | 11 ++ .../block/corporea/BlockCorporeaIndex.java | 9 + .../decor/quartz/BlockSpecialQuartz.java | 9 + .../block/decor/slabs/BlockModSlab.java | 26 ++- .../block/decor/stairs/BlockModStairs.java | 13 +- .../decor/walls/BlockBiomeStoneWall.java | 13 ++ .../block/decor/walls/BlockModWall.java | 13 +- .../common/block/mana/BlockBellows.java | 14 ++ .../common/block/mana/BlockBrewery.java | 14 ++ .../botania/common/item/ItemManaCookie.java | 12 +- 16 files changed, 202 insertions(+), 173 deletions(-) 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 9099887ec..d93f1b4a1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -123,17 +123,18 @@ public final class ModelHandler { registerStateMappers(); registerStandardBlocks(); - registerStairs(); - registerSlabs(); - registerQuartzBlocks(); + + for (Block block : Block.REGISTRY) { + if (block.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) + && block instanceof IModelRegister) + ((IModelRegister) block).registerModels(); + } for (Item item : Item.REGISTRY) { if (item.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) && item instanceof IModelRegister) ((IModelRegister) item).registerModels(); } - - registerTESRItems(); } private static void registerSubtiles() { @@ -208,6 +209,14 @@ public final class ModelHandler { } private static void registerStandardBlocks() { + registerBlockStandardPath(ModBlocks.avatar); + registerBlockStandardPath(ModBlocks.bellows); + registerBlockStandardPath(ModBlocks.brewery); + registerBlockStandardPath(ModBlocks.corporeaCrystalCube); + registerBlockStandardPath(ModBlocks.corporeaIndex); + registerBlockStandardPath(ModBlocks.hourglass); + registerBlockStandardPath(ModBlocks.teruTeruBozu); + registerBlockStandardPath(ModBlocks.alchemyCatalyst); registerBlockStandardPath(ModBlocks.alfPortal); registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); @@ -302,31 +311,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } - // Only for models that absolutely can't be converted to JSON. Use VERY sparingly - @SuppressWarnings("deprecation") - private static void registerTESRItems() { - registerBlockStandardPath(ModBlocks.avatar); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class); - - registerBlockStandardPath(ModBlocks.bellows); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class); - - registerBlockStandardPath(ModBlocks.brewery); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class); - - registerBlockStandardPath(ModBlocks.corporeaCrystalCube); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class); - - registerBlockStandardPath(ModBlocks.corporeaIndex); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class); - - registerBlockStandardPath(ModBlocks.hourglass); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class); - - registerBlockStandardPath(ModBlocks.teruTeruBozu); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class); - } - private static void registerStateMappers() { // Override to let custom model loader work, see SpecialFlowerModel ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); @@ -351,138 +335,6 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - - // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, - (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ignore(BlockWall.VARIANT).withSuffix("_wall").build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); - - // Ignore dummy variant in slabs - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - for (Block b : ModFluffBlocks.pavementSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - List otherSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingwoodPlankSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, - ModFluffBlocks.dreamwoodPlankSlab, - ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, - ModFluffBlocks.tileSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, ModFluffBlocks.darkQuartzSlab, - ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab, ModFluffBlocks.dirtPathSlab, - ModFluffBlocks.shimmerrockSlab, ModFluffBlocks.shimmerwoodPlankSlab); - - for (Block b : otherSlabs) { - if (b == null) // Dark quartz disabled - continue; - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - } - - // Ignore both dummy variant and half prop in full slabs - for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - for (Block b : ModFluffBlocks.pavementFullSlabs) { - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - List otherFullSlabs = Lists.newArrayList(ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingwoodPlankSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, - ModFluffBlocks.dreamwoodPlankSlabFull, - ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, - ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, - ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull, ModFluffBlocks.dirtPathSlabFull, - ModFluffBlocks.shimmerrockSlabFull, ModFluffBlocks.shimmerwoodPlankSlabFull); - - for (Block b : otherFullSlabs) { - if (b == null) // Dark quartz disabled - continue; - ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); - } - - // Ignore everything in TESR items to suppress missing model errors - ModelLoader.setCustomStateMapper(ModBlocks.avatar, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); - ModelLoader.setCustomStateMapper(ModBlocks.bellows, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); - ModelLoader.setCustomStateMapper(ModBlocks.brewery, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - ModelLoader.setCustomStateMapper(ModBlocks.gaiaHead, new StateMap.Builder().ignore(BlockSkull.FACING, BlockSkull.NODROP).build()); - ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - } - - private static void registerStairs() { - for (Block b : ModFluffBlocks.pavementStairs) { - registerBlockStandardPath(b); - } - - for (Block b : ModFluffBlocks.biomeStoneStairs) { - registerBlockStandardPath(b); - } - - registerBlockStandardPath(ModFluffBlocks.blazeQuartzStairs); - if (ConfigHandler.darkQuartzEnabled) - registerBlockStandardPath(ModFluffBlocks.darkQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.dreamwoodStairs); - registerBlockStandardPath(ModFluffBlocks.dreamwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.elfQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.lavenderQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.livingrockStairs); - registerBlockStandardPath(ModFluffBlocks.livingrockBrickStairs); - registerBlockStandardPath(ModFluffBlocks.livingwoodStairs); - registerBlockStandardPath(ModFluffBlocks.livingwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.manaQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.netherBrickStairs); - registerBlockStandardPath(ModFluffBlocks.redQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.shimmerrockStairs); - registerBlockStandardPath(ModFluffBlocks.shimmerwoodPlankStairs); - registerBlockStandardPath(ModFluffBlocks.snowBrickStairs); - registerBlockStandardPath(ModFluffBlocks.soulBrickStairs); - registerBlockStandardPath(ModFluffBlocks.sunnyQuartzStairs); - registerBlockStandardPath(ModFluffBlocks.tileStairs); - } - - private static void registerSlabs() { - for (Block b : ModFluffBlocks.biomeStoneSlabs) { - registerBlockVariant(b, "half=bottom"); - } - - for (Block b : ModFluffBlocks.pavementSlabs) { - registerBlockVariant(b, "half=bottom"); - } - - registerBlockVariant(ModFluffBlocks.livingwoodSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingrockSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.livingrockBrickSlab, "half=bottom"); - - registerBlockVariant(ModFluffBlocks.blazeQuartzSlab, "half=bottom"); - if (ConfigHandler.darkQuartzEnabled) - registerBlockVariant(ModFluffBlocks.darkQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.elfQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.lavenderQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.manaQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.redQuartzSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.sunnyQuartzSlab, "half=bottom"); - - registerBlockVariant(ModFluffBlocks.dreamwoodSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.dreamwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.dirtPathSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.shimmerrockSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.shimmerwoodPlankSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.netherBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.soulBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.snowBrickSlab, "half=bottom"); - registerBlockVariant(ModFluffBlocks.tileSlab, "half=bottom"); - } - - private static void registerQuartzBlocks() { - String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; - for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) { - if (b == null) // Dark quartz disabled - continue; - registerBlockVariantMetas(b, 3, i -> variantNames[i]); - } } private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { @@ -523,7 +375,7 @@ public final class ModelHandler { registerBlockVariant(b, "normal"); } - private static void registerBlockVariant(Block b, String variant) { + public static void registerBlockVariant(Block b, String variant) { registerBlockVariantMetas(b, 1, variant); } @@ -531,7 +383,7 @@ public final class ModelHandler { registerBlockVariantMetas(b, maxExclusive, i -> variant); } - private static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { + public static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 1018721d1..e584f92af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -14,9 +14,11 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -27,6 +29,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -146,4 +152,12 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return LexiconData.avatar; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileAvatar.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index a69d006c8..9acc0d285 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +23,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; @@ -33,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull { +public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); @@ -79,4 +84,10 @@ public class BlockGaiaHead extends BlockSkull { public TileEntity createNewTileEntity(World world, int meta) { return new TileGaiaHead(); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 1f23e5928..021119711 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -16,8 +16,10 @@ 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.renderer.block.statemap.StateMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -29,6 +31,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -195,4 +201,12 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return LexiconData.hourglass; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileHourglass.class); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index d8c4168be..e05cc29ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -14,7 +14,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; @@ -22,7 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockMod extends Block { +public class BlockMod extends Block implements IModelRegister { public BlockMod(Material par2Material, String name) { super(par2Material); @@ -41,4 +44,9 @@ public class BlockMod extends Block { return true; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index fb02e2916..9d41926c3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -26,6 +26,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileTeruTeruBozu; @@ -138,4 +141,11 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return LexiconData.teruTeruBozu; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileTeruTeruBozu.class); + } + } 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 2b11bd696..e51369563 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -16,6 +16,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -23,10 +24,13 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -125,4 +129,11 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).compValue; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaCrystalCube.class); + } + } 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 fa81e090a..c0f3d0864 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -17,12 +17,14 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.ParticleDigging; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -108,4 +110,11 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaIndex.class); + } + } 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 b303e9532..f35138c83 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 @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.QuartzVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; @@ -124,4 +125,12 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; + ModelHandler.registerBlockVariantMetas(this, 3, i -> variantNames[i]); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index b6107bfee..7a408a90b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -6,6 +6,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,9 +15,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -26,10 +33,10 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -public abstract class BlockModSlab extends BlockSlab implements ILexiconable { +public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { - final String name; - protected final boolean doubleSlab; + private final String name; + private final boolean doubleSlab; public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { @@ -123,7 +130,18 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { return LexiconData.decorativeBlocks; } - public enum DummyEnum implements IStringSerializable { + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + if(!doubleSlab) { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + ModelHandler.registerBlockVariant(this, "half=bottom"); + } else { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } + + private enum DummyEnum implements IStringSerializable { SINGLETON { @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index db9ed0a3a..3de4a27f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -2,20 +2,26 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends BlockStairs implements ILexiconable { +public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { public BlockModStairs(IBlockState state, String name) { super(state); @@ -31,4 +37,9 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { return LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 8ac77e3f4..8420433eb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -10,8 +10,10 @@ */ package vazkii.botania.common.block.decor.walls; +import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,7 +21,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; @@ -77,4 +82,12 @@ public class BlockBiomeStoneWall extends BlockModWall { return LexiconData.marimorphosis; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, + (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) + .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 516f97deb..0e634615f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,9 +23,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -33,7 +38,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public abstract class BlockModWall extends BlockWall implements ILexiconable { +public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { public BlockModWall(Block block, int meta) { super(block); @@ -100,4 +105,10 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { return LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + } + } 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 e03223cec..dd8ffa891 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -14,8 +14,10 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -25,6 +27,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -117,4 +123,12 @@ public class BlockBellows extends BlockMod implements ILexiconable { return LexiconData.bellows; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBellows.class); + } + } 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 3a456f05f..be16dd69d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -16,8 +16,10 @@ 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.renderer.block.statemap.StateMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -28,6 +30,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -148,4 +154,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBrewery.class); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index ac72c995a..b98ccc4d3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -19,8 +20,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; @@ -30,7 +35,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Locale; -public class ItemManaCookie extends ItemFood { +public class ItemManaCookie extends ItemFood implements IModelRegister { public ItemManaCookie() { super(0, 0.1F, false); @@ -54,4 +59,9 @@ public class ItemManaCookie extends ItemFood { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } } From 2ee0d7f0ede3722030fe5b8f67a1caaf203a1049 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 24 Jul 2016 21:36:49 -0500 Subject: [PATCH 819/935] More borign model cleaning --- .../client/core/handler/ModelHandler.java | 138 ++++++++---------- .../botania/blockstates/alchemyCatalyst.json | 14 +- .../botania/blockstates/alfheimPortal.json | 21 +-- .../assets/botania/blockstates/altGrass.json | 62 ++++---- .../assets/botania/blockstates/bifrost.json | 12 +- .../botania/blockstates/bifrostPerm.json | 12 +- .../botania/blockstates/blazeBlock.json | 11 +- .../botania/blockstates/cacophoniumBlock.json | 3 +- .../assets/botania/blockstates/cellBlock.json | 3 +- .../assets/botania/blockstates/cocoon.json | 3 +- .../blockstates/conjurationCatalyst.json | 3 +- .../botania/blockstates/corporeaFunnel.json | 3 +- .../blockstates/corporeaInterceptor.json | 3 +- .../botania/blockstates/corporeaRetainer.json | 3 +- .../botania/blockstates/distributor.json | 8 +- .../assets/botania/blockstates/elfGlass.json | 9 +- .../botania/blockstates/enchantedSoil.json | 3 +- .../assets/botania/blockstates/enchanter.json | 3 +- .../botania/blockstates/enderEyeBlock.json | 3 +- .../botania/blockstates/felPumpkin.json | 8 +- .../assets/botania/blockstates/ghostRail.json | 11 +- .../botania/blockstates/incensePlate.json | 3 +- .../botania/blockstates/livingrock.json | 17 +-- .../blockstates/livingrock0SlabFull.json | 6 +- .../blockstates/livingrock1SlabFull.json | 6 +- .../botania/blockstates/livingwood.json | 19 +-- .../blockstates/livingwood0SlabFull.json | 6 +- .../blockstates/livingwood1SlabFull.json | 6 +- .../assets/botania/blockstates/manaBomb.json | 3 +- .../botania/blockstates/manaDetector.json | 3 +- .../assets/botania/blockstates/manaGlass.json | 8 +- .../assets/botania/blockstates/manaVoid.json | 4 +- .../botania/blockstates/pistonRelay.json | 8 +- .../assets/botania/blockstates/prism.json | 23 +-- .../blockstates/redStringComparator.json | 3 +- .../blockstates/redStringContainer.json | 3 +- .../blockstates/redStringDispenser.json | 3 +- .../blockstates/redStringFertilizer.json | 3 +- .../blockstates/redStringInterceptor.json | 3 +- .../botania/blockstates/redStringRelay.json | 3 +- .../botania/blockstates/rfGenerator.json | 3 +- .../assets/botania/blockstates/root.json | 10 +- .../assets/botania/blockstates/seaLamp.json | 14 -- .../botania/blockstates/shimmerrock.json | 9 +- .../blockstates/shimmerrock0SlabFull.json | 6 +- .../blockstates/shimmerwoodPlanks.json | 9 +- .../shimmerwoodPlanks0SlabFull.json | 6 +- .../botania/blockstates/spawnerClaw.json | 4 +- .../assets/botania/blockstates/turntable.json | 13 +- .../models/block/alchemy_catalyst.json | 8 + .../botania/models/block/alfheim_portal.json | 6 + .../models/block/alfheim_portal_on.json | 6 + .../assets/botania/models/block/bifrost.json | 6 + .../botania/models/block/blaze_block.json | 6 + .../botania/models/block/dry_grass.json | 8 + .../botania/models/block/golden_grass.json | 8 + .../botania/models/block/infused_grass.json | 8 + .../botania/models/block/livingrock.json | 6 + .../models/block/livingrock_brick.json | 6 + .../block/livingrock_chiseled_brick.json | 6 + .../block/livingrock_cracked_brick.json | 6 + .../models/block/livingrock_mossy_brick.json | 6 + .../botania/models/block/livingwood.json | 6 + .../models/block/livingwood_framed.json | 6 + .../models/block/livingwood_glimmering.json | 6 + .../models/block/livingwood_mossy_planks.json | 6 + .../block/livingwood_pattern_framed.json | 6 + .../models/block/livingwood_planks.json | 6 + .../botania/models/block/mutated_grass.json | 8 + .../assets/botania/models/block/prism.json | 6 +- .../assets/botania/models/block/root.json | 6 + .../botania/models/block/scorched_grass.json | 8 + .../botania/models/block/shimmerrock.json | 6 + .../models/block/shimmerwood_planks.json | 6 + .../botania/models/block/turntable.json | 8 + .../botania/models/block/vivid_grass.json | 8 + .../models/item/{ => itemblock}/avatar.json | 0 .../models/item/{ => itemblock}/bellows.json | 0 .../models/item/{ => itemblock}/brewery.json | 0 .../corporea_index.json} | 0 .../models/item/itemblock/ghost_rail.json | 6 + .../hovering_hourglass.json} | 0 .../teru_teru_bozu.json} | 0 83 files changed, 349 insertions(+), 375 deletions(-) delete mode 100644 src/main/resources/assets/botania/blockstates/seaLamp.json create mode 100644 src/main/resources/assets/botania/models/block/alchemy_catalyst.json create mode 100644 src/main/resources/assets/botania/models/block/alfheim_portal.json create mode 100644 src/main/resources/assets/botania/models/block/alfheim_portal_on.json create mode 100644 src/main/resources/assets/botania/models/block/bifrost.json create mode 100644 src/main/resources/assets/botania/models/block/blaze_block.json create mode 100644 src/main/resources/assets/botania/models/block/dry_grass.json create mode 100644 src/main/resources/assets/botania/models/block/golden_grass.json create mode 100644 src/main/resources/assets/botania/models/block/infused_grass.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/mutated_grass.json create mode 100644 src/main/resources/assets/botania/models/block/root.json create mode 100644 src/main/resources/assets/botania/models/block/scorched_grass.json create mode 100644 src/main/resources/assets/botania/models/block/shimmerrock.json create mode 100644 src/main/resources/assets/botania/models/block/shimmerwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/turntable.json create mode 100644 src/main/resources/assets/botania/models/block/vivid_grass.json rename src/main/resources/assets/botania/models/item/{ => itemblock}/avatar.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/bellows.json (100%) rename src/main/resources/assets/botania/models/item/{ => itemblock}/brewery.json (100%) rename src/main/resources/assets/botania/models/item/{corporeaIndex.json => itemblock/corporea_index.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json rename src/main/resources/assets/botania/models/item/{hourglass.json => itemblock/hovering_hourglass.json} (100%) rename src/main/resources/assets/botania/models/item/{teruTeruBozu.json => itemblock/teru_teru_bozu.json} (100%) 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 d93f1b4a1..b5adfe559 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,20 +8,15 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; -import net.minecraft.block.BlockSkull; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; @@ -48,7 +43,6 @@ import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.subtile.SubTileDecor; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; @@ -92,26 +86,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; -import vazkii.botania.common.block.tile.TileAvatar; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.block.tile.TileHourglass; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; -import java.util.List; import java.util.Locale; import java.util.function.IntFunction; -import static vazkii.botania.common.item.ModItems.*; - public final class ModelHandler { public static void registerModels() { @@ -209,79 +189,79 @@ public final class ModelHandler { } private static void registerStandardBlocks() { - registerBlockStandardPath(ModBlocks.avatar); - registerBlockStandardPath(ModBlocks.bellows); - registerBlockStandardPath(ModBlocks.brewery); - registerBlockStandardPath(ModBlocks.corporeaCrystalCube); - registerBlockStandardPath(ModBlocks.corporeaIndex); - registerBlockStandardPath(ModBlocks.hourglass); - registerBlockStandardPath(ModBlocks.teruTeruBozu); + registerBlockCustomPath(ModBlocks.avatar, "avatar"); + registerBlockCustomPath(ModBlocks.bellows, "bellows"); + registerBlockCustomPath(ModBlocks.brewery, "brewery"); + registerBlockVariantInventory(ModBlocks.corporeaCrystalCube); + registerBlockCustomPath(ModBlocks.corporeaIndex, "corporea_index"); + registerBlockCustomPath(ModBlocks.hourglass, "hovering_hourglass"); + registerBlockCustomPath(ModBlocks.teruTeruBozu, "teru_teru_bozu"); - registerBlockStandardPath(ModBlocks.alchemyCatalyst); - registerBlockStandardPath(ModBlocks.alfPortal); + registerBlockVariantNormal(ModBlocks.alchemyCatalyst); + registerBlockVariant(ModBlocks.alfPortal, "state=off"); registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); - registerBlockStandardPath(ModBlocks.bifrost); + registerBlockVariantNormal(ModBlocks.bifrost); registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); - registerBlockStandardPath(ModBlocks.bifrostPerm); + registerBlockVariantNormal(ModBlocks.bifrostPerm); registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); - registerBlockStandardPath(ModBlocks.blazeBlock); - registerBlockStandardPath(ModBlocks.cacophonium); - registerBlockStandardPath(ModBlocks.cellBlock); - registerBlockStandardPath(ModBlocks.conjurationCatalyst); - registerBlockStandardPath(ModBlocks.cocoon); - registerBlockStandardPath(ModBlocks.corporeaFunnel); - registerBlockStandardPath(ModBlocks.corporeaInterceptor); - registerBlockStandardPath(ModBlocks.corporeaRetainer); - registerBlockVariant(ModBlocks.dirtPath); + registerBlockVariantNormal(ModBlocks.blazeBlock); + registerBlockVariant(ModBlocks.cacophonium, "powered=false"); + registerBlockVariantNormal(ModBlocks.cellBlock); + registerBlockVariantNormal(ModBlocks.conjurationCatalyst); + registerBlockVariantNormal(ModBlocks.cocoon); + registerBlockVariant(ModBlocks.corporeaFunnel, "powered=false"); + registerBlockVariant(ModBlocks.corporeaInterceptor, "powered=false"); + registerBlockVariant(ModBlocks.corporeaRetainer, "powered=false"); + registerBlockVariantNormal(ModBlocks.dirtPath); registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); - registerBlockStandardPath(ModBlocks.distributor); + registerBlockVariantNormal(ModBlocks.distributor); registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); - registerBlockStandardPath(ModBlocks.elfGlass); - registerBlockStandardPath(ModBlocks.enchantedSoil); - registerBlockStandardPath(ModBlocks.enchanter); - registerBlockStandardPath(ModBlocks.enderEye); - registerBlockStandardPath(ModBlocks.felPumpkin); - registerBlockStandardPath(ModBlocks.floatingSpecialFlower); + registerBlockVariantNormal(ModBlocks.elfGlass); + registerBlockVariantNormal(ModBlocks.enchantedSoil); + registerBlockVariant(ModBlocks.enchanter, "facing=x"); + registerBlockVariant(ModBlocks.enderEye, "powered=false"); + registerBlockVariant(ModBlocks.felPumpkin, "facing=north"); + registerBlockVariantInventory(ModBlocks.floatingSpecialFlower); registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariant(ModBlocks.forestEye); - registerBlockStandardPath(ModBlocks.ghostRail); - registerBlockStandardPath(ModBlocks.incensePlate); + registerBlockVariantNormal(ModBlocks.forestEye); + registerBlockCustomPath(ModBlocks.ghostRail, "ghost_rail"); + registerBlockVariant(ModBlocks.incensePlate, "facing=south"); registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlockStandardPath(ModBlocks.manaBomb); - registerBlockStandardPath(ModBlocks.manaDetector); - registerBlockStandardPath(ModBlocks.manaGlass); + registerBlockVariantNormal(ModBlocks.manaBomb); + registerBlockVariant(ModBlocks.manaDetector, "powered=false"); + registerBlockVariantNormal(ModBlocks.manaGlass); registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); - registerBlockStandardPath(ModBlocks.manaVoid); + registerBlockVariantNormal(ModBlocks.manaVoid); registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); // Explicit mapping needed because saved meta does not match EnumDyeColor EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN }; registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName()); - registerBlockStandardPath(ModBlocks.prism); - registerBlockStandardPath(ModBlocks.pistonRelay); - registerBlockStandardPath(ModBlocks.pump); - registerBlockStandardPath(ModBlocks.redStringComparator); - registerBlockStandardPath(ModBlocks.redStringContainer); - registerBlockStandardPath(ModBlocks.redStringDispenser); - registerBlockStandardPath(ModBlocks.redStringFertilizer); - registerBlockStandardPath(ModBlocks.redStringInterceptor); - registerBlockStandardPath(ModBlocks.redStringRelay); - registerBlockStandardPath(ModBlocks.rfGenerator); - registerBlockStandardPath(ModBlocks.root); - registerBlockVariant(ModBlocks.runeAltar); - registerBlockStandardPath(ModBlocks.shimmerrock); - registerBlockStandardPath(ModBlocks.shimmerwoodPlanks); + registerBlockVariant(ModBlocks.prism, "has_lens=false,powered=false"); + registerBlockVariantNormal(ModBlocks.pistonRelay); + registerBlockVariantInventory(ModBlocks.pump); + registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); + registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); + registerBlockVariant(ModBlocks.redStringDispenser, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); + registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); + registerBlockVariantNormal(ModBlocks.rfGenerator); + registerBlockVariantNormal(ModBlocks.root); + registerBlockVariantNormal(ModBlocks.runeAltar); + registerBlockVariantNormal(ModBlocks.shimmerrock); + registerBlockVariantNormal(ModBlocks.shimmerwoodPlanks); registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); - registerBlockVariant(ModBlocks.spawnerClaw); - registerBlockStandardPath(ModBlocks.specialFlower); + registerBlockVariantNormal(ModBlocks.spawnerClaw); + registerBlockVariantInventory(ModBlocks.specialFlower); registerBlockVariant(ModBlocks.starfield, "powered=false"); - registerBlockVariant(ModBlocks.terraPlate); - registerBlockVariant(ModBlocks.tinyPlanet); + registerBlockVariantNormal(ModBlocks.terraPlate); + registerBlockVariantNormal(ModBlocks.tinyPlanet); registerBlockVariant(ModBlocks.tinyPotato, "facing=north"); - registerBlockStandardPath(ModBlocks.turntable); + registerBlockVariantNormal(ModBlocks.turntable); // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); @@ -371,10 +351,15 @@ public final class ModelHandler { } // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // - private static void registerBlockVariant(Block b) { + private static void registerBlockVariantNormal(Block b) { registerBlockVariant(b, "normal"); } + // Registers the ItemBlock to models/item/#inventory + private static void registerBlockVariantInventory(Block b) { + registerBlockVariant(b, "inventory"); + } + public static void registerBlockVariant(Block b, String variant) { registerBlockVariantMetas(b, 1, variant); } @@ -393,11 +378,6 @@ public final class ModelHandler { } } - // Registers the ItemBlock to models/item/#inventory - private static void registerBlockStandardPath(Block b) { - registerBlockVariant(b, "inventory"); - } - // Registers the ItemBlock to a custom path in models/item/itemblock/ private static void registerBlockCustomPath(Block b, String path) { registerBlockCustomPathMetas(b, 1, path); diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json index e054f42ab..1eed16194 100644 --- a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json +++ b/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json @@ -1,17 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/alchemyCatalyst0", - "top": "botania:blocks/alchemyCatalyst1", - "side": "botania:blocks/alchemyCatalyst2" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:alchemy_catalyst" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/alfheimPortal.json b/src/main/resources/assets/botania/blockstates/alfheimPortal.json index 812637c1b..7f589eaf8 100644 --- a/src/main/resources/assets/botania/blockstates/alfheimPortal.json +++ b/src/main/resources/assets/botania/blockstates/alfheimPortal.json @@ -1,22 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/alfheimPortal0" - }, - "transform": "forge:default-block" - }, "variants": { - "state": { - "off": {}, - "on_x": { - "textures": { "all": "botania:blocks/alfheimPortal1" } - }, - "on_z": { - "textures": { "all": "botania:blocks/alfheimPortal1" } - } - }, - "inventory": [{}] + "state=off": { "model": "botania:alfheim_portal" }, + "state=on_x": { "model": "botania:alfheim_portal_on" }, + "state=on_z": { "model": "botania:alfheim_portal_on" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json index ec9f93048..58e0cf7f6 100644 --- a/src/main/resources/assets/botania/blockstates/altGrass.json +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -1,30 +1,40 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { "bottom": "minecraft:blocks/dirt" }, - "transform": "forge:default-block" - }, "variants": { - "variant": { - "dry": { - "textures": { "top": "botania:blocks/altGrass0", "side": "botania:blocks/altGrass1" } - }, - "golden": { - "textures": { "top": "botania:blocks/altGrass2", "side": "botania:blocks/altGrass3" } - }, - "vivid": { - "textures": { "top": "botania:blocks/altGrass4", "side": "botania:blocks/altGrass5" } - }, - "scorched": { - "textures": { "top": "botania:blocks/altGrass6", "side": "botania:blocks/altGrass7" } - }, - "infused": { - "textures": { "top": "botania:blocks/altGrass8", "side": "botania:blocks/altGrass9" } - }, - "mutated": { - "textures": { "top": "botania:blocks/altGrass10", "side": "botania:blocks/altGrass11" } - } - } + "variant=dry": [ + { "model": "botania:dry_grass" }, + { "model": "botania:dry_grass", "y": 90 }, + { "model": "botania:dry_grass", "y": 180 }, + { "model": "botania:dry_grass", "y": 270 } + ], + "variant=golden": [ + { "model": "botania:golden_grass" }, + { "model": "botania:golden_grass", "y": 90 }, + { "model": "botania:golden_grass", "y": 180 }, + { "model": "botania:golden_grass", "y": 270 } + ], + "variant=vivid": [ + { "model": "botania:vivid_grass" }, + { "model": "botania:vivid_grass", "y": 90 }, + { "model": "botania:vivid_grass", "y": 180 }, + { "model": "botania:vivid_grass", "y": 270 } + ], + "variant=scorched": [ + { "model": "botania:scorched_grass" }, + { "model": "botania:scorched_grass", "y": 90 }, + { "model": "botania:scorched_grass", "y": 180 }, + { "model": "botania:scorched_grass", "y": 270 } + ], + "variant=infused": [ + { "model": "botania:infused_grass" }, + { "model": "botania:infused_grass", "y": 90 }, + { "model": "botania:infused_grass", "y": 180 }, + { "model": "botania:infused_grass", "y": 270 } + ], + "variant=mutated": [ + { "model": "botania:mutated_grass" }, + { "model": "botania:mutated_grass", "y": 90 }, + { "model": "botania:mutated_grass", "y": 180 }, + { "model": "botania:mutated_grass", "y": 270 } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrost.json b/src/main/resources/assets/botania/blockstates/bifrost.json index e10154d99..73ebd7453 100644 --- a/src/main/resources/assets/botania/blockstates/bifrost.json +++ b/src/main/resources/assets/botania/blockstates/bifrost.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/bifrost" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:bifrost" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrostPerm.json b/src/main/resources/assets/botania/blockstates/bifrostPerm.json index e10154d99..73ebd7453 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPerm.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPerm.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/bifrost" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:bifrost" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blazeBlock.json b/src/main/resources/assets/botania/blockstates/blazeBlock.json index 128196b32..ecc5d1fbe 100644 --- a/src/main/resources/assets/botania/blockstates/blazeBlock.json +++ b/src/main/resources/assets/botania/blockstates/blazeBlock.json @@ -1,14 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/blazeBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:blaze_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json index 51790ca4a..7002906fc 100644 --- a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json +++ b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json index b14eadd13..d405b3ad3 100644 --- a/src/main/resources/assets/botania/blockstates/cellBlock.json +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json index 7d3170d3e..7b35ff907 100644 --- a/src/main/resources/assets/botania/blockstates/cocoon.json +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -13,7 +13,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json index e3f933d06..e623e55a2 100644 --- a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -10,8 +10,7 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json index ba2242e45..56d9638be 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json +++ b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json index 9e4db20af..64a7c9a34 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json @@ -13,7 +13,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json index de67279d8..350fb96cd 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json +++ b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json @@ -11,7 +11,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json index 3a39b6b79..886ce900b 100644 --- a/src/main/resources/assets/botania/blockstates/distributor.json +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -6,12 +6,10 @@ "top": "botania:blocks/distributor0", "side": "botania:blocks/distributor1", "bottom": "botania:blocks/livingrock0" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json index c7217df6b..46e30264a 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlass.json +++ b/src/main/resources/assets/botania/blockstates/elfGlass.json @@ -1,7 +1,8 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_all" + "model": "minecraft:cube_all", + "transform": "forge:default-block" }, "variants": { "normal": [ @@ -9,10 +10,6 @@ { "textures": { "all": "botania:blocks/elfGlass1" } }, { "textures": { "all": "botania:blocks/elfGlass2" } }, { "textures": { "all": "botania:blocks/elfGlass3" } } - ], - "inventory": [{ - "transform": "forge:default-block", - "textures": { "all": "botania:blocks/elfGlass" } - }] + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json index 9daa1928c..ad3fd5ec7 100644 --- a/src/main/resources/assets/botania/blockstates/enchantedSoil.json +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -10,7 +10,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index 71a389c10..317ae0bd2 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -11,7 +11,6 @@ "facing": { "x": {}, "z": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index d49d0e4dc..d509fb021 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -12,7 +12,6 @@ "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, "false": {} }, - "powered=false": [{}], - "inventory": [{}] + "powered=false": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json index afb93a0bf..a883a82f2 100644 --- a/src/main/resources/assets/botania/blockstates/felPumpkin.json +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -6,7 +6,8 @@ "top": "minecraft:blocks/pumpkin_top", "front": "botania:blocks/felPumpkin", "side": "minecraft:blocks/pumpkin_side" - } + }, + "transform": "forge:default-block" }, "variants": { "facing": { @@ -14,9 +15,6 @@ "south": { "y": 180 }, "west": { "y": 270 }, "east": { "y": 90 } - }, - "inventory": [{ - "transform": "forge:default-block" - }] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostRail.json index 891a54fbd..d7a6becb1 100644 --- a/src/main/resources/assets/botania/blockstates/ghostRail.json +++ b/src/main/resources/assets/botania/blockstates/ghostRail.json @@ -3,8 +3,7 @@ "defaults": { "textures": { "rail": "botania:blocks/ghostRail" - }, - "transform": "forge:default-item" + } }, "variants": { "shape": { @@ -14,12 +13,6 @@ "ascending_west": { "model": "minecraft:rail_raised_sw", "y": 90 }, "ascending_north": { "model": "minecraft:rail_raised_ne" }, "ascending_south": { "model": "minecraft:rail_raised_sw" } - }, - "inventory": [{ - "model": "builtin/generated", - "textures": { - "layer0": "botania:blocks/ghostRail" - } - }] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 1a9af84eb..05eb4c866 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -13,7 +13,6 @@ "south": {}, "west": { "y": 90 }, "east": { "y": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock.json b/src/main/resources/assets/botania/blockstates/livingrock.json index 2202ab749..3474630d0 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock.json +++ b/src/main/resources/assets/botania/blockstates/livingrock.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "default": { "textures": { "all": "botania:blocks/livingrock0" } }, - "brick": { "textures": { "all": "botania:blocks/livingrock1" } }, - "mossy_brick": { "textures": { "all": "botania:blocks/livingrock2" } }, - "cracked_brick": { "textures": { "all": "botania:blocks/livingrock3" } }, - "chiseled_brick": { "textures": { "all": "botania:blocks/livingrock4" } } - } + "variant=default": { "model": "botania:livingrock" }, + "variant=brick": { "model": "botania:livingrock_brick" }, + "variant=mossy_brick": { "model": "botania:livingrock_mossy_brick" }, + "variant=cracked_brick": { "model": "botania:livingrock_cracked_brick" }, + "variant=chiseled_brick": { "model": "botania:livingrock_chiseled_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json index 9bc4eca76..0ff8d3a0b 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingrock0" } - }] + "normal": { "model": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json index edf8dd3ea..ad78304be 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingrock1" } - }] + "normal": { "model": "botania:livingrock_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood.json b/src/main/resources/assets/botania/blockstates/livingwood.json index 5090da065..e3927b205 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood.json +++ b/src/main/resources/assets/botania/blockstates/livingwood.json @@ -1,17 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "default": { "textures": { "all": "botania:blocks/livingwood0" } }, - "planks": { "textures": { "all": "botania:blocks/livingwood1" } }, - "mossy_planks": { "textures": { "all": "botania:blocks/livingwood2" } }, - "framed": { "textures": { "all": "botania:blocks/livingwood3" } }, - "pattern_framed": { "textures": { "all": "botania:blocks/livingwood4" } }, - "glimmering": { "textures": { "all": "botania:blocks/livingwood5" } } - } + "variant=default": { "model": "botania:livingwood" }, + "variant=planks": { "model": "botania:livingwood_planks" }, + "variant=mossy_planks": { "model": "botania:livingwood_mossy_planks" }, + "variant=framed": { "model": "botania:livingwood_framed" }, + "variant=pattern_framed": { "model": "botania:livingwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:livingwood_glimmering" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json index 41e2ca5c6..71d8758ab 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingwood0" } - }] + "normal": { "model": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json index a7063094e..ee151acbe 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/livingwood1" } - }] + "normal": { "model": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBomb.json b/src/main/resources/assets/botania/blockstates/manaBomb.json index a0b707133..6eb3c0928 100644 --- a/src/main/resources/assets/botania/blockstates/manaBomb.json +++ b/src/main/resources/assets/botania/blockstates/manaBomb.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaDetector.json b/src/main/resources/assets/botania/blockstates/manaDetector.json index af949d40a..6e0e40770 100644 --- a/src/main/resources/assets/botania/blockstates/manaDetector.json +++ b/src/main/resources/assets/botania/blockstates/manaDetector.json @@ -11,7 +11,6 @@ "powered": { "true": { "textures": { "all": "botania:blocks/manaDetector1" } }, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json index 23e66042a..7579bf084 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlass.json +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -4,12 +4,10 @@ "model": "minecraft:cube_all", "textures": { "all": "botania:blocks/manaGlass" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json index 034836e67..dde8c8f4b 100644 --- a/src/main/resources/assets/botania/blockstates/manaVoid.json +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -8,8 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json index fb1ccb55e..bc7045a49 100644 --- a/src/main/resources/assets/botania/blockstates/pistonRelay.json +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -4,12 +4,10 @@ "model": "minecraft:cube_all", "textures": { "all": "botania:blocks/pistonRelay" - } + }, + "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prism.json b/src/main/resources/assets/botania/blockstates/prism.json index 594c03ccd..70c9ec09f 100644 --- a/src/main/resources/assets/botania/blockstates/prism.json +++ b/src/main/resources/assets/botania/blockstates/prism.json @@ -1,23 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:prism", - "textures": { - "bottom": "botania:blocks/prism0", - "top": "botania:blocks/prism0", - "side": "botania:blocks/prism1" - }, - "transform": "forge:default-block" - }, "variants": { - "inventory": [{}], - "powered": { - "true": {}, - "false": {} - }, - "has_lens": { - "true": {}, - "false": {} - } + "has_lens=false,powered=false": { "model": "botania:prism" }, + "has_lens=true,powered=false": { "model": "botania:prism" }, + "has_lens=false,powered=true": { "model": "botania:prism" }, + "has_lens=true,powered=true": { "model": "botania:prism" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redStringComparator.json index 8c5c5f473..235c9f735 100644 --- a/src/main/resources/assets/botania/blockstates/redStringComparator.json +++ b/src/main/resources/assets/botania/blockstates/redStringComparator.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redStringContainer.json index 328bf9920..5e69b9040 100644 --- a/src/main/resources/assets/botania/blockstates/redStringContainer.json +++ b/src/main/resources/assets/botania/blockstates/redStringContainer.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redStringDispenser.json index 77ad927c0..b36fdda64 100644 --- a/src/main/resources/assets/botania/blockstates/redStringDispenser.json +++ b/src/main/resources/assets/botania/blockstates/redStringDispenser.json @@ -21,7 +21,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json index bffa455f4..341542a68 100644 --- a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json +++ b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json index decdcf9f2..2c4f60c88 100644 --- a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json @@ -21,7 +21,6 @@ "powered": { "true": {}, "false": {} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redStringRelay.json index 1b61585ec..a430ae041 100644 --- a/src/main/resources/assets/botania/blockstates/redStringRelay.json +++ b/src/main/resources/assets/botania/blockstates/redStringRelay.json @@ -17,7 +17,6 @@ "east": { "y": 90 }, "down": { "x": 90 }, "up": { "x": 270 } - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json index 1b7d47b4c..f7c71579d 100644 --- a/src/main/resources/assets/botania/blockstates/rfGenerator.json +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -8,7 +8,6 @@ "transform": "forge:default-block" }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/root.json b/src/main/resources/assets/botania/blockstates/root.json index 6bced893d..c0360095f 100644 --- a/src/main/resources/assets/botania/blockstates/root.json +++ b/src/main/resources/assets/botania/blockstates/root.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/root" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:root" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/seaLamp.json b/src/main/resources/assets/botania/blockstates/seaLamp.json deleted file mode 100644 index a91f2a227..000000000 --- a/src/main/resources/assets/botania/blockstates/seaLamp.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/seaLamp" - }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock.json b/src/main/resources/assets/botania/blockstates/shimmerrock.json index 55193392b..91681a0e0 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerrock" }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:shimmerrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json index 7846bb4cb..91681a0e0 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerrock" } - }] + "normal": { "model": "botania:shimmerrock" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json index c80cb83d3..0e16dc267 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerwoodPlanks" }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:shimmerwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json index ee31766f3..0e16dc267 100644 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/shimmerwoodPlanks" } - }] + "normal": { "model": "botania:shimmerwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerClaw.json index 8c9da4cac..392aae69c 100644 --- a/src/main/resources/assets/botania/blockstates/spawnerClaw.json +++ b/src/main/resources/assets/botania/blockstates/spawnerClaw.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:life_imbuer" - } + "normal": { "model": "botania:life_imbuer" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/turntable.json b/src/main/resources/assets/botania/blockstates/turntable.json index 796d11f8f..a06bb863a 100644 --- a/src/main/resources/assets/botania/blockstates/turntable.json +++ b/src/main/resources/assets/botania/blockstates/turntable.json @@ -1,16 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/turntable1", - "top": "botania:blocks/turntable0", - "side": "botania:blocks/turntable1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}], - "inventory": [{}] + "normal": { "model": "botania:turntable" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json new file mode 100644 index 000000000..0fbe6496b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/alchemyCatalyst0", + "top": "botania:blocks/alchemyCatalyst1", + "side": "botania:blocks/alchemyCatalyst2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal.json b/src/main/resources/assets/botania/models/block/alfheim_portal.json new file mode 100644 index 000000000..c89f3e82d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alfheim_portal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json new file mode 100644 index 000000000..ed0629071 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/alfheimPortal1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bifrost.json b/src/main/resources/assets/botania/models/block/bifrost.json new file mode 100644 index 000000000..0b68b4f31 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bifrost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blaze_block.json b/src/main/resources/assets/botania/models/block/blaze_block.json new file mode 100644 index 000000000..876160d68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/blaze_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/blazeBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dry_grass.json b/src/main/resources/assets/botania/models/block/dry_grass.json new file mode 100644 index 000000000..f61bfde5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dry_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass0", + "side": "botania:blocks/altGrass1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/golden_grass.json b/src/main/resources/assets/botania/models/block/golden_grass.json new file mode 100644 index 000000000..8cb20c191 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/golden_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass2", + "side": "botania:blocks/altGrass3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/infused_grass.json b/src/main/resources/assets/botania/models/block/infused_grass.json new file mode 100644 index 000000000..07a8c64d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/infused_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass8", + "side": "botania:blocks/altGrass9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock.json b/src/main/resources/assets/botania/models/block/livingrock.json new file mode 100644 index 000000000..9a8786117 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_brick.json b/src/main/resources/assets/botania/models/block/livingrock_brick.json new file mode 100644 index 000000000..c79412d70 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json new file mode 100644 index 000000000..07ee851a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_chiseled_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json new file mode 100644 index 000000000..8b4cafa2c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_cracked_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json new file mode 100644 index 000000000..bd6a802c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_mossy_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingrock2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood.json b/src/main/resources/assets/botania/models/block/livingwood.json new file mode 100644 index 000000000..0a8062fd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_framed.json b/src/main/resources/assets/botania/models/block/livingwood_framed.json new file mode 100644 index 000000000..67ad48c5f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_glimmering.json b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json new file mode 100644 index 000000000..3f76a6831 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json new file mode 100644 index 000000000..88b9f8d3e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json new file mode 100644 index 000000000..a3edcc34f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json new file mode 100644 index 000000000..ff95b9ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mutated_grass.json b/src/main/resources/assets/botania/models/block/mutated_grass.json new file mode 100644 index 000000000..fa6af5245 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mutated_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass10", + "side": "botania:blocks/altGrass11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/prism.json b/src/main/resources/assets/botania/models/block/prism.json index 021d96f40..02cfd6f5a 100644 --- a/src/main/resources/assets/botania/models/block/prism.json +++ b/src/main/resources/assets/botania/models/block/prism.json @@ -1,6 +1,10 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#side" + "bottom": "botania:blocks/prism0", + "top": "botania:blocks/prism0", + "side": "botania:blocks/prism1", + "particle": "botania:blocks/prism1" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/root.json b/src/main/resources/assets/botania/models/block/root.json new file mode 100644 index 000000000..e36906545 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/root.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/root" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/scorched_grass.json b/src/main/resources/assets/botania/models/block/scorched_grass.json new file mode 100644 index 000000000..ad5d14643 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/scorched_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass6", + "side": "botania:blocks/altGrass7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerrock.json b/src/main/resources/assets/botania/models/block/shimmerrock.json new file mode 100644 index 000000000..ba5c0fd20 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shimmerrock.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/shimmerrock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json new file mode 100644 index 000000000..2843c22c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/shimmerwoodPlanks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/turntable.json b/src/main/resources/assets/botania/models/block/turntable.json new file mode 100644 index 000000000..9fbef02b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/turntable.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/turntable1", + "top": "botania:blocks/turntable0", + "side": "botania:blocks/turntable1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/vivid_grass.json b/src/main/resources/assets/botania/models/block/vivid_grass.json new file mode 100644 index 000000000..a6b3c3112 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/vivid_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/altGrass4", + "side": "botania:blocks/altGrass5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/avatar.json b/src/main/resources/assets/botania/models/item/itemblock/avatar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/avatar.json rename to src/main/resources/assets/botania/models/item/itemblock/avatar.json diff --git a/src/main/resources/assets/botania/models/item/bellows.json b/src/main/resources/assets/botania/models/item/itemblock/bellows.json similarity index 100% rename from src/main/resources/assets/botania/models/item/bellows.json rename to src/main/resources/assets/botania/models/item/itemblock/bellows.json diff --git a/src/main/resources/assets/botania/models/item/brewery.json b/src/main/resources/assets/botania/models/item/itemblock/brewery.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewery.json rename to src/main/resources/assets/botania/models/item/itemblock/brewery.json diff --git a/src/main/resources/assets/botania/models/item/corporeaIndex.json b/src/main/resources/assets/botania/models/item/itemblock/corporea_index.json similarity index 100% rename from src/main/resources/assets/botania/models/item/corporeaIndex.json rename to src/main/resources/assets/botania/models/item/itemblock/corporea_index.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json new file mode 100644 index 000000000..5d7e72edb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:blocks/ghostRail" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/hourglass.json b/src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/hourglass.json rename to src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json diff --git a/src/main/resources/assets/botania/models/item/teruTeruBozu.json b/src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json similarity index 100% rename from src/main/resources/assets/botania/models/item/teruTeruBozu.json rename to src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json From cf0189c3eefea1452e512215d86806213fcdf825 Mon Sep 17 00:00:00 2001 From: Flaxbeard Date: Mon, 25 Jul 2016 16:07:35 -0500 Subject: [PATCH 820/935] Added ManaDiscountEvent --- .../botania/api/mana/ManaDiscountEvent.java | 39 +++++++++++++++++++ .../botania/api/mana/ManaItemHandler.java | 5 +++ 2 files changed, 44 insertions(+) create mode 100644 src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java diff --git a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java new file mode 100644 index 000000000..0e8a0fb58 --- /dev/null +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -0,0 +1,39 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jul 25, 2016, 9:02:12 PM (GMT)] + */ +package vazkii.botania.api.mana; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class ManaDiscountEvent extends Event { + + private final EntityPlayer entityPlayer; + private float discount; + + public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) { + this.entityPlayer = entityPlayer; + this.discount = discount; + } + + public EntityPlayer getEntityPlayer() { + return entityPlayer; + } + + public float getDiscount() { + return discount; + } + + public void setDiscount(float discount) { + this.discount = discount; + } +} diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 6ac31a878..66ad83043 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -13,6 +13,7 @@ package vazkii.botania.api.mana; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; public final class ManaItemHandler { @@ -249,6 +250,10 @@ public final class ManaItemHandler { if(armor != null && armor.getItem() instanceof IManaDiscountArmor) discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player); } + + ManaDiscountEvent event = new ManaDiscountEvent(player, discount); + MinecraftForge.EVENT_BUS.post(event); + discount = event.getDiscount(); return discount; } From f0aa44999f5b424f095d7f4a0dfecd883a508a02 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jul 2016 18:59:27 -0500 Subject: [PATCH 821/935] Some biomestone jsons --- .../botania/blockstates/biomeStoneA.json | 37 ++++++++----------- .../blockstates/biomeStoneA0SlabFull.json | 6 +-- .../blockstates/biomeStoneA10SlabFull.json | 6 +-- .../blockstates/biomeStoneA11SlabFull.json | 6 +-- .../blockstates/biomeStoneA12SlabFull.json | 6 +-- .../blockstates/biomeStoneA13SlabFull.json | 6 +-- .../blockstates/biomeStoneA14SlabFull.json | 6 +-- .../blockstates/biomeStoneA15SlabFull.json | 6 +-- .../blockstates/biomeStoneA1SlabFull.json | 6 +-- .../blockstates/biomeStoneA2SlabFull.json | 6 +-- .../blockstates/biomeStoneA3SlabFull.json | 6 +-- .../blockstates/biomeStoneA4SlabFull.json | 6 +-- .../blockstates/biomeStoneA5SlabFull.json | 6 +-- .../blockstates/biomeStoneA6SlabFull.json | 6 +-- .../blockstates/biomeStoneA7SlabFull.json | 6 +-- .../blockstates/biomeStoneA8SlabFull.json | 6 +-- .../blockstates/biomeStoneA9SlabFull.json | 6 +-- .../botania/blockstates/buriedPetals.json | 3 +- .../botania/blockstates/cacophoniumBlock.json | 16 +------- .../assets/botania/blockstates/cocoon.json | 15 +------- .../models/block/cacophonium_block.json | 8 ++++ .../assets/botania/models/block/cocoon.json | 9 ++++- .../models/block/desert_cobble_stone.json | 6 +++ .../botania/models/block/desert_stone.json | 6 +++ .../models/block/forest_cobble_stone.json | 6 +++ .../botania/models/block/forest_stone.json | 6 +++ .../models/block/fungal_cobble_stone.json | 6 +++ .../botania/models/block/fungal_stone.json | 6 +++ .../models/block/mesa_cobble_stone.json | 6 +++ .../botania/models/block/mesa_stone.json | 6 +++ .../models/block/mountain_cobble_stone.json | 6 +++ .../botania/models/block/mountain_stone.json | 6 +++ .../models/block/plains_cobble_stone.json | 6 +++ .../botania/models/block/plains_stone.json | 6 +++ .../models/block/swamp_cobble_stone.json | 6 +++ .../botania/models/block/swamp_stone.json | 6 +++ .../models/block/taiga_cobble_stone.json | 6 +++ .../botania/models/block/taiga_stone.json | 6 +++ 38 files changed, 148 insertions(+), 132 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/cacophonium_block.json create mode 100644 src/main/resources/assets/botania/models/block/desert_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/desert_stone.json create mode 100644 src/main/resources/assets/botania/models/block/forest_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/forest_stone.json create mode 100644 src/main/resources/assets/botania/models/block/fungal_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/fungal_stone.json create mode 100644 src/main/resources/assets/botania/models/block/mesa_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/mesa_stone.json create mode 100644 src/main/resources/assets/botania/models/block/mountain_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/mountain_stone.json create mode 100644 src/main/resources/assets/botania/models/block/plains_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/plains_stone.json create mode 100644 src/main/resources/assets/botania/models/block/swamp_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/swamp_stone.json create mode 100644 src/main/resources/assets/botania/models/block/taiga_cobble_stone.json create mode 100644 src/main/resources/assets/botania/models/block/taiga_stone.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json index 2ec09cc6b..c10307719 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -1,25 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone0" } }], - "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone1" } }], - "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone2" } }], - "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone3" } }], - "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone4" } }], - "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone5" } }], - "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone6" } }], - "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone7" } }], - "variant=forest_cobble": [{ "textures": { "all": "botania:blocks/biomeStone8" } }], - "variant=plains_cobble": [{ "textures": { "all": "botania:blocks/biomeStone9" } }], - "variant=mountain_cobble": [{ "textures": { "all": "botania:blocks/biomeStone10" } }], - "variant=fungal_cobble": [{ "textures": { "all": "botania:blocks/biomeStone11" } }], - "variant=swamp_cobble": [{ "textures": { "all": "botania:blocks/biomeStone12" } }], - "variant=desert_cobble": [{ "textures": { "all": "botania:blocks/biomeStone13" } }], - "variant=taiga_cobble": [{ "textures": { "all": "botania:blocks/biomeStone14" } }], - "variant=mesa_cobble": [{ "textures": { "all": "botania:blocks/biomeStone15" } }] + "variant=forest": { "model": "botania:forest_stone" }, + "variant=plains": { "model": "botania:plains_stone" }, + "variant=mountain": { "model": "botania:mountain_stone" }, + "variant=fungal": { "model": "botania:fungal_stone" }, + "variant=swamp": { "model": "botania:swamp_stone" }, + "variant=desert": { "model": "botania:desert_stone" }, + "variant=taiga": { "model": "botania:taiga_stone" }, + "variant=mesa": { "model": "botania:mesa_stone" }, + "variant=forest_cobble": { "model": "botania:forest_cobble_stone" }, + "variant=plains_cobble": { "model": "botania:plains_cobble_stone" }, + "variant=mountain_cobble": { "model": "botania:mountain_cobble_stone" }, + "variant=fungal_cobble": { "model": "botania:fungal_cobble_stone" }, + "variant=swamp_cobble": { "model": "botania:swamp_cobble_stone" }, + "variant=desert_cobble": { "model": "botania:desert_cobble_stone" }, + "variant=taiga_cobble": { "model": "botania:taiga_cobble_stone" }, + "variant=mesa_cobble": { "model": "botania:mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json index 622220653..789994f0f 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone0" } - }] + "normal": { "model": "botania:forest_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json index a0c0c5ba3..a7b695ca5 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone10" } - }] + "normal": { "model": "botania:mountain_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json index 685aced75..a5f013dfe 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone11" } - }] + "normal": { "model": "botania:fungal_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json index 35fdc8ea2..979cce0ba 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone12" } - }] + "normal": { "model": "botania:swamp_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json index f0da4d47e..aff3bc828 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone13" } - }] + "normal": { "model": "botania:desert_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json index 5a6e9b1dc..a1827a0b5 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone14" } - }] + "normal": { "model": "botania:taiga_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json index 985fb290f..05f15a488 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone15" } - }] + "normal": { "model": "botania:mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json index c052661cc..12df9e1be 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone1" } - }] + "normal": { "model": "botania:plains_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json index ad8967e4c..e1e5402a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone2" } - }] + "normal": { "model": "botania:mountain_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json index ae53dde27..29c3ea890 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone3" } - }] + "normal": { "model": "botania:fungal_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json index 3a02ee0f9..71dfb7ef2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone4" } - }] + "normal": { "model": "botania:swamp_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json index 74e8a7dae..905561869 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone5" } - }] + "normal": { "model": "botania:desert_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json index 95cdc2830..03bee51e9 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone6" } - }] + "normal": { "model": "botania:taiga_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json index 6b89dbc07..373fa8a7c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone7" } - }] + "normal": { "model": "botania:mesa_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json index b708579a9..a9b5213a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone8" } - }] + "normal": { "model": "botania:forest_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json index c853b5705..f74a950bc 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone9" } - }] + "normal": { "model": "botania:plains_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/buriedPetals.json b/src/main/resources/assets/botania/blockstates/buriedPetals.json index 52b77d221..63daacef1 100644 --- a/src/main/resources/assets/botania/blockstates/buriedPetals.json +++ b/src/main/resources/assets/botania/blockstates/buriedPetals.json @@ -21,7 +21,6 @@ "green": { "textures": { "particle": "minecraft:blocks/wool_colored_green" }}, "red": { "textures": { "particle": "minecraft:blocks/wool_colored_red" }}, "black": { "textures": { "particle": "minecraft:blocks/wool_colored_black" }} - }, - "inventory": [{}] + } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json index 7002906fc..10c617df7 100644 --- a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json +++ b/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json @@ -1,18 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/cacophoniumBlock1", - "top": "botania:blocks/cacophoniumBlock0", - "side": "botania:blocks/cacophoniumBlock1" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - } + "powered=false": { "model": "botania:cacophonium_block" }, + "powered=true": { "model": "botania:cacophonium_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cocoon.json b/src/main/resources/assets/botania/blockstates/cocoon.json index 7b35ff907..575ca5610 100644 --- a/src/main/resources/assets/botania/blockstates/cocoon.json +++ b/src/main/resources/assets/botania/blockstates/cocoon.json @@ -1,18 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:cocoon", - "textures": { - "bottom": "botania:model/cocoon_bottom", - "top": "botania:model/cocoon_top", - "north": "botania:model/cocoon_north", - "south": "botania:model/cocoon_south", - "west": "botania:model/cocoon_west", - "east": "botania:model/cocoon_east" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:cocoon" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cacophonium_block.json b/src/main/resources/assets/botania/models/block/cacophonium_block.json new file mode 100644 index 000000000..ff56dd5a1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cacophonium_block.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/cacophoniumBlock1", + "top": "botania:blocks/cacophoniumBlock0", + "side": "botania:blocks/cacophoniumBlock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cocoon.json b/src/main/resources/assets/botania/models/block/cocoon.json index 470827526..1f13c87b4 100644 --- a/src/main/resources/assets/botania/models/block/cocoon.json +++ b/src/main/resources/assets/botania/models/block/cocoon.json @@ -1,6 +1,13 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#west" + "bottom": "botania:model/cocoon_bottom", + "top": "botania:model/cocoon_top", + "north": "botania:model/cocoon_north", + "south": "botania:model/cocoon_south", + "west": "botania:model/cocoon_west", + "east": "botania:model/cocoon_east", + "particle": "botania:model/cocoon_east" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_stone.json b/src/main/resources/assets/botania/models/block/desert_cobble_stone.json new file mode 100644 index 000000000..d649c97d1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_stone.json b/src/main/resources/assets/botania/models/block/desert_stone.json new file mode 100644 index 000000000..d67da6739 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_stone.json b/src/main/resources/assets/botania/models/block/forest_cobble_stone.json new file mode 100644 index 000000000..8bfba3dd5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_stone.json b/src/main/resources/assets/botania/models/block/forest_stone.json new file mode 100644 index 000000000..c749b11af --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_stone.json b/src/main/resources/assets/botania/models/block/fungal_cobble_stone.json new file mode 100644 index 000000000..5cb950824 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_stone.json b/src/main/resources/assets/botania/models/block/fungal_stone.json new file mode 100644 index 000000000..68dd2e184 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_stone.json b/src/main/resources/assets/botania/models/block/mesa_cobble_stone.json new file mode 100644 index 000000000..f97bdd014 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_stone.json b/src/main/resources/assets/botania/models/block/mesa_stone.json new file mode 100644 index 000000000..98b5666ab --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_stone.json b/src/main/resources/assets/botania/models/block/mountain_cobble_stone.json new file mode 100644 index 000000000..a8af764c3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_stone.json b/src/main/resources/assets/botania/models/block/mountain_stone.json new file mode 100644 index 000000000..3ef66eaea --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_stone.json b/src/main/resources/assets/botania/models/block/plains_cobble_stone.json new file mode 100644 index 000000000..e102ce939 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_stone.json b/src/main/resources/assets/botania/models/block/plains_stone.json new file mode 100644 index 000000000..2f8758753 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_stone.json b/src/main/resources/assets/botania/models/block/swamp_cobble_stone.json new file mode 100644 index 000000000..5bf0c567d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_stone.json b/src/main/resources/assets/botania/models/block/swamp_stone.json new file mode 100644 index 000000000..67f6676df --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_stone.json b/src/main/resources/assets/botania/models/block/taiga_cobble_stone.json new file mode 100644 index 000000000..87d553f31 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_cobble_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_stone.json b/src/main/resources/assets/botania/models/block/taiga_stone.json new file mode 100644 index 000000000..b5817f427 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone6" + } +} \ No newline at end of file From 7ce589c6db9d10a02cd1f1e13a3b20c42b3cac78 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jul 2016 19:02:31 -0500 Subject: [PATCH 822/935] Made treasure enchants more expensive to apply, remove some log spam --- .../vazkii/botania/common/block/tile/TileEnchanter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 e2c075407..29e819e83 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -207,7 +207,12 @@ 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.getRarity().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) + * (data.enchantmentobj.isTreasureEnchantment() ? 1.25F : 1F)); } } else if(mana >= manaRequired) { manaRequired = 0; @@ -348,7 +353,6 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { String enchStr = cmp.getString(TAG_ENCHANTS); if(!enchStr.isEmpty()) { String[] enchTokens = enchStr.split(","); - Botania.LOGGER.info(Arrays.toString(enchTokens)); for(String token : enchTokens) { String[] entryTokens = token.split("="); Enchantment ench = Enchantment.getEnchantmentByLocation(entryTokens[0]); From 32a505a57542b9b56aa4b8f4921dc535da436282 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Jul 2016 22:04:23 -0500 Subject: [PATCH 823/935] More model reorganization --- .../client/core/handler/ModelHandler.java | 7 +++- .../botania/blockstates/distributor.json | 12 +----- .../botania/blockstates/enchantedSoil.json | 12 +----- .../assets/botania/blockstates/enchanter.json | 14 +------ .../botania/blockstates/enderEyeBlock.json | 15 +------ .../botania/blockstates/felPumpkin.json | 20 ++-------- .../botania/blockstates/incensePlate.json | 18 ++------- .../assets/botania/blockstates/manaVoid.json | 10 +---- .../botania/blockstates/petalBlock.json | 4 +- .../botania/blockstates/pistonRelay.json | 10 +---- .../assets/botania/blockstates/platform.json | 13 ++----- .../blockstates/redStringComparator.json | 24 +++--------- .../blockstates/redStringContainer.json | 24 +++--------- .../blockstates/redStringDispenser.json | 28 +++---------- .../blockstates/redStringFertilizer.json | 24 +++--------- .../blockstates/redStringInterceptor.json | 28 +++---------- .../botania/blockstates/redStringRelay.json | 24 +++--------- .../botania/blockstates/rfGenerator.json | 10 +---- .../assets/botania/blockstates/runeAltar.json | 4 +- .../assets/botania/blockstates/spreader.json | 39 ++----------------- .../assets/botania/blockstates/storage.json | 17 +++----- .../models/block/abstruse_platform.json | 6 +++ .../models/block/dragonstone_block.json | 6 +++ .../models/block/elementium_block.json | 6 +++ .../botania/models/block/elven_spreader.json | 8 ++++ .../botania/models/block/enchanted_soil.json | 8 ++++ .../botania/models/block/ender_eye_block.json | 6 +++ .../models/block/ender_eye_block_powered.json | 6 +++ .../botania/models/block/fel_pumpkin.json | 8 ++++ .../botania/models/block/force_relay.json | 6 +++ .../botania/models/block/gaia_spreader.json | 8 ++++ .../botania/models/block/incense_plate.json | 4 +- .../models/block/infrangible_platform.json | 6 +++ .../models/block/mana_diamond_block.json | 6 +++ .../models/block/mana_distributor.json | 8 ++++ .../botania/models/block/mana_enchanter.json | 6 +++ .../botania/models/block/mana_fluxfield.json | 6 +++ .../botania/models/block/mana_spreader.json | 8 ++++ .../botania/models/block/mana_void.json | 6 +++ .../botania/models/block/manasteel_block.json | 6 +++ .../models/block/red_string_comparator.json | 8 ++++ .../models/block/red_string_container.json | 8 ++++ .../models/block/red_string_dispenser.json | 8 ++++ .../models/block/red_string_fertilizer.json | 8 ++++ .../models/block/red_string_interceptor.json | 8 ++++ .../models/block/red_string_relay.json | 8 ++++ .../models/block/redstone_spreader.json | 8 ++++ .../models/block/{ => shapes}/spreader.json | 1 + .../models/block/spectral_platform.json | 6 +++ .../models/block/terrasteel_block.json | 6 +++ 50 files changed, 264 insertions(+), 286 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/abstruse_platform.json create mode 100644 src/main/resources/assets/botania/models/block/dragonstone_block.json create mode 100644 src/main/resources/assets/botania/models/block/elementium_block.json create mode 100644 src/main/resources/assets/botania/models/block/elven_spreader.json create mode 100644 src/main/resources/assets/botania/models/block/enchanted_soil.json create mode 100644 src/main/resources/assets/botania/models/block/ender_eye_block.json create mode 100644 src/main/resources/assets/botania/models/block/ender_eye_block_powered.json create mode 100644 src/main/resources/assets/botania/models/block/fel_pumpkin.json create mode 100644 src/main/resources/assets/botania/models/block/force_relay.json create mode 100644 src/main/resources/assets/botania/models/block/gaia_spreader.json create mode 100644 src/main/resources/assets/botania/models/block/infrangible_platform.json create mode 100644 src/main/resources/assets/botania/models/block/mana_diamond_block.json create mode 100644 src/main/resources/assets/botania/models/block/mana_distributor.json create mode 100644 src/main/resources/assets/botania/models/block/mana_enchanter.json create mode 100644 src/main/resources/assets/botania/models/block/mana_fluxfield.json create mode 100644 src/main/resources/assets/botania/models/block/mana_spreader.json create mode 100644 src/main/resources/assets/botania/models/block/mana_void.json create mode 100644 src/main/resources/assets/botania/models/block/manasteel_block.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_comparator.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_container.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_dispenser.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_fertilizer.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_interceptor.json create mode 100644 src/main/resources/assets/botania/models/block/red_string_relay.json create mode 100644 src/main/resources/assets/botania/models/block/redstone_spreader.json rename src/main/resources/assets/botania/models/block/{ => shapes}/spreader.json (99%) create mode 100644 src/main/resources/assets/botania/models/block/spectral_platform.json create mode 100644 src/main/resources/assets/botania/models/block/terrasteel_block.json 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 b5adfe559..be4af3ce5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -244,9 +244,9 @@ public final class ModelHandler { registerBlockVariantInventory(ModBlocks.pump); registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); - registerBlockVariant(ModBlocks.redStringDispenser, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringDispenser, "facing=north"); registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); - registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north,powered=false"); + registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north"); registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); registerBlockVariantNormal(ModBlocks.rfGenerator); registerBlockVariantNormal(ModBlocks.root); @@ -315,6 +315,9 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + + ModelLoader.setCustomStateMapper(ModBlocks.redStringDispenser, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + ModelLoader.setCustomStateMapper(ModBlocks.redStringInterceptor, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); } private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { diff --git a/src/main/resources/assets/botania/blockstates/distributor.json b/src/main/resources/assets/botania/blockstates/distributor.json index 886ce900b..abc49f785 100644 --- a/src/main/resources/assets/botania/blockstates/distributor.json +++ b/src/main/resources/assets/botania/blockstates/distributor.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "top": "botania:blocks/distributor0", - "side": "botania:blocks/distributor1", - "bottom": "botania:blocks/livingrock0" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_distributor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedSoil.json index ad3fd5ec7..3d5fd4c4a 100644 --- a/src/main/resources/assets/botania/blockstates/enchantedSoil.json +++ b/src/main/resources/assets/botania/blockstates/enchantedSoil.json @@ -1,15 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/enchantedSoil0", - "side": "botania:blocks/enchantedSoil1" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:enchanted_soil" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enchanter.json b/src/main/resources/assets/botania/blockstates/enchanter.json index 317ae0bd2..536e7f653 100644 --- a/src/main/resources/assets/botania/blockstates/enchanter.json +++ b/src/main/resources/assets/botania/blockstates/enchanter.json @@ -1,16 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/enchanter" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "x": {}, - "z": {} - } + "facing=x": { "model": "botania:mana_enchanter" }, + "facing=z": { "model": "botania:mana_enchanter" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json index d509fb021..ccd930d3c 100644 --- a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -1,17 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/enderEyeBlock0" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": { "textures": { "all": "botania:blocks/enderEyeBlock1" } }, - "false": {} - }, - "powered=false": [{}] + "powered=true": { "model": "botania:ender_eye_block_powered" }, + "powered=false": { "model": "botania:ender_eye_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felPumpkin.json index a883a82f2..c07e63156 100644 --- a/src/main/resources/assets/botania/blockstates/felPumpkin.json +++ b/src/main/resources/assets/botania/blockstates/felPumpkin.json @@ -1,20 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "minecraft:blocks/pumpkin_top", - "front": "botania:blocks/felPumpkin", - "side": "minecraft:blocks/pumpkin_side" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } + "facing=north": { "model": "botania:fel_pumpkin" }, + "facing=south": { "model": "botania:fel_pumpkin", "y": 180 }, + "facing=west": { "model": "botania:fel_pumpkin", "y": 270 }, + "facing=east": { "model": "botania:fel_pumpkin", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incensePlate.json index 05eb4c866..7fbf37f19 100644 --- a/src/main/resources/assets/botania/blockstates/incensePlate.json +++ b/src/main/resources/assets/botania/blockstates/incensePlate.json @@ -1,18 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:incense_plate", - "textures": { - "all": "botania:model/incensePlate" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": {}, - "west": { "y": 90 }, - "east": { "y": 270 } - } + "facing=north": { "model": "botania:incense_plate", "y": 180 }, + "facing=south": { "model": "botania:incense_plate" }, + "facing=west": { "model": "botania:incense_plate", "y": 90 }, + "facing=east": { "model": "botania:incense_plate", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manaVoid.json index dde8c8f4b..c2aed8531 100644 --- a/src/main/resources/assets/botania/blockstates/manaVoid.json +++ b/src/main/resources/assets/botania/blockstates/manaVoid.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/manaVoid0" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_void" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalBlock.json index ec1198c64..c2e7134c7 100644 --- a/src/main/resources/assets/botania/blockstates/petalBlock.json +++ b/src/main/resources/assets/botania/blockstates/petalBlock.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:petal_block" - } + "normal": { "model": "botania:petal_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonRelay.json index bc7045a49..d554e34dc 100644 --- a/src/main/resources/assets/botania/blockstates/pistonRelay.json +++ b/src/main/resources/assets/botania/blockstates/pistonRelay.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/pistonRelay" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:force_relay" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/platform.json b/src/main/resources/assets/botania/blockstates/platform.json index a49c7b032..f2f52b17f 100644 --- a/src/main/resources/assets/botania/blockstates/platform.json +++ b/src/main/resources/assets/botania/blockstates/platform.json @@ -1,14 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "abstruse": { "textures": { "all": "botania:blocks/platform0" } }, - "spectral": { "textures": { "all": "botania:blocks/platform1" } }, - "infrangible": { "textures": { "all": "botania:blocks/platform2" } } - } + "variant=abstruse": { "model": "botania:abstruse_platform" }, + "variant=spectral": { "model": "botania:spectral_platform" }, + "variant=infrangible": { "model": "botania:infrangible_platform" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redStringComparator.json index 235c9f735..7ede7d4e9 100644 --- a/src/main/resources/assets/botania/blockstates/redStringComparator.json +++ b/src/main/resources/assets/botania/blockstates/redStringComparator.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringComparator", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringComparator" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_comparator" }, + "facing=south": { "model": "botania:red_string_comparator", "y": 180 }, + "facing=west": { "model": "botania:red_string_comparator", "y": 270 }, + "facing=east": { "model": "botania:red_string_comparator", "y": 90 }, + "facing=up": { "model": "botania:red_string_comparator", "x": 270 }, + "facing=down": { "model": "botania:red_string_comparator", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redStringContainer.json index 5e69b9040..22728cbf9 100644 --- a/src/main/resources/assets/botania/blockstates/redStringContainer.json +++ b/src/main/resources/assets/botania/blockstates/redStringContainer.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringContainer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringContainer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_container" }, + "facing=south": { "model": "botania:red_string_container", "y": 180 }, + "facing=west": { "model": "botania:red_string_container", "y": 270 }, + "facing=east": { "model": "botania:red_string_container", "y": 90 }, + "facing=up": { "model": "botania:red_string_container", "x": 270 }, + "facing=down": { "model": "botania:red_string_container", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redStringDispenser.json index b36fdda64..94fe15a9c 100644 --- a/src/main/resources/assets/botania/blockstates/redStringDispenser.json +++ b/src/main/resources/assets/botania/blockstates/redStringDispenser.json @@ -1,26 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringContainer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringContainer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - }, - "powered": { - "true": {}, - "false": {} - } + "facing=north": { "model": "botania:red_string_dispenser" }, + "facing=south": { "model": "botania:red_string_dispenser", "y": 180 }, + "facing=west": { "model": "botania:red_string_dispenser", "y": 270 }, + "facing=east": { "model": "botania:red_string_dispenser", "y": 90 }, + "facing=up": { "model": "botania:red_string_dispenser", "x": 270 }, + "facing=down": { "model": "botania:red_string_dispenser", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json index 341542a68..3e9c36371 100644 --- a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json +++ b/src/main/resources/assets/botania/blockstates/redStringFertilizer.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringFertilizer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringFertilizer" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_fertilizer" }, + "facing=south": { "model": "botania:red_string_fertilizer", "y": 180 }, + "facing=west": { "model": "botania:red_string_fertilizer", "y": 270 }, + "facing=east": { "model": "botania:red_string_fertilizer", "y": 90 }, + "facing=up": { "model": "botania:red_string_fertilizer", "x": 270 }, + "facing=down": { "model": "botania:red_string_fertilizer", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json index 2c4f60c88..bbb573d97 100644 --- a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/redStringInterceptor.json @@ -1,26 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringInterceptor", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringInterceptor" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - }, - "powered": { - "true": {}, - "false": {} - } + "facing=north": { "model": "botania:red_string_interceptor" }, + "facing=south": { "model": "botania:red_string_interceptor", "y": 180 }, + "facing=west": { "model": "botania:red_string_interceptor", "y": 270 }, + "facing=east": { "model": "botania:red_string_interceptor", "y": 90 }, + "facing=up": { "model": "botania:red_string_interceptor", "x": 270 }, + "facing=down": { "model": "botania:red_string_interceptor", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redStringRelay.json index a430ae041..ca75d0680 100644 --- a/src/main/resources/assets/botania/blockstates/redStringRelay.json +++ b/src/main/resources/assets/botania/blockstates/redStringRelay.json @@ -1,22 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable", - "textures": { - "top": "botania:blocks/redStringRelay", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringRelay" - }, - "transform": "forge:default-block" - }, "variants": { - "facing": { - "north": {}, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 }, - "down": { "x": 90 }, - "up": { "x": 270 } - } + "facing=north": { "model": "botania:red_string_relay" }, + "facing=south": { "model": "botania:red_string_relay", "y": 180 }, + "facing=west": { "model": "botania:red_string_relay", "y": 270 }, + "facing=east": { "model": "botania:red_string_relay", "y": 90 }, + "facing=up": { "model": "botania:red_string_relay", "x": 270 }, + "facing=down": { "model": "botania:red_string_relay", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfGenerator.json index f7c71579d..83fd6c04c 100644 --- a/src/main/resources/assets/botania/blockstates/rfGenerator.json +++ b/src/main/resources/assets/botania/blockstates/rfGenerator.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/rfGenerator" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_fluxfield" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runeAltar.json index cc64d8632..d1b467937 100644 --- a/src/main/resources/assets/botania/blockstates/runeAltar.json +++ b/src/main/resources/assets/botania/blockstates/runeAltar.json @@ -1,7 +1,5 @@ { "variants": { - "normal": { - "model": "botania:runic_altar" - } + "normal": { "model": "botania:runic_altar" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index a5efbf935..2f9baaed6 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -1,39 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:spreader", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "mana": { - "textures": { - "inside": "botania:model/spreader_item/mana_inside", - "side": "botania:model/spreader_item/mana_side", - "material": "botania:blocks/livingwood0" - } - }, - "redstone": { - "textures": { - "inside": "botania:model/spreader_item/redstone_inside", - "side": "botania:model/spreader_item/redstone_side", - "material": "botania:model/spreader_item/redstone_material" - } - }, - "elven": { - "textures": { - "inside": "botania:model/spreader_item/elven_inside", - "side": "botania:model/spreader_item/elven_side", - "material": "botania:blocks/dreamwood0" - } - }, - "gaia": { - "textures": { - "inside": "botania:model/spreader_item/gaia_inside", - "side": "botania:model/spreader_item/gaia_side", - "material": "botania:blocks/dreamwood0" - } - } - } + "variant=mana": { "model": "botania:mana_spreader" }, + "variant=redstone": { "model": "botania:redstone_spreader" }, + "variant=elven": { "model": "botania:elven_spreader" }, + "variant=gaia": { "model": "botania:gaia_spreader" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json index 101c43d96..416692109 100644 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "manasteel": { "textures": { "all": "botania:blocks/storage0" } }, - "terrasteel": { "textures": { "all": "botania:blocks/storage1" } }, - "elementium": { "textures": { "all": "botania:blocks/storage2" } }, - "mana_diamond": { "textures": { "all": "botania:blocks/storage3" } }, - "dragonstone": { "textures": { "all": "botania:blocks/storage4" } } - } + "variant=manasteel": { "model": "botania:manasteel_block" }, + "variant=terrasteel": { "model": "botania:terrasteel_block" }, + "variant=elementium": { "model": "botania:elementium_block" }, + "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, + "variant=dragonstone": { "model": "botania:dragonstone_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/abstruse_platform.json b/src/main/resources/assets/botania/models/block/abstruse_platform.json new file mode 100644 index 000000000..f3b6eaa40 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/abstruse_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/main/resources/assets/botania/models/block/dragonstone_block.json new file mode 100644 index 000000000..7d0c130d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dragonstone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/main/resources/assets/botania/models/block/elementium_block.json new file mode 100644 index 000000000..a55282f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elementium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elven_spreader.json b/src/main/resources/assets/botania/models/block/elven_spreader.json new file mode 100644 index 000000000..643dfa0c9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elven_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/elven_inside", + "side": "botania:model/spreader_item/elven_side", + "material": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/enchanted_soil.json b/src/main/resources/assets/botania/models/block/enchanted_soil.json new file mode 100644 index 000000000..94d0bc551 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/enchanted_soil.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:blocks/dirt", + "top": "botania:blocks/enchantedSoil0", + "side": "botania:blocks/enchantedSoil1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block.json b/src/main/resources/assets/botania/models/block/ender_eye_block.json new file mode 100644 index 000000000..ece4ad790 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/ender_eye_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json new file mode 100644 index 000000000..21db23bae --- /dev/null +++ b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fel_pumpkin.json b/src/main/resources/assets/botania/models/block/fel_pumpkin.json new file mode 100644 index 000000000..8d46f4eb2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fel_pumpkin.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "minecraft:blocks/pumpkin_top", + "front": "botania:blocks/felPumpkin", + "side": "minecraft:blocks/pumpkin_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/force_relay.json b/src/main/resources/assets/botania/models/block/force_relay.json new file mode 100644 index 000000000..e26dd6888 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/force_relay.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pistonRelay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_spreader.json b/src/main/resources/assets/botania/models/block/gaia_spreader.json new file mode 100644 index 000000000..705ca1e5e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/gaia_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/gaia_inside", + "side": "botania:model/spreader_item/gaia_side", + "material": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/incense_plate.json b/src/main/resources/assets/botania/models/block/incense_plate.json index 71ba93775..dc050fc94 100644 --- a/src/main/resources/assets/botania/models/block/incense_plate.json +++ b/src/main/resources/assets/botania/models/block/incense_plate.json @@ -1,6 +1,8 @@ { + "parent": "minecraft:block/block", "textures": { - "particle": "#all" + "all": "botania:model/incensePlate", + "particle": "botania:model/incensePlate" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/infrangible_platform.json b/src/main/resources/assets/botania/models/block/infrangible_platform.json new file mode 100644 index 000000000..090087bbe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/infrangible_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/main/resources/assets/botania/models/block/mana_diamond_block.json new file mode 100644 index 000000000..4a875189b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_distributor.json b/src/main/resources/assets/botania/models/block/mana_distributor.json new file mode 100644 index 000000000..49a795162 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_distributor.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/distributor0", + "side": "botania:blocks/distributor1", + "bottom": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_enchanter.json b/src/main/resources/assets/botania/models/block/mana_enchanter.json new file mode 100644 index 000000000..3c8590ff9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_enchanter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/enchanter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_fluxfield.json b/src/main/resources/assets/botania/models/block/mana_fluxfield.json new file mode 100644 index 000000000..9423529e7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_fluxfield.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/rfGenerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_spreader.json b/src/main/resources/assets/botania/models/block/mana_spreader.json new file mode 100644 index 000000000..fbbc73c95 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/mana_inside", + "side": "botania:model/spreader_item/mana_side", + "material": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_void.json b/src/main/resources/assets/botania/models/block/mana_void.json new file mode 100644 index 000000000..402d24915 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_void.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaVoid0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/main/resources/assets/botania/models/block/manasteel_block.json new file mode 100644 index 000000000..bdb8f0a68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_comparator.json b/src/main/resources/assets/botania/models/block/red_string_comparator.json new file mode 100644 index 000000000..58070033a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_comparator.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringComparator", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringComparator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_container.json b/src/main/resources/assets/botania/models/block/red_string_container.json new file mode 100644 index 000000000..4a8ebe34c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_container.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringContainer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringContainer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_dispenser.json b/src/main/resources/assets/botania/models/block/red_string_dispenser.json new file mode 100644 index 000000000..bbddc9883 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_dispenser.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringDispenser", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringDispenser" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json new file mode 100644 index 000000000..10771f70c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringFertilizer", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringFertilizer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_interceptor.json b/src/main/resources/assets/botania/models/block/red_string_interceptor.json new file mode 100644 index 000000000..6c31f846b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_interceptor.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringInterceptor", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringInterceptor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_relay.json b/src/main/resources/assets/botania/models/block/red_string_relay.json new file mode 100644 index 000000000..d62841e01 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/red_string_relay.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "botania:blocks/redStringRelay", + "front": "botania:blocks/redStringSender", + "side": "botania:blocks/redStringRelay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader.json b/src/main/resources/assets/botania/models/block/redstone_spreader.json new file mode 100644 index 000000000..15e48655c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/redstone_spreader.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/spreader", + "textures": { + "inside": "botania:model/spreader_item/redstone_inside", + "side": "botania:model/spreader_item/redstone_side", + "material": "botania:model/spreader_item/redstone_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/spreader.json b/src/main/resources/assets/botania/models/block/shapes/spreader.json similarity index 99% rename from src/main/resources/assets/botania/models/block/spreader.json rename to src/main/resources/assets/botania/models/block/shapes/spreader.json index 93cc92e43..32ca9a9a0 100644 --- a/src/main/resources/assets/botania/models/block/spreader.json +++ b/src/main/resources/assets/botania/models/block/shapes/spreader.json @@ -1,4 +1,5 @@ { + "parent": "minecraft:block/block", "textures": { "particle": "#material" }, diff --git a/src/main/resources/assets/botania/models/block/spectral_platform.json b/src/main/resources/assets/botania/models/block/spectral_platform.json new file mode 100644 index 000000000..feee92618 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/spectral_platform.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/platform1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/main/resources/assets/botania/models/block/terrasteel_block.json new file mode 100644 index 000000000..add746c6d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/terrasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage1" + } +} \ No newline at end of file From d622f0cd586fe1294d9a59adf752512922fd3155 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jul 2016 18:04:17 -0500 Subject: [PATCH 824/935] Move block registration out of constructors --- build.properties | 2 +- .../botania/common/block/BlockGaiaHead.java | 10 +++- .../botania/common/block/BlockGhostRail.java | 12 +++- .../vazkii/botania/common/block/BlockMod.java | 12 +++- .../common/block/BlockModDoubleFlower.java | 12 +++- .../botania/common/block/BlockModFlower.java | 11 +++- .../botania/common/block/BlockSolidVines.java | 9 ++- .../common/block/BlockSpecialFlower.java | 10 +++- .../common/block/IRegisterCallback.java | 8 +++ .../botania/common/block/ModBlocks.java | 12 ++++ .../botania/common/block/ModFluffBlocks.java | 57 ------------------- .../common/block/decor/BlockModMushroom.java | 13 ++++- .../block/decor/panes/BlockModPane.java | 12 +++- .../block/decor/slabs/BlockModSlab.java | 13 +++-- .../block/decor/stairs/BlockModStairs.java | 14 ++++- .../decor/walls/BlockBiomeStoneWall.java | 4 +- .../block/decor/walls/BlockModWall.java | 12 ++-- 17 files changed, 127 insertions(+), 96 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/IRegisterCallback.java diff --git a/build.properties b/build.properties index f3174e9bf..eaaa6886f 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2018 +forge_version=12.18.1.2041 build_number=314 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 9acc0d285..f5605c9c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -38,10 +38,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull implements IModelRegister { +public class BlockGaiaHead extends BlockSkull implements IModelRegister, IRegisterCallback { public BlockGaiaHead() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); setUnlocalizedName(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } @@ -90,4 +91,9 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); } + + @Override + public void register() { + GameRegistry.register(this); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 690eebdbb..df2662fa1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -36,15 +36,15 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockGhostRail extends BlockRailBase implements ILexiconable { +public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { super(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); setUnlocalizedName(LibBlockNames.GHOST_RAIL); MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); @@ -108,4 +108,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { public IProperty getShapeProperty() { return BlockRailPowered.SHAPE; } + + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index e05cc29ce..82cd912a9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -25,13 +25,13 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockMod extends Block implements IModelRegister { +public class BlockMod extends Block implements IModelRegister, IRegisterCallback { public BlockMod(Material par2Material, String name) { super(par2Material); setUnlocalizedName(name); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - registerItemForm(); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -49,4 +49,10 @@ public class BlockMod extends Block implements IModelRegister { public void registerModels() { } + + @Override + public void register() { + GameRegistry.register(this); + registerItemForm(); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 37ce7349d..6859a11ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IRegisterCallback { private static final int COUNT = 8; private final boolean second; @@ -59,8 +59,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I this.setHardness(0.0F); this.setSoundType(SoundType.PLANT); String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setHardness(0F); setTickRandomly(false); @@ -218,4 +218,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); } + @Override + public final void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 2d89c4c7c..aff8c93fe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -47,7 +47,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable { +public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IRegisterCallback { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -57,8 +57,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup protected BlockModFlower(String name) { setUnlocalizedName(name); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - registerItemForm(); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setHardness(0F); setSoundType(SoundType.PLANT); setTickRandomly(false); @@ -165,4 +165,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup world.setBlockState(pos.up(), flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } + @Override + public void register() { + GameRegistry.register(this); + registerItemForm(); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 51912a242..e45cf38ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -32,10 +32,11 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -public class BlockSolidVines extends BlockVine implements ILexiconable { +public class BlockSolidVines extends BlockVine implements ILexiconable, IRegisterCallback { public BlockSolidVines() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); @@ -66,4 +67,8 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { return LexiconData.vineBall; } + @Override + public void register() { + GameRegistry.register(this); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7b7f45cc1..698f50a05 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -65,7 +65,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IRegisterCallback { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( @@ -121,8 +121,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); protected BlockSpecialFlower() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); - GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); @@ -377,4 +376,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } } + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/IRegisterCallback.java b/src/main/java/vazkii/botania/common/block/IRegisterCallback.java new file mode 100644 index 000000000..8a47ef02a --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/IRegisterCallback.java @@ -0,0 +1,8 @@ +package vazkii.botania.common.block; + +public interface IRegisterCallback { + /** + * Register block and any itemblocks + */ + void register(); +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 5c1a90b32..b833691cf 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -175,8 +175,12 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import java.util.HashSet; +import java.util.Set; + public final class ModBlocks { + public static final Set ALL_BLOCKS = new HashSet<>(); public static Block flower; public static Block altar; public static Block livingrock; @@ -352,6 +356,14 @@ public final class ModBlocks { ModFluffBlocks.init(); + for (Block b : ALL_BLOCKS) { + if (b instanceof IRegisterCallback) { + ((IRegisterCallback) b).register(); + } else { + throw new RuntimeException(b.getRegistryName() + " doesn't have register callbacks!"); + } + } + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 62691fd73..01143a6f3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -271,63 +271,6 @@ public final class ModFluffBlocks { managlassPane = new BlockManaglassPane(); alfglassPane = new BlockAlfglassPane(); bifrostPane = new BlockBifrostPane(); - - if(ConfigHandler.darkQuartzEnabled) { - ((BlockModSlab) darkQuartzSlab).register(); - ((BlockModSlab) darkQuartzSlabFull).register(); - } - ((BlockModSlab) manaQuartzSlab).register(); - ((BlockModSlab) manaQuartzSlabFull).register(); - ((BlockModSlab) blazeQuartzSlab).register(); - ((BlockModSlab) blazeQuartzSlabFull).register(); - ((BlockModSlab) lavenderQuartzSlab).register(); - ((BlockModSlab) lavenderQuartzSlabFull).register(); - ((BlockModSlab) redQuartzSlab).register(); - ((BlockModSlab) redQuartzSlabFull).register(); - ((BlockModSlab) elfQuartzSlab).register(); - ((BlockModSlab) elfQuartzSlabFull).register(); - ((BlockModSlab) sunnyQuartzSlab).register(); - ((BlockModSlab) sunnyQuartzSlabFull).register(); - - ((BlockModSlab) livingwoodSlab).register(); - ((BlockModSlab) livingwoodSlabFull).register(); - ((BlockModSlab) livingwoodPlankSlab).register(); - ((BlockModSlab) livingwoodPlankSlabFull).register(); - ((BlockModSlab) livingrockSlab).register(); - ((BlockModSlab) livingrockSlabFull).register(); - ((BlockModSlab) livingrockBrickSlab).register(); - ((BlockModSlab) livingrockBrickSlabFull).register(); - ((BlockModSlab) dreamwoodSlab).register(); - ((BlockModSlab) dreamwoodSlabFull).register(); - ((BlockModSlab) dreamwoodPlankSlab).register(); - ((BlockModSlab) dreamwoodPlankSlabFull).register(); - - ((BlockModSlab) netherBrickSlab).register(); - ((BlockModSlab) netherBrickSlabFull).register(); - ((BlockModSlab) soulBrickSlab).register(); - ((BlockModSlab) soulBrickSlabFull).register(); - ((BlockModSlab) snowBrickSlab).register(); - ((BlockModSlab) snowBrickSlabFull).register(); - ((BlockModSlab) tileSlab).register(); - ((BlockModSlab) tileSlabFull).register(); - - ((BlockModSlab) dirtPathSlab).register(); - ((BlockModSlab) dirtPathSlabFull).register(); - - ((BlockModSlab) shimmerrockSlab).register(); - ((BlockModSlab) shimmerrockSlabFull).register(); - ((BlockModSlab) shimmerwoodPlankSlab).register(); - ((BlockModSlab) shimmerwoodPlankSlabFull).register(); - - for(int i = 0; i < 24; i++) { - ((BlockModSlab) biomeStoneSlabs[i]).register(); - ((BlockModSlab) biomeStoneFullSlabs[i]).register(); - } - - for(int i = 0; i < pavementSlabs.length; i++) { - ((BlockModSlab) pavementSlabs[i]).register(); - ((BlockModSlab) pavementFullSlabs[i]).register(); - } } } 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 70cc14779..640ac86fa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -38,6 +38,8 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -50,13 +52,13 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { +public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); public BlockModMushroom() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); @@ -153,4 +155,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); + } } 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 da85f97ee..c60f7353f 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 @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; @@ -26,14 +27,14 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockModPane extends BlockPane { +public class BlockModPane extends BlockPane implements IRegisterCallback { public BlockModPane(Block source) { 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)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + ModBlocks.ALL_BLOCKS.add(this); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); @@ -53,4 +54,9 @@ public class BlockModPane extends BlockPane { return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 7a408a90b..e90da5033 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -24,6 +24,8 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; @@ -33,16 +35,18 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { +public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister, IRegisterCallback { private final String name; private final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); + private static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); this.name = name; setUnlocalizedName(name); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + ModBlocks.ALL_BLOCKS.add(this); doubleSlab = full; if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); @@ -96,10 +100,11 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM return new ItemStack(getSingleBlock()); } + @Override public void register() { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); if (!isDouble()) - GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(new ItemBlockModSlab(this), getRegistryName()); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 3de4a27f4..612181548 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -16,17 +16,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { +public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister, IRegisterCallback { public BlockModStairs(IBlockState state, String name) { super(state); - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + ModBlocks.ALL_BLOCKS.add(this); + setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; @@ -42,4 +44,10 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR public void registerModels() { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); } + + @Override + public void register() { + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 8420433eb..80e4c3054 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -66,8 +66,8 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + public void register() { + GameRegistry.register(this); GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 0e634615f..c278f7ff1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -30,6 +30,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.block.IRegisterCallback; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -38,13 +40,14 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { +public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister, IRegisterCallback { public BlockModWall(Block block, int meta) { super(block); // For backward compat don't kill me String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; - register(name); + setRegistryName(name); + ModBlocks.ALL_BLOCKS.add(this); setUnlocalizedName(name); setDefaultState(blockState.getBaseState() .withProperty(UP, false) @@ -90,8 +93,9 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return true; } - public void register(String name) { - GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + @Override + public void register() { + GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } From c9e164707093ae297fe873861554aac14b78ce9d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jul 2016 18:24:16 -0500 Subject: [PATCH 825/935] Fix crash --- .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 698f50a05..def6834eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -121,6 +121,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); protected BlockSpecialFlower() { + ModBlocks.ALL_BLOCKS.add(this); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); From bc0da6105811308fa60a81e67e10653e9c1fa21a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jul 2016 18:41:07 -0500 Subject: [PATCH 826/935] Build 314 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index eaaa6886f..6d983de6e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Jul 20 20:28:08 CDT 2016 +#Fri Jul 29 18:40:22 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.10.2 forge_version=12.18.1.2041 -build_number=314 +mc_version=1.10.2 +dir_repo=./ +build_number=315 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 6a4e1cdfa..fefc24502 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-313 \ No newline at end of file +r1.8-314 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 5319d60db..f492ab079 100644 --- a/version/update.json +++ b/version/update.json @@ -4,7 +4,8 @@ }, "1.10.2": { "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", - "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313" + "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", + "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -27,8 +28,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-313", - "1.10.2-recommended": "r1.8-313", + "1.10.2-latest": "r1.8-314", + "1.10.2-recommended": "r1.8-314", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index a03abc0b5..625d470d8 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -265,4 +265,5 @@ r1.8-311=1.10 r1.8-312=1.9.4 r1.8-312=1.10.2 r1.8-313=1.9.4 -r1.8-313=1.10.2 \ No newline at end of file +r1.8-313=1.10.2 +r1.8-314=1.10.2 \ No newline at end of file From 3dc65c80d8362491641573cd50d1da9f296211c1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 29 Jul 2016 20:55:59 -0500 Subject: [PATCH 827/935] More model cleanup, and add a readme for artists --- .../assets/botania/ToTextureArtists.txt | 8 ++ .../blockstates/biomeStomeA11SlabFull.json | 9 --- .../botania/blockstates/biomeStoneA0Wall.json | 75 ------------------- .../assets/botania/blockstates/cellBlock.json | 10 +-- .../blockstates/conjurationCatalyst.json | 13 +--- .../botania/blockstates/corporeaFunnel.json | 16 +--- .../blockstates/corporeaInterceptor.json | 16 +--- .../botania/blockstates/corporeaRetainer.json | 14 +--- .../blockstates/desert_cobble_wall.json | 10 +-- .../botania/blockstates/dreamwood0Wall.json | 10 +-- .../blockstates/forest_cobble_wall.json | 10 +-- .../blockstates/fungal_cobble_wall.json | 10 +-- .../botania/blockstates/livingrock0Wall.json | 10 +-- .../botania/blockstates/livingwood0Wall.json | 10 +-- .../assets/botania/blockstates/manaBomb.json | 10 +-- .../botania/blockstates/manaDetector.json | 14 +--- .../assets/botania/blockstates/manaGlass.json | 10 +-- .../botania/blockstates/mesa_cobble_wall.json | 10 +-- .../blockstates/mountain_cobble_wall.json | 10 +-- .../blockstates/plains_cobble_wall.json | 10 +-- .../blockstates/swamp_cobble_wall.json | 10 +-- .../blockstates/taiga_cobble_wall.json | 10 +-- .../botania/models/block/cell_block.json | 6 ++ .../models/block/conjuration_catalyst.json | 8 ++ .../botania/models/block/corporea_funnel.json | 8 ++ .../models/block/corporea_interceptor.json | 8 ++ .../models/block/corporea_retainer.json | 6 ++ .../botania/models/block/mana_detector.json | 6 ++ .../models/block/mana_detector_powered.json | 6 ++ .../botania/models/block/mana_glass.json | 6 ++ .../models/block/manastorm_charge.json | 6 ++ .../{ => walls}/desert_cobble_wall_post.json | 0 .../{ => walls}/desert_cobble_wall_side.json | 0 .../{ => walls}/dreamwood_wall_post.json | 0 .../{ => walls}/dreamwood_wall_side.json | 0 .../{ => walls}/forest_cobble_wall_post.json | 0 .../{ => walls}/forest_cobble_wall_side.json | 0 .../{ => walls}/fungal_cobble_wall_post.json | 0 .../{ => walls}/fungal_cobble_wall_side.json | 0 .../{ => walls}/livingrock_wall_post.json | 0 .../{ => walls}/livingrock_wall_side.json | 0 .../{ => walls}/livingwood_wall_post.json | 0 .../{ => walls}/livingwood_wall_side.json | 0 .../{ => walls}/mesa_cobble_wall_post.json | 0 .../{ => walls}/mesa_cobble_wall_side.json | 0 .../mountain_cobble_wall_post.json | 0 .../mountain_cobble_wall_side.json | 0 .../{ => walls}/plains_cobble_wall_post.json | 0 .../{ => walls}/plains_cobble_wall_side.json | 0 .../{ => walls}/swamp_cobble_wall_post.json | 0 .../{ => walls}/swamp_cobble_wall_side.json | 0 .../{ => walls}/taiga_cobble_wall_post.json | 0 .../{ => walls}/taiga_cobble_wall_side.json | 0 53 files changed, 135 insertions(+), 230 deletions(-) create mode 100644 src/main/resources/assets/botania/ToTextureArtists.txt delete mode 100644 src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json delete mode 100644 src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json create mode 100644 src/main/resources/assets/botania/models/block/cell_block.json create mode 100644 src/main/resources/assets/botania/models/block/conjuration_catalyst.json create mode 100644 src/main/resources/assets/botania/models/block/corporea_funnel.json create mode 100644 src/main/resources/assets/botania/models/block/corporea_interceptor.json create mode 100644 src/main/resources/assets/botania/models/block/corporea_retainer.json create mode 100644 src/main/resources/assets/botania/models/block/mana_detector.json create mode 100644 src/main/resources/assets/botania/models/block/mana_detector_powered.json create mode 100644 src/main/resources/assets/botania/models/block/mana_glass.json create mode 100644 src/main/resources/assets/botania/models/block/manastorm_charge.json rename src/main/resources/assets/botania/models/block/{ => walls}/desert_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/desert_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/dreamwood_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/dreamwood_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/forest_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/forest_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/fungal_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/fungal_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/livingrock_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/livingrock_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/livingwood_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/livingwood_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/mesa_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/mesa_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/mountain_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/mountain_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/plains_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/plains_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/swamp_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/swamp_cobble_wall_side.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/taiga_cobble_wall_post.json (100%) rename src/main/resources/assets/botania/models/block/{ => walls}/taiga_cobble_wall_side.json (100%) diff --git a/src/main/resources/assets/botania/ToTextureArtists.txt b/src/main/resources/assets/botania/ToTextureArtists.txt new file mode 100644 index 000000000..c7a21ef7f --- /dev/null +++ b/src/main/resources/assets/botania/ToTextureArtists.txt @@ -0,0 +1,8 @@ +Thanks for improving Botania with your artwork! + +Some things to keep in mind: +1. Keep your textures in powers of two dimensions +2. Edit the jsons in models/block, not the ones in blockstates/ +3. Clean up after yourself - no texture errors on startup! + +Thanks and have at it! \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json deleted file mode 100644 index b8e1cc61d..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStomeA11SlabFull.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStome11" } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json deleted file mode 100644 index 5e6ffa42d..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania:dummy", - "textures": { - "particle": "#wall" - }, - "uvlock": true, - "transform": "forge:default-block" - }, - "variants": { - "north": { - "true": { "submodel": "minecraft:wall_side" }, - "false": {} - }, - "south": { - "true": { "submodel": "minecraft:wall_side", "y": 180 }, - "false": {} - }, - "west": { - "true": { "submodel": "minecraft:wall_side", "y": 270 }, - "false": {} - }, - "east": { - "true": { "submodel": "minecraft:wall_side", "y": 90 }, - "false": {} - }, - "up": { - "true": { "submodel": "minecraft:wall_post" }, - "false": {} - }, - "bswall_variant": { - "forest_cobble": { "textures": { "wall": "botania:blocks/biomeStone8" } }, - "plains_cobble": { "textures": { "wall": "botania:blocks/biomeStone9" } }, - "mountain_cobble": { "textures": { "wall": "botania:blocks/biomeStone10" } }, - "fungal_cobble": { "textures": { "wall": "botania:blocks/biomeStone11" } }, - "swamp_cobble": { "textures": { "wall": "botania:blocks/biomeStone12" } }, - "desert_cobble": { "textures": { "wall": "botania:blocks/biomeStone13" } }, - "taiga_cobble": { "textures": { "wall": "botania:blocks/biomeStone14" } }, - "mesa_cobble": { "textures": { "wall": "botania:blocks/biomeStone15" } } - }, - "inventory_forest_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone8" }, - "model": "minecraft:wall_inventory" - }], - "inventory_plains_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone9" }, - "model": "minecraft:wall_inventory" - }], - "inventory_mountain_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone10" }, - "model": "minecraft:wall_inventory" - }], - "inventory_fungal_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone11" }, - "model": "minecraft:wall_inventory" - }], - "inventory_swamp_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone12" }, - "model": "minecraft:wall_inventory" - }], - "inventory_desert_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone13" }, - "model": "minecraft:wall_inventory" - }], - "inventory_taiga_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone14" }, - "model": "minecraft:wall_inventory" - }], - "inventory_mesa_cobble": [{ - "textures": { "wall": "botania:blocks/biomeStone15" }, - "model": "minecraft:wall_inventory" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellBlock.json index d405b3ad3..058d79dd6 100644 --- a/src/main/resources/assets/botania/blockstates/cellBlock.json +++ b/src/main/resources/assets/botania/blockstates/cellBlock.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/cellBlock" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:cell_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json index e623e55a2..359b5d17a 100644 --- a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json +++ b/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json @@ -1,16 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/conjurationCatalyst0", - "top": "botania:blocks/conjurationCatalyst1", - "side": "botania:blocks/conjurationCatalyst2" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:conjuration_catalyst" } } - } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json index 56d9638be..08b4214ec 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json +++ b/src/main/resources/assets/botania/blockstates/corporeaFunnel.json @@ -1,18 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/corporeaFunnel0", - "top": "botania:blocks/corporeaFunnel0", - "side": "botania:blocks/corporeaFunnel1" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - } + "powered=false": { "model": "botania:corporea_funnel" }, + "powered=true": { "model": "botania:corporea_funnel" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json index 64a7c9a34..6b8a3b84f 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json +++ b/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json @@ -1,18 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/corporeaInterceptor0", - "top": "botania:blocks/corporeaInterceptor0", - "side": "botania:blocks/corporeaInterceptor1" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - } + "powered=false": { "model": "botania:corporea_interceptor" }, + "powered=true": { "model": "botania:corporea_interceptor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json index 350fb96cd..bd5428952 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json +++ b/src/main/resources/assets/botania/blockstates/corporeaRetainer.json @@ -1,16 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/corporeaRetainer" - }, - "transform": "forge:default-block" - }, "variants": { - "powered": { - "true": {}, - "false": {} - } + "powered=true": { "model": "botania:corporea_retainer" }, + "powered=false": { "model": "botania:corporea_retainer" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json index 8705b2a52..c0fb44666 100644 --- a/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:desert_cobble_wall_post" } + "apply": { "model": "botania:walls/desert_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:desert_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/desert_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:desert_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/desert_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:desert_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/desert_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:desert_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/desert_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json index f11b7c08a..961cad135 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:dreamwood_wall_post" } + "apply": { "model": "botania:walls/dreamwood_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:dreamwood_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/dreamwood_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:dreamwood_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/dreamwood_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:dreamwood_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/dreamwood_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:dreamwood_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/dreamwood_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json index 71f9c1d4b..30aed1269 100644 --- a/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:forest_cobble_wall_post" } + "apply": { "model": "botania:walls/forest_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:forest_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/forest_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:forest_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/forest_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:forest_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/forest_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:forest_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/forest_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json index c503bf282..cea3da485 100644 --- a/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:fungal_cobble_wall_post" } + "apply": { "model": "botania:walls/fungal_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:fungal_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/fungal_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:fungal_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/fungal_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:fungal_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/fungal_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:fungal_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/fungal_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json index ddc9bd49c..11461ad34 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:livingrock_wall_post" } + "apply": { "model": "botania:walls/livingrock_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:livingrock_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/livingrock_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:livingrock_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/livingrock_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:livingrock_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/livingrock_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:livingrock_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/livingrock_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json index 7a78863c4..f99a5f705 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:livingwood_wall_post" } + "apply": { "model": "botania:walls/livingwood_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:livingwood_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/livingwood_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:livingwood_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/livingwood_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:livingwood_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/livingwood_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:livingwood_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/livingwood_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/manaBomb.json b/src/main/resources/assets/botania/blockstates/manaBomb.json index 6eb3c0928..ecd268549 100644 --- a/src/main/resources/assets/botania/blockstates/manaBomb.json +++ b/src/main/resources/assets/botania/blockstates/manaBomb.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/manaBomb" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:manastorm_charge" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaDetector.json b/src/main/resources/assets/botania/blockstates/manaDetector.json index 6e0e40770..ade96b44f 100644 --- a/src/main/resources/assets/botania/blockstates/manaDetector.json +++ b/src/main/resources/assets/botania/blockstates/manaDetector.json @@ -1,16 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block", - "textures": { - "all": "botania:blocks/manaDetector0" - } - }, "variants": { - "powered": { - "true": { "textures": { "all": "botania:blocks/manaDetector1" } }, - "false": {} - } + "powered=false": { "model": "botania:mana_detector" }, + "powered=true": { "model": "botania:mana_detector_powered" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json index 7579bf084..f8cce71ca 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlass.json +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "textures": { - "all": "botania:blocks/manaGlass" - }, - "transform": "forge:default-block" - }, "variants": { - "normal": [{}] + "normal": { "model": "botania:mana_glass" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json index a960b7bec..a8e55a55b 100644 --- a/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:mesa_cobble_wall_post" } + "apply": { "model": "botania:walls/mesa_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:mesa_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/mesa_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:mesa_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/mesa_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:mesa_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/mesa_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:mesa_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/mesa_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json index 2606d1a7a..82da2ce3b 100644 --- a/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:mountain_cobble_wall_post" } + "apply": { "model": "botania:walls/mountain_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:mountain_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/mountain_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:mountain_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/mountain_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:mountain_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/mountain_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:mountain_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/mountain_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json index 948c22f9c..c4ebfc502 100644 --- a/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:plains_cobble_wall_post" } + "apply": { "model": "botania:walls/plains_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:plains_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/plains_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:plains_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/plains_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:plains_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/plains_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:plains_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/plains_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json index a05e64004..bf9b57407 100644 --- a/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:swamp_cobble_wall_post" } + "apply": { "model": "botania:walls/swamp_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:swamp_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/swamp_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:swamp_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/swamp_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:swamp_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/swamp_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:swamp_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/swamp_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json index ce48b7bc7..89b511062 100644 --- a/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json +++ b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json @@ -1,19 +1,19 @@ { "multipart": [ { "when": { "up": "true" }, - "apply": { "model": "botania:taiga_cobble_wall_post" } + "apply": { "model": "botania:walls/taiga_cobble_wall_post" } }, { "when": { "north": "true" }, - "apply": { "model": "botania:taiga_cobble_wall_side", "uvlock": true } + "apply": { "model": "botania:walls/taiga_cobble_wall_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "botania:taiga_cobble_wall_side", "y": 90, "uvlock": true } + "apply": { "model": "botania:walls/taiga_cobble_wall_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "botania:taiga_cobble_wall_side", "y": 180, "uvlock": true } + "apply": { "model": "botania:walls/taiga_cobble_wall_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "botania:taiga_cobble_wall_side", "y": 270, "uvlock": true } + "apply": { "model": "botania:walls/taiga_cobble_wall_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/botania/models/block/cell_block.json b/src/main/resources/assets/botania/models/block/cell_block.json new file mode 100644 index 000000000..622338265 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cell_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/cellBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json new file mode 100644 index 000000000..9d25fb9aa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/conjurationCatalyst0", + "top": "botania:blocks/conjurationCatalyst1", + "side": "botania:blocks/conjurationCatalyst2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_funnel.json b/src/main/resources/assets/botania/models/block/corporea_funnel.json new file mode 100644 index 000000000..c9d477349 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_funnel.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaFunnel0", + "top": "botania:blocks/corporeaFunnel0", + "side": "botania:blocks/corporeaFunnel1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json new file mode 100644 index 000000000..e94c14f92 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -0,0 +1,8 @@ +{ + "model": "minecraft:cube_bottom_top", + "textures": { + "bottom": "botania:blocks/corporeaInterceptor0", + "top": "botania:blocks/corporeaInterceptor0", + "side": "botania:blocks/corporeaInterceptor1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_retainer.json b/src/main/resources/assets/botania/models/block/corporea_retainer.json new file mode 100644 index 000000000..c52158a50 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/corporea_retainer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/corporeaRetainer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector.json b/src/main/resources/assets/botania/models/block/mana_detector.json new file mode 100644 index 000000000..4ddc0f74a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_detector.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaDetector0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector_powered.json b/src/main/resources/assets/botania/models/block/mana_detector_powered.json new file mode 100644 index 000000000..3af9228ba --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_detector_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaDetector1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_glass.json b/src/main/resources/assets/botania/models/block/mana_glass.json new file mode 100644 index 000000000..dc3338aa9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_glass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manastorm_charge.json b/src/main/resources/assets/botania/models/block/manastorm_charge.json new file mode 100644 index 000000000..3cc4fdce3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manastorm_charge.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaBomb" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json b/src/main/resources/assets/botania/models/block/walls/dreamwood_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/dreamwood_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/dreamwood_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json b/src/main/resources/assets/botania/models/block/walls/dreamwood_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/dreamwood_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/dreamwood_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/livingrock_wall_post.json b/src/main/resources/assets/botania/models/block/walls/livingrock_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/livingrock_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/livingrock_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/livingrock_wall_side.json b/src/main/resources/assets/botania/models/block/walls/livingrock_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/livingrock_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/livingrock_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_post.json b/src/main/resources/assets/botania/models/block/walls/livingwood_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/livingwood_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/livingwood_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_side.json b/src/main/resources/assets/botania/models/block/walls/livingwood_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/livingwood_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/livingwood_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json rename to src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json rename to src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json From f8abe9d7b1ae35fe0a3b9909076f182cfe4b20e4 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Sat, 30 Jul 2016 00:07:20 -0400 Subject: [PATCH 828/935] initial work on potatoes --- .../render/tile/RenderTileTinyPotato.java | 66 ++++++++++++------- .../common/block/tile/TileTinyPotato.java | 2 +- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f5d541407..e7ab878fe 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; +import java.util.regex.Pattern; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); @@ -49,6 +50,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Sat, 30 Jul 2016 10:38:57 -0500 Subject: [PATCH 829/935] Final model splitting, on to code cleanup --- .../assets/botania/blockstates/altar.json | 20 +++++----- .../botania/blockstates/biomeStoneA.json | 32 +++++++-------- .../blockstates/biomeStoneA0SlabFull.json | 2 +- .../blockstates/biomeStoneA10SlabFull.json | 2 +- .../blockstates/biomeStoneA11SlabFull.json | 2 +- .../blockstates/biomeStoneA12SlabFull.json | 2 +- .../blockstates/biomeStoneA13SlabFull.json | 2 +- .../blockstates/biomeStoneA14SlabFull.json | 2 +- .../blockstates/biomeStoneA15SlabFull.json | 2 +- .../blockstates/biomeStoneA1SlabFull.json | 2 +- .../blockstates/biomeStoneA2SlabFull.json | 2 +- .../blockstates/biomeStoneA3SlabFull.json | 2 +- .../blockstates/biomeStoneA4SlabFull.json | 2 +- .../blockstates/biomeStoneA5SlabFull.json | 2 +- .../blockstates/biomeStoneA6SlabFull.json | 2 +- .../blockstates/biomeStoneA7SlabFull.json | 2 +- .../blockstates/biomeStoneA8SlabFull.json | 2 +- .../blockstates/biomeStoneA9SlabFull.json | 2 +- .../botania/blockstates/biomeStoneB.json | 37 ++++++++---------- .../blockstates/biomeStoneB0SlabFull.json | 6 +-- .../blockstates/biomeStoneB1SlabFull.json | 6 +-- .../blockstates/biomeStoneB2SlabFull.json | 6 +-- .../blockstates/biomeStoneB3SlabFull.json | 6 +-- .../blockstates/biomeStoneB4SlabFull.json | 6 +-- .../blockstates/biomeStoneB5SlabFull.json | 6 +-- .../blockstates/biomeStoneB6SlabFull.json | 6 +-- .../blockstates/biomeStoneB7SlabFull.json | 6 +-- .../botania/blockstates/customBrick.json | 39 ++++++++----------- .../assets/botania/blockstates/dreamwood.json | 17 +++----- .../blockstates/dreamwood0SlabFull.json | 6 +-- .../blockstates/dreamwood1SlabFull.json | 6 +-- .../assets/botania/blockstates/flower.json | 32 +++++++-------- .../assets/botania/blockstates/mushroom.json | 32 +++++++-------- .../assets/botania/blockstates/pavement.json | 19 +++------ .../blockstates/pavement0SlabFull.json | 6 +-- .../blockstates/pavement1SlabFull.json | 6 +-- .../blockstates/pavement2SlabFull.json | 6 +-- .../blockstates/pavement3SlabFull.json | 6 +-- .../blockstates/pavement4SlabFull.json | 6 +-- .../blockstates/pavement5SlabFull.json | 6 +-- .../blockstates/quartzSlabBlazeFull.json | 10 +---- .../blockstates/quartzSlabDarkFull.json | 10 +---- .../blockstates/quartzSlabElfFull.json | 10 +---- .../blockstates/quartzSlabLavenderFull.json | 10 +---- .../blockstates/quartzSlabManaFull.json | 10 +---- .../blockstates/quartzSlabRedFull.json | 10 +---- .../blockstates/quartzSlabSunnyFull.json | 10 +---- .../botania/blockstates/quartzTypeBlaze.json | 17 +++----- .../botania/blockstates/quartzTypeDark.json | 17 +++----- .../botania/blockstates/quartzTypeElf.json | 17 +++----- .../blockstates/quartzTypeLavender.json | 17 +++----- .../botania/blockstates/quartzTypeMana.json | 17 +++----- .../botania/blockstates/quartzTypeRed.json | 17 +++----- .../botania/blockstates/quartzTypeSunny.json | 17 +++----- .../botania/blockstates/shinyFlower.json | 32 +++++++-------- .../default_apothecary.json | 0 .../{ => apothecaries}/desert_apothecary.json | 0 .../{ => apothecaries}/forest_apothecary.json | 0 .../{ => apothecaries}/fungal_apothecary.json | 0 .../{ => apothecaries}/mesa_apothecary.json | 0 .../{ => apothecaries}/mossy_apothecary.json | 0 .../mountain_apothecary.json | 0 .../{ => apothecaries}/plains_apothecary.json | 0 .../{ => apothecaries}/swamp_apothecary.json | 0 .../{ => apothecaries}/taiga_apothecary.json | 0 .../models/block/bricks/azulejo_1.json | 6 +++ .../models/block/bricks/azulejo_10.json | 6 +++ .../models/block/bricks/azulejo_11.json | 6 +++ .../models/block/bricks/azulejo_12.json | 6 +++ .../models/block/bricks/azulejo_2.json | 6 +++ .../models/block/bricks/azulejo_3.json | 6 +++ .../models/block/bricks/azulejo_4.json | 6 +++ .../models/block/bricks/azulejo_5.json | 6 +++ .../models/block/bricks/azulejo_6.json | 6 +++ .../models/block/bricks/azulejo_7.json | 6 +++ .../models/block/bricks/azulejo_8.json | 6 +++ .../models/block/bricks/azulejo_9.json | 6 +++ .../models/block/bricks/frosty_brick.json | 6 +++ .../models/block/bricks/hellish_brick.json | 6 +++ .../models/block/bricks/roof_tile.json | 6 +++ .../models/block/bricks/soul_brick.json | 6 +++ .../botania/models/block/dreamwood.json | 6 +++ .../models/block/dreamwood_framed.json | 6 +++ .../models/block/dreamwood_glimmering.json | 6 +++ .../models/block/dreamwood_mossy_planks.json | 6 +++ .../block/dreamwood_pattern_framed.json | 6 +++ .../models/block/dreamwood_planks.json | 6 +++ .../block/metamorphic/desert_brick.json | 6 +++ .../metamorphic/desert_brick_chiseled.json | 6 +++ .../desert_cobble_stone.json | 0 .../block/{ => metamorphic}/desert_stone.json | 0 .../block/metamorphic/forest_brick.json | 6 +++ .../metamorphic/forest_brick_chiseled.json | 6 +++ .../forest_cobble_stone.json | 0 .../block/{ => metamorphic}/forest_stone.json | 0 .../block/metamorphic/fungal_brick.json | 6 +++ .../metamorphic/fungal_brick_chiseled.json | 6 +++ .../fungal_cobble_stone.json | 0 .../block/{ => metamorphic}/fungal_stone.json | 0 .../models/block/metamorphic/mesa_brick.json | 6 +++ .../metamorphic/mesa_brick_chiseled.json | 6 +++ .../{ => metamorphic}/mesa_cobble_stone.json | 0 .../block/{ => metamorphic}/mesa_stone.json | 0 .../block/metamorphic/mountain_brick.json | 6 +++ .../metamorphic/mountain_brick_chiseled.json | 6 +++ .../mountain_cobble_stone.json | 0 .../{ => metamorphic}/mountain_stone.json | 0 .../block/metamorphic/plains_brick.json | 6 +++ .../metamorphic/plains_brick_chiseled.json | 6 +++ .../plains_cobble_stone.json | 0 .../block/{ => metamorphic}/plains_stone.json | 0 .../models/block/metamorphic/swamp_brick.json | 6 +++ .../metamorphic/swamp_brick_chiseled.json | 6 +++ .../{ => metamorphic}/swamp_cobble_stone.json | 0 .../block/{ => metamorphic}/swamp_stone.json | 0 .../models/block/metamorphic/taiga_brick.json | 6 +++ .../metamorphic/taiga_brick_chiseled.json | 6 +++ .../{ => metamorphic}/taiga_cobble_stone.json | 0 .../block/{ => metamorphic}/taiga_stone.json | 0 .../models/block/pavement/black_pavement.json | 6 +++ .../models/block/pavement/blue_pavement.json | 6 +++ .../models/block/pavement/green_pavement.json | 6 +++ .../models/block/pavement/red_pavement.json | 6 +++ .../models/block/pavement/white_pavement.json | 6 +++ .../block/pavement/yellow_pavement.json | 6 +++ .../block/{ => plants}/flower_black.json | 0 .../block/{ => plants}/flower_blue.json | 0 .../block/{ => plants}/flower_brown.json | 0 .../block/{ => plants}/flower_cyan.json | 0 .../block/{ => plants}/flower_gray.json | 0 .../block/{ => plants}/flower_green.json | 0 .../block/{ => plants}/flower_light_blue.json | 0 .../block/{ => plants}/flower_lime.json | 0 .../block/{ => plants}/flower_magenta.json | 0 .../block/{ => plants}/flower_orange.json | 0 .../block/{ => plants}/flower_pink.json | 0 .../block/{ => plants}/flower_purple.json | 0 .../models/block/{ => plants}/flower_red.json | 0 .../block/{ => plants}/flower_silver.json | 0 .../block/{ => plants}/flower_white.json | 0 .../block/{ => plants}/flower_yellow.json | 0 .../{ => plants}/glimmering_flower_black.json | 0 .../{ => plants}/glimmering_flower_blue.json | 0 .../{ => plants}/glimmering_flower_brown.json | 0 .../{ => plants}/glimmering_flower_cyan.json | 0 .../{ => plants}/glimmering_flower_gray.json | 0 .../{ => plants}/glimmering_flower_green.json | 0 .../glimmering_flower_light_blue.json | 0 .../{ => plants}/glimmering_flower_lime.json | 0 .../glimmering_flower_magenta.json | 0 .../glimmering_flower_orange.json | 0 .../{ => plants}/glimmering_flower_pink.json | 0 .../glimmering_flower_purple.json | 0 .../{ => plants}/glimmering_flower_red.json | 0 .../glimmering_flower_silver.json | 0 .../{ => plants}/glimmering_flower_white.json | 0 .../glimmering_flower_yellow.json | 0 .../block/{ => plants}/mushroom_black.json | 0 .../block/{ => plants}/mushroom_blue.json | 0 .../block/{ => plants}/mushroom_brown.json | 0 .../block/{ => plants}/mushroom_cyan.json | 0 .../block/{ => plants}/mushroom_gray.json | 0 .../block/{ => plants}/mushroom_green.json | 0 .../{ => plants}/mushroom_light_blue.json | 0 .../block/{ => plants}/mushroom_lime.json | 0 .../block/{ => plants}/mushroom_magenta.json | 0 .../block/{ => plants}/mushroom_orange.json | 0 .../block/{ => plants}/mushroom_pink.json | 0 .../block/{ => plants}/mushroom_purple.json | 0 .../block/{ => plants}/mushroom_red.json | 0 .../block/{ => plants}/mushroom_silver.json | 0 .../block/{ => plants}/mushroom_white.json | 0 .../block/{ => plants}/mushroom_yellow.json | 0 .../models/block/quartz/blaze_quartz.json | 8 ++++ .../block/quartz/blaze_quartz_chiseled.json | 7 ++++ .../block/quartz/blaze_quartz_pillar.json | 7 ++++ .../models/block/quartz/dark_quartz.json | 8 ++++ .../block/quartz/dark_quartz_chiseled.json | 7 ++++ .../block/quartz/dark_quartz_pillar.json | 7 ++++ .../models/block/quartz/elf_quartz.json | 8 ++++ .../block/quartz/elf_quartz_chiseled.json | 7 ++++ .../block/quartz/elf_quartz_pillar.json | 7 ++++ .../models/block/quartz/lavender_quartz.json | 8 ++++ .../quartz/lavender_quartz_chiseled.json | 7 ++++ .../block/quartz/lavender_quartz_pillar.json | 7 ++++ .../models/block/quartz/mana_quartz.json | 8 ++++ .../block/quartz/mana_quartz_chiseled.json | 7 ++++ .../block/quartz/mana_quartz_pillar.json | 7 ++++ .../models/block/quartz/red_quartz.json | 8 ++++ .../block/quartz/red_quartz_chiseled.json | 7 ++++ .../block/quartz/red_quartz_pillar.json | 7 ++++ .../models/block/quartz/sunny_quartz.json | 8 ++++ .../block/quartz/sunny_quartz_chiseled.json | 7 ++++ .../block/quartz/sunny_quartz_pillar.json | 7 ++++ .../botania/models/block/shapes/note.txt | 2 - 195 files changed, 610 insertions(+), 387 deletions(-) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/default_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/desert_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/forest_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/fungal_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mesa_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mossy_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mountain_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/plains_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/swamp_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/taiga_apothecary.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_1.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_10.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_11.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_12.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_2.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_3.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_4.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_5.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_6.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_7.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_8.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_9.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/frosty_brick.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/hellish_brick.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/roof_tile.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/soul_brick.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/desert_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/desert_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/forest_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/forest_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/fungal_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/fungal_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mesa_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mesa_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mountain_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mountain_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/plains_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/plains_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/swamp_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/swamp_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/taiga_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/taiga_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/pavement/black_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/blue_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/green_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/red_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/white_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json rename src/main/resources/assets/botania/models/block/{ => plants}/flower_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_yellow.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_yellow.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_yellow.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json delete mode 100644 src/main/resources/assets/botania/models/block/shapes/note.txt diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 8d6de2515..64dbd0d17 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -1,14 +1,14 @@ { "variants": { - "variant=default": { "model": "botania:default_apothecary" }, - "variant=forest": { "model": "botania:forest_apothecary" }, - "variant=plains": { "model": "botania:plains_apothecary" }, - "variant=mountain": { "model": "botania:mountain_apothecary" }, - "variant=fungal": { "model": "botania:fungal_apothecary" }, - "variant=swamp": { "model": "botania:swamp_apothecary" }, - "variant=desert": { "model": "botania:desert_apothecary" }, - "variant=taiga": { "model": "botania:taiga_apothecary" }, - "variant=mesa": { "model": "botania:mesa_apothecary" }, - "variant=mossy": { "model": "botania:mossy_apothecary" } + "variant=default": { "model": "botania:apothecaries/default_apothecary" }, + "variant=forest": { "model": "botania:apothecaries/forest_apothecary" }, + "variant=plains": { "model": "botania:apothecaries/plains_apothecary" }, + "variant=mountain": { "model": "botania:apothecaries/mountain_apothecary" }, + "variant=fungal": { "model": "botania:apothecaries/fungal_apothecary" }, + "variant=swamp": { "model": "botania:apothecaries/swamp_apothecary" }, + "variant=desert": { "model": "botania:apothecaries/desert_apothecary" }, + "variant=taiga": { "model": "botania:apothecaries/taiga_apothecary" }, + "variant=mesa": { "model": "botania:apothecaries/mesa_apothecary" }, + "variant=mossy": { "model": "botania:apothecaries/mossy_apothecary" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json index c10307719..27622ac2a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -1,20 +1,20 @@ { "variants": { - "variant=forest": { "model": "botania:forest_stone" }, - "variant=plains": { "model": "botania:plains_stone" }, - "variant=mountain": { "model": "botania:mountain_stone" }, - "variant=fungal": { "model": "botania:fungal_stone" }, - "variant=swamp": { "model": "botania:swamp_stone" }, - "variant=desert": { "model": "botania:desert_stone" }, - "variant=taiga": { "model": "botania:taiga_stone" }, - "variant=mesa": { "model": "botania:mesa_stone" }, - "variant=forest_cobble": { "model": "botania:forest_cobble_stone" }, - "variant=plains_cobble": { "model": "botania:plains_cobble_stone" }, - "variant=mountain_cobble": { "model": "botania:mountain_cobble_stone" }, - "variant=fungal_cobble": { "model": "botania:fungal_cobble_stone" }, - "variant=swamp_cobble": { "model": "botania:swamp_cobble_stone" }, - "variant=desert_cobble": { "model": "botania:desert_cobble_stone" }, - "variant=taiga_cobble": { "model": "botania:taiga_cobble_stone" }, - "variant=mesa_cobble": { "model": "botania:mesa_cobble_stone" } + "variant=forest": { "model": "botania:metamorphic/forest_stone" }, + "variant=plains": { "model": "botania:metamorphic/plains_stone" }, + "variant=mountain": { "model": "botania:metamorphic/mountain_stone" }, + "variant=fungal": { "model": "botania:metamorphic/fungal_stone" }, + "variant=swamp": { "model": "botania:metamorphic/swamp_stone" }, + "variant=desert": { "model": "botania:metamorphic/desert_stone" }, + "variant=taiga": { "model": "botania:metamorphic/taiga_stone" }, + "variant=mesa": { "model": "botania:metamorphic/mesa_stone" }, + "variant=forest_cobble": { "model": "botania:metamorphic/forest_cobble_stone" }, + "variant=plains_cobble": { "model": "botania:metamorphic/plains_cobble_stone" }, + "variant=mountain_cobble": { "model": "botania:metamorphic/mountain_cobble_stone" }, + "variant=fungal_cobble": { "model": "botania:metamorphic/fungal_cobble_stone" }, + "variant=swamp_cobble": { "model": "botania:metamorphic/swamp_cobble_stone" }, + "variant=desert_cobble": { "model": "botania:metamorphic/desert_cobble_stone" }, + "variant=taiga_cobble": { "model": "botania:metamorphic/taiga_cobble_stone" }, + "variant=mesa_cobble": { "model": "botania:metamorphic/mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json index 789994f0f..0c58db25e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:forest_stone" } + "normal": { "model": "botania:metamorphic/forest_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json index a7b695ca5..05719dcca 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mountain_cobble_stone" } + "normal": { "model": "botania:metamorphic/mountain_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json index a5f013dfe..27dbc8c9b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:fungal_cobble_stone" } + "normal": { "model": "botania:metamorphic/fungal_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json index 979cce0ba..ace8e0d07 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:swamp_cobble_stone" } + "normal": { "model": "botania:metamorphic/swamp_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json index aff3bc828..2e3c1d7c3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:desert_cobble_stone" } + "normal": { "model": "botania:metamorphic/desert_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json index a1827a0b5..e918af54b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:taiga_cobble_stone" } + "normal": { "model": "botania:metamorphic/taiga_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json index 05f15a488..e21f0c3a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mesa_cobble_stone" } + "normal": { "model": "botania:metamorphic/mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json index 12df9e1be..7e5f4febf 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:plains_stone" } + "normal": { "model": "botania:metamorphic/plains_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json index e1e5402a2..31ca5de05 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mountain_stone" } + "normal": { "model": "botania:metamorphic/mountain_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json index 29c3ea890..91fe895a6 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:fungal_stone" } + "normal": { "model": "botania:metamorphic/fungal_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json index 71dfb7ef2..fd38dc075 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:swamp_stone" } + "normal": { "model": "botania:metamorphic/swamp_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json index 905561869..8d022ec80 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:desert_stone" } + "normal": { "model": "botania:metamorphic/desert_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json index 03bee51e9..cb4e3f9f0 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:taiga_stone" } + "normal": { "model": "botania:metamorphic/taiga_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json index 373fa8a7c..9482b4a70 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mesa_stone" } + "normal": { "model": "botania:metamorphic/mesa_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json index a9b5213a2..2422f2551 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:forest_cobble_stone" } + "normal": { "model": "botania:metamorphic/forest_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json index f74a950bc..d9543cb48 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:plains_cobble_stone" } + "normal": { "model": "botania:metamorphic/plains_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomeStoneB.json index facaa9134..d0e0f3229 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB.json @@ -1,25 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone16" } }], - "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone17" } }], - "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone18" } }], - "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone19" } }], - "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone20" } }], - "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone21" } }], - "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone22" } }], - "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone23" } }], - "variant=chiseled_forest": [{ "textures": { "all": "botania:blocks/biomeStone24" } }], - "variant=chiseled_plains": [{ "textures": { "all": "botania:blocks/biomeStone25" } }], - "variant=chiseled_mountain": [{ "textures": { "all": "botania:blocks/biomeStone26" } }], - "variant=chiseled_fungal": [{ "textures": { "all": "botania:blocks/biomeStone27" } }], - "variant=chiseled_swamp": [{ "textures": { "all": "botania:blocks/biomeStone28" } }], - "variant=chiseled_desert": [{ "textures": { "all": "botania:blocks/biomeStone29" } }], - "variant=chiseled_taiga": [{ "textures": { "all": "botania:blocks/biomeStone30" } }], - "variant=chiseled_mesa": [{ "textures": { "all": "botania:blocks/biomeStone31" } }] + "variant=forest": { "model": "botania:metamorphic/forest_brick" }, + "variant=plains": { "model": "botania:metamorphic/plains_brick" }, + "variant=mountain": { "model": "botania:metamorphic/mountain_brick" }, + "variant=fungal": { "model": "botania:metamorphic/fungal_brick" }, + "variant=swamp": { "model": "botania:metamorphic/swamp_brick" }, + "variant=desert": { "model": "botania:metamorphic/desert_brick" }, + "variant=taiga": { "model": "botania:metamorphic/taiga_brick" }, + "variant=mesa": { "model": "botania:metamorphic/mesa_brick" }, + "variant=chiseled_forest": { "model": "botania:metamorphic/forest_brick_chiseled" }, + "variant=chiseled_plains": { "model": "botania:metamorphic/plains_brick_chiseled" }, + "variant=chiseled_mountain": { "model": "botania:metamorphic/mountain_brick_chiseled" }, + "variant=chiseled_fungal": { "model": "botania:metamorphic/fungal_brick_chiseled" }, + "variant=chiseled_swamp": { "model": "botania:metamorphic/swamp_brick_chiseled" }, + "variant=chiseled_desert": { "model": "botania:metamorphic/desert_brick_chiseled" }, + "variant=chiseled_taiga": { "model": "botania:metamorphic/taiga_brick_chiseled" }, + "variant=chiseled_mesa": { "model": "botania:metamorphic/mesa_brick_chiseled" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json index a5236f6d8..ea96f2b4e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone16" } - }] + "normal": { "model": "botania:metamorphic/forest_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json index 7612fa942..23fb25ad3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone17" } - }] + "normal": { "model": "botania:metamorphic/plains_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json index 4902a6e0c..71e4fecc4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone18" } - }] + "normal": { "model": "botania:metamorphic/mountain_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json index ad81a7910..26ea9305a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone19" } - }] + "normal": { "model": "botania:metamorphic/fungal_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json index 12a9d00da..f3cd0012d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone20" } - }] + "normal": { "model": "botania:metamorphic/swamp_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json index 00399c361..d2c6efe9c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone21" } - }] + "normal": { "model": "botania:metamorphic/desert_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json index cd9d3f0e9..bc2881dba 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone22" } - }] + "normal": { "model": "botania:metamorphic/taiga_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json index 9e7c19c2e..5c41e50f1 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone23" } - }] + "normal": { "model": "botania:metamorphic/mesa_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick.json b/src/main/resources/assets/botania/blockstates/customBrick.json index c8807f13f..41dd56852 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick.json +++ b/src/main/resources/assets/botania/blockstates/customBrick.json @@ -1,27 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "hellish_brick": { "textures": { "all": "botania:blocks/customBrick0" } }, - "soul_brick": { "textures": { "all": "botania:blocks/customBrick1" } }, - "frosty_brick": { "textures": { "all": "botania:blocks/customBrick2" } }, - "roof_tile": { "textures": { "all": "botania:blocks/customBrick3" } }, - "azulejo_1": { "textures": { "all": "botania:blocks/customBrick4" } }, - "azulejo_2": { "textures": { "all": "botania:blocks/customBrick5" } }, - "azulejo_3": { "textures": { "all": "botania:blocks/customBrick6" } }, - "azulejo_4": { "textures": { "all": "botania:blocks/customBrick7" } }, - "azulejo_5": { "textures": { "all": "botania:blocks/customBrick8" } }, - "azulejo_6": { "textures": { "all": "botania:blocks/customBrick9" } }, - "azulejo_7": { "textures": { "all": "botania:blocks/customBrick10" } }, - "azulejo_8": { "textures": { "all": "botania:blocks/customBrick11" } }, - "azulejo_9": { "textures": { "all": "botania:blocks/customBrick12" } }, - "azulejo_10": { "textures": { "all": "botania:blocks/customBrick13" } }, - "azulejo_11": { "textures": { "all": "botania:blocks/customBrick14" } }, - "azulejo_12": { "textures": { "all": "botania:blocks/customBrick15" } } - } + "variant=hellish_brick": { "model": "botania:bricks/hellish_brick" }, + "variant=soul_brick": { "model": "botania:bricks/soul_brick" }, + "variant=frosty_brick": { "model": "botania:bricks/frosty_brick" }, + "variant=roof_tile": { "model": "botania:bricks/roof_tile" }, + "variant=azulejo_1": { "model": "botania:bricks/azulejo_1" }, + "variant=azulejo_2": { "model": "botania:bricks/azulejo_2" }, + "variant=azulejo_3": { "model": "botania:bricks/azulejo_3" }, + "variant=azulejo_4": { "model": "botania:bricks/azulejo_4" }, + "variant=azulejo_5": { "model": "botania:bricks/azulejo_5" }, + "variant=azulejo_6": { "model": "botania:bricks/azulejo_6" }, + "variant=azulejo_7": { "model": "botania:bricks/azulejo_7" }, + "variant=azulejo_8": { "model": "botania:bricks/azulejo_8" }, + "variant=azulejo_9": { "model": "botania:bricks/azulejo_9" }, + "variant=azulejo_10": { "model": "botania:bricks/azulejo_10" }, + "variant=azulejo_11": { "model": "botania:bricks/azulejo_11" }, + "variant=azulejo_12": { "model": "botania:bricks/azulejo_12" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood.json b/src/main/resources/assets/botania/blockstates/dreamwood.json index fb6d48d06..2c86462f8 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood.json @@ -1,15 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/dreamwood0" } }], - "variant=planks": [{ "textures": { "all": "botania:blocks/dreamwood1" } }], - "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/dreamwood2" } }], - "variant=framed": [{ "textures": { "all": "botania:blocks/dreamwood3" } }], - "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/dreamwood4" } }], - "variant=glimmering": [{ "textures": { "all": "botania:blocks/dreamwood5" } }] + "variant=default": { "model": "botania:dreamwood" }, + "variant=planks": { "model": "botania:dreamwood_planks" }, + "variant=mossy_planks": { "model": "botania:dreamwood_mossy_planks" }, + "variant=framed": { "model": "botania:dreamwood_framed" }, + "variant=pattern_framed": { "model": "botania:dreamwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:dreamwood_glimmering" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json index 40e378188..796feb957 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dreamwood0" } - }] + "normal": { "model": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json index 47873fc21..e1afb1a06 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dreamwood1" } - }] + "normal": { "model": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 6a386460e..a908efe68 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:flower_white" }, - "color=orange": { "model": "botania:flower_orange" }, - "color=magenta": { "model": "botania:flower_magenta" }, - "color=light_blue": { "model": "botania:flower_light_blue" }, - "color=yellow": { "model": "botania:flower_yellow" }, - "color=lime": { "model": "botania:flower_lime" }, - "color=pink": { "model": "botania:flower_pink" }, - "color=gray": { "model": "botania:flower_gray" }, - "color=silver": { "model": "botania:flower_silver" }, - "color=cyan": { "model": "botania:flower_cyan" }, - "color=purple": { "model": "botania:flower_purple" }, - "color=blue": { "model": "botania:flower_blue" }, - "color=brown": { "model": "botania:flower_brown" }, - "color=green": { "model": "botania:flower_green" }, - "color=red": { "model": "botania:flower_red" }, - "color=black": { "model": "botania:flower_black" } + "color=white": { "model": "botania:plants/flower_white" }, + "color=orange": { "model": "botania:plants/flower_orange" }, + "color=magenta": { "model": "botania:plants/flower_magenta" }, + "color=light_blue": { "model": "botania:plants/flower_light_blue" }, + "color=yellow": { "model": "botania:plants/flower_yellow" }, + "color=lime": { "model": "botania:plants/flower_lime" }, + "color=pink": { "model": "botania:plants/flower_pink" }, + "color=gray": { "model": "botania:plants/flower_gray" }, + "color=silver": { "model": "botania:plants/flower_silver" }, + "color=cyan": { "model": "botania:plants/flower_cyan" }, + "color=purple": { "model": "botania:plants/flower_purple" }, + "color=blue": { "model": "botania:plants/flower_blue" }, + "color=brown": { "model": "botania:plants/flower_brown" }, + "color=green": { "model": "botania:plants/flower_green" }, + "color=red": { "model": "botania:plants/flower_red" }, + "color=black": { "model": "botania:plants/flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index 42d93df72..289615fc6 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:mushroom_white" }, - "color=orange": { "model": "botania:mushroom_orange" }, - "color=magenta": { "model": "botania:mushroom_magenta" }, - "color=light_blue": { "model": "botania:mushroom_light_blue" }, - "color=yellow": { "model": "botania:mushroom_yellow" }, - "color=lime": { "model": "botania:mushroom_lime" }, - "color=pink": { "model": "botania:mushroom_pink" }, - "color=gray": { "model": "botania:mushroom_gray" }, - "color=silver": { "model": "botania:mushroom_silver" }, - "color=cyan": { "model": "botania:mushroom_cyan" }, - "color=purple": { "model": "botania:mushroom_purple" }, - "color=blue": { "model": "botania:mushroom_blue" }, - "color=brown": { "model": "botania:mushroom_brown" }, - "color=green": { "model": "botania:mushroom_green" }, - "color=red": { "model": "botania:mushroom_red" }, - "color=black": { "model": "botania:mushroom_black" } + "color=white": { "model": "botania:plants/mushroom_white" }, + "color=orange": { "model": "botania:plants/mushroom_orange" }, + "color=magenta": { "model": "botania:plants/mushroom_magenta" }, + "color=light_blue": { "model": "botania:plants/mushroom_light_blue" }, + "color=yellow": { "model": "botania:plants/mushroom_yellow" }, + "color=lime": { "model": "botania:plants/mushroom_lime" }, + "color=pink": { "model": "botania:plants/mushroom_pink" }, + "color=gray": { "model": "botania:plants/mushroom_gray" }, + "color=silver": { "model": "botania:plants/mushroom_silver" }, + "color=cyan": { "model": "botania:plants/mushroom_cyan" }, + "color=purple": { "model": "botania:plants/mushroom_purple" }, + "color=blue": { "model": "botania:plants/mushroom_blue" }, + "color=brown": { "model": "botania:plants/mushroom_brown" }, + "color=green": { "model": "botania:plants/mushroom_green" }, + "color=red": { "model": "botania:plants/mushroom_red" }, + "color=black": { "model": "botania:plants/mushroom_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json index ed2c481c1..bf31a00b9 100644 --- a/src/main/resources/assets/botania/blockstates/pavement.json +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -1,17 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "color": { - "white": { "textures": { "all": "botania:blocks/pavement0" } }, - "black": { "textures": { "all": "botania:blocks/pavement1" } }, - "blue": { "textures": { "all": "botania:blocks/pavement2" } }, - "red": { "textures": { "all": "botania:blocks/pavement3"} }, - "yellow": { "textures": { "all": "botania:blocks/pavement4"} }, - "green": { "textures": { "all": "botania:blocks/pavement5" } } - } + "color=white": { "model": "botania:pavement/white_pavement" }, + "color=black": { "model": "botania:pavement/black_pavement" }, + "color=blue": { "model": "botania:pavement/blue_pavement" }, + "color=red": { "model": "botania:pavement/red_pavement" }, + "color=yellow": { "model": "botania:pavement/yellow_pavement" }, + "color=green": { "model": "botania:pavement/green_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json index dc17cad32..c0733d50d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement0" } - }] + "normal": { "model": "botania:pavement/white_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json index a35d6bb36..75ac52b2d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement1" } - }] + "normal": { "model": "botania:pavement/blue_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json index 60422e335..c0733d50d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement2" } - }] + "normal": { "model": "botania:pavement/white_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json index a8fb061e5..37690e037 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement3" } - }] + "normal": { "model": "botania:pavement/red_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json index b3796d2e9..ffcf8d19c 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement4" } - }] + "normal": { "model": "botania:pavement/yellow_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json index bdbf59766..3694cd049 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement5" } - }] + "normal": { "model": "botania:pavement/green_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json index 09b750c4e..ea9581d54 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockBlazeQuartz0", - "top": "botania:blocks/blockBlazeQuartz1", - "side": "botania:blocks/blockBlazeQuartz2" - } - }] + "normal": { "model": "botania:quartz/blaze_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json index 1b1039a18..94b46c0e7 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockDarkQuartz0", - "top": "botania:blocks/blockDarkQuartz1", - "side": "botania:blocks/blockDarkQuartz2" - } - }] + "normal": { "model": "botania:quartz/dark_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json index a7172cc7b..1a2f63077 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockElfQuartz0", - "top": "botania:blocks/blockElfQuartz1", - "side": "botania:blocks/blockElfQuartz2" - } - }] + "normal": { "model": "botania:quartz/elf_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json index b1a53a9e4..574eb70f6 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockLavenderQuartz0", - "top": "botania:blocks/blockLavenderQuartz1", - "side": "botania:blocks/blockLavenderQuartz2" - } - }] + "normal": { "model": "botania:quartz/lavender_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json index 721c03133..c7c9a15de 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockManaQuartz0", - "top": "botania:blocks/blockManaQuartz1", - "side": "botania:blocks/blockManaQuartz2" - } - }] + "normal": { "model": "botania:quartz/mana_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json index a360f41ff..965e2aeda 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockRedQuartz0", - "top": "botania:blocks/blockRedQuartz1", - "side": "botania:blocks/blockRedQuartz2" - } - }] + "normal": { "model": "botania:quartz/red_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json index 30a9b079a..e8211cfc3 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockSunnyQuartz0", - "top": "botania:blocks/blockSunnyQuartz1", - "side": "botania:blocks/blockSunnyQuartz2" - } - }] + "normal": { "model": "botania:quartz/sunny_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json index 30250402a..70c4e13aa 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockBlazeQuartz0", "top": "botania:blocks/blockBlazeQuartz1", "side": "botania:blocks/blockBlazeQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledBlazeQuartz1", "top": "botania:blocks/chiseledBlazeQuartz1", "side": "botania:blocks/chiseledBlazeQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/blaze_quartz" }, + "variant=chiseled": { "model": "botania:quartz/blaze_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/blaze_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/blaze_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/blaze_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json index 381f8deb6..573bbf826 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockDarkQuartz0", "top": "botania:blocks/blockDarkQuartz1", "side": "botania:blocks/blockDarkQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledDarkQuartz1", "top": "botania:blocks/chiseledDarkQuartz1", "side": "botania:blocks/chiseledDarkQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/dark_quartz" }, + "variant=chiseled": { "model": "botania:quartz/dark_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/dark_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/dark_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/dark_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json index 836d0e572..f6420fac1 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockElfQuartz0", "top": "botania:blocks/blockElfQuartz1", "side": "botania:blocks/blockElfQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledElfQuartz1", "top": "botania:blocks/chiseledElfQuartz1", "side": "botania:blocks/chiseledElfQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/elf_quartz" }, + "variant=chiseled": { "model": "botania:quartz/elf_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/elf_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/elf_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/elf_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json index c7588ddb6..17c644f85 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockLavenderQuartz0", "top": "botania:blocks/blockLavenderQuartz1", "side": "botania:blocks/blockLavenderQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledLavenderQuartz1", "top": "botania:blocks/chiseledLavenderQuartz1", "side": "botania:blocks/chiseledLavenderQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/lavender_quartz" }, + "variant=chiseled": { "model": "botania:quartz/lavender_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/lavender_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/lavender_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/lavender_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json index b655625fb..9747264a3 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockManaQuartz0", "top": "botania:blocks/blockManaQuartz1", "side": "botania:blocks/blockManaQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledManaQuartz1", "top": "botania:blocks/chiseledManaQuartz1", "side": "botania:blocks/chiseledManaQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/mana_quartz" }, + "variant=chiseled": { "model": "botania:quartz/mana_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/mana_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/mana_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/mana_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json index b7f12f67c..feb22538f 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockRedQuartz0", "top": "botania:blocks/blockRedQuartz1", "side": "botania:blocks/blockRedQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledRedQuartz1", "top": "botania:blocks/chiseledRedQuartz1", "side": "botania:blocks/chiseledRedQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/red_quartz" }, + "variant=chiseled": { "model": "botania:quartz/red_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/red_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/red_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/red_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json index bed541082..ddcf27955 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockSunnyQuartz0", "top": "botania:blocks/blockSunnyQuartz1", "side": "botania:blocks/blockSunnyQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledSunnyQuartz1", "top": "botania:blocks/chiseledSunnyQuartz1", "side": "botania:blocks/chiseledSunnyQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/sunny_quartz" }, + "variant=chiseled": { "model": "botania:quartz/sunny_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/sunny_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/sunny_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/sunny_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index 5317eb11b..9fefe3c99 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:glimmering_flower_white" }, - "color=orange": { "model": "botania:glimmering_flower_orange" }, - "color=magenta": { "model": "botania:glimmering_flower_magenta" }, - "color=light_blue": { "model": "botania:glimmering_flower_light_blue" }, - "color=yellow": { "model": "botania:glimmering_flower_yellow" }, - "color=lime": { "model": "botania:glimmering_flower_lime" }, - "color=pink": { "model": "botania:glimmering_flower_pink" }, - "color=gray": { "model": "botania:glimmering_flower_gray" }, - "color=silver": { "model": "botania:glimmering_flower_silver" }, - "color=cyan": { "model": "botania:glimmering_flower_cyan" }, - "color=purple": { "model": "botania:glimmering_flower_purple" }, - "color=blue": { "model": "botania:glimmering_flower_blue" }, - "color=brown": { "model": "botania:glimmering_flower_brown" }, - "color=green": { "model": "botania:glimmering_flower_green" }, - "color=red": { "model": "botania:glimmering_flower_red" }, - "color=black": { "model": "botania:glimmering_flower_black" } + "color=white": { "model": "botania:plants/glimmering_flower_white" }, + "color=orange": { "model": "botania:plants/glimmering_flower_orange" }, + "color=magenta": { "model": "botania:plants/glimmering_flower_magenta" }, + "color=light_blue": { "model": "botania:plants/glimmering_flower_light_blue" }, + "color=yellow": { "model": "botania:plants/glimmering_flower_yellow" }, + "color=lime": { "model": "botania:plants/glimmering_flower_lime" }, + "color=pink": { "model": "botania:plants/glimmering_flower_pink" }, + "color=gray": { "model": "botania:plants/glimmering_flower_gray" }, + "color=silver": { "model": "botania:plants/glimmering_flower_silver" }, + "color=cyan": { "model": "botania:plants/glimmering_flower_cyan" }, + "color=purple": { "model": "botania:plants/glimmering_flower_purple" }, + "color=blue": { "model": "botania:plants/glimmering_flower_blue" }, + "color=brown": { "model": "botania:plants/glimmering_flower_brown" }, + "color=green": { "model": "botania:plants/glimmering_flower_green" }, + "color=red": { "model": "botania:plants/glimmering_flower_red" }, + "color=black": { "model": "botania:plants/glimmering_flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/default_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/desert_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/forest_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/fungal_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mesa_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mossy_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mossy_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mountain_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/plains_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/swamp_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/taiga_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json new file mode 100644 index 000000000..511d0e425 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json new file mode 100644 index 000000000..439ea85f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json new file mode 100644 index 000000000..f18481bf4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json new file mode 100644 index 000000000..2273b3f22 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json new file mode 100644 index 000000000..fe49ac629 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json new file mode 100644 index 000000000..5a6c70382 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json new file mode 100644 index 000000000..1edd62f2b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json new file mode 100644 index 000000000..6895e3bf1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json new file mode 100644 index 000000000..fc3546919 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json new file mode 100644 index 000000000..ab8f0d42f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json new file mode 100644 index 000000000..361e8f412 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json new file mode 100644 index 000000000..bfd2a0fa0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json new file mode 100644 index 000000000..077d9da0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json new file mode 100644 index 000000000..ed252dee1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/roof_tile.json b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json new file mode 100644 index 000000000..4c6cc77d2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/soul_brick.json b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json new file mode 100644 index 000000000..84795a8d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood.json b/src/main/resources/assets/botania/models/block/dreamwood.json new file mode 100644 index 000000000..1d25e2f2b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_framed.json b/src/main/resources/assets/botania/models/block/dreamwood_framed.json new file mode 100644 index 000000000..9bf55e6fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json b/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json new file mode 100644 index 000000000..ef67451a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json new file mode 100644 index 000000000..001f16c72 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json new file mode 100644 index 000000000..58c91a044 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks.json b/src/main/resources/assets/botania/models/block/dreamwood_planks.json new file mode 100644 index 000000000..928789553 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json new file mode 100644 index 000000000..d3f6257f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone21" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json new file mode 100644 index 000000000..d72dc70c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone29" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/desert_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json new file mode 100644 index 000000000..7dbbaf74c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone16" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json new file mode 100644 index 000000000..23e27a7e2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone24" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/forest_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json new file mode 100644 index 000000000..69550fe61 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone19" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json new file mode 100644 index 000000000..3cc15bf6f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone27" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/fungal_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json new file mode 100644 index 000000000..baaa34b53 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone23" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json new file mode 100644 index 000000000..4df5848c3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone31" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/mesa_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json new file mode 100644 index 000000000..e7ec9c31f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone18" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json new file mode 100644 index 000000000..b3b170ce0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone26" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/mountain_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json new file mode 100644 index 000000000..12fb32f4a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone17" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json new file mode 100644 index 000000000..664cc97d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone25" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/plains_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json new file mode 100644 index 000000000..c8a878f5e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone20" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json new file mode 100644 index 000000000..6fc624583 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone28" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/swamp_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json new file mode 100644 index 000000000..2e56f6e9b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone22" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json new file mode 100644 index 000000000..341449e07 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone30" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/taiga_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json diff --git a/src/main/resources/assets/botania/models/block/pavement/black_pavement.json b/src/main/resources/assets/botania/models/block/pavement/black_pavement.json new file mode 100644 index 000000000..beaa676a5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/black_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json b/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json new file mode 100644 index 000000000..aa1c83e8e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/green_pavement.json b/src/main/resources/assets/botania/models/block/pavement/green_pavement.json new file mode 100644 index 000000000..4d1b4f975 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/green_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/red_pavement.json b/src/main/resources/assets/botania/models/block/pavement/red_pavement.json new file mode 100644 index 000000000..d96285ecd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/red_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/white_pavement.json b/src/main/resources/assets/botania/models/block/pavement/white_pavement.json new file mode 100644 index 000000000..f940e09bd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/white_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json b/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json new file mode 100644 index 000000000..317e9af1c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_black.json b/src/main/resources/assets/botania/models/block/plants/flower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_black.json rename to src/main/resources/assets/botania/models/block/plants/flower_black.json diff --git a/src/main/resources/assets/botania/models/block/flower_blue.json b/src/main/resources/assets/botania/models/block/plants/flower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_blue.json rename to src/main/resources/assets/botania/models/block/plants/flower_blue.json diff --git a/src/main/resources/assets/botania/models/block/flower_brown.json b/src/main/resources/assets/botania/models/block/plants/flower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_brown.json rename to src/main/resources/assets/botania/models/block/plants/flower_brown.json diff --git a/src/main/resources/assets/botania/models/block/flower_cyan.json b/src/main/resources/assets/botania/models/block/plants/flower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_cyan.json rename to src/main/resources/assets/botania/models/block/plants/flower_cyan.json diff --git a/src/main/resources/assets/botania/models/block/flower_gray.json b/src/main/resources/assets/botania/models/block/plants/flower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_gray.json rename to src/main/resources/assets/botania/models/block/plants/flower_gray.json diff --git a/src/main/resources/assets/botania/models/block/flower_green.json b/src/main/resources/assets/botania/models/block/plants/flower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_green.json rename to src/main/resources/assets/botania/models/block/plants/flower_green.json diff --git a/src/main/resources/assets/botania/models/block/flower_light_blue.json b/src/main/resources/assets/botania/models/block/plants/flower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/flower_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/flower_lime.json b/src/main/resources/assets/botania/models/block/plants/flower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_lime.json rename to src/main/resources/assets/botania/models/block/plants/flower_lime.json diff --git a/src/main/resources/assets/botania/models/block/flower_magenta.json b/src/main/resources/assets/botania/models/block/plants/flower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_magenta.json rename to src/main/resources/assets/botania/models/block/plants/flower_magenta.json diff --git a/src/main/resources/assets/botania/models/block/flower_orange.json b/src/main/resources/assets/botania/models/block/plants/flower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_orange.json rename to src/main/resources/assets/botania/models/block/plants/flower_orange.json diff --git a/src/main/resources/assets/botania/models/block/flower_pink.json b/src/main/resources/assets/botania/models/block/plants/flower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_pink.json rename to src/main/resources/assets/botania/models/block/plants/flower_pink.json diff --git a/src/main/resources/assets/botania/models/block/flower_purple.json b/src/main/resources/assets/botania/models/block/plants/flower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_purple.json rename to src/main/resources/assets/botania/models/block/plants/flower_purple.json diff --git a/src/main/resources/assets/botania/models/block/flower_red.json b/src/main/resources/assets/botania/models/block/plants/flower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_red.json rename to src/main/resources/assets/botania/models/block/plants/flower_red.json diff --git a/src/main/resources/assets/botania/models/block/flower_silver.json b/src/main/resources/assets/botania/models/block/plants/flower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_silver.json rename to src/main/resources/assets/botania/models/block/plants/flower_silver.json diff --git a/src/main/resources/assets/botania/models/block/flower_white.json b/src/main/resources/assets/botania/models/block/plants/flower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_white.json rename to src/main/resources/assets/botania/models/block/plants/flower_white.json diff --git a/src/main/resources/assets/botania/models/block/flower_yellow.json b/src/main/resources/assets/botania/models/block/plants/flower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_yellow.json rename to src/main/resources/assets/botania/models/block/plants/flower_yellow.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_black.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_black.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_blue.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_brown.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_gray.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_green.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_green.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_lime.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_orange.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_pink.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_purple.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_red.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_red.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_silver.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_white.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_white.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_black.json b/src/main/resources/assets/botania/models/block/plants/mushroom_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_black.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_black.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_blue.json b/src/main/resources/assets/botania/models/block/plants/mushroom_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_blue.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_blue.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_brown.json b/src/main/resources/assets/botania/models/block/plants/mushroom_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_brown.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_brown.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_cyan.json b/src/main/resources/assets/botania/models/block/plants/mushroom_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_cyan.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_cyan.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_gray.json b/src/main/resources/assets/botania/models/block/plants/mushroom_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_gray.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_gray.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_green.json b/src/main/resources/assets/botania/models/block/plants/mushroom_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_green.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_green.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_light_blue.json b/src/main/resources/assets/botania/models/block/plants/mushroom_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_lime.json b/src/main/resources/assets/botania/models/block/plants/mushroom_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_lime.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_lime.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_magenta.json b/src/main/resources/assets/botania/models/block/plants/mushroom_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_magenta.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_magenta.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_orange.json b/src/main/resources/assets/botania/models/block/plants/mushroom_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_orange.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_orange.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_pink.json b/src/main/resources/assets/botania/models/block/plants/mushroom_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_pink.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_pink.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_purple.json b/src/main/resources/assets/botania/models/block/plants/mushroom_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_purple.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_purple.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_red.json b/src/main/resources/assets/botania/models/block/plants/mushroom_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_red.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_red.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_silver.json b/src/main/resources/assets/botania/models/block/plants/mushroom_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_silver.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_silver.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_white.json b/src/main/resources/assets/botania/models/block/plants/mushroom_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_white.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_white.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_yellow.json b/src/main/resources/assets/botania/models/block/plants/mushroom_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_yellow.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_yellow.json diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json new file mode 100644 index 000000000..f44a954f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json new file mode 100644 index 000000000..1532d2d11 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledBlazeQuartz0", + "end": "botania:blocks/chiseledBlazeQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json new file mode 100644 index 000000000..eb34dda3a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarBlazeQuartz0", + "end": "botania:blocks/pillarBlazeQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json new file mode 100644 index 000000000..e48195fab --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json new file mode 100644 index 000000000..7c1da5c3a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledDarkQuartz0", + "end": "botania:blocks/chiseledDarkQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json new file mode 100644 index 000000000..c610d0b25 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarDarkQuartz0", + "end": "botania:blocks/pillarDarkQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json new file mode 100644 index 000000000..d68e10781 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json new file mode 100644 index 000000000..d2ba907cc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledElfQuartz0", + "end": "botania:blocks/chiseledElfQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json new file mode 100644 index 000000000..49ce41ac7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarElfQuartz0", + "end": "botania:blocks/pillarElfQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json new file mode 100644 index 000000000..a15700d32 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json new file mode 100644 index 000000000..743d29abb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledLavenderQuartz0", + "end": "botania:blocks/chiseledLavenderQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json new file mode 100644 index 000000000..a6baaf582 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarLavenderQuartz0", + "end": "botania:blocks/pillarLavenderQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json new file mode 100644 index 000000000..4d7592100 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json new file mode 100644 index 000000000..365192d7d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledManaQuartz0", + "end": "botania:blocks/chiseledManaQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json new file mode 100644 index 000000000..6ab1a24dc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarManaQuartz0", + "end": "botania:blocks/pillarManaQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json new file mode 100644 index 000000000..6f8745719 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json new file mode 100644 index 000000000..618377628 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledRedQuartz0", + "end": "botania:blocks/chiseledRedQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json new file mode 100644 index 000000000..eb722fa5c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarRedQuartz0", + "end": "botania:blocks/pillarRedQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json new file mode 100644 index 000000000..c4629562c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json new file mode 100644 index 000000000..9dc208c8f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledSunnyQuartz0", + "end": "botania:blocks/chiseledSunnyQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json new file mode 100644 index 000000000..037c8054b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarSunnyQuartz0", + "end": "botania:blocks/pillarSunnyQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/note.txt b/src/main/resources/assets/botania/models/block/shapes/note.txt deleted file mode 100644 index 18061f888..000000000 --- a/src/main/resources/assets/botania/models/block/shapes/note.txt +++ /dev/null @@ -1,2 +0,0 @@ -This folder is for "abstract" models, that only define shapes and not textures. -Textured models for actual blocks goes in the root folder (one level up). \ No newline at end of file From 1799380064bfb4ce8d70ff02f769d93f722c4383 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 10:52:48 -0500 Subject: [PATCH 830/935] Blocks own their statemappers --- .../client/core/handler/ModelHandler.java | 31 ------------------- .../common/block/BlockModDoubleFlower.java | 11 ++++++- .../botania/common/block/BlockModFlower.java | 13 +++++++- .../botania/common/block/BlockPlatform.java | 10 ++++++ .../common/block/BlockSpecialFlower.java | 12 ++++++- .../block/decor/BlockFloatingFlower.java | 8 +++++ .../common/block/decor/BlockManaBeacon.java | 10 ++++++ .../common/block/decor/BlockPetalBlock.java | 10 ++++++ .../common/block/decor/BlockUnstable.java | 8 +++++ .../botania/common/block/mana/BlockPool.java | 10 ++++++ .../block/string/BlockRedStringDispenser.java | 10 ++++++ .../string/BlockRedStringInterceptor.java | 10 ++++++ 12 files changed, 109 insertions(+), 34 deletions(-) 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 be4af3ce5..c28ce34a6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -100,8 +100,6 @@ public final class ModelHandler { registerSubtiles(); - registerStateMappers(); - registerStandardBlocks(); for (Block block : Block.REGISTRY) { @@ -291,35 +289,6 @@ public final class ModelHandler { registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); } - private static void registerStateMappers() { - // Override to let custom model loader work, see SpecialFlowerModel - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - - // Override to let smart models work, see MiscellaneousIcons - ModelLoader.setCustomStateMapper(ModBlocks.floatingSpecialFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.floatingFlower, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.platform, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); - - // Ignore vanilla facing, variant in double flower - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); - ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower2, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); - - // Ignore color in pool, unstable cube, mana beacon, special flower, and petals (handled by Block.colorMultiplier) - ModelLoader.setCustomStateMapper(ModBlocks.pool, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.unstableBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.manaBeacon, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.petalBlock, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); - ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR, ((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); - - // Ignore vanilla variant in flowers - ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); - ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); - - ModelLoader.setCustomStateMapper(ModBlocks.redStringDispenser, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - ModelLoader.setCustomStateMapper(ModBlocks.redStringInterceptor, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); - } - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 6859a11ec..2f5ea4375 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -17,6 +17,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -30,12 +31,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -49,7 +52,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IRegisterCallback { +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IRegisterCallback, IModelRegister { private static final int COUNT = 8; private final boolean second; @@ -224,4 +227,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) + @Override + public final void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index aff8c93fe..f0583e55c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -17,6 +17,7 @@ import net.minecraft.block.IGrowable; import net.minecraft.block.SoundType; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -29,10 +30,14 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -47,7 +52,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IRegisterCallback { +public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IRegisterCallback, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -170,4 +175,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup GameRegistry.register(this); registerItemForm(); } + + @SideOnly(Side.CLIENT) + @Override + public final void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 0ce7e6368..6d01833a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -15,6 +15,7 @@ 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.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,10 +28,13 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaCollisionGhost; @@ -152,4 +156,10 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, public boolean isGhost(IBlockState state, World world, BlockPos pos) { return true; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index def6834eb..1950bee9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -20,6 +20,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.ParticleDigging; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -39,6 +40,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; @@ -53,6 +55,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -65,7 +68,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IRegisterCallback { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IRegisterCallback, IModelRegister { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( @@ -382,4 +385,11 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I GameRegistry.register(this); GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + // Let custom loader work + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(getTypeProperty()).build()); + } } 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 d11ebabfd..0d69d83f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -18,6 +18,7 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.particle.ParticleDigging; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -36,6 +37,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; @@ -249,4 +251,10 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu public boolean canStabaliseInfusion(World world, BlockPos pos) { return ConfigHandler.enableThaumcraftStablizers; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); + } } 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 214d08e6c..c46d606c9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -14,6 +14,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -24,7 +25,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -116,4 +120,10 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileManaBeacon(); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + } } 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 5a56ab928..1852f142b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -14,6 +14,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -21,7 +22,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -83,4 +87,10 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return LexiconData.flowers; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + } + } 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 d2406153e..869661573 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -24,6 +25,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -123,4 +125,10 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return LexiconData.unstableBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + } + } 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 79bdd076c..2c5ae29b4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -16,6 +16,7 @@ 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.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -32,7 +33,10 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -237,4 +241,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { return ModAchievements.manaPoolPickup; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + } } 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 e6156608f..1ee5daa36 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -13,9 +13,13 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; @@ -74,4 +78,10 @@ public class BlockRedStringDispenser extends BlockRedString { return new TileRedStringDispenser(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + } + } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 682984cfb..3f64d95a0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -12,13 +12,17 @@ package vazkii.botania.common.block.string; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; @@ -92,4 +96,10 @@ public class BlockRedStringInterceptor extends BlockRedString { return new TileRedStringInterceptor(); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + } + } From 1cc995c986b3c50513efc854ec20e78b11c4ac83 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 10:56:14 -0500 Subject: [PATCH 831/935] Split black lotus metas --- .../botania/client/core/handler/ModelHandler.java | 15 ++++----------- .../botania/common/item/ItemBlackLotus.java | 3 +-- .../item/{blackLotus.json => blackLotus0.json} | 3 +-- .../assets/botania/models/item/blackLotus1.json | 6 ++++++ 4 files changed, 12 insertions(+), 15 deletions(-) rename src/main/resources/assets/botania/models/item/{blackLotus.json => blackLotus0.json} (80%) create mode 100644 src/main/resources/assets/botania/models/item/blackLotus1.json 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 c28ce34a6..8b71b9c4d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -102,15 +102,13 @@ public final class ModelHandler { registerStandardBlocks(); - for (Block block : Block.REGISTRY) { - if (block.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) - && block instanceof IModelRegister) + for(Block block : Block.REGISTRY) { + if(block instanceof IModelRegister) ((IModelRegister) block).registerModels(); } - for (Item item : Item.REGISTRY) { - if (item.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) - && item instanceof IModelRegister) + for(Item item : Item.REGISTRY) { + if(item instanceof IModelRegister) ((IModelRegister) item).registerModels(); } } @@ -369,10 +367,5 @@ public final class ModelHandler { } } - public static void registerItemModel(Item i,int meta) { - ResourceLocation loc = i.getRegistryName(); - ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); - } - private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 685946295..76d0c4bb5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -85,8 +85,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelHandler.registerItemModel(this, 0); - ModelHandler.registerItemModel(this, 1); + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.BLACK_LOTUS); } } diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus0.json similarity index 80% rename from src/main/resources/assets/botania/models/item/blackLotus.json rename to src/main/resources/assets/botania/models/item/blackLotus0.json index 6a3582c0b..bfab19bc4 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus.json +++ b/src/main/resources/assets/botania/models/item/blackLotus0.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/blackLotus" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus1.json b/src/main/resources/assets/botania/models/item/blackLotus1.json new file mode 100644 index 000000000..94c1f6ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackLotus1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/blackLotus" + } +} \ No newline at end of file From 1e2bd1d4cd388f266b7d497f6923e5977866bc58 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 12:11:28 -0500 Subject: [PATCH 832/935] Blocks now own their itemblock model registration --- .../client/core/handler/ModelHandler.java | 206 +++--------------- .../botania/client/render/IModelRegister.java | 2 + .../botania/common/block/BlockAltGrass.java | 9 + .../botania/common/block/BlockAltar.java | 11 +- .../botania/common/block/BlockAvatar.java | 4 +- .../botania/common/block/BlockFelPumpkin.java | 9 + .../botania/common/block/BlockGhostRail.java | 12 +- .../botania/common/block/BlockHourglass.java | 3 +- .../botania/common/block/BlockLightRelay.java | 11 + .../botania/common/block/BlockLivingrock.java | 9 + .../botania/common/block/BlockLivingwood.java | 9 + .../vazkii/botania/common/block/BlockMod.java | 5 +- .../common/block/BlockModDoubleFlower.java | 2 +- .../common/block/BlockModDoubleFlower1.java | 10 + .../common/block/BlockModDoubleFlower2.java | 10 + .../botania/common/block/BlockModFlower.java | 4 +- .../botania/common/block/BlockOpenCrate.java | 10 + .../botania/common/block/BlockPlatform.java | 4 + .../botania/common/block/BlockPylon.java | 9 + .../common/block/BlockSpecialFlower.java | 2 + .../botania/common/block/BlockStorage.java | 9 + .../common/block/BlockTeruTeruBozu.java | 3 +- .../corporea/BlockCorporeaCrystalCube.java | 3 +- .../block/corporea/BlockCorporeaIndex.java | 3 +- .../common/block/decor/BlockBuriedPetals.java | 11 + .../common/block/decor/BlockCustomBrick.java | 9 + .../block/decor/BlockFloatingFlower.java | 3 + .../common/block/decor/BlockManaBeacon.java | 2 + .../common/block/decor/BlockModMushroom.java | 10 +- .../common/block/decor/BlockPavement.java | 9 + .../common/block/decor/BlockPetalBlock.java | 2 + .../common/block/decor/BlockShinyFlower.java | 13 ++ .../common/block/decor/BlockUnstable.java | 2 + .../decor/biomestone/BlockBiomeStoneA.java | 9 + .../decor/biomestone/BlockBiomeStoneB.java | 9 + .../block/decor/panes/BlockAlfglassPane.java | 10 + .../block/decor/panes/BlockBifrostPane.java | 10 + .../block/decor/panes/BlockManaglassPane.java | 10 + .../block/decor/panes/BlockModPane.java | 6 +- .../decor/quartz/BlockSpecialQuartz.java | 5 +- .../block/decor/slabs/BlockModSlab.java | 2 +- .../decor/walls/BlockBiomeStoneWall.java | 2 + .../walls/living/BlockDreamwoodWall.java | 9 + .../walls/living/BlockLivingrockWall.java | 9 + .../walls/living/BlockLivingwoodWall.java | 9 + .../common/block/mana/BlockBellows.java | 3 +- .../common/block/mana/BlockBrewery.java | 3 +- .../common/block/mana/BlockEnchanter.java | 9 + .../common/block/mana/BlockForestDrum.java | 9 + .../botania/common/block/mana/BlockPool.java | 2 + .../botania/common/block/mana/BlockPump.java | 9 + .../common/block/mana/BlockSpreader.java | 10 +- .../common/block/string/BlockRedString.java | 9 + .../block/string/BlockRedStringDispenser.java | 1 + .../string/BlockRedStringInterceptor.java | 1 + .../models/block/corporea_interceptor.json | 2 +- 56 files changed, 378 insertions(+), 190 deletions(-) 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 8b71b9c4d..e8e4bb083 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -9,36 +9,20 @@ package vazkii.botania.client.core.handler; import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; +import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; 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 net.minecraftforge.fml.common.registry.RegistryDelegate; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltGrassVariant; -import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; -import vazkii.botania.api.state.enums.CrateVariant; -import vazkii.botania.api.state.enums.CustomBrickVariant; -import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.api.state.enums.LivingRockVariant; -import vazkii.botania.api.state.enums.LivingWoodVariant; -import vazkii.botania.api.state.enums.LuminizerVariant; -import vazkii.botania.api.state.enums.PlatformVariant; -import vazkii.botania.api.state.enums.PoolVariant; -import vazkii.botania.api.state.enums.PylonVariant; -import vazkii.botania.api.state.enums.SpreaderVariant; -import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; @@ -90,6 +74,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import java.util.Locale; +import java.util.Map; import java.util.function.IntFunction; public final class ModelHandler { @@ -100,8 +85,6 @@ public final class ModelHandler { registerSubtiles(); - registerStandardBlocks(); - for(Block block : Block.REGISTRY) { if(block instanceof IModelRegister) ((IModelRegister) block).registerModels(); @@ -184,129 +167,10 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); } - private static void registerStandardBlocks() { - registerBlockCustomPath(ModBlocks.avatar, "avatar"); - registerBlockCustomPath(ModBlocks.bellows, "bellows"); - registerBlockCustomPath(ModBlocks.brewery, "brewery"); - registerBlockVariantInventory(ModBlocks.corporeaCrystalCube); - registerBlockCustomPath(ModBlocks.corporeaIndex, "corporea_index"); - registerBlockCustomPath(ModBlocks.hourglass, "hovering_hourglass"); - registerBlockCustomPath(ModBlocks.teruTeruBozu, "teru_teru_bozu"); - - registerBlockVariantNormal(ModBlocks.alchemyCatalyst); - registerBlockVariant(ModBlocks.alfPortal, "state=off"); - registerBlockCustomPath(ModFluffBlocks.alfglassPane, "alfglass_pane"); - registerBlockVariantNormal(ModBlocks.bifrost); - registerBlockCustomPath(ModFluffBlocks.bifrostPane, "bifrost_pane"); - registerBlockVariantNormal(ModBlocks.bifrostPerm); - registerBlockCustomPathMetas(ModFluffBlocks.biomeStoneWall, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); - registerBlockVariantNormal(ModBlocks.blazeBlock); - registerBlockVariant(ModBlocks.cacophonium, "powered=false"); - registerBlockVariantNormal(ModBlocks.cellBlock); - registerBlockVariantNormal(ModBlocks.conjurationCatalyst); - registerBlockVariantNormal(ModBlocks.cocoon); - registerBlockVariant(ModBlocks.corporeaFunnel, "powered=false"); - registerBlockVariant(ModBlocks.corporeaInterceptor, "powered=false"); - registerBlockVariant(ModBlocks.corporeaRetainer, "powered=false"); - registerBlockVariantNormal(ModBlocks.dirtPath); - registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockCustomPathMetas(ModBlocks.doubleFlower2, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); - registerBlockVariantNormal(ModBlocks.distributor); - registerBlockCustomPath(ModFluffBlocks.dreamwoodWall, "dreamwood_wall"); - registerBlockVariantNormal(ModBlocks.elfGlass); - registerBlockVariantNormal(ModBlocks.enchantedSoil); - registerBlockVariant(ModBlocks.enchanter, "facing=x"); - registerBlockVariant(ModBlocks.enderEye, "powered=false"); - registerBlockVariant(ModBlocks.felPumpkin, "facing=north"); - registerBlockVariantInventory(ModBlocks.floatingSpecialFlower); - registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariantNormal(ModBlocks.forestEye); - registerBlockCustomPath(ModBlocks.ghostRail, "ghost_rail"); - registerBlockVariant(ModBlocks.incensePlate, "facing=south"); - registerBlockVariant(ModBlocks.lightLauncher, "powered=false"); - registerBlockCustomPath(ModFluffBlocks.livingrockWall, "livingrock_wall"); - registerBlockCustomPath(ModFluffBlocks.livingwoodWall, "livingwood_wall"); - registerBlockVariantNormal(ModBlocks.manaBomb); - registerBlockVariant(ModBlocks.manaDetector, "powered=false"); - registerBlockVariantNormal(ModBlocks.manaGlass); - registerBlockCustomPath(ModFluffBlocks.managlassPane, "managlass_pane"); - registerBlockVariantNormal(ModBlocks.manaVoid); - registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); - // Explicit mapping needed because saved meta does not match EnumDyeColor - EnumDyeColor[] manualMapping = { EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE, EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN }; - registerBlockVariantMetas(ModFluffBlocks.pavement, 6, i -> "color=" + manualMapping[i].getName()); - registerBlockVariant(ModBlocks.prism, "has_lens=false,powered=false"); - registerBlockVariantNormal(ModBlocks.pistonRelay); - registerBlockVariantInventory(ModBlocks.pump); - registerBlockVariant(ModBlocks.redStringComparator, "facing=north"); - registerBlockVariant(ModBlocks.redStringContainer, "facing=north"); - registerBlockVariant(ModBlocks.redStringDispenser, "facing=north"); - registerBlockVariant(ModBlocks.redStringFertilizer, "facing=north"); - registerBlockVariant(ModBlocks.redStringInterceptor, "facing=north"); - registerBlockVariant(ModBlocks.redStringRelay, "facing=north"); - registerBlockVariantNormal(ModBlocks.rfGenerator); - registerBlockVariantNormal(ModBlocks.root); - registerBlockVariantNormal(ModBlocks.runeAltar); - registerBlockVariantNormal(ModBlocks.shimmerrock); - registerBlockVariantNormal(ModBlocks.shimmerwoodPlanks); - registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); - registerBlockVariant(ModBlocks.sparkChanger, "powered=false"); - registerBlockVariantNormal(ModBlocks.spawnerClaw); - registerBlockVariantInventory(ModBlocks.specialFlower); - registerBlockVariant(ModBlocks.starfield, "powered=false"); - registerBlockVariantNormal(ModBlocks.terraPlate); - registerBlockVariantNormal(ModBlocks.tinyPlanet); - registerBlockVariant(ModBlocks.tinyPotato, "facing=north"); - registerBlockVariantNormal(ModBlocks.turntable); - - // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons - registerItemAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); - - // Item models which all use the same base model and recolored by render layer - registerBlockVariantMetas(ModBlocks.manaBeacon, EnumDyeColor.values().length, "normal"); - registerBlockVariantMetas(ModBlocks.petalBlock, EnumDyeColor.values().length, "normal"); - registerBlockVariantMetas(ModBlocks.unstableBlock, EnumDyeColor.values().length, "normal"); - - // Blocks which share models with their item, and have only one variant to switch over - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.altar, AltarVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); - registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.dreamwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.lightRelay, LuminizerVariant.class, "powered=false,variant"); - registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant"); - registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.spreader, SpreaderVariant.class, "variant"); - // todo 1.8 this is temporary until animation API is done, currnetly item model textures will not match true spreader texture - registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); - } - - private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { - Item item = Item.getItemFromBlock(b); - for (T e : enumclazz.getEnumConstants()) { - String baseName = ForgeRegistries.BLOCKS.getKey(b).toString(); - String variantName = variantHeader + "=" + e.getName(); - ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); - } - } - - /** - * Registers all metas of the given item to models/item/registryname.json - */ public static void registerItemAllMeta(Item item, int range) { registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); } - /** - * Registers each meta of an item to models/item/registryname.json - * Range is exclusive upper bound - */ public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { registerItemMetas(item, maxExclusive, i -> loc + i); } @@ -320,44 +184,46 @@ public final class ModelHandler { } } - // -- Registers the ItemBlock model to be the Block's model, of the specified variant -- // - private static void registerBlockVariantNormal(Block b) { - registerBlockVariant(b, "normal"); + private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); + private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper(); + + private static ModelResourceLocation getMrlForState(IBlockState state) { + return customStateMappers + .getOrDefault(state.getBlock().delegate, fallbackMapper) + .putStateModelLocations(state.getBlock()) + .get(state); + } + + public static void registerBlockToState(Block b, int meta, IBlockState state) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), + meta, + getMrlForState(state) + ); + } + + public static void registerBlockToState(Block b, int maxExclusive) { + for(int i = 0; i < maxExclusive; i++) + registerBlockToState(b, i, b.getStateFromMeta(i)); } // Registers the ItemBlock to models/item/#inventory - private static void registerBlockVariantInventory(Block b) { - registerBlockVariant(b, "inventory"); - } - - public static void registerBlockVariant(Block b, String variant) { - registerBlockVariantMetas(b, 1, variant); - } - - private static void registerBlockVariantMetas(Block b, int maxExclusive, String variant) { - registerBlockVariantMetas(b, maxExclusive, i -> variant); - } - - public static void registerBlockVariantMetas(Block b, int maxExclusive, IntFunction metaToVariant) { - Item item = Item.getItemFromBlock(b); - for (int i = 0; i < maxExclusive; i++) { - ModelLoader.setCustomModelResourceLocation( - item, i, - new ModelResourceLocation(item.getRegistryName(), metaToVariant.apply(i)) - ); - } + public static void registerInventoryVariant(Block b) { + ModelLoader.setCustomModelResourceLocation( + Item.getItemFromBlock(b), 0, + new ModelResourceLocation(b.getRegistryName(), "inventory")); } // Registers the ItemBlock to a custom path in models/item/itemblock/ - private static void registerBlockCustomPath(Block b, String path) { - registerBlockCustomPathMetas(b, 1, path); + public static void registerCustomItemblock(Block b, String path) { + registerCustomItemblock(b, 1, path); } - private static void registerBlockCustomPathMetas(Block b, int maxExclusive, String path) { - registerBlockCustomPathMetas(b, maxExclusive, i -> path); + public static void registerCustomItemblock(Block b, int maxExclusive, String path) { + registerCustomItemblock(b, maxExclusive, i -> path); } - private static void registerBlockCustomPathMetas(Block b, int maxExclusive, IntFunction metaToPath) { + public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction metaToPath) { Item item = Item.getItemFromBlock(b); for (int i = 0; i < maxExclusive; i++) { ModelLoader.setCustomModelResourceLocation( diff --git a/src/main/java/vazkii/botania/client/render/IModelRegister.java b/src/main/java/vazkii/botania/client/render/IModelRegister.java index 4f3f82a3d..358074074 100644 --- a/src/main/java/vazkii/botania/client/render/IModelRegister.java +++ b/src/main/java/vazkii/botania/client/render/IModelRegister.java @@ -6,6 +6,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface IModelRegister { /** * Do whatever needs to be done to register models + * For Blocks, statemapper registration needs to be done BEFORE itemblock registration + * Exceptions to that rule are noted */ @SideOnly(Side.CLIENT) void registerModels(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 783bd6f29..1a0530836 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -29,10 +29,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -151,4 +154,10 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.grassSeeds; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, AltGrassVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 92ed8cdb2..06832a1cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -30,19 +30,20 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -281,4 +282,10 @@ public class BlockAltar extends BlockMod implements ILexiconable { return LexiconData.apothecary; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, AltarVariant.values().length - 1); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index e584f92af..284f7461e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -37,6 +37,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileAvatar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; @@ -155,9 +156,10 @@ public class BlockAvatar extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileAvatar.class); + ModelHandler.registerCustomItemblock(this, "avatar"); + super.registerModels(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 4fcb1771f..8e124cc99 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -27,9 +27,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -104,4 +107,10 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return LexiconData.gardenOfGlass; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index df2662fa1..94b3c6404 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -25,9 +25,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -36,7 +40,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback { +public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; @@ -114,4 +118,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegi GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "ghost_rail"); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 021119711..a57912d38 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -43,6 +43,7 @@ import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; @@ -204,9 +205,9 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileHourglass.class); + ModelHandler.registerCustomItemblock(this, "hovering_hourglass"); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 0a3776833..1122d1310 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -26,11 +26,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -170,4 +173,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return LexiconData.luminizerTransport; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + int i = 0; + for(LuminizerVariant v : LuminizerVariant.values()) + ModelHandler.registerBlockToState(this, i++, getDefaultState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, v)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index b185705b5..1948c3fef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -91,4 +94,10 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, LivingRockVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 5a498e17b..00df2c3bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -23,10 +23,13 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -107,4 +110,10 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, LivingWoodVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 82cd912a9..ab6db0ee0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -12,11 +12,13 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; @@ -47,7 +49,8 @@ public class BlockMod extends Block implements IModelRegister, IRegisterCallback @SideOnly(Side.CLIENT) @Override public void registerModels() { - + if(Item.getItemFromBlock(this) != null) + ModelHandler.registerBlockToState(this, 0, getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 2f5ea4375..b41bf12a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -229,7 +229,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @SideOnly(Side.CLIENT) @Override - public final void registerModels() { + public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.FACING).build()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 17b52f84f..291d3e405 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -5,7 +5,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; @@ -42,4 +45,11 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { meta &= -9; return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.byMetadata(meta)); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 2b6206e04..f28db0f6d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -5,7 +5,10 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; @@ -43,4 +46,11 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { meta &= -9; return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i + 8).getName()); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index f0583e55c..1d23e582f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -37,6 +37,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; @@ -178,7 +179,8 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override - public final void registerModels() { + public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName()); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 24db554ee..12827d7b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -30,6 +30,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -37,6 +39,7 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -188,4 +191,11 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState()); + ModelHandler.registerBlockToState(this, 1, getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.CRAFTY)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 6d01833a5..a369ca59f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -41,6 +41,7 @@ import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -160,6 +161,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override public void registerModels() { + ModelHandler.registerBlockToState(this, 3); + // Statemapper after item registration, because the items should be registered to the actual variant names ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.PLATFORM_VARIANT).build()); + } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 0714cfdca..ba0caa08f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -26,11 +26,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -143,4 +146,10 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi public boolean canStabaliseInfusion(World world, BlockPos pos) { return ConfigHandler.enableThaumcraftStablizers; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, PylonVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1950bee9c..e6ffa1476 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -55,6 +55,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -391,5 +392,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I public void registerModels() { // Let custom loader work ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).ignore(getTypeProperty()).build()); + ModelHandler.registerInventoryVariant(this); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 833d54301..18660b9c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -90,4 +93,10 @@ public class BlockStorage extends BlockMod implements ILexiconable { return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, StorageVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 9d41926c3..91dd42569 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -31,6 +31,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -144,7 +145,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerCustomItemblock(this, "teru_teru_bozu"); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileTeruTeruBozu.class); } 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 e51369563..9b755491f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -33,6 +33,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; @@ -132,7 +133,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerInventoryVariant(this); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaCrystalCube.class); } 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 c0f3d0864..1b19b8d79 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -31,6 +31,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -113,7 +114,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); + ModelHandler.registerCustomItemblock(this, "corporea_index"); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileCorporeaIndex.class); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 5edfa88f7..2ccbe8ee7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.EnumBlockRenderType; @@ -18,6 +19,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; @@ -74,4 +78,11 @@ public class BlockBuriedPetals extends BlockModFlower { public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; } + + @SideOnly(Side.CLIENT) + @Override + public final void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + } + } 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 3e2da2553..d189bf730 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -22,10 +22,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CustomBrickVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -92,4 +95,10 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, CustomBrickVariant.values().length); + } + } 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 0d69d83f0..59142b4a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -52,6 +52,7 @@ import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; @@ -256,5 +257,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build()); + // All to variant inventory so smartmodel can work + ModelHandler.registerItemAllMeta(Item.getItemFromBlock(this), EnumDyeColor.values().length); } } 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 c46d606c9..177a4d448 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; @@ -125,5 +126,6 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 640ac86fa..30e911e86 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -37,6 +37,8 @@ import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; @@ -52,7 +54,7 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback { +public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -160,4 +162,10 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis GameRegistry.register(this); GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); + } } 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 4fe5a108e..66bb3769d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -23,7 +23,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -104,4 +107,10 @@ public class BlockPavement extends BlockMod { return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues().size()); + } + } 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 1852f142b..d79a8f01d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -29,6 +29,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; import vazkii.botania.common.lexicon.LexiconData; @@ -91,6 +92,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 66829a04a..4fc9d2a21 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -11,15 +11,21 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -63,4 +69,11 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(getTypeProperty()).build()); + ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName()); + } + } 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 869661573..e6dcc0360 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -32,6 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; @@ -129,6 +130,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, EnumDyeColor.values().length); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index a8c054cfe..c5f206768 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -12,8 +12,11 @@ package vazkii.botania.common.block.decor.biomestone; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; @@ -54,4 +57,10 @@ public class BlockBiomeStoneA extends BlockBiomeStone { return meta; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BiomeStoneVariant.values().length); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 5a1a61ca2..e8d43e23e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -12,8 +12,11 @@ package vazkii.botania.common.block.decor.biomestone; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; @@ -44,4 +47,10 @@ public class BlockBiomeStoneB extends BlockBiomeStone { } return getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.values()[meta]); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, BiomeBrickVariant.values().length); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 6bcd7df75..ff6db6a28 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -26,4 +29,11 @@ public class BlockAlfglassPane extends BlockModPane { public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "alfglass_pane"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index c20a05633..5c8361ebb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -26,4 +29,11 @@ public class BlockBifrostPane extends BlockModPane { public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "bifrost_pane"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 359eb7a45..0f6b30830 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.util.BlockRenderLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; @@ -27,4 +30,11 @@ public class BlockManaglassPane extends BlockModPane { return BlockRenderLayer.TRANSLUCENT; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "managlass_pane"); + } + + } 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 c60f7353f..503cbaba8 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 @@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.IRegisterCallback; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -27,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockModPane extends BlockPane implements IRegisterCallback { +public class BlockModPane extends BlockPane implements IRegisterCallback, IModelRegister { public BlockModPane(Block source) { super(Material.GLASS, false); @@ -59,4 +60,7 @@ public class BlockModPane extends BlockPane implements IRegisterCallback { GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + + @Override + public void registerModels() {} } 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 f35138c83..bfeee198f 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 @@ -129,8 +129,9 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - String[] variantNames = { "variant=normal", "variant=chiseled", "variant=pillar_y" }; - ModelHandler.registerBlockVariantMetas(this, 3, i -> variantNames[i]); + ModelHandler.registerBlockToState(this, 0, getDefaultState()); + ModelHandler.registerBlockToState(this, 1, getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.CHISELED)); + ModelHandler.registerBlockToState(this, 2, getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y)); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index e90da5033..894cebdcc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -140,7 +140,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM public void registerModels() { if(!doubleSlab) { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); - ModelHandler.registerBlockVariant(this, "half=bottom"); + ModelHandler.registerBlockToState(this, 0, getDefaultState()); } else { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 80e4c3054..b640df5b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -28,6 +28,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -88,6 +89,7 @@ public class BlockBiomeStoneWall extends BlockModWall { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT) .ignore(BlockWall.VARIANT).withSuffix("_wall").build()); + ModelHandler.registerCustomItemblock(this, 8, i -> BiomeStoneVariant.values()[i + 8].getName() + "_wall"); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java index 8555956dc..638ff1ee2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockDreamwoodWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -22,4 +25,10 @@ public class BlockDreamwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "dreamwood_wall"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java index 4f44d3db0..9445b0d15 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingrockWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -23,4 +26,10 @@ public class BlockLivingrockWall extends BlockModWall { setSoundType(SoundType.STONE); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "livingrock_wall"); + } + } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java index bc2ff754a..57e96e141 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/living/BlockLivingwoodWall.java @@ -11,6 +11,9 @@ package vazkii.botania.common.block.decor.walls.living; import net.minecraft.block.SoundType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.walls.BlockModWall; @@ -22,4 +25,10 @@ public class BlockLivingwoodWall extends BlockModWall { setSoundType(SoundType.WOOD); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerCustomItemblock(this, "livingwood_wall"); + } + } 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 dd8ffa891..b1977d0f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -34,6 +34,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; @@ -126,9 +127,9 @@ public class BlockBellows extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBellows.class); + ModelHandler.registerCustomItemblock(this, "bellows"); } } 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 be16dd69d..dba0c5684 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -38,6 +38,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -157,9 +158,9 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { @SideOnly(Side.CLIENT) @Override public void registerModels() { - super.registerModels(); ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileBrewery.class); + ModelHandler.registerCustomItemblock(this, "brewery"); } } 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 f9c6d5df7..9ccc259bd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -29,11 +29,14 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; @@ -177,4 +180,10 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, ((TileEnchanter) world.getTileEntity(pos)).renderHUD(res); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); + } + } 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 1edb23326..d97c22040 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -31,12 +31,15 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -189,4 +192,10 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, DrumVariant.values().length); + } + } 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 2c5ae29b4..1588489c8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -45,6 +45,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockMod; @@ -246,5 +247,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, (new StateMap.Builder()).ignore(BotaniaStateProps.COLOR).build()); + ModelHandler.registerBlockToState(this, PoolVariant.values().length); } } 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 0c6bf4fbd..5d4dfa13a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -27,9 +27,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; @@ -127,4 +130,10 @@ public class BlockPump extends BlockMod implements ILexiconable { public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TilePump(); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerInventoryVariant(this); + } } 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 09cd4e6f8..dd1f0e617 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -31,6 +31,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -39,6 +41,7 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.InventoryHelper; @@ -49,7 +52,6 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.List; -import java.util.Random; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { @@ -236,4 +238,10 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f); } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, SpreaderVariant.values().length); + } + } 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 a9bbfcf82..353babb9b 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -21,9 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; @@ -71,4 +74,10 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { return LexiconData.redString; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelHandler.registerBlockToState(this, 0, getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.NORTH)); + } + } 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 1ee5daa36..025ced489 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -82,6 +82,7 @@ public class BlockRedStringDispenser extends BlockRedString { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + super.registerModels(); } } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 3f64d95a0..858dc92a5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -100,6 +100,7 @@ public class BlockRedStringInterceptor extends BlockRedString { @Override public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build()); + super.registerModels(); } } diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json index e94c14f92..ec405725a 100644 --- a/src/main/resources/assets/botania/models/block/corporea_interceptor.json +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -1,5 +1,5 @@ { - "model": "minecraft:cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "botania:blocks/corporeaInterceptor0", "top": "botania:blocks/corporeaInterceptor0", From 5c33e95a54fe7bd1f93e1be3cbfafcabad6f4498 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 12:12:33 -0500 Subject: [PATCH 833/935] Remove unused overload --- .../vazkii/botania/client/core/handler/ModelHandler.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 e8e4bb083..e8ccc4730 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -216,11 +216,7 @@ public final class ModelHandler { // Registers the ItemBlock to a custom path in models/item/itemblock/ public static void registerCustomItemblock(Block b, String path) { - registerCustomItemblock(b, 1, path); - } - - public static void registerCustomItemblock(Block b, int maxExclusive, String path) { - registerCustomItemblock(b, maxExclusive, i -> path); + registerCustomItemblock(b, 1, i -> path); } public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction metaToPath) { From 4552a451aefe0ce0e1ccf7fbec073661f632c9bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 14:02:25 -0500 Subject: [PATCH 834/935] Fix lexicon 3d model --- .../client/core/handler/RenderLexicon.java | 184 ++++++------------ .../botania/client/model/LexiconModel.java | 19 +- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 3 files changed, 66 insertions(+), 139 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 8b35a4fd0..77c243747 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -12,11 +12,14 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumHandSide; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.RenderSpecificHandEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.util.glu.Project; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -30,114 +33,59 @@ import vazkii.botania.common.item.ModItems; // Hacky way to render 3D lexicon, will be reevaluated in the future. public class RenderLexicon { - final ModelBook model = new ModelBook(); - final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); + private final ModelBook model = new ModelBook(); + private final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA); @SubscribeEvent - public void renderItem(RenderHandEvent evt) { - Minecraft mc; - if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon)) + public void renderItem(RenderSpecificHandEvent evt) { + Minecraft mc = Minecraft.getMinecraft(); + if(!ConfigHandler.lexicon3dModel + || mc.gameSettings.thirdPersonView != 0 + || mc.thePlayer.getHeldItem(evt.getHand()) == null + || mc.thePlayer.getHeldItem(evt.getHand()).getItem() != ModItems.lexicon) return; evt.setCanceled(true); - try { - // Called immediately before EntityRenderer.renderHand - GlStateManager.clear(256); - // Begin copy EntityRenderer.renderHand - GlStateManager.matrixMode(5889); - GlStateManager.loadIdentity(); - float f = 0.07F; - - if (mc.gameSettings.anaglyph) - { - GlStateManager.translate((float)(-(/*xOffset*/0 * 2 - 1)) * f, 0.0F, 0.0F); - } - - float fovModifier = ((float) ClientMethodHandles.getFOVModifier.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks, false)); - float farPlane = ((float) ClientMethodHandles.farPlaneDistance_getter.invokeExact(mc.entityRenderer)); - Project.gluPerspective(fovModifier, (float)mc.displayWidth / (float)mc.displayHeight, 0.05F, farPlane * 2.0F); - GlStateManager.matrixMode(5888); - GlStateManager.loadIdentity(); - - if (mc.gameSettings.anaglyph) - { - GlStateManager.translate((float)(/*xOffset*/0 * 2 - 1) * 0.1F, 0.0F, 0.0F); - } - - GlStateManager.pushMatrix(); - ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); - - if (mc.gameSettings.viewBobbing) - { - ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); - } - - boolean flag = mc.getRenderViewEntity() instanceof EntityLivingBase && ((EntityLivingBase)mc.getRenderViewEntity()).isPlayerSleeping(); - - if (mc.gameSettings.thirdPersonView == 0 && !flag && !mc.gameSettings.hideGUI && !mc.playerController.isSpectator()) - { - ClientMethodHandles.enableLightmap.invokeExact(mc.entityRenderer); - renderItemInFirstPerson(); - ClientMethodHandles.disableLightmap.invokeExact(mc.entityRenderer); - } - - GlStateManager.popMatrix(); - - if (mc.gameSettings.thirdPersonView == 0 && !flag) - { - mc.getItemRenderer().renderOverlays(ClientTickHandler.partialTicks); - ClientMethodHandles.hurtCameraEffect.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); - } - - if (mc.gameSettings.viewBobbing) - { - ClientMethodHandles.setupViewBobbing.invokeExact(mc.entityRenderer, ClientTickHandler.partialTicks); - } - // End EntityRenderer.renderHand copy + renderItemInFirstPerson(mc.thePlayer, evt.getPartialTicks(), evt.getInterpolatedPitch(), evt.getHand(), evt.getSwingProgress(), evt.getItemStack(), evt.getEquipProgress()); } catch (Throwable throwable) { Botania.LOGGER.warn("Failed to render lexicon"); } } - private void renderItemInFirstPerson() throws Throwable { + private void renderItemInFirstPerson(AbstractClientPlayer player, float partialTicks, float interpPitch, EnumHand hand, float swingProgress, ItemStack stack, float equipProgress) throws Throwable { // Cherry picked from ItemRenderer.renderItemInFirstPerson - float prevEquippedProgress = 0;//((float) ClientMethodHandles.prevEquippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); - float equippedProgress = 0;//((float) ClientMethodHandles.equippedProgress_getter.invokeExact(Minecraft.getMinecraft().getItemRenderer())); - float f = 1.0F - (prevEquippedProgress + (equippedProgress - prevEquippedProgress) * ClientTickHandler.partialTicks); - EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; - float f1 = player.getSwingProgress(ClientTickHandler.partialTicks); - float f2 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * ClientTickHandler.partialTicks; - float f3 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * ClientTickHandler.partialTicks; - this.func_178101_a(f2, f3); - this.func_178109_a(player); - this.func_178110_a(player, ClientTickHandler.partialTicks); - GlStateManager.enableRescaleNormal(); + boolean flag = hand == EnumHand.MAIN_HAND; + EnumHandSide enumhandside = flag ? player.getPrimaryHand() : player.getPrimaryHand().opposite(); GlStateManager.pushMatrix(); - this.func_178105_d(f1); - this.transformFirstPersonItem(f, f1); - - doRender(); - + boolean flag1 = enumhandside == EnumHandSide.RIGHT; + float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * ((float)Math.PI * 2F)); + float f2 = -0.2F * MathHelper.sin(swingProgress * (float)Math.PI); + int i = flag1 ? 1 : -1; + GlStateManager.translate((float)i * f, f1, f2); + this.transformSideFirstPerson(enumhandside, equipProgress); + this.transformFirstPerson(enumhandside, swingProgress); + doRender(enumhandside, partialTicks, stack); GlStateManager.popMatrix(); - GlStateManager.disableRescaleNormal(); - RenderHelper.disableStandardItemLighting(); } - private void doRender() { + private void doRender(EnumHandSide side, float partialTicks, ItemStack stack) { + Minecraft mc = Minecraft.getMinecraft(); + GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + mc.renderEngine.bindTexture(texture); float opening; float pageFlip; float ticks = ClientTickHandler.ticksWithLexicaOpen; if(ticks > 0 && ticks < 10) { if(Minecraft.getMinecraft().currentScreen instanceof GuiLexicon) - ticks += ClientTickHandler.partialTicks; - else ticks -= ClientTickHandler.partialTicks; + ticks += partialTicks; + else ticks -= partialTicks; } GlStateManager.translate(0.3F + 0.02F * ticks, 0.475F + 0.01F * ticks, -0.2F - 0.01F * ticks); - GlStateManager.rotate(87.5F + ticks * 5, 0F, 1F, 0F); + GlStateManager.rotate(87.5F + ticks * (side == EnumHandSide.RIGHT ? 5 : 10), 0F, 1F, 0F); GlStateManager.rotate(ticks * 2.85F, 0F, 0F, 1F); opening = ticks / 12F; @@ -153,13 +101,12 @@ public class RenderLexicon { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.3F, -0.21F, -0.07F); GlStateManager.scale(0.0035F, 0.0035F, -0.0035F); - boolean bevo = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("BevoLJ"); - boolean saice = Minecraft.getMinecraft().thePlayer.getName().equalsIgnoreCase("saice"); + boolean bevo = mc.thePlayer.getName().equalsIgnoreCase("BevoLJ"); + boolean saice = mc.thePlayer.getName().equalsIgnoreCase("saice"); String title = ModItems.lexicon.getItemStackDisplayName(null); String origTitle = title; - ItemStack stack = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, Item.class); if(stack != null) title = stack.getDisplayName(); if(title.equals(origTitle) && bevo) @@ -188,56 +135,37 @@ public class RenderLexicon { GlStateManager.translate(0F, 10F, 0F); font.drawString(I18n.format("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92); } + + GlStateManager.color(1F, 1F, 1F); } GlStateManager.popMatrix(); } - // Copy - ItemRenderer.func_178101_a - private void func_178101_a(float angle, float p_178101_2_) { - GlStateManager.pushMatrix(); - GlStateManager.rotate(angle, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate(p_178101_2_, 0.0F, 1.0F, 0.0F); - RenderHelper.enableStandardItemLighting(); - GlStateManager.popMatrix(); + // Copy - ItemRenderer.transformSideFirstPerson + // Arg - Side, EquipProgress + private void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_) + { + int i = p_187459_1_ == EnumHandSide.RIGHT ? 1 : -1; + GlStateManager.translate((float)i * 0.56F, -0.52F + p_187459_2_ * -0.6F, -0.72F); } - // Copy - ItemRenderer.func_178109_a - private void func_178109_a(AbstractClientPlayer clientPlayer) { - int i = Minecraft.getMinecraft().theWorld.getCombinedLight(new BlockPos(clientPlayer.posX, clientPlayer.posY + (double)clientPlayer.getEyeHeight(), clientPlayer.posZ), 0); - float f = (float)(i & 65535); - float f1 = (float)(i >> 16); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, f, f1); - } - - // Copy - ItemRenderer.func_178110_a - private void func_178110_a(EntityPlayerSP entityplayerspIn, float partialTicks) { - float f = entityplayerspIn.prevRenderArmPitch + (entityplayerspIn.renderArmPitch - entityplayerspIn.prevRenderArmPitch) * partialTicks; - float f1 = entityplayerspIn.prevRenderArmYaw + (entityplayerspIn.renderArmYaw - entityplayerspIn.prevRenderArmYaw) * partialTicks; - GlStateManager.rotate((entityplayerspIn.rotationPitch - f) * 0.1F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate((entityplayerspIn.rotationYaw - f1) * 0.1F, 0.0F, 1.0F, 0.0F); - } - - // Copy - ItemRenderer.func_178105_d - private void func_178105_d(float p_178105_1_) { - float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI); - float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(p_178105_1_) * (float)Math.PI * 2.0F); - float f2 = -0.2F * MathHelper.sin(p_178105_1_ * (float)Math.PI); - GlStateManager.translate(f, f1, f2); - } - - // Copy with modification - ItemRenderer.transformFirstPersonItem - private void transformFirstPersonItem(float equipProgress, float swingProgress) { - GlStateManager.translate(1.2F, -1F, -0.71999997F); // Botania - x(0.56) -> 1; y(-0.52) -> -1 - GlStateManager.translate(0.0F, equipProgress * -0.6F, 0.0F); - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); // Botania - 45 -> 90 - GlStateManager.rotate(-20, 0, 0, 1); // Botania - added - float f = MathHelper.sin(swingProgress * swingProgress * (float)Math.PI); - float f1 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); - GlStateManager.rotate(f * -20.0F, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(f1 * -20.0F, 0.0F, 0.0F, 1.0F); + // Copy with modification - ItemRenderer.transformFirstPerson + // Arg - Side, SwingProgress + private void transformFirstPerson(EnumHandSide p_187453_1_, float p_187453_2_) + { + int i = p_187453_1_ == EnumHandSide.RIGHT ? 1 : -1; + // Botania - added + GlStateManager.translate(p_187453_1_ == EnumHandSide.RIGHT ? 0.5F : 0.3F, -0.25F, 0.2F); + GlStateManager.rotate(90F, 0F, 1F, 0F); + GlStateManager.rotate(12F, 0F, 0F, -1F); + // End add + float f = MathHelper.sin(p_187453_2_ * p_187453_2_ * (float)Math.PI); + GlStateManager.rotate((float)i * (45.0F + f * -20.0F), 0.0F, 1.0F, 0.0F); + float f1 = MathHelper.sin(MathHelper.sqrt_float(p_187453_2_) * (float)Math.PI); + GlStateManager.rotate((float)i * f1 * -20.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); - // GlStateManager.scale(0.4F, 0.4F, 0.4F); Botania - removed + GlStateManager.rotate((float)i * -45.0F, 0.0F, 1.0F, 0.0F); } } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 9ff580f1b..66489d7a3 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.common.core.handler.ConfigHandler; import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; @@ -25,20 +26,18 @@ public class LexiconModel implements IPerspectiveAwareModel { @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); - /*if(cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND && ConfigHandler.lexicon3dModel) - return Pair.of(this, null); todo 1.9 */ + if((cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND + || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) + && ConfigHandler.lexicon3dModel) + return Pair.of(this, null); return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); } - @Nonnull - @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } - @Nonnull - @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } - @Nonnull - @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - @Nonnull - @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 242ee221b..cdc826a11 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.18.1.2014,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2024,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; From 6d542dec5a299bee12aaffe12e5e1beb7a5388e5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 14:06:07 -0500 Subject: [PATCH 835/935] Clean up methodhandles --- .../core/handler/ClientMethodHandles.java | 38 +------------------ .../common/core/handler/MethodHandles.java | 8 +--- .../vazkii/botania/common/lib/LibMisc.java | 2 +- .../botania/common/lib/LibObfuscation.java | 16 -------- .../common/world/SkyblockWorldEvents.java | 5 +-- 5 files changed, 5 insertions(+), 64 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index 8f4ccd30d..d63e62c2a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -15,11 +15,7 @@ import java.lang.reflect.Method; public final class ClientMethodHandles { public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager - farPlaneDistance_getter, - hurtCameraEffect, setupViewBobbing, getFOVModifier, - enableLightmap, disableLightmap; // EntityRenderer - //prevEquippedProgress_getter, equippedProgress_getter; // ItemRenderer + renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager static { try { @@ -34,38 +30,6 @@ public final class ClientMethodHandles { f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); f.setAccessible(true); renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); - - f = ReflectionHelper.findField(EntityRenderer.class, LibObfuscation.FAR_PLANE_DISTANCE); - f.setAccessible(true); - farPlaneDistance_getter = MethodHandles.publicLookup().unreflectGetter(f); - - Method m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.HURT_CAMERA_EFFECT, float.class); - m.setAccessible(true); - hurtCameraEffect = MethodHandles.publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.SETUP_VIEW_BOBBING, float.class); - m.setAccessible(true); - setupViewBobbing = MethodHandles.publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.ENABLE_LIGHTMAP); - m.setAccessible(true); - enableLightmap = MethodHandles.publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.DISABLE_LIGHTMAP); - m.setAccessible(true); - disableLightmap = MethodHandles.publicLookup().unreflect(m); - - m = ReflectionHelper.findMethod(EntityRenderer.class, null, LibObfuscation.GET_FOV_MODIFIER, float.class, boolean.class); - m.setAccessible(true); - getFOVModifier = MethodHandles.publicLookup().unreflect(m); - -// f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.PREV_EQUIPPED_PROGRESS); -// f.setAccessible(true); -// prevEquippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); -// -// f = ReflectionHelper.findField(ItemRenderer.class, LibObfuscation.EQUIPPED_PROGRESS); -// f.setAccessible(true); -// equippedProgress_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); e.printStackTrace(); diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index 6f4753591..fec57d0b4 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -23,8 +23,8 @@ public final class MethodHandles { spawnRange_getter, spawnCount_getter, maxNearbyEntities_getter, maxSpawnDelay_getter, minSpawnDelay_getter, spawnDelay_getter, spawnDelay_setter, prevMobRotation_setter, mobRotation_setter, potentialSpawns_getter, - randomEntity_getter, isActivated, // MobSpawnerBaseLogic - breakSound_getter; // SoundType + randomEntity_getter, isActivated; // MobSpawnerBaseLogic + static { try { @@ -81,10 +81,6 @@ public final class MethodHandles { f.setAccessible(true); randomEntity_getter = publicLookup().unreflectGetter(f); - f = ReflectionHelper.findField(SoundType.class, LibObfuscation.BREAK_SOUND); - f.setAccessible(true); - breakSound_getter = publicLookup().unreflectGetter(f); - Method m = ReflectionHelper.findMethod(MobSpawnerBaseLogic.class, null, LibObfuscation.IS_ACTIVATED); m.setAccessible(true); isActivated = publicLookup().unreflect(m); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index cdc826a11..5022e29bf 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.18.1.2024,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2034,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index cb154c568..25516be05 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -54,7 +54,6 @@ public final class LibObfuscation { // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; - public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "i" }; // MobSpawnerBaseLogic public static final String[] IS_ACTIVATED = new String[] { "isActivated" ,"func_98279_f", "h" }; @@ -90,19 +89,4 @@ public final class LibObfuscation { public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "q" }; public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "r" }; - // EntityRenderer - public static final String[] FAR_PLANE_DISTANCE = { "farPlaneDistance", "field_78530_s", "k" }; - public static final String[] HURT_CAMERA_EFFECT = { "hurtCameraEffect", "func_78482_e", "d" }; - public static final String[] SETUP_VIEW_BOBBING = { "setupViewBobbing", "func_78475_f", "e" }; - public static final String[] ENABLE_LIGHTMAP = { "enableLightmap", "func_180436_i", "i" }; - public static final String[] DISABLE_LIGHTMAP = { "disableLightmap", "func_175072_h", "h" }; - public static final String[] GET_FOV_MODIFIER = { "getFOVModifier", "func_78481_a", "a" }; - - // ItemRenderer todo 1.9 dual wielding - public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; - public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; - - // SoundType - public static final String[] BREAK_SOUND = { "breakSound", "field_185862_o", "o" }; - } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 57452544e..b1eb6d825 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -78,10 +78,7 @@ public final class SkyblockWorldEvents { if(event.getWorld().isRemote) event.getEntityPlayer().swingArm(event.getHand()); else { - try { - SoundEvent breakSound = (SoundEvent) MethodHandles.breakSound_getter.invokeExact(block.getSoundType()); - event.getWorld().playSound(null, event.getPos(), breakSound, SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); - } catch (Throwable ignore) {} + event.getWorld().playSound(null, event.getPos(), block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); if(Math.random() < 0.8) event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false); From 21a35c9c92183eb7bd4036175d188f2199adafc1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 14:38:46 -0500 Subject: [PATCH 836/935] 1.8 recipes now permanently on, fix initial loop recipe being oredicted. Closes #413 --- .../botania/common/core/handler/ConfigHandler.java | 4 ---- .../common/crafting/ModManaAlchemyRecipes.java | 12 +++++------- .../vazkii/botania/common/lexicon/LexiconData.java | 8 +++----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 4d89f7761..a88d52706 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -80,7 +80,6 @@ public final class ConfigHandler { public static boolean enchanterEnabled = true; public static boolean fluxfieldEnabled = true; public static boolean relicsEnabled = true; - public static boolean stones18Enabled = true; public static boolean ringOfOdinFireResist = true; public static boolean invertMagnetRing = false; public static boolean enableThaumcraftStablizers = true; @@ -219,9 +218,6 @@ public final class ConfigHandler { desc = "Set this to false to disable the Relic System. This only disables the entries, drops and achievements. Old ones that are already in the world will stay."; relicsEnabled = loadPropBool("relics.enabled", desc, relicsEnabled); - desc = "Set this to false to disable the 1.8 Stones available as mana alchemy recipes. This only disables the recipes and entries. Old ones that are already in the world will stay."; - stones18Enabled = loadPropBool("18stones.enabled", desc, stones18Enabled); - desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations."; ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 7f06855dd..1f4dff2bd 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -131,13 +131,11 @@ public final class ModManaAlchemyRecipes { 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 = new ArrayList<>(); + stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONE, 1, 5), new ItemStack(Blocks.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)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 819c39092..7dc56c75b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1408,11 +1408,9 @@ public final class LexiconData { phantomInk = new BasicLexiconEntry(LibLexicon.MISC_PHANTOM_INK, categoryMisc); phantomInk.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePhantomInk)); - if (ConfigHandler.stones18Enabled) { - stoneAlchemy = new BasicLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); - stoneAlchemy.setLexiconPages(new PageText("0"), - new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes)); - } + stoneAlchemy = new BasicLexiconEntry(LibLexicon.MISC_STONE_ALCHEMY, categoryMisc); + stoneAlchemy.setLexiconPages(new PageText("0"), + new PageManaInfusionRecipe("1", ModManaAlchemyRecipes.stoneRecipes)); blazeBlock = new BasicLexiconEntry(LibLexicon.MISC_BLAZE_BLOCK, categoryMisc); blazeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeBlazeBlock)); From 5041e23ede1443b08edf77e031a8a96c660811f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 16:24:42 -0500 Subject: [PATCH 837/935] Cleanup, black hole talisman uses caps, debug handler shows extended state --- .../client/core/handler/DebugHandler.java | 21 ++++++- .../common/core/helper/InventoryHelper.java | 9 --- .../common/item/ItemBlackHoleTalisman.java | 56 +++++++------------ 3 files changed, 40 insertions(+), 46 deletions(-) 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 210341701..86f476971 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -10,12 +10,17 @@ */ package vazkii.botania.client.core.handler; +import com.google.common.base.Optional; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ContextCapabilities; @@ -27,6 +32,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; +import java.util.Map; import java.util.UUID; public final class DebugHandler { @@ -39,7 +45,7 @@ public final class DebugHandler { public static void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { - event.getLeft().add(null); + event.getLeft().add(""); String version = LibMisc.VERSION; if(version.contains("GRADLE")) version = "N/A"; @@ -70,6 +76,19 @@ 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); + + if (Minecraft.getMinecraft().objectMouseOver != null + && Minecraft.getMinecraft().objectMouseOver.getBlockPos() != null) { + BlockPos pos = Minecraft.getMinecraft().objectMouseOver.getBlockPos(); + IBlockState state = world.getBlockState(pos); + state = state.getActualState(world, pos); + state = state.getBlock().getExtendedState(state, world, pos); + if (state instanceof IExtendedBlockState) { + for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { + event.getRight().add(e.getKey().getName() + ": " + e.getValue().orNull()); + } + } + } } 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/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index c8e554b04..6205bdb8a 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -43,17 +43,8 @@ import java.util.Spliterators; import java.util.stream.Stream; import java.util.stream.StreamSupport; -// Some methods from OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { - public static int[] buildSlotsForLinearInventory(IInventory inv) { - int[] slots = new int[inv.getSizeInventory()]; - for (int i = 0; i < slots.length; i++) - slots[i] = i; - - return slots; - } - public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { IItemHandler ret = getInventory(world, pos, side); if(ret == null) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index f48cabb00..e5a13ee01 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -35,6 +35,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; @@ -79,59 +82,41 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = world.getBlockState(pos); - boolean set = setBlock(par1ItemStack, state.getBlock(), state.getBlock().getMetaFromState(state)); + boolean set = setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state)); if(!set) { - Block bBlock = getBlock(par1ItemStack); - int bmeta = getBlockMeta(par1ItemStack); + Block bBlock = getBlock(stack); + int bmeta = getBlockMeta(stack); TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : InventoryHelper.buildSlotsForLinearInventory(inv); - for(int slot : slots) { - ItemStack stackInSlot = inv.getStackInSlot(slot); - if(stackInSlot == null) { - ItemStack stack = new ItemStack(bBlock, 1, bmeta); - int maxSize = stack.getMaxStackSize(); - stack.stackSize = remove(par1ItemStack, maxSize); - if(stack.stackSize != 0) { - if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, side))) { - inv.setInventorySlotContents(slot, stack); - inv.markDirty(); - set = true; - } - } - } else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) { - int maxSize = stackInSlot.getMaxStackSize(); - int missing = maxSize - stackInSlot.stackSize; - if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, side))) { - stackInSlot.stackSize += remove(par1ItemStack, missing); - inv.markDirty(); - set = true; - } - } - } + if(tile != null && tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) { + IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); + ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); + int maxSize = toAdd.getMaxStackSize(); + toAdd.stackSize = remove(stack, maxSize); + ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); + if(remainder != null) + add(stack, remainder.stackSize); } else { int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); BlockPos correctedPos = bBlock.isReplaceable(world, pos) ? pos : pos.offset(side); if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) { - int remove = player.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); + int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1); if(remove > 0) { - ItemStack stack = new ItemStack(bBlock, 1, bmeta); - ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack)); + ItemStack toUse = new ItemStack(bBlock, 1, bmeta); + ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack)); - Item.getItemFromBlock(bBlock).onItemUse(stack, player, world, pos, hand, side, par8, par9, par10); + Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ); set = true; } } } } - player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); + player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, stack); return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } @@ -144,7 +129,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { int highest = -1; int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length]; - Arrays.fill(counts, 0); for(int i = 0; i < counts.length; i++) { ItemStack stack = player.inventory.getStackInSlot(i); From 3f8e3f72d9aa90251c6836e411435db98f5161f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 16:37:50 -0500 Subject: [PATCH 838/935] Version checker just piggybacks off forge one now --- .../core/version/ThreadVersionChecker.java | 39 ------------------- .../common/core/version/VersionChecker.java | 31 ++++++++------- 2 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java deleted file mode 100644 index 1917d9d38..000000000 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [May 31, 2014, 10:31:46 PM (GMT)] - */ -package vazkii.botania.common.core.version; - -import net.minecraftforge.common.MinecraftForge; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; - -public class ThreadVersionChecker extends Thread { - - private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/" + MinecraftForge.MC_VERSION + ".txt"; - - public ThreadVersionChecker() { - setName("Botania Version Checker Thread"); - setDaemon(true); - start(); - } - - @Override - public void run() { - try(BufferedReader r = new BufferedReader(new InputStreamReader(new URL(LINK).openStream()))) { - VersionChecker.onlineVersion = r.readLine(); - } catch(IOException e) { - e.printStackTrace(); - } - VersionChecker.doneChecking = true; - } -} diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index d3c5f90cb..8cc4ced28 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -17,7 +17,10 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; @@ -30,34 +33,32 @@ public final class VersionChecker { private static final int FLAVOUR_MESSAGES = 65; public static boolean doneChecking = false; - public static String onlineVersion = ""; - public static boolean triedToWarnPlayer = false; + private static boolean triedToWarnPlayer = false; public static boolean startedDownload = false; public static boolean downloadedFile = false; public static void init() { - new ThreadVersionChecker(); MinecraftForge.EVENT_BUS.register(VersionChecker.class); } @SubscribeEvent public static void onTick(ClientTickEvent event) { - if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) { - if(!onlineVersion.isEmpty()) { + if(!triedToWarnPlayer && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null) { + ModContainer botaniaContainer = Loader.instance().getIndexedModList().get(LibMisc.MOD_ID); + ForgeVersion.CheckResult result = ForgeVersion.getResult(botaniaContainer); + + if(result.status != ForgeVersion.Status.PENDING) + triedToWarnPlayer = true; + + if(result.status == ForgeVersion.Status.OUTDATED) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); - int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); - if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", botaniaContainer.getVersion(), result.target)); - ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage", onlineVersion)); - player.addChatComponentMessage(component); - } + ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage", result.target)); + player.addChatComponentMessage(component); } - - triedToWarnPlayer = true; } } From b29c810a8098277dd3ecdd00a8fb53d7e6810fb3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 12:55:53 -0500 Subject: [PATCH 839/935] Use face quads in floating models. Partially alleviates #414 --- .../botania/client/model/FloatingFlowerModel.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index c60522ded..c81b89f9b 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -47,7 +47,10 @@ import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.EnumMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; public class FloatingFlowerModel implements IBakedModel { @@ -151,6 +154,7 @@ public class FloatingFlowerModel implements IBakedModel { private final IBakedModel flower; private final IBakedModel island; private final List genQuads; + private final Map> faceQuads = new EnumMap<>(EnumFacing.class); public CompositeBakedModel(IBakedModel flower, IBakedModel island) { this.flower = flower; @@ -159,6 +163,8 @@ public class FloatingFlowerModel implements IBakedModel { ImmutableList.Builder genBuilder = ImmutableList.builder(); final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); + for(EnumFacing e : EnumFacing.VALUES) + faceQuads.put(e, new ArrayList<>()); // Add flower quads, scaled and translated for(BakedQuad quad : flower.getQuads(null, null, 0)) { @@ -166,13 +172,13 @@ public class FloatingFlowerModel implements IBakedModel { } for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + faceQuads.get(e).addAll(flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add island quads genBuilder.addAll(island.getQuads(null, null, 0)); for(EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(island.getQuads(null, e, 0)); + faceQuads.get(e).addAll(island.getQuads(null, e, 0)); } genQuads = genBuilder.build(); @@ -180,7 +186,7 @@ public class FloatingFlowerModel implements IBakedModel { // Forward all to flower model @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { - return genQuads; + return face == null ? genQuads : faceQuads.get(face); } @Override public boolean isAmbientOcclusion() { return flower.isAmbientOcclusion(); From 072e3a693b87da2376f5ed0ad31cef4b3bfc8cbd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 15:05:27 -0500 Subject: [PATCH 840/935] Fix extended state blocks shitting themselves --- build.properties | 2 +- .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 2 +- src/main/java/vazkii/botania/common/lib/LibMisc.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.properties b/build.properties index 6d983de6e..66c94f169 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jul 29 18:40:22 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2041 +forge_version=12.18.1.2042 mc_version=1.10.2 dir_repo=./ build_number=315 diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index e6ffa1476..47e96c45c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -174,7 +174,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I if (meta > 15) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 5022e29bf..89db6d30a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.18.1.2034,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2042,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; From 46566802504714da4aac59eebcac2c6b34d55bb9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 17:05:51 -0500 Subject: [PATCH 841/935] New optimized floating island model --- .../client/model/SpecialFlowerModel.java | 7 +- .../botania/blockstates/miniIsland.json | 2 +- .../botania/models/block/miniIsland.json | 437 +++++++----------- 3 files changed, 166 insertions(+), 280 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 1f9c76a8f..cd3414082 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,7 +192,6 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Optional load(@Nonnull String key) { - if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); @@ -208,8 +207,10 @@ public class SpecialFlowerModel implements IModelCustomData { @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { - if(state.getBlock() != ModBlocks.specialFlower) + if(state.getBlock() != ModBlocks.specialFlower) { + Botania.LOGGER.fatal("FOREIGN BLOCK: " + state); return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + } IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); @@ -219,6 +220,8 @@ public class SpecialFlowerModel implements IModelCustomData { Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); if(specialModel.isPresent()) ret = specialModel.get(); + } else { + Botania.LOGGER.fatal("NULL SUBTILE ID"); } return ret.getQuads(state, face, rand); diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..078eca7b7 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -5,7 +5,7 @@ }, "variants": { "variant": { - "grass": { "textures": { "all": "botania:model/miniIsland" } }, + "grass": { "textures": { "all": "blocks/grass_top" } }, "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 6da36e326..0b6e40f40 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -10,290 +10,173 @@ }, "elements": [ { - "name": "Shape0", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, - "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, - "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, - "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } - } - }, - { - "name": "Shape1-1", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } - } - }, - { - "name": "Shape1-2", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } - } - }, - { - "name": "Shape1-3", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } - } - }, - { - "name": "Shape1-4", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } - } - }, - { - "name": "Shape2-1", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 7.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } - } - }, - { - "name": "Shape2-2", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } - } - }, - { - "name": "Shape2-3", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } - } - }, - { - "name": "Shape2-4", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } - } - }, - { - "name": "Shape2-5", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 7.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } - } - }, - { - "name": "Shape2-6", - "from": [ 5.0, 4.0, 9.0 ], - "to": [ 7.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } - } - }, - { - "name": "Shape2-7", - "from": [ 9.0, 4.0, 9.0 ], - "to": [ 11.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } - } - }, - { - "name": "Shape2-8", - "from": [ 9.0, 4.0, 5.0 ], - "to": [ 11.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } - } - }, - { - "name": "Shape3-1", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 7.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } - } - }, - { - "name": "Shape3-2", - "from": [ 3.0, 5.0, 9.0 ], - "to": [ 5.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } - } - }, - { - "name": "Shape3-3", - "from": [ 9.0, 5.0, 11.0 ], - "to": [ 11.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } - } - }, - { - "name": "Shape3-4", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 7.0, 7.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } - } - }, - { - "name": "Shape3-5", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } - } - }, - { - "name": "Shape3-6", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 7.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } - } - }, - { - "name": "Shape3-7", - "from": [ 11.0, 5.0, 9.0 ], - "to": [ 13.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } - } - }, - { - "name": "Shape3-8", - "from": [ 9.0, 5.0, 3.0 ], - "to": [ 11.0, 7.0, 5.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } - } - }, - { - "name": "Shape4-1", + "name": "Layer1", "from": [ 3.0, 6.0, 3.0 ], - "to": [ 5.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } - } - }, - { - "name": "Shape4-2", - "from": [ 3.0, 6.0, 11.0 ], - "to": [ 5.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } - } - }, - { - "name": "Shape4-3", - "from": [ 11.0, 6.0, 11.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } } }, { - "name": "Shape4-4", - "from": [ 11.0, 6.0, 3.0 ], - "to": [ 13.0, 7.0, 5.0 ], + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } } } ] -} +} \ No newline at end of file From 67ef25de09579c3b49ecead25216453674bf228c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 20:07:49 -0500 Subject: [PATCH 842/935] Prep for debug helper build --- build.properties | 2 +- .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 66c94f169..016afde88 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jul 29 18:40:22 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2042 +forge_version=12.18.1.2044 mc_version=1.10.2 dir_repo=./ build_number=315 diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 1f9c76a8f..42fd26156 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -210,7 +210,7 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - + Botania.LOGGER.info("Getting " + (face == null ? "gen" : face.getName()) + " quads"); IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); From 947a225d23c1a840438254bf933f91033739d797 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 20:55:04 -0500 Subject: [PATCH 843/935] TIL you don't set default values for unlisted properties --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 9 +++------ .../botania/common/block/BlockFloatingSpecialFlower.java | 5 +---- .../java/vazkii/botania/common/block/BlockPlatform.java | 6 +----- .../vazkii/botania/common/block/BlockSpecialFlower.java | 5 ++--- .../common/block/corporea/BlockCorporeaCrystalCube.java | 2 +- .../botania/common/block/decor/BlockFloatingFlower.java | 4 +--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 42fd26156..325d0bfa2 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -210,16 +210,13 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - Botania.LOGGER.info("Getting " + (face == null ? "gen" : face.getName()) + " quads"); IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - if(subtileId != null) { // Todo remove - workaround for subtile ID being null? - Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(specialModel.isPresent()) - ret = specialModel.get(); - } + Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + if(specialModel.isPresent()) + ret = specialModel.get(); return ret.getQuads(state, face, rand); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index cbf48db81..815a99231 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -64,10 +64,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IFloatingFlower.IslandType.GRASS) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index a369ca59f..3725d77d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -58,11 +58,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.HELD_STATE, null) - .withProperty(BotaniaStateProps.HELD_WORLD, null) - .withProperty(BotaniaStateProps.HELD_POS, null) - .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 47e96c45c..723966808 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -57,6 +57,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -132,9 +133,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); } 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 9b755491f..d9b9976b1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -49,7 +49,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi 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)); + setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true)); } @Nonnull 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 59142b4a3..a345e1402 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -82,9 +82,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu setSoundType(SoundType.GROUND); setLightLevel(1F); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IslandType.GRASS) - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull From 6cde8299c4ebbb11762cbc59ddd960489bd5b33c Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 2 Aug 2016 16:19:29 -0400 Subject: [PATCH 844/935] Modify Elven Trade recipes to allow for recipes with multiple outputs --- .../java/vazkii/botania/api/BotaniaAPI.java | 16 ++++++++-- .../botania/api/recipe/RecipeElvenTrade.java | 10 +++--- .../elventrade/ElvenTradeRecipeWrapper.java | 6 ++-- .../common/block/tile/TileAlfPortal.java | 3 +- .../common/lexicon/page/PageElvenRecipe.java | 30 ++++++++++++++++-- .../textures/gui/elvenTradeOverlay.png | Bin 7321 -> 7110 bytes 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8cf4d22a6..cee6ca7af 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -495,16 +495,26 @@ public final class BotaniaAPI { /** * Registers a Elven Trade recipe (throw an item in an Alfheim Portal). - * @param output The ItemStack to return. + * @param outputs The ItemStacks to return. * @param inputs The items required, can be ItemStack or ore dictionary entry string. * @return The recipe created. */ - public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { - RecipeElvenTrade recipe = new RecipeElvenTrade(output, inputs); + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack[] outputs, Object... inputs) { + RecipeElvenTrade recipe = new RecipeElvenTrade(outputs, inputs); elvenTradeRecipes.add(recipe); return recipe; } + /** + * Registers a Elven Trade recipe (throw an item into an Alfeim Portal). + * @param output The ItemStack to return + * @param inputs The items required, can be an ItemStack or an Ore Dictionary entry string. + * @return The recipe created. + */ + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { + return registerElvenTradeRecipe(new ItemStack[]{ output }, inputs); + } + /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 04e96274d..834d5993f 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -9,11 +9,11 @@ import java.util.List; public class RecipeElvenTrade { - private final ItemStack output; + private final ImmutableList outputs; private final ImmutableList inputs; - public RecipeElvenTrade(ItemStack output, Object... inputs) { - this.output = output; + public RecipeElvenTrade(ItemStack[] outputs, Object... inputs) { + this.outputs = ImmutableList.copyOf(outputs); ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { @@ -88,8 +88,8 @@ public class RecipeElvenTrade { return inputs; } - public ItemStack getOutput() { - return output; + public List getOutputs() { + return outputs; } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 52bf709ac..b76ac1c6f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -22,7 +22,7 @@ import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; - private final ItemStack output; + private final List outputs; @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { @@ -36,7 +36,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { } } input = builder.build(); - output = recipe.getOutput(); + outputs = ImmutableList.copyOf(recipe.getOutputs()); } @Override @@ -46,7 +46,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return ImmutableList.of(output); + return outputs; } @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 25f606725..acb38778b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -222,7 +222,8 @@ public class TileAlfPortal extends TileMod { for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { if(recipe.matches(stacksIn, false)) { recipe.matches(stacksIn, true); - spawnItem(recipe.getOutput().copy()); + for(ItemStack output : recipe.getOutputs()) + spawnItem(output.copy()); break; } } 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 8f84d67e0..a5ee24418 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -43,7 +43,8 @@ public class PageElvenRecipe extends PageRecipe { @Override public void onPageAdded(LexiconEntry entry, int index) { for(RecipeElvenTrade recipe : recipes) - LexiconRecipeMappings.map(recipe.getOutput(), entry, index); + for(ItemStack output : recipe.getOutputs()) + LexiconRecipeMappings.map(output, entry, index); } @Override @@ -58,7 +59,10 @@ public class PageElvenRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); GlStateManager.disableBlend(); - renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); + List outputs = recipe.getOutputs(); + for(int i = 0; i < outputs.size(); i++) { + renderItemAtOutputPos(gui, i % 2, i / 2, outputs.get(i)); + } List inputs = recipe.getInputs(); int i = 0; @@ -94,6 +98,26 @@ public class PageElvenRecipe extends PageRecipe { renderItem(gui, xPos, yPos, stack1, false); } + @SideOnly(Side.CLIENT) + public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { + if(stack == null || stack.getItem() == null) + return; + stack = stack.copy(); + + if(stack.getItemDamage() == Short.MAX_VALUE) + stack.setItemDamage(0); + + int xPos = gui.getLeft() + x * 20 + 94; + int yPos = gui.getTop() + y * 20 + 52; + + ItemStack stack1 = stack.copy(); + if (stack1.getItemDamage() == -1) { + stack1.setItemDamage(0); + } + + renderItem(gui, xPos, yPos, stack1, false); + } + @Override @SideOnly(Side.CLIENT) @@ -114,7 +138,7 @@ public class PageElvenRecipe extends PageRecipe { public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); for(RecipeElvenTrade r : recipes) - list.add(r.getOutput()); + list.addAll(r.getOutputs()); return list; } diff --git a/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png b/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png index c7479f17a63c873bd4bc2e640a77bcb83671fc1f..8c89f61d8400b3d8131750182774b9ed63e33382 100644 GIT binary patch literal 7110 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 G_5T2rB#bKn From 5e8eaf8c77527797cf70527e5d15da782ba30338 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 2 Aug 2016 16:34:59 -0400 Subject: [PATCH 845/935] Fix Elven Trade JEI handling for trades with multiple outputs --- .../jei/elventrade/ElvenTradeRecipeCategory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 c82e17d00..c0c0570a3 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 @@ -106,8 +106,11 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { posX += 18; } - recipeLayout.getItemStacks().init(index, false, 93, 41); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + for (int i = 0; i < wrapper.getOutputs().size(); i++) { + ItemStack stack = wrapper.getOutputs().get(i); + recipeLayout.getItemStacks().init(index + i, false, 93 + (i % 2 * 20), 41 + (i / 2 * 20)); + recipeLayout.getItemStacks().set(index + i, stack); + } } } From 3a5e78a4c6a7502117794ba5bff913e1dbc74de6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 3 Aug 2016 20:30:33 -0500 Subject: [PATCH 846/935] Build 315 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 016afde88..1fafe8ac4 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Fri Jul 29 18:40:22 CDT 2016 +#Wed Aug 03 20:27:38 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2044 -mc_version=1.10.2 dir_repo=./ -build_number=315 +mc_version=1.10.2 +forge_version=12.18.1.2044 +build_number=316 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index fefc24502..f936bbdf8 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-314 \ No newline at end of file +r1.8-315 \ No newline at end of file diff --git a/version/update.json b/version/update.json index f492ab079..3472c85be 100644 --- a/version/update.json +++ b/version/update.json @@ -5,7 +5,8 @@ "1.10.2": { "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", - "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314" + "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", + "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -28,8 +29,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-314", - "1.10.2-recommended": "r1.8-314", + "1.10.2-latest": "r1.8-315", + "1.10.2-recommended": "r1.8-315", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index 625d470d8..b01956212 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -266,4 +266,5 @@ r1.8-312=1.9.4 r1.8-312=1.10.2 r1.8-313=1.9.4 r1.8-313=1.10.2 -r1.8-314=1.10.2 \ No newline at end of file +r1.8-314=1.10.2 +r1.8-315=1.10.2 \ No newline at end of file From 8eccfad65e65e2bfe7bf3c93b44ffeb5c23bdf38 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 4 Aug 2016 19:54:16 -0500 Subject: [PATCH 847/935] If we can't see the extended state bail. This is not a big deal. CLose #423 --- .../vazkii/botania/client/core/handler/DebugHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 86f476971..bb3acc68e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -84,8 +84,12 @@ public final class DebugHandler { state = state.getActualState(world, pos); state = state.getBlock().getExtendedState(state, world, pos); if (state instanceof IExtendedBlockState) { - for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { - event.getRight().add(e.getKey().getName() + ": " + e.getValue().orNull()); + try { + for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { + event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orNull()); + } + } catch (Throwable t) { + event.getRight().add("Error getting extended state"); } } } From acd5cce7cee8fb7981440984bb4433cd781448ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 18:31:44 -0500 Subject: [PATCH 848/935] Fix a bunch of things assuming the player only has main hand. Closes #424 --- .../botania/common/block/BlockAltar.java | 2 +- .../common/block/BlockSparkChanger.java | 2 +- .../common/block/mana/BlockBrewery.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 2 +- .../common/block/mana/BlockSpreader.java | 4 +-- .../common/block/mana/BlockTerraPlate.java | 2 +- .../common/block/tile/TileBrewery.java | 8 +++--- .../common/block/tile/TileRuneAltar.java | 8 +++--- .../botania/common/item/ItemBottledMana.java | 25 +++++++++---------- .../item/equipment/bauble/ItemBauble.java | 18 +++++++------ .../item/equipment/bauble/ItemSwapRing.java | 3 ++- .../item/material/ItemManaResource.java | 2 +- .../common/world/SkyblockWorldEvents.java | 2 +- 15 files changed, 45 insertions(+), 39 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 06832a1cd..2a6205f55 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -179,7 +179,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } 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) - player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket); + player.setHeldItem(hand, bucket); else { if(!player.inventory.addItemStackToInventory(bucket)) player.dropItem(bucket, false); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 705b9458d..524e81132 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -119,7 +119,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { pstack.stackSize--; if(pstack.stackSize == 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); return true; } 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 dba0c5684..6af9a2c67 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -93,7 +93,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { InventoryHelper.withdrawFromInventory(brew, player); } else { if(stack != null) - return brew.addItem(player, stack); + return brew.addItem(player, stack, hand); } return false; } 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 9ccc259bd..936c8a790 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -117,7 +117,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, if(enchanter.itemToEnchant == null) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); enchanter.sync(); } } else if(enchanter.stage == TileEnchanter.State.IDLE) { 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 fe37c587f..14a2cd9bf 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -122,7 +122,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, if(lens == null && isHeldItemLens) { if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); 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 54d0a258b..246a0a43a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -83,7 +83,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable altar.trySetLastRecipe(player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); } else if(stack != null) { - boolean result = altar.addItem(player, stack); + boolean result = altar.addItem(player, stack, hand); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); return result; } 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 dd1f0e617..d1cc52fd5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -158,7 +158,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex if(lens == null && isHeldItemLens) { if (!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); @@ -174,7 +174,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex spreader.paddingColor = heldItem.getItemDamage(); heldItem.stackSize--; if(heldItem.stackSize == 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); if(!player.inventory.addItemStackToInventory(pad)) 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 61a7702cb..d78dbe3e4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -58,7 +58,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } ItemStack target = stack.copy(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2aa7bb2ef..843cd329d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -16,6 +16,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.BotaniaAPI; @@ -31,6 +32,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.awt.*; import java.util.List; @@ -44,7 +46,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { int manaLastTick = 0; public int signal = 0; - public boolean addItem(EntityPlayer player, ItemStack stack) { + public boolean addItem(@Nullable EntityPlayer player, ItemStack stack, @Nullable EnumHand hand) { if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; @@ -60,7 +62,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } break; @@ -99,7 +101,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null) { ItemStack stack = item.getEntityItem(); - if(addItem(null, stack) && stack.stackSize == 0) + if(addItem(null, stack, null) && stack.stackSize == 0) item.setDead(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 5c43bca0e..28c74142a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import org.lwjgl.opengl.GL11; @@ -35,6 +36,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -53,7 +55,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver List lastRecipe = null; int recipeKeepTicks = 0; - public boolean addItem(EntityPlayer player, ItemStack stack) { + public boolean addItem(@Nullable EntityPlayer player, ItemStack stack, @Nullable EnumHand hand) { if(cooldown > 0 || stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.lexicon) return false; @@ -61,7 +63,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.setHeldItem(hand, null); } EntityItem item = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, new ItemStack(ModBlocks.livingrock)); @@ -111,7 +113,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver for(EntityItem item : items) if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { ItemStack stack = item.getEntityItem(); - if(addItem(null, stack) && stack.stackSize == 0) + if(addItem(null, stack, null) && stack.stackSize == 0) item.setDead(); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index ab9843edb..53efb1b10 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -2,10 +2,10 @@ * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania - * + * * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php - * + * * File Created @ [Jun 27, 2014, 2:41:19 AM (GMT)] */ package vazkii.botania.common.item; @@ -54,7 +54,7 @@ public class ItemBottledMana extends ItemMod { setMaxDamage(6); } - public void effect(EntityLivingBase living, int id) { + public void effect(ItemStack stack, EntityLivingBase living, int id) { switch(id) { case 0 : { // Random motion living.motionX = (Math.random() - 0.5) * 3; @@ -98,13 +98,14 @@ public class ItemBottledMana extends ItemMod { case 7 : { // All your inventory is belong to us if(!living.worldObj.isRemote && living instanceof EntityPlayer) { EntityPlayer player = ((EntityPlayer) living); - for(int i = 0; i < player.inventory.getSizeInventory(); i++) - if(i != player.inventory.currentItem) { - ItemStack stackAt = player.inventory.getStackInSlot(i); + for(int i = 0; i < player.inventory.getSizeInventory(); i++) { + ItemStack stackAt = player.inventory.getStackInSlot(i); + if(stackAt != stack) { if(stackAt != null) player.entityDropItem(stackAt, 0); player.inventory.setInventorySlotContents(i, null); } + } } break; @@ -189,15 +190,13 @@ public class ItemBottledMana extends ItemMod { } @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - getSeed(par1ItemStack); + public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) {} + + private void randomEffect(EntityLivingBase player, ItemStack stack) { + effect(stack, player, new Random(getSeed(stack)).nextInt(16)); } - public void randomEffect(EntityLivingBase player, ItemStack stack) { - effect(player, new Random(getSeed(stack)).nextInt(16)); - } - - long getSeed(ItemStack stack) { + private long getSeed(ItemStack stack) { long seed = ItemNBTHelper.getLong(stack, TAG_SEED, -1); if(seed == -1) return randomSeed(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index f8be37bb8..9fb29ce70 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -57,20 +57,22 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(!EntityDoppleganger.isTruePlayer(player)) - return ActionResult.newResult(EnumActionResult.FAIL, par1ItemStack); + return ActionResult.newResult(EnumActionResult.FAIL, stack); - if(canEquip(par1ItemStack, player)) { + ItemStack toEquip = stack.copy(); + toEquip.stackSize = 1; + + if(canEquip(toEquip, player)) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) { - if(baubles.isItemValidForSlot(i, par1ItemStack)) { + if(baubles.isItemValidForSlot(i, toEquip)) { ItemStack stackInSlot = baubles.getStackInSlot(i); if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { if(!world.isRemote) { - baubles.setInventorySlotContents(i, par1ItemStack.copy()); - if(!player.capabilities.isCreativeMode) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + baubles.setInventorySlotContents(i, toEquip); + stack.stackSize--; } if(stackInSlot != null) { @@ -83,7 +85,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index cc66e59f2..a1f3d0974 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.item.ISortableTool.ToolType; @@ -78,7 +79,7 @@ public class ItemSwapRing extends ItemBauble { } if(bestSlot != -1) { - player.inventory.setInventorySlotContents(player.inventory.currentItem, bestTool); + player.setHeldItem(EnumHand.MAIN_HAND, bestTool); player.inventory.setInventorySlotContents(bestSlot, currentStack); } } 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 78508fdd7..9e0ef431b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -78,7 +78,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve stack.stackSize--; if(stack.stackSize == 0) - event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, null); + event.getEntityPlayer().setHeldItem(event.getHand(), null); event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index b1eb6d825..caab50865 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -92,7 +92,7 @@ public final class SkyblockWorldEvents { --equipped.stackSize; if(equipped.stackSize <= 0) - event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, new ItemStack(ModItems.waterBowl)); + event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); else event.getEntityPlayer().dropItem(new ItemStack(ModItems.waterBowl), false); } } From a0aac5a9bf2c1520902d25118051d6004c43810a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 18:36:04 -0500 Subject: [PATCH 849/935] Stupid compile derp --- .../java/vazkii/botania/common/item/ItemBottledMana.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 53efb1b10..534a5d7ca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -180,9 +180,9 @@ 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); - ItemNBTHelper.setString(stack, "SkullOwner", living.getName()); - living.entityDropItem(stack, 0); + ItemStack skull = new ItemStack(Items.SKULL, 1, 3); + ItemNBTHelper.setString(skull, "SkullOwner", living.getName()); + living.entityDropItem(skull, 0); } break; } From 3d7c9e8b945de497cc86ab2d66625f95c76053f1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:21:50 -0500 Subject: [PATCH 850/935] Update forge, remove some unneeded particle methods --- build.properties | 2 +- .../common/block/BlockSpecialFlower.java | 39 ------------------ .../block/decor/BlockFloatingFlower.java | 41 ------------------- 3 files changed, 1 insertion(+), 81 deletions(-) diff --git a/build.properties b/build.properties index 1fafe8ac4..066331106 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2044 +forge_version=12.18.1.2046 build_number=316 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 723966808..7c0f54500 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; @@ -18,8 +17,6 @@ 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.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -32,11 +29,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -346,40 +341,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @Override - public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); - if (d0 > 2.5D) { - 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())); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - 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()))); - } - } - } - return true; - } else { - return false; - } - } - @Override public void register() { GameRegistry.register(this); 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 a345e1402..bdbaff08f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -31,10 +26,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -130,40 +123,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return state; } - @Override - public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles) { - float f = (float) MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); - double d0 = (double)Math.min(0.2F + f / 15.0F, 10.0F); - if (d0 > 2.5D) { - 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())); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { - if (world.getBlockState(pos).getBlock() == this) { - int i = 4; - 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()))); - } - } - } - return true; - } else { - return false; - } - } - @Override public void registerItemForm() { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); From c3e4a028252818408005bbb3f4bb306f2683b5d5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:51:21 -0500 Subject: [PATCH 851/935] A few inconsequential cleanups --- .../subtile/functional/SubTileBubbell.java | 21 +++++++-------- .../functional/SubTileSpectranthemum.java | 2 +- .../common/block/tile/TileLightRelay.java | 2 +- .../common/core/helper/MathHelper.java | 4 --- .../common/item/ItemObedienceStick.java | 27 +++++++++---------- .../botania/common/item/lens/LensMagnet.java | 2 +- 6 files changed, 24 insertions(+), 34 deletions(-) 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 173aefa6c..4447776d2 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 @@ -50,19 +50,16 @@ public class SubTileBubbell extends SubTileFunctional { if(ticksExisted % 10 == 0 && range < getRange()) range++; - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - 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) { - supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2); - TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos); - air.setFlower(supertile); - } - } + for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -range, -range), getPos().add(range, range, range))) { + if(getPos().distanceSq(pos) < range * range) { + IBlockState state = supertile.getWorld().getBlockState(pos); + 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/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index b906047ab..70a14decd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -141,7 +141,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { boolean bound = super.bindTo(player, wand, pos, side); - if(!bound && !pos.equals(bindPos) && MathHelper.pointDistanceSpace(pos, supertile.getPos()) <= BIND_RANGE && !(pos.equals(supertile.getPos()))) { + if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !(pos.equals(supertile.getPos()))) { bindPos = pos; sync(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index d36e77cde..94d0df5e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -160,7 +160,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(pos, getPos()) > MAX_DIST) + if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || pos.distanceSq(getPos()) > MAX_DIST * MAX_DIST) return false; bindPos = pos; diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index e2c92f72b..f7f7a1474 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -52,10 +52,6 @@ public final class MathHelper { return ret; } - public static float pointDistanceSpace(BlockPos p1, BlockPos p2) { - return pointDistanceSpace(p1.getX(), p1.getY(), p1.getZ(), p2.getX(), p2.getY(), p2.getZ()); - } - public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 11e17b6cf..5b27380d5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -46,23 +46,20 @@ public class ItemObedienceStick extends ItemMod { Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; int range = pool ? SubTileFunctional.LINK_RANGE : SubTileGenerating.LINK_RANGE; - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - if(MathHelper.pointDistanceSpace(pos_, pos) > range) - continue; + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { + if(pos_.distanceSq(pos) > range * range) + continue; - TileEntity tile = world.getTileEntity(pos_); - if(tile instanceof ISubTileContainer) { - SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); - if(act.actuate(subtile, tileAt)) { - Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); - Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - ItemTwigWand.doParticleBeam(world, orig, end); - } - } + TileEntity tile = world.getTileEntity(pos_); + if(tile instanceof ISubTileContainer) { + SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile(); + if(act.actuate(subtile, tileAt)) { + Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5); + Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + ItemTwigWand.doParticleBeam(world, orig, end); } + } + } if(player.worldObj.isRemote) player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index fefd9a71d..dc1071e9f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -49,7 +49,7 @@ public class LensMagnet extends Lens { BlockPos srcCoords = burst.getBurstSourceBlockPos(); - if(MathHelper.pointDistanceSpace(tile.getPos(), srcCoords) > 3 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { + if(tile.getPos().distanceSq(srcCoords) > 9 && receiver.canRecieveManaFromBursts() && !receiver.isFull()) { Vector3 burstVec = Vector3.fromEntity(entity); Vector3 tileVec = Vector3.fromTileEntityCenter(tile).add(0, -0.1, 0); Vector3 motionVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); From 921825aca3878157f7897a97e3d490b672f9be50 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 5 Aug 2016 20:59:05 -0500 Subject: [PATCH 852/935] Fix pickup delay not getting set properly in thrown items --- .../vazkii/botania/common/entity/EntityThrownItem.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 73caba59a..4210251b8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -40,7 +40,7 @@ public class EntityThrownItem extends EntityItem { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(item); } catch (Throwable ignored) {} - item.setPickupDelay(pickupDelay); + setPickupDelay(pickupDelay); motionX = item.motionX; motionY = item.motionY; motionZ = item.motionZ; @@ -63,12 +63,10 @@ public class EntityThrownItem extends EntityItem { if (!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; - for (Object aList : list) { - Entity entity1 = (Entity) aList; - + for (Entity entity1 : list) { int pickupDelay; try { pickupDelay = (int) MethodHandles.pickupDelay_getter.invokeExact(this); From aeaa2a76c426b862391eff7ef7cd9f0b934980e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Aug 2016 11:48:01 -0500 Subject: [PATCH 853/935] Tweak black hole talisman interactions, fix a crash --- .../common/item/ItemBlackHoleTalisman.java | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index e5a13ee01..98ab43385 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -69,55 +69,58 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(getBlock(par1ItemStack) != Blocks.AIR && player.isSneaking()) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(getBlock(stack) != Blocks.AIR && player.isSneaking()) { + int dmg = stack.getItemDamage(); + stack.setItemDamage(~dmg & 1); player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = world.getBlockState(pos); - boolean set = setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state)); - if(!set) { + if (Item.getItemFromBlock(state.getBlock()) != null + && setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state))) { + return EnumActionResult.SUCCESS; + } else { Block bBlock = getBlock(stack); int bmeta = getBlockMeta(stack); + if(bBlock == null) + return EnumActionResult.PASS; + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) { - IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); - ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); - int maxSize = toAdd.getMaxStackSize(); - toAdd.stackSize = remove(stack, maxSize); - ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); - if(remainder != null) - add(stack, remainder.stackSize); + if(!world.isRemote) { + IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); + ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); + int maxSize = toAdd.getMaxStackSize(); + toAdd.stackSize = remove(stack, maxSize); + ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); + if(remainder != null) + add(stack, remainder.stackSize); + } + return EnumActionResult.SUCCESS; } else { - int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); - BlockPos correctedPos = bBlock.isReplaceable(world, pos) ? pos : pos.offset(side); + if(player.capabilities.isCreativeMode || getBlockCount(stack) > 0) { + ItemStack toUse = new ItemStack(bBlock, 1, bmeta); - if(entities == 0 && !(correctedPos.getY() < 0) && !(correctedPos.getY() >= 256)) { - int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1); - if(remove > 0) { - ItemStack toUse = new ItemStack(bBlock, 1, bmeta); + if (Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ) == EnumActionResult.SUCCESS) { + remove(stack, 1); ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack)); - - Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ); - set = true; + return EnumActionResult.SUCCESS; } } } } - player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, stack); - return set ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return EnumActionResult.PASS; } @Override @@ -210,7 +213,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } private boolean setBlock(ItemStack stack, Block block, int meta) { - if(getBlock(stack) == Blocks.AIR || getBlockCount(stack) == 0) { + if(Item.getItemFromBlock(block) != null && (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; @@ -257,8 +260,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } public static Block getBlock(ItemStack stack) { - Block block = Block.getBlockFromName(getBlockName(stack)); - return block; + return Block.getBlockFromName(getBlockName(stack)); } public static int getBlockMeta(ItemStack stack) { From 16615ce4299e1d145e1a9a917d97dc2e9636e24f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Aug 2016 12:04:18 -0500 Subject: [PATCH 854/935] Tweak cacophonium interactions --- .../botania/common/item/ItemCacophonium.java | 89 ++++++++++--------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 09e34fb91..1737d3632 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -36,6 +36,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.logging.log4j.core.helpers.Strings; +import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; @@ -45,13 +48,14 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.lang.reflect.InvocationTargetException; import java.util.List; public class ItemCacophonium extends ItemMod implements ICraftAchievement { private static final String TAG_SOUND = "sound"; private static final String TAG_SOUND_NAME = "soundName"; - private static final String TAG_HAS_SOUND = "hasSound"; public ItemCacophonium() { super(LibItemNames.CACOPHONIUM); @@ -62,32 +66,33 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(entity instanceof EntityLiving) { EntityLiving living = (EntityLiving) entity; - SoundEvent sound; - try { - if(living instanceof EntityCreeper) - sound = SoundEvents.ENTITY_CREEPER_PRIMED; - else if(living instanceof EntitySlime) - sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; - else sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + SoundEvent sound = null; - if(sound != null) { - String s = EntityList.getEntityString(entity); - if(s == null) - s = "generic"; - - ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); - ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); - ItemNBTHelper.setBoolean(stack, TAG_HAS_SOUND, true); - player.setHeldItem(hand, stack); - //player.inventory.setInventorySlotContents(player.inventory.currentItem, stack.copy()); - - if(player.worldObj.isRemote) - player.swingArm(hand); - - return true; + if(living instanceof EntityCreeper) + sound = SoundEvents.ENTITY_CREEPER_PRIMED; + else if(living instanceof EntitySlime) + sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; + else { + try { + sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + } catch (InvocationTargetException | IllegalAccessException ignored) { + Botania.LOGGER.debug("Couldn't get living sound"); } - } catch (Exception e) { - e.printStackTrace(); + } + + if(sound != null) { + String s = EntityList.getEntityString(entity); + if(s == null) + s = "generic"; + + ItemNBTHelper.setString(stack, TAG_SOUND, sound.getRegistryName().toString()); + ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); + player.setHeldItem(hand, stack); + + if(player.worldObj.isRemote) + player.swingArm(hand); + + return true; } } @@ -97,15 +102,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { - boolean can = isDOIT(stack); - if(!can) { - String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); - isDOIT(stack); - if(sound != null && !sound.isEmpty()) - can = true; - } - - if(can) { + if(getSound(stack) != null) { Block block = world.getBlockState(pos).getBlock(); if(block == Blocks.NOTEBLOCK) { world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); @@ -123,7 +120,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) list.add(I18n.format("botaniamisc.justDoIt")); - else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) + else if(getSound(stack) != null) list.add(I18n.format(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @@ -140,10 +137,10 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(getSound(stack) != null) player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override @@ -156,13 +153,17 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { if(stack == null) return; - String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); - boolean doit = isDOIT(stack); - if(doit) - sound = "botania:doit"; + SoundEvent sound = getSound(stack); - if(sound != null && !sound.isEmpty() && SoundEvent.REGISTRY.containsKey(new ResourceLocation(sound))) - world.playSound(null, x, y, z, SoundEvent.REGISTRY.getObject(new ResourceLocation(sound)), category, volume, doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + if(sound != null) + world.playSound(null, x, y, z, sound, category, volume, sound == BotaniaSoundEvents.doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + } + + @Nullable + private static SoundEvent getSound(ItemStack stack) { + if(isDOIT(stack)) + return BotaniaSoundEvents.doit; + else return SoundEvent.REGISTRY.getObject(new ResourceLocation(ItemNBTHelper.getString(stack, TAG_SOUND, ""))); } private static boolean isDOIT(ItemStack stack) { From ddda9db4acb20d65ae8849226d443d5e375f9853 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 12:00:52 -0500 Subject: [PATCH 855/935] Make bubbell less laggy --- src/main/java/vazkii/botania/common/block/BlockFakeAir.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 396c5a61e..56a622914 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -36,7 +36,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.STRUCTURE_VOID, LibBlockNames.FAKE_AIR); setTickRandomly(true); } @@ -68,7 +68,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, rand.nextInt(10) == 0 ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState()); } @Override From 90c42b25c730d7a1b2780efc01176dffd2676d0f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 12:27:01 -0500 Subject: [PATCH 856/935] Get rid of some triple nested for loops --- .../subtile/functional/SubTileExoflame.java | 80 +++++++++---------- .../functional/SubTileMarimorphosis.java | 13 ++- .../subtile/functional/SubTileOrechid.java | 13 ++- .../functional/SubTileRannuncarpus.java | 19 +++-- .../subtile/generating/SubTileMunchdew.java | 30 +++---- .../botania/common/item/ItemGrassHorn.java | 20 ++--- .../botania/common/item/ItemGrassSeeds.java | 17 +--- .../common/item/rod/ItemDiviningRod.java | 30 +++---- 8 files changed, 95 insertions(+), 127 deletions(-) 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 322dc877e..f2cd743c9 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 @@ -39,51 +39,45 @@ public class SubTileExoflame extends SubTileFunctional { boolean did = false; - fireFurnaces : { - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) - for(int k = -RANGE; k < RANGE + 1; k++) { - BlockPos pos = supertile.getPos().add(i, j, k); - - 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)) { - TileEntityFurnace furnace = (TileEntityFurnace) tile; - boolean canSmelt = canFurnaceSmelt(furnace); - if(canSmelt && mana > 2) { - if(furnace.getField(0) < 2) { // Field 0 -> Burn time - if(furnace.getField(0) == 0) - BlockFurnace.setState(true, supertile.getWorld(), pos); - furnace.setField(0, 200); - mana = Math.max(0, mana - COST); - } - if(ticksExisted % 2 == 0) - furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time - - did = true; - - if(mana <= 0) - break fireFurnaces; - } - } else if(tile instanceof IExoflameHeatable) { - IExoflameHeatable heatable = (IExoflameHeatable) tile; - - if(heatable.canSmelt() && mana > 2) { - if(heatable.getBurnTime() == 0) { - heatable.boostBurnTime(); - mana = Math.max(0, mana - COST); - } - - if(ticksExisted % 2 == 0) - heatable.boostCookTime(); - - if(mana <= 0) - break fireFurnaces; - } - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { + 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)) { + TileEntityFurnace furnace = (TileEntityFurnace) tile; + boolean canSmelt = canFurnaceSmelt(furnace); + if(canSmelt && mana > 2) { + if(furnace.getField(0) < 2) { // Field 0 -> Burn time + if(furnace.getField(0) == 0) + BlockFurnace.setState(true, supertile.getWorld(), pos); + furnace.setField(0, 200); + mana = Math.max(0, mana - COST); } + if(ticksExisted % 2 == 0) + furnace.setField(2, Math.min(199, furnace.getField(2) + 1)); // Field 2 -> cook time + + did = true; + + if(mana <= 0) + break; } + } else if(tile instanceof IExoflameHeatable) { + IExoflameHeatable heatable = (IExoflameHeatable) tile; + + if(heatable.canSmelt() && mana > 2) { + if(heatable.getBurnTime() == 0) { + heatable.boostBurnTime(); + mana = Math.max(0, mana - COST); + } + + if(ticksExisted % 2 == 0) + heatable.boostCookTime(); + + if(mana <= 0) + break; + } + } + } } if(did) 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 ae2334e13..a9bd252d9 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 @@ -96,14 +96,11 @@ public class SubTileMarimorphosis extends SubTileFunctional { int range = getRange(); int rangeY = getRangeY(); - for(int i = -range; i < range + 1; i++) - for(int j = -rangeY; j < rangeY; j++) - 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))) - possibleCoords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-range, -rangeY, -range), getPos().add(range, rangeY, range))) { + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(Blocks.STONE))) + possibleCoords.add(pos); + } if(possibleCoords.isEmpty()) return null; 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 44ce95006..c71e5888f 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 @@ -103,14 +103,11 @@ public class SubTileOrechid extends SubTileFunctional { List possibleCoords = new ArrayList<>(); Block source = getSourceBlock(); - for(int i = -RANGE; i < RANGE + 1; i++) - for(int j = -RANGE_Y; j < RANGE_Y; j++) - 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(source))) - possibleCoords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) { + IBlockState state = supertile.getWorld().getBlockState(pos); + if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, BlockStateMatcher.forBlock(source))) + possibleCoords.add(pos); + } if(possibleCoords.isEmpty()) return null; 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 43b6bba5e..4e8220288 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 @@ -93,16 +93,15 @@ public class SubTileRannuncarpus extends SubTileFunctional { Item stackItem = stack.getItem(); if(stackItem instanceof ItemBlock || stackItem instanceof ItemBlockSpecial || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) { if(!scanned) { - for(int i = -rangePlace; i < rangePlace + 1; i++) - for(int j = -rangePlaceY; j < rangePlaceY + 1; j++) - for(int l = -rangePlace; l < rangePlace + 1; l++) { - BlockPos pos_ = pos.add(i, j, l); - IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); - Block blockAbove = stateAbove.getBlock(); - - if(filter == supertile.getWorld().getBlockState(pos_) && (blockAbove.isAir(stateAbove, supertile.getWorld(), pos_.up()) || blockAbove.isReplaceable(supertile.getWorld(), pos_.up()))) - validPositions.add(pos_.up()); - } + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-rangePlace, -rangePlaceY, -rangePlace), pos.add(rangePlace, rangePlaceY, rangePlace))) { + IBlockState stateAbove = supertile.getWorld().getBlockState(pos_.up()); + Block blockAbove = stateAbove.getBlock(); + BlockPos up = pos_.up(); + if(filter == supertile.getWorld().getBlockState(pos_) + && (blockAbove.isAir(stateAbove, supertile.getWorld(), up) + || blockAbove.isReplaceable(supertile.getWorld(), up))) + validPositions.add(up); + } scanned = true; } 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 6e6f476b1..312ae7522 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 @@ -58,26 +58,22 @@ public class SubTileMunchdew extends SubTileGenerating { List coords = new ArrayList<>(); BlockPos pos = supertile.getPos(); - for(int i = -RANGE; i < RANGE + 1; i++) - 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) { - boolean exposed = false; - for(EnumFacing dir : EnumFacing.VALUES) { - IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); - if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { - exposed = true; - break; - } - } - - - if(exposed) - coords.add(pos_); + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-RANGE, -RANGE_Y, -RANGE), pos.add(RANGE, RANGE_Y, RANGE))) { + if(supertile.getWorld().getBlockState(pos_).getMaterial() == Material.LEAVES) { + boolean exposed = false; + for(EnumFacing dir : EnumFacing.VALUES) { + IBlockState offState = supertile.getWorld().getBlockState(pos_.offset(dir)); + if(offState.getBlock().isAir(offState, supertile.getWorld(), pos_.offset(dir))) { + exposed = true; + break; } } + if(exposed) + coords.add(pos_); + } + } + if(coords.isEmpty()) break eatLeaves; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index f1767a650..7d2bd265b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -112,24 +112,24 @@ public class ItemGrassHorn extends ItemMod { int rangeY = 3 + stackDmg * 4; List coords = new ArrayList<>(); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - 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) - coords.add(pos); - } + for(BlockPos pos : BlockPos.getAllInBox(srcPos.add(-range, -rangeY, -range), srcPos.add(range, rangeY, range))) { + 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) + coords.add(pos); + } Collections.shuffle(coords, rand); int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); - List items = new ArrayList<>(); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); - items.addAll(block.getDrops(world, currCoords, state, 0)); + List items = block.getDrops(world, currCoords, state, 0); if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 64ec96613..ba039dd56 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -279,21 +279,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * should be removed. */ public boolean tick() { - ++ticksExisted; - - // Go through all blocks in the specified RANGE, and then - // try and spread around that block if it is our target block already - for(int i = -RANGE; i <= RANGE; i++) { - for(int j = -RANGE; j <= RANGE; j++) { - BlockPos pos = startCoords.add(i, 0, j); - IBlockState state = world.getBlockState(pos); - - if(state == stateToSet) { - // Only make changes every 20 ticks - if(ticksExisted % 20 != 0) continue; - + if(++ticksExisted % 20 == 0) { + for(BlockPos pos : BlockPos.getAllInBox(startCoords.add(-RANGE, 0, -RANGE), startCoords.add(RANGE, 0, RANGE))) { + if(world.getBlockState(pos) == stateToSet) tickBlock(pos); - } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 7bb64d6e6..532908adb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -66,24 +66,20 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW public void doHighlight(World world, BlockPos pos, int range, long seedxor) { Botania.proxy.setWispFXDepthTest(false); - for(int i = -range; i < range + 1; i++) - for(int j = -range; j < range + 1; j++) - for(int k = -range; k < range + 1; k++) { - BlockPos pos_ = pos.add(i, j, k); - IBlockState state = world.getBlockState(pos_); - if (Item.getItemFromBlock(state.getBlock()) == null) { - continue; - } - ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); - for(int id : OreDictionary.getOreIDs(orestack)) { - String s = OreDictionary.getOreName(id); - if(s.matches("^ore[A-Z].+")) { - Random rand = new Random(s.hashCode() ^ seedxor); - Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); - break; - } - } + for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { + IBlockState state = world.getBlockState(pos_); + if(Item.getItemFromBlock(state.getBlock()) == null) + continue; + ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); + for(int id : OreDictionary.getOreIDs(orestack)) { + String s = OreDictionary.getOreName(id); + if(s.matches("^ore[A-Z].+")) { + Random rand = new Random(s.hashCode() ^ seedxor); + Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); + break; } + } + } Botania.proxy.setWispFXDepthTest(true); } From 8423607b29f9a6a980eb64bd2b897b1377c1df8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 18:30:31 -0500 Subject: [PATCH 857/935] Reinstate null subtile check. Closes #428 --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 325d0bfa2..f382459c1 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,15 +192,16 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Optional load(@Nonnull String key) { - if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); if(loc == null) return Optional.empty(); + IModel model = ModelLoaderRegistry.getModelOrMissing(loc); if(model == ModelLoaderRegistry.getMissingModel()) return Optional.empty(); + return Optional.of(model.bake(new SimpleModelState(transforms), DefaultVertexFormats.ITEM, ModelLoader.defaultTextureGetter())); } } @@ -210,11 +211,12 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + Optional specialModel = bakedBlockModels.getUnchecked(subtileId == null ? "" : subtileId); if(specialModel.isPresent()) ret = specialModel.get(); From a3e8d88f1cbe6900ac8d4e4ab3a2c759de2c1dfb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Aug 2016 20:10:44 -0500 Subject: [PATCH 858/935] Fix a corproea animation being absent --- .../render/entity/RenderCorporeaSpark.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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 599140677..59ac6f867 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,11 +10,18 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.network.datasync.DataParameter; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { @@ -48,7 +55,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { -/* int time = entity.getItemDisplayTicks(); if(time == 0) return; @@ -64,14 +70,12 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.color(1F, 1F, 1F, absTime / 10); GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); - ItemStack stack = entity.getDisplayedItem(); + ItemStack stack = entity.getDisplayedItem().orNull(); if(stack == null) return; - Item item = stack.getItem(); - boolean block = item instanceof ItemBlock; - 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); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); if(icon != null) { float minU = icon.getMinU(); @@ -91,7 +95,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.translate(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { GlStateManager.translate(0F, gap * j, 0F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); GlStateManager.translate(0F, -gap * j, 0F); } GlStateManager.translate(-gap * i, 0F, 0F); @@ -100,7 +104,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.disableBlend(); GlStateManager.popMatrix(); -*/ } } From 0b34fe71931b93668a8e25b050ac9fdeff563c37 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Aug 2016 20:17:22 -0500 Subject: [PATCH 859/935] Fix porting derp in flare lens. Closes #429 --- .../botania/common/item/lens/LensFlare.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 8809624db..c6a2bd87a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -16,6 +16,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.mana.TileSpreader; import java.awt.*; @@ -48,22 +49,20 @@ public class LensFlare extends Lens { float my = (float) (MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI) * f / 2D); int storedColor = ItemLens.getStoredColor(stack); - float r = 1, g = 1, b = 1; + int hex = -1; TileEntity tile = (TileEntity) spreader; if(storedColor == 16) { - Color c = Color.getHSBColor(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); - r = c.getRed() / 255F; - g = c.getGreen() / 255F; - b = c.getBlue() / 255F; + hex = Color.HSBtoRGB(tile.getWorld().getTotalWorldTime() * 2 % 360 / 360F, 1F, 1F); } else if(storedColor >= 0) { - int hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; - r = (hex & 0xFF0000) >> 16; - g = (hex & 0xFF00) >> 8; - b = (hex & 0xFF); + hex = EnumDyeColor.byMetadata(storedColor).getMapColor().colorValue; } - Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r / 255F, g / 255F, b / 255F, 0.4F, mx, my, mz); + float r = ((hex & 0xFF0000) >> 16) / 255F; + float g = ((hex & 0xFF00) >> 8) / 255F; + float b = (hex & 0xFF) / 255F; + + Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); } } From 32a28e83a5263a0709e9954685544b6ea4cdf707 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 19:48:54 -0500 Subject: [PATCH 860/935] Magic flowers now show properly in JEI. Closes #431 --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index cc6c64b00..662c0ff3f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -14,6 +14,7 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.state.enums.AltarVariant; @@ -44,6 +45,9 @@ public class JEIBotaniaPlugin implements IModPlugin { public void register(@Nonnull IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); + jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.specialFlower), ItemBlockSpecialFlower::getType); + jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); + registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), From 8d9996cb6bcc838c4e213acb46542e244b9c49c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 19:57:41 -0500 Subject: [PATCH 861/935] Fix corporea retainer comparator output not working. Closes #430 --- .../common/block/tile/corporea/TileCorporeaRetainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index b80e561e7..22013761e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -47,7 +47,7 @@ public class TileCorporeaRetainer extends TileMod { this.request = request; this.requestCount = requestCount; pendingRequest = true; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); } public boolean hasPendingRequest() { @@ -65,7 +65,7 @@ public class TileCorporeaRetainer extends TileMod { ICorporeaRequestor requestor = (ICorporeaRequestor) inv.world.getTileEntity(inv.pos); requestor.doCorporeaRequest(request, requestCount, spark); pendingRequest = false; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); } } } From 07f68b37da9ad3a246b95c042cd6c10bd91698d1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 9 Aug 2016 21:04:09 -0500 Subject: [PATCH 862/935] Fix missing sideonly --- .../vazkii/botania/common/block/tile/TileSpecialFlower.java | 3 +++ 1 file changed, 3 insertions(+) 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 167cacc4d..893b8aba7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -25,6 +25,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileSlowableContainer; @@ -165,6 +167,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil return list; } + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { if(subTile != null) subTile.renderHUD(mc, res); From 348b52eb9faeea114335215a9d23396de68403d6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Aug 2016 19:50:01 -0500 Subject: [PATCH 863/935] Fix some of the easier potatoes --- .../render/tile/RenderTileTinyPotato.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index e7ab878fe..1809564a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -42,7 +42,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; -import java.util.regex.Pattern; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); @@ -188,19 +187,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Thu, 11 Aug 2016 20:38:54 -0500 Subject: [PATCH 864/935] Bunch more potato fixes, and one for me! --- .../render/tile/RenderTileTinyPotato.java | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 1809564a7..d24aa4503 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -170,7 +170,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Thu, 11 Aug 2016 21:00:04 -0500 Subject: [PATCH 865/935] Don't spam quite so many stacks --- .../render/tile/RenderTileTinyPotato.java | 28 +++++++++++-------- .../equipment/bauble/ItemBaubleCosmetic.java | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d24aa4503..78a481100 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -39,15 +39,18 @@ import vazkii.botania.client.model.ModelTinyPotato; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import javax.annotation.Nonnull; +import java.util.Arrays; public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN); private static final ModelTinyPotato model = new ModelTinyPotato(); + private final ItemStack[] cosmetics = Arrays.stream(ItemBaubleCosmetic.Variants.values()).map(v -> new ItemStack(ModItems.cosmetic, 1, v.ordinal())).toArray(ItemStack[]::new); private static boolean matches(String name, String match) { @@ -172,13 +175,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Fri, 12 Aug 2016 21:41:27 -0500 Subject: [PATCH 866/935] Fix all other potatoes. Closes #409 --- .../render/tile/RenderTileTinyPotato.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 78a481100..9ad0fcc22 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -180,7 +180,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer Date: Fri, 12 Aug 2016 22:17:12 -0500 Subject: [PATCH 867/935] Fix weird model name clash. Closes #436 --- src/main/java/vazkii/botania/common/lib/LibItemNames.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/es_ES.lang | 2 +- src/main/resources/assets/botania/lang/fr_FR.lang | 2 +- src/main/resources/assets/botania/lang/ja_JP.lang | 2 +- src/main/resources/assets/botania/lang/ko_KR.lang | 2 +- src/main/resources/assets/botania/lang/nl_NL.lang | 2 +- src/main/resources/assets/botania/lang/pt_BR.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 2 +- src/main/resources/assets/botania/lang/zh_TW.lang | 2 +- .../assets/botania/models/item/{root.json => livingRoot.json} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename src/main/resources/assets/botania/models/item/{root.json => livingRoot.json} (100%) diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 98f2643f7..5d6927462 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -208,7 +208,7 @@ public final class LibItemNames { "manasteelNugget", "terrasteelNugget", "elementiumNugget", - "root", + "livingRoot", "pebble", "manaweaveCloth", "manaPowder" diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 905d3716a..ad1ce0a2d 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1588,7 +1588,7 @@ item.botania:terraAxe.name=Terra Truncator item.botania:manasteelNugget.name=Manasteel Nugget item.botania:terrasteelNugget.name=Terrasteel Nugget item.botania:elementiumNugget.name=Elementium Nugget -item.botania:root.name=Living Root +item.botania:livingRoot.name=Living Root item.botania:pebble.name=Pebble item.botania:waterBowl.name=Bowl of Water item.botania:obedienceStick.name=Floral Obedience Stick diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index fb1b313db..cd8d93f2a 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -1336,7 +1336,7 @@ item.botania:terraAxe.name=Truncador de Terra item.botania:manasteelNugget.name=Pepita de manacero item.botania:terrasteelNugget.name=Pepita de terracero item.botania:elementiumNugget.name=Pepita de elementio -item.botania:root.name=Raíz viviente +item.botania:livingRoot.name=Raíz viviente item.botania:pebble.name=Guijarro item.botania:waterBowl.name=Cuenco con agua item.botania:obedienceStick.name=Palo de obediencia floral diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 2d49a91e6..7605cbd41 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -1196,7 +1196,7 @@ item.botania:terraAxe.name=Troncateur Terra item.botania:manasteelNugget.name=Pépite de manacier item.botania:terrasteelNugget.name=Pépite de terracier item.botania:elementiumNugget.name=Pépite d'élémentium -item.botania:root.name=Racine vivante +item.botania:livingRoot.name=Racine vivante item.botania:pebble.name=Caillou item.botania:waterBowl.name=bol d'eau item.botania:obedienceStick.name=Bâton d'obéissance floral diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index fc6f9c561..bf4a1b933 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -1352,7 +1352,7 @@ item.botania:terraAxe.name=テラトランケーター item.botania:manasteelNugget.name=マナスチールのナゲット item.botania:terrasteelNugget.name=テラスチールのナゲット item.botania:elementiumNugget.name=エレメンチウムのナゲット -item.botania:root.name=リビングルート +item.botania:livingRoot.name=リビングルート item.botania:pebble.name=小石 item.botania:waterBowl.name=水の入ったボウル item.botania:obedienceStick.name=花の指揮棒 diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 258ce220a..a6ddd8074 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -1298,7 +1298,7 @@ item.botania:terraAxe.name=대지 절단 item.botania:manasteelNugget.name=마나합금 조각 item.botania:terrasteelNugget.name=테라스틸 조각 item.botania:elementiumNugget.name=엘레멘티움 조각 -item.botania:root.name=생명의 뿌리 +item.botania:livingRoot.name=생명의 뿌리 item.botania:pebble.name=옥석 item.botania:waterBowl.name=물이 담긴 그릇 item.botania:obedienceStick.name=꽃의 순종막대 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index cb5563a04..65d0b5b66 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -1431,7 +1431,7 @@ item.botania:terraAxe.name=Terrakapper item.botania:manasteelNugget.name=Klompje Manastaal item.botania:terrasteelNugget.name=Klompje Terrastaal item.botania:elementiumNugget.name=Klompje Elementium -item.botania:root.name=Levenswortel +item.botania:livingRoot.name=Levenswortel item.botania:pebble.name=Kiezel item.botania:waterBowl.name=Kom Water item.botania:obedienceStick.name=Bloemen Gehoorzaamheidsstok diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 625e7b5d2..a8fc0754e 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -1504,7 +1504,7 @@ item.botania:terraAxe.name=Terra-Truncador item.botania:manasteelNugget.name=Pepita de Manasteel item.botania:terrasteelNugget.name=Pepita de Terrasteel item.botania:elementiumNugget.name=Pepita de Elementium -item.botania:root.name=Raíz-viva +item.botania:livingRoot.name=Raíz-viva item.botania:pebble.name=Seixo item.botania:waterBowl.name=Tigela de água item.botania:obedienceStick.name=Varinha da Obediência Floral diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index a62103994..ae0cdb139 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -1535,7 +1535,7 @@ item.botania:terraAxe.name=泰拉断裂者 item.botania:manasteelNugget.name=魔钢粒 item.botania:terrasteelNugget.name=泰拉钢粒 item.botania:elementiumNugget.name=源质钢粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵从法杖 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index e9b345cb3..2f5b1b307 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -1544,7 +1544,7 @@ item.botania:terraAxe.name=泰拉斷裂者 item.botania:manasteelNugget.name=魔鋼粒 item.botania:terrasteelNugget.name=泰拉鋼粒 item.botania:elementiumNugget.name=源質鋼粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵從法杖 diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/livingRoot.json similarity index 100% rename from src/main/resources/assets/botania/models/item/root.json rename to src/main/resources/assets/botania/models/item/livingRoot.json From 2877d304ceb96f6017b7ca7af861e6dd071612d2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 12:50:17 -0500 Subject: [PATCH 868/935] Mana blaster now shows active lens on model --- .../core/handler/MiscellaneousIcons.java | 11 + .../vazkii/botania/client/model/GunModel.java | 171 ++++++++ .../botania/common/item/ItemManaGun.java | 44 +- .../assets/botania/models/item/manaGun.json | 395 +++++++++--------- .../botania/models/item/manaGunClip.json | 6 +- 5 files changed, 405 insertions(+), 222 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/GunModel.java 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 a7dcbe448..de96858f4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -10,6 +10,7 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.Maps; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -24,6 +25,7 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.common.Botania; @@ -97,6 +99,15 @@ public class MiscellaneousIcons { // Lexicon evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + + // Mana Blaster + ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); + IBakedModel originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); + + key = new ModelResourceLocation("botania:manaGunClip", "inventory"); + originalModel = evt.getModelRegistry().getObject(key); + evt.getModelRegistry().putObject(key, new GunModel(originalModel)); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java new file mode 100644 index 000000000..0e0140c25 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -0,0 +1,171 @@ +package vazkii.botania.client.model; + +import com.google.common.base.Preconditions; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.collect.ImmutableList; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.pipeline.IVertexConsumer; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.TRSRTransformation; +import org.apache.commons.lang3.tuple.Pair; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class GunModel implements IBakedModel { + + private final IBakedModel originalModel; + + public GunModel(IBakedModel originalModel) { + this.originalModel = Preconditions.checkNotNull(originalModel); + } + + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + @Nonnull + @Override + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + ItemStack lens = ItemManaGun.getLens(stack); + if(lens != null) { + IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); + return GunModel.this.getModel(lensModel); + } + else return GunModel.this; + } + }; + + @Nonnull + @Override + public ItemOverrideList getOverrides() { + return itemHandler; + } + + @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { return originalModel.getQuads(state, side, rand); } + @Override public boolean isAmbientOcclusion() { return originalModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return originalModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } + + private final IdentityHashMap cache = new IdentityHashMap<>(); + + private CompositeBakedModel getModel(IBakedModel lens) { + CompositeBakedModel model = cache.get(lens); + if(model == null) { + model = new CompositeBakedModel(lens, originalModel); + cache.put(lens, model); + } + return model; + } + + protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); + final IVertexConsumer consumer = new VertexTransformer(builder) { + @Override + public void put(int element, float... data) { + VertexFormatElement formatElement = DefaultVertexFormats.ITEM.getElement(element); + switch(formatElement.getUsage()) { + case POSITION: { + float[] newData = new float[4]; + Vector4f vec = new Vector4f(data); + transform.getMatrix().transform(vec); + vec.get(newData); + parent.put(element, newData); + break; + } + default: { + parent.put(element, data); + break; + } + } + } + }; + quad.pipe(consumer); + return builder.build(); + } + + private static class CompositeBakedModel implements IPerspectiveAwareModel { + + private final IBakedModel gun; + private final List genQuads; + private final Map> faceQuads = new EnumMap<>(EnumFacing.class); + + CompositeBakedModel(IBakedModel lens, IBakedModel gun) { + this.gun = gun; + + ImmutableList.Builder genBuilder = ImmutableList.builder(); + final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(-0.4F, 0.25F, 0), null, new Vector3f(0.625F, 0.625F, 0.625F), TRSRTransformation.quatFromXYZ(0, (float) Math.PI / 2, 0))); + + for(EnumFacing e : EnumFacing.VALUES) + faceQuads.put(e, new ArrayList<>()); + + // Add lens quads, scaled and translated + for(BakedQuad quad : lens.getQuads(null, null, 0)) { + genBuilder.add(transform(quad, transform)); + } + + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(lens.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + } + + // Add gun quads + genBuilder.addAll(gun.getQuads(null, null, 0)); + for(EnumFacing e : EnumFacing.VALUES) { + faceQuads.get(e).addAll(gun.getQuads(null, e, 0)); + } + + genQuads = genBuilder.build(); + + } + + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return face == null ? genQuads : faceQuads.get(face); } + + // Forward all to gun model + @Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return gun.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();} + @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + if(gun instanceof IPerspectiveAwareModel) { + Pair pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); + } + return Pair.of(this, TRSRTransformation.identity().getMatrix()); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 5fd2d2163..539116ae1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,6 +30,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -75,9 +77,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { RecipeSorter.register("botania:manaGunLens", ManaGunLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunRemoveLens", ManaGunRemoveLensRecipe.class, Category.SHAPELESS, ""); RecipeSorter.register("botania:manaGunClip", ManaGunClipRecipe.class, Category.SHAPELESS, ""); - - addPropertyOverride(new ResourceLocation("botania", "clip"), (itemStack, world, entityLivingBase) -> hasClip(itemStack) ? 1 : 0); - addPropertyOverride(new ResourceLocation("botania", "desu"), (itemStack, world, entityLivingBase) -> isSugoiKawaiiDesuNe(itemStack) ? 1 : 0); } @Nonnull @@ -141,17 +140,21 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int tintIndex) { - if(tintIndex != 1) - return 0xFFFFFF; + public int getColorFromItemStack(ItemStack stack, int tintIndex) { + ItemStack lens = getLens(stack); + if(lens != null && tintIndex == 0) + return ((IColorable) ModItems.lens).getColorFromItemStack(lens, tintIndex); - EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false); - Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); + if(tintIndex == 2) { + EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false); + Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); - float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); - int c = (int) (255 * mul); + float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); + int c = (int) (255 * mul); + + return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); + } else return 0xFFFFFF; - return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); } @Override @@ -331,4 +334,23 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { public boolean usesMana(ItemStack stack) { return true; } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + ModelLoader.registerItemVariants(this, + new ModelResourceLocation("botania:desuGunClip", "inventory"), + new ModelResourceLocation("botania:desuGun", "inventory"), + new ModelResourceLocation("botania:manaGunClip", "inventory"), + new ModelResourceLocation("botania:manaGun", "inventory")); + ModelLoader.setCustomMeshDefinition(this, stack -> { + if (hasClip(stack) && isSugoiKawaiiDesuNe(stack)) + return new ModelResourceLocation("botania:desuGunClip", "inventory"); + else if (isSugoiKawaiiDesuNe(stack)) + return new ModelResourceLocation("botania:desuGun", "inventory"); + else if(hasClip(stack)) + return new ModelResourceLocation("botania:manaGunClip", "inventory"); + else return new ModelResourceLocation("botania:manaGun", "inventory"); + }); + } } diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json index 5e6ef87b7..2173f234e 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -1,209 +1,188 @@ -{ - "__comment": "Author: wiiv", - "textures": { - "layer0": "botania:items/manaBlaster", - "layer1": "botania:items/manaBlasterColor", - "layer2": "botania:items/manaBlasterGlass" - }, - "elements": [ - { - "name": "Barrel1", - "from": [ -10.0, 5.0, 5.5 ], - "to": [ -3.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, - "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, - "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, - "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel2", - "from": [ -3.0, 5.0, 5.5 ], - "to": [ 7.0, 9.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, - "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, - "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } - } - }, - { - "name": "Barrel3", - "from": [ 7.0, 5.0, 5.5 ], - "to": [ 10.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } - } - }, - { - "name": "Barrel4", - "from": [ 10.0, 12.0, 5.5 ], - "to": [ 18.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel5", - "from": [ 10.0, 9.0, 5.5 ], - "to": [ 18.0, 11.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } - } - }, - { - "name": "Strap", - "from": [ 14.0, -5.0, 6.5 ], - "to": [ 19.0, 9.0, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, - "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, - "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } - } - }, - { - "name": "Magazine", - "from": [ 12.5, -6.0, 7.0 ], - "to": [ 18.5, -5.0, 9.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, - "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, - "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, - "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } - } - }, - { - "name": "Trigger Guard1", - "from": [ 10.0, 6.0, 7.0 ], - "to": [ 16.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, - "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } - } - }, - { - "name": "Trigger", - "from": [ 13.0, 7.0, 7.5 ], - "to": [ 16.0, 9.0, 8.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } - } - }, - { - "name": "Trigger Guard2", - "from": [ 10.0, 7.0, 7.0 ], - "to": [ 11.0, 9.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, - "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } - } - }, - { - "name": "Colorizer", - "from": [ 9.5, 11.0, 6.0 ], - "to": [ 17.5, 12.0, 10.0 ], - "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } - } - }, - { - "name": "Glass", - "from": [ -3.5, 9.5, 6.0 ], - "to": [ 7.5, 13.5, 10.0 ], - "faces": { - "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, - "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, - "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, - "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, - "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } - } - } - ], - "display": { - "gui": { - "rotation": [ 0, -20, -40 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 0, -90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 10, 80, -5 ], - "translation": [ 0.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "firstperson_righthand": { - "rotation": [ 10, -80, 5 ], - "translation": [ -1.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - } - }, - "overrides": [ - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desuGunClip" - }, - { - "predicate": { - "botania:clip": 1 - }, - "model": "botania:item/manaGunClip" - }, - { - "predicate": { - "botania:desu": 1 - }, - "model": "botania:item/desuGun" - } - ] +{ + "__comment": "Author: wiiv", + "textures": { + "layer0": "botania:items/manaBlaster", + "layer1": "botania:items/manaBlasterColor", + "layer2": "botania:items/manaBlasterGlass" + }, + "elements": [ + { + "name": "Barrel1", + "from": [ -10.0, 5.0, 5.5 ], + "to": [ -3.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, + "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, + "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, + "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel2", + "from": [ -3.0, 5.0, 5.5 ], + "to": [ 7.0, 9.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, + "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, + "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } + } + }, + { + "name": "Barrel3", + "from": [ 7.0, 5.0, 5.5 ], + "to": [ 10.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, + "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, + "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } + } + }, + { + "name": "Barrel4", + "from": [ 10.0, 12.0, 5.5 ], + "to": [ 18.0, 14.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } + } + }, + { + "name": "Barrel5", + "from": [ 10.0, 9.0, 5.5 ], + "to": [ 18.0, 11.0, 10.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, + "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, + "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, + "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } + } + }, + { + "name": "Strap", + "from": [ 14.0, -5.0, 6.5 ], + "to": [ 19.0, 9.0, 9.5 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, + "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, + "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, + "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } + } + }, + { + "name": "Magazine", + "from": [ 12.5, -6.0, 7.0 ], + "to": [ 18.5, -5.0, 9.0 ], + "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, + "faces": { + "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, + "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, + "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, + "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, + "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, + "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } + } + }, + { + "name": "Trigger Guard1", + "from": [ 10.0, 6.0, 7.0 ], + "to": [ 16.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, + "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, + "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } + } + }, + { + "name": "Trigger", + "from": [ 13.0, 7.0, 7.5 ], + "to": [ 16.0, 9.0, 8.5 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, + "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } + } + }, + { + "name": "Trigger Guard2", + "from": [ 10.0, 7.0, 7.0 ], + "to": [ 11.0, 9.0, 9.0 ], + "faces": { + "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, + "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, + "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } + } + }, + { + "name": "Colorizer", + "from": [ 9.5, 11.0, 6.0 ], + "to": [ 17.5, 12.0, 10.0 ], + "faces": { + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } + } + }, + { + "name": "Glass", + "from": [ -3.5, 9.5, 6.0 ], + "to": [ 7.5, 13.5, 10.0 ], + "faces": { + "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, + "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, + "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, + "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, + "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } + } + } + ], + "display": { + "gui": { + "rotation": [ 0, -20, -40 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "fixed": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 2.45, -1.5 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "firstperson_lefthand": { + "rotation": [ 10, 80, -5 ], + "translation": [ 0.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + }, + "firstperson_righthand": { + "rotation": [ 10, -80, 5 ], + "translation": [ -1.8, 2.5, 0 ], + "scale": [ 0.45, 0.45, 0.45 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json index f13aec897..aa7221398 100644 --- a/src/main/resources/assets/botania/models/item/manaGunClip.json +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -131,9 +131,9 @@ "from": [ 9.5, 11.0, 6.0 ], "to": [ 17.5, 12.0, 10.0 ], "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 1 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 1 } + "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, + "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, + "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } } }, { From 1eafb2e85ebd95557949ca07e795445f534c5057 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 14:26:10 -0500 Subject: [PATCH 869/935] Update forge, fix tooltips additions not matching item tooltip. Closes #219 --- build.properties | 2 +- .../core/handler/ClientTickHandler.java | 1 - .../TooltipAdditionDisplayHandler.java | 222 ++++++++---------- .../client/core/proxy/ClientProxy.java | 2 + .../vazkii/botania/common/lib/LibMisc.java | 2 +- 5 files changed, 102 insertions(+), 127 deletions(-) diff --git a/build.properties b/build.properties index 066331106..bcf2bac3d 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.10.2 -forge_version=12.18.1.2046 +forge_version=12.18.1.2056 build_number=316 mod_name=Botania diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 8d2f897cd..1fa7197b0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -50,7 +50,6 @@ public final class ClientTickHandler { if(event.phase == Phase.START) partialTicks = event.renderTickTime; else { - TooltipAdditionDisplayHandler.render(); calcDelta(); } } 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 344e44df7..a4ec22c11 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -25,6 +25,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.client.event.RenderTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -47,133 +49,105 @@ public final class TooltipAdditionDisplayHandler { private static float lexiconLookupTime = 0F; - public static void render() { + @SubscribeEvent + public static void onToolTipRender(RenderTooltipEvent.PostText evt) { + if(evt.getStack() == null) + return; + + ItemStack stack = evt.getStack(); Minecraft mc = Minecraft.getMinecraft(); - GuiScreen gui = mc.currentScreen; - if(gui != null && gui instanceof GuiContainer && mc.thePlayer != null && mc.thePlayer.inventory.getItemStack() == null) { - GuiContainer container = (GuiContainer) gui; - Slot slot = container.getSlotUnderMouse(); - if(slot != null && slot.getHasStack()) { - ItemStack stack = slot.getStack(); - if(stack != null) { - ScaledResolution res = new ScaledResolution(mc); - FontRenderer font = mc.fontRendererObj; - int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth; - int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight; + int width = evt.getWidth(); + int height = 3; + int tooltipX = evt.getX(); + int tooltipY = evt.getY() - 4; + FontRenderer font = evt.getFontRenderer(); - List tooltip; - try { - tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); - } catch(Exception e) { - tooltip = new ArrayList<>(); + if(stack.getItem() instanceof ItemTerraPick) + drawTerraPick(stack, tooltipX, tooltipY, width, height, font); + else if(stack.getItem() instanceof IManaTooltipDisplay) + drawManaBar(stack, (IManaTooltipDisplay) stack.getItem(), tooltipX, tooltipY, width, height); + + EntryData data = LexiconRecipeMappings.getDataForStack(stack); + if(data != null) { + int lexSlot = -1; + ItemStack lexiconStack = null; + + for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) { + ItemStack stackAt = mc.thePlayer.inventory.getStackInSlot(i); + if(stackAt != null && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { + lexiconStack = stackAt; + lexSlot = i; + break; + } + } + + if(lexSlot > -1) { + int x = tooltipX - 34; + GlStateManager.disableDepth(); + + Gui.drawRect(x - 4, tooltipY - 4, x + 20, tooltipY + 26, 0x44000000); + Gui.drawRect(x - 6, tooltipY - 6, x + 22, tooltipY + 28, 0x44000000); + + if(ConfigHandler.useShiftForQuickLookup ? GuiScreen.isShiftKeyDown() : GuiScreen.isCtrlKeyDown()) { + lexiconLookupTime += ClientTickHandler.delta; + + int cx = x + 8; + int cy = tooltipY + 8; + float r = 12; + float time = 20F; + float angles = lexiconLookupTime / time * 360F; + + GlStateManager.disableLighting(); + GlStateManager.disableTexture2D(); + GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + VertexBuffer buf = Tessellator.getInstance().getBuffer(); + buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + + float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); + buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); + + for(float i = angles; i > 0; i--) { + double rad = (i - 90) / 180F * Math.PI; + buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); } - int width = 0; - for(String s : tooltip) - width = Math.max(width, font.getStringWidth(s) + 2); - int tooltipHeight = (tooltip.size() - 1) * 10 + 5; - int height = 3; - int offx = 11; - int offy = 17; + buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); + Tessellator.getInstance().draw(); - boolean offscreen = mouseX + width + 19 >= res.getScaledWidth(); + GlStateManager.disableBlend(); + GlStateManager.enableTexture2D(); + GlStateManager.shadeModel(GL11.GL_FLAT); - int fixY = res.getScaledHeight() - (mouseY + tooltipHeight); - if(fixY < 0) - offy -= fixY; - if(offscreen) - offx = -13 - width; + if(lexiconLookupTime >= time) { + mc.thePlayer.inventory.currentItem = lexSlot; + Botania.proxy.setEntryToOpen(data.entry); + Botania.proxy.setLexiconStack(lexiconStack); + mc.thePlayer.closeScreen(); + ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); - if(stack.getItem() instanceof ItemTerraPick) - drawTerraPick(stack, mouseX, mouseY, offx, offy, width, height, font); - else if(stack.getItem() instanceof IManaTooltipDisplay) - drawManaBar(stack, (IManaTooltipDisplay) stack.getItem(), mouseX, mouseY, offx, offy, width, height); - - EntryData data = LexiconRecipeMappings.getDataForStack(stack); - if(data != null) { - int lexSlot = -1; - ItemStack lexiconStack = null; - - for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) { - ItemStack stackAt = mc.thePlayer.inventory.getStackInSlot(i); - if(stackAt != null && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { - lexiconStack = stackAt; - lexSlot = i; - break; - } - } - - if(lexSlot > -1) { - int x = mouseX + offx - 34; - int y = mouseY - offy; - GlStateManager.disableDepth(); - - Gui.drawRect(x - 4, y - 4, x + 20, y + 26, 0x44000000); - Gui.drawRect(x - 6, y - 6, x + 22, y + 28, 0x44000000); - - if(ConfigHandler.useShiftForQuickLookup ? GuiScreen.isShiftKeyDown() : GuiScreen.isCtrlKeyDown()) { - lexiconLookupTime += ClientTickHandler.delta; - - int cx = x + 8; - int cy = y + 8; - float r = 12; - float time = 20F; - float angles = lexiconLookupTime / time * 360F; - - GlStateManager.disableLighting(); - GlStateManager.disableTexture2D(); - GlStateManager.shadeModel(GL11.GL_SMOOTH); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - VertexBuffer buf = Tessellator.getInstance().getBuffer(); - buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); - - float a = 0.5F + 0.2F * ((float) Math.cos((double) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 10) * 0.5F + 0.5F); - buf.pos(cx, cy, 0).color(0F, 0.5F, 0F, a).endVertex(); - - for(float i = angles; i > 0; i--) { - double rad = (i - 90) / 180F * Math.PI; - buf.pos(cx + Math.cos(rad) * r, cy + Math.sin(rad) * r, 0).color(0F, 1F, 0F, 1F).endVertex(); - } - - buf.pos(cx, cy, 0).color(0F, 1F, 0F, 0F).endVertex(); - Tessellator.getInstance().draw(); - - GlStateManager.disableBlend(); - GlStateManager.enableTexture2D(); - GlStateManager.shadeModel(GL11.GL_FLAT); - - if(lexiconLookupTime >= time) { - mc.thePlayer.inventory.currentItem = lexSlot; - Botania.proxy.setEntryToOpen(data.entry); - Botania.proxy.setLexiconStack(lexiconStack); - mc.thePlayer.closeScreen(); - ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); - - } - } else lexiconLookupTime = 0F; - - mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, y); - GlStateManager.disableLighting(); - - font.drawStringWithShadow("?", x + 10, y + 8, 0xFFFFFFFF); - GlStateManager.scale(0.5F, 0.5F, 1F); - 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); - - - GlStateManager.enableDepth(); - } else lexiconLookupTime = 0F; - } else lexiconLookupTime = 0F; + } } else lexiconLookupTime = 0F; + + mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.lexicon), x, tooltipY); + GlStateManager.disableLighting(); + + font.drawStringWithShadow("?", x + 10, tooltipY + 8, 0xFFFFFFFF); + GlStateManager.scale(0.5F, 0.5F, 1F); + boolean mac = Minecraft.IS_RUNNING_ON_MAC; + + mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (tooltipY + 8) * 2 + 20, 0xFFFFFFFF); + GlStateManager.scale(2F, 2F, 1F); + + + GlStateManager.enableDepth(); } else lexiconLookupTime = 0F; } else lexiconLookupTime = 0F; } - private static void drawTerraPick(ItemStack stack, int mouseX, int mouseY, int offx, int offy, int width, int height, FontRenderer font) { + private static void drawTerraPick(ItemStack stack, int mouseX, int mouseY, int width, int height, FontRenderer font) { int level = ItemTerraPick.getLevel(stack); int max = ItemTerraPick.LEVELS[Math.min(ItemTerraPick.LEVELS.length - 1, level + 1)]; boolean ss = level >= ItemTerraPick.LEVELS.length - 1; @@ -184,33 +158,33 @@ public final class TooltipAdditionDisplayHandler { float hueOff = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.01F; GlStateManager.disableDepth(); - Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); + Gui.drawRect(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); for(int i = 0; i < rainbowWidth; i++) - Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); - Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); + Gui.drawRect(mouseX + i, mouseY - height, mouseX + i + 1, mouseY, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F)); + Gui.drawRect(mouseX + rainbowWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableLighting(); - font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); + font.drawStringWithShadow(rank, mouseX, mouseY - 12, 0xFFFFFF); if(!ss) { rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); - font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); + font.drawStringWithShadow(rank, mouseX + width - font.getStringWidth(rank), mouseY - 12, 0xFFFFFF); } GlStateManager.enableLighting(); GlStateManager.enableDepth(); GL11.glPopAttrib(); } - private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int offx, int offy, int width, int height) { + private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int width, int height) { float fraction = display.getManaFractionForDisplay(stack); int manaBarWidth = (int) Math.ceil(width * fraction); GlStateManager.disableDepth(); - Gui.drawRect(mouseX + offx - 1, mouseY - offy - height - 1, mouseX + offx + width + 1, mouseY - offy, 0xFF000000); - Gui.drawRect(mouseX + offx, mouseY - offy - height, mouseX + offx + manaBarWidth, mouseY - offy, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); - Gui.drawRect(mouseX + offx + manaBarWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); + Gui.drawRect(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); + Gui.drawRect(mouseX, mouseY - height, mouseX + manaBarWidth, mouseY, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); + Gui.drawRect(mouseX + manaBarWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); } } 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 e9d82f2bc..42e989ed7 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -60,6 +60,7 @@ import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.RenderLexicon; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; +import vazkii.botania.client.core.handler.TooltipAdditionDisplayHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; @@ -205,6 +206,7 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.boundBlockWireframe) MinecraftForge.EVENT_BUS.register(BoundTileRenderer.class); MinecraftForge.EVENT_BUS.register(TooltipHandler.class); + MinecraftForge.EVENT_BUS.register(TooltipAdditionDisplayHandler.class); MinecraftForge.EVENT_BUS.register(DebugHandler.class); MinecraftForge.EVENT_BUS.register(SubTileRadiusRenderHandler.class); MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 89db6d30a..3bfdd51ee 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ 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.18.1.2042,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2053,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.10.2]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; From 687d475aeb7c3b41c4f4770d6598a7ddfa55406b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Aug 2016 15:21:32 -0500 Subject: [PATCH 870/935] Corporea no longer runs clientside --- .../render/entity/RenderCorporeaSpark.java | 8 +-- .../common/entity/EntityCorporeaSpark.java | 69 +++++++++---------- .../botania/common/entity/EntitySpark.java | 8 ++- 3 files changed, 41 insertions(+), 44 deletions(-) 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 59ac6f867..a307f797a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -61,6 +61,10 @@ public class RenderCorporeaSpark extends RenderSparkBase { float absTime = Math.abs(time) - pticks; + ItemStack stack = entity.getDisplayedItem().orNull(); + if(stack == null) + return; + GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); float scalef = 1F / 6F; @@ -70,10 +74,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.color(1F, 1F, 1F, absTime / 10); GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); - ItemStack stack = entity.getDisplayedItem().orNull(); - if(stack == null) - return; - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2c24f7131..d8737843c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -52,10 +52,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private ICorporeaSpark master; private List connections = new ArrayList<>(); - private List connectionsClient = new ArrayList<>(); private List relatives = new ArrayList<>(); - private boolean firstUpdateClient = true; - private boolean firstUpdateServer = true; + private boolean firstTick = true; public EntityCorporeaSpark(World world) { super(world); @@ -86,24 +84,25 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public void onUpdate() { super.onUpdate(); + + if(worldObj.isRemote) + return; + InvWithLocation inv = getSparkInventory(); if(inv == null) { - if(!worldObj.isRemote) - dropAndKill(); + dropAndKill(); return; } if(isMaster()) master = this; - if(worldObj.isRemote ? firstUpdateClient : firstUpdateServer) { + if(firstTick) { if(isMaster()) restartNetwork(); else findNetwork(); - if(worldObj.isRemote) - firstUpdateClient = false; - else firstUpdateServer = false; + firstTick = false; } if(master != null && (((Entity) master).isDead || master.getNetwork() != getNetwork())) @@ -125,7 +124,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public void setDead() { super.setDead(); connections.remove(this); - connectionsClient.remove(this); restartNetwork(); } @@ -143,20 +141,16 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } this.master = master; - if(worldObj.isRemote) - connectionsClient = connections; - else this.connections = connections; + this.connections = connections; } - List getNearbySparks() { + private List getNearbySparks() { List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); return ((List) ret); } - void restartNetwork() { - if(worldObj.isRemote) - connectionsClient = new ArrayList<>(); - else connections = new ArrayList<>(); + private void restartNetwork() { + connections = new ArrayList<>(); relatives = new ArrayList<>(); if(master != null) { @@ -167,7 +161,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } } - void findNetwork() { + private void findNetwork() { List sparks = getNearbySparks(); if(sparks.size() > 0) { for(ICorporeaSpark spark : sparks) @@ -183,18 +177,18 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } } - void displayRelatives(ArrayList checked, ICorporeaSpark spark) { + private static void displayRelatives(EntityPlayer player, List checked, ICorporeaSpark spark) { if(spark == null) return; List sparks = spark.getRelatives(); if(sparks.isEmpty()) - EntitySpark.particleBeam((Entity) spark, (Entity) spark.getMaster()); + EntitySpark.particleBeam(player, (Entity) spark, (Entity) spark.getMaster()); else for(ICorporeaSpark endSpark : sparks) { if(!checked.contains(endSpark)) { - EntitySpark.particleBeam((Entity) spark, (Entity) endSpark); + EntitySpark.particleBeam(player, (Entity) spark, (Entity) endSpark); checked.add(endSpark); - displayRelatives(checked, endSpark); + displayRelatives(player, checked, endSpark); } } } @@ -209,7 +203,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public List getConnections() { - return worldObj.isRemote ? connectionsClient : connections; + return connections; } @Override @@ -275,29 +269,30 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(stack != null) { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote) { dropAndKill(); - if(isMaster()) - restartNetwork(); - if(player.worldObj.isRemote) - player.swingArm(hand); + if(isMaster()) + restartNetwork(); + } else player.swingArm(hand); return true; } else { - displayRelatives(new ArrayList<>(), master); + if(!player.worldObj.isRemote) { + displayRelatives(player, new ArrayList<>(), master); + } return true; } } else if(stack.getItem() == ModItems.dye) { int color = stack.getItemDamage(); if(color != getNetwork().getMetadata()) { - setNetwork(EnumDyeColor.byMetadata(color)); + if(!worldObj.isRemote) { + setNetwork(EnumDyeColor.byMetadata(color)); - if(master != null) - restartNetwork(); - else findNetwork(); + if(master != null) + restartNetwork(); + else findNetwork(); - stack.stackSize--; - if(player.worldObj.isRemote) - player.swingArm(hand); + stack.stackSize--; + } else player.swingArm(hand); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 7500166d3..562a45cc1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -12,8 +12,10 @@ package vazkii.botania.common.entity; import baubles.common.lib.PlayerHandler; import gnu.trove.map.hash.TObjectIntHashMap; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -215,9 +217,9 @@ public class EntitySpark extends Entity implements ISparkEntity { getEntityId(), e.getEntityId())); } - public static void particleBeam(Entity e1, Entity e2) { + public static void particleBeam(EntityPlayer player, Entity e1, Entity e2) { if(e1 != null && e2 != null && !e1.worldObj.isRemote) { - PacketHandler.sendToNearby(e1.worldObj, e1, + PacketHandler.sendTo(((EntityPlayerMP) player), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ, e1.getEntityId(), e2.getEntityId())); } @@ -258,7 +260,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } else { List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); for(ISparkEntity spark : allSparks) - particleBeam(this, (Entity) spark); + particleBeam(player, this, (Entity) spark); return true; } } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) { From 878c0dbeba7da85b536e2a5451f540cf4ec8f8f3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Aug 2016 10:45:40 -0500 Subject: [PATCH 871/935] Make ender hand less desyncy and clean some old filesy --- .../client/model/ModelBlackHoleCube.java | 102 ------------------ .../client/model/ModelSkullOverride.java | 50 --------- .../botania/common/item/ItemEnderHand.java | 16 +-- 3 files changed, 9 insertions(+), 159 deletions(-) delete mode 100644 src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java delete mode 100644 src/main/java/vazkii/botania/client/model/ModelSkullOverride.java diff --git a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java b/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java deleted file mode 100644 index 56ff033e7..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelBlackHoleCube.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelBlackHoleCube extends ModelBase { - public final ModelRenderer shape1; - public final ModelRenderer shape1_1; - public final ModelRenderer shape1_2; - public final ModelRenderer shape1_3; - public final ModelRenderer shape1_4; - public final ModelRenderer shape1_5; - public final ModelRenderer shape1_6; - public final ModelRenderer shape1_7; - public final ModelRenderer shape1_8; - public final ModelRenderer shape1_9; - public final ModelRenderer shape1_10; - public final ModelRenderer shape1_11; - - public ModelBlackHoleCube() { - textureWidth = 36; - textureHeight = 2; - shape1_3 = new ModelRenderer(this, 0, 0); - shape1_3.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_3.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_3, 0.0F, 1.5707963267948966F, 0.0F); - shape1_7 = new ModelRenderer(this, 0, 0); - shape1_7.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_7.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_7, 0.0F, 1.5707963267948966F, 0.0F); - shape1_9 = new ModelRenderer(this, 0, 0); - shape1_9.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_9.addBox(-7.0F, 7.0F, 7.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_9, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_11 = new ModelRenderer(this, 0, 0); - shape1_11.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_11.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_11, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1 = new ModelRenderer(this, 0, 0); - shape1.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1.addBox(-8.0F, 7.0F, 7.0F, 16, 1, 1, 0.0F); - shape1_4 = new ModelRenderer(this, 0, 0); - shape1_4.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_4.addBox(-8.0F, 7.0F, -8.0F, 16, 1, 1, 0.0F); - shape1_8 = new ModelRenderer(this, 0, 0); - shape1_8.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_8.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_8, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_2 = new ModelRenderer(this, 0, 0); - shape1_2.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_2.addBox(-8.0F, -8.0F, -8.0F, 16, 1, 1, 0.0F); - shape1_1 = new ModelRenderer(this, 0, 0); - shape1_1.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_1.addBox(-8.0F, -8.0F, 7.0F, 16, 1, 1, 0.0F); - shape1_6 = new ModelRenderer(this, 0, 0); - shape1_6.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_6.addBox(-7.0F, -8.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_6, 0.0F, -1.5707963267948966F, 0.0F); - shape1_10 = new ModelRenderer(this, 0, 0); - shape1_10.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_10.addBox(-7.0F, -8.0F, 7.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_10, 0.0F, 3.141592653589793F, 1.5707963267948966F); - shape1_5 = new ModelRenderer(this, 0, 0); - shape1_5.setRotationPoint(0.0F, 16.0F, 0.0F); - shape1_5.addBox(-7.0F, 7.0F, -8.0F, 14, 1, 1, 0.0F); - setRotateAngle(shape1_5, 0.0F, -1.5707963267948966F, 0.0F); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - shape1_3.render(f5); - shape1_7.render(f5); - shape1_9.render(f5); - shape1_11.render(f5); - shape1.render(f5); - shape1_4.render(f5); - shape1_8.render(f5); - shape1_2.render(f5); - shape1_1.render(f5); - shape1_6.render(f5); - shape1_10.render(f5); - shape1_5.render(f5); - } - - - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java b/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java deleted file mode 100644 index 1ad6c4258..000000000 --- a/src/main/java/vazkii/botania/client/model/ModelSkullOverride.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ModelSkullOverride extends ModelBase { - - private final ModelRenderer bipedHead; - private final ModelRenderer bipedHeadwear; - - public ModelSkullOverride() { - textureWidth = 64; - textureHeight = 32; - bipedHead = new ModelRenderer(this, 0, 0); - bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0F); - bipedHead.setRotationPoint(0.0F, 0.0F, 0.0F); - bipedHeadwear = new ModelRenderer(this, 32, 0); - bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.5F); - bipedHeadwear.setRotationPoint(0.0F, 0.0F, 0.0F); - } - - public void renderWithoutRotation(float par1) { - bipedHead.render(par1); - bipedHeadwear.render(par1); - } - - @Override - public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); - bipedHead.render(par7); - bipedHeadwear.render(par7); - } - - @Override - public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity par7Entity) { - bipedHead.rotateAngleY = bipedHeadwear.rotateAngleY = par4 / (180F / (float)Math.PI); - bipedHead.rotateAngleX = bipedHeadwear.rotateAngleX = par5 / (180F / (float)Math.PI); - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index cbc2c6606..b26a2a3ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -44,20 +44,22 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv @Override public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { - player.displayGUIChest(player.getInventoryEnderChest()); + if(!player.worldObj.isRemote) + 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); + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override - public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer iplayer, EntityLivingBase entity, EnumHand hand) { - 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); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { + if(ConfigHandler.enderPickpocketEnabled && entity instanceof EntityPlayer && ManaItemHandler.requestManaExact(stack, player, COST_OTHER, false)) { + if(!player.worldObj.isRemote) + player.displayGUIChest(((EntityPlayer) entity).getInventoryEnderChest()); + ManaItemHandler.requestManaExact(stack, player, COST_OTHER, true); + player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); return true; } From 4f26ea98932c8f7b0bda45b939b02f769f82c493 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Aug 2016 11:46:45 -0500 Subject: [PATCH 872/935] Use vanilla mechanisms to sync TE's instead of rolling own --- .../api/internal/VanillaPacketDispatcher.java | 20 +++---------------- .../common/block/mana/BlockEnchanter.java | 14 ++++++++----- .../common/block/tile/TileEnchanter.java | 2 +- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 3c7992ea9..6d66580ed 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.internal; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.server.SPacketUpdateTileEntity; @@ -21,23 +22,8 @@ import net.minecraft.world.WorldServer; public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { - if(tile.getWorld() instanceof WorldServer) { - WorldServer ws = ((WorldServer) tile.getWorld()); - SPacketUpdateTileEntity packet = tile.getUpdatePacket(); - - if(packet == null) - return; - - for (EntityPlayer player : ws.playerEntities) { - EntityPlayerMP playerMP = ((EntityPlayerMP) player); - - if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64 - && ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4)) { - playerMP.connection.sendPacket(packet); - } - } - - } + IBlockState state = tile.getWorld().getBlockState(tile.getPos()); + tile.getWorld().notifyBlockUpdate(tile.getPos(), state, state, 8); } public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { 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 936c8a790..7bb39abdb 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -31,12 +31,14 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; @@ -112,7 +114,10 @@ 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; if(enchanter.itemToEnchant == null) { if(stackEnchantable) { @@ -121,10 +126,9 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, enchanter.sync(); } } else if(enchanter.stage == TileEnchanter.State.IDLE) { - if(player.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { - enchanter.itemToEnchant = null; - enchanter.sync(); - } else player.addChatMessage(new TextComponentTranslation("botaniamisc.invFull")); + ItemHandlerHelper.giveItemToPlayer(player, enchanter.itemToEnchant.copy()); + enchanter.itemToEnchant = null; + enchanter.sync(); } return true; 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 29e819e83..75f9351c2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -371,7 +371,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } private boolean isEnchantmentValid(Enchantment ench) { - if(!ench.canApply(itemToEnchant) || !ench.type.canEnchantItem(itemToEnchant.getItem())) + if(!ench.canApply(itemToEnchant)) return false; for(EnchantmentData data : enchants) { From 9e13eda148a157b4231cddfe0406726eca4f89aa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 12:00:51 -0500 Subject: [PATCH 873/935] Add missing sideonly to blocks --- src/main/java/vazkii/botania/api/wand/IWandHUD.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockAltGrass.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockBifrost.java | 3 +++ .../java/vazkii/botania/common/block/BlockBifrostPerm.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockCamo.java | 1 - .../botania/common/block/BlockFloatingSpecialFlower.java | 1 + .../java/vazkii/botania/common/block/BlockHourglass.java | 1 + .../java/vazkii/botania/common/block/BlockLightRelay.java | 1 + .../java/vazkii/botania/common/block/BlockLivingrock.java | 1 + .../java/vazkii/botania/common/block/BlockLivingwood.java | 1 + .../java/vazkii/botania/common/block/BlockModFlower.java | 2 ++ .../java/vazkii/botania/common/block/BlockOpenCrate.java | 2 ++ src/main/java/vazkii/botania/common/block/BlockPlatform.java | 1 + src/main/java/vazkii/botania/common/block/BlockPylon.java | 1 + .../java/vazkii/botania/common/block/BlockSpecialFlower.java | 3 +++ src/main/java/vazkii/botania/common/block/BlockStorage.java | 1 + .../vazkii/botania/common/block/decor/BlockBuriedPetals.java | 1 + .../vazkii/botania/common/block/decor/BlockCustomBrick.java | 1 + .../vazkii/botania/common/block/decor/BlockManaBeacon.java | 1 + .../vazkii/botania/common/block/decor/BlockManaFlame.java | 2 +- .../vazkii/botania/common/block/decor/BlockManaGlass.java | 4 ++++ .../vazkii/botania/common/block/decor/BlockPavement.java | 1 + .../vazkii/botania/common/block/decor/BlockPetalBlock.java | 1 + .../vazkii/botania/common/block/decor/BlockStarfield.java | 3 +++ .../vazkii/botania/common/block/decor/BlockTinyPotato.java | 1 + .../vazkii/botania/common/block/decor/BlockUnstable.java | 1 + .../common/block/decor/biomestone/BlockBiomeStone.java | 3 +++ .../botania/common/block/decor/panes/BlockAlfglassPane.java | 1 + .../botania/common/block/decor/panes/BlockBifrostPane.java | 1 + .../botania/common/block/decor/panes/BlockManaglassPane.java | 1 + .../common/block/decor/walls/BlockBiomeStoneWall.java | 1 + .../botania/common/block/decor/walls/BlockModWall.java | 1 + .../java/vazkii/botania/common/block/mana/BlockBrewery.java | 1 + .../vazkii/botania/common/block/mana/BlockEnchanter.java | 1 + .../vazkii/botania/common/block/mana/BlockForestDrum.java | 1 + .../java/vazkii/botania/common/block/mana/BlockPool.java | 1 + .../java/vazkii/botania/common/block/mana/BlockPrism.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockSpreader.java | 5 ++--- .../vazkii/botania/common/block/mana/BlockTurntable.java | 3 +++ 40 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index 58f09e8f2..a61860877 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -14,6 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * Any block that implements this has a HUD rendered when being hovered @@ -21,6 +23,7 @@ import net.minecraft.world.World; */ public interface IWandHUD { + @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 1a0530836..7abc27085 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -82,6 +82,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) @@ -120,6 +121,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { if (state.getBlock() != this) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 2a6205f55..8907a0475 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -110,6 +110,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return state; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { @@ -121,6 +122,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 9c600aaa4..4838ec0b2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -24,6 +24,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; @@ -66,6 +68,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable { return block != this && super.shouldSideBeRendered(state, world, pos, side); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 4308299b4..4da885bd1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -20,6 +20,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; @@ -59,6 +61,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 376fe3437..4a0e58452 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -34,7 +34,6 @@ public abstract class BlockCamo extends BlockMod { } @Override - @SuppressWarnings("unchecked") public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 815a99231..1585c73bc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -205,6 +205,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index a57912d38..fe0388941 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -191,6 +191,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return false; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 1122d1310..867aeb3df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -88,6 +88,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 1948c3fef..7b37454b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -76,6 +76,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 00df2c3bd..b73585ed5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -80,6 +80,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 1d23e582f..43637b05f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -118,6 +118,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return true; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(int i = 0; i < 16; i++) @@ -129,6 +130,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 12827d7b7..8650a249c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -101,6 +101,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CrateVariant.values().length; i++) @@ -156,6 +157,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return crate.onWanded(world, player, stack); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 3725d77d1..631255db1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -112,6 +112,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index ba0caa08f..ffeed4772 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -93,6 +93,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 7c0f54500..b6067f512 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -204,12 +204,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { @@ -336,6 +338,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 18660b9c6..48b4789c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -66,6 +66,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 2ccbe8ee7..e5f5f8a79 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -46,6 +46,7 @@ public class BlockBuriedPetals extends BlockModFlower { return AABB; } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR); 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 d189bf730..726a56a27 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -77,6 +77,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < CustomBrickVariant.values().length; i++) 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 177a4d448..a1249cfd0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -80,6 +80,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) 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 9bda6cca4..feb059682 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -91,7 +91,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + return NULL_AABB; } @Override 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 66cba1f49..2d89cdab2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -21,6 +21,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -47,12 +49,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return false; } + @SideOnly(Side.CLIENT) @Override public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) { Block block = world.getBlockState(pos.offset(side)).getBlock(); return block == this ? false : super.shouldSideBeRendered(state, world, pos, side); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { 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 66bb3769d..aa95fb27b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -95,6 +95,7 @@ public class BlockPavement extends BlockMod { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < TYPES; i++) 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 d79a8f01d..d37930c6f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -67,6 +67,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) 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 6df572ab1..29938d8cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -22,6 +22,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -50,6 +52,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { 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 5e9f97d89..254d2b774 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -95,6 +95,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public void registerItemForm() { GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName()); } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); 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 e6dcc0360..d79ce9cd3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -83,6 +83,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return AABB; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) 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 8c54d3ff8..8be058bce 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 @@ -21,6 +21,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -39,6 +41,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index ff6db6a28..c5286035d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -24,6 +24,7 @@ public class BlockAlfglassPane extends BlockModPane { super(ModBlocks.elfGlass); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index 5c8361ebb..d5d42dd65 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -24,6 +24,7 @@ public class BlockBifrostPane extends BlockModPane { super(ModBlocks.bifrostPerm); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 0f6b30830..09e2d4a16 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -24,6 +24,7 @@ public class BlockManaglassPane extends BlockModPane { super(ModBlocks.manaGlass); } + @SideOnly(Side.CLIENT) @Nonnull @Override public BlockRenderLayer getBlockLayer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index b640df5b6..f1ac50cea 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -72,6 +72,7 @@ public class BlockBiomeStoneWall extends BlockModWall { GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { for(int i = 0; i < 8; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index c278f7ff1..5e921e833 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -99,6 +99,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM GameRegistry.register(new ItemBlockMod(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { list.add(new ItemStack(item)); 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 6af9a2c67..14e2acd96 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -150,6 +150,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return LexiconData.brewery; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res); 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 7bb39abdb..1736f1d65 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -179,6 +179,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return LexiconData.manaEnchanting; } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileEnchanter) world.getTileEntity(pos)).renderHUD(res); 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 d97c22040..4dae7d5f1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -108,6 +108,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getBlock().getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) 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 1588489c8..7ebd19f51 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -140,6 +140,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return drops; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { par3.add(new ItemStack(item, 1, 0)); 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 14a2cd9bf..c5b0628e1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -97,7 +97,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + return NULL_AABB; } @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 d1cc52fd5..6f40cc2c4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -87,6 +87,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) @@ -233,9 +234,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) { - float f = 1F / 16F; - return new AxisAlignedBB(pos.getX() + f, pos.getY() + f, pos.getZ() + f, - pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f); + return FULL_BLOCK_AABB.offset(pos).contract(1.0/16.0); } @SideOnly(Side.CLIENT) 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 e78a655b2..b7f42b3c0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; @@ -51,6 +53,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe return new TileTurntable(); } + @SideOnly(Side.CLIENT) @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileTurntable) world.getTileEntity(pos)).renderHUD(mc, res); From ba3f337520fca13d497c247b4e66b8e3551b8ec7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 12:11:51 -0500 Subject: [PATCH 874/935] Remove moss stone botaina recipe, remove old tooltips --- .../vazkii/botania/client/core/handler/TooltipHandler.java | 6 ------ .../java/vazkii/botania/common/core/BotaniaCreativeTab.java | 1 - .../vazkii/botania/common/crafting/ModCraftingRecipes.java | 5 ----- .../java/vazkii/botania/common/lexicon/LexiconData.java | 3 +-- src/main/resources/assets/botania/lang/en_US.lang | 4 ---- src/main/resources/assets/botania/lang/es_AR.lang | 1 - src/main/resources/assets/botania/lang/es_ES.lang | 4 ---- src/main/resources/assets/botania/lang/fr_FR.lang | 3 --- src/main/resources/assets/botania/lang/ja_JP.lang | 5 +---- src/main/resources/assets/botania/lang/ko_KR.lang | 3 --- src/main/resources/assets/botania/lang/nl_NL.lang | 4 ---- src/main/resources/assets/botania/lang/pt_BR.lang | 3 --- src/main/resources/assets/botania/lang/ru_RU.lang | 3 --- src/main/resources/assets/botania/lang/zh_CN.lang | 4 ---- src/main/resources/assets/botania/lang/zh_TW.lang | 4 ---- 15 files changed, 2 insertions(+), 51 deletions(-) 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 57199cec6..8394b13ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -24,12 +24,6 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { - event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); - event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); - } else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode) - event.getToolTip().add(I18n.format("botaniamisc.spawnerTip")); - if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false)) event.getToolTip().add(I18n.format("botaniamisc.hasIvy")); if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 8d0fd68f9..3007a4da1 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -301,7 +301,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.manaBeacon); addItem(ModItems.signalFlare); - addStack(new ItemStack(Blocks.DIRT, 1, 1)); addBlock(ModBlocks.dirtPath); addBlock(ModFluffBlocks.dirtPathSlab); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 5abea5661..d8236f92e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -167,7 +167,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeFireRod; public static IRecipe recipeVineBall; public static IRecipe recipeSlingshot; - public static IRecipe recipeMossStone; public static IRecipe recipeLensInfluence; public static IRecipe recipeLensWeight; public static IRecipe recipeLensPaint; @@ -1118,10 +1117,6 @@ public final class ModCraftingRecipes { 'A', LibOreDict.RUNE[3]); recipeSlingshot = BotaniaAPI.getLatestAddedRecipe(); - // Moss Stone Recipe - addShapelessOreDictRecipe(new ItemStack(Blocks.MOSSY_COBBLESTONE), "cobblestone", new ItemStack(ModItems.vineBall)); - recipeMossStone = BotaniaAPI.getLatestAddedRecipe(); - // Influence Lens Recipe addOreDictRecipe(new ItemStack(ModItems.lens, 1, 12), "PRP", "PLP", "PPP", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7dc56c75b..057675bec 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -945,8 +945,7 @@ public final class LexiconData { vineBall = new BasicLexiconEntry(LibLexicon.TOOL_VINE_BALL, categoryTools); vineBall.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeVineBall), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeMossStone)); + new PageCraftingRecipe("3", ModCraftingRecipes.recipeSlingshot)); laputaShard = new AlfheimLexiconEntry(LibLexicon.TOOL_LAPUTA_SHARD, categoryTools); laputaShard.setLexiconPages(new PageText("0"), new PageText("2"), diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index ad1ce0a2d..de44542c6 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -58,9 +58,6 @@ botaniamisc.shiftToRemove=Shift-click to remove botaniamisc.clickToAdd=Add Bookmark botaniamisc.ratio=%sx Zoom (hover to zoom out) botaniamisc.bottleTooltip=It has an acquired taste -botaniamisc.coarseDirt0=Coarse Dirt, grass -botaniamisc.coarseDirt1=won't grow on it -botaniamisc.spawnerTip=Tip: Use a Spawn Egg to change the mob botaniamisc.shardLevel=Shard Power %s botaniamisc.lexiconIndex=Lexicon Index botaniamisc.hasIvy=Has Timeless Ivy @@ -2977,7 +2974,6 @@ botania.page.vineBall0=&1Ladders&0 can't stand up on their own, they require som botania.page.vineBall1=It's also possible, by combining some materials such as &1Livingwood&0 or a &1Rune of Air&0 to create a slingshot that lets these &1Vine Balls&0 be shot while completely ignoring the force of gravity. botania.page.vineBall2=This would be in Vineacraft... botania.page.vineBall3=...if that actually existed. -botania.page.vineBall4=Oh, and you can make &1Moss Stone&0 too # -- SHARD OF LAPUTA botania.entry.laputaShard=Shard of Laputa diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index 271cefebe..bab3bc81f 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -51,7 +51,6 @@ botaniamisc.shiftToRemove=Shift + click para quitar botaniamisc.clickToAdd=Click para añadir un señalador aquí botaniamisc.ratio=%s:1 Ratio botaniamisc.bottleTooltip=Ha adquirido gusto -botaniamisc.spawnerTip=Tip: Usa un huevo de spawn para cambiar el mob botaniamisc.shardLevel=Shard Power %s botaniamisc.lexiconIndex=Índice del Lexicon diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index cd8d93f2a..a327a1ba5 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift-clic para quitar botaniamisc.clickToAdd=Añadir marcador botaniamisc.ratio=Zoom: %sx botaniamisc.bottleTooltip=Tiene un gusto refinado -botaniamisc.coarseDirt0=Tierra basta, la hierba -botaniamisc.coarseDirt1=no crece sobre ella -botaniamisc.spawnerTip=Consejo: Usa un huevo de engendrar para cambiar la criatura botaniamisc.shardLevel=Potencia de lasca %s botaniamisc.lexiconIndex=Índice del lexicón botaniamisc.hasIvy=Tiene hiedra eterna @@ -2266,7 +2263,6 @@ botania.page.vineBall0=Las &1escaleras de mano&0 no se sostienen por si sola, ha botania.page.vineBall1=También es posible combinando algunos materiales tales como &1madera viviente&0 o una &1runa de aire&0 crear un tirachinas que permite arrojar estas &1bolas de enredadera&0 ignorando completamente la fuerza de gravedad. botania.page.vineBall2=Así sería en Enredacraft... botania.page.vineBall3=...si en realidad existiese. -botania.page.vineBall4=Oh, y se puede hace &1piedra musgosa&0 también # -- SHARD OF LAPUTA botania.entry.laputaShard=Lasca de Laputa diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 7605cbd41..5062906d1 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Maj-cliquez pour retirer botaniamisc.clickToAdd=Marquez la page botaniamisc.ratio=Zoom: %sx botaniamisc.bottleTooltip=Il a un goût d'acquis -botaniamisc.coarseDirt0=terre grossière, l'herbe -botaniamisc.coarseDirt1=ne poussera pas dessus -botaniamisc.spawnerTip=Aide: utilisez un oeuf pour changer la créature botaniamisc.shardLevel=Puissance d'éclat %s botaniamisc.lexiconIndex=Index du lexique botaniamisc.hasIvy=A lierre éternel diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index bf4a1b933..bdcab5d5d 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -50,10 +50,7 @@ botaniamisc.clickToSee=クリックで読む botaniamisc.shiftToRemove=シフト+クリックでお気に入りから外す botaniamisc.clickToAdd=お気に入りに追加 botaniamisc.ratio=%sx 拡大(カーソルで拡大解除) -botaniamisc.bottleTooltip=慣れ親しんだ味 -botaniamisc.coarseDirt0=きめの粗い土 -botaniamisc.coarseDirt1=草が伝播しない -botaniamisc.spawnerTip=Tip: スポーンエッグを使うとモブを変えられる +botaniamisc.bottleTooltip=慣れ親しんだ味 botaniamisc.shardLevel=シャードパワー %s botaniamisc.lexiconIndex=索引 botaniamisc.hasIvy=Has Timeless Ivy diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index a6ddd8074..b668775d6 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -54,9 +54,6 @@ botaniamisc.clickToSee=클릭시 해당페이지 이동 botaniamisc.shiftToRemove=쉬프트클릭시 삭제 botaniamisc.clickToAdd=이곳을 누르면 북마크가 추가됩니다. botaniamisc.ratio=확대: %sx -botaniamisc.coarseDirt0=거친 흙과 잔디 위에서는 -botaniamisc.coarseDirt1=아무것도 자랄 수 없습니다 -botaniamisc.spawnerTip=Tip: 스폰알로 몹을 변경 botaniamisc.shardLevel=%s 등급 botaniamisc.lexiconIndex=목차 botaniamisc.hasIvy=시대를 초월한 담쟁이 덩굴 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index 65d0b5b66..0b01c62b6 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -56,9 +56,6 @@ botaniamisc.shiftToRemove=Shift-klik om te verwijderen botaniamisc.clickToAdd=Favoriet toevoegen botaniamisc.ratio=Inzoomen: %sx botaniamisc.bottleTooltip=Het heeft een verworven smaak -botaniamisc.coarseDirt0=Grof Vuil, gras -botaniamisc.coarseDirt1=wil er niet op groeien -botaniamisc.spawnerTip=Tip: Gebruik een Spawn ei om de mob te wijzigen botaniamisc.shardLevel=Schervenkracht %s botaniamisc.lexiconIndex=Lexicon Index botaniamisc.hasIvy=Heeft Tijdloze Klimop @@ -2791,7 +2788,6 @@ botania.page.vineBall0=&1Ladders&0 kunnen niet op zichzelf staan, ze hebben iets botania.page.vineBall1=Het is ook mogelijk, middels combinatie van enkele materialen zoals &1Levenshout&0 of een &1Rune der Lucht&0, om een katapult te maken die de &1Lianenballen&0 kan afschieten zonder last te hebben van de zwaartekracht. botania.page.vineBall2=Dit zou bestaan in Vinecraft... botania.page.vineBall3=...als dat zou bestaan. -botania.page.vineBall4=Oh, en je kunt ook &1Mossige Steen&0 maken # -- SHARD OF LAPUTA botania.entry.laputaShard=Scherf van Laputa diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index a8fc0754e..e20467680 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shiftclique para remover botaniamisc.clickToAdd=Adicionar Favorito botaniamisc.ratio=Zoom: %sx (passe o mouse para ver normal) botaniamisc.bottleTooltip=Desenvolveu um sabor -botaniamisc.coarseDirt0=Terra áspera, a grama -botaniamisc.coarseDirt1=não crescerá. -botaniamisc.spawnerTip=Dica: Use um ovo de Invocar para mudar o mob botaniamisc.shardLevel=Poder Cristalino %s botaniamisc.lexiconIndex=Índice do Léxico botaniamisc.hasIvy=Possui Hera Eterna diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 79d8510e4..3233b26df 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -53,9 +53,6 @@ botaniamisc.shiftToRemove=Shift+ЛКМ, чтобы удалить botaniamisc.clickToAdd=Добавить закладку botaniamisc.ratio=Соотношение: %sx botaniamisc.bottleTooltip=Вкус на любителя -botaniamisc.coarseDirt0=Грубая земля, трава -botaniamisc.coarseDirt1=не будет расти на ней -botaniamisc.spawnerTip=Подсказка: Используйте яйцо призыва, чтобы сменить моба botaniamisc.shardLevel=Сила осколка %s botaniamisc.lexiconIndex=Оглавление Лексикона botaniamisc.hasIvy=С бессмертным плющом diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index ae0cdb139..ccdc21196 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift点击移除 botaniamisc.clickToAdd=点击添加书签 botaniamisc.ratio=放大:%s倍 botaniamisc.bottleTooltip=味道如何 -botaniamisc.coarseDirt0=劣质土,草 -botaniamisc.coarseDirt1=无法生长 -botaniamisc.spawnerTip=Tip:使用刷怪蛋改变怪物类型 botaniamisc.shardLevel=碎片能量 %s botaniamisc.lexiconIndex=辞典目录 botaniamisc.hasIvy=有永恒常春藤 @@ -2908,7 +2905,6 @@ botania.page.vineBall0=&1梯子&0不能独立存在,它们需要 有依附的东 botania.page.vineBall1=也可以用一些类似&1活木&0和&1风&0 &1之符文&0的材料制作一把能忽 视重力发射&1藤蔓球&0的弹弓. botania.page.vineBall2=这将会在Vineacraft出现.. botania.page.vineBall3=...如果那确实存在的话. -botania.page.vineBall4=哦,你也能制作&1苔石&0 # -- SHARD OF LAPUTA botania.entry.laputaShard=拉普达碎片 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 2f5b1b307..0d594d3df 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -54,9 +54,6 @@ botaniamisc.shiftToRemove=Shift點擊移除 botaniamisc.clickToAdd=點擊添加書籤 botaniamisc.ratio=放大:%s倍 botaniamisc.bottleTooltip=味道如何 -botaniamisc.coarseDirt0=劣質土,草 -botaniamisc.coarseDirt1=無法生長 -botaniamisc.spawnerTip=Tip:使用刷怪蛋改變怪物類型 botaniamisc.shardLevel=碎片能量 %s botaniamisc.lexiconIndex=辭典目錄 botaniamisc.hasIvy=有永恆常春籐 @@ -2917,7 +2914,6 @@ botania.page.vineBall0=&1梯子&0不能獨立存在,它們需要 有依附的東 botania.page.vineBall1=也可以用一些類似&1活木&0和&1風&0 &1之符文&0的材料製作一把能忽 視重力發射&1籐蔓球&0的彈弓. botania.page.vineBall2=這將會在Vineacraft出現.. botania.page.vineBall3=...如果那確實存在的話. -botania.page.vineBall4=哦,你也能製作&1苔石&0 # -- SHARD OF LAPUTA botania.entry.laputaShard=拉普達碎片 From a0a78ea2036871f6875d08c8194511e7052a3b47 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 13:43:18 -0500 Subject: [PATCH 875/935] Build 316 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index bcf2bac3d..4b8e9d8d6 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Aug 03 20:27:38 CDT 2016 +#Mon Aug 15 13:42:37 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.10.2 forge_version=12.18.1.2056 -build_number=316 +mc_version=1.10.2 +dir_repo=./ +build_number=317 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index f936bbdf8..939fa0c04 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-315 \ No newline at end of file +r1.8-316 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 3472c85be..454f412a5 100644 --- a/version/update.json +++ b/version/update.json @@ -6,7 +6,8 @@ "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", - "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315" + "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", + "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -29,8 +30,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-315", - "1.10.2-recommended": "r1.8-315", + "1.10.2-latest": "r1.8-316", + "1.10.2-recommended": "r1.8-316", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index b01956212..ac1ae9a39 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -267,4 +267,5 @@ r1.8-312=1.10.2 r1.8-313=1.9.4 r1.8-313=1.10.2 r1.8-314=1.10.2 -r1.8-315=1.10.2 \ No newline at end of file +r1.8-315=1.10.2 +r1.8-316=1.10.2 \ No newline at end of file From 37eb1a781c2fa208804562665622dfb07964f2f4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 15:34:06 -0500 Subject: [PATCH 876/935] Fix bergamute having a nonmatching color --- .../common/block/subtile/functional/SubTileBergamute.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 099392b34..69b374ad7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -45,7 +45,7 @@ public class SubTileBergamute extends SubTileFunctional { @Override public int getColor() { - return 0x1FCBFF; + return 0xF46C6C; } @Override From a0a742811639be0b13d61dd424a9859b6285d80e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 15:52:51 -0500 Subject: [PATCH 877/935] Bergamute now blocks moving/ticking sounds. Closes #407 --- .../functional/BergamuteEventHandler.java | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 2c290ee59..5674b1c19 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -1,6 +1,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.client.audio.ISound; +import net.minecraft.client.audio.ITickableSound; +import net.minecraft.client.audio.MovingSound; import net.minecraft.client.audio.Sound; import net.minecraft.client.audio.SoundEventAccessor; import net.minecraft.client.audio.SoundHandler; @@ -32,14 +34,18 @@ public class BergamuteEventHandler { ISound sound = evt.getResultSound(); if (sound != null && shouldSilence(sound.getCategory())) { - SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); + if(sound instanceof ITickableSound) { + evt.setResultSound(new WrappedTickableSound((ITickableSound) sound, MULTIPLIER)); + } else { + SubTileBergamute berg = SubTileBergamute.getBergamuteNearby(sound.getXPosF(), sound.getYPosF(), sound.getZPosF()); - if (berg != null) { - evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); + if (berg != null) { + evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); - if (RAND.nextBoolean()) { - Color color = TilePool.PARTICLE_COLOR; - BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + if (RAND.nextBoolean()) { + Color color = TilePool.PARTICLE_COLOR; + BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); + } } } } @@ -54,15 +60,18 @@ public class BergamuteEventHandler { private final ISound compose; private final float volMult; + private final boolean recheck; private WrappedSound(ISound toWrap, float volMult) { this.compose = toWrap; this.volMult = volMult; + this.recheck = toWrap instanceof MovingSound; } @Override public float getVolume() { - return compose.getVolume() * volMult; + float mult = recheck && SubTileBergamute.getBergamuteNearby(getXPosF(), getYPosF(), getZPosF()) == null ? 1F : volMult; + return compose.getVolume() * mult; } @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } @@ -77,4 +86,18 @@ public class BergamuteEventHandler { @Override public float getZPosF() { return compose.getZPosF(); } @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } } + + @SideOnly(Side.CLIENT) + private static class WrappedTickableSound extends WrappedSound implements ITickableSound { + + private final ITickableSound compose; + + private WrappedTickableSound(ITickableSound toWrap, float volMult) { + super(toWrap, volMult); + this.compose = toWrap; + } + + @Override public boolean isDonePlaying() { return compose.isDonePlaying(); } + @Override public void update() { compose.update(); } + } } From 64712d315fe18309e30c9dd4645b04cb99c572b7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 17:14:40 -0500 Subject: [PATCH 878/935] WIP --- .../botania/models/block/miniIsland.json | 435 +++++++++++------- .../botania/models/block/miniIsland_new.json | 182 ++++++++ .../botania/textures/model/miniIsland_new.png | Bin 0 -> 1389 bytes 3 files changed, 458 insertions(+), 159 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/miniIsland_new.json create mode 100644 src/main/resources/assets/botania/textures/model/miniIsland_new.png diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 0b6e40f40..3143f8d27 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -10,172 +10,289 @@ }, "elements": [ { - "name": "Layer1", + "name": "Shape0", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, + "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, + "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, + "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } + } + }, + { + "name": "Shape1-1", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } + } + }, + { + "name": "Shape1-2", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } + } + }, + { + "name": "Shape1-3", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } + } + }, + { + "name": "Shape1-4", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } + } + }, + { + "name": "Shape2-1", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 7.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } + } + }, + { + "name": "Shape2-2", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } + } + }, + { + "name": "Shape2-3", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } + } + }, + { + "name": "Shape2-4", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } + } + }, + { + "name": "Shape2-5", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 7.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } + } + }, + { + "name": "Shape2-6", + "from": [ 5.0, 4.0, 9.0 ], + "to": [ 7.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } + } + }, + { + "name": "Shape2-7", + "from": [ 9.0, 4.0, 9.0 ], + "to": [ 11.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } + } + }, + { + "name": "Shape2-8", + "from": [ 9.0, 4.0, 5.0 ], + "to": [ 11.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } + } + }, + { + "name": "Shape3-1", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 7.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } + } + }, + { + "name": "Shape3-2", + "from": [ 3.0, 5.0, 9.0 ], + "to": [ 5.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } + } + }, + { + "name": "Shape3-3", + "from": [ 9.0, 5.0, 11.0 ], + "to": [ 11.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } + } + }, + { + "name": "Shape3-4", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 7.0, 7.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } + } + }, + { + "name": "Shape3-5", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } + } + }, + { + "name": "Shape3-6", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 7.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } + } + }, + { + "name": "Shape3-7", + "from": [ 11.0, 5.0, 9.0 ], + "to": [ 13.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } + } + }, + { + "name": "Shape3-8", + "from": [ 9.0, 5.0, 3.0 ], + "to": [ 11.0, 7.0, 5.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } + } + }, + { + "name": "Shape4-1", "from": [ 3.0, 6.0, 3.0 ], + "to": [ 5.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } + } + }, + { + "name": "Shape4-2", + "from": [ 3.0, 6.0, 11.0 ], + "to": [ 5.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } + } + }, + { + "name": "Shape4-3", + "from": [ 11.0, 6.0, 11.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } } }, { - "name": "Layer2North", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 11.0, 6.0, 5.0 ], + "name": "Shape4-4", + "from": [ 11.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } - } - }, - { - "name": "Layer2South", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 11.0, 6.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } - } - }, - { - "name": "Layer2West", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } - } - }, - { - "name": "Layer2East", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } - } - }, - { - "name": "Layer3Center", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 5.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Layer3North", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 5.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3South", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 5.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3West", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3East", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4North", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 4.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4South", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 4.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4West", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4East", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer5", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 3.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } } } ] diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json new file mode 100644 index 000000000..f7d029511 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -0,0 +1,182 @@ +{ + "__comment": "Author: wiiv", + "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.75, 0.75, 0.75 ] + } + }, + "elements": [ + { + "name": "Layer1", + "from": [ 3.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 13.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + }, + { + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png new file mode 100644 index 0000000000000000000000000000000000000000..a054c4cc8a4e53dfe552aff755ed29a750ddc44e GIT binary patch literal 1389 zcmV-z1(N!SP)acK-Wz_s!ckZ)OFkh(&{BWidk3$D8|O(V%Ak%3?&fe?Bxr=0h{O{d(8$ zG(GAA$xL4Ngo$A*?AjF3nZS-VS3bucshsAe_rDNU~?ydWG3IR zPp=ma_|NI6y@y-7TsIxS)6snT;uQciMwhnXfFGgRsmAYkI)}sYP>Ufgom#KfY1yT^ zZo^NG^dlVbL#y4~NgyT3jo&FrM&a4-ErzsoYQ0*gWtZx@?f@EkTJ6NJ7r@zwynK_@ z%n{AHcske6sr71|TCdi1o1V>`1OPO=t!^Lu_Jn)a0sxl3m?M8-62OylhUmLHG3+HN zN!EOKX%6}H+h5xD)7(Mrb(u5W9W z!ZfK-dy^ymNM`c5KX3xUbhY~+AmB=GTb*m)9j~v1Xf}CeWRli4*2myE`>)w zK5BceTKA1_qOD#%%0_m(#f2h(7B6!HbEb8AdOFf(?J^jh$MpMl`>Wd|xUT>Jp5OFh zE!KX|POU3tO9<{OEjv50Xpl7b8`)(r7z_rZ^H@6N+*`g!YLyz4iUJUT5CU6|4bFZi zPGKS zFUt8c1do8ST!uIxHuOeI&2qEBY zJdQF)c)a}Bviq_$0_?qZR7+KO#yuz=6hZ0)r?pd*VVSQ5|pxnp_w5ZygK_&z>#!>`e_}BKU46$ z?}4Mw(a^`DLESIKMjNbVu+#w@$H6`3Mn0JbI6&|Ss8wok^f}-fa>3y`Yn##glKc|Z vZJsh13c700000NkvXXu0mjf+Owc~ literal 0 HcmV?d00001 From 5392f00ff9990ec3291e61879f4af8d258ac1cb6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 16 Aug 2016 18:09:06 -0500 Subject: [PATCH 879/935] Fix orechid running clientside, closes #447 --- .../botania/common/block/subtile/functional/SubTileOrechid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c71e5888f..322519a6f 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 @@ -46,7 +46,7 @@ public class SubTileOrechid extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(supertile.getWorld().isRemote && redstoneSignal > 0 || !canOperate()) + if(supertile.getWorld().isRemote || redstoneSignal > 0 || !canOperate()) return; int cost = getCost(); From 28aa8bc0d50add42b8338124716aa22c945f8a07 Mon Sep 17 00:00:00 2001 From: 3TUSK Date: Tue, 16 Aug 2016 21:20:42 -0400 Subject: [PATCH 880/935] Update zh_CN.lang Signed-off-by: 3TUSK --- .../resources/assets/botania/lang/zh_CN.lang | 275 ++++++++++++------ 1 file changed, 186 insertions(+), 89 deletions(-) diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index ccdc21196..22a736a27 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -11,6 +11,10 @@ itemGroup.Botania=植物魔法 generator.botania-skyblock=水晶花园 generator.botania-skyblock.info=不推荐植物魔法新手使用 +# Something that is not localized, translators, do NOT change this line. +# You do not need to copy this into your lang file 请勿将此条目重新复制到zh_CN.lang中 谢谢合作 +# [EXPUNGED] -> Occupying space so that it looks like zh_CN has same line number as en_US + botaniamisc.nextPage=下一页 botaniamisc.prevPage=上一页 botaniamisc.back=返回 @@ -209,6 +213,14 @@ botania.color14=红色 botania.color15=黑色 botania.color16=彩虹色 +# RANKS - PLEASE DO NOT COPY ENTRIES BACK THANKS - 请勿重新将条目复制到此处,这些行仅供占位用 +# [EXPUNGED] +# [EXPUNGED] +# [EXPUNGED] +# [EXPUNGED] +# [EXPUNGED] +# [EXPUNGED] + # ZODIAC SIGNS botania.sign0=白羊 botania.sign1=金牛 @@ -261,6 +273,39 @@ botania.armorset.will3.shortDesc=暴击施加重度缓慢效果 botania.armorset.will4.shortDesc=暴击伤害穿透护甲 botania.armorset.will5.shortDesc=暴击施加凋零效果 +# ROMAN NUMERALS +# +# PLEASE +# DON'T +# COPY +# THESE +# EXPUNGED +# ENTRIES +# BACK +# HERE +# +# THESE +# EMPTY +# LINES +# ARE +# LEFT +# ON +# PURPOSE +# THANKS +# +# 注: +# 罗马数字不需要翻译 +# 请勿将对应条目重新 +# 复制回此处,这些空 +# 行仅供占位用,谢谢 +# +# +# +# +# +# +# + # KNOWLEDGE botania.knowledge.minecraft=原版的知识 botania.knowledge.alfheim=&a精灵&7的知识 @@ -421,12 +466,12 @@ entity.Botania.botania:manaStorm.name=魔力风暴中心 entity.Botania.botania:babylonWeapon.name=贮藏库武器 entity.Botania.botania:fallingStar.name=落星 -# ACHIEVEMENT NAMES + DESC (Due to the fact that most achievement names have references to vocaloid song names, please use original name or common name first, thanks.)(以下成就名多为曲名,因此大多使用惯用名) +# ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Sky of Beginning achievement.botania:flowerPickup.desc=拾取一朵神秘花 -achievement.botania:lexiconUse=现実的论理主义者 +achievement.botania:lexiconUse=現実的論理主義者 achievement.botania:lexiconUse.desc=打开一本植物魔法辞典并浏览目录 -achievement.botania:daybloomPickup=拂晓抵达 +achievement.botania:daybloomPickup=アカツキアライヴァル achievement.botania:daybloomPickup.desc=在花药台制作一朵太阳花 achievement.botania:manaPoolPickup=Vivid Wave achievement.botania:manaPoolPickup.desc=将稀释魔力池升级为普通的魔力池 @@ -452,23 +497,23 @@ achievement.botania:elfPortalOpen=World Calling achievement.botania:elfPortalOpen.desc=打开通往精灵王国的传送门 achievement.botania:gaiaGuardianKill=Dead and Seek achievement.botania:gaiaGuardianKill.desc=在盖亚仪式中召唤并击杀一只盖亚守护者 -achievement.botania:terrasteelWeaponCraft=Remote Paranoia +achievement.botania:terrasteelWeaponCraft=絶境パラノイア achievement.botania:terrasteelWeaponCraft.desc=用泰拉锭制作的武器武装你自己 achievement.botania:kekimurusPickup=放課後ストライド achievement.botania:kekimurusPickup.desc=制作一朵贪食花来提供大量魔力 -achievement.botania:heiseiDreamPickup=Heisei Cataclysm +achievement.botania:heiseiDreamPickup=ヘイセイカタクリズム achievement.botania:heiseiDreamPickup.desc=制作一朵平成之梦让怪物们窝里斗 achievement.botania:dirtRodCraft=Rockbell achievement.botania:dirtRodCraft.desc=制作一根泥棍子...哦不,是大地法杖 -achievement.botania:spawnerMoverUse=I can take off my (redacted) +achievement.botania:spawnerMoverUse=I can take off my [redacted] achievement.botania:spawnerMoverUse.desc=用一个生命聚合器来转移刷怪笼 achievement.botania:enderAirMake=Imitation Air achievement.botania:enderAirMake.desc=收集一瓶末地空气 achievement.botania:corporeaCraft=Drop Pop Candy achievement.botania:corporeaCraft.desc=合成一个使用多媒体网络的方块 -achievement.botania:cacophoniumCraft=Noisy Lover Soul +achievement.botania:cacophoniumCraft=ノイジーラバーソウル achievement.botania:cacophoniumCraft.desc=制作一个不和谐之音来激怒你的敌人 -achievement.botania:manaCartCraft=World Domination How-To +achievement.botania:manaCartCraft=ハウトゥー世界征服 achievement.botania:manaCartCraft.desc=制作一个用魔力矿车进行的长距离魔力运输系统。 achievement.botania:craftingHaloCraft=Segments Blue achievement.botania:craftingHaloCraft.desc=制作一个合成环以方便合成 @@ -478,13 +523,13 @@ achievement.botania:enchanterMake=Odds and Ends achievement.botania:enchanterMake.desc=制作一个魔力附魔台来更好的控制附魔 achievement.botania:pollidisiacPickup=Romeo and Cinderella achievement.botania:pollidisiacPickup.desc=做一个畜牧花,在空气中制造爱情立场 -achievement.botania:brewPickup=Childhood Blues +achievement.botania:brewPickup=オサナナブルー achievement.botania:brewPickup.desc=制作一个植物酿造台并用他酿造所有种类的药水 -achievement.botania:terraformRodCraft=World is Mine +achievement.botania:terraformRodCraft=ワールドイズマイン achievement.botania:terraformRodCraft.desc=制作一把泰拉高并用他改变世界地形 achievement.botania:bubbellPickup=深海少女 achievement.botania:bubbellPickup.desc=制作一株气泡铃来方便水下建筑 -achievement.botania:luminizerRide=World's End Dancehall +achievement.botania:luminizerRide=ワールズエンド ダンスホール achievement.botania:luminizerRide.desc=制作一些微光并用它来进行传输 achievement.botania:manaBombIgnite=Under of Fragments achievement.botania:manaBombIgnite.desc=制作一个魔力风暴,并在宽阔的地方点燃它 @@ -506,8 +551,8 @@ achievement.botania:pinkinator.desc=使用粉色手炮 achievement.botania:infiniteFruit=Innocentia achievement.botania:infiniteFruit.desc=获得战利品:禁忌果实 -achievement.botania:excaliber=Streaming Heart -achievement.botania:excaliber.desc=获得战利品:王者圣剑 +achievement.botania:kingKey=A Fake, Fake Psychotropic +achievement.botania:kingKey.desc=获得战利品:王之宝钥 achievement.botania:flugelEye=Angel of Death achievement.botania:flugelEye.desc=获得战利品:天翼族之眼 achievement.botania:thorRing=One Step Layered @@ -1027,6 +1072,8 @@ tile.botania:lightLauncher.name=微光发射器 tile.botania:livingrock0Wall.name=活石墙 tile.botania:livingwood0Wall.name=活木墙 tile.botania:dreamwood0Wall.name=梦之木墙 +tile.botania:prismarine0Wall.name=海晶石墙 +tile.botania:reedBlock0Wall.name=甘蔗块墙 tile.botania:biomeStoneA0Wall0.name=变质森林石墙 tile.botania:biomeStoneA0Wall1.name=变质平原石墙 tile.botania:biomeStoneA0Wall2.name=变质高山石墙 @@ -1035,6 +1082,10 @@ tile.botania:biomeStoneA0Wall4.name=变质沼泽石墙 tile.botania:biomeStoneA0Wall5.name=变质沙漠石墙 tile.botania:biomeStoneA0Wall6.name=变质雪原石墙 tile.botania:biomeStoneA0Wall7.name=变质高原石墙 +tile.botania:stone0Wall0.name=安山岩墙 +tile.botania:stone0Wall1.name=玄武岩墙 +tile.botania:stone0Wall2.name=闪长岩墙 +tile.botania:stone0Wall3.name=花岗岩墙 tile.botania:manaBomb.name=魔力风暴 tile.botania:buriedPetals0=埋藏白色花瓣 tile.botania:buriedPetals0.name=埋藏白色花瓣 @@ -1222,6 +1273,8 @@ tile.botania:flower.solegnolia.name=弱磁兰 tile.botania:flower.solegnolia.reference=你的磁力都归我们了 tile.botania:flower.solegnoliaChibi.name=小弱磁兰 tile.botania:flower.solegnoliaChibi.reference=你的磁力都归我们了 +tile.botania:flower.bergamute.name=消音柑 +tile.botania:flower.bergamute.reference=啊咧嘴被堵上了 # ITEM NAMES item.botania:lexicon.name=植物魔法辞典 @@ -1359,7 +1412,7 @@ item.botania:terrasteelHelm.name=泰拉钢头盔 item.botania:terrasteelChest.name=泰拉钢胸甲 item.botania:terrasteelLegs.name=泰拉钢护腿 item.botania:terrasteelBoots.name=泰拉钢靴子 -item.botania:terra剑.name=泰拉之刃 +item.botania:terraSword.name=泰拉之刃 item.botania:tinyPlanet.name=行星项链 item.botania:manaRing.name=魔力之戒 item.botania:auraRing.name=光环之戒 @@ -1396,9 +1449,9 @@ item.botania:elementiumChest.name=源质钢胸甲 item.botania:elementiumLegs.name=源质钢护腿 item.botania:elementiumBoots.name=源质钢靴子 item.botania:elementiumPick.name=源质钢镐 -item.botania:elementium铲.name=源质钢铲 -item.botania:elementium斧头.name=源质钢斧 -item.botania:elementium剑.name=源质钢剑 +item.botania:elementiumShovel.name=源质钢铲 +item.botania:elementiumAxe.name=源质钢斧 +item.botania:elementiumSword.name=源质钢剑 item.botania:elementiumShears.name=源质钢剪 item.botania:openBucket.name=无底桶 item.botania:spawnerMover.name=生命聚合器 @@ -1452,7 +1505,7 @@ item.botania:cobbleRod.name=深渊法杖 item.botania:smeltRod.name=炽心法杖 item.botania:worldSeed.name=世界之种 item.botania:spellCloth.name=封印之布 -item.botania:thornChakram.name=荆棘飞轮 +item.botania:thornChakram0.name=荆棘飞轮 item.botania:thornChakram1.name=闪耀飞轮 item.botania:overgrowthSeed.name=增生之种 item.botania:craftPattern0.name=合成模板#1: 1x1 @@ -1593,6 +1646,10 @@ botania.potion.clear=赦免 botania.gui.lexicon.header=植物魔法辞典 第%s版 - 目录 botania.gui.lexicon.wip=(本条目的编纂工作仍在进行,其当前内容仍未完全定稿) +# MUSIC DISCS - Unless there is good tranlsation, please left these two as comment - 除非有合适的翻译,否则请不要移除下面两行开头的#注释标记 +# item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness +# item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence + # BANNER NAMES item.banner.botania_flower.black=黑色神秘花 item.banner.botania_flower.red=红色神秘花 @@ -1882,7 +1939,6 @@ botania.page.tutorial0=尽管你可以随意浏览本书的 各个章节,我们 # -- GARDEN OF GLASS botania.entry.gardenOfGlass=水晶花园 - botania.tagline.gardenOfGlass=你的新挑战 botania.page.gardenOfGlass0=在&2水晶花园&0里,没有人会听 见你的尖叫声.
    这是一个单独的空间.
    多么令人振奋. botania.page.gardenOfGlass1=&2水晶花园s&0植物魔法的空岛模 式.他只适合那些了解植魔 的抖M们, 但如果你是新 人,我们也很乐意你体验一下.
    MOD中绝大多数的功能不变 ,但我们调整了一部分地方 以适应空岛环境。调整的地 方见下页. @@ -1914,6 +1970,7 @@ botania.page.flowers2=这些花可以采摘用于获取&1神&0 &1秘花瓣&0,可 botania.page.flowers3=摘取花瓣. botania.page.flowers4=合成&1杵和臼&0. botania.page.flowers5=将花瓣磨成粉. +botania.page.flowers5.5=将寻常花磨成粉. botania.page.flowers6=通过将&1花粉&0和一些&1骨粉&0混合, 能做出一个不同种的肥料.那 就是&1花肥&0,会在附近区域催生 出少量&1神秘花&0,如果你没有把 它用完的话. botania.page.flowers7=制作花肥(任意花粉均有效) botania.page.flowers8=用指定的染料同样有效 @@ -1921,6 +1978,7 @@ botania.page.flowers10=&1神秘花&0也存在着高的一种.只 能用&1剪刀& botania.page.flowers12=
    也能通过对&1神秘花&0或者&1地上 的花瓣&0使用&1骨粉&0来人工制造 它.
    如果你发现某种特定颜色的 花瓣不够了,试着将它放在地 上并对它使用&1骨粉&0. botania.page.flowers11=以备不时之需 botania.page.flowers9=花瓣也能做成方块 +botania.page.flowers13=完全相反的方向 # -- PETAL APOTHECARY botania.entry.apothecary=花药台 @@ -1985,6 +2043,7 @@ botania.page.terrasteel0=&1泰拉钢&0是一种复杂的魔法合金 ,需注入 botania.page.terrasteel1=制作泰拉凝聚板 botania.page.terrasteel2=泰拉凝聚板放置好且已做好接 收&4魔力&0的准备之后,将一个&1魔 力钢锭,魔力钻石与魔力珍珠&0 掷于其顶部即可开始注魔.
    此过程中拾起任何物品均会使 注魔骤停,导致严重的 &4魔力流失&0.注魔将会使用一半 &1魔力池&0的魔力以制作一小块 &4泰拉钢&0,多个&1火花&0可加快注魔 速度. botania.page.terrasteel3=制作&1泰拉钢&0的模型 +# No translation # botania.page.terrasteel4=T.A. Plate # -- BLACK LOTUS botania.entry.blackLotus=黑莲花 @@ -2041,6 +2100,7 @@ botania.page.pool11=制作&1魔力玻璃&0,透明且无缝的玻璃. botania.page.pool12=制作&1线&0 botania.page.pool13=使用&1蕴魔丝线&0制作&1蜘蛛网&0 botania.page.pool7=注魔&1魔力曲奇&0,味道好极了. +botania.page.pool15=制作&1海晶碎片&0 # -- SPARKS botania.entry.sparks=火花 @@ -2070,11 +2130,13 @@ botania.page.distributor1=合成分配器 botania.entry.manaVoid=魔力销毁器 botania.tagline.manaVoid=销毁一切进来的魔力 botania.page.manaVoid0=&1魔力销毁器&0通俗的说,就是&4魔&0 &4力&0的垃圾桶.所有进入这个方 块的&4魔力&0都会消失在虚空,再 也不会出现.
    将它放在一个&1魔力池&0下方会 让池子总是接收&4魔力&0,但销毁 超出容量的部分. +# No translation # botania.page.manaVoid1=Even Chad from accounting? # -- MANA FLUXFIELD botania.entry.rfGenerator=魔力转换器 botania.tagline.rfGenerator=魔力变RF啦! botania.page.rfGenerator0=将&4魔力&0引入红石能量场,就可 以将其从自然能量源形态转 为&4红石流量&0.
    将一魔力发射器对向此方块, 就可把进入其中的&4魔力&0转化 为&4RF&0.之后就能用各种传输&4RF&0 的装置来输出. +# No translation # botania.page.rfGenerator1=The bullet guys. I bit it. # -- MANA LENSES botania.entry.lens=魔力透镜 @@ -2137,7 +2199,7 @@ botania.tagline.manaDetector=检测脉冲并发射红石信号 botania.page.manaDetector0=像&1魔力检测器&0这样的设备可 以在&4魔力脉冲&0穿过它时检测 到魔力(脉冲不会因与它的撞 击而损耗)并发出一个红石信 号. botania.page.manaDetector1=合成检测器 -# -- REDSTONE MANA SPREADER +# -- PULSE MANA SPREADER botania.entry.redstoneSpreader=红石魔力发射器 botania.tagline.redstoneSpreader=红石信号控制的魔力发射器 botania.page.redstoneSpreader0=通过组合&1魔力发射器&0与&1红石&0, 就能做出&1红石魔力发射器&0,它 只在收到&4红石信号&0时才会发 射脉冲,不管末端是否有可接 收魔力的方块.
    值得一提的是.只有发出去的 脉冲因魔力流失而消失或被 吸收了才会允许下一波的发 射. @@ -2304,12 +2366,14 @@ botania.page.tangleberrie1=&o纠缠,勇敢和冻结&r. botania.entry.jiyuulia=自由之翼 botania.tagline.jiyuulia=赶走怪物 botania.page.jiyuulia0=&1自由之翼&0是种消耗少量&4魔力&0 而使得所有邻近的动物和怪 物无法进入一个圈内的花. +# No translation # botania.page.jiyuulia1=&oHR HD DT Masterpiece&r. # -- RANNUNCARPUS botania.entry.rannuncarpus=手掌花 botania.tagline.rannuncarpus=放置方块 botania.page.rannuncarpus0=真是朵方便的花,&1手掌花&0会拾 取附近任何掉落物品形式的 方块并放置在其他地方.只会 将方块放置在特殊的方块上, 要指定这种特殊方块,只需将 它放在这朵花种植的土方块 下就可以. botania.page.rannuncarpus1=方块式物品,比如&1甘蔗&0也会奏 效的,但,就像这些方块一样, 它们只能被放在平常能放置 的地方.
    最后,提供&4魔力&0不是必需的, 但这会增加工作范围. +# No translation # botania.page.rannuncarpus2=&oThe Sandpit of Yanille&r? # -- HYACIDUS botania.entry.hyacidus=毒风信 @@ -2353,6 +2417,7 @@ botania.tagline.spectranthemum=传送物品 botania.page.spectranthemum0=长途运输物品是一个艰巨的 任务.水路和&1扇水仙&0也没法简 单完成这个任务.&1凌空蓟&0会消 耗少量&4魔力&0将周围的掉落物 传送到另一个地点.传送过一 次之后,其他同类的花就不能 用于传送该种物品. botania.page.spectranthemum1=为了指定物品的去向,可以使 用&1森林法杖&0的绑定模式来绑 定这朵花和某个方块,就像绑 到魔力池上一样.仅在12格以 内有效.查看这朵花绑定的方 块就像查看魔力池传输&4魔力&0 那样,潜行时用法杖指向它即 可. botania.page.spectranthemum2=这朵花受&4区块加载机制&0所限, 因此它不会作用于未加载的 区块.这里就不多加叙述了.
    &o推荐查询: "Chunks and Chicken", "Anchors of the World". +# No translation # botania.page.spectranthemum3=&o(n)spooky(n+2)me&r. # -- MEDUMONE botania.entry.medumone=石化草 @@ -2378,7 +2443,13 @@ botania.page.bubbell1=&o就像一些休闲游戏&r. botania.entry.solegnolia=弱磁兰 botania.tagline.solegnolia=创造一个磁化指环无法工作的地方 botania.page.solegnolia0=&1磁化指环&0对于搜集材料的人 而言十分便利,但这也会让他 们陷入另一个麻烦:总是会捡 起不需要的物品.
    &1弱磁兰&0会抑制指环的能力并 阻止任何物品被吸往佩戴指 环的人.这朵花不会消耗任何 魔力,尽管它有一个魔力缓存 区(也许是bug). -botania.page.solegnolia1=On/Off +botania.page.solegnolia1=开/关 + +# -- BERGAMUTE +botania.entry.bergamute=消音柑 +botania.tagline.bergamute=吸收音波 +botania.page.bergamute0=一个人若是有当牧场主的经历, 他就一定不会忘记动物们发出 的那刺耳的声音 - 那是,痛 苦的回忆。而这&1消音柑&0,则可以 吸收附近的声音,并转化成数 量基本可以无视魔力。吸收声 音的过程不需要消耗&4魔力&0。 +botania.page.bergamute1=もう歌しか聞こえない # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION @@ -2404,18 +2475,13 @@ botania.page.primusLoci1=这些花与&1太阳花&0或&1夜颠茄&0别 无二致, botania.entry.daybloom=太阳花 botania.tagline.daybloom=天空中的魔力 botania.page.daybloom0=&1太阳花&0是最基本的&4产能花&0.简 而言之,它进行着特别的光合 作用,将阳光转化为&4魔力&0.
    这个过程十分缓慢,需要十朵 甚至更多才能有所产出,当下 而言. -botania.page.daybloom1=这些花会相互争夺光照,因此 在邻近的四个面有同类花时 会减少&4魔力&0的产量.
    作为初期的花它们的效率有 限,或许升级为&1火红莲&0或其他 的花是个不错的选择. -botania.page.daybloom1a=若有其他&1太阳花&0相邻则会减 少&4魔力&0的产量.
    这种花的生命力不太顽强,因 此过段时间后就会枯萎死亡.
    作为初期的花它们的效率有 限,或许升级为&1火红莲&0或其他 的花是个不错的选择. -botania.page.daybloom3=产出缩减 +botania.page.daybloom1=这些花会相互争夺光照,因此 在邻近的四个面有同类花时 会减少&4魔力&0的产量.
    &1太阳花&0是一种&4被动产能花&0,这 意味着她们终将枯萎.
    作为初期的花它们的效率有 限,或许升级为&1火红莲&0或其他 的花是个不错的选择. botania.page.daybloom2=&o崭新的一天开始了&r. -botania.page.daybloom4=&o你们中有多少人曾为爱所伤? 又有多少次你发誓不会再爱? 有多少孤独寂寞的不眠之夜? 有过多少谎言?多少斗争?你 又为何每次都要重新卷入其 中?"爱即是痛,"我听见了你 的话语.爱有着残酷而又痛苦 的方法来报复你所遗弃的信 念. (...) -botania.page.daybloom5=&o当你最需要的反而让你变得 存在薄弱,那又是何种感觉? 你再也不想迷失在悲伤之中. 可能会有一天,下着淅淅沥沥 的雨,你打开了一本老书.看 见了一张照片,那是当你们还 在一起的时候她所留下的笑 容.你也可能会在路上漫步, 随着思绪而行.但她的笑脸一 直在脑海中挥之不去... # -- NIGHTSHADE botania.entry.nightshade=夜颠茄 botania.tagline.nightshade=月光中的魔力 -botania.page.nightshade0=&1夜颠茄&0是黑暗版的&1太阳花&0,它 会在&1太阳花&0不能工作的情况 下被动产生&4魔力&0,尽管只有一 半的速度.
    同样它也会因邻近的个体而 降低效率. -botania.page.nightshade0a=&1夜颠茄&0是黑暗版的&1太阳花&0,它 会在&1太阳花&0不能工作的情况 下被动产生&4魔力&0,尽管只有一 半的速度.
    同样它也会因邻近的个体而 降低效率.而且这种花的生命 力不太顽强,过段时间后就会 枯萎死亡. +botania.page.nightshade0=&1夜颠茄&0是黑暗版的&1太阳花&0,它 会在&1太阳花&0不能工作的情况 下被动产生&4魔力&0,尽管只有一 半的速度.
    同样它也会因邻近的个体而 降低效率.
    和太阳花一样,夜颠茄也是&4被 动产能花&0,她们也终将会枯萎. botania.page.nightshade1=&o白日的阴影&r. # -- ENDOFLAME @@ -2423,21 +2489,22 @@ botania.entry.endoflame=火红莲 botania.tagline.endoflame=燃烧产能 botania.page.endoflame0=尽管&1太阳花&0很好,对植物魔法 师而言还需要更有效的生产 &4魔力&0的方法.
    &1火红莲&0恰好是那样的,它会吸 收掉落在附近的任何可燃物 品和方块(每次一个)并在燃 烧期间释放出魔力. botania.page.endoflame1=有个小提示,&1火红莲&0不会燃烧 有燃烧产物的物品,比如&1岩浆&0 &1桶&0,会留下&1空桶&0.
    根据它们的特性,你在书中所 见的&1花格箱&0或许能助你实现 它的补给. +botania.page.endoflame3=由于&1火红莲&0通常是植物魔法师们在自动化&4主动产能花&0的道路上迈出的第一步,这里不建议一直手动管理火红莲.因为火红莲只会燃烧掉落物,使用&1花格箱&0(相关介绍可在&4自然装置&0部分找到)或者其它装置(计时器、压力板等等)进行自动化会是理想的选择. botania.page.endoflame2=&o不是闪耀之光&r. # -- HYDROANGEAS botania.entry.hydroangeas=水绣球 botania.tagline.hydroangeas=水力产魔机 -botania.page.hydroangeas0=尽管被动的&4魔力&0生产可以通 过&1太阳花&0轻松实现,同样便利 的方法也是有的.&1水绣球&0会吸 取以它为中心3x3范围内等 高的&1静水&0,从中产生&4魔力&0.
    似乎&4下雨&0天会更快,但有谁会 想到呢? -botania.page.hydroangeas0a=&1水绣球&0会吸取3x3范围内等高 的&1静水&0,从中产生&4魔力&0.
    似乎&4下雨&0天会更快,但有谁会 想到呢?
    就像&1太阳花&0,这种花的生命力不太顽强 ,因此过段时间后就会枯萎死 亡. +botania.page.hydroangeas0=尽管被动的&4魔力&0生产可以通 过&1太阳花&0轻松实现,同样便利 的方法也是有的.&1水绣球&0会吸 取以它为中心3x3范围内等 高的&1静水&0,从中产生&4魔力&0.
    似乎&4下雨&0天会更快,但有谁会 想到呢?
    &1水绣球&0亦是&4被动产能花&0,她们 也会有凋谢的一天. botania.page.hydroangeas2=一个简单的&1水绣球&0系统 -botania.page.hydroangeas3=这些花,类似&1太阳花&0和&1夜颠茄&0 ,如果种得太紧密则会降低效 率.将两株&1水绣球&0相聚一格或 对角种下都会使得产能效率 缩减,因为根部相互缠绕了. 种得越密缩减的就越厉害.花 之间的蓝色粒子便是缩减的 标志. botania.page.hydroangeas1=&o超次元来物&r? # -- THERMALILY botania.entry.thermalily=炽玫瑰 botania.tagline.thermalily=地热发电植魔版 -botania.page.thermalily0=有时候产能速度太慢了,就像 &1水绣球&0和&1火红莲&0.这个问题的 答案就是&1炽玫瑰&0,原理类似&1水&0 &1绣球&0,但它吸收的是&1岩浆&0.它 会在消耗&1岩浆&0时迅速产生大 量的&1魔力&0,这也会让它过热, 因此它在重新开始产能前还 需要一些时间来冷却. +botania.page.thermalily0=有时候产能速度太慢了,就像 &1水绣球&0和&1火红莲&0.这个问题的 答案就是&1炽玫瑰&0,原理类似&1水&0 &1绣球&0,但它吸收的是&1熔岩&0.它 会在消耗&1熔岩&0时迅速产生大 量的&1魔力&0,这也会让它过热, 因此它在重新开始产能前还 需要一些时间来冷却. +botania.page.thermalily2=在工作阶段时,&1炽玫瑰&0产出的&4魔力&0的量十分之高,十分适合应对短时间内需要大量消耗魔力的情况.
    在它进入“冷却阶段”时,它依旧会消耗熔岩,但不会产出任何&4魔力&0,直到5分钟的冷却期结束后方能继续产出魔力. +botania.page.thermalily3=虽然&1发射器&0可以胜任自动放置&1熔岩&0的工作,但自动收集&4下界&0或地底深处的熔岩并用来自动产出魔力却完全是另外一回事.
    因此,&1炽玫瑰&0被归类为“半自动化产能花”. botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA @@ -2472,15 +2539,12 @@ botania.page.gourmaryllis0=&1彼方兰&0是朵饥饿的花.它会吃 掉它附 botania.page.gourmaryllis1=消化美味的时间取决于它的 营养值,通俗来说,就是食物 所含的饱食度.
    因此,一个&1牛排&0需要4秒来消 化,一个&1胡萝卜&0则需要2秒,一 个&1面包&0就需要2.5秒,以此类 推. botania.page.gourmaryllis2=&4魔力&0的产量也取决于这个值, 食物越有营养它的效率就越 高.举例来说,单个&1牛排&0能比 两根&1胡萝卜&0产生更多的&1魔力&0, 无论是总量还是每秒的. botania.page.gourmaryllis3=&o为我们的新房客准备的火锅&r. -botania.page.gourmaryllis4=&o哇哦.如果人在它们死后吃了 它们,就会想起一些恐怖和负 面的事.但是你知道这是因为 你的残忍导致的结果,想一想, 人们吃的鱼儿像你一样活着.
    Job活着的时候说:"为什么你 总是这么无情地跟着我,活着 吃我,病了也吃我".你希望看 到这样的Job么?(...) -botania.page.gourmaryllis5=&o就像一个犯了罪或被指控为 罪犯的人看着那些要吃他的 人一样.警察吃他,狱卒吃他,记 录员吃他,原告吃他,调查者吃 他,律师吃他,证人吃他,法官吃 他,然后他甚至还没被宣判就 已经被吃了.更糟糕的是人并 不是鸡.(...) -botania.page.gourmaryllis6=&o更令人伤心的是一个要被绞 死的人,执行死刑之后只 有乌鸦来吃他,而被审判的人, 甚至不执行处决就已经被吃 了
    真正的恶魔是吃别人的人,无 论是那些吃得最多的,还是 吃的最少的.因为你们便是地 上的盐,盐若失去了滋味,可 用什么使它再变咸呢.(新约) # -- NARSLIMMUS botania.entry.narslimmus=粘球草 botania.tagline.narslimmus=黏黏魔法 botania.page.narslimmus0=这个世界上一些地方还存在 着未知的能量场,那里能产生 &1史莱姆&0.人们称其&4史莱姆区块&0 .&1粘球草&0就能利用这种能量.如 果它被种在了一只由那种能 量生出的&1史莱姆&0旁边,它就会 将其分解并收集由其产生的 所有&4魔力&0.&1史莱姆&0越大,产生 的&4魔力&0就越多.它也会弄得黏 黏糊糊的. -botania.page.narslimmus1=&oStick around, would ye&r? +# No translation # botania.page.narslimmus1=&oStick around, would ye&r? # -- SPECTROLUS botania.entry.spectrolus=斑斓花 @@ -2514,7 +2578,7 @@ botania.page.dandelifeon7=&1细胞方块&0可由&1仙人掌&0,&1胡萝卜&0 和& botania.page.dandelifeon8=&o细胞工艺^2&r. botania.page.dandelifeon9=制作&1细胞方块&0 -# - MAGICAL APPARATUS +# - NATURAL APPARATUS # -- MANA PYLON botania.entry.pylon=魔法水晶 botania.tagline.pylon=附魔强化者 @@ -2567,7 +2631,7 @@ botania.page.manaAlchemy21=将&1硬化粘土&0变成&1红沙&0 botania.page.manaAlchemy22=粉碎&1粘土&0&1和砖块&0 botania.page.manaAlchemy23=制作&1劣质土&0 botania.page.manaAlchemy24=&1草类&0的转化 -botania.page.manaAlchemy25寻常花之间转化 +botania.page.manaAlchemy25=寻常花的转化 # -- BOTANICAL BREWERY botania.entry.brewery=植物酿造 @@ -2601,7 +2665,7 @@ botania.page.brewery14a=一种简单的魔法药水,它效仿 了&1隐身药水& botania.page.brewery14b=假设你侵犯了我的领地 botania.page.brewery15a=一种简单的魔法药水,它效仿 了&1夜视药水&0,服用后,玩家会 被给予与之相仿的效果,使玩 家获得一个&4夜视&0的效果. botania.page.brewery15b=寂静是否随之而来? -botania.page.brewery16a=botania.page.brewery13a=一种简单的魔法药水,它效仿 了&1伤害吸收药水&0,服用后,玩 家会被给予与之相仿的效果, 使玩家获得一个&4伤害吸收IV&0的 效果. +botania.page.brewery16a=一种简单的魔法药水,它效仿 了&1伤害吸收药水&0,服用后,玩家会 被给予与之相仿的效果,使玩 家伙的一个&4伤害吸收IV&0的效果. botania.page.brewery16b=你准会感冒 # -- BREWING FLASKS @@ -2637,6 +2701,7 @@ botania.page.incense0=&4药剂&0以液态形式存在时可以 提供多样化 botania.page.incense1=&1熏香&0能通过右击放在&1香盘&0上, 这时再用&1打火石&0右击就能将 其点燃.一旦点着,熏香就不 能取下了.
    在需要替换前,一根熏香能燃 烧60倍于对应药水时长的时 间. botania.page.incense2=燃着&1熏香&0的&1香盘&0将会提供注 入&4药剂&0的效果,以香盘为中心 24格以内的所有玩家都会受 到影响.
    但不是所有的&4药剂&0效果都能 注入&1熏香&0,比如&4瞬间治疗&0和&1伤&0 &1害吸收&0就不能注入,熏香也不 能有一个以上的效果. botania.page.incense5=对于喜欢熏香的自动化狂魔 而言,&1熏香&0能通过&1漏斗&0或其他 输入方式接收物品.有熏香时 &1比较器&0会输出强度为1的信号 ,燃烧的时候强度则是2.
    最后,如果一束&1引燃透镜&0发出 的&4魔力脉冲&0击中了有熏香的 香盘,就会将其点着. +botania.page.incense3=是熏香赢了 botania.page.incense4=放上熏香 # -- EYE OF THE ANCIENTS @@ -2655,6 +2720,7 @@ botania.page.openCrate2=一个精妙的箱子 # -- DRUM OF THE WILD botania.entry.forestDrum=狂野之鼓 +botania.tagline.forestDrum=用魔力脉冲的力量将植物连根拔起 botania.page.forestDrum0=&1狂野之鼓&0通俗说,就是打击乐 器版的&1狂野号角&0.它与手持的 号角有相同的功能,但是放置 在地上的.
    要击响它破坏附近的花草,需 要向它发射一道&4魔力脉冲&0. botania.page.forestDrum1=注意鼓本身并不存储魔力,然 而,为了触发它,需要&1红石魔&0 &1力发射器&0或是&1魔力脉冲&0. botania.page.forestDrum2=但如果你闭上了眼睛... @@ -2679,6 +2745,8 @@ botania.page.manaConjuration6=炼造&1雪&0 botania.page.manaConjuration7=炼造&1地狱岩&0 botania.page.manaConjuration8=炼造&1灵魂沙&0 botania.page.manaConjuration9=炼造&1砂砾&0 +botania.page.manaConjuration10=炼造&1树叶&0 +botania.page.manaConjuration11=炼造&1草&0 # -- SPECTRAL PLATFORM botania.entry.spectralPlatform=幻影平台 @@ -2727,7 +2795,6 @@ botania.entry.canopyDrum=林冠之鼓 botania.tagline.canopyDrum=用魔力破坏叶子 botania.page.canopyDrum0=&1林冠之鼓&0就像&1狂野之鼓&0一样, 不过它所用的是&1林冠号角&0.它 的功能和手持的号角相同,不 过它需要放置下来.
    若要让它发出振动破坏周围 的树叶,你需要向其发射一道 &4魔力脉冲&0. botania.page.canopyDrum1=鼓本身不会储存魔力,因此激 活它就需要一个&1红石魔力发&0 &1射器&0或&1魔力发射器&0. -botania.page.canopyDrum2=修出我的范儿 # -- COCOON OF CAPRICE botania.entry.cocoon=随想之茧 @@ -2746,7 +2813,7 @@ botania.page.manaBomb1=准备面对伟大的存在... botania.entry.teruTeruBozu=晴天娃娃 botania.tagline.teruTeruBozu=天气控制以及超人的可爱 botania.page.teruTeruBozu0=&1晴天娃娃&0,众所周知,是一种驱 散坏天气的护身符. 简单 地制作一个并将它放在世界 上能够减少&1雨&0或&1雷暴s&0持续的 时间. 坏天气的时候,拿 着&1向日葵&0右击他或朝他投掷 向日葵会让晴天再临.给予 一个&1红石比较器&0能够让他检测 坏天气. -botania.page.teruTeruBozu1=Too spoopy +botania.page.teruTeruBozu1=虽然很吓人但是好萌啊 # -- LIVINGWOOD AVATAR botania.entry.avatar=活木化身 @@ -2780,7 +2847,7 @@ botania.page.grassSeeds3=&1菌丝孢子&0与菌丝 botania.page.grassSeeds4=现在有6种新的&1草地之种&0可 以制作, 所有种类的草地 都有了自己的表述.
    他们会向普通的草地之种那 样蔓延,植物也能在上面生 长. 类似草方块, 他们 只能被&4精准采集&0挖掘. 然而 ,它们不会因为有方块在上方 而变回泥土. botania.page.grassSeeds5=各种各样的&1草地之种&0 -# -- ROD THE LANDS +# -- ROD OF THE LANDS botania.entry.dirtRod=大地法杖 botania.tagline.dirtRod=制造泥土的法杖 botania.page.dirtRod0=&1大地法杖&0就是个傻瓜工具,使 用物品栏里的&4魔力&0(通过&1魔力 石板&0或其他),它能塑造并放 置出&1泥土&0. @@ -2840,6 +2907,7 @@ botania.page.terraPick1=工具里储存的&4魔力&0量决定了 它的&4阶位& botania.page.terraPick2=从&4C&0升至&4B&0,需要一个满的&1魔力&0 &1池&0,每级是上一级的十倍消耗 ,最终到达&4SS&0.
    工具的阶位不会改变它的速 度,但会增强&4激活能力&0.
    可以通过右击开启工具的能 力. botania.page.terraPick3=当工具激活时,它能破坏区域 内的方块.阶位&4C&0还是一小块 ,到了&4B&0就成了一个区域, 随着 阶位升高区域也会增大.注意 阶位&4D&0的工具不能激活.
    激活时会消耗工具储存的&4魔&0 &4力&0,哪怕不是用于挖掘. botania.page.terraPick4=最后,工具每次破坏方块时都 会受到磨损,所以最好物品栏 有与阶位相应的&4魔力&0储存,工 具的功能又像&1魔钢工具&0,因为 它使用&4魔力&0抵消磨损,制作原 料是&1泰拉钢&0.
    它也不会像普通掉落物品那 样消失. +# No translation # botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW # -- ROD OF THE SEAS botania.entry.waterRod=海洋法杖 @@ -2873,7 +2941,7 @@ botania.tagline.openBucket=摧毁一切进入之物 botania.page.openBucket0=用&1源质钢锭&0似乎能做出一个 有趣的桶.它所获得的液体都 会消失于虚空,再也不会出现 .看起来是个不错的清理工具. botania.page.openBucket1=Lewis的纪念品 -# -- ROD OF BIFROST +# -- ROD OF THE BIFROST botania.entry.rainbowRod=彩虹桥法杖 botania.tagline.rainbowRod=制造彩虹桥,以及梦幻建筑方块的法杖 botania.page.rainbowRod0=&4彩虹桥&0,连接人界与神域的桥 梁.
    尽管这个物品,&1彩虹桥法杖&0不 是用来那么做的,它让持有者 通过消耗一些&4魔力&0右击,向他 所看的方向延伸出一座彩虹 桥. @@ -2898,6 +2966,7 @@ botania.tagline.fireRod=制造火焰圈的法杖 botania.page.fireRod0=&1地狱法杖&0包含着燃烧火焰的 要素,对着地面使用会产生一 个燃烧内部的一切的火焰圈, 消耗相当的&4魔力&0.
    火圈需要一点时间扩散开来, 注意完全扩散开后它会燃烧 内部的一切生物,包括使用者. botania.page.fireRod2=它可以给&1活木化身&0使用.如 果这么做,它会在化身周边 创造一个火焰圈,就像你使 用法杖一样.
    这个过程化身需要&4魔力&0,并 且可以给它一个红石信号以 关闭它. botania.page.fireRod1=MeguMegu无尽之夜的火 + # -- VINE BALLS botania.entry.vineBall=藤蔓球 botania.tagline.vineBall=帮助你如梯子搬攀登的可投掷藤蔓 @@ -2908,6 +2977,7 @@ botania.page.vineBall3=...如果那确实存在的话. # -- SHARD OF LAPUTA botania.entry.laputaShard=拉普达碎片 +botania.tagline.laputaShard=将大地抬升为浮空岛 botania.page.laputaShard0=通过有些复杂的激活程序,结 合一些有趣的材料包括&1盖亚&0 &1之魂&0就能制作一个特殊的碎 片,当对土地使用时,就能让 附近一个几乎的球形区域升至 空中.
    这个过程可持续10分钟 并且根据土地的质量消耗对 应量的碎片. botania.page.laputaShard2=创建的岛的初始半径为14格 ,换句话说就是直径28格.可 通过添加&1盖亚之魂&0来升级,每 个增加1格半径,即2格直径. botania.page.laputaShard1=看呐白,拉普达真的存在! @@ -2924,7 +2994,7 @@ botania.page.virus2=也不在这儿 botania.entry.skyDirtRod=高原法杖 botania.tagline.skyDirtRod=在天空中制造泥土 botania.page.skyDirtRod0=尽管&1大地法杖&0十分出色,但若能不依靠其他东西而放置&1泥土&0就更好了.
    &1高原法杖&0就是那样的,保有&1大地法杖&0原本的力量同时,它也能在半空中放置&1泥土&0,多消耗一点&4魔力&0. -botania.page.skyDirtRod1=mk2型泥土棍 +botania.page.skyDirtRod1=Mk2型泥土棍 # -- VITREOUS PICKAXE botania.entry.glassPick=玻璃镐 @@ -2934,20 +3004,21 @@ botania.page.glassPick1=请勿与食物放在一起 # -- ROD OF DIVINING botania.entry.diviningRod=占矿法杖 +botania.tagline.diviningRod=追踪矿石的法杖 botania.page.diviningRod0=就如其名所示,&1占矿法杖&0能卜 测使用者周围大范围内的矿 物.它们会闪出亮点来显示位 置.
    这个过程显然会消耗掉玩家 相当量的&4魔力&0. botania.page.diviningRod2=它可以给&1活木化身&0使用.如 果这么做,它会显示周边所 有的矿物,如同玩家使用它 一般,但直到它被移除为止 都会一直显示
    这个过程化身需要&4魔力&0,并 且可以给它一个红石信号以 关闭它. -botania.page.diviningRod1=inb4 ee3 +# No translation # botania.page.diviningRod1=inb4 ee3 # -- ROD OF THE BLACK MESA botania.entry.gravityRod=黑山法杖 botania.tagline.gravityRod=举起,扔出生物 botania.page.gravityRod0=&1黑山法杖&0是个强力的遗物,传说这些最 初和撬棍被发现于一座黑山 的山顶.
    使用时需要对怪物或是物品 右键.松开右键就会扔出选择 的实体,左键时则会让它吃发 强力的爆破. botania.page.gravityRod1=当然这种力量不是免费的,它 会消耗使用者相当大量的&4魔&0 &4力&0. -botania.page.gravityRod2=Why the flax? +# No translation # botania.page.gravityRod2=Why the flax? # -- TIMELESS IVY botania.entry.regenIvy=永恒常春藤 - +botania.tagline.regenIvy=附着在物品上可恢复耐久的常春藤 botania.page.regenIvy0=尽管&1魔钢&0和&1源质钢&0能用&4魔力&0 保护自身,其他的工具和护甲 却没有这种能力.
    可以给几乎所有物品附上一 些&1永恒常春藤&0,使它们能用&4魔&0 &4力&0修复. botania.page.regenIvy1=使用的话,只需将常春藤和目 标工具,以及3个在铁砧上修 理该工具的材料(比如&1钻石镐 &0用的就是&1钻石&0)
    由于没有直接连接到材料,这样消耗的&4魔力&0比起&1魔钢&0的会多很多. botania.page.regenIvy2=带上你的炼狱扁斧 @@ -2956,9 +3027,8 @@ botania.page.regenIvy2=带上你的炼狱扁斧 botania.entry.missileRod=弹幕法杖 botania.tagline.missileRod=biubiu法杖 botania.page.missileRod0=&1弹幕法杖&0是一种对付大量敌 人用的极其强力的武器.赋予 它能量会产生无数随机追踪 目标的奥术飞弹,但这会消耗 相当巨大的&4魔力&0. -botania.page.missileRod1=死ね死ね死ね死ね死ね botania.page.missileRod2=它可以给&1活木化身&0使用.如 果这么做,它会会产生无数 奥术飞弹并攻击附近怪物, 只要它能够正常使用
    这个过程化身需要&4魔力&0,并 且可以给它一个红石信号以 关闭它. -botania.page.missileRod1=Zapzapzapzap +botania.page.missileRod1=死ね死ね死ね死ね死ね # -- ASSEMBLY HALO botania.entry.craftingHalo=合成环 @@ -2972,6 +3042,7 @@ botania.entry.clip=透镜夹 botania.tagline.clip=魔力脉冲枪的多透镜升级 botania.page.clip0=&1魔力脉冲枪&0作为一个强大而 万能的工具,它的缺陷就在于 每次最多只能储存一个&1透镜&0. 将&1透镜夹&0和&1魔力脉冲枪&0在合 成栏合成后,就能让它储存最 多6个透镜.
    就像他们常说的,没有枪的 俄罗斯轮盘可不算赌博... botania.page.clip1=添加和取出&1透镜&0就像之前做 的那样,要注意的是,只会按 照脉冲枪当前的槽取出或装 入透镜.
    Shift右击&1魔力脉冲枪&0即可切 换槽位.同时也会改变所选的 透镜,前提是槽内装了透镜. +# No translation # botania.page.clip2=Since we're dubbed by 4Kids we must make do without one # -- ROD OF THE DEPTHS botania.entry.cobbleRod=深渊法杖 @@ -3093,7 +3164,7 @@ botania.page.enderAir0=&1末地&0的空气看起来有一些变 异的特性.如 botania.entry.enderEyeBlock=末影监视者 botania.tagline.enderEyeBlock=看着来激活红石信号 botania.page.enderEyeBlock0=&4末影人&0的眼睛被看见时十分 敏感.由此制成的方块在64格 内被玩家直视时就会发出&4红&0 &4石信号&0.
    当然,头戴&1南瓜&0时可以避免. -botania.page.enderEyeBlock1=MY BRAND +# No translation # botania.page.enderEyeBlock1=MY BRAND # -- FORCE RELAY botania.entry.pistonRelay=力量传递器 @@ -3108,6 +3179,7 @@ botania.tagline.enderHand=随时随地的末影箱 botania.page.enderHand0=&1末影之手&0让使用者能跨维度 触及末界,换言之就是&1末影箱&0 的物品栏.无论何地只需用这 个手右击并消耗一些&4魔力&0.
    若对其他玩家使用则会相应 打开&o他们的&r末影物品栏,消耗 更多的&4魔力&0. botania.page.enderHand0a=&1末影之手&0让使用者能跨维度 触及末界,换言之就是&1末影箱&0 的物品栏.无论何地只需用这 个手右击并消耗一些&4魔力&0. botania.page.enderHand2=不仅如此,若玩家的背包中有 &1末影之手&0,那么&1移壳杆&0就能使 用玩家&1末影箱&0里的方块,这比 起平时使用,要消耗更多的&4魔 力&0. +# No translation # botania.page.enderHand1=Zezima hates him! botania.page.enderHand1a=就像是4G版的末影箱 # -- SOULSCRIBE @@ -3122,9 +3194,11 @@ botania.entry.spawnerClaw=生命灌注器 botania.tagline.spawnerClaw=用魔力生成怪物,即使你不在身边 botania.page.spawnerClaw0=&1刷怪笼&0是个有趣的东西.它们 能从稀薄的空气中抽取出生 命,但不知何故,只在附近有 玩家时才会运行.
    当然这会在某些程度上限制 它生成生物的速度. botania.page.spawnerClaw1=将一个&1生命灌注器&0放在刷怪 笼的顶端并用&1魔力发射器&0提 供大量的&4魔力&0,当附近无玩家 时,&4魔力&0就会驱动刷怪笼, 就好像有玩家存在一样. +# No translation # botania.page.spawnerClaw2=Something something shadow dragon # -- RED STRING botania.entry.redString=红线 +botania.tagline.redString=遥控物品存储,各种遥控 botania.page.redString0=Lore说过上帝将一条红线系在了 那些命中注定会互相影响各自 生命的人们的脚踝处.这启发 了发明家们想出了一种远程连 接方块的方法,并命名为&1红线&0 .用这种精致的材料制成的方 块可面朝6个基础方向,并且 在一定范围内与它能找到的第 一个有效且可相容的方块绑定. botania.page.redString1=每个&4红线&0方块都有自己不同的 绑定标准,但是每个变体都有 相同的绑定距离要求.如果方 块已建立绑定,则玩家手持 &1森林法杖&0就会看到线.
    中间的 方块不会阻挡方块之间的连接 .最后,&1红线&0方块不能被绑定 botania.page.redString2=你是否正处于紧要关头? @@ -3174,6 +3248,9 @@ botania.page.corporeaIndex2=输入"铁..."将搜索任何名称包 括"铁"的 botania.page.corporeaIndex3=物品名称的复数形式只能在 常规名词涉及到复数(以"-s", "-es"或"-ies"为后缀)时使用, 当前版本同样适用于多个物 品请求,例如"10 苹果".
    "10 of this"搜索10个等同于 玩家手持物品的物品. botania.page.corporeaIndex4=复数请求的例子包括 "10 apples", "a stack of apples", "2 stacks of apples", "2 stacks and 20 apples", "half a stack of apples", "a dozen apples",等等.
    索引可以识别或多或少的搜 索的繁琐形式,所以: "2x stacks and 20x of apples"等同于 "2 stack 2 apple"或 "2 stacks + 2 apples". botania.page.corporeaIndex5=搜索"all"或"every"会提供网络 内符合条件的全部物品,所以 "all 苹果"将提供网络内所有 苹果.
    另外,搜索"count","show","tell" 或"display"不会抽取任何物品, 但会显示物品库存. +botania.page.corporeaIndex8=若有人在&1多媒体索引&0附近使用 &4NEI&0,只需对着物品栏中某个物品 按C(NEI面板中亦可)即可请求一 个对应物品.
    按住SHIFT则可请求一组, 按住 CTRL可请求半组,同时按住SHIFT和 CTRL则可请求四分之一组. +botania.page.corporeaIndex6=最后,在&1多媒体索引&0附近,并在聊 天窗口中输入物品名称的一部 分后,可使用TAB键补全物品全名. +botania.page.corporeaIndex7=魔法禁书索引,不对,目录 # -- CORPOREA FUNNEL botania.entry.corporeaFunnel=多媒体漏斗 @@ -3211,6 +3288,8 @@ botania.tagline.endStoneDecor=一些末地风格的装饰 botania.page.endStoneDecor0=类似于其它石质方块,&1末地石&0 也能制成砖块和錾制石砖,砖 块可以跟&1石砖&0一样用于制作 楼梯和台阶. botania.page.endStoneDecor1=制作&1末地石砖&0 botania.page.endStoneDecor2=制作&1錾制末地石砖&0 +botania.page.endStoneDecor3=&1末影砖&0,Purpur并不是什么好名字 +botania.page.endStoneDecor4=制作&1竖纹末影砖&0 # -- LIFE AGGREGATOR botania.entry.spawnerMover=生命聚合器 @@ -3256,9 +3335,10 @@ botania.tagline.thunderSword=一把召唤雷电的剑 botania.page.thunderSword0=&1召雷者&0是一把能召唤雷电的 双刃.制作它需要&1泰拉之刃 &0,&1瓶装末地空气&0以及一些杂七 杂八的材料,&1召雷者&0牺牲了 原本的远距离攻击能力,换取 了能同时攻击多个目标的能力.
    攻击时&1召雷者&0会形成一道可 传递的闪电链,所有被传递的 怪物都会受到伤害,每次传递 都会降低伤害 botania.page.thunderSword1=商业交涉必备利器 -# - BAUBLES +# - BAUBLES AND ACCESSORIES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=饰品介绍 +botania.tagline.bIntro=小小饰品也拥有力量 botania.page.bIntro0=&4饰品(Baubles)&0,平常也指&4小&0 &4饰品&0或者&4护身符&0这样在穿戴 时提供不同效果的装备.
    要装备只需按&4B&0键(可修改). 有四个栏,一个&4项链&0栏,两个 &4戒指&0栏和一个&4腰带&0栏. botania.page.bIntro1=&4饰品栏界面&0 botania.page.bIntro2=注意,如果&4神秘时代&0或其他使 用Baubles的模组也安装了 的话,这个栏会与它们共享. @@ -3277,11 +3357,14 @@ botania.page.cosmeticBaubles7=都给我闭嘴 botania.page.cosmeticBaubles8=这只眼睛必须被封印 botania.page.cosmeticBaubles9=这可不是豆芽 botania.page.cosmeticBaubles10=最佳色彩 +# No translation # botania.page.cosmeticBaubles11=Tilting the umbrella too much botania.page.cosmeticBaubles12=邻人社 botania.page.cosmeticBaubles13=喵 botania.page.cosmeticBaubles14=别让自己太前卫了 botania.page.cosmeticBaubles15=邪恶吧! +# No translation # botania.page.cosmeticBaubles16=Nudistoooooooooo botania.page.cosmeticBaubles17=谁说我是死鱼眼的 +# No translation # botania.page.cosmeticBaubles18=Lurk moar botania.page.cosmeticBaubles19=我需要你的时间 botania.page.cosmeticBaubles20=稀有之物 botania.page.cosmeticBaubles21=嘿, Loki @@ -3323,7 +3406,7 @@ botania.page.auraRing2=升级戒指 botania.entry.travelBelt=旅居者腰带 botania.tagline.travelBelt=更快,更高,更远 botania.page.travelBelt0=穿越各种地形是个麻烦事. &1旅居者腰带&0能装备在&4腰带&0栏 ,装备时增加移动速度,跳跃 高度和摔落伤害减免.
    最后,非潜行时能让装备者自 动走上一格高的坡而不需要 跳跃. -botania.page.travelBelt1=...everell +# No translation # botania.page.travelBelt1=...everell # -- TECTONIC GIRDLE botania.entry.knockbackBelt=抗击腰带 @@ -3363,9 +3446,10 @@ botania.page.miningRing1=挖呀挖洞 # -- RING OF MAGNETIZATION botania.entry.magnetRing=磁化指环 -nia.tagline.magnetRing=把物品拉给你 +botania.tagline.magnetRing=把物品拉给你 botania.page.magnetRing0=通过将&1磁化透镜&0做成可穿戴 的指环,可用它来磁化周围的 物品.装备时,这个指环会将 附近物品吸向穿戴者,前提是 非潜行状态.
    注意它有一个特性,当装备者 扔出一个物品后5秒内它会 停止工作,以免再将扔出去的 东西吸回来. botania.page.magnetRing1=怎么做到的? +botania.page.magnetRing2=升级指环可获得更大作用范围 # -- RING OF FAR REACH botania.entry.reachRing=触物指环 @@ -3404,7 +3488,7 @@ botania.tagline.superLavaPendant=彻底的火免 botania.page.superLavaPendant0=&1绯红项链&0简而言之,就是&1火石&0 &1项链&0的升级版,穿着时能提供 对火和岩浆的免疫力,而不是 单纯的灭火. botania.page.superLavaPendant1=[秘碑解码]亚军 -# -- TAINED BLOOD PENDANT +# -- TAINTED BLOOD PENDANT botania.entry.bloodPendant=污血吊坠 botania.tagline.bloodPendant=酝酿成结晶吊坠 botania.page.bloodPendant0=采用原始的&4药水&0材料制作,下 界,看起来很容易利用这份力 量.
    &1污血吊坠&0允许在饰品栏头饰 槽穿戴的使用者产生浓缩的 &4药剂效果&0.当吊坠被装备时会 吸收使用者的魔力并产生效 果,&4魔力&0消耗取决于&4药剂效果&0 的等级. @@ -3461,7 +3545,6 @@ botania.page.aIntro7=这本书里关于&1艾尔夫海姆&0的 情报也只有这 botania.entry.elfMessage=来自爱尔文·加尔得的消息 botania.tagline.elfMessage=肯定的回复. Yup botania.page.elfMessage0= - # ^ This is blank on purpose botania.page.elfMessage1=&o致以问候.我们注意到我们的 传送门被其他世界的连接打 开了.说起来的确有些震惊. 感谢你向我们提供你所在世 界的知识库,让我们能了解到 在离开那里之后的事,真的过 去很久了呢,我们也很高兴能 看到那里的一切安好. botania.page.elfMessage2=&o经过与爱尔文·加尔德高级议 会的讨论,我们决定与您合作 .你看,你的"植物魔法辞典" 让我们知道了诸多很难入手 的你所在世界的资源,因为这 些资源根本不存在于我们的 土地. @@ -3613,17 +3696,6 @@ botania.page.shinyFlowers3=将任何颜色的&1浮空花朵&0与任何 有效果 botania.page.shinyFlowers1=一闪一闪 botania.page.shinyFlowers2=就像拉普达(天空之城)但小 多了 -# -- PRISMARINE -botania.entry.prismarine=海晶石 -botania.tagline.prismarine=UFO长官:我们来自未来 -botania.page.prismarine0=&1海晶石&0是个有趣的建筑构造 方块.有的人说这是来自&4未来&0 的.
    制作需要&1炼金催化器&0.扔一些 &1下界石英&0就可以得到这种材 料. -botania.page.prismarine1=有多种建筑方块可用&1海晶石&0 &1碎片&0合成,除了&1海灯笼&0以外的 都能做成对应的&1楼梯&0和&1半砖&0. -botania.page.prismarine2=制作&1海晶石碎片&0 -botania.page.prismarine3=合成&1海晶石&0 -botania.page.prismarine4=合成&1海晶石砖&0 -botania.page.prismarine5=合成&1深色海晶石&0 -botania.page.prismarine6=合成&1海灯笼&0 - # -- NATURAL SHEDDING botania.entry.shedding=自然掉落物 botania.tagline.shedding=一物克一物 @@ -3632,7 +3704,6 @@ botania.page.shedding0=这片土地上的生物都以非静 态的形式生存 # -- TINY POTATO botania.entry.tinyPotato=小土豆 botania.tagline.tinyPotato=土豆是我们所有人的朋友 - botania.page.tinyPotato0=这是一个小土豆,它相信你,你 能做到.
    尽管听起来不太真实,但就是 那样,将一个&1马铃薯&0投入&1魔力&0 &1池&0,它就得到了一点活性精华 并且感到愉悦.它很活跃,右击 它还能让它更活跃! botania.page.tinyPotato1=将它放在Kickstarter网站上 就起效了 @@ -3640,6 +3711,7 @@ botania.page.tinyPotato1=将它放在Kickstarter网站上 就起效了 botania.entry.headCreating=头颅制造 botania.tagline.headCreating=制造玩家的头颅 botania.page.headCreating0=一个特别的精灵咒语,配合一 些材料和一个&1命名牌&0就能做 出牌子里所写者头的复制品. 虽然并不知道这是怎样的原 理,但似乎可以用&1符文祭坛&0来 制作. +botania.page.headCreating2=这个社区的一小撮人决意制作 可用作装饰品的头颅。和其 它书页不一样,在这一页点击 左边的&1在线查看&0按钮会打开一 个新网站,这个网站中列出的 名字均可用于制作装饰性头颅。注:该网站提供 的名单和Botania没有任何形 式的关联,亦非寻找此类头颅 的唯一网站。 botania.page.headCreating1=在游戏中获得你的头 # -- AZULEJO -- http://en.wikipedia.org/wiki/Azulejo @@ -3654,7 +3726,7 @@ botania.page.azulejo3=各种样式间循环 botania.entry.starfield=星空制造器 botania.tagline.starfield=制造星空 botania.page.starfield0=&1星空制造器&0就像它的名字一 样,通过将精灵的能量释放到 空中,置于世界上时,会在夜 晚创造出一片距离很远的星 空. -botania.page.starfield=一闪一闪 +botania.page.starfield1=一闪一闪亮晶晶 # -- TRODDEN DIRT botania.entry.dirtPath=沙土 @@ -3682,13 +3754,16 @@ botania.page.stoneAlchemy0=用&1炼金催化器&0就能做出新类型 的&1石 botania.page.stoneAlchemy1=制作不同的石头 botania.page.stoneAlchemy2=磨光 botania.page.stoneAlchemy3=砌砖 -botania.page.stoneAlchemy4=錾制 + +# Not sure why these are not removed but I will remove them in zh_CN at least +# Not sure why these are not removed but I will remove them in zh_CN at least +# Not sure why these are not removed but I will remove them in zh_CN at least # -- BLAZE LIGHT botania.entry.blazeBlock=烈焰灯 botania.tagline.blazeBlock=压缩烈焰棒存储,新的黑曜石获取方式 botania.page.blazeBlock0=将一捆&1烈焰棒&0压实就能得到 一个发光的装饰方块,尽管粗 糙,却是个不错的光源.
    类似&1煤块&0,&1烈焰灯&0也能用作燃 料.将它放在&1白雏菊&0旁边则会 被转化为&1黑曜石&0,真是见鬼了. -botania.page.blazeBlock1=0x1a4 +# No translation # botania.page.blazeBlock1=0x1a4 # -- CHALLENGES botania.entry.challenges=挑战 @@ -3738,22 +3813,44 @@ botania.entry.preventingDecay=阻止凋零 botania.tagline.preventingDecay=阻止被动产能花的枯萎 botania.page.preventingDecay0=绝不 -# -- To translators from future: the following part is only for Archive -- -# -- Fallen Kanade -- -#botania.page.fallenKanade2=&o我会和你结婚.不管你在现实 之中有怎样的障碍,即使无法 走路,无法站立,甚至无法生 育,既便如此我也会和你结婚 .不管在哪里遇到你.我都会 喜欢上你.
    如果在六十亿分之一的概率 下再次相遇,即使那时候你的 身体依旧无法动弹,我也会和 你结婚的.(AngelBeats) - -# -- Hensei Dream -- - -# -- WELCOME TO BOTANIA -#botania.entry.welcome=欢迎来到植物魔法 -#botania.tagline.welcome=欢迎进入植物魔法旅馆 -#botania.page.welcome0=&o什么是和平?是没有斗争?是 年复一年的待在鲜花环绕的 花园里?是看管着你所谓的王 国?是完成已知的所有任务? 是看着自己收集的资源越来 越多? -#botania.page.welcome1=&o和平是不需劳作就能获得之 物-又或是难以获得之物?
    让我们来简单地说说-只需要 一会儿-和平其实就是无需工 作;可以过着被花朵所包围的 和平日子. -#botania.page.welcome2=&o看着你的植物们如预期般的 完成各自的任务,就这样感受 着时间的流逝,没有嘈杂且污 染四布的机器和电脑,也没有 密布的线缆和管道.
    现在想象一下,我们所讨论的 这一切都是可能实现的. -#botania.page.welcome3=&o想象下,经过你的一番努力- 对植物的精心培养,对魔力的 使用,对于这个世界和红石的 知识运用-你就能达到那种梦 寐以求的境界.想象下你所需 求的一切都能通过植物来实 现自动化.植物,加上些魔法, 还有你的智慧. -#botania.page.welcome4=&o有了这本书,你就能梦想成真 了.
    书名只是表面的.尽管称它植 物魔法辞典,但它所涉及的可 不仅仅都是花.其中也涵盖了 各种魔法和近似科技的装置. -#botania.page.welcome5=&o它里面也蕴藏着精灵的秘密, 而精灵们却早已带着世界起 源的线索一同消失在了这个 世界上.对于每一个有着基础 红石知识并能将其投入实践 的人而言,这本书为每一个人 们所知的问题给出了答案,有 了它你就再也不需要学习那 些不明所以的魔法和机械知 识了. -#botania.page.welcome6=&o书的内容也包括了你所要进 行的每一项任务的解释说明, 只需要用上书中的东西,确保 在Minecraft的世界里可行, 然后动用你的聪明才智,难题 就都不是问题了.
    试试看,你会吃惊于自己在没 有外界干扰的情况下竟然可 以做到这么多. -#botania.page.welcome7=&o植物学的知识不仅适用于那 些需要动脑筋的思考的家伙.
    言虽简,报颇丰.各式各样的 魔法饰品和工具想必也能让 其他人自由选择他们想要的. -#botania.page.welcome8=&o亲爱的读者,欢迎来到植物 魔法的世界——&nGideon Seymour&r(来宾作家), (适合新手使用)

    点击“返回”按钮离开本界 面。 -#botania.page.welcome8=&o尊敬的读者,我诚挚地欢迎您 来到植物魔法的世界.&r
    - 特约撰稿人 &nGideon Seymour&r.)

    点击“返回”按钮离开本界面. +botania.subtitle.airRod=天空法杖呼呼作响 +botania.subtitle.agricarnation=田园康乃馨闪光 +botania.subtitle.altarCraft=花药炼制结束 +botania.subtitle.babylonAttack=王之宝钥 封印解除 +botania.subtitle.babylonSpawn=王之宝钥 激活 +botania.subtitle.bellows=魔源风箱嘶嘶作响 +botania.subtitle.bifrostRod=彩虹桥法杖嗡嗡作响 +botania.subtitle.blackLotus=黑莲花溶解 +botania.subtitle.dash=玩家向前猛冲 +botania.subtitle.ding=森林法杖叮当作响 +botania.subtitle.divaCharm=女王项链的回声 +botania.subtitle.divinationRod=占矿法杖嗡嗡作响 +# No translation # botania.subtitle.doit=DO IT!! +botania.subtitle.enchanterForm=魔力附魔台 成型 +botania.subtitle.enchanterFade=魔力附魔台 崩解 +botania.subtitle.enchanterEnchant=魔力附魔结束 +botania.subtitle.endoflame=火红莲燃烧物品 +botania.subtitle.equipBauble=装备首饰 +botania.subtitle.gaiaTrap=盖亚守卫者的符咒 +botania.subtitle.goldenLaurel=黄金桂冠恢复生命 +botania.subtitle.holyCloak=神圣斗篷激活 +botania.subtitle.laputaStart=拉普达碎片 激活 +botania.subtitle.lexiconOpen=植物魔法辞典打开 +botania.subtitle.lexiconPage=植物魔法辞典翻页 +botania.subtitle.lightRelay=微光的嗖嗖声 +botania.subtitle.manaBlaster=魔力脉冲枪发射 +botania.subtitle.manaPoolCraft=魔力灌注 +botania.subtitle.missile=魔法飞弹发射 +botania.subtitle.orechid=石头变成矿石 +botania.subtitle.potionCreate=植物酿造结束 +botania.subtitle.runeAltarCraft=符文祭坛停止工作 +botania.subtitle.runeAltarStart=符文祭坛启动 +botania.subtitle.spreaderFire=魔力发射器发射Mana +botania.subtitle.starcaller=星星从天而降 +botania.subtitle.terraBlade=泰拉之刃 激活 +botania.subtitle.terraformRod=大地被塑形 +botania.subtitle.terraPickMode=泰拉粉碎者升级 +botania.subtitle.terrasteelCraft=泰拉钢制作完成 +botania.subtitle.thermalily=炽玫瑰消耗熔岩 +botania.subtitle.unholyCloak=罪恶斗篷 激活 +botania.subtitle.way=他的名字是 .... 约翰·塞纳!!! From 28febcac08b2ffd99676de5e020fd44cfde5d58a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 12:42:30 -0500 Subject: [PATCH 881/935] UV map the bottom of the model. Add placeholders for sides --- .../botania/blockstates/miniIsland.json | 2 +- .../botania/models/block/miniIsland_new.json | 32 +++++++++--------- .../botania/textures/model/miniIsland_new.png | Bin 1389 -> 778 bytes 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 078eca7b7..44a91fc1b 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -5,7 +5,7 @@ }, "variants": { "variant": { - "grass": { "textures": { "all": "blocks/grass_top" } }, + "grass": { "textures": { "all": "botania:model/miniIsland" } }, "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index f7d029511..732fb427e 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -18,8 +18,8 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.5, 2.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 5.5, 2.5 ] } } }, { @@ -30,7 +30,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 2.0, 5.0, 2.5 ] } } }, { @@ -41,7 +41,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 0.0, 5.0, 0.5 ] } } }, { @@ -52,7 +52,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 2.0 ] } } }, { @@ -63,7 +63,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 2.0 ] } } }, { @@ -75,7 +75,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 0.5, 5.0, 2.0 ] } } }, { @@ -86,7 +86,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 2.0, 4.5, 2.5 ] } } }, { @@ -97,7 +97,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 0.0, 4.5, 0.5 ] } } }, { @@ -108,7 +108,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.0, 1.0, 3.5, 1.5 ] } } }, { @@ -119,7 +119,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 5.0, 1.0, 5.5, 1.5 ] } } }, { @@ -130,7 +130,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 1.5, 4.5, 2.0 ] } } }, { @@ -141,7 +141,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 0.5, 4.5, 1.0 ] } } }, { @@ -152,7 +152,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 1.0, 4.0, 1.5 ] } } }, { @@ -163,7 +163,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.5, 1.0, 5.0, 1.5 ] } } }, { @@ -175,7 +175,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 1.0, 4.5, 1.5 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png index a054c4cc8a4e53dfe552aff755ed29a750ddc44e..4e7d86220cdf36b9f2eda652411233e89c780a9d 100644 GIT binary patch delta 739 zcmV<90v!GA3W^4hGk*fXNklm>{DxTI2TaBjf=NK3TtL$`+*dA%xddStVirug z&$=q1+38U(<$nQaZ#e3GdT+DwfVofCQ4pI+&EO3@ipPrdT0PRmG!uWq&>dpL4RXsl zhVD=$Shh>%pIy_y}tTno#n+G?F~nr1yQ2!^mnk=Y%okpCw~qyTbLzXOw)hcCk#RsjxMlN zT~Z0nP7lj=)#vtxgJrwwOxXJ@3iQ-`YPa__jqdXE93ezg+G64NztJtF|Mm~~+xGni$Qb;Zj6orU5JCtcgb+dqA%qY@2qAacK-Wz_s!ckZ)OFkh(&{BWidk3$A6pqW6_{y|H@)Sw|_n~ zL*_#>y8U|B?=(H?1IbKY_k@XIFSefVUHXFe=WYQ29&YWn?GMdPUE20#=vi5ekd!22 zV91T^K>-uPUZf-$^f++ll+f%HQj(16Q6GTT2Z%+3q}h2JOA92P&S84ghj==N&wpOy z0AO<`fn+A%uzydl7Y_K(>8QPjTf1C09l+DkeEQ-Q05nFIw&8#uq1ma%?|3?g!|_my zAuXL+uhwbVrMhmzPmc5>9PmS{-P}naCCQE7DM?1*+3ziev~+5{TBl`~>bmX#8hTpo z#IP5@*@(P+lhw=-&ANCx*U+i;YMolI)^(en&7A}QG=IFUZXf*ignQQl0G7X)BY$BM zz>{-^=({^H>?J8l)_iwq4*B%kU)uK5+(GSin;!arW;r-0pdT+Z`;EeOb0?uYy76?* zlF+BLOoM9Zoc?sC7lKCs{&;Ij7sL5lpxMzWNygpp?-IcypmJD&;1TfAJG;%Zfcm^{ zz?%_;1Al%f6$OPi1zlZmcFL5l*`A(09PpdDy(?kL0julV_++mN(I+CA$!p%&uN%)= zbnW!b_Vnzou5VxRvAT#+DQu=xHY$bn`a6xO2xul8@EeAvUO%k?w3r;}Zu5W9W!ZfK-dy^ymNM`c5KXZy)8 z$jENDFzo2qYSJ2R_3os+Q*M^nFi0*oQJ~U&vA8?f<+G#GF1XGf%Td5f( zFryWonIzjuOuqt=2NB{~Gu{aKiO<24$wNJgH2KkFNbMa)rr=rIYs?H47@f!T z`*!=Q+a$QJ005rf^kOa6e$P&=D`iUv?td#SJ3FyxkTmxj*<~;o3&2qEBYJdQF)c)a}Bviq_$0_?qZR7+KO#yuz=6hZ0)r?pd*u=0-l52ShkP@Cc|? zYH;*9;2Ltl;W}%Z(fgA864q^=G8ha7gTY`h7z_r3!C){L495S0e*yoj8ciG}7+3%R N002ovPDHLkV1kW`pGyD$ From 25a4877e1aaa336262e1e6c88464b4cb0447ca42 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 12:52:22 -0500 Subject: [PATCH 882/935] Halved the texture size --- .../botania/models/block/miniIsland_new.json | 32 +++++++++--------- .../botania/textures/model/miniIsland_new.png | Bin 778 -> 729 bytes 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index 732fb427e..e24740a6b 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -18,8 +18,8 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.5, 2.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 5.5, 2.5 ] } + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } } }, { @@ -30,7 +30,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 2.0, 5.0, 2.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } } }, { @@ -41,7 +41,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 0.0, 5.0, 0.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } } }, { @@ -52,7 +52,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } } }, { @@ -63,7 +63,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } } }, { @@ -75,7 +75,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 0.5, 5.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } } }, { @@ -86,7 +86,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 2.0, 4.5, 2.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } } }, { @@ -97,7 +97,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 0.0, 4.5, 0.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } } }, { @@ -108,7 +108,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 1.0, 3.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } } }, { @@ -119,7 +119,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 1.0, 5.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } } }, { @@ -130,7 +130,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 1.5, 4.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } } }, { @@ -141,7 +141,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 0.5, 4.5, 1.0 ] } + "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } } }, { @@ -152,7 +152,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 1.0, 4.0, 1.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } } }, { @@ -163,7 +163,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.5, 1.0, 5.0, 1.5 ] } + "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } } }, { @@ -175,7 +175,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 1.0, 4.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png index 4e7d86220cdf36b9f2eda652411233e89c780a9d..2b0563b6127b44230444c93bdc6eb29c35e06cda 100644 GIT binary patch delta 724 zcmV;_0xSKB2H6E6iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPGe~?K; zK~z|U?UcQ5(@+$}f3}mxalX?wO#_ia7Ro{+*pQGSF~CAMwhsIo2r*WS{1a@9EM-8d z6bXr?Y8EO1`Jh%wUDDXJNs~H`&Cupikg7UJs7sFY^q$|l=e?tQ?zOb?YQ=K~4#U9^ zJn%dZC7=*ag|T!CEv?}?F6%GWeHwe{7WsuFx?%D1 z%?Ak|kdF_Jkz@%ituY)7i7&>9WFqvZ1e|lKCWkt1k$;VG+Oc7=81tuwa~t^K0J% zoD&B%u42}Aah(~g9Sbd`A;}Vhp973-16h#;pVvB6E>b z?xL!H##Z>5XP66OGV-T?D7L@t<%CQWK*IgeF=~xiFhuK*)$1iLDYnb-LnbB zLWH8HLk*~cF#g%pS{)%G#wPl?OA8aU;S|!lwN=kg;KS#yC4foeFN1t}$p6Ka3lM3# zD76=*a?*I;c(=CdD*5&KU*f0u8`CztaskseoMMV8ruYSQ=SQ-JM>M1W0000ErHs~e@0S8@lb93nXvR!W8 zd8iQq`u65Fnyz6MOva-znS&Wp#S}wlNHUvb=ngUGO_flqR;V{xoLM;n!0MBA0P2kv z08gp>`BnUeSl|at#uI``K%rbf(>2^zE{VAWVHjc-OuEmyDxulwQ7+{He`s$w>V0}| zv+;nrPuEcpn@P>!4Lpj+iu77N(#13rf5OlmV#Ez{%Q=SbP$gKlOXlPStjBj%3&3tA z?7fbPn7`wb%p`HvUlaHSvLKcoLuvA@A3C&Iq%XZc0_J)IHyXs8X z`z#9d)O>2U_ce{~^DbL&wis`ZF%OvNF&(Gv(0%dw445vk-e`T%`v(;SrDF?teGhNosf1d!Lakb%T*`Ch{3%ubf7AO>YlYZgbAWE> z6pt5q`*I6_5B3LwNx=Fei|pYnzUQli>EdeDit7IZD`#nTb`QRCDX&Ii6vQ-5BeRsj zX* Date: Fri, 19 Aug 2016 15:12:52 -0500 Subject: [PATCH 883/935] Finish UV remapping --- .../botania/models/block/miniIsland_new.json | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index e24740a6b..038eaa71a 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -14,10 +14,10 @@ "from": [ 3.0, 6.0, 3.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 0.0, 6.0, 5.0, 6.5 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.0, 11.0, 6.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 9.5, 5.0, 10.0 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 9.5, 11.0, 10.0 ] }, "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } } @@ -27,9 +27,9 @@ "from": [ 5.0, 5.0, 3.0 ], "to": [ 11.0, 6.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 1.0, 6.5, 4.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.0, 11.0, 10.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.0, 1.0, 10.5 ] }, "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } } }, @@ -38,9 +38,9 @@ "from": [ 5.0, 5.0, 11.0 ], "to": [ 11.0, 6.0, 13.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 10.0, 7.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 6.5, 10.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.0, 5.0, 10.5 ] }, "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } } }, @@ -49,9 +49,9 @@ "from": [ 3.0, 5.0, 5.0 ], "to": [ 5.0, 6.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 4.0, 6.5, 5.0, 7.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 7.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.0, 4.0, 10.5 ] }, "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } } }, @@ -60,9 +60,9 @@ "from": [ 11.0, 5.0, 5.0 ], "to": [ 13.0, 6.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 0.0, 6.5, 1.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.0, 10.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 6.5, 11.0, 7.0 ] }, "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } } }, @@ -71,10 +71,10 @@ "from": [ 5.0, 4.0, 5.0 ], "to": [ 11.0, 5.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 1.0, 7.0, 4.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.0, 10.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.5, 4.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.5, 10.0, 11.0 ] }, "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } } }, @@ -83,9 +83,9 @@ "from": [ 7.0, 4.0, 3.0 ], "to": [ 9.0, 5.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 2.0, 7.0, 3.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.5, 1.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.5, 11.0, 11.0 ] }, "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } } }, @@ -94,9 +94,9 @@ "from": [ 7.0, 4.0, 11.0 ], "to": [ 9.0, 5.0, 13.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 10.5, 7.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.0, 9.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.5, 5.0, 11.0 ] }, "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } } }, @@ -105,9 +105,9 @@ "from": [ 3.0, 4.0, 7.0 ], "to": [ 5.0, 5.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 4.0, 7.0, 5.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 7.0, 2.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 10.5, 3.0, 11.0 ] }, "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } } }, @@ -116,9 +116,9 @@ "from": [ 11.0, 4.0, 7.0 ], "to": [ 13.0, 5.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 0.0, 7.0, 1.0, 7.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 10.5, 9.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 7.0, 7.0, 7.5 ] }, "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } } }, @@ -127,9 +127,9 @@ "from": [ 7.0, 3.0, 5.0 ], "to": [ 9.0, 4.0, 7.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 2.0, 7.5, 3.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 9.0, 11.0, 10.0, 11.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 11.0, 2.0, 11.5 ] }, "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } } }, @@ -138,9 +138,9 @@ "from": [ 7.0, 3.0, 9.0 ], "to": [ 9.0, 4.0, 11.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 11.0, 8.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.5, 9.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 3.0, 11.0, 4.0, 11.5 ] }, "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } } }, @@ -149,9 +149,9 @@ "from": [ 5.0, 3.0, 7.0 ], "to": [ 7.0, 4.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 7.5, 4.0, 8.0 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.5, 8.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.0, 3.0, 11.5 ] }, "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } } }, @@ -160,9 +160,9 @@ "from": [ 9.0, 3.0, 7.0 ], "to": [ 11.0, 4.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 1.0, 7.5, 2.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.0, 9.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 9.0, 7.5, 10.0, 8.0 ] }, "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } } }, @@ -171,10 +171,10 @@ "from": [ 7.0, 2.0, 7.0 ], "to": [ 9.0, 3.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "north": { "texture": "#all", "uv": [ 2.0, 8.0, 3.0, 8.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 8.0, 9.0, 8.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.5, 3.0, 12.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.5, 9.0, 12.0 ] }, "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } } } From 815cdc9f52969609a065f9feb8021640306e386a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 16:09:18 -0500 Subject: [PATCH 884/935] Fix all textures --- .../assets/botania/blockstates/miniIsland.json | 2 +- .../botania/textures/model/miniIsland.png | Bin 1471 -> 839 bytes .../botania/textures/model/miniIslandDry.png | Bin 1562 -> 833 bytes .../textures/model/miniIslandGolden.png | Bin 1474 -> 770 bytes .../textures/model/miniIslandInfused.png | Bin 1521 -> 813 bytes .../textures/model/miniIslandMutated.png | Bin 1533 -> 858 bytes .../textures/model/miniIslandMycelium.png | Bin 1558 -> 823 bytes .../textures/model/miniIslandPodzol.png | Bin 1503 -> 816 bytes .../textures/model/miniIslandScorched.png | Bin 1523 -> 825 bytes .../botania/textures/model/miniIslandSnow.png | Bin 1156 -> 605 bytes .../botania/textures/model/miniIslandVivid.png | Bin 1547 -> 821 bytes .../botania/textures/model/miniIsland_new.png | Bin 729 -> 0 bytes 12 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/botania/textures/model/miniIsland_new.png diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..d3063c63d 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland" + "model": "botania:miniIsland_new" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/textures/model/miniIsland.png b/src/main/resources/assets/botania/textures/model/miniIsland.png index 945d6b6fea2a5e7e6fed2f99bb789c96a5acc2db..ecd452714354494ff91e3168dfcbfd39fdd82b78 100644 GIT binary patch literal 839 zcmV-N1GxN&P) zXZC$(-@Z5Rjkx>6T^URQrjsd1kW!+@bW(*BuH|ADO~N4L!FLY?z~1h*td{e%+Ffdu z0?kI9PJal1WxG_%c`V!I`=5UmEP!@)a)!_ZX3=CinUdYik}jq391kOB;JF^=x~T-s zMx9o>%cpnV1>oVq5df`r7l1?Ri+ooR3xkl^bVfJ}Db|VzP2fItNvDdr6mEvDi090q^C+5^!CTJ7$Y+*`J* z-bJZc$N?nCP%`>&#QHlK^tg@|*YHO^TemmxM?U`8SAu4vPP0*`Rw?k+=bxzXNAt_3 zA~rr5qv;x@_e(tg=M;dK_DjN9$kA^WxtloxKTv{b@n)m0@_*yb4xRqR#;a8dsw5Y3 zKnOv0D~r=}h?{YYoPj^~NvcI)+56V}1`#j6qUxy0Q-tM-H{t#aE_Rqfk>5ZXW*8VzT(S2`sTmJaX z7xHqfy~$YDbpt>X!kD)gLano6VOC|hD#M8AxHDcW!?%^yvi2)htXT0@{s%#w*q@2m R3TOZT002ovPDHLkV1h(Cnp8RLL{aX*$;kkP-JE^Y#E*e;L`BjRraIb9u>-j!j|Dl z{N9$L>z50w`k~5QMfHo-grnp7N{fTW*BbE5#u*+h)>tYmm@CXBFO-~4VyUojqGvY% zmxk}IvWq3b;=&?+Z_7sRW5Za#c`qO$F@^g3i#)vkFCK3Tk(h$|JwP~`z&~vv^4Az` zzE<5E*c;9gzIF$eZ(#8A<03Q_r)`^?&{Uk0=kpnT<5;^0M-v7Ao~y@7n+I}bXvVur`2n9<;FU6YYd9Q%YaOx}Ko#Si1liskP(s zxZv6&UER*nIRHjpt;X)O(?|YyD#3SuDs=ZqOriVJZee%Y$;@W3JMHZFJqp0d<%Fo$ zHJYG}QhMQDL5HuETqeidIU)Hl`8;cL~cfNV0$_E#DJ{nAYzGt zVFu9RY;uyEPSV_1R~VN!1H(~PN7EBMyIE_Q(&`GMutu-ynj7md;?E~7!H6sFaZ!N9)(Nk=1SQg9AMz%0TX~Z7!b~AqL4|I;5$E> z0DfCO4+I0k*+0%~pap0DIL&{|0C3>)#pkmLzQ5!q%V(8Y` z^Vb6s;RKlS`}@#TyvUwSX35THb>9~Pq!VfEPCJp9LhY_YMRr@YjqH53@Qz@!c&0%J z^4UKZk8tJum6C(dO5KNUkFH+ZBi8dU#|9*3zq)HtM$=7>>63MyGuu zhu+)TKrkQ{vI`uUvFi4KKrkSd7M9p~drtTN4u`)yEEX~gy!jx1zF8x&;R-OBOw?|# z1<>8hRMzC@fIH|vziB0nquxP>uT{5Cq#mU(nN6F%8W@i9z7O_^_K6$-qq|)6_vvRy ztDAo~Py0l!s3Q7~wTqSZ_54aC5{X12kw_#Gi9{liNF)-8L?V$$Boc{4B9TZW5{YC3 Z{0D==Edg$K;=cd@002ovPDHLkV1kQ%+{gd` diff --git a/src/main/resources/assets/botania/textures/model/miniIslandDry.png b/src/main/resources/assets/botania/textures/model/miniIslandDry.png index 846c8c285e24259f811dd7678cdd6aac8a10ac83..87228df749de7d2c371aa75b7b8b851174900066 100644 GIT binary patch literal 833 zcmV-H1HSx;P)p43@es1IjMaB2RMMzQfqCF@(F=I|Xea@kou0&XL!;g4(WvUQ znkL=h7=VFgQ#UjQmd$tH|0=Nosp5W~@yjJH0f8ekyYN{qQuy;Mql-E2BIKRBIpNT1 znzTDTK0dw+z{98K0JJ+j0RF(-rF|`Ud3c{0Y~o^sg%=r(~wL#jb`LAv;tn_qt~tjXf;jL7j5c> zCJyTk$Mi=Ny2G*PhmA9!sVVj=SzO;|@iO9|R$}SHq(4JW=O}0yrWflaNSY0<%aHWM zz_ParAeGB!xtzGTp2Srg5P1%(Rmj16Wik~BZ=OagWQ9X=K)cghtNp;T#j~Uo8wKFZ z7wj2%mTrKSS9moKSxf_*QN(30AQOiSUMz$|t7+0|nl!39Uw`o-bwi^+nuz_R6q_Q~ z?-aS5uJB{<35nbQ<3MNp_Y_sn5aDrnqyrX!czLU7^6=?7bwi_a{3+exzm3Oztm zW#G?eOQaxVZ>3Pq#Z-?}vMUF*mLXDB>}w@fk}n*RG5%u4nt_-#+-yRBmg38*;Lq zou0(^zxgtLeV@9)zL>0U*=KLC-*F>58SZ45u&u0iGTgCa$N$DZCLZ#OVLBFb00000 LNkvXXu0mjfs7{ZV literal 1562 zcmV+#2IcvQP)&B4cAVuHba8k}2xk)Syrm zJJ@i7I5vD9K8vp+;)^~^5LBjuh&mq})#6a0bNaA}E^Rb!N!FU&G)>ax-_M77(>C{B zdYz{D@cX>n+??+{H~0L`@BGgF#m3(}6bXp3y~LiDVFG<#j=%nyjWs-TBp?^>74Hb;N7Xq>+DBPD56j(WB=8|*ho-! z|7Ky=K5XrCQ!GI&nlTj4=c-go6#_$Erhc5&*)y>P?5*wKHNH`1e{*t8I{0@mv~A=`yL>c%rNE;5>KfN4{R}f zfKktF#FDGQ`{L!pBAQ4uJg|jmB3&QRN$-q^B{OyZfxeadg$EU)&Q;y1@x3CJ%;+-Z zzotbSO|xS-q%bxTte-~{X|gws=^UBq8ug7jGryXy*|ZGx`v`{=%#M>6XNafN`guI1 zvT)%Oog*_{qrOpR=2z1-Jpkd5LNt-a>=@`6(pw^5P6Y zJ=%>&t(t$6zasj!`q)1*%q0}y{5nS;T%G1-znf@cWllHF-NP>gMJiUP*N}%^dS{*e z?)wLXYRlAX$EK|Ujmwo8{e#^&vIXKPl};|`?CuT+*|{=tVVt%Lb0v!T7A7yw7>=&D zyM^8!C(%TDQ&L~UzLDV6_+A0MF4Ix@OU0MHCJxESD<`476{k%UvzvYIAO=Q}Ygr zMZrSFNv*YJs%tiu0&x25G`E$5q_3BVB{QZ!?DW}b_V|VoE!1^J`qO8pxxLy?m&?K6 zLJxD97E@ibv7BBLFDhbDEwiH#0Q9LDzQ0#=b$Qrn_Z!;x-8&$>-EeU54yJyb)fLIe zk$}j|FLTpE51?Xe~g(`fXSGzDRvdzMB22}H{ zcvBweH@1KNVcZ6=Ws6&slIT0Z_g6;rOa1`h(THDo(%smUMZ}DUA-fNj_3sGH#&Q6T z-?7h9pZ<(8O4PNn?!=wlJL7u{`cCX~CFyg2j!s{w^vo{l~jv1G=u4{(So@vC{m{X&2x zDpU$~;whD`-H+<*rJR%GT&})Huvu7+vNor~A%(Yo`HC}d#|^JttNSSV9Z&S{;kED2 z@#)9cY(_eba7f|RAI|al2iG>W23XDjSZ!W*Z$EBHH{^eoXd=zNyH1+w*6QyaHP$r~ z%h7)Bgd+Z2EVDfyz-YI2|AW24?eE}_XQ$yDe>k#DbZ_+$%=Q@m?{M_Rph#S)5ee=D z*t8uX%Ng+VPep8%DuCh3jHlN{`g-y2?J_;R-cHK465)_ySSPY-g?z5G>8pX|C_fwt zh>&yTRd~*u;H@`j4X-_Ra#(Cj_5tv9{t8_kt%L~bGUC+uUh%E^3(lT)c2`$+lV;rs z-h12FuS6n|NF)-8L?V$$Boc{4B9TZW5{X12kw_#Gi9{liNN#|?08aufpxC`$G5`Po M07*qoM6N<$f=i4QRsaA1 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png index f6b7d231501b06cd0bcfffea943288af78af3dd5..24481d4d0728eb12b4205c01400b6846fa4806ca 100644 GIT binary patch literal 770 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 literal 1521 zcmVMTRn9tfO#+w!qrEZet9PpAX{} z)_ZSuLAnt0`@G!Uoo`QX&pAE6^ZV6-&ayheog$RmUARk~)NecB;9)-hSTHmmCDjQ) zXwUJH_Vw!oeOCzIyN;UFjP`Y32;!FrcAW!Yck9`a_AeU*eS-ueE%>V|jqjf)3bTK? zr$gTmu}IonnQ_3)6z)-4^Z~HD_3TLd;9Zu^s-))b z<;VFPk4<5C^}9k%YPi##s7VcXbtP(2L;pWOERn`PIgL7?Q8mqD`T>-JA!3&j;H(6o zY12{>ji;!ZRzftMqJHaF4uIzIH6oTsXZ^cNov2BTfGbV3Bbv>;Qa7wKRLT>kK+mSt zHQ@E&uddAAN8>4ar~3_#taQ2hT%DC)U6*ePD#~00ydJEs&8NCilUnv(O=@IL?lU;D z(&g%Nbyj|LUETu_@Op^GQ&?TyrA~nCeJo+#Bdm0}`dporUtO1P3Y$-L17xF}d)2$S z>i|6s9T%2b** zc|lBVAQ0i&~Kxm*F`X^fI7PReS0T6PPK|u*h9pYhoXy^Bi2(X~8W_WdJST5)t zgi;4+{U|q7=v1k{pOEbP+Dy>nQea0E@Ot3p5V%W6*WDQhQ~$A{n*=v+gX1}@@(}QP z>^$Co!d3tp4@FS4D-cf*OQbCytnp9;rC){at680yzVT25C3zBx3sEk#K?X}*zOi3k z8#W5xQj>1;DjD?AyC$XxKr`(o)^3yJOAN=2E=*aVk;E5yV_BAU7x9(-}ow|-N5b?!R-O-9o~&=;3~IlviZV(lvgbg!Lw(w9o#ZQ4QoZP?XaQK z8}uta6Tu6|*gaz&!N30+-EW?-T>(wy6K(C!o1X2lr>h#oUtLMlya{8n@3+Es52!so z0UV_$Xau|-a+j*@KOYf0PX9!-tKIZW(6@P`h-6}f`;(|i&9EEXd8|c*kG0X{^@!$E z-A`c;n4AIU@W^U52kdA$NaW}V^YcPr$|gn*F){e0r+9B>1!X>t#i#~bNURm7t+wU-(jZH33xr!wyChU<>~AJ@L+fey)xgH zZb|R(Szl=O80&>rs-xTlZKfy?;n>L@xAJYt11Dn$FxtZ zET4n#dFPm(2En6Lz=}_W(l?x)(Bw+^`djnYE`3KRL%qYgxqj&GKpE^YRD@DjBSK~6 z;FyXMKMla)d2bTguw_hpfJ7pZNF)-8L?V$$Boc{4B9TZW5{X12kw_#Gi9{li{IB^J XOhOF*cJ(ZC00000NkvXXu0mjf-LB+w diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png index f34e10082032f5767510ec43b6f09f7761a9f517..465bad39730de3c6e3c56733fb44569fca368942 100644 GIT binary patch literal 858 zcmV-g1Eu_lP)KS$B!Hdm zl9$h>sZ{F}ath_5O08)Cpy?+0Y#L2Bxp4KCL;%QV-|g{mWbo%`A1gFu-|aDyhgb_1 zy}p6v4%nMK5QK73rBbbP`s51$e1G>304miw06(Dy@p~xX`n5dgKHOuU13WiO?Vw5~ zvdqE2Vj7jPr&FGbt_wn~X;8>105n=18m*3q20**|-An?)VQI?wOD__4ZIF6wW=^wb z)ltF;yrDyAF@hxx1wqqIlCQpvcIRu60zVRuKL?IL+v^aSEV3Ri5Dlf+cUz?8IBU^W z7Gp`?IQc`g@KQEba6Ul-?voFZB>kbrxmU$F5o-7ykNtS3*<9ZkqDWQjWwKL6x4 zXLkvzLKP__vfwZ$-@-Bb#fUS)fg`C3On@LuVt+Mq_Tg>(!uB~uI z`%?T1X0bmCa=ECowGk72{K2^&`FYrQVz#TBzYD^w_D2eMdbWRYCB;Kad**DP)&3}m zFzsxYJpT*faJIj(`_(^&a#s7J5cb!d?UMJ|`)_)W_VP3Am;Ci9`^dj>{{P0j4d-p> kW7f8sx8WRf%<-S$Z%xkn*VRw;$N&HU07*qoM6N<$g1+FKCjbBd literal 1533 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 uj(rd7qSuDKHgwT#TlLzohaP(PZ}_W0p) zFWr4{7xXs7oZpwTyXSwN-uv9A&w0)%!Cl_&^wBd{b66Sh!c$v?H$UztD4?sEr+Grr z^0*HGub%!2u}AP(%|cT_FKbW+(8}R$=JWxW;~Kj>2I#zUMoW<;Z6VdbhR$01ghFpJ$(o zJAgb84*DP9F&-S-CvSDrn3#sAwhEYEq5 zA3xklBk?2}msKMYPbzP8Wy2VaCQ>N;+?be#5DLuG?d@4ZqluIzQ~ql>`E44FLMVW6 z(63xa;z?Yu4{ID5>C}3)&d9Hv_pGa5a$RREw|8`TISom#Kf8TplUR%07HIR*eqwAG_r&5w;v(2nIcgo97u z90CA_=Q;Z6_tU6$5JckAcUt}3-T8utmJld4q~qN$=GnKd=IM#aX{B})Z52>2S4Q~V z9Ijlau;tTm;<(0M?I7SdVwkqc3xK!I=>W zp#bV?2x=<-`Cf!j0HhSin($Z30TVZ~s4OQKyG9LlR%0pveFG!#xILK3N{y1yjr9$T zz+J(E0~DQ}zHeXzkNLbfayAQhjR)>WV5qYi)9JOR(?q=SI+X(;rKMg5&{>M_e;rjc zYJQH+VM*hR(gUc8U(2JSjG&>;h2G9q(+}`(S+EGoJn8o;Yjq@^)YyMGc1db=o4mAd zU_`$a{tb|qPr21?sB?KZJd&i1;>aQ;;+WIeJx(Ln^X~~F*Y28k(W4R4W7Zbw*c0$Y{1LOTZzoZ0H zsk~v4wF=Ww-n@#Zj#8&m!HwR~j@3Mc&8eyMYW=QfdAg{K!+YQTfp@yw7xZftrZZso zX2I0{ymzBH-Ai2pg3DLn+(&N|{S>GW(>37c#iJORn8i{j498d3LsIr++ zzsZfQJf#HK@Qie3sNM~3YUAl*yL6H?cyjFFs{x;%ox!!+c|;Q_-9F&P9EFV#-Sa{K zaF+u)J4H-PqoQS##$M~>u>Gk;${9hiFdb#NIt!ryK0DKoZ@x_G&Mnj(=pV$Z-2x6A z9>iBiCyAa;MhFG4|HvS|9iDtRYXESsd1(#qF{KM_+%1h;b{pyn^=+HBVFotGrT6tlq3_XsM^!SzwD0)U5&Q+j(lsQas)0)BW9H$2t$anxc4dt<+}}>qO|j zGQd$Lje47zOqRe_io3^UTI{nFueFs!2nBTO1O>oxw5X>+z8#BNvpBHVeD|r6XKT%CcQELE$ z!C){L3 z-nsW2&O7Iv_gv+Usff3(>iqda=Sp>sfyU24PJ1=S$V`Me=UHg*;3!f6cDA=fx7}ng z+{Nx#IQxZmuevJF%o-9F;iPQVCP`$LmN*Z&suCg8pCNmYQA-J-xVP#biG1uyeba47T z)_)t&Z8v4GkvCy)95C`GvL8wlu+p4Mnn6N_H`Upw>8#~CBR64x4l9O^AD=jkya}!! z%J02#fa`~{Cr;m$B4AcD_C-ou(V&r#gb~MS#;t1_Z7U_rE11W+bSMH0hP!8K@A{#< zD@sv{z~MAvqoon$8MU;^Uv&tM;n&dM`NV)(j>}0CI{h9_zlYti_~gTP=(d~ejRSdJ zl%g~N+t3N8AnKr632~ltp}EHXQAW!EEs3#PHR({)+3ELWvt7LXzC5=(mXu^E0*@1e z#Zue7tytHOe3PHub^osO;Dt{AmREU4gblR64(pKa0z8+drN$G|0$O@ zZS0Ok@bD26!^FAk$l3n;!*BTfhg7}=i`btB)#>-RylG1vt96}Bjn2&W?AE)|VNv^Y z3A{Yp1N&{luy$s)pT?s0=Ru}vXM0N&e+VbD{e#cG`p;A@YJVPzQK#>0Z;3BI{it|< z)&H?yE!LOpE3Xp#&BjuOOBoheR8~tFF0sTCuMK|#iQD9LxrX3M00000NkvXXu0mjf Dz<`d% literal 1523 zcmVf!TCZmGeuEHMq&gp9W@o(5^QhX)~#!=k1yIQ z>-}*jv5hg$=gqU*?|aX+zx&!?O(Lu)l^QSwTVl zhP42Iqo>c8#1DF^$as>4e^(E}FZrwy?I;~!-Gn-e{l^eFDu@(Wp7iQzo=orE=xp*9o$w*#2qnpS~r`2n9 zX7j4LvL`?-J+ra7!36-tV>6F1(`ofuo!PvquH0}#qhkP2%(iw^-Tdmg?})qFiSFKY z_!(XR=SwE~=G0j%VR-}#&$Ra0JtXnuY9d$kkWH^0FNr_gAdu*l%SG>~*eal1uFUYb z?HC`MMmQ$JiHo{;HP0b71+XS%8<_$oY*iQ<9W%VUwb>jN@jQZ&ctuKIg_}=sWP29@ zfaKu!NI8kAuD)v(06@Ml0(l}`JWnN`=nPf?Bpj3R;sTaTFgetxs*qq9EbhrKk8@Xn zTj!Mz)`}?L_hMGbVu|hV<#{v9!OrsY>XP*$rfe)`8U?T9I0E<9E<|Su zLeYfj2OAh1L1*tu*s4&}8R-WGM<6|LFB}R7=b8@Oa0#Zma$~u?UT@_{d=^-^CSU5> z(%dT8NDVK*yV++Lf3Vs?>N8mco_h$xm#*ndvcH)lu^9z?dpiJqt6VNDRR93|F7x;$ z&LiOW8diWy1agiP0OQhi+R_lDT(JkxGM!T(WbJ5ati_%}yIcw8H9-}r=RTwhYjrRZ z*Tql7mArWYWMFW_xD`$U_$|MDs;zEIV=Y3_1a@v-QPdqheO@cO7x6RaK%Z24E_qjx(bS^DAxY-@*U*sb3c1h>-x*Z~yNFtp}(Rd|< zXnV`N^Og(CkHFIhAGg$}_rCOqCEcdNe60oduVnu}7t7h+yNn@9jz!ao)d={#y0^I< zl1SX+1ReV}814x^?`8s_X`0a!HT$c7J%UPMIm@a$2mD@~d+#&6D`yPPovS29~qDXE95p^=kkC*FPV@vB|XIxldNx$z5CW&Csu3ehWcyqIqM7t|E?X?;?ME zbrG4F43=(M4FKT2zJNC)mGuA$g+ifFC=?2XLZMJ76bgkxp-?Ck3WY+UP$(1%g+lpX Z^B0Vn4G!_Q1GNAE002ovPDHLkV1iqS$!Y)q diff --git a/src/main/resources/assets/botania/textures/model/miniIslandSnow.png b/src/main/resources/assets/botania/textures/model/miniIslandSnow.png index 9f07eca9d46e3d82599e797a4045caa997aae883..492b94af619e60c3e1eb2d7e39ead8e36f3614f2 100644 GIT binary patch literal 605 zcmV-j0;2tiP)vxuASpXy7lf6!x@nlNBYcp^if+z+cT(0PK+Jws$r{|XzCD3RI zp~)1Au~@3 zm|mx?$$}_mwnzw~Sm&Yi37ET8__e-vgSodHeDy03SYotz<*fBrjT_Q0xLF z52gXaWM9=v|n)~8cSfJxdCVk>Y7c?eA?|AQ#jBJOfUXw)cMYLvpr_hgu+ z^3Bm>Ir2RzrIcZs%CqC49QmF+J040YrMzwZJ~Rfd!^!Ya_pus8=4^lW`k7u(wSKRF z;%q+|9x~6eowL1a{XXbl=E(P?+97QE{Kfl^fBdaht>1^Hx+)*n&y5}RYIul3{hiy8 r|L3UNux`UOsuj^c0T%`n%`zj{u^kIq-&0pF98nyg7Q`^?A#60RZX6 zxq&%8Cq|`^C9B@V%=8pwSD@V~>BTu%^(HcjII7n+o|pFwf1+Y8NiyBnU*7N12X*2; z!MsBE=IFiA^VFY_F)^B|YbFs#dU4KcSFdgS`&GIpkxCcT2X(5vLKik;v(X4Li8xf( z!}Cj6^`_Uh>P>t&d)t#pr3>nVI#phw3%vux)Kgt&rl$bFYpZI6N*B}zb*j8V7dD2h zV*Ao;v1Xisg`=(b!J)oXhsQ(rJXNFZiN&2_y_kWqQ|7y$6g z?|-yE$fvqymSGrPb+_tGZ$<#^j@inm0Nli#zj zvch)9>h`nBL`0QBR%(SsTxFHRLTd&HTCR&sA}*Z)!pZ{jsoOxijtCDRi#GtwMkAhG z9t8u7pkOPX!qrU!PoF$M_1f-<&rD8w#cO;26bI`ozT49y$gF-KKU2A@y zykVi;0nc9_0BAcw8J6SFglXc%(gJ3q5vdcbxh`I2A1UJiJpT~(`Y+Hff-%#?glWR6 zH>FNZ_=G_POtr%ko1Jo_U9)<>Mnl!apb2!cfx;Wc(A^rJkwL12@0b$D1NZMB8`W|P&EK( zTUMD50NQ3qc3voAu}%%S_s#dx_=IVCX9S}{`+XCml1aqz?b=SyJ1x^aT-(9P#ws4J z?MRJ~znw|MvGDUN&rpqup^Bg|FQrmROLtZ(;fu~yr8_*oyw#V>!#vJtA>U?5wpkH1 zLiLX8{_jvJWJmhHfOZY2xvsb2ku8OyMqEJt{!W;tx6aGzM5~j3l&3*MAx5v5OOpRI zCy0N`?B5~>b;VqgEXV2ELfd`vG7Q5o48t%C!!QiPFbu;m48t%C!!QiPFbu;mci=zp W^+Rrq1lsNZ00004gyGsL{LgBF&GZqd7(`*B|0 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 LNkvXXu0mjf{Le`j From 360a398fca8f13e9d56c8dee958111d7d63757db Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 19:54:41 -0500 Subject: [PATCH 885/935] Delete old model --- .../botania/blockstates/miniIsland.json | 2 +- .../botania/models/block/miniIsland.json | 475 +++++++----------- .../botania/models/block/miniIsland_new.json | 182 ------- 3 files changed, 180 insertions(+), 479 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/miniIsland_new.json diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index d3063c63d..44a91fc1b 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland_new" + "model": "botania:miniIsland" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 3143f8d27..038eaa71a 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -1,299 +1,182 @@ { - "__comment": "Author: wiiv", - "parent": "minecraft:block/block", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.75, 0.75, 0.75 ] - } + "__comment": "Author: wiiv", + "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.75, 0.75, 0.75 ] + } + }, + "elements": [ + { + "name": "Layer1", + "from": [ 3.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 13.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 6.0, 5.0, 6.5 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.0, 11.0, 6.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 9.5, 5.0, 10.0 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 9.5, 11.0, 10.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } + } }, - "elements": [ - { - "name": "Shape0", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, - "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, - "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, - "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } - } - }, - { - "name": "Shape1-1", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } - } - }, - { - "name": "Shape1-2", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } - } - }, - { - "name": "Shape1-3", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } - } - }, - { - "name": "Shape1-4", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } - } - }, - { - "name": "Shape2-1", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 7.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } - } - }, - { - "name": "Shape2-2", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } - } - }, - { - "name": "Shape2-3", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } - } - }, - { - "name": "Shape2-4", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } - } - }, - { - "name": "Shape2-5", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 7.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } - } - }, - { - "name": "Shape2-6", - "from": [ 5.0, 4.0, 9.0 ], - "to": [ 7.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } - } - }, - { - "name": "Shape2-7", - "from": [ 9.0, 4.0, 9.0 ], - "to": [ 11.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } - } - }, - { - "name": "Shape2-8", - "from": [ 9.0, 4.0, 5.0 ], - "to": [ 11.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } - } - }, - { - "name": "Shape3-1", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 7.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } - } - }, - { - "name": "Shape3-2", - "from": [ 3.0, 5.0, 9.0 ], - "to": [ 5.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } - } - }, - { - "name": "Shape3-3", - "from": [ 9.0, 5.0, 11.0 ], - "to": [ 11.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } - } - }, - { - "name": "Shape3-4", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 7.0, 7.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } - } - }, - { - "name": "Shape3-5", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } - } - }, - { - "name": "Shape3-6", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 7.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } - } - }, - { - "name": "Shape3-7", - "from": [ 11.0, 5.0, 9.0 ], - "to": [ 13.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } - } - }, - { - "name": "Shape3-8", - "from": [ 9.0, 5.0, 3.0 ], - "to": [ 11.0, 7.0, 5.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } - } - }, - { - "name": "Shape4-1", - "from": [ 3.0, 6.0, 3.0 ], - "to": [ 5.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } - } - }, - { - "name": "Shape4-2", - "from": [ 3.0, 6.0, 11.0 ], - "to": [ 5.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } - } - }, - { - "name": "Shape4-3", - "from": [ 11.0, 6.0, 11.0 ], - "to": [ 13.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } - } - }, - { - "name": "Shape4-4", - "from": [ 11.0, 6.0, 3.0 ], - "to": [ 13.0, 7.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } - } - } - ] + { + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 6.5, 4.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.0, 11.0, 10.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.0, 1.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 6.0, 10.0, 7.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 6.5, 10.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.0, 5.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 4.0, 6.5, 5.0, 7.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 7.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.0, 4.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 6.5, 1.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.0, 10.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 6.5, 11.0, 7.0 ] }, + "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 7.0, 4.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.0, 10.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.5, 4.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.5, 10.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 7.0, 3.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.5, 1.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.5, 11.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 6.0, 10.5, 7.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.0, 9.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.5, 5.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 4.0, 7.0, 5.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 7.0, 2.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 10.5, 3.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 7.0, 1.0, 7.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 10.5, 9.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 7.0, 7.0, 7.5 ] }, + "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 7.5, 3.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 9.0, 11.0, 10.0, 11.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 11.0, 2.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 11.0, 8.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.5, 9.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 3.0, 11.0, 4.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 3.0, 7.5, 4.0, 8.0 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.5, 8.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.0, 3.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 7.5, 2.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.0, 9.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 9.0, 7.5, 10.0, 8.0 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 8.0, 3.0, 8.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 8.0, 9.0, 8.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.5, 3.0, 12.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.5, 9.0, 12.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json deleted file mode 100644 index 038eaa71a..000000000 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "__comment": "Author: wiiv", - "parent": "minecraft:block/block", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.75, 0.75, 0.75 ] - } - }, - "elements": [ - { - "name": "Layer1", - "from": [ 3.0, 6.0, 3.0 ], - "to": [ 13.0, 7.0, 13.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 6.0, 5.0, 6.5 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 6.0, 11.0, 6.5 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 9.5, 5.0, 10.0 ] }, - "east": { "texture": "#all", "uv": [ 6.0, 9.5, 11.0, 10.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, - "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } - } - }, - { - "name": "Layer2North", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 11.0, 6.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 1.0, 6.5, 4.0, 7.0 ] }, - "east": { "texture": "#all", "uv": [ 10.0, 10.0, 11.0, 10.5 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 10.0, 1.0, 10.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } - } - }, - { - "name": "Layer2South", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 11.0, 6.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 6.0, 10.0, 7.0, 10.5 ] }, - "south": { "texture": "#all", "uv": [ 7.0, 6.5, 10.0, 7.0 ] }, - "west": { "texture": "#all", "uv": [ 4.0, 10.0, 5.0, 10.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } - } - }, - { - "name": "Layer2West", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 4.0, 6.5, 5.0, 7.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 6.5, 7.0, 7.0 ] }, - "west": { "texture": "#all", "uv": [ 1.0, 10.0, 4.0, 10.5 ] }, - "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } - } - }, - { - "name": "Layer2East", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 6.5, 1.0, 7.0 ] }, - "east": { "texture": "#all", "uv": [ 7.0, 10.0, 10.0, 10.5 ] }, - "south": { "texture": "#all", "uv": [ 10.0, 6.5, 11.0, 7.0 ] }, - "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } - } - }, - { - "name": "Layer3Center", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 5.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 1.0, 7.0, 4.0, 7.5 ] }, - "south": { "texture": "#all", "uv": [ 7.0, 7.0, 10.0, 7.5 ] }, - "west": { "texture": "#all", "uv": [ 1.0, 10.5, 4.0, 11.0 ] }, - "east": { "texture": "#all", "uv": [ 7.0, 10.5, 10.0, 11.0 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } - } - }, - { - "name": "Layer3North", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 5.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.0, 7.0, 3.0, 7.5 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 10.5, 1.0, 11.0 ] }, - "east": { "texture": "#all", "uv": [ 10.0, 10.5, 11.0, 11.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } - } - }, - { - "name": "Layer3South", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 5.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 6.0, 10.5, 7.0, 11.0 ] }, - "south": { "texture": "#all", "uv": [ 8.0, 7.0, 9.0, 7.5 ] }, - "west": { "texture": "#all", "uv": [ 4.0, 10.5, 5.0, 11.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } - } - }, - { - "name": "Layer3West", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 4.0, 7.0, 5.0, 7.5 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 7.0, 2.0, 7.5 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 10.5, 3.0, 11.0 ] }, - "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } - } - }, - { - "name": "Layer3East", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 7.0, 1.0, 7.5 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 10.5, 9.0, 11.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 7.0, 7.0, 7.5 ] }, - "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } - } - }, - { - "name": "Layer4North", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 4.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.0, 7.5, 3.0, 8.0 ] }, - "east": { "texture": "#all", "uv": [ 9.0, 11.0, 10.0, 11.5 ] }, - "west": { "texture": "#all", "uv": [ 1.0, 11.0, 2.0, 11.5 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } - } - }, - { - "name": "Layer4South", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 4.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 11.0, 8.0, 11.5 ] }, - "south": { "texture": "#all", "uv": [ 8.0, 7.5, 9.0, 8.0 ] }, - "west": { "texture": "#all", "uv": [ 3.0, 11.0, 4.0, 11.5 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } - } - }, - { - "name": "Layer4West", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 3.0, 7.5, 4.0, 8.0 ] }, - "south": { "texture": "#all", "uv": [ 7.0, 7.5, 8.0, 8.0 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 11.0, 3.0, 11.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } - } - }, - { - "name": "Layer4East", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 1.0, 7.5, 2.0, 8.0 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 11.0, 9.0, 11.5 ] }, - "south": { "texture": "#all", "uv": [ 9.0, 7.5, 10.0, 8.0 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } - } - }, - { - "name": "Layer5", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 3.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.0, 8.0, 3.0, 8.5 ] }, - "south": { "texture": "#all", "uv": [ 8.0, 8.0, 9.0, 8.5 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 11.5, 3.0, 12.0 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 11.5, 9.0, 12.0 ] }, - "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } - } - } - ] -} \ No newline at end of file From 2fe7d5e0258866218a298084278af235b520896d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 19:57:51 -0500 Subject: [PATCH 886/935] Slightly more efficient quad gathering --- .../vazkii/botania/client/model/FloatingFlowerModel.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index c81b89f9b..e16c57f3f 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -167,12 +167,10 @@ public class FloatingFlowerModel implements IBakedModel { faceQuads.put(e, new ArrayList<>()); // Add flower quads, scaled and translated - for(BakedQuad quad : flower.getQuads(null, null, 0)) { - genBuilder.add(transform(quad, transform)); - } - + flower.getQuads(null, null, 0).stream().map(q -> transform(q, transform)).forEach(genBuilder::add); for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + List faceQ = faceQuads.get(e); + flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).forEach(faceQ::add); } // Add island quads From 1b97974d0e4099debde49297cdd03b642cf5017a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 20:19:00 -0500 Subject: [PATCH 887/935] Add config to render floating flowers in static renderer --- .../client/render/tile/RenderTileFloatingFlower.java | 4 ++++ .../botania/common/block/decor/BlockFloatingFlower.java | 9 ++++++++- .../botania/common/core/handler/ConfigHandler.java | 4 ++++ src/main/resources/assets/botania/lang/en_US.lang | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 56d7083f9..53b3132a3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; import javax.annotation.Nonnull; import java.util.Random; @@ -28,6 +29,9 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + if(ConfigHandler.staticFloaters) + return; + if (tile != null) if (!tile.getWorld().isBlockLoaded(tile.getPos(), false)) return; 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 bdbaff08f..1d8b55f9d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -23,6 +23,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -87,7 +88,13 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; + return ConfigHandler.staticFloaters ? EnumBlockRenderType.MODEL : EnumBlockRenderType.ENTITYBLOCK_ANIMATED; + } + + @Nonnull + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index a88d52706..b3ede910e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -67,6 +67,7 @@ public final class ConfigHandler { public static int glSecondaryTextureUnit = 7; public static boolean altFlowerTextures = false; + public static boolean staticFloaters = false; public static boolean matrixMode = false; public static boolean referencesEnabled = true; @@ -185,6 +186,9 @@ public final class ConfigHandler { desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); + desc = "Set this to true if you use lots of floating flowers and are experiencing rendering lag. Will disable the floating flowers' animations and render them statically for a major performance boost."; + staticFloaters = loadPropBool("staticFloaters.enabled", desc, staticFloaters); + desc = "Set this to true if you are the chosen one. For lovers of glitch art and just general mad people."; matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index de44542c6..19f111eaf 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -349,6 +349,7 @@ references.enabled=Enable Tooltip References shaders.enabled=Enable Shader Usage baubleRender.enabled=Enable Bauble Rendering spreader.posShift=Spreader Pos Shift +staticFloaters.enabled=Enable static rendering of Floating Flowers versionChecking.enabled=Enable Version Checking wandBeam.static=Enable Static Wand Beam worldgen.flower.density=Worldgen Flower Density From 6478eb907e69cfbfc2b47f90f3dc7fe64677eb1d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 20:21:14 -0500 Subject: [PATCH 888/935] Localize config option --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 19f111eaf..66547298e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -349,7 +349,7 @@ references.enabled=Enable Tooltip References shaders.enabled=Enable Shader Usage baubleRender.enabled=Enable Bauble Rendering spreader.posShift=Spreader Pos Shift -staticFloaters.enabled=Enable static rendering of Floating Flowers +staticFloaters.enabled=Enable less pretty but faster rendering of Floating Flowers versionChecking.enabled=Enable Version Checking wandBeam.static=Enable Static Wand Beam worldgen.flower.density=Worldgen Flower Density diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 22a736a27..9c1b7151f 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -349,6 +349,7 @@ references.enabled=启用工具提示文本 shaders.enabled=启用光影支持 baubleRender.enabled=启用饰品渲染 spreader.posShift=发射器位置移动 +# No translation staticFloaters.enabled=? versionChecking.enabled=启用版本检查 wandBeam.static=启用静态法杖光线 worldgen.flower.density=世界生成花密度 From 808d80affaf75b1205810769caac1ac7cba3f8f2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 20:33:32 -0500 Subject: [PATCH 889/935] Add note to refresh rendering after toggling config option --- .../java/vazkii/botania/common/core/handler/ConfigHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index b3ede910e..b44fe6c4e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -186,7 +186,7 @@ public final class ConfigHandler { desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); - desc = "Set this to true if you use lots of floating flowers and are experiencing rendering lag. Will disable the floating flowers' animations and render them statically for a major performance boost."; + desc = "Set this to true if you use lots of floating flowers and are experiencing rendering lag. Will disable the floating flowers' animations and render them statically for a major performance boost. Hit F3+A in-world after toggling this."; staticFloaters = loadPropBool("staticFloaters.enabled", desc, staticFloaters); desc = "Set this to true if you are the chosen one. For lovers of glitch art and just general mad people."; From d12717c29f37a4ca8b3ba55d55cbdf3c84adb4e1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Aug 2016 14:31:25 -0500 Subject: [PATCH 890/935] Get rid of silly common proxy pattern --- .../client/core/proxy/ClientProxy.java | 9 +- .../java/vazkii/botania/common/Botania.java | 188 +++++++++- .../common/core/proxy/CommonProxy.java | 321 ------------------ .../botania/common/core/proxy/IProxy.java | 96 ++++++ .../common/core/proxy/ServerProxy.java | 133 ++++++++ .../vazkii/botania/common/lib/LibMisc.java | 2 +- 6 files changed, 415 insertions(+), 334 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java create mode 100644 src/main/java/vazkii/botania/common/core/proxy/IProxy.java create mode 100644 src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java 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 42e989ed7..5d877393f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -137,7 +137,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.version.AdaptorNotifier; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -165,7 +165,7 @@ import java.time.LocalDateTime; import java.time.Month; import java.util.Map; -public class ClientProxy extends CommonProxy { +public class ClientProxy implements IProxy { public static boolean jingleTheBells = false; public static boolean dootDoot = false; @@ -185,8 +185,6 @@ public class ClientProxy extends CommonProxy { Botania.LOGGER.fatal("Persistent Variables couldn't load!!"); } - super.preInit(event); - MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); initRenderers(); @@ -194,7 +192,6 @@ public class ClientProxy extends CommonProxy { @Override public void init(FMLInitializationEvent event) { - super.init(event); ColorHandler.init(); initAuxiliaryRender(); @@ -232,7 +229,6 @@ public class ClientProxy extends CommonProxy { @Override public void postInit(FMLPostInitializationEvent event) { - super.postInit(event); CorporeaAutoCompleteHandler.updateItemList(); } @@ -329,7 +325,6 @@ public class ClientProxy extends CommonProxy { @Override public void setExtraReach(EntityLivingBase entity, float reach) { - super.setExtraReach(entity, reach); Minecraft mc = Minecraft.getMinecraft(); EntityPlayer player = mc.thePlayer; if(entity == player) { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 1e542160e..43946269c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,16 @@ */ package vazkii.botania.common; +import net.minecraft.entity.Entity; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.EntityDragonPart; +import net.minecraft.entity.boss.EntityWither; +import net.minecraft.entity.item.EntityEnderCrystal; +import net.minecraft.entity.item.EntityItemFrame; +import net.minecraft.entity.item.EntityPainting; +import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -23,12 +33,64 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.ITwoNamedPage; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.block.ModBanners; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModMultiblocks; +import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.block.tile.TileLightRelay; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.core.command.CommandOpen; +import vazkii.botania.common.core.command.CommandShare; +import vazkii.botania.common.core.command.CommandSkyblockSpread; +import vazkii.botania.common.core.handler.BiomeDecorationHandler; +import vazkii.botania.common.core.handler.CommonTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.core.handler.ModSounds; +import vazkii.botania.common.core.handler.PixieHandler; +import vazkii.botania.common.core.handler.SheddingHandler; +import vazkii.botania.common.core.loot.LootHandler; +import vazkii.botania.common.core.proxy.IProxy; +import vazkii.botania.common.crafting.ModBrewRecipes; +import vazkii.botania.common.crafting.ModCraftingRecipes; +import vazkii.botania.common.crafting.ModElvenTradeRecipes; +import vazkii.botania.common.crafting.ModManaAlchemyRecipes; +import vazkii.botania.common.crafting.ModManaConjurationRecipes; +import vazkii.botania.common.crafting.ModManaInfusionRecipes; +import vazkii.botania.common.crafting.ModMigrationRecipes; +import vazkii.botania.common.crafting.ModPetalRecipes; +import vazkii.botania.common.crafting.ModPureDaisyRecipes; +import vazkii.botania.common.crafting.ModRuneRecipes; +import vazkii.botania.common.entity.EntityCorporeaSpark; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.entity.EntityFlameRing; +import vazkii.botania.common.entity.EntityMagicLandmine; +import vazkii.botania.common.entity.EntityMagicMissile; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.entity.EntityPinkWither; +import vazkii.botania.common.entity.EntitySignalFlare; +import vazkii.botania.common.entity.EntitySpark; +import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.network.GuiHandler; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.world.SkyblockWorldEvents; +import vazkii.botania.common.world.WorldTypeSkyblock; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) @@ -48,8 +110,8 @@ public class Botania { @Instance(LibMisc.MOD_ID) public static Botania instance; - @SidedProxy(serverSide = LibMisc.PROXY_COMMON, clientSide = LibMisc.PROXY_CLIENT) - public static CommonProxy proxy; + @SidedProxy(serverSide = LibMisc.PROXY_SERVER, clientSide = LibMisc.PROXY_CLIENT) + public static IProxy proxy; public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); @@ -67,27 +129,116 @@ public class Botania { storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); + BotaniaAPI.internalHandler = new InternalMethodHandler(); + + ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); + + PacketHandler.init(); + ModSounds.init(); + ModBlocks.init(); + ModItems.init(); + ModEntities.init(); + ModPotions.init(); + ModBrews.init(); + + ModAchievements.init(); + ModMultiblocks.init(); + ModBanners.init(); + + if(Botania.gardenOfGlassLoaded) + new WorldTypeSkyblock(); + proxy.preInit(event); } @EventHandler public void init(FMLInitializationEvent event) { + ModCraftingRecipes.init(); + ModMigrationRecipes.init(); + ModPetalRecipes.init(); + ModPureDaisyRecipes.init(); + ModRuneRecipes.init(); + ModManaAlchemyRecipes.init(); + ModManaConjurationRecipes.init(); + ModManaInfusionRecipes.init(); + ModElvenTradeRecipes.init(); + ModBrewRecipes.init(); + LexiconData.init(); + + NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); + + MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); + MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); + MinecraftForge.EVENT_BUS.register(PixieHandler.class); + MinecraftForge.EVENT_BUS.register(SheddingHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); + MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); + MinecraftForge.EVENT_BUS.register(new LootHandler()); + + if(Botania.gardenOfGlassLoaded) + MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); + + MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); + + FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); + + if(Botania.bcTriggersLoaded) + new StatementAPIPlugin(); proxy.init(event); } @EventHandler public void postInit(FMLPostInitializationEvent event) { + if(Botania.thaumcraftLoaded) { + ModBrews.initTC(); + ModBrewRecipes.initTC(); + try { + @SuppressWarnings("unchecked") + Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); + BotaniaAPI.blacklistEntityFromGravityRod(clazz); + } catch (ClassNotFoundException ignored) {} + } + + ModBlocks.addDispenserBehaviours(); + ModBlocks.registerMultiparts(); + ConfigHandler.loadPostInit(); + LexiconData.postInit(); + + int words = 0; + for(LexiconEntry entry : BotaniaAPI.getAllEntries()) + for(LexiconPage page : entry.pages) { + words += countWords(page.getUnlocalizedName()); + if(page instanceof ITwoNamedPage) + words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName()); + } + Botania.LOGGER.info("The Lexica Botania has {} words.", words); + + registerDefaultEntityBlacklist(); proxy.postInit(event); } + // Overriding the internal method handler will break everything as it changes regularly. + // So just don't be a moron and don't override it. Thanks. @EventHandler public void serverStarting(FMLServerAboutToStartEvent event) { - proxy.serverAboutToStart(event); + String clname = BotaniaAPI.internalHandler.getClass().getName(); + String expect = "vazkii.botania.common.core.handler.InternalMethodHandler"; + if(!clname.equals(expect)) { + new IllegalAccessError("The Botania API internal method handler has been overriden. " + + "This will cause crashes and compatibility issues, and that's why it's marked as" + + " \"Do not Override\". Whoever had the brilliant idea of overriding it needs to go" + + " back to elementary school and learn to read. (Expected classname: " + expect + ", Actual classname: " + clname + ")").printStackTrace(); + FMLCommonHandler.instance().exitJava(1, true); + } } @EventHandler public void serverStarting(FMLServerStartingEvent event) { - proxy.serverStarting(event); + // todo 1.8 - we don't have a file server yet. event.registerServerCommand(new CommandDownloadLatest()); + event.registerServerCommand(new CommandShare()); + event.registerServerCommand(new CommandOpen()); + if(Botania.gardenOfGlassLoaded) + event.registerServerCommand(new CommandSkyblockSpread()); } @EventHandler @@ -100,4 +251,31 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } + private int countWords(String s) { + String s1 = I18n.translateToLocal(s); + return s1.split("\\s+").length; + } + + private void registerDefaultEntityBlacklist() { + // Vanilla + BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class); + + // Botania + BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class); + BotaniaAPI.blacklistEntityFromGravityRod(TileLightRelay.EntityPlayerMover.class); + } + } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java deleted file mode 100644 index f69406110..000000000 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ /dev/null @@ -1,321 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)] - */ -package vazkii.botania.common.core.proxy; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityDragonPart; -import net.minecraft.entity.boss.EntityWither; -import net.minecraft.entity.item.EntityEnderCrystal; -import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.entity.item.EntityPainting; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemRecord; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.lexicon.ITwoNamedPage; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.block.ModBanners; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModMultiblocks; -import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.command.CommandOpen; -import vazkii.botania.common.core.command.CommandShare; -import vazkii.botania.common.core.command.CommandSkyblockSpread; -import vazkii.botania.common.core.handler.BiomeDecorationHandler; -import vazkii.botania.common.core.handler.CommonTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.handler.InternalMethodHandler; -import vazkii.botania.common.core.loot.LootHandler; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.handler.PixieHandler; -import vazkii.botania.common.core.handler.SheddingHandler; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.crafting.ModBrewRecipes; -import vazkii.botania.common.crafting.ModCraftingRecipes; -import vazkii.botania.common.crafting.ModElvenTradeRecipes; -import vazkii.botania.common.crafting.ModManaAlchemyRecipes; -import vazkii.botania.common.crafting.ModManaConjurationRecipes; -import vazkii.botania.common.crafting.ModManaInfusionRecipes; -import vazkii.botania.common.crafting.ModMigrationRecipes; -import vazkii.botania.common.crafting.ModPetalRecipes; -import vazkii.botania.common.crafting.ModPureDaisyRecipes; -import vazkii.botania.common.crafting.ModRuneRecipes; -import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.entity.EntityFlameRing; -import vazkii.botania.common.entity.EntityMagicLandmine; -import vazkii.botania.common.entity.EntityMagicMissile; -import vazkii.botania.common.entity.EntityManaBurst; -import vazkii.botania.common.entity.EntityPinkWither; -import vazkii.botania.common.entity.EntitySignalFlare; -import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.network.GuiHandler; -import vazkii.botania.common.network.PacketHandler; -import vazkii.botania.common.world.SkyblockWorldEvents; -import vazkii.botania.common.world.WorldTypeSkyblock; - -public class CommonProxy { - - public void preInit(FMLPreInitializationEvent event) { - BotaniaAPI.internalHandler = new InternalMethodHandler(); - - ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); - - PacketHandler.init(); - ModSounds.init(); - ModBlocks.init(); - ModItems.init(); - ModEntities.init(); - ModPotions.init(); - ModBrews.init(); - - ModAchievements.init(); - ModMultiblocks.init(); - ModBanners.init(); - - if(Botania.gardenOfGlassLoaded) - new WorldTypeSkyblock(); - } - - public void init(FMLInitializationEvent event) { - ModCraftingRecipes.init(); - ModMigrationRecipes.init(); - ModPetalRecipes.init(); - ModPureDaisyRecipes.init(); - ModRuneRecipes.init(); - ModManaAlchemyRecipes.init(); - ModManaConjurationRecipes.init(); - ModManaInfusionRecipes.init(); - ModElvenTradeRecipes.init(); - ModBrewRecipes.init(); - LexiconData.init(); - - NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); - - MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); - MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(PixieHandler.class); - MinecraftForge.EVENT_BUS.register(SheddingHandler.class); - MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); - MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); - MinecraftForge.EVENT_BUS.register(new LootHandler()); - - if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); - - MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); - - FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - - if(Botania.bcTriggersLoaded) - new StatementAPIPlugin(); - } - - public void postInit(FMLPostInitializationEvent event) { - if(Botania.thaumcraftLoaded) { - ModBrews.initTC(); - ModBrewRecipes.initTC(); - try { - @SuppressWarnings("unchecked") - Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); - BotaniaAPI.blacklistEntityFromGravityRod(clazz); - } catch (ClassNotFoundException ignored) {} - } - - ModBlocks.addDispenserBehaviours(); - ModBlocks.registerMultiparts(); - ConfigHandler.loadPostInit(); - LexiconData.postInit(); - - int words = 0; - for(LexiconEntry entry : BotaniaAPI.getAllEntries()) - for(LexiconPage page : entry.pages) { - words += countWords(page.getUnlocalizedName()); - if(page instanceof ITwoNamedPage) - words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName()); - } - Botania.LOGGER.info("The Lexica Botania has {} words.", words); - - registerDefaultEntityBlacklist(); - } - - private int countWords(String s) { - String s1 = I18n.translateToLocal(s); - return s1.split("\\s+").length; - } - - private void registerDefaultEntityBlacklist() { - // Vanilla - BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class); - - // Botania - BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPlayerMover.class); - } - - // Overriding the internal method handler will break everything as it changes regularly. - // So just don't be a moron and don't override it. Thanks. - public void serverAboutToStart(FMLServerAboutToStartEvent event) { - String clname = BotaniaAPI.internalHandler.getClass().getName(); - String expect = "vazkii.botania.common.core.handler.InternalMethodHandler"; - if(!clname.equals(expect)) { - new IllegalAccessError("The Botania API internal method handler has been overriden. " - + "This will cause crashes and compatibility issues, and that's why it's marked as" - + " \"Do not Override\". Whoever had the brilliant idea of overriding it needs to go" - + " back to elementary school and learn to read. (Expected classname: " + expect + ", Actual classname: " + clname + ")").printStackTrace(); - FMLCommonHandler.instance().exitJava(1, true); - } - } - - public void serverStarting(FMLServerStartingEvent event) { - // todo 1.8 - we don't have a file server yet. event.registerServerCommand(new CommandDownloadLatest()); - event.registerServerCommand(new CommandShare()); - event.registerServerCommand(new CommandOpen()); - if(Botania.gardenOfGlassLoaded) - event.registerServerCommand(new CommandSkyblockSpread()); - } - - public void setEntryToOpen(LexiconEntry entry) {} - - public void setToTutorialIfFirstLaunch() {} - - public void setLexiconStack(ItemStack stack) {} - - public boolean isTheClientPlayer(EntityLivingBase entity) { - return false; - } - - public EntityPlayer getClientPlayer() { - return null; - } - - public boolean isClientPlayerWearingMonocle() { - return false; - } - - public String getLastVersion() { - return LibMisc.BUILD; - } - - public void setExtraReach(EntityLivingBase entity, float reach) { - if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); - } - - public boolean openWikiPage(World world, Block block, RayTraceResult pos) { - return false; - } - - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} - - public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} - - public void removeSextantMultiblock() {} - - public long getWorldElapsedTicks() { - return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); - } - - public void setSparkleFXNoClip(boolean noclip) {} - - public void setSparkleFXCorrupt(boolean corrupt) {} - - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - sparkleFX(world, x, y, z, r, g, b, size, m, false); - } - - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} - - public void setWispFXDistanceLimit(boolean limit) {} - - public void setWispFXDepthTest(boolean depth) {} - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { - wispFX(world, x, y, z, r, g, b, size, 0F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity) { - wispFX(world, x, y, z, r, g, b, size, gravity, 1F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { - wispFX(world, x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { - wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} - - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { - lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); - } - - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} - - public void addBoss(IBotaniaBoss boss) {} - - public void removeBoss(IBotaniaBoss boss) {} - - public int getClientRenderDistance() { - return 0; - } - - public Object getEmptyModelBiped() { - return null; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java new file mode 100644 index 000000000..b67738de8 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -0,0 +1,96 @@ +package vazkii.botania.common.core.proxy; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemRecord; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.api.boss.IBotaniaBoss; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.core.helper.Vector3; + +public interface IProxy { + void preInit(FMLPreInitializationEvent event); + + void init(FMLInitializationEvent event); + + void postInit(FMLPostInitializationEvent event); + + void setEntryToOpen(LexiconEntry entry); + + void setToTutorialIfFirstLaunch(); + + void setLexiconStack(ItemStack stack); + + boolean isTheClientPlayer(EntityLivingBase entity); + + EntityPlayer getClientPlayer(); + + boolean isClientPlayerWearingMonocle(); + + String getLastVersion(); + + void setExtraReach(EntityLivingBase entity, float reach); + + boolean openWikiPage(World world, Block block, RayTraceResult pos); + + void playRecordClientSided(World world, BlockPos pos, ItemRecord record); + + void setMultiblock(World world, int x, int y, int z, double radius, Block block); + + void removeSextantMultiblock(); + + long getWorldElapsedTicks(); + + void setSparkleFXNoClip(boolean noclip); + + void setSparkleFXCorrupt(boolean corrupt); + + default void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { + sparkleFX(world, x, y, z, r, g, b, size, m, false); + } + + void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); + + void setWispFXDistanceLimit(boolean limit); + + void setWispFXDepthTest(boolean depth); + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { + wispFX(world, x, y, z, r, g, b, size, 0F); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity) { + wispFX(world, x, y, z, r, g, b, size, gravity, 1F); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { + wispFX(world, x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { + wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); + } + + void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); + + default void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { + lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); + } + + void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); + + void addBoss(IBotaniaBoss boss); + + void removeBoss(IBotaniaBoss boss); + + int getClientRenderDistance(); + + Object getEmptyModelBiped(); +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java new file mode 100644 index 000000000..ca46b008e --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -0,0 +1,133 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)] + */ +package vazkii.botania.common.core.proxy; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemRecord; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.api.boss.IBotaniaBoss; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibMisc; + +public class ServerProxy implements IProxy { + + @Override + public void preInit(FMLPreInitializationEvent event) {} + + @Override + public void init(FMLInitializationEvent event) {} + + @Override + public void postInit(FMLPostInitializationEvent event) {} + + @Override + public void setEntryToOpen(LexiconEntry entry) {} + + @Override + public void setToTutorialIfFirstLaunch() {} + + @Override + public void setLexiconStack(ItemStack stack) {} + + @Override + public boolean isTheClientPlayer(EntityLivingBase entity) { + return false; + } + + @Override + public EntityPlayer getClientPlayer() { + return null; + } + + @Override + public boolean isClientPlayerWearingMonocle() { + return false; + } + + @Override + public String getLastVersion() { + return LibMisc.BUILD; + } + + @Override + public void setExtraReach(EntityLivingBase entity, float reach) { + if(entity instanceof EntityPlayerMP) + ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); + } + + @Override + public boolean openWikiPage(World world, Block block, RayTraceResult pos) { + return false; + } + + @Override + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} + + @Override + public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} + + @Override + public void removeSextantMultiblock() {} + + @Override + public long getWorldElapsedTicks() { + return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); + } + + @Override + public void setSparkleFXNoClip(boolean noclip) {} + + @Override + public void setSparkleFXCorrupt(boolean corrupt) {} + + @Override + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} + + @Override + public void setWispFXDistanceLimit(boolean limit) {} + + @Override + public void setWispFXDepthTest(boolean depth) {} + + @Override + public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} + + @Override + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} + + @Override + public void addBoss(IBotaniaBoss boss) {} + + @Override + public void removeBoss(IBotaniaBoss boss) {} + + @Override + public int getClientRenderDistance() { + return 0; + } + + @Override + public Object getEmptyModelBiped() { + return null; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 3bfdd51ee..b943a2ce0 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -25,7 +25,7 @@ public final class LibMisc { public static final String NETWORK_CHANNEL = MOD_ID; // Proxy Constants - public static final String PROXY_COMMON = "vazkii.botania.common.core.proxy.CommonProxy"; + public static final String PROXY_SERVER = "vazkii.botania.common.core.proxy.ServerProxy"; public static final String PROXY_CLIENT = "vazkii.botania.client.core.proxy.ClientProxy"; public static final String GUI_FACTORY = "vazkii.botania.client.core.proxy.GuiFactory"; From b91ab69ceabaca8598c82fcb3f74baae423fc217 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Aug 2016 14:38:24 -0500 Subject: [PATCH 891/935] Remove unneeded world arg from particle methods --- .../client/core/proxy/ClientProxy.java | 21 ++++++------- .../botania/common/block/BlockAltGrass.java | 6 ++-- .../common/block/BlockBifrostPerm.java | 2 +- .../common/block/BlockModDoubleFlower.java | 2 +- .../botania/common/block/BlockModFlower.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 2 +- .../block/decor/BlockFloatingFlower.java | 2 +- .../common/block/decor/BlockModMushroom.java | 2 +- .../common/block/decor/BlockUnstable.java | 2 +- .../common/block/subtile/SubTileManastar.java | 2 +- .../block/subtile/SubTilePureDaisy.java | 4 +-- .../subtile/functional/SubTileDaffomill.java | 2 +- .../functional/SubTileTangleberrie.java | 2 +- .../generating/SubTileHydroangeas.java | 4 +-- .../subtile/generating/SubTileThermalily.java | 2 +- .../common/block/tile/TileAlfPortal.java | 2 +- .../botania/common/block/tile/TileAltar.java | 4 +-- .../common/block/tile/TileBifrost.java | 2 +- .../common/block/tile/TileBrewery.java | 8 ++--- .../common/block/tile/TileIncensePlate.java | 4 +-- .../common/block/tile/TileLightRelay.java | 5 ++-- .../common/block/tile/TileManaBeacon.java | 4 +-- .../common/block/tile/TileManaFlame.java | 2 +- .../botania/common/block/tile/TilePylon.java | 14 ++++----- .../common/block/tile/TileRuneAltar.java | 6 ++-- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../common/block/tile/TileSpiritShrine.java | 4 +-- .../common/block/tile/TileStarfield.java | 2 +- .../common/block/tile/TileTerraPlate.java | 6 ++-- .../block/tile/mana/TileManaDetector.java | 2 +- .../common/block/tile/mana/TileManaVoid.java | 2 +- .../common/block/tile/mana/TilePool.java | 2 +- .../core/handler/InternalMethodHandler.java | 2 +- .../botania/common/core/proxy/IProxy.java | 30 +++++++++---------- .../common/core/proxy/ServerProxy.java | 6 ++-- .../common/entity/EntityBabylonWeapon.java | 2 +- .../common/entity/EntityDoppleganger.java | 7 ++--- .../common/entity/EntityFallingStar.java | 2 +- .../common/entity/EntityFlameRing.java | 4 +-- .../common/entity/EntityMagicLandmine.java | 4 +-- .../common/entity/EntityMagicMissile.java | 4 +-- .../common/entity/EntityManaBurst.java | 12 ++++---- .../botania/common/entity/EntityPixie.java | 4 +-- .../common/entity/EntityPoolMinecart.java | 2 +- .../common/entity/EntitySignalFlare.java | 4 +-- .../buildcraft/TriggerManaDetector.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 4 +-- .../botania/common/item/ItemFertilizer.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 2 +- .../botania/common/item/ItemSextant.java | 4 +-- .../botania/common/item/ItemSpawnerMover.java | 6 ++-- .../botania/common/item/ItemTwigWand.java | 6 ++-- .../botania/common/item/ItemWorldSeed.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 3 +- .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemHolyCloak.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 8 ++--- .../item/equipment/bauble/ItemMagnetRing.java | 5 +--- .../equipment/bauble/ItemUnholyCloak.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../botania/common/item/lens/LensFlare.java | 3 +- .../common/item/relic/ItemFlugelEye.java | 6 ++-- .../botania/common/item/rod/ItemDirtRod.java | 2 +- .../common/item/rod/ItemDiviningRod.java | 2 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemMissileRod.java | 4 +-- .../common/item/rod/ItemSkyDirtRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 4 +-- .../common/item/rod/ItemTerraformRod.java | 2 +- .../common/item/rod/ItemTornadoRod.java | 6 ++-- .../botania/common/item/rod/ItemWaterRod.java | 2 +- .../common/network/PacketBotaniaEffect.java | 20 ++++++------- 72 files changed, 148 insertions(+), 170 deletions(-) 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 5d877393f..121fe3309 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -430,11 +430,11 @@ public class ClientProxy implements IProxy { } @Override - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) { - if(!doParticle(world) && !fake) + public void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) { + if(!doParticle() && !fake) return; - FXSparkle sparkle = new FXSparkle(world, x, y, z, size, r, g, b, m); + FXSparkle sparkle = new FXSparkle(Minecraft.getMinecraft().theWorld, x, y, z, size, r, g, b, m); sparkle.fake = sparkle.noClip = fake; if(noclipEnabled) sparkle.noClip = true; @@ -457,19 +457,16 @@ public class ClientProxy implements IProxy { } @Override - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) { - if(!doParticle(world)) + public void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) { + if(!doParticle()) return; - FXWisp wisp = new FXWisp(world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); + FXWisp wisp = new FXWisp(Minecraft.getMinecraft().theWorld, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); wisp.setSpeed(motionx, motiony, motionz); Minecraft.getMinecraft().effectRenderer.addEffect(wisp); } - private boolean doParticle(World world) { - if(!world.isRemote) - return false; - + private boolean doParticle() { if(!ConfigHandler.useVanillaParticleLimiter) return true; @@ -483,8 +480,8 @@ public class ClientProxy implements IProxy { } @Override - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); + public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { + Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(Minecraft.getMinecraft().theWorld, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7abc27085..2092758ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -140,13 +140,13 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { break; case INFUSED: if(r.nextInt(100) == 0) - Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); + Botania.proxy.sparkleFX(pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5); break; case MUTATED: if(r.nextInt(100) == 0) { if(r.nextInt(100) > 25) - Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); - else Botania.proxy.sparkleFX(world, pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5); + Botania.proxy.sparkleFX(pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5); + else Botania.proxy.sparkleFX(pos.getX() + r.nextFloat(), pos.getY() + 1.05, pos.getZ() + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5); } break; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 4da885bd1..a0871edc0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -58,7 +58,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { if(rand.nextBoolean()) - Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index b41bf12a5..eaeeb729d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -189,7 +189,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I int b = (hex & 0xFF); if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); + Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 43637b05f..a91f9139d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -139,7 +139,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup int b = (hex & 0xFF); if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); + Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index e5f5f8a79..e8950b55f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -56,7 +56,7 @@ public class BlockBuriedPetals extends BlockModFlower { int b = (hex & 0xFF); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.1 + rand.nextFloat() * 0.1, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); + Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.1 + rand.nextFloat() * 0.1, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); Botania.proxy.setSparkleFXNoClip(false); } 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 1d8b55f9d..2f9e8582e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -144,7 +144,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu int b = (hex & 0xFF); if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); + Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @SideOnly(Side.CLIENT) 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 30e911e86..10b47d62a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -131,7 +131,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis int b = (hex & 0xFF); if(rand.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); + Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } @Override 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 d79ce9cd3..3cde58d92 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -114,7 +114,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); Vector3 endVector = origVector.add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); - Botania.proxy.lightningFX(world, origVector, endVector, 5F, colorDark, colorBright); + Botania.proxy.lightningFX(origVector, endVector, 5F, colorDark, colorBright); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 15dcacc29..d7919afea 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -35,7 +35,7 @@ public class SubTileManastar extends SubTileEntity { if(manaLastTick != -1 && mana != manaLastTick && Math.random() > 0.6) { boolean more = mana > manaLastTick; - Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); + Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, more ? 0.05F : 1F, 0.05F, more ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); } if(ticksExisted % 60 == 0) 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 c239dd854..5b961ac54 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -69,7 +69,7 @@ public class SubTilePureDaisy extends SubTileEntity { ticksRemaining[positionAt] = recipe.getTime(); ticksRemaining[positionAt]--; - Botania.proxy.sparkleFX(supertile.getWorld(), coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); + Botania.proxy.sparkleFX(coords.getX() + Math.random(), coords.getY() + Math.random(), coords.getZ() + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); if(ticksRemaining[positionAt] <= 0) { ticksRemaining[positionAt] = -1; @@ -80,7 +80,7 @@ public class SubTilePureDaisy extends SubTileEntity { double y = coords.getY() + Math.random() + 0.5; double z = coords.getZ() + Math.random(); - Botania.proxy.wispFX(supertile.getWorld(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); + Botania.proxy.wispFX(x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); } if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState())); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 29292e4d5..b4a942189 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -38,7 +38,7 @@ public class SubTileDaffomill extends SubTileFunctional { super.onUpdate(); if(supertile.getWorld().rand.nextInt(4) == 0) - Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getFrontOffsetX() * 0.1F, orientation.getFrontOffsetY() * 0.1F, orientation.getFrontOffsetZ() * 0.1F); + Botania.proxy.wispFX(supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getFrontOffsetX() * 0.1F, orientation.getFrontOffsetY() * 0.1F, orientation.getFrontOffsetZ() * 0.1F); if(windTicks == 0 && mana > 0) { windTicks = 20; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index acb47e1df..bc19f9532 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -53,7 +53,7 @@ public class SubTileTangleberrie extends SubTileFunctional { if(distance > maxDist && distance < range) { MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity()); if(supertile.getWorld().rand.nextInt(3) == 0) - Botania.proxy.sparkleFX(supertile.getWorld(), x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3); + Botania.proxy.sparkleFX(x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3); } } 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 69aae6dc6..2c312c928 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 @@ -52,7 +52,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { if(cooldown > 0) { cooldown--; for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); + Botania.proxy.wispFX(supertile.getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); return; } @@ -101,7 +101,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { } public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); } public Material getMaterialToSearchFor() { 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 463f74ef0..c66cd8e62 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 @@ -31,7 +31,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { - Botania.proxy.wispFX(supertile.getWorld(), supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); } @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 acb38778b..a6bb79285 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -175,7 +175,7 @@ public class TileAlfPortal extends TileMod { pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; - Botania.proxy.wispFX(getWorld(), getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); + Botania.proxy.wispFX(getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); } public boolean onWanded() { 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 3c11c78da..46f06a7a1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -231,7 +231,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - 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); + Botania.proxy.sparkleFX(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); } } @@ -266,7 +266,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { float blue = color.getBlue() / 255F; if(Math.random() >= 0.75F) 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); + Botania.proxy.sparkleFX(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); } } 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 3702277c4..d15d53aef 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -28,7 +28,7 @@ public class TileBifrost extends TileMod { worldObj.setBlockToAir(pos); } else ticks--; } else if(Math.random() < 0.1) - Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 843cd329d..e2c0950b0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -119,9 +119,9 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; for(int i = 0; i < 5; i++) { - Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); } } @@ -169,9 +169,9 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; - 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, r, g, b, (float) Math.random() * 2F + 0.5F, 10); + Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); } } 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 b79ea0c60..ad849febf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -68,8 +68,8 @@ public class TileIncensePlate extends TileSimpleInventory { float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; - Botania.proxy.wispFX(worldObj, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, r, g, b, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.005F, 0.005F - (float) Math.random() * 0.01F); - Botania.proxy.wispFX(worldObj, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); + Botania.proxy.wispFX(x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, r, g, b, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.005F, 0.005F - (float) Math.random() * 0.01F); + Botania.proxy.wispFX(x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); } } else { itemHandler.setStackInSlot(0, null); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 94d0df5e7..a3425ae56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -33,7 +33,6 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import javax.annotation.Nonnull; @@ -90,7 +89,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { mul = Math.min(maxMul, mul + mulPer); double rad = radPer * (i + ticksElapsed * 0.4); Vector3 vecRot = vecMag.crossProduct(Vector3.ONE).multiply(mul).rotate(rad, vecMag).add(vecTip); - Botania.proxy.wispFX(worldObj, vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); + Botania.proxy.wispFX(vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); vecTip = vecTip.add(vecMag); } } else { @@ -256,7 +255,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { double sin = Math.sin(rad); double s = 0.4; - Botania.proxy.sparkleFX(worldObj, posX + cos * s, posY - 0.5, posZ + sin * s, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1.2F, 10); + Botania.proxy.sparkleFX(posX + cos * s, posY - 0.5, posZ + sin * s, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1.2F, 10); } posX += motVec.x; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 379159d12..1bf725ad3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -32,10 +32,10 @@ public class TileManaBeacon extends TileMod { int b = (hex & 0xFF); Botania.proxy.setWispFXDistanceLimit(false); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - pos.getY())), (float) (Math.random() - 0.5F)); for(int i = 0; i < 2; i++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, Math.min(256, pos.getY() + Botania.proxy.getClientRenderDistance() * 16), pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(pos.getX() + 0.5, Math.min(256, pos.getY() + Botania.proxy.getClientRenderDistance() * 16), pos.getZ() + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index ae53ff8f3..dc64dbac6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -56,7 +56,7 @@ public class TileManaFlame extends TileMod { float s = 0.2F + (float) Math.random() * 0.1F; float m = 0.03F + (float) Math.random() * 0.015F; - Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, s, -m); + Botania.proxy.wispFX(x, y, z, r, g, b, s, -m); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index b2eadda8b..bb87e017c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -61,9 +61,9 @@ public class TilePylon extends TileEntity implements ITickable { centerBlock = centerBlock.subtract(new Vector3(0, 0.5, 0)); Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); - Botania.proxy.wispFX(worldObj, x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); + Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); if(worldObj.rand.nextInt(3) == 0) - Botania.proxy.wispFX(worldObj, x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } else { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); @@ -77,17 +77,17 @@ public class TilePylon extends TileEntity implements ITickable { int b = (hex & 0xFF); if(worldObj.rand.nextInt(4) == 0) - Botania.proxy.sparkleFX(worldObj, centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); + Botania.proxy.sparkleFX(centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 3F, -0.04F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r / 255F, g / 255F, b / 255F, (float) Math.random() / 5F, -0.001F); - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 3F, -0.04F); + Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r / 255F, g / 255F, b / 255F, (float) Math.random() / 5F, -0.001F); + Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } } if(worldObj.rand.nextBoolean() && worldObj.isRemote) - Botania.proxy.sparkleFX(worldObj, pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 28c74142a..27d27fc2a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -123,13 +123,13 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver if(worldObj.rand.nextInt(20) == 0) { Vector3 vec = Vector3.fromTileEntityCenter(this); Vector3 endVec = vec.add(0, 2.5, 0); - Botania.proxy.lightningFX(worldObj, vec, endVec, 2F, 0x00948B, 0x00E4D7); + Botania.proxy.lightningFX(vec, endVec, 2F, 0x00948B, 0x00E4D7); } } if(cooldown > 0) { cooldown--; - Botania.proxy.wispFX(getWorld(), pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); + Botania.proxy.wispFX(pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); } int newSignal = 0; @@ -261,7 +261,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - 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); + Botania.proxy.sparkleFX(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); } } 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 6251b5b25..f30d31e19 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -54,7 +54,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { MethodHandles.spawnDelay_setter.invokeExact(logic, delay - 1); if(Math.random() > 0.5) - Botania.proxy.wispFX(worldObj, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + Botania.proxy.wispFX(getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); MethodHandles.prevMobRotation_setter.invokeExact(logic, logic.getMobRotation()); MethodHandles.mobRotation_setter.invokeExact(logic, (logic.getMobRotation() + 1000.0F / (((int) MethodHandles.spawnDelay_getter.invokeExact(logic)) + 200.0F)) % 360.0D); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index f9396260e..6ea40d788 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -49,8 +49,8 @@ public class TileSpiritShrine extends TileMod { wticks += tickIncrement; float[] colorsfx = colors[i >= colors.length ? 0 : i]; - Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index f8145e3c0..188ac2965 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -44,7 +44,7 @@ public class TileStarfield extends TileMod { float s = 20F + (float) Math.random() * 20F; int m = 50; - Botania.proxy.sparkleFX(worldObj, x, y, z, r, g, b, s, m); + Botania.proxy.sparkleFX(x, y, z, r, g, b, s, m); } } } 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 5f5c18969..3c1fa96a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -130,12 +130,12 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { float[] colorsfx = new float[] { 0F, (float) ticks / (float) 100, 1F - (float) ticks / (float) 100 }; - Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); if(ticks == 100) for(int j = 0; j < 15; j++) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index bef4c86bf..b9184d21c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -29,7 +29,7 @@ public class TileManaDetector extends TileMod { if(expectedState) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index 55921d510..e739294d3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -30,7 +30,7 @@ public class TileManaVoid extends TileMod implements IClientManaHandler { public void recieveMana(int mana) { if(mana > 0) for(int i = 0; i < 10; i++) - Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } @Override 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 b6a7d04f5..845cb6a15 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 @@ -224,7 +224,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(worldObj.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; if(Math.random() > particleChance) - Botania.proxy.wispFX(worldObj, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + Botania.proxy.wispFX(pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); return; } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index abe7c233c..bd13bdfda 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -214,7 +214,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - Botania.proxy.sparkleFX(world, x, y, z, r, g, b, size, m); + Botania.proxy.sparkleFX(x, y, z, r, g, b, size, m); } @Override diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index b67738de8..1ef11ecac 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -52,39 +52,39 @@ public interface IProxy { void setSparkleFXCorrupt(boolean corrupt); - default void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - sparkleFX(world, x, y, z, r, g, b, size, m, false); + default void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m) { + sparkleFX(x, y, z, r, g, b, size, m, false); } - void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); + void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); void setWispFXDistanceLimit(boolean limit); void setWispFXDepthTest(boolean depth); - default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { - wispFX(world, x, y, z, r, g, b, size, 0F); + default void wispFX(double x, double y, double z, float r, float g, float b, float size) { + wispFX(x, y, z, r, g, b, size, 0F); } - default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity) { - wispFX(world, x, y, z, r, g, b, size, gravity, 1F); + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity) { + wispFX(x, y, z, r, g, b, size, gravity, 1F); } - default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { - wispFX(world, x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { + wispFX(x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); } - default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { - wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); + default void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { + wispFX(x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); } - void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); + void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); - default void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { - lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); + default void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { + lightningFX(vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); } - void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); + void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); void addBoss(IBotaniaBoss boss); diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index ca46b008e..dfc8f3ed4 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -100,7 +100,7 @@ public class ServerProxy implements IProxy { public void setSparkleFXCorrupt(boolean corrupt) {} @Override - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} + public void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} @Override public void setWispFXDistanceLimit(boolean limit) {} @@ -109,10 +109,10 @@ public class ServerProxy implements IProxy { public void setWispFXDepthTest(boolean depth) {} @Override - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} + public void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} @Override - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} + public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} @Override public void addBoss(IBotaniaBoss boss) {} diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index a143f8045..d4ad4bad2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -158,7 +158,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { motionZ = z; if(liveTime > delay) - Botania.proxy.wispFX(worldObj, posX, posY, posZ, 1F, 1F, 0F, 0.3F, 0F); + Botania.proxy.wispFX(posX, posY, posZ, 1F, 1F, 0F, 0.3F, 0F); if(liveTime > 200 + delay) setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index bdccd1c8f..8915d3a4c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -46,7 +46,6 @@ import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -525,7 +524,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { double y = source.getY() + 0.5; double z = source.getZ() + 0.5 - Math.sin(rad) * range; - Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); + Botania.proxy.wispFX(x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); } if(worldObj.isRemote && !isPlayingMusic && !isDead && !getPlayersAround().isEmpty()) { @@ -555,8 +554,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { float g = (float) Math.random() * 0.3F; float b = 0.7F + (float) Math.random() * 0.3F; - Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); - Botania.proxy.wispFX(worldObj, partPos.x, partPos.y, partPos.z, r, g, b, 0.4F, (float) mot.x, (float) mot.y, (float) mot.z); + Botania.proxy.wispFX(partPos.x, partPos.y, partPos.z, r, g, b, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); + Botania.proxy.wispFX(partPos.x, partPos.y, partPos.z, r, g, b, 0.4F, (float) mot.x, (float) mot.y, (float) mot.z); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index b91cb6db0..5808bd112 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -44,7 +44,7 @@ public class EntityFallingStar extends EntityThrowableCopy { float xs = (float) (Math.random() - 0.5) * dist; float ys = (float) (Math.random() - 0.5) * dist; float zs = (float) (Math.random() - 0.5) * dist; - Botania.proxy.sparkleFX(worldObj, posX + xs, posY + ys, posZ + zs, 1F, 0.4F, 1F, 2F, 6); + Botania.proxy.sparkleFX(posX + xs, posY + ys, posZ + zs, 1F, 0.4F, 1F, 2F, 6); } EntityLivingBase thrower = getThrower(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index bea9c8c12..023c72b66 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -54,13 +54,13 @@ public class EntityFlameRing extends Entity { double x = Math.cos(rad) * renderRadius; double z = Math.sin(rad) * renderRadius; - Botania.proxy.wispFX(worldObj, posX + x, posY - 0.2, posZ + z, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.65F + (float) Math.random() * 0.45F, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); + Botania.proxy.wispFX(posX + x, posY - 0.2, posZ + z, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.65F + (float) Math.random() * 0.45F, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); float gs = (float) Math.random() * 0.15F; float smokeRadius = (float) (renderRadius - Math.random() * renderRadius * 0.9); x = Math.cos(rad) * smokeRadius; z = Math.sin(rad) * smokeRadius; - Botania.proxy.wispFX(worldObj, posX + x, posY - 0.2, posZ + z, gs, gs, gs, 0.65F + (float) Math.random() * 0.45F, -0.155F - (float) Math.random() * 0.025F); + Botania.proxy.wispFX(posX + x, posY - 0.2, posZ + z, gs, gs, gs, 0.65F + (float) Math.random() * 0.45F, -0.155F - (float) Math.random() * 0.025F); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index ae5936229..fde3e92ee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -49,7 +49,7 @@ public class EntityMagicLandmine extends Entity { //Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.6F, -0.2F, 1); for(int i = 0; i < 6; i++) - Botania.proxy.wispFX(worldObj, posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); + Botania.proxy.wispFX(posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); if(ticksExisted >= 55) { worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); @@ -57,7 +57,7 @@ public class EntityMagicLandmine extends Entity { float m = 0.35F; g = 0.4F; for(int i = 0; i < 25; i++) - Botania.proxy.wispFX(worldObj, posX, posY + 1, posZ, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); + Botania.proxy.wispFX(posX, posY + 1, posZ, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); if(!worldObj.isRemote) { List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 297b2fd5f..20f3a5ce0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -105,9 +105,9 @@ public class EntityMagicMissile extends EntityThrowable { Botania.proxy.setSparkleFXCorrupt(evil); for(int i = 0; i < steps; i++) { - Botania.proxy.sparkleFX(worldObj, particlePos.x, particlePos.y, particlePos.z, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); + Botania.proxy.sparkleFX(particlePos.x, particlePos.y, particlePos.z, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); if(worldObj.rand.nextInt(steps) <= 1) - Botania.proxy.sparkleFX(worldObj, particlePos.x + (Math.random() - 0.5) * 0.4, particlePos.y + (Math.random() - 0.5) * 0.4, particlePos.z + (Math.random() - 0.5) * 0.4, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); + Botania.proxy.sparkleFX(particlePos.x + (Math.random() - 0.5) * 0.4, particlePos.y + (Math.random() - 0.5) * 0.4, particlePos.z + (Math.random() - 0.5) * 0.4, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); particlePos = particlePos.add(step); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index a35b4b339..e5c88aeec 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -475,14 +475,14 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { size = 4F; if(!noParticles && shouldDoFakeParticles()) - Botania.proxy.sparkleFX(worldObj, posX, posY, posZ, r, g, b, 0.4F * size, 1, true); + Botania.proxy.sparkleFX(posX, posY, posZ, r, g, b, 0.4F * size, 1, true); } else { boolean monocle = Botania.proxy.isClientPlayerWearingMonocle(); if(monocle) Botania.proxy.setWispFXDepthTest(false); if(ConfigHandler.subtlePowerSystem) - Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.1F * size, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); + Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.1F * size, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); else { float or = r; float og = g; @@ -508,7 +508,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { b = ob + (float) Math.random() * 0.125F; } size = osize + ((float) Math.random() - 0.5F) * 0.065F + (float) Math.sin(new Random(entityUniqueID.getMostSignificantBits()).nextInt(9001)) * 0.4F; - Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F); + Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F); posX += diffVecNorm.x * distance; posY += diffVecNorm.y * distance; @@ -520,7 +520,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { break; } while(Math.abs(diffVec.mag()) > distance); - Botania.proxy.wispFX(worldObj, posX, posY, posZ, or, og, ob, 0.1F * size, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); + Botania.proxy.wispFX(posX, posY, posZ, or, og, ob, 0.1F * size, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); posX = savedPosX; posY = savedPosY; @@ -588,8 +588,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!ConfigHandler.subtlePowerSystem) for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.15F * size, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); - Botania.proxy.sparkleFX(worldObj, (float) posX, (float) posY, (float) posZ, r, g, b, 4, 2); + Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.15F * size, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); + Botania.proxy.sparkleFX((float) posX, (float) posY, (float) posZ, r, g, b, 4, 2); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 148690dfa..1b0b3edc1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -118,7 +118,7 @@ public class EntityPixie extends EntityFlyingCreature { boolean dark = getType() == 1; if(worldObj.isRemote) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(worldObj, posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, dark ? 0.1F : 1F, dark ? 0.025F : 0.25F, dark ? 0.09F : 0.9F, 0.1F + (float) Math.random() * 0.25F, 12); + Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, dark ? 0.1F : 1F, dark ? 0.025F : 0.25F, dark ? 0.09F : 0.9F, 0.1F + (float) Math.random() * 0.25F, 12); } public void die() { @@ -126,7 +126,7 @@ public class EntityPixie extends EntityFlyingCreature { if(worldObj.isRemote && getType() == 0) for(int i = 0; i < 12; i++) - Botania.proxy.sparkleFX(worldObj, posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, 1F, 0.25F, 0.9F, 1F + (float) Math.random() * 0.25F, 5); + Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, 1F, 0.25F, 0.9F, 1F + (float) Math.random() * 0.25F, 5); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index de95a2998..5387c8850 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -109,7 +109,7 @@ public class EntityPoolMinecart extends EntityMinecart { double y = MathHelper.floor_double(posY); double z = MathHelper.floor_double(posZ); if(Math.random() > particleChance) - Botania.proxy.wispFX(worldObj, x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + Botania.proxy.wispFX(x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index c66e612a7..b3620bcea 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -59,10 +59,10 @@ public class EntitySignalFlare extends Entity { Botania.proxy.setWispFXDistanceLimit(false); for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(worldObj, posX, posY, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + Botania.proxy.wispFX(posX, posY, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(worldObj, posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.wispFX(posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); Botania.proxy.setWispFXDistanceLimit(true); } } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 17a162eb9..2f07c69e9 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -42,7 +42,7 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern boolean output = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1), Predicates.instanceOf(IManaBurst.class)).size() != 0; if(output) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + Botania.proxy.sparkleFX(x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); return output; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 07da35603..1daa3ac33 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; @@ -28,7 +27,6 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.ContainerWorkbench; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; @@ -196,7 +194,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { Vector3 centerVector = Vector3.fromEntityCenter(player).add(lookVec3.xCoord * 3, 1.3, lookVec3.zCoord * 3); float m = 0.1F; for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(player.worldObj, centerVector.x, centerVector.y, centerVector.z, 1F, 0F, 1F, 0.2F + 0.2F * (float) Math.random(), ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m); + Botania.proxy.wispFX(centerVector.x, centerVector.y, centerVector.z, 1F, 0F, 1F, 0.2F + 0.2F * (float) Math.random(), ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m); } private static boolean consumeRecipeIngredients(ItemStack[] recipe, IItemHandler inv, EntityPlayer player) { diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 0d7478425..ba62b754b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -64,7 +64,7 @@ public class ItemFertilizer extends ItemMod { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(world, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); + Botania.proxy.wispFX(x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index ba039dd56..93ff2b0ae 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -151,7 +151,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { float velMul = 0.025F; - Botania.proxy.wispFX(world, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } par1ItemStack.stackSize--; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index cb3ae7ae8..a64a5e064 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -82,7 +82,7 @@ public class ItemSextant extends ItemMod { float radian = (float) (i * Math.PI / 180); double xp = x + Math.cos(radian) * radius; double zp = z + Math.sin(radian) * radius; - Botania.proxy.wispFX(world, xp + 0.5, source.y + 1, zp + 0.5, 0F, 1F, 1F, 0.3F, -0.01F); + Botania.proxy.wispFX(xp + 0.5, source.y + 1, zp + 0.5, 0F, 1F, 1F, 0.3F, -0.01F); } } } @@ -128,7 +128,7 @@ public class ItemSextant extends ItemMod { int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); World world = player.worldObj; Vector3 source = new Vector3(x, y, z); - Botania.proxy.wispFX(world, source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F); + Botania.proxy.wispFX(source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F); Vector3 centerVec = Vector3.fromEntityCenter(player); Vector3 diffVec = source.subtract(centerVec); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index e2c69d917..7c23c5350 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -14,10 +14,8 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -113,7 +111,7 @@ public class ItemSpawnerMover extends ItemMod { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); + Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); } return EnumActionResult.SUCCESS; } else return EnumActionResult.PASS; @@ -145,7 +143,7 @@ public class ItemSpawnerMover extends ItemMod { player.renderBrokenItemStack(itemstack); player.addStat(ModAchievements.spawnerMoverUse, 1); for(int i = 0; i < 100; i++) - Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5d9114e3e..199cc3625 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -16,12 +16,10 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -122,7 +120,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { float velMul = 0.07F; - Botania.proxy.wispFX(world, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } } } else if(block instanceof IWandable) { @@ -181,7 +179,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { float b = color.getBlue() / 255F; Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(world, currentPos.x, currentPos.y, currentPos.z, r, g, b, 0.5F, 4); + Botania.proxy.sparkleFX(currentPos.x, currentPos.y, currentPos.z, r, g, b, 0.5F, 4); Botania.proxy.setSparkleFXNoClip(false); currentPos = currentPos.add(movement); } diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index b6a395c4d..cc5edb63e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -46,7 +46,7 @@ public class ItemWorldSeed extends ItemMod { 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); + Botania.proxy.sparkleFX(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); stack.stackSize--; return ActionResult.newResult(EnumActionResult.SUCCESS, stack); 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 d946ea300..5ec2a86dd 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 @@ -22,7 +22,6 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; @@ -77,7 +76,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble double z = event.getEntityLiving().posZ; for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(event.getEntityLiving().worldObj, x + Math.random() * event.getEntityLiving().width, y + Math.random() * event.getEntityLiving().height, z + Math.random() * event.getEntityLiving().width, 1F, 1F, 0.25F, 1F, 3); + Botania.proxy.sparkleFX(x + Math.random() * event.getEntityLiving().width, y + Math.random() * event.getEntityLiving().height, z + Math.random() * event.getEntityLiving().width, 1F, 1F, 0.25F, 1F, 3); } } } 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 562d3cec7..032d05e07 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 @@ -278,7 +278,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } for(int i = 0; i < 2; i++) - Botania.proxy.sparkleFX(event.getEntityLiving().worldObj, x + Math.random() * event.getEntityLiving().width, y + Math.random() * 0.4, z + Math.random() * event.getEntityLiving().width, r, g, b, 2F * (float) Math.random(), 20); + Botania.proxy.sparkleFX(x + Math.random() * event.getEntityLiving().width, y + Math.random() * 0.4, z + Math.random() * event.getEntityLiving().width, r, g, b, 2F * (float) Math.random(), 20); } } } else { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 6b2fac040..34b7600c5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -87,7 +87,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { double y = player.posY + Math.random() * player.height; double z = player.posZ + Math.random() * player.width * 2 - player.width; boolean yellow = Math.random() > 0.5; - Botania.proxy.sparkleFX(player.worldObj, x, y, z, yellow ? 1F : 0.3F, yellow ? 1F : 0.3F, yellow ? 0.3F : 1F, 0.8F + (float) Math.random() * 0.4F, 3); + Botania.proxy.sparkleFX(x, y, z, yellow ? 1F : 0.3F, yellow ? 1F : 0.3F, yellow ? 0.3F : 1F, 0.8F + (float) Math.random() * 0.4F, 3); } return true; } 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 cd94c0bbd..ed18bace5 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 @@ -29,15 +29,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; -import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; @@ -86,7 +82,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(long l : blocks) { BlockPos pos = BlockPos.fromLong(l); float m = 0.02F; - Botania.proxy.wispFX(player.worldObj, pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); + Botania.proxy.wispFX(pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); } int[] entities = ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS); @@ -94,7 +90,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { Entity e = player.worldObj.getEntityByID(i); if(e != null && Math.random() < 0.6) { Botania.proxy.setWispFXDepthTest(Math.random() < 0.6); - Botania.proxy.wispFX(player.worldObj, e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.height, e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); + Botania.proxy.wispFX(e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.height, e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); } } 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 4cb5a750f..0b347c03e 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,13 +16,11 @@ import baubles.common.lib.PlayerHandler; import com.google.common.collect.ImmutableList; 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; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -37,7 +35,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; import java.util.List; public class ItemMagnetRing extends ItemBauble { @@ -99,7 +96,7 @@ public class ItemMagnetRing extends ItemBauble { MathHelper.setEntityMotionFromVector(item, new Vector3(x, y, z), 0.45F); if(player.worldObj.isRemote) { boolean red = player.worldObj.rand.nextBoolean(); - Botania.proxy.sparkleFX(player.worldObj, item.posX, item.posY, item.posZ, red ? 1F : 0F, 0F, red ? 0F : 1F, 1F, 3); + Botania.proxy.sparkleFX(item.posX, item.posY, item.posZ, red ? 1F : 0F, 0F, red ? 0F : 1F, 1F, 3); } pulled++; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index b86371d64..17a4cc7b4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -52,7 +52,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; float zMotion = (float) Math.sin(rad) * 0.2F; - Botania.proxy.wispFX(player.worldObj, player.posX, player.posY + 0.5, player.posZ, 0.4F + (float) Math.random() + 0.25F, 0F, 0F, 0.6F + (float) Math.random() * 0.2F, xMotion, 0F, zMotion); + Botania.proxy.wispFX(player.posX, player.posY + 0.5, player.posZ, 0.4F + (float) Math.random() + 0.25F, 0F, 0F, 0.6F + (float) Math.random() * 0.2F, xMotion, 0F, zMotion); } return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 2e19d4727..ee4b62717 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -69,7 +69,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); - Botania.proxy.lightningFX(entity.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF); + Botania.proxy.lightningFX(Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF); alreadyTargetedEntities.add(target); lightningSource = target; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index c6a2bd87a..83db6ce41 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -16,7 +16,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.tile.mana.TileSpreader; import java.awt.*; @@ -62,7 +61,7 @@ public class LensFlare extends Lens { float g = ((hex & 0xFF00) >> 8) / 255F; float b = (hex & 0xFF) / 255F; - Botania.proxy.wispFX(tile.getWorld(), tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); + Botania.proxy.wispFX(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); } } 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 8fa7d8f46..2f76ae11b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -55,7 +55,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float x1 = (float) (pos.getX() + Math.random()); float y1 = pos.getY() + 1; float z1 = (float) (pos.getZ() + Math.random()); - Botania.proxy.wispFX(player.worldObj, x1, y1, z1, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.5F, -0.05F + (float) Math.random() * 0.05F); + Botania.proxy.wispFX(x1, y1, z1, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.5F, -0.05F + (float) Math.random() * 0.05F); } } else { ItemNBTHelper.setInt(stack, TAG_X, pos.getX()); @@ -74,7 +74,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float x = (float) (living.posX - Math.random() * living.width); float y = (float) (living.posY - 1.6 + Math.random()); float z = (float) (living.posZ - Math.random() * living.width); - Botania.proxy.wispFX(living.worldObj, x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); + Botania.proxy.wispFX(x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); } @Nonnull @@ -112,7 +112,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float x = (float) (entity.posX + Math.random()); float y = (float) (entity.posY - 1.6 + Math.random()); float z = (float) (entity.posZ + Math.random()); - 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); + Botania.proxy.wispFX(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); 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 dfb0fb215..ab447f43b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -64,7 +64,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(world, pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); + Botania.proxy.sparkleFX(pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 532908adb..6d3589f81 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -75,7 +75,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW String s = OreDictionary.getOreName(id); if(s.matches("^ore[A-Z].+")) { Random rand = new Random(s.hashCode() ^ seedxor); - Botania.proxy.wispFX(world, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); + Botania.proxy.wispFX(pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 0.25F, 0F, 8); break; } } 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 b9e99b7f6..730f39adb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -160,7 +160,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { float xm = ((float) Math.random() - 0.5F) * m; float ym = ((float) Math.random() - 0.5F) * m; float zm = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(world, item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); + Botania.proxy.wispFX(item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); } MathHelper.setEntityMotionFromVector(item, target3, 0.3333333F); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 190ff4a2a..d28642129 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -66,7 +66,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi if(spawnMissile(player.worldObj, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, true); - Botania.proxy.sparkleFX(player.worldObj, player.posX, player.posY + 2.4, player.posZ, 1F, 0.4F, 1F, 6F, 6); + Botania.proxy.sparkleFX(player.posX, player.posY + 2.4, player.posZ, 1F, 0.4F, 1F, 6F, 6); } } @@ -108,7 +108,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi if(spawnMissile(world, null, te.getPos().getX() + 0.5 + (Math.random() - 0.5 * 0.1), te.getPos().getY() + 2.5 + (Math.random() - 0.5 * 0.1), te.getPos().getZ() + (Math.random() - 0.5 * 0.1))) { if(!world.isRemote) tile.recieveMana(-COST_AVATAR); - Botania.proxy.sparkleFX(world, te.getPos().getX() + 0.5, te.getPos().getY() + 2.5, te.getPos().getZ() + 0.5, 1F, 0.4F, 1F, 6F, 6); + Botania.proxy.sparkleFX(te.getPos().getX() + 0.5, te.getPos().getY() + 2.5, te.getPos().getZ() + 0.5, 1F, 0.4F, 1F, 6F, 6); } } 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 e4e8e3bfc..cdd5432f2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -56,7 +56,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { if(stackToPlace.stackSize == 0) { ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 0.35F, 0.2F, 0.05F, 1F, 5); + Botania.proxy.sparkleFX(x + Math.random(), y + Math.random(), z + Math.random(), 0.35F, 0.2F, 0.05F, 1F, 5); } } } 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 f09fc35af..d2863b97c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -109,7 +109,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { double y = pos.getBlockPos().getY() + Math.random(); double z = pos.getBlockPos().getZ() + Math.random(); - Botania.proxy.wispFX(p.worldObj, x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); + Botania.proxy.wispFX(x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); } } } @@ -122,7 +122,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { double x = pos.getBlockPos().getX() + Math.random(); double y = pos.getBlockPos().getY() + Math.random(); double z = pos.getBlockPos().getZ() + Math.random(); - Botania.proxy.wispFX(p.worldObj, x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); + Botania.proxy.wispFX(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); 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 60b9c2fc7..0a907e424 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -156,7 +156,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(int i = 0; i < 10; i++) world.playSound(player, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_SAND_STEP, SoundCategory.BLOCKS, 1F, 0.4F); for(int i = 0; i < 120; i++) - Botania.proxy.sparkleFX(world, 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); + Botania.proxy.sparkleFX(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); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index e7176bbab..e82460907 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -11,10 +11,8 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; @@ -79,7 +77,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++) - Botania.proxy.wispFX(player.worldObj, player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + Botania.proxy.wispFX(player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } par1ItemStack.setItemDamage(Math.min(max, par1ItemStack.getItemDamage() + FALL_MULTIPLIER)); @@ -146,7 +144,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi for(int i = 0; i < 20; i++) for(int j = 0; j < 5; j++) - Botania.proxy.wispFX(p.worldObj, p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + Botania.proxy.wispFX(p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); if(!world.isRemote) { p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); 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 8abe327ee..42ae3c89a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -43,7 +43,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { if (ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true) && ((ItemBucket) Items.WATER_BUCKET).tryPlaceContainedLiquid(player, world, placePos)) { for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(world, 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); + Botania.proxy.sparkleFX(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/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index a0c6f5b52..049973844 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -83,7 +83,7 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(world, message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, + Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 0.75, message.z + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } break; @@ -94,7 +94,7 @@ public class PacketBotaniaEffect implements IMessage { BlockPos pos = new BlockPos(message.x, message.y, message.z); Vector3 itemVec = Vector3.fromBlockPos(pos).add(0.5, 0.5 + Math.random() * 0.3, 0.5); Vector3 tileVec = Vector3.fromBlockPos(pos).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); - Botania.proxy.lightningFX(world, outputting ? tileVec : itemVec, + Botania.proxy.lightningFX(outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, world.rand.nextLong(), 0x4400799c, 0x4400C6FF); } break; @@ -107,7 +107,7 @@ public class PacketBotaniaEffect implements IMessage { int b = (hex & 0xFF); for(int i = 0; i < 10; i++) { BlockPos pos = new BlockPos(message.x, message.y, message.z).offset(EnumFacing.VALUES[world.rand.nextInt(6)]); - Botania.proxy.sparkleFX(world, + Botania.proxy.sparkleFX( pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), r / 255F, g / 255F, b / 255F, 0.6F + (float) Math.random() * 0.5F, 5); } @@ -123,7 +123,7 @@ public class PacketBotaniaEffect implements IMessage { double y = message.y + 0.5; double z = message.z + 0.5 - Math.sin(rad) * EntityDoppleganger.ARENA_RANGE; - Botania.proxy.sparkleFX(world, x, y, z, r, g, b, 5F, 120); + Botania.proxy.sparkleFX(x, y, z, r, g, b, 5F, 120); } break; } @@ -167,7 +167,7 @@ public class PacketBotaniaEffect implements IMessage { float b = Math.min(1F, color.getBlue() / 255F + 0.4F); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(e1.worldObj, currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); + Botania.proxy.sparkleFX(currentPos.x, currentPos.y, currentPos.z, r, g, b, 1F, 12); Botania.proxy.setSparkleFXNoClip(false); currentPos = currentPos.add(movement); } @@ -191,7 +191,7 @@ public class PacketBotaniaEffect implements IMessage { float b = 0.4F + 0.3F * (float) Math.random(); float size = 0.125F + 0.125F * (float) Math.random(); - Botania.proxy.wispFX(world, thisVec.x, thisVec.y, thisVec.z, r, g, b, + Botania.proxy.wispFX(thisVec.x, thisVec.y, thisVec.z, r, g, b, size, (float) motion.x, (float) motion.y, (float) motion.z); break; } @@ -200,7 +200,7 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.sparkleFX(world, + Botania.proxy.sparkleFX( message.x + Math.random() * 0.4 - 0.2, message.y, message.z + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } @@ -211,14 +211,14 @@ public class PacketBotaniaEffect implements IMessage { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(world, message.x, message.y, message.z, + Botania.proxy.wispFX(message.x, message.y, message.z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } break; } case ENTROPINNYUM: { for(int i = 0; i < 50; i++) - Botania.proxy.sparkleFX(world, message.x + Math.random() * 4 - 2, message.y + Math.random() * 4 - 2, message.z + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); + Botania.proxy.sparkleFX(message.x + Math.random() * 4 - 2, message.y + Math.random() * 4 - 2, message.z + Math.random() * 4 - 2, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, (float) (Math.random() * 0.65F + 1.25F), 12); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, message.x, message.y, message.z, 1D, 0D, 0D); break; @@ -235,7 +235,7 @@ public class PacketBotaniaEffect implements IMessage { float my = (float) Math.random() * m; float mz = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(world, message.x, message.y, message.z, r, g, b, s, mx, my, mz); + Botania.proxy.wispFX(message.x, message.y, message.z, r, g, b, s, mx, my, mz); } break; From 9e56e04e6cb6e5f4768fdc031f4e6693eae322fd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Aug 2016 16:32:37 -0500 Subject: [PATCH 892/935] Remove potions more cleanly --- .../common/entity/EntityDoppleganger.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 8915d3a4c..9e18d0e02 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -43,6 +43,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SPacketRemoveEntityEffect; import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; @@ -60,6 +61,7 @@ import net.minecraft.world.BossInfo; import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -88,8 +90,10 @@ import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; @@ -595,19 +599,22 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { setDead(); else { for(EntityPlayer player : players) { - if(player.inventory.armorInventory[0] != null || player.inventory.armorInventory[1] != null || player.inventory.armorInventory[2] != null || player.inventory.armorInventory[3] != null) - anyWithArmor = true; - - Collection active = player.getActivePotionEffects(); - Iterator iter = active.iterator(); - while(iter.hasNext()) { - PotionEffect effect = iter.next(); - if (effect.getDuration() < 160 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) { - iter.remove(); - ((EntityPlayerMP) player).connection.sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), effect.getPotion())); + for(EntityEquipmentSlot e : EntityEquipmentSlot.values()) { + if(e.getSlotType() == EntityEquipmentSlot.Type.ARMOR && player.getItemStackFromSlot(e) != null) { + anyWithArmor = true; + break; } } + player.getActivePotionEffects().stream() + .filter(effect -> effect.getDuration() < 160 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) + .map(PotionEffect::getPotion) + .distinct() + .forEach(potion -> { + player.removePotionEffect(potion); + ((WorldServer) worldObj).getPlayerChunkMap().getEntry(posXInt >> 4, posZInt >> 4).sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), potion)); + }); + player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { Vector3 sourceVector = new Vector3(source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5); From ddcff076a71af9a4bde4e5ef5da5bf77c684bf94 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 20 Aug 2016 16:44:27 -0500 Subject: [PATCH 893/935] Cleanup and pull unneeded stuff out of datawatcher --- .../common/entity/EntityDoppleganger.java | 87 ++++++------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 9e18d0e02..faec1c258 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -120,10 +120,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private static final String TAG_PLAYER_COUNT = "playerCount"; private static final DataParameter INVUL_TIME = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); - private static final DataParameter DATA_MOB_SPAWN_TICKS = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); private static final DataParameter PLAYER_COUNT = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); - private static final DataParameter TP_DELAY = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); - private static final DataParameter AGGRO = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); private static final DataParameter HARD_MODE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BOOLEAN); private static final DataParameter SOURCE = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.BLOCK_POS); private static final DataParameter> BOSSINFO_ID = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.OPTIONAL_UNIQUE_ID); @@ -138,16 +135,17 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", "ThaumicTinkerer:magnet"); + private static boolean isPlayingMusic = false; + private boolean spawnLandmines = false; private boolean spawnPixies = false; private boolean anyWithArmor = false; - + private boolean aggro = false; + private int tpDelay = 0; + private int mobSpawnTicks = 0; private final List playersWhoAttacked = new ArrayList<>(); - public EntityPlayer trueKiller = null; - - private static boolean isPlayingMusic = false; - private final BossInfoServer bossInfo = (BossInfoServer) (new BossInfoServer(this.getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS)).setCreateFog(true); + public EntityPlayer trueKiller = null; public EntityDoppleganger(World world) { super(world); @@ -209,15 +207,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { e.setInvulTime(SPAWN_TICKS); e.setHealth(1F); e.setSource(pos); - e.setMobSpawnTicks(MOB_SPAWN_TICKS); + e.mobSpawnTicks = MOB_SPAWN_TICKS; e.setHardMode(hard); - List players = e.getPlayersAround(); - int playerCount = 0; - for(EntityPlayer p : players) - if(isTruePlayer(p)) - playerCount++; - + int playerCount = (int) e.getPlayersAround().stream().filter(EntityDoppleganger::isTruePlayer).count(); e.setPlayerCount(playerCount); e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(MAX_HP * playerCount); if (hard) @@ -268,10 +261,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { protected void entityInit() { super.entityInit(); dataManager.register(INVUL_TIME, 0); - dataManager.register(AGGRO, false); - dataManager.register(TP_DELAY, 0); dataManager.register(SOURCE, BlockPos.ORIGIN); - dataManager.register(DATA_MOB_SPAWN_TICKS, 0); dataManager.register(HARD_MODE, false); dataManager.register(PLAYER_COUNT, 0); dataManager.register(BOSSINFO_ID, Optional.absent()); @@ -281,22 +271,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { return dataManager.get(INVUL_TIME); } - public boolean isAggroed() { - return dataManager.get(AGGRO); - } - - public int getTPDelay() { - return dataManager.get(TP_DELAY); - } - public BlockPos getSource() { return dataManager.get(SOURCE); } - public int getMobSpawnTicks() { - return dataManager.get(DATA_MOB_SPAWN_TICKS); - } - public boolean isHardMode() { return dataManager.get(HARD_MODE); } @@ -309,22 +287,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { dataManager.set(INVUL_TIME, time); } - public void setAggroed(boolean aggored) { - dataManager.set(AGGRO, aggored); - } - - public void setTPDelay(int delay) { - dataManager.set(TP_DELAY, delay); - } - public void setSource(BlockPos pos) { dataManager.set(SOURCE, pos); } - public void setMobSpawnTicks(int ticks) { - dataManager.set(DATA_MOB_SPAWN_TICKS, ticks); - } - public void setHardMode(boolean hardMode) { dataManager.set(HARD_MODE, hardMode); } @@ -337,8 +303,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { public void writeEntityToNBT(NBTTagCompound par1nbtTagCompound) { super.writeEntityToNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_INVUL_TIME, getInvulTime()); - par1nbtTagCompound.setBoolean(TAG_AGGRO, isAggroed()); - par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, getMobSpawnTicks()); + par1nbtTagCompound.setBoolean(TAG_AGGRO, aggro); + par1nbtTagCompound.setInteger(TAG_MOB_SPAWN_TICKS, mobSpawnTicks); BlockPos source = getSource(); par1nbtTagCompound.setInteger(TAG_SOURCE_X, source.getX()); @@ -353,8 +319,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { public void readEntityFromNBT(NBTTagCompound par1nbtTagCompound) { super.readEntityFromNBT(par1nbtTagCompound); setInvulTime(par1nbtTagCompound.getInteger(TAG_INVUL_TIME)); - setAggroed(par1nbtTagCompound.getBoolean(TAG_AGGRO)); - setMobSpawnTicks(par1nbtTagCompound.getInteger(TAG_MOB_SPAWN_TICKS)); + aggro = par1nbtTagCompound.getBoolean(TAG_AGGRO); + mobSpawnTicks = par1nbtTagCompound.getInteger(TAG_MOB_SPAWN_TICKS); int x = par1nbtTagCompound.getInteger(TAG_SOURCE_X); int y = par1nbtTagCompound.getInteger(TAG_SOURCE_Y); @@ -411,11 +377,11 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { motionX = -motionVector.x; motionY = 0.5; motionZ = -motionVector.z; - setTPDelay(4); - spawnPixies = isAggroed(); + tpDelay = 4; + spawnPixies = aggro; } - setAggroed(true); + aggro = true; } } @@ -632,10 +598,9 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(isDead) return; - int mobTicks = getMobSpawnTicks(); boolean spawnMissiles = hard && ticksExisted % 15 < 4; - if(invul > 0 && mobTicks == MOB_SPAWN_TICKS) { + if(invul > 0 && mobSpawnTicks == MOB_SPAWN_TICKS) { if(invul < SPAWN_TICKS) { if(invul > SPAWN_TICKS / 2 && worldObj.rand.nextInt(SPAWN_TICKS - invul + 1) == 0) for(int i = 0; i < 2; i++) @@ -647,20 +612,20 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { motionY = 0; } else { - if(isAggroed()) { + if(aggro) { boolean dying = getHealth() / getMaxHealth() < 0.2; - if(dying && mobTicks > 0) { + if(dying && mobSpawnTicks > 0) { motionX = 0; motionY = 0; motionZ = 0; - int reverseTicks = MOB_SPAWN_TICKS - mobTicks; + int reverseTicks = MOB_SPAWN_TICKS - mobSpawnTicks; if(reverseTicks < MOB_SPAWN_START_TICKS) { motionY = 0.2; setInvulTime(invul + 1); } - if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobTicks > MOB_SPAWN_END_TICKS && mobTicks % MOB_SPAWN_WAVE_TIME == 0) { + if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobSpawnTicks > MOB_SPAWN_END_TICKS && mobSpawnTicks % MOB_SPAWN_WAVE_TIME == 0) { for(int pl = 0; pl < playerCount; pl++) for(int i = 0; i < 3 + worldObj.rand.nextInt(2); i++) { EntityLiving entity = null; @@ -708,14 +673,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } } - setMobSpawnTicks(mobTicks - 1); - setTPDelay(10); - } else if(getTPDelay() > 0) { + mobSpawnTicks--; + tpDelay = 10; + } else if(tpDelay > 0) { if(invul > 0) setInvulTime(invul - 1); - setTPDelay(getTPDelay() - 1); - if(getTPDelay() == 0 && getHealth() > 0) { + tpDelay--; + if(tpDelay == 0 && getHealth() > 0) { int tries = 0; while(!teleportRandomly() && tries < 50) tries++; @@ -746,7 +711,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { worldObj.spawnEntityInWorld(pixie); } - setTPDelay(hard ? (dying ? 35 : 45) : (dying ? 40 : 60)); + tpDelay = hard ? (dying ? 35 : 45) : (dying ? 40 : 60); spawnLandmines = true; spawnPixies = false; } From a9062856d149c4f786aec674af1f44ce2ce71500 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Aug 2016 13:12:40 -0500 Subject: [PATCH 894/935] Extend entityliving instead of entitycreature --- .../java/vazkii/botania/common/entity/EntityDoppleganger.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index faec1c258..590667fc9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -18,7 +18,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -43,7 +42,6 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SPacketRemoveEntityEffect; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; @@ -97,7 +95,7 @@ import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; -public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { +public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public static final float ARENA_RANGE = 12F; private static final int SPAWN_TICKS = 160; From 8809524d6da2feb1e004ea93d2720d6f571da111 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Aug 2016 13:13:14 -0500 Subject: [PATCH 895/935] Imports --- .../vazkii/botania/common/entity/EntityDoppleganger.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 590667fc9..2ed834a77 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -84,14 +84,10 @@ import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; -import java.awt.*; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; From 6545845850dda42f8cb22f6a7b41c9d025198c58 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Aug 2016 14:13:38 -0500 Subject: [PATCH 896/935] Reduce watch task range --- .../java/vazkii/botania/common/entity/EntityDoppleganger.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 2ed834a77..37b2e1a47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -144,9 +144,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public EntityDoppleganger(World world) { super(world); setSize(0.6F, 1.8F); - ((PathNavigateGround) getNavigator()).setCanSwim(true); tasks.addTask(0, new EntityAISwimming(this)); - tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, Float.MAX_VALUE)); + tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, ARENA_RANGE * 1.5F)); isImmuneToFire = true; experienceValue = 825; Botania.proxy.addBoss(this); From a47619879a9c8e9e897aeaeea9f9e521c3080d2e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Aug 2016 14:42:26 -0500 Subject: [PATCH 897/935] Fix pixies instantly despawning clientside --- .../vazkii/botania/common/entity/EntityPixie.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 1b0b3edc1..710187c1e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -94,7 +94,7 @@ public class EntityPixie extends EntityFlyingCreature { } else target.attackEntityFrom(DamageSource.causeMobDamage(this), damage); if(effect != null && !(target instanceof EntityPlayer)) target.addPotionEffect(effect); - die(); + setDead(); } } @@ -112,8 +112,9 @@ public class EntityPixie extends EntityFlyingCreature { public void onEntityUpdate() { super.onEntityUpdate(); - if(getAttackTarget() == null || ticksExisted > 200) - die(); + if(!worldObj.isRemote + && (getAttackTarget() == null || ticksExisted > 200)) + setDead(); boolean dark = getType() == 1; if(worldObj.isRemote) @@ -121,12 +122,12 @@ public class EntityPixie extends EntityFlyingCreature { Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, dark ? 0.1F : 1F, dark ? 0.025F : 0.25F, dark ? 0.09F : 0.9F, 0.1F + (float) Math.random() * 0.25F, 12); } - public void die() { - setDead(); - - if(worldObj.isRemote && getType() == 0) + @Override + public void setDead() { + if(worldObj != null && worldObj.isRemote && getType() == 0) for(int i = 0; i < 12; i++) Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, 1F, 0.25F, 0.9F, 1F + (float) Math.random() * 0.25F, 5); + super.setDead(); } @Override From bffa5a117176f7c02b6678daa24a732dc77a4359 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Aug 2016 15:10:41 -0500 Subject: [PATCH 898/935] Remove redundant code and fix pixies being slow --- .../common/entity/EntityFlyingCreature.java | 87 ------------------- .../botania/common/entity/EntityPixie.java | 8 +- 2 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java deleted file mode 100644 index 7da3b679d..000000000 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [? (GMT)] - */ -package vazkii.botania.common.entity; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntityAmbientCreature; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; - -public class EntityFlyingCreature extends EntityAmbientCreature { - - public EntityFlyingCreature(World world) { - super(world); - } - - @Override - public void fall(float dist, float damageMult) {} - - @Override - protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) {} - - @Override - public void moveEntityWithHeading(float par1, float par2) { - if(isInWater()) { - moveRelative(par1, par2, 0.02F); - moveEntity(motionX, motionY, motionZ); - motionX *= 0.800000011920929D; - motionY *= 0.800000011920929D; - motionZ *= 0.800000011920929D; - } else if(isNotColliding()) { - moveRelative(par1, par2, 0.02F); - moveEntity(motionX, motionY, motionZ); - motionX *= 0.5D; - motionY *= 0.5D; - motionZ *= 0.5D; - } else { - float f2 = 0.91F; - - if (onGround) { - Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); - f2 = block.slipperiness * 0.91F; - } - - float f3 = 0.16277136F / (f2 * f2 * f2); - moveRelative(par1, par2, onGround ? 0.1F * f3 : 0.02F); - f2 = 0.91F; - - if (onGround) { - Block block = worldObj.getBlockState(new BlockPos(MathHelper.floor_double(posX), MathHelper.floor_double(getEntityBoundingBox().minY) - 1, MathHelper.floor_double(posZ))).getBlock(); - f2 = block.slipperiness * 0.91F; - } - - moveEntity(motionX, motionY, motionZ); - motionX *= f2; - motionY *= f2; - motionZ *= f2; - } - - prevLimbSwingAmount = limbSwingAmount; - double d0 = posX - prevPosX; - double d1 = posZ - prevPosZ; - float f4 = MathHelper.sqrt_double(d0 * d0 + d1 * d1) * 4.0F; - - if(f4 > 1.0F) - f4 = 1.0F; - - limbSwingAmount += (f4 - limbSwingAmount) * 0.4F; - limbSwing += limbSwingAmount; - } - - @Override - public boolean isOnLadder() { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 710187c1e..7d6dabf12 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.entity; +import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +24,7 @@ import vazkii.botania.common.Botania; import javax.annotation.Nonnull; -public class EntityPixie extends EntityFlyingCreature { +public class EntityPixie extends EntityFlying { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); @@ -135,4 +136,9 @@ public class EntityPixie extends EntityFlyingCreature { return false; } + @Override + public boolean canBeLeashedTo(EntityPlayer player) { + return false; + } + } \ No newline at end of file From 53a582e188d330d949bd7602fcb7c88a204e77f6 Mon Sep 17 00:00:00 2001 From: Luxor5393 Date: Tue, 23 Aug 2016 15:53:16 +0200 Subject: [PATCH 899/935] Update crafty crate picture --- .../textures/gui/entries/craftCrate.png | Bin 12379 -> 28587 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/gui/entries/craftCrate.png b/src/main/resources/assets/botania/textures/gui/entries/craftCrate.png index ecec6e8cfdd8ddf78f58d508c951ae47a27c6d19..5ee414d483616e8a28364a7f6eaec0c34101fcb4 100644 GIT binary patch literal 28587 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 Date: Tue, 23 Aug 2016 11:09:54 -0500 Subject: [PATCH 900/935] Shorten config name --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 66547298e..357e45bd5 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -349,7 +349,7 @@ references.enabled=Enable Tooltip References shaders.enabled=Enable Shader Usage baubleRender.enabled=Enable Bauble Rendering spreader.posShift=Spreader Pos Shift -staticFloaters.enabled=Enable less pretty but faster rendering of Floating Flowers +staticFloaters.enabled=Enable Static Floating Flowers versionChecking.enabled=Enable Version Checking wandBeam.static=Enable Static Wand Beam worldgen.flower.density=Worldgen Flower Density From af9588ff112c34b52cb7a1107273aed5949eaf9b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 23 Aug 2016 12:11:09 -0500 Subject: [PATCH 901/935] Pylons use new hidden model system instead of OBJState --- .../botania/client/model/ModelPylon.java | 64 ++++++++++++------- .../client/render/tile/RenderTilePylon.java | 5 -- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index f156b36bb..4b788d586 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.model; +import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; @@ -20,23 +21,29 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.crash.CrashReport; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.common.model.IModelPart; +import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.Models; +import net.minecraftforge.common.model.TRSRTransformation; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; +import java.util.ArrayList; import java.util.List; import java.util.function.Function; public class ModelPylon implements IPylonModel { - private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); private IBakedModel manaCrystal; private IBakedModel manaRingsAndPanes; private IBakedModel manaGems; @@ -57,23 +64,23 @@ public class ModelPylon implements IPylonModel { IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); - // All groups are off by default - // (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group) + // Hide necessary groups and bake + VertexFormat format = Attributes.DEFAULT_BAKED_FORMAT; + IModelState hideGroups = hideGroups(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", + "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04")); + manaCrystal = manaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + naturaCrystal = naturaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + gaiaCrystal = gaiaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); - // Turn on "Crystal" - manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + hideGroups = hideGroups(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04")); + manaRingsAndPanes = manaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + naturaRingsAndPanes = naturaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + gaiaRingsAndPanes = gaiaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); - // Turn on "Crystal_Ring", and "Ring_Panel0x" - manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - - // Turn on "Ring_Gem0x" - manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); - gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply); + hideGroups = hideGroups(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04")); + manaGems = manaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + naturaGems = naturaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); + gaiaGems = gaiaModel.bake(hideGroups, format, ModelLoader.defaultTextureGetter()); } catch(Exception e) { throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); } @@ -129,21 +136,30 @@ public class ModelPylon implements IPylonModel { } private void renderModel(IBakedModel model) { - renderModel(model, -1); - } - - private void renderModel(IBakedModel model, int color) { Tessellator tessellator = Tessellator.getInstance(); VertexBuffer worldrenderer = tessellator.getBuffer(); worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM); - this.renderQuads(worldrenderer, model.getQuads(null, null, 0), color); + for(BakedQuad bakedquad : model.getQuads(null, null, 0)) + LightUtil.renderQuadColor(worldrenderer, bakedquad, -1); tessellator.draw(); } - private void renderQuads(VertexBuffer renderer, List quads, int color) { - for(BakedQuad bakedquad : quads) - LightUtil.renderQuadColor(renderer, bakedquad, color); + private IModelState hideGroups(List groups) { + return part -> { + if (part.isPresent()) { + List parts = new ArrayList<>(); + Models.getParts(part.get()).forEachRemaining(parts::add); + for (String s : parts) { + if (groups.contains(s)) { + // Hide it + return Optional.of(TRSRTransformation.identity()); + } + } + } + + return Optional.absent(); + }; } } 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 91851f531..be5f880cc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -36,13 +36,8 @@ import java.util.Random; public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_PYLON); - private static final ResourceLocation textureGreenOld = new ResourceLocation(LibResources.MODEL_PYLON_GREEN_OLD); - private static final ResourceLocation textureGreen = new ResourceLocation(LibResources.MODEL_PYLON_GREEN); - private static final ResourceLocation texturePinkOld = new ResourceLocation(LibResources.MODEL_PYLON_PINK_OLD); - private static final ResourceLocation texturePink = new ResourceLocation(LibResources.MODEL_PYLON_PINK); IPylonModel model; public static boolean green = false; From f3dea919a66a1cc9c80d380a662ca96ac09508b8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 23 Aug 2016 17:02:29 -0500 Subject: [PATCH 902/935] Fix banner textures not being reversed properly --- .../textures/entity/banner/botania_axe.png | Bin 15954 -> 562 bytes .../textures/entity/banner/botania_fish.png | Bin 15959 -> 586 bytes .../textures/entity/banner/botania_flower.png | Bin 15456 -> 456 bytes .../textures/entity/banner/botania_hoe.png | Bin 15904 -> 523 bytes .../entity/banner/botania_lexicon.png | Bin 15568 -> 1012 bytes .../textures/entity/banner/botania_logo.png | Bin 16054 -> 716 bytes .../entity/banner/botania_pickaxe.png | Bin 15952 -> 590 bytes .../entity/banner/botania_sapling.png | Bin 15689 -> 871 bytes .../textures/entity/banner/botania_shovel.png | Bin 15932 -> 512 bytes .../banner/botania_spark_dispersive.png | Bin 15991 -> 1348 bytes .../entity/banner/botania_spark_dominant.png | Bin 15973 -> 1342 bytes .../entity/banner/botania_spark_isolated.png | Bin 16060 -> 1438 bytes .../entity/banner/botania_spark_recessive.png | Bin 15991 -> 1365 bytes .../textures/entity/banner/botania_sword.png | Bin 15974 -> 561 bytes .../entity/banner/botania_tiny_potato.png | Bin 15102 -> 278 bytes 15 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png index 7e732b97125ad30052b876c186d3fc75ecf1efc2..475dd589fe71be03d05995fb1ed2b586dee63720 100644 GIT binary patch delta 496 zcmVWC=xzjX&QR;uI+*6h)D+;z%hKbM;*SSoP%RM%duXg8&2|009U<00Izz z06F2ke~0(}_-$O)DmL&kJ0wH@3xLhs(fV!^Hwk@o+lLxcbqHSB$b^Wi; zB_r!R;JQL0GEP8MvET3EoXg($4u`{d@9}uVfBAd{fUG_iJr8isK|~N^MAvmt)u#tk zRdij47$Za^8*tGKP*sEwu-olmj2Sax>X-j}-!Kd~oldaUjwP`~20R2%Rm2!!t%Wh> zt%DE4fDi(<+wDVyMM_}K$pe5f2G&}{7+)%@SpcqSKiA}M5kd%yAlxm1xmW&~a`;#Y zIecp6*OCc8w-;iJ<8J@yFvg6Tu&STIRXnlr#Rv~X2tWV=5P$##AOHafKmY;|;C+w7 mDJ5nA0SJ>EJ{lO{OX3$Qq&o;hDH;L*0000Q-kbTonYX)t?COR&Ge?(BCj7m9GopkYSbpmY6#kr(KzajbkmY?QCb9bO9-|pu}bUdeIHmYid<=( z?+S9kcnxe<>Xs(p+@*7xq@{}_uWX&>FZCq_EWkZ>>Tf4IS0!-7~U>$UV(R6GKbY) zimrSKIV>~=W@N%4snXi6>v4f)J3BjVoerCtXk&S=*UNHt)^2A|4@T>X>0*+JX_M1V zvVHHDnQ5YHBRy^Ocyac4`m$SiE;W)pBB`UT-HXdv9 zvH3<*&)k9%YSf6DK*NH5hmS4RT+}L{N*%_Eu8v7iLwV3l`9WDq?b+#KTVZQf5mEdo zDK=S=1$UU^WUt-LxGQ*`35A_5#_NDcbh(}Ou*5^Ro%gZEPDMufkreBa9DIO4i_&n4!6_6gk+DzxV@6s!E<3Z?{KA7L!o(o zWEt1l=o#0>RGr}pj+Z=k#vYO?7@2dr8IKH|jLXA??7YKXA&2Z)*Cz7;t{+V(s9K8= zQ=cr&{}Q5zn*pKf6eG7?7LZAf zQIY+Uv8kc#V+&gI!@|v!feE}i1Zn>!^TA_uw!;{yGNfIldJXPGQ^R_vn1I!7XwUph zy-GVQw7@+V-x3H&Ss7F1fx8ghRaB$$2G4@}P|qayofNA+b`VmmUMVntt6*_cJ8_w-(fJnuIyeAMwgMn*0$`lFe&NS6 z02s2oK2Y71Jo4*zyIxqymECgq^f!Nitzbl7_sWCJ;bE68Ukzhs&lo$W4-9>B)AP+w z>^w4Tg*SF_a*MTU#fdKYz$bkVt>Jq{J-5BL;l0t_v&K!D@Z&SD-a2GN6&PC94N5Fv zNdL-JRRRB)>Thqmz3bxpZL2;z`S|vpvSE+)uwOL3JN4m`)+z1f-JkaE+1tN$>MT%o zS8d(;l4Zx9+I#fS=9Z0@*HyOmJ^-p-Khbw;g3|k&?MnIKEueqFsu8{0s=wb8|MI>= zTGPDUi)wtO=Uy7Kv)@{O$HB8}cAPrC`RtX}@`hs<7MxwLjroY%QeL`$@ukguyZi6? z(0jh*t?efd{n@?n?fn~9Z&P|aYsX&f8{6JDW!GNtM$h>JU4OlH{GCVUmtQ#-jKA{p z*IQ@qxxArg`N*=wPwPrX50AgR;n>sT&rDo)?38EizOyTZQNJH5V*{oc8<$7YM}rC diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png index f3ca142d86fdcd1881f9edb9afa9954c8244b41d..daf1824197699586a6022a3ab57b9beba09ad997 100644 GIT binary patch delta 542 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 JXW53W{{S$j))oK& diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png index 201dfa15a6497a531837fe1b0d3dcee1bbec8148..6a06b71e4b3ede36b9e21e14494cb6b78738e789 100644 GIT binary patch delta 478 zcmZ2b)6FtLg`X|S+ueoXKL{?^yL|FQMe%wD_7YEDSM~=S;-b17!bWP%3=E7jJY5_^ zDsH{KY1?4D2E zYXX0UPu@_;bZu2lw&xFH#^{iJW}LHC6IP$vKB*<%-1)MJ?x*nYT8ET5edn-5XVn-S z;uQpi0ysciAR)pM@uBR;$C4IKL?9uB7mWGm|2N*pg{>cXHYXoq00K`}KbLh*2~7Zk CKgPoV literal 15904 zcmeI3eQXp(6u`H91uGy#`G^VOJVF#?Z$Iw#KGy3&=|NlMpteV7H3ECPbM1z^-Q#vk zuO%96gGd5@2oVY)CMIgM7?6nKM?yo01`J4ILJ%Y*Xp8|-j0lma)Y<#oPOl>Zi6NOy z?snh2dGF2q-pt$GKX!A&(%SKrk5*C?HNL(s+z8L}t>4%&@V`%8djXyvNY%9%6!qZ4 z)~|xvy=NLl1tV&-*=&w15oJB;k`z4#T$yAF_J+E7nUo~20j47cT2-yedG)h?r$be$ zoGXL~8%foGHnpxR4Vt=^M&+(GazJs;3snX)B6N@hrsT*Z6Ph7rs+?KBBD}Vm8K)!L z#avV6thNF=nj;O48a)jhf=i%fmh(7#0T(B59zQqN!Lyv3VciVpra4|@10p9l@`p22 z39o`_B`!9G7v;l2smj@AnkkWCIyyRB9d4JNZe_SYAi%IZ!}B!kK^vW#DP?HQn3;1@ z@Dm1xoK{n&s%s9*uN2eU%_^tU3RFDu^Gc?Qfixq}4pL+?Qi|bREK|-%k&8B|_H-gU zG(~1W0wjTE8qkg_YnN)%P2FhIhY49!4;vWfBoZmcE<4_2vTSI>T(}M*$RjOlX+%3y zfN2DV-kz4h!gX*eGt151RO6-O4Dw`Yh8;V|sKc09nw(j7DdaK~gmV>Z(m*oxbX3<9 zq1-BKC?Isy)Ht44p=yfWVayIPXzx<0OO8NTGC>F~MS*7hG%rLsxDNdy>v@vpM3%KV z$@N5hM07=sccMOcR)lWctlfvLC+Y)k9Yr#w+wx-XYxASXVq8xrB{QTZrB=YCwALU~ zYP9t%E-0}^Pv~hlED&-BnR3l#t-`w8ZmsBQO$G+cgJH`L%u;sGE|6LWw-yu$H3XC5 zQdC9s#aUJf@IKn-r4WKCaJbYZ{fRE>bjI~ptQE4QWr)=xs81@O^Mrb8I z5)tb)!<66z>ciRbsMdI59Osc@EDZu2pyjv+4oa5&G|NkhpXa@9KY-&IVqO|q-gO~* z-nBJVMF7CV1DW>wVm$5PJzhGdz^W(v;$Dvsi%D*QFSxdu4{^OLt-@+8C2V~PH2+J8 zGH!;1s#C4pb|T=dY&3zjgIi0v&DPbFls14>HL9G2vQaF=uxs%MW~+}V$yP-U$=0R@ zN{|`US{fE=rVdTu?IFndx0w$gqoWOIxXO@omF+dW6GM-i9a0)px57R1FZC+taIgjH zx%`%Zc(NNWq25If3~AlnWx(f_y*}CRp}jt9iA!)x`#rosbAEr^7w7qa9P<@2d`B68 zbrn`+w@|37|4Rle*15oPo20b@CBzgaRcN@cl6G5lFE`;kP1>NF;r*So-2NL}1Pir$ zXweK>Pd_3oxN!4J*+K{JAw$|q%O%&p*(#ig_H2J2&%%S@tpB{JU5%Qy;7#pn)U;%| zTvN>uydz}?iZt7-tVgumLqrpNn*brNAh?AfgEpfU4Qd7?n!_r5h%l_u@Ac$uP(@k8 zmf;L-io9ViRkr8;?0qZO3g0T=3k_3zqZx8bE8cMKm_tGokiv&S{;6;K9&j-;G zTnG@nNO0l#AX4T@FKy5=YwboE(8c(B)IT=5G}!l0Ktm{7oHEI zCAbhEc#+`3^Fg!(7Xkz?5?pvbh?d|&fZ#=f3(p795?lxnyhw22`5;|wf*CcjLMAJ{ZsGGit`6Xq>qmByneB9^jkM)ZvW;;<^EYuZ+_&3 z-XC2rO>2#Rx5uq!dUx%8?dR~Dm$vWU`s?FUXILLE=Z>Az5AAtqvI(Znt@%Ma@jKB(l#0V_Hix`8KPGSe~>bZ!rL!AryLHz|qC3y2t zhfE^qUx*G#2kABxUObc#i9v@HA{CrHEHkUFhVE|K?mo|L#Cc|(*L*&Hp3k7d@1gUv zL(%o`f4Rk9|AOMb^#T3je;xuL00JNY0w4eaAOLMgBoZMKiTvdY{@wHc@gBR~Hq*Fi zP168SRh5m6jgE`2Js)U0hpy{NPXHPV-`?IPm&=hzBsxMcieFq@#NlvoaB$EOMAreD z6%KH6a>B~WN=FEd#Tz+*wjsI((5moUE{DV6f8gxwjB>f$HbS%F`}+D=T3Rx5wgb@> zfI^|b@$oU5rkRE3^LgU&H~`^r7`xrh)zuYNs};ZB|0P0W@yTS8QmI5R7;Ku?fKXMH z)zwu72M50$;LBCOxJgx2357z$<8ku&Ji%ZPzu!+XnKYl^S78+I_xtOL4~0Ugs%qx_ ze-X=|+wDeGRdYxJIGs+i*(?CnYL#3r2S6&7GM`whFmk0*DRU}St5pE9*(^?{)BLWH z%k6geW*ICL3Y?yv;&Qo2r_<)}O(YWLPzB7PYZN{^JIlz(2$PeOb;%zeA9;IwCLrBcCSv2nl%BPu$+#ez|ltE~!4BkBNy1Mn^{hxW2yr<3<#Pg@pyS zwzitCC|zxY421pted6&rHk%EX%f-yhjM)qg4GmE&7TfCL3<#Ue#{2ub*#zC)-I2*; zC>D!^!(n!Ic3SonJ?R8BO=E9we~FH_4$H$qUpYP~m7Z(>iKR+00JNY0w4eaAOHd&0RPqawm%@s2oL}P5C8!Xlcqcolde1m d8GxS`zX9XF<_she;7|Yn002ovPDHLkV1mn@&XxcG literal 15568 zcmeI3e{dA#8OL8@%s_+^m9eR5=y?H$Xz%v+ev#X`9L9w7VmXK*9RkJZ-tK$34R^c8 z?Ot*hrWsp6Y$??i#~P$q@du-|h*~gCh!H8xIMm5ltWc7%*fOA!N;ItktwZ0vyWCyg zT;9^rPXBpt?)L6^zwh%ryPx-cp4)%+hmFg>HK+K-VgSIL25(&x`o2y7%q&93XQlP; zqOVyI?`jo*Yp&NnGr*3Wr2x2wq~;c_#kY(Tl(3l>6+bk`!x1za0QZu3gcsI9&ESV^ zl3Z;(-#1`1NMf~dmBVN8MQUMC@^(ex%C6@u@ z#$;R${nm#Wqais(TUTwY(Gwb4e2s=$B?=7=v%@4kWz zZ6?;rSzH|JFr;5bPci!Cj*0=Usjfbq4q4U4pr%DQhUx6=G+O6m8*?HUQ?pYiW2gqc3I;DLPKq>VbLl{7L`u5(#_zrvrC-~1nYPWdeByMm@HK$ ztD~7k`>=|$*l)G4oW+t8BsCL@;ZsB@kjN9mX65X*+!#4C@ffIdL|)^sC`#_!oH(Mu z1(ax**E~{~Z-Y!kZgVr)!JL_y4aLK3}f;l+bmG5Yr1K9a==8ZH_9J z%?1~nP`hxM9K1bX;vE6j6cBmd!U`~8gRbQIpwKz)Q$nwZN~p>4p`1DT+5fjG@`Ra^ z$}6d8YbJ8GEZVrqHntM3pFBDtgrsCUittet>cv)VoT#=;|H`x{-6vVJ953jN%p>Tv z07W-5X*7FU8PBwvG<5;5jB+Y|j{EdEI)hLq6;vuza@O=gR3)Hw@=;jRhW5mNDDzan z$sTxQH>3Cbkn}%T1C{UiVk>ZECG^EsU{X8!zpOxZ?+QU)ZiAwSnb@`y16Q_asimA; zPZMomYW=zO{~r$3F4{+YvSwH}Gi5BBIW@mUufb3(Ie)R$f?f=(AJeY6GVZ#X?3yd% zu369T$dcxQX&+q3 z>$rM4#~dN;m|CiwJFjH@Em%6(;#@8d;oMU1mNC{09?F`zCQpUW&z;CdjQ}b0pP33&+a}_4?w|&hPs;O z_{q_eOV%0hoVVq@de(bOBOCO(R zS`NPRjrTWQK3I4g$h@6<>z}B3;;pgY%qs6G8#?jmPkQ8ycT|Gehkx1h%xM3Z&sIM8 zarxD!KD+t+M<4AAmmPhvqyEIg@l)VeI|}1nUAvoa`P-&_E6yAO?>MAk=Uc&tI{MxW zIfsi6ZTXlf%g#J7vlV_=aN!g4 zDQA0W(JO1ea?Jj>qzIETotMc~a$B*ya zwd=YE23O6W!B}JEGcNC$+r4D`;?C}Y72Ge1UVHJm{l36Ut34i1Z*Q-mWae|P-h1D& zFnBX?{ZsSi&Yi3E-PQEW+b3_{bFA`(mf3^rd;9zE>Vq+{ePGTlPxTHA>^b(q*ty{o zA?G!(#oYl*>DZ-9m!xaY$(vin`C3V|Z0{f2A9=cA(L8kRkyvd1*Vn%Oo@M(Rr;l#l z(35zmp|Nu5{xu6rXa8mV;-a4)1#4Sdqut%hJ&*mltMFaN_@bc#`LO)T@F%0Ap>s#h zKbrXamdAZBUvdr=4vX{Woa%e~&U!vku>cepCcQ7WOaHuT_b8ZALVRE7{)YgD;$zm+ U-lEU-XO0_|F0b2r`#nGSH)Y#5=>Px# diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png index 731af471a7ca42024a6af2065407f0c114ad25db..a8fe7e900d8d60ebe3aaa4ce93a1e4f07a58a981 100644 GIT binary patch delta 673 zcmdm1dxmv_3O`$tx4R3&e-K=-clqRrisJPQ>?NMQuIvvu#6=Ah*S)#)nSp^R($mE; zq~g}wnelzQ3@j-c2FC)f zZ*5&Lg^A%vVb8YQiOW`&ewo^wH$UjqIo1Xf-?g9T6id`6Z@8P+{H)<#)Phx7Ccd95 zQ(Ocmscft*jg980T{LA=yg0+GWe5M(u`{T6UYh;0`8v~FM<(+n>V7Z1v-91o z`!DBw)p{d!NTT|td073t=ex4o%jybrKfJ%1@$2vL8_ps++ax|ctm)XQ&ZyARFhwZ$ zw%@F!tpXXh#ez;nZu-9>N#lI6h^yhvxKi1&>+=>%bhSxXF3Zn(X&o+UQ^9Rh|99n5 z4X!7Z`|ijHD0!Zp$??*2O}>N7@q4`-3zJP64nJgIm=L6N+9;nbC6Z0E{%P|$R|X5Y z{{QT*6SuG4uzTC;V!`hX?=o(^{~ob6Y{%Wa$*zZAmTbzNcm8?Yip{niI<7Cy2U@Xl zf+MqmL4bkDfkAB_*ZIFXzJd-6kT`}4W8o;wsbPp>d90*=U|tLZ5O}h?`njxgN@xNA DNzf|r literal 16054 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 Q$^ZZW07*qoM6N<$g0#lyK>z>% literal 15952 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 diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png index a14acbb54bfc5e5b9808040f82094d09e71d3a22..4a354ef44e63fe98c45f029b9faa364ed7755c44 100644 GIT binary patch delta 1310 zcmV+(1>ySle8dWnBo78+OGiWi{{a60|De66laV18e*gz`Nliru;0PBLH!~6xHGBX7 z1kp)EK~#9!?V8U^GEW@GKkkalvS`vH<+=zaodiL;bP1`Gm>#@)@eqngV7CbRD>{W9 z5-(On|ACayrH;XR5bNNfgo+?KtR?U7;fqWA*z?#X{)lHjFrd3L^Ol=|j|&6905AY18*m&cib5P`p4~8QNBxHVa#0ioCnqQ1c^+ol z@;r}|lM^V4V!AB=8bvV;pi-#-0Bkm!=}FjZHUL1SQu%oRc%H|`#s&c3>FEg^$C;i4 z$8mUidIA7!Y;2f%iY5Yp=XnH!LFDs!)a!Nhe9`SO&&ldlQ9e`l}f>Gw+}t>-;3RDM=F&v=*na=V+COS%q~ijr2o!jGIVfo ze?UY;JkQg@!U73`K<##$9v&V{*;|*(Mf3CXq-h%6-rmy7%L^SG9FWasqy7E;KHU@Z z1D2MS^cC^@{U9QEy>2v}B8jS|Fx3^KPe^&JYudlBU1hBrouGgHPehWLY-6 zs9LSoKqVjRNRmXdEYtb2n485C`?y0D9bX<&CQXfX(WoGA);GbThssF z-`@{Z^0Cg^+L|F66h)CVO{2NFe>sw6d9u+U&-3tjJWvz`wOS1TAj`7u9QA&8yIlZ4 ztycT8&F}Ts?RG&#kY!nSdSqGF`%@GJ9*?KbH6F`LaCdjtV5(}hnm!Px(}{FCjf;y5 z{eCi;{4#)KGO4$_xVS(%orcrt)WP=v^<;N`?}b`1As zXJ@|*V0L!a&~|5M2RzTi@ApGh)jqw4hlk?_AW0Gui3EzpV&8z4mzP0AI66840A#aS z)2?qen*{(I9UXy)u)Mt7r>9sfB9Tb+Iap)&14L0Y*lz$>Sy_P~2#7=?-_8g{A`u9J zfR&XML*LP8^siCo#1bM7e}}{Hh|bK+3>^f`%*+_Jn8V?i?u?KqigT$-8N{aRZq+yaGf*|OD&yULrheDyhW^KMw zdfBE>C^QuSOr21us!BIEHwM?(tcapWH#aw=s_M@>8R~R8w70iMf10L!TcM_Dw70iM zola*uK0Gjc_WtYFFM4@-`St{CHXGUPc6xk#G#9V{mZ<; z(|=~p*`2xXzI*R`zx&>u`RA?9%bE66+;edVf;^R-WwnF*WbrpR7X1H?U33B5hPbn4 z3kWiFnD`rj)NUP(AjJD@ev!Ax_A`RwU22l%iy5`g0&@dku6V=!Fw2mUaePA7_L*K8P&KR*BS7M3Jr#9QA~^CS{1G# zFe8EM6-cy3&MxznMG^j?S0zFhh z73U>=Do%JI=%m|^l@TZp>-Mrdrx5*;#eBKftW=7DdakZ{x!gU0IH8LjposcNH;St< zG?Ecb_1L(}J9dW!aSH#eQ zH?smD=t3INQpm4zGpL;r_;L@$WLAKwybx*jUe*yxPA^ZQrr)tMKDHk-Q4=%^EQMf( zOkl1=hKC`&yeFUMotEG#%j-s{$jDG67qT49R|>C~P`Gy})gecWmGm+euoU$w%%IZf z^Kq~a4Fsl3!Ege@!kh$qLOyIf%{r%oj%-0SWnmo*g7=nB_GR6c;7HTG(|Xg zkBjtLSQlBspl+_jgoYZ!diE?RB7=AG9xyD%qBWtBnj>0Sd8%Ao(dit;2p|taSbjj3 z0(*7}S<<_;Tj69aASr5^rHM2LhS5e%nkp?7$5q7+onB?sGC=-Z?h5EoZuzF1hTDx@vvY##d^KYsG~8JmUMuHfax%m(EyeN zmP%?27-mSNXiZ=>^fnKTtjl$G^e)%pRQ0J8g)v60iZb9Dl~$)KR*|WcQDty2m_tiy z@H8FM?K;f7kLz3y3#v8g4C~WP^M45u!A+k~S*)1bDhRxojhW1%-mRhB2I{Jt^azYt zHO$KHve8qBLD!zk6sSG~Nr@HNLW!H2p-pJ7*3htEGq!I69}hv$f0%jyF)B+LPO35l zT?Kme??m7o-b&KLq?dp_^8@uN=&-j1>^bt50C)l$&&fVP4g|8|$ujVGTj zwCCfvPj&36T|eeSXhuJ#SICzf1Og&0%DANYKw23W1VmbtaY^%mv@$LTh_oolPZkrriK z(tIGTj0*xHEy}p0`9NA37X(CFlyOP(fwVF%2#B;O#p6~neU$sYHyPY@u z7r8=BQuLwHXQ+gaywAp6x}==)@*bk;h+$Qxb@!IR-;H>ONLDXZd^ad&pt^kB@{ek2 zVxCD)ob#(~tu@P!?-*3M)J$L=o zrXB8F>Kyq_)&+2T`TbFw#DJKtJHf4u@dfi)XZF84Qt+TIg?>un+lbBzw zU3>A$mDuWO`(`aCM{jt3+{P`t{m#^yo5f{iLk~Ahp+`W71 zSjRuy1w*o`&!M%uuI<}=njuW47nRDS=(X$Cz1ML4GiU0xTetB1>b+}H-b}>w`mcXe zH%~oCd9t%Jx%SMin?L#K*s(3TGbais1ILa2U2Icxb2M`Kb``A|gPdq@ANz4*M3&Q>S7_jvRTQsj1VIGCc0}opttCJ`)rZ3OD+zpKk8B zaG~?z!>!M)jV;();F-VKQBtycRjJSS#e0yX@yQ#f&p7&e z{ocJP2PdAshaEY7JpRqRf_ZzQCZ688V@J}$Lv!fSEBU|AnmF=kM|^zzj;D98NvRu^ zFl7NvM}O>UU6hFUnb{W=f6>T+3-%9`3$Wonmf1k z&YeSzZ&p1@(KrP8lj9HenCOe+Eo1Jh=bfvY`rC`opZs)i!Mtny$}exE-nemN z#@^50tz9vJ+a4c(^4QPEB_@8jdGn}+jcxW}->x32_BfzM7#6b#LI?sEx;1bmAqYwCTJ#49LLhDn z2?m7x3lb?p5LyXAR1_@?Qi9M;fkhD&-*@rS(4_X`eVO#(xd-mTxo6Hj_jB)@d(Mn~ z^sj(=e_Q$heO%=JfXVB+Kpg$$!T>M;3;+Yb0DP*zaU@BSZVpJ2L>$NUCIFu2DHICP z$;k=1-EK{v&1R!WBtmAh`O87fW-~=15wh8An(J=2n@&znC=?12&+}bPGTJtq&4xG0 zWHRb?uh)y4n;QT?sZ@d_NgZuSl7v#J1OT|Xf4PCz>s9+QnT%@RX0zclUjUFE?Nb2# z{r!l=Vkno(@OV7%cs$7Ea`-4?V`Cj{jE#-8=;v}d)n2(=Ml2RXe}8{>0dO1#K@cDa z0t^NNL{WsrVu38nNTpJ!)oLvhQ4|FZhXWkPb#$ELI5->*D2mc@f2~$SDwTpP%dl81 ze-K3x27^KMFH_m`Fu1ue>h0z z=jT)`7U|{Xg&K_p5fR1XaoXJ6q}SKi)@}M*kHEyl1h%%e)Sz^5aDd(2-L?U%R4Tz@ zv3$A87K=sA1wP8|?k)}v4%FXUTU(fznCQ+ixUjI$*2(ARXDEt-m6a9b^Lb6*_VzXe zLFhPnK@hOLy{)+?pU-1uWd(|&f8hD~x$T$>3k$z{4Ep{47ALaVEM{kCF)}iuI>Pfj z78e&adNVUK9RbYD%xH8M7Z<_vyxKo9GJ@IJS!A=>mht_5|L*}G1H7oK7c2qfwfho1KsZyzs(P-?wcY?AkqfjVdePCcfw;eDrFn~g# z(3_6{&+~9Poe)J)Hvpn2!s&E=nsxqqIoy-q$8{=)*_R;(fB|3t7yt%<0r-1Gw?81V z9l!uE01N;FzyL4+3;+Yb05AXy00Y1PFaQhy1Hb?<01N;FzyS1~`~%&`IXO>CIobdK N002ovPDHLkV1nFNUz-2` literal 15973 zcmeI3dvp_38o;Ne4-AC^>>?uN7v&9AJgmSlY-mA#ZVC9FDg6&l0iVtMvOj~b2i*A! zycjm*XVQNHwtdGK45PO3r4?d@Z7#(KP7TcpRh%Z^bc4|tX3h$@X=W)WDyz6^-epnU zdheJ@$+H$!xxq%*+&NqgpTEMx&0A4a%B)z*m{?VoRbdWLAb^t-X=T9aaCxbKMHPxm zfqO}ftCXQ3;!=w$TS};`uoWwF1P`Y)XbftGAoWV4NkbY)eI_|WsU=7qPUvt_rzW)& zVWLQbvgcA+72wY7VeM2&?(Cj)K(eT6MA1#*xZm&B_;nh=Q;m}*lL;rZxK^tMBh=pI zE|CtXUEasSK_YQ-IWObk-6Aizlu}%}O7Mvml}bv~d-bf#>F!PB^7gO;6!8G<#z_r< z$8%ztULUv5;|NWSWpK{HIXRc;1%6~)KX;8F3f>xFfRw%F0TY9o*lfMIsmpi@ZHroIa5x%Ybv|0{j4Ok|pdG+6v(c znZa7A91ll}f~Qmv9MpJ)X_j(E-i9auoVqzB2%q3 zl#*Z{W>SQHIzdtd5fdal5{h9HSl+%oP7DJ<8MLu6Vn)I-z|mo8k-n!Wv14Q6unc7v zJWg7)@=m&%!`-fGGagmOjO^V|RF2>fJYZU!RcFTIspER(3XD(M(b+DB^MX2fW9kE{ z6gsm{(A9ml5rc!bf}&_xo~4X-f?!QrquQ83lIkkE-k>(=I3OB~daa!yIir>|^-5Sr7|X+ovs24)amVDfzn+StE1H>j?>x=#tb8w zVTy!~aqk!UNe>UYHSLHQ6QTLPq=*xyU#fgws_k+Jyi|>O+_JvfXl+A%)lGZ6oYXZe zsz}@DZNy+`?_~~kABtwAj%;P5L(Q>fypJ|IE!d6kU%-1q5RMH);uR;iUB0;~Hy*T^FETW6iK@)U(XRi&kwlme~;#Y2UE_PVKC?n zW*k<-9>sisb5!K=;P=QYb&(8xj}L5!>$qSb#~4G8W4Kf?kC34j7}kOZRPbz!_dXo= z>yEv>>!-YluIQ(X3dNF>KtRxNvdXw1AZSs>h2{fUWn2&tv?$|3^MR}~E(i!( zlyRZ?Kvo$S1OzS0xX^qctBeZ*f)-_5Xg-it#svXEi!v@WAIK`>f`Fh!85f!lWR-D2 zK+vL$3(W_z%D5mPXi>(6<^x$}To4enDC0u&fvhqv2nbq~aiRG@Rv8xr1TD(A(0m}P zj0*yS7G+#$K9E($1pz^eGA=Y9$SUK4fS^Sg7n%=bm2p8p(4veB%?Gl|xF8^CQO1Sl z16gHU5D>H|<3jU+tTHYL2wFtqQbb=j}hSfJ< z*mrlqcM!vT1crT8DZRsrVWWi?7oVDqVT1Ata!-dlw`9V|WtRQZ7U7M* zUe}?wJ#+cWm4(6o?Aeq4`PHj~FweW=-tQ!ugMT=mJagK@GR$VP7^6p-8XKC$-Bod`WvRVHMDl0_dRl=a`>L&!E5N_Z_k*aR(D>%e!Z#TkaKTa+vx4T zHKj~1EH~93I+QWtr2^IE9XV!2%4r74jw$% z`tN|cqooxuAU5Y?*u~&Gf4bIvp)6Th9BfrTw>uc*7cN>fQT1ADtLCEb)isTcQy*M^ zp}l>`KW^T<*x8wW4iWu+hGF(@*)eR`uuUEI>62QY(xjdwmTb>H zaCqp{24EZY$cnnU2Iptnnwn02^2z*94|a6ex(+}6yR|dK2y1To_j2o9* zS6BDZi1egMlP9;|8Jd=snYd}+TjP$OIWvd9*4@3dVrz2xb4=x~CtdCB?HhhzgVVB7 zXJ|Af`iJ)&IbwO+*|hG|Ys|&LDGi+Q-Nwe$(?^@dv9-g#y+TpcrlL36w>IV1x^l@9h0$o7n2O{0i1nw;$xpx4dH|c9m-mYq54PK@?e>(GmX@8X{d>E| z)|XBz`}?&IK1fn+Ui;<5Tk|iC#4TZy;3niGp} zzgk&XIAoL}naaxg&BEH!;2gYRD@WJWjqT{@C@G(5IegTSke+ns&Yj_kU%j5VKd)`i zrOrpcd-kadzHP_SNNHD&!3I@g$1ZL8Az^d5bQ{^NA$>ogepmI%6s%-X;p1sj24T`w NFsmrH^@+;W{{_l2#vK3v diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png index 2dd3d374f82674d65f1e144d94232b7f3a02f1d0..15bd30f0e7ac8448d4293f5b04380ce84097567c 100644 GIT binary patch delta 1400 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 diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png index 04707fbcb24054f5dedfb67ae4203b533e39d39f..44a396aec83bdf8a8c7f741962fb863756779999 100644 GIT binary patch delta 1327 zcmaJ>do&Yz9RDragk&XpU`#1wjWaVWx7>Nmt8&RiCyzLYF7k}E9TiKbGBVk&A!V-Q zRnhFMEz0uPlvAUPNHAp>1i77T2PPlpn?tN_A8ecV0b~_PS z_DMY>#JKW29twEXGR5;!LE-8-r&_Evb6xo1EJafo_7Aeg~Ipmy?s@?B-_I+S(fCae+*(=Ki(=IMW@ZC1GIFrHS{4@jea||WuQbx1p z$TdYpQ2els={36ly_aX4?O%yRzCOObGPzv6xOgiOqnYgYtv?=o^r)7J%gnr`m0d2{ zmRnc&!>_&g1AkK+FHnlI6k|GVsjQiq)B&PWYgnZAjXB-ADHR z{rJ>WQ4~s~(YV(gYxE2lU+boeN(1Lqh|=d3aEI7x2Ns!QgEqDpa`y!MV9T zTfj>s5^$Tzyu;=0q_WwTO;_tqfT0YThJQE24i4X>yP<6OV^{=_ Iu$@RFNrs05 zG}SdV0XTDpmg(y1YD$?}$kQ6VNbI3i%=`FKd#|{ zaw#G*(t%YG9v)uBW<#x5Vk9y%JKNdWc|K;`#>PgwBavqwMt}wmC*ss8$FFgzsSi>- ze|MwK&YsK8$@%Wr(n@LFi9m#hjjL3JeSJRh2gCKt`|ozRVzC+N>2*!Qizo;QKOT~%R8tH24gF5baVvf z2!y&DrM(Ue4GlG7$z<|}g}jZjbo1`+ZkkA)ER!CBQB0n4d#nhT+uNN0o6UY}IYDN5 zWtsa*H5|@9(AU@JKUVP9Ug=}Q658U@(ly%4k&!Yy9&aM+kTuh2?>ilfVqOjo1`t_Z zdAYfzm6c{rhCipsQM>Bf#3Lgi^lykmn;YIF!Qoti;9z^abCtj%=oiD@#vidt^mB~( zjuSJhVv&?3t4oUk>LZrPN%}Dw9c=U_7Yz2g-XJKJ6B#|_2ld-TaE)X;Z6Y4^( ztFs17CbNVs?-Wl@AJAF^XZMjlQ_@Dp#s=o+GdBH}ku1j!4h}x*>^$L;eF(Bc`CTDS zH}9X!m|tCun)5^(>lK`Iw70cKC)0soV{J=Sw+~o+`~+GHNd&v7|AKJc-epDS&W{cM geUtwMs&XG?JDBSju*hs2!UJs)y@LrYUeSer0~mF1(*OVf literal 15991 zcmeI3d2kcg8NgSDfUQgn25MY$sd8{2LEc?SD_g28+gQf(6k&ti#)fdLcUSTjUDnFB ze1QXj+QGDdC$xj1ra;;>6p{?XHAyhk$xt9nh$*B^2S}kUHb zTdCmLY~{0*m9Tp9xhme$;N?mi7L+j!D;Yhj%rVK0egg>Lk4qwCx?iw${71V;Iq{UjjkGDmNGbECz8FB8MpC7?Z)CAoETOn8> zBUq~;-^@tR#$3k)N-a^(^mV-F3ojBMw_fN*xKrnQ0$q0$Y(%5m_oV zRYrn+m}MZe&k&@6Afkcl zx7SJgOuUn}bGXN4H{y}OD9gbOWyp6s++Hv(&ZIHov4&%MncYl{xTEu23@3m(2vPL` zRSKNhxwL)gXjtLkO`s?lEYBJ;Z3MyU)tRbH9Z9MxZCXmD*Kk0jGPP}Z+vgs*8MQ3Rl6>S3>PN!pRYS6w2 zEkTDvN4XCRUF_vSx27FYHes6oONtm_hNZIbVr}ao@M1Mex$2>#k=h3Os)zOpoY*z8 zmEpEA*ocAY;AISS9|O&Z9ofW)hni!J_>j@av|u-WcmW>{K`?%l`^Y)!syG*_GXz5g ztVRwZxNW{V+RNqH!I}9l{VEu6s0SQ5_K^U10te5*KSB)zy7tj3@Nh@y(JC;cul`>u zAhHf7W~ykHonuXSc-w{t9{@|#jaI|15zimGc%Mlf$_5Qbd5L%X;Qgo+JeYDO9Ytv< zBMuM49woe=bCjETa6b~nE~3+hd|*XP$BL00qZA>>V5y=WApB1VL5mVDG#^MS;evpmMF|(052TfFK|s)= zgbU3F(n`1>AZSs-h2{fkC0q~?v?$?1^MSMyE(i!(lyIT>Kw1eG1OzQgxX^qct%M5# zf)*uQXg-iu!UX|AixMt0A4n_Vf`Fh!2^X3Vq?K?%K+vLu3(W`8O1K~(Xi>t2<^yRZ zTo4enDB(i$fwU4X2nbq~aH07?S_u~f1T9Lq(0m}RgbMGm2g2o&>|9-Jo36J=K}AT)`6EvT@@3(;6+pgV_9Uyu!fl!*0L7E z?tcS*`!TGBz_1%D#CKRRY_faH@^|N9*r2@ z)Drhf@7!N)YHx41D8|3inU=1-DL+1N@65S#n{M5{U6k?jj-yBQ^^J{t`>&>JyO(e; zIk$2jT)K4j#*L@D7tcxF-CLiom60Eq&GGBz`hQs{2%7yjC$yO@Pfpl#zJJ%+;^N}@ zR%>-r(|Z>#eCMy8BfEP3c~L7re#n`am^jORirv!I*0w9Hv$GT1-qn?+1QCqW@#-U& zx6PBa#-CWRX~&LfckUa(8?m=O`D8-kPu`gGc=r_$bDZ+`r%%f@gJ66`$*SBKTs_88^Z?1gq!@u9TGXZ=5?$i4pET*io*K-Qr@h;5T zY-w$^l$Lf(l0TM|lrTEZyLvUg*#HlCq%;n3L{ae?vSUY9R@w>)DhYz2bH?VJ? zDmghB`-AO3YkYHa^ZW%1eze`6t=%{(B_-wKzP{Gi=5(AQG@8=(KmE4s#fuj&UiBX> zD;HNW_2l}YC7N5}4@ME2J z%sbaUySmiB{5J#6hKAIZ>({SWn!agjPq3C^r(Nsk6&4nl+2-b@(`U@cY3B}9BqhD! zT+(Ffdh6J+ty9m>vNCU;VAZpg%5mey&1Cw0UtMq8I@8oOa2RLjo-dzvuD3Vtcz-{C zs=TqW@w0`AqvN`F#I3yG@J}1R;ax0c%9ID^2JSs5dU+8xdhLlHseO$YxQYrEnD@_JvF1Ph&dU`5 diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png index af1da9888cbdee88469b242ae6934b2f92cf1346..e47e0d3b4a7b8cb1f7e6d3b44d911aff0bf3dc80 100644 GIT binary patch delta 499 zcmVjKX`ZfSI9sJS=Z+P)S00Izz00bZa0baMf&+WiD z*FP6UfAMhJrcRktt8-2PsI|6#zHPVGetCClRaGoe5hD1p03UhhPXhcVuuuq_0hkg{ z2!u@l%n4*J!m0owq9PJJi$C=-H15*?&gXMKnUI^=SYNkeKK&;kB6>I+`U!>lI~zi{ z9cxX1hfadlT2xg9=Uk8jO;HqZ&Y`L*SZlX?e-QedneVbQwRZjfl>H@F!04r@_a4{l z6;Tx7bUGo+GUR!VG);r3iwMfHg!dlD;}LD!Vz=8N%d%B3MF#=A_o(X{`~4nq9799^ z0A*PQLFj_d^Be$>rYV}H!R2y6k|cu&s{nL?wrz_fNf5{J-Nd^I&jlFjr)e70b&V*B zJnq_;{5CMU^FO1G&0&>2pvz2%EYDpXYpno&8RC@~0SG_<0uX=z1Rwwb2ta^WET+2} p<_aJH0SG_<0+TR478v~h@&Vm?IJj@Tr9S`w002ovPDHLkV1g+?*tY-x literal 15974 zcmeI3dyErB7{KT7IP}aJ6;LF`tVIn*_x62l*Iwng0(XWY!V&H?3ftZ3bwk@N-91_m zkO)x`qRDB1_`pYuf1p7VO)$|YF=~RwM?`Z9q6Uq~LqH^wBP!1Jxt;5cC?>{aHht_j z-+bRU^ZRDL-Th4uLPjkQLH=*Bc=F+dx-vybjJ{y1w$GhJK z@YoZR00>3Ro?fRnI$PDPRI6rKG1!_x!cV7m_iq4 zNxQGZ4aoFH=Q5pE7BWh!!s@&rGyY(!pa^n6xRDWgLE?Cc6C_p;RX(T+3R60K;bwFe z${KNXUSwt|9Fp373CGE(9GA=GT60pXmF?$*U@*w>A}5M0>cQH}(~g#B)Ap32ld_)( zwDqi+aZD@CxPG;mHQ==Sd~Tr1QJPmOQwfx|OY9IuF0W-cp_S+A85w%TCNq#t7KUc% z98AI#OglER6YAP!5|(4x32T&)74@irQBI=KO6Tt#~G?gj!X78BsYI15kxtdYO4)f+HX0E1aR#*zf4295K)y^!`94p&nS;=s5 zmCY?9WI8*UsSC}tVdd=WLmb|_n(C?}7||RUMoUp)`2Z^_Jpx*X0hO0;;02ZEJx+=} zF&|OOFyqT{A0n@!k5J>o(-ZfBwvM4W+F5z=_VxHNbTw{eQ<@VtQ(8adGU@&hS8eq4 ztSl(C(@I)dG%OgFLR`J(x>gZOA8=Q6M_PwA%7g9656V(u&ra9+Yg@~Tq!~s@X*Enk z^~ZVM2#S8z-zErbEG{c-P=ZKQ{IVF=1?U%r5a;exWK#5LM8^b#R(g@weN26+Y z+IBQFf$m6QJSG}XP%(_4A3~OoOFA2uWRVTT;tFfDNwIiLmL-kX3ag>kygIUy>vHsx zYj>)Ozs(=yHG`EEUS>5#ZewGx4V_5=Ic|u4#n6qiYmfN|*SBU(RIRn7r%##Y-w9F2 z&4^H4rkmU47Z5A9Tam-MyQv|f zP}5o+7H(#aOyJoeDEjx9j~*kJfN4@?D7q^28r_L)#hsj%g&qB9&-_KbDmtvSz&+RB z5(rOW<0Z{=$bqdbJGTr#IUe9Ozrl*U5o0A$_Ok(5M^!bT#TCCK`*~h2XZRmw02NhU zQu#o+HvcCXa9I}v>j^F04~;Nao>aNv|CF?|t9!)>|I?(^Tnzu;Nh|KZ+9Fu4-6M-; z$i4efQNcx+kbWI!4R$VT|{=IJDOb!(K`$ZldoZ$YJOucH{w2y4+RpX{r%LQrE z35%s@ShL5&8Ko2xr<%wp*C9QJ7`8Q9hGx|5ZV!mh)3Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_To@3tNO6(*U|Na` z140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRc<`^TD(f z7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX#3j;zHDK0V}OiOWLK*%D+MdpKP zDJ~2MS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt6c+}BED~`wSKkqaY4l=n4!r?< zX5Z)I(A&d|-Zd`@z=~@DShE&@;WOy}AOHhA0EZR>pl$)+a%*tWyE6f3c%(bh(UaeE z z?L6W+)HPn@J5 zS$gNtJ(qUuxKEhbkl1?Q*DsWfLffXH1rx6x6CPZ&_5Lx@X2v;j?9l8cX6A`q;GJ7m z=fEYmUDAEs@Kli6dwb*1_p8<%4L3$2+~y6dGMhJ@YM4B6=d2yMu`Od?K7DQPgt3vv z=zHjBw=EZ}LU-p~w zUVDcNpphxD*m)q9xNH0?Pl+3uU*-81GywohMt@1Nh6 BbPxal diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png index dbc603612184ae22838ec41041aeb63ebc26d307..3b430bb68af72588bc8a6a5ee2414c6502938d64 100644 GIT binary patch delta 231 zcmexYI*n<93O`$tx4R3&e-K=-clqRrisJPQ>?NMQuIvvu#6>N&=l^b4!oa|=*we)^ zq~g}w8-{!h3Oo!4rv3lFlP}LLd69zDdS&K|ix=ujW{2#t-jsDleH;IuKNpy@K7Iyj zgMozgjO)AhDn7~hyJg|~J@a{97^c;wNcF7pl4M|L&{AMd3u%1&GUeXx3G3f1_vL!Q toYLSe0MiSjFQ^t>%U;6+pv?`0iV)>|MIE}P!I#rx*HCz&nQ2t=c)r}P#a82(j!uOF)z>nnz8rVbXz@-2-dXy8EST8+BxYpp^m%Bzvz;job6qL5&v zkUA6=;r=}%E%1%lTa2ZjO1yL3xnU^w}sA`hJwU1PBjQq-b zW=)$b9ch;%Rw1<<1g<6s&1N&*l+%v4BuJ{N3SvgcWOx$6`)hWfw|LthkCSxrl(27j zmK#`(&4qdOs|_h{c&!|fKb{Wd#7QE2I|Af-iNkjON;8h6#JN0(+A0mFK|%t^W2tv&F18;yab{owFvf}o9bpwh3bxmcLPzO(8X z`0#0RE8~OiKCo)N$=Q-A^bEar+_HwqLQgDpHV6jS%;IFn7v<=G*L_>i6cRdvSV7c zwE;O~MU$mujzlEPL0ZSu1ASXrlCgJT301Vnv>DqEblbo)r6L(fTb8NiGJ4jOjT)bwsOfyRnyvD>Dic$Y)hbrh zYEI8a5XGyX{R!eP| z`%*vZS!9#b>xr1~>i=zt0crY5OwG z({0`TtGhjgny6_t-3T|bq7n82HuJ)k(cWcsm2H{TKY`n$9OqBShu3H>W1H4cajGb4 zcoN^K1x?+3+p6kdXrOh6@0pn+zA75AZTv00`Y=xafR;AOY~5W2~5(fI%`!v%oQO@@ok2Y4AS0EBKbTy#Fb%Wwf8bd%wt z^8sFl3jm>;3>Tdb@G@Kg2;F43=zM^e;Q~PDCc{PN1H23u075qzE;=9JWw-zky2)_S z`2a7&1%S{^hKtSzco{ALgl;libUwh#Z~-86li{NC0bYg+0HK=<7o89AGF$)%-K63g z>%FCkZSrbnle~j@_2|CKjmSF3dyP-usX9n~;@~%zZ@V(T^Y`a2ym0i~V+;FtAT)ckdFktglTT+Z zTzmPq7Yhp`&ur{+M{nv#J7@d+nV*%%!`D>@9UDIwBM5D7?m+eLA31RCjz2yKqh<~t LD_wl(r From b777e5856e370a34ae2a5eed3f1c472ab3fe330a Mon Sep 17 00:00:00 2001 From: LGcommisar Date: Tue, 23 Aug 2016 23:41:42 -0400 Subject: [PATCH 903/935] Create keep --- src/main/resources/assets/minecraft/textures/entity/shield/keep | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/keep diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/keep b/src/main/resources/assets/minecraft/textures/entity/shield/keep new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/entity/shield/keep @@ -0,0 +1 @@ + From 656c0de2a3a9cca62070005c608e60e6a13ede66 Mon Sep 17 00:00:00 2001 From: LGcommisar Date: Tue, 23 Aug 2016 23:42:09 -0400 Subject: [PATCH 904/935] Shield textures --- .../textures/entity/shield/botania_axe.png | Bin 0 -> 311 bytes .../textures/entity/shield/botania_fish.png | Bin 0 -> 307 bytes .../textures/entity/shield/botania_flower.png | Bin 0 -> 327 bytes .../textures/entity/shield/botania_hoe.png | Bin 0 -> 274 bytes .../textures/entity/shield/botania_lexicon.png | Bin 0 -> 371 bytes .../textures/entity/shield/botania_logo.png | Bin 0 -> 360 bytes .../textures/entity/shield/botania_pickaxe.png | Bin 0 -> 298 bytes .../textures/entity/shield/botania_sapling.png | Bin 0 -> 387 bytes .../textures/entity/shield/botania_shovel.png | Bin 0 -> 285 bytes .../entity/shield/botania_spark_dispersive.png | Bin 0 -> 477 bytes .../entity/shield/botania_spark_dominant.png | Bin 0 -> 476 bytes .../entity/shield/botania_spark_isolated.png | Bin 0 -> 552 bytes .../entity/shield/botania_spark_recessive.png | Bin 0 -> 496 bytes .../textures/entity/shield/botania_sword.png | Bin 0 -> 297 bytes .../entity/shield/botania_tiny_potato.png | Bin 0 -> 212 bytes 15 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_lexicon.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_shovel.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png create mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..10ce36d8a1244fd2f61ebe4ff53cc9be7fb8b7ce GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXf-7BWK5bBcRX`PZ!6Kid%25Z{$2|AmH}UUQxP& zL-d~G+_sA{_fDQIz2}&m(dIohp=t7r63e~(JZul0&QEd>I#zab?{EJ5fA+q9q20hR zpY5zqnwbyJefzX$lWdkgxxMY}ai^Voe}7&o@^p@>=Vg=L?W{pwla^G@3(XGA)=gAU>?;FoG%-OvCT21Wr3+V?E8;(E8Ui(i4|MnwC$sUlnr>mdKI;Vst02wlL3;+NC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_fish.png new file mode 100644 index 0000000000000000000000000000000000000000..420577488ec53ae1b3c47ad3c290c9c8e73926ff GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXjMEdPUhMKcLV7PZ!6Kid%25Z{%$@5Mj9JeMF?5 zMT_l&K**Vc8a@v_B@P7d_`>BWt;*%P>&AC26_N==U~PFP-!QeJ9uEq1|_LzVLwmQ30A_TSpu3=B&}8dhI?Z{4un ovA&fzfq~g$l8PrXs(;UUAkJX+<30b(fqr4|boFyt=akR{0OZ4YhX4Qo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_flower.png new file mode 100644 index 0000000000000000000000000000000000000000..106b5d05dc79eb2d98efca8abcd1731ed9e85b98 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXjMUzRPThe?Xxto-U3d6}R5rFyw1ikZ60j-uLi} zgc*BUr$6MHcd&RzwNzQ&15O#qJ8!OelxCX$ysvI}V7|o%)(Z*;w;f-&|NqBxZ*AAE zXJFc)#dkPh%QB`J&m$*^I89LLeH>BBuzq#Y?QN4(p3iw}yx@IxHRF;gU4`dvhA~_= z@tm|RSNoXQo8#)ocGO?5`w_Y8zvP9|*o{JGavE22UY9wf*)V7GwbHHC9A1|;>9|H0 zb1Y}r^L>8ZWs~KzIz+*m`;We2~3JkS#;AnPkz#7~cwq_!)&K;oXRelF{r G5}E+tRDZVs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..7c8ecd29bf852e11ef72de3c2b82de0f791c75a4 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXjMQD#!1AZ-7GcJzX3_DsH{KevtF90gqea*3%W- zZx>7cw>0Um@-l2(ws5=Gd*)`vCkxtzH%O*c=luTlaPI!^bLyBlKD=yHnQWrvChHwE zGji?Ld%ttP@+YK;3aYNWvsWcF?Ht#J`E8dyX9yp-t8ILK{=puG;~xYK-^&*m*8FFP zZ+kEM;Mj+~%y%UA#WLtQ-(lr&U|_7lD{l)@HqEYWP5tnJWYq?6HTTeP6@WTx_#Aik5iXaCRD5n#8!ZR~bvYwet4 z|N8Uq-FtquoPqJrw?k({lBdj!)n_mcJ{K8#UGsTN4aak(7irH7-Qurb4ffi%ZuN1A zyJ!CJw|=rMKTs%RuYLdfUb+7EX{kH?q;2|~A6sP2QrnuV?J3pfsK|0R&-`j>Y>f1u zs@j0isZJa~!AT-c0hdi?J>U69>VwVy+uJI=P6ADR|NG~k>Whqf+CK0+GO5(x#Wv^m vgUf&G^nYoc+0PK3$fUpkLclOU0bZYZHKWUWq~ky4fy6ys{an^LB{Ts5UHpu) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9042661a934f19c455994df15da1ae4b17061495 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXkXjMWV$CnmCW&r`bQ*w|FAi)nby2IYkgT>+P};4fB0)3eO|F@deELJpEwp>)$J%` z4hX&feQ)~*xf3Fccbr#j{ifi=k<6~3l$U1P^6km(E9I#O8E)Pw=A_ti{QG|0zGa*XJT*PfRqk8*;Y&5+_xEzsi>FPwwC8rB@#NgwDUo84 o*Gpf#HTci`f{_L2OBB%ag1dNEr4nbWaTZA2)78&qol`;+0G#xW>i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..3a18fb4f1b7b7b82d464450d1fbbb7ba4373aa41 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXkX#GMlc>W}wh^PZ!6Kid%25@8)eb5OI5GFBn|G zn14{bP0l+XkK!u4nY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..713cc0302a4f7243fbc778fc4d475734edffdd98 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXkXUwcCv8Ul|w}1w36GLn>~)y>8gm%plV8@TP6o z@)MFyS{pZR@|k|hyMnLUvBNB^QAR0ZiHF0Y)>g{{OHNHnjTGC~{ZF2wDaxXUe|}5q z?+VNB_VX&M=X>WfF#aiRew)gg@cXv+{XFy3$ZZ{F5tI1an`bZEm|GtEe3Q=IZENRW zPnU1VJzkjOsn>Pr_19a|Paln(rmNiW`Dc!&-{mWTB9W8&k3Y_l{*cVZ;1Pvl^jS)Tio!|X@3sP8A0+NSyhw1%+rZfA_Vae`Nq;S@(7>Q>WNfs# zQ{rhwO4`fc`*;oq7;XNuAuz6<$;kLvVb8kPNw>FsQ%jh&>^w_I{(cj|g!n&oc1L!W zH&lJR|E)Eeea7>jIUl!ke^`}&t+cnJBQ^35_Yd(8su~RpOdJY8_rXBS73mvJ2_ENk RrrZGudAjlYV-gA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dispersive.png new file mode 100644 index 0000000000000000000000000000000000000000..7a0ee77b553795682892275c8933962ae56b6ec5 GIT binary patch literal 477 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXfOg)YId+%?u2TS)MMAAr-gY-Z1R?HH|adC zv17jQvg8h@fehbIlevEN?|QP>PkfeXusPqksKafsqX5f0mI%G+ck;{^X(a8w%T%y4 zX2$vFc`PfgX05rN?Y3C3`)E_xYF39pk*Pc%&YS+I+yAz1KhU?ktwGJ!QN9+VWeNa@4Ln znZooSuc2!1xvZ^4<_$9ij~6awe$hXnvjYnVxg`Fz>4RUHC0{TwA{abf{an^LB{Ts5 D^+3&? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_dominant.png new file mode 100644 index 0000000000000000000000000000000000000000..639605b5cfcf7332ff3de44df49d046077eea95d GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNhXfP5jC$wnQU(UbOivfbkcwMxZ|JW+6d=L&p}d%{ zKjO|N$0G(CqDB7bnJtb_aBU5>Z*=UAPt@V{73)5z^3QW!$FfE{bIqcScW&EM*A*o2 zh}~=dzNg(-@RZr(x03&VJbOJe@;w9F0S3DbxzXpIZw^@_*l{Nw5ap)%a+@3+rn12+Vh-x&vT$qhQ+brZCUr>hYe@bn)9}I7w!C`BX_I3 zA@}wN8~(j<{6A~{?Jdw{-cYwc!0Tj*)l{#gO4CofzWTb$B~YbM=CwVu)m*+wDhD5b zJdm`}L88qo42=H>+}~$hzy=*IsY^$EdM1A@bVlio*s5 z5mdKI;Vst08N?A A`2YX_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_isolated.png new file mode 100644 index 0000000000000000000000000000000000000000..266e766dd2610732c1ce1852542bcf4028a12629 GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkEcb(k z-FJJRH#g2q>azTNo~MVS*6iup{{J&RKmPmc3s(X|{n|p;i8Xfmr=NZ@W)27q73yqx zu}g2)y3-|AQ|tE2|1kKlT(XVv{O1Ria@%g}#;q6cI;!;V;i5k?86&2(#^|-5O=G_Q zy>M?_q1D`b;_`18!d8pE`)(a`-PLS%Yii_%Tz9*-jN8tbw%5Dniyx@gp6d0Y#Hx|EL0;((zk(7L bz_sMQZQHrXqgO9K21U51tDnm{r-UW|9d_cd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_spark_recessive.png new file mode 100644 index 0000000000000000000000000000000000000000..99d6024f210fb36fb58200f280339e9ed235d9e7 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE}a)}v0^(ZU8XtJ(K`+I#L} zO=yr$vBk{U+!x9>-<$VTKHYBK-?zL83_J~tf1X+J#awsYeDg?!&9SFNjqiUSV|%b? zf64CHD_N#3i5<^BcUtsqjL?~IG9^Gmq+tL3-n{0R_2HKD&tH03a^!pM%ImK;#po@) znsxGJ$t3%pQ|EIUo>y+jmG;uiF_ZRD6AsZ5ee=C~O_=s)`$iSdfVE*4^R`bsn^tHc z6QDJ9f(qxazx#eNW~`lf{`tdQdU@NWrFz+PPCIE$Jyf;VO@JlMzcFro`_Gy_jV=Qj zKEv5(6_f(J9#+^$*$b)8^*f!nee%T&6$X{*r%#sco~po6r{`d}i?RPWbD@lLHZMcR zB95r+ih18f?OmB1PCea}v36;M4i|$Y51Y|kKUdAv6y_a##p0k~=)eL_IOu;7>YN($ SPv;sa;yhjbT-G@yGywp=p~N@< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..29bed02bce9a35b2bfae11d1eabf5b33ff18ae4a GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkEZX8&=BW-fF4XfPqORj=Sos;-}*9r;ow#utZpE1~W`*iJ}k7u6Vb)V0`B=CUS z^Vz#+@9rM&c&w^<$2Q38;k%EA-75bw96#zUrR;+3&^f*Eh^5&bj?< zPRr!I3-1RfM2gK`cJf>8_R4u{uUTE0D6w=(#PzRl)|Oi{{^9H##ofq@0+OcYS{ YnPHK0)|9IAn?*t5p00i_>zopr0PvJ+{r~^~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png b/src/main/resources/assets/minecraft/textures/entity/shield/botania_tiny_potato.png new file mode 100644 index 0000000000000000000000000000000000000000..874fd55d95734973e867a6469b6b66ad8eb88716 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkEGJcJ2Q9WsZFMw(ocDF)(r@>|>eab#3*7*L&F_7h($ literal 0 HcmV?d00001 From 29868d7d8e723f9ae93d8c36c7bef1b4e05d7804 Mon Sep 17 00:00:00 2001 From: LGcommisar Date: Tue, 23 Aug 2016 23:42:59 -0400 Subject: [PATCH 905/935] Delete keep --- src/main/resources/assets/minecraft/textures/entity/shield/keep | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/main/resources/assets/minecraft/textures/entity/shield/keep diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/keep b/src/main/resources/assets/minecraft/textures/entity/shield/keep deleted file mode 100644 index 8b1378917..000000000 --- a/src/main/resources/assets/minecraft/textures/entity/shield/keep +++ /dev/null @@ -1 +0,0 @@ - From c3da70b52eec90cc89c158edf5dbd33fb9ccccac Mon Sep 17 00:00:00 2001 From: pau101 Date: Tue, 23 Aug 2016 21:02:25 -0700 Subject: [PATCH 906/935] Add floral powder to ore dictionary for wildcard dye --- src/main/java/vazkii/botania/common/item/ModItems.java | 1 + src/main/java/vazkii/botania/common/lib/LibOreDict.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index bdba3e54c..9567534fc 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -423,6 +423,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i)); OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i)); } + OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE)); for(int i = 0; i < 7; i++) OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i)); diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 21d9e56b1..e8af12145 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -49,6 +49,8 @@ public final class LibOreDict { public static final String PRISMARINE_BLOCK = "blockPrismarine"; public static final String BLAZE_BLOCK = "blockBlaze"; + public static final String DYE_WILDCARD = "dye"; + public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", From 14851e751d36fb6b51aec2035b39c00b2e4c4d45 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 24 Aug 2016 21:19:24 -0500 Subject: [PATCH 907/935] Build 317 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 4b8e9d8d6..e02af8f0e 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Mon Aug 15 13:42:37 CDT 2016 +#Tue Aug 23 19:51:57 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2056 -mc_version=1.10.2 dir_repo=./ -build_number=317 +mc_version=1.10.2 +forge_version=12.18.1.2056 +build_number=318 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 939fa0c04..5a7111609 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-316 \ No newline at end of file +r1.8-317 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 454f412a5..98edadc10 100644 --- a/version/update.json +++ b/version/update.json @@ -7,7 +7,8 @@ "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", - "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316" + "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316", + "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -30,8 +31,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-316", - "1.10.2-recommended": "r1.8-316", + "1.10.2-latest": "r1.8-317", + "1.10.2-recommended": "r1.8-317", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index ac1ae9a39..0564996ce 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -268,4 +268,5 @@ r1.8-313=1.9.4 r1.8-313=1.10.2 r1.8-314=1.10.2 r1.8-315=1.10.2 -r1.8-316=1.10.2 \ No newline at end of file +r1.8-316=1.10.2 +r1.8-317=1.10.2 \ No newline at end of file From 90085c4379d594f1acd40911af88fd9459514846 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 24 Aug 2016 21:20:54 -0500 Subject: [PATCH 908/935] Fix comodification derpage --- .../botania/common/entity/EntityDoppleganger.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 37b2e1a47..ec4c331af 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -42,6 +42,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SPacketRemoveEntityEffect; import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; @@ -90,6 +91,7 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.regex.Pattern; +import java.util.stream.Collectors; public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { @@ -565,14 +567,16 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { } } - player.getActivePotionEffects().stream() + List potionsToRemove = player.getActivePotionEffects().stream() .filter(effect -> effect.getDuration() < 160 && effect.getIsAmbient() && !effect.getPotion().isBadEffect()) .map(PotionEffect::getPotion) .distinct() - .forEach(potion -> { - player.removePotionEffect(potion); - ((WorldServer) worldObj).getPlayerChunkMap().getEntry(posXInt >> 4, posZInt >> 4).sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), potion)); - }); + .collect(Collectors.toList()); + + potionsToRemove.forEach(potion -> { + player.removePotionEffect(potion); + ((WorldServer) worldObj).getPlayerChunkMap().getEntry(posXInt >> 4, posZInt >> 4).sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), potion)); + }); player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.posX, player.posY, player.posZ, source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= range) { From 4ce5b40ebbe3d293d6b69787957da829803166e0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 24 Aug 2016 21:27:44 -0500 Subject: [PATCH 909/935] Build 318 metadata --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index e02af8f0e..e8e0ec0df 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Tue Aug 23 19:51:57 CDT 2016 +#Wed Aug 24 21:25:20 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.10.2 forge_version=12.18.1.2056 -build_number=318 +mc_version=1.10.2 +dir_repo=./ +build_number=319 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 5a7111609..4c5661007 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-317 \ No newline at end of file +r1.8-318 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 98edadc10..db26f386b 100644 --- a/version/update.json +++ b/version/update.json @@ -8,7 +8,8 @@ "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316", - "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317" + "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317", + "r1.8-318": "See https://github.com/williewillus/Botania/releases/r1.8-318" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -31,8 +32,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-317", - "1.10.2-recommended": "r1.8-317", + "1.10.2-latest": "r1.8-318", + "1.10.2-recommended": "r1.8-318", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index 0564996ce..add420180 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -269,4 +269,5 @@ r1.8-313=1.10.2 r1.8-314=1.10.2 r1.8-315=1.10.2 r1.8-316=1.10.2 -r1.8-317=1.10.2 \ No newline at end of file +r1.8-317=1.10.2 +r1.8-318=1.10.2 \ No newline at end of file From 9f66216832502418825f3a60b2dad51d8c2829d7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Aug 2016 20:14:42 -0500 Subject: [PATCH 910/935] Item sideonly checks --- src/main/java/vazkii/botania/common/item/IColorable.java | 3 +++ .../java/vazkii/botania/common/item/Item16Colors.java | 1 + .../java/vazkii/botania/common/item/ItemAncientWill.java | 1 + .../java/vazkii/botania/common/item/ItemBlackLotus.java | 1 + .../vazkii/botania/common/item/ItemCorporeaSpark.java | 1 + .../vazkii/botania/common/item/ItemCraftPattern.java | 1 + .../java/vazkii/botania/common/item/ItemGrassHorn.java | 1 + .../java/vazkii/botania/common/item/ItemGrassSeeds.java | 1 + .../java/vazkii/botania/common/item/ItemLaputaShard.java | 1 + .../java/vazkii/botania/common/item/ItemLexicon.java | 1 + .../java/vazkii/botania/common/item/ItemManaMirror.java | 3 +++ .../java/vazkii/botania/common/item/ItemManaTablet.java | 2 ++ .../java/vazkii/botania/common/item/ItemSignalFlare.java | 2 ++ .../vazkii/botania/common/item/ItemSparkUpgrade.java | 1 + .../java/vazkii/botania/common/item/ItemTwigWand.java | 1 + .../vazkii/botania/common/item/brew/ItemBrewBase.java | 2 ++ .../botania/common/item/brew/ItemIncenseStick.java | 2 ++ .../java/vazkii/botania/common/item/brew/ItemVial.java | 1 + .../common/item/equipment/bauble/ItemBaubleCosmetic.java | 1 + .../common/item/equipment/bauble/ItemBloodPendant.java | 3 +++ .../common/item/equipment/bauble/ItemFlightTiara.java | 1 + .../common/item/equipment/bauble/ItemIcePendant.java | 3 +++ .../common/item/equipment/bauble/ItemLavaPendant.java | 3 +++ .../common/item/equipment/bauble/ItemManaRing.java | 3 +++ .../common/item/equipment/bauble/ItemMonocle.java | 1 + .../item/equipment/bauble/ItemSuperLavaPendant.java | 3 +++ .../common/item/equipment/bauble/ItemTinyPlanet.java | 3 +++ .../common/item/equipment/tool/ItemEnderDagger.java | 9 +++------ .../item/equipment/tool/terrasteel/ItemTerraPick.java | 1 + .../item/interaction/thaumcraft/ItemManaInkwell.java | 3 +++ .../java/vazkii/botania/common/item/lens/ItemLens.java | 2 ++ .../vazkii/botania/common/item/material/ItemQuartz.java | 1 + .../vazkii/botania/common/item/material/ItemRune.java | 1 + 33 files changed, 58 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/IColorable.java b/src/main/java/vazkii/botania/common/item/IColorable.java index b2f40d2d3..c48eacd1f 100644 --- a/src/main/java/vazkii/botania/common/item/IColorable.java +++ b/src/main/java/vazkii/botania/common/item/IColorable.java @@ -1,7 +1,10 @@ package vazkii.botania.common.item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IColorable { + @SideOnly(Side.CLIENT) int getColorFromItemStack(ItemStack stack, int tintIndex); } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index a49210a4e..8651d44d9 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -29,6 +29,7 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 0e064e8a6..8a9a6b710 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -41,6 +41,7 @@ public class ItemAncientWill extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 76d0c4bb5..8a62d69b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -42,6 +42,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 13d182023..aa55c48a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -39,6 +39,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 05f2499f6..cbdad90d7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -51,6 +51,7 @@ public class ItemCraftPattern extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 7d2bd265b..e706ed3de 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -61,6 +61,7 @@ public class ItemGrassHorn extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 93ff2b0ae..4bac00777 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -69,6 +69,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ebb93eada..b3643d874 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -73,6 +73,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 8766e377a..a7e7a7ba0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -95,6 +95,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index c5c847677..df4e24c42 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -23,6 +23,8 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -55,6 +57,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { float mana = getMana(par1ItemStack); return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 1346022e5..13385afbd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -45,6 +45,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { // Empty tablet stacks.add(new ItemStack(item, 1)); @@ -62,6 +63,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { float mana = getMana(par1ItemStack); return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / MAX_MANA, 1F) : 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 857822fba..eddb4ec18 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -91,6 +91,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) return 0xFFFFFF; @@ -99,6 +100,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) stacks.add(forColor(i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index adbeac582..368567c21 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -31,6 +31,7 @@ public class ItemSparkUpgrade extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 199cc3625..fe5dbe745 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -205,6 +205,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0 || par2 == 3) return 0xFFFFFF; 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 25346cf71..e24adffa3 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -118,6 +118,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); @@ -127,6 +128,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index cf016d2d0..8d0bafc8d 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -45,6 +45,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { @@ -55,6 +56,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 5c53ccf00..6fe3b8421 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -38,6 +38,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); 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 1b88f89cb..83c48aa05 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 @@ -71,6 +71,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); 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 a7a2e3b66..12ee6863a 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 @@ -58,6 +58,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { @@ -68,6 +69,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; @@ -166,6 +168,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 032d05e07..c63f591b2 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 @@ -98,6 +98,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); 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 cafbe379b..dec6f32f5 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 @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -50,6 +52,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 189cca99d..49179c98d 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 @@ -20,6 +20,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -43,6 +45,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 40810a6e0..099ada167 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -16,6 +16,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -47,6 +49,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { stacks.add(new ItemStack(item, 1, 10000)); } 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 40c330048..0c6dd68d8 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 @@ -49,6 +49,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; 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 563eb43ae..701697414 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 @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -54,6 +56,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 f3abaf290..f59b350d5 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 @@ -22,6 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; @@ -101,6 +103,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index f947bbf1a..7c4e8da50 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -22,6 +22,8 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; @@ -39,6 +41,7 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) return 0xFFFFFF; @@ -46,12 +49,6 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); } - @Nonnull - @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.NONE; - } - @Override public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { if(!target.worldObj.isRemote 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 0b6f8762d..942cacf6a 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 @@ -86,6 +86,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index d0f285d84..a99b2d4bf 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IScribeTools; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -42,6 +44,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 57bfad516..190b1a197 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -149,12 +149,14 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < SUBTYPES; i++) stacks.add(new ItemStack(item, 1, i)); } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index d08ba180a..6c935047e 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -34,6 +34,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 4be693ca3..24f7163f1 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -37,6 +37,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); From 2d225337afe73d504c006c0be9604adbb8287d22 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 12:53:33 -0500 Subject: [PATCH 911/935] Stop spawning particles serverside --- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 5 +++++ 1 file changed, 5 insertions(+) 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 121fe3309..5bf0db83c 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -30,10 +30,12 @@ import net.minecraftforge.client.model.animation.AnimationTESR; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; @@ -467,6 +469,9 @@ public class ClientProxy implements IProxy { } private boolean doParticle() { + if(FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) + return false; + if(!ConfigHandler.useVanillaParticleLimiter) return true; From 064275488685a400e47f135c36106cb26c5eb7b1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 12:57:21 -0500 Subject: [PATCH 912/935] Build 319 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index e8e0ec0df..9de25f624 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Aug 24 21:25:20 CDT 2016 +#Sat Aug 27 12:56:20 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.18.1.2056 -mc_version=1.10.2 dir_repo=./ -build_number=319 +mc_version=1.10.2 +forge_version=12.18.1.2056 +build_number=320 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 4c5661007..8e3580faf 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-318 \ No newline at end of file +r1.8-319 \ No newline at end of file diff --git a/version/update.json b/version/update.json index db26f386b..683661f2b 100644 --- a/version/update.json +++ b/version/update.json @@ -9,7 +9,8 @@ "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316", "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317", - "r1.8-318": "See https://github.com/williewillus/Botania/releases/r1.8-318" + "r1.8-318": "See https://github.com/williewillus/Botania/releases/r1.8-318", + "r1.8-319": "See https://github.com/williewillus/Botania/releases/r1.8-319" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -32,8 +33,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-318", - "1.10.2-recommended": "r1.8-318", + "1.10.2-latest": "r1.8-319", + "1.10.2-recommended": "r1.8-319", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index add420180..bf3a4a145 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -270,4 +270,5 @@ r1.8-314=1.10.2 r1.8-315=1.10.2 r1.8-316=1.10.2 r1.8-317=1.10.2 -r1.8-318=1.10.2 \ No newline at end of file +r1.8-318=1.10.2 +r1.8-319=1.10.2 \ No newline at end of file From 392a02e94519e4bec476ad82c02e785013a61647 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 19:08:43 -0500 Subject: [PATCH 913/935] Modernize GoG skybox code. Fixes #460 --- .../core/handler/ClientMethodHandles.java | 20 +- .../render/world/SkyblockSkyRenderer.java | 503 ++++++++++++------ .../botania/common/lib/LibObfuscation.java | 3 +- 3 files changed, 348 insertions(+), 178 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index d63e62c2a..cd87afeb2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -2,6 +2,7 @@ package vazkii.botania.client.core.handler; import com.google.common.base.Throwables; import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; @@ -15,7 +16,8 @@ import java.lang.reflect.Method; public final class ClientMethodHandles { public static final MethodHandle - renderPosX_getter, renderPosY_getter, renderPosZ_getter; // RenderManager + renderPosX_getter, renderPosY_getter, renderPosZ_getter, // RenderManager + starGLCallList_getter, starVBO_getter, glSkyList_getter, skyVBO_getter; // RenderGlobal static { try { @@ -30,6 +32,22 @@ public final class ClientMethodHandles { f = ReflectionHelper.findField(RenderManager.class, LibObfuscation.RENDERPOSZ); f.setAccessible(true); renderPosZ_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_GL_CALL_LIST); + f.setAccessible(true); + starGLCallList_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.STAR_VBO); + f.setAccessible(true); + starVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.GL_SKY_LIST); + f.setAccessible(true); + glSkyList_getter = MethodHandles.publicLookup().unreflectGetter(f); + + f = ReflectionHelper.findField(RenderGlobal.class, LibObfuscation.SKY_VBO); + f.setAccessible(true); + skyVBO_getter = MethodHandles.publicLookup().unreflectGetter(f); } catch (IllegalAccessException e) { Botania.LOGGER.fatal("Couldn't initialize client methodhandles! Things will be broken!"); e.printStackTrace(); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 834c616f7..d90e4fef8 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -13,9 +13,11 @@ package vazkii.botania.client.render.world; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; @@ -23,6 +25,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.IRenderHandler; import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibObfuscation; @@ -33,8 +36,8 @@ public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); private static final ResourceLocation textureRainbow = new ResourceLocation(LibResources.MISC_RAINBOW); - private static final ResourceLocation textureMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); - private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); + private static final ResourceLocation MOON_PHASES_TEXTURES = new ResourceLocation("textures/environment/moon_phases.png"); + private static final ResourceLocation SUN_TEXTURES = new ResourceLocation("textures/environment/sun.png"); private static final ResourceLocation[] planetTextures = new ResourceLocation[] { new ResourceLocation(LibResources.MISC_PLANET + "0.png"), new ResourceLocation(LibResources.MISC_PLANET + "1.png"), @@ -44,94 +47,129 @@ public class SkyblockSkyRenderer extends IRenderHandler { new ResourceLocation(LibResources.MISC_PLANET + "5.png") }; + // Copy of overworld section of RenderGlobal.renderSky(), heavily modified @Override public void render(float partialTicks, WorldClient world, Minecraft mc) { - boolean test = false; - if(test) - return; + // Environment setup + int glSkyList; + net.minecraft.client.renderer.vertex.VertexBuffer skyVBO; - int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); - int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon line. We don't have it here - int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); + try { + glSkyList = (int) ClientMethodHandles.glSkyList_getter.invokeExact(mc.renderGlobal); + skyVBO = (net.minecraft.client.renderer.vertex.VertexBuffer) ClientMethodHandles.skyVBO_getter.invokeExact(mc.renderGlobal); + } catch (Throwable t) { return; } + // Begin GlStateManager.disableTexture2D(); - Vec3d vec3 = world.getSkyColor(mc.getRenderViewEntity(), partialTicks); - float f1 = (float)vec3.xCoord; - float f2 = (float)vec3.yCoord; - float f3 = (float)vec3.zCoord; - float f6; - + Vec3d vec3d = world.getSkyColor(mc.getRenderViewEntity(), partialTicks); + float f = (float)vec3d.xCoord; + float f1 = (float)vec3d.yCoord; + float f2 = (float)vec3d.zCoord; + + // Botania - darken when in void float insideVoid = 0; if(mc.thePlayer.posY <= -2) insideVoid = (float) Math.min(1F, -(mc.thePlayer.posY + 2) / 30F); - + + f = Math.max(0F, f - insideVoid); f1 = Math.max(0F, f1 - insideVoid); f2 = Math.max(0F, f2 - insideVoid); - f3 = Math.max(0F, f3 - insideVoid); - Tessellator tessellator1 = Tessellator.getInstance(); + /*if (pass != 2) Botania - no anaglyph stuff + { + float f3 = (f * 30.0F + f1 * 59.0F + f2 * 11.0F) / 100.0F; + float f4 = (f * 30.0F + f1 * 70.0F) / 100.0F; + float f5 = (f * 30.0F + f2 * 70.0F) / 100.0F; + f = f3; + f1 = f4; + f2 = f5; + }*/ + + GlStateManager.color(f, f1, f2); + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer vertexbuffer = tessellator.getBuffer(); GlStateManager.depthMask(false); GlStateManager.enableFog(); - GlStateManager.color(f1, f2, f3); - GlStateManager.callList(glSkyList); + GlStateManager.color(f, f1, f2); + + if (OpenGlHelper.useVbo()) + { + skyVBO.bindBuffer(); + GlStateManager.glEnableClientState(32884); + GlStateManager.glVertexPointer(3, 5126, 12, 0); + skyVBO.drawArrays(7); + skyVBO.unbindBuffer(); + GlStateManager.glDisableClientState(32884); + } + else + { + GlStateManager.callList(glSkyList); + } + GlStateManager.disableFog(); GlStateManager.disableAlpha(); GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderHelper.disableStandardItemLighting(); float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); - float f7; - float f8; - float f9; - float f10; - // === Sunset - if(afloat != null) { + if (afloat != null) + { GlStateManager.disableTexture2D(); - GlStateManager.shadeModel(GL11.GL_SMOOTH); + GlStateManager.shadeModel(7425); GlStateManager.pushMatrix(); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F); - f6 = afloat[0]; - f7 = afloat[1]; - f8 = afloat[2]; - float f11; + float f6 = afloat[0]; + float f7 = afloat[1]; + float f8 = afloat[2]; - tessellator1.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); - tessellator1.getBuffer().pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3] * (1F - insideVoid)).endVertex(); - byte b0 = 16; + /*if (pass != 2) Botania - no anaglyph stuff + { + float f9 = (f6 * 30.0F + f7 * 59.0F + f8 * 11.0F) / 100.0F; + float f10 = (f6 * 30.0F + f7 * 70.0F) / 100.0F; + float f11 = (f6 * 30.0F + f8 * 70.0F) / 100.0F; + f6 = f9; + f7 = f10; + f8 = f11; + }*/ - for(int j = 0; j <= b0; ++j) { - f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; - float f12 = MathHelper.sin(f11); - float f13 = MathHelper.cos(f11); - tessellator1.getBuffer().pos((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); + vertexbuffer.begin(6, DefaultVertexFormats.POSITION_COLOR); + vertexbuffer.pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3] * (1F - insideVoid)).endVertex(); // Botania - darken in void + int j = 16; + + for (int l = 0; l <= 16; ++l) + { + float f21 = (float)l * ((float)Math.PI * 2F) / 16.0F; + float f12 = MathHelper.sin(f21); + float f13 = MathHelper.cos(f21); + vertexbuffer.pos((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])).color(afloat[0], afloat[1], afloat[2], 0.0F).endVertex(); } - tessellator1.draw(); + tessellator.draw(); GlStateManager.popMatrix(); - GlStateManager.shadeModel(GL11.GL_FLAT); + GlStateManager.shadeModel(7424); } GlStateManager.enableTexture2D(); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.pushMatrix(); - f6 = Math.max(0.2F, 1.0F - world.getRainStrength(partialTicks)) * (1F - insideVoid); - f7 = 0.0F; - f8 = 0.0F; - f9 = 0.0F; - - GlStateManager.translate(f7, f8, f9); + float f16 = 1.0F - world.getRainStrength(partialTicks); + GlStateManager.color(1.0F, 1.0F, 1.0F, f16); GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); - + + float f17; // Botania - move declaration up from below "extra stuff" + + // Botania - Begin extra stuff float celAng = world.getCelestialAngle(partialTicks); float effCelAng = celAng; if(celAng > 0.5) effCelAng = 0.5F - (celAng - 0.5F); // === Planets - f10 = 20F; - float lowA = Math.max(0F, effCelAng - 0.3F) * f6; + f17 = 20F; + float lowA = Math.max(0F, effCelAng - 0.3F) * f16; float a = Math.max(0.1F, lowA); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); @@ -140,37 +178,42 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F); for(int p = 0; p < planetTextures.length; p++) { mc.renderEngine.bindTexture(planetTextures[p]); - drawObject(tessellator1, f10); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getBuffer().pos(-f17, 100.0D, -f17).tex(0.0D, 0.0D).endVertex(); + tessellator.getBuffer().pos(f17, 100.0D, -f17).tex(1.0D, 0.0D).endVertex(); + tessellator.getBuffer().pos(f17, 100.0D, f17).tex(1.0D, 1.0D).endVertex(); + tessellator.getBuffer().pos(-f17, 100.0D, f17).tex(0.0D, 1.0D).endVertex(); + tessellator.draw(); switch(p) { - case 0: - GlStateManager.rotate(70F, 1F, 0F, 0F); - f10 = 12F; - break; - case 1: - GlStateManager.rotate(120F, 0F, 0F, 1F); - f10 = 15F; - break; - case 2: - GlStateManager.rotate(80F, 1F, 0F, 1F); - f10 = 25F; - break; - case 3: - GlStateManager.rotate(100F, 0F, 0F, 1F); - f10 = 10F; - break; - case 4: - GlStateManager.rotate(-60F, 1F, 0F, 0.5F); - f10 = 40F; + case 0: + GlStateManager.rotate(70F, 1F, 0F, 0F); + f17 = 12F; + break; + case 1: + GlStateManager.rotate(120F, 0F, 0F, 1F); + f17 = 15F; + break; + case 2: + GlStateManager.rotate(80F, 1F, 0F, 1F); + f17 = 25F; + break; + case 3: + GlStateManager.rotate(100F, 0F, 0F, 1F); + f17 = 10F; + break; + case 4: + GlStateManager.rotate(-60F, 1F, 0F, 0.5F); + f17 = 40F; } } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.popMatrix(); // === Rays - mc.renderEngine.bindTexture(textureSkybox); + mc.renderEngine.bindTexture(textureSkybox); - f10 = 20F; + f17 = 20F; a = lowA; GlStateManager.pushMatrix(); GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); @@ -192,42 +235,42 @@ public class SkyblockSkyRenderer extends IRenderHandler { float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); GlStateManager.rotate((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); - tessellator1.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) j--; float ang = j * anglePer + baseAngle; - double xp = Math.cos(ang * Math.PI / 180F) * f10; - double zp = Math.sin(ang * Math.PI / 180F) * f10; + double xp = Math.cos(ang * Math.PI / 180F) * f17; + double zp = Math.sin(ang * Math.PI / 180F) * f17; double yo = Math.sin(fuzzPer * j) * 1; float ut = ang * uPer; if(i % 2 == 0) { - tessellator1.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); - tessellator1.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); } else { - tessellator1.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); - tessellator1.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); } } - tessellator1.draw(); + tessellator.draw(); switch(p) { - case 0: - GlStateManager.rotate(20F, 1F, 0F, 0F); - GlStateManager.color(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 14) / angles; - rotSpeed = 0.2F; - break; - case 1: - GlStateManager.rotate(50F, 1F, 0F, 0F); - GlStateManager.color(0.4F, 1F, 0.7F, a); - fuzzPer = (Math.PI * 6) / angles; - rotSpeed = 2F; - break; + case 0: + GlStateManager.rotate(20F, 1F, 0F, 0F); + GlStateManager.color(1F, 0.4F, 0.4F, a); + fuzzPer = (Math.PI * 14) / angles; + rotSpeed = 0.2F; + break; + case 1: + GlStateManager.rotate(50F, 1F, 0F, 0F); + GlStateManager.color(0.4F, 1F, 0.7F, a); + fuzzPer = (Math.PI * 6) / angles; + rotSpeed = 2F; + break; } } GlStateManager.popMatrix(); @@ -235,8 +278,8 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Rainbow GlStateManager.pushMatrix(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); - mc.renderEngine.bindTexture(textureRainbow); - f10 = 10F; + mc.renderEngine.bindTexture(textureRainbow); + f17 = 10F; float effCelAng1 = celAng; if(effCelAng1 > 0.25F) effCelAng1 = 1F - effCelAng1; @@ -251,117 +294,225 @@ public class SkyblockSkyRenderer extends IRenderHandler { GlStateManager.rotate(angle1, 0F, 1F, 0F); GlStateManager.rotate(angle2, 0F, 0F, 1F); - tessellator1.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) j--; float ang = j * anglePer; - double xp = Math.cos(ang * Math.PI / 180F) * f10; - double zp = Math.sin(ang * Math.PI / 180F) * f10; + double xp = Math.cos(ang * Math.PI / 180F) * f17; + double zp = Math.sin(ang * Math.PI / 180F) * f17; double yo = 0; float ut = ang * uPer; if(i % 2 == 0) { - tessellator1.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); - tessellator1.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); } else { - tessellator1.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); - tessellator1.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0, zp).tex(ut, 0).endVertex(); + tessellator.getBuffer().pos(xp, yo + y0 + y, zp).tex(ut, 1F).endVertex(); } } - tessellator1.draw(); + tessellator.draw(); GlStateManager.popMatrix(); - GlStateManager.color(1F, 1F, 1F, 1F - insideVoid); - GlStateManager.tryBlendFuncSeparate(770, 1, 1, 0); - - // === Sun + // Botania - End extra stuff + + GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); - f10 = 60.0F; - mc.renderEngine.bindTexture(textureSun); - drawObject(tessellator1, f10); - - // === Moon - f10 = 60.0F; - mc.renderEngine.bindTexture(textureMoonPhases); - int k = world.getMoonPhase(); - int l = k % 4; - int i1 = k / 4 % 2; - float f14 = (float)(l + 0) / 4.0F; - float f15 = (float)(i1 + 0) / 2.0F; - float f16 = (float)(l + 1) / 4.0F; - float f17 = (float)(i1 + 1) / 2.0F; - tessellator1.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tessellator1.getBuffer().pos((double)(-f10), -100.0D, (double)f10).tex((double)f16, (double)f17).endVertex(); - tessellator1.getBuffer().pos((double)f10, -100.0D, (double)f10).tex((double)f14, (double)f17).endVertex(); - tessellator1.getBuffer().pos((double)f10, -100.0D, (double)(-f10)).tex((double)f14, (double)f15).endVertex(); - tessellator1.getBuffer().pos((double)(-f10), -100.0D, (double)(-f10)).tex((double)f16, (double)f15).endVertex(); - tessellator1.draw(); - - // === Stars - f6 *= Math.max(0.1F, effCelAng * 2); - float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; - GlStateManager.pushMatrix(); + /*float*/ f17 = 60.0F; // Botania - 30 -> 60 and move declaration above "extra stuff" + mc.renderEngine.bindTexture(SUN_TEXTURES); + vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); + vertexbuffer.pos((double)(-f17), 100.0D, (double)(-f17)).tex(0.0D, 0.0D).endVertex(); + vertexbuffer.pos((double)f17, 100.0D, (double)(-f17)).tex(1.0D, 0.0D).endVertex(); + vertexbuffer.pos((double)f17, 100.0D, (double)f17).tex(1.0D, 1.0D).endVertex(); + vertexbuffer.pos((double)(-f17), 100.0D, (double)f17).tex(0.0D, 1.0D).endVertex(); + tessellator.draw(); + f17 = 60.0F; // Botania - 20 -> 60 + mc.renderEngine.bindTexture(MOON_PHASES_TEXTURES); + int i = world.getMoonPhase(); + int k = i % 4; + int i1 = i / 4 % 2; + float f22 = (float)(k + 0) / 4.0F; + float f23 = (float)(i1 + 0) / 2.0F; + float f24 = (float)(k + 1) / 4.0F; + float f14 = (float)(i1 + 1) / 2.0F; + vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX); + vertexbuffer.pos((double)(-f17), -100.0D, (double)f17).tex((double)f24, (double)f14).endVertex(); + vertexbuffer.pos((double)f17, -100.0D, (double)f17).tex((double)f22, (double)f14).endVertex(); + vertexbuffer.pos((double)f17, -100.0D, (double)(-f17)).tex((double)f22, (double)f23).endVertex(); + vertexbuffer.pos((double)(-f17), -100.0D, (double)(-f17)).tex((double)f24, (double)f23).endVertex(); + tessellator.draw(); GlStateManager.disableTexture2D(); + // Botania - Custom star rendering + { + f16 *= Math.max(0.1F, effCelAng * 2); + renderStars(mc, f16, partialTicks); + } + /*float f15 = this.theWorld.getStarBrightness(partialTicks) * f16; - GlStateManager.pushMatrix(); - GlStateManager.rotate(t * 3, 0F, 1F, 0F); - GlStateManager.color(1F, 1F, 1F, f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(t, 0F, 1F, 0F); - GlStateManager.color(0.5F, 1F, 1F, f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(t * 2, 0F, 1F, 0F); - GlStateManager.color(1F, 0.75F, 0.75F, f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(t * 3, 0F, 0F, 1F); - GlStateManager.color(1F, 1F, 1F, 0.25F * f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(t, 0F, 0F, 1F); - GlStateManager.color(0.5F, 1F, 1F, 0.25F * f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.pushMatrix(); - GlStateManager.rotate(t * 2, 0F, 0F, 1F); - GlStateManager.color(1F, 0.75F, 0.75F, 0.25F * f6); - GlStateManager.callList(starGLCallList); - GlStateManager.popMatrix(); - - GlStateManager.enableTexture2D(); - GlStateManager.popMatrix(); + if (f15 > 0.0F) + { + GlStateManager.color(f15, f15, f15, f15); + if (this.vboEnabled) + { + this.starVBO.bindBuffer(); + GlStateManager.glEnableClientState(32884); + GlStateManager.glVertexPointer(3, 5126, 12, 0); + this.starVBO.drawArrays(7); + this.starVBO.unbindBuffer(); + GlStateManager.glDisableClientState(32884); + } + else + { + GlStateManager.callList(this.starGLCallList); + } + }*/ + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableBlend(); GlStateManager.enableAlpha(); GlStateManager.enableFog(); GlStateManager.popMatrix(); + // Botania - no horizon rendering + /* GlStateManager.disableTexture2D(); + GlStateManager.color(0.0F, 0.0F, 0.0F); + double d0 = this.mc.thePlayer.getPositionEyes(partialTicks).yCoord - this.theWorld.getHorizon(); + + if (d0 < 0.0D) + { + GlStateManager.pushMatrix(); + GlStateManager.translate(0.0F, 12.0F, 0.0F); + + if (this.vboEnabled) + { + this.sky2VBO.bindBuffer(); + GlStateManager.glEnableClientState(32884); + GlStateManager.glVertexPointer(3, 5126, 12, 0); + this.sky2VBO.drawArrays(7); + this.sky2VBO.unbindBuffer(); + GlStateManager.glDisableClientState(32884); + } + else + { + GlStateManager.callList(this.glSkyList2); + } + + GlStateManager.popMatrix(); + float f18 = 1.0F; + float f19 = -((float)(d0 + 65.0D)); + float f20 = -1.0F; + vertexbuffer.begin(7, DefaultVertexFormats.POSITION_COLOR); + vertexbuffer.pos(-1.0D, (double)f19, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, (double)f19, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, (double)f19, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, (double)f19, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, (double)f19, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, (double)f19, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, (double)f19, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, (double)f19, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(-1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, 1.0D).color(0, 0, 0, 255).endVertex(); + vertexbuffer.pos(1.0D, -1.0D, -1.0D).color(0, 0, 0, 255).endVertex(); + tessellator.draw(); + } + + if (this.theWorld.provider.isSkyColored()) + { + GlStateManager.color(f * 0.2F + 0.04F, f1 * 0.2F + 0.04F, f2 * 0.6F + 0.1F); + } + else + { + GlStateManager.color(f, f1, f2); + } + + GlStateManager.pushMatrix(); + GlStateManager.translate(0.0F, -((float)(d0 - 16.0D)), 0.0F); + GlStateManager.callList(this.glSkyList2); + GlStateManager.popMatrix();*/ + GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); } + + private void renderStars(Minecraft mc, float alpha, float partialTicks) { + int starGLCallList; + net.minecraft.client.renderer.vertex.VertexBuffer starVBO; - private void drawObject(Tessellator tess, float f10) { - tess.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tess.getBuffer().pos((double)(-f10), 100.0D, (double)(-f10)).tex(0.0D, 0.0D).endVertex(); - tess.getBuffer().pos((double)(f10), 100.0D, (double)(-f10)).tex(1.0D, 0.0D).endVertex(); - tess.getBuffer().pos((double)(f10), 100.0D, (double)(f10)).tex(1.0D, 1.0D).endVertex(); - tess.getBuffer().pos((double)(-f10), 100.0D, (double)(f10)).tex(0.0D, 1.0D).endVertex(); - tess.draw(); + try { + starGLCallList = (int) ClientMethodHandles.starGLCallList_getter.invokeExact(mc.renderGlobal); + starVBO = (net.minecraft.client.renderer.vertex.VertexBuffer) ClientMethodHandles.starVBO_getter.invokeExact(mc.renderGlobal); + } catch (Throwable t) { return; } + + float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; + GlStateManager.pushMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 3, 0F, 1F, 0F); + GlStateManager.color(1F, 1F, 1F, alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t, 0F, 1F, 0F); + GlStateManager.color(0.5F, 1F, 1F, alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 2, 0F, 1F, 0F); + GlStateManager.color(1F, 0.75F, 0.75F, alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 3, 0F, 0F, 1F); + GlStateManager.color(1F, 1F, 1F, 0.25F * alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t, 0F, 0F, 1F); + GlStateManager.color(0.5F, 1F, 1F, 0.25F * alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.pushMatrix(); + GlStateManager.rotate(t * 2, 0F, 0F, 1F); + GlStateManager.color(1F, 0.75F, 0.75F, 0.25F * alpha); + drawVboOrList(starVBO, starGLCallList); + GlStateManager.popMatrix(); + + GlStateManager.popMatrix(); + } + + // Excised from many occurences in RenderGlobal + private void drawVboOrList(net.minecraft.client.renderer.vertex.VertexBuffer vbo, int displayList) { + if (OpenGlHelper.useVbo()) + { + vbo.bindBuffer(); + GlStateManager.glEnableClientState(GL11.GL_VERTEX_ARRAY); + GlStateManager.glVertexPointer(3, GL11.GL_FLOAT, 12, 0); + vbo.drawArrays(GL11.GL_QUADS); + vbo.unbindBuffer(); + GlStateManager.glDisableClientState(GL11.GL_VERTEX_ARRAY); + } + else + { + GlStateManager.callList(displayList); + } } } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 25516be05..e8ce3cf5f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -86,7 +86,8 @@ public final class LibObfuscation { // RenderGlobal public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "p" }; + public static final String[] STAR_VBO = new String[] { "starVBO", "field_175013_s", "t" }; public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "q" }; - public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "r" }; + public static final String[] SKY_VBO = new String[] { "skyVBO", "field_175012_t", "u" }; } From d57354de2fdb94bc3abc6bcfb35139de596d216d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 19:12:04 -0500 Subject: [PATCH 914/935] Remove unnecessary new String[] libobfuscation --- .../botania/common/lib/LibObfuscation.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index e8ce3cf5f..7dcb2ed22 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -25,69 +25,69 @@ public final class LibObfuscation { public static final String[] PICKUP_DELAY = { "delayBeforeCanPickup", "field_145804_b", "e" }; // ParticleManager - public static final String[] PARTICLE_TEXTURES = new String[] { "particleTextures", "field_110737_b", "b" }; + public static final String[] PARTICLE_TEXTURES = { "particleTextures", "field_110737_b", "b" }; // EntityAINearestAttackableTarget - public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; - public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; + public static final String[] TARGET_CLASS = { "targetClass", "field_75307_b", "a" }; + public static final String[] TARGET_ENTITY_SELECTOR = { "targetEntitySelector", "field_82643_g", "c" }; // EntityAIAvoidEntity - public static final String[] TARGET_ENTITY_CLASS = new String[] { "classToAvoid", "field_181064_i", "i" }; + public static final String[] TARGET_ENTITY_CLASS = { "classToAvoid", "field_181064_i", "i" }; // EntityCreeper - public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "bw" }; + public static final String[] TIME_SINCE_IGNITED = { "timeSinceIgnited", "field_70833_d", "bw" }; // Entity - public static final String[] IS_IMMUNE_TO_FIRE = new String[] { "isImmuneToFire", "field_70178_ae", "Y" }; + public static final String[] IS_IMMUNE_TO_FIRE = { "isImmuneToFire", "field_70178_ae", "Y" }; // ItemBlockSpecial - public static final String[] REED_ITEM = new String[] { "block", "field_150935_a", "a" }; + public static final String[] REED_ITEM = { "block", "field_150935_a", "a" }; // EntityAnimal - public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bv" }; + public static final String[] IN_LOVE = { "inLove", "field_70881_d", "bv" }; // EntityLivingBase - public static final String[] ITEM_IN_USE_COUNT = new String[] { "activeItemStackUseCount", "field_184628_bn", "bn" }; + public static final String[] ITEM_IN_USE_COUNT = { "activeItemStackUseCount", "field_184628_bn", "bn" }; // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bC" }; + public static final String[] HORSE_JUMP_STRENGTH = { "horseJumpStrength", "field_110271_bv", "bC" }; // PlayerControllerMP - public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; + public static final String[] NET_CLIENT_HANDLER = { "netClientHandler", "field_78774_b", "b" }; // MobSpawnerBaseLogic - public static final String[] IS_ACTIVATED = new String[] { "isActivated" ,"func_98279_f", "h" }; - public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "l" }; - public static final String[] SPAWN_COUNT = new String[] { "spawnCount", "field_98294_i", "h" }; - public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "j" }; - public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "g" }; - public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "f" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "minecartToSpawn", "field_98285_e", "b" }; - public static final String[] SPAWN_DELAY = new String[] { "spawnDelay", "field_98286_b", "a" }; - public static final String[] PREV_MOB_ROTATION = new String[] { "prevMobRotation", "field_98284_d", "e" }; - public static final String[] MOB_ROTATION = new String[] { "mobRotation", "field_98287_c", "d" }; - public static final String[] RANDOM_ENTITY = new String[] { "randomEntity", "field_98282_f", "c" }; + public static final String[] IS_ACTIVATED = { "isActivated" ,"func_98279_f", "h" }; + public static final String[] SPAWN_RANGE = { "spawnRange", "field_98290_m", "l" }; + public static final String[] SPAWN_COUNT = { "spawnCount", "field_98294_i", "h" }; + public static final String[] MAX_NEARBY_ENTITIES = { "maxNearbyEntities", "field_98292_k", "j" }; + public static final String[] MAX_SPAWN_DELAY = { "maxSpawnDelay", "field_98293_h", "g" }; + public static final String[] MIN_SPAWN_DELAY = { "minSpawnDelay", "field_98283_g", "f" }; + public static final String[] POTENTIAL_ENTITY_SPAWNS = { "minecartToSpawn", "field_98285_e", "b" }; + public static final String[] SPAWN_DELAY = { "spawnDelay", "field_98286_b", "a" }; + public static final String[] PREV_MOB_ROTATION = { "prevMobRotation", "field_98284_d", "e" }; + public static final String[] MOB_ROTATION = { "mobRotation", "field_98287_c", "d" }; + public static final String[] RANDOM_ENTITY = { "randomEntity", "field_98282_f", "c" }; // GuiIngame - public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "q" }; + public static final String[] REMAINING_HIGHLIGHT_TICKS = { "remainingHighlightTicks", "field_92017_k", "q" }; // EntityThrowable - public static final String[] THROWER = new String[] { "thrower", "field_70192_c", "h" }; + public static final String[] THROWER = { "thrower", "field_70192_c", "h" }; // GuiContainer - public static final String[] THE_SLOT = new String[] { "theSlot", "field_147006_u", "u" }; + public static final String[] THE_SLOT = { "theSlot", "field_147006_u", "u" }; // GuiChat - public static final String[] INPUT_FIELD = new String[] { "inputField", "field_146415_a", "a" }; - public static final String[] COMPLETE_FLAG = new String[] { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9 + public static final String[] INPUT_FIELD = { "inputField", "field_146415_a", "a" }; + public static final String[] COMPLETE_FLAG = { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9 // Entityliving - public static final String[] GET_LIVING_SOUND = new String[] { "getAmbientSound", "func_184639_G", "G" }; + public static final String[] GET_LIVING_SOUND = { "getAmbientSound", "func_184639_G", "G" }; // RenderGlobal - public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "p" }; - public static final String[] STAR_VBO = new String[] { "starVBO", "field_175013_s", "t" }; - public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "q" }; - public static final String[] SKY_VBO = new String[] { "skyVBO", "field_175012_t", "u" }; + public static final String[] STAR_GL_CALL_LIST = { "starGLCallList", "field_72772_v", "p" }; + public static final String[] STAR_VBO = { "starVBO", "field_175013_s", "t" }; + public static final String[] GL_SKY_LIST = { "glSkyList", "field_72771_w", "q" }; + public static final String[] SKY_VBO = { "skyVBO", "field_175012_t", "u" }; } From 2aa05a4b072a32a941550bc63ab59df7e8ebea8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 19:34:08 -0500 Subject: [PATCH 915/935] Clean up libobf more --- src/main/java/vazkii/botania/client/fx/FXSparkle.java | 3 ++- src/main/java/vazkii/botania/client/fx/FXWisp.java | 3 ++- .../block/subtile/functional/SubTilePollidisiac.java | 3 +-- .../java/vazkii/botania/common/lib/LibObfuscation.java | 10 ++-------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 5bcae8da1..31e4b032a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -34,6 +34,7 @@ import java.util.Queue; public class FXSparkle extends Particle { + private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); private static final Queue queuedRenders = new ArrayDeque<>(); @@ -73,7 +74,7 @@ public class FXSparkle extends Particle { ParticleRenderDispatcher.fakeSparkleFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index a9ae72ac2..1ca8d4faa 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -32,6 +32,7 @@ import java.util.Queue; public class FXWisp extends Particle { + private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final Queue queuedRenders = new ArrayDeque<>(); @@ -81,7 +82,7 @@ public class FXWisp extends Particle { ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ReflectionHelper.getPrivateValue(ParticleManager.class, null, LibObfuscation.PARTICLE_TEXTURES) : particles); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); if(!queuedRenders.isEmpty()) { tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index d96a04095..49d189e0f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -43,8 +43,7 @@ public class SubTilePollidisiac extends SubTileFunctional { if(mana < manaCost) break; - int love = ReflectionHelper.getPrivateValue(EntityAnimal.class, animal, LibObfuscation.IN_LOVE); - if(animal.getGrowingAge() == 0 && love <= 0) { + if(animal.getGrowingAge() == 0 && !animal.isInLove()) { for(EntityItem item : items) { int age; try { diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 7dcb2ed22..6947941c4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -24,9 +24,6 @@ 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" }; - // ParticleManager - public static final String[] PARTICLE_TEXTURES = { "particleTextures", "field_110737_b", "b" }; - // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = { "targetClass", "field_75307_b", "a" }; public static final String[] TARGET_ENTITY_SELECTOR = { "targetEntitySelector", "field_82643_g", "c" }; @@ -50,10 +47,10 @@ public final class LibObfuscation { public static final String[] ITEM_IN_USE_COUNT = { "activeItemStackUseCount", "field_184628_bn", "bn" }; // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = { "horseJumpStrength", "field_110271_bv", "bC" }; + public static final String[] HORSE_JUMP_STRENGTH = { "JUMP_STRENGTH", "field_110271_bv", "bC" }; // PlayerControllerMP - public static final String[] NET_CLIENT_HANDLER = { "netClientHandler", "field_78774_b", "b" }; + public static final String[] NET_CLIENT_HANDLER = { "connection", "field_78774_b", "b" }; // MobSpawnerBaseLogic public static final String[] IS_ACTIVATED = { "isActivated" ,"func_98279_f", "h" }; @@ -74,9 +71,6 @@ public final class LibObfuscation { // EntityThrowable public static final String[] THROWER = { "thrower", "field_70192_c", "h" }; - // GuiContainer - public static final String[] THE_SLOT = { "theSlot", "field_147006_u", "u" }; - // GuiChat public static final String[] INPUT_FIELD = { "inputField", "field_146415_a", "a" }; public static final String[] COMPLETE_FLAG = { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9 From c077d4d46463da0584b699b8a0b0ecedb1311f23 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 27 Aug 2016 19:46:50 -0500 Subject: [PATCH 916/935] Remove category from sounds.json as it is no longer used by vanilla --- src/main/resources/assets/botania/sounds.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 0423aaf1e..49e44dff1 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,46 +1,46 @@ { - "airRod": { "category": "player", "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, - "agricarnation": { "category": "block", "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, - "altarCraft": { "category": "block", "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, - "babylonAttack": { "category": "player", "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, - "babylonSpawn": { "category": "player", "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, - "bellows": { "category": "block", "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, - "bifrostRod": { "category": "player", "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, - "blackLotus": { "category": "block", "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, - "dash": { "category": "player", "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, - "ding": { "category": "block", "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, - "divaCharm": { "category": "player", "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, - "divinationRod": { "category": "player", "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, - "doit": { "category": "block", "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, - "enchanterFade": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, - "enchanterForm": { "category": "block", "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, - "enchanterEnchant": { "category": "block", "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, - "endoflame": { "category": "block", "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, - "equipBauble": { "category": "player", "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, - "gaiaTrap": { "category": "hostile", "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, - "goldenLaurel": { "category": "player", "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, - "holyCloak": { "category": "player", "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, - "laputaStart": { "category": "player", "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, - "lexiconOpen": { "category": "master", "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, - "lexiconPage": { "category": "master", "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, - "lightRelay": { "category": "block", "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, - "manaBlaster": { "category": "player", "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, - "manaPoolCraft": { "category": "block", "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, - "missile": { "category": "player", "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, - "orechid": { "category": "block", "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, - "potionCreate": { "category": "block", "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, - "runeAltarCraft": { "category": "block", "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, - "runeAltarStart": { "category": "block", "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, - "spreaderFire": { "category": "block", "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, - "starcaller": { "category": "player", "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, - "terraBlade": { "category": "player", "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, - "terraformRod": { "category": "player", "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, - "terraPickMode": { "category": "player", "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, - "terrasteelCraft": { "category": "block", "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, - "thermalily": { "category": "block", "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, - "unholyCloak": { "category": "player", "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, - "way": { "category": "master", "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, + "airRod": { "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, + "agricarnation": { "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, + "altarCraft": { "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, + "babylonAttack": { "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, + "babylonSpawn": { "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, + "bellows": { "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, + "bifrostRod": { "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, + "blackLotus": { "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, + "dash": { "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, + "ding": { "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, + "divaCharm": { "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, + "divinationRod": { "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, + "doit": { "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, + "enchanterFade": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, + "enchanterForm": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, + "enchanterEnchant": { "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, + "endoflame": { "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, + "equipBauble": { "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, + "gaiaTrap": { "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, + "goldenLaurel": { "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, + "holyCloak": { "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, + "laputaStart": { "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, + "lexiconOpen": { "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, + "lexiconPage": { "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, + "lightRelay": { "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, + "manaBlaster": { "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, + "manaPoolCraft": { "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, + "missile": { "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, + "orechid": { "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, + "potionCreate": { "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, + "runeAltarCraft": { "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, + "runeAltarStart": { "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, + "spreaderFire": { "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, + "starcaller": { "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, + "terraBlade": { "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, + "terraformRod": { "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, + "terraPickMode": { "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, + "terrasteelCraft": { "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, + "thermalily": { "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, + "unholyCloak": { "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, + "way": { "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, - "music.gaia1": { "category": "record", "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, - "music.gaia2": { "category": "record", "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } + "music.gaia1": { "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, + "music.gaia2": { "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } } \ No newline at end of file From 659ab9cf5c69bc9a91462109b7eeff50f078d14d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 08:34:33 -0500 Subject: [PATCH 917/935] Fix item sideonly derps --- .../vazkii/botania/common/item/material/ItemManaPetal.java | 3 ++- .../java/vazkii/botania/common/item/material/ItemPetal.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java index 58444864c..d5ebae8ae 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.material; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; @@ -29,6 +30,6 @@ public class ItemManaPetal extends Item16Colors implements IFlowerComponent { @Override public int getParticleColor(ItemStack stack) { - return getColorFromItemStack(stack, 0); + return EnumDyeColor.byMetadata(stack.getItemDamage()).getMapColor().colorValue; } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 39fe10c82..4ababaf64 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -94,6 +95,6 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Override public int getParticleColor(ItemStack stack) { - return getColorFromItemStack(stack, 0); + return EnumDyeColor.byMetadata(stack.getItemDamage()).getMapColor().colorValue; } } From ae84d99013bd3e022ca7825aa20f74069725d704 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 08:39:05 -0500 Subject: [PATCH 918/935] Delete mana petal class --- .../common/item/material/ItemManaPetal.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java deleted file mode 100644 index d5ebae8ae..000000000 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Feb 2, 2014, 12:57:22 PM (GMT)] - */ -package vazkii.botania.common.item.material; - -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.item.IPetalApothecary; -import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.common.item.Item16Colors; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemManaPetal extends Item16Colors implements IFlowerComponent { - - public ItemManaPetal() { - super(LibItemNames.MANA_PETAL); - } - - @Override - public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { - return true; - } - - @Override - public int getParticleColor(ItemStack stack) { - return EnumDyeColor.byMetadata(stack.getItemDamage()).getMapColor().colorValue; - } -} From 8ac2d2fb196e6523b34023412e1b9296bc7d4b09 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 08:39:17 -0500 Subject: [PATCH 919/935] Missing sideonly --- src/main/java/vazkii/botania/common/item/Item16Colors.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 8651d44d9..ad60e6de6 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -35,6 +35,7 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); From e5ec84e040feab184037ffe9a954e9b6e3abcf57 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 09:03:21 -0500 Subject: [PATCH 920/935] Build 320 --- build.properties | 8 ++++---- version/1.10.2.txt | 2 +- version/update.json | 7 ++++--- web/versions.ini | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.properties b/build.properties index 9de25f624..4beb93288 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sat Aug 27 12:56:20 CDT 2016 +#Sun Aug 28 08:42:14 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -mc_version=1.10.2 forge_version=12.18.1.2056 -build_number=320 +mc_version=1.10.2 +dir_repo=./ +build_number=321 mod_name=Botania diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 8e3580faf..6eb5df681 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.8-319 \ No newline at end of file +r1.8-320 \ No newline at end of file diff --git a/version/update.json b/version/update.json index 683661f2b..278af76b7 100644 --- a/version/update.json +++ b/version/update.json @@ -10,7 +10,8 @@ "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316", "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317", "r1.8-318": "See https://github.com/williewillus/Botania/releases/r1.8-318", - "r1.8-319": "See https://github.com/williewillus/Botania/releases/r1.8-319" + "r1.8-319": "See https://github.com/williewillus/Botania/releases/r1.8-319", + "r1.8-320": "See https://github.com/williewillus/Botania/releases/r1.8-320" }, "1.9": { "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", @@ -33,8 +34,8 @@ "promos": { "1.10-latest": "r1.8-311", "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-319", - "1.10.2-recommended": "r1.8-319", + "1.10.2-latest": "r1.8-320", + "1.10.2-recommended": "r1.8-320", "1.9-latest": "r1.8-305", "1.9-recommended": "r1.8-305", "1.9.4-latest": "r1.8-313", diff --git a/web/versions.ini b/web/versions.ini index bf3a4a145..b3ca6b24d 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -271,4 +271,5 @@ r1.8-315=1.10.2 r1.8-316=1.10.2 r1.8-317=1.10.2 r1.8-318=1.10.2 -r1.8-319=1.10.2 \ No newline at end of file +r1.8-319=1.10.2 +r1.8-320=1.10.2 \ No newline at end of file From f6a68a0d8327fd514b60c4caa339529407a25539 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 10:33:29 -0500 Subject: [PATCH 921/935] Eliminate the IRegisterCallback shim --- .../botania/common/block/BlockAlfPortal.java | 6 ++++- .../botania/common/block/BlockAltGrass.java | 6 ++++- .../botania/common/block/BlockAltar.java | 9 ++++--- .../botania/common/block/BlockAvatar.java | 6 ++++- .../common/block/BlockCacophonium.java | 6 ++++- .../botania/common/block/BlockEnderEye.java | 6 ++++- .../botania/common/block/BlockFelPumpkin.java | 6 ++++- .../block/BlockFloatingSpecialFlower.java | 1 - .../botania/common/block/BlockGaiaHead.java | 9 ++----- .../botania/common/block/BlockGhostRail.java | 13 ++++------ .../botania/common/block/BlockHourglass.java | 6 ++++- .../common/block/BlockIncensePlate.java | 6 ++++- .../common/block/BlockLightLauncher.java | 6 ++++- .../botania/common/block/BlockLightRelay.java | 6 ++++- .../botania/common/block/BlockLivingrock.java | 6 ++++- .../botania/common/block/BlockLivingwood.java | 6 ++++- .../vazkii/botania/common/block/BlockMod.java | 19 +++++++-------- .../common/block/BlockModDoubleFlower.java | 14 +++++------ .../common/block/BlockModDoubleFlower1.java | 14 +++++++---- .../common/block/BlockModDoubleFlower2.java | 14 +++++++---- .../botania/common/block/BlockModFlower.java | 13 ++++------ .../botania/common/block/BlockOpenCrate.java | 10 +++++--- .../botania/common/block/BlockPlatform.java | 6 ++++- .../botania/common/block/BlockPylon.java | 7 ++++-- .../botania/common/block/BlockSolidVines.java | 9 ++----- .../common/block/BlockSparkChanger.java | 6 ++++- .../common/block/BlockSpecialFlower.java | 14 ++++------- .../botania/common/block/BlockStorage.java | 6 ++++- .../common/block/IRegisterCallback.java | 8 ------- .../botania/common/block/ModBlocks.java | 9 ------- .../corporea/BlockCorporeaCrystalCube.java | 6 ++++- .../block/corporea/BlockCorporeaFunnel.java | 6 ++++- .../corporea/BlockCorporeaInterceptor.java | 6 ++++- .../block/corporea/BlockCorporeaRetainer.java | 6 ++++- .../common/block/decor/BlockCustomBrick.java | 6 ++++- .../block/decor/BlockFloatingFlower.java | 7 ++++-- .../common/block/decor/BlockManaBeacon.java | 6 ++++- .../common/block/decor/BlockModMushroom.java | 11 +++------ .../common/block/decor/BlockPavement.java | 6 ++++- .../common/block/decor/BlockPetalBlock.java | 6 ++++- .../common/block/decor/BlockStarfield.java | 6 ++++- .../common/block/decor/BlockTinyPotato.java | 9 ++++--- .../common/block/decor/BlockUnstable.java | 6 ++++- .../decor/biomestone/BlockBiomeStoneA.java | 6 ++++- .../decor/biomestone/BlockBiomeStoneB.java | 6 ++++- .../block/decor/panes/BlockModPane.java | 11 +++------ .../decor/quartz/BlockSpecialQuartz.java | 6 ++++- .../block/decor/slabs/BlockModSlab.java | 13 ++++------ .../block/decor/stairs/BlockModStairs.java | 11 +++------ .../decor/walls/BlockBiomeStoneWall.java | 6 ++++- .../block/decor/walls/BlockModWall.java | 24 ++++++++++--------- .../common/block/mana/BlockBellows.java | 6 ++++- .../common/block/mana/BlockBrewery.java | 6 ++++- .../common/block/mana/BlockEnchanter.java | 6 ++++- .../common/block/mana/BlockForestDrum.java | 6 ++++- .../common/block/mana/BlockManaDetector.java | 6 ++++- .../botania/common/block/mana/BlockPool.java | 10 +++++--- .../botania/common/block/mana/BlockPrism.java | 11 +++++---- .../botania/common/block/mana/BlockPump.java | 6 ++++- .../common/block/mana/BlockSpreader.java | 6 ++++- .../string/BlockRedStringComparator.java | 6 ++++- .../block/string/BlockRedStringContainer.java | 6 ++++- .../block/string/BlockRedStringDispenser.java | 6 ++++- .../string/BlockRedStringFertilizer.java | 6 ++++- .../string/BlockRedStringInterceptor.java | 6 ++++- .../block/string/BlockRedStringRelay.java | 6 ++++- 66 files changed, 328 insertions(+), 194 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/block/IRegisterCallback.java diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index b5bbbf5a8..32240b26a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -39,7 +39,6 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable super(Material.WOOD, LibBlockNames.ALF_PORTAL); setHardness(10F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF)); } @Nonnull @@ -62,6 +61,11 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable return state.getValue(BotaniaStateProps.ALFPORTAL_STATE).ordinal(); } + @Override + public IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF); + } + @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 2092758ec..1a491ecef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -51,7 +51,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { super(Material.GRASS, LibBlockNames.ALT_GRASS); setHardness(0.6F); setSoundType(SoundType.PLANT); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY)); setTickRandomly(true); } @@ -61,6 +60,11 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.ALTGRASS_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY); + } + @Override public boolean isToolEffective(String type, @Nonnull IBlockState state) { return type.equals("shovel"); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 8907a0475..1443a32de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -65,9 +65,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { super(Material.ROCK, LibBlockNames.ALTAR); setHardness(3.5F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) - ); } @Nonnull @@ -82,6 +79,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 284f7461e..b59b18c42 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -56,7 +56,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { super(Material.WOOD, LibBlockNames.AVATAR); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } @Nonnull @@ -73,6 +72,11 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index ada81e200..dcb1f43b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -34,7 +34,6 @@ public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { super(Material.WOOD, LibBlockNames.CACOPHONIUM); setHardness(0.8F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -43,6 +42,11 @@ public class BlockCacophonium extends BlockMod { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index c8badef79..7edc3f342 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -37,7 +37,6 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -46,6 +45,11 @@ public class BlockEnderEye extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Nonnull @Override public IBlockState getStateFromMeta(int meta) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 8e124cc99..58c706509 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -47,7 +47,6 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { setHardness(1F); setSoundType(SoundType.WOOD); MinecraftForge.EVENT_BUS.register(BlockFelPumpkin.class); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Nonnull @@ -56,6 +55,11 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CARDINALS).getHorizontalIndex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 1585c73bc..ab7655cb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -64,7 +64,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index f5605c9c8..dd484b7c6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -38,11 +38,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull implements IModelRegister, IRegisterCallback { +public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { - ModBlocks.ALL_BLOCKS.add(this); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); + GameRegistry.register(this); setUnlocalizedName(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } @@ -91,9 +91,4 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister, IRegist public void registerModels() { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); } - - @Override - public void register() { - GameRegistry.register(this); - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 94b3c6404..7ff6cb92c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -40,18 +40,19 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegisterCallback, IModelRegister { +public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; public BlockGhostRail() { super(true); setCreativeTab(BotaniaCreativeTab.INSTANCE); - ModBlocks.ALL_BLOCKS.add(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.GHOST_RAIL); MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @Nonnull @@ -113,12 +114,6 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IRegi return BlockRailPowered.SHAPE; } - @Override - public void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index fe0388941..54c0b2d32 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -62,7 +62,6 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, super(Material.IRON, LibBlockNames.HOURGLASS); setHardness(2.0F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -77,6 +76,11 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index d22f988c7..9554ff0fe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -44,7 +44,6 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { super(Material.WOOD, LibBlockNames.INCENSE_PLATE); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Nonnull @@ -53,6 +52,11 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 1b2babb8e..4496392fc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -45,7 +45,6 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { super(Material.WOOD, LibBlockNames.LIGHT_LAUNCHER); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -60,6 +59,11 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 867aeb3df..eb41acdb9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -49,7 +49,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable protected BlockLightRelay() { super(Material.GLASS, LibBlockNames.LIGHT_RELAY); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -64,6 +63,11 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR ? 1 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 7b37454b6..ba4efbef5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -43,7 +43,6 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); } @Nonnull @@ -52,6 +51,11 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.LIVINGROCK_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index b73585ed5..5177ca109 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -47,7 +47,6 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { super(Material.WOOD, name); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); } @Nonnull @@ -56,6 +55,11 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.LIVINGWOOD_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index ab6db0ee0..905800fa7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -25,19 +26,23 @@ import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; - -public class BlockMod extends Block implements IModelRegister, IRegisterCallback { +public abstract class BlockMod extends Block implements IModelRegister { public BlockMod(Material par2Material, String name) { super(par2Material); setUnlocalizedName(name); - ModBlocks.ALL_BLOCKS.add(this); + setDefaultState(pickDefaultState()); // This MUST happen before registering the block setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); + registerItemForm(); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } + protected IBlockState pickDefaultState() { + return blockState.getBaseState(); + } + public void registerItemForm() { GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); } @@ -52,10 +57,4 @@ public class BlockMod extends Block implements IModelRegister, IRegisterCallback if(Item.getItemFromBlock(this) != null) ModelHandler.registerBlockToState(this, 0, getDefaultState()); } - - @Override - public void register() { - GameRegistry.register(this); - registerItemForm(); - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index eaeeb729d..7338dd666 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -52,7 +52,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IRegisterCallback, IModelRegister { +public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IModelRegister { private static final int COUNT = 8; private final boolean second; @@ -62,8 +62,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I this.setHardness(0.0F); this.setSoundType(SoundType.PLANT); String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); - ModBlocks.ALL_BLOCKS.add(this); + setDefaultState(pickDefaultState()); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); setUnlocalizedName(name); setHardness(0F); setTickRandomly(false); @@ -74,6 +76,8 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public abstract BlockStateContainer createBlockState(); + protected abstract IBlockState pickDefaultState(); + @Override public abstract int getMetaFromState(IBlockState state); @@ -221,12 +225,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); } - @Override - public final void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 291d3e405..f2f0f7c50 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -16,11 +16,6 @@ import javax.annotation.Nonnull; public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { super(false); - setDefaultState(blockState.getBaseState() - .withProperty(FACING, EnumFacing.SOUTH) - .withProperty(VARIANT, EnumPlantType.SUNFLOWER) - .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) - .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); } @Nonnull @@ -29,6 +24,15 @@ public class BlockModDoubleFlower1 extends BlockModDoubleFlower { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(FACING, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1).getMetadata(); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index f28db0f6d..25d866a4d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -17,11 +17,6 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { public BlockModDoubleFlower2() { super(true); - setDefaultState(blockState.getBaseState() - .withProperty(FACING, EnumFacing.SOUTH) - .withProperty(VARIANT, EnumPlantType.SUNFLOWER) - .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) - .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); } @Nonnull @@ -30,6 +25,15 @@ public class BlockModDoubleFlower2 extends BlockModDoubleFlower { return new BlockStateContainer(this, FACING, VARIANT, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(FACING, EnumFacing.SOUTH) + .withProperty(VARIANT, EnumPlantType.SUNFLOWER) + .withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER) + .withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER); + } + @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2).getMetadata() - 8; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index a91f9139d..2188dd856 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -53,7 +53,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IRegisterCallback, IModelRegister { +public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); @@ -63,13 +63,14 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup protected BlockModFlower(String name) { setUnlocalizedName(name); - ModBlocks.ALL_BLOCKS.add(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); + registerItemForm(); setHardness(0F); setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } public void registerItemForm() { @@ -173,12 +174,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup world.setBlockState(pos.up(), flower.getDefaultState().withProperty(color.getMetadata() >= 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color).withProperty(BlockDoublePlant.HALF, BlockDoublePlant.EnumBlockHalf.UPPER), flags); } - @Override - public void register() { - GameRegistry.register(this); - registerItemForm(); - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 8650a249c..353d14612 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -58,9 +58,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, super(Material.WOOD, LibBlockNames.OPEN_CRATE); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) - .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); } @Nonnull @@ -69,6 +66,13 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) + .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 631255db1..f5ed414a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -58,7 +58,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Nonnull @@ -68,6 +67,11 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS }); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index ffeed4772..91445d0bc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -53,8 +53,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi setHardness(5.5F); setSoundType(SoundType.METAL); setLightLevel(0.5F); - - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA)); } @Nonnull @@ -69,6 +67,11 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index e45cf38ce..0080e3acc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -32,11 +32,11 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -public class BlockSolidVines extends BlockVine implements ILexiconable, IRegisterCallback { +public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { - ModBlocks.ALL_BLOCKS.add(this); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); + GameRegistry.register(this); setUnlocalizedName(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); @@ -66,9 +66,4 @@ public class BlockSolidVines extends BlockVine implements ILexiconable, IRegiste public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.vineBall; } - - @Override - public void register() { - GameRegistry.register(this); - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 524e81132..f84460779 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -48,7 +48,6 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true)); } @Nonnull @@ -63,6 +62,11 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index b6067f512..423e3b926 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -65,7 +65,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IRegisterCallback, IModelRegister { +public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IModelRegister { static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( @@ -121,15 +121,15 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); protected BlockSpecialFlower() { - ModBlocks.ALL_BLOCKS.add(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) - ); } @Nonnull @@ -344,12 +344,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res); } - @Override - public void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 48b4789c1..bbffed6e0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -43,7 +43,6 @@ public class BlockStorage extends BlockMod implements ILexiconable { setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } @Nonnull @@ -52,6 +51,11 @@ public class BlockStorage extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/IRegisterCallback.java b/src/main/java/vazkii/botania/common/block/IRegisterCallback.java deleted file mode 100644 index 8a47ef02a..000000000 --- a/src/main/java/vazkii/botania/common/block/IRegisterCallback.java +++ /dev/null @@ -1,8 +0,0 @@ -package vazkii.botania.common.block; - -public interface IRegisterCallback { - /** - * Register block and any itemblocks - */ - void register(); -} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index b833691cf..a072401bf 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -180,7 +180,6 @@ import java.util.Set; public final class ModBlocks { - public static final Set ALL_BLOCKS = new HashSet<>(); public static Block flower; public static Block altar; public static Block livingrock; @@ -356,14 +355,6 @@ public final class ModBlocks { ModFluffBlocks.init(); - for (Block b : ALL_BLOCKS) { - if (b instanceof IRegisterCallback) { - ((IRegisterCallback) b).register(); - } else { - throw new RuntimeException(b.getRegistryName() + " doesn't have register callbacks!"); - } - } - for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); 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 d9b9976b1..cfc1c2e75 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -49,7 +49,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true)); } @Nonnull @@ -58,6 +57,11 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } ); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(Properties.StaticProperty, true); + } + @Override public int getMetaFromState(IBlockState state) { return 0; 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 351e50827..d9e6bdd2a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -35,7 +35,6 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab super(Material.IRON, LibBlockNames.CORPOREA_FUNNEL); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -44,6 +43,11 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0; 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 708293ecc..af72aefbe 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -37,7 +37,6 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi super(Material.IRON, LibBlockNames.CORPOREA_INTERCEPTOR); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -46,6 +45,11 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; 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 8ac491e67..dcae55067 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -40,7 +40,6 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr super(Material.IRON, LibBlockNames.CORPOREA_RETAINER); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -49,6 +48,11 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 8 : 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 726a56a27..e9e91b48b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -44,7 +44,6 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); } @Nonnull @@ -53,6 +52,11 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal(); 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 2f9e8582e..df2e7aa0f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -75,8 +75,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu setHardness(0.5F); setSoundType(SoundType.GROUND); setLightLevel(1F); - - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull @@ -103,6 +101,11 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE }); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); 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 a1249cfd0..1e35e64e6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -51,7 +51,6 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull @@ -60,6 +59,11 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.COLOR); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); 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 10b47d62a..d16ab23a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -54,12 +54,11 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IRegisterCallback, IModelRegister { +public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); public BlockModMushroom() { - ModBlocks.ALL_BLOCKS.add(this); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); @@ -68,6 +67,8 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Nonnull @@ -157,12 +158,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} - @Override - public void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { 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 aa95fb27b..49768b283 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -43,7 +43,6 @@ public class BlockPavement extends BlockMod { setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); } @Nonnull @@ -52,6 +51,11 @@ public class BlockPavement extends BlockMod { return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) { 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 d37930c6f..962a1f4cf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -44,7 +44,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { super(Material.PLANTS, LibBlockNames.PETAL_BLOCK); setHardness(0.4F); setSoundType(SoundType.PLANT); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull @@ -53,6 +52,11 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.COLOR); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); 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 29938d8cf..f2ae2f945 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -43,7 +43,6 @@ public class BlockStarfield extends BlockMod implements ILexiconable { setHardness(5F); setResistance(2000F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -65,6 +64,11 @@ public class BlockStarfield extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; 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 254d2b774..c8e7daf33 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -47,9 +47,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { public BlockTinyPotato() { super(Material.CLOTH, LibBlockNames.TINY_POTATO); setHardness(0.25F); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH) - ); } @Nonnull @@ -58,6 +55,12 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH); + } + @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.CARDINALS)) { 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 3cde58d92..5582f6bab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -54,7 +54,6 @@ public class BlockUnstable extends BlockMod implements ILexiconable { setHardness(5.0F); setResistance(10.0F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull @@ -63,6 +62,11 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.COLOR); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.COLOR).getMetadata(); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index c5f206768..179d975ab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -25,7 +25,6 @@ public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { super(LibBlockNames.BIOME_STONE_A); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); } @Nonnull @@ -34,6 +33,11 @@ public class BlockBiomeStoneA extends BlockBiomeStone { return new BlockStateContainer(this, BotaniaStateProps.BIOMESTONE_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index e8d43e23e..4a814dd72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -25,7 +25,6 @@ public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { super(LibBlockNames.BIOME_STONE_B); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST)); } @Nonnull @@ -34,6 +33,11 @@ public class BlockBiomeStoneB extends BlockBiomeStone { return new BlockStateContainer(this, BotaniaStateProps.BIOMEBRICK_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT).ordinal(); 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 503cbaba8..46b86a6d9 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 @@ -28,14 +28,15 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -public class BlockModPane extends BlockPane implements IRegisterCallback, IModelRegister { +public class BlockModPane extends BlockPane implements IModelRegister { public BlockModPane(Block source) { super(Material.GLASS, false); // Backward compat don't kill me String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - ModBlocks.ALL_BLOCKS.add(this); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); @@ -55,12 +56,6 @@ public class BlockModPane extends BlockPane implements IRegisterCallback, IModel return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } - @Override - public void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); - } - @Override public void registerModels() {} } 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 bfeee198f..9bff35bb7 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 @@ -46,7 +46,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { this.type = type; setHardness(0.8F); setResistance(10F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } @Nonnull @@ -55,6 +54,11 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.QUARTZ_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.QUARTZ_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 894cebdcc..72c328875 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -35,7 +35,7 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister, IRegisterCallback { +public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { private final String name; private final boolean doubleSlab; @@ -46,13 +46,15 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM this.name = name; setUnlocalizedName(name); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - ModBlocks.ALL_BLOCKS.add(this); doubleSlab = full; if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); + GameRegistry.register(this); + if (!isDouble()) + GameRegistry.register(new ItemBlockModSlab(this), getRegistryName()); } @Nonnull @@ -100,13 +102,6 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM return new ItemStack(getSingleBlock()); } - @Override - public void register() { - GameRegistry.register(this); - if (!isDouble()) - GameRegistry.register(new ItemBlockModSlab(this), getRegistryName()); - } - @Nonnull @Override public String getUnlocalizedName(int i) { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 612181548..4bc2d7e2a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -23,12 +23,13 @@ import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; -public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister, IRegisterCallback { +public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { public BlockModStairs(IBlockState state, String name) { super(state); - ModBlocks.ALL_BLOCKS.add(this); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); + GameRegistry.register(this); + GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; @@ -44,10 +45,4 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR public void registerModels() { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory")); } - - @Override - public void register() { - GameRegistry.register(this); - GameRegistry.register(new ItemBlockMod(this), getRegistryName()); - } } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index f1ac50cea..7aa85b348 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -43,7 +43,6 @@ public class BlockBiomeStoneWall extends BlockModWall { super(ModFluffBlocks.biomeStoneA, 0); setHardness(1.5F); setResistance(10F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE).withProperty(VARIANT, EnumType.NORMAL)); } @Nonnull @@ -52,6 +51,11 @@ public class BlockBiomeStoneWall extends BlockModWall { return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONEWALL_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return super.pickDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.FOREST_COBBLE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ordinal() - 8; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 5e921e833..87e5c1c2f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -40,23 +40,16 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister, IRegisterCallback { +public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { public BlockModWall(Block block, int meta) { super(block); // For backward compat don't kill me String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; setRegistryName(name); - ModBlocks.ALL_BLOCKS.add(this); setUnlocalizedName(name); - setDefaultState(blockState.getBaseState() - .withProperty(UP, false) - .withProperty(NORTH, false) - .withProperty(SOUTH, false) - .withProperty(WEST, false) - .withProperty(EAST, false) - .withProperty(VARIANT, EnumType.NORMAL) - ); + setDefaultState(pickDefaultState()); + register(); setCreativeTab(BotaniaCreativeTab.INSTANCE); } @@ -77,6 +70,16 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); } + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(UP, false) + .withProperty(NORTH, false) + .withProperty(SOUTH, false) + .withProperty(WEST, false) + .withProperty(EAST, false) + .withProperty(VARIANT, EnumType.NORMAL); + } + @Override public int getMetaFromState(IBlockState state) { return 0; @@ -93,7 +96,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return true; } - @Override public void register() { GameRegistry.register(this); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); 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 b1977d0f2..555924322 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -51,7 +51,6 @@ public class BlockBellows extends BlockMod implements ILexiconable { super(Material.WOOD, LibBlockNames.BELLOWS); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Nonnull @@ -60,6 +59,11 @@ public class BlockBellows extends BlockMod implements ILexiconable { return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); 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 14e2acd96..85f71d81d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -58,7 +58,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -67,6 +66,11 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; 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 1736f1d65..29bbf50bc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -58,7 +58,6 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, setResistance(5.0F); setLightLevel(1.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X)); } @Nonnull @@ -67,6 +66,11 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return new BlockStateContainer(this, BotaniaStateProps.ENCHANTER_DIRECTION); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X); + } + @Override public int getMetaFromState(IBlockState state) { switch (state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)) { 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 4dae7d5f1..5a2baf649 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -59,7 +59,6 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona super(Material.WOOD, LibBlockNames.FOREST_DRUM); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD)); } @Nonnull @@ -74,6 +73,11 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.DRUM_VARIANT).ordinal(); 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 f6b6d3db4..23696983e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -43,7 +43,6 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -52,6 +51,11 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo return new BlockStateContainer(this, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0; 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 7ebd19f51..7dc4ed154 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -69,9 +69,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT) - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE); } @@ -81,6 +78,13 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT) + .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal(); 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 c5b0628e1..a5b179e92 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -57,10 +57,6 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, setHardness(0.3F); setSoundType(SoundType.GLASS); setLightLevel(1.0F); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.POWERED, false) - .withProperty(BotaniaStateProps.HAS_LENS, false) - ); } @Nonnull @@ -75,6 +71,13 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, return new BlockStateContainer(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState() + .withProperty(BotaniaStateProps.POWERED, false) + .withProperty(BotaniaStateProps.HAS_LENS, false); + } + @Override public int getMetaFromState(IBlockState state) { return (state.getValue(BotaniaStateProps.POWERED) ? 8 : 0) 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 5d4dfa13a..b7c991353 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -50,7 +50,6 @@ public class BlockPump extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(10.0F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @Nonnull @@ -59,6 +58,11 @@ public class BlockPump extends BlockMod implements ILexiconable { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); 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 6f40cc2c4..a009a7d07 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -59,7 +59,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex super(Material.WOOD, LibBlockNames.SPREADER); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA)); } @Nonnull @@ -68,6 +67,11 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA); + } + @Override public int getMetaFromState(IBlockState state) { return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 724fb32ac..bef2d8406 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -25,7 +25,11 @@ public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { super(LibBlockNames.RED_STRING_COMPARATOR); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); + } + + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index c103b95c2..2aa4b362a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -24,7 +24,11 @@ public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { super(LibBlockNames.RED_STRING_CONTAINER); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); + } + + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN); } @Nonnull 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 025ced489..2ff8578f6 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -31,7 +31,6 @@ public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { super(LibBlockNames.RED_STRING_DISPENSER); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -40,6 +39,11 @@ public class BlockRedStringDispenser extends BlockRedString { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.FACING).getIndex(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index fd75ae5e8..da5bfa762 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -27,7 +27,11 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl public BlockRedStringFertilizer() { super(LibBlockNames.RED_STRING_FERTILIZER); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); + } + + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 858dc92a5..ee8fd3bd3 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -36,7 +36,6 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); MinecraftForge.EVENT_BUS.register(BlockRedStringInterceptor.class); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @Nonnull @@ -45,6 +44,11 @@ public class BlockRedStringInterceptor extends BlockRedString { return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED); } + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false); + } + @Override public int getMetaFromState(IBlockState state) { int meta = state.getValue(BotaniaStateProps.FACING).getIndex(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index db4626842..973d60ef5 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -24,7 +24,11 @@ public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { super(LibBlockNames.RED_STRING_RELAY); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN)); + } + + @Override + protected IBlockState pickDefaultState() { + return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN); } @Nonnull From f0d863d30f28b7250db5254d7e72a14dfe20d37c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 11:50:06 -0500 Subject: [PATCH 922/935] Move colorhandlers and get rid of icolorable --- .../client/core/handler/ColorHandler.java | 98 +++++++++++++++---- .../common/block/decor/BlockManaBeacon.java | 4 +- .../common/block/decor/BlockPetalBlock.java | 4 +- .../common/block/decor/BlockUnstable.java | 4 +- .../common/block/mana/BlockSpreader.java | 4 +- .../botania/common/item/IColorable.java | 10 -- .../botania/common/item/Item16Colors.java | 8 +- .../botania/common/item/ItemManaGun.java | 23 +---- .../botania/common/item/ItemManaMirror.java | 9 +- .../botania/common/item/ItemManaTablet.java | 11 +-- .../botania/common/item/ItemSignalFlare.java | 11 +-- .../botania/common/item/ItemSpellCloth.java | 8 +- .../botania/common/item/ItemTwigWand.java | 10 -- .../common/item/block/ItemBlockPool.java | 2 +- .../block/ItemBlockWithMetaNameAndColor.java | 21 ---- .../common/item/brew/ItemBrewBase.java | 23 +---- .../common/item/brew/ItemIncenseStick.java | 25 +---- .../equipment/bauble/ItemBloodPendant.java | 26 +---- .../item/equipment/tool/ItemEnderDagger.java | 16 +-- .../tool/terrasteel/ItemTerraPick.java | 15 +-- .../botania/common/item/lens/ItemLens.java | 9 +- .../item/material/ItemManaResource.java | 13 +-- 22 files changed, 104 insertions(+), 250 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/IColorable.java delete mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java 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 5abbfddff..4b662e619 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -5,28 +5,36 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.Brew; +import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.SpreaderVariant; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; -import vazkii.botania.common.item.IColorable; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.ItemManaMirror; +import vazkii.botania.common.item.ItemManaTablet; +import vazkii.botania.common.item.ItemSignalFlare; +import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import vazkii.botania.common.item.lens.ItemLens; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.awt.*; import java.util.Map; @@ -87,17 +95,69 @@ public final class ColorHandler { ItemColors items = Minecraft.getMinecraft().getItemColors(); - items.registerItemColorHandler((stack, tintIndex) -> { - Item item = stack.getItem(); - if (item instanceof IColorable) { - return ((IColorable) item).getColorFromItemStack(stack, tintIndex); - } else { - return 0xFFFFFF; - } - }, ModItems.manaResource, ModItems.twigWand, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, - ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, - ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), - Item.getItemFromBlock(ModBlocks.unstableBlock), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader)); + items.registerItemColorHandler((s, t) -> (s.getItemDamage() == 5 || s.getItemDamage() == 14) + ? Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F) : -1, + ModItems.manaResource); + + items.registerItemColorHandler((s, t) -> + t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getMapColor().colorValue + : t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getMapColor().colorValue + : -1, + ModItems.twigWand); + + items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal); + + items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), + ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock, ModBlocks.pool, ModBlocks.spreader); + + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaMirror) ModItems.manaMirror).getMana(s) / TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); + + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaTablet) ModItems.manaTablet).getMana(s) / ItemManaTablet.MAX_MANA, 1F) : -1, ModItems.manaTablet); + + items.registerItemColorHandler((s, t) -> t == 1 ? EnumDyeColor.byMetadata(ItemSignalFlare.getColor(s)).getMapColor().colorValue : -1, ModItems.signalFlare); + + items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(0.55F, ((float) s.getMaxDamage() - (float) s.getItemDamage()) / s.getMaxDamage() * 0.5F, 1F), ModItems.spellCloth); + + items.registerItemColorHandler((s, t) -> { + if(t != 1) + return -1; + + Brew brew = ((IBrewItem) s.getItem()).getBrew(s); + if(brew == BotaniaAPI.fallbackBrew) + return s.getItem() instanceof ItemBloodPendant ? 0xC6000E : 0x989898; + + Color color = new Color(brew.getColor(s)); + double speed = s.getItem() == ModItems.brewFlask || s.getItem() == ModItems.brewVial ? 0.1 : 0.2; + int add = (int) (Math.sin(ClientTickHandler.ticksInGame * speed) * 24); + + int r = Math.max(0, Math.min(255, color.getRed() + add)); + int g = Math.max(0, Math.min(255, color.getGreen() + add)); + int b = Math.max(0, Math.min(255, color.getBlue() + add)); + + return r << 16 | g << 8 | b; + }, ModItems.bloodPendant, ModItems.incenseStick, ModItems.brewFlask, ModItems.brewVial); + + items.registerItemColorHandler((s, t) -> { + ItemStack lens = ItemManaGun.getLens(s); + if(lens != null && t == 0) + return Minecraft.getMinecraft().getItemColors().getColorFromItemstack(lens, t); + + if(t == 2) { + EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().thePlayer, s, false); + Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); + + float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); + int c = (int) (255 * mul); + + return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); + } else return -1; + }, ModItems.manaGun); + + items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)) : -1, ModItems.enderDagger); + + items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); + + items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens); } private ColorHandler() {} 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 1e35e64e6..9091ea44c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -35,7 +35,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileManaBeacon; -import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -93,7 +93,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { @Override public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 962a1f4cf..1721e9c59 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -31,7 +31,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -80,7 +80,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @Override public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @Override 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 5582f6bab..f2b1fc068 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -36,7 +36,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -96,7 +96,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { @Override public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @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 a009a7d07..92f43e538 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -46,7 +46,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -88,7 +88,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @Override public void registerItemForm() { - GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName()); + GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/IColorable.java b/src/main/java/vazkii/botania/common/item/IColorable.java deleted file mode 100644 index c48eacd1f..000000000 --- a/src/main/java/vazkii/botania/common/item/IColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package vazkii.botania.common.item; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IColorable { - @SideOnly(Side.CLIENT) - int getColorFromItemStack(ItemStack stack, int tintIndex); -} diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index ad60e6de6..d647f98d6 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -21,19 +21,13 @@ import vazkii.botania.client.core.handler.ModelHandler; import javax.annotation.Nonnull; import java.util.List; -public class Item16Colors extends ItemMod implements IColorable { +public class Item16Colors extends ItemMod { public Item16Colors(String name) { super(name); setHasSubtypes(true); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 539116ae1..c5138f6cb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -56,7 +56,7 @@ import java.awt.*; import java.util.ArrayList; import java.util.List; -public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { +public class ItemManaGun extends ItemMod implements IManaUsingItem { private static final String TAG_LENS = "lens"; private static final String TAG_CLIP = "clip"; @@ -138,25 +138,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return stack.getDisplayName().equalsIgnoreCase("desu gun"); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int tintIndex) { - ItemStack lens = getLens(stack); - if(lens != null && tintIndex == 0) - return ((IColorable) ModItems.lens).getColorFromItemStack(lens, tintIndex); - - if(tintIndex == 2) { - EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false); - Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); - - float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); - int c = (int) (255 * mul); - - return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB(); - } else return 0xFFFFFF; - - } - @Override public boolean hasContainerItem(ItemStack stack) { return getLens(stack) != null; @@ -168,7 +149,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { return getLens(itemStack); } - private EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { + public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { EntityManaBurst burst = new EntityManaBurst(player); int maxMana = 120; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index df4e24c42..880162575 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -37,7 +37,7 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.awt.*; -public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { +public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_BACKLOG = "manaBacklog"; @@ -56,13 +56,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte setNoRepair(); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - float mana = getMana(par1ItemStack); - return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF; - } - @Override public int getDamage(ItemStack stack) { float mana = getMana(stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 13385afbd..333524059 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -29,9 +29,9 @@ import javax.annotation.Nonnull; import java.awt.*; import java.util.List; -public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay, IColorable { +public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { - private static final int MAX_MANA = 500000; + public static final int MAX_MANA = 500000; private static final String TAG_MANA = "mana"; private static final String TAG_CREATIVE = "creative"; @@ -62,13 +62,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP stacks.add(creative); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - float mana = getMana(par1ItemStack); - return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / MAX_MANA, 1F) : 0xFFFFFF; - } - @Override public int getDamage(ItemStack stack) { // Compatibility shim, so tablets from previous versions of botania diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index eddb4ec18..ac95ae870 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -39,7 +39,7 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.List; -public class ItemSignalFlare extends ItemMod implements IColorable { +public class ItemSignalFlare extends ItemMod { private static final String TAG_COLOR = "color"; @@ -90,15 +90,6 @@ public class ItemSignalFlare extends ItemMod implements IColorable { par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) - return 0xFFFFFF; - - return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue; - } - @Override @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 0853c7433..e300e8431 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -22,7 +22,7 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.awt.*; -public class ItemSpellCloth extends ItemMod implements IColorable { +public class ItemSpellCloth extends ItemMod { public ItemSpellCloth() { super(LibItemNames.SPELL_CLOTH); @@ -39,12 +39,6 @@ public class ItemSpellCloth extends ItemMod implements IColorable { return false; } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - return Color.HSBtoRGB(0.55F, ((float) par1ItemStack.getMaxDamage() - (float) par1ItemStack.getItemDamage()) / par1ItemStack.getMaxDamage() * 0.5F, 1F); - } - @Override public boolean hasContainerItem(ItemStack stack) { return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index fe5dbe745..71b29d596 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -204,16 +204,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0 || par2 == 3) - return 0xFFFFFF; - - EnumDyeColor color = EnumDyeColor.byMetadata(par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)); - return color.getMapColor().colorValue; - } - @Override public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 22114525f..86aaa4aed 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -public class ItemBlockPool extends ItemBlockWithMetaNameAndColor { +public class ItemBlockPool extends ItemBlockWithMetadataAndName { public ItemBlockPool(Block par2Block) { super(par2Block); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java deleted file mode 100644 index d9debbd76..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java +++ /dev/null @@ -1,21 +0,0 @@ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.common.item.IColorable; - -public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName implements IColorable { - public ItemBlockWithMetaNameAndColor(Block block) { - super(block); - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) { - return Minecraft.getMinecraft().getBlockColors() - .colorMultiplier(this.block.getStateFromMeta(stack.getMetadata()), null, null, renderPass); - } -} 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 e24adffa3..4d16cf367 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -17,7 +17,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -35,20 +34,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.awt.*; import java.util.List; -public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement, IColorable { +public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement { private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; @@ -127,22 +122,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) - return 0xFFFFFF; - - Color color = new Color(getBrew(stack).getColor(stack)); - int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.1) * 16); - - int r = Math.max(0, Math.min(255, color.getRed() + add)); - int g = Math.max(0, Math.min(255, color.getGreen() + add)); - int b = Math.max(0, Math.min(255, color.getBlue() + add)); - - return r << 16 | g << 8 | b; - } - @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 8d0bafc8d..67f9fb4ba 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -24,17 +24,14 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.awt.*; import java.util.List; -public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer, IColorable { +public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { private static final String TAG_BREW_KEY = "brewKey"; public static final int TIME_MULTIPLIER = 60; @@ -55,26 +52,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) - return 0xFFFFFF; - - Brew brew = getBrew(stack); - if(brew == BotaniaAPI.fallbackBrew) - return 0x989898; - - Color color = new Color(brew.getColor(stack)); - int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.2) * 24); - - int r = Math.max(0, Math.min(255, color.getRed() + add)); - int g = Math.max(0, Math.min(255, color.getGreen() + add)); - int b = Math.max(0, Math.min(255, color.getBlue() + add)); - - return r << 16 | g << 8 | b; - } - @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { 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 12ee6863a..34b82401b 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 @@ -37,18 +37,16 @@ import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.awt.*; import java.util.List; -public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender, IColorable { +public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { private static final String TAG_BREW_KEY = "brewKey"; @@ -68,26 +66,6 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) - return 0xFFFFFF; - - Brew brew = getBrew(stack); - if(brew == BotaniaAPI.fallbackBrew) - return 0xC6000E; - - Color color = new Color(brew.getColor(stack)); - int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.2) * 24); - - int r = Math.max(0, Math.min(255, color.getRed() + add)); - int g = Math.max(0, Math.min(255, color.getGreen() + add)); - int b = Math.max(0, Math.min(255, color.getBlue() + add)); - - return r << 16 | g << 8 | b; - } - @SideOnly(Side.CLIENT) @Override public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { @@ -185,7 +163,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float f3 = icon.getMaxV(); IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - Color color = new Color(getColorFromItemStack(stack, 1)); + Color color = new Color(Minecraft.getMinecraft().getItemColors().getColorFromItemstack(stack, 1)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); int light = 15728880; int lightmapX = light % 65536; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 7c4e8da50..5cf860cd0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -18,21 +18,16 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.awt.*; -public class ItemEnderDagger extends ItemManasteelSword implements IColorable { +public class ItemEnderDagger extends ItemManasteelSword { public ItemEnderDagger() { super(BotaniaAPI.manasteelToolMaterial, LibItemNames.ENDER_DAGGER); @@ -40,15 +35,6 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { setNoRepair(); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) - return 0xFFFFFF; - - return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); - } - @Override public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { if(!target.worldObj.isRemote 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 942cacf6a..177ec3045 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 @@ -15,10 +15,8 @@ import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -45,7 +43,6 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -55,10 +52,9 @@ import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.awt.*; import java.util.List; -public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker, IColorable { +public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { private static final String TAG_ENABLED = "enabled"; private static final String TAG_MANA = "mana"; @@ -209,15 +205,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ ItemNBTHelper.setBoolean(stack, TAG_TIPPED, true); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0 || !isEnabled(par1ItemStack)) - return 0xFFFFFF; - - return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F); - } - public static boolean isEnabled(ItemStack stack) { return ItemNBTHelper.getBoolean(stack, TAG_ENABLED, false); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 190b1a197..1feed3d46 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -36,7 +36,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; @@ -44,7 +43,7 @@ import javax.annotation.Nonnull; import java.awt.*; import java.util.List; -public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt, IColorable { +public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { public static final int SUBTYPES = 22; @@ -155,12 +154,6 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens stacks.add(new ItemStack(item, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; - } - @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { 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 9e0ef431b..6867528b4 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -39,15 +39,13 @@ import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; -import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; -import java.awt.*; import java.util.List; -public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement, IColorable { +public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { final int types = 24; @@ -130,15 +128,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve stacks.add(new ItemStack(item, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() == 5 || par1ItemStack.getItemDamage() == 14) - return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F); - - return 0xFFFFFF; - } - @Nonnull @Override public String getUnlocalizedName(ItemStack par1ItemStack) { From 783738112336056f93e7116f19f93999b52f60e6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 12:32:32 -0500 Subject: [PATCH 923/935] Split floating island jsons --- .../botania/blockstates/miniIsland.json | 26 +++++++------------ .../models/block/islands/island_dry.json | 6 +++++ .../models/block/islands/island_golden.json | 6 +++++ .../models/block/islands/island_grass.json | 6 +++++ .../models/block/islands/island_infused.json | 6 +++++ .../models/block/islands/island_mutated.json | 6 +++++ .../models/block/islands/island_mycel.json | 6 +++++ .../models/block/islands/island_podzol.json | 6 +++++ .../models/block/islands/island_scorched.json | 6 +++++ .../models/block/islands/island_snow.json | 6 +++++ .../models/block/islands/island_vivid.json | 6 +++++ .../models/block/{ => shapes}/miniIsland.json | 0 12 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/islands/island_dry.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_golden.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_grass.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_infused.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_mutated.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_mycel.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_podzol.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_scorched.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_snow.json create mode 100644 src/main/resources/assets/botania/models/block/islands/island_vivid.json rename src/main/resources/assets/botania/models/block/{ => shapes}/miniIsland.json (100%) diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..5a0f66ecb 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,20 +1,14 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:miniIsland" - }, "variants": { - "variant": { - "grass": { "textures": { "all": "botania:model/miniIsland" } }, - "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, - "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, - "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, - "dry": { "textures": { "all": "botania:model/miniIslandDry" } }, - "golden": { "textures": { "all": "botania:model/miniIslandGolden" } }, - "vivid": { "textures": { "all": "botania:model/miniIslandVivid" } }, - "scorched": { "textures": { "all": "botania:model/miniIslandScorched" } }, - "infused": { "textures": { "all": "botania:model/miniIslandInfused" } }, - "mutated": { "textures": { "all": "botania:model/miniIslandMutated" } } - } + "variant=grass": { "model": "botania:islands/island_grass" }, + "variant=podzol": { "model": "botania:islands/island_podzol" }, + "variant=mycel": { "model": "botania:islands/island_mycel" }, + "variant=snow": { "model": "botania:islands/island_snow" }, + "variant=dry": { "model": "botania:islands/island_dry" }, + "variant=golden": { "model": "botania:islands/island_golden" }, + "variant=vivid": { "model": "botania:islands/island_vivid" }, + "variant=scorched": { "model": "botania:islands/island_scorched" }, + "variant=infused": { "model": "botania:islands/island_infused" }, + "variant=mutated": { "model": "botania:islands/island_mutated" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_dry.json b/src/main/resources/assets/botania/models/block/islands/island_dry.json new file mode 100644 index 000000000..a60bc0c75 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_dry.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandDry" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_golden.json b/src/main/resources/assets/botania/models/block/islands/island_golden.json new file mode 100644 index 000000000..18cddf27b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_golden.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandGolden" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_grass.json b/src/main/resources/assets/botania/models/block/islands/island_grass.json new file mode 100644 index 000000000..df50a2333 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIsland" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_infused.json b/src/main/resources/assets/botania/models/block/islands/island_infused.json new file mode 100644 index 000000000..7af091d6e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_infused.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandInfused" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_mutated.json b/src/main/resources/assets/botania/models/block/islands/island_mutated.json new file mode 100644 index 000000000..eafb2b9da --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_mutated.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandMutated" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_mycel.json b/src/main/resources/assets/botania/models/block/islands/island_mycel.json new file mode 100644 index 000000000..245c73e6f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_mycel.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandMycelium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_podzol.json b/src/main/resources/assets/botania/models/block/islands/island_podzol.json new file mode 100644 index 000000000..34511f2dd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_podzol.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandPodzol" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_scorched.json b/src/main/resources/assets/botania/models/block/islands/island_scorched.json new file mode 100644 index 000000000..80528be96 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_scorched.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandScorched" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_snow.json b/src/main/resources/assets/botania/models/block/islands/island_snow.json new file mode 100644 index 000000000..ab71f1390 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_snow.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandSnow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_vivid.json b/src/main/resources/assets/botania/models/block/islands/island_vivid.json new file mode 100644 index 000000000..1e1a3f652 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/islands/island_vivid.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/miniIsland", + "textures": { + "all": "botania:model/miniIslandVivid" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/shapes/miniIsland.json similarity index 100% rename from src/main/resources/assets/botania/models/block/miniIsland.json rename to src/main/resources/assets/botania/models/block/shapes/miniIsland.json From ec4fe8bdb9bf4cd94af3602c791f89f6adc3003a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Aug 2016 12:43:07 -0500 Subject: [PATCH 924/935] Bump pack_format to 2 (1.9) even though it doesn't really matter --- src/main/resources/pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index a69b55295..5302a04d4 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 1, + "pack_format": 2, "description": "Resources used for Botania" } } \ No newline at end of file From adf0d08cde70939eadced9707ec9f661ff904fd3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 2 Sep 2016 12:36:33 -0500 Subject: [PATCH 925/935] Fix avatar icon and cocoon hitbox --- src/main/java/vazkii/botania/common/block/BlockAvatar.java | 1 - src/main/java/vazkii/botania/common/block/BlockCocoon.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index b59b18c42..cb4ca3e8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -163,7 +163,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable { ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileAvatar.class); ModelHandler.registerCustomItemblock(this, "avatar"); - super.registerModels(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index c9dcf4794..99599bee6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -36,7 +36,7 @@ import java.util.List; 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); + private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 0.875, 13.0/16);; protected BlockCocoon() { super(Material.CLOTH, LibBlockNames.COCOON); From 7eb9a89ef4abfeaf3d7131be3a73c5930996d2e6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 3 Sep 2016 17:00:02 -0500 Subject: [PATCH 926/935] Disable bergamute on custom sound classes. Closes #458 --- .../block/subtile/functional/BergamuteEventHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 5674b1c19..ebcad5145 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -33,7 +33,7 @@ public class BergamuteEventHandler { public static void onSoundEvent(PlaySoundEvent evt) { ISound sound = evt.getResultSound(); - if (sound != null && shouldSilence(sound.getCategory())) { + if (sound != null && shouldSilence(sound)) { if(sound instanceof ITickableSound) { evt.setResultSound(new WrappedTickableSound((ITickableSound) sound, MULTIPLIER)); } else { @@ -51,8 +51,10 @@ public class BergamuteEventHandler { } } - private static boolean shouldSilence(SoundCategory category) { - return category != SoundCategory.VOICE && category != SoundCategory.MUSIC; + private static boolean shouldSilence(ISound sound) { + return sound.getCategory() != SoundCategory.VOICE + && sound.getCategory() != SoundCategory.MUSIC + && sound.getClass().getName().startsWith("net.minecraft.client.audio"); } @SideOnly(Side.CLIENT) From 6a5d5a4f19cbfdf4a338d4d6d0f6e502b76a0893 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 5 Sep 2016 22:31:34 +0100 Subject: [PATCH 927/935] MOOOOOOOOOOOVE OOOOOOOOOOUT --- README.md | 23 +++++------------------ build.gradle | 12 +++++------- build.properties | 8 ++++---- src/main/resources/mcmod.info | 6 +++--- 4 files changed, 17 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 77165292e..627fb083e 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,8 @@ -README: - -This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above - -All licensing and distribution rights are exactly as 1.7.10 Botania. - -Use at your own risk as bugs may pop up unexpectedly. - -As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny. - -Please report all 1.8+ issues to this repository. - -These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod. - - -![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png) -Welcome to the Botania repository. +![](https://github.com/Vazkii/BotaniaV2/blob/master/web/img/logo.png) +Welcome to the BotaniaV2 repository. Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](http://www.minecraftforum.net/topic/2011841-) or [Blood Magic](http://www.minecraftforum.net/topic/1899223-). -Botania by Vazkii is licensed under the [Botania License](http://botaniamod.net/license.php) +This version is a fork of williewillus' fork of my Botania mod, so in a way we've just gone in a big circle. + +Botania is licensed under the [Botania License](http://botaniamod.net/license.php) diff --git a/build.gradle b/build.gradle index 5cb5aba8d..af030980c 100644 --- a/build.gradle +++ b/build.gradle @@ -136,7 +136,6 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) } -/* Unused - Forgecraft and web server stuff // I have no idea what I'm doing task wtfGradle2(type: Copy) { from(jar.destinationDir) @@ -218,7 +217,7 @@ def scp(String dir, Closure antFileset = {}) { } } } -*/ + def parseConfig(File config) { config.withReader { @@ -236,11 +235,11 @@ jar { curseforge { apiKey = priv.cfkey project { - id = "241973" + id = "225643" changelog = """ - See https://github.com/williewillus/Botania/releases/tag/${version} + See http://botaniamod.net/changelog.php#${version} """ - releaseType = "release" + releaseType = "beta" addGameVersion "${minecraft.version}" relations { requiredLibrary 'baubles' @@ -248,5 +247,4 @@ curseforge { } } -//defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' -defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge' +defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' diff --git a/build.properties b/build.properties index 4beb93288..e76c2dd80 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # #Sun Aug 28 08:42:14 CDT 2016 -version=r1.8 -dir_output=../Build Output/Botania/ +version=beta +dir_output=../Build Output/BotaniaV2/ forge_version=12.18.1.2056 mc_version=1.10.2 dir_repo=./ -build_number=321 -mod_name=Botania +build_number=1 +mod_name=BotaniaV2 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 942ddd490..17476ac27 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,14 +2,14 @@ { "modid": "Botania", "name": "Botania", - "description": "Botania is a mod that adds nature magic to Minecraft.", + "description": "Botania is a mod that adds nature magic to Minecraft. This time with a fancy number in front.", "version": "${version}", "mcversion": "${mcversion}", "logoFile": "assets/botania/textures/logo.png", "url": "http://www.botaniamod.net", "updateUrl": "", - "authorList": ["Vazkii"], - "credits": "Azanor, dylan4ever, Flaxbeard, Futureazoo, wiiv, Rorax, Lorc, Adubbz, WTFG33ks, Auric245524, MegaManki, Kain Vinosec, Kihira, mDiyo, Mikeemoo, ChickenBones, PowerCrystals, cpw, williewillus", + "authorList": ["Vazkii", "williewillus", "wiiv", "dylan4ever"], + "credits": "Azanor, Flaxbeard, Futureazoo, Rorax, Lorc, Adubbz, WTFG33ks, Auric245524, MegaManki, Kain Vinosec, Kihira, mDiyo, Mikeemoo, ChickenBones, PowerCrystals, cpw", "parent": "", "screenshots": [], "dependencies": [] From 48750b87b58fc1835d69646f696c632cac83c4a6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 5 Sep 2016 22:42:45 +0100 Subject: [PATCH 928/935] Logo update --- .../assets/botania/textures/logo.png | Bin 4631 -> 20373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/logo.png b/src/main/resources/assets/botania/textures/logo.png index 1fb6ec16158f09b1bd747c5a604a6683e1b91c3f..0a426d2de3dfd6aaa812cb6691efa4344ebc1456 100644 GIT binary patch literal 20373 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 R;-xDA(? zUVEDU3H79@YrNgo-Pay98FgCMCvvV|ZMiacsAXSM8^RbV6LHBx>DB)-l()-+ulSD+ z;rlH7oMvf}Z^-S)SB*=S6%WSQr~PVNnUU=M_cNVJ=I7_xq9|PJMF`GxXSQp759+Nz zz+TIJ?_ndZ4YAEOE80VGeqZ#UOpI>J3kBcOT4wUjW9yUOa#qm-=+Em!uMm6zsQNO3 zuNY?ws8GD8d^Exg^1ZjoPKN92VU;uDIQegCv_q8Xk3fV$>iaKmn$eRi#BJfqah_$B zS*E`7-%z1_y5^r$lCI2?Uir0y+kPl1)D*cMm{2nTs}Ke#lR3%4L#hc?rnw!o=l0-W zxzGa8T=3)aI*jsSCBk&IV)^x156q8shN4550m|^5$>TXrT$T+wiX#j5*=AyU1Qq` zc48>3AOf?@7f3dbS6vR`kUbkcktXKth352siiH+DvEcVVq~jiTTwPqR^0xWB982m$ z5?HC>oX-taPl(0HpMUib*8)vdQl#_UM%nRD;Tt$2s%VaLYAw?)AXYn8ukGoJgHrArPQuX#Migy7ca&h6YwITu{E;u!6Q7|`l$?ionVUrb8r zHdBfU?B3#!R+^LSOv`c&8n*S0mWkiRg|KRrYKTyX zy2nSq@0IxCkSF`v$MVr_2hA(X(}&vIud8F`#mk(D(l+82p#d3vGY7e)@zE}Ukp0l7 zC7Bk;SpspVk}JBqS<`;<#j$!PUq~yx{Te!?#2n(w8?|9u&}#d`*X}E7sah&BKs-Jr z*_hwYY=#zjOFm*m_eRTv3kSM&VY6B+rUC3t=@+|;BjKW`FQasJY~T?N_}y2Bp3!OQ z_#ifr7OA@DHu!qM?+E2fTx! zg5|1vX2U)Dv#A@7plr(g=Sx`^<_)Diu{mApzE5imMK^uCpjd#ktmGGri{C8_18iHC zJAr@H+n7)tRXel5f+<*%kEYozM`|{xFTulNV7t>W84;hYv>tz|Ev*^N!BR5<0_-sI zR%z(OYm&R2Vg6s$&(#;7o6J;sV{AMt&{A8xWQ%s${H@^*N21kOrX+8dX=>+f=<}^6suU&*`$lxA-@~9e3GVteC}W@5@xZ50ID7(Qa*U!<4~?F zG~{%IcnLy<8#H~;h9(?#Al_a1sqYLjJK*#%EYOKZpJb7CTWD={C{n;lc=Yg;nTvtY zZ4Y1Bo&Wx!I7MNw-gVu!E=Dg1@tp%zgK7wFUZcm&QK$01#hm)X@s{-$sF?R0TSZ?R{c^{r`K z-Wv8?2Clw%)Qi|N`4ay4lQyK$=*)h{&oMyjs)JU*Mbb&5F^g@WoHE^r|+$4JSlCf-* z+AH!{l<1y06*yQP`p@0iT>ila4}o9v%PX;qa}rVKVy|hI>oCfeg(F85j-Rg^Lu9U= zq)9#QuqDMVRqNgXcGX~J>x2u)%ooVs(?eUFj$!DQ=+54nNOs Date: Mon, 5 Sep 2016 22:43:52 +0100 Subject: [PATCH 929/935] Oh yeah fix this one too --- web/img/logo.png | Bin 4631 -> 20373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/img/logo.png b/web/img/logo.png index 1fb6ec16158f09b1bd747c5a604a6683e1b91c3f..0a426d2de3dfd6aaa812cb6691efa4344ebc1456 100644 GIT binary patch literal 20373 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 R;-xDA(? zUVEDU3H79@YrNgo-Pay98FgCMCvvV|ZMiacsAXSM8^RbV6LHBx>DB)-l()-+ulSD+ z;rlH7oMvf}Z^-S)SB*=S6%WSQr~PVNnUU=M_cNVJ=I7_xq9|PJMF`GxXSQp759+Nz zz+TIJ?_ndZ4YAEOE80VGeqZ#UOpI>J3kBcOT4wUjW9yUOa#qm-=+Em!uMm6zsQNO3 zuNY?ws8GD8d^Exg^1ZjoPKN92VU;uDIQegCv_q8Xk3fV$>iaKmn$eRi#BJfqah_$B zS*E`7-%z1_y5^r$lCI2?Uir0y+kPl1)D*cMm{2nTs}Ke#lR3%4L#hc?rnw!o=l0-W zxzGa8T=3)aI*jsSCBk&IV)^x156q8shN4550m|^5$>TXrT$T+wiX#j5*=AyU1Qq` zc48>3AOf?@7f3dbS6vR`kUbkcktXKth352siiH+DvEcVVq~jiTTwPqR^0xWB982m$ z5?HC>oX-taPl(0HpMUib*8)vdQl#_UM%nRD;Tt$2s%VaLYAw?)AXYn8ukGoJgHrArPQuX#Migy7ca&h6YwITu{E;u!6Q7|`l$?ionVUrb8r zHdBfU?B3#!R+^LSOv`c&8n*S0mWkiRg|KRrYKTyX zy2nSq@0IxCkSF`v$MVr_2hA(X(}&vIud8F`#mk(D(l+82p#d3vGY7e)@zE}Ukp0l7 zC7Bk;SpspVk}JBqS<`;<#j$!PUq~yx{Te!?#2n(w8?|9u&}#d`*X}E7sah&BKs-Jr z*_hwYY=#zjOFm*m_eRTv3kSM&VY6B+rUC3t=@+|;BjKW`FQasJY~T?N_}y2Bp3!OQ z_#ifr7OA@DHu!qM?+E2fTx! zg5|1vX2U)Dv#A@7plr(g=Sx`^<_)Diu{mApzE5imMK^uCpjd#ktmGGri{C8_18iHC zJAr@H+n7)tRXel5f+<*%kEYozM`|{xFTulNV7t>W84;hYv>tz|Ev*^N!BR5<0_-sI zR%z(OYm&R2Vg6s$&(#;7o6J;sV{AMt&{A8xWQ%s${H@^*N21kOrX+8dX=>+f=<}^6suU&*`$lxA-@~9e3GVteC}W@5@xZ50ID7(Qa*U!<4~?F zG~{%IcnLy<8#H~;h9(?#Al_a1sqYLjJK*#%EYOKZpJb7CTWD={C{n;lc=Yg;nTvtY zZ4Y1Bo&Wx!I7MNw-gVu!E=Dg1@tp%zgK7wFUZcm&QK$01#hm)X@s{-$sF?R0TSZ?R{c^{r`K z-Wv8?2Clw%)Qi|N`4ay4lQyK$=*)h{&oMyjs)JU*Mbb&5F^g@WoHE^r|+$4JSlCf-* z+AH!{l<1y06*yQP`p@0iT>ila4}o9v%PX;qa}rVKVy|hI>oCfeg(F85j-Rg^Lu9U= zq)9#QuqDMVRqNgXcGX~J>x2u)%ooVs(?eUFj$!DQ=+54nNOs Date: Mon, 5 Sep 2016 23:22:50 +0100 Subject: [PATCH 930/935] Change the forge version to be the same one I'm using in my other mods. Because I'm lazy and can't be bothered to redo my workspace again. I'll probably bump this up later alongside the other mods, but this'll do just for an initial setup. --- build.gradle | 6 +++--- build.properties | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index af030980c..1e42c09a7 100644 --- a/build.gradle +++ b/build.gradle @@ -43,10 +43,10 @@ group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-con archivesBaseName = config.mod_name minecraft { - version = "${config.mc_version}-${config.forge_version}" + version = "${config.mc_version}-${config.forge_version}-${config.mc_version_suffix}" runDir = "eclipse/assets" - mappings = "snapshot_20160718" + mappings = config.mc_mappings //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -240,7 +240,7 @@ curseforge { See http://botaniamod.net/changelog.php#${version} """ releaseType = "beta" - addGameVersion "${minecraft.version}" + addGameVersion "${config.cf_meta_version}" relations { requiredLibrary 'baubles' } diff --git a/build.properties b/build.properties index e76c2dd80..97b43ac34 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,12 @@ # #Sun Aug 28 08:42:14 CDT 2016 -version=beta -dir_output=../Build Output/BotaniaV2/ -forge_version=12.18.1.2056 -mc_version=1.10.2 +version=r2.0 +dir_output=../Build Output/Botania/ +mc_mappings=snapshot_20160518 +forge_version=12.18.0.1986 +mc_version_suffix=1.10.0 +mc_version=1.10 +cf_meta_version=1.10.2 dir_repo=./ -build_number=1 -mod_name=BotaniaV2 +build_number=321 +mod_name=Botania \ No newline at end of file From c6f9103b31196fd6e55f01254a0f48800f8442c8 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 5 Sep 2016 23:53:25 +0100 Subject: [PATCH 931/935] Actually update forge. Change stuff around to compile with the default forge mappings. --- build.gradle | 2 +- build.properties | 5 ++--- .../client/core/handler/MultiblockBlockAccess.java | 4 ++-- .../vazkii/botania/client/model/PlatformModel.java | 4 ++-- .../client/render/tile/RenderTileGaiaHead.java | 2 +- .../client/render/tile/RenderTileTinyPotato.java | 2 +- .../vazkii/botania/common/block/BlockFakeAir.java | 2 +- .../botania/common/block/decor/BlockModMushroom.java | 11 +++++------ .../common/block/decor/panes/BlockModPane.java | 5 ++--- .../common/block/decor/slabs/BlockModSlab.java | 12 +++++------- .../common/block/decor/stairs/BlockModStairs.java | 2 -- .../common/block/decor/walls/BlockModWall.java | 11 ++++------- .../subtile/functional/SubTileMarimorphosis.java | 2 +- .../block/subtile/generating/SubTileDaybloom.java | 2 +- .../block/subtile/generating/SubTileHydroangeas.java | 2 +- .../common/core/handler/BiomeDecorationHandler.java | 4 ++-- .../botania/common/entity/EntityDoppleganger.java | 2 +- .../vazkii/botania/common/item/ItemLaputaShard.java | 2 +- .../equipment/tool/elementium/ItemElementiumAxe.java | 2 +- 19 files changed, 34 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index 1e42c09a7..f72ab4437 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-con archivesBaseName = config.mod_name minecraft { - version = "${config.mc_version}-${config.forge_version}-${config.mc_version_suffix}" + version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" mappings = config.mc_mappings diff --git a/build.properties b/build.properties index 97b43ac34..1ceab45d7 100644 --- a/build.properties +++ b/build.properties @@ -3,9 +3,8 @@ version=r2.0 dir_output=../Build Output/Botania/ mc_mappings=snapshot_20160518 -forge_version=12.18.0.1986 -mc_version_suffix=1.10.0 -mc_version=1.10 +forge_version=12.18.1.2076 +mc_version=1.10.2 cf_meta_version=1.10.2 dir_repo=./ build_number=321 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 12e3c993f..768cdec89 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -85,9 +85,9 @@ public class MultiblockBlockAccess implements IBlockAccess { @Nonnull @Override - public Biome getBiome(@Nonnull BlockPos pos) { + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { if(hasBlockAccess) - return originalBlockAccess.getBiome(pos); + return originalBlockAccess.getBiomeGenForCoords(pos); return null; } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 5ae521951..49764605b 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -146,8 +146,8 @@ public class PlatformModel implements IBakedModel { @Nonnull @Override - public Biome getBiome(@Nonnull BlockPos pos) { - return compose.getBiome(pos); + public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { + return compose.getBiomeGenForCoords(pos); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index a0761b115..d5de22f41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -63,7 +63,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile(); } else if (view instanceof EntitySkeleton) { skullType = 0; - if (((EntitySkeleton) view).getSkeletonType() == SkeletonType.WITHER) + if (((EntitySkeleton) view).func_189771_df() == SkeletonType.WITHER) skullType = 1; } else if(view instanceof EntityWither) skullType = 1; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 9ad0fcc22..a92d1d7f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -348,7 +348,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiome(coords))); + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); TIntArrayList values = new TIntArrayList(); for(int i = 0; i < 8; i++) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index d3118f373..ed783f822 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -59,7 +59,7 @@ public class SubTileDaybloom extends SubTilePassiveGenerating { @Override public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); } 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 2c312c928..dfda50d4f 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 @@ -180,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 1 : 2; } diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 7e420810c..ad5e9df1b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -36,8 +36,8 @@ public final class BiomeDecorationHandler { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld()); - else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); + else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); if(!flowers) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index ec4c331af..0a2cb5ecf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -638,7 +638,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { entity = new EntitySkeleton(worldObj); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); if(worldObj.rand.nextInt(8) == 0) { - ((EntitySkeleton) entity).setSkeletonType(SkeletonType.WITHER); + ((EntitySkeleton) entity).func_189768_a(SkeletonType.WITHER); entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); } break; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index b3643d874..fd9df9ade 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -252,7 +252,7 @@ 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.create(entity.worldObj, tilecmp); + tile = TileEntity.func_190200_a(entity.worldObj, tilecmp); entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); 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 f4ee342b4..5f0fc1b75 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 @@ -42,7 +42,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { 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().ordinal())); + addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).func_189771_df().ordinal())); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) From 309574adc7a940c281c93e9698c87d3864d59737 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 6 Sep 2016 00:24:16 +0100 Subject: [PATCH 932/935] Listen scrub, this is my updater. --- .../java/vazkii/botania/common/Botania.java | 3 +- .../core/version/ThreadVersionChecker.java | 39 +++++++++++++++++++ .../common/core/version/VersionChecker.java | 32 +++++++-------- .../vazkii/botania/common/lib/LibMisc.java | 2 - .../resources/assets/botania/lang/en_US.lang | 2 +- 5 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 43946269c..f5051bca4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -92,8 +92,7 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, - guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) +@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { public static boolean gardenOfGlassLoaded = false; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java new file mode 100644 index 000000000..b4ffac40f --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -0,0 +1,39 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [May 31, 2014, 10:31:46 PM (GMT)] + */ +package vazkii.botania.common.core.version; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import net.minecraftforge.common.MinecraftForge; + +public class ThreadVersionChecker extends Thread { + + public ThreadVersionChecker() { + setName("Botania Version Checker Thread"); + setDaemon(true); + start(); + } + + @Override + public void run() { + try { + URL url = new URL("https://raw.githubusercontent.com/Vazkii/BotaniaV2/master/version/" + MinecraftForge.MC_VERSION + ".txt"); + BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); + VersionChecker.onlineVersion = r.readLine(); + r.close(); + } catch(Exception e) { + e.printStackTrace(); + } + VersionChecker.doneChecking = true; + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 8cc4ced28..98d786aec 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -11,20 +11,16 @@ package vazkii.botania.common.core.version; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.common.ForgeVersion; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import vazkii.botania.common.lib.LibMisc; public final class VersionChecker { @@ -33,32 +29,34 @@ public final class VersionChecker { private static final int FLAVOUR_MESSAGES = 65; public static boolean doneChecking = false; + public static String onlineVersion = ""; private static boolean triedToWarnPlayer = false; public static boolean startedDownload = false; public static boolean downloadedFile = false; public static void init() { + new ThreadVersionChecker(); MinecraftForge.EVENT_BUS.register(VersionChecker.class); } @SubscribeEvent public static void onTick(ClientTickEvent event) { - if(!triedToWarnPlayer && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null) { - ModContainer botaniaContainer = Loader.instance().getIndexedModList().get(LibMisc.MOD_ID); - ForgeVersion.CheckResult result = ForgeVersion.getResult(botaniaContainer); - - if(result.status != ForgeVersion.Status.PENDING) - triedToWarnPlayer = true; - - if(result.status == ForgeVersion.Status.OUTDATED) { + if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) { + if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", botaniaContainer.getVersion(), result.target)); + int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); + int clientBuild = 10;//LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); + if(onlineBuild > clientBuild) { + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); - ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.updateMessage", result.target)); - player.addChatComponentMessage(component); + ITextComponent component = ITextComponent.Serializer.fromJsonLenient(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + player.addChatComponentMessage(component); + } } + + triedToWarnPlayer = true; } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index b943a2ce0..08ab4e5f0 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -18,8 +18,6 @@ public final class LibMisc { public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2053,];required-after:Baubles;after:Thaumcraft"; - public static final String MC_VERSIONS = "[1.10.2]"; - public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/HEAD/version/update.json"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 357e45bd5..6f0d7267a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -423,7 +423,7 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial/files/latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/%s"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! From dd92eaf8860c54851ad4a45072411f87eda6628f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 6 Sep 2016 00:48:22 +0100 Subject: [PATCH 933/935] Ladies and Gentlemen! For my first trick... now you see the passive flowers. Now you don't! --- .../api/subtile/signature/BasicSignature.java | 3 - .../api/subtile/signature/PassiveFlower.java | 28 ---- .../client/core/handler/ModelHandler.java | 22 +-- .../client/gui/lexicon/GuiLexicon.java | 8 +- .../common/achievement/ModAchievements.java | 4 +- .../common/block/BlockSpecialFlower.java | 2 - .../botania/common/block/ModBlocks.java | 17 +-- .../common/block/subtile/SubTileDecor.java | 21 --- .../subtile/generating/SubTileDaybloom.java | 130 ------------------ .../generating/SubTileHydroangeas.java | 15 +- .../subtile/generating/SubTileNightshade.java | 49 ------- .../generating/SubTilePassiveGenerating.java | 22 --- .../subtile/generating/SubTileRafflowsia.java | 2 +- .../subtile/generating/SubTileThermalily.java | 5 - .../core/handler/BiomeDecorationHandler.java | 18 +-- .../common/core/handler/ConfigHandler.java | 5 - .../core/handler/InternalMethodHandler.java | 11 +- .../common/crafting/ModPetalRecipes.java | 2 - .../item/block/ItemBlockSpecialFlower.java | 5 +- .../botania/common/lexicon/LexiconData.java | 27 +--- .../botania/common/lib/LibBlockNames.java | 3 - .../vazkii/botania/common/lib/LibMisc.java | 2 + .../resources/assets/botania/lang/en_US.lang | 39 +----- 23 files changed, 36 insertions(+), 404 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java delete mode 100644 src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java delete mode 100644 src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java delete mode 100644 src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java delete mode 100644 src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 957c46999..5bfa0433b 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -52,9 +52,6 @@ public class BasicSignature extends SubTileSignature { if(clazz == null) return "uwotm8"; - if(clazz.getAnnotation(PassiveFlower.class) != null) - return "botania.flowerType.passiveGenerating"; - if(SubTileGenerating.class.isAssignableFrom(clazz)) return "botania.flowerType.generating"; diff --git a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java b/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java deleted file mode 100644 index 73dea37f3..000000000 --- a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [04/12/2015, 16:47:01 (GMT)] - */ -package vazkii.botania.api.subtile.signature; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * This annotation used for detecting whether a SubTileEntity - * is a passive flower without having to instantiate it. This - * is used for the flowers' tooltips. - */ -@Retention(value = RUNTIME) -@Target(value = TYPE) -public @interface PassiveFlower { - -} 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 e8ccc4730..f3044ac53 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,12 +8,15 @@ */ package vazkii.botania.client.core.handler; +import java.util.Locale; +import java.util.Map; +import java.util.function.IntFunction; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.block.statemap.IStateMapper; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; @@ -22,12 +25,8 @@ import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.subtile.SubTileDecor; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; @@ -58,7 +57,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; -import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; @@ -66,17 +64,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import java.util.Locale; -import java.util.Map; -import java.util.function.IntFunction; - public final class ModelHandler { public static void registerModels() { @@ -111,16 +104,9 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR)); BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY)); - BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM)); - BotaniaAPIClient.registerSubtileModel(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor")); - BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME)); BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS)); - BotaniaAPIClient.registerSubtileModel(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor")); BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY)); - BotaniaAPIClient.registerSubtileModel(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE)); - BotaniaAPIClient.registerSubtileModel(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor")); - BotaniaAPIClient.registerSubtileModel(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE)); BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW)); BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM)); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index e14132b96..42649687f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -527,10 +527,10 @@ public class GuiLexicon extends GuiScreen { tutorial.add(LexiconData.manaIntro); tutorial.add(LexiconData.pool); tutorial.add(LexiconData.spreader); - if(ConfigHandler.hardcorePassiveGeneration > 0) - tutorial.add(LexiconData.generatingIntro); - tutorial.add(LexiconData.passiveGen); - tutorial.add(LexiconData.daybloom); + tutorial.add(LexiconData.generatingIntro); + tutorial.add(LexiconData.endoflame); +// tutorial.add(LexiconData.passiveGen); +// tutorial.add(LexiconData.daybloom); tutorial.add(LexiconData.functionalIntro); tutorial.add(LexiconData.runicAltar); diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 82606ae69..ff4a817a9 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -30,7 +30,7 @@ public final class ModAchievements { public static Achievement flowerPickup; public static Achievement lexiconUse; - public static Achievement daybloomPickup; + public static Achievement daybloomPickup; // TODO change this to something else public static Achievement cacophoniumCraft; public static Achievement manaPoolPickup; @@ -91,7 +91,7 @@ public final class ModAchievements { public static void init() { flowerPickup = new AchievementMod(LibAchievementNames.FLOWER_PICKUP, 0, 4, new ItemStack(ModBlocks.flower, 1, 6), null); lexiconUse = new AchievementMod(LibAchievementNames.LEXICON_USE, 1, 5, ModItems.lexicon, flowerPickup); - daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), lexiconUse); + daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), lexiconUse); // TODO this too cacophoniumCraft = new AchievementMod(LibAchievementNames.CACOPHONIUM_CRAFT, -1, 2, ModItems.cacophonium, flowerPickup); manaPoolPickup = new AchievementMod(LibAchievementNames.MANA_POOL_PICKUP, 3, 2, ModBlocks.pool, daybloomPickup); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 423e3b926..314a969fd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -74,8 +74,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I LibBlockNames.SUBTILE_MANASTAR, // Generating - LibBlockNames.SUBTILE_DAYBLOOM, - LibBlockNames.SUBTILE_NIGHTSHADE, LibBlockNames.SUBTILE_ENDOFLAME, LibBlockNames.SUBTILE_HYDROANGEAS, LibBlockNames.SUBTILE_THERMALILY, diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index a072401bf..eac1fe811 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -74,7 +74,6 @@ import vazkii.botania.common.block.string.BlockRedStringDispenser; import vazkii.botania.common.block.string.BlockRedStringFertilizer; import vazkii.botania.common.block.string.BlockRedStringInterceptor; import vazkii.botania.common.block.string.BlockRedStringRelay; -import vazkii.botania.common.block.subtile.SubTileDecor; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; @@ -105,7 +104,6 @@ import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; -import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; @@ -113,7 +111,6 @@ import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; @@ -175,9 +172,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; -import java.util.HashSet; -import java.util.Set; - public final class ModBlocks { public static Block flower; @@ -454,13 +448,9 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); - registerSubTileWithDecor(LibBlockNames.SUBTILE_DAYBLOOM, SubTileDaybloom.class, SubTileDecor.Daybloom.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAYBLOOM_PRIME, SubTileDaybloom.Prime.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENDOFLAME, SubTileEndoflame.class); - registerSubTileWithDecor(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class, SubTileDecor.Hydroangeas.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_THERMALILY, SubTileThermalily.class); - registerSubTileWithDecor(LibBlockNames.SUBTILE_NIGHTSHADE, SubTileNightshade.class, SubTileDecor.Nightshade.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME, SubTileNightshade.Prime.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MUNCHDEW, SubTileMunchdew.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENTROPINNYUM, SubTileEntropinnyum.class); @@ -516,11 +506,6 @@ public final class ModBlocks { BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz, key); } - private static void registerSubTileWithDecor(String key, Class clazz, Class decor) { - BotaniaAPI.registerSubTile(key, clazz); - BotaniaAPI.registerMiniSubTile(key + "Decor", decor, key); - } - private static void registerTile(Class clazz, String key) { GameRegistry.registerTileEntity(clazz, LibResources.PREFIX_MOD + key); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java deleted file mode 100644 index f71a6bb8e..000000000 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Sep 28, 2015, 10:17:01 PM (GMT)] - */ -package vazkii.botania.common.block.subtile; - -import vazkii.botania.api.subtile.SubTileEntity; - -public class SubTileDecor extends SubTileEntity { - - public static class Daybloom extends SubTileDecor { } - public static class Nightshade extends SubTileDecor { } - public static class Hydroangeas extends SubTileDecor { } - -} diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java deleted file mode 100644 index ed783f822..000000000 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ /dev/null @@ -1,130 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 25, 2014, 3:09:35 PM (GMT)] - */ -package vazkii.botania.common.block.subtile.generating; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.signature.PassiveFlower; -import vazkii.botania.common.lexicon.LexiconData; - -import java.util.List; - -@PassiveFlower -public class SubTileDaybloom extends SubTilePassiveGenerating { - - private static final String TAG_PRIME_POSITION_X = "primePositionX"; - private static final String TAG_PRIME_POSITION_Y = "primePositionY"; - private static final String TAG_PRIME_POSITION_Z = "primePositionZ"; - private static final String TAG_SAVED_POSITION = "savedPosition"; - - BlockPos primePosition; - boolean savedPosition; - - @Override - public int getColor() { - return 0xFFFF00; - } - - @Override - public void onUpdate() { - super.onUpdate(); - - if(isPrime() && (!savedPosition || !supertile.getPos().equals(primePosition))) - supertile.getWorld().setBlockToAir(supertile.getPos()); - } - - public void setPrimusPosition() { - primePosition = supertile.getPos(); - - savedPosition = true; - } - - @Override - public List getDrops(List list) { - if(isPrime()) - list.clear(); - - return super.getDrops(list); - } - - @Override - public boolean canGeneratePassively() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); - return supertile.getWorld().isDaytime() && !rain && supertile.getWorld().canBlockSeeSky(supertile.getPos().up()); - } - - @Override - public int getDelayBetweenPassiveGeneration() { - return isPrime() ? 10 : 12; - } - - @Override - public void writeToPacketNBT(NBTTagCompound cmp) { - super.writeToPacketNBT(cmp); - - if(isPrime()) { - cmp.setInteger(TAG_PRIME_POSITION_X, primePosition.getX()); - cmp.setInteger(TAG_PRIME_POSITION_Y, primePosition.getY()); - cmp.setInteger(TAG_PRIME_POSITION_Z, primePosition.getZ()); - cmp.setBoolean(TAG_SAVED_POSITION, savedPosition); - } - } - - @Override - public void readFromPacketNBT(NBTTagCompound cmp) { - super.readFromPacketNBT(cmp); - - if(isPrime()) { - primePosition = new BlockPos( - cmp.getInteger(TAG_PRIME_POSITION_X), - cmp.getInteger(TAG_PRIME_POSITION_Y), - cmp.getInteger(TAG_PRIME_POSITION_Z) - ); - savedPosition = cmp.getBoolean(TAG_SAVED_POSITION); - } - } - - @Override - public boolean shouldSyncPassiveGeneration() { - return true; - } - - @Override - public boolean isPassiveFlower() { - return !isPrime(); - } - - @Override - public LexiconEntry getEntry() { - return LexiconData.daybloom; - } - - public boolean isPrime() { - return false; - } - - public static class Prime extends SubTileDaybloom { - - @Override - public boolean isPrime() { - return true; - } - - @Override - public LexiconEntry getEntry() { - return LexiconData.primusLoci; - } - - } - -} 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 dfda50d4f..d5dacc9b4 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 @@ -10,6 +10,10 @@ */ package vazkii.botania.common.block.subtile.generating; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; @@ -26,17 +30,12 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.signature.PassiveFlower; +import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -@PassiveFlower -public class SubTileHydroangeas extends SubTilePassiveGenerating { +public class SubTileHydroangeas extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; private static final String TAG_COOLDOWN = "cooldown"; @@ -181,7 +180,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { @Override public int getDelayBetweenPassiveGeneration() { boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); - return rain ? 1 : 2; + return rain ? 2 : 3; } public int getCooldown() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java deleted file mode 100644 index 706f6e797..000000000 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNightshade.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 16, 2014, 11:15:42 PM (GMT)] - */ -package vazkii.botania.common.block.subtile.generating; - -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.signature.PassiveFlower; -import vazkii.botania.common.lexicon.LexiconData; - -@PassiveFlower -public class SubTileNightshade extends SubTileDaybloom { - - @Override - public boolean canGeneratePassively() { - return !super.canGeneratePassively() && !supertile.getWorld().isDaytime(); - } - - @Override - public int getColor() { - return 0x3D2A90; - } - - @Override - public LexiconEntry getEntry() { - return LexiconData.nightshade; - } - - public static class Prime extends SubTileNightshade { - - @Override - public boolean isPrime() { - return true; - } - - @Override - public LexiconEntry getEntry() { - return LexiconData.primusLoci; - } - - } - -} diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java deleted file mode 100644 index be4092079..000000000 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 16, 2015, 6:03:16 PM (GMT)] - */ -package vazkii.botania.common.block.subtile.generating; - -import vazkii.botania.api.subtile.SubTileGenerating; - -public class SubTilePassiveGenerating extends SubTileGenerating { - - @Override - public boolean isPassiveFlower() { - return true; - } - -} 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 1907afb2f..5fdcee10e 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 @@ -55,7 +55,7 @@ public class SubTileRafflowsia extends SubTileGenerating { SubTileEntity stile = ((ISubTileContainer) tile).getSubTile(); String name = stile.getUnlocalizedName(); - if(stile instanceof SubTileGenerating && ((SubTileGenerating) stile).isPassiveFlower()) { + if(stile instanceof SubTileGenerating) { boolean last = name.equals(lastFlower); if(last) lastFlowerTimes++; 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 c66cd8e62..becef208f 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 @@ -34,11 +34,6 @@ public class SubTileThermalily extends SubTileHydroangeas { Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); } - @Override - public boolean isPassiveFlower() { - return false; - } - @Override public Material getMaterialToSearchFor() { return Material.LAVA; diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index ad5e9df1b..989921d6e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -22,9 +22,6 @@ import vazkii.botania.api.item.IFlowerlessWorld; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; -import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; public final class BiomeDecorationHandler { @@ -50,7 +47,6 @@ public final class BiomeDecorationHandler { int y = event.getWorld().getTopSolidOrLiquidBlock(event.getPos()).getY(); EnumDyeColor color = EnumDyeColor.byMetadata(event.getRand().nextInt(16)); - boolean primus = event.getRand().nextInt(380) == 0; for(int j = 0; j < ConfigHandler.flowerDensity * ConfigHandler.flowerPatchChance; j++) { int x1 = x + event.getRand().nextInt(dist * 2) - dist; @@ -58,17 +54,9 @@ public final class BiomeDecorationHandler { int z1 = z + event.getRand().nextInt(dist * 2) - dist; BlockPos pos2 = new BlockPos(x1, y1, z1); if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) { - if(primus) { - event.getWorld().setBlockState(pos2, ModBlocks.specialFlower.getDefaultState(), 2); - TileSpecialFlower flower = (TileSpecialFlower) event.getWorld().getTileEntity(pos2); - flower.setSubTile(event.getRand().nextBoolean() ? LibBlockNames.SUBTILE_NIGHTSHADE_PRIME : LibBlockNames.SUBTILE_DAYBLOOM_PRIME); - SubTileDaybloom subtile = (SubTileDaybloom) flower.getSubTile(); - subtile.setPrimusPosition(); - } else { - event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); - if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false)) - BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0); - } + event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); + if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false)) + BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0); } } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index b44fe6c4e..e44892d86 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -35,8 +35,6 @@ public final class ConfigHandler { public static ConfigAdaptor adaptor; - public static int hardcorePassiveGeneration = 72000; - public static boolean useAdaptativeConfig = true; public static boolean useShaders = true; @@ -240,9 +238,6 @@ public final class ConfigHandler { desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity); - desc = "The amount of time it takes a Passive flower to decay and turn into a dead bush. Defaults to 72000, 60 minutes. Setting this to -1 disables the feature altogether."; - hardcorePassiveGeneration = loadPropInt("passiveDecay.time", desc, hardcorePassiveGeneration); - desc = "The density of each Botania flower patch generated, defaults to 2, the lower the number, the less each patch will have."; adaptor.addMappingInt(0, "worldgen.flower.density", 16); adaptor.addMappingInt(238, "worldgen.flower.density", 2); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index bd13bdfda..f1780852f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -10,6 +10,9 @@ */ package vazkii.botania.common.core.handler; +import java.util.ArrayList; +import java.util.List; + import baubles.common.lib.PlayerHandler; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; @@ -70,9 +73,7 @@ import vazkii.botania.common.lexicon.page.PageMultiblock; import vazkii.botania.common.lexicon.page.PagePetalRecipe; import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageText; - -import java.util.ArrayList; -import java.util.List; +import vazkii.botania.common.lib.LibMisc; public class InternalMethodHandler extends DummyMethodHandler { @@ -229,9 +230,9 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public int getPassiveFlowerDecay() { - return ConfigHandler.hardcorePassiveGeneration; + return LibMisc.PASSIVE_FLOWER_DECAY; } - + @Override @Optional.Method(modid = "BuildCraft|Transport") public boolean isBuildcraftPipe(TileEntity tile) { diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 5c6ee477f..61366e49d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -81,8 +81,6 @@ public final class ModPetalRecipes { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlue, green, red, cyan); - daybloomRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), yellow, yellow, orange, lightBlue); - nightshadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE), black, black, purple, gray); endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, brown, red, lightGray, manaPowder); hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, cyan, cyan, manaPowder); thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orange, orange, runeEarth, runeFire); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index dacb292bc..8bf880b26 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -92,6 +92,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr stacks.add(TextFormatting.ITALIC + refLocalized); } + System.out.println(type); String mod = BotaniaAPI.subTileMods.get(type); if(!mod.equals(LibMisc.MOD_ID)) stacks.add(TextFormatting.ITALIC + "[" + mod + "]"); @@ -119,8 +120,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { String type = getType(stack); switch (type) { - case LibBlockNames.SUBTILE_DAYBLOOM: - return ModAchievements.daybloomPickup; +// case LibBlockNames.SUBTILE_DAYBLOOM: TODO fix this here +// return ModAchievements.daybloomPickup; case LibBlockNames.SUBTILE_ENDOFLAME: return ModAchievements.endoflamePickup; case LibBlockNames.SUBTILE_KEKIMURUS: diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 057675bec..dd2b290a1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -122,10 +122,6 @@ public final class LexiconData { public static LexiconEntry bergamute; public static LexiconEntry generatingIntro; - public static LexiconEntry passiveGen; - public static LexiconEntry primusLoci; - public static LexiconEntry daybloom; - public static LexiconEntry nightshade; public static LexiconEntry endoflame; public static LexiconEntry hydroangeas; public static LexiconEntry thermalily; @@ -634,27 +630,8 @@ public final class LexiconData { bergamute.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bergamuteRecipe)); // GENERATING FLOWERS ENTRIES - if (ConfigHandler.hardcorePassiveGeneration > 0) { - generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); - generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); - } - - passiveGen = new BasicLexiconEntry(LibLexicon.GFLOWER_PASSIVE_GENERATION, categoryGenerationFlowers); - passiveGen.setPriority().setLexiconPages(new PageText("0"), new PageText("1")) - .setIcon(new ItemStack(Blocks.DEADBUSH)); - - primusLoci = new BasicLexiconEntry(LibLexicon.GFLOWER_PRIMUS_LOCI, categoryGenerationFlowers); - primusLoci.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); - primusLoci.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); - primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME)); - primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); - - daybloom = new BasicLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); - daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe)); - - nightshade = new BasicLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); - nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe)); + generatingIntro = new BasicLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); + generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); endoflame = new BasicLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index fbb63b727..19448a388 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -110,12 +110,9 @@ public final class LibBlockNames { public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; - public static final String SUBTILE_DAYBLOOM = "daybloom"; - public static final String SUBTILE_DAYBLOOM_PRIME = "daybloomPrime"; public static final String SUBTILE_ENDOFLAME = "endoflame"; public static final String SUBTILE_HYDROANGEAS = "hydroangeas"; public static final String SUBTILE_THERMALILY = "thermalily"; - public static final String SUBTILE_NIGHTSHADE = "nightshade"; public static final String SUBTILE_NIGHTSHADE_PRIME = "nightshadePrime"; public static final String SUBTILE_ARCANE_ROSE = "arcanerose"; public static final String SUBTILE_MUNCHDEW = "munchdew"; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 08ab4e5f0..72f8f5aa3 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -36,5 +36,7 @@ public final class LibMisc { 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF }; + + public static final int PASSIVE_FLOWER_DECAY = 72000; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 6f0d7267a..635eb8c94 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -177,15 +177,11 @@ botania.nei.lexicaNoInfo=(there's no Extra Info for this entry, sorry!) botania.nei.quickInfo:tile.livingwood0~0=You can create Livingwood by placing Wood next to a Pure Daisy botania.nei.quickInfo:tile.livingrock0~0=You can create Livingrock by placing Stone next to a Pure Daisy -botania.nei.quickInfo:flower.daybloom=In this world, it's kill or be killed -botania.nei.quickInfo:flower.daybloomPrimus=This flower can not be harvested, but can be found rarely in the world -botania.nei.quickInfo:flower.nightshadePrimus=This flower can not be harvested, but can be found rarely in the world - botania.nei.quickInfo:item.bone~0=You're gonna have a bad time botania.nei.quickInfo:item.lexicon~0=What exactly did you expect? botania.nei.quickInfo:item.terrasteel~4=You can get Terrasteel by tossing the right materials on a Terrestrial Agglomeration Plate botania.nei.quickInfo:item.enderAirBottle~15=You can get this by right clicking with a Glass Bottle while in the End -primus + # BUILDCRAFT INTEGRATION botania.triggers.manaDetector=Mana Burst botania.triggers.manaEmpty=Mana Empty @@ -1168,26 +1164,12 @@ tile.botania:flower.manastar.name=Manastar tile.botania:flower.manastar.reference=Wish upon a star # - GENERATING -tile.botania:flower.daybloom.name=Daybloom -tile.botania:flower.daybloom.reference=A Sting of light -tile.botania:flower.daybloomDecor.name=Daybloom Motif -tile.botania:flower.daybloomDecor.reference=A Stylish Touch of light -tile.botania:flower.daybloomPrime.name=Daybloom Primus -tile.botania:flower.daybloomPrime.reference=You should not have this on you tile.botania:flower.endoflame.name=Endoflame tile.botania:flower.endoflame.reference=Squirting Lag tile.botania:flower.hydroangeas.name=Hydroangeas tile.botania:flower.hydroangeas.reference=Just friendly crustaceans -tile.botania:flower.hydroangeasDecor.name=Hydroangeas Motif -tile.botania:flower.hydroangeasDecor.reference=Just friendlier crustaceans tile.botania:flower.thermalily.name=Thermalily tile.botania:flower.thermalily.reference=A Scarlet Rose indeed -tile.botania:flower.nightshade.name=Nightshade -tile.botania:flower.nightshade.reference=Ghastly signature -tile.botania:flower.nightshadePrime.name=Nightshade Primus -tile.botania:flower.nightshadePrime.reference=You should not have this on you -tile.botania:flower.nightshadeDecor.name=Nightshade Motif -tile.botania:flower.nightshadeDecor.reference=Ghastly signature tile.botania:flower.arcanerose.name=Rosa Arcana tile.botania:flower.arcanerose.reference=Ten blue orbs in the corner tile.botania:flower.munchdew.name=Munchdew @@ -2466,25 +2448,6 @@ botania.tagline.passiveGen=It's free or it's good, pick one botania.page.passiveGen0=The spectrum of &4Generating Flowers&0 can be arranged in two groups, &4Passive&0 and &4Active&0.
    &4Passive Flowers&0 are those that simply create &4Mana&0 using a completely free resource, such as the sun, or water. &4Active Flowers&0 require some sort of resource to transform into &4Mana&0, be it renewable or not. botania.page.passiveGen1=At the start of a botanist's career, only very basic and rudimentary &4Passive Flowers&0 are available, such as the &1Daybloom&0 or &1Nightshade&0.
    These flowers are required to advance on to more potent and effective &4Active Flowers&0, but they should not be relied upon aside from being a stepping stone, as all &4Passive Flowers&0 will decay into a &1Dead Bush&0 after three days of work. -# -- PRIMUS LOCI -botania.entry.primusLoci=Primus Loci -botania.tagline.primusLoci=Rare flower patches with non-decaying flowers -botania.page.primusLoci0=Among one's travels, one might come across an unusual flower patch, with flowers resembling &1Dayblooms&0 and &1Nightshades&0.
    This is called a &4Primus Locus&0, a rare occurence in the world, where two special generating flora, the &1Daybloom Primus&0 and &1Nightshade Primus&0 can appear. -botania.page.primusLoci1=These flowers act as normal &1Dayblooms&0 or &1Nightshades&0, however, they produce mana a little bit faster and do not decay, making them a great find for a fledgling botanist to set up camp around.
    Primus flowers are incredibly fickle, and as such, attempting to move them off their natural resting place will kill them. - -# -- DAYBLOOM -botania.entry.daybloom=Daybloom -botania.tagline.daybloom=Mana from the sky -botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it performs a modified photosynthesis process, in order to transform sunlight into &4Mana&0.
    The process is rather slow, but about half a dozen of these should get the job done, for now. -botania.page.daybloom1=&1Dayblooms&0 are classified as &4passive flowers&0, which means they will decay after some use.
    They also produce feeble amounts of &4Mana&0 to begin with, so perhaps hastily upgrading to &1Endoflames&0 or other &1active flowers&0, once available, might be a good idea. -botania.page.daybloom2=&oStarting up a brand new day&r. - -# -- NIGHTSHADE -botania.entry.nightshade=Nightshade -botania.tagline.nightshade=Mana from the moon -botania.page.nightshade0=The &1Nightshade&0 is the dark counterpart of the &1Daybloom&0, as it generates &4Mana&0 passively in any situation the &1Daybloom&0 can not, as long as it's nighttime.
    Alike its shining counterpart, they are classified as &4passive flowers&0, and as such will decay. -botania.page.nightshade1=&oThe shadow of the day&r. - # -- ENDOFLAME botania.entry.endoflame=Endoflame botania.tagline.endoflame=Mana from fuel From 88ab3e41fd90bfcce9998af7b35ece82fa333596 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 6 Sep 2016 00:51:22 +0100 Subject: [PATCH 934/935] Remove the hardcoded test version from the checker --- .../java/vazkii/botania/common/core/version/VersionChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 98d786aec..9e5c727eb 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -46,7 +46,7 @@ public final class VersionChecker { if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); - int clientBuild = 10;//LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); + int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); From d423d06f2ef53b8eb48dba3477e6a22db84913e0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 6 Sep 2016 00:52:04 +0100 Subject: [PATCH 935/935] Remove remnants of willie's updater thing --- build.gradle | 14 -------------- version/update.json | 44 -------------------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 version/update.json diff --git a/build.gradle b/build.gradle index f72ab4437..2a8899ae0 100644 --- a/build.gradle +++ b/build.gradle @@ -120,20 +120,6 @@ task incrementBuildNumber(dependsOn: 'reobfJar') << { file('web/versions.ini').append("\n${version}=${minecraft.version}") file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") - - def updateJsonFile = file('version/update.json') - def updateJson = new JsonSlurper().parse(updateJsonFile) as Map - - // todo detect if the mcversion is absent - - // Add to version section - updateJson."${minecraft.version}"."${version}" = "See https://github.com/williewillus/Botania/releases/${version}" - - // Update promos - updateJson.promos."${minecraft.version}-latest" = "${version}" - updateJson.promos."${minecraft.version}-recommended" = "${version}" - - updateJsonFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(updateJson))) } // I have no idea what I'm doing diff --git a/version/update.json b/version/update.json deleted file mode 100644 index 278af76b7..000000000 --- a/version/update.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "1.10": { - "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311" - }, - "1.10.2": { - "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", - "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313", - "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314", - "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315", - "r1.8-316": "See https://github.com/williewillus/Botania/releases/r1.8-316", - "r1.8-317": "See https://github.com/williewillus/Botania/releases/r1.8-317", - "r1.8-318": "See https://github.com/williewillus/Botania/releases/r1.8-318", - "r1.8-319": "See https://github.com/williewillus/Botania/releases/r1.8-319", - "r1.8-320": "See https://github.com/williewillus/Botania/releases/r1.8-320" - }, - "1.9": { - "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301", - "r1.8-302": "See https://github.com/williewillus/Botania/releases/r1.8-302", - "r1.8-303": "See https://github.com/williewillus/Botania/releases/r1.8-303", - "r1.8-304": "See https://github.com/williewillus/Botania/releases/r1.8-304", - "r1.8-305": "See https://github.com/williewillus/Botania/releases/r1.8-305" - }, - "1.9.4": { - "r1.8-306": "See https://github.com/williewillus/Botania/releases/r1.8-306", - "r1.8-307": "See https://github.com/williewillus/Botania/releases/r1.8-307", - "r1.8-308": "See https://github.com/williewillus/Botania/releases/r1.8-308", - "r1.8-309": "See https://github.com/williewillus/Botania/releases/r1.8-309", - "r1.8-310": "See https://github.com/williewillus/Botania/releases/r1.8-310", - "r1.8-311": "See https://github.com/williewillus/Botania/releases/r1.8-311", - "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312", - "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313" - }, - "homepage": "https://minecraft.curseforge.com/projects/botania-unofficial", - "promos": { - "1.10-latest": "r1.8-311", - "1.10-recommended": "r1.8-311", - "1.10.2-latest": "r1.8-320", - "1.10.2-recommended": "r1.8-320", - "1.9-latest": "r1.8-305", - "1.9-recommended": "r1.8-305", - "1.9.4-latest": "r1.8-313", - "1.9.4-recommended": "r1.8-313" - } -} \ No newline at end of file

    cHKBREz=FIVf=K>d8?7XHXfrPVkhH# zx5dJ$#zjqNDG~xq6O779`IcS8W>mtvm#*X4XX~P~sY;s8l|RvHY-<1LqNM&bYDL}7 zB<(>QP4uFx`zgu+#bdFKyczaFb}gWAydP{(KH|cmx$I5$X$zZc5vGCnFUwzi1FpLx z^;)`P(zfC4Rs(v&9 zg6-*31gno*y2tUwh+NFsu7)3fzE=evO8@BPig>yigL5fn2d=7n-V1i@22G($R#>(|K4YB~ITvk|nlsu@t)hNC{=RhXaX zqE^12qxp-qTGY{g$EMb25#ttEhc6RcY9Lil7Ti1zjcXP6CuOsiJd34AXvWN>Z)#kITRisNZ_O$jZB%RGv~~NWG{80N-+EelAl&uXF4!^@ z{1)NSxa$|IzD>eGfubj~SM97^$0(!DJ%OV6=+@H0R7}EelgzuUF3by8Rvc>=3kgu$$`=a%R~ItBrzi(BwSr)^mjK7SNXSrv0AH zg5aS1HnJ9mLa5`$$gDkDYd z!b0-n(P7wbQ~jOqLA3TL;Ri%74lYD2Z@R$YgL$H00(F3l4yiIfP|Pk|gn@JTB$ud+1gpn8qXg$b2dq~{u0Ffg7VbE_a3|YQ{7y}D(2#}%# zqO5!+#4(BncISR>9Vh1O<-;5K_h#_ENNGVd}V9=l)m{r0^0YZNX zmT<9w5_J0netDU@pgR#yJ4xT8`d|@QB5}f_Ymd4LJM5euY3sr&>gE^wE*uQ?>n$Yt zdpfr{nm}I`pl~6=z6=4GVXtWYw3%aBa~W{R7Xj^X3Uo<_ax8~HH@{CahZkMmDkF=g z*w`Kd`ZR75rEl*H?Wa$1_+NT|0St-3Z8Bp4wT=?u*{qB|V1^%PKPq0LMGWDs&~vFK ze@Xhkb2RoAXSy-mLf}efvJi_x&JKDLrA$8&_2|?Pz#F1MPxR&t7~PT;E|S`3K17Se zm)w&}FSEeMiu5VE|3DTUGziCBAV=nyG{@dZm_Dd`_X8T~pQZePEh}Oafq9Nig@7yx zT&5{^9G^;%L|*#AI1aIX%JUD$!f>=OWD1iu63+J@ArH6;>1p!rp^QN7M$n^#gCRDO z*n!>4P;{LWzFJqN(>yRV0%~k5+))JO!H*To|32y3c&%}Z)lphGo;~6(GB<|Q#r~%7 zgwFD)b?O{~5Jocz9yn%z?7)Ez9wA7w>;C!^JUgVXa2Iq!1^5OLCZ@0GgpxcKv>Qy; z2}tgVk?hS0DRE1MZZ?(zdA`_^dz}5ozW8RR-fDRcN`gE)BuK*^93?7gSXc`tEE>x_ zJhpIlhK2_!8~zLK!RtzCQxE4a%QNhPoKURuasJD@4aU5Mshi1o#-HpjSf?}SmnpVZ zJI_vka#TTOn-P(xx`SpBWGqC+Q>o-H2){RF!cQmo)dzYKeEICyN#Cha2p@#^g$yNr>d+A7 z!FX+V>l^Y#lOsOcV>VGi+q1{L*qXWP6_DCb?CW75DpJYisG3W#E%FiH?7Ui;BD<*n4WEP@LWzEXbx-6Rg_L>*Mz zw<|!eimS_ZAkNLI}2MSdB!4CKzZQTRx{UYpKW@*yq!U+a>3Lg)mpO!7!=A5^-nNFgVu8 zb%yO4a=ngYqTAr*lF8E8%a<1%gbNG35^` zQOZmRlz4jHk>dmv@dJAQ`D^$9c6J3WCCiE0c27bszWuLY)*n)gW=M4;XCrgv_$JDM z6G5?bMBaRCNX5Dt(R&S%CQJQrHd@l~bTM2|v|9NE#RP+Qp4^aFF0R1rkn4|~eZQ+c z?w;@UO8#%LGuOA++2vd8{P$bzyznh{F8>xgD}I}wzu9x02;Tqs0&AwRmZ4UW8f^@O z@NWZ&(1sp29zgAS;-yg_hrnF{VIp1vqRj&mvo64hsJGn1RKP>^R*H!>3(`Y&dGgg%2}HT}3bXf>DbFAied3_|$I6>-p#Zy>E|5uxh7V%czj;Ta5)h0)UJg&( zd2dR*9V}D{4IG^4MDFTbKn6qM1>xP#HJbrT-CP<2M(PGm33Un zfXRBW;c8u{pBk?}a~>JaeK2=A1pv*h@ufSk!&e|+_bUEkj__q9Pcy0byZSV49`|FF}Et}bExw<(qMKJ*g zAh0yNwgJWSL&kP4apyCt59)_|`o7i0Fa)6FFexiNCh6!2K)Byap0HGXcL3eyEnh=F z7%CF@eA_0|!VUre&P>eFG(NT^E7~m+Hf>2L5VvlZi=0EGX#6OMDr|OMIHvp+p~8Qo zFei6WO{Tdz5C{iv&(0CC?*545aF-DR0$oB zL164-DG;(pNwU!rFY*Jg31qg&kV|xGBoUl7sW3WVnLzl=955N0A)%!G=Ij6!D1B+x z$s#-r2#}UvD>sEmkh1uakmw*AaplyJC1N1)A<+^}y-uw5HMSpoF#ds{=!`aYJO1Jf z0E_)UP2i67AY{$ZPIrJ)55OEFlQ$V560CK5NdXezTn>P)3Ezh7tC3PPQv&j+B7|R{ zfMSMpLF&$P?y`REYnt0R zMn>4&G3GMk)?h~?hx^0(y{)lme>M}x^m5_H^2PqIhDov-qb>eW#4Y$9PuFT$X4o#O z2`R$^&D9*D4rb{y`03S)*<0d2e=iQ(QS2763)roBpsBc`*6=W%@mS<}7{d8LHmzLU z4<`@dQ0`mQHWeKVsnJI_rBGpFLrd%mBYIkN3Ivdno8Z2M&q%HJxh+lZ<;OM0F8vX{ z`;1i!hXR!IM|A`MZ;Kiz3iU%Abtw>k56g79nu@;)r^uVgVG;WYnqN`>+ypBa3}lE(q{uc0ndbaOq`*HM({Cp+GS}s5DYQ_8Idf~VkdzzsxCxw>WH{Zp$OqFgwb@N?j&h1 z>J+XOZWi|G)gfOU7`(a%*|DTgy%rGU!^WS+*I2h_Mzq@&8EO9 zXscpMEUC_J60wAm)@(cQ?%dQo9RB!|Vq6UL*Th>r&>MI;q)<8kF2&F}Wnz|9yg9b= zFX1Rwh8c67>68nWa|OA$iT7zI@5r3!bUUxnRM!ek+QfkieU565CRWw_lX1gbyYc=! zk*$#z+2)^%KX?*lc*^wFw)8dr6D3r~5GR#hW2U0kFaujNzZLGDsr_;apBbAAKg2Sy zDC|kQSUqcA8YQ_EaQ z5jhdE%xU3sL$%xuD_g%`$_v-I_F#JII*92paV)z=UFCr~_U@6HIC*E8hG=W}(FV#Y zVseKNTP%A>Ud+5uw9t0kQ3P`aRd%W6YeVJduTx*I)3{mIU$&S0of!O`TJ00(qgR;Z zv%8vNroLX?QuV7{*{R`35SVQY@&R!(Wg+FBq2l2-6%Gi;8D?pr{_&FS?LRCr$4^kNZWWwc~k!lR#Z{Hb8yLAc-GXnRaDc9adA7kHtP zI%2qVn8kVM!>Df5qPP0_ke-lyo;%{G`A>K68N(y$`s_v?#VYOr%dUqLbv;I3@h|FM z{L^L(nqRseK{@By3+6*VCw?4UVMlNDEW4Vq^29>QD^`7y_fhxAP6uJ@l2IH| zq&$?e=UvTT89iNCaQZ?xd7DIjclT^xXy=$mrabrCN8*UPeolvQe0TRW(tfjiclVmC z9tSqY&4M!q7CwgtmqoU2Tn)MVcBoz}){nTs$mtGu>eFBMu|?bW?) zoN2Y_ymdxf5iX?^^%S1c!X~tkx+ykT`=9geNJUHV(ZbM{TH~LqkL)IlCiBSa72wR2`K49UHz3&wW-sqTS&SND$j$TAG~Z8}gPmd9p~-Sw<|*16ltXxnXUy{`A%2dibf z11K!VL;L5GnZB!gH}&MM3081%-gcGwNj1*;FTFy$w?Rw+CYB~Nl!dxIe78szMNzZv|qQeD-+?pK}lFz6mB7WfrYmk0u&1d%aMEs31E^q0; zY6xdw^F6P)Bs_NS;^I;wbU@M{)wtOZrQtq^bMF~x`@oHjnts`h`pZd z2FA;KgV*e;ao{9UZw@@~>hGqhUeolHoH#qw#>kkuzM$8_f3$VXC*1f+uedEjT7``E zbUCiM(8(d^FhX*X>Mys*yHR-tMJrBcYP?BVyv&G`zDb|kue5P!$h@yRIObqXz^;>Q zqvKcqv}hG&Dxw|Z>NHyeth8Hk7Hk)ZWzlM7rS@%|NeUaa8-4YGlc!T8h_(OwrVD+I56(AG~@KO#R^VS5;DW{K`e+rL|@m;>15 z-0|Kl9$t{|BdN5L6fl7u=FQbwhwUHgsG!q0G~|zN)pWW#9S%D~Hswo{;;DG4Ls(Baz5X(CnUQk6=1os1vxCYO;*wK1|N6*AOKU5KqeXV)8Zc;0|GS z@I98Qp2+=LjA~js_Zn@5^c^b&?sxH$wWmgNNxV-nn_M-?W9UpAerVpwuk@3sfFrx`a)%!Rluxx0zWbGg~sPBH*Ry`>Y~F#%=GvG!LuUlx?m#s>)uF*0Bwg$7~l?Nii19Y!pH z5hPLcge=AfE`bm(xRJoc4+(jvp;QFlKyh~_-x}MvHN$l`1${t;^uB=%R-g=qdDzj$ zhY9H4wTC3d4iFpYg~jBLC&>rz`j zX7-@i%qh1YhgpLYhkPu4_jD&s2y)vtJXdabGG#=VTd)N2V-P;&SU$jPNu1114TnV> zVt_Xiwz@+z9EU&uWqjUaEC;5Gn>h4D*^Xu+b=LtK^2;gm+0v>7wVSKS|#qkHVfM|T`} zJ%Pg+OtzzMtu&}a(VQGFL^$v+P12;FArxOFod`SxoE|-lnSn)M|3rcXh;fpyx(Or> zj!szR$}c=!*Oco|<|G7!@J?801z3N^?h_qXbzc@-2G6sShxhOS4@=-D6H>uEY*Mb< z9hQ8FEFG)JT1S8|1)(qAM{o@91<*g$J<~4^;ghi)Z_9XD6Q4rJym3^>3Z76ZnDbNq z>~LoHQa83eAG_&(l@9G{X-^WU6;rtOQ=GzJ` zsrR$-Yn@zrATLM8aGpVBrlKYR4k-aTJPUl#K>n;J16NE$kikhPID;?<2za!qzJOVw zqCQOMW4(0VFu*9Utv|yqc<|xqwzoM`Z~btvlz^$1fXiX#WN}1iw z2MZ^TgvfmGQ3{_EYUb#{rvj94A#B2k*o})0#EAB;dUP;ydk_e<1@W-y45<3zW24Pu z;ymnZ?V29ZkIzReANweFtMn18T_?Jg{~bM+ z^`>L~^O4IHFpy<91)fLqwaNN7C>IOcl3T zWc)}P7*5zofg}Q&!5cwHJbEq(iX><%PaF=(tlILa3spa!;Ug8PlyC9sR6|&Yc=M*2VluRL^}M zbuB*kN{#e`Vv_6+@4F)im-%lBjFnB=s;>8x>xX^NUC-Ouv({YkE>42qtlbV)?$M;_JK}sC-Y!Rvg<^>iGeg2>Nu|0}@M%F&v`xm=-XH3%@%1GQQTfxUm+0~07 z>M`oUR(Poa&b}X9QmbozT9KU7Kjl=_YVy&wg5&yyVloibnkP1?`_O(+WHebU}eW9&8T~L7I$af)Z6&}8K9!*k0dwAgWW&E78@y({BiX4_$BhTSLEpq<#r)Wgy zPekGSd0UU6YB_*CBigRUIAd)EE4d#C-qk4O9e9(}Sk zaCEY^u(A2qK(Q{k+6cBfC(mw>K( z)&7d22j9~vb86cDYPI6`iP!vC5<9vau61*FyVdImcc!*|lw1~v!I7qRnTAm8zD1MJ zG3Fo9j5&2pR=(a(TPzw2tOOk(9HXAje{8${oDQhFg&iz1?};8QUW?S-mjnevThk_P^ar<5IRtnrYgilzwq9w0bgu+ORy&5wzWT^6w&7d~k)5Iz8a23%-D zzEsD?tqohI??QRN-%>sj+}r)?A1kZjL?gZf(x5?~44FT80VSNi12hHLXwCKi&@Ba~ zuWsV_S{!5N_xTy0Z4!91pfK$|aa?GXIai8Z^(58clHa7UD5r)*;{dLJ639hKY(<`R z+{n}%4&W++k`*Q5R2er>rgLXJ(W%nQ-$X?WYVG`{y74jG|| zc`j_j^rt=hDc(dMHxoMAOxU2{1(|Tg)eVvdu0L;%LvS5FM9*&D!5lo}rqyjD-N{rr zRMCrs?p_=8$9i2<MQqU5DbW6iwYXGy(*nkVnZ39aclTG>0b=_%=P|`Q&2*M|}_X@2VMDCxC)#XcB zVfP+Xi>S<|<zOFDJwqYjC1p2t zgKMD=U}M*iDk!eH$lBlxd{|Pf{OscZ&C+H__OPQhN~+dy?V9Ao4tj zFpS8_m|*mvHARChkxlmvG1H*wABlabW6V%e-|u3JVSHYX55&Ap}--g!!W&J4Zc$1WDJv> zO;OyGhrt8h(4s$!Oa6|o*6`5aRUq<~>$&C|pfrnE=ws0ojS-JwStIjCJo^7hD#5lb zN+rb+l}tY8J4N3w52)FA)*%F0rNq`UvrgZiN)vfSSGMg8uuf(<;l9%^SSH5NV$zm7 z%*38iX1Cq6EYpQ#X56wBpHDi`u#w{sShB!jt8SfxCiNc<1y`wkYlGoE*3D2jr$(c; z$8$0GDv_t@GS3H`luVOA+O8sP z@P}}7rz3HM&OB!`n-o>OnxptnjxP9;cLep#(V4$F`v2sg-onh>*~$D{3imIP{_g?2 zD$&be_yx=#V;e!H(MbCfXkucgm`)k#0~4c)G$~3yBoBY8Q4mGQMnFU96sv_f=}6LE zaHS$Ys&=gESk{j4ONgX79KUce|W@@f#z6 zu$*rwM%498jUCStzpgG0n%{8RNi`{;?Wags)iB-Sa&C1em(<&{GHco#rHUWwZ#NkQJ1w zY0@A@M?oag%0~}-f7$dN{lLp1)K@3Yx7<7yd^Qk`bxh;qP>S#f7ShR99rVOX?`aBy z@J`Te-t0uH6kC`sm#o?`>5G7wLDDF(d%FVu-oL|kZ~Z6|T#V#gToi+VL1pjL)lS0> z^Ym(sb6GOJQ3n#JqWtAL0Z8a!*bw=V&FpF@c}0^K<7fdSJUhWtqKXmFbm@u%nJ`E5(OIu@d0|?lgZ}%_1pND5eWlpB`u9Ag)T&`g(^DvkM*G~l*```y`x$!uVROJ1E2nkx}IDW;5o9sImA{@ zg5*J0x;?5#ie`#QzhUAdbjha^EETCJFWpW5>{)Q?TePq9)aaf3*XX|>`rXT1x+6bn z=U(VgND6r4zPTHnK;vQK5A>s&$yAy(Zi%XPL=I`P{z~JP*fuy3_#x*2!By}Q}5o5KvP^6wso5`Cn}eNu2PK1Ge?&cN!nRVu}R06!@n9i+&X(7I>&RP+gJQaH@b5E zx;~ao=Wx8*7fkcy5k0;f7g9TA#?m=P_FUcU$hA)1Js&561l&S*EV`e3diQ5>yfbyR&ajeS{?yUy?@}^dR?Ve(B*8?0*=z0+hpsV}drsC?R=lT; zk$WWweHZ7mCVQ?Ikv49#xFPL zpBHt`)yI{28T;SZDzvOC&LGy~ALAeEa^aZK5jTKw;d=gmT*t8yH{ipYf0#xM9+^14_gJ?Uy~uzjCCO$A)WE# zV8O4}_$N_uG*WC>vl#-h04wEC5x-gKN5cCR()tA|CQU4%+~&BbBBzmiu2qzQZ)`vJij>I zuL^rTqQ)u0Sp#H7fhn`TDLTa6YgbpR!$^aY`o>v%mS4wi z{7qVIH};hxm9hn|w!LR-7lcgI?YZS6x;B0vf16;7&cz*C$Fh_O3f&d;%<%%J*@OGw zaj=dK_TC9jef|Ao>|7LbH~ry;2{(zb9vk1~>W++{dy95)_i9d|pvrm&z4&)tzjF;k z{vJDsi}mr^R!`oV=k{Us*R7Bz+#OKkn&J&8R-e~2@u~HU91ZslTL{M!O6;twFT`f{G+DEz~^R$ z@@Aic(`X}L{$rH04)Z63DNz_e12C8+|3zb(iZDyv48FMZ$B;9s{4T#C#FHXB4Ep8iHQls^P4x;v*y)=M_4Z<{FU=?Wif$BpAl9^Yhf(2LMR8aW{3 zP)BvsNd2L@zok8gYxi`(aVpm$S#0}lv156S@OMA%uaZNltooaT}o&X@_0yW+E2F*E;d3JH_zSAZD-jR zW#W3to!a)@1%-o5tcuYcSpw1GJ| z>^G94yl&4i)PVzf-Rj0rk%nf04iaWOzT#(l~1Y) z&lDiDY@r_*oJF{9C1D9#Y{LC_(f343L!RgCoy)NlQxSt9VC*r8e~^ankD%=Z$rN1u z-RsMv=!c{{(1{#fMz!Rd1r%`91jM@ogAXFwLKYDzYJ@Yw$1;f+s29Q#nv+5Y2^b<$ z!or3OlQ_616CIcdMl|ej3ksO+>CjgD4F{-~Di9=u$B7eu=dN}GFgfIVh4Sq=aDgMl z@@E+sK*(W_BFhCCY7~xr67>FRFa@&!WzienwZ%tRRkG6y7(<5yawd5q0Nd??gj2tJ zocAh3ZdSdwD2vCPFeB8)64LeeAFf;bvlHoDNTBFWQ4*@a6m{{B%ee+psvhKCw2vCQ!?m$o@Gni)1%~7Fn*1JusCB z3BF^^h9}Ri8}TT%Z_j``00}d|)D@$zawKJh3D=PrYU=;dH^Trri29a1m&)_AcaZqG zodu5u?hz%bU|zkyjwO^GHp*m9Uxg%^9adNz$AdY33l=<4PC%w!p6Y@|KWGGT@rr=B zG&Li#!33sn2=TqZ;MU*X=(#6K&f?mrhnwM9B_N)$9znLC$6DkBbs+e7(|1_e0!17y z;n8;2U+3NB9);~O8R|Vrm|^JCK`b93=&eGOE#o1ASO{MkRRWD+LUTvrYga6LnAxQc z=}O!S+*D9v^Hu$5=gOw=YXDbfsq{smod!H791zn3rrroHCF!_MT`U@iI<1ZS_P;FxbB z2xUD;$kTBYfN4u`ByFtu;4-(>1PQCHFQ9lz=jM9<70rZb1r8DtOzc=sSZ6{Lj8g6}RhUz(_Z47gtk=Z%%eUhh8xc(&aBi+%)IiSijMj=n%wcl8?o4B+kI z-GA2jL@wVUbmrz=%dxdPtr8PsH_5<#t+C$RU;7qsKC56G?H&1IWF~fn;tgIGX*Bd@ zpmm=WA)RED8h92Rk3{DxM}rR95s3GNA}C%PV0cf7dArYmXMKW25E+h6NWvlso5~r6 zV=_4*3lGL;Bw-SVPGk=vG8!L|hK3U{Q!t9aW^n#rUHWN+xH{&iV`6_=IwMeyg~VGa z{taG*8eLpK{o~01h}|dv-MFB|$c6szKs6DhWtnrzG|a)j(y8nB##UUB25)G}we5Vw-|?yx=# zmsxi)Z^_ak^BY#zbdF%uF77k1 z+c8&44XYXF$ZyO8&nB+En>q2mIoF_@YhU6rr}xR?udb=dSg$1EWHB!s<+|f>^CuH6 zp@X)&yFD;(q2ufnRX%*E79LDsRg+WmNW*&T2IW7Q3jfIG_Rnvoa`NpIWBMP^^Z#ZlA|^(5|27N!JEAyA zeD#M!k{cfi>yE*6f@RpK6KlF&?26IJOeP(RSy?xWjEXn4n3&j;N=lTffK)P=l9#77 zzNAFQvKh+jVdYWejici+dy~1x$+YI}?W?*QP7K z==MNd4Epuc&^-_y&-Cv59UUOQ#r>9K_n_nn1TgyBY19}Y4v-s80lRZ!AZN@JP5)hB z6(j@%HygV*R&4oLqLbiF+i33(1nNf3(SefywJalr6Ovx!V za#8!L2?^cHsmdF@Tr?mQcQhlA4dTac>oUJm-rDbU%_UH{>>pnxdCJ3^p|VM&jgMYA zu{^LurScmznoqUXv;U~VcgfNi8vT1ya7Jfr2{YnM=AWi0vZs{ecslMcvVzBnm7krc z8>`*sB2=+$`Xv={GKqXxNa}=NY%V~bhm!Jlu)e<1ztVA1VZi=^@QHJCwczl5dPeo?KM%|^iM7#=M zvhsUDb%W?@#(+9@_to|&0{)BBEB_r`tNLI1`|VD@^=gYZJZMjjDfiA3F}C&nD=>of z(e?>n@7AMqruE|KZCChw>I2r3MZ=dd4#@RwHfKv+?-+`)N?pCC;G}Bg*12N%%jzf1 zn|B`v+T4|MvBgY8h0X>RP*JpYlnOd_zwei@( z6uDY)T&8s3f3@V>MF574mAO!j#WQzduz(fwLCl=mC0~EHE~nOozVbiKdZ|90=DO4|g_%I{?b2OD_aHQBe+x!m+p=5dtOm#P`@1xpE`J1ieR zYYpj1X=)%Ra@EZ#+<8v}sGiyzsR9c0{Bb%pt6vElcEymXY5&qv{dFAeg9hbo-LEe@ z07Yq{$gkjaAMLMm#i>G)$z?V_I%}*21&j6c+3%F;a&5<>@#K2xrcOiF-*BnFaZEJ$ zacHotK?)e^+zVUhHt;#|!|4|KC#*7Kv-xc5Ee4Tu4)*Df9~dTITb;WEup3j4EGv8* z?Du#>oK1OKkxMu{aIiWHJ(n%yE#eikkJwi^oH||KV-yNaa4}BEw{4BU(IxkvG5gch zhuth(4bIswmoAp@wTZHK9nhSAKFcN`)md&+*nDGr8TeF;Xm*z_oRj6Bp6qUMT6@mf zDyw4pC49~Jf5Nr?gjGkYxj1uqpUrIXzyL3Rh;x>7qv&PLcX=f0jM;4$uknXpD|cl- z@~Y|^MO$CQdNu`#zxkfN+Q!bjmZ<2(TWzf7I|WA#!%DC)?RBKhf3BFipYHzhBy1%<(=@x3A-} zI_#x7PNL**vR?R6)vE78L2x_4-CkVY08KtTLkY{W1g|=>UdKOFq5N&T*?uk&5W7UcH(Fk$l^8$wJg0(hCr@opif`ZaJ*00%QDSYDuCL*!=D29&N9AYdhaoLs z#yA^pI@!n|x&#c^i8h*$Oll%m}Pb|cvQQFi!PNo;61QJ0Z+9mZwbs^gN9VY2?UqjDe8n2c;Gi~;`M-9&987YX# zv4eh}3?g4>ts7UEsQa?NG4Ih_(m_h6rd3Qve^PBavR`uvDpF(P$}e?!Ss7fNe%X44s)Ol3%tqM7 z1PJO|HH_Ge%tj#BzP}eL*E@Ee7fZzYL~$^1)s`=)^)~Y5B$TE#0ink<5vJrDdr(|L z*N!e0lVa4quPSKbSS$Q;0^471<)J4;zfA4I(rh_DIQDm3CC)b4R!Ya&;7Fo34DPC+ zaa*^(dB0;$UxM49uCUq+<+-`o8R*%FYK?ctz}wv0gIWH|N5#|nV?Kg~a!9>Y{`5Uf zVl*@U6--iV{QD%cN%C>rMQuveMc&m zSbkG;_*?im{TN*T!*n@HvXsS=E|QKIgP=>eLlgRFqoP{JT#8TFPu@>#5T3p9Psw(` zs2%P?4DBb>y`Rf@)LbId+~jyAKQe!cxjGBy8LKv@ab`DN^YvlZ?2cN=#xD_Y`w8nT zHuB1HP1o)h`+D_cutl2Nt+^8TD2}cc-rQSS)T%(Wo7W@3MH9U)J5P`8k&CHBG3byq zI35xO{-mz^L2$YzbmJVkHN`ByHjlLv=x?<24TnVR>qigK4tL8>;Zs1^3C0z#Z0D%e z>AEXLCf`C0i;2U~5M}b8^`$0!>Zl8|1&=C~J-+rrTJHr@j@kkbt<$=&((v578> zAC)|x0R2UrAuw{}NavcHsyiFxl!4COWsXW3ssIkc8He-}JLroYi-0uU$>dHW)iTBe zl17A$I;pAIA*@P3G|#^$X8?NhnTwqX>V!f9(>~EuVDGU+MZnCY02rB*n>&IdhX(E5 zkW;dt4&j=?ijXK3Ll#m2n?XzDLrL-inSuLQaFc4CWK$Z}LFzX>T|3TXhRO#@4p0yx z=I7^==NFUn0^tPp?ce^lQ86E~h4DAd-|*g6;mu~Lt>ap-P*|XFhP|7Xno*ZF0f){J zVF`$+S3?J(8M+VXJ?QO4_%dSRm??=o*@Os%2+EZ0bT9~oa@42`_6UCis=}~)p%4tp zgGvlW!FD)8jY1wh>aX{lfrryAj(|7%j2MH|kH=qm9AM_mh=z!muuP!|@NAXx14gyQ z7V=HL$Pi&p{6xXpTceT$uA=`&K~gA|vAe zmdJsw2@@b=V`n*%!pHUf*l&QL6&S^YOF&7JB3>x(3UE;^S6EJo-`;7>9ZB)y*aMQm zWCTgliIuMFd?Rw$5#mRULcfjD5E4~f6e&R|suV?!nFT3ykPjGl9Wy||qwK@PnQI&o zE#Uh;l`v^>r~6*}6De^~B8_&j%sFw9n8f(W8tLL|{hc8@WF|wDMcDc?m@|(YVL=|k zO&Dpxf5)*shG#R+Y6c*lBK(ph|L+Uh13~D7AM&~*GqTL7#}Y|Gz(roF;RwM%bxZKX#JwP zQ(zGW5xlyFdqGg@P8J<8i4;Bsp2>n!^Io%(%xB@;7rp52!Ti;f>>Bz(V)8xFDyiyJp8T#$zjyRQ<@qO^N(6XBPY+;c$@UvUBbJTI!Dd@j50DDJE|xJQX}qX?F|E zynV(!i6kSWlMv?I9!n|r&uD$V`7Td9||_2b+wAq7XC-3 z$=@ys@mC2E9gyIG{I}bQvGzw$hh(7I=cfzAfbqWs7?l5LGc5mycmE^QAat{Xx5~og zDB{T^4eF*t0RV=u5)9A)QCjf86V0Ed0$}c+rUGwLz(X|{K$sfv@7}$-)gA$W>`S3z zW34%!XewhO)pqw-?Phko!*l7jSI#oJih!KUX<(3}Hx{EaH8M~3Pj@ZRJV5icqn@O( zxOJ%XZf9+PnOtH;Y81g91JF7T+v$n4Pv{ue9$J?Vbx=C+YW8dzhxY*!3JdLqjRWz_nWzjNZ ztm+GuZ{7>ZZqaEq7NV?1&CLjdEoIIs&_)ix6LJw4hbR4QZqM_$m)g;e=f`xcO$~-0 zQV@y}pc`}hwkPSnFKoYEbSl&H>`rEm zjaLnta%eiaL}82kQN=G!02!I)X(tOh}>;fl@>C{bpc3S*>60Q6Qr+6W)iUCG3&2>_D#iOLu zZgfuG$`FB!ug-Kg0T_^(oRe+WHMu6&{lEAekzF*{sDG52w*Rk6jp9#r!T(rb{zs`H zJJkW5E{bUkV-a!@-%l^vI1Us5@YnSyDluECcraF~JUKkjt$7rnCJ)h^WA!?q}(aXeEvc&=~ zQ-_z?6F#`=wqNnyoBuHVW>}rx$V(XlNGn^!%A~cg64-{M1XSsVZBILVb{`wv^!OZ; z8L{jPZrY-;vOb*Xn0CY<6I-CQ$=uKpVOq#(;8a&j)QQqX<*50YWwr>>+hi)F5gjaP z@Y)a=q1J5NVHs;tVdP}AuYgS@0Xo>H_?tc2m^EgD90*lF`Bn@`!GnR15Ui<#%zHp1 zz~&8HJFVCw4zJenV1i=6Fj`HGo;&EUf@>|c6+tLPf@<|iwn&6@5QI5@Nz{RndwbHN zwY7nIs!R>@4{LC4Ps@ah`1NX(N5ux1?K;F(ysa|+q-5jxmde-1o|T1yH!xUIk>6zX zn6kNIs^4ynm;pv2G{CRjO?mUQ@@raG4ILu;%vTCrl9Ck>;;$mN(s&I}04K;H4e}>M zQ5fM>X|Ru(oOQO6eJ;tiLrt@o>WP0xtq2RcC+!A2%GlAvpHnxxHrMA}Y~(6ey|sha z!nQEY$!_=bCl4*$Gi9`&rZ*2~ZwaTYD^%T`W%scg zmWB#q%Gztzt-7}L?^9NgT*+OVSHDs*()4mnH?9|a$mGu!AmnYyBEg3H>p12H18Vj1 zMbT6@3BUq(o%J6Txaaorb9eRV`bLL`_SLb*0~OOI{RIFkrd4nytf)B4GCxsL@r)}d zl}C%k=!Y`Wbk*t8e`$E@#x>)z?M*|nqq1R0Z36-0V;?!@+=+4&tgg+3{>-yI>Revp zOf4c5*BFq76ck*`c^2{N-V zIeAUDZ%dTNe5euSjYBnw-xx3d;Lszc!r5-Dik65qJGEtC-KP9j}OspnR$sm zL5l=RN2-iUcJ2jO*D6)??sn05w9cn6y|SjfO_vsS$65_ zZ|xGW*D@<*{2hW{726U4KPA4586czBC^WjU~5%#zf@w`cX59{34p6A|8t? zh44FFm-!|5mVfOvF6tH%hjsN{sQU!M8^azlZGW11t|h;EsrCdRx$V;&BbJWZWoTJ745?7@HL+Xq-q* zr#D06HMR^&{b6l1!i?>2#`sb^BeE=Vj#Dhy6s;6FGg93v=KgMcs%8AL`piPZQP-^9 z&pIxAY~65gO(sh&GIkL4)Q6mY98(q0wWsGDp2U`x7HFqp-Hc0j$4QaYu^jSnf#KFuGU7wSBvKM#BJPx4$Xwi z4X3TK-S5ozERH^1x2knx=_~P5F{<8gwKjEF{Xa=khqevZ!c*}&|1zXA@-~J>hDUR2 zi_8ih}g^gG5StLPk+jMW~1RuyzMv~sZohd^^tka5~MzX z!|sF|v|W4Ydk>Kz9(rD$g?K|1ofK_*qc$0I)~brb!q!6ldgJoC@t0kaS*CV75B5G3 zsTJ5D%N4A7uG9DS zyTQPCqD%niGgjbgn*4;S4@oZ^5(h^ORhWG8l-%W_rYY5&Aq9~SbTcxfY z55s^=zf6UynEhuYf>a4!IomvfFB`l!$4ot36-E6xY_1h24{m$J( z8S0dpYMqGRl0=w{`iJ+-FHo;5_a1`$MDhf(^fcsaE;>5^W-m)+d@58bqd)k5cihr% zDm@X$S6DIMT1ulfVBS_c#dc}mLog;|u*mA!+LG@_aMeD%tpGn&ow?oEP0BL21XnEN zrFcX7w;qO>Q}{c1lLA}9;Qlo5=(6qg;0gI5aqJT>2to@jMOdbsHWjnPz2P95MPQ$mub!S_=qMBlpKQ~JAOjaeM# zoVxtGS5NcJJ5;1K5&;>l<*s>Me$>O?&HCn*0sS&!fIR2v?grU;b=GBofF?sLJu6!s zN5wynx1ggC6IQR&CCmLDtl3SHuVoM8VtRRfStBMcnLfwP1I?wed#Y{9*X+K`bD_o2 z!~Q#3q}rDqo%7`dZYkOTjUatanX*;uY2GciTpabd1*aUm0`;t$mnZQ_6Ec}2!Q=C( zz3pAQ>nMotv%rN%B7F>Ht!Wti*h5P1-MJlH2c&k9){JwId6DdJ(L4Up0+%6K+kv+Y zht+)Xt7y+d^RLfN7Sb4*yw3NO4b;VM+Db#P6_4;vx4W&CfHLxigu~TF*@%y?xYUf> zqA_!^gWKTQ5nR6jbXfG74@S%9Nt*NTn$_dP9V92>-7FKoSC2!gP&1s4v9Mp%3J~?; z?~C(JlODNh;QVTt9Zr0B4z4B6q!Aq6Mh{*kV>yW5X#10~hs~ihVbIjLH0%N_Sgf6L zT_|pwo}Z$_mBV=3ww1`{F%9mTvC`rp&9Vam@hYU#kuq^MF)8u5k{qPFx6iSk!|%g& zBXluoho@yI66Dx0YHEl?3{?mlw)S$?e7`w=XE;tBpHJLMsDW4yub*3=rR8>_1`64E zKP{H`S{sEc?%&SJiw);i6K$W!dVhJ}wT`D&Xh2y*K_w&aNs*Yi!dBn`A|i32)dU-x zNoKtG9kGLtdqW^zUVv4^S>bPrW;-*0BOsC|cd>;C(*FbtbHbAR%kKJ5lyu_ZKojDX zMei3bk1uP77+nDET0T&H%ee{>pPWC%$x zc4qPuCL^3FvYdh9qT84ssg6@PO#r4SOby3%uug;HAki}gpDgA;c>|#1kLA2s{-e?K zTqeiigpcn)z0&+gqp^@3V1*DMW#wcwlEj4#Ey$Y%Ma>Nq`t^TnG*3G<7Bip?9$F7Z zl%%k+MTCiyX>qXJLDz-D#2|1 z#+a}om}yfFfkw5o+%e{Xw}D2OmLLe^bHSsc%n=b*cUGl%pIke{qW53f5vNwg1r=Pr zj*OsP4lgylEsUS~J|%3PE`%x&23Z1sxY%G~^RA1DT(bg5`(gT0{o`8rqS!DirGQ_!$%wpS`ITm>lAMBj|9Bv4TJ=m<% zLGg~#C)x+#KTV(4k3b+65l@2qw~V~=0GR$dURXocG$MHMVeGkCSx04)lZ0^bq2 z=R&7dS#T&I=z!}N1-JD-TJK-p&66Gc-^rU#Pf$+|9@t1sc0{0lf3!IxuMNl{O>;S> z34H09q;_aCdim+9v15anPH1^y#~BBL_Q8ikW}P^}VPb)GY918O?6E-}K3i!> znNL8`r?I+-lMy zv;Oo+;w<W8+WYk52R6iL~;-knvwR)BlQ~X8s@E z{b`h(2sglCY5n<%L9~{&9+^i0{^=yt;aLX}oM8q)!a)QYQ1qGz0Bl8odkW|Pf|9@h zwXLs73|b(;iHV_&6yzE8#K5{rG5RQ84ZF5l_soez$3yebSOKYY_lf6$b64F_tt719 zV1M@6v8;9NxGnVm%Ck;sOE;cJK1pUcxoOl7hRG>Wsj65Eo>e&}fBN+vi(eK6-A;sO z13iOiQ`7M6WuwvKYwh_H=Ih*z2{Jp*txb#GO7&no-YKY0YK4R2!!c~WE82C~AgNxD zQc;y|wj=d~-DU2=YZ?vTtG^(>K${C?OzpyXb%W|%mQ&6nq}dxYdF4>0kUF4gT3-s({j3j{^OB>{^@N1 z07hHXCCxLb(hXn%fd6dN|9g*&gR_~5rIqP_LPwE`@)B^+*w8;0!AVJqD*ud#|JfkH ze_jdhzm0wdC`U;x7XSdh|34ehu){yopA?aTm57L z(Bo51Nny~SvKs*#WeL*vd1YcT2eBgT+)n@id5LI0@Am%Fa|*s{YKlFs3EqJ2tQ-8B z*w}dg>u|c{k^p_#>6>_vEyA5n zf(kL-IEt6}XomUzz?&x?kTP!7q(ug9>@k^L8 zY_bNA+K^#E5RbJ-$ucb25uUzJtp%RX5#h}UGPjqqBM1sqXao|)h-fVW$T&)qBn}cI zGxUY1R}vICnv`%f0#%7vCXr2&NjXZDP)!o=j?WpGD_mE+EsE-7rmT4MyzCk025i0<_Wa|Sa!Z7@cz%&##-0;Q2$lg`M*5+C z;aW~wsAQAzTH*@W@*(UR^$L*o$VZduS`SdHlfTd~+ zRp*fB#OLglNls}?vsopvNs>p`Ol|5QxKd~dX+}a1at`_rSPpOwi0*WtbBqO@3SU(A zD3!;orLhhX4_Obv%`%vU)C#hcH~;0UBC*A53s>ehDOW3n|3hJQ%i@|0MwgN)s{ETe zk8O!z`D|5v;@XC^nTju;KBF-=ekyU2egg8~0Sgy~7CanbL5Y=(34v*W<$+n9AzO?! zAB{Dv%E-ZVo^hOskm;bNN!>*4iwIvJ({nqG@na^MVdvUUim)7TmWJ}!|CO>t31>( zWl8$If7BN0HPs#!PBE)&E0dY7O<7ucnr69Vxl*~rc_(|-Wl2tPr&znzdl0ZjdX$)g0UCU`w8Dfl|<6ejN=o09`C9>ehZt&)gdzo1BwQL0h;Zb)M5EN{W0c&s== zjMb3tKIy*Qklj!LIXF2Hxs2SI+*OvcTx&5^F^?>d?C|8oW>R$r+QnK|O&#{3+FV*inrhm5_2QK|m1IlpmF*=+C9U$w^5wZp z7X3B1O`}bv%~&;uE8y!@O?FLwMi#~x7R`fI{a4AI$$o8qv7dYpaN(=)<#^h7{w@v9 zsNCw@TUk@TuLS%CAJR@4EHtMPr&n0^n^4B72CQ;avgai%Ff3YKg6|`uBV~S#)2H*( zXX6ZQj&vSKyFNPU?Rw8W=497r_g(&5ufAfxvbqZ2_%p%!hbmW##bu^{L}W+la8>~3 zPb#C$c7?x!h(eG><1qrBF;>s}Pz{ z{IAMihrN|VmLnGll|;|S8B>WMC}7 z+pg`8%lq)XoIRL*AB+r!5j{t*{HeZ&&=T}gdSqJeG(p)2dCrs@Aw=qb=rLq>C>~^S z&|ZCbeHO$Fv+T1GD)N32^_z#|9oE}_aW~lH5G-)Xwczl9(7h&bJg)W zd96e5qk++cse@PWwnQ~i+bt@TUuvXR`FE0g%h?3!_m2JQZ3MD8hf#w*4D~zTSiaO# z&}7isZZvue%faDCi;Sv5UB^gA3s|At@I1r`cNpu=+(>CCEgxt#oi?8{KRw!_%hiET zD@#90hqs4YU2A~bR&Tg`d=gt{NS~x!Zx3z~X)WmHZRs#88J(Ks5l}5ueNcT3II+AMILK15%S)G+#7(mwK;%7O09WJAFxex6`YXw{yB2 z2AKo-gdl-$T5erf#GB(&RgPbxIhTMRCg}Rgx%QxgV~10V{XMit;wb8MaQY0j{frOC zz2+X{Q?Uy%PvDMcfyZDioOPEao~@Gg{?n=2rZB-jyL7hY{UNbVfbg4@SIbNKUUk%J z?ey1tvc=tWOipT!pFjQUhT;0(CZA)IscmZnhwC;(*WEd>@91Nm4xTC9yB62Gy7fa8 zjTVipYHkC&GuJcTujF}!;r8F{SyipNHmz6QosB-`&!;%KKSdD_onE)--%E?RTzs3I z_udZAgU^rK=$rn|6rWS$?W-OXSCt(K9R?4AmqM!|o8gNBI$s+r*Bb%WJsx@Yvl|l6 z;Gx0OUx|8$+7SETb zW;15<)9=!gyX}07KF@m2v8vaH`iAhkMm<@W^dHpUFMB;UJn*gywh&3EfsDj1*1e5k0(<}Zd(apt@Vw1hEal0$)}6?wB<=$DuxR~q z?An%nmw2)3*vrWY)DJCBv)yo;Mmmf9zQdui(XtY3=V=+Jp0Kb?=FXK~311V;vU0GF z)_0o%8E*P&krr})Z-0#duy)x*3Yb4d4fO8p+8c{Wk8fu3egC3g`gtJNISDSjzT5H3 zW?VX|Zc_f>2BU}0x&dFm?AE1z?&s{f8@8U%^mUj1>Ryh2oEGvmLm+?Ew(RT`f!^j1 zYRxN2Do&H;l)5f2Z@Y#~s1?l`kJ~{}buJOvgr`)ikxZ6338D3FktCq3jWktVNIW7ZfbH2aU4$P=TKD0dOP}eH7uZ@S5!?KjA@??33tZ`@H^OHb;he#{$~aO zQeyI=Rl;F+7V( zaN0lJ#UxT=E$eYQCFv0?>4>KOPT`~?z2UmU6{U6?gWAi-y7#qZ8-9lA`;6=B=hv=) z>1QwhZm(Pca^LWr(1rzXDgdCcl2#56Oro__PFS|)+tf9Ul2fvdZnFhIsKVA9IbfTr z1Pq|^;l}Sa35SRt-t(?mA*A8OA2_P{=lbJdcxfQ#o`sYLv4JJ$9+s`>2cFih$3-I* zj3cK2IV@OUQzJcW3NI~epyW)cW@XVSR?WsG$3{Z(l8H6e=+3TdnAdb_6<#D=} zd)|%CjgO|tU7pqr_;o&wEjQtS%8;z-G^IQYgw;a4X}Uk=5VxqR=J6~X`>Swa<(JcO zvRcc08F7y(0KFYem)su*@z$$F7nrhMjxyK*GAGr~%GtkJa>pr=S$~1uCQ{I=XM~~e zfZ5QL9ytTE+*1&{(9TL#y1tiC!UGwo6^ky6s zlL?a@mhN?-m+R}eN6MzKbi$p$J9EZ7mRlaHHFnyUme#ekRkB_#>yC8Y`Z7I3{gm1& z>+^{jn3MI>Z282}NO;L7gg#E*UD_gG?qVgfk2Sh~bvaE!S8PxFCr8;IvZ~IR!F4g^ z+DY>e&j>rfTJ;^7bK_tljVC+HVsyH#VJl*7|5shjh}eQy41S|$wVUkxU!=ICUsc_a|H`uXSeqF;(Ir2H+2{`gKlLVJ2Pj}$>r+}qyHB7^3Ru33+4k2*8~ z724-jv5;tI2+k3I;-XLO8k@M{C zU6|J^iD|-`kue)qNjb_po`XcJc8yoPp01y@Z0bwtbqoW%y4U$9OhVmvzdUTrBqqe$ zS0Lyo-9XS8j13~Eyx*;f3l@s+mA_hBs9-B?q z|JGxJVHHq`Xrn-@=M(1>mqHPjoNoC&n_0Wzwa^-enAx>FDlojEHC#%ecX#fRIfWI; z1D=!e+w%0yDj%zX6}|VS9MF8~$kZ&IE$#E60Y9qo{D`U%oR++F_-`hH#9e!_4KCx+qkCC^k&_q=Go@b(r$x*{I6Rt(_cV)k?sM)0e#6KRXFb+Zx;*H zk~A$+wPWX-UaNL3c^Oz8D3|V|i(bdMzV{ac7jp5@bt^J9#cD_X29C{y zpF?dMT_whLTwpQ40mPGfiSGOI@`sMDQVrj9-_s><14SY_rp&1x)DVu?-q0pc!pDK@@k^C~rM_A+REvsAnJU~-A-BYf=G?#vr+mUyh_5ORuTSO4fv zH>Yr(x8^UGd2=%o{wOk~EV-LuvdI#_+kM}4U8UbmHCG<@W47~WdtAUr_)DtGB= zpMGjH?^2ut#Tvr*25ritjFJw-7ihQGUgR@ggDvgW{yoAryEr!P4T4>k8Eovmd6k8Y z4d<8kV(T?+G{~uWiQnWPEi$O-c$VdQLQOZpMUu_fZfDWWk~S}^<6=EOV*OPNNwp1q z2#t-o6k-kS6SZC0I%_|mJil~3(X2EmY0${So!;;U9q%A7pl3^BH=h_NrHv8*IWWWC zlR_Am6UlvPmy~aeqbKMijl!pB>qul@pW1eze%VJMxJhf=x)tB zi#lDPr2DVvarb%Vm^ry=31M^k2NbP+9j#$71z%aFx#(BCqa4u)Bf9$NCA9?Piodkp zELSG6yI)E4C(6voA(wK-l(%jg*Ew<$ic;yh{t$)eUL7_i#$tulFnXQX%YV zrM+*XtqR2;oRoSOwNK$-q?u}n8rQ3A_G-Qab*xRpyX*6!@nND&*qNj;ll!IvC8Rpy-Sv`V2GF814S2|T)T*^-7^J&>V8GpbWdR;qJdvD!iMC5lnpQ%(?$ z!$X&XKhu;Qjs}nZOXzuB!md4vqS(p9p_wb1bDjS$|KE;U?_>d^43u0ZMz1S46NM(c zexHBh4O*_+x@yHcQoGCXDcNw4af$KG@Y*8_zRo`6w`c^!u}SVjPIBXUJSJ?vj~?qQC*Z#(^MOmTAUXe&Yz5K#)4E*)%hkB1JCbl z_3;E``EcCQ;-8u*9^^yqORk`f>BsDRw=%-Qdas8bTLIW}Z2+xnSAbnDTxdurF=0u^ z5PC@jI59$`wsk~pLOV`j2=L_~B3D94J6POUAwnSmn3!bbi&|V}w0%qKFBbWmQNTs- zek~It=AY^CJGVSqc(^dZf?38Ec3B-9;uE0VH)bzU0?6d@H~LWqFIg&GRDUq0R)J-CMX?NoL^u(_-I_sJ)46K=C!x6I_54IB#wd(X zA)~t%U;<+$g7@_B@4>`w_UT}ZxTU41{(Un>bT?-&^KefBcW02%42dInDY2~mA_uM(=z2=e8%8G z{%I9B={dgmB|vITgBujoUt9B<8-0X0fz6yK@v%>P@3%cILT>br7Cv~Se-=v=8*IpY zuBPU7$Kl5wz+iMk%YZJyNDD0w0i#3O(K0T5Q}uRrh&t@nzzC$3xvK=p3Jo?JMqE=P z_SPBD)zpMZL!K^SnnbBy%qawrE=gvB^swXn{i|4*QWO=bPEIEsT8IR+XhzJkoy7G) zat$@bFa_oUMmf7q65{x1ZMt;y*TR)3sThP9u?Qt)13swyBAM`plqxmop}hFXX~G7Q zC?^z*j-f%qTCNC2MY3phK!j$7Inh|s6xv30S2z1awV^!fb@MD3oWASKMv&ZrBbCej zBH&{@1dM_4XFYbx2R4zl8GTRE!NHLk{b~IK!uA0S<3=HE$L}2i(-#5y-s9-NHyq)m zm6keQ;XpCQ>KE~MFL7;z$&WmGJ=Otwc#MqjnY#Dgxq9Cm)%~LVK%f`&Izfs+oGebX zZ+IPZAB14g@OtvAlr-XVYoUM2&u3Cjr#B~;tGq37B(sP0btwA7me6y)XKU6R zSTx479h)NXG%;K>&ZhtLNmEZmXy@|;x#bHPwI?wuZ%m)RA2u56Ck(Q1NJ3FEB5??9 zP6#5A=_zRlB#{gSktn1VHx!ZZ$ea`;l5m>5a0FtV>;JD)Kc)$l@4K%H8Arhl`BxA< z!uN;}0DuV7Q%e|te>Q;d1{3hXNy7;b=n>)sbZj61GB^Q>ra7w~!?*xZ;tJVVDE`Xf z=@e}ZY`d0ux6e~eIp+s|GkyAd!6SXDdpMOk9*0n}jU)qfYL?0nEfTY|btSW>JLc!Y ziOr)p5^-!JM7WfLgRoiHJE<-HVwGC3Jiv`)ax=n3sXDqzT{wPm|+ODzX zoio&X#LF1r;&2VZNK$Y51|6F^_#UvRln_3(U;`fmNQ)cZfW{gBA_H>lLd~9hgqt0vVszsXK-yT-v%?HVT4lu-#v56_xVbkx~ z|CKF_ue_%F^|NA2_CuVc|KCe0jt;iAR;E@iRz@cOt*HEu-(F5%j5?n5r@X1cYud1w zDdTp6CPwVPzz8u$<_ELLktys_hm951e6)Ru)&)-y5cdd7r}~D6l7l z=N6Ylpnz1gczGS0TLjDFsIAun*I~6 z-<4qa*Tl3NZu>el#>{A8ZQG*U5tmzBv6qE8S@4{iGlrq9DOqMP9g$fd5b(lpM)CRT zbEsX|&KiFi&x>FGJan>uIox@Tjv&y==6{P{biAOb?H}x#Iq^ZV#7QCi@?m>+7rHIF zq^c%xC7dNbV)ZVxoHIR#8fPU1ATct%qqt!{Ee{l($?;+q%=ELy@?O1)1e^Xhit}IO z$;iD}TeH4YzAEpNnjn>a__QC?{uf4d3k!1kJ>O|NG`yhWG+B*sAdw*_kZ_{2< zRa$1TZwZZap=M8SjeY&V6!+)*xXUibTSHojMN&^9*;d`~HS#dl>K9to%e7P3tI#*d z;<(k`hwm60s-MwQD4n-T{Pw?3@e^4=x#3#~F0ZPz%rbOqIFFyoZ$JsG*P%jQ-$&BI z$#n6r(JMWnr#{C759}rOe_d{4cIoRRCg1>-hs}u5GOGaet+GRW0vRT^vM2eIY!`}y z114CAAEvTOyD1I+8jv?u_}c5db}Z|_x+^u7Q~!%n|wx*)pp|Dx?3gLCVmwaqx$ zv2EM7ZQHhO+qP}nwz;Dn@7PW{@B8)naH_k`sp{$J z@ZKck&8y0>i-PETe}iC*3cgp!JR#=ySp$T@G>6Tl8p4Wjkx6vk9L3KCUS zQ=G#%nfmZtHycQ` zI6&i#XGzX!nyN4);U<`R3Y<*|;Zvo#9X53B(mJ==)cr5TB~rbdNJxI6(FI`w01x-3)d98h=%xQRY4Aq#-8_}nahfS7eBK&OM=huXnSfu?)1B8jVZD17fV^ zULuo(E7{7`aOKMULTLJl1kVIi;%n`dC#Yv0#n^5$V$D3bjt_6kBr^x?^AyW!Iaq!t!KWiQnh5}QUzqI>?EIL@u8Z5jw3EO9K$Se zH`3QQZvw~o%Y_+fY{;#5aSMHwG0Mjz_bx%`_5rRF@jnR9+UMG3+EphcU>-gh7GzS? zk=&w0$kUdq)xYZ(Bazhj*lNa(dZ&h@JET#(j25T3jbopGJr;=^2bAo?nJaUEGD}KI;1DO zxT|>^5WTuL9i5~?JvmgdIa|8jReG$9xfDAyyI5c5Z9JE;Z=vOCyEwLNTXtn?vDx8t zxv*u#TSj+;T}oU^^rUV2T1<83yS)8mr>6;I-RqpodOn~bzl+uod1l+Y>9jHI-Z^ic zp}0lKqM6W6Q#*^>kIVE;RdB!i2-pZbk+d{z(fOZGUgN-SrIGt(gn)nGy2%e_Q z&y7Ww9J%ePjj#OJ?n%4x)GaMJE>nFlX~{ifJ3V>2wtc@N z{hCra!)4#UoIG!~%kIRIIri~DzufkvoK84KALv*w3NbAFvn{*J<#i^kKTB`KpK=E* za$`bPl4Sh?@jh;JFEi9AwMMtXp?bH(Cf2g#YA#bxD)@s&n7% z%P>9jMN*`C8G3#9F@0x*oJpSfSwZiMc!tf^y$lRC56Qh5!^q@npwa7k@AXgFIIsaO>_%w2qO@e81!4xSKl4f zZ=@J=;;DV(BKO$#z^E%ae0hrL=CNb*tJBWhO-ysFd-k$YqWm1|Gcaydtvh^Dc|w$S zkqn2SCCY)G^C2grP&ak57bPePSnVPWs&>A7uU{bsEQW!m8OC!82dw7tLI~CuOHUeN zwKtTjU{|Nz%H%1)kjta%r;Xv9l59hdyPB>X7{QJ1*PoYJWRWM|?=k8zxTER@8O_P( zJHz&bX!&Yzrg{AVTz2e->Uc&n3u`FCD&_NFAa+!LH_%DHmxyTn78V%d1wGwSJWCXUnlZ^ZjS zNoT=}9wOG1-E|FLg~9h%Znci9^7#{+=Qmc)&LZwjI!0ZQvI?c-=ZhI7OBEUAorS_J z)a9DqEWaY=j?4Lwi{F)ksz278?e{|jLZ6<&gzRCm2*}>MXFTnAyYC0V-6=e3O@)Xy zXRRngDD#jpsfo0xf$7aRtty#Qy#>8_y#<)JEL>gV-&nUc7izn@AHZK*$E%McLq^G) zRW-GUwNEn_ruP3PI1$^)$zG2qDC~?b!E%51W^%|ljTW~cLtdfyZdWfDOS{E(y-zq% zg=EIn#g@T<5FWxD>hOIRb_z|+akp2wski#LcW|E#wEAqx@uc?N-?GBQf>~0rn9%=Y zyf<wCd9_4=Fxef6V=EF6$VMXcwpj8vVoLF=Nz8p$l6 ziBNciV0A;i3rW)2n!!C+mSL^(c`G1(^h^$KA3GP`4kZ@Af8Dg~r(IIQ4S`UN{XLJo z0O+MXdjAKTId+jO<2ftp6Qv~I#ojf}KLkMqN5^JitF<*23A zbAJaKtDV#5awhBc<$hi~ay>Q=)D#>HKFlsI zSd+#sL;(=j(eCUT-`{IM%_gc2D|<6mq?Ha{6LqslLxs6;n3DIdf``~z#cWh z7}|z-GWX)cJRNC)MewI3fOR$vXGZ|0<>Z_2$JG z9XPa89NrzXZ<+){@Alq8kEsVR2q6v>7%{qM5GwrR9Us6lcrZ|B1`88BkVnS`3L+_p zAch8fYT85QFqcEEUne$mn#yyS&tUj1MSMq8ARiDAFwT#iNVk_yFHDFKGFn)#4w4)I z5B463E&!odu)0Oqx6A+@A`Q4EH+=LyNIHj+`vH)^fDL;jeMSS(8RCYow?F3t{zym} zz8^M-zfk_1esRfXeQ;~)3@L)TC5-0^c{bpSKZ${S2Mi)TZ-{kDwU}9vyi2!BY)boF z``Y6+VA$*Q1`6T5<4hkF0p!DvJB%#II~~o7kT#Q>!Lf0ti;X_)69;4Yx*?izmrx)} zx&VSNG>kU?>Ww$KrNH|586g^Uw#k&Py*qKQV!V8PXGRU0DTD9X9}dJ3zy~JX&!c}$2?xtDNqg>0n;`~qbS%rK z+kwGGMZdW`0JB~-gTIh<>1Td^M)T9nKMMs}Q=S8h1berV#}fd|u*=JR?+a%SF!eMk z*m-%O<_5+$T-I?1^|3^Jq0Q-6vMxpKPXTHmBO8Cn>=2;6namAah= zV=Mhz|%{o$Y7nurhCMwtWK>L*&$y(_=wp0*0FF`}Y$v7%xM6 z^i>QQCa!w}#t{_SdqBg6-`yX@D<}=!la*!5^>2A| znwrcl1GgY3BxveTq+t=n8s>L>6IZ_?`@ z-sHx=yvf{uc#}{6@Ftu7)(s47Mc_Q;obI+V zN17$4iluP({;`3O6rrd-UELpqj}+Op?bYU6^%rK~&u;yqs1~O)Fb`=eLz1EjDoDr> ztHPjIT6XWkArDtF2V3WE%W;oXU4aoa)0qi42}UIecDWK@O;gvEJyOo%=RQD`%`d2n;x>~AAH>ZFe73#$zVo7KattL3j4caEPrs=@d zTW$v$=G8MB&4WV9T_XvV_WsH8S&HX6f9h9?O1>WbFIEqrpzI^ur%i|i`kNLyKP~|6 z=;HD}jPvF#xxpGK0OenZ=tw5=I~qFXgtB;~U)_-1zEv5zfAdjJyVeg$&weX$kYW60(dLgDFfufINVFF{r)BCG z1`>ICs|x(;rfivHQKXWCEzR1n@ry&(%5W>o#X>mv!TOa<|QV z=a}w2{l0gf-#vD}S+3o4Bh=5$Yw+8IVF3U@wXmSjZpxWo6BB@T`LMF{1Hd(UW5VD8 zl+)yTiLG^-{eDus$zU_OU2D+fhLJpPU*NSEF$U3Y)UokM0bbb1IvOczdn!qZE`^A@ zZuW{?xzSKC!lBOe>m45;d1N$7SoSl?GL^HXPP8;<75WkoX)!P`yv0W}{H_2yz!!Bg z$%vkFA^GgjSB7%Ry06h4K3vh*JyDZu2o*Q&9K@3E%KWASyIB zu>Z77dZ~~`mNPv)y)YyY69s_7qp5^BJgDns-dp_vmw_h~>ko~3qsUU+Ak!%jo z7>{8K=w1WHc+ShG|4Tl>pK+=d2%Os=P+ZF`6~>+ykGw)9aSqV<7)bo&WASI+nUME48UFidAYAP zUP2eKdy8`Y^~=Q3r&BlUM42@n$M|H1nd>j{GaFaDL%FAzqlh6;8JTSz9k^BH_|+xb zj%!S_G#gq6yn7D>VRs(JkL?w)O@h-Hf>kHcKB_JrV?R%eZG;V<+?u$eYQ2*wx$f0= zsG9mm>ioYHZk%-Ms1^zK=I}n4m;#)QcW-y0zebB-Kh+Y4VTJZSR11e^&DS?#oG0=w zoRiB76UB%C=;g<$K2_C38P~0@hdBEpPD+hdDW(GSQ!f*20O}_Mv1B_^tTai00Z=Ij zJWpm;!X(ko(!^rG6KaT9ITXFOnfXu|DgnCVGo zbqyH2McgyCOhk~ry3?354i&cx;Ws#r*^E&anX`sSxZ&hm2u+s%2#K*s*&I`|m&0^m z)LuZhM6ostbYSQ6|F&iZlLpD#d$OzVMC^G3^WVAWtRBa7VJ05iINa(;8wWLOkb2U{ zN$wkhFF-6*RzkdnprvKtFm^6HkquqzJ|-vZfYi7%PG}YgfkV{QknPm3ro$4d>jjv} z&Qj<&{5Z)-3_%!r=!EihLJd|=9mkxxB@!^7nzku_QXT_mH6xH}VYtsSX=qG*&z^G5 zXE3{@t!-!g78xOwW47d55!E~Y3M>zSD9PDBgsgrFgkaPx+q)raMe8kKrZ%s)-0L)d z{98t1Xq{?4^4r?f{Y3mA_OFoYHpHdmU&?F7Q^o5=Y<0S{LyOkSEQK|(PTIECT8-Z| z%Q0uEhNA^D+p;9>%{e>*8FuI`vB@rkb4S_tUrkU9TS)dSUMe=1vSvBlu5J-&nQIUy zzmXPFUTwxwIYxIJ?8>iNd=cM;9mnlz1=A;YD(zdZ{tSyOMy*GEqUJ<3@io0%4UDKD z6Qe#-*OK|_a?iz7rjGIBuud9GUKI zW{|#L-a@xM6t~Q2ujp)8RLxzw}?PXun z(_7LaAhPxfHyDY8Vv*6in5T-yS|aB*Pt0`%5@S_2+RHs>bWb*++{S3Ld7w%tvW~O0 zywINya6LMq!mCl{3u>U_XJB(L!;9mQovEL&pRM;*wNBnn%XBVXZ=63+2`}_m!OVf- zT)imYluPo|&eGmeJW^D_k-iz)xN*K-`b!2$^HJ-d^nQ?7XA3FYdQ#E~j{MxM-3i4Y zigE9g!D-EtMw!B;rd4TTdr3IxGGxOY2v%5mBxZIu>d16wvB{u$G32uV`WUSAT>T@r zxP>cq6ex8qwJo;YEkjnIWKvyV=W;%fwX-8NSzV1`k!I#&F7QO~ zM8rhkylSn!)-BC(Ww~WoWG%H^MT`0ABCt8*%pNeW*ldq#S5+5RA3Z}gK`Nb;p|X#% zn-cGurR9AyT$}1@e*L-MhAY-=y!XC$U0Bbxy!bfZIQnE5Vd$#8cypW<)->=-G7KH% zjKSX*31Iwk^7azERQoLLs)fV37OAgrk#vEB=DbH$t*hQ6?jYT1F|BHV3ibjYf)ic8 ztOy-L+>iL1V#5~MwHhAUX5)>%PM@8eo~6F()_SDfr@&X{=Xbu=#-LXx{X`GHL(wPj zHQUj(qx^MlBz_$`jZfC71o5sIhZ-0g?mB15o#(en=M(&-9rJ>uaN|POkmPS8*5+m1 z8$&bEm!Nm4JS(+>y(zF$!!nQ#kzEe17?dVePeLR(Ewt))XUTj6HDi@f`ht2a$06f$ z9Ht04tukHoWPEu>JG1!EdHcCfJ(G~zzImz{Yk0buPxgE*zJ$93n+iU&@@pIKFRm%( z1Y8+yh1dw@+e%wv2o5S8O{`WkS)+n%yHh<&sOPZri>e^g(@z4n1xfai!#gfZgyp$W z+fM@a6ziWi?MwGMOv z9{ned5@xvzs+Vk*lV%N=wl&r)32pad&4}wN&$@EFs*dQNs!sIe9%#t5Zf?YP&gi+^ z(!m}b9FA4BVGXqSqqNH=%c=%>(<&kWls)93q|=sU>pC5gqWgIz(txO`d_bRljW?KfATo{%FPNN>7!O z>n}H8s`tcg8BCm`#FdTl#;P1rGPCF@pT2w;?*4RmX~Nerw^IjuJPreu)*#ZN(ks}0 z0KCKKI_1f9uOb6 zoT{V5v$&-J>hu&d<`PY%*voRm-pqKFf4ef{VqV7#uPF`=0I3pQ3syVl`HAl6l&S9f zZsxgZahWo^?;V8a23mzyv~|q%dj1__0Jn@I$(h>*OZOCoeJ=an$IFQw7CWB|ToJexNI#ul{9G zc2&I2ld-kcrks6GY$f9TInjaCW+W(}JK>yY2&d9U04S$n^Y0)jU(Q!GVOimfkg3nH z%wg;2v-DbA8?XCLr3+G#p zS}acQ)qF~PYkV>1y z@|VL}5g6zC|6&Nn8ax$81`8Y+PzWWDW{|`S6fJ~?7Y7EJ1PB#8NMPrlguj#Gk8u3S z?&#Ow*P*WV9SATZm8bhRyW`{IW6u}NKG#2nf8U-R1Tluc$Uq-d8oeK7;ln_?U{xzg z&xbl)u+x7C&B0xJ{E%ZNsZGZiC?t?Y=@u1aXOIhC?L}%gpeOvM>=uEX9q|@0A!umK zq_>xeGK6pnr!bBxBpHAgX@3y;t`+K3dJ0FnR@{n|>Z|TYKxy?_`xxlbpWmf;-2&yc zxP!FcEcg$%fR6D`ax8!=V=lG+qA)jL$k;tWZ;px5 zZr-?Ycr9?u?7nPn9Wnk+Ro+6R1z>NuxxM3HygE9hlmNy-La2K*!vBcCex}^Lw+A5O z4I(Z4Y?xBMjOOJA3q!dHqg6^-;=#tgY1J+WA1z_Bp$XRqn%$?rArEChG8(22Wr(&{ zM+X}k>^E13KAjaTqIWhzjtMPAf?qmZs-|&&xJ*jgL$d-ix9RW4)Q=IcGJ+2MrCIb7 z`2jiQZvg!hmR&{wX>t)k`V&-9ror`#eUDZ6{vY{-bxDC0n}8hyXop4G2EKOM#;$P* z)0;hh0yvKpo{?;=;Mc=i2t*EP`f|6%oI9qEV->;Tt~53n;O*9hm~plR@W1lO#}G6h z9qF@C($ByH5vd@q)S(y>{mh2`k9;DSE$}0sAp9erhzf{r-Kvf5UDNyocc4pqEcKXc zvnB}$`w#At@bX$KZCF@APWza{Any1u_H2<&58!4~BhA(;OE5o$kxq2Q0LKjN(VI5| zMhlqj>!XJ%Jx2hD9Vh@g(taa40BbRz{v{d!|2SX(mYsx|wI7_V;Oy#P_MctvTk$i@#16;x z;lX-gl9tfPDX(cb&qsm2h$HjZS%zOd?DTyavpn*Q&GB+VlU3tS@0lWb&`DZ~4}{;0 zDm!nI{C2+N4Dtyni@ z0>utj?J7GCEM1w5W>i5HQT4&btK~sE<<+v`bA5z>c_eXnV=H)JDs?^XSfVuIYnvm| zkI&nM>=P5Rkg9-but!he*glQ7=sT6k4B0gx??^NSOShd3#A~`Sik?kui1M*9GMcQl8piPSV$AZkDjp`Z%u{`fB0Ychq*5SqG(pdcc@yPR>#TFn2%zqE$%?E$}FqFTS; zq1J}rxaTIVRV4lKy*)4^ z#w}~=3KJ=Fdg|$x?e6e=5-fB2M8d(j3EKC;YbuT+WF_4;NpvxWs-9yT;CnRhC}(9H(s98CGChqjppZqO>SKnRH+2R#?8!0z&WUO`m` z=6RTBylCBzyS>Me%=dAb;%BP4->~77cA9pI48SuN+!+`>l$5&pkICeMqEwXB7_puQ zSaCnc47*7Mp4g6jl|j7^;cY*hNDWE(DQ!VGMsAoaO++?ong0*Xj$+V8D!o z;Not0_VviA(`$<}u5Dyp%W9oVq0_blR?@xa~8`|WYV2S%bj28wls*om4B^vM#} z$}!?E1WJP)$zhA`5HZVEumI{a)b#mkeS;7v;rS0=S$MP8@CFU{k51k;M5k|e zM#|VJCQ#t}ruxA8pKRMbA+}c zFlfAq#r6b4#qe=dtENhGyFv*H8*)=-b00H~?=wxS+<14=;;>1o>U8 zOO0V>!!;sRfWJ3jkDFcdpX>7HH>8h4KVj05rhTV{5=+i5X_MnU))SXVcZOQFD6ix4 zy6_xk56g8)p_>5W(i}0b5K|RA!zLjjfa}Ru{tKEweOw?eFR*w~6cTPT&?zghiGd^D z0gjGFgoK|lua%$+`d^xeeFWg3nctdV+2f?Bu7)$HZZI6G)g7S_c@}@iak|!{^FNU= z%xA;>Sb$NOatoaW3*nRdC2z=*LNz$aUg45sAA%4EC3J%wW)VS6HlhuQ74&mOt612z z#KM_OjASaDJ|-GOiOcTuFfC9>kMOYW>(Gwes;$1G9ECQu4}s*hkg=@3ZlgT7%qHAQ zImz92`1m4L_iHW|=B|(|Z(LoUs=5+vm|MozfVwME%%D1Q5a^Xv!JzqdR_poVDKcHY#= zt3~T-KoY!&6Jms~;{Pi_yZC8_jCq1R`e07KERf-J&J^oZS}7Ym>Wd|hcW%aMT(h2M46Rv85I_iL^GX$4#7_EqPnm}0XcBk8^Vw$ahv-_QgncXQ@IA-6# z-s@lx9UXVx-1GBN6*U4{YQ3e@cuOre=CgqqtT(4cU*r_q5Lf@3TA$%gSI^XaIMTs zV34wz`MmS~m%yWMfQD6)c*z`eT3q3|_OD&Qg;WtsfLkwB8hnS{P(NVzXWf7V52jd} zEjDoIxpW1!Cx9b&CFtKX6ym3olOWGW$owU|faaEfDJGzZy(Y?;!JKx6>$yYaMzBd^ zspj~MCW8Z@Rh!MY`K$#;(f1Uoir4mw@1dfgBd}9hz~+r4c+hClAo6H*oyH{+t&k6R zm_z=Ln79^D=70(tf~bv1!XCU8c>HAs@NunS^LDaG;(&UtwfSKDP)s~_4a7Fed6<+3 zU)wnAtHwfO0lL|zTk5{aI%MuN{d^Wcjk92CD{oF_YPYTzpr}N1_MWF4JxZFza@?b7 zZhXtQ2E~tn^Bul zkC^Y59*;ohbP7xlS#8;C1u~Xo;fxQt(~tgOg5H{4#M@_YKPTR=7oqJsS+Zll{{+XW z6YaWe_(=i#=l9>3I(0O#wRN#IGH|qaar&p+{Wl0XAjJQ`aQ;Ey$o~fdhaDkAW!G*? z8JRc2PO%u34_{p@EOMkyMMvR~7fbqK`; zm`Bf|B@;s>JhiGeXO1`}sSGtaS0-|?X;}(*x#~=oCShs@k#+#(dG>rCClX@nGU4h= z_KB#^GwSz31fg8NEeehg#tXE<^s-f}6mlQ<`-?>z*zbGnnVBFp7rgUuvdcf%8N&70cSe=BX2~9PL299(4ba4)C4Bv3HSuPJ3 zIzj61*(DuD?Qju0R8Pvi5qxVc57;+S^?G$35(a*tFL7^+-azhn3J(>DKF&KQVtRTt z$U9&=pk531Wl%EjmM#ol*ys%lk0j^m<3#LhE@p^L#c2N5sxQs!MyCno<4P8L273dN zK9w1InGUMQ!P`?!nipk29WoAG(uix@G*O+fJabKaC^-@$1L~`>C%vzU7_~1z9E^Ldu zWmZ;v7qHxuU|lb>m%Ub2&L0lvat@A2y0WT>74osRffau7kha ziEwzd0hdT%&h7Rz<~J2L8;VN)z6Q(_kq+>U^G+{z?9W&JO!`;Ymg|+HE$?z!2LBXk zVjoH$s!wtsvLCF8bfmLJC*dctPD*bAEhtCVbx$72x>uc^0n&D)j`@mJ9t)Y0?4;Kr z+EMaH_eUc)Ry}fu9&S?EVb9IQucsO4Pn;ffXUHZ?nHDdaTM%?+I1;cNu(eU;k>Dz4 zRE@2?q*6uJ@zM1MqB2+Q?4#63ch1~MGVzG(D7oRWKTJSvx!o_iFQoOQz>i-^Nc5bX zdp6Y4B;!nfayT7SMIIoXv*u@Xe8F~M3ni*tS6L@f)HdoW>nMJCPqs7atcZo7%rK+O z9g(xTwf7806%qFa5yqYh?7a7ixNbw+Txki1eGhV-tNsLQAo*OvKlWj6hTh0}A2St3 zfj@Tk{5dHSKLkrq;;i3&$2pVwv+dlr;O_sdGDjxNg~x{ZUCV~arAPRUx?pn8rvc#L zZjD8S^g}HW|A$(@j$owU50om}@G-Z5@De8iDHQ%o2c$SdE(C#EI$D4nte^Q>du&F( z;yGl0bIA`Hj_<>yyw&XOnrbL&MdW8$8+Z`}2ygd};grG;bcvqB8M6xTG?E|8*7pwM z4;`~aHduc)oT6UxLt25dP<%Zael>n_hJ z)eu_fu6nazusn3S;}I}XBLV8uw7v?xngJ82Rlh$XLf;J;7>z~vE86TWqw}tNoC=Mq zK)lR&fNR|gTTl%U+Q{O_l~khz7S#lJV6bO|_U0pzg`2*f|r1IF4Aa%;WP)D21Nh7m_km48uirlT`j zeSz`%$sC;RZ+)=60V>BB7r|`egiSiV-g@4?bzN*KD#=dfa@U(3&PQ3SR;@W*?oLDQ zelO~tucf>{t=ZLcvr5b9X4Pply_$H{_;h;Rx3XCMOfA#t*wp@DJR+00yclGFE`8k1 zI!k5VVR^F+yG3U3=VLs({a*gQM(yXzzK5wjV7Quk2HUQZ;mw`?IcQ4zbD*_Qwm$%j z^~{5f(vM?le{(Z?dF%aP|7|~jlk#2DfeDMMk*W0_7N$A2_c!A{h$smI=0O)G!GWdT zmu^j)qt^@{Jq;xZC9QuX{1ss>=-I+u->Bm{tAxAL{^8}_{>bM0#&k(qOyzNJAgBlK zaA)E|bfo7Q1t|qy-m(8>E^8v=I5Jg1@8&_335xu_- zG}rZs0FfjE3`K$O9GOTVEJzfm3)rN|lczJF89;y~Cjbb@VOg~dlBYzouKhiZQs5C4 zr*V}XQL|e>7B-VX>2OiJhKSK-8RPo7)$%8?f`=irr74UZGeKAJP@QfDEFcC&PrSsheA44f*xi_*0D6jb`2mpW?=DFD; zIH62?fsdW=GqCARfXFe3+u^Cr855A@z+DeKV##zV(VqFFb0=*wbevK{Cp#pS8B_|uSuYfO+O81L5cOxvL&u=ovul$8Mk zMZqRTmKl(*+@Q(m+6mGi5}6T@?-2rzpv9Za*%L*x-i8z#V<~_SivUbKfW#Jq^mmws z+!0qF!w|qol|sj(fk-B2m}2(k6A~9TuvPrjWfvi>`i&tk?FDaSnZ~&b!bvsFr0vi> zMTj*(_Jx2(*a1`f@ChYInC6m|{LnSSh?&gOK+1=y*>h;@%NW{1rXn9hL1&SYVuPe4 z(9}gC(uvX2Bod^{YtG=JaMA9WrA7k<1wcuWgUf-?D29z~?9``Aa}Y4-skZhHVf3dl z*yo~2@S?@L*`nPYr$IrBL%>Nk;Zl?RrIIF~7EgWr(hoA2jt9_-1U8HTJKXwVi4 zC&zZ`tKF5+X@pN8rAc<5nBWvROt6n1HEY%xa*O*3D?O2-a8mRGdFz2wSuav~ljw*Ix2u-q^ z;1jLF*wXfzSMqTza1|QhCljlwzM(%EJa1{m>@$H3`Sp!7J(J(c8< zO#;7fB>J&hCGtgw?#ll-GQOQs@?biLn?Wjs0{fG}lNkbLa6uve1Z3dVc!LJgvFdsk z|Grv;jQ%V^RZl#S!QRbx&ew!U3-zm9c$4%E9wPnNrp|zO;LxN*G*%*9g z6?0L|b)Jo5FF&P3TJnIg>lKO@{LxoecWlh>Mle`A9AA)D7@h!)FgzX#L3lg_g78of z1i_IY5TXNK;Qx8~FpogPPmUPLk|eK4?khT&mZl7VpF;SP2SAk8e*^L+NBoM)zZMgp z65QM#5ZU6QF&-YEcGxCRU}z|-M;ga^)<*8eJTsT6%$K$v6^n+$v5pD#SX9w9k_=cY zxv%!1=q}fwMy$jtRoTEQ*sfCp=*yqMD>{*rDazIg#Co;GU$&@5H;Af;_&UEza@N*! zl^dn^1w-ykw``_1a@1s{vtq;TS^CRVe9oYq@)ygZCf5aDDdVi{WXr(<-6tiFjanm1 z_n1Ph>&W(4c)AUq*^t9665aN5a7kA$YEtbxdHx>F+7=}w@jZebr}4;DXy6Gf2{BUJ zb1P2kI8ERGX-1=DRSo18%*3%R;?=!$e;pdmeG>EbBeLR?vnfn|htpV zirnXs8YaSngf~<*!I8cU5v%Hz8fl@@EY+9jQ7VEGV2QY&yZ28 zaEAJctO-K3J*@s3m<)cREyHVJdP+e8@;pY)k~CyUP)xh`Bng_*j$nsE8{)Zn*wFPD zR~{Q-NcWeZFCK*`of9Ok`~aGWWZlm<=GZ!vY`ksXNLpSgyvxSqSJf91HC=5rP6E!V>Mp>UdHDu@q%_ ziAQ4feMR}*l+WXM0a2;vF7Vo51420^il=NCNb=Q?HraX=R=kjo=0t78I)(&!XC25- z@-gZ7PAlTWdk_K{HA)Kv^T%}AzwGBCtT&@bsjN7%T20wx<*q2{hRlRorQ-aHNFlwm z_L?N3gw$|baURZE{BjE7BFGY1KMgn_FA6>-1aW&dcv#ZMOMY}nnH!g6 z`M%s}Kq}WJB;rIfZ75zn;yfN8^a`Cb4ZeKHP1|lG#kNV=ox@p(%%0|tS4D|A(0SuY zY|S#1&ILkX#Q~vw5L5aF->?Hcf+jaO-FrqI!=OE!3KCxe zX_kV^Ja(1)bj5mmXnlzvyH&Y*vc6tSA97ss9(AO;i%FTXY-#VvBs^%rO0jiZ^7)cF5{6Q~P$zP+_ zeonZ@>?IC+@3nFKI@)5t&8RrHu;^F%g)e;7L{8RF^#7m5SxOf3P2o{8b)3aXxJ8q2#QyY;--_(5MByA@M|fHo?9~TKxm`T z3WuESS1nsKTTmyD8XMbZuFceW(LzVgG)HJaJcFk>?fZV;f9G8v(8gINvMVF45IdBU zR!aPlmr+g{F37BAOj<6HDuq#fHMMB+4rxB?tV87=xb+c(1*8$_FHyx8zIy{Urv&DH z?2mo-FK8&Lb)&;aRn~M}$u=8D?m-Y0e!&Cz2%>s?4L9^t7Lm(@64zbu9SkNXH0+P+ z^Trh|5a>T=WtyU?Ax$%a;4vbQo`H=gmC$!U^7ixy%|0L^pIxfIa2^#jApD;D1??MC zAB_yCVIlaN$e!)Sur3dtgrW=i^NC=59@U8vlk+$9RQQT;FG7qQ5~U3#t0_0VdxHjK++S8^F8M5bP~%ztP*Zs*zupNTesXcXbo1v8%3QVrq8l zG2m)Qe+J^GM9`)t;BQ{CBZPG@7MuC^4alz0eTC?8hsTqHZA3I59(=-iKzRc+b_uB{ znT-sWV_Q5*+EYmiw$+0?#-KhRnWSaGC(>yQ=TQtB5dFy@ru~HIyTh0J(TTqay>oxr zKVU#_;|X1~>JDz@7=AFM?oJj}1rXt>5WPJ0Hl6bpx2q5d{7!MVKQSEo3} ztH$Ni3<6wzX zNv2Vad=q{*)UIBo#69l&)YV9l5ASnACp=`cII}t%4$PS1RY^VPx~BI9{D0Oz^%32o z$sfIzOaK7jC#~(jy0!nW`uD%?>}vl}1plK;+3%8#=5h!oFeO#!pC9hE!O^-T+AJaN zZDBB$2)AdYUcc|Begmiv?irNX-2KC1p0P5W&A5%`ktoR#^X4;8;{*w@*&Zb1G|uNMjBww;EuDHv>=i z?n_rGZ~z;To))2$3K6Pl_s*QC&Nju;u3c_9NHrHLy1bn|sTo()^`UGdn!0V$?)NI3 zeu5&cGHC=XWzI7&h#|799mt1QHXUJ~GTkpzadk@}GNPxS z<&{>48J`?We&Vg5l>Z|8g7Z||LG6{(k4~7k(`Qy4w zZ}jf@OHVd~T!nH9xXIH=ryxmkQ+_&8ex`5=2{#|twf>UJ--{MlyPfy6<7c`&3g@q* zY)H-E8^{|ahH30UhXTlQ1Tba?vOHVkat@xsTw8p-=cO?SD=_KJR;g5F59)7eDT$P~ z=?{Fq;BZ7W+*@E?axR8XkT=~VJfO_efbLEsEPt3kh& z7kW#MKKU0izk~g(#y%Q75!S7JKx{2jg!>rISgQ;RRW#rO&KpBNYiU2N`xXs$6@dwT zNbO~|gRgADu51EUE5R)Yg|hllZ_~&>HJ{Hy4t!-ZAbjSWxPkuZFm4-Dn05^r(=Ikn zhRf+^72>qF{c2wWKx}`i$wx_Penb4_2EqLTsaVNJ|HbusefS&`cQMoOPrdBN_d8d( zpb8*PjQh7v{?BIPPnVGtxsW{a;G0V(MuAt-h??FG6_q?$eLW^rJ-=RAxKS{9Yfo-eTHT<)nzeh8_8faL|sP0HGJ)r3;Fd zRm;Llkf>kZq(9)A_%mh=yvW(3mF|LrpI$oIB%q#yvb^}KnuOU7~^^oqQROxkJ`hOz)Lh2gRKfs;fw;GSO7pcPHU`< zB?PKu-on=0<$C3L+V?+MS7c;F1$chC$izR@f#JVV8SG7roPR`JXLA!9mwzd;f1z)j zPL2})80zcqJwDj~0$K#ZpB{iFW^sNE3P6_XEUF^{9vbb<+zm(y@D4GK!`A}~b@c@c z#l`=ET3$Zw@0Zt_=)Y;q3K%%101i6LFw9zY1Oqb-1;~R}%g^1hYBKH7?0Eg`RjbqW zd3!kf{{Dt8(npSl23Yq_3J-#Yj)o=?@E!OTW7UWFnyrO|Mw|tT8#e?4vlW0ht(J?( zgFsFucZebXH7iF&AxAA~LM}c%O|>v3MWaB!z%{Sw7$& z#L;#)`)w3Ttwt-^`>>m0_-bI#}%9wTnAhvtE?(-inA=3 z^gji@eu9ts5hb8`dx72^Xg`M^P=&N38K`|$5V1H9bb$iVVZ3@5{=jJkvx<{Mo z8WhFx=L(DcI~cjU$9#0jpa6- zOkZbn<-P8HUq8QJeRn<2;+#y!9@RcYI^G}RLnt~s*WdcrQ4aour1tqTfSBKyXqE@T z!37?gL1uv@yPCs-OmsMmA0ABsw|mpl`C~=e6DJ`Q7-*xCh5r)Rhhya4K%V1exla(I ztI7FO^vvPFqilkJyV_M~Mnbc?lwI0Lt$QzCRq3_jtffWqc&>4q`0Lj~m&*1ditFTd z+Swv^X8oi3$82X?92*W)w;JoB5}#{9$g-Cwc~QMWsiNw>e^5Y|Lh~TSIp|W~mZn$B zu>;y9qo}O`x%X}ew9HO>{|DF!%?rx-{ zQzheAc?Z zd+&AcXUEzdx9_YMK~5R=z&?=_H4A(HlO~Gyn^>y{0|mwhS;059=KUHU zb)nw&gSeV1KOOPR%(@`rU>f=#7~*x_O-WNp&ZIzYsjtVScjK}~@W>BU9B)Ss^x>kN z;$p|8!KB+IOL!~+$>?_6lDG7ANbUigV^h#G{7!M47JtsL*T}?trAC7ET7k|zJ|P+( zAoPDA$SI9NE+@%pn-~Wz(1A=Am*z^V7BW9Ge{6AD$1NMk>2PA7c}F`@7BarfbWa7> zQ;kTMd2_F9PK`M(sMTzU&m_jpNjCYgOvhnGCPigFGsO-5v6<4l{eVq)PEeVzdBbO0 z<>l^*!Wm>O{@FIS+mdrE9xd4vlEzZP@#@l%&Qk@V-rsYaSs{cx(}pt5Z1kv7APeuB zV!pt^PT5lNPc(WnIkJgb@YR6qmBJGv`P&FWoGN!54L^2iDmAy~gvV=cIyglflzsj> z_yOnX$3msNH@c#&C~8?wj{cuz)DKmVDn8GcF>)Z@9)_F<6^W4Reu@*(BoZ;&rpK0L z{aq(rQbi*&PO{S(m3h1>EHjRjZ(nQSc{4q123{F9xoKUiWv`_at7Wz0LMmxFAv;WS z?cG{4O?^AMZwtI$gKJFLO~hr)>D9vrYTgJxL&K=o3;T&8s+z}iJJGxIJIs9J5)3N` zcO;eVX@8xDA`h*1cI-D_M8o?bAu}kS&V3q`AV;Pial^-MT-s^zrN*p&Ows zU$>Cv{zyPwlu?BA>d!1{1j7Z=$v5E(yG^S@T;Y6dOMS!et8Gi2_aaPZSY-Kjze0*> zxg)wJ+|`-g?8^?wzO4bHF{csjS!s!P^k%-wVR2WqA;ok!zhszx*k`z-NijB}H;+BY zmnKLqoq#I4poLH2r^Q#7{clk|1RX1zYTbl!uYVB@kMc8X*;d2-YI<~(HjA>&Y%X20 z=<>@T;jlCOT_`j3tydPAYR@P8d96BsH8yFtVm0xE%{l9su4k8g#teYpa(K2ZH07zz zocT0lBr;Rd#&SP$QL|iA14WuA!ixNt{Oj`G;9hB|i42bTnDxbSM1DS5>HRIi>?bl` z*M7y%#V5Hxc{;N?7LpG3eF<{OQpr~9kHGc)Pi!*bgKzfA1LgBGH462*(Vc8{YJcHX z#D9!O`81W^t=`(`77$oKBqCj0Gi<$JHFcDYUNF;1-(riM~a`8cYT;s z@558aP`5J9+t6vQmtksEhw0!~my(%@XR+e6%KljO*sb7bL@34D$`~P=tAeY7sv^aH z@%u`|-hCQ>CRQSZQl~Gm6QQLh_ zT8@;hQ)U!bhdvE&rwy+8d-!v9_8oodukT&UL8OeNF{>=totL-5t6%&mRf2z;Bia5} ztpS=6DsdVIA%1S3^Wv2IUG|uP_Z{}5iJy$7rH8X(5nDG5oVJW@;mzjd4zh`4)J&5V zB;H$ZM*H^uD0{Q&+neJ`=wQfAQNdDCdaO4X1wIMhQoXfRTZD)*Z?K2EVyampbJS8% z_D%R`#r2_9!z?XVz8d1ba1LkmYnio{=R9i8>cMQnPIqE9USZl6hjmG^J9s($oV5Fq zn!n??DqVDY=wVeK^4gPu7vSVV7~w<}5*~~t6kqATZhtDup{VNmAdyR2a7PoXU`uVW zg+5Q=v(!*%QCbwoV`HV($wZ z@!LGb;H;Nu>ynwa=_}9U(ORdC3$&?C5MpBMpqNVRK_hvq&RVV~@2RspRQjMfkr#%i zxglj^El|XR$*z2!WZ;N$($D!>nm*+4In`I9Q8F@ax zYf@?7)#fF8#Arf6j%z4G+h95zQ(#zO^E&;3CE7k-neXS-X^??&P2cBWjrtkreSK3X z>?NMV5)_5(#=W{n-=*TP1)?B0J7XTpSEV4kk#bpqT#i3}DJ>MB_I*kSbI6uy$UmZH z&EN8kAVX-8?p_75rl2}WJ9Tfy-fl-RR>wO(96Rh;=uw*=i`z2ag6K5~XVGy#rDvKx z=!W*I{jZ-FS9E{KtvP>nD8i^OC#2Mc@Nid2srxiXKZ>vo*>)Vc#xUP zp$l`#FgeGt(-!SooXa52cV9%myJ$arXt}si_6pf)KEV>$87{Q;5qj@sxR?yKCrejs z_`J6HK7{$^BuyrB7%T z=u~>7@o8)=&>V6hI`a0&))V*vXnf|^Hne3nE`B>wuuuoqrhV(STZ2DKzI_vvVzrqe z8V2i!5%RiCcq>BI#)7)7q=pvXbG}v78`f7?7?tsh2xvo)nq<6H&q}!I^V4u8BQkD8 zD@HR4oPY`d+EJ=E`31#NHgNb-HA zr^1a!&HegPGwFV)r>37aB6dyf*QFmSUPpiFDiOs(=T^!$wf5+5{hrCqQ!2s+LyW6m>RIg>&`L@1fX?y_GPoI=F1)%Og@J1+sLcA&C`5c43`d ziCB1OPpUCQc;yADx5vJzD6>o}0fucm1+upurb^S-=$k8}C7{2RKu;?xMkN%ncUFaq zn>7;gfTTtC6-u0ZdqjN%qfAL`CM<$Ki6|XnUwV(&uU5z0$H(W00YiizjZqjUq;R~0 z3oc~f!y$P3wI@hsp>i3ATX5l7Cy&~mQaf9g8ZKqYMKJqc5c?7dnI>WP< znj4a}H@rjee0k)ufx-T|5%R#F3N^`XNCdSSakudxT4Dz(p+SEYx_~7ei-2h@fuTea zH~F#HvBESR?Y*GF)n&}%gpcvZHmfw@v)~1&!0{>JAPgD^w?&5<`H;s@4R;IYUM}Br z99c$GGN1JVl}lp3;|M&=>tA)vO3YiaPN(yHt+z9YE8*i#h6H-WwkqDSD#lJdOj3!9 z=e*E!pMR_`VJK-vuyKgg6t|p@O)|HYa{QahYrVBK&7)fJ35Py43PO`_UzN-A?x6dA z`NEp);MS(y2G3xs%n~R&0oB>}(Ao$t=4CwG5!0iclG{V%;}&gSd%-^(X+NY)pjUq` zMDTV0p*b$D(T5eRbk{aU;muw4?q3*PeoQ&2$O&GabjjnRpS*lMHRl%K6Lh1#B)OoX ze|y>jZwMoA!o6ZO75Jo9xe;ygZS2hYo#Y_6ke5f3AdDq@67Sahl{@%{M}$arhp?zI zFQwCwbujY2bqN`hb4KyLl&+(G1e@pAr#DB+i5ByasE%4EEW@);)R@)g|Mq`AGNiV| zsCuaH!_xE_N)j2AgBs0HAVLajZ*sAO0k23Fg9 z8lOB#>AX?`v8dD`6ha(Vu_3@-7VPag$~}GzExIonBaxVvHYFfW3sJL!0Fk`tT7pt+ zze+wMfdZ)kPuSLy`oh2vRt{V!0lUvU>Q+Zil*gDLmYljeB2?k`7vejJ#$CZ+?cYNa zdwdu$qtvT&NWp2L<~?{SrNCt6p=@kys#`6ol|_P~V(U@i6nq5(UQrh78zP886(>yz z_6(v3-lZg++Jb&Nl?uf&-6^D|MxboKfI#bmPAUNlAs-!@*ly~zp8iK~QQ>>D!Fc<~NO3q2Q=iAYm`mYKWLc`J&1%FgXy6~1`lYttu>lECjIzX5j(?Z1bSh%Q%6oVE|HQXmOO_0*?M zl(=+Tiwdf?y{DUc)N%36?}J~b7sWys2-_c9q8>+9%ST7vZdyBGey zd*T1P7yiF{;s0Onh5z__FMPLr>upbM!sBwM+K0Bd_))RB)YHP2db<|ZmU7793X~;0 zxkP@HB@art%~diu^26)gO{lB9In)*yzZ*ZF|GXS#STVSOvhp;3d*3yowH0TFE2tSK zg3n;lvQYc+7VOl+#FlXfn1Ogg?}6n<+3QtSsC3bcB9>EHF0U|L*-e1z=kXKG$flfv!XqkvqqJgEP;Z-xTXIm>7XVw%AMF>cV?hI9s1R@cO_AMW z{SmCHY8jgA7Fp^&pSxYiMOGrDU*f?Lrt!Olk-_g^pw^p?4K~?REyoKA7(G}nmFh3w8wSG>}M*g& z1aXA~eU374`{FCwr1E6A_Ryk}JZcZ#NcUygej@0;`&z(o8(0!>%GuvPuB>W3JU$94 znT+Kr=>IM%Y#fLS28M2s?o&8sGrK`X4i#TT7*FnrBmX)B0|!hgJK-)=lQ9;MNA1pY z>X2fGPXsXy)1`SlsBGkDUseq|qlnqTR!pP|bb}Z6p3J?rtt5Zz3meaFI4I>OXbdk7 zL6s7&I3*fsdMok)C?uaw#Xzq>ZraqcSW8rNOrDP5^L^j?Xm6*VEn-j!2=~-Ej_g}` zw$s0~zvBoi30iT%@x`#3^YXus9mn~&s2xt-+CA5_->xQN3M6QClGQ zz5@67GaJaD~VFjj%NNVPOW zG{0xsq&o2KmJ&S^L1fO$JGTbtAvV!%&0l{7&dg=iY^NBp zP^hwmrH$)mjT=Gl_R?IZHf|H?Q5TKIvq_H~CZw_NGUe6rv__?D_g84FrqW)QPtc@* zu_#tE?JC_DWocvFv50H!dQbr$_H$E^ba=rF2h5mD(JLg=a)bUpSTzfe#O5parmWD% z&+3JrKd3ZfMsu4?b_h;Xek!Fbg_;7By=mKTz6vHpRWSYPLngw3nv05cUZ9#0yWyP= zT}NMaG+IJ?^+Hn7BY>o>-Y|Cem4c^KYoXOq_~=DnN;G%}e2aL?r0yz;X34DHAvVG< zRf`F7dJC1u6+zUo`Sb<+pn)@+)GwwNyerfNZBP!Zw1Z;XgZE474y-?Nzy`Lyx|g^X zyc%*l41?HSQ!T|wku7amD19)rM}j{OUH-s0BG<757D7p0tT^){HNJF4CB2)4yg_~R zZA}eK25xrYjIy~;<_^K~dGDu%Ng%w+TdKR-zqDuevlHbjp;df%toT52B~dyf-`To! zmm@9ahbxoj)GJ{hp6E7ZRUT*;v8WK*_; zkUSdSQqU?fbnr#y>uU=k8UY5+kQVA$7mP7>3yH>zrsSsRoj~ceZlYmtEL4l{bA*~4 zJa&FfZ5l%OQ&LZ!t8OhRF}{ooX5>zeu^@vMQ5;QO3fARw4$Y<+BAVy0^)aLxco&Mz zMrdCAXl=@eh5$&1&$t#+V6uewPFIG{AlhI+FS?wzqX}Q)0l%i6;ut$|L0_U}*czuk zhM3+Wj-QJyqb(6|9_luuO&*0xF5t{z(~*oLZzo+(oE|?DN^ph2(J4hmyu-$uqyK zZrRvzezUIXuDAJeDXx}u0kY1|ExKyD6du<<;5{w3R&WYOa zE*9rJc0OF%d^XQ&+wnS>X~NZ;ZZ7;-Q6Lz*_~{EWd)h`)qj`_jJI584MHCykCIt!k zYA}eesechj;E56!TPGI%42>NeUJlX>C0O+T7?`QggxpWK@?qAUWtVPOLZzB~DmWL_ zSFQq1rg$>iQ7^zp)`c%*P=9A&r9j&d0umHhf;gO-^s4p6V%_Iw!=j^ISufh-mbiGS zd7~ZP=G0d!eqvW4E-D>CMD!JqbS59E5a-2q?Twm@R8ZTar!<*@?z7}r0J->^-(C#6 zhs*F-TGPS$u3jJe7@9<=z###|MTul%(1 zVAZd@OU?@R{fEiUWPiRp{oKq|oOz}h%$z>1RMu#AljiZ6hAB4FFGLp*DcmNifmOFxv`HKFT&Z)eW$8ImJY9ZK*SqM)lW@C@wrMRZMf(Ob%2Hq zU-se8&j?XdyIs7FkQK)u8g|h9L?_-ISzYW;l&Y#ZlGZLZCR#sfQaJ4&21=<3nG@eR z9x@pU6jmLm7{DhI=-^6ylG;nzT;uaveJ$mV(qUp#{Fj8bQLaK0M#8x2(Xws>W-YUR z3A5C|n805FbNWQzXGr)2mS&y5eeZmpsE{jUF08C=F_Lm%Mxak%Em;^MO`!RfA^Tvh zM{nW*$$PJKufsexELlu$A6J3Hlw^&RdCJ_6WkE|NJIXubk!AXL`73c=J4yDFP-Q!- zAG6iWR7V?nxdfIs+;ls(rb5|_V#7w$wL1h1o*%pWwg)7Yrue->--fPsHMIlr#T2~@ zQW*Sf1;0PloL1g|B=$&r&-#|lvm&J7F(mz>&201Haa1?Fvf6c?Wgb)3y(Am`nkbK* z4+kboyPik)OPpp>4p}8tKNID=I&f9z>F#>#)xJoJzhxLSf=4u~+K)E&kzZa-qirIE z-#(+Q)V$&LA-E^Dj<|BlNYA&e>Bz->JM4W*l-{D4fLq>Bz0zWVqD*A2Xm~g(MD%ET z=C@iT5=Vjog^=%^%RVe;tPbeNW1fvL1Q-(x@d~* zVP|7Nwf^JId0G&%_(6!Pn;Tjdd6lJWX6rgN zRquw)9U2Ew(B$u~ALCn_)x~7O% z>w{c=C7l&!M@G!=!?&ecn9PETpwkt`*ioWs8h?85{*2`%4wFfU;Tc|&Cv1+~MZ@b` z%R;=DQtN*ID|!V;k9aVq&cJDGv^hU&Syq%>v_ABqc7FOY*Vq_IU2D`U12|%POm3be zI7V897%x#Rc?kvug7SKDRPG(v5R#v{P&9WVnkd}v{&=_$>(Hl2J-qx$#em%KS8hRF zbY3w(tG_TCTb(B|ZkS|!GM$7pzQ!X2sqS>LL?c8g$jpx)y*(7z+1n(bZi)1Kk+WD) zSyRbC>JQiG3>)k1Qe@$X3b0LkW|Wj<{e%%8b20NHcs(hHd?yVO6nZ$@02}jt)(^pR(AXy_n_kbh8wPD)DR{YtG`gn#CYP$_Ul%}!2r9S zXb2Y)HP7Phgon%9@Q}G4o!Ub@Z|L2dcKRqCsw@&&j1cj?6?_%wtPwG#yL&vIJ$Ik? zO-{R?mJ+Om5WSWso=^|wlHl;ApNK49pl@XCsdR0Y=Uo3%$zuc2iD|oIusSOfX*g6i ziezf^lnnU$HNjfZ{T6PGB57K)#%8jtD6Jd7flG5_e|OJTZZ{mB!#w^9ZI46JDh*_< zEfip9HPO4s*oJJo)v*>xd_o=#fy$Z94iFn&95Fk=QViBGZ%#kz=K5WEIHFqES`Z0+}BzN=G;RAu{D z7z88pO@&G!YQ%HGF+zk#Ak3ub81`V_GKxwq#sTN`B~h;7g-hB)ka0S|G$5#;BFDYW z!!+DII(#TH{-7z!$_Li29!C#6rmsX=dh{2rGYAZ7L@G&KIBQ^Si7#jgM?>xj=j`?u zNz#G0Gpa~k@YD^ze5}b|p$xj)H9%&Mv{``65hA6+y10ArZ32i!(FYhPx(MZa#>4eK zf9K5hNmX3fm#zqq8|Pg`D{y(bZ3i#q(M=PJ_YLb-18ylDf7zr`7XH?=geLMwYS09b z!J(X9;}w>=$?hMMW4pz=H92qD=F_vqaquAzl{2vBX$$VYbt`|SRbaaqK_3H+vaBdD zNRQedb6A^dwB#N)xUVq$WYNqm+_yNnu%`dxa~8&`=Vag*g^Pw((~M*<@E1Niw=TBO zfEgKxDfy^CMM75nvu*Np68`C6mWmCqef6YVBh$P!$WY(XO5fqXGw}b-M)TinH2=*; z^Zz^>4dU+^cwH@Ays_iad&fe!F=kP@@E(}=_$whlXcy8q93MVaM+}l#tVzc#!1+x|!6_(-;P{)HJ<^GBKHtM1d%H z^h9Z|A=j>h*=Gi82+^$YP#bL30-D^XrV$)2G@vQuz)jDQh+nRqgC!Y(blrc?`zYbw zp6__=yc^;#6xW(eY!Nx?u;t^NcgMIog#Ea|99dfkM>vsay4>iF823@caQUN-{N!Vh z$Px4V@4N^E*PCfLth&QaQHJe_WLcRcfYQ?D3#v8;e>kzLVG9E;PYomNqs0N1I$Q6b zgNTkkq_s{cVopO1h8yydC*l460Wfp@mkDmono2QBU;>;DDA$E^+HQBi1RJq%AqWkJBVC}@NhY|td1r1px1a1_{sh8aCeYBSteHx zu;>JZ^3Z!njF{H&SYYIEIfbkzJX zuOh@{n01opa5-EQzsJ0IXZgdMb@?|22#cX3sB|`s1{Zg#d@H2RhwBaouIyWT)}e~yiB=(Mcz77TPduZM z9I_7#z#wFw+>5l4ftUW{kbz-%s)V*c_YY;DG7N!&02Fg=-RDdux+eP8+F8>Ia&q(% z4_lP-6~OY6%6AG5l85Th6B9#_McJu7bC=M5N~C1FheDhA^X;Qh)$mB=(9E%L&Cs`z zQSaqKRpk{_!&N^7D`t!--O`~}0&W)ox9PR)h5#G@hqwoMk}ehOpLD4w|NQp@`|lsX zP+u$xo&3vxG79}~UjnXS{?F&+OH`*{(lG;;*g@LN|J#>=)rvp9tZ?zm*829=z-=^E z|0{*$U&udxzx-b)I>u(Y&;Nw|&Kav_zZm}=Sl8JQ0|R6E9~kM2RQLL;VcLe4ARwil zskSx9%=Ba@!RZ74rsJ0UB69{(W2wu5fpMIn4+95Gu1MN+hW+*!fjJ55ggh5=3sU7@zlZ|+~6zO_7_fDg0_0bq^sWCVQ*pOm>0 zu4}CAplb&7y35>tEtet|4v>p3kj1sGBNAz) zHOQuV`o^4c~u*MfG*fEHA51r(p0xO@Ph|G`h1< zDszv1*7`tunrYwQz`zE@&O40_Y@xU!2%e-|2e^uW@0Y@7q7uvk z0C?5~I0Mp6;CC+by!T1qi%#HWxd*_{DguptP57nUUDm?V8i4x~;GS(Cq%_y%UaCgM zf+v4JpvD{kKHJghxvvfWtJX0i3a=Re`qK+^d7&H8FBL_n^szk~(EOfUh^;?>j(V+T za_3U8$w7(oAmH}O1-Hf3t_}XHC>GV|s-^%v-~!!T??&`XeUF8;&msjx5xyV_gUNO2 ztd}+IaD>qBV}RSM7u=3;y*Bu-qA;jBWCsECj~D2*zBi&@Dhfp>eCNMo*t6XyG5ET4 zw#!7(dy>}l32++@Q2T86$xXU8_^+ZAX+AG}1<*$?h?19iBl@MHc+_abKmsj=>OxEL z`*dA8`(>i^l5iq3!GnR>T@aD7i?SvPo&a*FiA>3=iFO9Oim_yuXK;NMNxMvlKq`NNnuZpC+AAM*DDB^QL zkxkZ{z%Nwk zS(I)9zf=+IItt;Rz@QEBf+AB-uL-|2z7lE#Vg&Aj(=~e_|Gu*Y_G|1zb5?B;2P6+FnjW%e0Ra=?9l6S|EkE>k~d%Z0JzBo zxOdD=;Fl^=LMs7U0u;fz&_<9_uL-|2vL1A(;tv5%pS%#x#u1Uv*X90Ik>iA7A6)?M zegSS=c@y}hilE+N#hbab*AM~;9j`U2=eq1&qou>@`W|q)?t;?~`>xCVt0Fnnw_?=+ zxZMS~(D+T@mn#xC_!AR|tXvn`$lUBT;oO%gLOAlNtPF6v>w?o_``6|ERS`00c|9!v z?sfq#0|j}#YUDnFU#dv8MHb>oWIY*npN%8?h}VSkT&Bp6I%}#vz-c;wd$!lm5MP)3 zS4G}v@vx==@RPZLv+##BH-TTONVlqwL<2B+q{R20P@xxK8fC<+N zCd`CyZsO9X5H~3ymXZSC`gv|vLRBAUjap}0=r!%o69t^MoboYF((A2)MiA$?O_8EA_ z9l(Or1qLHU9O1IHU%xOBYJGqIxF1X$PrR`<@TWbxw07A_q>cpnqbl>!zNFFZq#&y6iy z`aUj#r?DFVESO%f5EF1?3xB-dPJhU2HrlJ4bh(pq_7&6+dZh(JGaKN@p{0YdG05ul z<#`G(uv4~j1iHdWIayKr{W)16*?)T_+(;i}r4JGX)^;vk?JBY@WVHeoUTlGKcEzYB z;cB*-xw*cj5wJXe>h|d``9O9lLJmNW=RglWyHf0ybOZEX7hUraMV8zFw>^P!cJc)3 z-PL>tZC#Mw?>#W*R{(>;q}EY@VIc=FSUIbA%lm79^(@VRGzI$Ff7IovC>9GpQeOb< zTfq7s+rL%$&v1gS^d{_c3yi0Y1^r29K{6s3*hx97`reN#4Lk$Zqx6J;ws?}D^iOe4 z`BM;;GCM%6o|LnyFZ5l_2RYc-{O4AP^DA|Qb6L9|0O(0!IHL^X=#}8-`p-coHkOyW zjD*ZQo&Zo!%Gp6J#nhE#V42ty^yk{*XMd@^=CLabz79I3~du|+xF4<(I6!X)Kxzq zfVOc;|7+KzlWvqi1iB^Wg|2B#cC`t8JsT4<(@Pgd$Fie%u>jwBE=XQOel-}lM$<@7 z-|kY$?HzMZ+J`z2tj@+k680;>rrMTPCu96So8PJ4Lc0mm@PN;3fX`>q@Vr-}L54=w zRz`nWC%)HkG^z@qXC%&dc8v!&K%WaHr>>)0J>j4S_@x*4uo^eu|8>8DK@?r2CJ?Aj z%GsXjZh9r(%u-+12&8veZ5k2ka=`$8+l!rl9n(5pmn&&#s(J6TflYUM+90ccG8deGshz)K z{d5qKmwhGq?1k&+Blr0WZBNnhpRa*Fd%f*>zt7*7cnXg#yAk}a!Rq|oMyD1O>aMhK zdeg&Y)p`Efh(FLjZh-!)>*te?pYn~{ujXG!MSfoU^ZB$-@jD&Y#Q&RJ`+S=@pZMt% zo%!=h^!YSU=lwpP^5YbaG=DYxOahSeexE-pbBbm@xElTE$(i#`pWnuPN?rnozUsAn pc2oDC=*zY&pQ1G&q5s^#EcXB!_>BPu<_!D=0^-jI@SnlJ{ts{l_ig|H literal 0 HcmV?d00001 From 1b144e6b5896bd20fbdb55ba3368be86c507ffd6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 May 2016 19:32:33 -0500 Subject: [PATCH 581/935] Fix #264 --- .../client/core/handler/MiscellaneousIcons.java | 9 +++++---- .../botania/client/core/handler/ModelHandler.java | 1 - .../botania/client/model/FloatingFlowerModel.java | 15 +++++---------- .../render/tile/RenderTileFloatingFlower.java | 5 ++++- 4 files changed, 14 insertions(+), 16 deletions(-) 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 729ac7a73..30d474905 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -86,10 +86,11 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { // Floating flowers - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), FloatingFlowerModel.INSTANCE); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + FloatingFlowerModel model = new FloatingFlowerModel(); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "normal"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), model); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model); // Platforms evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); 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 3730ef4a2..570a31c39 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -126,7 +126,6 @@ public final class ModelHandler { public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(FloatingFlowerModel.INSTANCE); /** Subtile block models **/ registerSubtiles(); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index bd9e7b02a..8631e8bde 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -50,9 +50,8 @@ import java.util.stream.Collectors; public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadListener { - public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; - private static final Table CACHE = HashBasedTable.create(); + private final Table CACHE = HashBasedTable.create(); protected static BakedQuad transform(BakedQuad quad, final TRSRTransformation transform) { UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(DefaultVertexFormats.ITEM); @@ -139,7 +138,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL @Override public ItemOverrideList getOverrides() { - return ItemHandler.INSTANCE; + return itemHandler; } @Override public boolean isAmbientOcclusion() { return false; } @@ -212,10 +211,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } - private static class ItemHandler extends ItemOverrideList { - private static final ItemHandler INSTANCE = new ItemHandler(); - private ItemHandler() { super(ImmutableList.of()); } - + private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Override public IBakedModel handleItemState(IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { // Items always have GRASS island @@ -230,8 +226,7 @@ public class FloatingFlowerModel implements IBakedModel, IResourceManagerReloadL identifier = MUNDANE_PREFIX + stack.getItemDamage(); } - return FloatingFlowerModel.INSTANCE.getModel(islandType, identifier); + return FloatingFlowerModel.this.getModel(islandType, identifier); } - } - + }; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index ba17a6c3c..aab5fc65c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -14,6 +14,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -50,7 +52,8 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { IBlockState state = tile.getWorld().getBlockState(tile.getPos()); state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos()); - brd.getBlockModelRenderer().renderModelBrightness(FloatingFlowerModel.INSTANCE, state, 1.0F, true); + IBakedModel model = brd.getBlockModelShapes().getModelManager().getModel(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory")); + brd.getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, true); GlStateManager.popMatrix(); From e99d5dff636d5183e059a1f5d14e5fb7ca7c20e3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 18:49:11 -0500 Subject: [PATCH 582/935] Update to recommended forge, removed useless synchronization in ManaNetworkHandler --- build.properties | 2 +- .../botania/common/core/handler/ManaNetworkHandler.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index 045eecac4..7ef34dcbc 100644 --- a/build.properties +++ b/build.properties @@ -4,6 +4,6 @@ version=r1.8 dir_output=../Build Output/Botania/ dir_repo=./ mc_version=1.9 -forge_version=12.16.0.1882-1.9 +forge_version=12.16.1.1888 build_number=303 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index cea02357c..7628fd202 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -70,12 +70,12 @@ public final class ManaNetworkHandler implements IManaNetwork { return isIn(tile, manaPools); } - private synchronized boolean isIn(TileEntity tile, Map> map) { + private boolean isIn(TileEntity tile, Map> map) { Set set = map.get(tile.getWorld()); return set != null && set.contains(new TileSignature(tile, tile.getWorld().isRemote)); } - private synchronized TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { + private TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { return tiles.stream() .filter(ts -> ts.isRemote() == remoteCheck) .map(TileSignature::getTile) @@ -85,7 +85,7 @@ public final class ManaNetworkHandler implements IManaNetwork { .orElse(null); } - private synchronized void remove(Map> map, TileEntity tile) { + private void remove(Map> map, TileEntity tile) { World world = tile.getWorld(); if(!map.containsKey(world)) @@ -94,7 +94,7 @@ public final class ManaNetworkHandler implements IManaNetwork { map.get(world).remove(new TileSignature(tile, tile.getWorld().isRemote)); } - private synchronized void add(Map> map, TileEntity tile) { + private void add(Map> map, TileEntity tile) { World world = tile.getWorld(); map.putIfAbsent(world, new HashSet<>()); map.get(world).add(new TileSignature(tile, tile.getWorld().isRemote)); From c0c1db1aa720b090adfc1148f638e0e731639e8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 19:11:33 -0500 Subject: [PATCH 583/935] Fix #267 --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 2219f3df5..fd23d8a1f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -13,7 +13,9 @@ import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; @@ -60,6 +62,8 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipes(BotaniaAPI.elvenTradeRecipes); registry.addRecipes(BotaniaAPI.runeAltarRecipes); registry.addRecipes(BotaniaAPI.manaInfusionRecipes); + + registry.getRecipeTransferRegistry().addRecipeTransferHandler(ContainerCraftingHalo.class, VanillaRecipeCategoryUid.CRAFTING, 1, 9, 10, 36); } @Override From a3abfb6aadcb8c7c9f05e406b8e90bc2740079ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 19:30:58 -0500 Subject: [PATCH 584/935] Removed buried petals and mana flash item forms. Closes #268 --- .../vazkii/botania/common/block/decor/BlockBuriedPetals.java | 3 +++ .../java/vazkii/botania/common/block/decor/BlockManaFlame.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 8b0a19901..d69532f27 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -74,6 +74,9 @@ public class BlockBuriedPetals extends BlockModFlower { return ModItems.petal; } + @Override + public void registerItemForm() {} + @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.INVISIBLE; 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 b1e351e31..31501d333 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -126,4 +126,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { return LexiconData.lenses; } + @Override + public void registerItemForm() {} + } From 5e11fe6e0648d16cad026b514ba49ae38b687561 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 19:33:42 -0500 Subject: [PATCH 585/935] Removed model registration for last commit --- .../java/vazkii/botania/client/core/handler/ModelHandler.java | 1 - 1 file changed, 1 deletion(-) 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 570a31c39..a9f6eaaa3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -308,7 +308,6 @@ public final class ModelHandler { registerItemModel(ModBlocks.lightLauncher); registerItemModel(ModBlocks.manaBomb); registerItemModel(ModBlocks.manaDetector); - registerItemModel(ModBlocks.manaFlame); registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.manaVoid); registerItemModel(ModBlocks.prism); From 072f13d3db22c02086f598a2c05dba35dc4c824c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 22:24:15 -0500 Subject: [PATCH 586/935] Update JEI and add support for recipe category crafting items --- build.gradle | 2 +- .../integration/jei/JEIBotaniaPlugin.java | 27 +++++++++++++++++++ .../jei/brewery/BreweryRecipeCategory.java | 3 ++- .../elventrade/ElvenTradeRecipeCategory.java | 3 ++- .../jei/manapool/ManaPoolRecipeCategory.java | 3 ++- .../PetalApothecaryRecipeCategory.java | 3 ++- .../puredaisy/PureDaisyRecipeCategory.java | 3 ++- .../runicaltar/RunicAltarRecipeCategory.java | 3 ++- 8 files changed, 40 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index dbc016c70..2393f429b 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { //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.2.3.176" + deobfCompile "mezz.jei:jei_1.9:3.3.3.197" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index fd23d8a1f..c1a62ff2c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -14,7 +14,10 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.state.enums.AltarVariant; +import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; @@ -28,6 +31,10 @@ import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory; import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.annotation.Nonnull; @@ -63,6 +70,26 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipes(BotaniaAPI.runeAltarRecipes); registry.addRecipes(BotaniaAPI.manaInfusionRecipes); + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID); + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID); + + for(PoolVariant v : PoolVariant.values()) { + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID); + } + + for(AltarVariant v : AltarVariant.values()) { + if(v == AltarVariant.MOSSY) continue; + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID); + } + + registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID); + registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID); + + + registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID); + registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.autocraftingHalo), VanillaRecipeCategoryUid.CRAFTING); + registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.craftingHalo), VanillaRecipeCategoryUid.CRAFTING); + registry.getRecipeTransferRegistry().addRecipeTransferHandler(ContainerCraftingHalo.class, VanillaRecipeCategoryUid.CRAFTING, 1, 9, 10, 36); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index c572d9383..1f2c51032 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -25,6 +25,7 @@ import java.util.List; public class BreweryRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.brewery"; private final IDrawableStatic background; private final String localizedName; @@ -37,7 +38,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.brewery"; + return UID; } @Nonnull 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 4c1b7ec8b..0c1638788 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 @@ -31,6 +31,7 @@ import java.util.Collection; public class ElvenTradeRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.elvenTrade"; private final String localizedName; private final IDrawable background; private final IDrawable overlay; @@ -44,7 +45,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.elvenTrade"; + return UID; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 536b363d9..239c28efa 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -26,6 +26,7 @@ import java.util.Collection; public class ManaPoolRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.manaPool"; private final IDrawable background; private final String localizedName; private final IDrawable overlay; @@ -42,7 +43,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.manaPool"; + return UID; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index cb155d1b7..1d59f1734 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -27,6 +27,7 @@ import java.util.Collection; public class PetalApothecaryRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.petals"; private final IDrawableStatic background; private final String localizedName; private final IDrawableStatic overlay; @@ -41,7 +42,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.petals"; + return UID; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 86c145688..4ca2b3156 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -26,6 +26,7 @@ import java.util.Collection; public class PureDaisyRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.pureDaisy"; private final IDrawable background; private final String localizedName; private final IDrawable overlay; @@ -40,7 +41,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.pureDaisy"; + return UID; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 914c8b02b..6e5695b98 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -26,6 +26,7 @@ import java.util.Collection; public class RunicAltarRecipeCategory implements IRecipeCategory { + public static final String UID = "botania.runicAltar"; private final IDrawable background; private final String localizedName; private final IDrawable overlay; @@ -40,7 +41,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { @Nonnull @Override public String getUid() { - return "botania.runicAltar"; + return UID; } @Nonnull From afc5f93b55446622215c705bf38f5f2fffd7b53e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 22:38:07 -0500 Subject: [PATCH 587/935] Fix #265 --- .../block/subtile/functional/SubTileJadedAmaranthus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f9dd0dad1..459802e15 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 @@ -35,7 +35,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { if(redstoneSignal > 0) return; - if(mana >= COST && !supertile.getWorld().isRemote && ticksExisted % 30 == 0) { + if(!supertile.getWorld().isRemote && ticksExisted % 30 == 0 && mana >= COST) { BlockPos pos = new BlockPos( supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1), supertile.getPos().getY() + RANGE, @@ -59,6 +59,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { break; } + up = pos; pos = pos.down(); } } From d524a0b2e9f4e116be3fae2170c84a429160cd1e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 6 May 2016 23:27:36 -0500 Subject: [PATCH 588/935] Fold a couple interfaces together, we have way too many .-. --- .../vazkii/botania/api/boss/IBotaniaBoss.java | 17 +++++++++ .../api/boss/IBotaniaBossWithShader.java | 38 ------------------- .../vazkii/botania/api/item/IDyablePool.java | 26 ------------- ...tendedWireframeCoordinateListProvider.java | 28 -------------- .../IWireframeCoordinateListProvider.java | 8 ++++ .../vazkii/botania/api/mana/IDirectioned.java | 24 ++++++++++++ .../botania/api/mana/IIdentifiable.java | 23 ----------- .../vazkii/botania/api/mana/IManaPool.java | 13 +++++++ .../vazkii/botania/api/mana/IPingable.java | 7 +++- .../botania/api/mana/IRedirectable.java | 29 -------------- .../client/core/handler/BossBarHandler.java | 17 +++------ .../core/handler/BoundTileRenderer.java | 9 ++--- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../common/entity/EntityDoppleganger.java | 4 +- .../botania/common/item/ItemManaMirror.java | 9 +++++ .../common/item/lens/LensRedirect.java | 6 +-- .../botania/common/item/material/ItemDye.java | 10 ++--- .../common/item/relic/ItemAesirRing.java | 5 +-- .../common/item/relic/ItemLokiRing.java | 4 +- .../common/item/rod/ItemExchangeRod.java | 5 +++ 21 files changed, 107 insertions(+), 183 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java delete mode 100644 src/main/java/vazkii/botania/api/item/IDyablePool.java delete mode 100644 src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java delete mode 100644 src/main/java/vazkii/botania/api/mana/IIdentifiable.java delete mode 100644 src/main/java/vazkii/botania/api/mana/IRedirectable.java diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 2826ca3c4..c8b6bee65 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -16,6 +16,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.ShaderCallback; import java.awt.*; import java.util.UUID; @@ -63,4 +64,20 @@ public interface IBotaniaBoss { */ public UUID getBossInfoUuid(); + /** + * The Shader Program to use for this boss's bar. Return 0 case + * you don't want a shader to be used. You can use separate shaders + * for the background and foreground. + * @param background True if rendering the background of the boss bar, + * false if rendering the bar itself that shows the HP. + * @return OpenGL program ID of the shader to use + */ + public int getBossBarShaderProgram(boolean background); + + /** + * A callback for the shader, used to pass in uniforms. Return null for no callback. + * @return a ShaderCallback to use. If getBossBarShaderProgram returns an invalid shader the result of this method is ignored. + */ + public ShaderCallback getBossBarShaderCallback(boolean background, int shader); + } diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java deleted file mode 100644 index c7a425412..000000000 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 29, 2014, 6:13:21 PM (GMT)] - */ -package vazkii.botania.api.boss; - -import vazkii.botania.api.internal.ShaderCallback; - -/** - * A Botania boss whose HP bar makes use of shaders. Shaders - * used through this have a few uniforms available: - *

    08=8kIh`Y;eNC#E+jDK$g{st$6(lEV4g9! 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⩔&X1K{BzD|*P2<&l)CGorW6mO!#i<{9nJQd!6%e_ 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 QJi#9dF)%}713n1*9~dz=$p8QV literal 0 HcmV?d00001 From 3f5159fe75c5f1f0da2014a13156d31b31016d10 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 19:09:46 -0600 Subject: [PATCH 326/935] Mossy apothecary --- .../model/altar/mossy/gobletBase2_bottom.png | Bin 0 -> 652 bytes .../model/altar/mossy/gobletBase2_sides.png | Bin 0 -> 233 bytes .../model/altar/mossy/gobletBase2_top.png | Bin 0 -> 763 bytes .../model/altar/mossy/gobletBase3_bottom.png | Bin 0 -> 519 bytes .../model/altar/mossy/gobletBase3_sides.png | Bin 0 -> 191 bytes .../model/altar/mossy/gobletBase3_top.png | Bin 0 -> 607 bytes .../model/altar/mossy/gobletBase_bottom.png | Bin 0 -> 738 bytes .../model/altar/mossy/gobletBase_sides.png | Bin 0 -> 296 bytes .../textures/model/altar/mossy/gobletBase_top.png | Bin 0 -> 871 bytes .../model/altar/mossy/gobletStand_sides.png | Bin 0 -> 615 bytes .../model/altar/mossy/gobletStand_top_bottom.png | Bin 0 -> 246 bytes .../model/altar/mossy/kelkBase2_bottom.png | Bin 0 -> 486 bytes .../model/altar/mossy/kelkBase2_sides.png | Bin 0 -> 213 bytes .../textures/model/altar/mossy/kelkBase2_top.png | Bin 0 -> 346 bytes .../textures/model/altar/mossy/kelkBase_sides.png | Bin 0 -> 230 bytes .../model/altar/mossy/kelkBase_top_bottom.png | Bin 0 -> 265 bytes .../textures/model/altar/mossy/kelkWall.png | Bin 0 -> 742 bytes 17 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_top.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_sides.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_top_bottom.png create mode 100644 src/main/resources/assets/botania/textures/model/altar/mossy/kelkWall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a1d26adced0724b65ce90bf0259de29f87c3db GIT binary patch literal 652 zcmV;70(1R|P){a>-8Gn_Yp#{+wB0b zZJQ)XkWyld;qmcNH~>{u;rl+G=P{ejNRkB0vbedq!EqdX-={1~k|aS0!FW98_4O41 z2jJ`L3)gk2>zbk{Xxo;yZFzfpBZ?vxiv_lAGnq`Ns*2TWMZez%zyh!=iztfd_xotA zaU2K7acG(br4+qhkNf+3_WM0QKR@`sfAGKoh~pT5?RHBX$2>njBZQ#S>EL-DT5D#r z8F`*#j3EdDMx)UYu-R-V%aR}nP)ZR5!QY|du-$HvQj(@ARaN1-E=|*LcXxM`uvjcm zN^yRE&SWy-;^G1+CDZ8?+qMCaQes&a0Iut@TrQ7*UyXU5qm()r`ttI^U@#z#W4hfg zuIplqK}tzgRYwV0Yo4B-I6XZj&vV}2-!aC}wk?CffcbpR+1VM!n1g}i@%Xrb)|%mP z$j8SAtJMl)48|CWqM+C75r!dYn$qcX5JGT!drOvOM*zUd$qCoj*VJ{5ZQBSTFvj3{ z9+#JwOsCUBbWPJ7dh4Gt?)Q6!!y#?k0^s{TN-37hC0Ujch9LlHnj(Za0_O8MN-2^g zL2FGA1YBKRA*JN=^OLHoD9aMZaR|eZ&1OSg*GIsw#`SuQZQIzkjnwP7K4z94=O=-qLoNSvpcTLOwVo^O!t0}WdNzwFZvXl_VO0B%W36Ew4 z++41f{BQP8u7s_TZi{7=oFb>Gcs6aFw(8zxo4B0o)_u#F-K=MwZ2e|;Ji~q7^RD_p zhRA70{Xc!JOp_9qcw3idn!WP1bnN9t8f-=$mrcIyjC9#oEvVRHFro3g-M7Cr+gCb9 dNk}qQFn6vAVlABT$`A$F?Bx4qnaxbvDoGZSO>iM5Z3%7hU!(>RBB6Tm z&{9FvgJO>!z2(wl4}~0hDZMC_;-Z2ydWdZ-q_v5zQEEF`mfgiL*<~lY6Nl`d?#%QM z*u_H+;_vvv`|!RG?+gDk0$^!rDGI|7-}iA{mj{*a@phY7S_%NiDFg7~d!OR_K0*i@ zjRuR0iy{WFy}gZ6idwCP5Q5THo%vVKBc((sMdw(D^}-FV|8NOQOY!2&97-two&gvb z7$67&>_V1@)tmH3gWP?T;rGAR2!a411m12F&utPVcKGrBHHyVz57270P)bpMT;OnY ziswg0{@Zn3zCHNxpW6 zwy5E{Zdcf?jjsW?{c8qI(|QtT&x}Xs=078s%aJQ>Qrvk+e>BMJugrIw!!RUQ+GKQS zlAp8R0PyFUb0G1|?8hvxWT-zb;JHm^kH14K7Gr;ZA1Ng(_ir#ZG>PMsG4)~Ip8J5+ zKd$#yC>D#|=14kE8_7utyT*uC5B<(xy>FR2!aD4LQt>QsaC6mVTfs(EU#pE^W^&g zL{Y@_^fbQj(;p22P7hGpsxzK&@H~$wirCxRBbiJRC3dJ(Dk!DUb)73;Uc@}C7#>am z4-Oop(`m+rCRy9~iFiDY5CSPB-`@O+(pH^&zum?zWU&ib&MsWQ(o(#9;*H)4wrz9j z_-WQzWqtDw`jG~WzjfN8_V1JKbXdN36-!HDSym5_NF=CKDm-VUNIsiJ*LBK9nSWYk t?mo(Ng^i{yX2uqfQexZoQ$O@SgD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..7815483675adc564559fcde4af566d79d7d7c935 GIT binary patch literal 519 zcmV+i0{H!jP)Hol#odLD-{%B zRL#41qItY7;5n<4$>cNV{09EIly}qb_oc4u+-^5CO(TjTy4@~85MY`nK@gy68m(3f zAq0cLKmkzSfU2t0>vgWzE4$qeAq1n*2-~&^!w}oH>GgWVam@LAPAAB`8_)9qNRot1 z=I8kNd}0^|hG7uLF~i{yDJ8z|e*>4xh5P-E=Xp%0QxruZpU<;cEObzL?Esc|0D> zW;2S#B2r3(5F|;0X`0_ak|d1BV@jnG$K#RJYK4@N*Xu>GSR|9l&}=pdg5V=W^*7)+ z4(s)r{eF*>5-BB76k*#og+hVtc1u2=M^Th-0Kj!!YPA}V#{*5%P!t6zC5B;8tyXEb z+x%ZC@cza)j&U4^*Xsp9E|((=Lzc@Whr@wFq3{8u8B8Vm1VwxtFWpTURJ~H_G`UfI`&Jo$%TJ!(_002ov JPDHLkV1id#?2`Zh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..933da393ba64a125809156e8351b3cdd5f5a0a69 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfU_e6TE`_~7F2&n0jC<2Lf(&|I)V^5%ZyoY?*I`Sc`q7&P2$Id2-g l%x7UAx7$ID1R!8wI5gFTwPwy?BcKZyJYD@<);T3K0RZ@PL$Uw> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6e8f41be3690b22bb8286839eb48dfe2080ef3 GIT binary patch literal 607 zcmV-l0-*hgP)>Rd`za9iHp*KkRPCTbrzS0 zbI!f+uSYr*larGz$8o4sDx_B5V(gj(eSHAra(Mvm-+6*0N!06gCMG5%0Pi7SYikQx zmMN7={QgyD?CN8L5XiDj^IVfmHpW~!!KL$~$g=D@IC3ZgfdIB`qh*)rYK2%>kMn(X z9^1B&Bne~Jq~+fxvGfLA*E<2J#c4h!UJ)I*%-P5g0Q&YC)oPW@N)n@JV(gk2MUzk{ z)Y-xC`03Wev6pOYY%r7lKvyfo$dxg7(QzCs%ObV>34ovTx%Ljmho3Vw8>hUVWjJ~p zuh&bhRznEE>{5(Vy#uJ-C%85GjO35^oe^|hr@WuVD4GZ%7#tkLRh392f_hA*r>6%Y1d5_y6ipZ4MzC%BpcF}BXJ-e; zaZpv2so6N!hn^m|2#2XuDs;6%K(5_Ee}6yHUN7-4?*M2t8qB1=qHnM9c{)aBB}utl zW-guJ?#)M?4m3^UV)PmrlH|;9)c^`WoC!q9 tD|z-Bc^1~=Zsw5-_Ygv$X&V2}`~{Fd)toI`XH@_I002ovPDHLkV1gUX4hsMP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..f5269c16bf7ee183180f305b6fcec889383dd3a3 GIT binary patch literal 738 zcmV<80v-K{P)QR6wJ!P!SBljSDaEy9sa1jR^}Pi9exG z%1;GaPS5!khR$-{yu5Hao!ISmWupClkLP(f!{M-ObUGb|!y!s3gb?g@JBp&< z?d=V%HS6^nV+{3r9ox16aMCp8csx?C*O^YID5d@c$3ZED>$#yI8Z?jOB94&CLy?(THxhi|e|K$K#UHYPJ4OW?2BG$z(FY@qM4Crzbu?KTBes z=S-(ln$0HNZWn-Btwxq*6h(pSy7<12loIDWW4qmEyI!2Fp6BuK@IacTbUK|sgLb>k&(9B=%?4u(#u&ESExle3DJ4-9;dvg_YL&;wM;40( zo6UyZZijWA@&5jvJkPOh8zBV77%G(tyGl!HCk(uB%xZZ0#K<` zkW!MSDYk7Bh9O}X;xrl!qA22cJR+q8D4)u*ENZnH^?IGd;ZQ!+d_Ko@U7{%BKe>8n Usm|ce^8f$<07*qoM6N<$g5sH4!vFvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..457d7a0b13504591b4e918907855d1dc80d7e8e7 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf+OosK(8`*y85}Sb4q9e0Py2~>;M1& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b90bfcf59a94cd0755dfde4bc237ba8fe7e742 GIT binary patch literal 871 zcmV-t1DO1YP)D!2j)PK)=gt&f3D7fWGwG=;l497k(t0&0>UMh?EkqlHoNyM64?Wz_x8xHl8A{ zN@nM$@tuI{S8kC?rTBe4;8OQZqR}YE!NCE4@2pTdjG|f;hG76utyTeeyn2`IJ&!vh zql96I<2d+EfOXzNDMiC8olW0m_tv=i$!*%&+VDJ&NF+kW|BV-=BG=xyMWs^Vm${!< zTAky?$qCp+{@PgL&2xi@4?a)p+r!_oxw*;a_A&t3y)`VIzB4jPp-{ka9QykDSXo)AJ9xRJ3mItzz%x8u56X zshLSWyYeLfT5F_~^z`&lEEchJ@>F1Z!z10C!}oo()@ZFcIy$1WvlHFC$Nv64Qc9xH zD80SCOx*pR_)C)Z_7o8SOD9RE)0E3)8X6i9LZG$AvMl^UK!1Nf0Kd*XtdrxdlAf~{ z5#!_IdTM5pTrSVxz!0wMqP3=}sflOL7bpuCODAb>e-(hs7lyDbizk1~@ZRN5G1k}D z865bCMIN!ZJjk|WXoloEwPJdwAHkC?+e*uaIiP`=2q(uM#002ovPDHLkV1n-eo%;X) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..3af8bd008bffd30b0d8fb6927c889c6687225aeb GIT binary patch literal 615 zcmV-t0+{`YP)cleo=g>`m%Ejn)xJOD8RNEmHP6?<763{qeBWok*CpM~!3K zAwC?FqvndGjR5dGFR4HXL1-FOi*^3kn7BXY_Ko`pA?O}$It9nJgE1xvn8l^aH74GG z`qC|g5X5GiYO#(Gf*dvC{um+te{&;9DUnj5ltS8w;c&>y)?>naK-z{Vr3iw6DAQ#7 zTPLYNDTU{GXswxe1EiEEo#V308)HuLrA889jKNwK>(gT*GCUJkv?`a>cHG2o2l7N})**L!MQ!UoXrsk1Sa%b%U z0KV^^uOLUwoeN;6*K$fuHv#xD-Aw{cpXMjKg!zEl#mi@W5at84*2MjB5&*CqH4#D} zZA2+pbI>p!AcSDl%aF}xxx4=G{3S{$dGY=cnS~L<;SggCvDv1Ox{gu`z~yJ*jFedz z(LLIvTCDTy*dQax>yJ;7HgZ15T__->#9HeBe*ux^_bMHJi2VQn002ovPDHLkV1ina B7Zm^i literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..21357a3ebdb58e671156d4667572d36d9148ea2d GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfW)#>ldOGRq$ rPgddlY!fWP8kN0CXZIKW`X|i$r$#HCeh@en=x_#4S3j3^P6@P)nZcYl6C>yI-vHNm6A3pTgc84J1Gxc&fDRS5=zWV6}xJ9Q8sgy8M#6~;m? zGq)eIxxJ21nk>w}qvhHB{dY(p5EyE3ZO~|%#@F3d(zDA*DT&>RlT0Q7n7uQHBR^vp z#t>kr0l>+zN3mGMaU8kw~B@3bk5|ZnsN5 zpC^~g(d+f7R*y!%5R1h~rBb~AutNI&67hH(DJ88|i$uh}c#N9}m zNF+j`P(W2xeBZ}3O*Bozv@Y4ewr#4_Bczl7Se8YlQb7oT@B94z|DBneuPz_)$=pj$ zWsS9skGQUjuIudVZE^7D2h)>JiAJNNHz<`#00fOmoKTsay)A^�(icf4qq2dDQFm ciX|dAa9Qr#Y~ecg3Y&wozi#W9>GeW? z+MW}I=N`2+e3&+Sb4pb5rlwt%T>G9b4$1viIK{R&vS7LTmuV>*ola}tja<}w+}rW? z7JDm=@=%_2&b(6V-GfpqY?NQ}v>8m8aYE?mLc71052i4EV469_h4rJ5UNg{L44$rj JF6*2UngC~gQaJzs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c1931da93cb8c334f0925c87c4c41187ab93c51c GIT binary patch literal 346 zcmV-g0j2(lP)!kR%D~^_sSAxm+$djzdut2q92P5k*m- z6GOo3^%{laIHs;^G)-f%SfG?*Hk*wad=HJT>sXe>@puH_`FsNKcsu}DtyV}WrvU&$ zh(26ZRsV0ACQ?ca!3Y2qhT(YO&}=rF_d*{!pU=|`48vf#T#}~g zXvnth{sg7eG$7A&ilP91Z|>B+-@_k(Zpin2s;c62IsvfVZYj$W0M~V=0r&eIfWzUy sd_KqXJhCj~cDu3L?P!{&2mK@c00SUq1%}@Rj{pDw07*qoM6N<$g6jE|hyVZp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..82a9d99a62b4ec2987d343397366e82930b308ce GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfP7nbN$-BWIe&8Xj}5Ww zp4_Tf!j<_*NHe~r==g1p$xB3j`qk#uefnxPJKgAlvl6fQdyZRzq0vV3mhkLNueT_R znXpzoC{||KMh#_`%Toe0-wgS2iB(I=+*=(NseAakhV<-QVpC ct}|CK?>Dk!ow_qJ3+PY=Pgg&ebxsLQ0LD*VLI3~& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_top_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..163b2b90a4f834100653d094c1884ee967474e3f GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfKaSXBO zeS6W6tHnT|^`X5WZw8as0k{4KqI(*a-!i@x$r&cbCFHHT`>0bwx9{e+e&#iYlV>#6 zcP2{AV|ZR!*I@W;@&9K+39;d8wt8q@j7siVsL^F0Q+)CJ-_4m)pKRPUTLqZj+dj6K zq{7KyIGy42rU}b5b8jd0JlvPRW@}>e4DW_r>+WX;O-hxF%Klc%&j?g=&T`%BqbZP*dEWQ` z@e=^Ly1LTAV34JyC0s5S?RPIDTUGY%a1)QmSy)&=(==LJTZPR1D;*b@2RP-g~;F==tQ=vfX*5ugG3_1#J4fL53jRc zE+P2!IRym;G@rPHyjDb#Bo-GJvjQV#P*HpcfSlbMYq{OuM*V@aq*5uSr>BvvDxxT& z>pI1okJI0qv;b7193i@AM!)CM5_qcSlIt z+n*IAlSz<_Wr1m$sH#dVBq9g`;c%E2?|fh?jE;^XTU9I;3#Msi1%VGk)RvuJF2U(^ zVz=8V(#rWZ^9dtnaIWzp@pv4czny(sYM7jyMANjaK#>(hQRKgAX=zE<)VtFFIls@< zQ*;cM%Z2yeEvh|7h(@D~jt{e;VC$+q5JeFqW~?;PH_%C`R!e?mV8A=H?O#g(&sxOaqL3>Y@Hn(~4l`#~1SQ@|c~S1yeziB+9p(=JWIjja4m3lElzh zKSvLr0w5MiVz=ALmQYuD20;)=rBcKaKPW6LBy-;T^eVAPlFB^|L?RIYCIY%}GH`O` z2gBptOifKO`05UaD^Bw)c$2xgIczo?m;kWE)6jlqf6D6&HFu1ccO=&Ce6c+$h0mmh`yUx0t` Y6PV%>v&aqOUjP6A07*qoM6N<$f@HN*Pyhe` literal 0 HcmV?d00001 From 2ab491867ef05af44d416ac1ed2767920396230c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 21:50:53 -0600 Subject: [PATCH 327/935] Revert "Fix lexicon npe, closes #94" This reverts commit 6f6f330a5ab99bc10a15e69dab8f5bd3f701e036. --- src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 67ca7dd0b..590d3ddc5 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -11,7 +11,6 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; @@ -54,7 +53,7 @@ public class SimpleWikiProvider implements IWikiProvider { if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, bPos, Minecraft.getMinecraft().thePlayer); + ItemStack stack = block.getPickBlock(pos, world, bPos, null); if(stack == null || stack.getItem() == null) stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); From 512884729e916f977dada3bbd1c3108c3e186202 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 21:54:11 -0600 Subject: [PATCH 328/935] Tweak mossy apothecary break texture, fix lexicon crash again --- .../java/vazkii/botania/api/wiki/IWikiProvider.java | 7 ++++--- .../vazkii/botania/api/wiki/SimpleWikiProvider.java | 11 ++++++----- .../botania/client/core/handler/HUDHandler.java | 6 +++--- .../vazkii/botania/client/core/proxy/ClientProxy.java | 2 +- .../resources/assets/botania/blockstates/altar.json | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java index 285c1549e..48c9fb4f4 100644 --- a/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/IWikiProvider.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.wiki; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -23,16 +24,16 @@ public interface IWikiProvider { /** * Gets the name of the block being looked at for display. */ - public String getBlockName(World world, MovingObjectPosition pos); + public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player); /** * Gets the URL to open when the block is clicked. */ - public String getWikiURL(World world, MovingObjectPosition pos); + public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player); /** * Gets the name of the wiki for display. */ - public String getWikiName(World world, MovingObjectPosition pos); + public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 590d3ddc5..132182269 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; @@ -46,14 +47,14 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getBlockName(World world, MovingObjectPosition pos) { + public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player) { BlockPos bPos = pos.getBlockPos(); Block block = world.getBlockState(bPos).getBlock(); if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, bPos, null); + ItemStack stack = block.getPickBlock(pos, world, bPos, player); if(stack == null || stack.getItem() == null) stack = new ItemStack(block, 1, block.getDamageValue(world, bPos)); @@ -69,8 +70,8 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiURL(World world, MovingObjectPosition pos) { - String name = getBlockName(world, pos); + public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player) { + String name = getBlockName(world, pos, player); if(name == null) return null; @@ -82,7 +83,7 @@ public class SimpleWikiProvider implements IWikiProvider { } @Override - public String getWikiName(World world, MovingObjectPosition pos) { + public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player) { return name; } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 964488d61..e915394ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -363,10 +363,10 @@ public final class HUDHandler { profiler.startSection("wikiLookup"); if(!block.isAir(mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); - String url = provider.getWikiURL(mc.theWorld, pos); + String url = provider.getWikiURL(mc.theWorld, pos, mc.thePlayer); if(url != null && !url.isEmpty()) { - String name = provider.getBlockName(mc.theWorld, pos); - String wikiName = provider.getWikiName(mc.theWorld, pos); + String name = provider.getBlockName(mc.theWorld, pos, mc.thePlayer); + String wikiName = provider.getWikiName(mc.theWorld, pos, mc.thePlayer); drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName; draw = true; } 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 0406e080d..5f89fbdf5 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -339,7 +339,7 @@ public class ClientProxy extends CommonProxy { @Override public boolean openWikiPage(World world, Block block, MovingObjectPosition pos) { IWikiProvider wiki = WikiHooks.getWikiFor(block); - String url = wiki.getWikiURL(world, pos); + String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().thePlayer); if(url != null && !url.isEmpty()) { try { Desktop.getDesktop().browse(new URI(url)); diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 207c7c165..1438c5ac9 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -205,7 +205,7 @@ "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", "kelkwall": "botania:model/altar/mossy/kelkWall", - "particle": "minecraft:blocks/cobblestone" + "particle": "minecraft:blocks/cobblestone_mossy" }} } } From b9b066617acb6da5b81ce44c355c4ba79c950e45 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 21:55:44 -0600 Subject: [PATCH 329/935] Fix floating flower lightlevel crash --- .../botania/common/block/BlockFloatingSpecialFlower.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 1b0f4bb43..2e64b29cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -84,7 +84,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public int getLightValue(IBlockAccess world, BlockPos pos) { - int currentLight = ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); + TileEntity tile = world.getTileEntity(pos); + int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; if(currentLight == -1) currentLight = originalLight; return LightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), currentLight); From 2b57a2232df148d5af48b064bbd5c72208ef1d35 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 22:07:42 -0600 Subject: [PATCH 330/935] Update lexicon to reflect new corporea funnel item frame values --- MC18_notes.txt | 3 ++- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MC18_notes.txt b/MC18_notes.txt index 48140b558..ff7736d96 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -13,6 +13,7 @@ Anyways, vanilla removed it from their method so we follow suit. * Removed icon methods from SubTileSignature -- Other -- +* Lang entries to be updated in non-english: Corporea funnel new numbers. Moving of prismarine entry. * Most things left untouched to make patches from upstream easier * Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances since BlockPos'es are immutable and thus can be reused everywhere. @@ -25,4 +26,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is * Quartz stair textures may be assigned incorrectly - resource pack authors check me * Glass pane inner faces are not getting culled (vanilla bug?) * Some item forms of technical/non-user blocks are removed - * Full list: [all double slab items, all solid vine items] \ No newline at end of file + * Full list: [all double slab items, all solid vine items] diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 74fc9e3ec..e8a721df7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3300,7 +3300,7 @@ botania.page.corporeaIndex7=A certain magical one at that botania.entry.corporeaFunnel=Corporea Funnel botania.tagline.corporeaFunnel=Request items from a Corporea network via redstone botania.page.corporeaFunnel0=A simpler block that utilizes the prospects of the &4Corporea Network&0 is the &1Corporea Funnel&0, when given access to a network through a &1Corporea Spark&0 on top, it'll pull a single item from the network when given a redstone signal.
    This item is put into an inventory 1 or 2 blocks below it, or case one doesn't exist or is full, tossed into the world right above the funnel. -botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
    Rotating the item changes how many will be requested at once, starting at 1, rotating once will pull 16, and each rotation thereafter increases the count by 8, up to a maximum of 64. +botania.page.corporeaFunnel1=The &1Corporea Funnel&0 may only pull items that match its filter, similarly to a &1Hopperhock&0, the filter is designated by items contained on &1Item Frames&0 placed on it. The item pulled is one of the various items in the frames at random.
    Rotating the item changes how many will be requested at once, starting at 1, rotating once will pull 2, twice 4, three times 8, four times 16, five times 32, six times 48, and finally seven times 64 items. botania.page.corporeaFunnel2=Energistically applied # -- CORPOREA INTERCEPTOR From 972d0e5bf60a62ddda68989396736572ec388ac6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Feb 2016 10:18:12 -0600 Subject: [PATCH 331/935] Safety check in platform model, update JEI --- build.gradle | 3 +-- .../client/integration/jei/JEIBotaniaPlugin.java | 10 +++++----- .../jei/brewery/BreweryRecipeWrapper.java | 15 +++++++++++++++ .../jei/elventrade/ElvenTradeRecipeWrapper.java | 15 +++++++++++++++ .../jei/manapool/ManaPoolRecipeWrapper.java | 16 ++++++++++++++++ .../PetalApothecaryRecipeWrapper.java | 15 +++++++++++++++ .../jei/puredaisy/PureDaisyRecipeWrapper.java | 15 +++++++++++++++ .../jei/runicaltar/RunicAltarRecipeWrapper.java | 15 +++++++++++++++ .../botania/client/model/PlatformModel.java | 4 ++++ 9 files changed, 101 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 7a5929442..a4cb31537 100644 --- a/build.gradle +++ b/build.gradle @@ -70,8 +70,7 @@ dependencies { //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.8.9:2.13.7.64" + deobfCompile "mezz.jei:jei_1.8.9:2.25.7.145" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 4d999a48f..a7e51dcba 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -10,6 +10,7 @@ package vazkii.botania.client.integration.jei; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; @@ -33,11 +34,6 @@ public class JEIBotaniaPlugin implements IModPlugin { private IJeiHelpers jeiHelpers; - @Override - public boolean isModLoaded() { - return true; - } - @Override public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { this.jeiHelpers = jeiHelpers; @@ -79,4 +75,8 @@ public class JEIBotaniaPlugin implements IModPlugin { public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { } + @Override + public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index b903eeb33..456510d80 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -18,6 +18,7 @@ import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { @@ -66,8 +67,22 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + } + @Override public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index e6e08d18f..b61fe5abd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeElvenTrade; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { @@ -63,8 +64,22 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + } + @Override public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index b36f4929b..8f1dc2c86 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -21,6 +21,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class ManaPoolRecipeWrapper implements IRecipeWrapper { @@ -71,6 +72,10 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { GlStateManager.enableAlpha(); HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10); GlStateManager.disableAlpha(); @@ -80,4 +85,15 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 9104b69ec..c2e508e4b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePetals; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { @@ -62,8 +63,22 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + } + @Override public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 1666d0cde..8e1c869f9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -19,6 +19,7 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePureDaisy; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class PureDaisyRecipeWrapper implements IRecipeWrapper { @@ -72,8 +73,22 @@ public class PureDaisyRecipeWrapper implements IRecipeWrapper { public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + } + @Override public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 1c3694138..e1ad0c9e1 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -20,6 +20,7 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class RunicAltarRecipeWrapper implements IRecipeWrapper { @@ -66,6 +67,10 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { GlStateManager.enableAlpha(); HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10); GlStateManager.disableAlpha(); @@ -75,4 +80,14 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + return ImmutableList.of(); + } + + @Override + public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { + return false; + } + } diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index b21744feb..f459e85e6 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -22,6 +22,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.ModBlocks; import java.util.List; @@ -29,6 +30,9 @@ public class PlatformModel implements ISmartBlockModel { @Override public IBakedModel handleBlockState(IBlockState state) { + if(state.getBlock() != ModBlocks.platform) + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); From c7d28c57de16ed641881549ad32b2d0213de542d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Feb 2016 13:03:38 -0600 Subject: [PATCH 332/935] Partial fix for platform + smartmodels --- .../botania/api/state/BotaniaStateProps.java | 8 ++ .../botania/client/model/PlatformModel.java | 91 ++++++++++++++++++- .../botania/common/block/BlockPlatform.java | 10 +- 3 files changed, 105 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index df620c98c..3e08907a4 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -16,7 +16,9 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.*; @@ -36,6 +38,12 @@ public class BotaniaStateProps { // The property for platform held blockstate id public static final PropertyObject HELD_STATE = new PropertyObject<>("held_state", IBlockState.class); + // The property for platform world object + public static final PropertyObject HELD_WORLD = new PropertyObject<>("held_world", IBlockAccess.class); + + // The proeprty for platform world pos + public static final PropertyObject HELD_POS = new PropertyObject<>("held_pos", BlockPos.class); + /** Common properties to all blocks to use **/ // The 16 Minecraft colors diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index f459e85e6..fa1dac290 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -16,13 +16,20 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.common.property.IExtendedBlockState; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileCamo; import java.util.List; @@ -35,6 +42,12 @@ public class PlatformModel implements ISmartBlockModel { EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); + IBlockAccess heldWorld = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_WORLD); + BlockPos heldPos = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_POS); + + if (heldWorld == null || heldPos == null) { + return this; + } Minecraft mc = Minecraft.getMinecraft(); if(heldState == null && layer == EnumWorldBlockLayer.SOLID) { @@ -43,12 +56,15 @@ public class PlatformModel implements ISmartBlockModel { return mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); } else if(heldState != null) { if(heldState.getBlock().canRenderInLayer(layer)) { + IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); + // Steal camo's model - IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(heldState); + IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(actual); if(model instanceof ISmartBlockModel) { // Their model can be smart too - model = ((ISmartBlockModel) model).handleBlockState(heldState); + IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); + model = ((ISmartBlockModel) model).handleBlockState(extended); } return model; @@ -93,4 +109,75 @@ public class PlatformModel implements ISmartBlockModel { return ItemCameraTransforms.DEFAULT; } + private static class FakeBlockAccess implements IBlockAccess { + + private final IBlockAccess compose; + + private FakeBlockAccess(IBlockAccess compose) { + this.compose = compose; + } + + @Override + public TileEntity getTileEntity(BlockPos pos) { + /* todo is this actually needed? if so this can't be an iblockaccess anymore + IBlockState state = getBlockState(pos); + if(state == null || !state.getBlock().hasTileEntity(state)) + return null; + + TileEntity tile = state.getBlock().createTileEntity(this, state); + if(tile == null) + return null; + + tile.setWorldObj(this); + tile.setPos(pos); + + return tile;*/ + return compose.getTileEntity(pos); + } + + @Override + public int getCombinedLight(BlockPos pos, int lightValue) { + return 15 << 20 | 15 << 4; + } + + @Override + public IBlockState getBlockState(BlockPos pos) { + IBlockState state = compose.getBlockState(pos); + if(state.getBlock() instanceof BlockCamo) { + state = ((TileCamo) compose.getTileEntity(pos)).camoState; + } + return state; + } + + @Override + public boolean isAirBlock(BlockPos pos) { + return compose.isAirBlock(pos); + } + + @Override + public BiomeGenBase getBiomeGenForCoords(BlockPos pos) { + return compose.getBiomeGenForCoords(pos); + } + + @Override + public boolean extendedLevelsInChunkCache() { + return compose.extendedLevelsInChunkCache(); + } + + @Override + public int getStrongPower(BlockPos pos, EnumFacing direction) { + return compose.getStrongPower(pos, direction); + } + + @Override + public WorldType getWorldType() { + return compose.getWorldType(); + } + + @Override + public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean _default) { + return compose.isSideSolid(pos, side, _default); + } + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 21c6912ac..916492f9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -53,12 +53,15 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable setUnlocalizedName(LibBlockNames.PLATFORM); setDefaultState(((IExtendedBlockState) blockState.getBaseState()) .withProperty(BotaniaStateProps.HELD_STATE, null) + .withProperty(BotaniaStateProps.HELD_WORLD, null) + .withProperty(BotaniaStateProps.HELD_POS, null) .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Override public BlockState createBlockState() { - return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE }); + return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.PLATFORM_VARIANT, }, + new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS }); } @Override @@ -76,11 +79,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { + state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) + .withProperty(BotaniaStateProps.HELD_POS, pos); + if (world.getTileEntity(pos) instanceof TileCamo) { TileCamo tile = ((TileCamo) world.getTileEntity(pos)); return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); } else { - return ((IExtendedBlockState) state); + return state; } } From e522d8e24cebd90c347b4a9af1660ac71e1260ed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Feb 2016 21:44:04 -0600 Subject: [PATCH 333/935] comment out debug output --- src/main/java/vazkii/botania/client/model/LexiconModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 56d6be0f0..c5830b0aa 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -88,7 +88,7 @@ public class LexiconModel implements IPerspectiveAwareModel { public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { initModels(); if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - System.out.println("m8"); + //System.out.println("m8"); float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; Pair> animate = asm.apply(time); From 006519bcf5106d51168167ef07cfed1821c915e9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Feb 2016 22:23:23 -0600 Subject: [PATCH 334/935] Slightly nerfed path speed boost --- .../java/vazkii/botania/common/block/decor/BlockDirtPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1b434abac..27ea41336 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -42,7 +42,7 @@ import java.util.UUID; public class BlockDirtPath extends BlockMod implements ILexiconable { private static final UUID speedBoostUuid = UUID.fromString("c5f17cca-c89f-4f12-81da-8f04b1f27679"); - private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.7, 2).setSaved(false); + private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.55, 2).setSaved(false); public BlockDirtPath() { super(Material.ground); From d3e1bf80b428a46fbff96bc944d6f31557040cee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 8 Feb 2016 22:39:32 -0600 Subject: [PATCH 335/935] Fix star particle - corporea index and manastorm charge --- .../botania/client/core/helper/RenderHelper.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 5ca7e279d..e307c1a6f 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -172,14 +172,14 @@ public final class RenderHelper { tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; - int r = (color & 0xFF0000) >> 16; - int g = (color & 0xFF00) >> 8; - int b = (color & 0xFF); - tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 255F * (1F - f2)).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); + float r = ((color & 0xFF0000) >> 16) / 255F; + float g = ((color & 0xFF00) >> 8) / 255F; + float b = (color & 0xFF) / 255F; + tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); + tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); + tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(r, g, b, 1F - f2).endVertex(); + tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(r, g, b, 1F - f2).endVertex(); tessellator.draw(); } From ba944db343eb5ab179e313839a5ea37148b824ae Mon Sep 17 00:00:00 2001 From: GirafiStudios Date: Wed, 10 Feb 2016 20:33:21 +0100 Subject: [PATCH 336/935] Updated to official RF API. --- .../cofh/api/energy/IEnergyConnection.java | 7 ++-- .../java/cofh/api/energy/IEnergyHandler.java | 42 +++---------------- .../java/cofh/api/energy/IEnergyProvider.java | 14 +------ .../java/cofh/api/energy/IEnergyReceiver.java | 14 +------ 4 files changed, 13 insertions(+), 64 deletions(-) diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java index 65c64d31f..29ef0a1ce 100644 --- a/src/api/java/cofh/api/energy/IEnergyConnection.java +++ b/src/api/java/cofh/api/energy/IEnergyConnection.java @@ -2,20 +2,21 @@ package cofh.api.energy; import net.minecraft.util.EnumFacing; + /** * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not * accept it; otherwise just use IEnergyHandler. *